From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Wed, 4 Mar 2015 16:15:53 +0000 (+0000)
Subject: Merge "Add top help link to MediaWiki.org in several pages via indicator"
X-Git-Tag: 1.31.0-rc.0~12186
X-Git-Url: https://git.cyclocoop.org/%7B%24admin_url%7Dmembres/modifier.php?a=commitdiff_plain;h=5907e840ccad13f28438b413687342b65f3ab900;p=lhc%2Fweb%2Fwiklou.git

Merge "Add top help link to MediaWiki.org in several pages via indicator"
---

5907e840ccad13f28438b413687342b65f3ab900
diff --cc resources/Resources.php
index 4d000b60e3,1829cfacf5..faaf852258
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@@ -881,19 -877,23 +881,25 @@@ return array
  			'feedback-error1',
  			'feedback-error2',
  			'feedback-error3',
 +			'feedback-message',
 +			'feedback-subject',
 +			'feedback-submit',
 +			'feedback-terms',
 +			'feedback-termsofuse',
  			'feedback-thanks',
 -			'feedback-close',
 -			'feedback-bugcheck',
 -			'feedback-bugnew',
 +			'feedback-thanks-title',
 +			'feedback-useragent'
  		),
  	),
+ 	'mediawiki.helplink' => array(
+ 		'styles' => array(
+ 			'resources/src/mediawiki/mediawiki.helplink.css',
+ 		),
+ 		'targets' => array( 'desktop', 'mobile' ),
+ 	),
  	'mediawiki.hidpi' => array(
  		'scripts' => 'resources/src/mediawiki/mediawiki.hidpi.js',
 -		'dependencies' => array(
 -			'jquery.hidpi',
 -		),
 +		'dependencies' => 'jquery.hidpi',
  		'skipFunction' => 'resources/src/mediawiki.hidpi-skip.js',
  		'targets' => array( 'desktop', 'mobile' ),
  	),