summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-03-20 13:37:35 +0200
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-03-20 13:37:35 +0200
commite013be10d7185dcdc814c11a65537ecd903e404d (patch)
treedaeb0147f202873ae090ef6b469f302a16cc0f37
parenta74194a550d8f1f118d742ddb913a202ba47afe8 (diff)
downloadgitlab-ce-e013be10d7185dcdc814c11a65537ecd903e404d.tar.gz
GitLab requires gitlab-shell v1.9.0
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
-rw-r--r--CHANGELOG2
-rw-r--r--lib/tasks/gitlab/check.rake2
2 files changed, 3 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 93a31e7377f..a9a8c00666d 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -27,6 +27,8 @@ v 6.7.0
- Markdown relative links in the wiki link to wiki pages, markdown relative links in repositories link to files in the repository
- Added Slack service integration (Federico Ravasio)
- Better API responses for access_levels (sponsored by O'Reilly Media)
+ - Requires at least 2 unicorn workers
+ - Requires gitlab-shell v1.9+
v 6.6.5
- Added option to remove issue assignee on project issue page and issue edit page (Jason Blanchard)
diff --git a/lib/tasks/gitlab/check.rake b/lib/tasks/gitlab/check.rake
index d4d5e48ce3f..067735d66b1 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, 8, 5)
+ required_version = Gitlab::VersionInfo.new(1, 9, 0)
current_version = Gitlab::VersionInfo.parse(gitlab_shell_version)
print "GitLab Shell version >= #{required_version} ? ... "