diff options
| author | Mathieu Parent <math.parent@gmail.com> | 2019-07-25 16:10:30 +0300 |
|---|---|---|
| committer | Mathieu Parent <math.parent@gmail.com> | 2019-09-09 16:14:52 +0300 |
| commit | 85776fa3ffba6f641cf981cb0107f0e4ba882f3e (patch) | |
| tree | dd571294c8ee15639c371c1a0f6a71799eea632e /app | |
| parent | ea14d17da4d3625eaf6a70a3b38660e5753c5f77 (diff) | |
Settings API: domain_{black,white}list should be arrays
As in documentation.
Fixes: #58180.
Also remove the requirement between domain_blacklist_enabled and domain_blacklist.
Diffstat (limited to 'app')
| -rw-r--r-- | app/controllers/admin/application_settings_controller.rb | 1 | ||||
| -rw-r--r-- | app/helpers/application_settings_helper.rb | 6 |
2 files changed, 5 insertions, 2 deletions
diff --git a/app/controllers/admin/application_settings_controller.rb b/app/controllers/admin/application_settings_controller.rb index 53ceffd6bea..f2f72bea5b4 100644 --- a/app/controllers/admin/application_settings_controller.rb +++ b/app/controllers/admin/application_settings_controller.rb @@ -85,6 +85,7 @@ class Admin::ApplicationSettingsController < Admin::ApplicationController params[:application_setting][:import_sources]&.delete("") params[:application_setting][:restricted_visibility_levels]&.delete("") + # TODO Remove domain_blacklist_raw in APIv5 (See https://gitlab.com/gitlab-org/gitlab-ce/issues/67204) 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] diff --git a/app/helpers/application_settings_helper.rb b/app/helpers/application_settings_helper.rb index 76ce08458e8..b1a6e988a1d 100644 --- a/app/helpers/application_settings_helper.rb +++ b/app/helpers/application_settings_helper.rb @@ -182,9 +182,11 @@ module ApplicationSettingsHelper :disabled_oauth_sign_in_sources, :domain_blacklist, :domain_blacklist_enabled, - :domain_blacklist_raw, # TODO: remove in API v5 + # TODO Remove domain_blacklist_raw in APIv5 (See https://gitlab.com/gitlab-org/gitlab-ce/issues/67204) + :domain_blacklist_raw, :domain_whitelist, - :domain_whitelist_raw, # TODO: remove in API v5 + # TODO Remove domain_whitelist_raw in APIv5 (See https://gitlab.com/gitlab-org/gitlab-ce/issues/67204) + :domain_whitelist_raw, :outbound_local_requests_whitelist_raw, :dsa_key_restriction, :ecdsa_key_restriction, |