diff options
| author | Kamil Trzciński <ayufan@ayufan.eu> | 2019-06-11 08:16:54 +0000 |
|---|---|---|
| committer | Kamil Trzciński <ayufan@ayufan.eu> | 2019-06-11 08:16:54 +0000 |
| commit | 338c7b31baba174971cead6843c847aabad2c1b2 (patch) | |
| tree | f87eadaa7ea749d2c605ec6139ca99c058d895d4 /app | |
| parent | 641d332351907b77b53b0cb23ff51ccea2489824 (diff) | |
| parent | 8f243acf02451c5c2c86cbcb99012180b8b18875 (diff) | |
| download | gitlab-ce-338c7b31baba174971cead6843c847aabad2c1b2.tar.gz | |
Merge branch 'process-when-auto-merge-is-enabled' into 'master'
Notify events when auto merge is enabled or merge param is updated
See merge request gitlab-org/gitlab-ce!29415
Diffstat (limited to 'app')
| -rw-r--r-- | app/services/auto_merge/base_service.rb | 3 |
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 |