diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-03-21 09:37:03 +0200 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-03-21 09:37:03 +0200 |
| commit | ac35ee37071836e55543a58e6bdf6a5490e963d2 (patch) | |
| tree | 21845ddbba3bf17f1016be258f876ea88a03b1b1 /CHANGELOG | |
| parent | 60c3e841ce4f0bb29917bff6318167f5b417c426 (diff) | |
| parent | fefab474569f231676a4fd1579a70723d729f206 (diff) | |
| download | gitlab-ce-ac35ee37071836e55543a58e6bdf6a5490e963d2.tar.gz | |
Merge branch 'username-keys-content-type' of https://github.com/dmedvinsky/gitlabhq into dmedvinsky-username-keys-content-type
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 f2124408b42..441f36a5bde 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -30,6 +30,7 @@ v 6.7.0 - Requires at least 2 unicorn workers - Requires gitlab-shell v1.9+ - Replaced gemoji(due to closed licencing problem) with Phantom Open Emoji library(combined SIL Open Font License, MIT License and the CC 3.0 License) + - Fix `/:username.keys` response content type (Dmitry Medvinsky) v 6.6.5 - Added option to remove issue assignee on project issue page and issue edit page (Jason Blanchard) |