Merge "Update weblinks in comments from HTTP to HTTPS"

diff --cc includes/DefaultSettings.php
Simple merge

diff --cc includes/FormOptions.php
Simple merge

diff --cc includes/GlobalFunctions.php
Simple merge

diff --cc includes/MediaWikiServices.php
Simple merge

diff --cc includes/OutputPage.php
Simple merge

diff --cc includes/api/ApiMain.php
Simple merge

diff --cc includes/htmlform/fields/HTMLFloatField.php
Simple merge

diff --cc includes/htmlform/fields/HTMLIntField.php
Simple merge

diff --cc includes/jobqueue/JobQueueDB.php
Simple merge

diff --cc includes/jobqueue/JobRunner.php
Simple merge

diff --cc includes/libs/filebackend/FileBackend.php
Simple merge

diff --cc includes/libs/filebackend/SwiftFileBackend.php
Simple merge

diff --cc includes/libs/rdbms/database/Database.php
Simple merge

diff --cc includes/libs/rdbms/database/DatabaseMysqlBase.php
index 76208c4,3e24ce6..668443b
--- 1/includes/libs/rdbms/database/DatabaseMysqlBase.php
--- 2/includes/libs/rdbms/database/DatabaseMysqlBase.php
+++ b/includes/libs/rdbms/database/DatabaseMysqlBase.php
@@@ -569,10 -569,10 +569,10 @@@ abstract class DatabaseMysqlBase extend
         * @param string $fname
         * @return bool|array|null False or null on failure
         */
 -      function indexInfo( $table, $index, $fname = __METHOD__ ) {
 +      public function indexInfo( $table, $index, $fname = __METHOD__ ) {
                # SHOW INDEX works in MySQL 3.23.58, but SHOW INDEXES does not.
                # SHOW INDEX should work for 3.x and up:
-               # http://dev.mysql.com/doc/mysql/en/SHOW_INDEX.html
+               # https://dev.mysql.com/doc/mysql/en/SHOW_INDEX.html
                $table = $this->tableName( $table );
                $index = $this->indexName( $index );
  

diff --cc includes/libs/rdbms/database/DatabasePostgres.php
Simple merge

diff --cc includes/libs/rdbms/database/DatabaseSqlite.php
Simple merge

diff --cc includes/libs/rdbms/database/IDatabase.php
Simple merge

diff --cc includes/libs/rdbms/lbfactory/LBFactory.php
Simple merge

diff --cc includes/libs/rdbms/loadbalancer/LoadBalancer.php
Simple merge

diff --cc includes/page/WikiPage.php
Simple merge

diff --cc includes/parser/Parser.php
Simple merge

diff --cc includes/resourceloader/ResourceLoader.php
Simple merge

diff --cc includes/user/User.php
index 2a59d5d,4a34371..273d555
--- 1/includes/user/User.php
--- 2/includes/user/User.php
+++ b/includes/user/User.php
@@@ -1689,8 -1689,9 +1689,8 @@@ class User implements IDBAccessObject 
         * @return bool True if blacklisted.
         */
        public function inDnsBlacklist( $ip, $bases ) {
 -
                $found = false;
-               // @todo FIXME: IPv6 ???  (http://bugs.php.net/bug.php?id=33170)
+               // @todo FIXME: IPv6 ???  (https://bugs.php.net/bug.php?id=33170)
                if ( IP::isIPv4( $ip ) ) {
                        // Reverse IP, bug 21255
                        $ipReversed = implode( '.', array_reverse( explode( '.', $ip ) ) );

diff --cc includes/utils/UIDGenerator.php
Simple merge

diff --cc resources/src/mediawiki.skinning/content.css
Simple merge

diff --cc resources/src/mediawiki/mediawiki.js
Simple merge

diff --cc tests/parser/parserTests.txt
Simple merge

diff --cc tests/phpunit/includes/HtmlTest.php
Simple merge

diff --cc tests/phpunit/includes/upload/UploadBaseTest.php
Simple merge

diff --cc tests/phpunit/suites/ParserTestTopLevelSuite.php
Simple merge