Add latest changes from gitlab-org/gitlab@master

2 files changed, 5 insertions, 20 deletions

diff --git a/app/services/ci/daily_build_group_report_result_service.rb b/app/services/ci/daily_build_group_report_result_service.rb
index bc966fb9634..820e6e08fc5 100644
--- a/app/services/ci/daily_build_group_report_result_service.rb
+++ b/app/services/ci/daily_build_group_report_result_service.rb
@@ -14,7 +14,8 @@ module Ci
         ref_path: pipeline.source_ref_path,
         date: pipeline.created_at.to_date,
         last_pipeline_id: pipeline.id,
-        default_branch: pipeline.default_branch?
+        default_branch: pipeline.default_branch?,
+        group_id: pipeline.project&.group&.id
       }
 
       aggregate(pipeline.builds.with_coverage).map do |group_name, group|
diff --git a/app/services/concerns/integrations/project_test_data.rb b/app/services/concerns/integrations/project_test_data.rb
index 11eb2cd4ca7..726f450b41c 100644
--- a/app/services/concerns/integrations/project_test_data.rb
+++ b/app/services/concerns/integrations/project_test_data.rb
@@ -8,16 +8,8 @@ module Integrations
       Gitlab::DataBuilder::Push.build_sample(project, current_user)
     end
 
-    def use_optimal_query?
-      Feature.enabled?(:integrations_test_webhook_optimizations, project)
-    end
-
     def note_events_data
-      note = if use_optimal_query?
-               NotesFinder.new(current_user, project: project, target: project).execute.reorder(nil).last # rubocop: disable CodeReuse/ActiveRecord
-             else
-               project.notes.first
-             end
+      note = NotesFinder.new(current_user, project: project, target: project).execute.reorder(nil).last # rubocop: disable CodeReuse/ActiveRecord
 
       return { error: s_('TestHooks|Ensure the project has notes.') } unless note.present?
 
@@ -25,11 +17,7 @@ module Integrations
     end
 
     def issues_events_data
-      issue = if use_optimal_query?
-                IssuesFinder.new(current_user, project_id: project.id, sort: 'created_desc').execute.first
-              else
-                project.issues.first
-              end
+      issue = IssuesFinder.new(current_user, project_id: project.id, sort: 'created_desc').execute.first
 
       return { error: s_('TestHooks|Ensure the project has issues.') } unless issue.present?
 
@@ -37,11 +25,7 @@ module Integrations
     end
 
     def merge_requests_events_data
-      merge_request = if use_optimal_query?
-                        MergeRequestsFinder.new(current_user, project_id: project.id, sort: 'created_desc').execute.first
-                      else
-                        project.merge_requests.first
-                      end
+      merge_request = MergeRequestsFinder.new(current_user, project_id: project.id, sort: 'created_desc').execute.first
 
       return { error: s_('TestHooks|Ensure the project has merge requests.') } unless merge_request.present?