Merge branch 'master' into mr-merge-base

1 files changed, 6 insertions, 1 deletions

diff --git a/CHANGELOG b/CHANGELOG
index e7273e017ea..a33a50373d7 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -5,22 +5,27 @@ 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
+  - Display 404 error on group not found
   - Track project import failure
   - Fix visibility level text in admin area (Zeger-Jan van de Weg)
   - Update the ExternalIssue regex pattern (Blake Hitchcock)
 
-v 8.4.2 (unreleased)
+v 8.4.2
   - Bump required gitlab-workhorse version to bring in a fix for missing
     artifacts in the build artifacts browser
   - Get rid of those ugly borders on the file tree view
+  - Fix updating the runner information when asking for builds
   - Bump gitlab_git version to 7.2.24 in order to bring in a performance
     improvement when checking if a repository was empty
   - Add instrumentation for Gitlab::Git::Repository instance methods so we can
     track them in Performance Monitoring.
   - Correctly highlight MR diff when MR has merge conflicts
+  - Increase contrast between highlighted code comments and inline diff marker
   - Fix method undefined when using external commit status in builds
 
 v 8.4.1