From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Sat, 18 Mar 2017 00:38:43 +0000 (+0000)
Subject: Merge "resourceloader: Fix broken 'deprecated' string messages"
X-Git-Tag: 1.31.0-rc.0~3769
X-Git-Url: http://git.cyclocoop.org/url?a=commitdiff_plain;h=bf79a09a715f54be9012372643d1508cd94fbcd8;p=lhc%2Fweb%2Fwiklou.git

Merge "resourceloader: Fix broken 'deprecated' string messages"
---

bf79a09a715f54be9012372643d1508cd94fbcd8
diff --cc resources/Resources.php
index 2ed1489645,939771d1a1..8aca675e00
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@@ -151,11 -151,15 +151,9 @@@ return 
  		'targets' => [ 'mobile', 'desktop' ],
  	],
  	'jquery.appear' => [
- 		'deprecated' => [
- 			'message' => 'Please use "mediawiki.viewport" instead.',
- 		],
+ 		'deprecated' => 'Please use "mediawiki.viewport" instead.',
  		'scripts' => 'resources/lib/jquery/jquery.appear.js',
  	],
 -	'jquery.arrowSteps' => [
 -		'deprecated' => true,
 -		'scripts' => 'resources/src/jquery/jquery.arrowSteps.js',
 -		'styles' => 'resources/src/jquery/jquery.arrowSteps.css',
 -		'targets' => [ 'desktop', 'mobile' ],
 -	],
  	'jquery.async' => [
  		'scripts' => 'resources/lib/jquery/jquery.async.js',
  	],