From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Sun, 7 Dec 2014 21:59:12 +0000 (+0000)
Subject: Merge "Promote LivePreview from its experimental state"
X-Git-Tag: 1.31.0-rc.0~13055
X-Git-Url: http://git.heureux-cyclage.org/?a=commitdiff_plain;h=04f27a07a181e903497024a4fdbc2c6d24f974c4;p=lhc%2Fweb%2Fwiklou.git

Merge "Promote LivePreview from its experimental state"
---

04f27a07a181e903497024a4fdbc2c6d24f974c4
diff --cc resources/Resources.php
index 9c43987890,27b2e5ce08..1049a6a10a
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@@ -1043,16 -1041,18 +1043,25 @@@ return array
  		'dependencies' => array(
  			'jquery.form',
  			'jquery.spinner',
+ 			'mediawiki.api',
  			'mediawiki.action.history.diff',
+ 			'mediawiki.util',
+ 			'mediawiki.jqueryMsg',
+ 		),
+ 		'messages' => array(
+ 			'otherlanguages',
+ 			'tooltip-p-lang',
+ 			'summary-preview',
+ 			'parentheses',
  		),
  	),
 +	'mediawiki.action.edit.stash' => array(
 +		'scripts' => 'resources/src/mediawiki.action/mediawiki.action.edit.stash.js',
 +		'dependencies' => array(
 +			'jquery.getAttrs',
 +			'mediawiki.api',
 +		),
 +	),
  	'mediawiki.action.history' => array(
  		'scripts' => 'resources/src/mediawiki.action/mediawiki.action.history.js',
  		'styles' => 'resources/src/mediawiki.action/mediawiki.action.history.css',