From 2649b160268025d72582504b85998155be9663af Mon Sep 17 00:00:00 2001 From: Justin Ho Tuan Duong Date: Tue, 26 Nov 2019 12:02:11 +0000 Subject: Hide AWS secret on Admin Integration page --- app/controllers/admin/application_settings_controller.rb | 1 + 1 file changed, 1 insertion(+) 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] -- cgit v1.2.1