Merge branch 'fix/rake_satellites_create' into 'master'

Fix popen bug in `rake gitlab:satellites:create`

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