diff options
| author | Jeroen van Baarsen <jeroenvanbaarsen@gmail.com> | 2015-05-21 09:48:11 +0200 |
|---|---|---|
| committer | Jeroen van Baarsen <jeroenvanbaarsen@gmail.com> | 2015-05-21 09:48:11 +0200 |
| commit | 2b725777fe00cea0937d43d4d726c74dca766246 (patch) | |
| tree | 9a47b7bf2d5781ac4dcab7349ed41df35c2df038 | |
| parent | caf4a6cfd772d71821c99629c3686d06e02f4715 (diff) | |
| parent | 7d658f2dbde614090941983b9f8bc3ae091235ea (diff) | |
| download | gitlab-ce-2b725777fe00cea0937d43d4d726c74dca766246.tar.gz | |
Merge pull request #9317 from jvanbaarsen/move-changelog-stuff
Moved changelog stuff to the correct release
| -rw-r--r-- | CHANGELOG | 6 |
1 files 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 |