summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Speicher <robert@gitlab.com>2015-12-01 17:55:30 +0000
committerRobert Speicher <robert@gitlab.com>2015-12-01 17:55:30 +0000
commit1ad8b73121c93570bde08ce6fa58b5e50f771603 (patch)
tree06a89b59e3d10f47b1d33b2a40ae4e0e2f37621e
parente6149a7ee672b29c676c857fc48a4033e3249ebc (diff)
parent55d0e04ffd3f178f41ae3ef13790eb6882b1ef8e (diff)
downloadgitlab-ce-1ad8b73121c93570bde08ce6fa58b5e50f771603.tar.gz
Merge branch 'install-guide-gitlab-shell-version' into 'master'
Install gitlab-shell 2.6.8 in installations from source [ci skip] See merge request !1932
-rw-r--r--doc/install/installation.md2
-rw-r--r--doc/update/8.1-to-8.2.md2
2 files changed, 2 insertions, 2 deletions
diff --git a/doc/install/installation.md b/doc/install/installation.md
index 3f5c03a890a..618391e16d2 100644
--- a/doc/install/installation.md
+++ b/doc/install/installation.md
@@ -312,7 +312,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.7] REDIS_URL=unix:/var/run/redis/redis.sock RAILS_ENV=production
+ sudo -u git -H bundle exec rake gitlab:shell:install 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:
diff --git a/doc/update/8.1-to-8.2.md b/doc/update/8.1-to-8.2.md
index b57e999cfb7..7b228d6a22f 100644
--- a/doc/update/8.1-to-8.2.md
+++ b/doc/update/8.1-to-8.2.md
@@ -68,7 +68,7 @@ sudo -u git -H git checkout 8-2-stable-ee
```bash
cd /home/git/gitlab-shell
sudo -u git -H git fetch
-sudo -u git -H git checkout v2.6.7
+sudo -u git -H git checkout v2.6.8
```
### 5. Replace gitlab-git-http-server with gitlab-workhorse