diff options
| author | Valery Sizov <valery@gitlab.com> | 2015-07-23 11:31:29 +0000 |
|---|---|---|
| committer | Valery Sizov <valery@gitlab.com> | 2015-07-23 11:31:29 +0000 |
| commit | 5dd4dea93baa6386ed860a50125dce3ca3890f16 (patch) | |
| tree | a4380d4df828ab46baec0726f8c5ab5a57712028 /app/models/merge_request.rb | |
| parent | 8a539e58c8f56881094edd435170147d99e1e438 (diff) | |
| parent | 0484ae7e6a7f0e6301089cdf7ce3e8a17e9079b8 (diff) | |
| download | gitlab-ce-5dd4dea93baa6386ed860a50125dce3ca3890f16.tar.gz | |
Merge branch 'remove-source-branch' into 'master'
Fix bug causing "Remove source-branch" option not to work for merge requests from the same project.
Fixes #2049.
See merge request !1025
Diffstat (limited to 'app/models/merge_request.rb')
| -rw-r--r-- | app/models/merge_request.rb | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb index 53b3fc10ccb..1ef76d16700 100644 --- a/app/models/merge_request.rb +++ b/app/models/merge_request.rb @@ -235,6 +235,10 @@ class MergeRequest < ActiveRecord::Base execute(self, commit_message) end + def remove_source_branch? + self.should_remove_source_branch && !self.source_project.root_ref?(self.source_branch) && !self.for_fork? + end + def open? opened? || reopened? end |