Merge branch 'actioncontroller-parameters-deprecations' into 'master'

Fixes several ActionController::Parameters deprecations

See merge request gitlab-org/gitlab-ce!24332

8 files changed, 12 insertions, 7 deletions

diff --git a/app/controllers/groups/children_controller.rb b/app/controllers/groups/children_controller.rb
index d549f793ad7..236a19a8dc4 100644
--- a/app/controllers/groups/children_controller.rb
+++ b/app/controllers/groups/children_controller.rb
@@ -35,7 +35,7 @@ module Groups
     def setup_children(parent)
       @children = GroupDescendantsFinder.new(current_user: current_user,
                                              parent_group: parent,
-                                             params: params).execute
+                                             params: params.to_unsafe_h).execute
       @children = @children.page(params[:page])
     end
   end
diff --git a/app/controllers/projects/blob_controller.rb b/app/controllers/projects/blob_controller.rb
index ff286c0ccf0..77672e7d9fc 100644
--- a/app/controllers/projects/blob_controller.rb
+++ b/app/controllers/projects/blob_controller.rb
@@ -93,7 +93,7 @@ class Projects::BlobController < Projects::ApplicationController
     @blob.load_all_data!
     @lines = @blob.present.highlight.lines
 
-    @form = UnfoldForm.new(params)
+    @form = UnfoldForm.new(params.to_unsafe_h)
 
     @lines = @lines[@form.since - 1..@form.to - 1].map(&:html_safe)
 
diff --git a/app/controllers/projects/pipelines_settings_controller.rb b/app/controllers/projects/pipelines_settings_controller.rb
index 192e6d38f36..7f988110977 100644
--- a/app/controllers/projects/pipelines_settings_controller.rb
+++ b/app/controllers/projects/pipelines_settings_controller.rb
@@ -4,6 +4,6 @@ class Projects::PipelinesSettingsController < Projects::ApplicationController
   before_action :authorize_admin_pipeline!
 
   def show
-    redirect_to project_settings_ci_cd_path(@project, params: params)
+    redirect_to project_settings_ci_cd_path(@project, params: params.to_unsafe_h)
   end
 end
diff --git a/app/services/labels/create_service.rb b/app/services/labels/create_service.rb
index fe34be41ac1..db710bac900 100644
--- a/app/services/labels/create_service.rb
+++ b/app/services/labels/create_service.rb
@@ -3,7 +3,7 @@
 module Labels
   class CreateService < Labels::BaseService
     def initialize(params = {})
-      @params = params.dup.with_indifferent_access
+      @params = params.to_h.dup.with_indifferent_access
     end
 
     # returns the created label
diff --git a/app/services/labels/update_service.rb b/app/services/labels/update_service.rb
index c3a720a1c66..e563447c64c 100644
--- a/app/services/labels/update_service.rb
+++ b/app/services/labels/update_service.rb
@@ -3,7 +3,7 @@
 module Labels
   class UpdateService < Labels::BaseService
     def initialize(params = {})
-      @params = params.dup.with_indifferent_access
+      @params = params.to_h.dup.with_indifferent_access
     end
 
     # returns the updated label
diff --git a/app/services/lfs/locks_finder_service.rb b/app/services/lfs/locks_finder_service.rb
index 4a5b2a52921..192ce3d3c2a 100644
--- a/app/services/lfs/locks_finder_service.rb
+++ b/app/services/lfs/locks_finder_service.rb
@@ -12,7 +12,7 @@ module Lfs
 
     # rubocop: disable CodeReuse/ActiveRecord
     def find_locks
-      options = params.slice(:id, :path).compact.symbolize_keys
+      options = params.slice(:id, :path).to_h.compact.symbolize_keys
 
       project.lfs_file_locks.where(options)
     end
diff --git a/app/services/users/update_service.rb b/app/services/users/update_service.rb
index af4fe1aebb9..0b00bd135eb 100644
--- a/app/services/users/update_service.rb
+++ b/app/services/users/update_service.rb
@@ -55,7 +55,7 @@ module Users
         params.reject! { |key, _| read_only.include?(key.to_sym) }
       end
 
-      @user.assign_attributes(params) if params.any?
+      @user.assign_attributes(params) unless params.empty?
     end
   end
 end
diff --git a/changelogs/unreleased/actioncontroller-parameters-deprecations.yml b/changelogs/unreleased/actioncontroller-parameters-deprecations.yml
new file mode 100644
index 00000000000..ddd15c37542
--- /dev/null
+++ b/changelogs/unreleased/actioncontroller-parameters-deprecations.yml
@@ -0,0 +1,5 @@
+---
+title: Fix several ActionController::Parameters deprecations
+merge_request: 24332
+author: Jasper Maes
+type: other