diff options
| author | Luke "Jared" Bennett <lbennett@gitlab.com> | 2017-04-07 21:00:40 +0100 |
|---|---|---|
| committer | Luke "Jared" Bennett <lbennett@gitlab.com> | 2017-04-07 21:00:40 +0100 |
| commit | 8b98ca50b3068fecc76233714fa7d363703ee55c (patch) | |
| tree | 97d67331552de76faa9bfb8cec11616a369351fe /app/models/merge_request.rb | |
| parent | 501d403202d8b4f603dd1864790f56e85633b8ef (diff) | |
| parent | d37f1f1cd013a8b7a307e1004e020df086cba9d5 (diff) | |
| download | gitlab-ce-8b98ca50b3068fecc76233714fa7d363703ee55c.tar.gz | |
Merge branch 'master' into new-resolvable-discussion
Diffstat (limited to 'app/models/merge_request.rb')
| -rw-r--r-- | app/models/merge_request.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb index 77c902fdf09..b71a9e17a93 100644 --- a/app/models/merge_request.rb +++ b/app/models/merge_request.rb @@ -443,7 +443,7 @@ class MergeRequest < ActiveRecord::Base end def can_remove_source_branch?(current_user) - !source_project.protected_branch?(source_branch) && + !ProtectedBranch.protected?(source_project, source_branch) && !source_project.root_ref?(source_branch) && Ability.allowed?(current_user, :push_code, source_project) && diff_head_commit == source_branch_head |