home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-20 18:16:45 +10:00
Code Issues Packages Projects Releases Wiki Activity
10,629 Commits 48 Branches 340 Tags
0f80ffdf8756a76a6ea0daaa2da5d3e193fcbe99
Commit Graph
10629 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Sytse Sijbrandij 8969a2f061 Merge branch 'irc_update' into 'master' 
Update status of IRC in PROCESS doc

Just a small fix to update the official status of the IRC channel in the PROCESS.md doc.
 2014-04-08 07:23:01 +00:00
Sytse Sijbrandij 6909705a3e Merge branch 'merge-request-officer' into 'master' 
Merge Request Officer
 2014-04-08 07:17:26 +00:00
Dmitriy Zaporozhets 1e8ed9d514 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq 2014-04-08 09:32:26 +03:00
Dmitriy Zaporozhets 7f2551ac21 Merge branch 'login_page' into 'master' 
Add option to disable standard login
 2014-04-08 06:32:02 +00:00
Dmitriy Zaporozhets 7f148385d4 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2014-04-08 09:30:49 +03:00
Dmitriy Zaporozhets c4ef7f06a1 Merge pull request #6717 from pkgr/fix-database-parsing-gitlab-setup 
Allow to parse heroku-generated database.yml config file.
 2014-04-08 09:30:08 +03:00
Drew Blessing f64ccc3f5b Change IRC to official 2014-04-07 21:59:13 -05:00
Marin Jankovski af5ea92cc4 Merge branch 'master' into login_page 
Conflicts:
	CHANGELOG
 2014-04-07 20:13:37 +02:00
Dmitriy Zaporozhets d238a21bcb Merge pull request #6708 from skv-headless/fix_url_error_on_invalid_hook 
Fix url generation error on hook invalid create
 2014-04-07 19:55:09 +03:00
Dmitriy Zaporozhets e36108f75b Merge branch 'grammer_fix' into 'master' 
Grammer Fix

Should read like:

```
Your project limit is 10 projects! Please contact your administrator to increase it
```
Instead of:

```
Your own projects limit is 10! Please contact administrator to increase it
```
 2014-04-07 16:52:08 +00:00
Dmitriy Zaporozhets 38ae34a301 Merge branch 'namespacefix-changelog' into 'master' 
Namespacefix changelog

Forgot the changelog entry.
Thanks @sytse

Fixes #908
 2014-04-07 16:31:16 +00:00
Dmitriy Zaporozhets 8f2a4aa544 Merge pull request #6718 from pkgr/fix-procfile 
Fix Procfile to be usable in production.
 2014-04-07 19:25:30 +03:00
Job van der Voort be6cee2354 add namespace fix to changelog 2014-04-07 18:24:08 +02:00
Dmitriy Zaporozhets d92e4830f7 Allow people to remove source branch of fork project in MR 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-04-07 19:11:02 +03:00
Dmitriy Zaporozhets d70939f680 Remove unnecessary sign * 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-04-07 18:59:10 +03:00
Dmitriy Zaporozhets 3befe6ec33 Fix show/hide discussion link 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-04-07 18:57:57 +03:00
Dmitriy Zaporozhets fefa10c3c2 Merge branch 'breack-attack' into 'master' 
Breack attack

Fixes #1104
 2014-04-07 15:48:45 +00:00
Dmitriy Zaporozhets 5307dd5f74 Comment gzip: off be default 2014-04-07 15:47:20 +00:00
Dmitriy Zaporozhets 8df66046d9 Merge branch 'fix-faulty-namespaces' into 'master' 
Fix faulty namespaces

Fixes #908

Now with updated schema.
 2014-04-07 15:45:37 +00:00
Marin Jankovski aea3712e8d Add option for disable standard signin. 2014-04-07 17:11:06 +02:00
Cyril Rohr 8a56e7db48 Allow to parse heroku-generated database.yml config file. 2014-04-07 15:48:51 +01:00
Cyril Rohr 459e629591 Fix Procfile to be usable in production. 2014-04-07 15:45:52 +01:00
Dmitriy Zaporozhets 26c5102002 Fix link in integration doc 2014-04-07 14:39:45 +00:00
Job van der Voort 52cf11b9f2 add a space 2014-04-07 14:26:52 +00:00
Stuart Pook 66209fbc76 Add optional parameter to list merge requests 
Add an optional parameter to list merge requests to restrict the
returned merge requests to those that are "opened", "merged" or
"closed". By default all merge requests are returned. Note that
"all" can be given to explicitly request all merge requests.
 2014-04-07 16:18:25 +02:00
