jenkins-bot has submitted this change and it was merged.
Change subject: Merge resource messages
......................................................................
Merge resource messages
Update 'mobile.startup/util' documentation too.
Change-Id: Ia6a701f42c7dc0238671eedbd376318f970e1e2c
---
M includes/Resources.php
M resources/mobile.startup/util.js
2 files changed, 3 insertions(+), 5 deletions(-)
Approvals:
Florianschmidtwelzow: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/Resources.php b/includes/Resources.php
index 4ab904a..183b269 100644
--- a/includes/Resources.php
+++ b/includes/Resources.php
@@ -1474,6 +1474,8 @@
'mobile-frontend-last-modified-with-user-months',
'mobile-frontend-last-modified-with-user-years',
'mobile-frontend-last-modified-with-user-just-now',
+ // mf-stop-mobile-redirect.js
+ 'mobile-frontend-cookies-required',
),
'scripts' => array(
// FIXME: Merge preInit and init files.
@@ -1482,10 +1484,6 @@
'resources/skins.minerva.scripts/initLogging.js',
'resources/skins.minerva.scripts/mobileRedirect.js',
'resources/skins.minerva.scripts/search.js',
- ),
- 'messages' => array(
- // mf-stop-mobile-redirect.js
- 'mobile-frontend-cookies-required',
),
),
// Remove when cache clears (https://phabricator.wikimedia.org/T113686)
diff --git a/resources/mobile.startup/util.js b/resources/mobile.startup/util.js
index b5137e4..2db21ba 100644
--- a/resources/mobile.startup/util.js
+++ b/resources/mobile.startup/util.js
@@ -3,7 +3,7 @@
$window = $( window );
/**
- * Utility library for looking up details on the current user
+ * Utility library
* @class util
* @singleton
*/
--
To view, visit https://gerrit.wikimedia.org/r/266491
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia6a701f42c7dc0238671eedbd376318f970e1e2c
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Bmansurov <[email protected]>
Gerrit-Reviewer: Florianschmidtwelzow <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
