summaryrefslogtreecommitdiff
path: root/lib/gitlab/upgrader.rb
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2018-02-01 15:26:59 +0000
committerPhil Hughes <me@iamphill.com>2018-02-01 15:26:59 +0000
commit135a02cf4232dd948fad4116c744279328888049 (patch)
treecba978e07c0e62b008d1a897fa3d21dc7277f544 /lib/gitlab/upgrader.rb
parentb1c8b3aadb202898a1e9342706e9e6f46bbb3612 (diff)
parent5b73e0eb35f5b9b78c228a4867ef78538ef05653 (diff)
downloadgitlab-ce-135a02cf4232dd948fad4116c744279328888049.tar.gz
Merge branch 'master' into ph-axios-2
Diffstat (limited to 'lib/gitlab/upgrader.rb')
-rw-r--r--lib/gitlab/upgrader.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/gitlab/upgrader.rb b/lib/gitlab/upgrader.rb
index d545f2f95f1..024be6aca44 100644
--- a/lib/gitlab/upgrader.rb
+++ b/lib/gitlab/upgrader.rb
@@ -49,7 +49,7 @@ module Gitlab
def fetch_git_tags
remote_tags, _ = Gitlab::Popen.popen(%W(#{Gitlab.config.git.bin_path} ls-remote --tags https://gitlab.com/gitlab-org/gitlab-ce.git))
- remote_tags.split("\n").grep(/tags\/v#{current_version.major}/)
+ remote_tags.split("\n").grep(%r{tags/v#{current_version.major}})
end
def update_commands