Add latest changes from gitlab-org/gitlab@master

1 files changed, 6 insertions, 0 deletions

diff --git a/app/models/concerns/analytics/cycle_analytics/stage.rb b/app/models/concerns/analytics/cycle_analytics/stage.rb
index 54e9a13d1ea..1376dd97a49 100644
--- a/app/models/concerns/analytics/cycle_analytics/stage.rb
+++ b/app/models/concerns/analytics/cycle_analytics/stage.rb
@@ -4,6 +4,7 @@ module Analytics
   module CycleAnalytics
     module Stage
       extend ActiveSupport::Concern
+      include RelativePositioning
 
       included do
         validates :name, presence: true
@@ -17,6 +18,7 @@ module Analytics
 
         alias_attribute :custom_stage?, :custom
         scope :default_stages, -> { where(custom: false) }
+        scope :ordered, -> { order(:relative_position, :id) }
       end
 
       def parent=(_)
@@ -58,6 +60,10 @@ module Analytics
           end_event_identifier.to_s.eql?(stage_params[:end_event_identifier].to_s)
       end
 
+      def find_with_same_parent!(id)
+        parent.cycle_analytics_stages.find(id)
+      end
+
       private
 
       def validate_stage_event_pairs