From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Wed, 27 Jun 2018 08:19:04 +0000 (+0000)
Subject: Merge "mw.widgets.CategoryMultiselectWidget use TagMultiselectWidget"
X-Git-Tag: 1.34.0-rc.0~4944
X-Git-Url: http://git.cyclocoop.org/%7B%24admin_url%7Dcompta/comptes/Foo_bar_baz?a=commitdiff_plain;h=5623d4c64319a98ddd8263c597002d173464ccbf;p=lhc%2Fweb%2Fwiklou.git

Merge "mw.widgets.CategoryMultiselectWidget use TagMultiselectWidget"
---

5623d4c64319a98ddd8263c597002d173464ccbf
diff --cc resources/Resources.php
index dea9293e96,15669e2daf..b4b921fbfc
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@@ -2627,24 -2605,9 +2627,24 @@@ return 
  		],
  		'targets' => [ 'desktop', 'mobile' ],
  	],
 +	'mediawiki.widgets.expiry' => [
 +		'scripts' => [
 +			'resources/src/mediawiki.widgets/mw.widgets.ExpiryInputWidget.js',
 +		],
 +		'dependencies' => [
 +			'oojs-ui-core',
 +			'oojs-ui-widgets',
 +			'moment',
 +			'mediawiki.widgets.datetime'
 +		],
 +		'skinStyles' => [
 +			'default' => 'resources/src/mediawiki.widgets/mw.widgets.ExpiryInputWidget.less',
 +		],
 +		'targets' => [ 'desktop', 'mobile' ],
 +	],
  	'mediawiki.widgets.CategoryMultiselectWidget' => [
  		'scripts' => [
- 			'resources/src/mediawiki.widgets/mw.widgets.CategoryCapsuleItemWidget.js',
+ 			'resources/src/mediawiki.widgets/mw.widgets.CategoryTagItemWidget.js',
  			'resources/src/mediawiki.widgets/mw.widgets.CategoryMultiselectWidget.js',
  		],
  		'dependencies' => [