Download as
Browse Code »

Commit ab7b8b2125889f0f3ba03e65d1ce26088e30631e

Authored by Dmitriy Zaporozhets
2 parents bfd44948 bcfd9386
Exists in spb-stable and in 3 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb

Merge branch 'fix/rake_satellites_create' into 'master' 

Fix popen bug in `rake gitlab:satellites:create`
Showing 2 changed files with 3 additions and 5 deletions   Show diff stats
@@ -8,6 +8,7 @@ v 6.8.0 @@ -8,6 +8,7 @@ v 6.8.0
8 - Create branches via API (sponsored by O'Reilly Media) 8 - Create branches via API (sponsored by O'Reilly Media)
9 - Changed permission of gitlab-satellites directory not to be world accessible 9 - Changed permission of gitlab-satellites directory not to be world accessible
10 - Protected branch does not allow force push 10 - Protected branch does not allow force push
  11 + - Fix popen bug in `rake gitlab:satellites:create`
11 12
12 v 6.7.3 13 v 6.7.3
13 - Fix the merge notification email not being sent (Pierre de La Morinerie) 14 - Fix the merge notification email not being sent (Pierre de La Morinerie)
lib/tasks/gitlab/enable_automerge.rake
  Diff comments   View file @ab7b8b2
@@ -27,11 +27,8 @@ namespace :gitlab do @@ -27,11 +27,8 @@ namespace :gitlab do
27 if project.satellite.exists? 27 if project.satellite.exists?
28 puts "exists already".green 28 puts "exists already".green
29 else 29 else
30 - puts ""  
31 - project.satellite.create  
32 -  
33 - print "... "  
34 - if $?.success? 30 + print "\n... "
  31 + if project.satellite.create
35 puts "created".green 32 puts "created".green
36 else 33 else
37 puts "error".red 34 puts "error".red