diff options
author | Justin Ho Tuan Duong <hduong@gitlab.com> | 2019-11-26 12:01:40 +0000 |
---|---|---|
committer | GitLab Release Tools Bot <robert+release-tools@gitlab.com> | 2019-11-26 12:01:40 +0000 |
commit | 4c192319176830fd0612170bd48462840a997b77 (patch) | |
tree | 0f6fbfe92004c012a463030ded909dface2d879b | |
parent | ddd05f245513e5a34b8db2b600dd1e628be43fd2 (diff) | |
download | gitlab-ce-4c192319176830fd0612170bd48462840a997b77.tar.gz |
Hide AWS secret on Admin Integration page
-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] |