diff options
| author | Jeroen van Baarsen <jeroenvanbaarsen@gmail.com> | 2015-04-25 19:09:52 +0200 |
|---|---|---|
| committer | Jeroen van Baarsen <jeroenvanbaarsen@gmail.com> | 2015-04-25 19:09:52 +0200 |
| commit | 5cb325b50188fb2ba6483e710a29350c4b0b06ae (patch) | |
| tree | ebb9c0bf44d33676d6327b775b457bc98f59d9a4 | |
| parent | aef6123d32c7e4b161fc5cedd5f150edd39a3ac4 (diff) | |
| parent | 2e34b7aab5ad91bdcfde80486e8b4bcc17cb2241 (diff) | |
| download | gitlab-ce-5cb325b50188fb2ba6483e710a29350c4b0b06ae.tar.gz | |
Merge pull request #9196 from tonicbupt/fix
fix redis 3.0.0
| -rw-r--r-- | lib/tasks/gitlab/check.rake | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/tasks/gitlab/check.rake b/lib/tasks/gitlab/check.rake index 04a2eb12db0..1a6303b6c82 100644 --- a/lib/tasks/gitlab/check.rake +++ b/lib/tasks/gitlab/check.rake @@ -282,7 +282,8 @@ namespace :gitlab do def check_redis_version print "Redis version >= 2.0.0? ... " - if run_and_match(%W(redis-cli --version), /redis-cli 2.\d.\d/) + redis_version = run(%W(redis-cli --version)) + if redis_version.try(:match, /redis-cli 2.\d.\d/) || redis_version.try(:match, /redis-cli 3.\d.\d/) puts "yes".green else puts "no".red |