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
2549f520
Commit
2549f520
authored
Oct 04, 2021
by
Russell Dickenson
Committed by
Simon Knox
Oct 04, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Edit UI text of Abuse reports settings
Changelog: changed
parent
2c1a843f
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
9 deletions
+5
-9
app/views/admin/application_settings/_abuse.html.haml
app/views/admin/application_settings/_abuse.html.haml
+0
-2
app/views/admin/application_settings/reporting.html.haml
app/views/admin/application_settings/reporting.html.haml
+2
-1
locale/gitlab.pot
locale/gitlab.pot
+3
-6
No files found.
app/views/admin/application_settings/_abuse.html.haml
View file @
2549f520
...
@@ -5,7 +5,5 @@
...
@@ -5,7 +5,5 @@
.form-group
.form-group
=
f
.
label
:abuse_notification_email
,
_
(
'Abuse reports notification email'
),
class:
'label-bold'
=
f
.
label
:abuse_notification_email
,
_
(
'Abuse reports notification email'
),
class:
'label-bold'
=
f
.
text_field
:abuse_notification_email
,
class:
'form-control gl-form-input'
=
f
.
text_field
:abuse_notification_email
,
class:
'form-control gl-form-input'
.form-text.text-muted
=
_
(
'Abuse reports will be sent to this address if it is set. Abuse reports are always available in the admin area.'
)
=
f
.
submit
_
(
'Save changes'
),
class:
"gl-button btn btn-confirm"
=
f
.
submit
_
(
'Save changes'
),
class:
"gl-button btn btn-confirm"
app/views/admin/application_settings/reporting.html.haml
View file @
2549f520
...
@@ -20,6 +20,7 @@
...
@@ -20,6 +20,7 @@
%button
.btn.gl-button.btn-default.js-settings-toggle
{
type:
'button'
}
%button
.btn.gl-button.btn-default.js-settings-toggle
{
type:
'button'
}
=
expanded_by_default?
?
_
(
'Collapse'
)
:
_
(
'Expand'
)
=
expanded_by_default?
?
_
(
'Collapse'
)
:
_
(
'Expand'
)
%p
%p
=
_
(
'Set notification email for abuse reports.'
)
=
_
(
'Receive notification of abuse reports by email.'
)
=
link_to
_
(
'Learn more.'
),
help_page_path
(
'user/admin_area/review_abuse_reports.md'
),
target:
'_blank'
,
rel:
'noopener noreferrer'
.settings-content
.settings-content
=
render
'abuse'
=
render
'abuse'
locale/gitlab.pot
View file @
2549f520
...
@@ -1694,9 +1694,6 @@ msgstr ""
...
@@ -1694,9 +1694,6 @@ msgstr ""
msgid "Abuse reports notification email"
msgid "Abuse reports notification email"
msgstr ""
msgstr ""
msgid "Abuse reports will be sent to this address if it is set. Abuse reports are always available in the admin area."
msgstr ""
msgid "Accept invitation"
msgid "Accept invitation"
msgstr ""
msgstr ""
...
@@ -27919,6 +27916,9 @@ msgstr ""
...
@@ -27919,6 +27916,9 @@ msgstr ""
msgid "Receive any notifications from GitLab."
msgid "Receive any notifications from GitLab."
msgstr ""
msgstr ""
msgid "Receive notification of abuse reports by email."
msgstr ""
msgid "Receive notifications about your own activity"
msgid "Receive notifications about your own activity"
msgstr ""
msgstr ""
...
@@ -30973,9 +30973,6 @@ msgstr ""
...
@@ -30973,9 +30973,6 @@ msgstr ""
msgid "Set new password"
msgid "Set new password"
msgstr ""
msgstr ""
msgid "Set notification email for abuse reports."
msgstr ""
msgid "Set parent epic to an epic"
msgid "Set parent epic to an epic"
msgstr ""
msgstr ""
...
...
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