[MediaWiki-commits] [Gerrit] Add Wikia to travis build matrix - change (pywikibot/core)
John Vandenberg has uploaded a new change for review. https://gerrit.wikimedia.org/r/226039 Change subject: Add Wikia to travis build matrix .. Add Wikia to travis build matrix Bug: T75513 Change-Id: I1410091e61442a7ac34de702057068e65ac4d84b --- M .travis.yml 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core refs/changes/39/226039/1 diff --git a/.travis.yml b/.travis.yml index 909b3c5..6e07c11 100644 --- a/.travis.yml +++ b/.travis.yml @@ -91,6 +91,8 @@ include: - python: '2.7' env: LANGUAGE=he FAMILY=wikivoyage SITE_ONLY=1 +- python: '2.7' + env: LANGUAGE=wikia FAMILY=wikia PYWIKIBOT2_TEST_NO_RC=1 - python: '3.3' env: LANGUAGE=en FAMILY=oraintest SITE_ONLY=1 - python: '3.4' -- To view, visit https://gerrit.wikimedia.org/r/226039 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I1410091e61442a7ac34de702057068e65ac4d84b Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: John Vandenberg Gerrit-Reviewer: Maverick ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Avoid logging query in wasDeletedSinceLastEdit() if the page... - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged.
Change subject: Avoid logging query in wasDeletedSinceLastEdit() if the page
still exists
..
Avoid logging query in wasDeletedSinceLastEdit() if the page still exists
* This avoids hitting a long tail of logging table queries that
cannot easily use the buffer pool all the time.
Change-Id: Id2ad6b9699f1a8c579ebb1c3c0319183772af1bd
---
M includes/EditPage.php
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Gilles: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/EditPage.php b/includes/EditPage.php
index bf322ae..0233b11 100644
--- a/includes/EditPage.php
+++ b/includes/EditPage.php
@@ -3445,7 +3445,7 @@
$this->deletedSinceEdit = false;
- if ( $this->mTitle->isDeletedQuick() ) {
+ if ( !$this->mTitle->exists() &&
$this->mTitle->isDeletedQuick() ) {
$this->lastDelete = $this->getLastDelete();
if ( $this->lastDelete ) {
$deleteTime = wfTimestamp( TS_MW,
$this->lastDelete->log_timestamp );
--
To view, visit https://gerrit.wikimedia.org/r/226028
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Id2ad6b9699f1a8c579ebb1c3c0319183772af1bd
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz
Gerrit-Reviewer: Gilles
Gerrit-Reviewer: Jackmcbarn
Gerrit-Reviewer: Tpt
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Make the User Timing API safe to use in MediaWiki - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged.
Change subject: Make the User Timing API safe to use in MediaWiki
..
Make the User Timing API safe to use in MediaWiki
Allow JavaScript code to be annotated via the User Timing API without having to
repeatedly ensure that the API exists by declaring a no-op stub for browsers
that don't implement it. Do it in the startup module so we can use
performance.mark() early. Add an initial performance.mark() call as a use-case.
Task: T105389
Change-Id: Id686073da5baf3fcae36f296e6e50d648a543249
---
M .jshintrc
M resources/src/startup.js
2 files changed, 9 insertions(+), 0 deletions(-)
Approvals:
Gilles: Looks good to me, approved
jenkins-bot: Verified
diff --git a/.jshintrc b/.jshintrc
index d72c31d..b84d276 100644
--- a/.jshintrc
+++ b/.jshintrc
@@ -22,6 +22,7 @@
"mediaWiki": true,
"JSON": true,
"OO": true,
+ "performance": true,
"jQuery": false,
"QUnit": false,
"sinon": false
diff --git a/resources/src/startup.js b/resources/src/startup.js
index 80cc7d9..5ee295b 100644
--- a/resources/src/startup.js
+++ b/resources/src/startup.js
@@ -6,6 +6,14 @@
var mediaWikiLoadStart = ( new Date() ).getTime();
+if ( !window.performance ) {
+ window.performance = {};
+}
+if ( !performance.mark ) {
+ performance.mark = function () {};
+}
+performance.mark( 'mediaWikiStartUp' );
+
/**
* Returns false for Grade C supported browsers.
*
--
To view, visit https://gerrit.wikimedia.org/r/225497
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Id686073da5baf3fcae36f296e6e50d648a543249
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Ori.livneh
Gerrit-Reviewer: Edokter
Gerrit-Reviewer: Gilles
Gerrit-Reviewer: Jack Phoenix
Gerrit-Reviewer: Krinkle
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Clean up UserMailer::send() parameters - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged.
Change subject: Clean up UserMailer::send() parameters
..
Clean up UserMailer::send() parameters
$replyto and $contentType should now be passed as an array of $options.
This will make it easier to add more options in the future without
having a long list of optional parameters.
Change-Id: I2c38bb438bd01e0ed2552024a40311f3e8e2dc08
---
M includes/User.php
M includes/jobqueue/jobs/EmaillingJob.php
M includes/mail/EmailNotification.php
M includes/mail/UserMailer.php
M includes/specials/SpecialEmailuser.php
5 files changed, 34 insertions(+), 10 deletions(-)
Approvals:
Aaron Schulz: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/User.php b/includes/User.php
index d627a6d..4c044bd 100644
--- a/includes/User.php
+++ b/includes/User.php
@@ -4252,7 +4252,9 @@
}
$to = MailAddress::newFromUser( $this );
- return UserMailer::send( $to, $sender, $subject, $body,
$replyto );
+ return UserMailer::send( $to, $sender, $subject, $body, array(
+ 'replyTo' => $replyto,
+ ) );
}
/**
diff --git a/includes/jobqueue/jobs/EmaillingJob.php
b/includes/jobqueue/jobs/EmaillingJob.php
index 68e96fc..beeb067 100644
--- a/includes/jobqueue/jobs/EmaillingJob.php
+++ b/includes/jobqueue/jobs/EmaillingJob.php
@@ -38,7 +38,7 @@
$this->params['from'],
$this->params['subj'],
$this->params['body'],
- $this->params['replyto']
+ array( 'replyTo' => $this->params['replyto'] )
);
return $status->isOK();
diff --git a/includes/mail/EmailNotification.php
b/includes/mail/EmailNotification.php
index 1027732..0eed450 100644
--- a/includes/mail/EmailNotification.php
+++ b/includes/mail/EmailNotification.php
@@ -478,7 +478,9 @@
$wgContLang->userTime( $this->timestamp,
$watchingUser ) ),
$this->body );
- return UserMailer::send( $to, $this->from, $this->subject,
$body, $this->replyto );
+ return UserMailer::send( $to, $this->from, $this->subject,
$body, array(
+ 'replyTo' => $this->replyto,
+ ) );
}
/**
@@ -503,7 +505,9 @@
$wgContLang->time( $this->timestamp, false,
false ) ),
$this->body );
- return UserMailer::send( $addresses, $this->from,
$this->subject, $body, $this->replyto );
+ return UserMailer::send( $addresses, $this->from,
$this->subject, $body, array(
+ 'replyTo' => $this->replyto,
+ ) );
}
}
diff --git a/includes/mail/UserMailer.php b/includes/mail/UserMailer.php
index 546cc8c..d83ae93 100644
--- a/includes/mail/UserMailer.php
+++ b/includes/mail/UserMailer.php
@@ -102,16 +102,32 @@
* @param MailAddress $from Sender's email
* @param string $subject Email's subject.
* @param string $body Email's text or Array of two strings to be the
text and html bodies
-* @param MailAddress $replyto Optional reply-to email (default: null).
-* @param string $contentType Optional custom Content-Type (default:
text/plain; charset=UTF-8)
+* @param array $options:
+* 'replyTo' MailAddress
+* 'contentType' string default 'text/plain; charset=UTF-8'
+*
+* Previous versions of this function had $replyto as the 5th argument
and $contentType
+* as the 6th. These are still supported for backwards compatability,
but deprecated.
+*
* @throws MWException
* @throws Exception
* @return Status
*/
- public static function send( $to, $from, $subject, $body, $replyto =
null,
- $contentType = 'text/plain; charset=UTF-8'
- ) {
+ public static function send( $to, $from, $subject, $body, $options =
array() ) {
global $wgSMTP, $wgEnotifMaxRecips, $wgAdditionalMailParams,
$wgAllowHTMLEmail;
+ $contentType = 'text/plain; charset=UTF-8';
+ if ( is_array( $options ) ) {
+ $replyto = isset( $options['replyTo'] ) ?
$options['replyTo'] : null;
+ $contentType = isset( $options['contentType'] ) ?
$options['contentType'] : $contentType;
+ } else {
+ // Old calling style
+ wfDeprecated( __METHOD__ . ' with $replyto as 5th
parameter', '1.26' );
+ $replyto = $options;
+ if ( func_num_args() === 6 ) {
+ $contentType = func_get_arg( 5 );
+ }
+ }
+
[MediaWiki-commits] [Gerrit] wip Add alternative upload methods link - change (mediawiki...UploadWizard)
Prtksxna has uploaded a new change for review.
https://gerrit.wikimedia.org/r/226038
Change subject: wip Add alternative upload methods link
..
wip Add alternative upload methods link
Change-Id: I49f3282d5acf119f8bb58ca8bfb6b32a9d4521b6
---
M UploadWizardHooks.php
M i18n/en.json
M i18n/qqq.json
3 files changed, 3 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/UploadWizard
refs/changes/38/226038/1
diff --git a/UploadWizardHooks.php b/UploadWizardHooks.php
index 1ac24b0..29ce688 100644
--- a/UploadWizardHooks.php
+++ b/UploadWizardHooks.php
@@ -429,6 +429,7 @@
'mwe-upwiz-image-preview',
'mwe-upwiz-subhead-bugs',
'mwe-upwiz-subhead-alt-upload',
+ 'mwe-upwiz-subhead-alternatives',
'mwe-upwiz-feedback-prompt',
'mwe-upwiz-feedback-note',
'mwe-upwiz-feedback-subject',
diff --git a/i18n/en.json b/i18n/en.json
index d1e3171..5bff2bb 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -304,6 +304,7 @@
"mwe-upwiz-image-preview": "File preview",
"mwe-upwiz-subhead-bugs": "[$1 Known issues]",
"mwe-upwiz-subhead-alt-upload": "Back to the old form",
+ "mwe-upwiz-subhead-alternatives": "Alternative upload methods",
"mwe-upwiz-feedback-prompt": "Leave feedback",
"mwe-upwiz-feedback-title": "Leave feedback about Upload Wizard",
"mwe-upwiz-feedback-blacklist-report-prompt": "[$1 Send Feedback]",
diff --git a/i18n/qqq.json b/i18n/qqq.json
index ef38038..8cf3f00 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -327,6 +327,7 @@
"mwe-upwiz-image-preview": "Used as title for the preview of the image
file.",
"mwe-upwiz-subhead-bugs": "Unused at this time. Parameters:\n* $1 -
full URL\n{{Identical|Known issue}}",
"mwe-upwiz-subhead-alt-upload": "Used as a link in the sub-header. Will
go to an alternate upload form.",
+ "mwe-upwiz-subhead-alternatives": "Used as a link in the sub-header.
Will go to Commons:Upload_tools.",
"mwe-upwiz-feedback-prompt": "Used as a link in the
sub-header.\n{{Identical|Leave feedback}}",
"mwe-upwiz-feedback-title": "Used as title for the dialog box.",
"mwe-upwiz-feedback-blacklist-report-prompt": "Parameters:\n* $1 - full
URL\n{{Identical|Send feedback}}",
--
To view, visit https://gerrit.wikimedia.org/r/226038
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I49f3282d5acf119f8bb58ca8bfb6b32a9d4521b6
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/UploadWizard
Gerrit-Branch: master
Gerrit-Owner: Prtksxna
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Use $parser->mUniqPrefix instead of $parser::MARKER_PREFIX f... - change (mediawiki...SyntaxHighlight_GeSHi)
jenkins-bot has submitted this change and it was merged. Change subject: Use $parser->mUniqPrefix instead of $parser::MARKER_PREFIX for MW 1.25 compatibility .. Use $parser->mUniqPrefix instead of $parser::MARKER_PREFIX for MW 1.25 compatibility Parser::MARKER_PREFIX is a new constant introduced in MW 1.26, previously the value was dynamic and available as $parser->mUniqPrefix. That continues to be supported in MW 1.26+. Follow-up to 043969f84eb5c61a508c05bf5ffd369cc6655cd6. Bug: T105796 Change-Id: I9dfc9e1a424e28fc4f870dd513306e5144d1ec7c --- M SyntaxHighlight_GeSHi.class.php 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: John Vandenberg: Looks good to me, but someone else must approve Legoktm: Looks good to me, approved jenkins-bot: Verified diff --git a/SyntaxHighlight_GeSHi.class.php b/SyntaxHighlight_GeSHi.class.php index 3884efc..8c45f0d 100644 --- a/SyntaxHighlight_GeSHi.class.php +++ b/SyntaxHighlight_GeSHi.class.php @@ -168,7 +168,7 @@ // Use 'nowiki' strip marker to prevent list processing (also known as doBlockLevels()). // However, leave the wrapping outside to prevent -wrapping. - $marker = $parser::MARKER_PREFIX . '-syntaxhighlightinner-' . + $marker = $parser->mUniqPrefix . '-syntaxhighlightinner-' . sprintf( '%08X', $parser->mMarkerIndex++ ) . $parser::MARKER_SUFFIX; $parser->mStripState->addNoWiki( $marker, $out ); -- To view, visit https://gerrit.wikimedia.org/r/224778 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I9dfc9e1a424e28fc4f870dd513306e5144d1ec7c Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/extensions/SyntaxHighlight_GeSHi Gerrit-Branch: master Gerrit-Owner: Bartosz Dziewoński Gerrit-Reviewer: Bartosz Dziewoński Gerrit-Reviewer: John Vandenberg Gerrit-Reviewer: Legoktm Gerrit-Reviewer: Ori.livneh Gerrit-Reviewer: TheDJ Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] [IMPROV] Wrap noautopatrol error message - change (pywikibot/core)
jenkins-bot has submitted this change and it was merged. Change subject: [IMPROV] Wrap noautopatrol error message .. [IMPROV] Wrap noautopatrol error message The noautopatrol error message is longer than 100 characters. Change-Id: Ibcaa551c8968be568a5856e5af32f8b9971cbc3f --- M pywikibot/site.py 1 file changed, 2 insertions(+), 1 deletion(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/site.py b/pywikibot/site.py index fc00d47..e8fe41e 100644 --- a/pywikibot/site.py +++ b/pywikibot/site.py @@ -4877,7 +4877,8 @@ "nosuchrcid": "There is no change with rcid %(rcid)s", "nosuchrevid": "There is no change with revid %(revid)s", "patroldisabled": "Patrolling is disabled on %(site)s wiki", -"noautopatrol": "User %(user)s has no permission to patrol its own changes, 'autopatrol' is needed", +"noautopatrol": 'User %(user)s has no permission to patrol its own ' +'changes, "autopatrol" is needed', "notpatrollable": "The revision %(revid)s can't be patrolled as it's too old." } -- To view, visit https://gerrit.wikimedia.org/r/225892 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ibcaa551c8968be568a5856e5af32f8b9971cbc3f Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: XZise Gerrit-Reviewer: John Vandenberg Gerrit-Reviewer: Ladsgroup Gerrit-Reviewer: Merlijn van Deen Gerrit-Reviewer: Ricordisamoa Gerrit-Reviewer: XZise Gerrit-Reviewer: Xqt Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] added ability to specify auth params and added support for t... - change (mediawiki...OpenIDConnect)
Cicalese has uploaded a new change for review.
https://gerrit.wikimedia.org/r/226037
Change subject: added ability to specify auth params and added support for
table prefixes
..
added ability to specify auth params and added support for table prefixes
Change-Id: If4a786953e61ce0394c9dafffc6792db01954b67
---
M AddIssuer.sql
M AddSubject.sql
M OpenIDConnect.class.php
M OpenIDConnect.php
4 files changed, 9 insertions(+), 5 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/OpenIDConnect
refs/changes/37/226037/1
diff --git a/AddIssuer.sql b/AddIssuer.sql
index d55c9ab..4b18a37 100644
--- a/AddIssuer.sql
+++ b/AddIssuer.sql
@@ -1 +1 @@
-ALTER TABLE user ADD issuer TINYBLOB;
+ALTER TABLE /*_*/user ADD issuer TINYBLOB;
diff --git a/AddSubject.sql b/AddSubject.sql
index 2444c0d..76ff53d 100644
--- a/AddSubject.sql
+++ b/AddSubject.sql
@@ -1 +1 @@
-ALTER TABLE user ADD subject TINYBLOB;
+ALTER TABLE /*_*/user ADD subject TINYBLOB;
diff --git a/OpenIDConnect.class.php b/OpenIDConnect.class.php
index e737ad1..873570a 100644
--- a/OpenIDConnect.class.php
+++ b/OpenIDConnect.class.php
@@ -38,7 +38,7 @@
public function authenticate( &$id, &$username, &$realname, &$email ) {
if ( !array_key_exists( 'SERVER_PORT', $_SERVER ) ) {
- wfDebug( "in authenticat, server port not set" .
PHP_EOL );
+ wfDebug( "in authenticate, server port not set" .
PHP_EOL );
return false;
}
@@ -119,6 +119,10 @@
if ( isset( $_REQUEST['forcelogin'] ) ) {
$oidc->addAuthParam( array( 'prompt' => 'login'
) );
}
+ if ( isset( $config['authparam'] ) &&
+ is_array( $config['authparam'] ) ) {
+ $oidc->addAuthParam( $config['authparam'] );
+ }
if ( isset( $config['scope'] ) ) {
$scope = $config['scope'];
if ( is_array( $scope ) ) {
diff --git a/OpenIDConnect.php b/OpenIDConnect.php
index e051224..99db120 100644
--- a/OpenIDConnect.php
+++ b/OpenIDConnect.php
@@ -33,7 +33,7 @@
$GLOBALS['wgExtensionCredits']['other'][] = array (
'path' => __FILE__,
'name' => 'OpenID Connect',
- 'version' => '1.1',
+ 'version' => '1.2',
'author' => array(
'[https://www.mediawiki.org/wiki/User:Cindy.cicalese Cindy
Cicalese]'
),
@@ -47,7 +47,7 @@
$GLOBALS['wgAutoloadClasses']['OpenIDConnect'] =
__DIR__ . '/OpenIDConnect.class.php';
$GLOBALS['wgAutoloadClasses']['OpenIDConnectClient'] =
- __DIR__ . '/OpenID-Connect-PHP/OpenIDConnectClient.php5';
+ __DIR__ . '/OpenID-Connect-PHP/OpenIDConnectClient.php';
$GLOBALS['wgMessagesDirs']['OpenIDConnect'] = __DIR__ . '/i18n';
$GLOBALS['wgExtensionMessagesFiles']['OpenIDConnect'] =
--
To view, visit https://gerrit.wikimedia.org/r/226037
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: If4a786953e61ce0394c9dafffc6792db01954b67
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/OpenIDConnect
Gerrit-Branch: master
Gerrit-Owner: Cicalese
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] build: Add clean:tests task - change (oojs/ui)
jenkins-bot has submitted this change and it was merged.
Change subject: build: Add clean:tests task
..
build: Add clean:tests task
We sure do have a lot of generated junk appearing in various places.
Change-Id: Ia10949494c584951db0418d5009cc04237f41eb5
---
M Gruntfile.js
1 file changed, 1 insertion(+), 0 deletions(-)
Approvals:
Jforrester: Looks good to me, approved
jenkins-bot: Verified
diff --git a/Gruntfile.js b/Gruntfile.js
index 892d318..85c556b 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -105,6 +105,7 @@
clean: {
build: 'dist/*',
demos:
'demos/{composer.json,composer.lock,node_modules,dist,php,vendor}',
+ tests: 'tests/{JSPHP-suite.json,JSPHP.test.js}',
doc: 'docs/*',
tmp: 'dist/tmp'
},
--
To view, visit https://gerrit.wikimedia.org/r/225885
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia10949494c584951db0418d5009cc04237f41eb5
Gerrit-PatchSet: 1
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: Bartosz Dziewoński
Gerrit-Reviewer: Jforrester
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mw.loader: Fix late loading of CSS in certain cases - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged.
Change subject: mw.loader: Fix late loading of CSS in certain cases
..
mw.loader: Fix late loading of CSS in certain cases
By protecting the CSS callbacks array against being
polluted by the callbacks themselves. This fixes
a bug where if A depends on B and both A and B have
styles, both A and B are executed once B's styles
have loaded (but before A's styles have loaded).
This breaks mw.loader's contract to only execute
A once its styles have loaded.
Bug: T105973
Change-Id: Ifa8fc7b3d275faa1f9a136a8c4a0e0a7cc358083
---
M resources/src/mediawiki/mediawiki.js
M tests/qunit/suites/resources/mediawiki/mediawiki.test.js
2 files changed, 64 insertions(+), 2 deletions(-)
Approvals:
Krinkle: Looks good to me, approved
jenkins-bot: Verified
diff --git a/resources/src/mediawiki/mediawiki.js
b/resources/src/mediawiki/mediawiki.js
index 2c88e93..c0b1642 100644
--- a/resources/src/mediawiki/mediawiki.js
+++ b/resources/src/mediawiki/mediawiki.js
@@ -819,6 +819,14 @@
function addEmbeddedCSS( cssText, callback ) {
var $style, styleEl;
+ function fireCallbacks() {
+ var oldCallbacks = cssCallbacks;
+ // Reset cssCallbacks variable so it's
not polluted by any calls to
+ // addEmbeddedCSS() from one of the
callbacks (T105973)
+ cssCallbacks = $.Callbacks();
+ oldCallbacks.fire().empty();
+ }
+
if ( callback ) {
cssCallbacks.add( callback );
}
@@ -884,14 +892,14 @@
} else {
styleEl.appendChild(
document.createTextNode( cssText ) );
}
- cssCallbacks.fire().empty();
+ fireCallbacks();
return;
}
}
$( newStyleTag( cssText, getMarker() ) ).data(
'ResourceLoaderDynamicStyleTag', true );
- cssCallbacks.fire().empty();
+ fireCallbacks();
}
/**
diff --git a/tests/qunit/suites/resources/mediawiki/mediawiki.test.js
b/tests/qunit/suites/resources/mediawiki/mediawiki.test.js
index 77fecb3..c8f0011 100644
--- a/tests/qunit/suites/resources/mediawiki/mediawiki.test.js
+++ b/tests/qunit/suites/resources/mediawiki/mediawiki.test.js
@@ -670,6 +670,60 @@
} );
+ QUnit.asyncTest( 'mw.loader.implement( dependency with styles )', 4,
function ( assert ) {
+ var $element = $( ''
).appendTo( '#qunit-fixture' ),
+ $element2 = $( '' ).appendTo( '#qunit-fixture' );
+
+ assert.notEqual(
+ $element.css( 'float' ),
+ 'right',
+ 'style is clear'
+ );
+ assert.notEqual(
+ $element2.css( 'float' ),
+ 'left',
+ 'style is clear'
+ );
+
+ mw.loader.register( [
+ [ 'test.implement.e', '0', ['test.implement.e2']],
+ [ 'test.implement.e2', '0' ]
+ ] );
+
+ mw.loader.implement(
+ 'test.implement.e',
+ function () {
+ assert.equal(
+ $element.css( 'float' ),
+ 'right',
+ 'Depending module\'s style is applied'
+ );
+ QUnit.start();
+ },
+ {
+ 'all': '.mw-test-implement-e { float: right; }'
+ }
+ );
+
+ mw.loader.implement(
+ 'test.implement.e2',
+ function () {
+ assert.equal(
+ $element2.css( 'float' ),
+ 'left',
+ 'Dependency\'s style is applied'
+ );
+ },
+ {
+ 'all': '.mw-test-implement-e2 { float: left; }'
+ }
+
[MediaWiki-commits] [Gerrit] mw.loader: Fix late loading of CSS in certain cases - change (mediawiki/core)
Catrope has uploaded a new change for review.
https://gerrit.wikimedia.org/r/226036
Change subject: mw.loader: Fix late loading of CSS in certain cases
..
mw.loader: Fix late loading of CSS in certain cases
By protecting the CSS callbacks array against being
polluted by the callbacks themselves. This fixes
a bug where if A depends on B and both A and B have
styles, both A and B are executed once B's styles
have loaded (but before A's styles have loaded).
This breaks mw.loader's contract to only execute
A once its styles have loaded.
Bug: T105973
Change-Id: Ifa8fc7b3d275faa1f9a136a8c4a0e0a7cc358083
---
M resources/src/mediawiki/mediawiki.js
M tests/qunit/suites/resources/mediawiki/mediawiki.test.js
2 files changed, 64 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/36/226036/1
diff --git a/resources/src/mediawiki/mediawiki.js
b/resources/src/mediawiki/mediawiki.js
index 2c88e93..c0b1642 100644
--- a/resources/src/mediawiki/mediawiki.js
+++ b/resources/src/mediawiki/mediawiki.js
@@ -819,6 +819,14 @@
function addEmbeddedCSS( cssText, callback ) {
var $style, styleEl;
+ function fireCallbacks() {
+ var oldCallbacks = cssCallbacks;
+ // Reset cssCallbacks variable so it's
not polluted by any calls to
+ // addEmbeddedCSS() from one of the
callbacks (T105973)
+ cssCallbacks = $.Callbacks();
+ oldCallbacks.fire().empty();
+ }
+
if ( callback ) {
cssCallbacks.add( callback );
}
@@ -884,14 +892,14 @@
} else {
styleEl.appendChild(
document.createTextNode( cssText ) );
}
- cssCallbacks.fire().empty();
+ fireCallbacks();
return;
}
}
$( newStyleTag( cssText, getMarker() ) ).data(
'ResourceLoaderDynamicStyleTag', true );
- cssCallbacks.fire().empty();
+ fireCallbacks();
}
/**
diff --git a/tests/qunit/suites/resources/mediawiki/mediawiki.test.js
b/tests/qunit/suites/resources/mediawiki/mediawiki.test.js
index 77fecb3..c8f0011 100644
--- a/tests/qunit/suites/resources/mediawiki/mediawiki.test.js
+++ b/tests/qunit/suites/resources/mediawiki/mediawiki.test.js
@@ -670,6 +670,60 @@
} );
+ QUnit.asyncTest( 'mw.loader.implement( dependency with styles )', 4,
function ( assert ) {
+ var $element = $( ''
).appendTo( '#qunit-fixture' ),
+ $element2 = $( '' ).appendTo( '#qunit-fixture' );
+
+ assert.notEqual(
+ $element.css( 'float' ),
+ 'right',
+ 'style is clear'
+ );
+ assert.notEqual(
+ $element2.css( 'float' ),
+ 'left',
+ 'style is clear'
+ );
+
+ mw.loader.register( [
+ [ 'test.implement.e', '0', ['test.implement.e2']],
+ [ 'test.implement.e2', '0' ]
+ ] );
+
+ mw.loader.implement(
+ 'test.implement.e',
+ function () {
+ assert.equal(
+ $element.css( 'float' ),
+ 'right',
+ 'Depending module\'s style is applied'
+ );
+ QUnit.start();
+ },
+ {
+ 'all': '.mw-test-implement-e { float: right; }'
+ }
+ );
+
+ mw.loader.implement(
+ 'test.implement.e2',
+ function () {
+ assert.equal(
+ $element2.css( 'float' ),
+ 'left',
+ 'Dependency\'s style is applied'
+ );
+ },
+ {
+ 'all': '.mw-test-implement-e2 { float: left;
[MediaWiki-commits] [Gerrit] Add id to Parser tags/hooks headings - change (mediawiki/core)
Spage has uploaded a new change for review.
https://gerrit.wikimedia.org/r/226035
Change subject: Add id to Parser tags/hooks headings
..
Add id to Parser tags/hooks headings
All h2 headings in Special:Version had an id attribute except for
Parser extension tags and Parser function hooks.
Change-Id: I7d1d290862861b229791ba3973b502b44d9274f8
---
M includes/specials/SpecialVersion.php
1 file changed, 8 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/35/226035/1
diff --git a/includes/specials/SpecialVersion.php
b/includes/specials/SpecialVersion.php
index 0a91957..4fb6772 100644
--- a/includes/specials/SpecialVersion.php
+++ b/includes/specials/SpecialVersion.php
@@ -575,7 +575,10 @@
if ( count( $tags ) ) {
$out = Html::rawElement(
'h2',
- array( 'class' => 'mw-headline plainlinks' ),
+ array(
+ 'class' => 'mw-headline plainlinks',
+ 'id' =>
'mw-version-parser-extensiontags',
+ ),
Linker::makeExternalLink(
'//www.mediawiki.org/wiki/Special:MyLanguage/Manual:Tag_extensions',
$this->msg(
'version-parser-extensiontags' )->parse(),
@@ -615,7 +618,10 @@
if ( count( $fhooks ) ) {
$out = Html::rawElement(
'h2',
- array( 'class' => 'mw-headline plainlinks' ),
+ array(
+ 'class' => 'mw-headline plainlinks',
+ 'id' =>
'mw-version-parser-function-hooks',
+ ),
Linker::makeExternalLink(
'//www.mediawiki.org/wiki/Special:MyLanguage/Manual:Parser_functions',
$this->msg(
'version-parser-function-hooks' )->parse(),
--
To view, visit https://gerrit.wikimedia.org/r/226035
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I7d1d290862861b229791ba3973b502b44d9274f8
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Spage
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fixed TimedMediaHandler test - change (integration/config)
Paladox has uploaded a new change for review. https://gerrit.wikimedia.org/r/226034 Change subject: Fixed TimedMediaHandler test .. Fixed TimedMediaHandler test This fixes the problem with dependacy on MwEmbedSupport Change-Id: I8c9b44a61a54b313db0acdc42ce38582f7dc799f --- M jjb/mediawiki-extensions.yaml M zuul/layout.yaml 2 files changed, 1 insertion(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/integration/config refs/changes/34/226034/1 diff --git a/jjb/mediawiki-extensions.yaml b/jjb/mediawiki-extensions.yaml index 0050f51..b659c03 100644 --- a/jjb/mediawiki-extensions.yaml +++ b/jjb/mediawiki-extensions.yaml @@ -800,7 +800,6 @@ - mwext-Loops - mwext-MagicNoCache - mwext-Maintenance - - mwext-MaintenanceShell - mwext-Maps - mwext-MarkAsHelpful - mwext-MassEditRegex diff --git a/zuul/layout.yaml b/zuul/layout.yaml index 8314e62..58a45b9 100644 --- a/zuul/layout.yaml +++ b/zuul/layout.yaml @@ -7091,7 +7091,7 @@ - name: mediawiki/extensions/TimedMediaHandler template: - name: composer-test - - name: extension-unittests-generic + - name: extension-unittests - name: npm check: - jsonlint -- To view, visit https://gerrit.wikimedia.org/r/226034 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I8c9b44a61a54b313db0acdc42ce38582f7dc799f Gerrit-PatchSet: 1 Gerrit-Project: integration/config Gerrit-Branch: master Gerrit-Owner: Paladox ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Use "B" and "I" icon for Persian - change (mediawiki...WikiEditor)
jenkins-bot has submitted this change and it was merged. Change subject: Use "B" and "I" icon for Persian .. Use "B" and "I" icon for Persian Change-Id: I4e6f69debc489d34e611bc177975fba9c3874a54 --- M modules/jquery.wikiEditor.toolbar.config.js 1 file changed, 4 insertions(+), 0 deletions(-) Approvals: Amire80: Looks good to me, approved Ladsgroup: Looks good to me, but someone else must approve Reza: Looks good to me, but someone else must approve jenkins-bot: Verified diff --git a/modules/jquery.wikiEditor.toolbar.config.js b/modules/jquery.wikiEditor.toolbar.config.js index 8e36879..70f12d6 100644 --- a/modules/jquery.wikiEditor.toolbar.config.js +++ b/modules/jquery.wikiEditor.toolbar.config.js @@ -21,6 +21,7 @@ 'en': [2, -142], 'cs': [2, -142], 'de': [2, -214], + 'fa': [2, -142], 'fr': [2, -286], 'gl': [2, -358], 'es': [2, -358], @@ -37,6 +38,7 @@ 'en': 'format-bold-B.png', 'cs': 'format-bold-B.png', 'de': 'format-bold-F.png', + 'fa': 'format-bold-B.png', 'fr': 'format-bold-G.png', 'gl': 'format-bold-N.png', 'es': 'format-bold-N.png', @@ -74,6 +76,7 @@ 'en': [2, -862], 'cs': [2, -862], 'de': [2, -934], + 'fa': [2, -862], 'fr': [2, -862], 'gl': [2, -790], 'es': [2, -790], @@ -92,6 +95,7 @@ 'en': 'format-italic-I.png', 'cs': 'format-italic-I.png', 'de': 'format-italic-K.png', + 'fa': 'format-italic-I.png', 'fr': 'format-italic-I.png', 'gl': 'format-italic-C.png', 'es': 'format-italic-C.png', -- To view, visit https://gerrit.wikimedia.org/r/226030 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I4e6f69debc489d34e611bc177975fba9c3874a54 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/WikiEditor Gerrit-Branch: master Gerrit-Owner: Ebrahim Gerrit-Reviewer: Amire80 Gerrit-Reviewer: Ladsgroup Gerrit-Reviewer: Reza Gerrit-Reviewer: TheDJ Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] QA: Add a sleep on a flakey test - change (mediawiki...MobileFrontend)
Jdlrobson has uploaded a new change for review. https://gerrit.wikimedia.org/r/226033 Change subject: QA: Add a sleep on a flakey test .. QA: Add a sleep on a flakey test This test regularly fails due to a page not having fully loaded. [1] This adds a sleep step to try avoid this [1] https://integration.wikimedia.org/ci/view/ Mobile/job/browsertests-MobileFrontend-SmokeTests-linux-chrome-sauce/ 193/testReport/junit/(root)/Manage%20Watchlist/Switching_to_Feed_view/ Change-Id: Ie19ea0820ac58aea9989f799e82ee1ee7ed17a25 --- M tests/browser/features/step_definitions/special_watchlist_steps.rb 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend refs/changes/33/226033/1 diff --git a/tests/browser/features/step_definitions/special_watchlist_steps.rb b/tests/browser/features/step_definitions/special_watchlist_steps.rb index 623d2b4..0ed971c 100644 --- a/tests/browser/features/step_definitions/special_watchlist_steps.rb +++ b/tests/browser/features/step_definitions/special_watchlist_steps.rb @@ -1,5 +1,7 @@ When(/^I click the Pages tab$/) do on(WatchlistPage).pages_tab_link_element.when_present.click + # Give time for the page to load + sleep 5 end When(/^I switch to the list view of the watchlist$/) do -- To view, visit https://gerrit.wikimedia.org/r/226033 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie19ea0820ac58aea9989f799e82ee1ee7ed17a25 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/MobileFrontend Gerrit-Branch: master Gerrit-Owner: Jdlrobson ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Sanitize link fragments - change (mediawiki...parsoid)
Arlolra has uploaded a new change for review.
https://gerrit.wikimedia.org/r/226032
Change subject: Sanitize link fragments
..
Sanitize link fragments
* Implements Sanitizer's escapeId.
* Moves some utilities from the Sanitizer's prototype to the constructor
for use without instantiation.
* 36053d3b568145d991d5088e1dbe561d60241f02 mentions T59252 (and some
comments here) where we are foregoing id munging. That is probably
less of an issue for editability than it is for Flow. Their stored
link fragments should point to the right place on wiki.
* I imagine there may be some complications here with copy/paste.
* Fixes a little edge case in roundtripping unedited interwiki links.
Bug: T94949
Change-Id: I8758a7af37788a93d2326c7930bb82b9ad138f27
---
M lib/ext.core.LinkHandler.js
M lib/ext.core.Sanitizer.js
M lib/mediawiki.Util.js
M lib/wts.LinkHandler.js
M tests/parserTests-blacklist.js
M tests/parserTests.txt
6 files changed, 77 insertions(+), 43 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/parsoid
refs/changes/32/226032/1
diff --git a/lib/ext.core.LinkHandler.js b/lib/ext.core.LinkHandler.js
index e80e892..584a6df 100644
--- a/lib/ext.core.LinkHandler.js
+++ b/lib/ext.core.LinkHandler.js
@@ -539,7 +539,7 @@
if (target.language.protorel !== undefined) {
absHref = absHref.replace( /^https?:/, '');
}
- newTk.addNormalizedAttribute('href', absHref, target.hrefSrc);
+ newTk.addNormalizedAttribute('href', Util.sanitizeURI(absHref),
target.hrefSrc);
// Change the rel to be mw:PageProp/Language
Util.lookupKV( newTk.attribs, 'rel' ).v = 'mw:PageProp/Language';
@@ -562,7 +562,8 @@
if (target.interwiki.protorel !== undefined) {
absHref = absHref.replace( /^https?:/, '');
}
- newTk.addNormalizedAttribute('href', absHref, target.hrefSrc);
+
+ newTk.addNormalizedAttribute('href', Util.sanitizeURI(absHref),
target.hrefSrc);
// Change the rel to be mw:ExtLink
Util.lookupKV( newTk.attribs, 'rel' ).v = 'mw:ExtLink';
diff --git a/lib/ext.core.Sanitizer.js b/lib/ext.core.Sanitizer.js
index 1b78f64..a88f3e3 100644
--- a/lib/ext.core.Sanitizer.js
+++ b/lib/ext.core.Sanitizer.js
@@ -807,12 +807,11 @@
*
* gwicke: Use Util.decodeEntities instead?
*/
-Sanitizer.prototype.decodeEntity = function(name) {
- if (this.constants.htmlEntityAliases[name]) {
- name = this.constants.htmlEntityAliases[name];
+Sanitizer.decodeEntity = function(name) {
+ if (SanitizerConstants.htmlEntityAliases[name]) {
+ name = SanitizerConstants.htmlEntityAliases[name];
}
-
- var e = this.constants.htmlEntities[name];
+ var e = SanitizerConstants.htmlEntities[name];
return e ? Util.codepointToUtf8(e) : "&" + name + ";";
};
@@ -820,11 +819,11 @@
* Return UTF-8 string for a codepoint if that is a valid
* character reference, otherwise U+FFFD REPLACEMENT CHARACTER.
*/
-Sanitizer.prototype.decodeChar = function(codepoint) {
+Sanitizer.decodeChar = function(codepoint) {
if (Util.validateCodepoint(codepoint)) {
return Util.codepointToUtf8(codepoint);
} else {
- return this.constants.UTF8_REPLACEMENT;
+ return SanitizerConstants.UTF8_REPLACEMENT;
}
};
@@ -832,15 +831,14 @@
* Decode any character references, numeric or named entities,
* in the text and return a UTF-8 string.
*/
-Sanitizer.prototype.decodeCharReferences = function( text ) {
- var sanitizer = this;
- return text.replace(sanitizer.constants.CHAR_REFS_RE, function() {
+Sanitizer.decodeCharReferences = function(text) {
+ return text.replace(SanitizerConstants.CHAR_REFS_RE, function() {
if (arguments[1]) {
- return sanitizer.decodeEntity(arguments[1]);
+ return Sanitizer.decodeEntity(arguments[1]);
} else if (arguments[2]) {
- return sanitizer.decodeChar(parseInt(arguments[2], 10));
+ return Sanitizer.decodeChar(parseInt(arguments[2], 10));
} else if (arguments[3]) {
- return sanitizer.decodeChar(parseInt(arguments[3], 16));
+ return Sanitizer.decodeChar(parseInt(arguments[3], 16));
} else {
return arguments[4];
}
@@ -870,7 +868,7 @@
}
// Decode character references like {
- text = this.decodeCharReferences(text);
+ text = Sanitizer.decodeCharReferences(text);
text = text.replace(this.constants.cssDecodeRE, function() {
var c;
if (arguments[1] !== undefined ) {
@@ -937,8 +935,23 @@
return text;
};
-Sanitizer.prototype.escapeId = function(id,
[MediaWiki-commits] [Gerrit] Remove unused mwext-MaintenanceShell-jslint job - change (integration/config)
jenkins-bot has submitted this change and it was merged. Change subject: Remove unused mwext-MaintenanceShell-jslint job .. Remove unused mwext-MaintenanceShell-jslint job * Remove unused and unneeded mwext-MaintenanceShell test Change-Id: I1a0bb9641bdd2aa26bf4de55c7563acc3c4d581a --- M jjb/mediawiki-extensions.yaml 1 file changed, 0 insertions(+), 1 deletion(-) Approvals: Krinkle: Looks good to me, approved jenkins-bot: Verified diff --git a/jjb/mediawiki-extensions.yaml b/jjb/mediawiki-extensions.yaml index 0050f51..b659c03 100644 --- a/jjb/mediawiki-extensions.yaml +++ b/jjb/mediawiki-extensions.yaml @@ -800,7 +800,6 @@ - mwext-Loops - mwext-MagicNoCache - mwext-Maintenance - - mwext-MaintenanceShell - mwext-Maps - mwext-MarkAsHelpful - mwext-MassEditRegex -- To view, visit https://gerrit.wikimedia.org/r/225293 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I1a0bb9641bdd2aa26bf4de55c7563acc3c4d581a Gerrit-PatchSet: 6 Gerrit-Project: integration/config Gerrit-Branch: master Gerrit-Owner: Paladox Gerrit-Reviewer: Hashar Gerrit-Reviewer: Krinkle Gerrit-Reviewer: Paladox Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] WikidataPageBanner allow spaces in banner href - change (mediawiki...WikidataPageBanner)
jenkins-bot has submitted this change and it was merged.
Change subject: WikidataPageBanner allow spaces in banner href
..
WikidataPageBanner allow spaces in banner href
Bug: T106321
Change-Id: Iaae97116ed93877ac12eb3935380eedb3a50ae52
---
M templates/banner.mustache
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Jdlrobson: Looks good to me, approved
jenkins-bot: Verified
diff --git a/templates/banner.mustache b/templates/banner.mustache
index fb37c81..997d11d 100644
--- a/templates/banner.mustache
+++ b/templates/banner.mustache
@@ -2,7 +2,7 @@
{{title}}
-
+
{{#hasIcons}}
{{#icons}}
--
To view, visit https://gerrit.wikimedia.org/r/225855
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iaae97116ed93877ac12eb3935380eedb3a50ae52
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikidataPageBanner
Gerrit-Branch: master
Gerrit-Owner: Sumit
Gerrit-Reviewer: Jdlrobson
Gerrit-Reviewer: Sumit
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Allow constructing a Message from a MessageSpecifier - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged.
Change subject: Allow constructing a Message from a MessageSpecifier
..
Allow constructing a Message from a MessageSpecifier
Bug: T91986
Change-Id: Id6a9862d23c2b71da2c8b34acdd19b8247ac5301
---
M includes/GlobalFunctions.php
M includes/Message.php
M tests/phpunit/includes/MessageTest.php
3 files changed, 26 insertions(+), 4 deletions(-)
Approvals:
Aaron Schulz: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/GlobalFunctions.php b/includes/GlobalFunctions.php
index 3be43b3..6ebd464 100644
--- a/includes/GlobalFunctions.php
+++ b/includes/GlobalFunctions.php
@@ -1411,7 +1411,7 @@
*
* This function replaces all old wfMsg* functions.
*
- * @param string|string[] $key Message key, or array of keys
+ * @param string|string[]|MessageSpecifier $key Message key, or array of keys,
or a MessageSpecifier
* @param mixed $params,... Normal message parameters
* @return Message
*
diff --git a/includes/Message.php b/includes/Message.php
index 134af0e..3340656 100644
--- a/includes/Message.php
+++ b/includes/Message.php
@@ -226,8 +226,9 @@
/**
* @since 1.17
*
-* @param string|string[] $key Message key or array of message keys to
try and use the first
-* non-empty message for.
+* @param string|string[]|MessageSpecifier $key Message key, or array of
+* message keys to try and use the first non-empty message for, or a
+* MessageSpecifier to copy from.
* @param array $params Message parameters.
* @param Language $language Optional language of the message, defaults
to $wgLang.
*
@@ -235,6 +236,16 @@
*/
public function __construct( $key, $params = array(), Language
$language = null ) {
global $wgLang;
+
+ if ( $key instanceof MessageSpecifier ) {
+ if ( $params ) {
+ throw new InvalidArgumentException(
+ '$params must be empty if $key is a
MessageSpecifier'
+ );
+ }
+ $params = $key->getParams();
+ $key = $key->getKey();
+ }
if ( !is_string( $key ) && !is_array( $key ) ) {
throw new InvalidArgumentException( '$key must be a
string or an array' );
@@ -327,7 +338,7 @@
*
* @since 1.17
*
-* @param string|string[] $key Message key or array of keys.
+* @param string|string[]|MessageSpecifier $key
* @param mixed $param,... Parameters as strings.
*
* @return Message
diff --git a/tests/phpunit/includes/MessageTest.php
b/tests/phpunit/includes/MessageTest.php
index 99ec2e4..225cc4c 100644
--- a/tests/phpunit/includes/MessageTest.php
+++ b/tests/phpunit/includes/MessageTest.php
@@ -21,6 +21,17 @@
$this->assertEquals( $key, $message->getKey() );
$this->assertEquals( $params, $message->getParams() );
$this->assertEquals( $expectedLang, $message->getLanguage() );
+
+ $messageSpecifier = $this->getMockForAbstractClass(
'MessageSpecifier' );
+ $messageSpecifier->expects( $this->any() )
+ ->method( 'getKey' )->will( $this->returnValue( $key )
);
+ $messageSpecifier->expects( $this->any() )
+ ->method( 'getParams' )->will( $this->returnValue(
$params ) );
+ $message = new Message( $messageSpecifier, array(), $language );
+
+ $this->assertEquals( $key, $message->getKey() );
+ $this->assertEquals( $params, $message->getParams() );
+ $this->assertEquals( $expectedLang, $message->getLanguage() );
}
public static function provideConstructor() {
--
To view, visit https://gerrit.wikimedia.org/r/195293
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Id6a9862d23c2b71da2c8b34acdd19b8247ac5301
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Anomie
Gerrit-Reviewer: Aaron Schulz
Gerrit-Reviewer: Anomie
Gerrit-Reviewer: Legoktm
Gerrit-Reviewer: Parent5446
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] PostgreSQL: Fix text search on moved pages - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged.
Change subject: PostgreSQL: Fix text search on moved pages
..
PostgreSQL: Fix text search on moved pages
When a page is updated under PostgreSQL, there is code to
de-index all but the most recent version of the page. But
when a page is moved, it was accidentally de-indexing the
most recent version as well, because rev_text_id is not
incremented in that case. A simple tweak to the SQL
fixes that.
I added code to the update script to find pages
previously corrupted by this problem and reindex them.
Bug: 66650
Change-Id: I52e1bbbd8592be5e7c7383c225e6b4c19bbe5b9e
---
M includes/installer/PostgresUpdater.php
M includes/search/SearchPostgres.php
A maintenance/postgres/archives/patch-textsearch_bug66650.sql
M maintenance/postgres/update-keys.sql
4 files changed, 21 insertions(+), 1 deletion(-)
Approvals:
Aaron Schulz: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/installer/PostgresUpdater.php
b/includes/installer/PostgresUpdater.php
index 9e41276..f2f2a26 100644
--- a/includes/installer/PostgresUpdater.php
+++ b/includes/installer/PostgresUpdater.php
@@ -409,6 +409,8 @@
array( 'addPgField', 'mwuser', 'user_password_expires',
'TIMESTAMPTZ NULL' ),
array( 'changeFieldPurgeTable', 'l10n_cache',
'lc_value', 'bytea',
"replace(lc_value,'\','')::bytea" ),
+ // 1.23.9
+ array( 'rebuildTextSearch'),
// 1.24
array( 'addPgField', 'page_props', 'pp_sortkey', 'float
NULL' ),
@@ -949,4 +951,12 @@
$this->applyPatch( 'patch-tsearch2funcs.sql', false,
"Rewriting tsearch2 triggers" );
}
}
+
+ protected function rebuildTextSearch() {
+ if ( $this->updateRowExists( 'patch-textsearch_bug66650.sql' )
) {
+ $this->output( "...bug 66650 already fixed or not
applicable.\n" );
+ return true;
+ };
+ $this->applyPatch( 'patch-textsearch_bug66650.sql', false,
"Rebuilding text search for bug 66650" );
+ }
}
diff --git a/includes/search/SearchPostgres.php
b/includes/search/SearchPostgres.php
index bda10b0..71e3b63 100644
--- a/includes/search/SearchPostgres.php
+++ b/includes/search/SearchPostgres.php
@@ -186,7 +186,7 @@
function update( $pageid, $title, $text ) {
## We don't want to index older revisions
$sql = "UPDATE pagecontent SET textvector = NULL WHERE
textvector IS NOT NULL and old_id IN " .
- "(SELECT rev_text_id FROM revision WHERE
rev_page = " . intval( $pageid ) .
+ "(SELECT DISTINCT rev_text_id FROM revision
WHERE rev_page = " . intval( $pageid ) .
" ORDER BY rev_text_id DESC OFFSET 1)";
$this->db->query( $sql );
return true;
diff --git a/maintenance/postgres/archives/patch-textsearch_bug66650.sql
b/maintenance/postgres/archives/patch-textsearch_bug66650.sql
new file mode 100644
index 000..e4f5681
--- /dev/null
+++ b/maintenance/postgres/archives/patch-textsearch_bug66650.sql
@@ -0,0 +1,5 @@
+UPDATE /*_*/pagecontent SET textvector=to_tsvector(old_text)
+WHERE textvector IS NULL AND old_id IN
+(SELECT max(rev_text_id) FROM revision GROUP BY rev_page);
+
+INSERT INTO /*_*/updatelog(ul_key) VALUES ('patch-textsearch_bug66650.sql');
diff --git a/maintenance/postgres/update-keys.sql
b/maintenance/postgres/update-keys.sql
index 7761d0c..b858551 100644
--- a/maintenance/postgres/update-keys.sql
+++ b/maintenance/postgres/update-keys.sql
@@ -27,3 +27,8 @@
VALUES(
'user_former_groups-ufg_group-patch-ufg_group-length-increase-255.sql', null );
INSERT INTO /*_*/updatelog (ul_key, ul_value)
VALUES( 'user_properties-up_property-patch-up_property.sql', null );
+
+-- PostgreSQL-specific patches.
+
+INSERT INTO /*_*/updatelog (ul_key, ul_value)
+ VALUES( 'patch-textsearch_bug66650.sql', null );
--
To view, visit https://gerrit.wikimedia.org/r/153565
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I52e1bbbd8592be5e7c7383c225e6b4c19bbe5b9e
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Jjanes
Gerrit-Reviewer: Aaron Schulz
Gerrit-Reviewer: Jjanes
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Move deprecated HTML attributes to CSS - change (mediawiki...ConfirmAccount)
jenkins-bot has submitted this change and it was merged.
Change subject: Move deprecated HTML attributes to CSS
..
Move deprecated HTML attributes to CSS
Change-Id: I4b03a0c004ddbbc1a2439c91f4644695b5cb0ac6
---
M frontend/specialpages/actions/ConfirmAccount_body.php
M frontend/specialpages/actions/RequestAccount_body.php
M frontend/specialpages/actions/UserCredentials_body.php
3 files changed, 14 insertions(+), 14 deletions(-)
Approvals:
Aaron Schulz: Looks good to me, approved
jenkins-bot: Verified
diff --git a/frontend/specialpages/actions/ConfirmAccount_body.php
b/frontend/specialpages/actions/ConfirmAccount_body.php
index 7946add..925f376 100644
--- a/frontend/specialpages/actions/ConfirmAccount_body.php
+++ b/frontend/specialpages/actions/ConfirmAccount_body.php
@@ -295,7 +295,7 @@
$form .= "";
$form .= '' . $this->msg( 'confirmaccount-leg-user'
)->escaped() . '';
- $form .= '';
+ $form .= '';
$form .= "" . Xml::label( $this->msg( 'username'
)->text(), 'wpNewName' ) . "";
$form .= "" . Xml::input( 'wpNewName', 30,
$this->reqUsername, array( 'id' => 'wpNewName' ) ) . "\n";
$econf = '';
@@ -324,7 +324,7 @@
$form .= '' . $this->msg(
'confirmaccount-leg-areas' )->escaped() . '';
$form .= "";
- $form .= "";
+ $form .= "";
$count = 0;
foreach ( $userAreas as $name => $conf ) {
$count++;
@@ -353,7 +353,7 @@
$form .= '';
$form .= '' . $this->msg(
'confirmaccount-leg-person' )->escaped() . '';
if ( $this->hasItem( 'RealName' ) ) {
- $form .= '';
+ $form .= '';
$form .= "" . $this->msg(
'confirmaccount-real' )->escaped() . "";
$form .= "" . htmlspecialchars(
$accountReq->getRealName() ) . "\n";
$form .= '';
@@ -426,7 +426,7 @@
$form .= '';
$form .= '' . $this->msg( 'confirmaccount-legend'
)->escaped() . '';
$form .= "" . $this->msg( 'confirmaccount-confirm'
)->parse() . "\n";
- $form .= "";
+ $form .= "";
$form .= "" . Xml::radio( 'wpSubmitType', 'accept',
$this->submitType == 'accept',
array( 'id' => 'submitCreate', 'onclick' =>
'document.getElementById("wpComment").style.display="block"' ) );
$form .= ' ' . Xml::label( $this->msg( 'confirmaccount-create'
)->text(), 'submitCreate' ) . "\n";
@@ -710,7 +710,7 @@
$r .= ' ' . $this->msg( 'confirmaccount-viewing',
User::whoIs( $value ) )->parse() . '';
}
- $r .= "";
+ $r .= "";
if ( $this->hasItem( 'UserName' ) ) {
$r .= '' . $this->msg(
'confirmaccount-name' )->escaped() . '' .
htmlspecialchars( $row->acr_name ) .
'';
@@ -735,7 +735,7 @@
$preview .= " . . .";
}
$r .= '' . $this->msg( 'confirmaccount-bio-q'
)->escaped() .
- '' . $preview .
'';
+ '' . $preview
. '';
$r .= '';
$r .= '';
diff --git a/frontend/specialpages/actions/RequestAccount_body.php
b/frontend/specialpages/actions/RequestAccount_body.php
index 0554273..75339c4 100644
--- a/frontend/specialpages/actions/RequestAccount_body.php
+++ b/frontend/specialpages/actions/RequestAccount_body.php
@@ -112,7 +112,7 @@
$form .= '' . $this->msg(
'requestaccount-leg-user' )->escaped() . '';
$form .= $this->msg( 'requestaccount-acc-text'
)->parseAsBlock() . "\n";
- $form .= '';
+ $form .= '';
if ( $this->hasItem( 'UserName' ) ) {
$form .= "" . Xml::label( $this->msg(
'username' )->text(), 'wpUsername' ) . "";
$form .= "" . Xml::input( 'wpUsername', 30,
$this->mUsername, array( 'id' => 'wpUsername' ) ) . "\n";
@@ -143,12 +143,12 @@
$form .= $this->msg( 'requestaccount-areas-text'
)->parseAsBlock() . "\n";
$form .= "";
- $form .= "";
+ $form .= "";
$count = 0;
foreach ( $userAreas as $name => $conf ) {
$count++;
if ( $count > 5 ) {
- $form .= "";
+ $form .= "";
$count = 1
[MediaWiki-commits] [Gerrit] Ensure that phabricator/src/extensions exists - change (operations/puppet)
20after4 has uploaded a new change for review.
https://gerrit.wikimedia.org/r/226031
Change subject: Ensure that phabricator/src/extensions exists
..
Ensure that phabricator/src/extensions exists
Gotta have the directory created before adding symlinks there. This
should fix T104904.
Bug: T104904
Change-Id: I9b9e21a7b51f8a5c9edf797679dc03faf589aad1
---
M modules/phabricator/manifests/extension.pp
M modules/phabricator/manifests/init.pp
2 files changed, 10 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/31/226031/1
diff --git a/modules/phabricator/manifests/extension.pp
b/modules/phabricator/manifests/extension.pp
index 05387110..a368f3f 100644
--- a/modules/phabricator/manifests/extension.pp
+++ b/modules/phabricator/manifests/extension.pp
@@ -9,5 +9,6 @@
file { "${rootdir}/phabricator/src/extensions/${name}":
ensure => link,
target => "${rootdir}/extensions/${name}",
+require => "${rootdir}/phabricator/src/extensions/"
}
}
diff --git a/modules/phabricator/manifests/init.pp
b/modules/phabricator/manifests/init.pp
index 658b635..6abfff1 100644
--- a/modules/phabricator/manifests/init.pp
+++ b/modules/phabricator/manifests/init.pp
@@ -222,6 +222,15 @@
before=> Git::Install['phabricator/phabricator'],
}
+file { "${$phabdir}/phabricator/src/extensions/":
+ensure=> 'directory',
+owner => 'root',
+group => 'root',
+mode => '0755',
+require => Git::Install['phabricator/extensions'],
+before=> Phabricator::Extension["$extensions"],
+}
+
exec {$ext_lock_path:
command => "touch ${ext_lock_path}",
unless => "test -z ${ext_lock_path} || test -e ${ext_lock_path}",
--
To view, visit https://gerrit.wikimedia.org/r/226031
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I9b9e21a7b51f8a5c9edf797679dc03faf589aad1
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: 20after4
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Use "B" and "I" icon for Persian - change (mediawiki...WikiEditor)
Ebrahim has uploaded a new change for review. https://gerrit.wikimedia.org/r/226030 Change subject: Use "B" and "I" icon for Persian .. Use "B" and "I" icon for Persian Change-Id: I4e6f69debc489d34e611bc177975fba9c3874a54 --- M modules/jquery.wikiEditor.toolbar.config.js 1 file changed, 4 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikiEditor refs/changes/30/226030/1 diff --git a/modules/jquery.wikiEditor.toolbar.config.js b/modules/jquery.wikiEditor.toolbar.config.js index 8e36879..70f12d6 100644 --- a/modules/jquery.wikiEditor.toolbar.config.js +++ b/modules/jquery.wikiEditor.toolbar.config.js @@ -21,6 +21,7 @@ 'en': [2, -142], 'cs': [2, -142], 'de': [2, -214], + 'fa': [2, -142], 'fr': [2, -286], 'gl': [2, -358], 'es': [2, -358], @@ -37,6 +38,7 @@ 'en': 'format-bold-B.png', 'cs': 'format-bold-B.png', 'de': 'format-bold-F.png', + 'fa': 'format-bold-B.png', 'fr': 'format-bold-G.png', 'gl': 'format-bold-N.png', 'es': 'format-bold-N.png', @@ -74,6 +76,7 @@ 'en': [2, -862], 'cs': [2, -862], 'de': [2, -934], + 'fa': [2, -862], 'fr': [2, -862], 'gl': [2, -790], 'es': [2, -790], @@ -92,6 +95,7 @@ 'en': 'format-italic-I.png', 'cs': 'format-italic-I.png', 'de': 'format-italic-K.png', + 'fa': 'format-italic-I.png', 'fr': 'format-italic-I.png', 'gl': 'format-italic-C.png', 'es': 'format-italic-C.png', -- To view, visit https://gerrit.wikimedia.org/r/226030 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I4e6f69debc489d34e611bc177975fba9c3874a54 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/WikiEditor Gerrit-Branch: master Gerrit-Owner: Ebrahim ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] QA: Do not set user_factory to true on the default environment - change (mediawiki...MobileFrontend)
Jdlrobson has uploaded a new change for review. https://gerrit.wikimedia.org/r/226029 Change subject: QA: Do not set user_factory to true on the default environment .. QA: Do not set user_factory to true on the default environment This is causing Barry the browser test to choke on various tests Change-Id: I48689caf89352c3703fe216e955edcab2305a0f0 --- M tests/browser/environments.yml 1 file changed, 0 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend refs/changes/29/226029/1 diff --git a/tests/browser/environments.yml b/tests/browser/environments.yml index adc2407..cdb6d79 100644 --- a/tests/browser/environments.yml +++ b/tests/browser/environments.yml @@ -16,7 +16,6 @@ # mw-vagrant-host: &default mediawiki_url: http://127.0.0.1:8080/wiki/ - user_factory: true mw-vagrant-guest: mediawiki_url: http://127.0.0.1/wiki/ -- To view, visit https://gerrit.wikimedia.org/r/226029 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I48689caf89352c3703fe216e955edcab2305a0f0 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/MobileFrontend Gerrit-Branch: master Gerrit-Owner: Jdlrobson ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Avoid logging query in wasDeletedSinceLastEdit() if the page... - change (mediawiki/core)
Aaron Schulz has uploaded a new change for review.
https://gerrit.wikimedia.org/r/226028
Change subject: Avoid logging query in wasDeletedSinceLastEdit() if the page
still exists
..
Avoid logging query in wasDeletedSinceLastEdit() if the page still exists
* This avoids hitting a long tail of logging table queries that
cannot easily use the buffer pool all the time.
Change-Id: Id2ad6b9699f1a8c579ebb1c3c0319183772af1bd
---
M includes/EditPage.php
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/28/226028/1
diff --git a/includes/EditPage.php b/includes/EditPage.php
index bf322ae..0233b11 100644
--- a/includes/EditPage.php
+++ b/includes/EditPage.php
@@ -3445,7 +3445,7 @@
$this->deletedSinceEdit = false;
- if ( $this->mTitle->isDeletedQuick() ) {
+ if ( !$this->mTitle->exists() &&
$this->mTitle->isDeletedQuick() ) {
$this->lastDelete = $this->getLastDelete();
if ( $this->lastDelete ) {
$deleteTime = wfTimestamp( TS_MW,
$this->lastDelete->log_timestamp );
--
To view, visit https://gerrit.wikimedia.org/r/226028
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Id2ad6b9699f1a8c579ebb1c3c0319183772af1bd
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Always show a logo on Login/Create page - change (mediawiki...MobileFrontend)
jenkins-bot has submitted this change and it was merged.
Change subject: Always show a logo on Login/Create page
..
Always show a logo on Login/Create page
Before this change, the logo was only visible, if there is no error
or warning message. That is really confusing and differs from the
behavior of the core login page.
This change changes the logo to appear everytime the login page is
requested, no matter, if there is an error or warning message.
Follow up: I1b09e7ba80d18dc8c19b2aa475c4d269dffc295e
Bug: T106352
Change-Id: Ib9893b3376c6d15843c2a798a334c1998526e8da
---
M includes/skins/UserLoginAndCreateTemplate.php
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Jdlrobson: Looks good to me, approved
jenkins-bot: Verified
Objections:
BarryTheBrowserTestBot: There's a problem with this change, please improve
diff --git a/includes/skins/UserLoginAndCreateTemplate.php
b/includes/skins/UserLoginAndCreateTemplate.php
index d7dd7a6..33ccf07 100644
--- a/includes/skins/UserLoginAndCreateTemplate.php
+++ b/includes/skins/UserLoginAndCreateTemplate.php
@@ -60,8 +60,8 @@
$msgBox .= Html::element( 'br' );
$msgBox .= wfMessage(
"mobile-frontend-generic-{$action}-action" )->plain();
$msgBox .= Html::closeElement( 'div' );
- $msgBox .= $this->getLogoHtml();
}
+ $msgBox .= $this->getLogoHtml();
echo $msgBox;
}
--
To view, visit https://gerrit.wikimedia.org/r/226026
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib9893b3376c6d15843c2a798a334c1998526e8da
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Florianschmidtwelzow
Gerrit-Reviewer: BarryTheBrowserTestBot
Gerrit-Reviewer: Jdlrobson
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix MwEmbedSupport dependance of TimedMediaHandler - change (integration/config)
Paladox has uploaded a new change for review.
https://gerrit.wikimedia.org/r/226027
Change subject: Fix MwEmbedSupport dependance of TimedMediaHandler
..
Fix MwEmbedSupport dependance of TimedMediaHandler
Change-Id: I30ac229e4c71b8cf7167634b60a34507ee90b1a1
---
M jjb/mediawiki-extensions.yaml
M zuul/ext_dependencies.py
2 files changed, 14 insertions(+), 15 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/integration/config
refs/changes/27/226027/1
diff --git a/jjb/mediawiki-extensions.yaml b/jjb/mediawiki-extensions.yaml
index 9fb9605..52ec60b 100644
--- a/jjb/mediawiki-extensions.yaml
+++ b/jjb/mediawiki-extensions.yaml
@@ -438,7 +438,7 @@
- ExtTab
- FanBoxes
- Flow:
-dependencies:
'AbuseFilter,SpamBlacklist,CheckUser,Mantle,Echo,EventLogging,ConfirmEdit,VisualEditor'
+dependencies:
'AbuseFilter,SpamBlacklist,CheckUser,Echo,EventLogging,ConfirmEdit,VisualEditor'
- GitHub
- Graph:
dependencies: 'JsonConfig'
@@ -453,13 +453,14 @@
- Maps:
dependencies: 'Validator'
- MobileApp:
-dependencies: 'Echo,MobileFrontend,Mantle,VisualEditor'
+dependencies: 'Echo,MobileFrontend,VisualEditor'
- MobileFrontend:
-dependencies: 'Echo,Mantle,VisualEditor'
+dependencies: 'Echo,VisualEditor'
- MoodBar
- MsLinks
- MultimediaPlayer
- MultimediaViewer
+- MwEmbedSupport
- Narayam
- NaturalLanguageList
- NewsBox
@@ -547,7 +548,7 @@
- SyntaxHighlight_GeSHi
- Tabs
- Thanks:
-dependencies:
'Echo,Flow,Mantle,MobileFrontend,VisualEditor,AbuseFilter,SpamBlacklist,CheckUser,EventLogging,ConfirmEdit'
+dependencies:
'Echo,Flow,MobileFrontend,VisualEditor,AbuseFilter,SpamBlacklist,CheckUser,EventLogging,ConfirmEdit'
- ThrottleOverride
- TimedMediaHandler:
dependencies: 'MwEmbedSupport'
@@ -589,7 +590,7 @@
- WikidataEntitySuggester
- WikidataPageBanner
- WikiGrok:
-dependencies: 'Echo,MobileFrontend,Mantle,VisualEditor'
+dependencies: 'Echo,MobileFrontend,VisualEditor'
- wikihiero:
dependencies: 'VisualEditor'
- WikiLexicalData
@@ -600,9 +601,9 @@
- WindowsAzureSDK
- WYSIWYG
- ZeroBanner:
-dependencies: 'Echo,JsonConfig,MobileFrontend,Mantle,VisualEditor'
+dependencies: 'Echo,JsonConfig,MobileFrontend,VisualEditor'
- ZeroPortal:
-dependencies:
'Echo,JsonConfig,MobileFrontend,Mantle,VisualEditor,ZeroBanner'
+dependencies: 'Echo,JsonConfig,MobileFrontend,VisualEditor,ZeroBanner'
mwbranch:
- master
@@ -632,19 +633,17 @@
- '{name}-{ext-name}-qunit':
name: mwext
ext-name: MobileFrontend
-dependencies: Mantle
- '{name}-{ext-name}-qunit-mobile':
name: mwext
ext-name: MobileFrontend
-dependencies: Mantle
- '{name}-{ext-name}-qunit':
name: mwext
ext-name: Thanks
-dependencies:
'Echo,Flow,Mantle,MobileFrontend,VisualEditor,AbuseFilter,SpamBlacklist,CheckUser,EventLogging,ConfirmEdit'
+dependencies:
'Echo,Flow,MobileFrontend,VisualEditor,AbuseFilter,SpamBlacklist,CheckUser,EventLogging,ConfirmEdit'
- '{name}-{ext-name}-qunit-mobile':
name: mwext
ext-name: Thanks
-dependencies:
'Echo,Flow,Mantle,MobileFrontend,VisualEditor,AbuseFilter,SpamBlacklist,CheckUser,EventLogging,ConfirmEdit'
+dependencies:
'Echo,Flow,MobileFrontend,VisualEditor,AbuseFilter,SpamBlacklist,CheckUser,EventLogging,ConfirmEdit'
- '{name}-{ext-name}-npm':
ext-name: VisualEditor
diff --git a/zuul/ext_dependencies.py b/zuul/ext_dependencies.py
index 32a4017..d3a15dc 100644
--- a/zuul/ext_dependencies.py
+++ b/zuul/ext_dependencies.py
@@ -9,10 +9,10 @@
'Disambiguator': ['VisualEditor'],
'EducationProgram': ['cldr'],
'FlaggedRevs': ['Scribunto'],
-'Flow': ['AbuseFilter', 'CheckUser', 'ConfirmEdit', 'Mantle',
- 'SpamBlacklist', 'Echo', 'EventLogging', 'VisualEditor'],
+'Flow': ['AbuseFilter', 'CheckUser', 'ConfirmEdit', 'SpamBlacklist',
+ 'Echo', 'EventLogging', 'VisualEditor'],
'Gather': ['PageImages', 'TextExtracts', 'MobileFrontend', 'Echo',
- 'Mantle', 'VisualEditor'],
+ 'VisualEditor'],
'GettingStarted': ['CentralAuth', 'EventLogging', 'GuidedTour'],
'GuidedTour': ['EventLogging'],
'GWToolset': ['SyntaxHighlight_GeSHi', 'Scribunto', 'TemplateData'],
@@ -21,7 +21,7 @@
'MassMessage': ['LiquidThreads'],
'Math': ['VisualEditor'],
'MathSearch': ['Math'],
-'MobileFrontend': ['Echo', 'Mantle', 'VisualEditor'],
+'MobileFrontend': ['Echo', 'VisualEditor'],
'NavigationTiming': ['EventLogging'],
'PronunciationRecording': ['UploadWizard'],
'ProofreadPage': ['LabeledSectionTrans
[MediaWiki-commits] [Gerrit] Remove experimental page load checkbox from theme chooser. - change (apps...wikipedia)
jenkins-bot has submitted this change and it was merged.
Change subject: Remove experimental page load checkbox from theme chooser.
..
Remove experimental page load checkbox from theme chooser.
...since it's now part of Developer Settings.
Change-Id: I94d5117c6bd7451ae37246c854a7001a44119dce
---
M wikipedia/res/layout/dialog_themechooser.xml
D wikipedia/res/layout/experimental_page_load.xml
D wikipedia/src/alpha/res/layout/experimental_page_load.xml
D wikipedia/src/main/java/org/wikipedia/theme/ExperimentalPageLoadChooser.java
M wikipedia/src/main/java/org/wikipedia/theme/ThemeChooserDialog.java
5 files changed, 0 insertions(+), 91 deletions(-)
Approvals:
BearND: Looks good to me, approved
Niedzielski: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/wikipedia/res/layout/dialog_themechooser.xml
b/wikipedia/res/layout/dialog_themechooser.xml
index bf67178..838ae61 100644
--- a/wikipedia/res/layout/dialog_themechooser.xml
+++ b/wikipedia/res/layout/dialog_themechooser.xml
@@ -111,14 +111,6 @@
/>
-
-
-
-
-
-
-http://schemas.android.com/apk/res/android";
-xmlns:tools="http://schemas.android.com/tools";
-
-android:visibility="gone"
-
-android:orientation="vertical"
-android:layout_width="match_parent"
-android:layout_height="match_parent"
-android:background="@color/nav_background"
-android:layout_marginTop="8dp"
-android:layout_marginBottom="26dp">
-
-
-
\ No newline at end of file
diff --git a/wikipedia/src/alpha/res/layout/experimental_page_load.xml
b/wikipedia/src/alpha/res/layout/experimental_page_load.xml
deleted file mode 100644
index c1a0873..000
--- a/wikipedia/src/alpha/res/layout/experimental_page_load.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-
-http://schemas.android.com/apk/res/android";
-xmlns:tools="http://schemas.android.com/tools";
-android:orientation="vertical"
-android:layout_width="match_parent"
-android:layout_height="match_parent"
-android:background="@color/nav_background"
-android:paddingBottom="16dp">
-
-
-
\ No newline at end of file
diff --git
a/wikipedia/src/main/java/org/wikipedia/theme/ExperimentalPageLoadChooser.java
b/wikipedia/src/main/java/org/wikipedia/theme/ExperimentalPageLoadChooser.java
deleted file mode 100644
index fce929a..000
---
a/wikipedia/src/main/java/org/wikipedia/theme/ExperimentalPageLoadChooser.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package org.wikipedia.theme;
-
-import org.wikipedia.R;
-import org.wikipedia.WikipediaApp;
-import org.wikipedia.events.ThemeChangeEvent;
-import org.wikipedia.settings.Prefs;
-
-import android.content.Context;
-import android.view.View;
-import android.widget.CheckBox;
-import android.widget.CompoundButton;
-import android.widget.LinearLayout;
-
-/**
- * Temp class, which enables turning on the page load experiment. Remove once
it is completed.
- */
-public final class ExperimentalPageLoadChooser {
-public static void initExperimentalPageLoadChooser(final Context context,
View root) {
-LinearLayout layout = (LinearLayout)
root.findViewById(R.id.experimental_page_load);
-CheckBox expPageLoadCB = (CheckBox)
layout.findViewById(R.id.use_exp_page_load_cb);
-expPageLoadCB.setChecked(Prefs.isExperimentalPageLoadEnabled());
-expPageLoadCB.setOnCheckedChangeListener(new
CompoundButton.OnCheckedChangeListener() {
-@Override
-public void onCheckedChanged(CompoundButton buttonView, boolean
isChecked) {
-Prefs.setExperimentalPageLoadEnabled(isChecked);
-WikipediaApp.getInstance().getBus().post(new
ThemeChangeEvent());
-// Not ideal since it doesn't automatically reload the page
-// but good enough for experimental switching.
-// (The old strategy has a backstack, the new one doesn't.)
-// A page refresh right after this will crash the app.
-// Better use load a new page instead (Today, Random, search,
...)
-}
-});
-}
-
-// do not instantiate
-private ExperimentalPageLoadChooser() {
-}
-}
diff --git
a/wikipedia/src/main/java/org/wikipedia/theme/ThemeChooserDialog.java
b/wikipedia/src/main/java/org/wikipedia/theme/ThemeChooserDialog.java
index bef03a8..dc520c1 100644
--- a/wikipedia/src/main/java/org/wikipedia/theme/ThemeChooserDialog.java
+++ b/wikipedia/src/main/java/org/wikipedia/theme/ThemeChooserDialog.java
@@ -76,10 +76,6 @@
fontChangeProgressBar = (ProgressBar)
getDialogLayout().findViewById(R.id.font_change_progress_bar);
updateButtonState();
-
-if (app.isPreBetaRelease()) {
-
ExperimentalPageLoadChooser.initExperimentalPageLoadChooser(context,
getDialogLayout());
-}
}
@Subscribe
--
To view, visit https://
[MediaWiki-commits] [Gerrit] Use WikiErrorView for displaying page load errors. - change (apps...wikipedia)
jenkins-bot has submitted this change and it was merged.
Change subject: Use WikiErrorView for displaying page load errors.
..
Use WikiErrorView for displaying page load errors.
- Greatly simplified error logic in PageViewFragmentInternal, since a lot
of it is now handled in java-mwapi.
- Removed SectionsFetchException.
- Removed duplicate exception parsing function from Utils.
Change-Id: If104cc5f3675b6bdb2a755d49b7cef057d3a0e2e
---
M wikipedia/res/layout/fragment_page.xml
M wikipedia/src/main/java/org/wikipedia/ApiTask.java
M wikipedia/src/main/java/org/wikipedia/NavDrawerFragment.java
M wikipedia/src/main/java/org/wikipedia/Utils.java
M wikipedia/src/main/java/org/wikipedia/page/PageActivity.java
M wikipedia/src/main/java/org/wikipedia/page/PageViewFragmentInternal.java
D wikipedia/src/main/java/org/wikipedia/page/SectionsFetchException.java
M wikipedia/src/main/java/org/wikipedia/page/SectionsFetchTask.java
M wikipedia/src/main/java/org/wikipedia/util/ThrowableUtil.java
9 files changed, 41 insertions(+), 203 deletions(-)
Approvals:
BearND: Looks good to me, approved
Niedzielski: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/wikipedia/res/layout/fragment_page.xml
b/wikipedia/res/layout/fragment_page.xml
index ee1c287..431b9c4 100644
--- a/wikipedia/res/layout/fragment_page.xml
+++ b/wikipedia/res/layout/fragment_page.xml
@@ -233,71 +233,14 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
+android:visibility="gone"
+/>
allStatusCodes = new ArrayList<>();
-
allStatusCodes.addAll(Arrays.asList(app.getResources().getStringArray(R.array.status_codes)));
-// check probable returned code against list of status codes and
display code/message if valid
-if (statusCode != null && allStatusCodes.contains(statusCode)) {
-statusCodeView.setText(statusCode);
-List allStatusMessages = new ArrayList<>();
-
allStatusMessages.addAll(Arrays.asList(app.getResources().getStringArray(R.array.status_messages)));
-
statusMessageView.setText(allStatusMessages.get(allStatusCodes.indexOf(statusCode)));
-} else {
-statusMessageView.setText(R.string.status_code_unavailable);
-}
-}
-
-hidePageContent();
-ViewAnimations.fadeIn(networkError);
}
public void savePage() {
diff --git
a/wikipedia/src/main/java/org/wikipedia/page/SectionsFetchException.java
b/wikipedia/src/main/java/org/wikipedia/page/SectionsFetchException.java
deleted file mode 100644
index a32a055..000
--- a/wikipedia/src/main/java/org/wikipedia/page/SectionsFetchException.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package org.wikipedia.page;
-
-public class SectionsFetchException extends Exception {
-private final String code;
-private final String info;
-
-public SectionsFetchException(String code, String info) {
-this.code = code;
-this.info = info;
-}
-
-public String getCode() {
-return code;
-}
-
-public String getMessage() {
-return info;
-}
-}
diff --git a/wikipedia/src/main/java/org/wikipedia/page/SectionsFetchTask.java
b/wikipedia/src/main/java/org/wikipedia/page/SectionsFetchTask.java
index 7f49ad1..fcab611 100644
--- a/wikipedia/src/main/java/org/wikipedia/page/SectionsFetchTask.java
+++ b/wikipedia/src/main/java/org/wikipedia/page/SectionsFetchTask.java
@@ -3,7 +3,6 @@
import android.content.Context;
import org.json.JSONArray;
import org.json.JSONException;
-import org.json.JSONObject;
import org.mediawiki.api.json.Api;
import org.mediawiki.api.json.ApiException;
import org.mediawiki.api.json.ApiResult;
@@ -46,11 +45,6 @@
@Override
public List processResult(ApiResult result) throws Throwable {
-if (result.asObject().has("error")) {
-JSONObject errorJSON = result.asObject().optJSONObject("error");
-throw new SectionsFetchException(errorJSON.optString("code"),
errorJSON.optString("info"));
-}
-
JSONArray sectionsJSON =
result.asObject().optJSONObject("mobileview").optJSONArray("sections");
ArrayList sections = new ArrayList<>();
diff --git a/wikipedia/src/main/java/org/wikipedia/util/ThrowableUtil.java
b/wikipedia/src/main/java/org/wikipedia/util/ThrowableUtil.java
index 8ab445b..31640c6 100644
--- a/wikipedia/src/main/java/org/wikipedia/util/ThrowableUtil.java
+++ b/wikipedia/src/main/java/org/wikipedia/util/ThrowableUtil.java
@@ -41,7 +41,7 @@
// look at what kind of exception it is...
if (inner instanceof ApiException) {
// it's a well-formed error response from the server!
-result = new
AppError(context.getString(R.string.error_server_response),
+result = new AppError(getApiEr
[MediaWiki-commits] [Gerrit] Always show a logo on Login/Create page - change (mediawiki...MobileFrontend)
Florianschmidtwelzow has uploaded a new change for review.
https://gerrit.wikimedia.org/r/226026
Change subject: Always show a logo on Login/Create page
..
Always show a logo on Login/Create page
Before this change, the logo was only visible, if there is no error
or warning message. That is really confusing and differs from the
behavior of the core login page.
This change changes the logo to appear everytime the login page is
requested, no matter, if there is an error or warning message.
Follow up: I1b09e7ba80d18dc8c19b2aa475c4d269dffc295e
Bug: T106352
Change-Id: Ib9893b3376c6d15843c2a798a334c1998526e8da
---
M includes/skins/UserLoginAndCreateTemplate.php
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend
refs/changes/26/226026/1
diff --git a/includes/skins/UserLoginAndCreateTemplate.php
b/includes/skins/UserLoginAndCreateTemplate.php
index d7dd7a6..33ccf07 100644
--- a/includes/skins/UserLoginAndCreateTemplate.php
+++ b/includes/skins/UserLoginAndCreateTemplate.php
@@ -60,8 +60,8 @@
$msgBox .= Html::element( 'br' );
$msgBox .= wfMessage(
"mobile-frontend-generic-{$action}-action" )->plain();
$msgBox .= Html::closeElement( 'div' );
- $msgBox .= $this->getLogoHtml();
}
+ $msgBox .= $this->getLogoHtml();
echo $msgBox;
}
--
To view, visit https://gerrit.wikimedia.org/r/226026
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib9893b3376c6d15843c2a798a334c1998526e8da
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Florianschmidtwelzow
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] WIP: Cassanra logstash setup - change (operations/puppet)
Eevans has uploaded a new change for review.
https://gerrit.wikimedia.org/r/226025
Change subject: WIP: Cassanra logstash setup
..
WIP: Cassanra logstash setup
Bug: T100970
Change-Id: Idc5cfc8c5b53e8dac88dbed9e506eee79568903e
---
M hieradata/common/role/deployment.yaml
M hieradata/labs/deployment-prep/common.yaml
A modules/cassandra/manifests/logging.pp
M modules/cassandra/templates/logback.xml.erb
4 files changed, 53 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/25/226025/1
diff --git a/hieradata/common/role/deployment.yaml
b/hieradata/common/role/deployment.yaml
index e1f020b..9c07329 100644
--- a/hieradata/common/role/deployment.yaml
+++ b/hieradata/common/role/deployment.yaml
@@ -99,3 +99,6 @@
kartotherian/deploy:
upstream: https://gerrit.wikimedia.org/r/maps/kartotherian/deploy
checkout_submodules: true
+ cassandra/logstash-logback-encoder:
+gitfat_enabled: true
+upstream:
https://gerrit.wikimedia.org/r/operations/software/logstash-logback-encoder
diff --git a/hieradata/labs/deployment-prep/common.yaml
b/hieradata/labs/deployment-prep/common.yaml
index bb44777..9d2e1ae 100644
--- a/hieradata/labs/deployment-prep/common.yaml
+++ b/hieradata/labs/deployment-prep/common.yaml
@@ -60,6 +60,7 @@
"cassandra::seeds":
- 10.68.17.227
- 10.68.17.189
+cassandra::logstash_host: deployment-logstash2.deployment-prep.eqiad.wmflabs
"restbase::seeds":
- 10.68.17.227
- 10.68.17.189
diff --git a/modules/cassandra/manifests/logging.pp
b/modules/cassandra/manifests/logging.pp
new file mode 100644
index 000..578fc34
--- /dev/null
+++ b/modules/cassandra/manifests/logging.pp
@@ -0,0 +1,34 @@
+# == Class: cassandra::logging
+#
+# Configure remote logging for Cassandra
+#
+# === Usage
+# class { '::cassandra::logging':
+# logstash_host => 'logstash1001.eqiad.wmnet',
+# }
+#
+# === Parameters
+# [*logstash_host*]
+# The logstash logging server to send to.
+#
+# [*logstash_port*]
+# The logstash logging server port number.
+
+class cassandra::logging(
+$logstash_host = 'logstash1001.eqiad.wmnet',
+$logstash_port = 514,
+) {
+validate_string($logstash_host)
+validate_re("${logstash_port}", '^[0-9]+$')
+
+package { 'cassandra/logstash-logback-encoder':
+ensure => present,
+provider => 'trebuchet',
+}
+
+file { '/usr/share/cassandra/lib/logstash-logback-encoder.jar':
+ensure => 'link',
+target =>
'/srv/deployment/cassandra/logstash-logging/lib/logstash-logback-encoder-4.2.jar',
+require => Package['cassandra/logstash-logging'],
+}
+}
diff --git a/modules/cassandra/templates/logback.xml.erb
b/modules/cassandra/templates/logback.xml.erb
index f2e2478..b283c8f 100644
--- a/modules/cassandra/templates/logback.xml.erb
+++ b/modules/cassandra/templates/logback.xml.erb
@@ -38,6 +38,20 @@
+
+
+<%= @logstash_host %>
+<%= @logstash_port %>
+
+
+
+
+
+
+<%= @logstash_host %>
+<%= @logstash_port %>
+
+
%-5level %date{HH:mm:ss,SSS} %msg%n
@@ -47,6 +61,7 @@
+
--
To view, visit https://gerrit.wikimedia.org/r/226025
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Idc5cfc8c5b53e8dac88dbed9e506eee79568903e
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Eevans
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Increase MathSearch robustness - change (mediawiki...MathSearch)
jenkins-bot has submitted this change and it was merged.
Change subject: Increase MathSearch robustness
..
Increase MathSearch robustness
Tolerate
* empty result sets
* missing MathML
Change-Id: Id90eee1e530faa72683697cc0080abbd8449548f
---
M includes/engines/MathEngineBaseX.php
M includes/special/SpecialMathSearch.php
2 files changed, 16 insertions(+), 4 deletions(-)
Approvals:
Dyiop: Looks good to me, but someone else must approve
Physikerwelt: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/engines/MathEngineBaseX.php
b/includes/engines/MathEngineBaseX.php
index 145d04b..e126fb1 100644
--- a/includes/engines/MathEngineBaseX.php
+++ b/includes/engines/MathEngineBaseX.php
@@ -34,8 +34,14 @@
$wgOut->addWikiText("invalid XML
{$jsonResult->response}");
return false;
}
- $this->processMathResults( $xRes );
- return true;
+ if ( $xRes->run->result ){
+ $this->processMathResults( $xRes );
+ return true;
+ } else {
+ global $wgOut;
+ $wgOut->addWikiText("Result was
empty.");
+ return false;
+ }
} else {
global $wgOut;
$wgOut->addWikiText("{$jsonResult->response}");
diff --git a/includes/special/SpecialMathSearch.php
b/includes/special/SpecialMathSearch.php
index 16e74b9..4f7c513 100644
--- a/includes/special/SpecialMathSearch.php
+++ b/includes/special/SpecialMathSearch.php
@@ -257,14 +257,20 @@
return;
}
$mml = $res->getMathml();
+ if ( ! $mml ) {
+ LoggerFactory::getInstance(
'MathSearch' )
+ ->error( "Failure: Could not
get MathML $anchorID for page $pagename (id $revisionID)" );
+ continue;
+ }
$out->addWikiText(
"[[$pagename#$anchorID|Eq: $anchorID (Result " .
$this->resultID ++ . ")]]", false );
$out->addHtml( "" );
$xpath = $answ[0]['xpath'];
// TODO: Remove hack and report to Prode that
he fixes that
// $xmml->registerXPathNamespace('m',
'http://www.w3.org/1998/Math/MathML');
- $xpath = str_replace(
'/m:semantics/m:annotation-xml[@encoding="MathML-Content"]',
- '', $xpath );
+ $xpath =
+ str_replace(
'/m:semantics/m:annotation-xml[@encoding="MathML-Content"]',
+ '', $xpath );
$dom = new DOMDocument;
$dom->preserveWhiteSpace = false;
$dom->validateOnParse = true;
--
To view, visit https://gerrit.wikimedia.org/r/226016
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Id90eee1e530faa72683697cc0080abbd8449548f
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/MathSearch
Gerrit-Branch: master
Gerrit-Owner: Physikerwelt
Gerrit-Reviewer: Dyiop
Gerrit-Reviewer: Hcohl
Gerrit-Reviewer: Physikerwelt
Gerrit-Reviewer: Whyameri
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Merge branch 'master' into deploy - change (wikimedia...tools)
Ejegg has submitted this change and it was merged. Change subject: Merge branch 'master' into deploy .. Merge branch 'master' into deploy 5dc4e40 Add astropay audit downloader and example config 5ee8b9a Add ECDSA support to sftp crawler 83384cf Add timeout param to limit query lifespan Change-Id: Id9ea87adcebac52dc32464fa46e12086f59487c3 --- 0 files changed, 0 insertions(+), 0 deletions(-) Approvals: Ejegg: Looks good to me, approved jenkins-bot: Verified -- To view, visit https://gerrit.wikimedia.org/r/226024 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Id9ea87adcebac52dc32464fa46e12086f59487c3 Gerrit-PatchSet: 1 Gerrit-Project: wikimedia/fundraising/tools Gerrit-Branch: deploy Gerrit-Owner: Ejegg Gerrit-Reviewer: Ejegg Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Merge branch 'master' into deploy - change (wikimedia...tools)
Ejegg has uploaded a new change for review. https://gerrit.wikimedia.org/r/226024 Change subject: Merge branch 'master' into deploy .. Merge branch 'master' into deploy 5dc4e40 Add astropay audit downloader and example config 5ee8b9a Add ECDSA support to sftp crawler 83384cf Add timeout param to limit query lifespan Change-Id: Id9ea87adcebac52dc32464fa46e12086f59487c3 --- 0 files changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/tools refs/changes/24/226024/1 -- To view, visit https://gerrit.wikimedia.org/r/226024 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id9ea87adcebac52dc32464fa46e12086f59487c3 Gerrit-PatchSet: 1 Gerrit-Project: wikimedia/fundraising/tools Gerrit-Branch: deploy Gerrit-Owner: Ejegg ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove experimental page load checkbox from theme chooser. - change (apps...wikipedia)
Dbrant has uploaded a new change for review.
https://gerrit.wikimedia.org/r/226023
Change subject: Remove experimental page load checkbox from theme chooser.
..
Remove experimental page load checkbox from theme chooser.
...since it's now part of Developer Settings.
Change-Id: I94d5117c6bd7451ae37246c854a7001a44119dce
---
M wikipedia/res/layout/dialog_themechooser.xml
D wikipedia/res/layout/experimental_page_load.xml
D wikipedia/src/alpha/res/layout/experimental_page_load.xml
D wikipedia/src/main/java/org/wikipedia/theme/ExperimentalPageLoadChooser.java
M wikipedia/src/main/java/org/wikipedia/theme/ThemeChooserDialog.java
5 files changed, 0 insertions(+), 91 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia
refs/changes/23/226023/1
diff --git a/wikipedia/res/layout/dialog_themechooser.xml
b/wikipedia/res/layout/dialog_themechooser.xml
index bf67178..838ae61 100644
--- a/wikipedia/res/layout/dialog_themechooser.xml
+++ b/wikipedia/res/layout/dialog_themechooser.xml
@@ -111,14 +111,6 @@
/>
-
-
-
-
-
-
-http://schemas.android.com/apk/res/android";
-xmlns:tools="http://schemas.android.com/tools";
-
-android:visibility="gone"
-
-android:orientation="vertical"
-android:layout_width="match_parent"
-android:layout_height="match_parent"
-android:background="@color/nav_background"
-android:layout_marginTop="8dp"
-android:layout_marginBottom="26dp">
-
-
-
\ No newline at end of file
diff --git a/wikipedia/src/alpha/res/layout/experimental_page_load.xml
b/wikipedia/src/alpha/res/layout/experimental_page_load.xml
deleted file mode 100644
index c1a0873..000
--- a/wikipedia/src/alpha/res/layout/experimental_page_load.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-
-http://schemas.android.com/apk/res/android";
-xmlns:tools="http://schemas.android.com/tools";
-android:orientation="vertical"
-android:layout_width="match_parent"
-android:layout_height="match_parent"
-android:background="@color/nav_background"
-android:paddingBottom="16dp">
-
-
-
\ No newline at end of file
diff --git
a/wikipedia/src/main/java/org/wikipedia/theme/ExperimentalPageLoadChooser.java
b/wikipedia/src/main/java/org/wikipedia/theme/ExperimentalPageLoadChooser.java
deleted file mode 100644
index fce929a..000
---
a/wikipedia/src/main/java/org/wikipedia/theme/ExperimentalPageLoadChooser.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package org.wikipedia.theme;
-
-import org.wikipedia.R;
-import org.wikipedia.WikipediaApp;
-import org.wikipedia.events.ThemeChangeEvent;
-import org.wikipedia.settings.Prefs;
-
-import android.content.Context;
-import android.view.View;
-import android.widget.CheckBox;
-import android.widget.CompoundButton;
-import android.widget.LinearLayout;
-
-/**
- * Temp class, which enables turning on the page load experiment. Remove once
it is completed.
- */
-public final class ExperimentalPageLoadChooser {
-public static void initExperimentalPageLoadChooser(final Context context,
View root) {
-LinearLayout layout = (LinearLayout)
root.findViewById(R.id.experimental_page_load);
-CheckBox expPageLoadCB = (CheckBox)
layout.findViewById(R.id.use_exp_page_load_cb);
-expPageLoadCB.setChecked(Prefs.isExperimentalPageLoadEnabled());
-expPageLoadCB.setOnCheckedChangeListener(new
CompoundButton.OnCheckedChangeListener() {
-@Override
-public void onCheckedChanged(CompoundButton buttonView, boolean
isChecked) {
-Prefs.setExperimentalPageLoadEnabled(isChecked);
-WikipediaApp.getInstance().getBus().post(new
ThemeChangeEvent());
-// Not ideal since it doesn't automatically reload the page
-// but good enough for experimental switching.
-// (The old strategy has a backstack, the new one doesn't.)
-// A page refresh right after this will crash the app.
-// Better use load a new page instead (Today, Random, search,
...)
-}
-});
-}
-
-// do not instantiate
-private ExperimentalPageLoadChooser() {
-}
-}
diff --git
a/wikipedia/src/main/java/org/wikipedia/theme/ThemeChooserDialog.java
b/wikipedia/src/main/java/org/wikipedia/theme/ThemeChooserDialog.java
index bef03a8..dc520c1 100644
--- a/wikipedia/src/main/java/org/wikipedia/theme/ThemeChooserDialog.java
+++ b/wikipedia/src/main/java/org/wikipedia/theme/ThemeChooserDialog.java
@@ -76,10 +76,6 @@
fontChangeProgressBar = (ProgressBar)
getDialogLayout().findViewById(R.id.font_change_progress_bar);
updateButtonState();
-
-if (app.isPreBetaRelease()) {
-
ExperimentalPageLoadChooser.initExperimentalPageLoadChooser(context,
getDialogLayout());
-}
}
@Subscribe
--
To view, visit https://gerrit.wikimedi
[MediaWiki-commits] [Gerrit] Add MobileFrontendLogo to alpha login/create page - change (mediawiki...MobileFrontend)
jenkins-bot has submitted this change and it was merged.
Change subject: Add MobileFrontendLogo to alpha login/create page
..
Add MobileFrontendLogo to alpha login/create page
Like the own userlogin and usercreate pages, add a watermark image
to both special pages after the error/warning message.
Depends on: Ia81f7c52f08e8dcc73ac751432560c4077d4bd39
Bug: T87261
Change-Id: Ib05f0753b0abbbc9e81ca2dcf1f1c6fe4fa7e908
---
M includes/MobileFrontend.hooks.php
M resources/skins.minerva.special.userlogin.styles/userlogin.less
2 files changed, 58 insertions(+), 29 deletions(-)
Approvals:
Jdlrobson: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/MobileFrontend.hooks.php
b/includes/MobileFrontend.hooks.php
index 0c1315e..26f8791 100644
--- a/includes/MobileFrontend.hooks.php
+++ b/includes/MobileFrontend.hooks.php
@@ -576,6 +576,47 @@
}
/**
+* Decide if the login/usercreate page should be overwritten by a
mobile only
+* special specialpage. If not, do some changes to the template.
+* @param QuickTemplate $tpl Login or Usercreate template
+* @param String $mode Is this function called in context of UserCreate
or UserLogin?
+*/
+ public static function changeUserLoginCreateForm( &$tpl, $mode =
'userlogin' ) {
+ $context = MobileContext::singleton();
+ if (
+ !$context->getMFConfig()->get( 'MFNoLoginOverride' ) &&
+ !$context->isAlphaGroupMember() &&
+ $context->shouldDisplayMobileView()
+ ) {
+ if ( $mode === 'userlogin' ) {
+ $tpl = new UserLoginMobileTemplate( $tpl );
+ } else {
+ $tpl = new UserAccountCreateMobileTemplate(
$tpl );
+ }
+ } else {
+ $mfLogo = $context->getMFConfig()
+ ->get( 'MobileFrontendLogo' );
+
+ if ( $mfLogo ) {
+ $tpl->extend(
+ 'formheader',
+ Html::openElement(
+ 'div',
+ array( 'class' => 'watermark' )
+ ) .
+ Html::element( 'img',
+ array(
+ 'src' => $mfLogo,
+ 'alt' => '',
+ )
+ ) .
+ Html::closeElement( 'div' )
+ );
+ }
+ }
+ }
+
+ /**
* UserLoginForm hook handler
* @see https://www.mediawiki.org/wiki/Manual:Hooks/UserLoginForm
*
@@ -583,14 +624,7 @@
* @return bool
*/
public static function onUserLoginForm( &$template ) {
- $context = MobileContext::singleton();
- if (
- !$context->getMFConfig()->get( 'MFNoLoginOverride' ) &&
- !$context->isAlphaGroupMember() &&
- $context->shouldDisplayMobileView()
- ) {
- $template = new UserLoginMobileTemplate( $template );
- }
+ self::changeUserLoginCreateForm( $template );
return true;
}
@@ -603,14 +637,7 @@
* @return bool
*/
public static function onUserCreateForm( &$template ) {
- $context = MobileContext::singleton();
- if (
- !$context->getMFConfig()->get( 'MFNoLoginOverride' ) &&
- !$context->isAlphaGroupMember() &&
- $context->shouldDisplayMobileView()
- ) {
- $template = new UserAccountCreateMobileTemplate(
$template );
- }
+ self::changeUserLoginCreateForm( $template, 'usercreate' );
return true;
}
diff --git a/resources/skins.minerva.special.userlogin.styles/userlogin.less
b/resources/skins.minerva.special.userlogin.styles/userlogin.less
index 72e0a7f..9fcf44d 100644
--- a/resources/skins.minerva.special.userlogin.styles/userlogin.less
+++ b/resources/skins.minerva.special.userlogin.styles/userlogin.less
@@ -44,17 +44,6 @@
.stable, .beta {
#mw-mf-login,
#mw-mf-accountcreate {
- .watermark {
- text-align: center;
- // FIXME: Should we set the height here?
- height: 72px;
- margin-bo
[MediaWiki-commits] [Gerrit] WIP: Add VisualEditor language screenshots group - change (translatewiki)
Amire80 has uploaded a new change for review. https://gerrit.wikimedia.org/r/226022 Change subject: WIP: Add VisualEditor language screenshots group .. WIP: Add VisualEditor language screenshots group Shouldn't be merged before I96c01763d1003619e9c8b0f549a53a1956dde16a Change-Id: I63d99184357d7663d7f86f2709c06ed50869dcb6 --- M groups/MediaWiki/mediawiki-extensions.txt 1 file changed, 5 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/translatewiki refs/changes/22/226022/1 diff --git a/groups/MediaWiki/mediawiki-extensions.txt b/groups/MediaWiki/mediawiki-extensions.txt index 0fa6343..d1b9089 100644 --- a/groups/MediaWiki/mediawiki-extensions.txt +++ b/groups/MediaWiki/mediawiki-extensions.txt @@ -2364,6 +2364,11 @@ ignored = visualeditor-wikitext-warning-link prefix = visualeditor-override- | tooltip-ca-edit +VisualEditor user guide screenshots +id = ext-visualeditor-ve-mw-screenshots +descmsg = visualeditor-languagescreenshot-desc +file = VisualEditor/modules/ve-mw/tests/browser/i18n/%CODE%.json + VisualEditor (WMF) id = ext-visualeditor-ve-wmf descmsg = visualeditor-desc -- To view, visit https://gerrit.wikimedia.org/r/226022 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I63d99184357d7663d7f86f2709c06ed50869dcb6 Gerrit-PatchSet: 1 Gerrit-Project: translatewiki Gerrit-Branch: master Gerrit-Owner: Amire80 ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add api featureLog for ungroupedlist param - change (mediawiki...Wikibase)
Addshore has uploaded a new change for review.
https://gerrit.wikimedia.org/r/226021
Change subject: Add api featureLog for ungroupedlist param
..
Add api featureLog for ungroupedlist param
Change-Id: Iea54404ead54051783ee23d0fe042d4226a6790c
---
M repo/includes/api/GetClaims.php
M repo/includes/api/GetEntities.php
2 files changed, 4 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/21/226021/1
diff --git a/repo/includes/api/GetClaims.php b/repo/includes/api/GetClaims.php
index c7a71e7..9282b14 100644
--- a/repo/includes/api/GetClaims.php
+++ b/repo/includes/api/GetClaims.php
@@ -1,6 +1,6 @@
getEntity();
if ( $params['ungroupedlist'] ) {
- $this->getResultBuilder()->getOptions()
+ $this->logFeatureUsage(
'action=wbgetclaims&ungroupedlist' );
+ $this->resultBuilder->getOptions()
->setOption(
SerializationOptions::OPT_GROUP_BY_PROPERTIES,
array()
diff --git a/repo/includes/api/GetEntities.php
b/repo/includes/api/GetEntities.php
index bd63c3d..ea7fe69 100644
--- a/repo/includes/api/GetEntities.php
+++ b/repo/includes/api/GetEntities.php
@@ -275,6 +275,7 @@
$languages = $params['languages'];
}
if( $params['ungroupedlist'] ) {
+ $this->logFeatureUsage(
'action=wbgetentities&ungroupedlist' );
$options->setOption(
SerializationOptions::OPT_GROUP_BY_PROPERTIES,
array()
--
To view, visit https://gerrit.wikimedia.org/r/226021
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iea54404ead54051783ee23d0fe042d4226a6790c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: wmf/1.26wmf13
Gerrit-Owner: Addshore
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Documentation: CategoryLookupInputWidget - change (mediawiki...MobileFrontend)
jenkins-bot has submitted this change and it was merged.
Change subject: Documentation: CategoryLookupInputWidget
..
Documentation: CategoryLookupInputWidget
Add some documentation so it's clearer how this works.
Change-Id: I996896ed6500a95b9705a616fdf02ddd01f07cd7
---
M resources/mobile.categories.overlays/CategoryLookupInputWidget.js
1 file changed, 4 insertions(+), 0 deletions(-)
Approvals:
Florianschmidtwelzow: Looks good to me, approved
jenkins-bot: Verified
diff --git a/resources/mobile.categories.overlays/CategoryLookupInputWidget.js
b/resources/mobile.categories.overlays/CategoryLookupInputWidget.js
index 52910bf..cdebea7 100644
--- a/resources/mobile.categories.overlays/CategoryLookupInputWidget.js
+++ b/resources/mobile.categories.overlays/CategoryLookupInputWidget.js
@@ -5,6 +5,10 @@
/**
* @class CategoryLookupInputWidget
* @extends OO.ui.LookupElement
+* @param {Object} options
+* @param {CategoryApi} options.api to use to retrieve search results
+* @param {jQuery.Object} options.suggestions container element for
search suggestions
+* @param {jQuery.Object} options.saveButton element. Will get disabled
when suggested item clicked.
*/
function CategoryLookupInputWidget( options ) {
this.$element = $( '' );
--
To view, visit https://gerrit.wikimedia.org/r/226018
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I996896ed6500a95b9705a616fdf02ddd01f07cd7
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson
Gerrit-Reviewer: Florianschmidtwelzow
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add a simple proxy for testing - change (wikidata...rdf)
Manybubbles has uploaded a new change for review.
https://gerrit.wikimedia.org/r/226020
Change subject: Add a simple proxy for testing
..
Add a simple proxy for testing
We boot the proxy before integration testing start and let it run during
the tests so we can make requests to it. All it does is send requests to
wikibase or general 503s. As configured right now it generates 503s every
other request.
Change-Id: Iabe712ccb6f74bb431fe7ef96ccd6536bd82381c
---
M tools/pom.xml
A tools/src/main/java/org/wikidata/query/rdf/tool/HttpClientUtils.java
M
tools/src/main/java/org/wikidata/query/rdf/tool/wikibase/WikibaseRepository.java
A tools/src/test/java/org/wikidata/query/rdf/tool/Proxy.java
4 files changed, 306 insertions(+), 16 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/wikidata/query/rdf
refs/changes/20/226020/1
diff --git a/tools/pom.xml b/tools/pom.xml
index 1804527..e403219 100644
--- a/tools/pom.xml
+++ b/tools/pom.xml
@@ -239,6 +239,34 @@
+org.codehaus.mojo
+exec-maven-plugin
+1.1.1
+
+
+start-proxy
+pre-integration-test
+
+ java
+
+
+ test
+ org.wikidata.query.rdf.tool.Proxy
+
+--port
+8812
+--error
+503
+--errorMod
+2
+--embedded
+-v
+
+
+
+
+
+
maven-assembly-plugin
diff --git
a/tools/src/main/java/org/wikidata/query/rdf/tool/HttpClientUtils.java
b/tools/src/main/java/org/wikidata/query/rdf/tool/HttpClientUtils.java
new file mode 100644
index 000..805a379
--- /dev/null
+++ b/tools/src/main/java/org/wikidata/query/rdf/tool/HttpClientUtils.java
@@ -0,0 +1,22 @@
+package org.wikidata.query.rdf.tool;
+
+import org.apache.http.client.config.CookieSpecs;
+import org.apache.http.client.config.RequestConfig;
+import org.apache.http.client.methods.HttpRequestBase;
+
+/**
+ * Utilities for dealing with HttpClient.
+ */
+public final class HttpClientUtils {
+/**
+ * Configure request to ignore cookies.
+ */
+public static void ignoreCookies(HttpRequestBase request) {
+RequestConfig noCookiesConfig =
RequestConfig.custom().setCookieSpec(CookieSpecs.IGNORE_COOKIES).build();
+request.setConfig(noCookiesConfig);
+}
+
+private HttpClientUtils() {
+// Uncallable utility constructor
+}
+}
diff --git
a/tools/src/main/java/org/wikidata/query/rdf/tool/wikibase/WikibaseRepository.java
b/tools/src/main/java/org/wikidata/query/rdf/tool/wikibase/WikibaseRepository.java
index 5e25b06..4b0a4b4 100644
---
a/tools/src/main/java/org/wikidata/query/rdf/tool/wikibase/WikibaseRepository.java
+++
b/tools/src/main/java/org/wikidata/query/rdf/tool/wikibase/WikibaseRepository.java
@@ -16,8 +16,6 @@
import org.apache.http.Consts;
import org.apache.http.NameValuePair;
-import org.apache.http.client.config.CookieSpecs;
-import org.apache.http.client.config.RequestConfig;
import org.apache.http.client.entity.UrlEncodedFormEntity;
import org.apache.http.client.methods.CloseableHttpResponse;
import org.apache.http.client.methods.HttpGet;
@@ -40,6 +38,7 @@
import org.openrdf.rio.helpers.StatementCollector;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.wikidata.query.rdf.tool.HttpClientUtils;
import org.wikidata.query.rdf.tool.change.Change;
import org.wikidata.query.rdf.tool.exception.ContainedException;
import org.wikidata.query.rdf.tool.exception.FatalException;
@@ -108,7 +107,7 @@
StatementCollector collector = new StatementCollector();
parser.setRDFHandler(new NormalizingRdfHandler(collector));
HttpGet request = new HttpGet(uri);
-setNoCookies(request);
+HttpClientUtils.ignoreCookies(request);
try {
try (CloseableHttpResponse response = client.execute(request)) {
if (response.getStatusLine().getStatusCode() == 404) {
@@ -215,16 +214,6 @@
}
/**
- * Configure request to ignore cookies.
- * @param request
- */
-private void setNoCookies(HttpRequestBase request) {
-RequestConfig noCookiesConfig = RequestConfig.custom()
-.setCookieSpec(CookieSpecs.IGNORE_COOKIES).build();
-request.setConfig(noCookiesConfig);
-}
-
-/**
* Perform an HTTP request and return the JSON in the response body.
*
* @param request request to perform
@@ -234,7 +223,7 @@
* @throws ParseException the json was malformed and couldn't be parsed
*/
private JSONObject getJson(HttpRequestBase request) throws IOException,
ParseException {
-setNoCookies(request);
+HttpClientUtils.ignoreCookies(request);
[MediaWiki-commits] [Gerrit] fix MWKList KVO and article observation - change (apps...wikipedia)
jenkins-bot has submitted this change and it was merged.
Change subject: fix MWKList KVO and article observation
..
fix MWKList KVO and article observation
Change-Id: I6e02b8a5b82e5daaf9cac5250fa9f835bc495770
---
M MediaWikiKit/MediaWikiKit/MWKList.m
M MediaWikiKit/MediaWikiKitTests/MWKListTests.m
M Wikipedia/Networking/Fetchers/ArticleFetcher.h
M Wikipedia/UI-V5/WMFArticleFetcher.h
M Wikipedia/UI-V5/WMFArticleFetcher.m
M Wikipedia/UI-V5/WMFArticleViewController.m
6 files changed, 51 insertions(+), 43 deletions(-)
Approvals:
Fjalapeno: Looks good to me, approved
jenkins-bot: Verified
diff --git a/MediaWikiKit/MediaWikiKit/MWKList.m
b/MediaWikiKit/MediaWikiKit/MWKList.m
index 02c7c3a..1f2a743 100644
--- a/MediaWikiKit/MediaWikiKit/MWKList.m
+++ b/MediaWikiKit/MediaWikiKit/MWKList.m
@@ -19,7 +19,7 @@
- (instancetype)init {
self = [super init];
if (self) {
-self.mutableEntries = [NSMutableArray array];
+_mutableEntries = [NSMutableArray array];
self.entriesByTitle = [NSMutableDictionary dictionary];
}
return self;
@@ -144,6 +144,10 @@
#pragma mark - KVO
+- (NSMutableArray*)mutableEntries {
+return [self mutableArrayValueForKey:@"entries"];
+}
+
- (NSUInteger)countOfEntries {
return [_mutableEntries count];
}
diff --git a/MediaWikiKit/MediaWikiKitTests/MWKListTests.m
b/MediaWikiKit/MediaWikiKitTests/MWKListTests.m
index 7e33315..6e4ab34 100644
--- a/MediaWikiKit/MediaWikiKitTests/MWKListTests.m
+++ b/MediaWikiKit/MediaWikiKitTests/MWKListTests.m
@@ -131,4 +131,21 @@
XCTAssertEqual([list countOfEntries], 0, @"Should have length 0 after
removing all");
}
+- (void)testKVO {
+MWKList* list= [[MWKList alloc] init];
+NSMutableArray* observations = [NSMutableArray new];
+[self.KVOController observe:list
+keyPath:WMF_SAFE_KEYPATH(list, entries)
+options:0
+ block:^(id observer, id object, NSDictionary*
change) {
+[observations addObject:@[change[NSKeyValueChangeKindKey],
change[NSKeyValueChangeIndexesKey]]];
+}];
+[list addEntry:self.testObjects[0]];
+[list removeEntry:self.testObjects[0]];
+XCTAssertEqual(observations.count, 2);
+XCTAssertEqualObjects(observations[0], (@[@(NSKeyValueChangeInsertion),
[NSIndexSet indexSetWithIndex:0]]));
+XCTAssertEqualObjects(observations[1], (@[@(NSKeyValueChangeRemoval),
[NSIndexSet indexSetWithIndex:0]]));
+[self.KVOController unobserve:list];
+}
+
@end
diff --git a/Wikipedia/Networking/Fetchers/ArticleFetcher.h
b/Wikipedia/Networking/Fetchers/ArticleFetcher.h
index 343918c..95b1d5f 100644
--- a/Wikipedia/Networking/Fetchers/ArticleFetcher.h
+++ b/Wikipedia/Networking/Fetchers/ArticleFetcher.h
@@ -15,8 +15,4 @@
completionBlock:(WMFArticleHandler)completion
errorBlock:(WMFErrorHandler)errorHandler;
-
-
-
-
@end
diff --git a/Wikipedia/UI-V5/WMFArticleFetcher.h
b/Wikipedia/UI-V5/WMFArticleFetcher.h
index 72b3ead..10b5a03 100644
--- a/Wikipedia/UI-V5/WMFArticleFetcher.h
+++ b/Wikipedia/UI-V5/WMFArticleFetcher.h
@@ -13,7 +13,7 @@
- (instancetype)initWithDataStore:(MWKDataStore*)dataStore;
-- (AnyPromise*)fetchArticleForPageTitle:(MWKTitle*)pageTitle
progress:(WMFProgressHandler)progress;
+- (AnyPromise*)fetchArticleForPageTitle:(MWKTitle*)pageTitle
progress:(WMFProgressHandler __nullable)progress;
@end
diff --git a/Wikipedia/UI-V5/WMFArticleFetcher.m
b/Wikipedia/UI-V5/WMFArticleFetcher.m
index 94faf33..727e9be 100644
--- a/Wikipedia/UI-V5/WMFArticleFetcher.m
+++ b/Wikipedia/UI-V5/WMFArticleFetcher.m
@@ -37,20 +37,14 @@
return _fetcher;
}
-- (AnyPromise*)fetchArticleForPageTitle:(MWKTitle*)pageTitle
progress:(WMFProgressHandler)progress {
+- (AnyPromise*)fetchArticleForPageTitle:(MWKTitle*)pageTitle
progress:(WMFProgressHandler __nullable)progress {
return [AnyPromise promiseWithResolverBlock:^(PMKResolver resolve) {
-AFHTTPRequestOperation* operation = [self.fetcher
fetchSectionsForTitle:pageTitle inDataStore:self.dataStore
withManager:self.operationManager progressBlock:^(CGFloat completionProgress) {
-dispatch_async(dispatch_get_main_queue(), ^{
-if (progress) {
-progress(completionProgress);
-}
-});
-} completionBlock:^(MWKArticle* article) {
-resolve(article);
-} errorBlock:^(NSError* error) {
-resolve(error);
-}];
-
+AFHTTPRequestOperation* operation = [self.fetcher
fetchSectionsForTitle:pageTitle
+
inDataStore:self.dataStore
+
withManager:self.operationManager
+
[MediaWiki-commits] [Gerrit] Fix displayTitle of CategoryLookupInputWidget - change (mediawiki...MobileFrontend)
jenkins-bot has submitted this change and it was merged.
Change subject: Fix displayTitle of CategoryLookupInputWidget
..
Fix displayTitle of CategoryLookupInputWidget
Reflect upstream change in CategoryApi::search which
now gets passed a Page object.
Follow up: I2b5f1f0439dc6a83a6ef35077bbbc9fb8fc32b2d
Bug: T105832
Change-Id: I69187f75aba52e1ae00d537e8b52339e624eb510
---
M resources/mobile.categories.overlays/CategoryLookupInputWidget.js
1 file changed, 3 insertions(+), 3 deletions(-)
Approvals:
Jdlrobson: Looks good to me, approved
jenkins-bot: Verified
diff --git a/resources/mobile.categories.overlays/CategoryLookupInputWidget.js
b/resources/mobile.categories.overlays/CategoryLookupInputWidget.js
index 4af7a4a..52910bf 100644
--- a/resources/mobile.categories.overlays/CategoryLookupInputWidget.js
+++ b/resources/mobile.categories.overlays/CategoryLookupInputWidget.js
@@ -56,7 +56,7 @@
// add user input as a possible (actually not existing) category
response.results.unshift( {
title: title.toString(),
- displayname: title.getNameText()
+ displayTitle: title.getNameText()
} );
return response;
@@ -74,12 +74,12 @@
$.each( data.results, function ( i, value ) {
if (
!$( 'button[data-title="' + value.title + '"]'
).length &&
- $.inArray( value.displayname, self.categories )
=== -1
+ $.inArray( value.displayTitle, self.categories
) === -1
) {
result.push(
new OO.ui.MenuOptionWidget( {
data: value.title,
- label: value.displayname
+ label: value.displayTitle
} )
);
}
--
To view, visit https://gerrit.wikimedia.org/r/225102
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I69187f75aba52e1ae00d537e8b52339e624eb510
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Florianschmidtwelzow
Gerrit-Reviewer: BarryTheBrowserTestBot
Gerrit-Reviewer: Jdlrobson
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Use a better marker to detect regex filter errors - change (mediawiki...CirrusSearch)
jenkins-bot has submitted this change and it was merged. Change subject: Use a better marker to detect regex filter errors .. Use a better marker to detect regex filter errors The source_text filter error detection was broken somehow. Something to do with the 1.6 upgrade maybe. This is a more consistently returned marker. Change-Id: Ic06a87d8b5647da58731de0c44a2f0d5587c764c --- M includes/ElasticsearchIntermediary.php 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Chad: Looks good to me, approved Cindy-the-browser-test-bot: Looks good to me, but someone else must approve DCausse: Looks good to me, but someone else must approve jenkins-bot: Verified diff --git a/includes/ElasticsearchIntermediary.php b/includes/ElasticsearchIntermediary.php index cd94e57..0f7385c 100644 --- a/includes/ElasticsearchIntermediary.php +++ b/includes/ElasticsearchIntermediary.php @@ -251,7 +251,7 @@ // what else would have automatons and illegal argument exceptions. Just looking // for the exception won't suffice because other weird things could cause it. $seemsToUseRegexes = strpos( $message, 'import org.apache.lucene.util.automaton.*' ) !== false; - $usesExtraRegex = strpos( $message, 'org.wikimedia.search.extra.regex.SourceRegexFilter' ) !== false; + $usesExtraRegex = strpos( $message, 'source_text:/' ) !== false; $seemsToUseRegexes |= $usesExtraRegex; $marker = 'IllegalArgumentException['; $markerLocation = strpos( $message, $marker ); -- To view, visit https://gerrit.wikimedia.org/r/224655 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ic06a87d8b5647da58731de0c44a2f0d5587c764c Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/CirrusSearch Gerrit-Branch: master Gerrit-Owner: Manybubbles Gerrit-Reviewer: Chad Gerrit-Reviewer: Cindy-the-browser-test-bot Gerrit-Reviewer: DCausse Gerrit-Reviewer: EBernhardson Gerrit-Reviewer: Manybubbles Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add api featureLog for ungroupedlist param - change (mediawiki...Wikibase)
jenkins-bot has submitted this change and it was merged.
Change subject: Add api featureLog for ungroupedlist param
..
Add api featureLog for ungroupedlist param
Please backport & deploy ASAP :)
Change-Id: Iea54404ead54051783ee23d0fe042d4226a6790c
---
M repo/includes/api/GetClaims.php
M repo/includes/api/GetEntities.php
2 files changed, 2 insertions(+), 0 deletions(-)
Approvals:
JanZerebecki: Looks good to me, approved
jenkins-bot: Verified
diff --git a/repo/includes/api/GetClaims.php b/repo/includes/api/GetClaims.php
index 192ac0d..f3c1fbd 100644
--- a/repo/includes/api/GetClaims.php
+++ b/repo/includes/api/GetClaims.php
@@ -105,6 +105,7 @@
$entity = $entityRevision->getEntity();
if ( $params['ungroupedlist'] ) {
+ $this->logFeatureUsage(
'action=wbgetclaims&ungroupedlist' );
$this->resultBuilder->getOptions()
->setOption(
SerializationOptions::OPT_GROUP_BY_PROPERTIES,
diff --git a/repo/includes/api/GetEntities.php
b/repo/includes/api/GetEntities.php
index 1c5ab79..123038e 100644
--- a/repo/includes/api/GetEntities.php
+++ b/repo/includes/api/GetEntities.php
@@ -308,6 +308,7 @@
$languages = $params['languages'];
}
if ( $params['ungroupedlist'] ) {
+ $this->logFeatureUsage(
'action=wbgetentities&ungroupedlist' );
$options->setOption(
SerializationOptions::OPT_GROUP_BY_PROPERTIES,
array()
--
To view, visit https://gerrit.wikimedia.org/r/225921
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iea54404ead54051783ee23d0fe042d4226a6790c
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Addshore
Gerrit-Reviewer: Aude
Gerrit-Reviewer: Hoo man
Gerrit-Reviewer: JanZerebecki
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] fix MWKList KVO and article observation - change (apps...wikipedia)
Bgerstle has uploaded a new change for review.
https://gerrit.wikimedia.org/r/226019
Change subject: fix MWKList KVO and article observation
..
fix MWKList KVO and article observation
Change-Id: I6e02b8a5b82e5daaf9cac5250fa9f835bc495770
---
M MediaWikiKit/MediaWikiKit/MWKList.m
M MediaWikiKit/MediaWikiKitTests/MWKListTests.m
M Wikipedia/Networking/Fetchers/ArticleFetcher.h
M Wikipedia/UI-V5/WMFArticleFetcher.h
M Wikipedia/UI-V5/WMFArticleFetcher.m
M Wikipedia/UI-V5/WMFArticleViewController.m
6 files changed, 51 insertions(+), 43 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/apps/ios/wikipedia
refs/changes/19/226019/1
diff --git a/MediaWikiKit/MediaWikiKit/MWKList.m
b/MediaWikiKit/MediaWikiKit/MWKList.m
index 02c7c3a..1f2a743 100644
--- a/MediaWikiKit/MediaWikiKit/MWKList.m
+++ b/MediaWikiKit/MediaWikiKit/MWKList.m
@@ -19,7 +19,7 @@
- (instancetype)init {
self = [super init];
if (self) {
-self.mutableEntries = [NSMutableArray array];
+_mutableEntries = [NSMutableArray array];
self.entriesByTitle = [NSMutableDictionary dictionary];
}
return self;
@@ -144,6 +144,10 @@
#pragma mark - KVO
+- (NSMutableArray*)mutableEntries {
+return [self mutableArrayValueForKey:@"entries"];
+}
+
- (NSUInteger)countOfEntries {
return [_mutableEntries count];
}
diff --git a/MediaWikiKit/MediaWikiKitTests/MWKListTests.m
b/MediaWikiKit/MediaWikiKitTests/MWKListTests.m
index 7e33315..6e4ab34 100644
--- a/MediaWikiKit/MediaWikiKitTests/MWKListTests.m
+++ b/MediaWikiKit/MediaWikiKitTests/MWKListTests.m
@@ -131,4 +131,21 @@
XCTAssertEqual([list countOfEntries], 0, @"Should have length 0 after
removing all");
}
+- (void)testKVO {
+MWKList* list= [[MWKList alloc] init];
+NSMutableArray* observations = [NSMutableArray new];
+[self.KVOController observe:list
+keyPath:WMF_SAFE_KEYPATH(list, entries)
+options:0
+ block:^(id observer, id object, NSDictionary*
change) {
+[observations addObject:@[change[NSKeyValueChangeKindKey],
change[NSKeyValueChangeIndexesKey]]];
+}];
+[list addEntry:self.testObjects[0]];
+[list removeEntry:self.testObjects[0]];
+XCTAssertEqual(observations.count, 2);
+XCTAssertEqualObjects(observations[0], (@[@(NSKeyValueChangeInsertion),
[NSIndexSet indexSetWithIndex:0]]));
+XCTAssertEqualObjects(observations[1], (@[@(NSKeyValueChangeRemoval),
[NSIndexSet indexSetWithIndex:0]]));
+[self.KVOController unobserve:list];
+}
+
@end
diff --git a/Wikipedia/Networking/Fetchers/ArticleFetcher.h
b/Wikipedia/Networking/Fetchers/ArticleFetcher.h
index 343918c..95b1d5f 100644
--- a/Wikipedia/Networking/Fetchers/ArticleFetcher.h
+++ b/Wikipedia/Networking/Fetchers/ArticleFetcher.h
@@ -15,8 +15,4 @@
completionBlock:(WMFArticleHandler)completion
errorBlock:(WMFErrorHandler)errorHandler;
-
-
-
-
@end
diff --git a/Wikipedia/UI-V5/WMFArticleFetcher.h
b/Wikipedia/UI-V5/WMFArticleFetcher.h
index 72b3ead..10b5a03 100644
--- a/Wikipedia/UI-V5/WMFArticleFetcher.h
+++ b/Wikipedia/UI-V5/WMFArticleFetcher.h
@@ -13,7 +13,7 @@
- (instancetype)initWithDataStore:(MWKDataStore*)dataStore;
-- (AnyPromise*)fetchArticleForPageTitle:(MWKTitle*)pageTitle
progress:(WMFProgressHandler)progress;
+- (AnyPromise*)fetchArticleForPageTitle:(MWKTitle*)pageTitle
progress:(WMFProgressHandler __nullable)progress;
@end
diff --git a/Wikipedia/UI-V5/WMFArticleFetcher.m
b/Wikipedia/UI-V5/WMFArticleFetcher.m
index 94faf33..727e9be 100644
--- a/Wikipedia/UI-V5/WMFArticleFetcher.m
+++ b/Wikipedia/UI-V5/WMFArticleFetcher.m
@@ -37,20 +37,14 @@
return _fetcher;
}
-- (AnyPromise*)fetchArticleForPageTitle:(MWKTitle*)pageTitle
progress:(WMFProgressHandler)progress {
+- (AnyPromise*)fetchArticleForPageTitle:(MWKTitle*)pageTitle
progress:(WMFProgressHandler __nullable)progress {
return [AnyPromise promiseWithResolverBlock:^(PMKResolver resolve) {
-AFHTTPRequestOperation* operation = [self.fetcher
fetchSectionsForTitle:pageTitle inDataStore:self.dataStore
withManager:self.operationManager progressBlock:^(CGFloat completionProgress) {
-dispatch_async(dispatch_get_main_queue(), ^{
-if (progress) {
-progress(completionProgress);
-}
-});
-} completionBlock:^(MWKArticle* article) {
-resolve(article);
-} errorBlock:^(NSError* error) {
-resolve(error);
-}];
-
+AFHTTPRequestOperation* operation = [self.fetcher
fetchSectionsForTitle:pageTitle
+
inDataStore:self.dataStore
+
withManager:self.operationManager
+
[MediaWiki-commits] [Gerrit] Documentation: CategoryLookupInputWidget - change (mediawiki...MobileFrontend)
Jdlrobson has uploaded a new change for review.
https://gerrit.wikimedia.org/r/226018
Change subject: Documentation: CategoryLookupInputWidget
..
Documentation: CategoryLookupInputWidget
Add some documentation so it's clearer how this works.
Change-Id: I996896ed6500a95b9705a616fdf02ddd01f07cd7
---
M resources/mobile.categories.overlays/CategoryLookupInputWidget.js
1 file changed, 4 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend
refs/changes/18/226018/1
diff --git a/resources/mobile.categories.overlays/CategoryLookupInputWidget.js
b/resources/mobile.categories.overlays/CategoryLookupInputWidget.js
index 52910bf..cdebea7 100644
--- a/resources/mobile.categories.overlays/CategoryLookupInputWidget.js
+++ b/resources/mobile.categories.overlays/CategoryLookupInputWidget.js
@@ -5,6 +5,10 @@
/**
* @class CategoryLookupInputWidget
* @extends OO.ui.LookupElement
+* @param {Object} options
+* @param {CategoryApi} options.api to use to retrieve search results
+* @param {jQuery.Object} options.suggestions container element for
search suggestions
+* @param {jQuery.Object} options.saveButton element. Will get disabled
when suggested item clicked.
*/
function CategoryLookupInputWidget( options ) {
this.$element = $( '' );
--
To view, visit https://gerrit.wikimedia.org/r/226018
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I996896ed6500a95b9705a616fdf02ddd01f07cd7
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Suppress stdin warning with --quiet - change (mediawiki/core)
Arlolra has uploaded a new change for review.
https://gerrit.wikimedia.org/r/226017
Change subject: Suppress stdin warning with --quiet
..
Suppress stdin warning with --quiet
Change-Id: I789260be1c83e0f081e6b7cd84cdab291d07837e
---
M maintenance/parse.php
1 file changed, 2 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/17/226017/1
diff --git a/maintenance/parse.php b/maintenance/parse.php
index 7b05cb7..fac61c1 100644
--- a/maintenance/parse.php
+++ b/maintenance/parse.php
@@ -95,8 +95,8 @@
if ( $input_file === $php_stdin ) {
$ctrl = wfIsWindows() ? 'CTRL+Z' : 'CTRL+D';
- $this->error( basename( __FILE__ )
- . ": warning: reading wikitext from STDIN.
Press $ctrl to parse.\n" );
+ $this->output( basename( __FILE__ )
+ . ": warning: reading wikitext from STDIN.
Press $ctrl to parse.\n\n" );
}
return file_get_contents( $input_file );
--
To view, visit https://gerrit.wikimedia.org/r/226017
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I789260be1c83e0f081e6b7cd84cdab291d07837e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Arlolra
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Increase MathSearch robustness - change (mediawiki...MathSearch)
Physikerwelt has uploaded a new change for review.
https://gerrit.wikimedia.org/r/226016
Change subject: Increase MathSearch robustness
..
Increase MathSearch robustness
Tolerate
* empty result sets
* missing MathML
Change-Id: Id90eee1e530faa72683697cc0080abbd8449548f
---
M includes/engines/MathEngineBaseX.php
M includes/special/SpecialMathSearch.php
2 files changed, 16 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MathSearch
refs/changes/16/226016/1
diff --git a/includes/engines/MathEngineBaseX.php
b/includes/engines/MathEngineBaseX.php
index 145d04b..e126fb1 100644
--- a/includes/engines/MathEngineBaseX.php
+++ b/includes/engines/MathEngineBaseX.php
@@ -34,8 +34,14 @@
$wgOut->addWikiText("invalid XML
{$jsonResult->response}");
return false;
}
- $this->processMathResults( $xRes );
- return true;
+ if ( $xRes->run->result ){
+ $this->processMathResults( $xRes );
+ return true;
+ } else {
+ global $wgOut;
+ $wgOut->addWikiText("Result was
empty.");
+ return false;
+ }
} else {
global $wgOut;
$wgOut->addWikiText("{$jsonResult->response}");
diff --git a/includes/special/SpecialMathSearch.php
b/includes/special/SpecialMathSearch.php
index 16e74b9..4f7c513 100644
--- a/includes/special/SpecialMathSearch.php
+++ b/includes/special/SpecialMathSearch.php
@@ -257,14 +257,20 @@
return;
}
$mml = $res->getMathml();
+ if ( ! $mml ) {
+ LoggerFactory::getInstance(
'MathSearch' )
+ ->error( "Failure: Could not
get MathML $anchorID for page $pagename (id $revisionID)" );
+ continue;
+ }
$out->addWikiText(
"[[$pagename#$anchorID|Eq: $anchorID (Result " .
$this->resultID ++ . ")]]", false );
$out->addHtml( "" );
$xpath = $answ[0]['xpath'];
// TODO: Remove hack and report to Prode that
he fixes that
// $xmml->registerXPathNamespace('m',
'http://www.w3.org/1998/Math/MathML');
- $xpath = str_replace(
'/m:semantics/m:annotation-xml[@encoding="MathML-Content"]',
- '', $xpath );
+ $xpath =
+ str_replace(
'/m:semantics/m:annotation-xml[@encoding="MathML-Content"]',
+ '', $xpath );
$dom = new DOMDocument;
$dom->preserveWhiteSpace = false;
$dom->validateOnParse = true;
--
To view, visit https://gerrit.wikimedia.org/r/226016
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Id90eee1e530faa72683697cc0080abbd8449548f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MathSearch
Gerrit-Branch: master
Gerrit-Owner: Physikerwelt
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: 9134ec2..164be9e - change (mediawiki/extensions)
Jenkins-mwext-sync has submitted this change and it was merged. Change subject: Syncronize VisualEditor: 9134ec2..164be9e .. Syncronize VisualEditor: 9134ec2..164be9e Change-Id: I6e518d7b1c431dafb05fa839c144a8a246fb6832 --- M VisualEditor 1 file changed, 0 insertions(+), 0 deletions(-) Approvals: Jenkins-mwext-sync: Verified; Looks good to me, approved diff --git a/VisualEditor b/VisualEditor index 9134ec2..164be9e 16 --- a/VisualEditor +++ b/VisualEditor -Subproject commit 9134ec2d73b7fb1fd88da2f77838aebe40cd8425 +Subproject commit 164be9e07a1fb0418a2fb4978461db960615f5b7 -- To view, visit https://gerrit.wikimedia.org/r/226015 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I6e518d7b1c431dafb05fa839c144a8a246fb6832 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions Gerrit-Branch: master Gerrit-Owner: Jenkins-mwext-sync Gerrit-Reviewer: Jenkins-mwext-sync ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: 9134ec2..164be9e - change (mediawiki/extensions)
Jenkins-mwext-sync has uploaded a new change for review. https://gerrit.wikimedia.org/r/226015 Change subject: Syncronize VisualEditor: 9134ec2..164be9e .. Syncronize VisualEditor: 9134ec2..164be9e Change-Id: I6e518d7b1c431dafb05fa839c144a8a246fb6832 --- M VisualEditor 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions refs/changes/15/226015/1 diff --git a/VisualEditor b/VisualEditor index 9134ec2..164be9e 16 --- a/VisualEditor +++ b/VisualEditor -Subproject commit 9134ec2d73b7fb1fd88da2f77838aebe40cd8425 +Subproject commit 164be9e07a1fb0418a2fb4978461db960615f5b7 -- To view, visit https://gerrit.wikimedia.org/r/226015 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I6e518d7b1c431dafb05fa839c144a8a246fb6832 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions Gerrit-Branch: master Gerrit-Owner: Jenkins-mwext-sync ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Changed my blog address to new Jekyll from Wordpress - change (operations/puppet)
01tonythomas has uploaded a new change for review. https://gerrit.wikimedia.org/r/225952 Change subject: Changed my blog address to new Jekyll from Wordpress .. Changed my blog address to new Jekyll from Wordpress The earlier website is dropped. Please change it to this new one Change-Id: Ie6b13612fcc578cb601f9f2c15a781cf39d62cda --- M modules/planet/templates/feeds/en_config.erb 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/52/225952/1 diff --git a/modules/planet/templates/feeds/en_config.erb b/modules/planet/templates/feeds/en_config.erb index 13afd1d..27a1352 100644 --- a/modules/planet/templates/feeds/en_config.erb +++ b/modules/planet/templates/feeds/en_config.erb @@ -446,7 +446,7 @@ [https://timotijhof.net/category/tools/feed/] name=User:Krinkle -[https://tttwrites.wordpress.com/category/wikimedia/feed/] +[http://blog.tttwrites.in/wikimedia.xml] name=Tony Thomas [http://thingelstad.com/tag/mediawiki/feed/] -- To view, visit https://gerrit.wikimedia.org/r/225952 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie6b13612fcc578cb601f9f2c15a781cf39d62cda Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: 01tonythomas <01tonytho...@gmail.com> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove Mantle from dependency tree for several extensions - change (integration/config)
jenkins-bot has submitted this change and it was merged.
Change subject: Remove Mantle from dependency tree for several extensions
..
Remove Mantle from dependency tree for several extensions
It's not used anymore and discontinued (it's already removed from cluster).
Change-Id: I218e352fd3886c6430fc35d73ed97edacda52da2
See: T93448 and T85890
---
M jjb/mediawiki-extensions.yaml
M zuul/ext_dependencies.py
2 files changed, 13 insertions(+), 15 deletions(-)
Approvals:
Hashar: Looks good to me, approved
jenkins-bot: Verified
diff --git a/jjb/mediawiki-extensions.yaml b/jjb/mediawiki-extensions.yaml
index 9fb9605..0050f51 100644
--- a/jjb/mediawiki-extensions.yaml
+++ b/jjb/mediawiki-extensions.yaml
@@ -438,7 +438,7 @@
- ExtTab
- FanBoxes
- Flow:
-dependencies:
'AbuseFilter,SpamBlacklist,CheckUser,Mantle,Echo,EventLogging,ConfirmEdit,VisualEditor'
+dependencies:
'AbuseFilter,SpamBlacklist,CheckUser,Echo,EventLogging,ConfirmEdit,VisualEditor'
- GitHub
- Graph:
dependencies: 'JsonConfig'
@@ -453,9 +453,9 @@
- Maps:
dependencies: 'Validator'
- MobileApp:
-dependencies: 'Echo,MobileFrontend,Mantle,VisualEditor'
+dependencies: 'Echo,MobileFrontend,VisualEditor'
- MobileFrontend:
-dependencies: 'Echo,Mantle,VisualEditor'
+dependencies: 'Echo,VisualEditor'
- MoodBar
- MsLinks
- MultimediaPlayer
@@ -547,7 +547,7 @@
- SyntaxHighlight_GeSHi
- Tabs
- Thanks:
-dependencies:
'Echo,Flow,Mantle,MobileFrontend,VisualEditor,AbuseFilter,SpamBlacklist,CheckUser,EventLogging,ConfirmEdit'
+dependencies:
'Echo,Flow,MobileFrontend,VisualEditor,AbuseFilter,SpamBlacklist,CheckUser,EventLogging,ConfirmEdit'
- ThrottleOverride
- TimedMediaHandler:
dependencies: 'MwEmbedSupport'
@@ -589,7 +589,7 @@
- WikidataEntitySuggester
- WikidataPageBanner
- WikiGrok:
-dependencies: 'Echo,MobileFrontend,Mantle,VisualEditor'
+dependencies: 'Echo,MobileFrontend,VisualEditor'
- wikihiero:
dependencies: 'VisualEditor'
- WikiLexicalData
@@ -600,9 +600,9 @@
- WindowsAzureSDK
- WYSIWYG
- ZeroBanner:
-dependencies: 'Echo,JsonConfig,MobileFrontend,Mantle,VisualEditor'
+dependencies: 'Echo,JsonConfig,MobileFrontend,VisualEditor'
- ZeroPortal:
-dependencies:
'Echo,JsonConfig,MobileFrontend,Mantle,VisualEditor,ZeroBanner'
+dependencies: 'Echo,JsonConfig,MobileFrontend,VisualEditor,ZeroBanner'
mwbranch:
- master
@@ -632,19 +632,17 @@
- '{name}-{ext-name}-qunit':
name: mwext
ext-name: MobileFrontend
-dependencies: Mantle
- '{name}-{ext-name}-qunit-mobile':
name: mwext
ext-name: MobileFrontend
-dependencies: Mantle
- '{name}-{ext-name}-qunit':
name: mwext
ext-name: Thanks
-dependencies:
'Echo,Flow,Mantle,MobileFrontend,VisualEditor,AbuseFilter,SpamBlacklist,CheckUser,EventLogging,ConfirmEdit'
+dependencies:
'Echo,Flow,MobileFrontend,VisualEditor,AbuseFilter,SpamBlacklist,CheckUser,EventLogging,ConfirmEdit'
- '{name}-{ext-name}-qunit-mobile':
name: mwext
ext-name: Thanks
-dependencies:
'Echo,Flow,Mantle,MobileFrontend,VisualEditor,AbuseFilter,SpamBlacklist,CheckUser,EventLogging,ConfirmEdit'
+dependencies:
'Echo,Flow,MobileFrontend,VisualEditor,AbuseFilter,SpamBlacklist,CheckUser,EventLogging,ConfirmEdit'
- '{name}-{ext-name}-npm':
ext-name: VisualEditor
diff --git a/zuul/ext_dependencies.py b/zuul/ext_dependencies.py
index 32a4017..d3a15dc 100644
--- a/zuul/ext_dependencies.py
+++ b/zuul/ext_dependencies.py
@@ -9,10 +9,10 @@
'Disambiguator': ['VisualEditor'],
'EducationProgram': ['cldr'],
'FlaggedRevs': ['Scribunto'],
-'Flow': ['AbuseFilter', 'CheckUser', 'ConfirmEdit', 'Mantle',
- 'SpamBlacklist', 'Echo', 'EventLogging', 'VisualEditor'],
+'Flow': ['AbuseFilter', 'CheckUser', 'ConfirmEdit', 'SpamBlacklist',
+ 'Echo', 'EventLogging', 'VisualEditor'],
'Gather': ['PageImages', 'TextExtracts', 'MobileFrontend', 'Echo',
- 'Mantle', 'VisualEditor'],
+ 'VisualEditor'],
'GettingStarted': ['CentralAuth', 'EventLogging', 'GuidedTour'],
'GuidedTour': ['EventLogging'],
'GWToolset': ['SyntaxHighlight_GeSHi', 'Scribunto', 'TemplateData'],
@@ -21,7 +21,7 @@
'MassMessage': ['LiquidThreads'],
'Math': ['VisualEditor'],
'MathSearch': ['Math'],
-'MobileFrontend': ['Echo', 'Mantle', 'VisualEditor'],
+'MobileFrontend': ['Echo', 'VisualEditor'],
'NavigationTiming': ['EventLogging'],
'PronunciationRecording': ['UploadWizard'],
'ProofreadPage': ['LabeledSectionTransclusion'],
--
To view, visit https://gerri
[MediaWiki-commits] [Gerrit] Update DonationInterface - change (mediawiki/core)
Ejegg has submitted this change and it was merged. Change subject: Update DonationInterface .. Update DonationInterface Change-Id: I5ce3c846da159c73b252f071ceae717b0d276e4b --- M extensions/DonationInterface 1 file changed, 0 insertions(+), 0 deletions(-) Approvals: XenoRyet: Looks good to me, approved jenkins-bot: Verified diff --git a/extensions/DonationInterface b/extensions/DonationInterface index 7654b4f..0127857 16 --- a/extensions/DonationInterface +++ b/extensions/DonationInterface -Subproject commit 7654b4fed60b2a34ba0ac616e9d462101414c697 +Subproject commit 0127857d07af386ae4cec9bbb84ad9bde15158b1 -- To view, visit https://gerrit.wikimedia.org/r/225943 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I5ce3c846da159c73b252f071ceae717b0d276e4b Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: fundraising/REL1_23 Gerrit-Owner: XenoRyet Gerrit-Reviewer: Awight Gerrit-Reviewer: Ejegg Gerrit-Reviewer: XenoRyet Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update DonationInterface - change (mediawiki/core)
XenoRyet has uploaded a new change for review. https://gerrit.wikimedia.org/r/225943 Change subject: Update DonationInterface .. Update DonationInterface Change-Id: I5ce3c846da159c73b252f071ceae717b0d276e4b --- M extensions/DonationInterface 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/43/225943/1 diff --git a/extensions/DonationInterface b/extensions/DonationInterface index 7654b4f..0127857 16 --- a/extensions/DonationInterface +++ b/extensions/DonationInterface -Subproject commit 7654b4fed60b2a34ba0ac616e9d462101414c697 +Subproject commit 0127857d07af386ae4cec9bbb84ad9bde15158b1 -- To view, visit https://gerrit.wikimedia.org/r/225943 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I5ce3c846da159c73b252f071ceae717b0d276e4b Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: fundraising/REL1_23 Gerrit-Owner: XenoRyet ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: 307c182..9134ec2 - change (mediawiki/extensions)
Jenkins-mwext-sync has submitted this change and it was merged. Change subject: Syncronize VisualEditor: 307c182..9134ec2 .. Syncronize VisualEditor: 307c182..9134ec2 Change-Id: Idc42631c8b51199c38bac5e6b329beebe2554f60 --- M VisualEditor 1 file changed, 0 insertions(+), 0 deletions(-) Approvals: Jenkins-mwext-sync: Verified; Looks good to me, approved diff --git a/VisualEditor b/VisualEditor index 307c182..9134ec2 16 --- a/VisualEditor +++ b/VisualEditor -Subproject commit 307c1825697ee71af447f915366904a52b37e424 +Subproject commit 9134ec2d73b7fb1fd88da2f77838aebe40cd8425 -- To view, visit https://gerrit.wikimedia.org/r/225940 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Idc42631c8b51199c38bac5e6b329beebe2554f60 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions Gerrit-Branch: master Gerrit-Owner: Jenkins-mwext-sync Gerrit-Reviewer: Jenkins-mwext-sync ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: 307c182..9134ec2 - change (mediawiki/extensions)
Jenkins-mwext-sync has uploaded a new change for review. https://gerrit.wikimedia.org/r/225940 Change subject: Syncronize VisualEditor: 307c182..9134ec2 .. Syncronize VisualEditor: 307c182..9134ec2 Change-Id: Idc42631c8b51199c38bac5e6b329beebe2554f60 --- M VisualEditor 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions refs/changes/40/225940/1 diff --git a/VisualEditor b/VisualEditor index 307c182..9134ec2 16 --- a/VisualEditor +++ b/VisualEditor -Subproject commit 307c1825697ee71af447f915366904a52b37e424 +Subproject commit 9134ec2d73b7fb1fd88da2f77838aebe40cd8425 -- To view, visit https://gerrit.wikimedia.org/r/225940 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Idc42631c8b51199c38bac5e6b329beebe2554f60 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions Gerrit-Branch: master Gerrit-Owner: Jenkins-mwext-sync ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Disallow typing newlines in the edit summary - change (mediawiki...VisualEditor)
jenkins-bot has submitted this change and it was merged.
Change subject: Disallow typing newlines in the edit summary
..
Disallow typing newlines in the edit summary
Prevent typing newlines by pressing the 'Enter' key on the keyboard,
like in a single-line ; and filter newlines from
pasted / IME'd text.
Also:
* Use 'classes' config rather than .$element.addClass()
* Remove no-op 'tabIndex' setting (this is the default already)
Bug: T106325
Change-Id: I42d18f51f5ca989818577d6f045f6a516bb5b121
---
M modules/ve-mw/ui/dialogs/ve.ui.MWSaveDialog.js
1 file changed, 17 insertions(+), 7 deletions(-)
Approvals:
Esanders: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/ve-mw/ui/dialogs/ve.ui.MWSaveDialog.js
b/modules/ve-mw/ui/dialogs/ve.ui.MWSaveDialog.js
index 8c02458..de097cc 100644
--- a/modules/ve-mw/ui/dialogs/ve.ui.MWSaveDialog.js
+++ b/modules/ve-mw/ui/dialogs/ve.ui.MWSaveDialog.js
@@ -358,13 +358,23 @@
this.$editSummaryLabel = $( '' ).addClass(
've-ui-mwSaveDialog-summaryLabel' )
.html( ve.init.platform.getParsedMessage( 'summary' ) )
.find( 'a' ).attr( 'target', '_blank' ).end();
- this.editSummaryInput = new OO.ui.TextInputWidget(
- { multiline: true, placeholder: ve.msg(
'visualeditor-editsummary' ) }
- );
- this.editSummaryInput.$element.addClass( 've-ui-mwSaveDialog-summary' );
- this.editSummaryInput.$input
- .byteLimit( this.editSummaryByteLimit )
- .prop( 'tabIndex', 0 );
+ this.editSummaryInput = new OO.ui.TextInputWidget( {
+ multiline: true,
+ placeholder: ve.msg( 'visualeditor-editsummary' ),
+ classes: [ 've-ui-mwSaveDialog-summary' ],
+ inputFilter: function ( value ) {
+ // Prevent the user from inputting newlines (this kicks
in on paste, etc.)
+ return value.replace( /\r?\n/g, ' ' );
+ }
+ } );
+ // Prevent the user from inputting newlines from keyboard
+ this.editSummaryInput.$input.on( 'keypress', function ( e ) {
+ if ( e.which === OO.ui.Keys.ENTER ) {
+ e.preventDefault();
+ }
+ } );
+ // Limit byte length, and display the remaining bytes
+ this.editSummaryInput.$input.byteLimit( this.editSummaryByteLimit );
this.editSummaryInput.on( 'change', function () {
// TODO: This looks a bit weird, there is no unit in the UI,
just numbers
// Users likely assume characters but then it seems to count
down quicker
--
To view, visit https://gerrit.wikimedia.org/r/225861
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I42d18f51f5ca989818577d6f045f6a516bb5b121
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Bartosz Dziewoński
Gerrit-Reviewer: Esanders
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Merge branch 'master' into deployment - change (mediawiki...DonationInterface)
jenkins-bot has submitted this change and it was merged.
Change subject: Merge branch 'master' into deployment
..
Merge branch 'master' into deployment
6ca39c9 Localisation updates from https://translatewiki.net.
dd79602 Dynamically generate JS currency minimum amounts
00986f7 Update currency rates
b4fa73c Rearrange order of CC logos on GC form for Japan
899be81 Stop exceptioning in drupal formatMessage stub
ee8b703 Fix recurring GC false success report
80f1e48 Get around watchdog stripping tags
ccc82b1 Remove unused logfile parsing code
854204f Quit demoting log messages to debug under drupal
b671104 Localisation updates from https://translatewiki.net.
Conflicts:
tests/Adapter/GlobalCollect/RecurringTest.php
tests/GatewayPageTest.php
tests/includes/Responses/globalcollect/DO_PAYMENT_recurring.testresponse
tests/includes/Responses/globalcollect/GET_ORDERSTATUS_recurring.testresponse
tests/includes/Responses/globalcollect/SET_PAYMENT_recurring.testresponse
Change-Id: Iaa21069b0a70ba3c5816fc34d7da74be04f8bd64
---
D tests/Adapter/GlobalCollect/RecurringTest.php
D tests/GatewayPageTest.php
D tests/includes/Responses/globalcollect/DO_PAYMENT_recurring-NOK.testresponse
D tests/includes/Responses/globalcollect/DO_PAYMENT_recurring.testresponse
D tests/includes/Responses/globalcollect/GET_ORDERSTATUS_recurring.testresponse
D tests/includes/Responses/globalcollect/SET_PAYMENT_recurring.testresponse
6 files changed, 0 insertions(+), 368 deletions(-)
Approvals:
XenoRyet: Looks good to me, approved
jenkins-bot: Verified
diff --git a/tests/Adapter/GlobalCollect/RecurringTest.php
b/tests/Adapter/GlobalCollect/RecurringTest.php
deleted file mode 100644
index 261399a..000
--- a/tests/Adapter/GlobalCollect/RecurringTest.php
+++ /dev/null
@@ -1,100 +0,0 @@
-<<< HEAD (7654b4 Merge branch 'master' into deployment)
-===
-testAdapterClass = 'TestingGlobalCollectAdapter';
- }
-
- public function setUp() {
- parent::setUp();
-
- $this->setMwGlobals( array(
- 'wgGlobalCollectGatewayEnabled' => true,
- ) );
- }
-
- function tearDown() {
- TestingGlobalCollectAdapter::clearGlobalsCache();
- parent::tearDown();
- }
-
- /**
-* Can make a recurring payment
-*
-* @covers GlobalCollectAdapter::transactionRecurring_Charge
-*/
- public function testRecurringCharge() {
- $init = array(
- 'amount' => '2345',
- 'effort_id' => 2,
- 'order_id' => '9998890004',
- 'currency_code' => 'EUR',
- 'payment_product' => '',
- );
- $gateway = $this->getFreshGatewayObject( $init );
-
- // FIXME: I don't understand whether the literal code should
correspond to anything in GC
- $gateway->setDummyGatewayResponseCode( 'recurring' );
-
- $result = $gateway->do_transaction( 'Recurring_Charge' );
-
- $this->assertTrue( $result->getCommunicationStatus() );
- $this->assertRegExp( '/SET_PAYMENT/', $result->getRawResponse()
);
- }
-
- /**
-* Can make a recurring payment
-*
-* @covers GlobalCollectAdapter::transactionRecurring_Charge
-*/
- public function testDeclinedRecurringCharge() {
- $init = array(
- 'amount' => '2345',
- 'effort_id' => 2,
- 'order_id' => '9998890004',
- 'currency_code' => 'EUR',
- 'payment_product' => '',
- );
- $gateway = $this->getFreshGatewayObject( $init );
-
- $gateway->setDummyGatewayResponseCode( 'recurring-NOK' );
-
- $result = $gateway->do_transaction( 'Recurring_Charge' );
-
- $this->assertEquals( 1, count( $gateway->curled ), 'Should not
make another reqest after DO_PAYMENT fails' );
- $this->assertEquals( FinalStatus::FAILED,
$gateway->getFinalStatus() );
- }
-}
->>> BRANCH (6ca39c Localisation updates from https://translatewiki.net.)
diff --git a/tests/GatewayPageTest.php b/tests/GatewayPageTest.php
deleted file mode 100644
index 4d12662..000
--- a/tests/GatewayPageTest.php
+++ /dev/null
@@ -1,108 +0,0 @@
-<<< HEAD (7654b4 Merge branch 'master' into deployment)
-===
-page = new TestingGatewayPage();
- $this->adapter = new TestingGenericAdapter();
- $this->adapter->addRequestData( array(
- 'amount' => '200',
- 'currency_code' => 'BBD' ) );
- $this->adapter->errorsForRevalidate[0] = array( 'currency_code'
=> 'blah' );
- $this->adapter->er
[MediaWiki-commits] [Gerrit] Merge branch 'master' into deployment - change (mediawiki...DonationInterface)
XenoRyet has uploaded a new change for review.
https://gerrit.wikimedia.org/r/225938
Change subject: Merge branch 'master' into deployment
..
Merge branch 'master' into deployment
6ca39c9 Localisation updates from https://translatewiki.net.
dd79602 Dynamically generate JS currency minimum amounts
00986f7 Update currency rates
b4fa73c Rearrange order of CC logos on GC form for Japan
899be81 Stop exceptioning in drupal formatMessage stub
ee8b703 Fix recurring GC false success report
80f1e48 Get around watchdog stripping tags
ccc82b1 Remove unused logfile parsing code
854204f Quit demoting log messages to debug under drupal
b671104 Localisation updates from https://translatewiki.net.
Conflicts:
tests/Adapter/GlobalCollect/RecurringTest.php
tests/GatewayPageTest.php
tests/includes/Responses/globalcollect/DO_PAYMENT_recurring.testresponse
tests/includes/Responses/globalcollect/GET_ORDERSTATUS_recurring.testresponse
tests/includes/Responses/globalcollect/SET_PAYMENT_recurring.testresponse
Change-Id: Iaa21069b0a70ba3c5816fc34d7da74be04f8bd64
---
D tests/Adapter/GlobalCollect/RecurringTest.php
D tests/GatewayPageTest.php
D tests/includes/Responses/globalcollect/DO_PAYMENT_recurring-NOK.testresponse
D tests/includes/Responses/globalcollect/DO_PAYMENT_recurring.testresponse
D tests/includes/Responses/globalcollect/GET_ORDERSTATUS_recurring.testresponse
D tests/includes/Responses/globalcollect/SET_PAYMENT_recurring.testresponse
6 files changed, 0 insertions(+), 368 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/DonationInterface
refs/changes/38/225938/1
diff --git a/tests/Adapter/GlobalCollect/RecurringTest.php
b/tests/Adapter/GlobalCollect/RecurringTest.php
deleted file mode 100644
index 261399a..000
--- a/tests/Adapter/GlobalCollect/RecurringTest.php
+++ /dev/null
@@ -1,100 +0,0 @@
-<<< HEAD (7654b4 Merge branch 'master' into deployment)
-===
-testAdapterClass = 'TestingGlobalCollectAdapter';
- }
-
- public function setUp() {
- parent::setUp();
-
- $this->setMwGlobals( array(
- 'wgGlobalCollectGatewayEnabled' => true,
- ) );
- }
-
- function tearDown() {
- TestingGlobalCollectAdapter::clearGlobalsCache();
- parent::tearDown();
- }
-
- /**
-* Can make a recurring payment
-*
-* @covers GlobalCollectAdapter::transactionRecurring_Charge
-*/
- public function testRecurringCharge() {
- $init = array(
- 'amount' => '2345',
- 'effort_id' => 2,
- 'order_id' => '9998890004',
- 'currency_code' => 'EUR',
- 'payment_product' => '',
- );
- $gateway = $this->getFreshGatewayObject( $init );
-
- // FIXME: I don't understand whether the literal code should
correspond to anything in GC
- $gateway->setDummyGatewayResponseCode( 'recurring' );
-
- $result = $gateway->do_transaction( 'Recurring_Charge' );
-
- $this->assertTrue( $result->getCommunicationStatus() );
- $this->assertRegExp( '/SET_PAYMENT/', $result->getRawResponse()
);
- }
-
- /**
-* Can make a recurring payment
-*
-* @covers GlobalCollectAdapter::transactionRecurring_Charge
-*/
- public function testDeclinedRecurringCharge() {
- $init = array(
- 'amount' => '2345',
- 'effort_id' => 2,
- 'order_id' => '9998890004',
- 'currency_code' => 'EUR',
- 'payment_product' => '',
- );
- $gateway = $this->getFreshGatewayObject( $init );
-
- $gateway->setDummyGatewayResponseCode( 'recurring-NOK' );
-
- $result = $gateway->do_transaction( 'Recurring_Charge' );
-
- $this->assertEquals( 1, count( $gateway->curled ), 'Should not
make another reqest after DO_PAYMENT fails' );
- $this->assertEquals( FinalStatus::FAILED,
$gateway->getFinalStatus() );
- }
-}
->>> BRANCH (6ca39c Localisation updates from https://translatewiki.net.)
diff --git a/tests/GatewayPageTest.php b/tests/GatewayPageTest.php
deleted file mode 100644
index 4d12662..000
--- a/tests/GatewayPageTest.php
+++ /dev/null
@@ -1,108 +0,0 @@
-<<< HEAD (7654b4 Merge branch 'master' into deployment)
-===
-page = new TestingGatewayPage();
- $this->adapter = new TestingGenericAdapter();
- $this->adapter->addRequestData( array(
- 'amount' => '200',
- 'currency_code' => 'BBD' ) );
- $this->adapter->errorsForRevalidate[0] = array(
[MediaWiki-commits] [Gerrit] Merge branch 'master' into deployment - change (mediawiki...DonationInterface)
Ejegg has uploaded a new change for review.
https://gerrit.wikimedia.org/r/225937
Change subject: Merge branch 'master' into deployment
..
Merge branch 'master' into deployment
Conflicts:
tests/Adapter/GlobalCollect/RecurringTest.php
tests/GatewayPageTest.php
tests/includes/Responses/globalcollect/DO_PAYMENT_recurring.testresponse
tests/includes/Responses/globalcollect/GET_ORDERSTATUS_recurring.testresponse
tests/includes/Responses/globalcollect/SET_PAYMENT_recurring.testresponse
Change-Id: If8e1a0b4670c6f6efc8aa972b6208511a8e1a487
---
D tests/Adapter/GlobalCollect/RecurringTest.php
D tests/GatewayPageTest.php
D tests/includes/Responses/globalcollect/DO_PAYMENT_recurring.testresponse
D tests/includes/Responses/globalcollect/GET_ORDERSTATUS_recurring.testresponse
D tests/includes/Responses/globalcollect/SET_PAYMENT_recurring.testresponse
5 files changed, 0 insertions(+), 330 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/DonationInterface
refs/changes/37/225937/1
diff --git a/tests/Adapter/GlobalCollect/RecurringTest.php
b/tests/Adapter/GlobalCollect/RecurringTest.php
deleted file mode 100644
index 261399a..000
--- a/tests/Adapter/GlobalCollect/RecurringTest.php
+++ /dev/null
@@ -1,100 +0,0 @@
-<<< HEAD (7654b4 Merge branch 'master' into deployment)
-===
-testAdapterClass = 'TestingGlobalCollectAdapter';
- }
-
- public function setUp() {
- parent::setUp();
-
- $this->setMwGlobals( array(
- 'wgGlobalCollectGatewayEnabled' => true,
- ) );
- }
-
- function tearDown() {
- TestingGlobalCollectAdapter::clearGlobalsCache();
- parent::tearDown();
- }
-
- /**
-* Can make a recurring payment
-*
-* @covers GlobalCollectAdapter::transactionRecurring_Charge
-*/
- public function testRecurringCharge() {
- $init = array(
- 'amount' => '2345',
- 'effort_id' => 2,
- 'order_id' => '9998890004',
- 'currency_code' => 'EUR',
- 'payment_product' => '',
- );
- $gateway = $this->getFreshGatewayObject( $init );
-
- // FIXME: I don't understand whether the literal code should
correspond to anything in GC
- $gateway->setDummyGatewayResponseCode( 'recurring' );
-
- $result = $gateway->do_transaction( 'Recurring_Charge' );
-
- $this->assertTrue( $result->getCommunicationStatus() );
- $this->assertRegExp( '/SET_PAYMENT/', $result->getRawResponse()
);
- }
-
- /**
-* Can make a recurring payment
-*
-* @covers GlobalCollectAdapter::transactionRecurring_Charge
-*/
- public function testDeclinedRecurringCharge() {
- $init = array(
- 'amount' => '2345',
- 'effort_id' => 2,
- 'order_id' => '9998890004',
- 'currency_code' => 'EUR',
- 'payment_product' => '',
- );
- $gateway = $this->getFreshGatewayObject( $init );
-
- $gateway->setDummyGatewayResponseCode( 'recurring-NOK' );
-
- $result = $gateway->do_transaction( 'Recurring_Charge' );
-
- $this->assertEquals( 1, count( $gateway->curled ), 'Should not
make another reqest after DO_PAYMENT fails' );
- $this->assertEquals( FinalStatus::FAILED,
$gateway->getFinalStatus() );
- }
-}
->>> BRANCH (6ca39c Localisation updates from https://translatewiki.net.)
diff --git a/tests/GatewayPageTest.php b/tests/GatewayPageTest.php
deleted file mode 100644
index 4d12662..000
--- a/tests/GatewayPageTest.php
+++ /dev/null
@@ -1,108 +0,0 @@
-<<< HEAD (7654b4 Merge branch 'master' into deployment)
-===
-page = new TestingGatewayPage();
- $this->adapter = new TestingGenericAdapter();
- $this->adapter->addRequestData( array(
- 'amount' => '200',
- 'currency_code' => 'BBD' ) );
- $this->adapter->errorsForRevalidate[0] = array( 'currency_code'
=> 'blah' );
- $this->adapter->errorsForRevalidate[1] = array();
- $this->page->adapter = $this->adapter;
- TestingGenericAdapter::$fakeGlobals = array (
'FallbackCurrency' => 'USD' );
- parent::setUp();
- }
-
- public function testFallbackWithNotification() {
- TestingGenericAdapter::$fakeGlobals['NotifyOnConvert'] = true;
-
- $this->page->validateForm();
-
- $this->assertTrue( $this->adapter->validatedOK() );
-
- $manualErrors = $this->adapter-
[MediaWiki-commits] [Gerrit] Thumbnail logging and stats - change (mediawiki/core)
Gilles has uploaded a new change for review.
https://gerrit.wikimedia.org/r/225936
Change subject: Thumbnail logging and stats
..
Thumbnail logging and stats
This is a combination of the following commits:
103eff5bcdafdafdddf0e2744ed168352a6ec77c
ec60612b6f5f684c76d73fbe93d4244499700c04
87861302440b425dca6b1e3ef55ebd3bf9a2497c
Bug: T106323
Change-Id: Iddd4201b13a31f441c6d25bcde6564b643cefdb4
---
M includes/filerepo/file/File.php
M thumb.php
2 files changed, 32 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/36/225936/1
diff --git a/includes/filerepo/file/File.php b/includes/filerepo/file/File.php
index 76ed27b..bd997b8 100644
--- a/includes/filerepo/file/File.php
+++ b/includes/filerepo/file/File.php
@@ -421,7 +421,10 @@
public function getLocalRefPath() {
$this->assertRepoDefined();
if ( !isset( $this->fsFile ) ) {
+ $starttime = microtime( true );
$this->fsFile = $this->repo->getLocalReference(
$this->getPath() );
+ RequestContext::getMain()->getStats()->timing(
'media.thumbnail.generate.fetchoriginal', microtime( true ) - $starttime );
+
if ( !$this->fsFile ) {
$this->fsFile = false; // null => false; cache
negative hits
}
@@ -1094,6 +1097,8 @@
public function generateAndSaveThumb( $tmpFile, $transformParams,
$flags ) {
global $wgUseSquid, $wgIgnoreImageErrors;
+ $stats = RequestContext::getMain()->getStats();
+
$handler = $this->getHandler();
$normalisedParams = $transformParams;
@@ -1109,9 +1114,13 @@
$this->generateBucketsIfNeeded( $normalisedParams,
$flags );
}
+ $starttime = microtime( true );
+
// Actually render the thumbnail...
$thumb = $handler->doTransform( $this, $tmpThumbPath,
$thumbUrl, $transformParams );
$tmpFile->bind( $thumb ); // keep alive with $thumb
+
+ $stats->timing( 'media.thumbnail.generate.transform',
microtime( true ) - $starttime );
if ( !$thumb ) { // bad params?
$thumb = false;
@@ -1123,6 +1132,9 @@
}
} elseif ( $this->repo && $thumb->hasFile() &&
!$thumb->fileIsSource() ) {
// Copy the thumbnail from the file system into
storage...
+
+ $starttime = microtime( true );
+
$disposition = $this->getThumbDisposition( $thumbName );
$status = $this->repo->quickImport( $tmpThumbPath,
$thumbPath, $disposition );
if ( $status->isOK() ) {
@@ -1130,6 +1142,9 @@
} else {
$thumb = $this->transformErrorOutput(
$thumbPath, $thumbUrl, $transformParams, $flags );
}
+
+ $stats->timing( 'media.thumbnail.generate.store',
microtime( true ) - $starttime );
+
// Give extensions a chance to do something with this
thumbnail...
Hooks::run( 'FileTransformed', array( $this, $thumb,
$tmpThumbPath, $thumbPath ) );
}
@@ -1139,9 +1154,13 @@
// "thumbs" which have the main image URL though (bug 13776)
if ( $wgUseSquid ) {
if ( !$thumb || $thumb->isError() || $thumb->getUrl()
!= $this->getURL() ) {
+ $starttime = microtime( true );
SquidUpdate::purge( array( $thumbUrl ) );
+ $stats->timing(
'media.thumbnail.generate.purge', microtime( true ) - $starttime );
}
}
+
+ wfDebugLog( 'thumbnailaccess', time() . ' ' . $thumbPath . ' '
. filesize( $tmpThumbPath ) . ' Generated ' );
return $thumb;
}
@@ -1167,6 +1186,8 @@
return false;
}
+ $starttime = microtime( true );
+
$params['physicalWidth'] = $bucket;
$params['width'] = $bucket;
@@ -1182,6 +1203,8 @@
$thumb = $this->generateAndSaveThumb( $tmpFile, $params, $flags
);
+ $buckettime = microtime( true ) - $starttime;
+
if ( !$thumb || $thumb->isError() ) {
return false;
}
@@ -1191,6 +1214,8 @@
// this object exists
$tmpFile->bind( $this );
+ RequestContext::getMain()->getStats()->timing(
'media.thumbnail.generate.bucket', $buckettime );
+
return true;
}
diff --git a/thumb.php b/thumb.php
index b530bb5..3b7ff43 10
[MediaWiki-commits] [Gerrit] Assign thumbnail access log to Monolog debug channel - change (operations/mediawiki-config)
Gilles has uploaded a new change for review. https://gerrit.wikimedia.org/r/225935 Change subject: Assign thumbnail access log to Monolog debug channel .. Assign thumbnail access log to Monolog debug channel Bug: T106323 Change-Id: Id705c4c45eeb967ba947a05c9664e12126a0b0f7 --- M wmf-config/InitialiseSettings.php 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/35/225935/1 diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index 5624afc..01a8f56 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -4360,6 +4360,7 @@ 'AdHocDebug' => 'debug', // for temp live debugging 'wfLogDBError' => 'debug', // Former $wgDBerrorLog 'wbq_evaluation' => 'debug', // WikibaseQualityConstraints evaluation logs + 'thumbnailaccess' => 'debug', // T106323 ), '+enwiki' => array( -- To view, visit https://gerrit.wikimedia.org/r/225935 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id705c4c45eeb967ba947a05c9664e12126a0b0f7 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Gilles ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Implement Memory cache for articles - change (apps...wikipedia)
jenkins-bot has submitted this change and it was merged.
Change subject: Implement Memory cache for articles
..
Implement Memory cache for articles
T105819
Adding NSCache to the datastore, setting cache size to 50
Note: NSCache is thread safe and locks itself.
Caching when an article is saved
Checking memory cache, then, disk, then create if needed
Moved from article fetched notification -> article saved notification (more
like core data)
Added memory warning logic - purging cache.
Change-Id: I0042dbf2bc7097cd3b4698216178cbe59ac4e30e
---
M MediaWikiKit/MediaWikiKit/MWKDataStore.h
M MediaWikiKit/MediaWikiKit/MWKDataStore.m
M Wikipedia/UI-V5/WMFArticleFetcher.h
M Wikipedia/UI-V5/WMFArticleFetcher.m
M Wikipedia/UI-V5/WMFArticleViewController.m
5 files changed, 50 insertions(+), 15 deletions(-)
Approvals:
Bgerstle: Looks good to me, approved
jenkins-bot: Verified
diff --git a/MediaWikiKit/MediaWikiKit/MWKDataStore.h
b/MediaWikiKit/MediaWikiKit/MWKDataStore.h
index 84f9645..ea2c610 100644
--- a/MediaWikiKit/MediaWikiKit/MWKDataStore.h
+++ b/MediaWikiKit/MediaWikiKit/MWKDataStore.h
@@ -22,6 +22,9 @@
*/
extern NSString* MWKCreateImageURLWithPath(NSString* path);
+extern NSString* const MWKArticleSavedNotification;
+extern NSString* const MWKArticleKey;
+
@interface MWKDataStore : NSObject
@property (readonly, copy, nonatomic) NSString* basePath;
diff --git a/MediaWikiKit/MediaWikiKit/MWKDataStore.m
b/MediaWikiKit/MediaWikiKit/MWKDataStore.m
index 3ba71b0..5dac95a 100644
--- a/MediaWikiKit/MediaWikiKit/MWKDataStore.m
+++ b/MediaWikiKit/MediaWikiKit/MWKDataStore.m
@@ -7,8 +7,10 @@
#import
-
+NSString* const MWKArticleSavedNotification =
@"MWKArticleSavedNotification";
+NSString* const MWKArticleKey= @"MWKArticleKey";
NSString* const MWKDataStoreValidImageSitePrefix = @"//upload.wikimedia.org/";
+
NSString* MWKCreateImageURLWithPath(NSString* path) {
return [MWKDataStoreValidImageSitePrefix stringByAppendingString:path];
}
@@ -18,15 +20,24 @@
@interface MWKDataStore ()
@property (readwrite, copy, nonatomic) NSString* basePath;
+@property (nonatomic, strong) NSCache* articleCache;
@end
@implementation MWKDataStore
+#pragma mark - Class methods
+
+ (NSString*)mainDataStorePath {
NSString* documentsFolder =
[NSSearchPathForDirectoriesInDomains(NSDocumentDirectory,
NSUserDomainMask, YES) firstObject];
return [documentsFolder stringByAppendingPathComponent:@"Data"];
+}
+
+#pragma mark - Setup / Teardown
+
+- (void)dealloc {
+[[NSNotificationCenter defaultCenter] removeObserver:self];
}
- (instancetype)init {
@@ -36,9 +47,18 @@
- (instancetype)initWithBasePath:(NSString*)basePath {
self = [super init];
if (self) {
-self.basePath = basePath;
+self.basePath= basePath;
+self.articleCache= [[NSCache alloc] init];
+self.articleCache.countLimit = 50;
+[[NSNotificationCenter defaultCenter] addObserver:self
selector:@selector(didRecievememoryWarningWithNotifcation:)
name:UIApplicationDidReceiveMemoryWarningNotification object:nil];
}
return self;
+}
+
+#pragma mark - Memory
+
+- (void)didRecievememoryWarningWithNotifcation:(NSNotification*)note {
+[self.articleCache removeAllObjects];
}
#pragma mark - path methods
@@ -193,9 +213,14 @@
}
- (void)saveArticle:(MWKArticle*)article {
+if (article.title.text == nil) {
+return;
+}
NSString* path = [self pathForArticle:article];
NSDictionary* export = [article dataExport];
[self saveDictionary:export path:path name:@"Article.plist"];
+[self.articleCache setObject:article forKey:article.title];
+[[NSNotificationCenter defaultCenter]
postNotificationName:MWKArticleSavedNotification object:self
userInfo:@{MWKArticleKey: article}];
}
- (void)saveSection:(MWKSection*)section {
@@ -266,6 +291,10 @@
#pragma mark - load methods
+- (MWKArticle*)memoryCachedArticleWithTitle:(MWKTitle*)title {
+return [self.articleCache objectForKey:title];
+}
+
- (MWKArticle*)existingArticleWithTitle:(MWKTitle*)title {
NSString* path = [self pathForTitle:title];
NSString* filePath = [path
stringByAppendingPathComponent:@"Article.plist"];
@@ -274,7 +303,19 @@
}
- (MWKArticle*)articleWithTitle:(MWKTitle*)title {
-return [self existingArticleWithTitle:title] ? : [[MWKArticle alloc]
initWithTitle:title dataStore:self];
+MWKArticle* article = [self memoryCachedArticleWithTitle:title];
+
+if (!article) {
+article = [self existingArticleWithTitle:title];
+if (!article) {
+article = [[MWKArticle alloc] initWithTitle:title dataStore:self];
+}
+if (article) {
+[self.articleCache setObject:article forKey:article.title];
+}
+}
+
+return article;
}
- (MWKSection*)sectionWithId:(NSUInteger
[MediaWiki-commits] [Gerrit] Implement gifs in web view - change (apps...wikipedia)
jenkins-bot has submitted this change and it was merged. Change subject: Implement gifs in web view .. Implement gifs in web view T104481 Added AnimatedGIFImageSerialization pod Updated all pods Returning gif data in Image Protocol Returning PNG data if image type is unknown If gif is not animated, allowing fallback to PNG as well (animated gif serialization only works with animated gifs, not all gifs) Change-Id: I6c49e64aa5c42722d49ca1ba0a4e53a248bbaefb --- M Podfile M Podfile.lock A Pods/AnimatedGIFImageSerialization/AnimatedGIFImageSerialization/AnimatedGIFImageSerialization.h A Pods/AnimatedGIFImageSerialization/AnimatedGIFImageSerialization/AnimatedGIFImageSerialization.m A Pods/AnimatedGIFImageSerialization/LICENSE A Pods/AnimatedGIFImageSerialization/README.md M Pods/CocoaLumberjack/Classes/CocoaLumberjack.h A Pods/CocoaLumberjack/Classes/CocoaLumberjack.modulemap M Pods/CocoaLumberjack/Classes/CocoaLumberjack.swift M Pods/CocoaLumberjack/Classes/DDASLLogCapture.m M Pods/CocoaLumberjack/Classes/DDASLLogger.h M Pods/CocoaLumberjack/Classes/DDASLLogger.m M Pods/CocoaLumberjack/Classes/DDAbstractDatabaseLogger.h M Pods/CocoaLumberjack/Classes/DDAssertMacros.h M Pods/CocoaLumberjack/Classes/DDFileLogger.m M Pods/CocoaLumberjack/Classes/DDLegacyMacros.h M Pods/CocoaLumberjack/Classes/DDLog+LOGV.h M Pods/CocoaLumberjack/Classes/DDLog.h M Pods/CocoaLumberjack/Classes/DDLog.m M Pods/CocoaLumberjack/Classes/DDLogMacros.h M Pods/CocoaLumberjack/Classes/DDTTYLogger.h M Pods/CocoaLumberjack/Classes/DDTTYLogger.m M Pods/CocoaLumberjack/Classes/Extensions/DDDispatchQueueLogFormatter.m M Pods/CocoaLumberjack/README.md A Pods/Headers/Private/AnimatedGIFImageSerialization/AnimatedGIFImageSerialization.h A Pods/Headers/Public/AnimatedGIFImageSerialization/AnimatedGIFImageSerialization.h M Pods/Manifest.lock M Pods/Pods.xcodeproj/project.pbxproj M Pods/Pods.xcodeproj/xcshareddata/xcschemes/Pods-WikipediaUnitTests-SDWebImage.xcscheme M Pods/Target Support Files/Pods-AFNetworking/Pods-AFNetworking-Private.xcconfig A Pods/Target Support Files/Pods-AnimatedGIFImageSerialization/Pods-AnimatedGIFImageSerialization-Private.xcconfig A Pods/Target Support Files/Pods-AnimatedGIFImageSerialization/Pods-AnimatedGIFImageSerialization-dummy.m A Pods/Target Support Files/Pods-AnimatedGIFImageSerialization/Pods-AnimatedGIFImageSerialization-prefix.pch A Pods/Target Support Files/Pods-AnimatedGIFImageSerialization/Pods-AnimatedGIFImageSerialization.xcconfig M Pods/Target Support Files/Pods-BlocksKit/Pods-BlocksKit-Private.xcconfig M Pods/Target Support Files/Pods-CocoaLumberjack/Pods-CocoaLumberjack-Private.xcconfig M Pods/Target Support Files/Pods-HockeySDK/Pods-HockeySDK-Private.xcconfig M Pods/Target Support Files/Pods-KVOController/Pods-KVOController-Private.xcconfig M Pods/Target Support Files/Pods-Mantle/Pods-Mantle-Private.xcconfig M Pods/Target Support Files/Pods-Masonry/Pods-Masonry-Private.xcconfig M Pods/Target Support Files/Pods-SDWebImage/Pods-SDWebImage-Private.xcconfig M Pods/Target Support Files/Pods-WikipediaUnitTests-AFNetworking/Pods-WikipediaUnitTests-AFNetworking-Private.xcconfig A Pods/Target Support Files/Pods-WikipediaUnitTests-AnimatedGIFImageSerialization/Pods-WikipediaUnitTests-AnimatedGIFImageSerialization-Private.xcconfig A Pods/Target Support Files/Pods-WikipediaUnitTests-AnimatedGIFImageSerialization/Pods-WikipediaUnitTests-AnimatedGIFImageSerialization-dummy.m A Pods/Target Support Files/Pods-WikipediaUnitTests-AnimatedGIFImageSerialization/Pods-WikipediaUnitTests-AnimatedGIFImageSerialization-prefix.pch A Pods/Target Support Files/Pods-WikipediaUnitTests-AnimatedGIFImageSerialization/Pods-WikipediaUnitTests-AnimatedGIFImageSerialization.xcconfig M Pods/Target Support Files/Pods-WikipediaUnitTests-BlocksKit/Pods-WikipediaUnitTests-BlocksKit-Private.xcconfig M Pods/Target Support Files/Pods-WikipediaUnitTests-CocoaLumberjack/Pods-WikipediaUnitTests-CocoaLumberjack-Private.xcconfig M Pods/Target Support Files/Pods-WikipediaUnitTests-HockeySDK/Pods-WikipediaUnitTests-HockeySDK-Private.xcconfig M Pods/Target Support Files/Pods-WikipediaUnitTests-KVOController/Pods-WikipediaUnitTests-KVOController-Private.xcconfig M Pods/Target Support Files/Pods-WikipediaUnitTests-Mantle/Pods-WikipediaUnitTests-Mantle-Private.xcconfig M Pods/Target Support Files/Pods-WikipediaUnitTests-Masonry/Pods-WikipediaUnitTests-Masonry-Private.xcconfig M Pods/Target Support Files/Pods-WikipediaUnitTests-OCHamcrest/Pods-WikipediaUnitTests-OCHamcrest-Private.xcconfig M Pods/Target Support Files/Pods-WikipediaUnitTests-OCMockito/Pods-WikipediaUnitTests-OCMockito-Private.xcconfig M Pods/Target Support Files/Pods-WikipediaUnitTests-SDWebImage/Pods-WikipediaUnitTests-SDWebImage-Private.xcconfig M Pods/Target Support Files/Pods-WikipediaUnitTests-hpple/Pods-WikipediaUnitTests-hpple-Private.xcconfig M Pods/Target Support Files/Pods-WikipediaU
[MediaWiki-commits] [Gerrit] Avoid undefined index error - change (mediawiki...Gather)
jenkins-bot has submitted this change and it was merged. Change subject: Avoid undefined index error .. Avoid undefined index error Bug: T105696 Change-Id: I5cc971247862899b9fe2d81db2fb8cf91cba84c1 --- M includes/specials/SpecialGather.php 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Robmoen: Looks good to me, approved jenkins-bot: Verified diff --git a/includes/specials/SpecialGather.php b/includes/specials/SpecialGather.php index 73e3765..86c5b2b 100644 --- a/includes/specials/SpecialGather.php +++ b/includes/specials/SpecialGather.php @@ -111,7 +111,7 @@ $args = $this->specialCollections[$key]; $c = new models\Collection( 0, null, $args['title'], $args['description'] ); $c = models\Collection::newFromApi( $c, $args['params'], $args['limit'], - ( $args['continue'] ? $args['continue'] : array() ) ); + ( isset( $args['continue'] ) ? $args['continue'] : array() ) ); $c->setUrl( SpecialPage::getTitleFor( 'Gather' ) ->getSubpage( 'explore' ) ->getSubpage( $key )->getLocalUrl() ); -- To view, visit https://gerrit.wikimedia.org/r/225674 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I5cc971247862899b9fe2d81db2fb8cf91cba84c1 Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/extensions/Gather Gerrit-Branch: master Gerrit-Owner: Jdlrobson Gerrit-Reviewer: BarryTheBrowserTestBot Gerrit-Reviewer: Robmoen Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Only apply indicator circle to first instance of main menu b... - change (mediawiki...MobileFrontend)
jenkins-bot has submitted this change and it was merged.
Change subject: Only apply indicator circle to first instance of main menu
button
..
Only apply indicator circle to first instance of main menu button
In beta the main menu can be triggered from various places. Only show
the indicator on the first in the DOM, given this should be the first
the user sees when visually scanning.
Bug: T105880
Change-Id: I5eb9080c448243e83792ff124a54c3f07beed8d5
---
M resources/mobile.mainMenu/MainMenu.js
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Robmoen: Looks good to me, approved
jenkins-bot: Verified
Objections:
BarryTheBrowserTestBot: There's a problem with this change, please improve
diff --git a/resources/mobile.mainMenu/MainMenu.js
b/resources/mobile.mainMenu/MainMenu.js
index e28b272..38f8d04 100644
--- a/resources/mobile.mainMenu/MainMenu.js
+++ b/resources/mobile.mainMenu/MainMenu.js
@@ -40,7 +40,7 @@
this._hasNewFeature = true;
}
$( function () {
- var $activator = $( self.activator );
+ var $activator = $( self.activator ).eq( 0 );
$activator.addClass( 'indicator-circle' );
mw.loader.using( 'mobile.contentOverlays'
).done( function () {
$activator.one( 'click', function () {
--
To view, visit https://gerrit.wikimedia.org/r/225922
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I5eb9080c448243e83792ff124a54c3f07beed8d5
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson
Gerrit-Reviewer: BarryTheBrowserTestBot
Gerrit-Reviewer: Robmoen
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] QA: Add integration tests to Jenkins - change (mediawiki...MobileFrontend)
Jdlrobson has uploaded a new change for review. https://gerrit.wikimedia.org/r/225934 Change subject: QA: Add integration tests to Jenkins .. QA: Add integration tests to Jenkins Highlight failures with the new user per page creation approach Change-Id: I5f3426765760a2937d56d8a38c2850fe6da3a2ad --- M tests/browser/features/special_watchlist.feature M tests/browser/features/ui_links.feature 2 files changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend refs/changes/34/225934/1 diff --git a/tests/browser/features/special_watchlist.feature b/tests/browser/features/special_watchlist.feature index 2949b2c..30eefdc 100644 --- a/tests/browser/features/special_watchlist.feature +++ b/tests/browser/features/special_watchlist.feature @@ -5,7 +5,7 @@ Given I am logged into the mobile website And I am on the "Special:Watchlist" page - @smoke + @smoke @integration Scenario: Switching to Feed view When I switch to the modified view of the watchlist And I click the Pages tab diff --git a/tests/browser/features/ui_links.feature b/tests/browser/features/ui_links.feature index 0cd44fa..23eb3c5 100644 --- a/tests/browser/features/ui_links.feature +++ b/tests/browser/features/ui_links.feature @@ -4,7 +4,7 @@ Background: Given I am using the mobile site - @smoke + @smoke @integration Scenario: Check existence of important UI components on the main page Given the wiki has a terms of use And I am on the "Main Page" page -- To view, visit https://gerrit.wikimedia.org/r/225934 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I5f3426765760a2937d56d8a38c2850fe6da3a2ad Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/MobileFrontend Gerrit-Branch: master Gerrit-Owner: Jdlrobson ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Log thumbnail access - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged.
Change subject: Log thumbnail access
..
Log thumbnail access
Bug: T106323
Change-Id: Iddd4201b13a31f441c6d25bcde6564b643cefdb4
---
M includes/filerepo/file/File.php
M thumb.php
2 files changed, 3 insertions(+), 0 deletions(-)
Approvals:
Aaron Schulz: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/filerepo/file/File.php b/includes/filerepo/file/File.php
index f9e1128..72b3ae9 100644
--- a/includes/filerepo/file/File.php
+++ b/includes/filerepo/file/File.php
@@ -1149,6 +1149,8 @@
Hooks::run( 'FileTransformed', array( $this, $thumb,
$tmpThumbPath, $thumbPath ) );
}
+ wfDebugLog( 'thumbnailaccess', time() . ' ' . $thumbPath . ' '
. filesize( $tmpThumbPath ) . ' Generated ' );
+
return $thumb;
}
diff --git a/thumb.php b/thumb.php
index 5c4eea7..3b7ff43 100644
--- a/thumb.php
+++ b/thumb.php
@@ -309,6 +309,7 @@
wfThumbError( 500, 'Could not stream the file' );
} else {
RequestContext::getMain()->getStats()->timing(
'media.thumbnail.stream', $streamtime );
+ wfDebugLog( 'thumbnailaccess', time() . ' ' .
$thumbPath . ' ' . ob_get_length() . ' Streamed ' );
}
return;
}
--
To view, visit https://gerrit.wikimedia.org/r/225929
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iddd4201b13a31f441c6d25bcde6564b643cefdb4
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Gilles
Gerrit-Reviewer: Aaron Schulz
Gerrit-Reviewer: Gilles
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Bump versionCode - change (apps...wikipedia)
jenkins-bot has submitted this change and it was merged.
Change subject: Bump versionCode
..
Bump versionCode
Change-Id: I57738a25e7c777a8bbe030c92df014c69c8e092a
---
M wikipedia/build.gradle
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Sniedzielski: Looks good to me, approved
jenkins-bot: Verified
diff --git a/wikipedia/build.gradle b/wikipedia/build.gradle
index e2141a2..d4777de 100644
--- a/wikipedia/build.gradle
+++ b/wikipedia/build.gradle
@@ -30,7 +30,7 @@
applicationId 'org.wikipedia'
minSdkVersion 10
targetSdkVersion 22
-versionCode 105
+versionCode 106
testApplicationId 'org.wikipedia.test'
}
signingConfigs {
--
To view, visit https://gerrit.wikimedia.org/r/225495
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I57738a25e7c777a8bbe030c92df014c69c8e092a
Gerrit-PatchSet: 2
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Niedzielski
Gerrit-Reviewer: BearND
Gerrit-Reviewer: Brion VIBBER
Gerrit-Reviewer: Dbrant
Gerrit-Reviewer: Mholloway
Gerrit-Reviewer: Sniedzielski
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Correct typo in tables stylesheet of minerva - change (mediawiki...MobileFrontend)
jenkins-bot has submitted this change and it was merged.
Change subject: Correct typo in tables stylesheet of minerva
..
Correct typo in tables stylesheet of minerva
Bug: T105762
Change-Id: Ib3b9afa4883fe54217668cb87117347aa1c4d143
---
M resources/skins.minerva.content.styles/tables.less
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
GOIII: Looks good to me, but someone else must approve
Florianschmidtwelzow: Looks good to me, but someone else must approve
Jdlrobson: Looks good to me, approved
jenkins-bot: Verified
Objections:
BarryTheBrowserTestBot: There's a problem with this change, please improve
diff --git a/resources/skins.minerva.content.styles/tables.less
b/resources/skins.minerva.content.styles/tables.less
index c310daa..47c6833 100644
--- a/resources/skins.minerva.content.styles/tables.less
+++ b/resources/skins.minerva.content.styles/tables.less
@@ -27,7 +27,7 @@
// We only style cells that are direct children of the
wikitable table since
// table tags may be used for non-table purposes within
the cells.
> tr > th,
- > tr > th,
+ > tr > td,
> * > tr > th,
> * > tr > td {
border: 1px solid @grayLightest;
--
To view, visit https://gerrit.wikimedia.org/r/225031
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib3b9afa4883fe54217668cb87117347aa1c4d143
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: TheDJ
Gerrit-Reviewer: BarryTheBrowserTestBot
Gerrit-Reviewer: Florianschmidtwelzow
Gerrit-Reviewer: GOIII
Gerrit-Reviewer: Jdlrobson
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Hygiene: Main return as root structure (handle errors early) - change (mediawiki...Cite)
jenkins-bot has submitted this change and it was merged.
Change subject: Hygiene: Main return as root structure (handle errors early)
..
Hygiene: Main return as root structure (handle errors early)
Restructure code to return early for errors instead of nesting
conditionals. This leaves the outer tree of the function as
the natural flow of the primary purpose.
Makes code more resilient by ensuring that new code added to the
function will not execute under error conditions by removing the
need to keep everything encapsulated in the various levels of
error conditionals.
Change-Id: I1b4a67d344fd9843ca088d008487914f87b1c640
---
M Cite_body.php
1 file changed, 63 insertions(+), 65 deletions(-)
Approvals:
Gilles: Looks good to me, approved
jenkins-bot: Verified
diff --git a/Cite_body.php b/Cite_body.php
index 9763555..0db37fd 100644
--- a/Cite_body.php
+++ b/Cite_body.php
@@ -394,7 +394,6 @@
if ( !isset( $this->mGroupCnt[$group] ) ) {
$this->mGroupCnt[$group] = 0;
}
-
if ( $follow != null ) {
if ( isset( $this->mRefs[$group][$follow] ) &&
is_array( $this->mRefs[$group][$follow] ) ) {
// add text to the note that is being followed
@@ -418,6 +417,7 @@
// return an empty string : this is not a reference
return '';
}
+
if ( $key === null ) {
// No key
// $this->mRefs[$group][] = $str;
@@ -425,49 +425,48 @@
$this->mRefCallStack[] = array( 'new', $call, $str,
$key, $group, $this->mOutCnt );
return $this->linkRef( $group, $this->mOutCnt );
- } elseif ( is_string( $key ) ) {
- // Valid key
- if ( !isset( $this->mRefs[$group][$key] ) || !is_array(
$this->mRefs[$group][$key] ) ) {
- // First occurrence
- $this->mRefs[$group][$key] = array(
- 'text' => $str,
- 'count' => 0,
- 'key' => ++$this->mOutCnt,
- 'number' => ++$this->mGroupCnt[$group]
- );
- $this->mRefCallStack[] = array( 'new', $call,
$str, $key, $group, $this->mOutCnt );
-
- return
- $this->linkRef(
- $group,
- $key,
-
$this->mRefs[$group][$key]['key'] . "-" . $this->mRefs[$group][$key]['count'],
-
$this->mRefs[$group][$key]['number'],
- "-" .
$this->mRefs[$group][$key]['key']
- );
- } else {
- // We've been here before
- if ( $this->mRefs[$group][$key]['text'] ===
null && $str !== '' ) {
- // If no text found before, use this
text
- $this->mRefs[$group][$key]['text'] =
$str;
- $this->mRefCallStack[] = array(
'assign', $call, $str, $key, $group,
-
$this->mRefs[$group][$key]['key'] );
- } else {
- $this->mRefCallStack[] = array(
'increment', $call, $str, $key, $group,
-
$this->mRefs[$group][$key]['key'] );
- }
- return
- $this->linkRef(
- $group,
- $key,
-
$this->mRefs[$group][$key]['key'] . "-" . ++$this->mRefs[$group][$key]['count'],
-
$this->mRefs[$group][$key]['number'],
- "-" .
$this->mRefs[$group][$key]['key']
- );
- }
- } else {
+ }
+ if ( !is_string( $key ) ) {
throw new Exception( 'Invalid stack key: ' . serialize(
$key ) );
}
+
+ // Valid key
+ if ( !isset( $this->mRefs[$group][$key] ) || !is_array(
$this->mRefs[$group][$key] ) ) {
+ // First occurrence
+ $this->mRefs[$group][$key] = array(
+
[MediaWiki-commits] [Gerrit] Removed redundant signatures from DatabaseBase - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged. Change subject: Removed redundant signatures from DatabaseBase .. Removed redundant signatures from DatabaseBase Change-Id: I35816c752cd1b782796989a2d5ac4fe5eff78e55 --- M includes/db/Database.php 1 file changed, 0 insertions(+), 145 deletions(-) Approvals: Gilles: Looks good to me, approved jenkins-bot: Verified diff --git a/includes/db/Database.php b/includes/db/Database.php index 04b3edd..d7acb42 100644 --- a/includes/db/Database.php +++ b/includes/db/Database.php @@ -606,125 +606,6 @@ } /** -* Get the type of the DBMS, as it appears in $wgDBtype. -* -* @return string -*/ - abstract function getType(); - - /** -* Open a connection to the database. Usually aborts on failure -* -* @param string $server Database server host -* @param string $user Database user name -* @param string $password Database user password -* @param string $dbName Database name -* @return bool -* @throws DBConnectionError -*/ - abstract function open( $server, $user, $password, $dbName ); - - /** -* Fetch the next row from the given result object, in object form. -* Fields can be retrieved with $row->fieldname, with fields acting like -* member variables. -* If no more rows are available, false is returned. -* -* @param ResultWrapper|stdClass $res Object as returned from DatabaseBase::query(), etc. -* @return stdClass|bool -* @throws DBUnexpectedError Thrown if the database returns an error -*/ - abstract function fetchObject( $res ); - - /** -* Fetch the next row from the given result object, in associative array -* form. Fields are retrieved with $row['fieldname']. -* If no more rows are available, false is returned. -* -* @param ResultWrapper $res Result object as returned from DatabaseBase::query(), etc. -* @return array|bool -* @throws DBUnexpectedError Thrown if the database returns an error -*/ - abstract function fetchRow( $res ); - - /** -* Get the number of rows in a result object -* -* @param mixed $res A SQL result -* @return int -*/ - abstract function numRows( $res ); - - /** -* Get the number of fields in a result object -* @see http://www.php.net/mysql_num_fields -* -* @param mixed $res A SQL result -* @return int -*/ - abstract function numFields( $res ); - - /** -* Get a field name in a result object -* @see http://www.php.net/mysql_field_name -* -* @param mixed $res A SQL result -* @param int $n -* @return string -*/ - abstract function fieldName( $res, $n ); - - /** -* Get the inserted value of an auto-increment row -* -* The value inserted should be fetched from nextSequenceValue() -* -* Example: -* $id = $dbw->nextSequenceValue( 'page_page_id_seq' ); -* $dbw->insert( 'page', array( 'page_id' => $id ) ); -* $id = $dbw->insertId(); -* -* @return int -*/ - abstract function insertId(); - - /** -* Change the position of the cursor in a result object -* @see http://www.php.net/mysql_data_seek -* -* @param mixed $res A SQL result -* @param int $row -*/ - abstract function dataSeek( $res, $row ); - - /** -* Get the last error number -* @see http://www.php.net/mysql_errno -* -* @return int -*/ - abstract function lastErrno(); - - /** -* Get a description of the last error -* @see http://www.php.net/mysql_error -* -* @return string -*/ - abstract function lastError(); - - /** -* mysql_fetch_field() wrapper -* Returns false if the field doesn't exist -* -* @param string $table Table name -* @param string $field Field name -* -* @return Field -*/ - abstract function fieldInfo( $table, $field ); - - /** * Get information about an index into an object * @param string $table Table name * @param string $index Index name @@ -734,38 +615,12 @@ abstract function indexInfo( $table, $index, $fname = __METHOD__ ); /** -* Get the number of rows affected by the last write query -* @see http://www.php.net/mysql_affected_rows -* -* @return int -*/ - abstract function affectedRows(); - - /** * Wrapper for addslashes() * * @param string $s String to be slashed.
[MediaWiki-commits] [Gerrit] More API feature logging. SetClaimValue & GE props - change (mediawiki...Wikibase)
Addshore has uploaded a new change for review.
https://gerrit.wikimedia.org/r/225933
Change subject: More API feature logging. SetClaimValue & GE props
..
More API feature logging. SetClaimValue & GE props
Change-Id: I4565b210449a4927b4bcb9e0c879a07ba5b226eb
---
M repo/includes/api/GetEntities.php
M repo/includes/api/SetClaimValue.php
2 files changed, 6 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/33/225933/1
diff --git a/repo/includes/api/GetEntities.php
b/repo/includes/api/GetEntities.php
index 123038e..744bb37 100644
--- a/repo/includes/api/GetEntities.php
+++ b/repo/includes/api/GetEntities.php
@@ -110,6 +110,10 @@
public function execute() {
$params = $this->extractRequestParams();
+ if ( isset( $params['props'] ) && !empty( $params['props'] ) ) {
+ $this->logFeatureUsage( 'action=wbgetentities&props=' .
implode( '|', $params['props'] ) );
+ }
+
if ( !isset( $params['ids'] ) && ( empty( $params['sites'] ) ||
empty( $params['titles'] ) ) ) {
$this->errorReporter->dieError(
'Either provide the item "ids" or pairs of
"sites" and "titles" for corresponding pages',
diff --git a/repo/includes/api/SetClaimValue.php
b/repo/includes/api/SetClaimValue.php
index 530f57e..15acc46 100644
--- a/repo/includes/api/SetClaimValue.php
+++ b/repo/includes/api/SetClaimValue.php
@@ -52,6 +52,8 @@
$params = $this->extractRequestParams();
$this->validateParameters( $params );
+ $this->logFeatureUsage( 'action=wbsetclaimvalue' );
+
$guid = $params['claim'];
$entityId = $this->guidParser->parse( $guid )->getEntityId();
if ( isset( $params['baserevid'] ) ) {
--
To view, visit https://gerrit.wikimedia.org/r/225933
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I4565b210449a4927b4bcb9e0c879a07ba5b226eb
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Addshore
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update installation instructions - change (search/highlighter)
jenkins-bot has submitted this change and it was merged. Change subject: Update installation instructions .. Update installation instructions Change-Id: Ia5805ccca3588035a9a76462fe005bffaaa84e3f --- M README.md 1 file changed, 7 insertions(+), 1 deletion(-) Approvals: Tjones: Looks good to me, approved jenkins-bot: Verified diff --git a/README.md b/README.md index 6dcaa4b..bbe2c92 100644 --- a/README.md +++ b/README.md @@ -34,13 +34,19 @@ | Experimental Highlighter Plugin | ElasticSearch | |-|-| -| 1.6.0, master branch| 1.6.X | +| 1.7.0, master branch| 1.7.X | +| 1.6.0, 1.6 branch | 1.6.X | | 1.5.0 -> 1.5.1, 1.5 branch | 1.5.X | | 1.4.0 -> 1.4.1, 1.4 branch | 1.4.X | | 0.0.11 -> 1.3.0, 1.3 branch | 1.3.X | | 0.0.10 | 1.2.X | | 0.0.1 -> 0.0.9 | 1.1.X | +Install it like so for Elasticsearch 1.7.x: +```bash +./bin/plugin --install org.wikimedia.search.highlighter/experimental-highlighter-elasticsearch-plugin/1.7.0 +``` + Install it like so for Elasticsearch 1.6.x: ```bash ./bin/plugin --install org.wikimedia.search.highlighter/experimental-highlighter-elasticsearch-plugin/1.6.0 -- To view, visit https://gerrit.wikimedia.org/r/225927 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ia5805ccca3588035a9a76462fe005bffaaa84e3f Gerrit-PatchSet: 2 Gerrit-Project: search/highlighter Gerrit-Branch: master Gerrit-Owner: Manybubbles Gerrit-Reviewer: DCausse Gerrit-Reviewer: EBernhardson Gerrit-Reviewer: Manybubbles Gerrit-Reviewer: Tjones Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update installation instructions - change (search/repository-swift)
jenkins-bot has submitted this change and it was merged. Change subject: Update installation instructions .. Update installation instructions Change-Id: I95bb878fbb698f2f1ef31eeb1a404925d0acd750 --- M README.md 1 file changed, 3 insertions(+), 2 deletions(-) Approvals: Tjones: Looks good to me, approved jenkins-bot: Verified diff --git a/README.md b/README.md index b6e9630..2f90ae4 100644 --- a/README.md +++ b/README.md @@ -9,9 +9,10 @@ | 0.6 | 1.3.2 | 2014-08-20 | | 0.7 | 1.4.0 | 2014-11-07 | | 1.6.0 | 1.6.0 | 2015-06-09 | +| 1.7.0 | 1.7.0 | 2015-07-20 | -Versions 0.4, 0.6, 0.7, and 1.6.0 should be used. The in-between releases were -buggy and are not recommended. +Only the versions in the table above should be used. The in-between releases +were buggy and are not recommended. ## Create Repository ``` -- To view, visit https://gerrit.wikimedia.org/r/225926 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I95bb878fbb698f2f1ef31eeb1a404925d0acd750 Gerrit-PatchSet: 2 Gerrit-Project: search/repository-swift Gerrit-Branch: master Gerrit-Owner: Manybubbles Gerrit-Reviewer: DCausse Gerrit-Reviewer: EBernhardson Gerrit-Reviewer: Manybubbles Gerrit-Reviewer: Tjones Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Revert "Don't killall $DAEMON" - change (operations/puppet)
GWicke has uploaded a new change for review. https://gerrit.wikimedia.org/r/225932 Change subject: Revert "Don't killall $DAEMON" .. Revert "Don't killall $DAEMON" In production workers were not cleanly exiting on restart. A better solution is needed, but reverting for now to make sure that restarts are working as expected in the meantime. This reverts commit 45214e9be8323dd97c4b182c3322a9e01b932557. Change-Id: I65a3697cdc4d41950583904aa3d7ea836ff347a2 --- M modules/restbase/templates/restbase.init 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/32/225932/1 diff --git a/modules/restbase/templates/restbase.init b/modules/restbase/templates/restbase.init index 65dee3a..1099af0 100644 --- a/modules/restbase/templates/restbase.init +++ b/modules/restbase/templates/restbase.init @@ -93,8 +93,8 @@ # that waits for the process to drop all resources that could be # needed by services started subsequently. A last resort is to # sleep for some time. - # start-stop-daemon --stop --quiet --oknodo --retry=0/5/KILL/5 --exec $DAEMON - # [ "$?" = 2 ] && return 2 + start-stop-daemon --stop --quiet --oknodo --retry=0/5/KILL/5 --exec $DAEMON + [ "$?" = 2 ] && return 2 # Many daemons don't delete their pidfiles when they exit. rm -f $PIDFILE return "$RETVAL" -- To view, visit https://gerrit.wikimedia.org/r/225932 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I65a3697cdc4d41950583904aa3d7ea836ff347a2 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: GWicke ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Revert "Avoid spamming mailing list by skipping" - change (mediawiki...Gather)
Jdlrobson has uploaded a new change for review. https://gerrit.wikimedia.org/r/225931 Change subject: Revert "Avoid spamming mailing list by skipping" .. Revert "Avoid spamming mailing list by skipping" This reverts commit 36c1826f3a6e5554964f08ec068c298ad6f9ad30. (Upstream change means these tests should pass again) Bug: T105878 Change-Id: I46f03152fb2036e678cb4d5ef656ed9f8aacad86 --- M tests/browser/features/menu.feature 1 file changed, 0 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Gather refs/changes/31/225931/1 diff --git a/tests/browser/features/menu.feature b/tests/browser/features/menu.feature index 1f1ef5f..2c9e28d 100644 --- a/tests/browser/features/menu.feature +++ b/tests/browser/features/menu.feature @@ -4,14 +4,12 @@ Background: Given I am using the mobile site -@skip Scenario: Check links in menu And I have Gather And I am on the "Main Page" page When I click on the main navigation button Then I should see a link to "Collections" in the main navigation menu -@skip Scenario: Check links in menu And I have Gather And I am on the "Special:MobileOptions" page -- To view, visit https://gerrit.wikimedia.org/r/225931 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I46f03152fb2036e678cb4d5ef656ed9f8aacad86 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Gather Gerrit-Branch: master Gerrit-Owner: Jdlrobson ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update installation instructions for new branch - change (search/extra)
jenkins-bot has submitted this change and it was merged. Change subject: Update installation instructions for new branch .. Update installation instructions for new branch Change-Id: I555a30fcb36146c65d9441ab4c0bb19b371d6c8b --- M README.md 1 file changed, 7 insertions(+), 1 deletion(-) Approvals: Tjones: Looks good to me, approved jenkins-bot: Verified diff --git a/README.md b/README.md index b6e56b1..f036ea9 100644 --- a/README.md +++ b/README.md @@ -34,12 +34,18 @@ | Extra Queries and Filters Plugin | ElasticSearch | |--|-| -| 1.6.0, master branch | 1.6.X | +| 1.7.0, master branch | 1.7.X | +| 1.6.0, 1.6 branch| 1.6.X | | 1.5.0, 1.5 branch| 1.5.X | | 1.4.0 -> 1.4.1, 1.4 branch | 1.4.X | | 1.3.0 -> 1.3.1, 1.3 branch | 1.3.4 -> 1.3.X | | 0.0.1 -> 0.0.2 | 1.3.2 -> 1.3.3 | +Install it like so for Elasticsearch 1.7.x: +```bash +./bin/plugin --install org.wikimedia.search/extra/1.7.0 +``` + Install it like so for Elasticsearch 1.6.x: ```bash ./bin/plugin --install org.wikimedia.search/extra/1.6.0 -- To view, visit https://gerrit.wikimedia.org/r/225925 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I555a30fcb36146c65d9441ab4c0bb19b371d6c8b Gerrit-PatchSet: 1 Gerrit-Project: search/extra Gerrit-Branch: master Gerrit-Owner: Manybubbles Gerrit-Reviewer: DCausse Gerrit-Reviewer: EBernhardson Gerrit-Reviewer: Tjones Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix doxygen warnings for missing commands - change (mediawiki/core)
Florianschmidtwelzow has uploaded a new change for review.
https://gerrit.wikimedia.org/r/225930
Change subject: Fix doxygen warnings for missing commands
..
Fix doxygen warnings for missing commands
Follow up: I14c4d7521f81ddd8c7b56facc1f0ae34f86b2299
Change-Id: I8c69f52da577b3baecc622e3fab16f7c7b3db1f5
---
M includes/debug/logger/LegacyLogger.php
M includes/debug/logger/LegacySpi.php
M includes/debug/logger/LoggerFactory.php
M includes/debug/logger/MonologSpi.php
M includes/debug/logger/NullSpi.php
M includes/debug/logger/Spi.php
M includes/debug/logger/monolog/LegacyFormatter.php
7 files changed, 27 insertions(+), 27 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/30/225930/1
diff --git a/includes/debug/logger/LegacyLogger.php
b/includes/debug/logger/LegacyLogger.php
index 8010790..ea4e1b1 100644
--- a/includes/debug/logger/LegacyLogger.php
+++ b/includes/debug/logger/LegacyLogger.php
@@ -40,7 +40,7 @@
* See documentation in DefaultSettings.php for detailed explanations of each
* variable.
*
- * @see \MediaWiki\Logger\LoggerFactory
+ * @see \\MediaWiki\\Logger\\LoggerFactory
* @since 1.25
* @author Bryan Davis
* @copyright © 2014 Bryan Davis and Wikimedia Foundation.
@@ -53,10 +53,10 @@
protected $channel;
/**
-* Convert Psr\Log\LogLevel constants into int for sane comparisons
+* Convert Psr\\Log\\LogLevel constants into int for sane comparisons
* These are the same values that Monlog uses
*
-* @var array
+* @var array $levelMapping
*/
protected static $levelMapping = array(
LogLevel::DEBUG => 100,
@@ -100,7 +100,7 @@
*
* @param string $channel
* @param string $message
-* @param string|int $level Psr\Log\LogEvent constant or Monlog level
int
+* @param string|int $level Psr\\Log\\LogEvent constant or Monlog level
int
* @param array $context
* @return bool True if message should be sent to disk/network, false
* otherwise
diff --git a/includes/debug/logger/LegacySpi.php
b/includes/debug/logger/LegacySpi.php
index 1bf39e4..6a7f1d0 100644
--- a/includes/debug/logger/LegacySpi.php
+++ b/includes/debug/logger/LegacySpi.php
@@ -30,7 +30,7 @@
* );
* @endcode
*
- * @see \MediaWiki\Logger\LoggerFactory
+ * @see \\MediaWiki\\Logger\\LoggerFactory
* @since 1.25
* @author Bryan Davis
* @copyright © 2014 Bryan Davis and Wikimedia Foundation.
@@ -47,7 +47,7 @@
* Get a logger instance.
*
* @param string $channel Logging channel
-* @return \Psr\Log\LoggerInterface Logger instance
+* @return \\Psr\\Log\\LoggerInterface Logger instance
*/
public function getLogger( $channel ) {
if ( !isset( $this->singletons[$channel] ) ) {
diff --git a/includes/debug/logger/LoggerFactory.php
b/includes/debug/logger/LoggerFactory.php
index f6699ec..0b6965f 100644
--- a/includes/debug/logger/LoggerFactory.php
+++ b/includes/debug/logger/LoggerFactory.php
@@ -25,7 +25,7 @@
/**
* PSR-3 logger instance factory.
*
- * Creation of \Psr\Log\LoggerInterface instances is managed via the
+ * Creation of \\Psr\\Log\\LoggerInterface instances is managed via the
* LoggerFactory::getInstance() static method which in turn delegates to the
* currently registered service provider.
*
@@ -38,7 +38,7 @@
* $wgMWLoggerDefaultSpi is expected to be an array usable by
* ObjectFactory::getObjectFromSpec() to create a class.
*
- * @see \MediaWiki\Logger\Spi
+ * @see \\MediaWiki\\Logger\\Spi
* @since 1.25
* @author Bryan Davis
* @copyright © 2014 Bryan Davis and Wikimedia Foundation.
@@ -53,10 +53,10 @@
/**
-* Register a service provider to create new \Psr\Log\LoggerInterface
+* Register a service provider to create new \\Psr\\Log\\LoggerInterface
* instances.
*
-* @param \MediaWiki\Logger\Spi $provider Provider to register
+* @param \\MediaWiki\\Logger\\Spi $provider Provider to register
*/
public static function registerProvider( Spi $provider ) {
self::$spi = $provider;
@@ -71,7 +71,7 @@
* Spi registration. $wgMWLoggerDefaultSpi is expected to be an
* array usable by ObjectFactory::getObjectFromSpec() to create a class.
*
-* @return \MediaWiki\Logger\Spi
+* @return \\MediaWiki\\Logger\\Spi
* @see registerProvider()
* @see ObjectFactory::getObjectFromSpec()
*/
@@ -91,7 +91,7 @@
* Get a named logger instance from the currently configured logger
factory.
*
* @param string $channel Logger channel (name)
-* @return \Psr\Log\LoggerInterface
+* @return \\Psr\\Log\\LoggerInterface
*/
public static function getInstance( $channel ) {
[MediaWiki-commits] [Gerrit] Log thumbnail access - change (mediawiki/core)
Gilles has uploaded a new change for review.
https://gerrit.wikimedia.org/r/225929
Change subject: Log thumbnail access
..
Log thumbnail access
Bug: T106323
Change-Id: Iddd4201b13a31f441c6d25bcde6564b643cefdb4
---
M includes/filerepo/file/File.php
M thumb.php
2 files changed, 3 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/29/225929/1
diff --git a/includes/filerepo/file/File.php b/includes/filerepo/file/File.php
index f9e1128..59856fd 100644
--- a/includes/filerepo/file/File.php
+++ b/includes/filerepo/file/File.php
@@ -1149,6 +1149,8 @@
Hooks::run( 'FileTransformed', array( $this, $thumb,
$tmpThumbPath, $thumbPath ) );
}
+ wfDebugLog( 'thumbnail', 'Access ' . time() . ' ' . $thumbPath
. ' ' . filesize( $tmpThumbPath ) . ' Generated ' );
+
return $thumb;
}
diff --git a/thumb.php b/thumb.php
index 5c4eea7..99cea5d 100644
--- a/thumb.php
+++ b/thumb.php
@@ -309,6 +309,7 @@
wfThumbError( 500, 'Could not stream the file' );
} else {
RequestContext::getMain()->getStats()->timing(
'media.thumbnail.stream', $streamtime );
+ wfDebugLog( 'thumbnail', 'Access ' . time() . ' ' .
$thumbPath . ' ' . ob_get_length() . ' Streamed ' );
}
return;
}
--
To view, visit https://gerrit.wikimedia.org/r/225929
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iddd4201b13a31f441c6d25bcde6564b643cefdb4
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Gilles
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix typo in pom - change (search/extra)
jenkins-bot has submitted this change and it was merged. Change subject: Fix typo in pom .. Fix typo in pom Change-Id: Ic56d8f9a814d54b0731ee1f142fcea9c7f1e7832 --- M pom.xml 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Tjones: Looks good to me, approved jenkins-bot: Verified diff --git a/pom.xml b/pom.xml index f9767ea..1207cbc 100644 --- a/pom.xml +++ b/pom.xml @@ -48,7 +48,7 @@ - + src/main/resources true -- To view, visit https://gerrit.wikimedia.org/r/225923 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ic56d8f9a814d54b0731ee1f142fcea9c7f1e7832 Gerrit-PatchSet: 1 Gerrit-Project: search/extra Gerrit-Branch: master Gerrit-Owner: Manybubbles Gerrit-Reviewer: DCausse Gerrit-Reviewer: EBernhardson Gerrit-Reviewer: Tjones Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] [WIP] Add option to trust users - change (mediawiki...SmiteSpam)
Polybuildr has uploaded a new change for review.
https://gerrit.wikimedia.org/r/225928
Change subject: [WIP] Add option to trust users
..
[WIP] Add option to trust users
Provide a button in the Special:SmiteSpam interface to allow marking a
user as trusted. Pages created by trusted users do not appear in the
list of pages marked as spam.
Adds an API module "smitespamtrustuser" to allow marking a user as
trusted.
Adds a special page Special:SmiteSpamTrustedUsers to list the trusted
users.
Things missing:
* The "Block" checkbox still remains on trusting a user
* The pages created by a trusted user should be removed from the list
* Special:SmiteSpamTrustedUsers does not have an option to add or remove
trusted users.
* Blocking a user now breaks the UI a little (creator cell gets weird
text)
Change-Id: I4e2e14677f5b02613c2632a2ec9209bd750c8e7a
---
M SmiteSpam.alias.php
A SmiteSpam.hooks.php
M SmiteSpam.php
A SpecialSmiteSpamTrustedUsers.php
A api/SmiteSpamApiTrustUser.php
M autoload.php
M generate-autoloads.php
M includes/SmiteSpamAnalyzer.php
M includes/SmiteSpamWikiPage.php
A smitespam.sql
M static/js/ext.smitespam.js
11 files changed, 214 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/SmiteSpam
refs/changes/28/225928/1
diff --git a/SmiteSpam.alias.php b/SmiteSpam.alias.php
index cbadf13..999ab02 100644
--- a/SmiteSpam.alias.php
+++ b/SmiteSpam.alias.php
@@ -12,4 +12,4 @@
/** English (English) */
$specialPageAliases['en'] = array(
'SmiteSpam' => array( 'SmiteSpam' ),
-);
\ No newline at end of file
+);
diff --git a/SmiteSpam.hooks.php b/SmiteSpam.hooks.php
new file mode 100644
index 000..1129097
--- /dev/null
+++ b/SmiteSpam.hooks.php
@@ -0,0 +1,10 @@
+addExtensionTable( 'trusted_user',
+ __DIR__ . '/smitespam.sql' );
+ return true;
+ }
+}
diff --git a/SmiteSpam.php b/SmiteSpam.php
index 8b5841d..5a63909 100644
--- a/SmiteSpam.php
+++ b/SmiteSpam.php
@@ -20,11 +20,15 @@
$wgMessagesDirs['SmiteSpam'] = "$ssRoot/i18n";
$wgExtensionMessagesFiles['SmiteSpamAlias'] = "$ssRoot/SmiteSpam.alias.php";
$wgSpecialPages['SmiteSpam'] = 'SpecialSmiteSpam';
+$wgSpecialPages['SmiteSpamTrustedUsers'] = 'SpecialSmiteSpamTrustedUsers';
$wgAvailableRights[] = 'smitespam';
$wgGroupPermissions['sysop']['smitespam'] = true;
$wgAPIModules['smitespamanalyze'] = 'SmiteSpamApiQuery';
+$wgAPIModules['smitespamtrustuser'] = 'SmiteSpamApiTrustUser';
+
+$wgHooks['LoadExtensionSchemaUpdates'][] = 'SmiteSpamHooks::createTables';
$wgResourceModules['ext.SmiteSpam.retriever'] = array(
'scripts' => 'js/ext.smitespam.js',
diff --git a/SpecialSmiteSpamTrustedUsers.php b/SpecialSmiteSpamTrustedUsers.php
new file mode 100644
index 000..01c8b54
--- /dev/null
+++ b/SpecialSmiteSpamTrustedUsers.php
@@ -0,0 +1,46 @@
+getOutput();
+ $out->setPageTitle( 'Smite Spam Trusted Users' );
+ $dbr = wfGetDB( DB_SLAVE );
+ $result = $dbr->select(
+ array( 'trusted_user' ),
+ array( 'trusted_user_id', 'trusted_user_timestamp',
'trusted_user_admin_id' )
+ );
+ // TODO i18n
+ $out->addHTML( '' .
+ 'Trusted User' .
+ 'Timestamp' .
+ 'Admin' .
+ ''
+ );
+ foreach ( $result as $row ) {
+ $trustedUser = User::newFromID( $row->trusted_user_id
)->getName();
+ $trustedUserContribsLink = Linker::link(
+ SpecialPage::getTitleFor( 'Contributions',
$trustedUser ),
+ Sanitizer::escapeHtmlAllowEntities(
$trustedUser ),
+ array( 'target' => '_blank' )
+ );
+ $timestamp = wfTimestamp( TS_RFC2822,
$row->trusted_user_timestamp );
+ $admin = User::newFromID( $row->trusted_user_admin_id
)->getName();
+ $adminContribsLink = Linker::link(
+ SpecialPage::getTitleFor( 'Contributions',
$admin ),
+ Sanitizer::escapeHtmlAllowEntities( $admin ),
+ array( 'target' => '_blank' )
+ );
+ $out->addHTML(
+ "$trustedUserContribsLink" .
+ "$timestamp" .
+ "$adminContribsLink"
+ );
+ }
+ $out->addHTML( '' );
+ }
+}
diff --git a/api/SmiteSpamApiTrustUser.php b/api/SmiteSpamApiTrustUser.php
new file mode 100644
index 000..6a05f55
--- /dev/null
+++ b/api/SmiteSpamApiTrustUser.php
@@ -0,0 +1,77 @@
+getUser()->getRights() ) ) {
+ $t
[MediaWiki-commits] [Gerrit] Update installation instructions - change (search/highlighter)
Manybubbles has uploaded a new change for review. https://gerrit.wikimedia.org/r/225927 Change subject: Update installation instructions .. Update installation instructions Change-Id: Ia5805ccca3588035a9a76462fe005bffaaa84e3f --- M README.md 1 file changed, 2 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/search/highlighter refs/changes/27/225927/1 diff --git a/README.md b/README.md index 6dcaa4b..231b910 100644 --- a/README.md +++ b/README.md @@ -34,7 +34,8 @@ | Experimental Highlighter Plugin | ElasticSearch | |-|-| -| 1.6.0, master branch| 1.6.X | +| 1.7.0, master branch| 1.7.X | +| 1.6.0, 1.6 branch | 1.6.X | | 1.5.0 -> 1.5.1, 1.5 branch | 1.5.X | | 1.4.0 -> 1.4.1, 1.4 branch | 1.4.X | | 0.0.11 -> 1.3.0, 1.3 branch | 1.3.X | -- To view, visit https://gerrit.wikimedia.org/r/225927 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ia5805ccca3588035a9a76462fe005bffaaa84e3f Gerrit-PatchSet: 1 Gerrit-Project: search/highlighter Gerrit-Branch: master Gerrit-Owner: Manybubbles ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update installation instructions - change (search/repository-swift)
Manybubbles has uploaded a new change for review. https://gerrit.wikimedia.org/r/225926 Change subject: Update installation instructions .. Update installation instructions Change-Id: I95bb878fbb698f2f1ef31eeb1a404925d0acd750 --- M README.md 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/search/repository-swift refs/changes/26/225926/1 diff --git a/README.md b/README.md index b6e9630..5266678 100644 --- a/README.md +++ b/README.md @@ -9,6 +9,7 @@ | 0.6 | 1.3.2 | 2014-08-20 | | 0.7 | 1.4.0 | 2014-11-07 | | 1.6.0 | 1.6.0 | 2015-06-09 | +| 1.7.0 | 1.7.0 | 2015-07-20 | Versions 0.4, 0.6, 0.7, and 1.6.0 should be used. The in-between releases were buggy and are not recommended. -- To view, visit https://gerrit.wikimedia.org/r/225926 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I95bb878fbb698f2f1ef31eeb1a404925d0acd750 Gerrit-PatchSet: 1 Gerrit-Project: search/repository-swift Gerrit-Branch: master Gerrit-Owner: Manybubbles ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Refine design of search bar language selection button - change (apps...wikipedia)
jenkins-bot has submitted this change and it was merged.
Change subject: Refine design of search bar language selection button
..
Refine design of search bar language selection button
Adjust size, make background solid grey, enlarge clickable area.
Bug: T73136
Change-Id: Ic016c5d67130d1636a5948df0bfc85709c4aef70
---
M wikipedia/res/drawable/lang_button_shape.xml
M wikipedia/res/layout/activity_page.xml
M wikipedia/src/main/java/org/wikipedia/search/SearchArticlesFragment.java
3 files changed, 51 insertions(+), 27 deletions(-)
Approvals:
BearND: Looks good to me, approved
Niedzielski: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/wikipedia/res/drawable/lang_button_shape.xml
b/wikipedia/res/drawable/lang_button_shape.xml
index 25016b6..af45ea7 100644
--- a/wikipedia/res/drawable/lang_button_shape.xml
+++ b/wikipedia/res/drawable/lang_button_shape.xml
@@ -3,10 +3,9 @@
android:shape="rectangle" >
+android:radius="2dp" />
-
+
\ No newline at end of file
diff --git a/wikipedia/res/layout/activity_page.xml
b/wikipedia/res/layout/activity_page.xml
index 1d928fe..303b41f 100644
--- a/wikipedia/res/layout/activity_page.xml
+++ b/wikipedia/res/layout/activity_page.xml
@@ -117,14 +117,26 @@
android:inputType="text"
android:imeOptions="actionGo|flagNoExtractUi"
app:cabEnabled="false" />
-
+
+
+
diff --git
a/wikipedia/src/main/java/org/wikipedia/search/SearchArticlesFragment.java
b/wikipedia/src/main/java/org/wikipedia/search/SearchArticlesFragment.java
index 079ce48..1c59c4f 100644
--- a/wikipedia/src/main/java/org/wikipedia/search/SearchArticlesFragment.java
+++ b/wikipedia/src/main/java/org/wikipedia/search/SearchArticlesFragment.java
@@ -29,6 +29,7 @@
import android.view.ViewGroup;
import android.widget.Button;
import android.widget.EditText;
+import android.widget.FrameLayout;
import android.widget.LinearLayout;
import android.widget.TextView;
@@ -44,6 +45,7 @@
private EditText searchEditText;
private SearchFunnel funnel;
private Button langButton;
+private FrameLayout langButtonContainer;
public SearchFunnel getFunnel() {
return funnel;
@@ -286,6 +288,7 @@
LinearLayout enabledSearchBar = (LinearLayout)
getActivity().findViewById(R.id.search_bar_enabled);
TextView searchButton = (TextView)
getActivity().findViewById(R.id.main_search_bar_text);
langButton = (Button)
getActivity().findViewById(R.id.search_lang_button);
+langButtonContainer = (FrameLayout)
getActivity().findViewById(R.id.search_lang_button_container);
if (enabled) {
// set up the language picker
@@ -293,19 +296,14 @@
formatLangButtonText();
langButton.setOnClickListener(new View.OnClickListener() {
@Override
-public void onClick(View view) {
-LanguagePreferenceDialog langPrefDialog = new
LanguagePreferenceDialog(getActivity(), true);
-langPrefDialog.setOnDismissListener(new
DialogInterface.OnDismissListener() {
-@Override
-public void onDismiss(DialogInterface dialog) {
-
langButton.setText(app.getAppOrSystemLanguageCode());
-formatLangButtonText();
-if (!TextUtils.isEmpty(lastSearchedText)) {
-startSearch(lastSearchedText, true);
-}
-}
-});
-langPrefDialog.show();
+public void onClick(View v) {
+showLangPreferenceDialog();
+}
+});
+langButtonContainer.setOnClickListener(new View.OnClickListener() {
+@Override
+public void onClick(View v) {
+showLangPreferenceDialog();
}
});
@@ -454,8 +452,8 @@
final int langButtonTextMaxLength = 7;
// These values represent scaled pixels (sp)
-final int langButtonTextSizeSmaller = 10;
-final int langButtonTextSizeLarger = 12;
+final int langButtonTextSizeSmaller = 11;
+final int langButtonTextSizeLarger = 13;
String langCode = app.getAppOrSystemLanguageCode();
if (langCode.length() > langCodeStandardLength) {
@@ -467,4 +465,19 @@
}
langButton.setTextSize(langButtonTextSizeLarger);
}
+
+public void showLangPreferenceDialog() {
+Lan
[MediaWiki-commits] [Gerrit] Update installation instructions for new branch - change (search/extra)
Manybubbles has uploaded a new change for review. https://gerrit.wikimedia.org/r/225925 Change subject: Update installation instructions for new branch .. Update installation instructions for new branch Change-Id: I555a30fcb36146c65d9441ab4c0bb19b371d6c8b --- M README.md 1 file changed, 7 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/search/extra refs/changes/25/225925/1 diff --git a/README.md b/README.md index b6e56b1..f036ea9 100644 --- a/README.md +++ b/README.md @@ -34,12 +34,18 @@ | Extra Queries and Filters Plugin | ElasticSearch | |--|-| -| 1.6.0, master branch | 1.6.X | +| 1.7.0, master branch | 1.7.X | +| 1.6.0, 1.6 branch| 1.6.X | | 1.5.0, 1.5 branch| 1.5.X | | 1.4.0 -> 1.4.1, 1.4 branch | 1.4.X | | 1.3.0 -> 1.3.1, 1.3 branch | 1.3.4 -> 1.3.X | | 0.0.1 -> 0.0.2 | 1.3.2 -> 1.3.3 | +Install it like so for Elasticsearch 1.7.x: +```bash +./bin/plugin --install org.wikimedia.search/extra/1.7.0 +``` + Install it like so for Elasticsearch 1.6.x: ```bash ./bin/plugin --install org.wikimedia.search/extra/1.6.0 -- To view, visit https://gerrit.wikimedia.org/r/225925 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I555a30fcb36146c65d9441ab4c0bb19b371d6c8b Gerrit-PatchSet: 1 Gerrit-Project: search/extra Gerrit-Branch: master Gerrit-Owner: Manybubbles ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] POC: Load a service worker on mobile - change (mediawiki...MobileFrontend)
Jdlrobson has uploaded a new change for review.
https://gerrit.wikimedia.org/r/225924
Change subject: POC: Load a service worker on mobile
..
POC: Load a service worker on mobile
This installs a service worker that hijacks any page with
the string 'html' in the title
e.g. http://localhost:/w/index.php/Page.html
I did this to highlight possible changes needed in RL and given service
worker doesn't have access to same environment as non-service worker what
we need to think about.
Change-Id: I2b9d43de62035363143b154244090380ee5fdad2
---
M includes/Resources.php
A resources/mobile.serviceWorker/worker.js
M resources/mobile.startup/init.js
3 files changed, 51 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend
refs/changes/24/225924/1
diff --git a/includes/Resources.php b/includes/Resources.php
index 7e9da29..1fd1fe0 100644
--- a/includes/Resources.php
+++ b/includes/Resources.php
@@ -262,6 +262,11 @@
);
$wgResourceModules = array_merge( $wgResourceModules, array(
+ 'mobile.serviceWorker' => $wgMFResourceFileModuleBoilerplate + array(
+ 'scripts' => array(
+ 'resources/mobile.serviceWorker/worker.js',
+ ),
+ ),
'mobile.modules' => $wgMFResourceFileModuleBoilerplate + array(
'scripts' => array(
'resources/mobile.modules/modules.js',
diff --git a/resources/mobile.serviceWorker/worker.js
b/resources/mobile.serviceWorker/worker.js
new file mode 100644
index 000..5947623
--- /dev/null
+++ b/resources/mobile.serviceWorker/worker.js
@@ -0,0 +1,40 @@
+// How to access mw.config and the templates?
+
+// The SW will be shutdown when not in use to save memory,
+// be aware that any global state is likely to disappear
+console.log("SW startup");
+
+// Workaround ResourceLoader
+var mw = { loader: { state: function() {} } };
+var staticCacheName = 'wiki-wiki-wiki';
+
+self.addEventListener('install', function(event) {
+ console.log("SW installed");
+});
+
+self.oninstall = function(event) {
+ self.skipWaiting();
+
+ event.waitUntil(
+caches.open(staticCacheName).then(function(cache) {
+ return cache.addAll([
+'./'
+ ]);
+})
+ );
+};
+
+self.addEventListener('activate', function(event) {
+ console.log("SW activated");
+});
+
+self.addEventListener('fetch', function(event) {
+ var requestURL = new URL(event.request.url);
+ console.log('fetchz');
+ //new RegExp(mw.config.values.wgScript)
+ console.log( /html/.test( requestURL.pathname ), requestURL.pathname );
+ if(/html/.test( requestURL.pathname ) ) {
+ event.respondWith(new Response("this page has been hijacked by
the service worker!"));
+ }
+});
+
diff --git a/resources/mobile.startup/init.js b/resources/mobile.startup/init.js
index ad028fd..bbe3e0d 100644
--- a/resources/mobile.startup/init.js
+++ b/resources/mobile.startup/init.js
@@ -113,4 +113,10 @@
M.require( 'Schema' ).flushBeacon();
} );
+ navigator.serviceWorker.register( mw.config.get( 'wgLoadScript' ) +
'?modules=mobile.serviceWorker&only=scripts&target=mobile' ).then(function(reg)
{
+ console.log('win', reg);
+ }, function(err,z) {
+ console.log('bad', err,z);
+ });
+
}( mw.mobileFrontend, jQuery ) );
--
To view, visit https://gerrit.wikimedia.org/r/225924
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I2b9d43de62035363143b154244090380ee5fdad2
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix typo in pom - change (search/extra)
Manybubbles has uploaded a new change for review. https://gerrit.wikimedia.org/r/225923 Change subject: Fix typo in pom .. Fix typo in pom Change-Id: Ic56d8f9a814d54b0731ee1f142fcea9c7f1e7832 --- M pom.xml 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/search/extra refs/changes/23/225923/1 diff --git a/pom.xml b/pom.xml index f9767ea..1207cbc 100644 --- a/pom.xml +++ b/pom.xml @@ -48,7 +48,7 @@ - + src/main/resources true -- To view, visit https://gerrit.wikimedia.org/r/225923 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic56d8f9a814d54b0731ee1f142fcea9c7f1e7832 Gerrit-PatchSet: 1 Gerrit-Project: search/extra Gerrit-Branch: master Gerrit-Owner: Manybubbles ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Only apply indicator circle to first instance of main menu b... - change (mediawiki...MobileFrontend)
Jdlrobson has uploaded a new change for review.
https://gerrit.wikimedia.org/r/225922
Change subject: Only apply indicator circle to first instance of main menu
button
..
Only apply indicator circle to first instance of main menu button
In beta the main menu can be triggered from various places. Only show
the indicator on the first in the DOM, given this should be the first
the user sees when visually scanning.
Bug: T105880
Change-Id: I5eb9080c448243e83792ff124a54c3f07beed8d5
---
M resources/mobile.mainMenu/MainMenu.js
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend
refs/changes/22/225922/1
diff --git a/resources/mobile.mainMenu/MainMenu.js
b/resources/mobile.mainMenu/MainMenu.js
index e28b272..38f8d04 100644
--- a/resources/mobile.mainMenu/MainMenu.js
+++ b/resources/mobile.mainMenu/MainMenu.js
@@ -40,7 +40,7 @@
this._hasNewFeature = true;
}
$( function () {
- var $activator = $( self.activator );
+ var $activator = $( self.activator ).eq( 0 );
$activator.addClass( 'indicator-circle' );
mw.loader.using( 'mobile.contentOverlays'
).done( function () {
$activator.one( 'click', function () {
--
To view, visit https://gerrit.wikimedia.org/r/225922
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I5eb9080c448243e83792ff124a54c3f07beed8d5
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add api featureLog for ungroupedlist param - change (mediawiki...Wikibase)
Addshore has uploaded a new change for review.
https://gerrit.wikimedia.org/r/225921
Change subject: Add api featureLog for ungroupedlist param
..
Add api featureLog for ungroupedlist param
Change-Id: Iea54404ead54051783ee23d0fe042d4226a6790c
---
M repo/includes/api/GetClaims.php
M repo/includes/api/GetEntities.php
2 files changed, 2 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/21/225921/1
diff --git a/repo/includes/api/GetClaims.php b/repo/includes/api/GetClaims.php
index 192ac0d..f3c1fbd 100644
--- a/repo/includes/api/GetClaims.php
+++ b/repo/includes/api/GetClaims.php
@@ -105,6 +105,7 @@
$entity = $entityRevision->getEntity();
if ( $params['ungroupedlist'] ) {
+ $this->logFeatureUsage(
'action=wbgetclaims&ungroupedlist' );
$this->resultBuilder->getOptions()
->setOption(
SerializationOptions::OPT_GROUP_BY_PROPERTIES,
diff --git a/repo/includes/api/GetEntities.php
b/repo/includes/api/GetEntities.php
index 1c5ab79..123038e 100644
--- a/repo/includes/api/GetEntities.php
+++ b/repo/includes/api/GetEntities.php
@@ -308,6 +308,7 @@
$languages = $params['languages'];
}
if ( $params['ungroupedlist'] ) {
+ $this->logFeatureUsage(
'action=wbgetentities&ungroupedlist' );
$options->setOption(
SerializationOptions::OPT_GROUP_BY_PROPERTIES,
array()
--
To view, visit https://gerrit.wikimedia.org/r/225921
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iea54404ead54051783ee23d0fe042d4226a6790c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Addshore
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Localisation updates from https://translatewiki.net. - change (apps...wikipedia)
jenkins-bot has submitted this change and it was merged. Change subject: Localisation updates from https://translatewiki.net. .. Localisation updates from https://translatewiki.net. Change-Id: I51f2d772dcf08d8e695266a673d6916216d09f82 --- M wikipedia/res/values-ca/strings.xml M wikipedia/res/values-ce/strings.xml M wikipedia/res/values-es/strings.xml M wikipedia/res/values-eu/strings.xml M wikipedia/res/values-fa/strings.xml M wikipedia/res/values-fi/strings.xml M wikipedia/res/values-it/strings.xml M wikipedia/res/values-kn/strings.xml M wikipedia/res/values-ko/strings.xml M wikipedia/res/values-lb/strings.xml M wikipedia/res/values-mr/strings.xml M wikipedia/res/values-nl/strings.xml M wikipedia/res/values-pt/strings.xml M wikipedia/res/values-th/strings.xml M wikipedia/res/values-vi/strings.xml 15 files changed, 119 insertions(+), 47 deletions(-) Approvals: BearND: Looks good to me, approved jenkins-bot: Verified diff --git a/wikipedia/res/values-ca/strings.xml b/wikipedia/res/values-ca/strings.xml index 31d7549..190fcc7 100644 --- a/wikipedia/res/values-ca/strings.xml +++ b/wikipedia/res/values-ca/strings.xml @@ -264,6 +264,9 @@ Fair use (ús raonable) Carregador no conegut No s\'ha pogut desar l\'edició: %s + Mantén premut qualsevol part del text per a ressaltar-lo per copiar i compartir. + Després de destacar un fet interessant, proveu de compartir-lo en les vostres xarxes preferides! + Visualitza la pàgina en el navegador Mira la taula de continguts en qualsevol moment tocant aquest botó, o arrossegant des de la part dreta de la pantalla El servidor no pot completar la petició. La resposta del servidor no s\'ha formatat correctament. diff --git a/wikipedia/res/values-ce/strings.xml b/wikipedia/res/values-ce/strings.xml index 90c2489..954c605 100644 --- a/wikipedia/res/values-ce/strings.xml +++ b/wikipedia/res/values-ce/strings.xml @@ -104,7 +104,7 @@ Карлаяккха агӀо АгӀонгахь хаатарш АгӀонгахь хаатарш - Кечяр а шрифт а хийцар + Кечяр а, шрифт а хийцар Шрифтан барам Кечяр Сирла diff --git a/wikipedia/res/values-es/strings.xml b/wikipedia/res/values-es/strings.xml index 5df5e4f..56ba12d 100644 --- a/wikipedia/res/values-es/strings.xml +++ b/wikipedia/res/values-es/strings.xml @@ -76,9 +76,9 @@ Permanecer Tabla de contenidos No se encontraron resultados - Para ayudar a proteger contra el spam automatizado, por favor introduce las palabras que aparecen abajo + Para ayudar a proteger contra el spam automatizado, escribe las palabras que aparecen abajo Repetir las palabras de arriba - Introducir captcha + Escribe el CAPTCHA Toca el CAPTCHA para recargar Está página guardada puede estar obsoleta, y debe ser actualizada para habilitar la edición. ¿Quieres actualizar la página? Acceder diff --git a/wikipedia/res/values-eu/strings.xml b/wikipedia/res/values-eu/strings.xml index faa2948..7d47d71 100644 --- a/wikipedia/res/values-eu/strings.xml +++ b/wikipedia/res/values-eu/strings.xml @@ -10,7 +10,7 @@ Zer egiten ari zinen hutsegitea gertatu zenean? Bilatu Wikipedian Historia - Ezin izan da sarearekin konektatu :( + Ezin izan da sarearekin konektatu :( Errorea. Saiatu berriro. Arazo bat egon da zure eskaera kudeatzean. Zerbitzariaren egoera-kodea ez dago eskuragarri. @@ -157,6 +157,7 @@ Igoera amaitua Orrialdea gordeta Orrialdea eguneratu + Letra eta gaia Letra-tamaina Argia Iluna diff --git a/wikipedia/res/values-fa/strings.xml b/wikipedia/res/values-fa/strings.xml index 1536b84..57064c6 100644 --- a/wikipedia/res/values-fa/strings.xml +++ b/wikipedia/res/values-fa/strings.xml @@ -277,7 +277,7 @@ ذخیره برای بعد هر جایی از متن را برای پررنگ شدن و کپی و اشتراک میتوانید با فشاردادن و نگهداشتن انتخاب کنید. بعد از پررنگ کردن مطلب مورد نظرتان، می توانید آن را در شبکه مطلوبتان به اشتراک بگذارید. - دیدن در مرورگر + دیدن صفحه در مرورگر با فشردن این دکمه جدول محتویات را هر زمانی که خواستید مشاهده کنید یا از سمت راست پنجره برگ بزنید. سرور امکان کامل کردن درخواست شما را ندارد. پاسخ سرور به درستی تنظیم نشدهاست. diff --git a/wikipedia/res/values-fi/strings.xml b/wikipedia/res/values-fi/strings.xml index b21b0ab..86ac168 100644 --- a/wikipedia/res/values-fi/strings.xml +++ b/wikipedia/res/values-fi/strings.xml @@ -10,7 +10,7 @@ Mitä olit tekemässä kaatumishetkellä? Wikipedia-haku Historia - Verkkoyhteyttä ei ole :( + Verkkoyhteyttä ei voitu muodostaa. Verkkovirhe. Yritä uudelleen. Pyyntöäsi käsiteltäessä ilmeni ongelma. Palvelimen tilakoodi ei ole saatavilla. @@ -273,4 +273,13 @@ Avaa linkki Avaa uudessa välilehdessä Tallenna myöhemmäksi + Paina ja pidä painettuna mitä tahansa tekstin osaa korostaaksesi sen kopioimista ja jakamista varten. + Korostettuasi mielenkiintoisen faktan, kokeile jakaa se suosikkiverkostoissasi! + Tarkastele sivua selaimessa +
[MediaWiki-commits] [Gerrit] Localisation updates from https://translatewiki.net. - change (apps...wikipedia)
BearND has uploaded a new change for review. https://gerrit.wikimedia.org/r/225920 Change subject: Localisation updates from https://translatewiki.net. .. Localisation updates from https://translatewiki.net. Change-Id: Iaf4ade0ceb322f5f468bad12ddd70abda74e3054 --- M Wikipedia/azb.lproj/Localizable.strings M Wikipedia/azb.lproj/Main_iPhone.strings M Wikipedia/bn.lproj/Localizable.strings M Wikipedia/bn.lproj/Main_iPhone.strings A Wikipedia/eu.lproj/Localizable.strings A Wikipedia/hy.lproj/Localizable.strings M Wikipedia/hy.lproj/Main_iPhone.strings M Wikipedia/ja.lproj/Localizable.strings M Wikipedia/nl.lproj/Localizable.strings M Wikipedia/vi.lproj/Localizable.strings 10 files changed, 372 insertions(+), 15 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/apps/ios/wikipedia refs/changes/20/225920/1 diff --git a/Wikipedia/azb.lproj/Localizable.strings b/Wikipedia/azb.lproj/Localizable.strings index c34ec8f..50b0e1f 100644 --- a/Wikipedia/azb.lproj/Localizable.strings +++ b/Wikipedia/azb.lproj/Localizable.strings @@ -21,7 +21,7 @@ "account-creation-login" = "اؤنجهدن حسابینیز وارمی؟ گیرینیز."; "account-creation-username-placeholder-text" = "ایشلدن آدی"; "account-creation-password-placeholder-text" = "رمز"; -"login-user-blocked" = "ایستیفادهچی باغلانیب."; +"login-user-blocked" = "ایشلدن باغلانیب."; "login-username-placeholder-text" = "ایشلدن آدی"; "login-password-placeholder-text" = "رمز"; "wikitext-upload-save" = "ساخلانیلیر..."; @@ -59,7 +59,7 @@ "main-menu-show-today" = "بوگون"; "main-menu-nearby" = "یاخیندا"; "main-menu-more" = "داها..."; -"saved-pages-title" = "ساخلانیلمیش صحیفهلر"; +"saved-pages-title" = "ساخلانیلمیش صفحهلر"; "saved-pages-clear-cancel" = "پوْز"; // Fuzzy "saved-pages-clear-delete-all" = "هامیسین سیل"; @@ -84,7 +84,7 @@ "about-wikipedia" = "ویکیپدیا"; "about-contributors" = "چالیشقانلار"; "about-translators" = "چئویریجیلر"; -"share-menu-save-page" = "صحیفهنی ساخلا"; +"share-menu-save-page" = "صفحهنی ساخلا"; "timestamp-just-now" = "ایندی"; "timestamp-minutes" = "d% دقیقه قاباق"; "timestamp-hours" = "d% ساعات قاباق"; diff --git a/Wikipedia/azb.lproj/Main_iPhone.strings b/Wikipedia/azb.lproj/Main_iPhone.strings index ce4da2c..9bf7e2f 100644 --- a/Wikipedia/azb.lproj/Main_iPhone.strings +++ b/Wikipedia/azb.lproj/Main_iPhone.strings @@ -1,9 +1,10 @@ // Messages for South Azerbaijani (تۆرکجه) // Exported from translatewiki.net // Author: Arjanizary +// Author: Koroğlu "21c-U6-yfo.normalTitle" = "آیری کپچا کودو گؤستر"; -"5cT-2Y-0Ie.placeholder" = "ایستیفادهچی آدی"; +"5cT-2Y-0Ie.placeholder" = "ایشلدن آدی"; "LfM-01-aCF.text" = "اؤنگؤستریش"; "P6J-IE-CiO.text" = "آتلا"; "PCr-0J-fBj.placeholder" = "رمز"; @@ -16,6 +17,6 @@ "heA-3K-nhS.text" = "اؤنجهدن حسابینیز وارمی؟ گیرینیز"; "jiW-Cg-oL3.text" = "حساب یارات"; "kVb-lx-d6C.placeholder" = "رمز"; -"mAk-1N-jPC.placeholder" = "ایستیفادهچی آدی"; +"mAk-1N-jPC.placeholder" = "ایشلدن آدی"; "rKI-nq-3p7.placeholder" = "ایمئیل آدرئسی (ایستگه باغلی)"; "wkl-j8-wLX.text" = "حساب یارات"; diff --git a/Wikipedia/bn.lproj/Localizable.strings b/Wikipedia/bn.lproj/Localizable.strings index 896bfab..0d44e24 100644 --- a/Wikipedia/bn.lproj/Localizable.strings +++ b/Wikipedia/bn.lproj/Localizable.strings @@ -2,18 +2,26 @@ // Exported from translatewiki.net // Author: Aftab1995 // Author: Aftabuzzaman +// Author: Sayma Jahan // Author: Tauhid16 +"languages-title" = "ভাষা"; "article-languages-label" = "ভাষা নির্বাচন করুন"; "article-languages-cancel" = "বাতিল"; "article-languages-downloading" = "নিবন্ধের ভাষাসমূহ লোড হচ্ছে..."; "article-languages-filter-placeholder" = "ভাষা ছাকনী"; +"article-read-more-title" = "আরো পড়ুন"; +"article-unable-to-load-section" = "এই অনুচ্ছেদ পূরণ করতে অসমর্থ। যদি এই সমস্যা সমাধান হয়ে থাকে তাহলে নিবন্ধটি দেখার জন্য পুনরায় সতেজ করুন।"; +"article-unable-to-load-article" = "নিবন্ধ লোড করতে অসমর্থ।"; +"info-box-title" = "দ্রুত কার্য"; +"info-box-close-text" = "বন্ধ"; "table-title-other" = "আরও তথ্য"; "history-label" = "সাম্প্রতিক"; "history-section-today" = "আজ"; "history-section-yesterday" = "গতকাল"; "history-section-lastweek" = "গত সপ্তাহ"; "history-section-lastmonth" = "গত মাস"; +"history-clear-confirmation-heading" = "সাম্প্রতিক সব আইটেম মুছে ফেলবেন?"; "history-clear-cancel" = "বাতিল"; "history-clear-delete-all" = "সব মুছে ফেলুন"; "zero-free-verbiage" = "মোবাইল অপারেটরদের সৌজন্যে বিনামূল্যে উইকিপিডয়া (ডাটা চার্জ প্রযোজ্য নয়)"; @@ -39,6 +47,7 @@ "account-creation-password-placeholder-text" = "পাসওয়ার্ড"; "account-creation-password-confirm-placeholder-text" = "পাসওয়ার্ড নিশ্চিত করুন"; "account-creation-email-placeholder-text" = "ইমেইল (ঐচ্ছিক)"; +"account-creation-missing-fields" = "একাউন্ট তৈরি করার জন্য আপনাকে অবশ্যই একটি ব্যবহারকারী নাম, পাসওয়ার্ড, এবং পাসওয়ার্ড নিশ্চিতকরণ দিতে হবে।"; "login-name-not-found" = "প্রবেশ করার জন্য ব্যবহারকারী নাম প্রয়োজন।"; "login-name-illegal" = "আপ
[MediaWiki-commits] [Gerrit] Localisation updates from https://translatewiki.net. - change (apps...wikipedia)
BearND has uploaded a new change for review. https://gerrit.wikimedia.org/r/225919 Change subject: Localisation updates from https://translatewiki.net. .. Localisation updates from https://translatewiki.net. Change-Id: I51f2d772dcf08d8e695266a673d6916216d09f82 --- M wikipedia/res/values-ca/strings.xml M wikipedia/res/values-ce/strings.xml M wikipedia/res/values-es/strings.xml M wikipedia/res/values-eu/strings.xml M wikipedia/res/values-fa/strings.xml M wikipedia/res/values-fi/strings.xml M wikipedia/res/values-it/strings.xml M wikipedia/res/values-kn/strings.xml M wikipedia/res/values-ko/strings.xml M wikipedia/res/values-lb/strings.xml M wikipedia/res/values-mr/strings.xml M wikipedia/res/values-nl/strings.xml M wikipedia/res/values-pt/strings.xml M wikipedia/res/values-th/strings.xml M wikipedia/res/values-vi/strings.xml 15 files changed, 119 insertions(+), 47 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia refs/changes/19/225919/1 diff --git a/wikipedia/res/values-ca/strings.xml b/wikipedia/res/values-ca/strings.xml index 31d7549..190fcc7 100644 --- a/wikipedia/res/values-ca/strings.xml +++ b/wikipedia/res/values-ca/strings.xml @@ -264,6 +264,9 @@ Fair use (ús raonable) Carregador no conegut No s\'ha pogut desar l\'edició: %s + Mantén premut qualsevol part del text per a ressaltar-lo per copiar i compartir. + Després de destacar un fet interessant, proveu de compartir-lo en les vostres xarxes preferides! + Visualitza la pàgina en el navegador Mira la taula de continguts en qualsevol moment tocant aquest botó, o arrossegant des de la part dreta de la pantalla El servidor no pot completar la petició. La resposta del servidor no s\'ha formatat correctament. diff --git a/wikipedia/res/values-ce/strings.xml b/wikipedia/res/values-ce/strings.xml index 90c2489..954c605 100644 --- a/wikipedia/res/values-ce/strings.xml +++ b/wikipedia/res/values-ce/strings.xml @@ -104,7 +104,7 @@ Карлаяккха агӀо АгӀонгахь хаатарш АгӀонгахь хаатарш - Кечяр а шрифт а хийцар + Кечяр а, шрифт а хийцар Шрифтан барам Кечяр Сирла diff --git a/wikipedia/res/values-es/strings.xml b/wikipedia/res/values-es/strings.xml index 5df5e4f..56ba12d 100644 --- a/wikipedia/res/values-es/strings.xml +++ b/wikipedia/res/values-es/strings.xml @@ -76,9 +76,9 @@ Permanecer Tabla de contenidos No se encontraron resultados - Para ayudar a proteger contra el spam automatizado, por favor introduce las palabras que aparecen abajo + Para ayudar a proteger contra el spam automatizado, escribe las palabras que aparecen abajo Repetir las palabras de arriba - Introducir captcha + Escribe el CAPTCHA Toca el CAPTCHA para recargar Está página guardada puede estar obsoleta, y debe ser actualizada para habilitar la edición. ¿Quieres actualizar la página? Acceder diff --git a/wikipedia/res/values-eu/strings.xml b/wikipedia/res/values-eu/strings.xml index faa2948..7d47d71 100644 --- a/wikipedia/res/values-eu/strings.xml +++ b/wikipedia/res/values-eu/strings.xml @@ -10,7 +10,7 @@ Zer egiten ari zinen hutsegitea gertatu zenean? Bilatu Wikipedian Historia - Ezin izan da sarearekin konektatu :( + Ezin izan da sarearekin konektatu :( Errorea. Saiatu berriro. Arazo bat egon da zure eskaera kudeatzean. Zerbitzariaren egoera-kodea ez dago eskuragarri. @@ -157,6 +157,7 @@ Igoera amaitua Orrialdea gordeta Orrialdea eguneratu + Letra eta gaia Letra-tamaina Argia Iluna diff --git a/wikipedia/res/values-fa/strings.xml b/wikipedia/res/values-fa/strings.xml index 1536b84..57064c6 100644 --- a/wikipedia/res/values-fa/strings.xml +++ b/wikipedia/res/values-fa/strings.xml @@ -277,7 +277,7 @@ ذخیره برای بعد هر جایی از متن را برای پررنگ شدن و کپی و اشتراک میتوانید با فشاردادن و نگهداشتن انتخاب کنید. بعد از پررنگ کردن مطلب مورد نظرتان، می توانید آن را در شبکه مطلوبتان به اشتراک بگذارید. - دیدن در مرورگر + دیدن صفحه در مرورگر با فشردن این دکمه جدول محتویات را هر زمانی که خواستید مشاهده کنید یا از سمت راست پنجره برگ بزنید. سرور امکان کامل کردن درخواست شما را ندارد. پاسخ سرور به درستی تنظیم نشدهاست. diff --git a/wikipedia/res/values-fi/strings.xml b/wikipedia/res/values-fi/strings.xml index b21b0ab..86ac168 100644 --- a/wikipedia/res/values-fi/strings.xml +++ b/wikipedia/res/values-fi/strings.xml @@ -10,7 +10,7 @@ Mitä olit tekemässä kaatumishetkellä? Wikipedia-haku Historia - Verkkoyhteyttä ei ole :( + Verkkoyhteyttä ei voitu muodostaa. Verkkovirhe. Yritä uudelleen. Pyyntöäsi käsiteltäessä ilmeni ongelma. Palvelimen tilakoodi ei ole saatavilla. @@ -273,4 +273,13 @@ Avaa linkki Avaa uudessa välilehdessä Tallenna myöhemmäksi + Paina ja pidä painettuna mitä tahansa tekstin osaa korostaaksesi sen kopioimista ja jakamista varten. + Korostettuasi mielenkiintoisen faktan, kokeile jakaa se suosikkive
[MediaWiki-commits] [Gerrit] Another improvement to string replacement for multi-inst. te... - change (mediawiki...SemanticForms)
Yaron Koren has submitted this change and it was merged. Change subject: Another improvement to string replacement for multi-inst. templates .. Another improvement to string replacement for multi-inst. templates Change-Id: I9ad1510f0322d71529a71b5a8fac468e259cbcc3 --- M includes/SF_FormPrinter.php 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Yaron Koren: Checked; Looks good to me, approved diff --git a/includes/SF_FormPrinter.php b/includes/SF_FormPrinter.php index 013088c..7a1a242 100644 --- a/includes/SF_FormPrinter.php +++ b/includes/SF_FormPrinter.php @@ -324,7 +324,7 @@ // case- and spacing-insensitive. // Also, keeping the "id=" attribute should not be // necessary; but currently it is, for "show on select". - $section = preg_replace( '/ id="(.*?)" /', ' id="$1" data-origID="$1" ', $section ); + $section = preg_replace( '/ id="(.*?)"/', ' id="$1" data-origID="$1" ', $section ); $text = "\t\t" . Html::rawElement( 'div', array( -- To view, visit https://gerrit.wikimedia.org/r/225918 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I9ad1510f0322d71529a71b5a8fac468e259cbcc3 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/SemanticForms Gerrit-Branch: master Gerrit-Owner: Yaron Koren Gerrit-Reviewer: Yaron Koren Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Another improvement to string replacement for multi-inst. te... - change (mediawiki...SemanticForms)
Yaron Koren has uploaded a new change for review. https://gerrit.wikimedia.org/r/225918 Change subject: Another improvement to string replacement for multi-inst. templates .. Another improvement to string replacement for multi-inst. templates Change-Id: I9ad1510f0322d71529a71b5a8fac468e259cbcc3 --- M includes/SF_FormPrinter.php 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/SemanticForms refs/changes/18/225918/1 diff --git a/includes/SF_FormPrinter.php b/includes/SF_FormPrinter.php index 013088c..7a1a242 100644 --- a/includes/SF_FormPrinter.php +++ b/includes/SF_FormPrinter.php @@ -324,7 +324,7 @@ // case- and spacing-insensitive. // Also, keeping the "id=" attribute should not be // necessary; but currently it is, for "show on select". - $section = preg_replace( '/ id="(.*?)" /', ' id="$1" data-origID="$1" ', $section ); + $section = preg_replace( '/ id="(.*?)"/', ' id="$1" data-origID="$1" ', $section ); $text = "\t\t" . Html::rawElement( 'div', array( -- To view, visit https://gerrit.wikimedia.org/r/225918 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I9ad1510f0322d71529a71b5a8fac468e259cbcc3 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/SemanticForms Gerrit-Branch: master Gerrit-Owner: Yaron Koren ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Hygiene: Update bundle - change (mediawiki...MobileFrontend)
Jdlrobson has uploaded a new change for review. https://gerrit.wikimedia.org/r/225917 Change subject: Hygiene: Update bundle .. Hygiene: Update bundle Update bundle and bundle install with latest version Change-Id: I3a50a8e095ed41bc6a5708669ad4aee62c909002 --- M Gemfile.lock 1 file changed, 10 insertions(+), 10 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend refs/changes/17/225917/1 diff --git a/Gemfile.lock b/Gemfile.lock index 8b16ba3..3b5013c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -2,8 +2,8 @@ remote: https://rubygems.org/ specs: ast (2.0.0) -astrolabe (1.3.0) - parser (>= 2.2.0.pre.3, < 3.0) +astrolabe (1.3.1) + parser (~> 2.2) builder (3.2.2) childprocess (0.5.6) ffi (~> 1.0, >= 1.0.11) @@ -28,7 +28,7 @@ faraday-cookie_jar (0.0.6) faraday (>= 0.7.4) http-cookie (~> 1.0.0) -ffi (1.9.9) +ffi (1.9.10) gherkin (2.12.2) multi_json (~> 1.3) headless (1.0.2) @@ -41,7 +41,7 @@ parallel (~> 0.7.1) rdiscount (~> 2.1.6) rkelly-remix (~> 0.0.4) -json (1.8.2) +json (1.8.3) mediawiki_api (0.4.1) faraday (~> 0.9, >= 0.9.0) faraday-cookie_jar (~> 0.0, >= 0.0.6) @@ -56,7 +56,7 @@ syntax (~> 1.2, >= 1.2.0) thor (~> 0.19, >= 0.19.1) mime-types (2.6.1) -multi_json (1.11.1) +multi_json (1.11.2) multi_test (0.1.2) multipart-post (2.0.0) netrc (0.10.3) @@ -67,9 +67,9 @@ page_navigation (0.9) data_magic (>= 0.14) parallel (0.7.1) -parser (2.2.0.3) +parser (2.2.2.6) ast (>= 1.1, < 3.0) -powerpack (0.1.0) +powerpack (0.1.1) rainbow (2.0.0) rdiscount (2.1.8) rest-client (1.8.0) @@ -79,13 +79,13 @@ rkelly-remix (0.0.7) rspec-expectations (2.99.2) diff-lcs (>= 1.1.3, < 2.0) -rubocop (0.29.1) +rubocop (0.32.1) astrolabe (~> 1.3) - parser (>= 2.2.0.1, < 3.0) + parser (>= 2.2.2.5, < 3.0) powerpack (~> 0.1) rainbow (>= 1.99.1, < 3.0) ruby-progressbar (~> 1.4) -ruby-progressbar (1.7.1) +ruby-progressbar (1.7.5) rubyzip (1.1.7) selenium-webdriver (2.46.2) childprocess (~> 0.5) -- To view, visit https://gerrit.wikimedia.org/r/225917 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I3a50a8e095ed41bc6a5708669ad4aee62c909002 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/MobileFrontend Gerrit-Branch: master Gerrit-Owner: Jdlrobson ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix doc-blocks for some HTMLForm elements - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged.
Change subject: Fix doc-blocks for some HTMLForm elements
..
Fix doc-blocks for some HTMLForm elements
The @return doxygen parameter can take a class with a namespace, but
the \ needs to be escaped with an additional \. "\value" is usually interpreted
as a special command.
Actually with "@return OOUI\Widget", e.g., you'll get this output in your docs:
return OOUI
and an error message in the doxygen generation with something like "unknown
command \Widget".
With "@return OOUI\\Widget" you'll get the expected output:
return OOUI\Widget
without any error message.
Change-Id: I14c4d7521f81ddd8c7b56facc1f0ae34f86b2299
---
M includes/htmlform/HTMLButtonField.php
M includes/htmlform/HTMLCheckField.php
M includes/htmlform/HTMLFormField.php
3 files changed, 3 insertions(+), 3 deletions(-)
Approvals:
Bartosz Dziewoński: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/htmlform/HTMLButtonField.php
b/includes/htmlform/HTMLButtonField.php
index 8d7aec3..b0b08a6 100644
--- a/includes/htmlform/HTMLButtonField.php
+++ b/includes/htmlform/HTMLButtonField.php
@@ -44,7 +44,7 @@
/**
* Get the OOUI widget for this field.
* @param string $value
-* @return OOUI\ButtonInputWidget
+* @return OOUI\\ButtonInputWidget
*/
public function getInputOOUI( $value ) {
return new OOUI\ButtonInputWidget( array(
diff --git a/includes/htmlform/HTMLCheckField.php
b/includes/htmlform/HTMLCheckField.php
index 55312ff..9666c4e 100644
--- a/includes/htmlform/HTMLCheckField.php
+++ b/includes/htmlform/HTMLCheckField.php
@@ -45,7 +45,7 @@
* Get the OOUI version of this field.
* @since 1.26
* @param string $value
-* @return OOUI\CheckboxInputWidget The checkbox widget.
+* @return OOUI\\CheckboxInputWidget The checkbox widget.
*/
public function getInputOOUI( $value ) {
if ( !empty( $this->mParams['invert'] ) ) {
diff --git a/includes/htmlform/HTMLFormField.php
b/includes/htmlform/HTMLFormField.php
index 21526c7..b26b45d 100644
--- a/includes/htmlform/HTMLFormField.php
+++ b/includes/htmlform/HTMLFormField.php
@@ -49,7 +49,7 @@
* Defaults to false, which getOOUI will interpret as "use the HTML
version"
*
* @param string $value
-* @return OOUI\Widget|false
+* @return OOUI\\Widget|false
*/
function getInputOOUI( $value ) {
return false;
--
To view, visit https://gerrit.wikimedia.org/r/225912
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I14c4d7521f81ddd8c7b56facc1f0ae34f86b2299
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Florianschmidtwelzow
Gerrit-Reviewer: Bartosz Dziewoński
Gerrit-Reviewer: Daniel Friesen
Gerrit-Reviewer: Krinkle
Gerrit-Reviewer: Legoktm
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix scrolling of floating ToC button in Gingerbread. - change (apps...wikipedia)
jenkins-bot has submitted this change and it was merged. Change subject: Fix scrolling of floating ToC button in Gingerbread. .. Fix scrolling of floating ToC button in Gingerbread. It seems we were anchoring on the wrong view inside the CoordinatorLayout. Also updated to the latest Appcompat library. Bug: T106197 Change-Id: Ia7678a544c38a778d96fb29ea3d277abaf39a76f --- M wikipedia/build.gradle M wikipedia/res/layout/fragment_page.xml 2 files changed, 3 insertions(+), 3 deletions(-) Approvals: BearND: Looks good to me, approved Niedzielski: Looks good to me, but someone else must approve jenkins-bot: Verified diff --git a/wikipedia/build.gradle b/wikipedia/build.gradle index ca0e8ee..e2141a2 100644 --- a/wikipedia/build.gradle +++ b/wikipedia/build.gradle @@ -113,8 +113,8 @@ // use http://gradleplease.appspot.com/ or http://search.maven.org/. // Debug with ./gradlew -q wikipedia:dependencies --configuration compile -compile 'com.android.support:appcompat-v7:22.2.0' // includes support-v4 -compile 'com.android.support:design:22.2.0' +compile 'com.android.support:appcompat-v7:22.2.1' // includes support-v4 +compile 'com.android.support:design:22.2.1' compile 'com.android.support:percent:22.2.0' compile 'com.squareup.okhttp:okhttp-urlconnection:2.4.0' compile 'com.squareup.okhttp:okhttp:2.4.0' diff --git a/wikipedia/res/layout/fragment_page.xml b/wikipedia/res/layout/fragment_page.xml index f4c8461..ee1c287 100644 --- a/wikipedia/res/layout/fragment_page.xml +++ b/wikipedia/res/layout/fragment_page.xml @@ -180,7 +180,7 @@ app:elevation="4sp" app:borderWidth="0dp" app:backgroundTint="?attr/toc_button_color" -app:layout_anchor="@id/page_web_view" +app:layout_anchor="@id/bottom_content_container" app:layout_anchorGravity="bottom|right|end" /> -- To view, visit https://gerrit.wikimedia.org/r/225670 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ia7678a544c38a778d96fb29ea3d277abaf39a76f Gerrit-PatchSet: 2 Gerrit-Project: apps/android/wikipedia Gerrit-Branch: master Gerrit-Owner: Dbrant Gerrit-Reviewer: BearND Gerrit-Reviewer: Brion VIBBER Gerrit-Reviewer: Dbrant Gerrit-Reviewer: Mholloway Gerrit-Reviewer: Niedzielski Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Hide WMC special pages from the specialpage index - change (mediawiki...MathSearch)
jenkins-bot has submitted this change and it was merged.
Change subject: Hide WMC special pages from the specialpage index
..
Hide WMC special pages from the specialpage index
Change-Id: If7e8dd01802c4d809021fb7247c04357391eb77b
---
M SpecialMathDownloadResult.php
M SpecialUploadResult.php
M includes/special/SpecialDisplayTopics.php
3 files changed, 12 insertions(+), 3 deletions(-)
Approvals:
Whyameri: Looks good to me, but someone else must approve
Physikerwelt: Looks good to me, approved
jenkins-bot: Verified
diff --git a/SpecialMathDownloadResult.php b/SpecialMathDownloadResult.php
index 7485170..ef2a442 100644
--- a/SpecialMathDownloadResult.php
+++ b/SpecialMathDownloadResult.php
@@ -6,7 +6,10 @@
*/
class SpecialMathDownloadResult extends SpecialUploadResult {
public function __construct( $name = 'MathDownload' ) {
- parent::__construct( $name );
+ global $wgMathWmcServer;
+ if ( $wgMathWmcServer ) {
+ parent::__construct( $name );
+ }
}
public static function run2CSV( $runId ){
diff --git a/SpecialUploadResult.php b/SpecialUploadResult.php
index 6f9746e..813999e 100644
--- a/SpecialUploadResult.php
+++ b/SpecialUploadResult.php
@@ -16,7 +16,10 @@
* @param string $name
*/
public function __construct( $name = 'MathUpload' ) {
- parent::__construct( $name );
+ global $wgMathWmcServer;
+ if ( $wgMathWmcServer ) {
+ parent::__construct( $name );
+ }
}
/**
diff --git a/includes/special/SpecialDisplayTopics.php
b/includes/special/SpecialDisplayTopics.php
index dace630..ffe77a8 100644
--- a/includes/special/SpecialDisplayTopics.php
+++ b/includes/special/SpecialDisplayTopics.php
@@ -14,7 +14,10 @@
* @param string $name
*/
public function __construct( $name = 'DisplayTopics' ) {
- parent::__construct( $name );
+ global $wgMathWmcServer;
+ if ( $wgMathWmcServer ) {
+ parent::__construct( $name );
+ }
}
/**
--
To view, visit https://gerrit.wikimedia.org/r/224371
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: If7e8dd01802c4d809021fb7247c04357391eb77b
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/MathSearch
Gerrit-Branch: master
Gerrit-Owner: Physikerwelt
Gerrit-Reviewer: Dyiop
Gerrit-Reviewer: Hcohl
Gerrit-Reviewer: Physikerwelt
Gerrit-Reviewer: Whyameri
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] [maven-release-plugin] prepare for next development iteration - change (search/extra)
Manybubbles has submitted this change and it was merged. Change subject: [maven-release-plugin] prepare for next development iteration .. [maven-release-plugin] prepare for next development iteration Change-Id: Ic4ffeb3f83c8ed81587978eb056cedeaa05cc989 --- M pom.xml 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Manybubbles: Verified; Looks good to me, approved diff --git a/pom.xml b/pom.xml index 20c9f8b..f9767ea 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ org.wikimedia.search extra - 1.7.0 + 1.7.1-SNAPSHOT Extra queries and filters for Elasticsearch. -- To view, visit https://gerrit.wikimedia.org/r/225914 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ic4ffeb3f83c8ed81587978eb056cedeaa05cc989 Gerrit-PatchSet: 1 Gerrit-Project: search/extra Gerrit-Branch: master Gerrit-Owner: Manybubbles Gerrit-Reviewer: Manybubbles Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
