diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-01-20 18:08:53 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-01-20 18:08:53 +0300 |
commit | 709948b7a69597b1efe24df9b0f388cc0b493dd9 (patch) | |
tree | a6cbb0b7a1243c5308f8d5afb703d1980edb4595 /app/models/analytics | |
parent | 50ea04b6c6823aa1bd8d64cd9a77dcbd03b19053 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/models/analytics')
-rw-r--r-- | app/models/analytics/cycle_analytics/project_stage.rb | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/app/models/analytics/cycle_analytics/project_stage.rb b/app/models/analytics/cycle_analytics/project_stage.rb index 8a80514333f..7e121399b1e 100644 --- a/app/models/analytics/cycle_analytics/project_stage.rb +++ b/app/models/analytics/cycle_analytics/project_stage.rb @@ -8,23 +8,14 @@ module Analytics belongs_to :project, optional: false belongs_to :value_stream, class_name: 'Analytics::CycleAnalytics::ProjectValueStream', foreign_key: :project_value_stream_id - alias_attribute :parent, :project - alias_attribute :parent_id, :project_id - alias_attribute :value_stream_id, :project_value_stream_id delegate :group, to: :project + alias_attribute :parent, :project + alias_attribute :parent_id, :project_id validate :validate_project_group_for_label_events, if: -> { start_event_label_based? || end_event_label_based? } - def self.relative_positioning_query_base(stage) - where(project_id: stage.project_id) - end - - def self.relative_positioning_parent_column - :project_id - end - def self.distinct_stages_within_hierarchy(group) with_preloaded_labels .where(project_id: group.all_projects.select(:id)) |