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
ea14d17d
Commit
ea14d17d
authored
Jul 25, 2019
by
Mathieu Parent
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Show domain_blacklist and domain_whitelist in the settings API
parent
d5978d09
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
2 deletions
+6
-2
app/controllers/admin/application_settings_controller.rb
app/controllers/admin/application_settings_controller.rb
+2
-0
app/helpers/application_settings_helper.rb
app/helpers/application_settings_helper.rb
+4
-2
No files found.
app/controllers/admin/application_settings_controller.rb
View file @
ea14d17d
...
...
@@ -86,6 +86,8 @@ class Admin::ApplicationSettingsController < Admin::ApplicationController
params
[
:application_setting
][
:import_sources
]
&
.
delete
(
""
)
params
[
:application_setting
][
:restricted_visibility_levels
]
&
.
delete
(
""
)
params
.
delete
(
:domain_blacklist_raw
)
if
params
[
:domain_blacklist_file
]
params
.
delete
(
:domain_blacklist_raw
)
if
params
[
:domain_blacklist
]
params
.
delete
(
:domain_whitelist_raw
)
if
params
[
:domain_whitelist
]
params
.
require
(
:application_setting
).
permit
(
visible_application_setting_attributes
...
...
app/helpers/application_settings_helper.rb
View file @
ea14d17d
...
...
@@ -180,9 +180,11 @@ module ApplicationSettingsHelper
:default_projects_limit
,
:default_snippet_visibility
,
:disabled_oauth_sign_in_sources
,
:domain_blacklist
,
:domain_blacklist_enabled
,
:domain_blacklist_raw
,
:domain_whitelist_raw
,
:domain_blacklist_raw
,
# TODO: remove in API v5
:domain_whitelist
,
:domain_whitelist_raw
,
# TODO: remove in API v5
:outbound_local_requests_whitelist_raw
,
:dsa_key_restriction
,
:ecdsa_key_restriction
,
...
...
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