summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-03-21 11:44:24 +0000
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-03-21 11:44:24 +0000
commit8ae593304ba1fbb505822a464b2b645e10f5bb2c (patch)
tree697edd6911400fba8c4f2278e3f3572a867de5c4
parentfb919a631c16f0046c5599a9e9e9fa38ff4a699a (diff)
parent895c913247e0444374316ea46dec9304ce1efdf4 (diff)
downloadgitlab-ce-8ae593304ba1fbb505822a464b2b645e10f5bb2c.tar.gz
Merge branch 'update_upgrade_document' into 'master'
Update Upgrade Document for 6.7 Use the latest version of gitlab-shell which is 1.9.0
-rw-r--r--doc/install/installation.md2
-rw-r--r--doc/update/6.6-to-6.7.md2
-rw-r--r--lib/tasks/gitlab/check.rake2
3 files changed, 3 insertions, 3 deletions
diff --git a/doc/install/installation.md b/doc/install/installation.md
index a0eac76ab5b..a37eb733147 100644
--- a/doc/install/installation.md
+++ b/doc/install/installation.md
@@ -128,7 +128,7 @@ GitLab Shell is an ssh access and repository management software developed speci
cd /home/git
# Clone gitlab shell
- sudo -u git -H git clone https://gitlab.com/gitlab-org/gitlab-shell.git -b v1.8.0
+ sudo -u git -H git clone https://gitlab.com/gitlab-org/gitlab-shell.git -b v1.9.1
cd gitlab-shell
diff --git a/doc/update/6.6-to-6.7.md b/doc/update/6.6-to-6.7.md
index e4a0cafa911..8a16e5d67be 100644
--- a/doc/update/6.6-to-6.7.md
+++ b/doc/update/6.6-to-6.7.md
@@ -37,7 +37,7 @@ sudo -u git -H git checkout 6-7-stable-ee
```bash
cd /home/git/gitlab-shell
sudo -u git -H git fetch
-sudo -u git -H git checkout v1.8.0
+sudo -u git -H git checkout v1.9.1
```
### 4. Install libs, migrations, etc.
diff --git a/lib/tasks/gitlab/check.rake b/lib/tasks/gitlab/check.rake
index 067735d66b1..071760c0c36 100644
--- a/lib/tasks/gitlab/check.rake
+++ b/lib/tasks/gitlab/check.rake
@@ -742,7 +742,7 @@ namespace :gitlab do
end
def check_gitlab_shell
- required_version = Gitlab::VersionInfo.new(1, 9, 0)
+ required_version = Gitlab::VersionInfo.new(1, 9, 1)
current_version = Gitlab::VersionInfo.parse(gitlab_shell_version)
print "GitLab Shell version >= #{required_version} ? ... "