summaryrefslogtreecommitdiff
path: root/tooling
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2021-10-28 12:10:22 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2021-10-28 12:10:22 +0000
commitd2f4295270852f1ec4b9736f1db493421729474d (patch)
treec3bb3833ab7b6039a6b7223cc26745d373295fa3 /tooling
parent89cbcca95d58b6185098c13467d2382032f11774 (diff)
downloadgitlab-ce-d2f4295270852f1ec4b9736f1db493421729474d.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'tooling')
-rw-r--r--tooling/deprecations/docs.rb6
1 files changed, 4 insertions, 2 deletions
diff --git a/tooling/deprecations/docs.rb b/tooling/deprecations/docs.rb
index 67ff7a932b4..0f649024b60 100644
--- a/tooling/deprecations/docs.rb
+++ b/tooling/deprecations/docs.rb
@@ -20,9 +20,11 @@ module Deprecations
YAML.load_file(file)
end
- deprecations = VersionSorter.sort(deprecations) { |d| d["removal_milestone"] }
+ deps = VersionSorter.sort(deprecations) { |d| d["removal_milestone"] }
- milestones = deprecations.map { |d| d["removal_milestone"] }.uniq
+ deprecations = deps.sort_by { |d| d["name"] }
+
+ milestones = deps.map { |d| d["removal_milestone"] }.uniq
template = Rails.root.join("data/deprecations/templates/_deprecation_template.md.erb")