Add latest changes from gitlab-org/gitlab@13-2-stable-ee

1 files changed, 7 insertions, 2 deletions

diff --git a/lib/gitlab/analytics/cycle_analytics/stage_events/plan_stage_start.rb b/lib/gitlab/analytics/cycle_analytics/stage_events/plan_stage_start.rb
index 37168a1fb0f..bddc326de71 100644
--- a/lib/gitlab/analytics/cycle_analytics/stage_events/plan_stage_start.rb
+++ b/lib/gitlab/analytics/cycle_analytics/stage_events/plan_stage_start.rb
@@ -18,10 +18,15 @@ module Gitlab
           end
 
           def timestamp_projection
-            Arel::Nodes::NamedFunction.new('COALESCE', [
+            Arel::Nodes::NamedFunction.new('COALESCE', column_list)
+          end
+
+          override :column_list
+          def column_list
+            [
               issue_metrics_table[:first_associated_with_milestone_at],
               issue_metrics_table[:first_added_to_board_at]
-            ])
+            ]
           end
 
           # rubocop: disable CodeReuse/ActiveRecord