diff options
author | Kamil Trzciński <ayufan@ayufan.eu> | 2017-02-28 10:45:39 +0000 |
---|---|---|
committer | Kamil Trzciński <ayufan@ayufan.eu> | 2017-02-28 10:45:39 +0000 |
commit | cd92c84b5617970ee4b143687120668c6efa4a72 (patch) | |
tree | 6530275060c588cc67ee39280d12be510a688f39 /app | |
parent | 7733f285aca97d444382a59eda0ea3e303539c26 (diff) | |
parent | 2da8bc3de9f8b63bd80a081c7e2880adee3edb71 (diff) | |
download | gitlab-ce-cd92c84b5617970ee4b143687120668c6efa4a72.tar.gz |
Merge branch 'only-create-unmergeable-todo-once' into 'master'
Only create unmergeable todos once
Closes #28555
See merge request !9513
Diffstat (limited to 'app')
-rw-r--r-- | app/models/merge_request.rb | 4 | ||||
-rw-r--r-- | app/services/merge_requests/merge_when_pipeline_succeeds_service.rb | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb index 7eb875f1ef5..d6e7ed87555 100644 --- a/app/models/merge_request.rb +++ b/app/models/merge_request.rb @@ -91,10 +91,6 @@ 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?] diff --git a/app/services/merge_requests/merge_when_pipeline_succeeds_service.rb b/app/services/merge_requests/merge_when_pipeline_succeeds_service.rb index 5616edf8b4a..5081dd5a0c4 100644 --- a/app/services/merge_requests/merge_when_pipeline_succeeds_service.rb +++ b/app/services/merge_requests/merge_when_pipeline_succeeds_service.rb @@ -24,7 +24,11 @@ module MergeRequests pipeline_merge_requests(pipeline) do |merge_request| next unless merge_request.merge_when_build_succeeds? - next unless merge_request.mergeable? + + unless merge_request.mergeable? + todo_service.merge_request_became_unmergeable(merge_request) + next + end MergeWorker.perform_async(merge_request.id, merge_request.merge_user_id, merge_request.merge_params) end |