Add latest changes from gitlab-org/gitlab@master

3 files changed, 6 insertions, 33 deletions

diff --git a/app/services/concerns/integrations/project_test_data.rb b/app/services/concerns/integrations/project_test_data.rb
index f27a4e1c224..57bcba98b49 100644
--- a/app/services/concerns/integrations/project_test_data.rb
+++ b/app/services/concerns/integrations/project_test_data.rb
@@ -8,10 +8,6 @@ module Integrations
       Gitlab::DataBuilder::Push.build_sample(project, current_user)
     end
 
-    def use_newest_record?
-      Feature.enabled?(:integrations_test_webhook_reorder, project)
-    end
-
     def note_events_data
       note = NotesFinder.new(current_user, project: project, target: project).execute.reorder(nil).last # rubocop: disable CodeReuse/ActiveRecord
 
@@ -37,11 +33,7 @@ module Integrations
     end
 
     def job_events_data
-      build = if use_newest_record?
-                Ci::JobsFinder.new(current_user: current_user, project: project).execute.first
-              else
-                project.builds.first
-              end
+      build = Ci::JobsFinder.new(current_user: current_user, project: project).execute.first
 
       return { error: s_('TestHooks|Ensure the project has CI jobs.') } unless build.present?
 
@@ -49,11 +41,7 @@ module Integrations
     end
 
     def pipeline_events_data
-      pipeline = if use_newest_record?
-                   Ci::PipelinesFinder.new(project, current_user, order_by: 'id', sort: 'desc').execute.first
-                 else
-                   project.ci_pipelines.newest_first.first
-                 end
+      pipeline = Ci::PipelinesFinder.new(project, current_user, order_by: 'id', sort: 'desc').execute.first
 
       return { error: s_('TestHooks|Ensure the project has CI pipelines.') } unless pipeline.present?
 
@@ -71,11 +59,7 @@ module Integrations
     end
 
     def deployment_events_data
-      deployment = if use_newest_record?
-                     DeploymentsFinder.new(project: project, order_by: 'created_at', sort: 'desc').execute.first
-                   else
-                     project.deployments.first
-                   end
+      deployment = DeploymentsFinder.new(project: project, order_by: 'created_at', sort: 'desc').execute.first
 
       return { error: s_('TestHooks|Ensure the project has deployments.') } unless deployment.present?
 
@@ -83,11 +67,7 @@ module Integrations
     end
 
     def releases_events_data
-      release = if use_newest_record?
-                  ReleasesFinder.new(project, current_user, order_by: :created_at, sort: :desc).execute.first
-                else
-                  project.releases.first
-                end
+      release = ReleasesFinder.new(project, current_user, order_by: :created_at, sort: :desc).execute.first
 
       return { error: s_('TestHooks|Ensure the project has releases.') } unless release.present?
 
diff --git a/app/services/merge_requests/create_from_issue_service.rb b/app/services/merge_requests/create_from_issue_service.rb
index 78b462174c9..b43e697d3ab 100644
--- a/app/services/merge_requests/create_from_issue_service.rb
+++ b/app/services/merge_requests/create_from_issue_service.rb
@@ -25,6 +25,7 @@ module MergeRequests
       new_merge_request = create(merge_request)
 
       if new_merge_request.valid?
+        merge_request_activity_counter.track_mr_create_from_issue(user: current_user)
         SystemNoteService.new_merge_request(issue, project, current_user, new_merge_request)
 
         success(new_merge_request)
diff --git a/app/services/test_hooks/system_service.rb b/app/services/test_hooks/system_service.rb
index ddec45343e9..10d23421719 100644
--- a/app/services/test_hooks/system_service.rb
+++ b/app/services/test_hooks/system_service.rb
@@ -6,10 +6,6 @@ module TestHooks
 
     private
 
-    def use_newest_record?
-      Feature.enabled?(:integrations_test_webhook_reorder)
-    end
-
     def data
       strong_memoize(:data) do
         case trigger
@@ -24,11 +20,7 @@ module TestHooks
     end
 
     def merge_requests_events_data
-      merge_request = if use_newest_record?
-                        MergeRequest.of_projects(current_user.projects.select(:id)).last
-                      else
-                        MergeRequest.of_projects(current_user.projects.select(:id)).first
-                      end
+      merge_request = MergeRequest.of_projects(current_user.projects.select(:id)).last
 
       return { error: s_('TestHooks|Ensure one of your projects has merge requests.') } unless merge_request.present?