Add latest changes from gitlab-org/gitlab@master

1 files changed, 4 insertions, 3 deletions

diff --git a/lib/api/helpers.rb b/lib/api/helpers.rb
index 3bbc1d71852..db08bc6c63a 100644
--- a/lib/api/helpers.rb
+++ b/lib/api/helpers.rb
@@ -462,8 +462,8 @@ module API
       items.search(text)
     end
 
-    def order_options_with_tie_breaker
-      order_by = if params[:order_by] == 'created_at'
+    def order_options_with_tie_breaker(override_created_at: true)
+      order_by = if params[:order_by] == 'created_at' && override_created_at
                    'id'
                  else
                    params[:order_by]
@@ -700,7 +700,7 @@ module API
       Gitlab::AppLogger.warn("Redis tracking event failed for event: #{event_name}, message: #{error.message}")
     end
 
-    def track_event(event_name, user:, namespace_id: nil, project_id: nil)
+    def track_event(event_name, user:, send_snowplow_event: true, namespace_id: nil, project_id: nil)
       return unless user.present?
 
       namespace = Namespace.find(namespace_id) if namespace_id
@@ -708,6 +708,7 @@ module API
 
       Gitlab::InternalEvents.track_event(
         event_name,
+        send_snowplow_event: send_snowplow_event,
         user: user,
         namespace: namespace,
         project: project