Add latest changes from gitlab-org/gitlab@15-9-stable-eev15.9.0-rc42

1 files changed, 11 insertions, 0 deletions

diff --git a/app/models/concerns/ci/has_variable.rb b/app/models/concerns/ci/has_variable.rb
index 3b437fbba16..77e7e5035a0 100644
--- a/app/models/concerns/ci/has_variable.rb
+++ b/app/models/concerns/ci/has_variable.rb
@@ -18,6 +18,7 @@ module Ci
 
       scope :by_key, -> (key) { where(key: key) }
       scope :order_key_asc, -> { reorder(key: :asc) }
+      scope :order_key_desc, -> { reorder(key: :desc) }
 
       attr_encrypted :value,
         mode: :per_attribute_iv_and_salt,
@@ -30,6 +31,16 @@ module Ci
       end
     end
 
+    class_methods do
+      def order_by(method)
+        case method.to_s
+        when 'key_asc' then order_key_asc
+        when 'key_desc' then order_key_desc
+        else all
+        end
+      end
+    end
+
     def to_runner_variable
       var_cache_key = to_runner_variable_cache_key