diff options
| author | Marin Jankovski <marin@gitlab.com> | 2014-04-07 22:13:37 +0400 |
|---|---|---|
| committer | Marin Jankovski <marin@gitlab.com> | 2014-04-07 22:13:37 +0400 |
| commit | af5ea92cc4c0eb9577bb4de2ffc5a873a37fec49 (patch) | |
| tree | 07d9e5c635fc16a1c449c94876910ca8005b3b64 /CHANGELOG | |
| parent | aea3712e8dd71092847eeaec6f934a426d1becc0 (diff) | |
| parent | 38ae34a30131aef38623ac5cf8c510ad04fc26a6 (diff) | |
Merge branch 'master' into login_page
Conflicts:
CHANGELOG
Diffstat (limited to 'CHANGELOG')
| -rw-r--r-- | CHANGELOG | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/CHANGELOG b/CHANGELOG index 2718a5d268b..72f2642727a 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -11,6 +11,7 @@ v 6.8.0 - Fix popen bug in `rake gitlab:satellites:create` - Disable connection reaping for MySQL - Allow oauth signup without email for twitter and github + - Fix faulty namespace names that caused 500 on user creation - Option to disable standard login v 6.7.3 |