diff options
| author | Jacob Vosmaer <contact@jacobvosmaer.nl> | 2014-03-14 15:57:52 +0100 |
|---|---|---|
| committer | Jacob Vosmaer <contact@jacobvosmaer.nl> | 2014-03-14 15:58:47 +0100 |
| commit | 090ed21e6f53ade25716fb0b406f25b93b6a7690 (patch) | |
| tree | d647ea3cbedfb7693c547e09ff62360d0cea403b | |
| parent | 779fa4a7b7f2eef7910509df1787412844a3b3b8 (diff) | |
| download | gitlab-ce-090ed21e6f53ade25716fb0b406f25b93b6a7690.tar.gz | |
Batch key import requires gitlab-shell 1.8.5
| -rw-r--r-- | CHANGELOG | 2 | ||||
| -rw-r--r-- | lib/tasks/gitlab/check.rake | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/CHANGELOG b/CHANGELOG index 8fd88bf1542..785a4bb6713 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -21,7 +21,7 @@ v 6.7.0 - Reuse the GitLab LDAP connection within each request - Changed markdown new line behaviour to conform to markdown standards - Fix global search - - Faster authorized_keys rebuilding in `rake gitlab:shell:setup` (requires gitlab-shell 1.8.4) + - Faster authorized_keys rebuilding in `rake gitlab:shell:setup` (requires gitlab-shell 1.8.5) v 6.6.2 - Fix 500 error on branch/tag create or remove via UI diff --git a/lib/tasks/gitlab/check.rake b/lib/tasks/gitlab/check.rake index 2b158fe14ee..c2e6cd1be78 100644 --- a/lib/tasks/gitlab/check.rake +++ b/lib/tasks/gitlab/check.rake @@ -727,7 +727,7 @@ namespace :gitlab do end def check_gitlab_shell - required_version = Gitlab::VersionInfo.new(1, 8, 4) + required_version = Gitlab::VersionInfo.new(1, 8, 5) current_version = Gitlab::VersionInfo.parse(gitlab_shell_version) print "GitLab Shell version >= #{required_version} ? ... " |