Merge remote-tracking branch 'jenkins/master' into jenkins-28840

changelog.html

@@ -74,6 +74,9 @@ Upcoming changes</a>
   <li class=bug>
     Fix several loggers which are identifying as the wrong class.
     (<a href="https://github.com/jenkinsci/jenkins/pull/1651">PR 1651</a>)
+  <li class=bug>
+    Revert fix for issue <a href="https://issues.jenkins-ci.org/browse/JENKINS-17290">17290</a> due to the regressions it caused.
+    (<a href="https://issues.jenkins-ci.org/browse/JENKINS-28601">issue 28601</a>)
   <li class=bug>
     Fix deadlock between hudson.model.Queue and hudson.model.Computer.
     (<a href="https://issues.jenkins-ci.org/browse/JENKINS-288040">issue 28840</a>)

war/src/main/webapp/scripts/sortable.js

@@ -178,7 +178,7 @@ var Sortable = (function() {
             var dir = this.pref.direction;
 
             var s = this.getSorter(column);
-            if(dir === arrowTable.down) {// only need to reverse when it's descending
+            if(dir === arrowTable.up) {// ascending
                 s = sorter.reverse(s);
             }