Commit 840e98ba87a53b85689b87ae1d4528d92154d67d

Authored by Dmitriy Zaporozhets
2 parents 70ed6ef2 2b6b07f3

Merge branch 'update-guide-7-0' into 'master'

Installation guide for 7.0

* Changed branch to 7-0-stable
* Bump gitlab-shell version to 1.9.6
GITLAB_SHELL_VERSION
1 -1.9.5 1 +1.9.6
doc/install/installation.md
@@ -141,12 +141,12 @@ We recommend using a PostgreSQL database. For MySQL check [MySQL setup guide](da @@ -141,12 +141,12 @@ We recommend using a PostgreSQL database. For MySQL check [MySQL setup guide](da
141 ### Clone the Source 141 ### Clone the Source
142 142
143 # Clone GitLab repository 143 # Clone GitLab repository
144 - sudo -u git -H git clone https://gitlab.com/gitlab-org/gitlab-ce.git -b 6-9-stable gitlab 144 + sudo -u git -H git clone https://gitlab.com/gitlab-org/gitlab-ce.git -b 7-0-stable gitlab
145 145
146 # Go to gitlab dir 146 # Go to gitlab dir
147 cd /home/git/gitlab 147 cd /home/git/gitlab
148 148
149 -**Note:** You can change `6-9-stable` to `master` if you want the *bleeding edge* version, but never install master on a production server! 149 +**Note:** You can change `7-0-stable` to `master` if you want the *bleeding edge* version, but never install master on a production server!
150 150
151 ### Configure it 151 ### Configure it
152 152
@@ -238,7 +238,7 @@ GitLab Shell is an ssh access and repository management software developed speci @@ -238,7 +238,7 @@ GitLab Shell is an ssh access and repository management software developed speci
238 cd /home/git/gitlab 238 cd /home/git/gitlab
239 239
240 # Run the installation task for gitlab-shell (replace `REDIS_URL` if needed): 240 # Run the installation task for gitlab-shell (replace `REDIS_URL` if needed):
241 - sudo -u git -H bundle exec rake gitlab:shell:install[v1.9.5] REDIS_URL=redis://localhost:6379 RAILS_ENV=production 241 + sudo -u git -H bundle exec rake gitlab:shell:install[v1.9.6] REDIS_URL=redis://localhost:6379 RAILS_ENV=production
242 242
243 # By default, the gitlab-shell config is generated from your main gitlab config. 243 # By default, the gitlab-shell config is generated from your main gitlab config.
244 # 244 #