diff options
Diffstat (limited to 'app/models')
| -rw-r--r-- | app/models/merge_request.rb | 2 | ||||
| -rw-r--r-- | app/models/project/repository_trait.rb | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb index fed761a6d5b..2aba24bc46f 100644 --- a/app/models/merge_request.rb +++ b/app/models/merge_request.rb @@ -189,7 +189,7 @@ class MergeRequest < ActiveRecord::Base self.merge!(current_user.id) true end - rescue + rescue self.mark_as_unmergable false end diff --git a/app/models/project/repository_trait.rb b/app/models/project/repository_trait.rb index a759ead569c..2b9cf437bbc 100644 --- a/app/models/project/repository_trait.rb +++ b/app/models/project/repository_trait.rb @@ -114,5 +114,9 @@ module Project::RepositoryTrait def root_ref default_branch || "master" end + + def root_ref? branch + root_ref == branch + end end end |