[MediaWiki-commits] [Gerrit] Check for rev_len not rev_sha1 - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged.
Change subject: Check for rev_len not rev_sha1
..
Check for rev_len not rev_sha1
Change-Id: Ida29357d1277ec1ddeada2aaca2d1b889ba742a8
---
M maintenance/populateRevisionLength.php
1 file changed, 2 insertions(+), 2 deletions(-)
Approvals:
Aaron Schulz: Looks good to me, approved
Umherirrender: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/maintenance/populateRevisionLength.php
b/maintenance/populateRevisionLength.php
index 7c529d5..1572869 100644
--- a/maintenance/populateRevisionLength.php
+++ b/maintenance/populateRevisionLength.php
@@ -48,8 +48,8 @@
$db = $this-getDB( DB_MASTER );
if ( !$db-tableExists( 'revision' ) ) {
$this-error( revision table does not exist, true );
- } else if ( !$db-fieldExists( 'revision', 'rev_sha1',
__METHOD__ ) ) {
- $this-output( rev_sha1 column does not exist\n\n,
true );
+ } else if ( !$db-fieldExists( 'revision', 'rev_len',
__METHOD__ ) ) {
+ $this-output( rev_len column does not exist\n\n,
true );
return false;
}
--
To view, visit https://gerrit.wikimedia.org/r/54129
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ida29357d1277ec1ddeada2aaca2d1b889ba742a8
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Reedy re...@wikimedia.org
Gerrit-Reviewer: Aaron Schulz asch...@wikimedia.org
Gerrit-Reviewer: Umherirrender umherirrender_de...@web.de
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 badly broken If4f11ab - change (mediawiki...Translate)
Nikerabbit has uploaded a new change for review.
https://gerrit.wikimedia.org/r/54633
Change subject: Fix badly broken If4f11ab
..
Fix badly broken If4f11ab
Change-Id: I9287b12722b2d8968c174bc7498846675e25bbad
---
M utils/TranslationEditPage.php
1 file changed, 2 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Translate
refs/changes/33/54633/1
diff --git a/utils/TranslationEditPage.php b/utils/TranslationEditPage.php
index 8a3b029..daf1e90 100644
--- a/utils/TranslationEditPage.php
+++ b/utils/TranslationEditPage.php
@@ -89,7 +89,7 @@
$handle = new MessageHandle( $this-getTitle() );
$groupId = MessageIndex::getPrimaryGroupId( $handle );
- $translatio = '';
+ $translation = '';
if ( $groupId ) {
$translation = $helpers-getTranslation();
}
@@ -105,7 +105,7 @@
'dir' = $targetLang-getDir(),
);
- if ( $groupId || !$wgUser-isAllowed( 'translate' ) ) {
+ if ( !$groupId || !$wgUser-isAllowed( 'translate' ) ) {
$textareaParams['readonly'] = 'readonly';
}
--
To view, visit https://gerrit.wikimedia.org/r/54633
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I9287b12722b2d8968c174bc7498846675e25bbad
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Translate
Gerrit-Branch: master
Gerrit-Owner: Nikerabbit niklas.laxst...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix badly broken If4f11ab - change (mediawiki...Translate)
jenkins-bot has submitted this change and it was merged.
Change subject: Fix badly broken If4f11ab
..
Fix badly broken If4f11ab
Change-Id: I9287b12722b2d8968c174bc7498846675e25bbad
---
M utils/TranslationEditPage.php
1 file changed, 2 insertions(+), 2 deletions(-)
Approvals:
Amire80: Looks good to me, approved
jenkins-bot: Verified
diff --git a/utils/TranslationEditPage.php b/utils/TranslationEditPage.php
index 8a3b029..daf1e90 100644
--- a/utils/TranslationEditPage.php
+++ b/utils/TranslationEditPage.php
@@ -89,7 +89,7 @@
$handle = new MessageHandle( $this-getTitle() );
$groupId = MessageIndex::getPrimaryGroupId( $handle );
- $translatio = '';
+ $translation = '';
if ( $groupId ) {
$translation = $helpers-getTranslation();
}
@@ -105,7 +105,7 @@
'dir' = $targetLang-getDir(),
);
- if ( $groupId || !$wgUser-isAllowed( 'translate' ) ) {
+ if ( !$groupId || !$wgUser-isAllowed( 'translate' ) ) {
$textareaParams['readonly'] = 'readonly';
}
--
To view, visit https://gerrit.wikimedia.org/r/54633
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I9287b12722b2d8968c174bc7498846675e25bbad
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Translate
Gerrit-Branch: master
Gerrit-Owner: Nikerabbit niklas.laxst...@gmail.com
Gerrit-Reviewer: Amire80 amir.ahar...@mail.huji.ac.il
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] (bug 46303) Call to a member function getUserCaseDBKey() on ... - change (mediawiki...CentralAuth)
Hoo man has uploaded a new change for review.
https://gerrit.wikimedia.org/r/54634
Change subject: (bug 46303) Call to a member function getUserCaseDBKey() on a
non-object
..
(bug 46303) Call to a member function getUserCaseDBKey() on a non-object
(Untested)
Change-Id: Ie14d06f783619456fd4ce7fa85ab8861d99ffa51
---
M specials/SpecialGlobalUsers.php
1 file changed, 4 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CentralAuth
refs/changes/34/54634/1
diff --git a/specials/SpecialGlobalUsers.php b/specials/SpecialGlobalUsers.php
index 63f7a9e..638ffed 100644
--- a/specials/SpecialGlobalUsers.php
+++ b/specials/SpecialGlobalUsers.php
@@ -20,7 +20,10 @@
}
$rqGroup = $this-getRequest()-getVal( 'group' );
if ( $rqGroup ) {
- $pg-setGroup( Title::newFromText( $rqGroup
)-getUserCaseDBKey() );
+ $groupTitle = Title::newFromText( $rqGroup );
+ if ( $groupTitle ) {
+ $pg-setGroup(
$groupTitle-getUserCaseDBKey() );
+ }
}
$rqUsername = $wgContLang-ucfirst(
$this-getRequest()-getVal( 'username' ) );
--
To view, visit https://gerrit.wikimedia.org/r/54634
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie14d06f783619456fd4ce7fa85ab8861d99ffa51
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CentralAuth
Gerrit-Branch: master
Gerrit-Owner: Hoo man h...@online.de
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] (bug 45084) update beta database automatically - change (integration/jenkins-job-builder-config)
Hashar has uploaded a new change for review. https://gerrit.wikimedia.org/r/54635 Change subject: (bug 45084) update beta database automatically .. (bug 45084) update beta database automatically This create a basic layout to create new jobs for the beta cluster. They should be tied to Jenkins slave 'deployment-bastion' which is provided by the new `beta` default. The job run `mwscript update.php` every hour for the enwiki database. Change-Id: Ib49518068f91232ab074a3bfa8b8a63f6b54dc34 --- A beta.yaml 1 file changed, 45 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/integration/jenkins-job-builder-config refs/changes/35/54635/1 diff --git a/beta.yaml b/beta.yaml new file mode 100644 index 000..a5a0540 --- /dev/null +++ b/beta.yaml @@ -0,0 +1,45 @@ +# Contains any jobs related to the beta cluster. +# +# Beta is a cluster meant to reproduce the production environnement out of +# virtual instances in the Wikimedia labs. We use Jenkins job to maintain +# some recurring tasks such as running the MediaWiki database schema updates. +# +# Jobs should be prefixed with 'beta-' and tied to the 'deployment-bastion' +# host defined in Jenkins. They will run as the `jenkins-deploy` user on that +# instance. To create a new job simply use the provided default which would +# take care of the basic configuration. +# +# Example: +# +# - job: +#name: beta-myawesomeness +#defaults: beta +# + +# Basic valid defaults, making sure we run on the deployment-bastion host +# slave nodes which is in labs. +- defaults: +name: beta +description: | + pJob is managed by a href=https://www.mediawiki.org/wiki/CI/JJB;Jenkins Job Builder/a./p +project-type: freestyle + +node: deployment-bastion + +wrappers: + - timeout: + timeout: 360 + fail: true + - timestamps + - ansicolor + +# Every hour, update the `enwiki` database using update.php. +- job: +name: beta-updatedb-enwiki +defaults: beta + +builders: + - shell: sudo -u mwdeploy mwscript update.php --wiki=enwiki --quick + +triggers: + - timed: '@hourly' -- To view, visit https://gerrit.wikimedia.org/r/54635 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib49518068f91232ab074a3bfa8b8a63f6b54dc34 Gerrit-PatchSet: 1 Gerrit-Project: integration/jenkins-job-builder-config Gerrit-Branch: master Gerrit-Owner: Hashar has...@free.fr ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] (bug 45084) update beta database automatically - change (integration/jenkins-job-builder-config)
Hashar has submitted this change and it was merged. Change subject: (bug 45084) update beta database automatically .. (bug 45084) update beta database automatically This create a basic layout to create new jobs for the beta cluster. They should be tied to Jenkins slave 'deployment-bastion' which is provided by the new `beta` default. The job run `mwscript update.php` every hour for the enwiki database. Change-Id: Ib49518068f91232ab074a3bfa8b8a63f6b54dc34 --- A beta.yaml 1 file changed, 45 insertions(+), 0 deletions(-) Approvals: Hashar: Verified; Looks good to me, approved diff --git a/beta.yaml b/beta.yaml new file mode 100644 index 000..a5a0540 --- /dev/null +++ b/beta.yaml @@ -0,0 +1,45 @@ +# Contains any jobs related to the beta cluster. +# +# Beta is a cluster meant to reproduce the production environnement out of +# virtual instances in the Wikimedia labs. We use Jenkins job to maintain +# some recurring tasks such as running the MediaWiki database schema updates. +# +# Jobs should be prefixed with 'beta-' and tied to the 'deployment-bastion' +# host defined in Jenkins. They will run as the `jenkins-deploy` user on that +# instance. To create a new job simply use the provided default which would +# take care of the basic configuration. +# +# Example: +# +# - job: +#name: beta-myawesomeness +#defaults: beta +# + +# Basic valid defaults, making sure we run on the deployment-bastion host +# slave nodes which is in labs. +- defaults: +name: beta +description: | + pJob is managed by a href=https://www.mediawiki.org/wiki/CI/JJB;Jenkins Job Builder/a./p +project-type: freestyle + +node: deployment-bastion + +wrappers: + - timeout: + timeout: 360 + fail: true + - timestamps + - ansicolor + +# Every hour, update the `enwiki` database using update.php. +- job: +name: beta-updatedb-enwiki +defaults: beta + +builders: + - shell: sudo -u mwdeploy mwscript update.php --wiki=enwiki --quick + +triggers: + - timed: '@hourly' -- To view, visit https://gerrit.wikimedia.org/r/54635 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ib49518068f91232ab074a3bfa8b8a63f6b54dc34 Gerrit-PatchSet: 1 Gerrit-Project: integration/jenkins-job-builder-config Gerrit-Branch: master Gerrit-Owner: Hashar has...@free.fr Gerrit-Reviewer: Hashar has...@free.fr ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Using toggle_reference_section in statements Selenium tests - change (mediawiki...Wikibase)
Henning Snater has uploaded a new change for review. https://gerrit.wikimedia.org/r/54636 Change subject: Using toggle_reference_section in statements Selenium tests .. Using toggle_reference_section in statements Selenium tests The method wait_for_referencesToggle has been removed in a previous change set. It has been replaced by toggle_references_section. Change-Id: Ib6abb24483b70a877be177eab8f0f72ca6e207c4 --- M repo/tests/selenium/statements/statements_deleted_prop_spec.rb 1 file changed, 2 insertions(+), 4 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase refs/changes/36/54636/1 diff --git a/repo/tests/selenium/statements/statements_deleted_prop_spec.rb b/repo/tests/selenium/statements/statements_deleted_prop_spec.rb index f6eab06..1cc767c 100644 --- a/repo/tests/selenium/statements/statements_deleted_prop_spec.rb +++ b/repo/tests/selenium/statements/statements_deleted_prop_spec.rb @@ -103,8 +103,7 @@ ajax_wait page.wbErrorDiv?.should be_true page.cancelStatement -page.referenceHeadingToggleLink -page.wait_for_referencesToggle +page.toggle_reference_section page.reference1Property.should_not == properties_cm[0][label] page.reference1Property.include?(properties_cm[0][id]).should be_true page.reference1Property.include?(Deleted property).should be_true @@ -159,8 +158,7 @@ #ajax_wait #page.wbErrorDiv?.should be_true #page.cancelStatement -page.referenceHeadingToggleLink -page.wait_for_referencesToggle +page.toggle_reference_section page.reference1Property.should_not == properties_item[0][label] page.reference1Property.include?(properties_item[0][id]).should be_true page.reference1Property.include?(Deleted property).should be_true -- To view, visit https://gerrit.wikimedia.org/r/54636 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib6abb24483b70a877be177eab8f0f72ca6e207c4 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Wikibase Gerrit-Branch: master Gerrit-Owner: Henning Snater henning.sna...@wikimedia.de ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Minor comment and license fixes - change (mediawiki...VisualEditor)
Esanders has uploaded a new change for review.
https://gerrit.wikimedia.org/r/54637
Change subject: Minor comment and license fixes
..
Minor comment and license fixes
Change-Id: I7fb632e56291b136e3e7b83ea6335474f1521d05
---
M modules/ve/test/ve.Range.test.js
M modules/ve/test/ve.qunit.js
2 files changed, 8 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor
refs/changes/37/54637/1
diff --git a/modules/ve/test/ve.Range.test.js b/modules/ve/test/ve.Range.test.js
index c65ce51..5a2931e 100644
--- a/modules/ve/test/ve.Range.test.js
+++ b/modules/ve/test/ve.Range.test.js
@@ -1,5 +1,5 @@
/*!
- * VisualEditor Base method tests.
+ * VisualEditor Range tests.
*
* @copyright 2011-2013 VisualEditor Team and others; see AUTHORS.txt
* @license The MIT License (MIT); see LICENSE.txt
diff --git a/modules/ve/test/ve.qunit.js b/modules/ve/test/ve.qunit.js
index 5104ccc..fc75561 100644
--- a/modules/ve/test/ve.qunit.js
+++ b/modules/ve/test/ve.qunit.js
@@ -1,9 +1,15 @@
+/*!
+ * VisualEditor plugin for QUnit.
+ *
+ * @copyright 2011-2013 VisualEditor Team and others; see AUTHORS.txt
+ * @license The MIT License (MIT); see LICENSE.txt
+ */
( function ( QUnit ) {
QUnit.config.requireExpects = true;
/**
- * VisualEditor plugin for QUnit.
+ * Plugin for QUnit.
*
* @class ve.QUnit
* @extends QUnit
--
To view, visit https://gerrit.wikimedia.org/r/54637
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I7fb632e56291b136e3e7b83ea6335474f1521d05
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders esand...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] (bug 46250) Re-focusing entity search box after clicking more - change (mediawiki...Wikibase)
Henning Snater has uploaded a new change for review.
https://gerrit.wikimedia.org/r/54638
Change subject: (bug 46250) Re-focusing entity search box after clicking more
..
(bug 46250) Re-focusing entity search box after clicking more
Change-Id: I0c76a2a87483f742eefd3f12c9602cae0a78dd74
---
M lib/resources/jquery.wikibase/jquery.wikibase.entityselector.js
1 file changed, 2 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/38/54638/1
diff --git a/lib/resources/jquery.wikibase/jquery.wikibase.entityselector.js
b/lib/resources/jquery.wikibase/jquery.wikibase.entityselector.js
index 1856547..34af0a5 100644
--- a/lib/resources/jquery.wikibase/jquery.wikibase.entityselector.js
+++ b/lib/resources/jquery.wikibase/jquery.wikibase.entityselector.js
@@ -569,11 +569,13 @@
* @return {jQuery}
*/
_renderMoreLink: function() {
+ var self = this;
return this._renderCustomListItem( {
content: $( 'span/' ).text(
this.options.messages['more'] ),
action: function( event, entityselector ) {
event.stopImmediatePropagation();
entityselector.more();
+ self.element.focus();
},
cssClass: 'ui-entityselector-more'
} );
--
To view, visit https://gerrit.wikimedia.org/r/54638
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I0c76a2a87483f742eefd3f12c9602cae0a78dd74
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Henning Snater henning.sna...@wikimedia.de
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix H264 video detection now that sources have a type - change (mediawiki...TimedMediaHandler)
J has submitted this change and it was merged. Change subject: Fix H264 video detection now that sources have a type .. Fix H264 video detection now that sources have a type Change-Id: I15c265d5c0a6f8f46584a81e4aec47220f6f7a31 --- M MwEmbedModules/EmbedPlayer/resources/mw.MediaPlayers.js 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: J: Verified; Looks good to me, approved diff --git a/MwEmbedModules/EmbedPlayer/resources/mw.MediaPlayers.js b/MwEmbedModules/EmbedPlayer/resources/mw.MediaPlayers.js index 35f24cb..7d515e9 100644 --- a/MwEmbedModules/EmbedPlayer/resources/mw.MediaPlayers.js +++ b/MwEmbedModules/EmbedPlayer/resources/mw.MediaPlayers.js @@ -40,7 +40,7 @@ this.defaultPlayers['audio/mpeg']= ['Native', 'Kplayer']; this.defaultPlayers['audio/mp3']= ['Native', 'Kplayer']; this.defaultPlayers['audio/mp4']= ['Native']; - this.defaultPlayers['video/mp4'] = ['Vlc']; + this.defaultPlayers['video/mp4'] = ['Native', 'Vlc']; this.defaultPlayers['video/mpeg'] = ['Vlc']; this.defaultPlayers['video/x-msvideo'] = ['Vlc']; -- To view, visit https://gerrit.wikimedia.org/r/53392 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I15c265d5c0a6f8f46584a81e4aec47220f6f7a31 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/TimedMediaHandler Gerrit-Branch: master Gerrit-Owner: J jger...@wikimedia.org Gerrit-Reviewer: J jger...@wikimedia.org Gerrit-Reviewer: Mdale md...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Reduce dialog box size of site link widget - change (mediawiki...Wikibase)
Aude has uploaded a new change for review.
https://gerrit.wikimedia.org/r/54639
Change subject: Reduce dialog box size of site link widget
..
Reduce dialog box size of site link widget
- does not need to be so large, and does not need height specified
Change-Id: Ia919eba0881f991b56792d626b53bda780a9d0c8
---
M client/resources/wbclient.linkItem.js
1 file changed, 2 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/39/54639/1
diff --git a/client/resources/wbclient.linkItem.js
b/client/resources/wbclient.linkItem.js
index 603ecbe..d9e38c1 100644
--- a/client/resources/wbclient.linkItem.js
+++ b/client/resources/wbclient.linkItem.js
@@ -90,8 +90,7 @@
.attr( 'id', 'wbclient-linkItem-dialog' )
.dialog( {
title: mw.message( 'wikibase-linkitem-title'
).escaped(),
- width: 700,
- height: 400,
+ width: 500,
resizable: false,
buttons: [ {
text: mw.message(
'wikibase-linkitem-linkpage' ).escaped(),
@@ -612,7 +611,7 @@
/**
* Called in case an error occurs and displays an error message.
-*
+*
* Can either show a given errorCode (as html) or use data from an
* API failure (pass two parameters in this case).
*
--
To view, visit https://gerrit.wikimedia.org/r/54639
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia919eba0881f991b56792d626b53bda780a9d0c8
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Aude aude.w...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Moved some RedisConnectionPool docs to the factory function. - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged.
Change subject: Moved some RedisConnectionPool docs to the factory function.
..
Moved some RedisConnectionPool docs to the factory function.
Change-Id: I4183b96e123882de604de1484456abcd10091fb2
---
M includes/clientpool/RedisConnectionPool.php
1 file changed, 8 insertions(+), 8 deletions(-)
Approvals:
IAlex: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/clientpool/RedisConnectionPool.php
b/includes/clientpool/RedisConnectionPool.php
index 5c7c4f2..a15e80b 100644
--- a/includes/clientpool/RedisConnectionPool.php
+++ b/includes/clientpool/RedisConnectionPool.php
@@ -55,14 +55,6 @@
const SERVER_DOWN_TTL = 30; // integer; seconds to cache servers as
down
/**
-* $options include:
-* - connectTimeout : The timeout for new connections, in seconds.
-* Optional, default is 1 second.
-* - persistent : Set this to true to allow connections to
persist across
-* multiple web requests. False by default.
-* - password : The authentication password, will be sent to
Redis in clear text.
-* Optional, if it is unspecified, no AUTH command
will be sent.
-* - serializer : Set to php, igbinary, or none. Default is
php.
* @param array $options
*/
protected function __construct( array $options ) {
@@ -103,6 +95,14 @@
/**
* @param $options Array
+* $options include:
+* - connectTimeout : The timeout for new connections, in seconds.
+* Optional, default is 1 second.
+* - persistent : Set this to true to allow connections to
persist across
+* multiple web requests. False by default.
+* - password : The authentication password, will be sent to
Redis in clear text.
+* Optional, if it is unspecified, no AUTH command
will be sent.
+* - serializer : Set to php, igbinary, or none. Default is
php.
* @return RedisConnectionPool
*/
public static function singleton( array $options ) {
--
To view, visit https://gerrit.wikimedia.org/r/54486
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I4183b96e123882de604de1484456abcd10091fb2
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz asch...@wikimedia.org
Gerrit-Reviewer: IAlex ialex.w...@gmail.com
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Create basic tests for AnnotationSet. - change (mediawiki...VisualEditor)
Esanders has uploaded a new change for review.
https://gerrit.wikimedia.org/r/54640
Change subject: Create basic tests for AnnotationSet.
..
Create basic tests for AnnotationSet.
Also covers methods inherited from OrderedHashSet.
Bug: 46320
Change-Id: I632e4cf1b87312179a9ce52df0d590ff42f56325
---
M VisualEditor.hooks.php
M modules/ve/test/index.php
A modules/ve/test/ve.AnnotationSet.test.js
3 files changed, 66 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor
refs/changes/40/54640/1
diff --git a/VisualEditor.hooks.php b/VisualEditor.hooks.php
index 5b5a3d8..b5042e8 100644
--- a/VisualEditor.hooks.php
+++ b/VisualEditor.hooks.php
@@ -78,6 +78,7 @@
've.example.js',
've.Document.test.js',
've.Node.test.js',
+ 've.AnnotationSet.test.js',
've.BranchNode.test.js',
've.LeafNode.test.js',
've.Factory.test.js',
diff --git a/modules/ve/test/index.php b/modules/ve/test/index.php
index bb1c1f0..37c99f6 100644
--- a/modules/ve/test/index.php
+++ b/modules/ve/test/index.php
@@ -195,6 +195,7 @@
script src=ve.Trigger.test.js/script
script src=ve.Document.test.js/script
script src=ve.Node.test.js/script
+ script src=ve.AnnotationSet.test.js/script
script src=ve.BranchNode.test.js/script
script src=ve.LeafNode.test.js/script
script src=ve.Factory.test.js/script
diff --git a/modules/ve/test/ve.AnnotationSet.test.js
b/modules/ve/test/ve.AnnotationSet.test.js
new file mode 100644
index 000..bdf45c1
--- /dev/null
+++ b/modules/ve/test/ve.AnnotationSet.test.js
@@ -0,0 +1,64 @@
+/*!
+ * VisualEditor AnnotationSet tests.
+ *
+ * @copyright 2011-2013 VisualEditor Team and others; see AUTHORS.txt
+ * @license The MIT License (MIT); see LICENSE.txt
+ */
+
+QUnit.module( 've.AnnotationSet' );
+
+/* Tests */
+
+QUnit.test( 'Basic usage', 26, function ( assert ) {
+ var annotationSet3,
+ bold = new ve.dm.TextStyleBoldAnnotation(),
+ italic = new ve.dm.TextStyleItalicAnnotation(),
+ underline = new ve.dm.TextStyleUnderlineAnnotation(),
+ annotationSet = new ve.AnnotationSet( [ bold, italic ] ),
+ annotationSet2 = new ve.AnnotationSet( [ italic, underline ] ),
+ emptySet = new ve.AnnotationSet();
+
+ assert.equal( annotationSet.getLength(), 2, 'getLength is 2' );
+ assert.equal( annotationSet.isEmpty(), false, 'isEmpty is false' );
+ assert.equal( annotationSet.get( 0 ), bold, 'get(0) is bold' );
+ assert.equal( annotationSet.contains( italic ), true, 'contains italic'
);
+ assert.equal( annotationSet.contains( underline ), false, 'doesn\'t
contain underline' );
+ assert.equal( annotationSet.containsAnyOf( annotationSet2 ), true,
'containsAnyOf set2 is true' );
+ assert.equal( annotationSet.containsAnyOf( emptySet ), false,
'containsAnyOf empty set is false' );
+ assert.equal( annotationSet.containsAllOf( annotationSet2 ), false,
'containsAllOf set2 set is false' );
+ assert.equal( annotationSet.containsAllOf( annotationSet ), true,
'containsAllOf slef is true' );
+ assert.equal( annotationSet.indexOf( italic ), 1, 'indexOf italic is 1'
);
+ assert.equal( annotationSet.hasAnnotationWithName( 'textStyle/bold' ),
true, 'hasAnnotationWithName textStyle/bold is true' );
+ assert.equal( annotationSet.hasAnnotationWithName(
'textStyle/underline' ), false, 'hasAnnotationWithName underline is false' );
+
+ annotationSet2.add( bold, 1 );
+ assert.equal( annotationSet2.indexOf( bold ), 1, 'set2 contains bold at
1 after add at 1' );
+ annotationSet2.remove( bold );
+ assert.equal( annotationSet2.contains( bold ), false, 'set2 doesn\'t
contain bold after remove' );
+ annotationSet2.add( bold, 0 );
+ assert.equal( annotationSet2.indexOf( bold ), 0, 'set2 contains bold at
0 after add at 0' );
+ // set is now [ bold, italic, underline ]
+ annotationSet2.removeAt( 2 );
+ assert.equal( annotationSet2.contains( underline ), false, 'set2
doesn\'t contain underline after removeAt 2' );
+ annotationSet2.removeAll();
+ assert.equal( annotationSet2.isEmpty(), true, 'set2 is empty after
removeAll' );
+ annotationSet2.addSet( annotationSet );
+ assert.equal( annotationSet.getLength(), 2, 'set2 has length 2 after
addSet' );
+ annotationSet2.removeSet( annotationSet );
+ assert.equal( annotationSet2.isEmpty(), true, 'set2 is empty after
removeSet' );
+
+ annotationSet2 = new ve.AnnotationSet( [ italic, underline ] );
+
[MediaWiki-commits] [Gerrit] Replace wmf favicon for blog - change (wikimedia...WP-Victor)
Jalexander has submitted this change and it was merged. Change subject: Replace wmf favicon for blog .. Replace wmf favicon for blog Bug: 46256 Change-Id: I898a1a475909c93c8bab401ac611814b24b6a631 --- M favicon.ico 1 file changed, 0 insertions(+), 0 deletions(-) Approvals: Demon: Looks good to me, but someone else must approve Jalexander: Verified; Looks good to me, approved diff --git a/favicon.ico b/favicon.ico index 81b8096..bde61ef 100644 --- a/favicon.ico +++ b/favicon.ico Binary files differ -- To view, visit https://gerrit.wikimedia.org/r/54488 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I898a1a475909c93c8bab401ac611814b24b6a631 Gerrit-PatchSet: 2 Gerrit-Project: wikimedia/communications/WP-Victor Gerrit-Branch: master Gerrit-Owner: Jalexander jalexan...@wikimedia.org Gerrit-Reviewer: Demon ch...@wikimedia.org Gerrit-Reviewer: Guillom gpaum...@wikimedia.org Gerrit-Reviewer: Jalexander jalexan...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Left-pad legacy aft_id values with null-bytes, instead of ri... - change (mediawiki...ArticleFeedbackv5)
Matthias Mullie has uploaded a new change for review.
https://gerrit.wikimedia.org/r/54641
Change subject: Left-pad legacy aft_id values with null-bytes, instead of
right-padding
..
Left-pad legacy aft_id values with null-bytes, instead of right-padding
Change-Id: I2e9b0e2014b0f4a70c87c39817cd6d955de020cb
---
M ArticleFeedbackv5.backend.LBFactory.php
M ArticleFeedbackv5.hooks.php
A sql/aft_id_pad_left.sql
3 files changed, 18 insertions(+), 4 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ArticleFeedbackv5
refs/changes/41/54641/1
diff --git a/ArticleFeedbackv5.backend.LBFactory.php
b/ArticleFeedbackv5.backend.LBFactory.php
index 55c6e4b..edfe2b1 100644
--- a/ArticleFeedbackv5.backend.LBFactory.php
+++ b/ArticleFeedbackv5.backend.LBFactory.php
@@ -201,6 +201,6 @@
* @return string
*/
protected function standardizeId( $id ) {
- return str_pad( $id, 32, chr( 0 ) );
+ return str_pad( $id, 32, chr( 0 ), STR_PAD_LEFT );
}
}
diff --git a/ArticleFeedbackv5.hooks.php b/ArticleFeedbackv5.hooks.php
index 7911c21..9ba75a4 100644
--- a/ArticleFeedbackv5.hooks.php
+++ b/ArticleFeedbackv5.hooks.php
@@ -33,11 +33,10 @@
dirname( __FILE__ ) . '/sql/index_user_data.sql'
);
- $updater-modifyField(
+ $updater-modifyExtensionField(
'aft_article_feedback',
'af_user_ip',
- dirname( __FILE__ ) . '/sql/userip_length.sql',
- true
+ dirname( __FILE__ ) . '/sql/userip_length.sql'
);
// move all data from old schema to new, sharded, schema
@@ -73,6 +72,12 @@
dirname( __FILE__ ) . '/sql/inappropriate.sql'
);
+ $updater-modifyExtensionField(
+ 'aft_feedback',
+ 'aft_id',
+ dirname( __FILE__ ) . '/sql/aft_id_pad_left.sql'
+ );
+
return true;
}
diff --git a/sql/aft_id_pad_left.sql b/sql/aft_id_pad_left.sql
new file mode 100644
index 000..cf2a120
--- /dev/null
+++ b/sql/aft_id_pad_left.sql
@@ -0,0 +1,9 @@
+-- legacy AFTv5 entries had auto-incrementing ids
+-- current entries' ids are built using UIDGenerator::newTimestampedUID128( 16
)
+-- both will result in a value that increases as time increases, but to make
+-- sure that such id-based sort resembles a time-based sort, we have to
+-- left-pad the legacy entries with null bytes (instead of right-pad, in which
+-- case 789\0\0\0\0\0\0... would be than 45b6e2349...)
+-- Even only to accurately sort the legacy ids, this needs to be done, or
+-- 123\0\0\0\0\0\0 would be than 45\0\0\0\0\0\0\0
+UPDATE aft_feedback SET aft_id = LPAD(TRIM(TRAILING CHAR(0x00) FROM aft_id),
32, \0);
--
To view, visit https://gerrit.wikimedia.org/r/54641
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I2e9b0e2014b0f4a70c87c39817cd6d955de020cb
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ArticleFeedbackv5
Gerrit-Branch: master
Gerrit-Owner: Matthias Mullie mmul...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Emptying wb_changes_dispatch on deleteAllData - change (mediawiki...Wikibase)
Anja Jentzsch has uploaded a new change for review. https://gerrit.wikimedia.org/r/54642 Change subject: Emptying wb_changes_dispatch on deleteAllData .. Emptying wb_changes_dispatch on deleteAllData Emptying wb_changes_distpatch table when deleting all data to ensure the dispatcher works correctly. Change-Id: I72b5128a93ea1550927b3cac41f9baaf263049b6 --- M repo/Wikibase.hooks.php 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase refs/changes/42/54642/1 diff --git a/repo/Wikibase.hooks.php b/repo/Wikibase.hooks.php old mode 100644 new mode 100755 index 750ee58..b0f9a36 --- a/repo/Wikibase.hooks.php +++ b/repo/Wikibase.hooks.php @@ -626,6 +626,7 @@ $dbw = wfGetDB( DB_MASTER ); $dbw-delete( 'wb_changes', '*', __METHOD__ ); + $dbw-delete( 'wb_changes_dispatch', '*', __METHOD__ ); $reportMessage( done!\n ); -- To view, visit https://gerrit.wikimedia.org/r/54642 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I72b5128a93ea1550927b3cac41f9baaf263049b6 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Wikibase Gerrit-Branch: master Gerrit-Owner: Anja Jentzsch anja.jentz...@wikimedia.de ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] (#46124) Restrict getEntity to connected entity only - change (mediawiki...Wikibase)
Daniel Kinzler has submitted this change and it was merged.
Change subject: (#46124) Restrict getEntity to connected entity only
..
(#46124) Restrict getEntity to connected entity only
Change-Id: Ie916bad460f0f42ac220c6e74edfe9105b9b4e8e
---
M client/includes/WikibaseLibrary.php
M client/resources/mw.wikibase.lua
2 files changed, 62 insertions(+), 22 deletions(-)
Approvals:
Daniel Kinzler: Verified; Looks good to me, approved
jenkins-bot: Checked
diff --git a/client/includes/WikibaseLibrary.php
b/client/includes/WikibaseLibrary.php
index 3b276fe..5cb8fe8 100644
--- a/client/includes/WikibaseLibrary.php
+++ b/client/includes/WikibaseLibrary.php
@@ -32,7 +32,10 @@
* @since 0.4
*/
public function register() {
- $lib = array( 'getEntity' = array( $this, 'getEntity' ) );
+ $lib = array(
+ 'getEntity' = array( $this, 'getEntity' ),
+ 'getEntityId' = array( $this, 'getEntityId' )
+ );
$this-getEngine()-registerInterface( dirname( __FILE__ ) .
'/../resources/' . 'mw.wikibase.lua', $lib, array() );
}
/**
@@ -58,8 +61,9 @@
Wikibase\EntityId::newFromPrefixedId( $prefixedEntityId
)
);
if ( $entityObject == null ) {
- return null;
+ return array( null );
}
+
$serializerFactory = new
\Wikibase\Lib\Serializers\SerializerFactory();
$serializer = $serializerFactory-newSerializerForObject(
$entityObject );
@@ -69,4 +73,34 @@
$entityArr = $serializer-getSerialized( $entityObject );
return array( $entityArr );
}
+
+ /**
+* Get entity id from page title.
+*
+* @since 0.4
+*
+* @param string $pageTitle
+*
+* @return string $id
+*/
+ public function getEntityId( $pageTitle = null ) {
+ $this-checkType( 'getEntityByTitle', 1, $pageTitle, 'string' );
+ $globalSiteId = \Wikibase\Settings::get( 'siteGlobalID' );
+ $table = \Wikibase\ClientStoreFactory::getStore( 'sqlstore'
)-newSiteLinkTable();
+ if ( $table == null ) {
+ return array( null );
+ }
+
+ $numericId = $table-getItemIdForLink( $globalSiteId,
$pageTitle );
+ if ( !is_int( $numericId ) ) {
+ return array( null );
+ }
+
+ $id = new Wikibase\EntityId( \Wikibase\Item::ENTITY_TYPE,
$numericId );
+ if ( $id == null ) {
+ return array( null );
+ }
+
+ return array( $id-getPrefixedId() );
+ }
}
diff --git a/client/resources/mw.wikibase.lua b/client/resources/mw.wikibase.lua
index 65bfb68..533fb4d 100644
--- a/client/resources/mw.wikibase.lua
+++ b/client/resources/mw.wikibase.lua
@@ -1,38 +1,44 @@
--[[
- Registers and defines functions to access Wikibase through the
Scribunto extension
- Provides Lua setupInterface
+Registers and defines functions to access Wikibase through the Scribunto
extension
+Provides Lua setupInterface
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
- You should have received a copy of the GNU General Public License along
- with this program; if not, write to the Free Software Foundation, Inc.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- http://www.gnu.org/copyleft/gpl.html
+You should have received a copy of the GNU General Public License along
+with this program; if not, write to the Free Software Foundation, Inc.,
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+http://www.gnu.org/copyleft/gpl.html
- @since 0.4
+@since 0.4
-
[MediaWiki-commits] [Gerrit] Optimized jquery.eachchange performance - change (mediawiki...DataValues)
Henning Snater has uploaded a new change for review.
https://gerrit.wikimedia.org/r/54643
Change subject: Optimized jquery.eachchange performance
..
Optimized jquery.eachchange performance
Change-Id: I0af2c258e685631469e16ad9641b88cffc206d52
---
M DataTypes/resources/jquery/jquery.eachchange.js
1 file changed, 29 insertions(+), 25 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/DataValues
refs/changes/43/54643/1
diff --git a/DataTypes/resources/jquery/jquery.eachchange.js
b/DataTypes/resources/jquery/jquery.eachchange.js
index ecdbd2b..5ff6315 100644
--- a/DataTypes/resources/jquery/jquery.eachchange.js
+++ b/DataTypes/resources/jquery/jquery.eachchange.js
@@ -12,11 +12,37 @@
* @example $( 'input' ).eachchange( function( event, oldValue ) { ... } );
*
* @dependency jquery.client
- *
- * @TODO: Take care of context related changes via mouse (paste, drag, delete)
and DOM
*/
( function( $, undefined ) {
'use strict';
+
+ /**
+* Returns a string to be used for detecting any instant changes of an
input box. In general, this
+* should be just 'input' in recent browsers.
+*
+* @return {string} events
+*/
+ $.getInputEvent = function() {
+ // IE (at least = version 9) does not trigger input event when
pressing backspace
+ // (version = 8 does not support input event at all anyway)
+ if ( $.client.profile().name === 'msie'
$.client.profile().versionNumber = 9 ) {
+ return 'input keyup';
+ }
+
+ var fallbackEvents = 'keyup keydown blur cut paste mousedown
mouseup mouseout',
+ $input = $( 'input/' ),
+ supported = 'oninput' in $input[0];
+
+ $input.remove();
+
+ return ( supported ) ? 'input' : fallbackEvents;
+ };
+
+ /**
+* String containing all the events needed to detect any change of the
input of an element.
+* @type {string}
+*/
+ var inputEvents = $.getInputEvent();
$.fn.eachchange = function( fn ) {
var monitoredInputs = $();
@@ -35,7 +61,7 @@
var oldVal = input.val(); // old val to compare new one
with
input
- .on( $.getInputEvent(), function( e ) {
+ .on( inputEvents, function( e ) {
/*
* NOTE: we use 'keyup' here as well, so when
holding backspace the thing still gets
* triggered. Also, for some reason in
some browsers 'keydown' isn't triggered
@@ -70,28 +96,6 @@
} );
return this; // return jQuery object
- };
-
- /**
-* Returns a string to be used for detecting any instant changes of an
input box. In general, this
-* should be just 'input' in recent browsers.
-*
-* @return {String} events
-*/
- $.getInputEvent = function() {
- var fallbackEvents = 'keyup keydown blur cut paste mousedown
mouseup mouseout';
-
- // IE (at least = version 9) does not trigger input event when
pressing backspace
- // (version = 8 does not support input event at all anyway)
- if ( $.client.profile().name === 'msie'
$.client.profile().versionNumber = 9 ) {
- return 'input keyup';
- }
-
- var $input = $( 'input/' );
- var supported = 'oninput' in $input[0];
- $input.remove();
-
- return ( supported ) ? 'input' : fallbackEvents;
};
}( jQuery ) );
--
To view, visit https://gerrit.wikimedia.org/r/54643
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I0af2c258e685631469e16ad9641b88cffc206d52
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/DataValues
Gerrit-Branch: master
Gerrit-Owner: Henning Snater henning.sna...@wikimedia.de
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Dont show sourceSwitch for small videos - change (mediawiki...TimedMediaHandler)
J has uploaded a new change for review.
https://gerrit.wikimedia.org/r/54644
Change subject: Dont show sourceSwitch for small videos
..
Dont show sourceSwitch for small videos
videos smaller than the smallest derivate dont need
sourceSwitch, this leavees space to show the seekbar.
Change-Id: I9dccffbfb26afd841a6c6b73a0fe0562fdc9bcb9
---
M MwEmbedModules/EmbedPlayer/resources/skins/mw.PlayerControlBuilder.js
1 file changed, 4 insertions(+), 0 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/TimedMediaHandler
refs/changes/44/54644/1
diff --git
a/MwEmbedModules/EmbedPlayer/resources/skins/mw.PlayerControlBuilder.js
b/MwEmbedModules/EmbedPlayer/resources/skins/mw.PlayerControlBuilder.js
index c2ec2c9..990bde6 100644
--- a/MwEmbedModules/EmbedPlayer/resources/skins/mw.PlayerControlBuilder.js
+++ b/MwEmbedModules/EmbedPlayer/resources/skins/mw.PlayerControlBuilder.js
@@ -245,6 +245,10 @@
if( componentId == 'fullscreen'
this.embedPlayer.isAudio() ){
continue;
}
+ // Skip sourceSwitch if width smalles derivative
+ if ( componentId == 'sourceSwitch'
this.availableWidth 320) {
+ continue;
+ }
addComponent( componentId );
}
if( this.availableWidth 30 ){
--
To view, visit https://gerrit.wikimedia.org/r/54644
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I9dccffbfb26afd841a6c6b73a0fe0562fdc9bcb9
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/TimedMediaHandler
Gerrit-Branch: master
Gerrit-Owner: J jger...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] extract2.php: Clean up old code. - change (operations/mediawiki-config)
Krinkle has uploaded a new change for review.
https://gerrit.wikimedia.org/r/54645
Change subject: extract2.php: Clean up old code.
..
extract2.php: Clean up old code.
- The _portals are no longer used. Some of them still exist
on meta.wikimedia.org but only with content like
This is no longer used or {{Historical}} etc.
extract2.php was still parsing these on every request and doing
a pointless string search/replace.
- The text/plain header is broken, PHP outputs text/html instead
because it somehow called header() with the value as second
argument, which is an incorrect invokation.
- Secure.wikimedia.org should no longer be exposed.
- Whitespace, single quotes, commented out code.
Bug: 38167
Change-Id: Ib77f5312e7667ce2ebc074172a12ad3c5efb3a13
---
M extract2.php
1 file changed, 21 insertions(+), 47 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config
refs/changes/45/54645/1
diff --git a/extract2.php b/extract2.php
index 6ad6e12..5d18dfa 100644
--- a/extract2.php
+++ b/extract2.php
@@ -1,61 +1,35 @@
?php
-header(Content-Type: text/html; charset=utf-8);
-$lang = meta;
+$lang = 'meta';
putenv( MW_LANG={$lang} ); // notify MWMultiVersion
-define( MEDIAWIKI, true );
-#include_once(CommonSettings.php);
-#include_once(/apache/common/wmf-deployment/includes/ProfileStub.php );
-#include_once(/apache/common/wmf-deployment/includes/Defines.php );
-#include_once(/apache/common/wmf-deployment/wmf-config/CommonSettings.php);
-#include_once(/apache/common/wmf-deployment/includes/Setup.php);
+define( 'MEDIAWIKI', true );
-#include_once(/apache/common/wmf-deployment/includes/WebStart.php);
+include '/apache/common/live-1.5/MWVersion.php';
+include getMediaWiki( 'includes/WebStart.php' );
-include /apache/common/live-1.5/MWVersion.php;
-include getMediaWiki(includes/WebStart.php);
-
-$allowed_portals = array(
- Www.wikipedia.org_portal,
- Www.wikinews.org_portal,
- Www.wiktionary.org_portal,
- Www.wikiquote.org_portal,
- Www.wikimedia.org_portal,
- Www.wikiversity.org_portal,
- Www.wikibooks.org_portal,
- Secure.wikimedia.org_portal,
- Www.wikivoyage.org_portal,
-);
$allowed_templates = array(
- Www.wikipedia.org_template,
- Www.wikinews.org_template,
- Www.wiktionary.org_template,
- Www.wikiquote.org_template,
- Www.wikimedia.org_template,
- Www.wikiversity.org_template,
- Www.wikibooks.org_template,
- Secure.wikimedia.org_template,
- Www.wikivoyage.org_template,
+ 'Www.wikimedia.org_template',
+ 'Www.wikipedia.org_template',
+ 'Www.wikinews.org_template',
+ 'Www.wiktionary.org_template',
+ 'Www.wikiquote.org_template',
+ 'Www.wikiversity.org_template',
+ 'Www.wikibooks.org_template',
+ 'Www.wikivoyage.org_template',
);
-$useportal = $wgRequest-getText( 'title', 'Www.wikipedia.org_portal' );
-$usetemplate = $wgRequest-getText( 'template', 'Www.wikipedia.org_template' );
-if (!in_array($useportal, $allowed_portals) || !in_array($usetemplate,
$allowed_templates)) {
- header(Content-Type, text/plain; charset=US-ASCII);
- echo sorry...;
+$template = $wgRequest-getText( 'template', 'Www.wikipedia.org_template' );
+if ( !in_array( $template, $allowed_templates ) ) {
+ header( 'Content-Type: text/plain; charset=utf-8' );
+ echo 'Invalid parameters...';
exit;
}
-$wgTitle = Title::newFromText( $useportal );
+$wgTitle = Title::newFromText( $template );
$wgArticle = new Article( $wgTitle );
-$mainText = $wgOut-parse( $wgArticle-getContent( false ) );
+$rawHtml = $wgArticle-getContent( false );
-$templateTitle = Title::newFromText( $usetemplate );
-$templateArticle = new Article( $templateTitle );
-$templateText = $templateArticle-getContent( false );
-$text = str_replace( '$1', $mainText, $templateText );
-
-$lastmod = gmdate( 'D, j M Y H:i:s', wfTimestamp(TS_UNIX, max(
$wgArticle-getTouched(), $templateArticle-getTouched() ) ) ) . ' GMT';
+$lastmod = gmdate( 'D, j M Y H:i:s', wfTimestamp( TS_UNIX,
$wgArticle-getTouched() ) ) . ' GMT';
+header( 'Content-Type: text/html; charset=utf-8' );
header( 'Cache-Control: s-maxage=3600, must-revalidate, max-age=0' );
header( Last-modified: $lastmod );
-echo $text;
-
+echo $rawHtml;
--
To view, visit https://gerrit.wikimedia.org/r/54645
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib77f5312e7667ce2ebc074172a12ad3c5efb3a13
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Krinkle ttij...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] cache db queries for Special:TimedMediaHandler for one hour - change (mediawiki...TimedMediaHandler)
J has uploaded a new change for review.
https://gerrit.wikimedia.org/r/54646
Change subject: cache db queries for Special:TimedMediaHandler for one hour
..
cache db queries for Special:TimedMediaHandler for one hour
Change-Id: Ic61bc69d5f66e47bc2701c3e29f9f67ed5753c03
---
M SpecialTimedMediaHandler.php
1 file changed, 7 insertions(+), 1 deletion(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/TimedMediaHandler
refs/changes/46/54646/1
diff --git a/SpecialTimedMediaHandler.php b/SpecialTimedMediaHandler.php
index 9910cc1..e23fc54 100644
--- a/SpecialTimedMediaHandler.php
+++ b/SpecialTimedMediaHandler.php
@@ -25,12 +25,18 @@
}
public function execute( $par ) {
+ global $wgMemc;
$this-setHeaders();
$out = $this-getOutput();
$out-addModuleStyles( 'mediawiki.special' );
- $stats = $this-getStats();
+ $key = wfMemcKey( 'TimedMediaHandler', 'stats' );
+ $stats = $wgMemc-get( $key );
+ if ( !$stats ) {
+ $stats = $this-getStats();
+ $wgMemc-add( $key, $stats, 3600 );
+ }
$out-addHTML(
h2
. $this-msg( 'timedmedia-videos',
$stats['videos']['total'] )-escaped()
--
To view, visit https://gerrit.wikimedia.org/r/54646
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic61bc69d5f66e47bc2701c3e29f9f67ed5753c03
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/TimedMediaHandler
Gerrit-Branch: master
Gerrit-Owner: J jger...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] (#46125) Lua function label(id) that takes an ID and returns... - change (mediawiki...Wikibase)
Jens Ohlig has uploaded a new change for review.
https://gerrit.wikimedia.org/r/54647
Change subject: (#46125) Lua function label(id) that takes an ID and returns
the label in the language of the client Wiki
..
(#46125) Lua function label(id) that takes an ID and returns the label in the
language of the client Wiki
Change-Id: Iecc7cf51ced432d25fb161f3639f791029979f7e
---
M client/resources/mw.wikibase.lua
1 file changed, 5 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/47/54647/1
diff --git a/client/resources/mw.wikibase.lua b/client/resources/mw.wikibase.lua
index 533fb4d..5d7c481 100644
--- a/client/resources/mw.wikibase.lua
+++ b/client/resources/mw.wikibase.lua
@@ -28,6 +28,7 @@
function wikibase.setupInterface()
local title = require('mw.title')
local site = require('mw.site')
+ local language = require('mw.language')
local php = mw_interface
mw_interface = nil
wikibase.getEntity = function()
@@ -36,6 +37,10 @@
entity = php.getEntity(id)
return entity
end
+ wikibase.label = function(id)
+code = language.getContentLanguage().code
+return php.getEntity(id).labels[code].value
+ end
mw = mw or {}
mw.wikibase = wikibase
package.loaded['mw.wikibase'] = wikibase
--
To view, visit https://gerrit.wikimedia.org/r/54647
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iecc7cf51ced432d25fb161f3639f791029979f7e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Jens Ohlig jens.oh...@wikimedia.de
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Updated multi_json Ruby gem - change (qa/browsertests)
Zfilipin has uploaded a new change for review. https://gerrit.wikimedia.org/r/54648 Change subject: Updated multi_json Ruby gem .. Updated multi_json Ruby gem Change-Id: I12e9fac550aee0a0f798c847db2f6eb00b02f26c --- M Gemfile.lock 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/qa/browsertests refs/changes/48/54648/1 diff --git a/Gemfile.lock b/Gemfile.lock index 27993dc..7c01a0f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -21,7 +21,7 @@ json (= 1.7.6) i18n (0.6.4) json (1.7.7) -multi_json (1.7.0) +multi_json (1.7.1) net-http-persistent (2.8) page-object (0.8.6.1) page_navigation (= 0.7) -- To view, visit https://gerrit.wikimedia.org/r/54648 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I12e9fac550aee0a0f798c847db2f6eb00b02f26c Gerrit-PatchSet: 1 Gerrit-Project: qa/browsertests Gerrit-Branch: master Gerrit-Owner: Zfilipin zfili...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Updated multi_json Ruby gem - change (mediawiki...MobileFrontend)
Zfilipin has uploaded a new change for review. https://gerrit.wikimedia.org/r/54649 Change subject: Updated multi_json Ruby gem .. Updated multi_json Ruby gem Change-Id: Ieda116123e6859969bf7d299fd17f299aaf31ca6 --- M tests/acceptance/Gemfile.lock 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend refs/changes/49/54649/1 diff --git a/tests/acceptance/Gemfile.lock b/tests/acceptance/Gemfile.lock index 27993dc..7c01a0f 100644 --- a/tests/acceptance/Gemfile.lock +++ b/tests/acceptance/Gemfile.lock @@ -21,7 +21,7 @@ json (= 1.7.6) i18n (0.6.4) json (1.7.7) -multi_json (1.7.0) +multi_json (1.7.1) net-http-persistent (2.8) page-object (0.8.6.1) page_navigation (= 0.7) -- To view, visit https://gerrit.wikimedia.org/r/54649 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ieda116123e6859969bf7d299fd17f299aaf31ca6 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/MobileFrontend Gerrit-Branch: master Gerrit-Owner: Zfilipin zfili...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] (bug 46321) Add init js file for site link widget - change (mediawiki...Wikibase)
Aude has uploaded a new change for review.
https://gerrit.wikimedia.org/r/54650
Change subject: (bug 46321) Add init js file for site link widget
..
(bug 46321) Add init js file for site link widget
- wrap linkItem in a variable, and put in scope of wb. stuff
@todo:
- needs spinner while the dependency js is loading
- what the widget depends on could be optimized
Change-Id: I21ffaf3396da28aecbb92ea405268b98cf609ca1
---
M client/WikibaseClient.hooks.php
M client/resources/Resources.php
A client/resources/wbclient.linkItem.init.js
M client/resources/wbclient.linkItem.js
4 files changed, 140 insertions(+), 104 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/50/54650/1
diff --git a/client/WikibaseClient.hooks.php b/client/WikibaseClient.hooks.php
index 13e8fd5..1e042a1 100644
--- a/client/WikibaseClient.hooks.php
+++ b/client/WikibaseClient.hooks.php
@@ -426,7 +426,7 @@
// (as that only runs after the element
initially appeared).
$out-addModules( 'wikibase.client.nolanglinks'
);
// Add the JavaScript to link pages locally
- $out-addModules( 'wbclient.linkItem' );
+ $out-addModules( 'wbclient.linkItem.init' );
}
}
diff --git a/client/resources/Resources.php b/client/resources/Resources.php
index 9e63bec..759f547 100644
--- a/client/resources/Resources.php
+++ b/client/resources/Resources.php
@@ -67,7 +67,18 @@
'wikibase-sitelinks-sitename-columnheading',
'wikibase-sitelinks-link-columnheading'
),
- )
+ ),
+ 'wbclient.linkItem.init' = $moduleTemplate + array(
+ 'scripts' = array(
+ 'wbclient.linkItem.init.js'
+ ),
+ 'dependencies' = array(
+// 'wbclient.linkItem'
+ ),
+ 'messages' = array(
+ 'wikibase-linkitem-addlinks'
+ ),
+ ),
);
} );
diff --git a/client/resources/wbclient.linkItem.init.js
b/client/resources/wbclient.linkItem.init.js
new file mode 100644
index 000..1d63831
--- /dev/null
+++ b/client/resources/wbclient.linkItem.init.js
@@ -0,0 +1,36 @@
+/**
+* JavaScript that allows linking articles with Wikibase items or creating
+* new wikibase items directly in the client wikis
+*
+* @since 0.4
+*
+* Author: Marius Hoch h...@online.de
+*/
+( function( mw, $ ) {
+'use strict';
+
+ /**
+* Displays the link which shows the dialog after checking whether the
user is logged ins
+*
+*/
+ $( document ).ready( function() {
+ $( '#wbc-linkToItem' )
+ .empty()
+ .append(
+ $( 'a' )
+ .attr( {
+ href: '#',
+ id: 'wbc-linkToItem-link'
+ } )
+ .text( mw.msg( 'wikibase-linkitem-addlinks' ) )
+ .click( function( event ) {
+ var $e = event;
+ mw.loader.using( 'wbclient.linkItem',
function( event ) {
+
wikibase.AddSiteLinkWidget.checkLoggedin( $e );
+ });
+ })
+ );
+ $( '#p-lang' ).show();
+ } );
+
+} )( mediaWiki, jQuery );
diff --git a/client/resources/wbclient.linkItem.js
b/client/resources/wbclient.linkItem.js
index 603ecbe..d0f2dc9 100644
--- a/client/resources/wbclient.linkItem.js
+++ b/client/resources/wbclient.linkItem.js
@@ -7,20 +7,23 @@
* Author: Marius Hoch h...@online.de
*/
( function( wb, mw, $ ) {
- var repoApi = new wb.RepoApi(),
- $dialog, $spinner, $goButton, targetSite, targetArticle;
+
+var repoApi = new wb.RepoApi(), $siteLinkWidget,
+ $dialog, $spinner, $goButton, targetSite, targetArticle;
+
+$siteLinkWidget = {
/**
* Check whether the user is logged in on both the client and the repo
* show the dialog if he is, error if not
*
*/
- function checkLoggedin( event ) {
+ checkLoggedin: function( event ) {
event.preventDefault();
if ( mw.user.isAnon() ) {
// User isn't logged in
- notLoggedin();
+ $siteLinkWidget.notLoggedin();
return;
[MediaWiki-commits] [Gerrit] Use GEOIP_MMAP_CACHE instead of GEOIP_MEMORY_CACHE - change (operations/puppet)
Mark Bergsma has uploaded a new change for review.
https://gerrit.wikimedia.org/r/54651
Change subject: Use GEOIP_MMAP_CACHE instead of GEOIP_MEMORY_CACHE
..
Use GEOIP_MMAP_CACHE instead of GEOIP_MEMORY_CACHE
Let's see how this affects memory usage...
Change-Id: I76e376aa81f7b1f359d6ea1ef7a471ac9de7869a
---
M templates/varnish/geoip.inc.vcl.erb
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/51/54651/1
diff --git a/templates/varnish/geoip.inc.vcl.erb
b/templates/varnish/geoip.inc.vcl.erb
index cfbac67..c5d2d68 100644
--- a/templates/varnish/geoip.inc.vcl.erb
+++ b/templates/varnish/geoip.inc.vcl.erb
@@ -25,7 +25,7 @@
GeoIP *gi;
void geo_init () {
if (!gi) {
- gi = GeoIP_open(/usr/share/GeoIP/GeoIPCity.dat,
GEOIP_MEMORY_CACHE);
+ gi = GeoIP_open(/usr/share/GeoIP/GeoIPCity.dat,
GEOIP_MMAP_CACHE);
}
}
getaddrfamily(const char *addr) {
--
To view, visit https://gerrit.wikimedia.org/r/54651
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I76e376aa81f7b1f359d6ea1ef7a471ac9de7869a
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Mark Bergsma m...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Updated multi_json Ruby gem - change (qa/browsertests)
Cmcmahon has submitted this change and it was merged. Change subject: Updated multi_json Ruby gem .. Updated multi_json Ruby gem Change-Id: I26caee6f7598a01bd20a3bfef09d0f14bfcfe437 --- M Gemfile.lock 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Cmcmahon: Verified; Looks good to me, approved diff --git a/Gemfile.lock b/Gemfile.lock index 9a73819..7e8a97a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -21,7 +21,7 @@ json (= 1.7.6) i18n (0.6.4) json (1.7.7) -multi_json (1.6.1) +multi_json (1.7.0) net-http-persistent (2.8) page-object (0.8.6.1) page_navigation (= 0.7) -- To view, visit https://gerrit.wikimedia.org/r/54204 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I26caee6f7598a01bd20a3bfef09d0f14bfcfe437 Gerrit-PatchSet: 1 Gerrit-Project: qa/browsertests Gerrit-Branch: master Gerrit-Owner: Zfilipin zfili...@wikimedia.org Gerrit-Reviewer: Cmcmahon cmcma...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Updated Ruby gems - change (qa/browsertests)
Cmcmahon has submitted this change and it was merged. Change subject: Updated Ruby gems .. Updated Ruby gems Change-Id: Iffb23be51d07b3e77a9a0bda86e549570ffd6450 --- M Gemfile.lock 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Cmcmahon: Verified; Looks good to me, approved diff --git a/Gemfile.lock b/Gemfile.lock index 9a73819..27993dc 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -21,7 +21,7 @@ json (= 1.7.6) i18n (0.6.4) json (1.7.7) -multi_json (1.6.1) +multi_json (1.7.0) net-http-persistent (2.8) page-object (0.8.6.1) page_navigation (= 0.7) @@ -30,7 +30,7 @@ page_navigation (0.7) data_magic (= 0.14) parallel (0.6.2) -parallel_tests (0.10.0) +parallel_tests (0.10.1) parallel rake (10.0.3) rspec-expectations (2.13.0) -- To view, visit https://gerrit.wikimedia.org/r/54469 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iffb23be51d07b3e77a9a0bda86e549570ffd6450 Gerrit-PatchSet: 1 Gerrit-Project: qa/browsertests Gerrit-Branch: master Gerrit-Owner: Zfilipin zfili...@wikimedia.org Gerrit-Reviewer: Cmcmahon cmcma...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Moved MobileFrontend documentation to MobileFrontend repository - change (qa/browsertests)
Cmcmahon has submitted this change and it was merged. Change subject: Moved MobileFrontend documentation to MobileFrontend repository .. Moved MobileFrontend documentation to MobileFrontend repository Bug: 46219 Change-Id: Iba82063a3e3427c9ca2c072dd2b1a8f648920844 --- M docs/template.md 1 file changed, 8 insertions(+), 21 deletions(-) Approvals: Cmcmahon: Verified; Looks good to me, approved diff --git a/docs/template.md b/docs/template.md index b2bba37..cc1ed28 100644 --- a/docs/template.md +++ b/docs/template.md @@ -4,7 +4,7 @@ - Jenkins Templates New Template (name) Job Template OK Save - Display Name: (name) -- Description: Makes it easy to create new Jenkins job to run browser (desktop or mobile) tests. +- Description: (description) - Instantiable?: check - Attribute @@ -23,20 +23,13 @@ - Options - Display Name: (name) - Value: (name) - - - (name) -- desktop - - chrome - - firefox - - internet_explorer_6 - - internet_explorer_7 - - internet_explorer_8 - - internet_explorer_9 - - internet_explorer_10 -- mobile - - android - - ipad - - iphone + - chrome + - firefox + - internet_explorer_6 + - internet_explorer_7 + - internet_explorer_8 + - internet_explorer_9 + - internet_explorer_10 ## bundle exec @@ -63,12 +56,6 @@ - Display Name: browsertests@cloudbees - Value: git://git.cloudbees.com/wmf/browsertests.git - -- Display Name: MobileFrontend@gerrit -- Value: ssh://zfili...@gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend - -- Display Name: MobileFrontend@cloudbees -- Value: ssh://g...@git.cloudbees.com/wmf/MobileFrontend.git ## Branch -- To view, visit https://gerrit.wikimedia.org/r/54518 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iba82063a3e3427c9ca2c072dd2b1a8f648920844 Gerrit-PatchSet: 1 Gerrit-Project: qa/browsertests Gerrit-Branch: master Gerrit-Owner: Zfilipin zfili...@wikimedia.org Gerrit-Reviewer: Cmcmahon cmcma...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Updated multi_json Ruby gem - change (qa/browsertests)
Cmcmahon has submitted this change and it was merged. Change subject: Updated multi_json Ruby gem .. Updated multi_json Ruby gem Change-Id: I12e9fac550aee0a0f798c847db2f6eb00b02f26c --- M Gemfile.lock 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Cmcmahon: Verified; Looks good to me, approved diff --git a/Gemfile.lock b/Gemfile.lock index 27993dc..7c01a0f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -21,7 +21,7 @@ json (= 1.7.6) i18n (0.6.4) json (1.7.7) -multi_json (1.7.0) +multi_json (1.7.1) net-http-persistent (2.8) page-object (0.8.6.1) page_navigation (= 0.7) -- To view, visit https://gerrit.wikimedia.org/r/54648 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I12e9fac550aee0a0f798c847db2f6eb00b02f26c Gerrit-PatchSet: 1 Gerrit-Project: qa/browsertests Gerrit-Branch: master Gerrit-Owner: Zfilipin zfili...@wikimedia.org Gerrit-Reviewer: Cmcmahon cmcma...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Updated multi_json Ruby gem - change (mediawiki...MobileFrontend)
Cmcmahon has submitted this change and it was merged. Change subject: Updated multi_json Ruby gem .. Updated multi_json Ruby gem Change-Id: Ieda116123e6859969bf7d299fd17f299aaf31ca6 --- M tests/acceptance/Gemfile.lock 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Cmcmahon: Verified; Looks good to me, approved diff --git a/tests/acceptance/Gemfile.lock b/tests/acceptance/Gemfile.lock index 27993dc..7c01a0f 100644 --- a/tests/acceptance/Gemfile.lock +++ b/tests/acceptance/Gemfile.lock @@ -21,7 +21,7 @@ json (= 1.7.6) i18n (0.6.4) json (1.7.7) -multi_json (1.7.0) +multi_json (1.7.1) net-http-persistent (2.8) page-object (0.8.6.1) page_navigation (= 0.7) -- To view, visit https://gerrit.wikimedia.org/r/54649 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ieda116123e6859969bf7d299fd17f299aaf31ca6 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/MobileFrontend Gerrit-Branch: master Gerrit-Owner: Zfilipin zfili...@wikimedia.org Gerrit-Reviewer: Cmcmahon cmcma...@wikimedia.org Gerrit-Reviewer: Mgrover mgro...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Makes it easy to create new Jenkins job to run Selenium test... - change (mediawiki...MobileFrontend)
Cmcmahon has submitted this change and it was merged.
Change subject: Makes it easy to create new Jenkins job to run Selenium tests
from MobileFrontend repository
..
Makes it easy to create new Jenkins job to run Selenium tests from
MobileFrontend repository
Bug: 46219
Change-Id: I86e7b5d3a6fcf212cbaa3b7f35907369380e74a5
---
A tests/acceptance/docs/template.md
1 file changed, 202 insertions(+), 0 deletions(-)
Approvals:
Cmcmahon: Verified; Looks good to me, approved
diff --git a/tests/acceptance/docs/template.md
b/tests/acceptance/docs/template.md
new file mode 100644
index 000..5820395
--- /dev/null
+++ b/tests/acceptance/docs/template.md
@@ -0,0 +1,202 @@
+# Template
+
+## Setup
+
+- Jenkins Templates New Template (name) Job Template OK Save
+- Display Name: (name)
+- Description: (description)
+- Instantiable?: check
+- Attribute
+
+## Name
+
+- ID: name
+ - Display Name: Name
+ - Type: Text-field
+
+## Browser Label
+
+- ID: BROWSER_LABEL
+ - Display Name: Browser Label
+ - Type: Select a string among many
+ - UI Mode: Dropdown list (no inline help, but more compact UI)
+ - Options
+- Display Name: (name)
+- Value: (name)
+ - android
+ - ipad
+ - iphone
+
+## bundle exec
+
+ - ID: BUNDLE_EXEC
+- Display Name: bundle exec
+- Type: Text-field
+
+## Recipients
+
+- ID: RECIPIENTS
+ - Display Name: Recipients
+ - Type: Text-field
+
+## Repository URL
+
+- ID: REPOSITORY_URL
+ - Display Name: Repository URL
+ - Type: Select a string among many
+ - UI Mode: Dropdown list (no inline help, but more compact UI)
+ - Options
+
+- Display Name: MobileFrontend@gerrit
+- Value:
ssh://zfili...@gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend
+
+- Display Name: MobileFrontend@cloudbees
+- Value: ssh://g...@git.cloudbees.com/wmf/MobileFrontend.git
+
+## Branch
+
+- ID: BRANCH
+ - Display Name: Branch
+ - Type: Select a string among many
+ - UI Mode: Dropdown list (no inline help, but more compact UI)
+ - Options
+- Display Name: (name)
+- Value: (name)
+
+- name:
+ - master
+ - debug
+
+## Jelly-based transformation
+
+- Property
+ - Transformer: Jelly-based transformation
+ - Script, from (site)/job/(job)/config.xml
+
+--
+
+?xml version='1.0' encoding='UTF-8'?
+project
+ actions/
+ description/description
+ logRotator
+daysToKeep60/daysToKeep
+numToKeep-1/numToKeep
+artifactDaysToKeep-1/artifactDaysToKeep
+artifactNumToKeep20/artifactNumToKeep
+ /logRotator
+ keepDependenciesfalse/keepDependencies
+ properties
+nectar.plugins.rbac.groups.JobProxyGroupContainer
+ groups/
+/nectar.plugins.rbac.groups.JobProxyGroupContainer
+com.cloudbees.jenkins.plugins.PublicKey/
+com.cloudbees.plugins.deployer.DeployNowJobProperty
+ oneClickDeployfalse/oneClickDeploy
+ configuration
+user(jenkins)/user
+accountwmf/account
+deployables/
+ /configuration
+/com.cloudbees.plugins.deployer.DeployNowJobProperty
+ /properties
+ scm class=hudson.plugins.git.GitSCM
+configVersion2/configVersion
+userRemoteConfigs
+ hudson.plugins.git.UserRemoteConfig
+name/name
+refspec/refspec
+url${REPOSITORY_URL}/url
+ /hudson.plugins.git.UserRemoteConfig
+/userRemoteConfigs
+branches
+ hudson.plugins.git.BranchSpec
+name${BRANCH}/name
+ /hudson.plugins.git.BranchSpec
+/branches
+disableSubmodulesfalse/disableSubmodules
+recursiveSubmodulesfalse/recursiveSubmodules
+
doGenerateSubmoduleConfigurationsfalse/doGenerateSubmoduleConfigurations
+authorOrCommitterfalse/authorOrCommitter
+cleanfalse/clean
+wipeOutWorkspacefalse/wipeOutWorkspace
+pruneBranchesfalse/pruneBranches
+remotePollfalse/remotePoll
+ignoreNotifyCommitfalse/ignoreNotifyCommit
+useShallowClonefalse/useShallowClone
+buildChooser class=hudson.plugins.git.util.DefaultBuildChooser/
+gitToolDefault/gitTool
+submoduleCfg class=list/
+relativeTargetDir/relativeTargetDir
+reference/reference
+excludedRegions/excludedRegions
+excludedUsers/excludedUsers
+gitConfigName/gitConfigName
+gitConfigEmail/gitConfigEmail
+skipTagfalse/skipTag
+includedRegions/includedRegions
+scmName/scmName
+ /scm
+ canRoamtrue/canRoam
+ disabledfalse/disabled
+
blockBuildWhenDownstreamBuildingfalse/blockBuildWhenDownstreamBuilding
+ blockBuildWhenUpstreamBuildingfalse/blockBuildWhenUpstreamBuilding
+ triggers class=vector
+hudson.triggers.TimerTrigger
+ spec0 20,23 * * */spec
+
[MediaWiki-commits] [Gerrit] test: abstract parser test result - change (mediawiki/core)
Hashar has uploaded a new change for review.
https://gerrit.wikimedia.org/r/54652
Change subject: test: abstract parser test result
..
test: abstract parser test result
This patch introduce the new ParserTestResult class which is meant to
represent the result of a parser test. I have refactored some methods
to take advantage of this new class.
It just hold the test description and the actual/expected parser output.
A short isSuccess() method is provided for convenience, we can later
improve the class to carry more methods.
Change-Id: Ifb86e09451875dc119633b52d3f7e4f47c67cc60
---
M tests/TestsAutoLoader.php
A tests/parser/ParserTestResult.php
M tests/parser/parserTest.inc
3 files changed, 59 insertions(+), 16 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/52/54652/1
diff --git a/tests/TestsAutoLoader.php b/tests/TestsAutoLoader.php
index 264ba69..363d0a2 100644
--- a/tests/TestsAutoLoader.php
+++ b/tests/TestsAutoLoader.php
@@ -30,6 +30,7 @@
'DbTestPreviewer' = $testDir/testHelpers.inc,
'DbTestRecorder' = $testDir/testHelpers.inc,
'DelayedParserTest' = $testDir/testHelpers.inc,
+ 'ParserTestResult' = $testDir/parser/ParserTestResult.php,
'TestFileIterator' = $testDir/testHelpers.inc,
'TestRecorder' = $testDir/testHelpers.inc,
diff --git a/tests/parser/ParserTestResult.php
b/tests/parser/ParserTestResult.php
new file mode 100644
index 000..7d2edfa
--- /dev/null
+++ b/tests/parser/ParserTestResult.php
@@ -0,0 +1,34 @@
+?php
+/**
+ * @copyright Copyright © 2013, Antoine Musso
+ * @copyright Copyright © 2013, Wikimedia Foundation Inc.
+ * @license GNU GPL v2
+ *
+ * @file
+ */
+
+/**
+ * Represent the result of a parser test.
+ *
+ * @since 1.21
+ */
+class ParserTestResult {
+ /** Name of the parser test */
+ public $description;
+ /** Text that was expected */
+ public $expected;
+ /** Actual text rendered */
+ public $actual;
+
+ /**
+* @param $description string The test has described in the .txt file
+*/
+ public function __construct( $description ) {
+ $this-description = $description;
+ }
+
+ /** Whether the test passed */
+ public function isSuccess() {
+ return ($this-expected === $this-actual);
+ }
+}
diff --git a/tests/parser/parserTest.inc b/tests/parser/parserTest.inc
index ce621f4..efd2e42 100644
--- a/tests/parser/parserTest.inc
+++ b/tests/parser/parserTest.inc
@@ -518,18 +518,23 @@
}
$this-teardownGlobals();
- return $this-showTestResult( $desc, $result, $out );
+
+ $testResult = new ParserTestResult( $desc );
+ $testResult-expected = $result;
+ $testResult-actual = $out;
+
+ return $this-showTestResult( $testResult );
}
/**
-*
+* Refactored in 1.21 to use ParserTestResult
*/
- function showTestResult( $desc, $result, $out ) {
- if ( $result === $out ) {
- $this-showSuccess( $desc );
+ function showTestResult( ParserTestResult $testResult ) {
+ if ( $testResult-isSuccess() ) {
+ $this-showSuccess( $testResult );
return true;
} else {
- $this-showFailure( $desc, $result, $out );
+ $this-showFailure( $testResult );
return false;
}
}
@@ -1070,10 +1075,12 @@
/**
* Print a happy success message.
*
-* @param $desc String: the test name
+* Refactored in 1.21 to use ParserTestResult
+*
+* @param $testResult ParserTestResult
* @return Boolean
*/
- protected function showSuccess( $desc ) {
+ protected function showSuccess( ParserTestResult $testResult ) {
if ( $this-showProgress ) {
print $this-term-color( '1;32' ) . 'PASSED' .
$this-term-reset() . \n;
}
@@ -1085,28 +1092,29 @@
* Print a failure message and provide some explanatory output
* about what went wrong if so configured.
*
-* @param $desc String: the test name
-* @param $result String: expected HTML output
-* @param $html String: actual HTML output
+* Refactored in 1.21 to use ParserTestResult
+*
+* @param $testResult ParserTestResult
* @return Boolean
*/
- protected function showFailure( $desc, $result, $html ) {
+ protected function showFailure( ParserTestResult $testResult ) {
if ( $this-showFailure ) {
if ( !$this-showProgress ) {
# In quiet mode we didn't show the 'Testing'
message
[MediaWiki-commits] [Gerrit] test: describe the parser tests recorder - change (mediawiki/core)
Hashar has uploaded a new change for review.
https://gerrit.wikimedia.org/r/54653
Change subject: test: describe the parser tests recorder
..
test: describe the parser tests recorder
How to best describe the myriad of parser tests recorder we have? PHP
come with interfaces which let us express what a developer should expect
from all those common classes.
The iTestRecorder interface represent our parser test recorders.
Change-Id: I58e10e7ebcb7ae1c4598a4f7e3bd4f11a7f713c4
---
M tests/testHelpers.inc
1 file changed, 30 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/53/54653/1
diff --git a/tests/testHelpers.inc b/tests/testHelpers.inc
index 02fcf24..98ed84a 100644
--- a/tests/testHelpers.inc
+++ b/tests/testHelpers.inc
@@ -21,7 +21,36 @@
* @ingroup Testing
*/
-class TestRecorder {
+/**
+ * Interface to record parser test results.
+ *
+ * The iTestRecorder is a very simple interface to record the result of
+ * MediaWiki parser tests. One should call start() before running the
+ * full parser tests and end() once all the tests have been finished.
+ * After each test, you should use record() to keep track of your tests
+ * results. Finally, report() is used to generate a summary of your
+ * test run, one could dump it to the console for human consumption or
+ * register the result in a database for tracking purposes.
+ *
+ * @since 1.21
+ */
+interface iTestRecorder {
+
+ /** Called at beginning of the parser test run */
+ public function start();
+
+ /** Called after each test */
+ public function record( $test, $result );
+
+ /** Called before finishing the test run */
+ public function report();
+
+ /** Called at the end of the parser test run */
+ public function end();
+
+}
+
+class TestRecorder implements iTestRecorder {
var $parent;
var $term;
--
To view, visit https://gerrit.wikimedia.org/r/54653
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I58e10e7ebcb7ae1c4598a4f7e3bd4f11a7f713c4
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Hashar has...@free.fr
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] contint: update apache conf file headers - change (operations/puppet)
Faidon has submitted this change and it was merged. Change subject: contint: update apache conf file headers .. contint: update apache conf file headers The headers in Apaches configurations were not using the proper puppet URL. We somehow forgot to update them when refactoring to a module :) Change-Id: Ifc0ac44548d3e7e212b0bc33221c92611eee89d9 --- M modules/contint/files/apache/integration.mediawiki.org M modules/contint/files/apache/integration.wikimedia.org M modules/contint/files/apache/proxy_jenkins M modules/contint/files/apache/proxy_zuul M modules/contint/files/apache/qunit.localhost 5 files changed, 11 insertions(+), 3 deletions(-) Approvals: Faidon: Looks good to me, approved jenkins-bot: Verified diff --git a/modules/contint/files/apache/integration.mediawiki.org b/modules/contint/files/apache/integration.mediawiki.org index a1104de..28bf24a 100644 --- a/modules/contint/files/apache/integration.mediawiki.org +++ b/modules/contint/files/apache/integration.mediawiki.org @@ -1,6 +1,6 @@ # ### THIS FILE IS MANAGED BY PUPPET -### puppet:///files/apache/sites/integration.mediawiki.org +### puppet:///modules/contint/apache/integration.mediawiki.org # # vim: filetype=apache diff --git a/modules/contint/files/apache/integration.wikimedia.org b/modules/contint/files/apache/integration.wikimedia.org index d6547e3..94e5e49 100644 --- a/modules/contint/files/apache/integration.wikimedia.org +++ b/modules/contint/files/apache/integration.wikimedia.org @@ -1,6 +1,6 @@ # ### THIS FILE IS MANAGED BY PUPPET -### puppet:///files/apache/sites/integration.wikimedia.org +### puppet:///modules/contint/apache/integration.wikimedia.org # # vim: filetype=apache diff --git a/modules/contint/files/apache/proxy_jenkins b/modules/contint/files/apache/proxy_jenkins index 79d0e40..1b5b1dd 100644 --- a/modules/contint/files/apache/proxy_jenkins +++ b/modules/contint/files/apache/proxy_jenkins @@ -1,3 +1,7 @@ +# +### THIS FILE IS MANAGED BY PUPPET +### puppet:///modules/contint/apache/proxy_jenkins +# # vim: filetype=apache ProxyPass /ci http://localhost:8080/ci diff --git a/modules/contint/files/apache/proxy_zuul b/modules/contint/files/apache/proxy_zuul index 2ab9a6e..8b338cd 100644 --- a/modules/contint/files/apache/proxy_zuul +++ b/modules/contint/files/apache/proxy_zuul @@ -1,3 +1,7 @@ +# +### THIS FILE IS MANAGED BY PUPPET +### puppet:///modules/contint/apache/proxy_zuul +# # vim: filetype=apache ProxyPass /zuul/ http://localhost:8001/ diff --git a/modules/contint/files/apache/qunit.localhost b/modules/contint/files/apache/qunit.localhost index 820ebe0..9181fe9 100644 --- a/modules/contint/files/apache/qunit.localhost +++ b/modules/contint/files/apache/qunit.localhost @@ -1,6 +1,6 @@ # ### THIS FILE IS MANAGED BY PUPPET -### puppet:///files/apache/sites/qunit.localhost +### puppet:///modules/contint/apache/qunit.localhost # # vim: filetype=apache -- To view, visit https://gerrit.wikimedia.org/r/54465 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ifc0ac44548d3e7e212b0bc33221c92611eee89d9 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Hashar has...@free.fr Gerrit-Reviewer: Faidon fai...@wikimedia.org 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 GEOIP_MMAP_CACHE instead of GEOIP_MEMORY_CACHE - change (operations/puppet)
Mark Bergsma has submitted this change and it was merged.
Change subject: Use GEOIP_MMAP_CACHE instead of GEOIP_MEMORY_CACHE
..
Use GEOIP_MMAP_CACHE instead of GEOIP_MEMORY_CACHE
Let's see how this affects memory usage...
Change-Id: I76e376aa81f7b1f359d6ea1ef7a471ac9de7869a
---
M templates/varnish/geoip.inc.vcl.erb
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Mark Bergsma: Looks good to me, approved
jenkins-bot: Verified
diff --git a/templates/varnish/geoip.inc.vcl.erb
b/templates/varnish/geoip.inc.vcl.erb
index cfbac67..c5d2d68 100644
--- a/templates/varnish/geoip.inc.vcl.erb
+++ b/templates/varnish/geoip.inc.vcl.erb
@@ -25,7 +25,7 @@
GeoIP *gi;
void geo_init () {
if (!gi) {
- gi = GeoIP_open(/usr/share/GeoIP/GeoIPCity.dat,
GEOIP_MEMORY_CACHE);
+ gi = GeoIP_open(/usr/share/GeoIP/GeoIPCity.dat,
GEOIP_MMAP_CACHE);
}
}
getaddrfamily(const char *addr) {
--
To view, visit https://gerrit.wikimedia.org/r/54651
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I76e376aa81f7b1f359d6ea1ef7a471ac9de7869a
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Mark Bergsma m...@wikimedia.org
Gerrit-Reviewer: Mark Bergsma m...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] (bug 25325) fix hiding bot edits - change (mediawiki/core)
Kaligula has uploaded a new change for review.
https://gerrit.wikimedia.org/r/54654
Change subject: (bug 25325) fix hiding bot edits
..
(bug 25325) fix hiding bot edits
I added support for 'wlshow' parameter, which allows to exclude bot/minor/anon
edits from feed watchlist.
Change-Id: Idab489fc017dcf226ea39f2f1766e06064e4ec0a
---
M includes/api/ApiFeedWatchlist.php
1 file changed, 5 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/54/54654/1
diff --git a/includes/api/ApiFeedWatchlist.php
b/includes/api/ApiFeedWatchlist.php
index 6c793b3..529102c 100644
--- a/includes/api/ApiFeedWatchlist.php
+++ b/includes/api/ApiFeedWatchlist.php
@@ -86,6 +86,11 @@
if ( $params['wlexcludeuser'] !== null ) {
$fauxReqArr['wlexcludeuser'] =
$params['wlexcludeuser'];
}
+ // Only list revisions that meet the 'wlshow' criteria
+ if ( $params['wlshow'] !== null ) {
+ $fauxReqArr['wlshow'] = $params['wlshow'];
+ }
+
// Support linking to diffs instead of article
if ( $params['linktodiffs'] ) {
--
To view, visit https://gerrit.wikimedia.org/r/54654
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Idab489fc017dcf226ea39f2f1766e06064e4ec0a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Kaligula winn...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Use consistent timestamps in JobQueueDB to cut risk of timez... - change (mediawiki/core)
Lwelling has uploaded a new change for review.
https://gerrit.wikimedia.org/r/54655
Change subject: Use consistent timestamps in JobQueueDB to cut risk of timezone
confusion
..
Use consistent timestamps in JobQueueDB to cut risk of timezone confusion
Change-Id: Ic486b585d579ea259b8e2c3f16820164702721fd
---
M includes/job/JobQueueDB.php
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/55/54655/1
diff --git a/includes/job/JobQueueDB.php b/includes/job/JobQueueDB.php
index a7a459f..d6ba4b6 100644
--- a/includes/job/JobQueueDB.php
+++ b/includes/job/JobQueueDB.php
@@ -412,7 +412,7 @@
public function recycleAndDeleteStaleJobs() {
global $wgMemc;
- $now = time();
+ $now = wfTimestampNow();
list( $dbw, $scope ) = $this-getMasterDB();
$count = 0; // affected rows
--
To view, visit https://gerrit.wikimedia.org/r/54655
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic486b585d579ea259b8e2c3f16820164702721fd
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Lwelling lwell...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] (#46125) Lua function label(id) that takes an ID and returns... - change (mediawiki...Wikibase)
Daniel Kinzler has submitted this change and it was merged.
Change subject: (#46125) Lua function label(id) that takes an ID and returns
the label in the language of the client Wiki
..
(#46125) Lua function label(id) that takes an ID and returns the label in the
language of the client Wiki
Change-Id: Iecc7cf51ced432d25fb161f3639f791029979f7e
---
M client/resources/mw.wikibase.lua
1 file changed, 13 insertions(+), 6 deletions(-)
Approvals:
Daniel Kinzler: Verified; Looks good to me, approved
jenkins-bot: Checked
diff --git a/client/resources/mw.wikibase.lua b/client/resources/mw.wikibase.lua
index 533fb4d..7139ab8 100644
--- a/client/resources/mw.wikibase.lua
+++ b/client/resources/mw.wikibase.lua
@@ -26,16 +26,23 @@
local wikibase = {}
function wikibase.setupInterface()
- local title = require('mw.title')
- local site = require('mw.site')
local php = mw_interface
mw_interface = nil
- wikibase.getEntity = function()
-id = php.getEntityId(tostring(title.getCurrentTitle().prefixedText))
-if (id == nil) then return nil end
-entity = php.getEntity(id)
+ wikibase.getEntity = function ()
+local id = php.getEntityId( tostring(
mw.title.getCurrentTitle().prefixedText ) )
+if id == nil then return nil end
+local entity = php.getEntity( id )
return entity
end
+ wikibase.label = function ( id )
+local code = mw.language.getContentLanguage():getCode()
+if code == nil then return nil end
+local entity = php.getEntity( id )
+if entity == nil then return nil end
+local label = entity.labels[code]
+if label == nil then return nil end
+return label.value
+ end
mw = mw or {}
mw.wikibase = wikibase
package.loaded['mw.wikibase'] = wikibase
--
To view, visit https://gerrit.wikimedia.org/r/54647
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iecc7cf51ced432d25fb161f3639f791029979f7e
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Jens Ohlig jens.oh...@wikimedia.de
Gerrit-Reviewer: Anomie bjor...@wikimedia.org
Gerrit-Reviewer: Daniel Kinzler daniel.kinz...@wikimedia.de
Gerrit-Reviewer: Denny Vrandecic denny.vrande...@wikimedia.de
Gerrit-Reviewer: Jens Ohlig jens.oh...@wikimedia.de
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] doc.mediawiki.org: Redirect to canonical wikimedia.org and f... - change (operations/puppet)
Faidon has submitted this change and it was merged. Change subject: doc.mediawiki.org: Redirect to canonical wikimedia.org and fix invalid SSL .. doc.mediawiki.org: Redirect to canonical wikimedia.org and fix invalid SSL I don't know since when but apparently doc.mediawiki.org has been registered in addition to doc.wikimedia.org and pointed to the same server, but Apache was never properly configured for it so we were serving duplicate content on these 4 different urls, of which one was causing an invalid certificate error. (http/https)://doc.(mediawiki,wikimedia).org - https://doc.wikimedia.org Bug: 46298 Change-Id: Ideca6e75eb99fde407509acda4057c940bddfb07 --- M files/apache/sites/doc.wikimedia.org 1 file changed, 20 insertions(+), 8 deletions(-) Approvals: Hashar: Looks good to me, but someone else must approve Faidon: Looks good to me, approved jenkins-bot: Verified diff --git a/files/apache/sites/doc.wikimedia.org b/files/apache/sites/doc.wikimedia.org index 60a577f..a9cacba 100644 --- a/files/apache/sites/doc.wikimedia.org +++ b/files/apache/sites/doc.wikimedia.org @@ -5,20 +5,32 @@ # vim: filetype=apache VirtualHost *:80 - ServerAdmin n...@wikimedia.org - ServerName doc.wikimedia.org + ServerName doc.mediawiki.org - DocumentRoot /srv/org/wikimedia/doc - - ErrorLog /var/log/apache2/error.log - LogLevel warn - CustomLog /var/log/apache2/access.log combined + Redirect permanent / https://doc.wikimedia.org/ /VirtualHost VirtualHost *:443 - ServerAdmin n...@wikimedia.org + ServerName doc.mediawiki.org + + SSLEngine on + SSLCertificateFile /etc/ssl/certs/star.mediawiki.org.pem + SSLCertificateKeyFile /etc/ssl/private/star.mediawiki.org.key + SSLCACertificateFile /etc/ssl/certs/RapidSSL_CA.pem + + Redirect permanent / https://doc.wikimedia.org/ +/VirtualHost + +VirtualHost *:80 ServerName doc.wikimedia.org + Redirect permanent / https://doc.wikimedia.org/ +/VirtualHost + +VirtualHost *:443 + ServerName doc.wikimedia.org + ServerAdmin n...@wikimedia.org + DocumentRoot /srv/org/wikimedia/doc ErrorLog /var/log/apache2/error.log -- To view, visit https://gerrit.wikimedia.org/r/54614 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ideca6e75eb99fde407509acda4057c940bddfb07 Gerrit-PatchSet: 3 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Krinkle ttij...@wikimedia.org Gerrit-Reviewer: Andrew Bogott abog...@wikimedia.org Gerrit-Reviewer: Demon ch...@wikimedia.org Gerrit-Reviewer: Dzahn dz...@wikimedia.org Gerrit-Reviewer: Faidon fai...@wikimedia.org Gerrit-Reviewer: Hashar has...@free.fr Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] triggers for mw/ext/DoubleWiki - change (integration/zuul-config)
Hashar has uploaded a new change for review. https://gerrit.wikimedia.org/r/54656 Change subject: triggers for mw/ext/DoubleWiki .. triggers for mw/ext/DoubleWiki Change-Id: I76c74f58a36e25bc824117f5d4a7767f812bd695 --- M layout.yaml 1 file changed, 10 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/integration/zuul-config refs/changes/56/54656/1 diff --git a/layout.yaml b/layout.yaml index 72e6d21..ccae013 100644 --- a/layout.yaml +++ b/layout.yaml @@ -1010,6 +1010,16 @@ - mwext-DismissableSiteNotice-jslint - mwext-DismissableSiteNotice-lint + - name: mediawiki/extensions/DoubleWiki +check: + - mwext-DoubleWiki-merge: +- mwext-DoubleWiki-jslint +- mwext-DoubleWiki-lint +gate-and-submit: + - mwext-DoubleWiki-merge: +- mwext-DoubleWiki-jslint +- mwext-DoubleWiki-lint + - name: mediawiki/extensions/DynamicSidebar check: - mwext-DynamicSidebar-merge: -- To view, visit https://gerrit.wikimedia.org/r/54656 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I76c74f58a36e25bc824117f5d4a7767f812bd695 Gerrit-PatchSet: 1 Gerrit-Project: integration/zuul-config Gerrit-Branch: master Gerrit-Owner: Hashar has...@free.fr ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] triggers for mw/ext/DoubleWiki - change (integration/zuul-config)
Hashar has submitted this change and it was merged. Change subject: triggers for mw/ext/DoubleWiki .. triggers for mw/ext/DoubleWiki Change-Id: I76c74f58a36e25bc824117f5d4a7767f812bd695 --- M layout.yaml 1 file changed, 10 insertions(+), 0 deletions(-) Approvals: Hashar: Verified; Looks good to me, approved diff --git a/layout.yaml b/layout.yaml index 72e6d21..ccae013 100644 --- a/layout.yaml +++ b/layout.yaml @@ -1010,6 +1010,16 @@ - mwext-DismissableSiteNotice-jslint - mwext-DismissableSiteNotice-lint + - name: mediawiki/extensions/DoubleWiki +check: + - mwext-DoubleWiki-merge: +- mwext-DoubleWiki-jslint +- mwext-DoubleWiki-lint +gate-and-submit: + - mwext-DoubleWiki-merge: +- mwext-DoubleWiki-jslint +- mwext-DoubleWiki-lint + - name: mediawiki/extensions/DynamicSidebar check: - mwext-DynamicSidebar-merge: -- To view, visit https://gerrit.wikimedia.org/r/54656 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I76c74f58a36e25bc824117f5d4a7767f812bd695 Gerrit-PatchSet: 1 Gerrit-Project: integration/zuul-config Gerrit-Branch: master Gerrit-Owner: Hashar has...@free.fr Gerrit-Reviewer: Hashar has...@free.fr ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Concistency tweak in preparation for adding extension to tra... - change (mediawiki...AWSSDK)
Raimond Spekking has uploaded a new change for review.
https://gerrit.wikimedia.org/r/54657
Change subject: Concistency tweak in preparation for adding extension to
translatewiki.net
..
Concistency tweak in preparation for adding extension to translatewiki.net
Change-Id: Idfa67096086c23d5cf1e1be9d02bcfec94077105
---
M AWSSDK.i18n.php
1 file changed, 12 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/AWSSDK
refs/changes/57/54657/1
diff --git a/AWSSDK.i18n.php b/AWSSDK.i18n.php
index 55240e3..5ddf35b 100644
--- a/AWSSDK.i18n.php
+++ b/AWSSDK.i18n.php
@@ -1,7 +1,18 @@
?php
+/**
+ * Internationalisation for Amazon Web Services SDK extension
+ *
+ * @file
+ * @ingroup Extensions
+ */
$messages = array();
+/** English */
$messages['en'] = array(
- 'awssdk-desc' = 'This plugin provides extensions with the ability to
use the Amazon Web Services SDK for PHP.'
+ 'awssdk-desc' = 'Plugin for using the Amazon Web Services SDK for PHP'
+);
+
+$messages['qqq'] = array(
+ 'awssdk-desc' = '{{desc}}'
);
\ No newline at end of file
--
To view, visit https://gerrit.wikimedia.org/r/54657
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Idfa67096086c23d5cf1e1be9d02bcfec94077105
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/AWSSDK
Gerrit-Branch: master
Gerrit-Owner: Raimond Spekking raimond.spekk...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] wfProfile fixes: 0543c7b0 added a wfProfileIn() that should... - change (mediawiki/core)
Platonides has uploaded a new change for review.
https://gerrit.wikimedia.org/r/54658
Change subject: wfProfile fixes: 0543c7b0 added a wfProfileIn() that should
have been wfProfileOut() Reorder Http::request() so that wfProfileOut() is at
the same level as the above wfProfileIn() [checked by check-vars]
..
wfProfile fixes:
0543c7b0 added a wfProfileIn() that should have been wfProfileOut()
Reorder Http::request() so that wfProfileOut() is at the same
level as the above wfProfileIn() [checked by check-vars]
Change-Id: Ia91445d792e524b9c570890397f1513af0d8cd73
---
M includes/HttpFunctions.php
1 file changed, 4 insertions(+), 6 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/58/54658/1
diff --git a/includes/HttpFunctions.php b/includes/HttpFunctions.php
index 98d36d3..9e280db 100644
--- a/includes/HttpFunctions.php
+++ b/includes/HttpFunctions.php
@@ -69,14 +69,12 @@
$req = MWHttpRequest::factory( $url, $options );
$status = $req-execute();
+ $content = false;
if ( $status-isOK() ) {
$content = $req-getContent();
- wfProfileOut( __METHOD__ . -$method );
- return $content;
- } else {
- wfProfileOut( __METHOD__ . -$method );
- return false;
}
+ wfProfileOut( __METHOD__ . -$method );
+ return $content;
}
/**
@@ -629,7 +627,7 @@
}
}
- wfProfileIn( __METHOD__ );
+ wfProfileOut( __METHOD__ );
}
/**
--
To view, visit https://gerrit.wikimedia.org/r/54658
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia91445d792e524b9c570890397f1513af0d8cd73
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Platonides platoni...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] pep8 configuration file for poolcounter.py - change (mediawiki...PoolCounter)
Hashar has uploaded a new change for review. https://gerrit.wikimedia.org/r/54659 Change subject: pep8 configuration file for poolcounter.py .. pep8 configuration file for poolcounter.py Change-Id: Ic6f3bb3e09a0399965e0f736499478d4d7661256 --- A .pep8 1 file changed, 6 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/PoolCounter refs/changes/59/54659/1 diff --git a/.pep8 b/.pep8 new file mode 100644 index 000..0f0030d --- /dev/null +++ b/.pep8 @@ -0,0 +1,6 @@ +[pep8] + +# W191 indentation contains tabs +# E128 continuation line under-indented for visual indent +# E501 line too long (87 79 characters) +ignore = W191,E128,E501 -- To view, visit https://gerrit.wikimedia.org/r/54659 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic6f3bb3e09a0399965e0f736499478d4d7661256 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/PoolCounter Gerrit-Branch: master Gerrit-Owner: Hashar has...@free.fr ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] poolcounter.py remove trailing whitespaces - change (mediawiki...PoolCounter)
Hashar has uploaded a new change for review.
https://gerrit.wikimedia.org/r/54660
Change subject: poolcounter.py remove trailing whitespaces
..
poolcounter.py remove trailing whitespaces
Change-Id: Icf33ae7e408cf1fdfcc6035be392e200fa91bc65
---
M poolcounter.py
1 file changed, 35 insertions(+), 35 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/PoolCounter
refs/changes/60/54660/1
diff --git a/poolcounter.py b/poolcounter.py
index dd2da78..0d10cc7 100755
--- a/poolcounter.py
+++ b/poolcounter.py
@@ -15,13 +15,13 @@
badcomm = (1, Bad command or not enough arguments)
nokey = (2, %s No such key acquired by current connection)
haveit = (3, %s Already acquired)
-
+
def __init__(self,error,params=[]):
self.errno=error[0]
self.message=error[1]
self.params=params
pass
-
+
def msg(self):
return ERROR %03d %s\n % (self.errno, self.message %
self.params)
@@ -29,29 +29,29 @@
class CounterDatabase(dict):
Counter database organizes counter objects by their name,
and provides basis for on-demand creation and destruction of counters
-
+
It maps:
1:1 with CounterFactory
1:n with Counter (linked both sides)
def acquireCounter(self, name, client,options={}):
- Acquires (and if needed) creates a counter
+ Acquires (and if needed) creates a counter
for a client, as well as increments counts
-
+
if name not in self:
counter = Counter(name, self)
else:
counter = self[name]
-
- if client in counter:
+
+ if client in counter:
raise Error(Error.haveit, name)
-
+
counter.acquire(client)
return counter
-
+
def releaseCounter(self, name, client, options={}):
Releases, and if necessary, destroys counter object
- try:
+ try:
counter = self[name]
counter[client]
except KeyError:
@@ -62,17 +62,17 @@
class Counter(dict):
- Counter object tracks and counts
+ Counter object tracks and counts
clients that have acquired it
# count is size of dictionary
count = property(fget=len)
age = property(fget = lambda self: int(time.time() - self.init_time))
-
+
def __hash__(self):
- Make this object usable as key in other dictionaries,
+ Make this object usable as key in other dictionaries,
after losing such property by inheriting (dict)
return id(self);
-
+
def __init__(self, name, db):
Register object in supplied database
self.database = db
@@ -84,11 +84,11 @@
Register both client inside counter, and counter at client
self[client] = True
client.counts[self] = True
-
+
def release(self, client):
del self[client]
del client.counts[self]
-
+
if len(self) == 0:
del self.database[self.name]
@@ -98,48 +98,48 @@
def __init__(self):
Initialize counter objects held by a client
self.counts = {}
-
+
def error(self, error, parts=[]):
Write an error, based either on exception message or custom
error tuple
if isinstance(error,Error):
self.transport.write(error.msg())
else:
self.transport.write(ERROR %03d %s\n % (error[0],
error[1] % parts) )
-
+
def connectionMade(self):
- When connection is established, add it to factory
+ When connection is established, add it to factory
public list of connections, and set timeouts
self.factory.conns[self] = True
self.setTimeout(300)
-
+
def lineReceived(self,line):
Process the request line, and invoke necessary actions
-
+
request = line.split()
-
+
self.resetTimeout()
self.factory.stats_requests += 1
-
+
# Development, debugging and introspection functions
if (len(request)=1):
- if len(request) == 0:
+ if len(request) == 0:
pass
elif request[0] == quit:
[MediaWiki-commits] [Gerrit] poolcounter.py cleanup source file - change (mediawiki...PoolCounter)
Hashar has uploaded a new change for review.
https://gerrit.wikimedia.org/r/54661
Change subject: poolcounter.py cleanup source file
..
poolcounter.py cleanup source file
Mostly whitespace missing around operator or extra whitespaces near
parentheses.
Change-Id: Ib2d6e5864b8cfd49d67fc1bd38dc49941312f7a9
---
M poolcounter.py
1 file changed, 28 insertions(+), 27 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/PoolCounter
refs/changes/61/54661/1
diff --git a/poolcounter.py b/poolcounter.py
index 0d10cc7..b66049d 100755
--- a/poolcounter.py
+++ b/poolcounter.py
@@ -9,17 +9,18 @@
import time
-port=7531
+port = 7531
+
class Error:
badcomm = (1, Bad command or not enough arguments)
nokey = (2, %s No such key acquired by current connection)
haveit = (3, %s Already acquired)
- def __init__(self,error,params=[]):
- self.errno=error[0]
- self.message=error[1]
- self.params=params
+ def __init__(self, error, params=[]):
+ self.errno = error[0]
+ self.message = error[1]
+ self.params = params
pass
def msg(self):
@@ -34,7 +35,7 @@
1:1 with CounterFactory
1:n with Counter (linked both sides)
- def acquireCounter(self, name, client,options={}):
+ def acquireCounter(self, name, client, options={}):
Acquires (and if needed) creates a counter
for a client, as well as increments counts
@@ -66,12 +67,12 @@
clients that have acquired it
# count is size of dictionary
count = property(fget=len)
- age = property(fget = lambda self: int(time.time() - self.init_time))
+ age = property(fget=lambda self: int(time.time() - self.init_time))
def __hash__(self):
Make this object usable as key in other dictionaries,
after losing such property by inheriting (dict)
- return id(self);
+ return id(self)
def __init__(self, name, db):
Register object in supplied database
@@ -93,7 +94,7 @@
del self.database[self.name]
-class CounterClient(basic.LineReceiver,policies.TimeoutMixin):
+class CounterClient(basic.LineReceiver, policies.TimeoutMixin):
Counter protocol, basic functions and connection tracking
def __init__(self):
Initialize counter objects held by a client
@@ -101,10 +102,10 @@
def error(self, error, parts=[]):
Write an error, based either on exception message or custom
error tuple
- if isinstance(error,Error):
+ if isinstance(error, Error):
self.transport.write(error.msg())
else:
- self.transport.write(ERROR %03d %s\n % (error[0],
error[1] % parts) )
+ self.transport.write(ERROR %03d %s\n % (error[0],
error[1] % parts))
def connectionMade(self):
When connection is established, add it to factory
@@ -112,7 +113,7 @@
self.factory.conns[self] = True
self.setTimeout(300)
- def lineReceived(self,line):
+ def lineReceived(self, line):
Process the request line, and invoke necessary actions
request = line.split()
@@ -121,19 +122,19 @@
self.factory.stats_requests += 1
# Development, debugging and introspection functions
- if (len(request)=1):
+ if (len(request) = 1):
if len(request) == 0:
pass
elif request[0] == quit:
self.transport.loseConnection()
# Show counts acquired by connections
elif request[0] == conns:
- self.transport.write( str([(k, [c.name for c in
k.counts])
- for k in self.factory.conns])+\n)
+ self.transport.write(str([(k, [c.name for c in
k.counts])
+ for k in self.factory.conns]) + \n)
# Show counter values
elif request[0] == counts:
- self.transport.write(str([(k,v.count) for k,v in
- self.factory.database.items()])+ \n)
+ self.transport.write(str([(k, v.count) for k, v
in
+ self.factory.database.items()]) + \n)
# Just die :)
elif request[0] == die:
reactor.stop()
@@ -166,7 +167,7 @@
except Error, e:
[MediaWiki-commits] [Gerrit] General cleanup/fixes - change (mediawiki...ArticleFeedbackv5)
Matthias Mullie has submitted this change and it was merged.
Change subject: General cleanup/fixes
..
General cleanup/fixes
* Fix unittests
* logging table is not available, so make sure it isn't called
* don't query cluster for data; unittests assume local $this-db
* Fix data merge script
* add archive action (although previously non-existant)
* i18n log_title
* Fix cache purge script
* incorrect cache key name was used; use dedicated method instead
* Cleanup flagger
* route all log calls to new -log() function (instead of calling other
class directly, multiple times)
Change-Id: I6254fbcc8a1579d797974a934da6b787df949400
---
M ArticleFeedbackv5.flagging.php
M ArticleFeedbackv5.i18n.php
M ArticleFeedbackv5.model.php
M data/maintenance/DataModelPurgeCache.php
M maintenance/legacyToShard.php
M tests/ArticleFeedbackv5ModelTest.php
6 files changed, 216 insertions(+), 160 deletions(-)
Approvals:
Matthias Mullie: Verified; Looks good to me, approved
jenkins-bot: Checked
diff --git a/ArticleFeedbackv5.flagging.php b/ArticleFeedbackv5.flagging.php
index 8d76668..576ec43 100644
--- a/ArticleFeedbackv5.flagging.php
+++ b/ArticleFeedbackv5.flagging.php
@@ -63,7 +63,7 @@
*
* @var int
*/
- private $logId = null;
+ private $logId;
/**
* Constructor
@@ -150,6 +150,25 @@
}
/**
+* Log the performed action
+*
+* @param string $action
+* @param int $pageId
+* @param mixed $feedbackId
+* @param string $comment
+* @param User $user
+* @return int
+*/
+ protected function log( $action, $pageId, $feedbackId, $comment, User
$user ) {
+ $params = array();
+ if ( $this-source ) {
+ $params['source'] = $this-source;
+ }
+
+ return ArticleFeedbackv5Activity::log( $action, $pageId,
$feedbackId, $comment, $user, $params );
+ }
+
+ /**
* Flag: request oversight
*
* This flag allows monitors (who can hide feedback but not delete it)
to
@@ -159,7 +178,7 @@
* @param $togglebool whether to toggle the flag
* @return array|bool
*/
- private function request( $notes, $toggle ) {
+ public function request( $notes, $toggle ) {
// already requested?
if ( $this-feedback-isRequested() ) {
$this-error =
'articlefeedbackv5-invalid-feedback-state';
@@ -168,7 +187,7 @@
$this-feedback-aft_request = 1;
$this-feedback-aft_decline = 0;
- $this-logId = ArticleFeedbackv5Activity::log( __FUNCTION__,
$this-feedback-aft_page, $this-feedback-aft_id, $notes, $this-user, array(
'source' = $this-source ) );
+ $this-logId = $this-log( __FUNCTION__,
$this-feedback-aft_page, $this-feedback-aft_id, $notes, $this-user );
// autohide if not yet hidden
if ( !$this-feedback-isHidden() ) {
@@ -178,7 +197,7 @@
*/
$this-feedback-aft_hide = 1;
$this-feedback-aft_autohide = 1;
- ArticleFeedbackv5Activity::log( 'autohide',
$this-feedback-aft_page, $this-feedback-aft_id, 'Automatic hide',
$this-user, array( 'source' = $this-source ) );
+ $this-log( 'autohide', $this-feedback-aft_page,
$this-feedback-aft_id, 'Automatic hide', $this-user );
}
// send an email to oversighter(s)
@@ -194,7 +213,7 @@
* @param $togglebool whether to toggle the flag
* @return array|bool
*/
- private function unrequest( $notes, $toggle ) {
+ public function unrequest( $notes, $toggle ) {
// not yet requested?
if ( !$this-feedback-isRequested() ) {
$this-error =
'articlefeedbackv5-invalid-feedback-state';
@@ -202,13 +221,13 @@
}
$this-feedback-aft_request = 0;
- $this-logId = ArticleFeedbackv5Activity::log( __FUNCTION__,
$this-feedback-aft_page, $this-feedback-aft_id, $notes, $this-user, array(
'source' = $this-source ) );
+ $this-logId = $this-log( __FUNCTION__,
$this-feedback-aft_page, $this-feedback-aft_id, $notes, $this-user );
// un-hide if autohidden
if ( $this-feedback-aft_hide $this-feedback-aft_autohide
) {
$this-feedback-aft_hide = 0;
$this-feedback-aft_autohide = 0;
- ArticleFeedbackv5Activity::log( 'unhide',
$this-feedback-aft_page, $this-feedback-aft_id, 'Automatic un-hide',
$this-user, array( 'source' = $this-source ) );
+ $this-log( 'unhide',
[MediaWiki-commits] [Gerrit] Rename i18n file with the magic words for consistency - change (mediawiki...Josa)
Raimond Spekking has uploaded a new change for review. https://gerrit.wikimedia.org/r/54662 Change subject: Rename i18n file with the magic words for consistency .. Rename i18n file with the magic words for consistency Clarify magic word definition for 'en' Real i18n file will be added in a separate patch Change-Id: I828869cd10c311ed3fa73950403c4d243f42152e --- A Josa.i18n.magic.php D Josa.i18n.php M Josa.php 3 files changed, 25 insertions(+), 25 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Josa refs/changes/62/54662/1 diff --git a/Josa.i18n.magic.php b/Josa.i18n.magic.php new file mode 100644 index 000..bcb9121 --- /dev/null +++ b/Josa.i18n.magic.php @@ -0,0 +1,24 @@ +?php +$magicWords = array(); + +$magicWords['en'] = array( + 'EulRuel' = array ( 0, 'EulRuel' ), + 'EunNeun' = array( 0, 'EunNeun' ), + 'IGa' = array( 0, 'IGa' ), + 'GwaWa' = array( 0, 'GwaWa' ), + 'AYa' = array( 0, 'AYa' ), + 'I' = array( 0, 'I' ), + 'Eu' = array( 0, 'Eu' ), + 'HaveTail' = array( 0, 'HaveTail' ), +); + +$magicWords['ko'] = array( + 'EulRuel' = array ( 0, '을를' ), + 'EunNeun' = array( 0, '은는' ), + 'IGa' = array( 0, '이가' ), + 'GwaWa' = array( 0, '과와' ), + 'AYa' = array( 0, '아야' ), + 'I' = array( 0, '이' ), + 'Eu' = array( 0, '으' ), + 'HaveTail' = array( 0, '받침유무' ), +); diff --git a/Josa.i18n.php b/Josa.i18n.php deleted file mode 100644 index 92179be..000 --- a/Josa.i18n.php +++ /dev/null @@ -1,24 +0,0 @@ -?php -$magicWords = array(); - -$magicWords['en'] = array( - '을를' = array ( 0, 'EulRuel' ), - '은는' = array( 0, 'EunNeun' ), - '이가' = array( 0, 'IGa' ), - '과와' = array( 0, 'GwaWa' ), - '아야' = array( 0, 'AYa' ), - '이' = array( 0, 'I' ), - '으' = array( 0, 'Eu' ), - '받침유무' = array( 0, 'HaveTail' ), -); - -$magicWords['ko'] = array( - '을를' = array ( 0, '을를' ), - '은는' = array( 0, '은는' ), - '이가' = array( 0, '이가' ), - '과와' = array( 0, '과와' ), - '아야' = array( 0, '아야' ), - '이' = array( 0, '이' ), - '으' = array( 0, '으' ), - '받침유무' = array( 0, '받침유무' ), -); diff --git a/Josa.php b/Josa.php index 567b48f..7ce3334 100644 --- a/Josa.php +++ b/Josa.php @@ -20,7 +20,7 @@ 'version' = '0.1', ); $wgHooks['ParserFirstCallInit'][] = 'JosaPFSetup'; -$wgExtensionMessagesFiles['Josa'] = dirname( __FILE__ ) . '/Josa.i18n.php'; +$wgExtensionMessagesFiles['JosaMagic'] = dirname( __FILE__ ) . '/Josa.i18n.magic.php'; $Josa = array( 'ER' = array( '을', '를', '을(를)' ), -- To view, visit https://gerrit.wikimedia.org/r/54662 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I828869cd10c311ed3fa73950403c4d243f42152e Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Josa Gerrit-Branch: master Gerrit-Owner: Raimond Spekking raimond.spekk...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] job mwext-PoolCounter-pep8 - change (integration/jenkins-job-builder-config)
Hashar has uploaded a new change for review.
https://gerrit.wikimedia.org/r/54663
Change subject: job mwext-PoolCounter-pep8
..
job mwext-PoolCounter-pep8
Change-Id: I7866512b7aaad82b8a4e839c0d1f09247638878d
---
M mediawiki-extensions.yaml
1 file changed, 4 insertions(+), 0 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/integration/jenkins-job-builder-config
refs/changes/63/54663/1
diff --git a/mediawiki-extensions.yaml b/mediawiki-extensions.yaml
index 1352bd6..a384919 100644
--- a/mediawiki-extensions.yaml
+++ b/mediawiki-extensions.yaml
@@ -375,6 +375,10 @@
- '{name}-{ext-name}-pep8':
name: mwext
+ext-name: PoolCounter
+
+ - '{name}-{ext-name}-pep8':
+name: mwext
ext-name: SemanticBundle
- '{name}-{ext-name}-pep8':
--
To view, visit https://gerrit.wikimedia.org/r/54663
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I7866512b7aaad82b8a4e839c0d1f09247638878d
Gerrit-PatchSet: 1
Gerrit-Project: integration/jenkins-job-builder-config
Gerrit-Branch: master
Gerrit-Owner: Hashar has...@free.fr
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] job mwext-PoolCounter-pep8 - change (integration/jenkins-job-builder-config)
Hashar has submitted this change and it was merged.
Change subject: job mwext-PoolCounter-pep8
..
job mwext-PoolCounter-pep8
Change-Id: I7866512b7aaad82b8a4e839c0d1f09247638878d
---
M mediawiki-extensions.yaml
1 file changed, 4 insertions(+), 0 deletions(-)
Approvals:
Hashar: Verified; Looks good to me, approved
diff --git a/mediawiki-extensions.yaml b/mediawiki-extensions.yaml
index 1352bd6..a384919 100644
--- a/mediawiki-extensions.yaml
+++ b/mediawiki-extensions.yaml
@@ -375,6 +375,10 @@
- '{name}-{ext-name}-pep8':
name: mwext
+ext-name: PoolCounter
+
+ - '{name}-{ext-name}-pep8':
+name: mwext
ext-name: SemanticBundle
- '{name}-{ext-name}-pep8':
--
To view, visit https://gerrit.wikimedia.org/r/54663
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I7866512b7aaad82b8a4e839c0d1f09247638878d
Gerrit-PatchSet: 1
Gerrit-Project: integration/jenkins-job-builder-config
Gerrit-Branch: master
Gerrit-Owner: Hashar has...@free.fr
Gerrit-Reviewer: Hashar has...@free.fr
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] triggers for mw/ext/PoolCounter - change (integration/zuul-config)
Hashar has uploaded a new change for review. https://gerrit.wikimedia.org/r/54664 Change subject: triggers for mw/ext/PoolCounter .. triggers for mw/ext/PoolCounter Still need to test out the C code. bug: 46261 Change-Id: Ibd77e196c8f1750a8488e540dab0f20fef88aff5 --- M layout.yaml 1 file changed, 12 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/integration/zuul-config refs/changes/64/54664/1 diff --git a/layout.yaml b/layout.yaml index ccae013..e6a21f8 100644 --- a/layout.yaml +++ b/layout.yaml @@ -1759,6 +1759,18 @@ - mwext-Poem-jslint - mwext-Poem-lint + - name: mediawiki/extensions/PoolCounter +check: + - mwext-PoolCounter-merge: +- mwext-PoolCounter-jslint +- mwext-PoolCounter-lint +- mwext-PoolCounter-pep8 +gate-and-submit: + - mwext-PoolCounter-merge: +- mwext-PoolCounter-jslint +- mwext-PoolCounter-lint +- mwext-PoolCounter-pep8 + - name: mediawiki/extensions/PostEdit check: - mwext-PostEdit-merge: -- To view, visit https://gerrit.wikimedia.org/r/54664 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ibd77e196c8f1750a8488e540dab0f20fef88aff5 Gerrit-PatchSet: 1 Gerrit-Project: integration/zuul-config Gerrit-Branch: master Gerrit-Owner: Hashar has...@free.fr ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] triggers for mw/ext/PoolCounter - change (integration/zuul-config)
Hashar has submitted this change and it was merged. Change subject: triggers for mw/ext/PoolCounter .. triggers for mw/ext/PoolCounter Still need to test out the C code. bug: 46261 Change-Id: Ibd77e196c8f1750a8488e540dab0f20fef88aff5 --- M layout.yaml 1 file changed, 12 insertions(+), 0 deletions(-) Approvals: Hashar: Verified; Looks good to me, approved diff --git a/layout.yaml b/layout.yaml index ccae013..e6a21f8 100644 --- a/layout.yaml +++ b/layout.yaml @@ -1759,6 +1759,18 @@ - mwext-Poem-jslint - mwext-Poem-lint + - name: mediawiki/extensions/PoolCounter +check: + - mwext-PoolCounter-merge: +- mwext-PoolCounter-jslint +- mwext-PoolCounter-lint +- mwext-PoolCounter-pep8 +gate-and-submit: + - mwext-PoolCounter-merge: +- mwext-PoolCounter-jslint +- mwext-PoolCounter-lint +- mwext-PoolCounter-pep8 + - name: mediawiki/extensions/PostEdit check: - mwext-PostEdit-merge: -- To view, visit https://gerrit.wikimedia.org/r/54664 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ibd77e196c8f1750a8488e540dab0f20fef88aff5 Gerrit-PatchSet: 1 Gerrit-Project: integration/zuul-config Gerrit-Branch: master Gerrit-Owner: Hashar has...@free.fr Gerrit-Reviewer: Hashar has...@free.fr ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] remove mwext-PoolCounter-pep8 - change (integration/zuul-config)
Hashar has uploaded a new change for review. https://gerrit.wikimedia.org/r/54665 Change subject: remove mwext-PoolCounter-pep8 .. remove mwext-PoolCounter-pep8 The PoolCounter extension only has one python file which is obsolete since it has been rewritten to C. Change-Id: Id4b8b1779e31eff1641b8f89d6c19443b91e6dad --- M layout.yaml 1 file changed, 0 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/integration/zuul-config refs/changes/65/54665/1 diff --git a/layout.yaml b/layout.yaml index e6a21f8..4dcef32 100644 --- a/layout.yaml +++ b/layout.yaml @@ -1764,12 +1764,10 @@ - mwext-PoolCounter-merge: - mwext-PoolCounter-jslint - mwext-PoolCounter-lint -- mwext-PoolCounter-pep8 gate-and-submit: - mwext-PoolCounter-merge: - mwext-PoolCounter-jslint - mwext-PoolCounter-lint -- mwext-PoolCounter-pep8 - name: mediawiki/extensions/PostEdit check: -- To view, visit https://gerrit.wikimedia.org/r/54665 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id4b8b1779e31eff1641b8f89d6c19443b91e6dad Gerrit-PatchSet: 1 Gerrit-Project: integration/zuul-config Gerrit-Branch: master Gerrit-Owner: Hashar has...@free.fr ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] remove mwext-PoolCounter-pep8 - change (integration/zuul-config)
Hashar has submitted this change and it was merged. Change subject: remove mwext-PoolCounter-pep8 .. remove mwext-PoolCounter-pep8 The PoolCounter extension only has one python file which is obsolete since it has been rewritten to C. Change-Id: Id4b8b1779e31eff1641b8f89d6c19443b91e6dad --- M layout.yaml 1 file changed, 0 insertions(+), 2 deletions(-) Approvals: Hashar: Verified; Looks good to me, approved diff --git a/layout.yaml b/layout.yaml index e6a21f8..4dcef32 100644 --- a/layout.yaml +++ b/layout.yaml @@ -1764,12 +1764,10 @@ - mwext-PoolCounter-merge: - mwext-PoolCounter-jslint - mwext-PoolCounter-lint -- mwext-PoolCounter-pep8 gate-and-submit: - mwext-PoolCounter-merge: - mwext-PoolCounter-jslint - mwext-PoolCounter-lint -- mwext-PoolCounter-pep8 - name: mediawiki/extensions/PostEdit check: -- To view, visit https://gerrit.wikimedia.org/r/54665 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Id4b8b1779e31eff1641b8f89d6c19443b91e6dad Gerrit-PatchSet: 1 Gerrit-Project: integration/zuul-config Gerrit-Branch: master Gerrit-Owner: Hashar has...@free.fr Gerrit-Reviewer: Hashar has...@free.fr Gerrit-Reviewer: Platonides platoni...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] (#46126) Lua function sitelink(id) that returns the link wit... - change (mediawiki...Wikibase)
Jens Ohlig has uploaded a new change for review.
https://gerrit.wikimedia.org/r/54666
Change subject: (#46126) Lua function sitelink(id) that returns the link with
the element
..
(#46126) Lua function sitelink(id) that returns the link with the element
Change-Id: I675ad7072572c25569da41332ae4e9c2c3a3aaea
---
M client/includes/WikibaseLibrary.php
M client/resources/mw.wikibase.lua
2 files changed, 21 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/66/54666/1
diff --git a/client/includes/WikibaseLibrary.php
b/client/includes/WikibaseLibrary.php
index 5cb8fe8..517331f 100644
--- a/client/includes/WikibaseLibrary.php
+++ b/client/includes/WikibaseLibrary.php
@@ -35,6 +35,7 @@
$lib = array(
'getEntity' = array( $this, 'getEntity' ),
'getEntityId' = array( $this, 'getEntityId' )
+ 'getGlobalSiteId' = array( $this, 'getGlobalSiteId' )
);
$this-getEngine()-registerInterface( dirname( __FILE__ ) .
'/../resources/' . 'mw.wikibase.lua', $lib, array() );
}
@@ -103,4 +104,15 @@
return array( $id-getPrefixedId() );
}
+/**
+ * Get global site ID (e.g. enwiki)
+ * This is basically a helper function.
+ * I can see this becoming part of mw.site in the Scribunto extension.
+ *
+ * @since 0.4
+ *
+ */
+public function getGlobalSiteId() {
+return array( \Wikibase\Settings::get( 'siteGlobalID' ) );
+}
}
diff --git a/client/resources/mw.wikibase.lua b/client/resources/mw.wikibase.lua
index 7139ab8..850325b 100644
--- a/client/resources/mw.wikibase.lua
+++ b/client/resources/mw.wikibase.lua
@@ -43,6 +43,15 @@
if label == nil then return nil end
return label.value
end
+ wikibase.sitelink = function ( id )
+local entity = php.getEntity( id )
+if entity == nil then return nil end
+local globalSiteId = php.getGlobalSiteId()
+if globalSiteId == nil then return nil end
+local sitelink = entity.sitelinks[globalSiteId]
+if sitelink == nil then return nil end
+return sitelink.value
+ end
mw = mw or {}
mw.wikibase = wikibase
package.loaded['mw.wikibase'] = wikibase
--
To view, visit https://gerrit.wikimedia.org/r/54666
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I675ad7072572c25569da41332ae4e9c2c3a3aaea
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Jens Ohlig jens.oh...@wikimedia.de
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Revert job mwext-PoolCounter-pep8 - change (integration/jenkins-job-builder-config)
Hashar has submitted this change and it was merged.
Change subject: Revert job mwext-PoolCounter-pep8
..
Revert job mwext-PoolCounter-pep8
The lonely python script has been replaced by C code.
This reverts commit ebc0d171fa8bb6c557e2b223a39895a9da280015
Change-Id: I2b1552e5d26e172f9f4667edcec8b04c015bdc1c
---
M mediawiki-extensions.yaml
1 file changed, 0 insertions(+), 4 deletions(-)
Approvals:
Hashar: Verified; Looks good to me, approved
diff --git a/mediawiki-extensions.yaml b/mediawiki-extensions.yaml
index a384919..1352bd6 100644
--- a/mediawiki-extensions.yaml
+++ b/mediawiki-extensions.yaml
@@ -375,10 +375,6 @@
- '{name}-{ext-name}-pep8':
name: mwext
-ext-name: PoolCounter
-
- - '{name}-{ext-name}-pep8':
-name: mwext
ext-name: SemanticBundle
- '{name}-{ext-name}-pep8':
--
To view, visit https://gerrit.wikimedia.org/r/54667
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I2b1552e5d26e172f9f4667edcec8b04c015bdc1c
Gerrit-PatchSet: 1
Gerrit-Project: integration/jenkins-job-builder-config
Gerrit-Branch: master
Gerrit-Owner: Hashar has...@free.fr
Gerrit-Reviewer: Hashar has...@free.fr
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] entityselector: Instantly closing list of suggestions - change (mediawiki...Wikibase)
Henning Snater has uploaded a new change for review.
https://gerrit.wikimedia.org/r/54668
Change subject: entityselector: Instantly closing list of suggestions
..
entityselector: Instantly closing list of suggestions
When hitting enter on an item in the suggestion list of the entity selector
replacing the search box, the suggestion list will be closed instantly now.
Change-Id: I9f6701f14c32dd14acf28d2c6dcdc27f86257c95
---
M lib/resources/jquery.ui/jquery.ui.suggester.js
M lib/resources/jquery.wikibase/jquery.wikibase.entityselector.js
2 files changed, 2 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/68/54668/1
diff --git a/lib/resources/jquery.ui/jquery.ui.suggester.js
b/lib/resources/jquery.ui/jquery.ui.suggester.js
index 9a59bc1..6454638 100644
--- a/lib/resources/jquery.ui/jquery.ui.suggester.js
+++ b/lib/resources/jquery.ui/jquery.ui.suggester.js
@@ -156,7 +156,7 @@
if ( event.keyCode === $.ui.keyCode.ENTER ) {
if ( self.menu.active ) {
var item =
self.menu.active.data( 'item.autocomplete' );
- if ( item.isCustom
item.customAction ) {
+ if ( item item.isCustom
item.customAction ) {
// Custom actions are
supposed to be suggester-specific. If, for some
// reason, they should
interact with external components, the action(s)
// may trigger custom
events.
diff --git a/lib/resources/jquery.wikibase/jquery.wikibase.entityselector.js
b/lib/resources/jquery.wikibase/jquery.wikibase.entityselector.js
index 1856547..c4bf407 100644
--- a/lib/resources/jquery.wikibase/jquery.wikibase.entityselector.js
+++ b/lib/resources/jquery.wikibase/jquery.wikibase.entityselector.js
@@ -200,6 +200,7 @@
// entity.
event.stopImmediatePropagation();
event.preventDefault();
+
$.ui.autocomplete.prototype.close.call( self );
window.location.href =
self.selectedEntity().url;
return;
}
--
To view, visit https://gerrit.wikimedia.org/r/54668
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I9f6701f14c32dd14acf28d2c6dcdc27f86257c95
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Henning Snater henning.sna...@wikimedia.de
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] (bug 45198) entity selector: Prevent closing of suggestion list - change (mediawiki...Wikibase)
Henning Snater has uploaded a new change for review.
https://gerrit.wikimedia.org/r/54669
Change subject: (bug 45198) entity selector: Prevent closing of suggestion list
..
(bug 45198) entity selector: Prevent closing of suggestion list
List of suggestion will not be closed anymore if there is just one suggestion
left.
Change-Id: Ia7f11d8d0a3c724be9de9b9d562d0667e14c5a50
---
M lib/resources/jquery.wikibase/jquery.wikibase.entityselector.js
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/69/54669/1
diff --git a/lib/resources/jquery.wikibase/jquery.wikibase.entityselector.js
b/lib/resources/jquery.wikibase/jquery.wikibase.entityselector.js
index c4bf407..b719178 100644
--- a/lib/resources/jquery.wikibase/jquery.wikibase.entityselector.js
+++ b/lib/resources/jquery.wikibase/jquery.wikibase.entityselector.js
@@ -362,7 +362,7 @@
this.offset = 0;
this.menu.element.children().remove();
this.menu.refresh();
- } else {
+ } else if ( originalType !== 'programmatic' ) {
// Do not close the list of suggestions when
programmatically selecting an entity
// (e.g by typing an exact, unique entity
label), allowing the user to check that
// the typed string actually matches a single
entity.
--
To view, visit https://gerrit.wikimedia.org/r/54669
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia7f11d8d0a3c724be9de9b9d562d0667e14c5a50
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Henning Snater henning.sna...@wikimedia.de
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Setting up udp2log instance on gadolinium - change (operations/puppet)
Ottomata has uploaded a new change for review.
https://gerrit.wikimedia.org/r/54670
Change subject: Setting up udp2log instance on gadolinium
..
Setting up udp2log instance on gadolinium
Change-Id: I1ec25a210c639e7438102e2546171da1434e6822
---
A files/udp2log/minnesota.awk
A files/udp2log/vu.awk
M manifests/misc/statistics.pp
M manifests/role/logging.pp
M manifests/site.pp
A templates/udp2log/filters.gadolinium.erb
6 files changed, 137 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/70/54670/1
diff --git a/files/udp2log/minnesota.awk b/files/udp2log/minnesota.awk
new file mode 100644
index 000..4830ff6
--- /dev/null
+++ b/files/udp2log/minnesota.awk
@@ -0,0 +1,3 @@
+# University of Minnesota udp2log filter
+
+$5 !~ /^(145\.97\.39\.|66\.230\.200\.|211\.115\.107\.)/ {print $3, $9}
\ No newline at end of file
diff --git a/files/udp2log/vu.awk b/files/udp2log/vu.awk
new file mode 100644
index 000..2b1d715
--- /dev/null
+++ b/files/udp2log/vu.awk
@@ -0,0 +1,11 @@
+# Vrije Universiteit udp2log filter
+
+function savemark(url, code) {
+ if (url ~ /action=submit$/ code == TCP_MISS/302)
+ return save
+ return -
+}
+
+$5 !~ /^(145\.97\.39\.|66\.230\.200\.|211\.115\.107\.)/ {
+ print $3, $9, savemark($9, $6)
+}
diff --git a/manifests/misc/statistics.pp b/manifests/misc/statistics.pp
index bb711dc..c2103c5 100644
--- a/manifests/misc/statistics.pp
+++ b/manifests/misc/statistics.pp
@@ -624,6 +624,7 @@
}
# edit logs from locke
+ # TODO: Move this to gadolinium
misc::statistics::rsync_job { edits:
source = locke.wikimedia.org::udp2log/archive/edits*.gz,
destination = /a/squid/archive/edits,
diff --git a/manifests/role/logging.pp b/manifests/role/logging.pp
index d0cbee1..a5a137d 100644
--- a/manifests/role/logging.pp
+++ b/manifests/role/logging.pp
@@ -64,5 +64,62 @@
ensure = 'link',
target = '/data/project/logs';
}
+}
+
+
+# udp2log base role class
+class role::logging::udp2log {
+ include misc::udp2log,
+ misc::udp2log::utilities
+}
+
+# gadolinium udp2log instance(s)
+class role::logging::udp2log::gadolinum inherits role::logging::udp2log {
+ file { '/a/log':
+ ensure = 'directory',
+ }
+ $log_directory = '/a/log/webrequest'
+
+
+
+ # install custom filters
+ file { $log_directory/bin:
+ ensure = directory,
+ mode = 0755,
+ owner = 'udp2log',
+ group = 'udp2log',
+ }
+ file { $log_directory/bin/vu.awk:
+ ensure = 'file',
+ source = 'puppet:///files/udp2log/vu.awk',
+ mode = 0755,
+ owner = 'udp2log',
+ group = 'udp2log',
+ }
+ file { $log_directory/bin/minnesota.awk:
+ ensure = 'file',
+ source = 'puppet:///files/udp2log/minnesota.awk',
+ mode = 0755,
+ owner = 'udp2log',
+ group = 'udp2log',
+ }
+ # Don't forget:
+ # - 5xx-filter from udplog repository
+ # - webstatscollector filter and collector
+ # These are not puppetized :( :(
+
+ # webrequest udp2log instance
+ misc::udp2log::instance { 'gadolinium':
+ log_directory = $log_directory,
+ require = File['/a/log'],
+ }
+
+ # Set up an rsync daemon module for udp2log logrotated
+ # archives. This allows stat1 to copy logs from the
+ # logrotated archive directory
+ class { 'misc::udp2log::rsyncd':
+ path= $log_directory,
+ require = Misc::Udp2log::Instance['gadolinium'],
+ }
}
diff --git a/manifests/site.pp b/manifests/site.pp
index 436f6c7..7c4079f 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -753,11 +753,23 @@
class { role::ldap::client::labs: ldapincludes = $ldapincludes }
}
+# gadolinium is a webrequest udp2log machine.
+# base_analytics_logging_node is defined in role/logging.pp
node gadolinium.wikimedia.org inherits base_analytics_logging_node {
include
accounts::dsc,
accounts::datasets,
accounts::dandreescu
+
+ sudo_user { 'otto': privileges = ['ALL = NOPASSWD: ALL'] }
+
+ # set up the gadolinum udp2log webrequest instance.
+ include role::logging::udp2log::gadolinium
+
+
+ ## NOTE: This is still on locke.
+ # fundraising banner log pipeline
+ # include misc::fundraising::udp2log_rotation
}
node gallium.wikimedia.org {
@@ -1843,10 +1855,10 @@
sudo_user { otto: privileges = ['ALL = NOPASSWD: ALL'] }
# oxygen's udp2log instance
- # saves logs mainly in /a/squid
+ # saves logs mainly in
[MediaWiki-commits] [Gerrit] Use correct meta data keys in test changes. - change (mediawiki...Wikibase)
Daniel Kinzler has uploaded a new change for review. https://gerrit.wikimedia.org/r/54671 Change subject: Use correct meta data keys in test changes. .. Use correct meta data keys in test changes. Change-Id: Id42f92d2f5ba88cadf8dc0dd931e99543c19eca9 --- M lib/tests/phpunit/changes/TestChanges.php 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase refs/changes/71/54671/1 diff --git a/lib/tests/phpunit/changes/TestChanges.php b/lib/tests/phpunit/changes/TestChanges.php index ba8fc25..9a3f252 100644 --- a/lib/tests/phpunit/changes/TestChanges.php +++ b/lib/tests/phpunit/changes/TestChanges.php @@ -69,8 +69,8 @@ 'info' = array( //NOTE: we no longer put Entity objects into the change, they are just too big. 'metadata' = array( - 'rc_user' = 0, - 'rc_user_text' = '208.80.152.201' + 'user' = 0, + 'user_text' = '208.80.152.201' ) ) ); -- To view, visit https://gerrit.wikimedia.org/r/54671 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id42f92d2f5ba88cadf8dc0dd931e99543c19eca9 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Wikibase Gerrit-Branch: master Gerrit-Owner: Daniel Kinzler daniel.kinz...@wikimedia.de ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] contint: libevent-dev on gallium - change (operations/puppet)
Hashar has uploaded a new change for review. https://gerrit.wikimedia.org/r/54672 Change subject: contint: libevent-dev on gallium .. contint: libevent-dev on gallium libevent-dev is required to build the PoolCounter C daemon. That is the only dependency according to its debian/control file. bug: 46261 Change-Id: Iabaff606898c5257efe19d6a4ab3c953ca9a174c --- M modules/contint/manifests/packages.pp 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/72/54672/1 diff --git a/modules/contint/manifests/packages.pp b/modules/contint/manifests/packages.pp index 3b95139..3e00d53 100644 --- a/modules/contint/manifests/packages.pp +++ b/modules/contint/manifests/packages.pp @@ -59,6 +59,7 @@ 'pylint', 'luajit', +'libevent-dev', # PoolCounter daemon 'liblua5.1-0-dev', 'g++', 'libthai-dev', -- To view, visit https://gerrit.wikimedia.org/r/54672 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iabaff606898c5257efe19d6a4ab3c953ca9a174c Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Hashar has...@free.fr ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] contint: libevent-dev on gallium - change (operations/puppet)
Faidon has submitted this change and it was merged. Change subject: contint: libevent-dev on gallium .. contint: libevent-dev on gallium libevent-dev is required to build the PoolCounter C daemon. That is the only dependency according to its debian/control file. bug: 46261 Change-Id: Iabaff606898c5257efe19d6a4ab3c953ca9a174c --- M modules/contint/manifests/packages.pp 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Faidon: Looks good to me, approved jenkins-bot: Verified diff --git a/modules/contint/manifests/packages.pp b/modules/contint/manifests/packages.pp index 3b95139..3e00d53 100644 --- a/modules/contint/manifests/packages.pp +++ b/modules/contint/manifests/packages.pp @@ -59,6 +59,7 @@ 'pylint', 'luajit', +'libevent-dev', # PoolCounter daemon 'liblua5.1-0-dev', 'g++', 'libthai-dev', -- To view, visit https://gerrit.wikimedia.org/r/54672 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iabaff606898c5257efe19d6a4ab3c953ca9a174c Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Hashar has...@free.fr Gerrit-Reviewer: Faidon fai...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] extract2.php: Clean up old code. - change (operations/mediawiki-config)
jenkins-bot has submitted this change and it was merged.
Change subject: extract2.php: Clean up old code.
..
extract2.php: Clean up old code.
- The _portals are no longer used. Some of them still exist
on meta.wikimedia.org but only with content like
This is no longer used or {{Historical}} etc.
extract2.php was still parsing these on every request and doing
a pointless string search/replace.
- The text/plain header is broken, PHP outputs text/html instead
because it somehow called header() with the value as second
argument, which is an incorrect invokation.
- Secure.wikimedia.org should no longer be exposed.
- Whitespace, single quotes, commented out code.
Bug: 38167
Change-Id: Ib77f5312e7667ce2ebc074172a12ad3c5efb3a13
---
M extract2.php
1 file changed, 21 insertions(+), 47 deletions(-)
Approvals:
Krinkle: Looks good to me, approved
jenkins-bot: Verified
diff --git a/extract2.php b/extract2.php
index 6ad6e12..5d18dfa 100644
--- a/extract2.php
+++ b/extract2.php
@@ -1,61 +1,35 @@
?php
-header(Content-Type: text/html; charset=utf-8);
-$lang = meta;
+$lang = 'meta';
putenv( MW_LANG={$lang} ); // notify MWMultiVersion
-define( MEDIAWIKI, true );
-#include_once(CommonSettings.php);
-#include_once(/apache/common/wmf-deployment/includes/ProfileStub.php );
-#include_once(/apache/common/wmf-deployment/includes/Defines.php );
-#include_once(/apache/common/wmf-deployment/wmf-config/CommonSettings.php);
-#include_once(/apache/common/wmf-deployment/includes/Setup.php);
+define( 'MEDIAWIKI', true );
-#include_once(/apache/common/wmf-deployment/includes/WebStart.php);
+include '/apache/common/live-1.5/MWVersion.php';
+include getMediaWiki( 'includes/WebStart.php' );
-include /apache/common/live-1.5/MWVersion.php;
-include getMediaWiki(includes/WebStart.php);
-
-$allowed_portals = array(
- Www.wikipedia.org_portal,
- Www.wikinews.org_portal,
- Www.wiktionary.org_portal,
- Www.wikiquote.org_portal,
- Www.wikimedia.org_portal,
- Www.wikiversity.org_portal,
- Www.wikibooks.org_portal,
- Secure.wikimedia.org_portal,
- Www.wikivoyage.org_portal,
-);
$allowed_templates = array(
- Www.wikipedia.org_template,
- Www.wikinews.org_template,
- Www.wiktionary.org_template,
- Www.wikiquote.org_template,
- Www.wikimedia.org_template,
- Www.wikiversity.org_template,
- Www.wikibooks.org_template,
- Secure.wikimedia.org_template,
- Www.wikivoyage.org_template,
+ 'Www.wikimedia.org_template',
+ 'Www.wikipedia.org_template',
+ 'Www.wikinews.org_template',
+ 'Www.wiktionary.org_template',
+ 'Www.wikiquote.org_template',
+ 'Www.wikiversity.org_template',
+ 'Www.wikibooks.org_template',
+ 'Www.wikivoyage.org_template',
);
-$useportal = $wgRequest-getText( 'title', 'Www.wikipedia.org_portal' );
-$usetemplate = $wgRequest-getText( 'template', 'Www.wikipedia.org_template' );
-if (!in_array($useportal, $allowed_portals) || !in_array($usetemplate,
$allowed_templates)) {
- header(Content-Type, text/plain; charset=US-ASCII);
- echo sorry...;
+$template = $wgRequest-getText( 'template', 'Www.wikipedia.org_template' );
+if ( !in_array( $template, $allowed_templates ) ) {
+ header( 'Content-Type: text/plain; charset=utf-8' );
+ echo 'Invalid parameters...';
exit;
}
-$wgTitle = Title::newFromText( $useportal );
+$wgTitle = Title::newFromText( $template );
$wgArticle = new Article( $wgTitle );
-$mainText = $wgOut-parse( $wgArticle-getContent( false ) );
+$rawHtml = $wgArticle-getContent( false );
-$templateTitle = Title::newFromText( $usetemplate );
-$templateArticle = new Article( $templateTitle );
-$templateText = $templateArticle-getContent( false );
-$text = str_replace( '$1', $mainText, $templateText );
-
-$lastmod = gmdate( 'D, j M Y H:i:s', wfTimestamp(TS_UNIX, max(
$wgArticle-getTouched(), $templateArticle-getTouched() ) ) ) . ' GMT';
+$lastmod = gmdate( 'D, j M Y H:i:s', wfTimestamp( TS_UNIX,
$wgArticle-getTouched() ) ) . ' GMT';
+header( 'Content-Type: text/html; charset=utf-8' );
header( 'Cache-Control: s-maxage=3600, must-revalidate, max-age=0' );
header( Last-modified: $lastmod );
-echo $text;
-
+echo $rawHtml;
--
To view, visit https://gerrit.wikimedia.org/r/54645
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib77f5312e7667ce2ebc074172a12ad3c5efb3a13
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Krinkle ttij...@wikimedia.org
Gerrit-Reviewer: Krinkle ttij...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Setting up udp2log instance on gadolinium - change (operations/puppet)
Ottomata has submitted this change and it was merged.
Change subject: Setting up udp2log instance on gadolinium
..
Setting up udp2log instance on gadolinium
Change-Id: I1ec25a210c639e7438102e2546171da1434e6822
---
A files/udp2log/minnesota.awk
A files/udp2log/vu.awk
M manifests/misc/statistics.pp
M manifests/role/logging.pp
M manifests/site.pp
A templates/udp2log/filters.gadolinium.erb
6 files changed, 132 insertions(+), 2 deletions(-)
Approvals:
Ottomata: Verified; Looks good to me, approved
jenkins-bot: Verified
diff --git a/files/udp2log/minnesota.awk b/files/udp2log/minnesota.awk
new file mode 100644
index 000..4830ff6
--- /dev/null
+++ b/files/udp2log/minnesota.awk
@@ -0,0 +1,3 @@
+# University of Minnesota udp2log filter
+
+$5 !~ /^(145\.97\.39\.|66\.230\.200\.|211\.115\.107\.)/ {print $3, $9}
\ No newline at end of file
diff --git a/files/udp2log/vu.awk b/files/udp2log/vu.awk
new file mode 100644
index 000..2b1d715
--- /dev/null
+++ b/files/udp2log/vu.awk
@@ -0,0 +1,11 @@
+# Vrije Universiteit udp2log filter
+
+function savemark(url, code) {
+ if (url ~ /action=submit$/ code == TCP_MISS/302)
+ return save
+ return -
+}
+
+$5 !~ /^(145\.97\.39\.|66\.230\.200\.|211\.115\.107\.)/ {
+ print $3, $9, savemark($9, $6)
+}
diff --git a/manifests/misc/statistics.pp b/manifests/misc/statistics.pp
index bb711dc..c2103c5 100644
--- a/manifests/misc/statistics.pp
+++ b/manifests/misc/statistics.pp
@@ -624,6 +624,7 @@
}
# edit logs from locke
+ # TODO: Move this to gadolinium
misc::statistics::rsync_job { edits:
source = locke.wikimedia.org::udp2log/archive/edits*.gz,
destination = /a/squid/archive/edits,
diff --git a/manifests/role/logging.pp b/manifests/role/logging.pp
index d0cbee1..1275f2c 100644
--- a/manifests/role/logging.pp
+++ b/manifests/role/logging.pp
@@ -64,5 +64,60 @@
ensure = 'link',
target = '/data/project/logs';
}
+}
+
+
+# udp2log base role class
+class role::logging::udp2log {
+ include misc::udp2log,
+ misc::udp2log::utilities
+}
+
+# gadolinium udp2log instance(s)
+class role::logging::udp2log::gadolinum inherits role::logging::udp2log {
+ file { '/a/log':
+ ensure = 'directory',
+ }
+ $log_directory = '/a/log/webrequest'
+
+ # install custom filters
+ file { $log_directory/bin:
+ ensure = directory,
+ mode = 0755,
+ owner = 'udp2log',
+ group = 'udp2log',
+ }
+ file { $log_directory/bin/vu.awk:
+ ensure = 'file',
+ source = 'puppet:///files/udp2log/vu.awk',
+ mode = 0755,
+ owner = 'udp2log',
+ group = 'udp2log',
+ }
+ file { $log_directory/bin/minnesota.awk:
+ ensure = 'file',
+ source = 'puppet:///files/udp2log/minnesota.awk',
+ mode = 0755,
+ owner = 'udp2log',
+ group = 'udp2log',
+ }
+ # Don't forget:
+ # - 5xx-filter from udplog repository
+ # - webstatscollector filter and collector
+ # These are not puppetized :( :(
+
+ # webrequest udp2log instance
+ misc::udp2log::instance { 'gadolinium':
+ log_directory = $log_directory,
+ require = File['/a/log'],
+ }
+
+ # Set up an rsync daemon module for udp2log logrotated
+ # archives. This allows stat1 to copy logs from the
+ # logrotated archive directory
+ class { 'misc::udp2log::rsyncd':
+ path= $log_directory,
+ require = Misc::Udp2log::Instance['gadolinium'],
+ }
}
diff --git a/manifests/site.pp b/manifests/site.pp
index 436f6c7..9ec97b5 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -753,11 +753,20 @@
class { role::ldap::client::labs: ldapincludes = $ldapincludes }
}
+# gadolinium is a webrequest udp2log machine.
+# base_analytics_logging_node is defined in role/logging.pp
node gadolinium.wikimedia.org inherits base_analytics_logging_node {
include
accounts::dsc,
accounts::datasets,
accounts::dandreescu
+
+ # set up the gadolinum udp2log webrequest instance.
+ include role::logging::udp2log::gadolinium
+
+ ## NOTE: This is still on locke.
+ # fundraising banner log pipeline
+ # include misc::fundraising::udp2log_rotation
}
node gallium.wikimedia.org {
@@ -1843,10 +1852,10 @@
sudo_user { otto: privileges = ['ALL = NOPASSWD: ALL'] }
# oxygen's udp2log instance
- # saves logs mainly in /a/squid
+ # saves logs mainly in /a/squid.
misc::udp2log::instance { oxygen:
multicast = true,
- # TODO: Move
[MediaWiki-commits] [Gerrit] Turns out gadolinium is hard to type - change (operations/puppet)
Ottomata has uploaded a new change for review.
https://gerrit.wikimedia.org/r/54673
Change subject: Turns out gadolinium is hard to type
..
Turns out gadolinium is hard to type
Change-Id: I55ed55327b6fe1612f1d894a65e1fca86e555138
---
M manifests/role/logging.pp
M manifests/site.pp
2 files changed, 2 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/73/54673/1
diff --git a/manifests/role/logging.pp b/manifests/role/logging.pp
index 1275f2c..881e611 100644
--- a/manifests/role/logging.pp
+++ b/manifests/role/logging.pp
@@ -75,7 +75,7 @@
}
# gadolinium udp2log instance(s)
-class role::logging::udp2log::gadolinum inherits role::logging::udp2log {
+class role::logging::udp2log::gadolinium inherits role::logging::udp2log {
file { '/a/log':
ensure = 'directory',
}
diff --git a/manifests/site.pp b/manifests/site.pp
index 9ec97b5..0396d3a 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -761,7 +761,7 @@
accounts::datasets,
accounts::dandreescu
- # set up the gadolinum udp2log webrequest instance.
+ # set up the gadolinium udp2log webrequest instance.
include role::logging::udp2log::gadolinium
## NOTE: This is still on locke.
--
To view, visit https://gerrit.wikimedia.org/r/54673
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I55ed55327b6fe1612f1d894a65e1fca86e555138
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ottomata o...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Stopgap to avoid excessively long string values (backport) - change (mediawiki...DataValues)
Denny Vrandecic has uploaded a new change for review.
https://gerrit.wikimedia.org/r/54674
Change subject: Stopgap to avoid excessively long string values (backport)
..
Stopgap to avoid excessively long string values (backport)
Change-Id: I9b20d0d4bad5f68cd0cc440ee1995193ecec9abd
---
M DataValues/includes/values/StringValue.php
1 file changed, 12 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/DataValues
refs/changes/74/54674/1
diff --git a/DataValues/includes/values/StringValue.php
b/DataValues/includes/values/StringValue.php
index caacbe5..e23cab1 100644
--- a/DataValues/includes/values/StringValue.php
+++ b/DataValues/includes/values/StringValue.php
@@ -53,6 +53,18 @@
throw new InvalidArgumentException( 'Can only construct
StringValue from strings' );
}
+ // This is backporting the very evil hack I added for the last
deployment as can be found
+ // here:
+ //
https://gerrit.wikimedia.org/r/gitweb?p=mediawiki/extensions/DataValues.git;a=commitdiff;h=8a980bc893824dcf86be51350ede893fe950bce2
+ //
https://gerrit.wikimedia.org/r/gitweb?p=mediawiki/extensions/DataValues.git;a=commitdiff;h=f049d35c3fd8cd69969396238a89e4dc31701f39
+ // It is still very evil. Last time I pledged that I would be
loosing karma for a week.
+ // Since the following I had the unfortunate incident of a
pulled hamstring - which, by
+ // the way, hurts a lot - I will refrain from committing any
new karma this time. I hope
+ // that by the next deployment or two we can get rid of this
terrible hack.
+ if ( mb_strlen( $value ) 400 ) {
+ throw new InvalidArgumentException( 'String length
exceeds limit of 400 characters' );
+ }
+
$this-value = $value;
}
--
To view, visit https://gerrit.wikimedia.org/r/54674
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I9b20d0d4bad5f68cd0cc440ee1995193ecec9abd
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/DataValues
Gerrit-Branch: mw1.21-wmf12
Gerrit-Owner: Denny Vrandecic denny.vrande...@wikimedia.de
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Turns out gadolinium is hard to type - change (operations/puppet)
Ottomata has submitted this change and it was merged.
Change subject: Turns out gadolinium is hard to type
..
Turns out gadolinium is hard to type
Change-Id: I55ed55327b6fe1612f1d894a65e1fca86e555138
---
M manifests/role/logging.pp
M manifests/site.pp
M typos
3 files changed, 3 insertions(+), 2 deletions(-)
Approvals:
Ottomata: Verified; Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/role/logging.pp b/manifests/role/logging.pp
index 1275f2c..881e611 100644
--- a/manifests/role/logging.pp
+++ b/manifests/role/logging.pp
@@ -75,7 +75,7 @@
}
# gadolinium udp2log instance(s)
-class role::logging::udp2log::gadolinum inherits role::logging::udp2log {
+class role::logging::udp2log::gadolinium inherits role::logging::udp2log {
file { '/a/log':
ensure = 'directory',
}
diff --git a/manifests/site.pp b/manifests/site.pp
index 9ec97b5..0396d3a 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -761,7 +761,7 @@
accounts::datasets,
accounts::dandreescu
- # set up the gadolinum udp2log webrequest instance.
+ # set up the gadolinium udp2log webrequest instance.
include role::logging::udp2log::gadolinium
## NOTE: This is still on locke.
diff --git a/typos b/typos
index b1c7b42..5cf20a5 100644
--- a/typos
+++ b/typos
@@ -1 +1,2 @@
pmpta
+gadolinum
--
To view, visit https://gerrit.wikimedia.org/r/54673
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I55ed55327b6fe1612f1d894a65e1fca86e555138
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ottomata o...@wikimedia.org
Gerrit-Reviewer: Ottomata o...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Stopgap to avoid excessively long string values (backport) - change (mediawiki...DataValues)
Jens Ohlig has submitted this change and it was merged.
Change subject: Stopgap to avoid excessively long string values (backport)
..
Stopgap to avoid excessively long string values (backport)
Change-Id: I9b20d0d4bad5f68cd0cc440ee1995193ecec9abd
---
M DataValues/includes/values/StringValue.php
1 file changed, 12 insertions(+), 0 deletions(-)
Approvals:
Jens Ohlig: Verified; Looks good to me, approved
jenkins-bot: Checked
diff --git a/DataValues/includes/values/StringValue.php
b/DataValues/includes/values/StringValue.php
index caacbe5..e23cab1 100644
--- a/DataValues/includes/values/StringValue.php
+++ b/DataValues/includes/values/StringValue.php
@@ -53,6 +53,18 @@
throw new InvalidArgumentException( 'Can only construct
StringValue from strings' );
}
+ // This is backporting the very evil hack I added for the last
deployment as can be found
+ // here:
+ //
https://gerrit.wikimedia.org/r/gitweb?p=mediawiki/extensions/DataValues.git;a=commitdiff;h=8a980bc893824dcf86be51350ede893fe950bce2
+ //
https://gerrit.wikimedia.org/r/gitweb?p=mediawiki/extensions/DataValues.git;a=commitdiff;h=f049d35c3fd8cd69969396238a89e4dc31701f39
+ // It is still very evil. Last time I pledged that I would be
loosing karma for a week.
+ // Since the following I had the unfortunate incident of a
pulled hamstring - which, by
+ // the way, hurts a lot - I will refrain from committing any
new karma this time. I hope
+ // that by the next deployment or two we can get rid of this
terrible hack.
+ if ( mb_strlen( $value ) 400 ) {
+ throw new InvalidArgumentException( 'String length
exceeds limit of 400 characters' );
+ }
+
$this-value = $value;
}
--
To view, visit https://gerrit.wikimedia.org/r/54674
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I9b20d0d4bad5f68cd0cc440ee1995193ecec9abd
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/DataValues
Gerrit-Branch: mw1.21-wmf12
Gerrit-Owner: Denny Vrandecic denny.vrande...@wikimedia.de
Gerrit-Reviewer: Jens Ohlig jens.oh...@wikimedia.de
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Removing GeoMath from submodule list - change (mediawiki/extensions)
Demon has uploaded a new change for review. https://gerrit.wikimedia.org/r/54675 Change subject: Removing GeoMath from submodule list .. Removing GeoMath from submodule list Change-Id: I7d1538b7be66ee7f416c395acbece77848008ff2 --- M .gitmodules D GeoMath 2 files changed, 0 insertions(+), 3 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions refs/changes/75/54675/1 diff --git a/.gitmodules b/.gitmodules index e952917..df56172 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1823,9 +1823,6 @@ [submodule EImage] path = EImage url = https://gerrit.wikimedia.org/r/p/mediawiki/extensions/EImage.git -[submodule GeoMath] - path = GeoMath - url = https://gerrit.wikimedia.org/r/p/mediawiki/extensions/GeoMath.git [submodule GuidedTour] path = GuidedTour url = https://gerrit.wikimedia.org/r/p/mediawiki/extensions/GuidedTour.git diff --git a/GeoMath b/GeoMath deleted file mode 16 index 4c6ce18..000 --- a/GeoMath +++ /dev/null -Subproject commit 4c6ce18419168032d7f1aeeb8454dc5e262a1ffe -- To view, visit https://gerrit.wikimedia.org/r/54675 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I7d1538b7be66ee7f416c395acbece77848008ff2 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions Gerrit-Branch: master Gerrit-Owner: Demon ch...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Removing GeoMath from submodule list - change (mediawiki/extensions)
Demon has submitted this change and it was merged. Change subject: Removing GeoMath from submodule list .. Removing GeoMath from submodule list Change-Id: I7d1538b7be66ee7f416c395acbece77848008ff2 --- M .gitmodules D GeoMath 2 files changed, 0 insertions(+), 3 deletions(-) Approvals: Demon: Verified; Looks good to me, approved diff --git a/.gitmodules b/.gitmodules index e952917..df56172 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1823,9 +1823,6 @@ [submodule EImage] path = EImage url = https://gerrit.wikimedia.org/r/p/mediawiki/extensions/EImage.git -[submodule GeoMath] - path = GeoMath - url = https://gerrit.wikimedia.org/r/p/mediawiki/extensions/GeoMath.git [submodule GuidedTour] path = GuidedTour url = https://gerrit.wikimedia.org/r/p/mediawiki/extensions/GuidedTour.git diff --git a/GeoMath b/GeoMath deleted file mode 16 index 4c6ce18..000 --- a/GeoMath +++ /dev/null -Subproject commit 4c6ce18419168032d7f1aeeb8454dc5e262a1ffe -- To view, visit https://gerrit.wikimedia.org/r/54675 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I7d1538b7be66ee7f416c395acbece77848008ff2 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions Gerrit-Branch: master Gerrit-Owner: Demon ch...@wikimedia.org Gerrit-Reviewer: Demon ch...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix namespace filtering in ChangeChanger. - change (mediawiki...Wikibase)
Daniel Kinzler has uploaded a new change for review.
https://gerrit.wikimedia.org/r/54676
Change subject: Fix namespace filtering in ChangeChanger.
..
Fix namespace filtering in ChangeChanger.
In addition to the actual fix (include/exclude params in the correct order),
thich change includes a number of improvements to debug logging and
error reporting during change handling on the client.
Change-Id: Ib8ac99f762b9aed5f61d62c10bf7706ed70affa8
---
M client/includes/ChangeHandler.php
M client/includes/NamespaceChecker.php
M client/includes/WikiPageUpdater.php
M lib/includes/ChangeNotificationJob.php
M lib/includes/changes/ItemChange.php
M lib/maintenance/dispatchChanges.php
6 files changed, 53 insertions(+), 23 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/76/54676/1
diff --git a/client/includes/ChangeHandler.php
b/client/includes/ChangeHandler.php
index 4ad7741..3aa21ed 100644
--- a/client/includes/ChangeHandler.php
+++ b/client/includes/ChangeHandler.php
@@ -141,8 +141,8 @@
// TODO: allow these to be passed in as parameters!
$this-setNamespaces(
- Settings::get( 'excludeNamespaces' ),
- Settings::get( 'namespaces' )
+ Settings::get( 'namespaces' ),
+ Settings::get( 'excludeNamespaces' )
);
$this-injectRC = Settings::get( 'injectRecentChanges' );
@@ -237,7 +237,10 @@
$minor = true;
$bot = true;
+ $ids = array();
+
foreach ( $changes as $change ) {
+ $ids[] = $change-getId();
$meta = $change-getMetadata();
$minor = isset( $meta['minor'] )
(bool)$meta['minor'];
@@ -289,6 +292,7 @@
) );
$info = $change-hasField( 'info' ) ? $change-getField( 'info'
) : array();
+ $info['change-ids'] = $ids;
$info['changes'] = $changes;
$change-setField( 'info', $info );
@@ -397,6 +401,10 @@
}
usort( $coalesced,
'Wikibase\ChangeHandler::compareChangesByTimestamp' );
+
+ wfDebugLog( __CLASS__, __METHOD__ . : coalesced
+ . count( $changes ) . into . count( $coalesced ) .
changes );
+
return $coalesced;
}
@@ -466,7 +474,10 @@
*/
public function handleChange( Change $change ) {
wfProfileIn( __METHOD__ );
- wfDebugLog( __CLASS__, __FUNCTION__ . : handling change # .
$change-getId() );
+
+ $chid = self::getChangeIdForLog( $change );
+ wfDebugLog( __CLASS__, __FUNCTION__ . : handling change #$chid
+ . ( . $change-getType() . ) );
//TODO: Actions may be per-title, depending on how the change
applies to that page.
// We'll need on list of titles per action.
@@ -474,6 +485,7 @@
if ( $actions === 0 ) {
// nothing to do
+ wfDebugLog( __CLASS__, __FUNCTION__ . : No actions to
take for change #$chid. );
wfProfileOut( __METHOD__ );
return false;
}
@@ -487,11 +499,13 @@
if ( empty( $titlesToUpdate ) ) {
// nothing to do
+ wfDebugLog( __CLASS__, __FUNCTION__ . : No pages to
update for change #$chid. );
wfProfileOut( __METHOD__ );
return false;
}
- wfDebugLog( __CLASS__, __FUNCTION__ . : . count(
$titlesToUpdate ) . pages to update. );
+ wfDebugLog( __CLASS__, __FUNCTION__ . : updating . count(
$titlesToUpdate )
+ . pages (actions: . dechex( $actions ). ) for
change #$chid. );
$this-updatePages( $change, $actions, $titlesToUpdate );
@@ -597,7 +611,7 @@
if ( $rcAttribs !== false ) {
$this-updater-injectRCRecord( $title,
$rcAttribs );
} else {
- trigger_error( change # .
$change-getId() . did not provide RC info, E_USER_WARNING );
+ trigger_error( change # .
self::getChangeIdForLog( $change ) . did not provide RC info, E_USER_WARNING
);
}
}
@@ -606,6 +620,26 @@
}
wfProfileOut( __METHOD__ );
+ }
+
+ /**
+* Returns a human readable change ID, containing multiple IDs in case
of a
+* coalesced change.
+*
+* @param Change $change
+*
+* @return string
[MediaWiki-commits] [Gerrit] Link report bug link in Gerrit to Bugzilla - change (operations/puppet)
Demon has uploaded a new change for review. https://gerrit.wikimedia.org/r/54677 Change subject: Link report bug link in Gerrit to Bugzilla .. Link report bug link in Gerrit to Bugzilla The default links to the upstream tracker, but not all bugs with our install belong there. Change-Id: I012314c571978cd727e81b1b5c38dc3c8abe57d7 --- M templates/gerrit/gerrit.config.erb 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/77/54677/1 diff --git a/templates/gerrit/gerrit.config.erb b/templates/gerrit/gerrit.config.erb index e6b2643..0626470 100644 --- a/templates/gerrit/gerrit.config.erb +++ b/templates/gerrit/gerrit.config.erb @@ -1,6 +1,7 @@ [gerrit] basePath = git canonicalWebUrl = %= url % + reportBugUrl = https://bugzilla.wikimedia.org/enter_bug.cgi?product=Wikimediacomponent=Git/Gerrit [core] packedGitOpenFiles = 4096 packedGitLimit = 500m -- To view, visit https://gerrit.wikimedia.org/r/54677 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I012314c571978cd727e81b1b5c38dc3c8abe57d7 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Demon ch...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Using toggle_reference_section in statements Selenium tests - change (mediawiki...Wikibase)
Tobias Gritschacher has submitted this change and it was merged. Change subject: Using toggle_reference_section in statements Selenium tests .. Using toggle_reference_section in statements Selenium tests The method wait_for_referencesToggle has been removed in a previous change set. It has been replaced by toggle_references_section. Change-Id: Ib6abb24483b70a877be177eab8f0f72ca6e207c4 --- M repo/tests/selenium/statements/statements_deleted_prop_spec.rb 1 file changed, 2 insertions(+), 4 deletions(-) Approvals: Tobias Gritschacher: Verified; Looks good to me, approved jenkins-bot: Checked diff --git a/repo/tests/selenium/statements/statements_deleted_prop_spec.rb b/repo/tests/selenium/statements/statements_deleted_prop_spec.rb index f6eab06..1cc767c 100644 --- a/repo/tests/selenium/statements/statements_deleted_prop_spec.rb +++ b/repo/tests/selenium/statements/statements_deleted_prop_spec.rb @@ -103,8 +103,7 @@ ajax_wait page.wbErrorDiv?.should be_true page.cancelStatement -page.referenceHeadingToggleLink -page.wait_for_referencesToggle +page.toggle_reference_section page.reference1Property.should_not == properties_cm[0][label] page.reference1Property.include?(properties_cm[0][id]).should be_true page.reference1Property.include?(Deleted property).should be_true @@ -159,8 +158,7 @@ #ajax_wait #page.wbErrorDiv?.should be_true #page.cancelStatement -page.referenceHeadingToggleLink -page.wait_for_referencesToggle +page.toggle_reference_section page.reference1Property.should_not == properties_item[0][label] page.reference1Property.include?(properties_item[0][id]).should be_true page.reference1Property.include?(Deleted property).should be_true -- To view, visit https://gerrit.wikimedia.org/r/54636 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ib6abb24483b70a877be177eab8f0f72ca6e207c4 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Wikibase Gerrit-Branch: master Gerrit-Owner: Henning Snater henning.sna...@wikimedia.de Gerrit-Reviewer: Tobias Gritschacher tobias.gritschac...@wikimedia.de Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] wfProfile fixes: 0543c7b0 added a wfProfileIn() that should... - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged.
Change subject: wfProfile fixes: 0543c7b0 added a wfProfileIn() that should
have been wfProfileOut() Reorder Http::request() so that wfProfileOut() is at
the same level as the above wfProfileIn() [checked by check-vars]
..
wfProfile fixes:
0543c7b0 added a wfProfileIn() that should have been wfProfileOut()
Reorder Http::request() so that wfProfileOut() is at the same
level as the above wfProfileIn() [checked by check-vars]
Change-Id: Ia91445d792e524b9c570890397f1513af0d8cd73
---
M includes/HttpFunctions.php
1 file changed, 4 insertions(+), 6 deletions(-)
Approvals:
Aaron Schulz: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/HttpFunctions.php b/includes/HttpFunctions.php
index 98d36d3..9e280db 100644
--- a/includes/HttpFunctions.php
+++ b/includes/HttpFunctions.php
@@ -69,14 +69,12 @@
$req = MWHttpRequest::factory( $url, $options );
$status = $req-execute();
+ $content = false;
if ( $status-isOK() ) {
$content = $req-getContent();
- wfProfileOut( __METHOD__ . -$method );
- return $content;
- } else {
- wfProfileOut( __METHOD__ . -$method );
- return false;
}
+ wfProfileOut( __METHOD__ . -$method );
+ return $content;
}
/**
@@ -629,7 +627,7 @@
}
}
- wfProfileIn( __METHOD__ );
+ wfProfileOut( __METHOD__ );
}
/**
--
To view, visit https://gerrit.wikimedia.org/r/54658
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia91445d792e524b9c570890397f1513af0d8cd73
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Platonides platoni...@gmail.com
Gerrit-Reviewer: Aaron Schulz asch...@wikimedia.org
Gerrit-Reviewer: Parent5446 tylerro...@gmail.com
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Re-introduce CVE links - change (operations/puppet)
Demon has uploaded a new change for review.
https://gerrit.wikimedia.org/r/54678
Change subject: Re-introduce CVE links
..
Re-introduce CVE links
We tried this before, but didn't have the escaping right. I've
tested this thoroughly, and this escapes all characters properly.
Change-Id: Iccc647c8ae07b6c3e081d24ec03c30f22886ada1
---
M templates/gerrit/gerrit.config.erb
1 file changed, 3 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/78/54678/1
diff --git a/templates/gerrit/gerrit.config.erb
b/templates/gerrit/gerrit.config.erb
index e6b2643..b48c052 100644
--- a/templates/gerrit/gerrit.config.erb
+++ b/templates/gerrit/gerrit.config.erb
@@ -68,6 +68,9 @@
[commentlink rt]
match = \\b[rR][tT]\\s+#?(\\d+)\\b
link = https://rt.wikimedia.org/Ticket/Display.html?id=$1
+[commentlink cve]
+match = \\b(CVE\\-\\d{4}\\-\\d+)\\b
+link = https://cve.mitre.org/cgi-bin/cvename.cgi?name=$1
[mimetype application/javascript]
safe = true
[mimetype application/x-php]
--
To view, visit https://gerrit.wikimedia.org/r/54678
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iccc647c8ae07b6c3e081d24ec03c30f22886ada1
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Demon ch...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Emptying wb_changes_dispatch on deleteAllData - change (mediawiki...Wikibase)
Tobias Gritschacher has submitted this change and it was merged. Change subject: Emptying wb_changes_dispatch on deleteAllData .. Emptying wb_changes_dispatch on deleteAllData Emptying wb_changes_distpatch table when deleting all data to ensure the dispatcher works correctly. Change-Id: I72b5128a93ea1550927b3cac41f9baaf263049b6 --- M repo/Wikibase.hooks.php 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Tobias Gritschacher: Verified; Looks good to me, approved Daniel Kinzler: Looks good to me, approved jenkins-bot: Checked diff --git a/repo/Wikibase.hooks.php b/repo/Wikibase.hooks.php old mode 100644 new mode 100755 index 750ee58..b0f9a36 --- a/repo/Wikibase.hooks.php +++ b/repo/Wikibase.hooks.php @@ -626,6 +626,7 @@ $dbw = wfGetDB( DB_MASTER ); $dbw-delete( 'wb_changes', '*', __METHOD__ ); + $dbw-delete( 'wb_changes_dispatch', '*', __METHOD__ ); $reportMessage( done!\n ); -- To view, visit https://gerrit.wikimedia.org/r/54642 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I72b5128a93ea1550927b3cac41f9baaf263049b6 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Wikibase Gerrit-Branch: master Gerrit-Owner: Anja Jentzsch anja.jentz...@wikimedia.de Gerrit-Reviewer: Aude aude.w...@gmail.com Gerrit-Reviewer: Daniel Kinzler daniel.kinz...@wikimedia.de Gerrit-Reviewer: Tobias Gritschacher tobias.gritschac...@wikimedia.de Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Using toggle_reference_section in statements Selenium tests - change (mediawiki...Wikibase)
Anja Jentzsch has uploaded a new change for review. https://gerrit.wikimedia.org/r/54679 Change subject: Using toggle_reference_section in statements Selenium tests .. Using toggle_reference_section in statements Selenium tests The method wait_for_referencesToggle has been removed in a previous change set. It has been replaced by toggle_references_section. Change-Id: Ib6abb24483b70a877be177eab8f0f72ca6e207c4 --- M repo/tests/selenium/statements/statements_deleted_prop_spec.rb 1 file changed, 2 insertions(+), 4 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase refs/changes/79/54679/1 diff --git a/repo/tests/selenium/statements/statements_deleted_prop_spec.rb b/repo/tests/selenium/statements/statements_deleted_prop_spec.rb index f6eab06..1cc767c 100644 --- a/repo/tests/selenium/statements/statements_deleted_prop_spec.rb +++ b/repo/tests/selenium/statements/statements_deleted_prop_spec.rb @@ -103,8 +103,7 @@ ajax_wait page.wbErrorDiv?.should be_true page.cancelStatement -page.referenceHeadingToggleLink -page.wait_for_referencesToggle +page.toggle_reference_section page.reference1Property.should_not == properties_cm[0][label] page.reference1Property.include?(properties_cm[0][id]).should be_true page.reference1Property.include?(Deleted property).should be_true @@ -159,8 +158,7 @@ #ajax_wait #page.wbErrorDiv?.should be_true #page.cancelStatement -page.referenceHeadingToggleLink -page.wait_for_referencesToggle +page.toggle_reference_section page.reference1Property.should_not == properties_item[0][label] page.reference1Property.include?(properties_item[0][id]).should be_true page.reference1Property.include?(Deleted property).should be_true -- To view, visit https://gerrit.wikimedia.org/r/54679 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib6abb24483b70a877be177eab8f0f72ca6e207c4 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Wikibase Gerrit-Branch: mw1.21-wmf12 Gerrit-Owner: Anja Jentzsch anja.jentz...@wikimedia.de Gerrit-Reviewer: Henning Snater henning.sna...@wikimedia.de ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] (bug 45673) Removing toolbar node from claimlistview template - change (mediawiki...Wikibase)
Henning Snater has uploaded a new change for review.
https://gerrit.wikimedia.org/r/54680
Change subject: (bug 45673) Removing toolbar node from claimlistview template
..
(bug 45673) Removing toolbar node from claimlistview template
The toolbar node is generated programmatically by the add toolbar widget now.
This change set also gives the claimlist(view) template a proper name.
Change-Id: I7a365522cd4f5f5bc7888dd7dac5c65f7620b0bd
---
M lib/resources/jquery.wikibase/jquery.wikibase.addtoolbar.js
M lib/resources/jquery.wikibase/jquery.wikibase.claimlistview.js
M lib/resources/templates.php
M lib/resources/wikibase.css
M repo/includes/EntityView.php
M selenium/lib/modules/entity_selector_module.rb
M selenium/lib/modules/reference_module.rb
M selenium/lib/modules/statement_module.rb
8 files changed, 21 insertions(+), 24 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/80/54680/1
diff --git a/lib/resources/jquery.wikibase/jquery.wikibase.addtoolbar.js
b/lib/resources/jquery.wikibase/jquery.wikibase.addtoolbar.js
index e8592a8..9fc3894 100644
--- a/lib/resources/jquery.wikibase/jquery.wikibase.addtoolbar.js
+++ b/lib/resources/jquery.wikibase/jquery.wikibase.addtoolbar.js
@@ -16,8 +16,9 @@
* The widget the toolbar shall interact with has to have implemented
certain methods listed in
* the _requiredMethods attribute.
*
-* @option toolbarParentSelector {string} (REQUIRED) jQuery selector to
find the node the actual
-* toolbar buttons shall be appended to.
+* @option toolbarParentSelector {string} jQuery selector to find the
node the actual toolbar
+* buttons shall be appended to. If omitted, the DOM structure
required for the toolbar
+* will be created and appended to the node the toolbar is
initialized on.
*
* @option interactionWidgetName {string} Name of the widget the
toolbar shall interact with.
* (That widget needs to be initialized on the same DOM node
this toolbar is initialized
@@ -91,11 +92,9 @@
_create: function() {
var self = this;
- if ( !this.options.toolbarParentSelector ) {
- throw new Error( 'jquery.wikibase.addtoolbar:
Missing toolbar parent selector' );
- }
-
- this.$toolbarParent = this.element.find(
this.options.toolbarParentSelector );
+ this.$toolbarParent = (
this.options.toolbarParentSelector )
+ ? this.element.find(
this.options.toolbarParentSelector )
+ : mw.template( 'wb-toolbar', '' ).appendTo(
this.element );
this.toolbar = new wb.ui.Toolbar();
this.toolbar.innerGroup = new wb.ui.Toolbar.Group();
diff --git a/lib/resources/jquery.wikibase/jquery.wikibase.claimlistview.js
b/lib/resources/jquery.wikibase/jquery.wikibase.claimlistview.js
index 74c8eab..69e5a1f 100644
--- a/lib/resources/jquery.wikibase/jquery.wikibase.claimlistview.js
+++ b/lib/resources/jquery.wikibase/jquery.wikibase.claimlistview.js
@@ -43,7 +43,7 @@
* @see jQuery.Widget.options
*/
options: {
- template: 'wb-claims-section',
+ template: 'wb-claimlist',
templateParams: [
'',
''
@@ -460,8 +460,7 @@
prototype: widgetPrototype
},
options: {
- interactionWidgetName: widgetPrototype.widgetName,
- toolbarParentSelector: '.wb-claims-toolbar'
+ interactionWidgetName: widgetPrototype.widgetName
}
} );
diff --git a/lib/resources/templates.php b/lib/resources/templates.php
index e376e07..c123bbe 100644
--- a/lib/resources/templates.php
+++ b/lib/resources/templates.php
@@ -44,14 +44,12 @@
h2 class=wb-section-heading dir=auto$1/h2
HTML;
- // TODO: rename this to 'wb-claimlist' or 'wb-claims' (in which case
the widget should also be renamed)
- $templates['wb-claims-section'] =
+ $templates['wb-claimlist'] =
HTML
-div class=wb-claims-section
+div class=wb-claimlist
div class=wb-claims
$1 !-- [0,*] wb-claim-section --
/div
- div class=wb-claims-toolbar$2/div !-- edit section --
/div
HTML;
diff --git a/lib/resources/wikibase.css b/lib/resources/wikibase.css
index a5c2cc8..2e2f99b 100644
--- a/lib/resources/wikibase.css
+++ b/lib/resources/wikibase.css
@@ -495,7 +495,10 @@
}
/* General add new claim link */
-div.wb-claims-section div.wb-editsection {
+div.wb-claimlist span.wb-ui-toolbar {
+ display: block;
+}
+div.wb-claimlist div.wb-editsection {
position: static;
float: right;
}
diff --git
[MediaWiki-commits] [Gerrit] Using toggle_reference_section in statements Selenium tests - change (mediawiki...Wikibase)
Anja Jentzsch has submitted this change and it was merged. Change subject: Using toggle_reference_section in statements Selenium tests .. Using toggle_reference_section in statements Selenium tests The method wait_for_referencesToggle has been removed in a previous change set. It has been replaced by toggle_references_section. Change-Id: Ib6abb24483b70a877be177eab8f0f72ca6e207c4 --- M repo/tests/selenium/statements/statements_deleted_prop_spec.rb 1 file changed, 2 insertions(+), 4 deletions(-) Approvals: Anja Jentzsch: Verified; Looks good to me, approved jenkins-bot: Checked diff --git a/repo/tests/selenium/statements/statements_deleted_prop_spec.rb b/repo/tests/selenium/statements/statements_deleted_prop_spec.rb index f6eab06..1cc767c 100644 --- a/repo/tests/selenium/statements/statements_deleted_prop_spec.rb +++ b/repo/tests/selenium/statements/statements_deleted_prop_spec.rb @@ -103,8 +103,7 @@ ajax_wait page.wbErrorDiv?.should be_true page.cancelStatement -page.referenceHeadingToggleLink -page.wait_for_referencesToggle +page.toggle_reference_section page.reference1Property.should_not == properties_cm[0][label] page.reference1Property.include?(properties_cm[0][id]).should be_true page.reference1Property.include?(Deleted property).should be_true @@ -159,8 +158,7 @@ #ajax_wait #page.wbErrorDiv?.should be_true #page.cancelStatement -page.referenceHeadingToggleLink -page.wait_for_referencesToggle +page.toggle_reference_section page.reference1Property.should_not == properties_item[0][label] page.reference1Property.include?(properties_item[0][id]).should be_true page.reference1Property.include?(Deleted property).should be_true -- To view, visit https://gerrit.wikimedia.org/r/54679 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ib6abb24483b70a877be177eab8f0f72ca6e207c4 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Wikibase Gerrit-Branch: mw1.21-wmf12 Gerrit-Owner: Anja Jentzsch anja.jentz...@wikimedia.de Gerrit-Reviewer: Anja Jentzsch anja.jentz...@wikimedia.de Gerrit-Reviewer: Henning Snater henning.sna...@wikimedia.de Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Sort channels and logs before making config lines from them - change (operations/puppet)
Demon has uploaded a new change for review.
https://gerrit.wikimedia.org/r/54681
Change subject: Sort channels and logs before making config lines from them
..
Sort channels and logs before making config lines from them
Puppet doesn't ensure that array/list orders are preserved
between runs, so each run of puppet has the potential to
generate different output.
This caused ircecho to flap every time puppet was run since
it detected new config.
Change-Id: I288e9b0e6834e77a84517aea521db2ca9c804d12
---
M templates/ircecho/default.erb
1 file changed, 3 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/81/54681/1
diff --git a/templates/ircecho/default.erb b/templates/ircecho/default.erb
index ed7112a..7b58384 100644
--- a/templates/ircecho/default.erb
+++ b/templates/ircecho/default.erb
@@ -10,7 +10,7 @@
channels = channels.map {|channel| channel.sub(/^#?/,'#') }
# join all channels to a single string. separate them w/ commas
- channels = channels.join(,)
+ channels = channels.sort.join(,)
# join the log name and (the already joined) channel list.
separate them w/ a colon
#{log}:#{channels}
@@ -18,7 +18,7 @@
# join the whole list of logs to one big string.
# separate each log from the next with a semicolon.
- logs = logs.join(;)
+ logs = logs.sort.join(;)
return logs
end
@@ -34,7 +34,7 @@
channels = channels.uniq
# join all channels to a single string. separate them w/ commas
- channels = channels.join(,)
+ channels = channels.sort.join(,)
return channels
end
--
To view, visit https://gerrit.wikimedia.org/r/54681
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I288e9b0e6834e77a84517aea521db2ca9c804d12
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Demon ch...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Purge buffered data when fflush() doesn't work - change (operations...varnish)
Mark Bergsma has uploaded a new change for review.
https://gerrit.wikimedia.org/r/54683
Change subject: Purge buffered data when fflush() doesn't work
..
Purge buffered data when fflush() doesn't work
Change-Id: I49d7bbffaf43e50ab19a3c7be7df067b352cefce
---
M debian/patches/0010-varnishncsa-udplog.patch
1 file changed, 16 insertions(+), 12 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/debs/varnish
refs/changes/83/54683/1
diff --git a/debian/patches/0010-varnishncsa-udplog.patch
b/debian/patches/0010-varnishncsa-udplog.patch
index 107ebad..1fbe824 100644
--- a/debian/patches/0010-varnishncsa-udplog.patch
+++ b/debian/patches/0010-varnishncsa-udplog.patch
@@ -1,5 +1,5 @@
diff --git a/bin/varnishncsa/varnishncsa.c b/bin/varnishncsa/varnishncsa.c
-index ff07ed5..10f5c8a 100644
+index ff07ed5..332d24c 100644
--- a/bin/varnishncsa/varnishncsa.c
+++ b/bin/varnishncsa/varnishncsa.c
@@ -62,6 +62,7 @@
@@ -92,19 +92,23 @@
VSB_cat(os, tbuf);
break;
-@@ -793,8 +816,10 @@ h_ncsa(void *priv, enum VSL_tag_e tag, unsigned fd,
+@@ -793,8 +816,14 @@ h_ncsa(void *priv, enum VSL_tag_e tag, unsigned fd,
/* flush the stream */
VSB_finish(os);
+ if (fo != stdout __fpending(fo) + VSB_len(os) opts-packet_len) {
-+ fflush(fo);
++ if (fflush(fo) != 0) {
++ /* We can't flush now. Purge the buffered data to
++ * avoid hogging memory. */
++ fpurge(fo);
++ }
+ }
fprintf(fo, %s, VSB_data(os));
- fflush(fo);
/* clean up */
clean_logline(lp);
-@@ -813,15 +838,71 @@ sighup(int sig)
+@@ -813,15 +842,71 @@ sighup(int sig)
}
static FILE *
@@ -157,11 +161,11 @@
+ perror(socket);
+ exit(1);
+ }
-+
-+ FILE *sf = fdopen(sockfd, w);
- if ((of = fopen(ofn, append ? a : w)) == NULL) {
- perror(ofn);
++ FILE *sf = fdopen(sockfd, w);
++
+ if (sf == NULL) {
+ perror(fdopen);
exit(1);
@@ -180,7 +184,7 @@
}
/**/
-@@ -832,7 +913,7 @@ usage(void)
+@@ -832,7 +917,7 @@ usage(void)
fprintf(stderr,
usage: varnishncsa %s [-aDV] [-n varnish_name]
@@ -189,7 +193,7 @@
exit(1);
}
-@@ -843,14 +924,17 @@ main(int argc, char *argv[])
+@@ -843,14 +928,17 @@ main(int argc, char *argv[])
int a_flag = 0, D_flag = 0, format_flag = 0;
const char *P_arg = NULL;
const char *w_arg = NULL;
@@ -210,7 +214,7 @@
switch (c) {
case 'a':
a_flag = 1;
-@@ -860,7 +944,7 @@ main(int argc, char *argv[])
+@@ -860,7 +948,7 @@ main(int argc, char *argv[])
fprintf(stderr, -f and -F can not be
combined\n);
exit(1);
}
@@ -219,7 +223,7 @@
format_flag = 1;
break;
case 'F':
-@@ -883,6 +967,9 @@ main(int argc, char *argv[])
+@@ -883,6 +971,9 @@ main(int argc, char *argv[])
case 'w':
w_arg = optarg;
break;
@@ -229,7 +233,7 @@
case 'b':
fprintf(stderr, -b is not valid for varnishncsa\n);
exit(1);
-@@ -907,6 +994,11 @@ main(int argc, char *argv[])
+@@ -907,6 +998,11 @@ main(int argc, char *argv[])
}
}
@@ -241,7 +245,7 @@
VSL_Arg(vd, 'c', optarg);
if (VSL_Open(vd, 1))
-@@ -927,22 +1019,34 @@ main(int argc, char *argv[])
+@@ -927,22 +1023,34 @@ main(int argc, char *argv[])
if (pfh != NULL)
VPF_Write(pfh);
--
To view, visit https://gerrit.wikimedia.org/r/54683
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I49d7bbffaf43e50ab19a3c7be7df067b352cefce
Gerrit-PatchSet: 1
Gerrit-Project: operations/debs/varnish
Gerrit-Branch: testing/3.0.3plus-rc1
Gerrit-Owner: Mark Bergsma m...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] (testing) adjusted selenium test to check for changed error msg - change (mediawiki...Wikibase)
Tobias Gritschacher has uploaded a new change for review. https://gerrit.wikimedia.org/r/54684 Change subject: (testing) adjusted selenium test to check for changed error msg .. (testing) adjusted selenium test to check for changed error msg - error message for edit conflicts has changed, so test needs to be adjusted Change-Id: Ib69f231c1057845ef15e0b099c1412fd0c70c7e3 --- M repo/tests/selenium/item/edit_conflict_spec.rb 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase refs/changes/84/54684/1 diff --git a/repo/tests/selenium/item/edit_conflict_spec.rb b/repo/tests/selenium/item/edit_conflict_spec.rb index 2cb5e50..f00fc0a 100644 --- a/repo/tests/selenium/item/edit_conflict_spec.rb +++ b/repo/tests/selenium/item/edit_conflict_spec.rb @@ -14,7 +14,7 @@ description_user2 = description + changed by user 2! alias_a = generate_random_string(5) sitelinks = [it, Pizza] -edit_conflict_msg = Edit not allowed: Edit conflict. +edit_conflict_msg = Edit conflict. old_revid = 0 describe Check edit-conflicts do -- To view, visit https://gerrit.wikimedia.org/r/54684 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib69f231c1057845ef15e0b099c1412fd0c70c7e3 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Wikibase Gerrit-Branch: master Gerrit-Owner: Tobias Gritschacher tobias.gritschac...@wikimedia.de ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] (testing) adjusted selenium test to check for changed error msg - change (mediawiki...Wikibase)
Tobias Gritschacher has submitted this change and it was merged. Change subject: (testing) adjusted selenium test to check for changed error msg .. (testing) adjusted selenium test to check for changed error msg - error message for edit conflicts has changed, so test needs to be adjusted Change-Id: Ib69f231c1057845ef15e0b099c1412fd0c70c7e3 --- M repo/tests/selenium/item/edit_conflict_spec.rb 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Tobias Gritschacher: Verified; Looks good to me, approved jenkins-bot: Checked diff --git a/repo/tests/selenium/item/edit_conflict_spec.rb b/repo/tests/selenium/item/edit_conflict_spec.rb index 2cb5e50..f00fc0a 100644 --- a/repo/tests/selenium/item/edit_conflict_spec.rb +++ b/repo/tests/selenium/item/edit_conflict_spec.rb @@ -14,7 +14,7 @@ description_user2 = description + changed by user 2! alias_a = generate_random_string(5) sitelinks = [it, Pizza] -edit_conflict_msg = Edit not allowed: Edit conflict. +edit_conflict_msg = Edit conflict. old_revid = 0 describe Check edit-conflicts do -- To view, visit https://gerrit.wikimedia.org/r/54684 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ib69f231c1057845ef15e0b099c1412fd0c70c7e3 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Wikibase Gerrit-Branch: master Gerrit-Owner: Tobias Gritschacher tobias.gritschac...@wikimedia.de Gerrit-Reviewer: Tobias Gritschacher tobias.gritschac...@wikimedia.de Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] rebuildTermSearchKey should wait for slaves. - change (mediawiki...Wikibase)
Daniel Kinzler has uploaded a new change for review.
https://gerrit.wikimedia.org/r/54685
Change subject: rebuildTermSearchKey should wait for slaves.
..
rebuildTermSearchKey should wait for slaves.
rebuildTermSearchKey should sleep if slaves get lagged, in order
to avoid locking the database because slaves get too far behind.
Change-Id: I9eb2735b688f80e7319c2b73c56cbf6c1ba54fcc
Note: This should be backported to the wmf12 branch.
---
M repo/includes/store/sql/TermSearchKeyBuilder.php
1 file changed, 25 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/85/54685/1
diff --git a/repo/includes/store/sql/TermSearchKeyBuilder.php
b/repo/includes/store/sql/TermSearchKeyBuilder.php
index f6e6248..2cdfef6 100644
--- a/repo/includes/store/sql/TermSearchKeyBuilder.php
+++ b/repo/includes/store/sql/TermSearchKeyBuilder.php
@@ -184,6 +184,8 @@
if ( $c $this-batchSize ) {
// we are done.
break;
+ } else {
+ $this-waitForSlaves( $dbw );
}
}
@@ -191,6 +193,29 @@
}
/**
+* Wait for slaves (quietly)
+*
+* @todo: this should be in the Database class.
+* @todo: thresholds should be configurable
+*
+* @author Tim Starling (stolen from recompressTracked.php)
+*/
+ protected function waitForSlaves() {
+ $lb = wfGetLB(); //TODO: allow foreign DB, get from $this-table
+
+ while ( true ) {
+ list( $host, $maxLag ) = $lb-getMaxLag();
+ if ( $maxLag 2 ) {
+ break;
+ }
+
+ $this-report( Slaves are lagged by $maxLag seconds,
sleeping... );
+ sleep( 5 );
+ $this-report( Resuming... );
+ }
+ }
+
+ /**
* Updates a single row with a newley calculated search key.
* The search key is calculated using Term::normalizeText().
*
--
To view, visit https://gerrit.wikimedia.org/r/54685
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I9eb2735b688f80e7319c2b73c56cbf6c1ba54fcc
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Daniel Kinzler daniel.kinz...@wikimedia.de
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Adding gadolinium as a webrequest udp2log receiver. - change (operations/puppet)
Ottomata has uploaded a new change for review.
https://gerrit.wikimedia.org/r/54686
Change subject: Adding gadolinium as a webrequest udp2log receiver.
..
Adding gadolinium as a webrequest udp2log receiver.
See RT 4720.
This also requires that squid's frontend.conf.php is edited to add
gadolinium as a udp2log logging destination. A patch is available on
fenari:/home/otto/frontend.conf.php.rt.4720.patch
Change-Id: I4c6c8a257b9a58be00904f9857d8315a94e9e356
---
M manifests/misc/blogs.pp
M manifests/role/cache.pp
M templates/nginx/nginx.conf.erb
3 files changed, 10 insertions(+), 6 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/86/54686/1
diff --git a/manifests/misc/blogs.pp b/manifests/misc/blogs.pp
index 5e55a53..05bba76 100644
--- a/manifests/misc/blogs.pp
+++ b/manifests/misc/blogs.pp
@@ -63,6 +63,7 @@
}
# send blog access logs to udp2log instances.
varnish::logging { locke : listener_address =
208.80.152.138 }
+ varnish::logging { gadolinium : listener_address =
208.80.154.73 }
varnish::logging { emery : listener_address =
208.80.152.184 }
varnish::logging { multicast_relay : listener_address =
208.80.154.15, port = 8419 }
diff --git a/manifests/role/cache.pp b/manifests/role/cache.pp
index 4f6b228..5b8d909 100644
--- a/manifests/role/cache.pp
+++ b/manifests/role/cache.pp
@@ -479,8 +479,9 @@
xff_sources =
$network::constants::all_networks,
}
- varnish::logging { locke : listener_address =
208.80.152.138 , cli_args = -m RxRequest:^(?!PURGE\$) -D }
- varnish::logging { emery : listener_address =
208.80.152.184 , cli_args = -m RxRequest:^(?!PURGE\$) -D }
+ varnish::logging { locke : listener_address
= 208.80.152.138 , cli_args = -m RxRequest:^(?!PURGE\$) -D }
+ varnish::logging { gadolinium : listener_address
= 208.80.154.73 , cli_args = -m RxRequest:^(?!PURGE\$) -D }
+ varnish::logging { emery : listener_address
= 208.80.152.184 , cli_args = -m RxRequest:^(?!PURGE\$) -D }
varnish::logging { multicast_relay : listener_address
= 208.80.154.15 , port = 8419, cli_args = -m RxRequest:^(?!PURGE\$) -D
}
# HTCP packet loss monitoring on the ganglia aggregators
@@ -681,8 +682,9 @@
xff_sources = $network::constants::all_networks,
}
- varnish::logging { locke : listener_address =
208.80.152.138, cli_args = -m RxRequest:^(?!PURGE\$) -D }
- varnish::logging { emery : listener_address =
208.80.152.184, cli_args = -m RxRequest:^(?!PURGE\$) -D }
+ varnish::logging { locke : listener_address =
208.80.152.138, cli_args = -m RxRequest:^(?!PURGE\$) -D }
+ varnish::logging { gadolinium : listener_address =
208.80.154.73 , cli_args = -m RxRequest:^(?!PURGE\$) -D }
+ varnish::logging { emery : listener_address =
208.80.152.184, cli_args = -m RxRequest:^(?!PURGE\$) -D }
varnish::logging { multicast_relay : listener_address =
208.80.154.15, port = 8419, cli_args = -m RxRequest:^(?!PURGE\$) -D }
}
}
diff --git a/templates/nginx/nginx.conf.erb b/templates/nginx/nginx.conf.erb
index 4d8dba5..183c843 100644
--- a/templates/nginx/nginx.conf.erb
+++ b/templates/nginx/nginx.conf.erb
@@ -29,8 +29,9 @@
access_log /var/log/nginx/access.log;
% if has_variable?(nginx_use_ssl) then %
log_format squid_combined '$hostname $udplog_sequence
$udplog_time$request_time $remote_addr-/$status $bytes_sent
$request_method $scheme://$host$uri NONE/$proxy_host$content_type
$http_referer $http_x_forwarded_for $udplog_escaped_user_agent
$http_accept_language $http_x_cs';
-access_udplog 208.80.152.138:8420 squid_combined;
-access_udplog 208.80.152.184:8420 squid_combined;
+access_udplog 208.80.152.138:8420 squid_combined;
+access_udplog 208.80.154.73:8420 squid_combined;
+access_udplog 208.80.152.184:8420 squid_combined;
client_max_body_size 100m;
large_client_header_buffers 4 16k;
% end %
--
To view, visit https://gerrit.wikimedia.org/r/54686
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I4c6c8a257b9a58be00904f9857d8315a94e9e356
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ottomata o...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] (testing) adjusted selenium test to check for changed error msg - change (mediawiki...Wikibase)
Anja Jentzsch has uploaded a new change for review. https://gerrit.wikimedia.org/r/54687 Change subject: (testing) adjusted selenium test to check for changed error msg .. (testing) adjusted selenium test to check for changed error msg - error message for edit conflicts has changed, so test needs to be adjusted Change-Id: Ib69f231c1057845ef15e0b099c1412fd0c70c7e3 --- M repo/tests/selenium/item/edit_conflict_spec.rb 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase refs/changes/87/54687/1 diff --git a/repo/tests/selenium/item/edit_conflict_spec.rb b/repo/tests/selenium/item/edit_conflict_spec.rb index 2cb5e50..f00fc0a 100644 --- a/repo/tests/selenium/item/edit_conflict_spec.rb +++ b/repo/tests/selenium/item/edit_conflict_spec.rb @@ -14,7 +14,7 @@ description_user2 = description + changed by user 2! alias_a = generate_random_string(5) sitelinks = [it, Pizza] -edit_conflict_msg = Edit not allowed: Edit conflict. +edit_conflict_msg = Edit conflict. old_revid = 0 describe Check edit-conflicts do -- To view, visit https://gerrit.wikimedia.org/r/54687 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib69f231c1057845ef15e0b099c1412fd0c70c7e3 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Wikibase Gerrit-Branch: mw1.21-wmf12 Gerrit-Owner: Anja Jentzsch anja.jentz...@wikimedia.de Gerrit-Reviewer: Tobias Gritschacher tobias.gritschac...@wikimedia.de ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] (testing) adjusted selenium test to check for changed error msg - change (mediawiki...Wikibase)
Anja Jentzsch has submitted this change and it was merged. Change subject: (testing) adjusted selenium test to check for changed error msg .. (testing) adjusted selenium test to check for changed error msg - error message for edit conflicts has changed, so test needs to be adjusted Change-Id: Ib69f231c1057845ef15e0b099c1412fd0c70c7e3 --- M repo/tests/selenium/item/edit_conflict_spec.rb 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Anja Jentzsch: Verified; Looks good to me, approved jenkins-bot: Checked diff --git a/repo/tests/selenium/item/edit_conflict_spec.rb b/repo/tests/selenium/item/edit_conflict_spec.rb index 2cb5e50..f00fc0a 100644 --- a/repo/tests/selenium/item/edit_conflict_spec.rb +++ b/repo/tests/selenium/item/edit_conflict_spec.rb @@ -14,7 +14,7 @@ description_user2 = description + changed by user 2! alias_a = generate_random_string(5) sitelinks = [it, Pizza] -edit_conflict_msg = Edit not allowed: Edit conflict. +edit_conflict_msg = Edit conflict. old_revid = 0 describe Check edit-conflicts do -- To view, visit https://gerrit.wikimedia.org/r/54687 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ib69f231c1057845ef15e0b099c1412fd0c70c7e3 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Wikibase Gerrit-Branch: mw1.21-wmf12 Gerrit-Owner: Anja Jentzsch anja.jentz...@wikimedia.de Gerrit-Reviewer: Anja Jentzsch anja.jentz...@wikimedia.de Gerrit-Reviewer: Tobias Gritschacher tobias.gritschac...@wikimedia.de Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Message Improvements for upload buttons. - change (mediawiki...UploadWizard)
Nischayn22 has uploaded a new change for review.
https://gerrit.wikimedia.org/r/54688
Change subject: Message Improvements for upload buttons.
..
Message Improvements for upload buttons.
* remove obsolete message
* make messages indicate multiple upload facility.
Change-Id: I70515d0af548a9716d933f17a2c82d008fff8445
---
M UploadWizard.i18n.php
1 file changed, 3 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/UploadWizard
refs/changes/88/54688/1
diff --git a/UploadWizard.i18n.php b/UploadWizard.i18n.php
index d53c5f4..9e03bcd 100644
--- a/UploadWizard.i18n.php
+++ b/UploadWizard.i18n.php
@@ -45,10 +45,9 @@
'mwe-upwiz-tutorial-error-cannot-transform' = 'Sorry, we could not get
a scaled image of the tutorial to fit this screen. This may be a temporary
problem with Wikimedia Commons; try again later.',
'mwe-upwiz-help-desk' = 'Help desk',
'mwe-upwiz-help-desk-url' = '{{ns:project}}:Help desk',
- 'mwe-upwiz-add-file-n' = 'Add another file',
- 'mwe-upwiz-add-file-0-free' = 'Select a media file to share',
- 'mwe-upwiz-upload-flickr' = 'Upload images from Flickr',
- 'mwe-upwiz-add-file-flickr' = 'Add images from Flickr',
+ 'mwe-upwiz-add-file-n' = 'Add more files',
+ 'mwe-upwiz-add-file-0-free' = 'Select one or several media files to
share',
+ 'mwe-upwiz-add-file-flickr' = 'Share images from Flickr',
'mwe-upwiz-add-file-flickr-n' = 'Add more images from Flickr',
'mwe-upwiz-add-flickr-or' = 'Or' ,
'mwe-upwiz-add-flickr' = 'Get from Flickr',
--
To view, visit https://gerrit.wikimedia.org/r/54688
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I70515d0af548a9716d933f17a2c82d008fff8445
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/UploadWizard
Gerrit-Branch: master
Gerrit-Owner: Nischayn22 nischay...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Use correct meta data keys in test changes. - change (mediawiki...Wikibase)
Aude has submitted this change and it was merged. Change subject: Use correct meta data keys in test changes. .. Use correct meta data keys in test changes. Change-Id: Id42f92d2f5ba88cadf8dc0dd931e99543c19eca9 --- M lib/tests/phpunit/changes/TestChanges.php 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Aude: Verified; Looks good to me, approved jenkins-bot: Checked diff --git a/lib/tests/phpunit/changes/TestChanges.php b/lib/tests/phpunit/changes/TestChanges.php index ba8fc25..9a3f252 100644 --- a/lib/tests/phpunit/changes/TestChanges.php +++ b/lib/tests/phpunit/changes/TestChanges.php @@ -69,8 +69,8 @@ 'info' = array( //NOTE: we no longer put Entity objects into the change, they are just too big. 'metadata' = array( - 'rc_user' = 0, - 'rc_user_text' = '208.80.152.201' + 'user' = 0, + 'user_text' = '208.80.152.201' ) ) ); -- To view, visit https://gerrit.wikimedia.org/r/54671 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Id42f92d2f5ba88cadf8dc0dd931e99543c19eca9 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Wikibase Gerrit-Branch: master Gerrit-Owner: Daniel Kinzler daniel.kinz...@wikimedia.de Gerrit-Reviewer: Aude aude.w...@gmail.com Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Initial release. - change (operations...ruby-dimensions)
Faidon has uploaded a new change for review.
https://gerrit.wikimedia.org/r/54689
Change subject: Initial release.
..
Initial release.
Change-Id: I5c64b5ecb111e57273fee3fb3b18ac12472cb6b1
---
A debian/changelog
A debian/compat
A debian/control
A debian/copyright
A debian/gbp.conf
A debian/rules
A debian/source/format
A debian/watch
8 files changed, 71 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/debs/ruby-dimensions
refs/changes/89/54689/1
diff --git a/debian/changelog b/debian/changelog
new file mode 100644
index 000..75eebf1
--- /dev/null
+++ b/debian/changelog
@@ -0,0 +1,5 @@
+ruby-dimensions (1.2.0-1~wmf1) precise-wikimedia; urgency=low
+
+ * Initial release.
+
+ -- Faidon Liambotis fai...@wikimedia.org Tue, 19 Mar 2013 03:11:51 +0200
diff --git a/debian/compat b/debian/compat
new file mode 100644
index 000..7f8f011
--- /dev/null
+++ b/debian/compat
@@ -0,0 +1 @@
+7
diff --git a/debian/control b/debian/control
new file mode 100644
index 000..e440f4f
--- /dev/null
+++ b/debian/control
@@ -0,0 +1,16 @@
+Source: ruby-dimensions
+Section: ruby
+Priority: optional
+Maintainer: Faidon Liambotis fai...@wikimedia.org
+Build-Depends: debhelper (= 7.0.50~), gem2deb (= 0.3.0~)
+Standards-Version: 3.9.3
+Homepage: https://github.com/sstephenson/dimensions
+XS-Ruby-Versions: all
+
+Package: ruby-dimensions
+Architecture: all
+XB-Ruby-Versions: ${ruby:Versions}
+Depends: ${shlibs:Depends}, ${misc:Depends}, ruby | ruby-interpreter
+Description: Pure Ruby dimension measurement for GIF, PNG, JPEG and TIFF images
+ A pure Ruby library for measuring the dimensions and rotation angles of GIF,
+ PNG, JPEG and TIFF images.
diff --git a/debian/copyright b/debian/copyright
new file mode 100644
index 000..cadcc46
--- /dev/null
+++ b/debian/copyright
@@ -0,0 +1,31 @@
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: dimensions
+Source: https://github.com/sstephenson/dimensions
+
+License: Expat
+ Permission is hereby granted, free of charge, to any person obtaining
+ a copy of this software and associated documentation files (the
+ Software), to deal in the Software without restriction, including
+ without limitation the rights to use, copy, modify, merge, publish,
+ distribute, sublicense, and/or sell copies of the Software, and to
+ permit persons to whom the Software is furnished to do so, subject to
+ the following conditions:
+ .
+ The above copyright notice and this permission notice shall be
+ included in all copies or substantial portions of the Software.
+ .
+ THE SOFTWARE IS PROVIDED AS IS, WITHOUT WARRANTY OF ANY KIND,
+ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+Files: *
+Copyright: 2012 Sam Stephenson
+License: Expat
+
+Files: debian/*
+Copyright: 2013 Faidon Liambotis fai...@wikimedia.org
+License: Expat
diff --git a/debian/gbp.conf b/debian/gbp.conf
new file mode 100644
index 000..c87b3c6
--- /dev/null
+++ b/debian/gbp.conf
@@ -0,0 +1,10 @@
+[DEFAULT]
+upstream-tag = v%(version)s
+
+[git-buildpackage]
+upstream-tree=tag
+debian-branch=master
+overlay = True
+no-create-orig = True
+tarball-dir = ../tarballs
+export-dir = ../build-area
diff --git a/debian/rules b/debian/rules
new file mode 100755
index 000..5df7f46
--- /dev/null
+++ b/debian/rules
@@ -0,0 +1,5 @@
+#!/usr/bin/make -f
+#export DH_VERBOSE=1
+
+%:
+ dh $@ --buildsystem=ruby --with ruby
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
diff --git a/debian/watch b/debian/watch
new file mode 100644
index 000..a96acf4
--- /dev/null
+++ b/debian/watch
@@ -0,0 +1,2 @@
+version=3
+http://pkg-ruby-extras.alioth.debian.org/cgi-bin/gemwatch/dimensions
.*/dimensions-(.*).tar.gz
--
To view, visit https://gerrit.wikimedia.org/r/54689
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I5c64b5ecb111e57273fee3fb3b18ac12472cb6b1
Gerrit-PatchSet: 1
Gerrit-Project: operations/debs/ruby-dimensions
Gerrit-Branch: master
Gerrit-Owner: Faidon fai...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Initial release. - change (operations...ruby-execjs)
Faidon has uploaded a new change for review.
https://gerrit.wikimedia.org/r/54690
Change subject: Initial release.
..
Initial release.
Change-Id: Ief3878f7345a893221cee525f0c98b74ad4cbe26
---
A debian/changelog
A debian/compat
A debian/control
A debian/copyright
A debian/gbp.conf
A debian/rules
A debian/source/format
A debian/watch
8 files changed, 72 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/debs/ruby-execjs
refs/changes/90/54690/1
diff --git a/debian/changelog b/debian/changelog
new file mode 100644
index 000..b6a76d6
--- /dev/null
+++ b/debian/changelog
@@ -0,0 +1,5 @@
+ruby-execjs (1.4.0-1~wmf1) precise-wikimedia; urgency=low
+
+ * Initial release.
+
+ -- Faidon Liambotis fai...@wikimedia.org Tue, 19 Mar 2013 02:31:59 +0200
diff --git a/debian/compat b/debian/compat
new file mode 100644
index 000..7f8f011
--- /dev/null
+++ b/debian/compat
@@ -0,0 +1 @@
+7
diff --git a/debian/control b/debian/control
new file mode 100644
index 000..0178f50
--- /dev/null
+++ b/debian/control
@@ -0,0 +1,16 @@
+Source: ruby-execjs
+Section: ruby
+Priority: optional
+Maintainer: Faidon Liambotis fai...@wikimedia.org
+Build-Depends: debhelper (= 7.0.50~), gem2deb (= 0.3.0~)
+Standards-Version: 3.9.3
+Homepage: https://github.com/sstephenson/execjs
+XS-Ruby-Versions: all
+
+Package: ruby-execjs
+Architecture: all
+XB-Ruby-Versions: ${ruby:Versions}
+Depends: ${shlibs:Depends}, ${misc:Depends}, ruby | ruby-interpreter,
ruby-multi-json
+Recommends: nodejs
+Description: Run JavaScript code from Ruby
+ ExecJS lets you run JavaScript code from Ruby.
diff --git a/debian/copyright b/debian/copyright
new file mode 100644
index 000..9af90c7
--- /dev/null
+++ b/debian/copyright
@@ -0,0 +1,32 @@
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: execjs
+Source: https://github.com/sstephenson/execjs
+
+License: Expat
+ Permission is hereby granted, free of charge, to any person obtaining
+ a copy of this software and associated documentation files (the
+ Software), to deal in the Software without restriction, including
+ without limitation the rights to use, copy, modify, merge, publish,
+ distribute, sublicense, and/or sell copies of the Software, and to
+ permit persons to whom the Software is furnished to do so, subject to
+ the following conditions:
+ .
+ The above copyright notice and this permission notice shall be
+ included in all copies or substantial portions of the Software.
+ .
+ THE SOFTWARE IS PROVIDED AS IS, WITHOUT WARRANTY OF ANY KIND,
+ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+Files: *
+Copyright: 2011 Sam Stephenson
+ 2011 Josh Peek
+License: Expat
+
+Files: debian/*
+Copyright: 2013 Faidon Liambotis fai...@wikimedia.org
+License: Expat
diff --git a/debian/gbp.conf b/debian/gbp.conf
new file mode 100644
index 000..c87b3c6
--- /dev/null
+++ b/debian/gbp.conf
@@ -0,0 +1,10 @@
+[DEFAULT]
+upstream-tag = v%(version)s
+
+[git-buildpackage]
+upstream-tree=tag
+debian-branch=master
+overlay = True
+no-create-orig = True
+tarball-dir = ../tarballs
+export-dir = ../build-area
diff --git a/debian/rules b/debian/rules
new file mode 100755
index 000..5df7f46
--- /dev/null
+++ b/debian/rules
@@ -0,0 +1,5 @@
+#!/usr/bin/make -f
+#export DH_VERBOSE=1
+
+%:
+ dh $@ --buildsystem=ruby --with ruby
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
diff --git a/debian/watch b/debian/watch
new file mode 100644
index 000..4fbf6d0
--- /dev/null
+++ b/debian/watch
@@ -0,0 +1,2 @@
+version=3
+http://pkg-ruby-extras.alioth.debian.org/cgi-bin/gemwatch/execjs
.*/execjs-(.*).tar.gz
--
To view, visit https://gerrit.wikimedia.org/r/54690
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ief3878f7345a893221cee525f0c98b74ad4cbe26
Gerrit-PatchSet: 1
Gerrit-Project: operations/debs/ruby-execjs
Gerrit-Branch: master
Gerrit-Owner: Faidon fai...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Initial release. - change (operations...ruby-jsduck)
Faidon has uploaded a new change for review.
https://gerrit.wikimedia.org/r/54691
Change subject: Initial release.
..
Initial release.
Change-Id: I725c0ffc80b97269c94e5b295ea6e1eac54b2aa9
---
A debian/changelog
A debian/compat
A debian/control
A debian/copyright
A debian/gbp.conf
A debian/install
A debian/patches/disable-parallel
A debian/patches/drop-require-rubygems
A debian/patches/execjs
A debian/patches/root-usr-share
A debian/patches/series
A debian/rules
A debian/source/format
A debian/watch
14 files changed, 261 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/debs/ruby-jsduck
refs/changes/91/54691/1
diff --git a/debian/changelog b/debian/changelog
new file mode 100644
index 000..df15331
--- /dev/null
+++ b/debian/changelog
@@ -0,0 +1,5 @@
+ruby-jsduck (4.6.2-1~wmf1) precise-wikimedia; urgency=low
+
+ * Initial release.
+
+ -- Faidon Liambotis fai...@wikimedia.org Tue, 19 Mar 2013 01:17:05 +0200
diff --git a/debian/compat b/debian/compat
new file mode 100644
index 000..7f8f011
--- /dev/null
+++ b/debian/compat
@@ -0,0 +1 @@
+7
diff --git a/debian/control b/debian/control
new file mode 100644
index 000..8d1595c
--- /dev/null
+++ b/debian/control
@@ -0,0 +1,18 @@
+Source: ruby-jsduck
+Section: ruby
+Priority: optional
+Maintainer: Faidon Liambotis fai...@wikimedia.org
+DM-Upload-Allowed: yes
+Build-Depends: debhelper (= 7.0.50~), gem2deb (= 0.3.0~)
+Standards-Version: 3.9.3
+Homepage: https://github.com/senchalabs/jsduck
+XS-Ruby-Versions: all
+
+Package: ruby-jsduck
+Architecture: all
+XB-Ruby-Versions: ${ruby:Versions}
+Depends: ${shlibs:Depends}, ${misc:Depends}, ruby | ruby-interpreter,
ruby-rdiscount, ruby-dimensions
+# ruby-parallel (temp disabled)
+Recommends: libjs-extjs
+Description: Simple JavaScript Duckumentation generator
+ Documentation generator for Sencha JS frameworks
diff --git a/debian/copyright b/debian/copyright
new file mode 100644
index 000..7524b5b
--- /dev/null
+++ b/debian/copyright
@@ -0,0 +1,33 @@
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: jsduck
+Source: https://github.com/senchalabs/jsduck
+
+License: GPL-3+
+ This program is free software; you can redistribute it
+ and/or modify it under the terms of the GNU General Public
+ License as published by the Free Software Foundation; either
+ version 3 of the License, or (at your option) any later
+ version.
+ .
+ This program is distributed in the hope that it will be
+ useful, but WITHOUT ANY WARRANTY; without even the implied
+ warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ PURPOSE. See the GNU General Public License for more
+ details.
+ .
+ You should have received a copy of the GNU General Public
+ License along with this package; if not, write to the Free
+ Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+ Boston, MA 02110-1301 USA
+ .
+ On Debian systems, the full text of the GNU General Public
+ License version 2 can be found in the file
+ `/usr/share/common-licenses/GPL'.
+
+Files: *
+Copyright: 2010 Rene Saarsoo
+License: GPL-3+
+
+Files: debian/*
+Copyright: 2013 Faidon Liambotis fai...@wikimedia.org
+License: GPL-3+
diff --git a/debian/gbp.conf b/debian/gbp.conf
new file mode 100644
index 000..c87b3c6
--- /dev/null
+++ b/debian/gbp.conf
@@ -0,0 +1,10 @@
+[DEFAULT]
+upstream-tag = v%(version)s
+
+[git-buildpackage]
+upstream-tree=tag
+debian-branch=master
+overlay = True
+no-create-orig = True
+tarball-dir = ../tarballs
+export-dir = ../build-area
diff --git a/debian/install b/debian/install
new file mode 100644
index 000..8cab16a
--- /dev/null
+++ b/debian/install
@@ -0,0 +1 @@
+js-classes/* /usr/share/ruby-jsduck/js-classes/
diff --git a/debian/patches/disable-parallel b/debian/patches/disable-parallel
new file mode 100644
index 000..b32bb8d
--- /dev/null
+++ b/debian/patches/disable-parallel
@@ -0,0 +1,37 @@
+Description: disable the use of Parallel gem
+ The parallel gem doesn't have a copyright or license statement, so it's
+ illegal to use. Remove its calls, hurting performance but making jsduck legal
+ to use again :)
+Author: Faidon Liambotis fai...@wikimedia.org
+Last-Update: 2013-03-19
+
+--- a/lib/jsduck/util/parallel.rb
b/lib/jsduck/util/parallel.rb
+@@ -1,5 +1,3 @@
+-require 'parallel'
+-
+ module JsDuck
+ module Util
+
+@@ -14,19 +12,11 @@ module JsDuck
+ end
+
+ def self.each(arr, block)
+-if @@in_processes == 0
+- arr.each block
+-else
+- ::Parallel.each(arr, {:in_processes = @@in_processes}, block)
+-end
++arr.each block
+ end
+
+ def self.map(arr, block)
+-if @@in_processes == 0
+- arr.map block
+-else
+- ::Parallel.map(arr, {:in_processes = @@in_processes}, block)
+-end
++arr.map block
+ end
+ end
+
diff --git
[MediaWiki-commits] [Gerrit] Adding support for capturing raw attribute value strings (vs... - change (mediawiki...Parsoid)
GWicke has submitted this change and it was merged.
Change subject: Adding support for capturing raw attribute value strings
(vsrc), and for an --inputfile option for parse test as an alternative to stdin
..
Adding support for capturing raw attribute value strings (vsrc), and for an
--inputfile option for parse test as an alternative to stdin
Amend by gwicke:
- Only escape entities in the serializer when an attribute value is not
round-tripped from source.
- Comment out a stray debug print
Overall, 10 additonal wt2wt tests are passing with this patch.
Change-Id: Ia26be4af360bd67926170cabe1a76cb20e007475
---
M js/lib/mediawiki.WikitextSerializer.js
M js/lib/pegTokenizer.pegjs.txt
M js/tests/parse.js
3 files changed, 117 insertions(+), 69 deletions(-)
Approvals:
GWicke: Verified; Looks good to me, approved
diff --git a/js/lib/mediawiki.WikitextSerializer.js
b/js/lib/mediawiki.WikitextSerializer.js
index 58a6277..c674637 100644
--- a/js/lib/mediawiki.WikitextSerializer.js
+++ b/js/lib/mediawiki.WikitextSerializer.js
@@ -1967,7 +1967,7 @@
'data-parsoid-serialize': 1
};
- var kv, k, v, tplKV, tplK, tplV;
+ var kv, k, vInfo, v, tplKV, tplK, tplV;
for ( var i = 0, l = attribs.length; i l; i++ ) {
kv = attribs[i];
k = kv.k;
@@ -1984,7 +1984,8 @@
} else {
tplK = tplAttrState.ks[k],
tplV = tplAttrState.vs[k],
- v= token.getAttributeShadowInfo(k).value;
+ vInfo = token.getAttributeShadowInfo(k),
+ v = vInfo.value;
// Deal with k/v's that were template-generated
if (tplK) {
@@ -1995,8 +1996,10 @@
}
if (v.length ) {
- // Escape HTML entities
- v = Util.escapeEntities(v);
+ if (!vInfo.fromsrc) {
+ // Escape HTML entities
+ v = Util.escapeEntities(v);
+ }
out.push(k + '=' + '' + v.replace(
//g, 'quot;' ) + '');
} else {
out.push(k);
diff --git a/js/lib/pegTokenizer.pegjs.txt b/js/lib/pegTokenizer.pegjs.txt
index be7dbff..eb9f64c 100644
--- a/js/lib/pegTokenizer.pegjs.txt
+++ b/js/lib/pegTokenizer.pegjs.txt
@@ -164,6 +164,18 @@
}
}
+/**
+* Get an attribute value and source, given a start and end position.
Returned object will have a 'value' property
+* holding the value (first argument) and a 'valueSrc' property holding the
raw value source
+*/
+function get_attribute_value_and_source( attrVal, attrValPosStart,
attrValPosEnd ) {
+//console.log([attrVal, attrValPosStart, attrValPosEnd].join(, ));
+return {
+value: attrVal,
+valueSrc: input.substring(attrValPosStart, attrValPosEnd)
+}
+}
+
/* End static utilities */
/*
@@ -1601,13 +1613,15 @@
namePos0:({return pos;})
name:generic_attribute_name
namePos:({return pos;})
-value:(( space / newline )*
- v:generic_attribute_newline_value { return v })?
+valueData:(( space / newline )*
+v:generic_attribute_newline_value { return v })?
{
//console.warn('generic_newline_attribute: ' + pp( name ))
var res;
-if ( value !== '' ) {
+if ( valueData !== '' ) {
+var value = valueData.value;
res = new KV( name, value );
+res.vsrc = valueData.valueSrc;
} else {
res = new KV( name, '' );
}
@@ -1623,15 +1637,17 @@
namePos0:({return pos;})
name:generic_attribute_name
namePos:({return pos;})
-value:(optionalSpaceToken
+valueData:(optionalSpaceToken
v:generic_attribute_value { return v })?
{
//console.warn( 'generic attribute: ' + pp([name, value]));
// FIXME: name might just be a template, which can expand to a key-value
// pair later. We'll need to handle that in the AttributeTransformManager.
var res;
-if ( value !== '' ) {
+if ( valueData !== '' ) {
+var value = valueData.value;
res = new KV( name, value );
+res.vsrc = valueData.valueSrc;
} else {
res = new KV( name, '' );
}
@@ -1672,23 +1688,37 @@
// Attribute value, quoted variants can span multiple lines.
xml_att_value
- = ' r:( t1:attribute_preprocessor_text_single ' { return t1; }
+ = ' r:(valPos1:({return pos;}) t1:attribute_preprocessor_text_single?
valPos2:({return pos;}) '
+
[MediaWiki-commits] [Gerrit] futureproof for ruby1.9.x (not in use yet) - change (operations/puppet)
Jeremyb has uploaded a new change for review.
https://gerrit.wikimedia.org/r/54692
Change subject: futureproof for ruby1.9.x (not in use yet)
..
futureproof for ruby1.9.x (not in use yet)
Change-Id: I50d37166e17b84018a011a1e64a488cce183feed
---
M templates/ircecho/default.erb
1 file changed, 3 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/92/54692/1
diff --git a/templates/ircecho/default.erb b/templates/ircecho/default.erb
index 7b58384..aca00ec 100644
--- a/templates/ircecho/default.erb
+++ b/templates/ircecho/default.erb
@@ -6,6 +6,9 @@
def infile(logs)
# make a list of flattened strings w/ one log each and that log's
channels
logs = logs.map {|log,channels|
+ # ensure channels is an Array, not a bare string
+ channels = Array(channels)
+
# prepend # on channel name if missing
channels = channels.map {|channel| channel.sub(/^#?/,'#') }
--
To view, visit https://gerrit.wikimedia.org/r/54692
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I50d37166e17b84018a011a1e64a488cce183feed
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Jeremyb jer...@tuxmachine.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add index for mycontribs hook - change (mediawiki...ArticleFeedbackv5)
jenkins-bot has submitted this change and it was merged.
Change subject: Add index for mycontribs hook
..
Add index for mycontribs hook
Lack of this index resulted in most apache children were tied
up waiting on queries to the slave in that shard
I checked explains for a few of the queries and those that I
picked weren't covered by any index (i.e. searching for feedback
by ip address on aft_user_text which is unindexed) and all
included an ORDER BY + LIMIT. Not bad if that's covered by an
index, not good if the query can't use one.
Query this index is meant for:
public function getContributionsData( $pager, $offset, $limit, $descending,
$userIds = array() ) {
$tables[] = 'aft_feedback';
$fields[] = 'aft_id';
$fields[] = 'aft_page';
$fields[] = 'AFT AS aft_contribution';
$fields[] = 'aft_timestamp AS ' . $pager-getIndexField(); // used for
navbar
if ( $pager-contribs == 'newbie' ) {
$conds['aft_user'] = $userIds;
} else {
$uid = User::idFromName( $pager-target );
if ( $uid ) {
$conds['aft_user'] = $uid;
} else {
$conds['aft_user'] = 0;
$conds['aft_user_text'] = $pager-target;
}
}
if ( $offset ) {
$operator = $descending ? '' : '';
$conds[] = aft_timestamp $operator .
$pager-getDatabase()-addQuotes( $offset );
}
$order = $descending ? 'ASC' : 'DESC'; // something's wrong with
$descending - see logic applied in includes/Pager.php
$options['ORDER BY'] = array( $pager-getIndexField() . $order );
$options['LIMIT'] = $limit;
return $this-getDB( DB_SLAVE )-select( $tables, $fields, $conds,
__METHOD__, $options, array() );
}
Change-Id: I330be208dc1e752a71339a97cd810dd6eaa4c4c6
---
M ArticleFeedbackv5.hooks.php
M sql/ArticleFeedbackv5.sql
A sql/index_contribs.sql
3 files changed, 12 insertions(+), 0 deletions(-)
Approvals:
Lwelling: Looks good to me, approved
jenkins-bot: Verified
diff --git a/ArticleFeedbackv5.hooks.php b/ArticleFeedbackv5.hooks.php
index 7911c21..3eb23f7 100644
--- a/ArticleFeedbackv5.hooks.php
+++ b/ArticleFeedbackv5.hooks.php
@@ -73,6 +73,12 @@
dirname( __FILE__ ) . '/sql/inappropriate.sql'
);
+ $updater-addExtensionIndex(
+ 'aft_feedback',
+ 'contribs',
+ dirname( __FILE__ ) . '/sql/index_contribs.sql'
+ );
+
return true;
}
diff --git a/sql/ArticleFeedbackv5.sql b/sql/ArticleFeedbackv5.sql
index 1aca8fa..726eaf3 100644
--- a/sql/ArticleFeedbackv5.sql
+++ b/sql/ArticleFeedbackv5.sql
@@ -39,3 +39,7 @@
-- index for archive-job
CREATE INDEX /*i*/archive_queue ON /*_*/aft_feedback (aft_archive,
aft_archive_date);
+
+-- index for mycontribs data
+CREATE INDEX /*i*/contribs ON /*_*/aft_feedback (aft_user, aft_timestamp);
+CREATE INDEX /*i*/contribs_anon ON /*_*/aft_feedback (aft_user, aft_user_text,
aft_timestamp);
diff --git a/sql/index_contribs.sql b/sql/index_contribs.sql
new file mode 100644
index 000..f8142a9
--- /dev/null
+++ b/sql/index_contribs.sql
@@ -0,0 +1,2 @@
+CREATE INDEX /*i*/contribs ON /*_*/aft_feedback (aft_user, aft_timestamp);
+CREATE INDEX /*i*/contribs_anon ON /*_*/aft_feedback (aft_user, aft_user_text,
aft_timestamp);
--
To view, visit https://gerrit.wikimedia.org/r/54108
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I330be208dc1e752a71339a97cd810dd6eaa4c4c6
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/extensions/ArticleFeedbackv5
Gerrit-Branch: master
Gerrit-Owner: Matthias Mullie mmul...@wikimedia.org
Gerrit-Reviewer: Asher afeld...@wikimedia.org
Gerrit-Reviewer: Lwelling lwell...@wikimedia.org
Gerrit-Reviewer: Matthias Mullie mmul...@wikimedia.org
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 Add index for mycontribs hook - change (mediawiki...ArticleFeedbackv5)
Matthias Mullie has uploaded a new change for review. https://gerrit.wikimedia.org/r/54693 Change subject: Merge Add index for mycontribs hook .. Merge Add index for mycontribs hook Change-Id: I1d82147e0d38369947dfce510609dca15f02562f --- M ArticleFeedbackv5.hooks.php M sql/ArticleFeedbackv5.sql A sql/index_page.sql 3 files changed, 15 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ArticleFeedbackv5 refs/changes/93/54693/1 diff --git a/ArticleFeedbackv5.hooks.php b/ArticleFeedbackv5.hooks.php index 3eb23f7..7b7d795 100644 --- a/ArticleFeedbackv5.hooks.php +++ b/ArticleFeedbackv5.hooks.php @@ -79,6 +79,12 @@ dirname( __FILE__ ) . '/sql/index_contribs.sql' ); + $updater-addExtensionIndex( + 'aft_feedback', + 'index_page', + dirname( __FILE__ ) . '/sql/index_page.sql' + ); + return true; } diff --git a/sql/ArticleFeedbackv5.sql b/sql/ArticleFeedbackv5.sql index 726eaf3..ba43969 100644 --- a/sql/ArticleFeedbackv5.sql +++ b/sql/ArticleFeedbackv5.sql @@ -32,11 +32,16 @@ aft_relevance_score integer NOT NULL DEFAULT 0 ) /*$wgDBTableOptions*/; --- sort indexes +-- sort indexes (central feedback page; lots of data - more details indexes for most popular actions) CREATE INDEX /*i*/relevance ON /*_*/aft_feedback (aft_relevance_score, aft_id, aft_has_comment, aft_oversight, aft_archive, aft_hide); CREATE INDEX /*i*/age ON /*_*/aft_feedback (aft_timestamp, aft_id, aft_has_comment, aft_oversight, aft_archive, aft_hide); CREATE INDEX /*i*/helpful ON /*_*/aft_feedback (aft_net_helpful, aft_id, aft_has_comment, aft_oversight, aft_archive, aft_hide); +-- page-specific +CREATE INDEX /*i*/relevance_page ON /*_*/aft_feedback (aft_page, aft_relevance_score); +CREATE INDEX /*i*/age_page ON /*_*/aft_feedback (aft_page, aft_timestamp); +CREATE INDEX /*i*/helpful_page ON /*_*/aft_feedback (aft_page, aft_net_helpful); + -- index for archive-job CREATE INDEX /*i*/archive_queue ON /*_*/aft_feedback (aft_archive, aft_archive_date); diff --git a/sql/index_page.sql b/sql/index_page.sql new file mode 100644 index 000..bc2c2f8 --- /dev/null +++ b/sql/index_page.sql @@ -0,0 +1,3 @@ +CREATE INDEX /*i*/relevance_page ON /*_*/aft_feedback (aft_page, aft_relevance_score); +CREATE INDEX /*i*/age_page ON /*_*/aft_feedback (aft_page, aft_timestamp); +CREATE INDEX /*i*/helpful_page ON /*_*/aft_feedback (aft_page, aft_net_helpful); -- To view, visit https://gerrit.wikimedia.org/r/54693 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I1d82147e0d38369947dfce510609dca15f02562f Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/ArticleFeedbackv5 Gerrit-Branch: master Gerrit-Owner: Matthias Mullie mmul...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] re-enable AFTv5 - change (operations/mediawiki-config)
Matthias Mullie has uploaded a new change for review.
https://gerrit.wikimedia.org/r/54694
Change subject: re-enable AFTv5
..
re-enable AFTv5
Change-Id: Iaf8feeaa842b2571154f49638ea9853ae342d5a7
---
M wmf-config/CommonSettings.php
1 file changed, 1 insertion(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config
refs/changes/94/54694/1
diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index c20798d..de1d207 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -2039,8 +2039,7 @@
}
if ( $wmgUseArticleFeedbackv5 ) {
- ## Breaking the site -- disabled for now - Ryan; Mar 5, 2013
- #require_once( $IP/extensions/ArticleFeedbackv5/ArticleFeedbackv5.php
);
+ require_once( $IP/extensions/ArticleFeedbackv5/ArticleFeedbackv5.php
);
$wgArticleFeedbackv5Cluster = $wmgArticleFeedbackv5Cluster;
$wgArticleFeedbackv5Categories = $wmgArticleFeedbackv5Categories;
--
To view, visit https://gerrit.wikimedia.org/r/54694
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iaf8feeaa842b2571154f49638ea9853ae342d5a7
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Matthias Mullie mmul...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add index for page-specific requests - change (mediawiki...ArticleFeedbackv5)
jenkins-bot has submitted this change and it was merged. Change subject: Add index for page-specific requests .. Add index for page-specific requests All articles have a dedicated feedback page; there's also a per-user page for feedback on their watchlisted articles. This results in lots of queries that can be narrowed down to a certain aft_page Change-Id: I41817822a00af54e7321493d2756b3b36907b26a --- M ArticleFeedbackv5.hooks.php M sql/ArticleFeedbackv5.sql A sql/index_page.sql 3 files changed, 15 insertions(+), 1 deletion(-) Approvals: Lwelling: Looks good to me, approved jenkins-bot: Verified diff --git a/ArticleFeedbackv5.hooks.php b/ArticleFeedbackv5.hooks.php index 3eb23f7..7b7d795 100644 --- a/ArticleFeedbackv5.hooks.php +++ b/ArticleFeedbackv5.hooks.php @@ -79,6 +79,12 @@ dirname( __FILE__ ) . '/sql/index_contribs.sql' ); + $updater-addExtensionIndex( + 'aft_feedback', + 'index_page', + dirname( __FILE__ ) . '/sql/index_page.sql' + ); + return true; } diff --git a/sql/ArticleFeedbackv5.sql b/sql/ArticleFeedbackv5.sql index 726eaf3..ba43969 100644 --- a/sql/ArticleFeedbackv5.sql +++ b/sql/ArticleFeedbackv5.sql @@ -32,11 +32,16 @@ aft_relevance_score integer NOT NULL DEFAULT 0 ) /*$wgDBTableOptions*/; --- sort indexes +-- sort indexes (central feedback page; lots of data - more details indexes for most popular actions) CREATE INDEX /*i*/relevance ON /*_*/aft_feedback (aft_relevance_score, aft_id, aft_has_comment, aft_oversight, aft_archive, aft_hide); CREATE INDEX /*i*/age ON /*_*/aft_feedback (aft_timestamp, aft_id, aft_has_comment, aft_oversight, aft_archive, aft_hide); CREATE INDEX /*i*/helpful ON /*_*/aft_feedback (aft_net_helpful, aft_id, aft_has_comment, aft_oversight, aft_archive, aft_hide); +-- page-specific +CREATE INDEX /*i*/relevance_page ON /*_*/aft_feedback (aft_page, aft_relevance_score); +CREATE INDEX /*i*/age_page ON /*_*/aft_feedback (aft_page, aft_timestamp); +CREATE INDEX /*i*/helpful_page ON /*_*/aft_feedback (aft_page, aft_net_helpful); + -- index for archive-job CREATE INDEX /*i*/archive_queue ON /*_*/aft_feedback (aft_archive, aft_archive_date); diff --git a/sql/index_page.sql b/sql/index_page.sql new file mode 100644 index 000..bc2c2f8 --- /dev/null +++ b/sql/index_page.sql @@ -0,0 +1,3 @@ +CREATE INDEX /*i*/relevance_page ON /*_*/aft_feedback (aft_page, aft_relevance_score); +CREATE INDEX /*i*/age_page ON /*_*/aft_feedback (aft_page, aft_timestamp); +CREATE INDEX /*i*/helpful_page ON /*_*/aft_feedback (aft_page, aft_net_helpful); -- To view, visit https://gerrit.wikimedia.org/r/54489 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I41817822a00af54e7321493d2756b3b36907b26a Gerrit-PatchSet: 3 Gerrit-Project: mediawiki/extensions/ArticleFeedbackv5 Gerrit-Branch: master Gerrit-Owner: Matthias Mullie mmul...@wikimedia.org Gerrit-Reviewer: Asher afeld...@wikimedia.org Gerrit-Reviewer: Lwelling lwell...@wikimedia.org 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 ArticleFeedbackv5 to master - change (mediawiki/core)
Matthias Mullie has uploaded a new change for review. https://gerrit.wikimedia.org/r/54695 Change subject: Update ArticleFeedbackv5 to master .. Update ArticleFeedbackv5 to master Change-Id: Ieae14dba5a00c8e7d8e9846c71f5baa2d4e06f33 --- M extensions/ArticleFeedbackv5 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/95/54695/1 diff --git a/extensions/ArticleFeedbackv5 b/extensions/ArticleFeedbackv5 index 5c309fe..4445564 16 --- a/extensions/ArticleFeedbackv5 +++ b/extensions/ArticleFeedbackv5 -Subproject commit 5c309fe44e23e771a16c25abc68075c5e49c3dac +Subproject commit 44455641b46b637b637d2c5eb5f42c7e672c49ef -- To view, visit https://gerrit.wikimedia.org/r/54695 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ieae14dba5a00c8e7d8e9846c71f5baa2d4e06f33 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: wmf/1.21wmf11 Gerrit-Owner: Matthias Mullie mmul...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
