Remove EE-specific code from Issuable

app/models/concerns/issuable.rb

@@ -23,6 +23,8 @@ module Issuable
   include CreatedAtFilterable
   include UpdatedAtFilterable
 
+  prepend EE::Issuable
+
   # This object is used to gather issuable meta data for displaying
   # upvotes, downvotes, notes and closing merge requests count for issues and merge requests
   # lists avoiding n+1 queries and improving performance.
@@ -80,9 +82,6 @@ module Issuable
     scope :opened, -> { with_state(:opened) }
     scope :only_opened, -> { with_state(:opened) }
     scope :closed, -> { with_state(:closed) }
-    scope :order_milestone_due_desc, -> { outer_join_milestone.reorder('milestones.due_date IS NULL ASC, milestones.due_date DESC, milestones.id DESC') }
-    scope :order_milestone_due_asc, -> { outer_join_milestone.reorder('milestones.due_date IS NULL ASC, milestones.due_date ASC, milestones.id ASC') }
-    scope :without_label, -> { joins("LEFT OUTER JOIN label_links ON label_links.target_type = '#{name}' AND label_links.target_id = #{table_name}.id").where(label_links: { id: nil }) }
 
     scope :left_joins_milestones,    -> { joins("LEFT OUTER JOIN milestones ON #{table_name}.milestone_id = milestones.id") }
     scope :order_milestone_due_desc, -> { left_joins_milestones.reorder('milestones.due_date IS NULL, milestones.id IS NULL, milestones.due_date DESC') }
@@ -207,17 +206,6 @@ module Issuable
       end
     end
 
-    def labels_hash
-      issue_labels = Hash.new { |h, k| h[k] = [] }
-
-      relation = unscoped.where(id: self.select(:id)).eager_load(:labels)
-      relation.pluck(:id, 'labels.title').each do |issue_id, label|
-        issue_labels[issue_id] << label
-      end
-
-      issue_labels
-    end
-
     # Includes table keys in group by clause when sorting
     # preventing errors in postgres
     #

ee/app/models/concerns/ee/issuable.rb

+# frozen_string_literal: true
+
+module EE
+  module Issuable
+    extend ActiveSupport::Concern
+
+    class_methods do
+      def labels_hash
+        issue_labels = Hash.new { |h, k| h[k] = [] }
+
+        relation = unscoped.where(id: self.select(:id)).eager_load(:labels)
+        relation.pluck(:id, 'labels.title').each do |issue_id, label|
+          issue_labels[issue_id] << label
+        end
+
+        issue_labels
+      end
+    end
+  end
+end