summaryrefslogtreecommitdiff
path: root/app/models
diff options
context:
space:
mode:
authorlulalala <mark@goodlife.tw>2018-05-09 17:55:00 +0800
committerMark Chao <mchao@gitlab.com>2018-05-17 08:54:57 +0800
commit953bb41f25270c07ab12c17472ef0fe8ab848301 (patch)
tree01d61d39572a06737d5bf70b8f4fc2f651d9ae6c /app/models
parentdc174e9655267e89e1b7c63f8c9f4dac069069c7 (diff)
downloadgitlab-ce-953bb41f25270c07ab12c17472ef0fe8ab848301.tar.gz
Create TODO when MR became unmergeable
Old behavior of creating TODO when “Merge When Pipeline Succeeds” service fails, is generalized to: Create a TODO whenever MR became unmergeable (and similar to notification, MR author and merge_user are both applicable)
Diffstat (limited to 'app/models')
-rw-r--r--app/models/merge_request.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb
index 99687d305e7..a0ad7f3c609 100644
--- a/app/models/merge_request.rb
+++ b/app/models/merge_request.rb
@@ -127,6 +127,7 @@ class MergeRequest < ActiveRecord::Base
after_transition unchecked: :cannot_be_merged do |merge_request, transition|
NotificationService.new.merge_request_unmergeable(merge_request)
+ TodoService.new.merge_request_became_unmergeable(merge_request)
end
def check_state?(merge_status)