diff options
author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-04-07 17:15:31 +0300 |
---|---|---|
committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-04-07 17:15:31 +0300 |
commit | 650d0bc695eb0f874561b8d4ed3fc86510573fba (patch) | |
tree | 70da3eb09b3d8f0e34997158272cf36c8e7fe0fa /CHANGELOG | |
parent | 5d6e9ea8efa07d5342857de0772b59a4c5092f60 (diff) | |
parent | e6f58cb87da914f2a424df66b680e19e49dcd2e6 (diff) | |
download | gitlab-ce-650d0bc695eb0f874561b8d4ed3fc86510573fba.tar.gz |
Merge branch 'improve-oauth'
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
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 a6f2b36d31c..f0a72710a92 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -10,6 +10,7 @@ v 6.8.0 - Protected branch does not allow force push - Fix popen bug in `rake gitlab:satellites:create` - Disable connection reaping for MySQL + - Allow oauth signup without email for twitter and github v 6.7.3 - Fix the merge notification email not being sent (Pierre de La Morinerie) |