summaryrefslogtreecommitdiff
path: root/app/controllers/projects/services_controller.rb
diff options
context:
space:
mode:
authorValery Sizov <vsv2711@gmail.com>2015-10-14 19:21:27 +0300
committerValery Sizov <vsv2711@gmail.com>2015-10-14 19:21:27 +0300
commitb83a18a55cd03cfa6d0d631b8d4567ae29b5fe26 (patch)
tree8d4c05cf0b74779fb37cb492bf4dd3bd653c614b /app/controllers/projects/services_controller.rb
parent2fb02f9252f3083b44d1999a8421b3824e1929cb (diff)
downloadgitlab-ce-b83a18a55cd03cfa6d0d631b8d4567ae29b5fe26.tar.gz
Revert "Improve invalidation of stored service password if the endpoint URL is changed"
This reverts commit b46397548056e4e8ef00efe4f641c61ba1dd5230.
Diffstat (limited to 'app/controllers/projects/services_controller.rb')
-rw-r--r--app/controllers/projects/services_controller.rb8
1 files changed, 1 insertions, 7 deletions
diff --git a/app/controllers/projects/services_controller.rb b/app/controllers/projects/services_controller.rb
index 129068ef019..3047ee8a1ff 100644
--- a/app/controllers/projects/services_controller.rb
+++ b/app/controllers/projects/services_controller.rb
@@ -9,10 +9,6 @@ class Projects::ServicesController < Projects::ApplicationController
:note_events, :send_from_committer_email, :disable_diffs, :external_wiki_url,
:notify, :color,
:server_host, :server_port, :default_irc_uri, :enable_ssl_verification]
-
- # Parameters to ignore if no value is specified
- FILTER_BLANK_PARAMS = [:password]
-
# Authorize
before_action :authorize_admin_project!
before_action :service, only: [:edit, :update, :test]
@@ -63,9 +59,7 @@ class Projects::ServicesController < Projects::ApplicationController
def service_params
service_params = params.require(:service).permit(ALLOWED_PARAMS)
- FILTER_BLANK_PARAMS.each do |param|
- service_params.delete(param) if service_params[param].blank?
- end
+ service_params.delete("password") if service_params["password"].blank?
service_params
end
end