#888 prevent to remove source_branch

This commit is contained in:
Zevs 2012-06-05 00:08:41 +03:00
parent 3b41b1839b
commit d6ed9920d6
4 changed files with 9 additions and 4 deletions

View file

@ -189,7 +189,7 @@ class MergeRequest < ActiveRecord::Base
self.merge!(current_user.id)
true
end
rescue
rescue
self.mark_as_unmergable
false
end

View file

@ -114,5 +114,9 @@ module Project::RepositoryTrait
def root_ref
default_branch || "master"
end
def root_ref? branch
root_ref == branch
end
end
end