Dmitriy Zaporozhets 650d0bc695 Merge branch 'improve-oauth' 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	CHANGELOG
 2014-04-07 17:15:31 +03:00
Job van der Voort 6d19696267 Fix faulty namespaces 2014-04-07 16:03:49 +02:00
Dmitriy Zaporozhets e6f58cb87d Avoid false validation when create user 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-04-07 16:47:37 +03:00
Dmitriy Zaporozhets 5436d6afd6 Make oauth works for google oauth too 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-04-07 16:36:33 +03:00
dosire 43ecf68af0 Small edit. 2014-04-07 15:11:57 +02:00
dosire ac906b427a Simplify the contributing process and introduce MRO's. 2014-04-07 15:08:46 +02:00
Dmitriy Zaporozhets 021faad3fe Add nickname to oauth_spec 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-04-07 16:03:05 +03:00
Dmitriy Zaporozhets 5d6e9ea8ef Merge branch 'link-to-github-app' into 'master' 
Link to github app
 2014-04-07 13:02:19 +00:00
dosire 5b018cc5b1 Name should be oauth and not twitter. 2014-04-07 14:52:35 +02:00
Dmitriy Zaporozhets 4ab32be8a7 Dont care about emails for oauth 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-04-07 15:20:40 +03:00
Dmitriy Zaporozhets e7f8080666 Merge branch 'wording-of-link-text' into 'master' 
Wording of link text
 2014-04-07 12:18:04 +00:00
dosire db880cf39f Image for GitHub app setup. 2014-04-07 14:17:40 +02:00
Dmitriy Zaporozhets c06255e150 fix image link 2014-04-07 12:17:32 +00:00
dosire 6e4dbde2e7 Improve actionability of notice. 2014-04-07 14:14:14 +02:00
Dmitriy Zaporozhets 11d3a00c28 Merge branch 'add-github-app' into 'master' 
Add github app
 2014-04-07 12:12:42 +00:00
dosire a4523c5292 Also add example for GitHub. 2014-04-07 14:11:00 +02:00
Dmitriy Zaporozhets 84d17f7965 Skip require email for devise controllers 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-04-07 14:32:59 +03:00
Dmitriy Zaporozhets a73df4f72d Allow oauth signup without email 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-04-07 14:09:29 +03:00
Dmitriy Zaporozhets 0dc48fac6b Merge branch 'remove_reaping_frequency' into 'master' 
Remove reaping frequency
 2014-04-07 10:40:27 +00:00
Dmitriy Zaporozhets d8ed899038 Merge branch 'add-twitter' into 'master' 
Add twitter documentation
 2014-04-07 10:40:15 +00:00
Jacob Vosmaer 5163a8fcb9 Disable connection reaping for MySQL 
On GitLab Cloud, MySQL connection reaping seemed to cause more problems
(exceptions and segfaults in the native MySQL client) than it solved.
 2014-04-07 12:32:24 +02:00
dosire ba72bd1dee Add twitter documentation. 2014-04-07 11:53:48 +02:00
Dmitriy Zaporozhets ab7b8b2125 Merge branch 'fix/rake_satellites_create' into 'master' 
Fix popen bug in `rake gitlab:satellites:create`
 2014-04-07 09:42:13 +00:00
Jacob Vosmaer bcfd9386f5 Fix popen bug in rake gitlab:satellites:create 
The Satellite#create method no longer sets the `$?` global variable.
Instead, we can use the method return value to test if the satellite was
created successfully
 2014-04-07 11:22:27 +02:00
Dmitriy Zaporozhets bfd4494890 Merge branch 'show_diff' into 'master' 
Show note diff if diff exists
 2014-04-06 17:01:15 +00:00