summaryrefslogtreecommitdiff
path: root/CHANGELOG
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-10-30 16:17:36 +0200
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-10-30 16:17:36 +0200
commitf0dd16d53e81bb0796fa6fa422efcab8a64f097a (patch)
tree8d583e1e96b1e82334d185d9252e22842fe36689 /CHANGELOG
parent8388bbe82918d2fca2600620f48e048ccfab2c97 (diff)
parentc2f0ae8a40658d02dfa128881a014fe1e907f61c (diff)
downloadgitlab-ce-f0dd16d53e81bb0796fa6fa422efcab8a64f097a.tar.gz
Merge branch 'master' of github.com:gitlabhq/gitlabhq
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Conflicts: CHANGELOG
Diffstat (limited to 'CHANGELOG')
-rw-r--r--CHANGELOG1
1 files changed, 1 insertions, 0 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 1d1c6d26e11..cc287b67063 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -5,6 +5,7 @@ v 7.5.0
- Fix LDAP config lookup for provider 'ldap'
- Add Atlassian Bamboo CI service (Drew Blessing)
- Mentioned @user will receive email even if he is not participating in issue or commit
+ - Tie up loose ends with annotated tags: API & UI (Sean Edge)
v 7.4.2
- Fix internal snippet exposing for unauthenticated users