Add latest changes from gitlab-org/gitlab@13-2-stable-ee

1 files changed, 11 insertions, 1 deletions

diff --git a/lib/gitlab/utils.rb b/lib/gitlab/utils.rb
index e80cc51dc3b..8f5c1eda456 100644
--- a/lib/gitlab/utils.rb
+++ b/lib/gitlab/utils.rb
@@ -56,7 +56,7 @@ module Gitlab
     #   * Maximum length is 63 bytes
     #   * First/Last Character is not a hyphen
     def slugify(str)
-      return str.downcase
+      str.downcase
         .gsub(/[^a-z0-9]/, '-')[0..62]
         .gsub(/(\A-+|-+\z)/, '')
     end
@@ -178,5 +178,15 @@ module Gitlab
         .group_by(&:first)
         .transform_values { |kvs| kvs.map(&:last) }
     end
+
+    # This sort is stable (see https://en.wikipedia.org/wiki/Sorting_algorithm#Stability)
+    # contrary to the bare Ruby sort_by method. Using just sort_by leads to
+    # instability across different platforms (e.g., x86_64-linux and x86_64-darwin18)
+    # which in turn leads to different sorting results for the equal elements across
+    # these platforms.
+    # This method uses a list item's original index position to break ties.
+    def stable_sort_by(list)
+      list.sort_by.with_index { |x, idx| [yield(x), idx] }
+    end
   end
 end