summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Speicher <robert@gitlab.com>2015-11-19 15:09:28 +0000
committerRobert Speicher <rspeicher@gmail.com>2015-11-19 10:10:00 -0500
commit9535d91e8db07cb32f408a62dcc169ba302566f4 (patch)
tree93d686683441120e2e93d0b9cf7931857ecba6ab
parent506e0be36bcef746c3f2e469a5e1046380ca7d76 (diff)
downloadgitlab-ce-9535d91e8db07cb32f408a62dcc169ba302566f4.tar.gz
Merge branch 'update-gitlab-shell-doc' into 'master'
Update gitlab-shell documentation to 2.6.7 See merge request !1836
-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 7ef46b04065..52ae30af805 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.6] REDIS_URL=unix:/var/run/redis/redis.sock RAILS_ENV=production
+ sudo -u git -H bundle exec rake gitlab:shell:install[v2.6.7] 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 73d899f9c2e..261031442ac 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.6
+sudo -u git -H git checkout v2.6.7
```
### 5. Replace gitlab-git-http-server with gitlab-workhorse