diff options
| author | Douwe Maan <douwe@gitlab.com> | 2015-07-22 14:07:41 +0200 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2015-07-22 14:07:41 +0200 |
| commit | 276ca427ea8c30b20881f466bb9137596174cdb4 (patch) | |
| tree | 1a44ff9c77c4bbc74ff851235672f58692b0768a /app/models/merge_request.rb | |
| parent | 95d89e442a83eaf5456c2a34362579dd889e0f71 (diff) | |
| download | gitlab-ce-276ca427ea8c30b20881f466bb9137596174cdb4.tar.gz | |
Fix Remove source-branch for MRs from same project
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 |