summaryrefslogtreecommitdiff
path: root/app/models/concerns
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2019-11-25 21:06:28 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2019-11-25 21:06:28 +0000
commiteb7390edf3afd52174b786fff1e06d5ffae0cec5 (patch)
tree395dce44e5ea2b55704414e4d38fc24da4b1b676 /app/models/concerns
parent801ced25ff0540b096c395f9ac8d2d9e005878e8 (diff)
downloadgitlab-ce-eb7390edf3afd52174b786fff1e06d5ffae0cec5.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/models/concerns')
-rw-r--r--app/models/concerns/analytics/cycle_analytics/stage.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/app/models/concerns/analytics/cycle_analytics/stage.rb b/app/models/concerns/analytics/cycle_analytics/stage.rb
index 0e07806dd6f..dde73b567db 100644
--- a/app/models/concerns/analytics/cycle_analytics/stage.rb
+++ b/app/models/concerns/analytics/cycle_analytics/stage.rb
@@ -26,6 +26,7 @@ module Analytics
alias_attribute :custom_stage?, :custom
scope :default_stages, -> { where(custom: false) }
scope :ordered, -> { order(:relative_position, :id) }
+ scope :for_list, -> { includes(:start_event_label, :end_event_label).ordered }
end
def parent=(_)