diff options
| author | Mathieu Parent <math.parent@gmail.com> | 2019-07-25 15:09:04 +0200 |
|---|---|---|
| committer | Mathieu Parent <math.parent@gmail.com> | 2019-09-09 15:11:34 +0200 |
| commit | ea14d17da4d3625eaf6a70a3b38660e5753c5f77 (patch) | |
| tree | 86812ca928a80f70f08c2f44fbd702544599b185 | |
| parent | d5978d09219b654d8c43e6904d6f340643a8b3b9 (diff) | |
| download | gitlab-ce-ea14d17da4d3625eaf6a70a3b38660e5753c5f77.tar.gz | |
Show domain_blacklist and domain_whitelist in the settings API
| -rw-r--r-- | app/controllers/admin/application_settings_controller.rb | 2 | ||||
| -rw-r--r-- | app/helpers/application_settings_helper.rb | 6 |
2 files changed, 6 insertions, 2 deletions
diff --git a/app/controllers/admin/application_settings_controller.rb b/app/controllers/admin/application_settings_controller.rb index 99411641874..53ceffd6bea 100644 --- a/app/controllers/admin/application_settings_controller.rb +++ b/app/controllers/admin/application_settings_controller.rb @@ -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 diff --git a/app/helpers/application_settings_helper.rb b/app/helpers/application_settings_helper.rb index 84021d0da56..76ce08458e8 100644 --- a/app/helpers/application_settings_helper.rb +++ b/app/helpers/application_settings_helper.rb @@ -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, |