diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2012-03-30 00:27:42 +0300 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2012-03-30 00:27:42 +0300 |
| commit | cd74f9da91cb1b798a8654f725b502bac256228d (patch) | |
| tree | 7d8f94a59c60e8a80db40fb618f0a74d35cc137d /app/models/merge_request.rb | |
| parent | 78d620b3b63fdd78b2cd1e4386822f93a701bc42 (diff) | |
| download | gitlab-ce-cd74f9da91cb1b798a8654f725b502bac256228d.tar.gz | |
Link for auto merge, db field for MR
Diffstat (limited to 'app/models/merge_request.rb')
| -rw-r--r-- | app/models/merge_request.rb | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb index edf073d4e88..6d59ce563e1 100644 --- a/app/models/merge_request.rb +++ b/app/models/merge_request.rb @@ -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 |