summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJacob Vosmaer <contact@jacobvosmaer.nl>2013-11-02 16:17:09 +0100
committerJacob Vosmaer <contact@jacobvosmaer.nl>2013-11-04 12:52:53 +0100
commitac5d5adeb84077393020806016fcc87f3291ae33 (patch)
tree325dbf5d2d70334ab998ca98a9a6bfe9843877a3
parent6d8b0bbb9639037080b334487dccbe8f209ddd88 (diff)
downloadgitlab-ce-ac5d5adeb84077393020806016fcc87f3291ae33.tar.gz
Bump gitlab-shell to 1.7.4 (CVE-2013-4490)
-rw-r--r--doc/install/installation.md2
-rw-r--r--lib/tasks/gitlab/check.rake2
2 files changed, 2 insertions, 2 deletions
diff --git a/doc/install/installation.md b/doc/install/installation.md
index 2af513ce915..5ef6a2d082a 100644
--- a/doc/install/installation.md
+++ b/doc/install/installation.md
@@ -119,7 +119,7 @@ GitLab Shell is a ssh access and repository management software developed specia
cd gitlab-shell
# switch to right version
- sudo -u git -H git checkout v1.5.0
+ sudo -u git -H git checkout v1.7.4
sudo -u git -H cp config.yml.example config.yml
diff --git a/lib/tasks/gitlab/check.rake b/lib/tasks/gitlab/check.rake
index 3d96eab0149..1dc538ddc83 100644
--- a/lib/tasks/gitlab/check.rake
+++ b/lib/tasks/gitlab/check.rake
@@ -657,7 +657,7 @@ namespace :gitlab do
end
def check_gitlab_shell
- required_version = Gitlab::VersionInfo.new(1, 4, 0)
+ required_version = Gitlab::VersionInfo.new(1, 7, 4)
current_version = Gitlab::VersionInfo.parse(gitlab_shell_version)
print "GitLab Shell version >= #{required_version} ? ... "