diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-01-18 22:00:14 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-01-18 22:00:14 +0300 |
commit | 05f0ebba3a2c8ddf39e436f412dc2ab5bf1353b2 (patch) | |
tree | 11d0f2a6ec31c7793c184106cedc2ded3d9a2cc5 /app/services/issues/base_service.rb | |
parent | ec73467c23693d0db63a797d10194da9e72a74af (diff) |
Add latest changes from gitlab-org/gitlab@15-8-stable-eev15.8.0-rc42
Diffstat (limited to 'app/services/issues/base_service.rb')
-rw-r--r-- | app/services/issues/base_service.rb | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/app/services/issues/base_service.rb b/app/services/issues/base_service.rb index 10407e99715..553fb6e2ac9 100644 --- a/app/services/issues/base_service.rb +++ b/app/services/issues/base_service.rb @@ -97,6 +97,16 @@ module Issues hooks_scope = issue.confidential? ? :confidential_issue_hooks : :issue_hooks issue.project.execute_hooks(issue_data, hooks_scope) issue.project.execute_integrations(issue_data, hooks_scope) + + execute_incident_hooks(issue, issue_data) if issue.incident? + end + + # We can remove this code after proposal in + # https://gitlab.com/gitlab-org/gitlab/-/issues/367550#proposal is updated. + def execute_incident_hooks(issue, issue_data) + issue_data[:object_kind] = 'incident' + issue_data[:event_type] = 'incident' + issue.project.execute_integrations(issue_data, :incident_hooks) end def update_project_counter_caches?(issue) @@ -117,7 +127,7 @@ module Issues override :allowed_create_params def allowed_create_params(params) - super(params).except(:issue_type, :work_item_type_id, :work_item_type) + super(params).except(:work_item_type_id, :work_item_type) end end end |