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
735c3e86
Commit
735c3e86
authored
May 04, 2021
by
Sarah Yasonik
Committed by
David O'Regan
May 04, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Rephrase setting for recovery alerts to match expected behavior
parent
e837d5a0
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
10 additions
and
3 deletions
+10
-3
app/assets/javascripts/incidents_settings/constants.js
app/assets/javascripts/incidents_settings/constants.js
+3
-1
changelogs/unreleased/sy-incident-setting-recovery-alert-string-change.yml
...ased/sy-incident-setting-recovery-alert-string-change.yml
+5
-0
locale/gitlab.pot
locale/gitlab.pot
+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 @
735c3e86
...
@@ -43,7 +43,9 @@ export const I18N_ALERT_SETTINGS_FORM = {
...
@@ -43,7 +43,9 @@ export const I18N_ALERT_SETTINGS_FORM = {
label
:
__
(
'
Send a single email notification to Owners and Maintainers for new alerts.
'
),
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 associated incident when a recovery alert notification resolves an alert
'
,
),
},
},
};
};
...
...
changelogs/unreleased/sy-incident-setting-recovery-alert-string-change.yml
0 → 100644
View file @
735c3e86
---
title
:
Change text for incident auto-resolve setting to match behavior
merge_request
:
58515
author
:
type
:
changed
locale/gitlab.pot
View file @
735c3e86
...
@@ -4746,7 +4746,7 @@ msgstr ""
...
@@ -4746,7 +4746,7 @@ msgstr ""
msgid "Automatic deployment rollbacks"
msgid "Automatic deployment rollbacks"
msgstr ""
msgstr ""
msgid "Automatically close
incidents when the associated Prometheus alert resolves.
"
msgid "Automatically close
associated incident when a recovery alert notification resolves an alert
"
msgstr ""
msgstr ""
msgid "Automatically create merge requests for vulnerabilities that have fixes available."
msgid "Automatically create merge requests for vulnerabilities that have fixes available."
...
...
spec/frontend/incidents_settings/components/__snapshots__/alerts_form_spec.js.snap
View file @
735c3e86
...
@@ -90,7 +90,7 @@ exports[`Alert integration settings form default state should match the default
...
@@ -90,7 +90,7 @@ exports[`Alert integration settings form default state should match the default
checked="true"
checked="true"
>
>
<span>
<span>
Automatically close
incidents when the associated Prometheus alert resolves.
Automatically close
associated incident when a recovery alert notification resolves an alert
</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