kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Show domain_blacklist and domain_whitelist in the settings API

This commit is contained in:
Mathieu Parent 2019-07-25 15:09:04 +02:00
parent d5978d0921
commit ea14d17da4
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/admin/application_settings_controller.rb
View File

@ -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

6
app/helpers/application_settings_helper.rb
View File

@ -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,