summaryrefslogtreecommitdiff
path: root/lib/gitlab/version_info.rb
diff options
context:
space:
mode:
authorSato Hiroyuki <sathiroyuki@gmail.com>2013-06-06 10:10:51 +0900
committerSato Hiroyuki <sathiroyuki@gmail.com>2013-06-06 10:10:51 +0900
commitc18564d2cbbffa5d15d2ead97ba0fc4623f77e07 (patch)
tree8edc5d27f1c5e3cd28809e9c658b1bf3960bdecf /lib/gitlab/version_info.rb
parente7bcbb95c88a42fc31bc0ccbdf6a819780a612ec (diff)
downloadgitlab-ce-c18564d2cbbffa5d15d2ead97ba0fc4623f77e07.tar.gz
Fix abort gitlab:app:check
When the file that pointed git bin_path in gitlab.yml dose'nt exist, bundle rake gitlab:app:check would be aborted. refs #4205
Diffstat (limited to 'lib/gitlab/version_info.rb')
-rw-r--r--lib/gitlab/version_info.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/gitlab/version_info.rb b/lib/gitlab/version_info.rb
index 31b72720972..6ee41e85cc9 100644
--- a/lib/gitlab/version_info.rb
+++ b/lib/gitlab/version_info.rb
@@ -5,7 +5,7 @@ module Gitlab
attr_reader :major, :minor, :patch
def self.parse(str)
- if m = str.match(/(\d+)\.(\d+)\.(\d+)/)
+ if str && m = str.match(/(\d+)\.(\d+)\.(\d+)/)
VersionInfo.new(m[1].to_i, m[2].to_i, m[3].to_i)
else
VersionInfo.new