diff options
| author | Joshua Lambert <joshua@gitlab.com> | 2018-04-06 14:26:23 -0400 |
|---|---|---|
| committer | Joshua Lambert <joshua@gitlab.com> | 2018-04-06 14:37:45 -0400 |
| commit | 1beb9a9fb0218b55c4338d4cc0d60f40bd053ac6 (patch) | |
| tree | 768d57e5c0f22e2d4cf324f7912c6495fbb99990 | |
| parent | b9c62c21c6e1dd06e8b68fff5cfa6b13aaf87ae9 (diff) | |
| download | gitlab-ce-fix-dashboard-sorting.tar.gz | |
Fix dashboard sortingfix-dashboard-sorting
| -rw-r--r-- | app/assets/javascripts/monitoring/stores/monitoring_store.js | 2 | ||||
| -rw-r--r-- | changelogs/unreleased/fix-dashboard-sorting.yml | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/app/assets/javascripts/monitoring/stores/monitoring_store.js b/app/assets/javascripts/monitoring/stores/monitoring_store.js index 854636e9a89..535c415cd6d 100644 --- a/app/assets/javascripts/monitoring/stores/monitoring_store.js +++ b/app/assets/javascripts/monitoring/stores/monitoring_store.js @@ -1,7 +1,7 @@ import _ from 'underscore'; function sortMetrics(metrics) { - return _.chain(metrics).sortBy('weight').sortBy('title').value(); + return _.chain(metrics).sortBy('title').sortBy('weight').value(); } function normalizeMetrics(metrics) { diff --git a/changelogs/unreleased/fix-dashboard-sorting.yml b/changelogs/unreleased/fix-dashboard-sorting.yml new file mode 100644 index 00000000000..62557e839a1 --- /dev/null +++ b/changelogs/unreleased/fix-dashboard-sorting.yml @@ -0,0 +1,5 @@ +--- +title: Prioritize weight over title when sorting charts +merge_request: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/18233 +author: joshlambert +type: fixed |