summaryrefslogtreecommitdiff
path: root/app/services/auto_merge
diff options
context:
space:
mode:
authorShinya Maeda <shinya@gitlab.com>2019-06-10 18:03:32 +0700
committerShinya Maeda <shinya@gitlab.com>2019-06-10 18:03:32 +0700
commit8f243acf02451c5c2c86cbcb99012180b8b18875 (patch)
treef4b1ae2385a9d1ba707cd6ec49b94c750159511c /app/services/auto_merge
parenta0af34582cf0f3c5d901dfe9c78d9ef05c900d7f (diff)
downloadgitlab-ce-8f243acf02451c5c2c86cbcb99012180b8b18875.tar.gz
Notify when auto merge is enabledprocess-when-auto-merge-is-enabled
There are bunch of auto merge related notifications, and when auto merge is enabled, it should be evaluated immediately.
Diffstat (limited to 'app/services/auto_merge')
-rw-r--r--app/services/auto_merge/base_service.rb3
1 files changed, 3 insertions, 0 deletions
diff --git a/app/services/auto_merge/base_service.rb b/app/services/auto_merge/base_service.rb
index 058105db3a4..7f0a41b3dfa 100644
--- a/app/services/auto_merge/base_service.rb
+++ b/app/services/auto_merge/base_service.rb
@@ -14,6 +14,9 @@ module AutoMerge
yield if block_given?
+ # Notify the event that auto merge is enabled or merge param is updated
+ AutoMergeProcessWorker.perform_async(merge_request.id)
+
strategy.to_sym
end