diff options
| author | Douglas Barbosa Alexandre <dbalexandre@gmail.com> | 2019-09-09 23:29:31 +0300 |
|---|---|---|
| committer | Douglas Barbosa Alexandre <dbalexandre@gmail.com> | 2019-09-09 23:29:31 +0300 |
| commit | 814d12b8c72b0e8a4f9025ffb1373c11b36a061a (patch) | |
| tree | 4015aacfc24b19d0e4bbb733cf0af65306b03aa2 /app/controllers | |
| parent | 84b93b67f0c560103914780f05c3871b79476186 (diff) | |
| parent | 6b7456017ded3c12751e27fa3839157f0064a0f7 (diff) | |
Merge branch 'api_settings' into 'master'
Improve application settings API
Closes #58180
See merge request gitlab-org/gitlab-ce!31149
Diffstat (limited to 'app/controllers')
| -rw-r--r-- | app/controllers/admin/application_settings_controller.rb | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/app/controllers/admin/application_settings_controller.rb b/app/controllers/admin/application_settings_controller.rb index 99411641874..f2f72bea5b4 100644 --- a/app/controllers/admin/application_settings_controller.rb +++ b/app/controllers/admin/application_settings_controller.rb @@ -85,7 +85,10 @@ 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] params.require(:application_setting).permit( visible_application_setting_attributes |