Add latest changes from gitlab-org/gitlab@master

1 files changed, 8 insertions, 1 deletions

diff --git a/lib/api/helpers.rb b/lib/api/helpers.rb
index f3d7650693d..a079c591519 100644
--- a/lib/api/helpers.rb
+++ b/lib/api/helpers.rb
@@ -394,7 +394,14 @@ module API
     end
 
     def order_options_with_tie_breaker
-      order_options = { params[:order_by] => params[:sort] }
+      order_by = if Feature.enabled?(:replace_order_by_created_at_with_id) &&
+                    params[:order_by] == 'created_at'
+                   'id'
+                 else
+                   params[:order_by]
+                 end
+
+      order_options = { order_by => params[:sort] }
       order_options['id'] ||= params[:sort] || 'asc'
       order_options
     end