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
381032ba
Commit
381032ba
authored
Jul 19, 2021
by
ngaskill
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Revised Package Registry settings text
Changelog: other
parent
9fef399c
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
6 additions
and
11 deletions
+6
-11
app/views/admin/application_settings/_package_registry.html.haml
...ws/admin/application_settings/_package_registry.html.haml
+1
-1
ee/app/views/admin/application_settings/_ee_package_registry.haml
...iews/admin/application_settings/_ee_package_registry.haml
+1
-3
ee/spec/features/admin/admin_settings_spec.rb
ee/spec/features/admin/admin_settings_spec.rb
+1
-1
locale/gitlab.pot
locale/gitlab.pot
+3
-6
No files found.
app/views/admin/application_settings/_package_registry.html.haml
View file @
381032ba
...
...
@@ -6,7 +6,7 @@
%button
.btn.gl-button.btn-default.js-settings-toggle
{
type:
'button'
}
=
expanded_by_default?
?
_
(
'Collapse'
)
:
_
(
'Expand'
)
%p
=
_
(
"
Settings related to the use and experience of using GitLab's Package Registry
."
)
=
_
(
"
Control how the GitLab Package Registry functions
."
)
=
render_if_exists
'admin/application_settings/ee_package_registry'
...
...
ee/app/views/admin/application_settings/_ee_package_registry.haml
View file @
381032ba
...
...
@@ -7,8 +7,6 @@
.form-check
=
f
.
check_box
:npm_package_requests_forwarding
,
class:
'form-check-input'
=
f
.
label
:npm_package_requests_forwarding
,
class:
'form-check-label'
do
Enable forwarding of npm package requests to npmjs.org
.form-text.text-muted
=
_
(
"When enabled, if an npm package isn't found in the GitLab Registry, we will attempt to pull from the global npm registry."
)
Forward npm package requests to the npm Registry if the packages are not found in the GitLab Package Registry
=
f
.
submit
_
(
'Save changes'
),
class:
'btn gl-button btn-confirm'
ee/spec/features/admin/admin_settings_spec.rb
View file @
381032ba
...
...
@@ -268,7 +268,7 @@ RSpec.describe 'Admin updates EE-only settings' do
it
'allows you to change the npm_forwaring setting'
do
page
.
within
(
'#js-package-settings'
)
do
check
'
Enable forwarding of npm package requests to npmjs.org
'
check
'
Forward npm package requests to the npm Registry if the packages are not found in the GitLab Package Registry
'
click_button
'Save'
end
...
...
locale/gitlab.pot
View file @
381032ba
...
...
@@ -8901,6 +8901,9 @@ msgstr ""
msgid "Control emails linked to your account"
msgstr ""
msgid "Control how the GitLab Package Registry functions."
msgstr ""
msgid "Control whether to display third-party offers in GitLab."
msgstr ""
...
...
@@ -29996,9 +29999,6 @@ msgstr ""
msgid "Settings"
msgstr ""
msgid "Settings related to the use and experience of using GitLab's Package Registry."
msgstr ""
msgid "Setup"
msgstr ""
...
...
@@ -36901,9 +36901,6 @@ msgstr ""
msgid "When disabled, an external authentication provider must be used."
msgstr ""
msgid "When enabled, if an npm package isn't found in the GitLab Registry, we will attempt to pull from the global npm registry."
msgstr ""
msgid "When enabled, users cannot use GitLab until the terms have been accepted."
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