diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-03-02 15:10:52 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-03-02 15:10:52 +0300 |
commit | 2ce2a08284a698742c24d1b50fab5f77aa5c6321 (patch) | |
tree | 962381f5cf4a6bbdcfeeef78ff35e4707720de58 /app/models/concerns/analytics | |
parent | 26a21ebddbfd2f814738a725f62750bf913796e3 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/models/concerns/analytics')
-rw-r--r-- | app/models/concerns/analytics/cycle_analytics/stage.rb | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/app/models/concerns/analytics/cycle_analytics/stage.rb b/app/models/concerns/analytics/cycle_analytics/stage.rb index 080ff07ec0c..f1c39dda49d 100644 --- a/app/models/concerns/analytics/cycle_analytics/stage.rb +++ b/app/models/concerns/analytics/cycle_analytics/stage.rb @@ -49,14 +49,6 @@ module Analytics end end - def start_event_identifier - backward_compatible_identifier(:start_event_identifier) || super - end - - def end_event_identifier - backward_compatible_identifier(:end_event_identifier) || super - end - def start_event_label_based? start_event_identifier && start_event.label_based? end @@ -136,17 +128,6 @@ module Analytics .id_in(label_id) .exists? end - - # Temporary, will be removed in 13.10 - def backward_compatible_identifier(attribute_name) - removed_identifier = 6 # References IssueFirstMentionedInCommit removed on https://gitlab.com/gitlab-org/gitlab/-/merge_requests/51975 - replacement_identifier = :issue_first_mentioned_in_commit - - # ActiveRecord returns nil if the column value is not part of the Enum definition - if self[attribute_name].nil? && read_attribute_before_type_cast(attribute_name) == removed_identifier - replacement_identifier - end - end end end end |