summaryrefslogtreecommitdiff
path: root/CHANGELOG
diff options
context:
space:
mode:
authorMarin Jankovski <maxlazio@gmail.com>2015-05-19 14:39:52 +0200
committerMarin Jankovski <maxlazio@gmail.com>2015-05-19 14:39:52 +0200
commit7758a566c9d12dbb7728ad6273cafe140a9e8eb8 (patch)
treebf3cd5621dfc583d615e58e02f2d363aa99836ab /CHANGELOG
parent9c6427768dc3d81d5837d205a30cd15397b0ba86 (diff)
parent37e94e3c5bfde0dc6d74decdd52db55e8a0c905e (diff)
downloadgitlab-ce-7758a566c9d12dbb7728ad6273cafe140a9e8eb8.tar.gz
Merge branch 'jirutka-shell-secret-path'
Diffstat (limited to 'CHANGELOG')
-rw-r--r--CHANGELOG3
1 files changed, 3 insertions, 0 deletions
diff --git a/CHANGELOG b/CHANGELOG
index d170e6d27c3..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