Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
f6e7c081
Commit
f6e7c081
authored
Mar 04, 2021
by
David O'Regan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix: update Incident Management settings copy
parent
1d17649c
Changes
6
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
10 additions
and
5 deletions
+10
-5
app/assets/javascripts/incidents_settings/constants.js
app/assets/javascripts/incidents_settings/constants.js
+1
-1
changelogs/unreleased/323474-update-incident-setting-copy.yml
...gelogs/unreleased/323474-update-incident-setting-copy.yml
+5
-0
locale/gitlab.pot
locale/gitlab.pot
+1
-1
spec/features/projects/settings/operations_settings_spec.rb
spec/features/projects/settings/operations_settings_spec.rb
+1
-1
spec/features/projects/settings/user_searches_in_settings_spec.rb
...tures/projects/settings/user_searches_in_settings_spec.rb
+1
-1
spec/frontend/incidents_settings/components/__snapshots__/alerts_form_spec.js.snap
...ettings/components/__snapshots__/alerts_form_spec.js.snap
+1
-1
No files found.
app/assets/javascripts/incidents_settings/constants.js
View file @
f6e7c081
...
@@ -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 s
eparate email notification to Developer
s.
'
),
label
:
__
(
'
Send a s
ingle email notification to Owners and Maintainers for new alert
s.
'
),
},
},
autoCloseIncidents
:
{
autoCloseIncidents
:
{
label
:
__
(
'
Automatically close incidents when the associated Prometheus alert resolves.
'
),
label
:
__
(
'
Automatically close incidents when the associated Prometheus alert resolves.
'
),
...
...
changelogs/unreleased/323474-update-incident-setting-copy.yml
0 → 100644
View file @
f6e7c081
---
title
:
Update text for email config under Incidents in Settings > Operations
merge_request
:
55753
author
:
type
:
changed
locale/gitlab.pot
View file @
f6e7c081
...
@@ -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 s
eparate email notification to Developer
s."
msgid "Send a s
ingle email notification to Owners and Maintainers for new alert
s."
msgstr ""
msgstr ""
msgid "Send confirmation email"
msgid "Send confirmation email"
...
...
spec/features/projects/settings/operations_settings_spec.rb
View file @
f6e7c081
...
@@ -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 s
eparate email notification to Developer
s.'
}
let
(
:send_email
)
{
'Send a s
ingle email notification to Owners and Maintainers for new alert
s.'
}
before
do
before
do
create
(
:project_incident_management_setting
,
send_email:
true
,
project:
project
)
create
(
:project_incident_management_setting
,
send_email:
true
,
project:
project
)
...
...
spec/features/projects/settings/user_searches_in_settings_spec.rb
View file @
f6e7c081
...
@@ -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
spec/frontend/incidents_settings/components/__snapshots__/alerts_form_spec.js.snap
View file @
f6e7c081
...
@@ -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 s
eparate email notification to Developer
s.
Send a s
ingle email notification to Owners and Maintainers for new alert
s.
</span>
</span>
</gl-form-checkbox-stub>
</gl-form-checkbox-stub>
</gl-form-group-stub>
</gl-form-group-stub>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment