More work on ruby 3 support

Author: alexandermeindl

Diff for: app/use_cases/settings/apply.rb

@@ -83,8 +83,11 @@ def check_gitolite_config
       if value_has_changed?(:gitolite_config_file)       ||
          value_has_changed?(:gitolite_identifier_prefix) ||
          value_has_changed?(:gitolite_identifier_strip_user_id)
-        options = { message: 'Gitolite configuration has been modified, resync all projects (active, closed, archived)...' }
-        gitolite_accessor.update_projects 'all', options
+
+        gitolite_accessor.update_projects(
+          'all',
+          message: 'Gitolite configuration has been modified, resync all projects (active, closed, archived)...'
+        )
       end
     end
 
@@ -96,8 +99,8 @@ def check_gitolite_default_values
          value_has_changed?(:gitolite_notify_global_exclude)
 
         # Need to update everyone!
-        options = { message: 'Gitolite configuration has been modified, resync all active projects...' }
-        gitolite_accessor.update_projects 'active', options
+        gitolite_accessor.update_projects 'active',
+                                          message: 'Gitolite configuration has been modified, resync all active projects...'
       end
     end
 
@@ -118,9 +121,12 @@ def check_cache_config
     end
 
     def do_resync_projects
+      return unless resync_projects
+
       ## A resync has been asked within the interface, update all projects in force mode
-      options = { message: 'Forced resync of all projects (active, closed, archived)...', force: true }
-      gitolite_accessor.update_projects 'all', options if resync_projects
+      gitolite_accessor.update_projects 'all',
+                                        message: 'Forced resync of all projects (active, closed, archived)...',
+                                        force: true
     end
 
     def do_resync_ssh_keys

Diff for: lib/redmine_git_hosting/gitolite_accessor.rb

@@ -61,7 +61,7 @@ def destroy_repositories(repositories, **opts)
       end
     end
 
-    def update_projects(projects, opts)
+    def update_projects(projects, **opts)
       message = opts.delete(:message) { ' ' }
       logger.info message
       resync_gitolite :update_projects, projects, **opts

Diff for: lib/redmine_git_hosting/patches/member_patch.rb

@@ -16,8 +16,8 @@ def self.prepended(base)
       private
 
       def update_project
-        options = { message: "Membership changes on project '#{project}', update!" }
-        gitolite_accessor.update_projects [project.id], **options
+        gitolite_accessor.update_projects [project.id],
+                                          message: "Membership changes on project '#{project}', update!"
       end
     end
   end

Diff for: lib/redmine_git_hosting/patches/projects_controller_patch.rb

@@ -89,13 +89,11 @@ def move_project_hierarchy
       end
 
       def update_project(message)
-        options = { message: message }
-        Projects::Update.call @project, options
+        Projects::Update.call @project, message: message
       end
 
       def update_project_hierarchy(message)
-        options = { message: message }
-        gitolite_accessor.update_projects hierarchy_to_update, options
+        gitolite_accessor.update_projects hierarchy_to_update, message: message
       end
 
       def hierarchy_to_update

Diff for: lib/redmine_git_hosting/patches/users_controller_patch.rb

@@ -50,7 +50,8 @@ def set_public_key_values
       end
 
       def update_projects
-        gitolite_accessor.update_projects projects_to_update, message: "Status of '#{@user.login}' has changed, update projects"
+        gitolite_accessor.update_projects projects_to_update,
+                                          message: "Status of '#{@user.login}' has changed, update projects"
       end
 
       def projects_to_update

Diff for: lib/tasks/migration_tools.rake

@@ -72,9 +72,9 @@ namespace :redmine_git_hosting do
 
       puts ''
 
-      options = { message: 'Gitolite configuration has been modified, resync all projects...', bypass_sidekiq: true }
-      RedmineGitHosting::GitoliteAccessor.update_projects 'all', options
-
+      RedmineGitHosting::GitoliteAccessor.update_projects 'all',
+                                                          message: 'Gitolite configuration has been modified, resync all projects...',
+                                                          bypass_sidekiq: true
       puts 'Done!'
     end