Merge "Remove comments literally repeating the next line of code"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Fri, 1 Mar 2019 02:37:27 +0000 (02:37 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Fri, 1 Mar 2019 02:37:27 +0000 (02:37 +0000)
1  2 
includes/preferences/DefaultPreferencesFactory.php
resources/Resources.php

@@@ -373,7 -373,6 +373,6 @@@ class DefaultPreferencesFactory impleme
                        ];
                }
  
-               // Language
                $languages = Language::fetchLanguageNames( null, 'mwfile' );
                $languageCode = $this->config->get( 'LanguageCode' );
                if ( !array_key_exists( $languageCode, $languages ) ) {
                        'options' => $stubThresholdOptions,
                        // This is not a raw HTML message; label-raw is needed for the manual <a></a>
                        'label-raw' => $l10n->msg( 'stub-threshold' )->rawParams(
 -                              '<a href="#" class="stub">' .
 +                              '<a class="stub">' .
                                $l10n->msg( 'stub-threshold-sample-link' )->parse() .
                                '</a>' )->parse(),
                ];
diff --combined resources/Resources.php
@@@ -643,7 -643,7 +643,7 @@@ return 
                'group' => 'jquery.ui',
                'targets' => [ 'desktop', 'mobile' ],
        ],
-       // Effects
        'jquery.effects.core' => [
                'deprecated' => true,
                'scripts' => 'resources/lib/jquery.ui/jquery.ui.effect.js',
                ],
                'dependencies' => [
                        'mediawiki.language',
 +                      'mediawiki.RegExp',
                ],
                'targets' => [ 'desktop', 'mobile' ],
        ],
                        'period-pm',
                ],
                'dependencies' => [
 +                      'mediawiki.RegExp',
                        'oojs-ui-core',
                        'oojs-ui.styles.icons-moderation',
                        'oojs-ui.styles.icons-movement',