Add latest changes from gitlab-org/gitlab@master

3 files changed, 11 insertions, 2 deletions

diff --git a/app/models/analytics/cycle_analytics/project_stage.rb b/app/models/analytics/cycle_analytics/project_stage.rb
index a312bd24e78..23f0db0829b 100644
--- a/app/models/analytics/cycle_analytics/project_stage.rb
+++ b/app/models/analytics/cycle_analytics/project_stage.rb
@@ -9,6 +9,7 @@ module Analytics
       belongs_to :project
 
       alias_attribute :parent, :project
+      alias_attribute :parent_id, :project_id
     end
   end
 end
diff --git a/app/models/concerns/analytics/cycle_analytics/stage.rb b/app/models/concerns/analytics/cycle_analytics/stage.rb
index 0011ba10a9a..54e9a13d1ea 100644
--- a/app/models/concerns/analytics/cycle_analytics/stage.rb
+++ b/app/models/concerns/analytics/cycle_analytics/stage.rb
@@ -47,11 +47,17 @@ module Analytics
         !custom
       end
 
-      # The model that is going to be queried, Issue or MergeRequest
-      def subject_model
+      # The model class that is going to be queried, Issue or MergeRequest
+      def subject_class
         start_event.object_type
       end
 
+      def matches_with_stage_params?(stage_params)
+        default_stage? &&
+          start_event_identifier.to_s.eql?(stage_params[:start_event_identifier].to_s) &&
+          end_event_identifier.to_s.eql?(stage_params[:end_event_identifier].to_s)
+      end
+
       private
 
       def validate_stage_event_pairs
diff --git a/app/models/merge_request_diff.rb b/app/models/merge_request_diff.rb
index 7706119681d..ca50820a879 100644
--- a/app/models/merge_request_diff.rb
+++ b/app/models/merge_request_diff.rb
@@ -591,3 +591,5 @@ class MergeRequestDiff < ApplicationRecord
     end
   end
 end
+
+MergeRequestDiff.prepend_if_ee('EE::MergeRequestDiff')