Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-docs.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSuzanne Selhorn <sselhorn@gitlab.com>2023-02-15 21:43:48 +0300
committerSuzanne Selhorn <sselhorn@gitlab.com>2023-02-15 21:43:48 +0300
commit84878b84f7274433a39802bec2351a8bf42382f6 (patch)
tree425f32c0480b0a6f124a5230ab067e6d2c854b4a
parent72242bb2aeec3149bafc9b32dc005c94dae848e5 (diff)
parentd04e9aa15123d62b693adac200c5d2de567169e0 (diff)
Merge branch 'axil-sort-ff-milestone' into 'main'
Sort feature flags table by milestone See merge request https://gitlab.com/gitlab-org/gitlab-docs/-/merge_requests/3547 Merged-by: Suzanne Selhorn <sselhorn@gitlab.com> Co-authored-by: Achilleas Pipinellis <axil@gitlab.com>
-rw-r--r--layouts/feature_flags_table.md.erb6
1 files changed, 3 insertions, 3 deletions
diff --git a/layouts/feature_flags_table.md.erb b/layouts/feature_flags_table.md.erb
index 97457c80..7e39fb3a 100644
--- a/layouts/feature_flags_table.md.erb
+++ b/layouts/feature_flags_table.md.erb
@@ -27,11 +27,11 @@ The feature flags available to you depend on:
<%= ffs.count %> feature flags are available in <%= product %>.
-<% sorted_ff = ffs.sort_by { |ff| ff[:name] } %>
+<% sorted_ff = ffs.sort_by { |ff| ff[:milestone].to_f } %>
| Name | Group | Milestone | Default state | Rollout issue |
|------|--------|-----------|---------------|---------------|
-<% sorted_ff.each do |ff| %>| <%= ff[:introduced_by_url] ? "[`#{ff[:name]}`](#{ff[:introduced_by_url]})" : "`#{ff[:name]}`" %> | `<%= ff[:group] || 'Not defined' %>` | <%= ff[:milestone] || 'Not defined' %> | <%= enabled_state(ff) %> | <%= ff[:rollout_issue_url] ? "<#{ff[:rollout_issue_url]}>" : 'Not defined' %> |
+<% sorted_ff.reverse.each do |ff| %>| <%= ff[:introduced_by_url] ? "[`#{ff[:name]}`](#{ff[:introduced_by_url]})" : "`#{ff[:name]}`" %> | `<%= ff[:group] || 'Not defined' %>` | <%= ff[:milestone] || 'Not defined' %> | <%= enabled_state(ff) %> | <%= ff[:rollout_issue_url] ? "<#{ff[:rollout_issue_url]}>" : 'Not defined' %> |
<% end %>
<% end %>
@@ -61,6 +61,6 @@ GitLab features [are delivered](https://about.gitlab.com/handbook/engineering/re
| Milestone | Count | Enabled | Disabled |
|-----------|-------|---------|----------|
-<% ff_milestones.each do |milestone, ffs| %> | <%= milestone %> | <%= ffs.count %> | <%= enabled_count(ffs) %> | <%= disabled_count(ffs) %> |
+<% ff_milestones.reverse.each do |milestone, ffs| %> | <%= milestone %> | <%= ffs.count %> | <%= enabled_count(ffs) %> | <%= disabled_count(ffs) %> |
<% end %>
<% end %>