deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Link for auto merge, db field for MR

Browse source
This commit is contained in:
Dmitriy Zaporozhets 2012-03-30 00:27:42 +03:00
parent 78d620b3b6
commit cd74f9da91
5 changed files with 61 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

9
app/models/merge_request.rb
View file

@ -56,6 +56,10 @@ class MergeRequest < ActiveRecord::Base
self.reloaded_diffs
end
def can_be_merged?
auto_merge
end
def new?
today? && created_at == updated_at
end
@ -118,6 +122,11 @@ class MergeRequest < ActiveRecord::Base
save
end
def mark_as_unmergable
self.auto_merge = false
save
end
def reloaded_commits
if open? && unmerged_commits.any?
self.st_commits = unmerged_commits