kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

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
This commit is contained in:
Sato Hiroyuki 2013-06-06 10:10:51 +09:00
parent e7bcbb95c8
commit c18564d2cb
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/gitlab/version_info.rb
View File

@ -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

4
lib/tasks/gitlab/check.rake
View File

@ -659,7 +659,7 @@ namespace :gitlab do
current_version = Gitlab::VersionInfo.parse(gitlab_shell_version)
print "GitLab Shell version >= #{required_version} ? ... "
if required_version <= current_version
if current_version.valid? && required_version <= current_version
puts "OK (#{current_version})".green
else
puts "FAIL. Please update gitlab-shell to #{required_version} from #{current_version}".red
@ -673,7 +673,7 @@ namespace :gitlab do
puts "Your git bin path is \"#{Gitlab.config.git.bin_path}\""
print "Git version >= #{required_version} ? ... "
if required_version <= current_version
if current_version.valid? && required_version <= current_version
puts "yes (#{current_version})".green
else
puts "no".red