diff options
| author | GitLab Release Tools Bot <delivery-team+release-tools@gitlab.com> | 2019-11-27 11:31:00 +0000 |
|---|---|---|
| committer | GitLab Release Tools Bot <delivery-team+release-tools@gitlab.com> | 2019-11-27 11:31:00 +0000 |
| commit | 52b9f101a35b6eec91621d5470e6d5883bfcaf88 (patch) | |
| tree | 8d9ea54cf3da9939592d14a1208cf262dd67a199 /app/controllers/admin/application_settings_controller.rb | |
| parent | 4c442bdda212490c660a4c0acd82d03f60d72dc9 (diff) | |
| parent | ef6512ad8f7fc86ab67f210b6ca2754790e4564f (diff) | |
| download | gitlab-ce-52b9f101a35b6eec91621d5470e6d5883bfcaf88.tar.gz | |
Merge remote-tracking branch 'dev/12-5-stable' into 12-5-stable
Diffstat (limited to 'app/controllers/admin/application_settings_controller.rb')
| -rw-r--r-- | app/controllers/admin/application_settings_controller.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/app/controllers/admin/application_settings_controller.rb b/app/controllers/admin/application_settings_controller.rb index f7e33c09928..9d81d3fad07 100644 --- a/app/controllers/admin/application_settings_controller.rb +++ b/app/controllers/admin/application_settings_controller.rb @@ -86,6 +86,7 @@ class Admin::ApplicationSettingsController < Admin::ApplicationController params[:application_setting][:import_sources]&.delete("") params[:application_setting][:restricted_visibility_levels]&.delete("") + params[:application_setting].delete(:elasticsearch_aws_secret_access_key) if params[:application_setting][:elasticsearch_aws_secret_access_key].blank? # TODO Remove domain_blacklist_raw in APIv5 (See https://gitlab.com/gitlab-org/gitlab-foss/issues/67204) params.delete(:domain_blacklist_raw) if params[:domain_blacklist_file] params.delete(:domain_blacklist_raw) if params[:domain_blacklist] |