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
294b85eb
Commit
294b85eb
authored
Jun 23, 2021
by
Kati Paizee
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Revise UI text for third-party offers
Update the Admin Area third-party offers UI text Changelog: changed
parent
256bb662
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
10 additions
and
9 deletions
+10
-9
app/views/admin/application_settings/_third_party_offers.html.haml
.../admin/application_settings/_third_party_offers.html.haml
+3
-3
doc/user/admin_area/settings/third_party_offers.md
doc/user/admin_area/settings/third_party_offers.md
+4
-3
locale/gitlab.pot
locale/gitlab.pot
+3
-3
No files found.
app/views/admin/application_settings/_third_party_offers.html.haml
View file @
294b85eb
...
@@ -2,11 +2,11 @@
...
@@ -2,11 +2,11 @@
%section
.settings.as-third-party-offers.no-animate
#js-third-party-offers-settings
{
class:
(
'expanded'
if
expanded
)
}
%section
.settings.as-third-party-offers.no-animate
#js-third-party-offers-settings
{
class:
(
'expanded'
if
expanded
)
}
.settings-header
.settings-header
%h4
%h4
=
_
(
'Third
party offers'
)
=
_
(
'Third
-
party offers'
)
%button
.btn.gl-button.btn-default.js-settings-toggle
{
type:
'button'
}
%button
.btn.gl-button.btn-default.js-settings-toggle
{
type:
'button'
}
=
expanded
?
_
(
'Collapse'
)
:
_
(
'Expand'
)
=
expanded
?
_
(
'Collapse'
)
:
_
(
'Expand'
)
%p
%p
=
_
(
'Control
the display of third party offers
.'
)
=
_
(
'Control
whether to display third-party offers in GitLab
.'
)
.settings-content
.settings-content
=
form_for
@application_setting
,
url:
general_admin_application_settings_path
(
anchor:
'js-third-party-offers-settings'
),
html:
{
class:
'fieldset-form'
,
id:
'third-party-offers-settings'
}
do
|
f
|
=
form_for
@application_setting
,
url:
general_admin_application_settings_path
(
anchor:
'js-third-party-offers-settings'
),
html:
{
class:
'fieldset-form'
,
id:
'third-party-offers-settings'
}
do
|
f
|
=
form_errors
(
@application_setting
)
if
expanded
=
form_errors
(
@application_setting
)
if
expanded
...
@@ -15,6 +15,6 @@
...
@@ -15,6 +15,6 @@
.form-group
.form-group
.form-check
.form-check
=
f
.
check_box
:hide_third_party_offers
,
class:
'form-check-input'
=
f
.
check_box
:hide_third_party_offers
,
class:
'form-check-input'
=
f
.
label
:hide_third_party_offers
,
_
(
'Do not display offers from third parties
within GitLab
'
),
class:
'form-check-label'
=
f
.
label
:hide_third_party_offers
,
_
(
'Do not display offers from third parties'
),
class:
'form-check-label'
=
f
.
submit
_
(
'Save changes'
),
class:
"gl-button btn btn-confirm"
=
f
.
submit
_
(
'Save changes'
),
class:
"gl-button btn btn-confirm"
doc/user/admin_area/settings/third_party_offers.md
View file @
294b85eb
...
@@ -5,7 +5,7 @@ info: To determine the technical writer assigned to the Stage/Group associated w
...
@@ -5,7 +5,7 @@ info: To determine the technical writer assigned to the Stage/Group associated w
type
:
reference
type
:
reference
---
---
# Third
party offers **(FREE SELF)**
# Third
-
party offers **(FREE SELF)**
> [Introduced](https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/20379) in GitLab Free 11.1.
> [Introduced](https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/20379) in GitLab Free 11.1.
...
@@ -16,8 +16,9 @@ for using [Google Kubernetes Engine](https://cloud.google.com/kubernetes-engine/
...
@@ -16,8 +16,9 @@ for using [Google Kubernetes Engine](https://cloud.google.com/kubernetes-engine/
To toggle the display of third-party offers:
To toggle the display of third-party offers:
1.
On the top bar, select
**Menu >**
**{admin}**
**Admin**
.
1.
On the top bar, select
**Menu >**
**{admin}**
**Admin**
.
1.
In the left sidebar, select
**Settings**
, and expand
**Third party offers**
.
1.
On the left sidebar, select
**Settings**
, and expand
**Third-party offers**
.
1.
Select
**Do not display offers from third parties within GitLab**
.
1.
Select
**Do not display offers from third parties**
.
1.
Select
**Save changes**
.
<!-- ## Troubleshooting
<!-- ## Troubleshooting
...
...
locale/gitlab.pot
View file @
294b85eb
...
@@ -8736,7 +8736,7 @@ msgstr ""
...
@@ -8736,7 +8736,7 @@ msgstr ""
msgid "Control emails linked to your account"
msgid "Control emails linked to your account"
msgstr ""
msgstr ""
msgid "Control
the display of third party offers
."
msgid "Control
whether to display third-party offers in GitLab
."
msgstr ""
msgstr ""
msgid "Cookie domain"
msgid "Cookie domain"
...
@@ -11431,7 +11431,7 @@ msgstr ""
...
@@ -11431,7 +11431,7 @@ msgstr ""
msgid "Display source"
msgid "Display source"
msgstr ""
msgstr ""
msgid "Do not display offers from third parties
within GitLab
"
msgid "Do not display offers from third parties"
msgstr ""
msgstr ""
msgid "Do you want to remove this deploy key?"
msgid "Do you want to remove this deploy key?"
...
@@ -32940,7 +32940,7 @@ msgstr ""
...
@@ -32940,7 +32940,7 @@ msgstr ""
msgid "Third Party Advisory Link"
msgid "Third Party Advisory Link"
msgstr ""
msgstr ""
msgid "Third
party offers"
msgid "Third
-
party offers"
msgstr ""
msgstr ""
msgid "This %{issuableDisplayName} is locked. Only project members can comment."
msgid "This %{issuableDisplayName} is locked. Only project members can comment."
...
...
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