1 files changed, 12 insertions, 5 deletions
diff --git a/app/models/concerns/issue_available_features.rb b/app/models/concerns/issue_available_features.rb
index 6efb8103b7b..886db133a94 100644
--- a/app/models/concerns/issue_available_features.rb
+++ b/app/models/concerns/issue_available_features.rb
@@ -6,18 +6,25 @@
 module IssueAvailableFeatures
   extend ActiveSupport::Concern
 
-  # EE only features are listed on EE::IssueAvailableFeatures
-  def available_features_for_issue_types
-    {}.with_indifferent_access
+  class_methods do
+    # EE only features are listed on EE::IssueAvailableFeatures
+    def available_features_for_issue_types
+      {}.with_indifferent_access
+    end
+  end
+
+  included do
+    scope :with_feature, ->(feature) { where(issue_type: available_features_for_issue_types[feature]) }
   end
 
   def issue_type_supports?(feature)
-    unless available_features_for_issue_types.has_key?(feature)
+    unless self.class.available_features_for_issue_types.has_key?(feature)
       raise ArgumentError, 'invalid feature'
     end
 
-    available_features_for_issue_types[feature].include?(issue_type)
+    self.class.available_features_for_issue_types[feature].include?(issue_type)
   end
 end
 
 IssueAvailableFeatures.prepend_if_ee('EE::IssueAvailableFeatures')
+IssueAvailableFeatures::ClassMethods.prepend_if_ee('EE::IssueAvailableFeatures::ClassMethods')