summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGo MAEDA <maeda@farend.jp>2024-01-27 06:01:10 +0000
committerGo MAEDA <maeda@farend.jp>2024-01-27 06:01:10 +0000
commitae971404ccacf2d158c7d3b9d381f41d362def94 (patch)
tree5adfc44b72d30cafcbab6208399953cb88e12875
parentbac1e2213ab005745ee7e2a64195d931333c8a55 (diff)
downloadredmine-ae971404ccacf2d158c7d3b9d381f41d362def94.tar.gz
redmine-ae971404ccacf2d158c7d3b9d381f41d362def94.zip
Fix RuboCop offense Lint/RedundantDirGlobSort (#38585).
git-svn-id: https://svn.redmine.org/redmine/trunk@22651 e93f8b46-1217-0410-a6f0-8f06a7374b81
-rw-r--r--config/initializers/00-core_plugins.rb2
-rw-r--r--lib/redmine/plugin_loader.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/config/initializers/00-core_plugins.rb b/config/initializers/00-core_plugins.rb
index e20599000..4fbab3250 100644
--- a/config/initializers/00-core_plugins.rb
+++ b/config/initializers/00-core_plugins.rb
@@ -1,7 +1,7 @@
# frozen_string_literal: true
# Loads the core plugins located in lib/plugins
-Dir.glob(Rails.root.join('lib/plugins/*')).sort.each do |directory|
+Dir.glob(Rails.root.join('lib/plugins/*')).each do |directory|
next unless File.directory?(directory)
initializer = File.join(directory, 'init.rb')
diff --git a/lib/redmine/plugin_loader.rb b/lib/redmine/plugin_loader.rb
index 9323b18a7..5b4b49374 100644
--- a/lib/redmine/plugin_loader.rb
+++ b/lib/redmine/plugin_loader.rb
@@ -67,7 +67,7 @@ module Redmine
def self.setup
@plugin_directories = []
- Dir.glob(File.join(directory, '*')).sort.each do |directory|
+ Dir.glob(File.join(directory, '*')).each do |directory|
next unless File.directory?(directory)
@plugin_directories << PluginPath.new(directory)