diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-04-07 19:11:02 +0300 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-04-07 19:11:02 +0300 |
| commit | d92e4830f78018b3a38bc448aaec4a045f4d3d62 (patch) | |
| tree | d9081e425450a3325d6925aed235af3dac0e9a19 /app/models/merge_request.rb | |
| parent | d70939f6806ed388444309def47c170fa02c5591 (diff) | |
| download | gitlab-ce-d92e4830f78018b3a38bc448aaec4a045f4d3d62.tar.gz | |
Allow people to remove source branch of fork project in MR
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
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 0decc7782ee..1ec76dbd39a 100644 --- a/app/models/merge_request.rb +++ b/app/models/merge_request.rb @@ -210,7 +210,7 @@ class MergeRequest < ActiveRecord::Base end def disallow_source_branch_removal? - (source_project.root_ref? source_branch) || for_fork? + source_project.root_ref?(source_branch) || source_project.protected_branches.include?(source_branch) end def project |