Prepared for gitolite v3

2012-08-29 02:03:04 +03:00 · 2012-08-29 02:03:04 +03:00 · ad3a88cfd3
commit ad3a88cfd3
parent 1f5e2658f5
5 changed files with 15 additions and 11 deletions
--- a/lib/gitlab/merge.rb
+++ b/lib/gitlab/merge.rb
@ -21,8 +21,7 @@ module Gitlab
        if output =~ /CONFLICT/
          false  
        else 
-          repo.git.push({}, "origin", merge_request.target_branch)
-          true
+          !!repo.git.push({}, "origin", merge_request.target_branch)
        end
      end
    end