diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-09-07 18:08:44 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-09-07 18:08:44 +0300 |
| commit | 06c9acad67a086a66f1d63aa1b79fc77a19cc646 (patch) | |
| tree | b2c642197d4a9e549417dadfb050d2645ec7ffa7 /app/services/merge_requests | |
| parent | 01f48ebf027baee9f845cecbf094e91a98c9a324 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/services/merge_requests')
| -rw-r--r-- | app/services/merge_requests/base_service.rb | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/app/services/merge_requests/base_service.rb b/app/services/merge_requests/base_service.rb index 8a2ed4d08e6..f36cad7139a 100644 --- a/app/services/merge_requests/base_service.rb +++ b/app/services/merge_requests/base_service.rb @@ -36,10 +36,7 @@ module MergeRequests merge_request.project.execute_integrations(merge_data, :merge_request_hooks) execute_external_hooks(merge_request, merge_data) - - if action == 'open' && Feature.enabled?(:group_mentions, merge_request.project) - execute_group_mention_hooks(merge_request, merge_data) - end + execute_group_mention_hooks(merge_request, merge_data) if action == 'open' enqueue_jira_connect_messages_for(merge_request) end |