Fix several ActionController::Parameters deprecations

4 files changed, 4 insertions, 4 deletions

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