Commits · af5ea92cc4c0eb9577bb4de2ffc5a873a37fec49 · nexedi / gitlab-ce

07 Apr, 2014 36 commits
- Merge branch 'master' into login_page · af5ea92c
  Marin Jankovski authored Apr 07, 2014
```
Conflicts:
	CHANGELOG
```
  af5ea92c
- 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
- 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
- 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
- Image for GitHub app setup. · db880cf3
  dosire authored Apr 07, 2014
  
  db880cf3
- fix image link · c06255e1
  Dmitriy Zaporozhets authored Apr 07, 2014
  
  c06255e1
- Improve actionability of notice. · 6e4dbde2
  dosire authored Apr 07, 2014
  
  6e4dbde2
- Merge branch 'add-github-app' into 'master' · 11d3a00c
  Dmitriy Zaporozhets authored Apr 07, 2014
```
Add github app
```
  11d3a00c
- Also add example for GitHub. · a4523c52
  dosire authored Apr 07, 2014
  
  a4523c52
- Skip require email for devise controllers · 84d17f79
  Dmitriy Zaporozhets authored Apr 07, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  84d17f79
- Allow oauth signup without email · a73df4f7
  Dmitriy Zaporozhets authored Apr 07, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  a73df4f7
- Merge branch 'remove_reaping_frequency' into 'master' · 0dc48fac
  Dmitriy Zaporozhets authored Apr 07, 2014
```
Remove reaping frequency
```
  0dc48fac
- Merge branch 'add-twitter' into 'master' · d8ed8990
  Dmitriy Zaporozhets authored Apr 07, 2014
```
Add twitter documentation
```
  d8ed8990
- Disable connection reaping for MySQL · 5163a8fc
  Jacob Vosmaer authored Apr 07, 2014
```
On GitLab Cloud, MySQL connection reaping seemed to cause more problems
(exceptions and segfaults in the native MySQL client) than it solved.
```
  5163a8fc
- Add twitter documentation. · ba72bd1d
  dosire authored Apr 07, 2014
  
  ba72bd1d
- Merge branch 'fix/rake_satellites_create' into 'master' · ab7b8b21
  Dmitriy Zaporozhets authored Apr 07, 2014
```
Fix popen bug in `rake gitlab:satellites:create`
```
  ab7b8b21
- Fix popen bug in `rake gitlab:satellites:create` · bcfd9386
  Jacob Vosmaer authored Apr 07, 2014
```
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
```
  bcfd9386
06 Apr, 2014 4 commits
- Merge branch 'show_diff' into 'master' · bfd44948
  Dmitriy Zaporozhets authored Apr 06, 2014
```
Show note diff if diff exists
```
  bfd44948
- Merge branch 'improve-mr-widget' into 'master' · 4e002a71
  Dmitriy Zaporozhets authored Apr 06, 2014
```
 Restyle merge request accept and ci widget

Fixes #1138
```
  4e002a71
- Restyle merge request accept and ci widget · 8e7f80ee
  Dmitriy Zaporozhets authored Apr 06, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  8e7f80ee
- Merge pull request #6705 from razielgn/slack-service-attachments · bc40efa1
  Dmitriy Zaporozhets authored Apr 06, 2014
```
Improved Slack integration with message attachments.
```
  bc40efa1