Download as
Browse Code »

Commit b53ca0bcfea0cf9d82084ad9debbc65512103ddd

Authored by Dmitriy Zaporozhets
1 parent 7e40684b
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

Fix branch remove on automerge

Showing 1 changed file with 1 additions and 1 deletions   Show diff stats
lib/gitlab/satellite/merge_action.rb
  Diff comments   View file @b53ca0b
... ... @@ -31,7 +31,7 @@ module Gitlab
31 31 merge_repo.git.push({raise: true, timeout: true}, :origin, merge_request.target_branch)
32 32  
33 33 # remove source branch
34   - if merge_request.should_remove_source_branch && !project.repository.root_ref?(merge_request.source_branch)
  34 + if merge_request.should_remove_source_branch && !project.root_ref?(merge_request.source_branch)
35 35 # will raise CommandFailed when push fails
36 36 merge_repo.git.push({raise: true, timeout: true}, :origin, ":#{merge_request.source_branch}")
37 37 end
... ...