summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoshua Lambert <joshua@gitlab.com>2018-04-06 14:26:23 -0400
committerJoshua Lambert <joshua@gitlab.com>2018-04-06 19:47:29 -0400
commitdca4c62f5bdd976c126a7758578fa9fc58e6d788 (patch)
tree08d088a76ee62dad6e546f8b2f2dcdc6a323d988
parent85f4e323f9be5b7056850be353d8689d503a5c86 (diff)
downloadgitlab-ce-dca4c62f5bdd976c126a7758578fa9fc58e6d788.tar.gz
Fix dashboard sorting
-rw-r--r--app/assets/javascripts/monitoring/stores/monitoring_store.js2
-rw-r--r--changelogs/unreleased/fix-dashboard-sorting.yml5
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..2ba13a93fa9
--- /dev/null
+++ b/changelogs/unreleased/fix-dashboard-sorting.yml
@@ -0,0 +1,5 @@
+---
+title: Prioritize weight over title when sorting charts
+merge_request: 18233
+author:
+type: fixed