summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2016-09-27 16:37:08 +0000
committerRémy Coutable <remy@rymai.me>2016-09-27 16:37:08 +0000
commitbac56e3bf15345b3a2c6041b9160f8aebf00ae32 (patch)
tree78f76bb453185128556174c9e5267e5975d99c16
parente350d807726af36506b5b6544d8c28705b03e448 (diff)
parente7ab6b70ebcc065dd2a98d6af44de7075f872f1e (diff)
downloadgitlab-ce-bac56e3bf15345b3a2c6041b9160f8aebf00ae32.tar.gz
Merge branch '22053-bump-gitlab-shell-to-have-git-trace' into 'master'
Use gitlab-shell v3.6.2 ## What does this MR do? Bump gitlab-shell to v3.6.2 to be able to enable GIT_TRACE_PERFORMANCE output to a log file Relates #22053 See merge request !6367
-rw-r--r--CHANGELOG1
-rw-r--r--GITLAB_SHELL_VERSION2
2 files changed, 2 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 0f797559d2c..4e41b435711 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,7 @@
Please view this file on the master branch, on stable branches it's out of date.
v 8.13.0 (unreleased)
+ - Use gitlab-shell v3.6.2 (GIT TRACE logging)
- Speed-up group milestones show page
- Fix robots.txt disallowing access to groups starting with "s" (Matt Harrison)
- Revoke button in Applications Settings underlines on hover.
diff --git a/GITLAB_SHELL_VERSION b/GITLAB_SHELL_VERSION
index 40c341bdcdb..b72762837ea 100644
--- a/GITLAB_SHELL_VERSION
+++ b/GITLAB_SHELL_VERSION
@@ -1 +1 @@
-3.6.0
+3.6.2