summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarin Jankovski <maxlazio@gmail.com>2015-05-19 14:38:45 +0200
committerMarin Jankovski <maxlazio@gmail.com>2015-05-19 14:38:45 +0200
commit37e94e3c5bfde0dc6d74decdd52db55e8a0c905e (patch)
treebf3cd5621dfc583d615e58e02f2d363aa99836ab
parent509a32f4663f76e4bf02f8a691e80afd803d4e48 (diff)
downloadgitlab-ce-37e94e3c5bfde0dc6d74decdd52db55e8a0c905e.tar.gz
Move the changelog item to 7.12
-rw-r--r--CHANGELOG4
1 files changed, 3 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 85562497b32..fdb37bcc3ab 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,5 +1,8 @@
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)
+
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)
- Don't show duplicate deploy keys
@@ -70,7 +73,6 @@ v 7.11.0 (unreleased)
- 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)
- - Allow to configure location of the `.gitlab_shell_secret` file. (Jakub Jirutka)
v 7.10.2
- Fix CI links on MR page