Commit f6e7c081 authored by David O'Regan's avatar David O'Regan

Fix: update Incident Management settings copy

parent 1d17649c
...@@ -40,7 +40,7 @@ export const I18N_ALERT_SETTINGS_FORM = { ...@@ -40,7 +40,7 @@ export const I18N_ALERT_SETTINGS_FORM = {
label: __('Incident template (optional)'), label: __('Incident template (optional)'),
}, },
sendEmail: { sendEmail: {
label: __('Send a separate email notification to Developers.'), label: __('Send a single email notification to Owners and Maintainers for new alerts.'),
}, },
autoCloseIncidents: { autoCloseIncidents: {
label: __('Automatically close incidents when the associated Prometheus alert resolves.'), label: __('Automatically close incidents when the associated Prometheus alert resolves.'),
......
---
title: Update text for email config under Incidents in Settings > Operations
merge_request: 55753
author:
type: changed
...@@ -27104,7 +27104,7 @@ msgstr "" ...@@ -27104,7 +27104,7 @@ msgstr ""
msgid "SelfMonitoring|Self monitoring project has been successfully deleted." msgid "SelfMonitoring|Self monitoring project has been successfully deleted."
msgstr "" msgstr ""
msgid "Send a separate email notification to Developers." msgid "Send a single email notification to Owners and Maintainers for new alerts."
msgstr "" msgstr ""
msgid "Send confirmation email" msgid "Send confirmation email"
......
...@@ -24,7 +24,7 @@ RSpec.describe 'Projects > Settings > For a forked project', :js do ...@@ -24,7 +24,7 @@ RSpec.describe 'Projects > Settings > For a forked project', :js do
describe 'Settings > Operations' do describe 'Settings > Operations' do
describe 'Incidents' do describe 'Incidents' do
let(:create_issue) { 'Create an incident. Incidents are created for each alert triggered.' } let(:create_issue) { 'Create an incident. Incidents are created for each alert triggered.' }
let(:send_email) { 'Send a separate email notification to Developers.' } let(:send_email) { 'Send a single email notification to Owners and Maintainers for new alerts.' }
before do before do
create(:project_incident_management_setting, send_email: true, project: project) create(:project_incident_management_setting, send_email: true, project: project)
......
...@@ -37,6 +37,6 @@ RSpec.describe 'User searches project settings', :js do ...@@ -37,6 +37,6 @@ RSpec.describe 'User searches project settings', :js do
visit project_settings_operations_path(project) visit project_settings_operations_path(project)
end end
it_behaves_like 'can search settings', 'Alerts', 'Incidents' it_behaves_like 'can search settings', 'Alerts', 'Error tracking'
end end
end end
...@@ -78,7 +78,7 @@ exports[`Alert integration settings form default state should match the default ...@@ -78,7 +78,7 @@ exports[`Alert integration settings form default state should match the default
> >
<gl-form-checkbox-stub> <gl-form-checkbox-stub>
<span> <span>
Send a separate email notification to Developers. Send a single email notification to Owners and Maintainers for new alerts.
</span> </span>
</gl-form-checkbox-stub> </gl-form-checkbox-stub>
</gl-form-group-stub> </gl-form-group-stub>
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment