Add latest changes from gitlab-org/gitlab@master

2 files changed, 63 insertions, 36 deletions

diff --git a/app/models/concerns/issuable.rb b/app/models/concerns/issuable.rb
index 9e3fba139e3..fe0fad4b9d5 100644
--- a/app/models/concerns/issuable.rb
+++ b/app/models/concerns/issuable.rb
@@ -13,6 +13,7 @@ module Issuable
   include CacheMarkdownField
   include Participable
   include Mentionable
+  include Milestoneable
   include Subscribable
   include StripAttribute
   include Awardable
@@ -56,7 +57,6 @@ module Issuable
     belongs_to :author, class_name: 'User'
     belongs_to :updated_by, class_name: 'User'
     belongs_to :last_edited_by, class_name: 'User'
-    belongs_to :milestone
 
     has_many :notes, as: :noteable, inverse_of: :noteable, dependent: :destroy do # rubocop:disable Cop/ActiveRecordDependent
       def authors_loaded?
@@ -89,18 +89,12 @@ module Issuable
     # to avoid breaking the existing Issuables which may have their descriptions longer
     validates :description, length: { maximum: DESCRIPTION_LENGTH_MAX }, allow_blank: true, on: :create
     validate :description_max_length_for_new_records_is_valid, on: :update
-    validate :milestone_is_valid
 
     before_validation :truncate_description_on_import!
 
     scope :authored, ->(user) { where(author_id: user) }
     scope :recent, -> { reorder(id: :desc) }
     scope :of_projects, ->(ids) { where(project_id: ids) }
-    scope :of_milestones, ->(ids) { where(milestone_id: ids) }
-    scope :any_milestone, -> { where('milestone_id IS NOT NULL') }
-    scope :with_milestone, ->(title) { left_joins_milestones.where(milestones: { title: title }) }
-    scope :any_release, -> { joins_milestone_releases }
-    scope :with_release, -> (tag, project_id) { joins_milestone_releases.where( milestones: { releases: { tag: tag, project_id: project_id } } ) }
     scope :opened, -> { with_state(:opened) }
     scope :only_opened, -> { with_state(:opened) }
     scope :closed, -> { with_state(:closed) }
@@ -118,20 +112,6 @@ module Issuable
     end
     # rubocop:enable GitlabSecurity/SqlInjection
 
-    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(Arel.sql('milestones.due_date IS NULL, milestones.id IS NULL, milestones.due_date DESC')) }
-    scope :order_milestone_due_asc,  -> { left_joins_milestones.reorder(Arel.sql('milestones.due_date IS NULL, milestones.id IS NULL, milestones.due_date ASC')) }
-
-    scope :without_release, -> do
-      joins("LEFT OUTER JOIN milestone_releases ON #{table_name}.milestone_id = milestone_releases.milestone_id")
-        .where('milestone_releases.release_id IS NULL')
-    end
-
-    scope :joins_milestone_releases, -> do
-      joins("JOIN milestone_releases ON #{table_name}.milestone_id = milestone_releases.milestone_id
-             JOIN releases ON milestone_releases.release_id = releases.id").distinct
-    end
-
     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 :any_label, -> { joins(:label_links).group(:id) }
     scope :join_project, -> { joins(:project) }
@@ -164,10 +144,6 @@ module Issuable
 
     private
 
-    def milestone_is_valid
-      errors.add(:milestone_id, message: "is invalid") if respond_to?(:milestone_id) && milestone_id.present? && !milestone_available?
-    end
-
     def description_max_length_for_new_records_is_valid
       if new_record? && description.length > Issuable::DESCRIPTION_LENGTH_MAX
         errors.add(:description, :too_long, count: Issuable::DESCRIPTION_LENGTH_MAX)
@@ -332,10 +308,6 @@ module Issuable
     project
   end
 
-  def milestone_available?
-    project_id == milestone&.project_id || project.ancestors_upto.compact.include?(milestone&.group)
-  end
-
   def assignee_or_author?(user)
     author_id == user.id || assignees.exists?(user.id)
   end
@@ -482,13 +454,6 @@ module Issuable
   def wipless_title_changed(old_title)
     old_title != title
   end
-
-  ##
-  # Overridden on EE module
-  #
-  def supports_milestone?
-    respond_to?(:milestone_id)
-  end
 end
 
 Issuable.prepend_if_ee('EE::Issuable') # rubocop: disable Cop/InjectEnterpriseEditionModule
diff --git a/app/models/concerns/milestoneable.rb b/app/models/concerns/milestoneable.rb
new file mode 100644
index 00000000000..7fb3f95bf0a
--- /dev/null
+++ b/app/models/concerns/milestoneable.rb
@@ -0,0 +1,62 @@
+# frozen_string_literal: true
+
+# == Milestoneable concern
+#
+# Contains functionality related to objects that can be assigned Milestones
+#
+# Used by Issuable
+#
+module Milestoneable
+  extend ActiveSupport::Concern
+
+  included do
+    belongs_to :milestone
+
+    validate :milestone_is_valid
+
+    after_save :write_to_new_milestone_relationship
+
+    scope :of_milestones, ->(ids) { where(milestone_id: ids) }
+    scope :any_milestone, -> { where('milestone_id IS NOT NULL') }
+    scope :with_milestone, ->(title) { left_joins_milestones.where(milestones: { title: title }) }
+    scope :any_release, -> { joins_milestone_releases }
+    scope :with_release, -> (tag, project_id) { joins_milestone_releases.where( milestones: { releases: { tag: tag, project_id: project_id } } ) }
+
+    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(Arel.sql('milestones.due_date IS NULL, milestones.id IS NULL, milestones.due_date DESC')) }
+    scope :order_milestone_due_asc,  -> { left_joins_milestones.reorder(Arel.sql('milestones.due_date IS NULL, milestones.id IS NULL, milestones.due_date ASC')) }
+
+    scope :without_release, -> do
+      joins("LEFT OUTER JOIN milestone_releases ON #{table_name}.milestone_id = milestone_releases.milestone_id")
+        .where('milestone_releases.release_id IS NULL')
+    end
+
+    scope :joins_milestone_releases, -> do
+      joins("JOIN milestone_releases ON #{table_name}.milestone_id = milestone_releases.milestone_id
+             JOIN releases ON milestone_releases.release_id = releases.id").distinct
+    end
+
+    private
+
+    def milestone_is_valid
+      errors.add(:milestone_id, message: "is invalid") if respond_to?(:milestone_id) && milestone_id.present? && !milestone_available?
+    end
+
+    def write_to_new_milestone_relationship
+      self.milestones = [milestone].compact if supports_milestone? && saved_change_to_milestone_id?
+    end
+  end
+
+  def milestone_available?
+    project_id == milestone&.project_id || project.ancestors_upto.compact.include?(milestone&.group)
+  end
+
+  ##
+  # Overridden on EE module
+  #
+  def supports_milestone?
+    respond_to?(:milestone_id)
+  end
+end
+
+Milestoneable.prepend_if_ee('EE::Milestoneable')