diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-10-19 15:57:54 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-10-19 15:57:54 +0300 |
commit | 419c53ec62de6e97a517abd5fdd4cbde3a942a34 (patch) | |
tree | 1f43a548b46bca8a5fb8fe0c31cef1883d49c5b6 /app/services/merge_requests/update_service.rb | |
parent | 1da20d9135b3ad9e75e65b028bffc921aaf8deb7 (diff) |
Add latest changes from gitlab-org/gitlab@16-5-stable-eev16.5.0-rc42
Diffstat (limited to 'app/services/merge_requests/update_service.rb')
-rw-r--r-- | app/services/merge_requests/update_service.rb | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/app/services/merge_requests/update_service.rb b/app/services/merge_requests/update_service.rb index c435048e343..37a829e3014 100644 --- a/app/services/merge_requests/update_service.rb +++ b/app/services/merge_requests/update_service.rb @@ -185,6 +185,7 @@ module MergeRequests # email template itself, see `change_in_merge_request_draft_status_email` template. notify_draft_status_changed(merge_request) trigger_merge_request_status_updated(merge_request) + publish_draft_change_event(merge_request) if Feature.enabled?(:additional_merge_when_checks_ready, project) end if !old_title_draft && new_title_draft @@ -196,6 +197,14 @@ module MergeRequests end end + def publish_draft_change_event(merge_request) + Gitlab::EventStore.publish( + MergeRequests::DraftStateChangeEvent.new( + data: { current_user_id: current_user.id, merge_request_id: merge_request.id } + ) + ) + end + def notify_draft_status_changed(merge_request) notification_service.async.change_in_merge_request_draft_status( merge_request, |