Merge "resourceloader: Consistent stylesheet order for debug and non-debug"

diff --git a/maintenance/manageJobs.php b/maintenance/manageJobs.php
index 9585ed8..bbedf0c 100644 (file)
--- a/maintenance/manageJobs.php
+++ b/maintenance/manageJobs.php
@@ -75,7 +75,7 @@ class ManageJobs extends Maintenance {
                $skipped = 0;
                foreach ( $queue->getAllAbandonedJobs() as $job ) {
                        /** @var Job $job */
-                       if ( $job->getQueuedTimestamp() < $lastRepushTime ) {
+                       if ( $job->getQueuedTimestamp() < wfTimestamp( TS_UNIX, $lastRepushTime ) ) {
                                ++$skipped;
                                continue; // already re-pushed in prior round
                        }

diff --git a/package.json b/package.json
index 983da09..b868295 100644 (file)
--- a/package.json
+++ b/package.json
@@ -15,12 +15,12 @@
     "grunt-eslint": "19.0.0",
     "grunt-jsonlint": "1.1.0",
     "grunt-karma": "2.0.0",
-    "grunt-stylelint": "0.6.0",
+    "grunt-stylelint": "0.7.0",
     "karma": "1.1.0",
     "karma-chrome-launcher": "2.0.0",
     "karma-firefox-launcher": "1.0.0",
     "karma-qunit": "1.0.0",
     "qunitjs": "1.22.0",
-    "stylelint-config-wikimedia": "0.3.0"
+    "stylelint-config-wikimedia": "0.4.1"
   }
 }