summaryrefslogtreecommitdiff
path: root/CHANGELOG
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-05-15 19:58:39 +0300
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-05-15 19:58:39 +0300
commitcb58e1cbd74a76c2e25f56e8df1f1f494d14128a (patch)
tree47a521a1c19f891a1ec5de049b6d1ac7f47467f4 /CHANGELOG
parent39eac7b0b92ac65edf22ce860174e6049af13032 (diff)
parentb024c094d3b6a2d1f81e0314dbfcfb1e6303155d (diff)
downloadgitlab-ce-cb58e1cbd74a76c2e25f56e8df1f1f494d14128a.tar.gz
Merge branch 'ad_disabled_changelog'
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 b1a7c3effb1..2f7874ba724 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -17,6 +17,7 @@ v 6.9.0
- Remove unwanted files from satellite working directory with git clean -fdx
- Accept merge request via API (sponsored by O'Reilly Media)
- Add more access checks during API calls
+ - Block SSH access for 'disabled' Active Directory users
v 6.8.0
- Ability to at mention users that are participating in issue and merge req. discussion