Resolve app/controllers/concerns/service_params.rb

819cf890 · Lin Jen-Shin · 269619c3 · 819cf890
Commit 819cf890 authored Dec 16, 2017 by Lin Jen-Shin
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 4 deletions

app/controllers/concerns/service_params.rb app/controllers/concerns/service_params.rb +0 -4

No files found.
--- a/app/controllers/concerns/service_params.rb
+++ b/app/controllers/concerns/service_params.rb
@@ -68,11 +68,7 @@ module ServiceParams

  def service_params
    dynamic_params = @service.event_channel_names + @service.event_names # rubocop:disable Gitlab/ModuleWithInstanceVariables
-<<<<<<< HEAD
    service_params = params.permit(:id, service: allowed_service_params + dynamic_params)
-=======
-    service_params = params.permit(:id, service: ALLOWED_PARAMS_CE + dynamic_params)
->>>>>>> upstream/master

    if service_params[:service].is_a?(Hash)
      FILTER_BLANK_PARAMS.each do |param|