Merge "resources: Remove the deprecated 'jquery.badge' module"

diff --combined RELEASE-NOTES-1.31
index a7edba4,86d887b..add2ee9
--- 1/RELEASE-NOTES-1.31
--- 2/RELEASE-NOTES-1.31
+++ b/RELEASE-NOTES-1.31
@@@ -13,8 -13,6 +13,8 @@@ production
    temporary variable during the migration period, deprecated since 1.29.
  * $wgLogoHD has been updated to support svg images and uses $wgLogo where
    possible for fallback images such as png.
 +* (T44246) $wgFilterLogTypes will no longer ignore 'patrol' when user does
 +  not have the right to mark things patrolled.
  * …
  
  === New features in 1.31 ===
@@@ -30,6 -28,7 +30,7 @@@
  * …
  
  ==== Removed and replaced external libraries ====
+ * (T17845) The deprecated 'jquery.badge' module was removed.
  * …
  
  === Bug fixes in 1.31 ===
@@@ -59,33 -58,6 +60,33 @@@ changes to languages because of Phabric
  * mw.page (deprecated in 1.30) was removed.
  * Article::getLastPurgeTimestamp(), WikiPage::getLastPurgeTimestamp(), and the
    related WikiPage::PURGE_* constants, deprecated in 1.29, were removed.
 +* The Article::selectFields(), Article::onArticleCreate(),
 +  Article::onArticleDelete(), and Article::onArticleEdit() methods, deprecated
 +  in 1.24, were removed.
 +* Installer::locateExecutable() and Installer::locateExecutableInDefaultPaths()
 +  were removed, use ExecutableFinder::findInDefaultPaths() instead.
 +* Several methods for returning lists of fields to select from the database
 +  have been deprecated in favor of similar methods that also return the tables
 +  to select from and the join conditions for those tables.
 +  * Block::selectFields() → Block::getQueryInfo()
 +  * RecentChange::selectFields() → RecentChange::getQueryInfo()
 +  * ArchivedFile::selectFields() → ArchivedFile::getQueryInfo()
 +  * LocalFile::selectFields() → LocalFile::getQueryInfo()
 +  * LocalFile::getCacheFields() with a prefix no longer works
 +  * LocalFile::getLazyCacheFields() with a prefix no longer works
 +  * OldLocalFile::selectFields() → OldLocalFile::getQueryInfo()
 +  * RecentChange::selectFields() → RecentChange::getQueryInfo()
 +  * Revision::userJoinCond() → Revision::getQueryInfo( [ 'user' ] )
 +  * Revision::selectUserFields() → Revision::getQueryInfo( [ 'user' ] )
 +  * Revision::pageJoinCond() → Revision::getQueryInfo( [ 'page' ] )
 +  * Revision::selectPageFields() → Revision::getQueryInfo( [ 'page' ] )
 +  * Revision::selectTextFields() → Revision::getQueryInfo( [ 'text' ] )
 +  * Revision::selectFields() → Revision::getQueryInfo()
 +  * Revision::selectArchiveFields() → Revision::getArchiveQueryInfo()
 +  * User::selectFields() → User::getQueryInfo()
 +  * WikiPage::selectFields() → WikiPage::getQueryInfo()
 +* Due to significant refactoring, method ContribsPager::getUserCond() that had
 +  no access restriction has been removed.
  
  == Compatibility ==
  MediaWiki 1.31 requires PHP 5.5.9 or later. There is experimental support for

diff --combined resources/Resources.php
index 1a2d707,ca24922..ec995bc
--- 1/resources/Resources.php
--- 2/resources/Resources.php
+++ b/resources/Resources.php
@@@ -164,12 -164,6 +164,6 @@@ return 
                'dependencies' => 'jquery.highlightText',
                'targets' => [ 'desktop', 'mobile' ],
        ],
-       'jquery.badge' => [
-               'deprecated' => 'Please use Notifications instead.',
-               'scripts' => 'resources/src/jquery/jquery.badge.js',
-               'styles' => 'resources/src/jquery/jquery.badge.css',
-               'dependencies' => 'mediawiki.language',
-       ],
        'jquery.byteLength' => [
                'scripts' => 'resources/src/jquery/jquery.byteLength.js',
                'targets' => [ 'desktop', 'mobile' ],
@@@ -360,7 -354,7 +354,7 @@@
        /* jQuery UI */
  
        'jquery.ui.core' => [
 -              'deprecated' => 'Please use "mediawiki.ui.button" or "oojs-ui" instead.',
 +              'deprecated' => 'Please use OOUI instead.',
                'scripts' => 'resources/lib/jquery.ui/jquery.ui.core.js',
                'dependencies' => [
                        'jquery.ui.core.styles',
@@@ -2311,7 -2305,6 +2305,7 @@@
        /* MediaWiki UI */
  
        'mediawiki.ui' => [
 +              'deprecated' => 'Please use OOUI instead.',
                'skinStyles' => [
                        'default' => [
                                'resources/src/mediawiki.ui/default.less',