Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2013-01-17 14:07:01 +0400
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2013-01-17 14:07:01 +0400
commitb53ca0bcfea0cf9d82084ad9debbc65512103ddd (patch)
treec3314b4970f8df99e163e1b1f2c167d7655aa5fd /lib
parent7e40684b476f89db69cce22a9170375456716f30 (diff)
Fix branch remove on automerge
Diffstat (limited to 'lib')
-rw-r--r--lib/gitlab/satellite/merge_action.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/gitlab/satellite/merge_action.rb b/lib/gitlab/satellite/merge_action.rb
index 556a1e2d52f..832db6621c4 100644
--- 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