From 7d658f2dbde614090941983b9f8bc3ae091235ea Mon Sep 17 00:00:00 2001 From: Jeroen van Baarsen Date: Thu, 21 May 2015 09:46:42 +0200 Subject: 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 --- CHANGELOG | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 6d9fb13a81c..aea66986e30 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,8 +1,10 @@ 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 -- cgit v1.2.1