summaryrefslogtreecommitdiff
path: root/app/controllers/admin/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/admin/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/admin/services_controller.rb')
-rw-r--r--app/controllers/admin/services_controller.rb8
1 files changed, 1 insertions, 7 deletions
diff --git a/app/controllers/admin/services_controller.rb b/app/controllers/admin/services_controller.rb
index 46133588332..a62170662e1 100644
--- a/app/controllers/admin/services_controller.rb
+++ b/app/controllers/admin/services_controller.rb
@@ -39,13 +39,7 @@ class Admin::ServicesController < Admin::ApplicationController
end
def application_services_params
- application_services_params = params.permit(:id,
+ params.permit(:id,
service: Projects::ServicesController::ALLOWED_PARAMS)
- if application_services_params[:service].is_a?(Hash)
- Projects::ServicesController::FILTER_BLANK_PARAMS.each do |param|
- application_services_params[:service].delete(param) if application_services_params[:service][param].blank?
- end
- end
- application_services_params
end
end