Fix branch remove on automerge

b53ca0bc · Dmitriy Zaporozhets · 7e40684b · b53ca0bc
Commit b53ca0bc authored Jan 17, 2013 by Dmitriy Zaporozhets
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

lib/gitlab/satellite/merge_action.rb lib/gitlab/satellite/merge_action.rb +1 -1

No files found.
--- a/lib/gitlab/satellite/merge_action.rb
+++ b/lib/gitlab/satellite/merge_action.rb
@@ -31,7 +31,7 @@ module Gitlab
            merge_repo.git.push({raise: true, timeout: true}, :origin, merge_request.target_branch)
            # remove source branch
-            if merge_request.should_remove_source_branch && !project.repository.root_ref?(merge_request.source_branch)
+            if merge_request.should_remove_source_branch && !project.root_ref?(merge_request.source_branch)
              # will raise CommandFailed when push fails
              merge_repo.git.push({raise: true, timeout: true}, :origin, ":#{merge_request.source_branch}")
            end