Commit ea14d17d authored by Mathieu Parent's avatar Mathieu Parent

Show domain_blacklist and domain_whitelist in the settings API

parent d5978d09
...@@ -86,6 +86,8 @@ class Admin::ApplicationSettingsController < Admin::ApplicationController ...@@ -86,6 +86,8 @@ class Admin::ApplicationSettingsController < Admin::ApplicationController
params[:application_setting][:import_sources]&.delete("") params[:application_setting][:import_sources]&.delete("")
params[:application_setting][:restricted_visibility_levels]&.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_file]
params.delete(:domain_blacklist_raw) if params[:domain_blacklist]
params.delete(:domain_whitelist_raw) if params[:domain_whitelist]
params.require(:application_setting).permit( params.require(:application_setting).permit(
visible_application_setting_attributes visible_application_setting_attributes
......
...@@ -180,9 +180,11 @@ module ApplicationSettingsHelper ...@@ -180,9 +180,11 @@ module ApplicationSettingsHelper
:default_projects_limit, :default_projects_limit,
:default_snippet_visibility, :default_snippet_visibility,
:disabled_oauth_sign_in_sources, :disabled_oauth_sign_in_sources,
:domain_blacklist,
:domain_blacklist_enabled, :domain_blacklist_enabled,
:domain_blacklist_raw, :domain_blacklist_raw, # TODO: remove in API v5
:domain_whitelist_raw, :domain_whitelist,
:domain_whitelist_raw, # TODO: remove in API v5
:outbound_local_requests_whitelist_raw, :outbound_local_requests_whitelist_raw,
:dsa_key_restriction, :dsa_key_restriction,
:ecdsa_key_restriction, :ecdsa_key_restriction,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment