Use Array#intersect? introduced in Ruby 3.1 (#38585).

git-svn-id: https://svn.redmine.org/redmine/trunk@22972 e93f8b46-1217-0410-a6f0-8f06a7374b81

6 files changed, 6 insertions, 6 deletions

diff --git a/app/models/issue_custom_field.rb b/app/models/issue_custom_field.rb
index 8363bc397..ae460e221 100644
--- a/app/models/issue_custom_field.rb
+++ b/app/models/issue_custom_field.rb
@@ -29,7 +29,7 @@ class IssueCustomField < CustomField
   end
 
   def visible_by?(project, user=User.current)
-    super || (roles & user.roles_for_project(project)).present?
+    super || roles.intersect?(user.roles_for_project(project))
   end
 
   def visibility_by_project_condition(project_key=nil, user=User.current, id_column=nil)
diff --git a/app/models/mail_handler.rb b/app/models/mail_handler.rb
index 2cbc8a5c7..b6858d96a 100644
--- a/app/models/mail_handler.rb
+++ b/app/models/mail_handler.rb
@@ -398,7 +398,7 @@ class MailHandler < ActionMailer::Base
           if options.key?(:override)
             options[:override]
           else
-            (handler_options[:allow_override] & [attr.to_s.downcase.gsub(/\s+/, '_'), 'all']).present?
+            handler_options[:allow_override].intersect?([attr.to_s.downcase.gsub(/\s+/, '_'), 'all'])
           end
         if override && (v = extract_keyword!(cleaned_up_text_body, attr, options[:format]))
           v
diff --git a/app/models/project_custom_field.rb b/app/models/project_custom_field.rb
index 6c11b225f..1816f5060 100644
--- a/app/models/project_custom_field.rb
+++ b/app/models/project_custom_field.rb
@@ -23,7 +23,7 @@ class ProjectCustomField < CustomField
   end
 
   def visible_by?(project, user=User.current)
-    super || (roles & user.roles_for_project(project)).present?
+    super || roles.intersect?(user.roles_for_project(project))
   end
 
   def visibility_by_project_condition(project_key=nil, user=User.current, id_column=nil)
diff --git a/app/models/query.rb b/app/models/query.rb
index 0f8793122..4e0088174 100644
--- a/app/models/query.rb
+++ b/app/models/query.rb
@@ -417,7 +417,7 @@ class Query < ApplicationRecord
       true
     when VISIBILITY_ROLES
       if project
-        (user.roles_for_project(project) & roles).any?
+        user.roles_for_project(project).intersect?(roles)
       else
         user.memberships.joins(:member_roles).where(:member_roles => {:role_id => roles.map(&:id)}).any?
       end
diff --git a/app/models/time_entry_custom_field.rb b/app/models/time_entry_custom_field.rb
index 69dcce59d..d52f7fc31 100644
--- a/app/models/time_entry_custom_field.rb
+++ b/app/models/time_entry_custom_field.rb
@@ -23,7 +23,7 @@ class TimeEntryCustomField < CustomField
   end
 
   def visible_by?(project, user=User.current)
-    super || (roles & user.roles_for_project(project)).present?
+    super || roles.intersect?(user.roles_for_project(project))
   end
 
   def validate_custom_field
diff --git a/app/models/version_custom_field.rb b/app/models/version_custom_field.rb
index 075bbe675..6f7dd1a50 100644
--- a/app/models/version_custom_field.rb
+++ b/app/models/version_custom_field.rb
@@ -23,6 +23,6 @@ class VersionCustomField < CustomField
   end
 
   def visible_by?(project, user=User.current)
-    super || (roles & user.roles_for_project(project)).present?
+    super || roles.intersect?(user.roles_for_project(project))
   end
 end