diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-06-18 10:17:10 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-06-18 10:17:10 +0000 |
| commit | 840e98ba87a53b85689b87ae1d4528d92154d67d (patch) | |
| tree | 2b2fe5e1f9dff11bf02e1928f9875e9f5e0741a9 | |
| parent | 70ed6ef2a6894042c9bbd92f273542bca2a2374f (diff) | |
| parent | 2b6b07f31e203ff3e3d6eb0f05adc93493a3f5ac (diff) | |
| download | gitlab-ce-840e98ba87a53b85689b87ae1d4528d92154d67d.tar.gz | |
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
| -rw-r--r-- | GITLAB_SHELL_VERSION | 2 | ||||
| -rw-r--r-- | doc/install/installation.md | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/GITLAB_SHELL_VERSION b/GITLAB_SHELL_VERSION index 158c7472933..7bc1c40470f 100644 --- a/GITLAB_SHELL_VERSION +++ b/GITLAB_SHELL_VERSION @@ -1 +1 @@ -1.9.5 +1.9.6 diff --git a/doc/install/installation.md b/doc/install/installation.md index 394a22d2186..1b5139e8bb9 100644 --- a/doc/install/installation.md +++ b/doc/install/installation.md @@ -141,12 +141,12 @@ We recommend using a PostgreSQL database. For MySQL check [MySQL setup guide](da ### Clone the Source # Clone GitLab repository - sudo -u git -H git clone https://gitlab.com/gitlab-org/gitlab-ce.git -b 6-9-stable gitlab + sudo -u git -H git clone https://gitlab.com/gitlab-org/gitlab-ce.git -b 7-0-stable gitlab # Go to gitlab dir cd /home/git/gitlab -**Note:** You can change `6-9-stable` to `master` if you want the *bleeding edge* version, but never install master on a production server! +**Note:** You can change `7-0-stable` to `master` if you want the *bleeding edge* version, but never install master on a production server! ### Configure it @@ -238,7 +238,7 @@ GitLab Shell is an ssh access and repository management software developed speci cd /home/git/gitlab # Run the installation task for gitlab-shell (replace `REDIS_URL` if needed): - sudo -u git -H bundle exec rake gitlab:shell:install[v1.9.5] REDIS_URL=redis://localhost:6379 RAILS_ENV=production + sudo -u git -H bundle exec rake gitlab:shell:install[v1.9.6] REDIS_URL=redis://localhost:6379 RAILS_ENV=production # By default, the gitlab-shell config is generated from your main gitlab config. # |