diff options
| author | GitLab Release Tools Bot <robert+release-tools@gitlab.com> | 2019-11-26 12:02:11 +0000 |
|---|---|---|
| committer | GitLab Release Tools Bot <robert+release-tools@gitlab.com> | 2019-11-26 12:02:11 +0000 |
| commit | 6584ed51fd6e2ccf66d139a3fa976ec237c27a34 (patch) | |
| tree | 91e4074d1de631546bd1f85c3af1e561178dcf4b | |
| parent | ccb32647be0f8cb9f10377e230457cbf6dec3408 (diff) | |
| parent | 2649b160268025d72582504b85998155be9663af (diff) | |
| download | gitlab-ce-6584ed51fd6e2ccf66d139a3fa976ec237c27a34.tar.gz | |
Merge branch 'security-aws-secret-key-2937-ce-12-5' into '12-5-stable'
Hide AWS secret on Admin Integration page
See merge request gitlab/gitlabhq!3532
| -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] |