summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2017-02-06 10:04:21 +0100
committerRémy Coutable <remy@rymai.me>2017-02-06 10:04:21 +0100
commitb54b031638e7a98c1e51b369cff53602db40e4b0 (patch)
tree2d6500c76b7a3d9e67e32c1cff0a849e8965ab32
parent0ce20138298eaebfb9e8225d21e7b0088716e5ad (diff)
downloadgitlab-ce-backport-7967-and-8189-to-8-13-stable.tar.gz
Update gitlab-shell to 3.6.7backport-7967-and-8189-to-8-13-stable
Signed-off-by: Rémy Coutable <remy@rymai.me>
-rw-r--r--GITLAB_SHELL_VERSION2
-rw-r--r--changelogs/unreleased/use-gitlab-shell-3-6-7.yml4
-rw-r--r--doc/update/8.12-to-8.13.md4
3 files changed, 7 insertions, 3 deletions
diff --git a/GITLAB_SHELL_VERSION b/GITLAB_SHELL_VERSION
index 4f2c1d15f6d..5b3413147c9 100644
--- a/GITLAB_SHELL_VERSION
+++ b/GITLAB_SHELL_VERSION
@@ -1 +1 @@
-3.6.6
+3.6.7
diff --git a/changelogs/unreleased/use-gitlab-shell-3-6-7.yml b/changelogs/unreleased/use-gitlab-shell-3-6-7.yml
new file mode 100644
index 00000000000..c6600cead87
--- /dev/null
+++ b/changelogs/unreleased/use-gitlab-shell-3-6-7.yml
@@ -0,0 +1,4 @@
+---
+title: Use gitlab-shell v3.6.7
+merge_request:
+author:
diff --git a/doc/update/8.12-to-8.13.md b/doc/update/8.12-to-8.13.md
index c0084d9d59c..6457ec9b663 100644
--- a/doc/update/8.12-to-8.13.md
+++ b/doc/update/8.12-to-8.13.md
@@ -72,7 +72,7 @@ sudo -u git -H git checkout 8-13-stable-ee
```bash
cd /home/git/gitlab-shell
sudo -u git -H git fetch --all --tags
-sudo -u git -H git checkout v3.6.6
+sudo -u git -H git checkout v3.6.7
```
### 6. Update gitlab-workhorse
@@ -166,7 +166,7 @@ See [smtp_settings.rb.sample] as an example.
Ensure you're still up-to-date with the latest init script changes:
sudo cp lib/support/init.d/gitlab /etc/init.d/gitlab
-
+
For Ubuntu 16.04.1 LTS:
sudo systemctl daemon-reload