summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-10-28 10:32:18 +0000
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-10-28 10:32:18 +0000
commitb6d1d25d43fc562fd3a05ae67da7de01f7d36206 (patch)
tree1f55eab56b68f7ba307df218a258b1768cac6721
parent940d68cc4c349b574166b010666a36cf25f485b7 (diff)
parent835f6a2b51f43c65eb70c6e9e764263786ed9f8e (diff)
downloadgitlab-ce-b6d1d25d43fc562fd3a05ae67da7de01f7d36206.tar.gz
Merge branch 'gitlab-shell-v2.6.6' into 'master'
Bump gitlab-shell to v2.6.6 See merge request !1673
-rw-r--r--GITLAB_SHELL_VERSION2
-rw-r--r--doc/install/installation.md2
2 files changed, 2 insertions, 2 deletions
diff --git a/GITLAB_SHELL_VERSION b/GITLAB_SHELL_VERSION
index 57cf282ebbc..338a5b5d8fe 100644
--- a/GITLAB_SHELL_VERSION
+++ b/GITLAB_SHELL_VERSION
@@ -1 +1 @@
-2.6.5
+2.6.6
diff --git a/doc/install/installation.md b/doc/install/installation.md
index 36d6ec79fde..b48acb655ee 100644
--- a/doc/install/installation.md
+++ b/doc/install/installation.md
@@ -310,7 +310,7 @@ We recommend using a PostgreSQL database. For MySQL check [MySQL setup guide](da
GitLab Shell is an SSH access and repository management software developed specially for GitLab.
# Run the installation task for gitlab-shell (replace `REDIS_URL` if needed):
- sudo -u git -H bundle exec rake gitlab:shell:install[v2.6.5] REDIS_URL=unix:/var/run/redis/redis.sock RAILS_ENV=production
+ sudo -u git -H bundle exec rake gitlab:shell:install[v2.6.6] REDIS_URL=unix:/var/run/redis/redis.sock RAILS_ENV=production
# By default, the gitlab-shell config is generated from your main GitLab config.
# You can review (and modify) the gitlab-shell config as follows: