summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorDaniel Juarez <daniel.juarez.gonzalez@cern.ch>2019-02-05 12:30:06 +0000
committerSean McGivern <sean@gitlab.com>2019-02-05 12:30:06 +0000
commit72b59d6e3ba1e19045071ada494cc8e7c71a32c9 (patch)
tree3a3cf832a9d69e9a8a1020917d02bb0e98839dd6 /app
parent55cb4bc9cafca0c838192b54f9daa4b2bc0b86b0 (diff)
downloadgitlab-ce-72b59d6e3ba1e19045071ada494cc8e7c71a32c9.tar.gz
Fix comparing equality between `ActionController::Parameters` and a `Hash`....
Diffstat (limited to 'app')
-rw-r--r--app/controllers/concerns/service_params.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/concerns/service_params.rb b/app/controllers/concerns/service_params.rb
index c6ae4fe15bf..48451bedcc2 100644
--- a/app/controllers/concerns/service_params.rb
+++ b/app/controllers/concerns/service_params.rb
@@ -72,7 +72,7 @@ module ServiceParams
dynamic_params = @service.event_channel_names + @service.event_names # rubocop:disable Gitlab/ModuleWithInstanceVariables
service_params = params.permit(:id, service: allowed_service_params + dynamic_params)
- if service_params[:service].is_a?(Hash)
+ if service_params[:service].is_a?(ActionController::Parameters)
FILTER_BLANK_PARAMS.each do |param|
service_params[:service].delete(param) if service_params[:service][param].blank?
end