Add latest changes from gitlab-org/gitlab@14-4-stable-eev14.4.0-rc42

4 files changed, 16 insertions, 0 deletions

diff --git a/lib/gitlab/analytics/cycle_analytics/stage_events/code_stage_start.rb b/lib/gitlab/analytics/cycle_analytics/stage_events/code_stage_start.rb
index 8e87245e62b..fda4ab0207d 100644
--- a/lib/gitlab/analytics/cycle_analytics/stage_events/code_stage_start.rb
+++ b/lib/gitlab/analytics/cycle_analytics/stage_events/code_stage_start.rb
@@ -53,6 +53,10 @@ module Gitlab
               .on(mr_metrics_table[:merge_request_id].eq(mr_table[:id]))
               .join_sources
           end
+
+          def include_in(query)
+            query.left_joins(merge_requests_closing_issues: { issue: [:metrics] }, metrics: [])
+          end
         end
       end
     end
diff --git a/lib/gitlab/analytics/cycle_analytics/stage_events/issue_deployed_to_production.rb b/lib/gitlab/analytics/cycle_analytics/stage_events/issue_deployed_to_production.rb
index 4ca3c19051e..0cb081c64c4 100644
--- a/lib/gitlab/analytics/cycle_analytics/stage_events/issue_deployed_to_production.rb
+++ b/lib/gitlab/analytics/cycle_analytics/stage_events/issue_deployed_to_production.rb
@@ -26,6 +26,10 @@ module Gitlab
             query.joins(merge_requests_closing_issues: { merge_request: [:metrics] }).where(mr_metrics_table[:first_deployed_to_production_at].gteq(mr_table[:created_at]))
           end
           # rubocop: enable CodeReuse/ActiveRecord
+
+          def include_in(query)
+            query.left_joins(merge_requests_closing_issues: { merge_request: [:metrics] })
+          end
         end
       end
     end
diff --git a/lib/gitlab/analytics/cycle_analytics/stage_events/metrics_based_stage_event.rb b/lib/gitlab/analytics/cycle_analytics/stage_events/metrics_based_stage_event.rb
index fd30ab5277d..e191b0fe897 100644
--- a/lib/gitlab/analytics/cycle_analytics/stage_events/metrics_based_stage_event.rb
+++ b/lib/gitlab/analytics/cycle_analytics/stage_events/metrics_based_stage_event.rb
@@ -20,6 +20,10 @@ module Gitlab
           def column_list
             [timestamp_projection]
           end
+
+          def include_in(query)
+            super.left_joins(:metrics)
+          end
         end
       end
     end
diff --git a/lib/gitlab/analytics/cycle_analytics/stage_events/stage_event.rb b/lib/gitlab/analytics/cycle_analytics/stage_events/stage_event.rb
index 8eb067ed0ec..945cecfcf8c 100644
--- a/lib/gitlab/analytics/cycle_analytics/stage_events/stage_event.rb
+++ b/lib/gitlab/analytics/cycle_analytics/stage_events/stage_event.rb
@@ -61,6 +61,10 @@ module Gitlab
           end
           # rubocop: enable CodeReuse/ActiveRecord
 
+          def include_in(query)
+            query
+          end
+
           def self.label_based?
             false
           end