From ded741a9395b5eb2baab52c3df961d730682bdd5 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Sat, 6 Feb 2021 21:09:10 +0000 Subject: [PATCH] Add latest changes from gitlab-org/gitlab@master --- app/helpers/projects/alert_management_helper.rb | 4 ++-- changelogs/unreleased/sy-update-alerts-docs-urls.yml | 5 +++++ spec/helpers/projects/alert_management_helper_spec.rb | 4 ++-- 3 files changed, 9 insertions(+), 4 deletions(-) create mode 100644 changelogs/unreleased/sy-update-alerts-docs-urls.yml diff --git a/app/helpers/projects/alert_management_helper.rb b/app/helpers/projects/alert_management_helper.rb index 58f1abb2818..5fad38bd32c 100644 --- a/app/helpers/projects/alert_management_helper.rb +++ b/app/helpers/projects/alert_management_helper.rb @@ -5,8 +5,8 @@ module Projects::AlertManagementHelper { 'project-path' => project.full_path, 'enable-alert-management-path' => project_settings_operations_path(project, anchor: 'js-alert-management-settings'), - 'alerts-help-url' => help_page_url('operations/incident_management/index.md'), - 'populating-alerts-help-url' => help_page_url('operations/incident_management/index.md', anchor: 'enable-alert-management'), + 'alerts-help-url' => help_page_url('operations/incident_management/alerts.md'), + 'populating-alerts-help-url' => help_page_url('operations/incident_management/integrations.md', anchor: 'configuration'), 'empty-alert-svg-path' => image_path('illustrations/alert-management-empty-state.svg'), 'user-can-enable-alert-management' => can?(current_user, :admin_operations, project).to_s, 'alert-management-enabled' => alert_management_enabled?(project).to_s, diff --git a/changelogs/unreleased/sy-update-alerts-docs-urls.yml b/changelogs/unreleased/sy-update-alerts-docs-urls.yml new file mode 100644 index 00000000000..8b23e7e0b87 --- /dev/null +++ b/changelogs/unreleased/sy-update-alerts-docs-urls.yml @@ -0,0 +1,5 @@ +--- +title: Link to more helpful docs from alert management pages +merge_request: 51665 +author: +type: changed diff --git a/spec/helpers/projects/alert_management_helper_spec.rb b/spec/helpers/projects/alert_management_helper_spec.rb index fd35c1ecab8..5afa693b400 100644 --- a/spec/helpers/projects/alert_management_helper_spec.rb +++ b/spec/helpers/projects/alert_management_helper_spec.rb @@ -28,8 +28,8 @@ RSpec.describe Projects::AlertManagementHelper do expect(helper.alert_management_data(current_user, project)).to match( 'project-path' => project_path, 'enable-alert-management-path' => setting_path, - 'alerts-help-url' => 'http://test.host/help/operations/incident_management/index.md', - 'populating-alerts-help-url' => 'http://test.host/help/operations/incident_management/index.md#enable-alert-management', + 'alerts-help-url' => 'http://test.host/help/operations/incident_management/alerts.md', + 'populating-alerts-help-url' => 'http://test.host/help/operations/incident_management/integrations.md#configuration', 'empty-alert-svg-path' => match_asset_path('/assets/illustrations/alert-management-empty-state.svg'), 'user-can-enable-alert-management' => 'true', 'alert-management-enabled' => 'false',