diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2017-01-19 14:05:38 +0300 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2017-01-19 14:05:38 +0300 |
| commit | d3f26be6f08cd0656589306eb06991b93d1c5825 (patch) | |
| tree | d00b4dbcaacfe281f6493b03b5e8f17d28c7de24 /app/models/merge_request.rb | |
| parent | 2a0d6342912472b7ab9fa0036bd764841b388e7d (diff) | |
| parent | 85e0b99471b58078e1e50494ae26eb13430d3a9f (diff) | |
Merge branch '23524-notify-automerge-user-of-failed-build' into 'master'
Notify the user who set auto-merge when merge is not possible
Closes #23524
See merge request !8056
Diffstat (limited to 'app/models/merge_request.rb')
| -rw-r--r-- | app/models/merge_request.rb | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb index 10251302db8..cd5b345bae5 100644 --- a/app/models/merge_request.rb +++ b/app/models/merge_request.rb @@ -91,6 +91,10 @@ class MergeRequest < ActiveRecord::Base around_transition do |merge_request, transition, block| Gitlab::Timeless.timeless(merge_request, &block) end + + after_transition unchecked: :cannot_be_merged do |merge_request, transition| + TodoService.new.merge_request_became_unmergeable(merge_request) + end end validates :source_project, presence: true, unless: [:allow_broken, :importing?, :closed_without_fork?] |