Add latest changes from gitlab-org/gitlab@master

1 files changed, 10 insertions, 1 deletions

diff --git a/app/services/test_hooks/system_service.rb b/app/services/test_hooks/system_service.rb
index 66d78bfc578..ddec45343e9 100644
--- a/app/services/test_hooks/system_service.rb
+++ b/app/services/test_hooks/system_service.rb
@@ -6,6 +6,10 @@ module TestHooks
 
     private
 
+    def use_newest_record?
+      Feature.enabled?(:integrations_test_webhook_reorder)
+    end
+
     def data
       strong_memoize(:data) do
         case trigger
@@ -20,7 +24,12 @@ module TestHooks
     end
 
     def merge_requests_events_data
-      merge_request = MergeRequest.of_projects(current_user.projects.select(:id)).first
+      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
+
       return { error: s_('TestHooks|Ensure one of your projects has merge requests.') } unless merge_request.present?
 
       merge_request.to_hook_data(current_user)