diff options
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | lib/tasks/gitlab/enable_automerge.rake | 7 |
2 files changed, 3 insertions, 5 deletions
diff --git a/CHANGELOG b/CHANGELOG index 59e3e22524b..d0613c301ea 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -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) diff --git a/lib/tasks/gitlab/enable_automerge.rake b/lib/tasks/gitlab/enable_automerge.rake index 6822e5cf1ad..aa9869daf2f 100644 --- a/lib/tasks/gitlab/enable_automerge.rake +++ b/lib/tasks/gitlab/enable_automerge.rake @@ -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 |