Moved changelog stuff to the correct release

**Why was this needed?** The changes are pulled in 7.12.0 but where mistakenly put under 7.11.0 [skip-ci] Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>

Moved changelog stuff to the correct release
7d658f2d · Jeroen van Baarsen · caf4a6cf · 7d658f2d
Commit 7d658f2d authored May 21, 2015 by Jeroen van Baarsen
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 3 deletions

CHANGELOG CHANGELOG +3 -3

No files found.
--- a/CHANGELOG
+++ b/CHANGELOG
 Please view this file on the master branch, on stable branches it's out of date.

 v 7.12.0 (unreleased)
- Allow to configure location of the `.gitlab_shell_secret` file. (Jakub Jirutka)
+  - Allow to configure location of the `.gitlab_shell_secret` file. (Jakub Jirutka)
  - Disabled expansion of top/bottom blobs for new file diffs
+  - Update Asciidoctor gem to version 1.5.2. (Jakub Jirutka)
+  - Fix resolving of relative links to repository files in AsciiDoc documents. (Jakub Jirutka)

 v 7.11.0 (unreleased)
  - Fix broken view when viewing history of a file that includes a path that used to be another file (Stan Hu)
@@ -72,8 +74,6 @@ v 7.11.0 (unreleased)
  - Spin spinner icon next to "Checking for CI status..." on MR page.
  - Fix reference links in dashboard activity and ATOM feeds.
  - Ensure that the first added admin performs repository imports
-  - Update Asciidoctor gem to version 1.5.2. (Jakub Jirutka)
-  - Fix resolving of relative links to repository files in AsciiDoc documents. (Jakub Jirutka)

 v 7.10.2
  - Fix CI links on MR page