Commits · 16567af9f56d8e4131a61563e67e3136ffaecf8c · nexedi / gitlab-ce

08 Apr, 2014 12 commits
- Use placeholder to prevent using the find box to add new members. · 16567af9
  dosire authored Apr 08, 2014
  
  16567af9
- Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq · e7087fbf
  Dmitriy Zaporozhets authored Apr 08, 2014
  
  e7087fbf
- More info about GitLab integrations with OAuth · 3b339a8b
  Dmitriy Zaporozhets authored Apr 08, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  3b339a8b
- Merge branch 'irc-status' into 'master' · 603fa9e9
  Sytse Sijbrandij authored Apr 08, 2014
```
Irc status
```
  603fa9e9
- Officially supported irc might cause people to expect too much. · 688e4290
  dosire authored Apr 08, 2014
  
  688e4290
- Merge branch 'irc_update' into 'master' · 8969a2f0
  Sytse Sijbrandij authored Apr 08, 2014
```
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.
```
  8969a2f0
- Merge branch 'merge-request-officer' into 'master' · 6909705a
  Sytse Sijbrandij authored Apr 08, 2014
```
Merge Request Officer
```
  6909705a
- Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq · 1e8ed9d5
  Dmitriy Zaporozhets authored Apr 08, 2014
  
  1e8ed9d5
- Merge branch 'login_page' into 'master' · 7f2551ac
  Dmitriy Zaporozhets authored Apr 08, 2014
```
Add option to disable standard login
```
  7f2551ac
- Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce · 7f148385
  Dmitriy Zaporozhets authored Apr 08, 2014
  
  7f148385
- Merge pull request #6717 from pkgr/fix-database-parsing-gitlab-setup · c4ef7f06
  Dmitriy Zaporozhets authored Apr 08, 2014
```
Allow to parse heroku-generated database.yml config file.
```
  c4ef7f06
- Change IRC to official · f64ccc3f
  Drew Blessing authored Apr 07, 2014
  
  f64ccc3f
07 Apr, 2014 28 commits
- Merge branch 'master' into login_page · af5ea92c
  Marin Jankovski authored Apr 07, 2014
```
Conflicts:
	CHANGELOG
```
  af5ea92c
- Merge pull request #6708 from skv-headless/fix_url_error_on_invalid_hook · d238a21b
  Dmitriy Zaporozhets authored Apr 07, 2014
```
Fix url generation error on hook invalid create
```
  d238a21b
- Merge branch 'grammer_fix' into 'master' · e36108f7
  Dmitriy Zaporozhets authored Apr 07, 2014
```
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
```
```
  e36108f7
- Merge branch 'namespacefix-changelog' into 'master' · 38ae34a3
  Dmitriy Zaporozhets authored Apr 07, 2014
```
Namespacefix changelog

Forgot the changelog entry.
Thanks @sytse

Fixes #908
```
  38ae34a3
- Merge pull request #6718 from pkgr/fix-procfile · 8f2a4aa5
  Dmitriy Zaporozhets authored Apr 07, 2014
```
Fix Procfile to be usable in production.
```
  8f2a4aa5
- add namespace fix to changelog · be6cee23
  Job van der Voort authored Apr 07, 2014
  
  be6cee23
- Allow people to remove source branch of fork project in MR · d92e4830
  Dmitriy Zaporozhets authored Apr 07, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  d92e4830
- Remove unnecessary sign * · d70939f6
  Dmitriy Zaporozhets authored Apr 07, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  d70939f6
- Fix show/hide discussion link · 3befe6ec
  Dmitriy Zaporozhets authored Apr 07, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  3befe6ec
- Merge branch 'breack-attack' into 'master' · fefa10c3
  Dmitriy Zaporozhets authored Apr 07, 2014
```
Breack attack

Fixes #1104
```
  fefa10c3
- Comment gzip: off be default · 5307dd5f
  Dmitriy Zaporozhets authored Apr 07, 2014
  
  5307dd5f
- Merge branch 'fix-faulty-namespaces' into 'master' · 8df66046
  Dmitriy Zaporozhets authored Apr 07, 2014
```
Fix faulty namespaces

Fixes #908

Now with updated schema.
```
  8df66046
- Add option for disable standard signin. · aea3712e
  Marin Jankovski authored Apr 07, 2014
  
  aea3712e
- Allow to parse heroku-generated database.yml config file. · 8a56e7db
  Cyril Rohr authored Apr 01, 2014
  
  8a56e7db
- Fix Procfile to be usable in production. · 459e6295
  Cyril Rohr authored Apr 01, 2014
  
  459e6295
- Fix link in integration doc · 26c51020
  Dmitriy Zaporozhets authored Apr 07, 2014
  
  26c51020
- add a space · 52cf11b9
  Job van der Voort authored Apr 07, 2014
  
  52cf11b9
- Merge branch 'improve-oauth' · 650d0bc6
  Dmitriy Zaporozhets authored Apr 07, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	CHANGELOG
```
  650d0bc6
- Fix faulty namespaces · 6d196962
  Job van der Voort authored Apr 07, 2014
  
  6d196962
- Avoid false validation when create user · e6f58cb8
  Dmitriy Zaporozhets authored Apr 07, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  e6f58cb8
- Make oauth works for google oauth too · 5436d6af
  Dmitriy Zaporozhets authored Apr 07, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  5436d6af
- Small edit. · 43ecf68a
  dosire authored Apr 07, 2014
  
  43ecf68a
- Simplify the contributing process and introduce MRO's. · ac906b42
  dosire authored Apr 07, 2014
  
  ac906b42
- Add nickname to oauth_spec · 021faad3
  Dmitriy Zaporozhets authored Apr 07, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  021faad3
- Merge branch 'link-to-github-app' into 'master' · 5d6e9ea8
  Dmitriy Zaporozhets authored Apr 07, 2014
```
Link to github app
```
  5d6e9ea8
- Name should be oauth and not twitter. · 5b018cc5
  dosire authored Apr 07, 2014
  
  5b018cc5
- Dont care about emails for oauth · 4ab32be8
  Dmitriy Zaporozhets authored Apr 07, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  4ab32be8
- Merge branch 'wording-of-link-text' into 'master' · e7f80806
  Dmitriy Zaporozhets authored Apr 07, 2014
```
Wording of link text
```
  e7f80806