Skip to content
Snippets Groups Projects

5 2 stable

Closed gitlab-qa-bot requested to merge 5-2-stable into master
1 file
+ 1
1
Compare changes
  • Side-by-side
  • Inline
@@ -144,7 +144,7 @@ namespace :gitlab do
@@ -144,7 +144,7 @@ namespace :gitlab do
return
return
end
end
recipe_content = `curl https://raw.github.com/gitlabhq/gitlab-recipes/master/init.d/gitlab 2>/dev/null`
recipe_content = `curl https://raw.github.com/gitlabhq/gitlabhq/5-2-stable/lib/support/init.d/gitlab 2>/dev/null`
script_content = File.read(script_path)
script_content = File.read(script_path)
if recipe_content == script_content
if recipe_content == script_content
@@ -588,7 +588,7 @@ namespace :gitlab do
@@ -588,7 +588,7 @@ namespace :gitlab do
def check_sidekiq_running
def check_sidekiq_running
print "Running? ... "
print "Running? ... "
if run_and_match("ps aux | grep -i sidekiq", /sidekiq \d\.\d\.\d.+$/)
if run_and_match("ps aux | grep -i sidekiq", /sidekiq \d+\.\d+\.\d+.+$/)
puts "yes".green
puts "yes".green
else
else
puts "no".red
puts "no".red
Loading