diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-07-20 12:55:51 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-07-20 12:55:51 +0300 |
| commit | e8d2c2579383897a1dd7f9debd359abe8ae8373d (patch) | |
| tree | c42be41678c2586d49a75cabce89322082698334 /app/services/alert_management | |
| parent | fc845b37ec3a90aaa719975f607740c22ba6a113 (diff) | |
Add latest changes from gitlab-org/gitlab@14-1-stable-eev14.1.0-rc42
Diffstat (limited to 'app/services/alert_management')
| -rw-r--r-- | app/services/alert_management/alerts/update_service.rb | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/app/services/alert_management/alerts/update_service.rb b/app/services/alert_management/alerts/update_service.rb index 464d5f2ecea..089715a42fb 100644 --- a/app/services/alert_management/alerts/update_service.rb +++ b/app/services/alert_management/alerts/update_service.rb @@ -37,7 +37,6 @@ module AlertManagement private attr_reader :alert, :current_user, :params, :param_errors, :status - delegate :resolved?, to: :alert def allowed? current_user&.can?(:update_alert_management_alert, alert) @@ -129,7 +128,7 @@ module AlertManagement def handle_status_change add_status_change_system_note - resolve_todos if resolved? + resolve_todos if alert.resolved? end def add_status_change_system_note @@ -177,3 +176,5 @@ module AlertManagement end end end + +AlertManagement::Alerts::UpdateService.prepend_mod |