summaryrefslogtreecommitdiff
path: root/CHANGELOG
diff options
context:
space:
mode:
authorRobert Speicher <robert@gitlab.com>2016-01-27 21:17:31 +0000
committerRobert Speicher <robert@gitlab.com>2016-01-27 21:17:31 +0000
commit614025da38c13cbaeb55eb2d09997784ddb946e6 (patch)
tree700b3fc6e0f32ccec630ea798dbba1da320f0245 /CHANGELOG
parent27893b972d148350f21aba1554024e246945e815 (diff)
parent8c6231d1844c651eae31841e879a31a9c5d32cb8 (diff)
downloadgitlab-ce-614025da38c13cbaeb55eb2d09997784ddb946e6.tar.gz
Merge branch 'rs-skip-2fa-on-signout' into 'master'
Skip the 2FA requirement during logout See merge request !2581
Diffstat (limited to 'CHANGELOG')
-rw-r--r--CHANGELOG2
1 files changed, 2 insertions, 0 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 48fe7395486..1c809254341 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -5,6 +5,8 @@ v 8.5.0 (unreleased)
- Ignore binary files in code search to prevent Error 500 (Stan Hu)
- Upgrade gitlab_git to 7.2.23 to fix commit message mentions in first branch push
- New UI for pagination
+ - Don't prevent sign out when 2FA enforcement is enabled and user hasn't yet
+ set it up
- Fix diff comments loaded by AJAX to load comment with diff in discussion tab
- Whitelist raw "abbr" elements when parsing Markdown (Benedict Etzel)
- Don't vendor minified JS