Merge "Revert "Provide direct deprecation message for jquery.ui.spinner""

diff --combined resources/Resources.php
index 718cd83,5e5f308..ec44a83
--- 1/resources/Resources.php
--- 2/resources/Resources.php
+++ b/resources/Resources.php
@@@ -294,7 -294,7 +294,7 @@@ return 
        ],
        'jquery.spinner' => [
                'scripts' => 'resources/src/jquery.spinner/spinner.js',
 -              'styles' => 'resources/src/jquery.spinner/spinner.css',
 +              'styles' => 'resources/src/jquery.spinner/spinner.less',
                'targets' => [ 'desktop', 'mobile' ],
        ],
        'jquery.jStorage' => [
@@@ -592,7 -592,6 +592,6 @@@
                'group' => 'jquery.ui',
        ],
        'jquery.ui.spinner' => [
-               'deprecated' => 'Please use "jquery.spinner" instead.',
                'scripts' => 'resources/lib/jquery.ui/jquery.ui.spinner.js',
                'dependencies' => [
                        'jquery.ui.core',
@@@ -1454,9 -1453,7 +1453,9 @@@
                'styles' => 'resources/src/mediawiki.action/mediawiki.action.history.css',
        ],
        'mediawiki.action.history.styles' => [
 -              'styles' => 'resources/src/mediawiki.action/mediawiki.action.history.styles.css',
 +              'skinStyles' => [
 +                      'default' => 'resources/src/mediawiki.action/mediawiki.action.history.styles.css',
 +              ],
        ],
        'mediawiki.action.view.dblClickEdit' => [
                'scripts' => 'resources/src/mediawiki.action/mediawiki.action.view.dblClickEdit.js',
@@@ -1766,6 -1763,19 +1765,6 @@@
                        'removedwatchtext-talk',
                ],
        ],
 -      'mediawiki.page.rollback' => [
 -              'scripts' => 'resources/src/mediawiki.page.rollback.js',
 -              'dependencies' => [
 -                      'mediawiki.api',
 -                      'mediawiki.notify',
 -                      'mediawiki.util',
 -                      'jquery.spinner',
 -              ],
 -              'messages' => [
 -                      'rollbackfailed',
 -                      'actioncomplete',
 -              ],
 -      ],
        'mediawiki.page.rollback.confirmation' => [
                'scripts' => 'resources/src/mediawiki.rollback.confirmation.js',
                'dependencies' => [
@@@ -2013,8 -2023,8 +2012,8 @@@
                        'parentheses-end',
                        'pipe-separator'
                ],
 -              'styles' => [
 -                      'resources/src/mediawiki.interface.helpers.styles.less',
 +              'skinStyles' => [
 +                      'default' => 'resources/src/mediawiki.interface.helpers.styles.less',
                ],
                'targets' => [
                        'desktop', 'mobile'
@@@ -2136,10 -2146,7 +2135,10 @@@
        ],
        'mediawiki.special.changeslist' => [
                'styles' => [
 -                      'resources/src/mediawiki.special.changeslist.less',
 +                      'resources/src/mediawiki.special.changeslist/changeslist.less'
 +              ],
 +              'skinStyles' => [
 +                      'default' => 'resources/src/mediawiki.special.changeslist/default.less',
                ],
                'targets' => [ 'desktop', 'mobile' ],
        ],