[MediaWiki-commits] [Gerrit] MediaDialog: Add missing indent commands to blacklist - change (mediawiki...VisualEditor)
Esanders has uploaded a new change for review. https://gerrit.wikimedia.org/r/266621 Change subject: MediaDialog: Add missing indent commands to blacklist .. MediaDialog: Add missing indent commands to blacklist Bug: T124619 Change-Id: If2a5d98673db6e2d29fe49f1e7f5307437ba3866 --- M modules/ve-mw/ui/dialogs/ve.ui.MWMediaDialog.js 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor refs/changes/21/266621/1 diff --git a/modules/ve-mw/ui/dialogs/ve.ui.MWMediaDialog.js b/modules/ve-mw/ui/dialogs/ve.ui.MWMediaDialog.js index 2ce9053..eec5866 100644 --- a/modules/ve-mw/ui/dialogs/ve.ui.MWMediaDialog.js +++ b/modules/ve-mw/ui/dialogs/ve.ui.MWMediaDialog.js @@ -121,7 +121,9 @@ 'tableCellData', // No structure 'bullet', + 'bulletWrapOnce', 'number', + 'numberWrapOnce', 'indent', 'outdent' ]; -- To view, visit https://gerrit.wikimedia.org/r/266621 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If2a5d98673db6e2d29fe49f1e7f5307437ba3866 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/VisualEditor Gerrit-Branch: master Gerrit-Owner: Esanders ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Sequences: Check command against surface's allowed commands - change (VisualEditor/VisualEditor)
Esanders has uploaded a new change for review.
https://gerrit.wikimedia.org/r/266620
Change subject: Sequences: Check command against surface's allowed commands
..
Sequences: Check command against surface's allowed commands
Triggers do this but sequences never implemeted this logic.
Bug: T124619
Change-Id: Ib9227c364fab7d9ee99220173ffacbb67d9561cb
---
M src/ui/ve.ui.Sequence.js
M src/ui/ve.ui.Surface.js
2 files changed, 20 insertions(+), 5 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/VisualEditor/VisualEditor
refs/changes/20/266620/1
diff --git a/src/ui/ve.ui.Sequence.js b/src/ui/ve.ui.Sequence.js
index f5d2459..f6802ed 100644
--- a/src/ui/ve.ui.Sequence.js
+++ b/src/ui/ve.ui.Sequence.js
@@ -66,9 +66,14 @@
* @return {boolean} The command executed
*/
ve.ui.Sequence.prototype.execute = function ( surface, range ) {
- var stripRange, executed, stripFragment, selection,
- surfaceModel = surface.getModel(),
- command = ve.init.target.commandRegistry.lookup(
this.getCommandName() );
+ var command, stripRange, executed, stripFragment, selection,
+ surfaceModel = surface.getModel();
+
+ if ( surface.getCommands().indexOf( this.getCommandName() ) === -1 ) {
+ return false;
+ }
+
+ command = ve.init.target.commandRegistry.lookup( this.getCommandName()
);
if ( !command ) {
return false;
diff --git a/src/ui/ve.ui.Surface.js b/src/ui/ve.ui.Surface.js
index 41293d3..e0d8972 100644
--- a/src/ui/ve.ui.Surface.js
+++ b/src/ui/ve.ui.Surface.js
@@ -37,9 +37,10 @@
this.$controls = $( '' );
this.$menus = $( '' );
this.$placeholder = $( '' ).addClass( 've-ui-surface-placeholder'
);
- this.triggerListener = new ve.TriggerListener( OO.simpleArrayDifference(
+ this.commands = OO.simpleArrayDifference(
config.includeCommands || Object.keys(
ve.init.target.commandRegistry.registry ), config.excludeCommands || []
- ) );
+ );
+ this.triggerListener = new ve.TriggerListener( this.commands );
if ( dataOrDoc instanceof ve.dm.Document ) {
// ve.dm.Document
documentModel = dataOrDoc;
@@ -443,6 +444,15 @@
};
/**
+ * Get list of commands available on this surface.
+ *
+ * @return {string[]} Commands
+ */
+ve.ui.Surface.prototype.getCommands = function () {
+ return this.commands;
+};
+
+/**
* Execute an action or command.
*
* @method
--
To view, visit https://gerrit.wikimedia.org/r/266620
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib9227c364fab7d9ee99220173ffacbb67d9561cb
Gerrit-PatchSet: 1
Gerrit-Project: VisualEditor/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] releases: also rsync /home dirs with user tools - change (operations/puppet)
Dzahn has submitted this change and it was merged.
Change subject: releases: also rsync /home dirs with user tools
..
releases: also rsync /home dirs with user tools
Also rsync home directories (of releaser users) from
caesium over to bromine, because they contain things
like the "release-tools" and gnupg config.
Bug:T124261
Change-Id: Ic4c0c0487fca66c978e7e85b307337ae0cf1e07a
---
M manifests/role/rsync_caesium.pp
1 file changed, 6 insertions(+), 0 deletions(-)
Approvals:
jenkins-bot: Verified
Dzahn: Looks good to me, approved
diff --git a/manifests/role/rsync_caesium.pp b/manifests/role/rsync_caesium.pp
index 16d44a7..d39f883 100644
--- a/manifests/role/rsync_caesium.pp
+++ b/manifests/role/rsync_caesium.pp
@@ -12,6 +12,12 @@
hosts_allow => $sourceip,
}
+rsync::server::module { 'releases_home':
+path=> '/home',
+read_only => 'no',
+hosts_allow => $sourceip,
+}
+
ferm::service { 'caesium_rsyncd':
proto => 'tcp',
port => '873',
--
To view, visit https://gerrit.wikimedia.org/r/266616
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ic4c0c0487fca66c978e7e85b307337ae0cf1e07a
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn
Gerrit-Reviewer: Dzahn
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: 75b0a8d..2c76dc5 - change (mediawiki/extensions)
Jenkins-mwext-sync has uploaded a new change for review. https://gerrit.wikimedia.org/r/266619 Change subject: Syncronize VisualEditor: 75b0a8d..2c76dc5 .. Syncronize VisualEditor: 75b0a8d..2c76dc5 Change-Id: I396e487f460d75057f0c6d6a591f91b10f7334af --- M VisualEditor 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions refs/changes/19/266619/1 diff --git a/VisualEditor b/VisualEditor index 75b0a8d..2c76dc5 16 --- a/VisualEditor +++ b/VisualEditor -Subproject commit 75b0a8de634f3d8c8d6402a0cbdb267004009496 +Subproject commit 2c76dc5b50fbfa3a4bd679b37f9dac85336d0e94 -- To view, visit https://gerrit.wikimedia.org/r/266619 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I396e487f460d75057f0c6d6a591f91b10f7334af Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions Gerrit-Branch: master Gerrit-Owner: Jenkins-mwext-sync ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: 75b0a8d..2c76dc5 - change (mediawiki/extensions)
Jenkins-mwext-sync has submitted this change and it was merged. Change subject: Syncronize VisualEditor: 75b0a8d..2c76dc5 .. Syncronize VisualEditor: 75b0a8d..2c76dc5 Change-Id: I396e487f460d75057f0c6d6a591f91b10f7334af --- M VisualEditor 1 file changed, 0 insertions(+), 0 deletions(-) Approvals: Jenkins-mwext-sync: Verified; Looks good to me, approved diff --git a/VisualEditor b/VisualEditor index 75b0a8d..2c76dc5 16 --- a/VisualEditor +++ b/VisualEditor -Subproject commit 75b0a8de634f3d8c8d6402a0cbdb267004009496 +Subproject commit 2c76dc5b50fbfa3a4bd679b37f9dac85336d0e94 -- To view, visit https://gerrit.wikimedia.org/r/266619 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I396e487f460d75057f0c6d6a591f91b10f7334af Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions Gerrit-Branch: master Gerrit-Owner: Jenkins-mwext-sync Gerrit-Reviewer: Jenkins-mwext-sync ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Change Varnish home directory to /home/varnish - change (mediawiki/vagrant)
Mattflaschen has uploaded a new change for review.
https://gerrit.wikimedia.org/r/266618
Change subject: Change Varnish home directory to /home/varnish
..
Change Varnish home directory to /home/varnish
This should make the upgrade work without intervention for people
who enabled Varnish role before aed7f9ac3967d7ec0d3784b323d419586787496f
Bug: T124711
Change-Id: I297ab9f6d7c937dd7aa3dcc075c636a19062e812
---
M puppet/modules/varnish/manifests/init.pp
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant
refs/changes/18/266618/1
diff --git a/puppet/modules/varnish/manifests/init.pp
b/puppet/modules/varnish/manifests/init.pp
index 2e1fb9a..171686a 100644
--- a/puppet/modules/varnish/manifests/init.pp
+++ b/puppet/modules/varnish/manifests/init.pp
@@ -17,7 +17,7 @@
user { 'varnish':
ensure => present,
-home=> '/var/run/varnish',
+home=> '/home/varnish',
gid => 'varnish',
require => Group['varnish'],
}
--
To view, visit https://gerrit.wikimedia.org/r/266618
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I297ab9f6d7c937dd7aa3dcc075c636a19062e812
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: Mattflaschen
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] MWEditingTabDialog: Use 'small' size - change (mediawiki...VisualEditor)
jenkins-bot has submitted this change and it was merged. Change subject: MWEditingTabDialog: Use 'small' size .. MWEditingTabDialog: Use 'small' size Change-Id: Icb30d4fbea21653cf2fb6c782a4314be97a3e0a2 --- M modules/ve-mw/init/ve.init.MWEditingTabDialog.js 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Alex Monk: Looks good to me, approved jenkins-bot: Verified diff --git a/modules/ve-mw/init/ve.init.MWEditingTabDialog.js b/modules/ve-mw/init/ve.init.MWEditingTabDialog.js index c61c0d7..fd0f080 100644 --- a/modules/ve-mw/init/ve.init.MWEditingTabDialog.js +++ b/modules/ve-mw/init/ve.init.MWEditingTabDialog.js @@ -28,7 +28,7 @@ mw.libs.ve.EditingTabDialog.static.name = 'editingtab'; -mw.libs.ve.EditingTabDialog.static.size = 'medium'; +mw.libs.ve.EditingTabDialog.static.size = 'small'; mw.libs.ve.EditingTabDialog.static.verbose = true; -- To view, visit https://gerrit.wikimedia.org/r/266614 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Icb30d4fbea21653cf2fb6c782a4314be97a3e0a2 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/VisualEditor Gerrit-Branch: master Gerrit-Owner: Jforrester Gerrit-Reviewer: Alex Monk Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] updates to upstream a599aed9e2c29367e8958ee25ca48d76900163dc... - change (phabricator...Sprint)
Christopher Johnson (WMDE) has uploaded a new change for review.
https://gerrit.wikimedia.org/r/266617
Change subject: updates to upstream a599aed9e2c29367e8958ee25ca48d76900163dc
Bug: T124385
..
updates to upstream a599aed9e2c29367e8958ee25ca48d76900163dc
Bug: T124385
Change-Id: I939544e0795da6c8f1db530e783f211591c948ac
---
M src/engine/SprintProjectProfilePanelEngine.php
M src/storage/SprintListDataProvider.php
M src/storage/TaskTableDataProvider.php
3 files changed, 10 insertions(+), 27 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/phabricator/extensions/Sprint
refs/changes/17/266617/1
diff --git a/src/engine/SprintProjectProfilePanelEngine.php
b/src/engine/SprintProjectProfilePanelEngine.php
index ff191c5..ad305c2 100644
--- a/src/engine/SprintProjectProfilePanelEngine.php
+++ b/src/engine/SprintProjectProfilePanelEngine.php
@@ -3,6 +3,10 @@
final class SprintProjectProfilePanelEngine
extends PhabricatorProfilePanelEngine {
+ protected function isPanelEngineConfigurable() {
+return true;
+ }
+
protected function getPanelURI($path) {
$project = $this->getProfileObject();
$id = $project->getID();
@@ -14,38 +18,20 @@
$panels[] = $this->newPanel()
->setBuiltinKey(PhabricatorProject::PANEL_PROFILE)
-->setPanelKey(SprintProjectDetailsProfilePanel::PANELKEY);
+->setPanelKey(PhabricatorProjectDetailsProfilePanel::PANELKEY);
$panels[] = $this->newPanel()
->setBuiltinKey(PhabricatorProject::PANEL_WORKBOARD)
-->setPanelKey(SprintProjectWorkboardProfilePanel::PANELKEY);
-
-$id = $object->getID();
-// TODO: This is temporary.
-$uri = urisprintf(
-'/maniphest/?statuses=open()&projects=%s#R',
-$object->getPHID());
-
-$panels[] = $this->newPanel()
-->setBuiltinKey('tasks')
-->setPanelKey(PhabricatorLinkProfilePanel::PANELKEY)
-->setPanelProperty('icon', 'maniphest')
-->setPanelProperty('name', pht('Open Tasks'))
-->setPanelProperty('uri', $uri);
-
-// TODO: This is temporary.
-
-$panels[] = $this->newPanel()
-->setBuiltinKey('feed')
-->setPanelKey(PhabricatorLinkProfilePanel::PANELKEY)
-->setPanelProperty('icon', 'feed')
-->setPanelProperty('name', pht('Feed'))
-->setPanelProperty('uri', "/project/feed/{$id}/");
+->setPanelKey(PhabricatorProjectWorkboardProfilePanel::PANELKEY);
$panels[] = $this->newPanel()
->setBuiltinKey(PhabricatorProject::PANEL_MEMBERS)
->setPanelKey(PhabricatorProjectMembersProfilePanel::PANELKEY);
+$panels[] = $this->newPanel()
+->setBuiltinKey(PhabricatorProject::PANEL_MANAGE)
+->setPanelKey(PhabricatorProjectManageProfilePanel::PANELKEY);
+
return $panels;
}
diff --git a/src/storage/SprintListDataProvider.php
b/src/storage/SprintListDataProvider.php
index 8870e25..012e092 100644
--- a/src/storage/SprintListDataProvider.php
+++ b/src/storage/SprintListDataProvider.php
@@ -90,7 +90,6 @@
private function getEditProjectDetailsIcon() {
$image = id(new PHUIIconView())
-->setSpriteSheet(PHUIIconView::SPRITE_PROJECTS)
->setIconFont('fa-fire', 'orange')
->setText('Burndown');
return $image;
diff --git a/src/storage/TaskTableDataProvider.php
b/src/storage/TaskTableDataProvider.php
index 692c20e..39439d1 100644
--- a/src/storage/TaskTableDataProvider.php
+++ b/src/storage/TaskTableDataProvider.php
@@ -243,7 +243,6 @@
$image = id(new PHUIIconView())
->addSigil($sigil)
->setMetadata($meta)
-->setSpriteSheet(PHUIIconView::SPRITE_PROJECTS)
->setIconFont('fa-wrench', 'green')
->setText('Blocker');
return $image;
@@ -251,7 +250,6 @@
private function getIconforBlocked() {
$image = id(new PHUIIconView())
-->setSpriteSheet(PHUIIconView::SPRITE_PROJECTS)
->setIconFont('fa-lock', 'red')
->setText('Blocked');
return $image;
--
To view, visit https://gerrit.wikimedia.org/r/266617
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I939544e0795da6c8f1db530e783f211591c948ac
Gerrit-PatchSet: 1
Gerrit-Project: phabricator/extensions/Sprint
Gerrit-Branch: master
Gerrit-Owner: Christopher Johnson (WMDE)
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] releases: also rsync /home dirs with user tools - change (operations/puppet)
Dzahn has uploaded a new change for review.
https://gerrit.wikimedia.org/r/266616
Change subject: releases: also rsync /home dirs with user tools
..
releases: also rsync /home dirs with user tools
Also rsync home directories (of releaser users) from
caesium over to bromine, because they contain things
like the "release-tools" and gnupg config.
Bug:T124261
Change-Id: Ic4c0c0487fca66c978e7e85b307337ae0cf1e07a
---
M manifests/role/rsync_caesium.pp
1 file changed, 6 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/16/266616/1
diff --git a/manifests/role/rsync_caesium.pp b/manifests/role/rsync_caesium.pp
index 16d44a7..d39f883 100644
--- a/manifests/role/rsync_caesium.pp
+++ b/manifests/role/rsync_caesium.pp
@@ -12,6 +12,12 @@
hosts_allow => $sourceip,
}
+rsync::server::module { 'releases_home':
+path=> '/home',
+read_only => 'no',
+hosts_allow => $sourceip,
+}
+
ferm::service { 'caesium_rsyncd':
proto => 'tcp',
port => '873',
--
To view, visit https://gerrit.wikimedia.org/r/266616
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic4c0c0487fca66c978e7e85b307337ae0cf1e07a
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Point amp to temporary directory - change (wikimedia...crm)
Eileen has submitted this change and it was merged.
Change subject: Point amp to temporary directory
..
Point amp to temporary directory
Bug: T91911
Change-Id: I06d3a6caf0f2c8a36cc6c25cc9c4df9bf1020127
---
M bin/ci-populate-dbs.sh
1 file changed, 1 insertion(+), 0 deletions(-)
Approvals:
Eileen: Looks good to me, approved
jenkins-bot: Verified
diff --git a/bin/ci-populate-dbs.sh b/bin/ci-populate-dbs.sh
index 22f36d6..7969422 100755
--- a/bin/ci-populate-dbs.sh
+++ b/bin/ci-populate-dbs.sh
@@ -6,6 +6,7 @@
echo "Populating databases with the prefix '${CIVICRM_SCHEMA_PREFIX}'"
export
PRECREATED_DSN_PATTERN="mysql://${CIVICRM_MYSQL_USERNAME}:${CIVICRM_MYSQL_PASSWORD}@${CIVICRM_MYSQL_CLIENT}/${CIVICRM_SCHEMA_PREFIX}{{db_seq}}"
+export AMPHOME="${WORKSPACE}/.amp-${BUILD_NUMBER}"
#FIXME: --web-root="$WORKSPACE/src/crm"
--
To view, visit https://gerrit.wikimedia.org/r/266443
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I06d3a6caf0f2c8a36cc6c25cc9c4df9bf1020127
Gerrit-PatchSet: 3
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: master
Gerrit-Owner: Awight
Gerrit-Reviewer: Awight
Gerrit-Reviewer: Cdentinger
Gerrit-Reviewer: Eileen
Gerrit-Reviewer: Ejegg
Gerrit-Reviewer: Hashar
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Ensure all contributions have a payment instrument set. - change (wikimedia...crm)
jenkins-bot has submitted this change and it was merged.
Change subject: Ensure all contributions have a payment instrument set.
..
Ensure all contributions have a payment instrument set.
From 4.3 all contributions should have a payment instrument per
http://wiki.civicrm.org/confluence/display/CRMDOC/Fixing+Transactions+Missing+a+Payment+Instrument+-+4.4.3+Upgrades
There is not a strong pattern or a large quantiy so I chose 'Gateway' as a
sensible default
Change-Id: I089ad3493baed5dcebc48acbed15ae2ce92cc322
---
M sites/all/modules/wmf_civicrm/wmf_civicrm.install
1 file changed, 42 insertions(+), 0 deletions(-)
Approvals:
Awight: Looks good to me, approved
jenkins-bot: Verified
diff --git a/sites/all/modules/wmf_civicrm/wmf_civicrm.install
b/sites/all/modules/wmf_civicrm/wmf_civicrm.install
index 2b38f36..85d0905 100644
--- a/sites/all/modules/wmf_civicrm/wmf_civicrm.install
+++ b/sites/all/modules/wmf_civicrm/wmf_civicrm.install
@@ -1518,3 +1518,45 @@
wmf_civicrm_fill_missing_appeal_data('2015-10-01');
}
+/**
+ * Ensure all payments have a payment instrument id.
+ *
+ * Per
http://wiki.civicrm.org/confluence/display/CRMDOC/Fixing+Transactions+Missing+a+Payment+Instrument+-+4.4.3+Upgrades
+ * there is a payment instrument id set for all contributions.
+ *
+ * The code there basically just figures out a default & sets the empty ones
to that.
+ *
+ * If we look at the first million contributions just setting the it to
'Gateway' seems a reasonable
+ * choice of default.
+ *
+ * SELECT payment_instrument_id, count(*) FROM (SELECT * FROM
civicrm_contribution LIMIT 100) as t GROUP BY payment_instrument_id;
+ * +---+--+
+ * | payment_instrument_id | count(*) |
+ * +---+--+
+ * | NULL | 33 |
+ * | 1 |3 |
+ * | 3 | 30 |
+ * | 4 |14162 |
+ * | 5 | 119 |
+ * | 6 | 982954 |
+ * | 7 | 1451 |
+ * | 8 | 1246 |
+ * |44 |1 |
+ * | 186 |1 |
+ */
+function wmf_civicrm_update_7065() {
+ civicrm_initialize();
+ $paymentInstruments = civicrm_api3('Contribution', 'getoptions',
array('field' => 'payment_instrument_id'));
+ $defaultPaymentInstrument = array_search('Gateway',
$paymentInstruments['values']);
+ CRM_Core_DAO::executeQuery(
+"UPDATE civicrm_contribution SET payment_instrument_id =
$defaultPaymentInstrument WHERE payment_instrument_id IS NULL"
+ );
+ CRM_Core_DAO::executeQuery(
+"UPDATE civicrm_financial_trxn cft
+LEFT JOIN civicrm_entity_financial_trxn ceft ON ceft.financial_trxn_id = cft.id
+LEFT JOIN civicrm_contribution cc ON ceft.entity_id = cc.id
+SET cft.payment_instrument_id = IFNULL(cc.payment_instrument_id,
$defaultPaymentInstrument)
+WHERE ceft.entity_table = 'civicrm_contribution' AND cft.payment_instrument_id
IS NULL;"
+ );
+}
+
--
To view, visit https://gerrit.wikimedia.org/r/266467
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I089ad3493baed5dcebc48acbed15ae2ce92cc322
Gerrit-PatchSet: 3
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: master
Gerrit-Owner: Eileen
Gerrit-Reviewer: Awight
Gerrit-Reviewer: Cdentinger
Gerrit-Reviewer: Ejegg
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Follow-up Ic506950: Use new filenames for OOUI stylesheets f... - change (VisualEditor/VisualEditor)
jenkins-bot has submitted this change and it was merged. Change subject: Follow-up Ic506950: Use new filenames for OOUI stylesheets for demo .. Follow-up Ic506950: Use new filenames for OOUI stylesheets for demo Change-Id: I74f516af78437394d4687132b3581e1522549429 --- M .jsduck/eg-iframe.html M build/modules.json M demos/ve/desktop-dist.html M demos/ve/desktop.html M demos/ve/minimal-rtl.html M demos/ve/minimal.html M demos/ve/mobile-dist.html M demos/ve/mobile.html 8 files changed, 65 insertions(+), 45 deletions(-) Approvals: Bartosz Dziewoński: Looks good to me, approved jenkins-bot: Verified diff --git a/.jsduck/eg-iframe.html b/.jsduck/eg-iframe.html index 5037a6c..9ae0f81 100644 --- a/.jsduck/eg-iframe.html +++ b/.jsduck/eg-iframe.html @@ -5,11 +5,11 @@ VisualEditor Example - - - - - + + + + + diff --git a/build/modules.json b/build/modules.json index ebfa122..e71d564 100644 --- a/build/modules.json +++ b/build/modules.json @@ -40,11 +40,11 @@ "lib/oojs-ui/oojs-ui-apex.js" ], "styles": [ - "lib/oojs-ui/oojs-ui-apex.vector.css", - "lib/oojs-ui/oojs-ui-apex-icons-editing-core.vector.css", - "lib/oojs-ui/oojs-ui-apex-icons-editing-advanced.vector.css", - "lib/oojs-ui/oojs-ui-apex-icons-editing-styling.vector.css", - "lib/oojs-ui/oojs-ui-apex-icons-editing-list.vector.css" + "lib/oojs-ui/oojs-ui-apex.css", + "lib/oojs-ui/oojs-ui-apex-icons-editing-core.css", + "lib/oojs-ui/oojs-ui-apex-icons-editing-advanced.css", + "lib/oojs-ui/oojs-ui-apex-icons-editing-styling.css", + "lib/oojs-ui/oojs-ui-apex-icons-editing-list.css" ], "dependencies": [ "oojs-ui" @@ -55,11 +55,11 @@ "lib/oojs-ui/oojs-ui-mediawiki.js" ], "styles": [ - "lib/oojs-ui/oojs-ui-mediawiki.vector.css", - "lib/oojs-ui/oojs-ui-mediawiki-icons-editing-core.vector.css", - "lib/oojs-ui/oojs-ui-mediawiki-icons-editing-advanced.vector.css", - "lib/oojs-ui/oojs-ui-mediawiki-icons-editing-styling.vector.css", - "lib/oojs-ui/oojs-ui-mediawiki-icons-editing-list.vector.css" + "lib/oojs-ui/oojs-ui-mediawiki.css", + "lib/oojs-ui/oojs-ui-mediawiki-icons-editing-core.css", + "lib/oojs-ui/oojs-ui-mediawiki-icons-editing-advanced.css", + "lib/oojs-ui/oojs-ui-mediawiki-icons-editing-styling.css", + "lib/oojs-ui/oojs-ui-mediawiki-icons-editing-list.css" ], "dependencies": [ "oojs-ui" diff --git a/demos/ve/desktop-dist.html b/demos/ve/desktop-dist.html index 2042dd8..165a50e 100644 --- a/demos/ve/desktop-dist.html +++ b/demos/ve/desktop-dist.html @@ -13,11 +13,16 @@ VisualEditor Standalone Demo - - - - - + + + + + + + + + + diff --git a/demos/ve/desktop.html b/demos/ve/desktop.html index 53e5a4e..7c5d43b 100644 --- a/demos/ve/desktop.html +++ b/demos/ve/desktop.html @@ -16,11 +16,16 @@ - - - - - + + + + + + + + + + diff --git a/demos/ve/minimal-rtl.html b/demos/ve/minimal-rtl.html index 805acfb..e5b15d3 100644 --- a/demos/ve/minimal-rtl.html +++ b/demos/ve/minimal-rtl.html @@ -13,11 +13,11 @@ VisualEditor Standalone Demo - - - - - + + + + + diff --git a/demos/ve/minimal.html b/demos/ve/minimal.html index 4948d38..3ee4e84 100644 --- a/demos/ve/minimal.html +++ b/demos/ve/minimal.html @@ -13,11 +13,11 @@ VisualEditor Standalone Demo - - -
[MediaWiki-commits] [Gerrit] Follow-up Ic506950: Use new filenames for OOUI stylesheets f... - change (VisualEditor/VisualEditor)
Jforrester has uploaded a new change for review. https://gerrit.wikimedia.org/r/266615 Change subject: Follow-up Ic506950: Use new filenames for OOUI stylesheets for demo .. Follow-up Ic506950: Use new filenames for OOUI stylesheets for demo Change-Id: I74f516af78437394d4687132b3581e1522549429 --- M .jsduck/eg-iframe.html M build/modules.json M demos/ve/desktop-dist.html M demos/ve/desktop.html M demos/ve/minimal-rtl.html M demos/ve/minimal.html M demos/ve/mobile-dist.html M demos/ve/mobile.html 8 files changed, 65 insertions(+), 45 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/VisualEditor/VisualEditor refs/changes/15/266615/1 diff --git a/.jsduck/eg-iframe.html b/.jsduck/eg-iframe.html index 5037a6c..9ae0f81 100644 --- a/.jsduck/eg-iframe.html +++ b/.jsduck/eg-iframe.html @@ -5,11 +5,11 @@ VisualEditor Example - - - - - + + + + + diff --git a/build/modules.json b/build/modules.json index ebfa122..e71d564 100644 --- a/build/modules.json +++ b/build/modules.json @@ -40,11 +40,11 @@ "lib/oojs-ui/oojs-ui-apex.js" ], "styles": [ - "lib/oojs-ui/oojs-ui-apex.vector.css", - "lib/oojs-ui/oojs-ui-apex-icons-editing-core.vector.css", - "lib/oojs-ui/oojs-ui-apex-icons-editing-advanced.vector.css", - "lib/oojs-ui/oojs-ui-apex-icons-editing-styling.vector.css", - "lib/oojs-ui/oojs-ui-apex-icons-editing-list.vector.css" + "lib/oojs-ui/oojs-ui-apex.css", + "lib/oojs-ui/oojs-ui-apex-icons-editing-core.css", + "lib/oojs-ui/oojs-ui-apex-icons-editing-advanced.css", + "lib/oojs-ui/oojs-ui-apex-icons-editing-styling.css", + "lib/oojs-ui/oojs-ui-apex-icons-editing-list.css" ], "dependencies": [ "oojs-ui" @@ -55,11 +55,11 @@ "lib/oojs-ui/oojs-ui-mediawiki.js" ], "styles": [ - "lib/oojs-ui/oojs-ui-mediawiki.vector.css", - "lib/oojs-ui/oojs-ui-mediawiki-icons-editing-core.vector.css", - "lib/oojs-ui/oojs-ui-mediawiki-icons-editing-advanced.vector.css", - "lib/oojs-ui/oojs-ui-mediawiki-icons-editing-styling.vector.css", - "lib/oojs-ui/oojs-ui-mediawiki-icons-editing-list.vector.css" + "lib/oojs-ui/oojs-ui-mediawiki.css", + "lib/oojs-ui/oojs-ui-mediawiki-icons-editing-core.css", + "lib/oojs-ui/oojs-ui-mediawiki-icons-editing-advanced.css", + "lib/oojs-ui/oojs-ui-mediawiki-icons-editing-styling.css", + "lib/oojs-ui/oojs-ui-mediawiki-icons-editing-list.css" ], "dependencies": [ "oojs-ui" diff --git a/demos/ve/desktop-dist.html b/demos/ve/desktop-dist.html index 2042dd8..165a50e 100644 --- a/demos/ve/desktop-dist.html +++ b/demos/ve/desktop-dist.html @@ -13,11 +13,16 @@ VisualEditor Standalone Demo - - - - - + + + + + + + + + + diff --git a/demos/ve/desktop.html b/demos/ve/desktop.html index 53e5a4e..7c5d43b 100644 --- a/demos/ve/desktop.html +++ b/demos/ve/desktop.html @@ -16,11 +16,16 @@ - - - - - + + + + + + + + + + diff --git a/demos/ve/minimal-rtl.html b/demos/ve/minimal-rtl.html index 805acfb..e5b15d3 100644 --- a/demos/ve/minimal-rtl.html +++ b/demos/ve/minimal-rtl.html @@ -13,11 +13,11 @@ VisualEditor Standalone Demo - - - - - + + + + + diff --git a/demos/ve/minimal.html b/demos/ve/minimal.html index 4948d38..3ee4e84 100644 --- a/demos/ve/minimal.html +++ b/demos/ve/minimal.html @@ -13,11 +13,11 @@ VisualEditor Standalone Demo -
[MediaWiki-commits] [Gerrit] releases: add ferm rule to allow rsync to bromine - change (operations/puppet)
Dzahn has submitted this change and it was merged.
Change subject: releases: add ferm rule to allow rsync to bromine
..
releases: add ferm rule to allow rsync to bromine
Add ferm rule that is neeed in addition to hosts_allow
to let caesium use rsync to copy files over to bromine.
Bug:T124261
Change-Id: Ic0e17fee045b60fe255b27b8edf60ce99b36c355
---
M manifests/role/rsync_caesium.pp
1 file changed, 6 insertions(+), 0 deletions(-)
Approvals:
jenkins-bot: Verified
Dzahn: Looks good to me, approved
diff --git a/manifests/role/rsync_caesium.pp b/manifests/role/rsync_caesium.pp
index c697db9..16d44a7 100644
--- a/manifests/role/rsync_caesium.pp
+++ b/manifests/role/rsync_caesium.pp
@@ -1,5 +1,7 @@
+# T124261 - temporary
class role::rsync_caesium {
+# caesium.eqiad.wmnet
$sourceip='10.64.32.145'
include rsync::server
@@ -10,4 +12,8 @@
hosts_allow => $sourceip,
}
+ferm::service { 'caesium_rsyncd':
+proto => 'tcp',
+port => '873',
+}
}
--
To view, visit https://gerrit.wikimedia.org/r/266613
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ic0e17fee045b60fe255b27b8edf60ce99b36c355
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn
Gerrit-Reviewer: Dzahn
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] MWEditingTabDialog: Use 'small' size - change (mediawiki...VisualEditor)
Jforrester has uploaded a new change for review. https://gerrit.wikimedia.org/r/266614 Change subject: MWEditingTabDialog: Use 'small' size .. MWEditingTabDialog: Use 'small' size Change-Id: Icb30d4fbea21653cf2fb6c782a4314be97a3e0a2 --- M modules/ve-mw/init/ve.init.MWEditingTabDialog.js 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor refs/changes/14/266614/1 diff --git a/modules/ve-mw/init/ve.init.MWEditingTabDialog.js b/modules/ve-mw/init/ve.init.MWEditingTabDialog.js index c61c0d7..fd0f080 100644 --- a/modules/ve-mw/init/ve.init.MWEditingTabDialog.js +++ b/modules/ve-mw/init/ve.init.MWEditingTabDialog.js @@ -28,7 +28,7 @@ mw.libs.ve.EditingTabDialog.static.name = 'editingtab'; -mw.libs.ve.EditingTabDialog.static.size = 'medium'; +mw.libs.ve.EditingTabDialog.static.size = 'small'; mw.libs.ve.EditingTabDialog.static.verbose = true; -- To view, visit https://gerrit.wikimedia.org/r/266614 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Icb30d4fbea21653cf2fb6c782a4314be97a3e0a2 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/VisualEditor Gerrit-Branch: master Gerrit-Owner: Jforrester ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] releases: add ferm rule to allow rsync to bromine - change (operations/puppet)
Dzahn has uploaded a new change for review.
https://gerrit.wikimedia.org/r/266613
Change subject: releases: add ferm rule to allow rsync to bromine
..
releases: add ferm rule to allow rsync to bromine
Add ferm rule that is neeed in addition to hosts_allow
to let caesium use rsync to copy files over to bromine.
Bug:T124261
Change-Id: Ic0e17fee045b60fe255b27b8edf60ce99b36c355
---
M manifests/role/rsync_caesium.pp
1 file changed, 6 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/13/266613/1
diff --git a/manifests/role/rsync_caesium.pp b/manifests/role/rsync_caesium.pp
index c697db9..16d44a7 100644
--- a/manifests/role/rsync_caesium.pp
+++ b/manifests/role/rsync_caesium.pp
@@ -1,5 +1,7 @@
+# T124261 - temporary
class role::rsync_caesium {
+# caesium.eqiad.wmnet
$sourceip='10.64.32.145'
include rsync::server
@@ -10,4 +12,8 @@
hosts_allow => $sourceip,
}
+ferm::service { 'caesium_rsyncd':
+proto => 'tcp',
+port => '873',
+}
}
--
To view, visit https://gerrit.wikimedia.org/r/266613
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic0e17fee045b60fe255b27b8edf60ce99b36c355
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Preserve certain keys when updating central session - change (mediawiki...CentralAuth)
Anomie has uploaded a new change for review.
https://gerrit.wikimedia.org/r/266610
Change subject: Preserve certain keys when updating central session
..
Preserve certain keys when updating central session
If the central session is updated without dirtying the
MediaWiki\Session\Session, these essential keys get lost which breaks
logins in some cases.
Bug: T124821
Change-Id: I0d2b07af2d946cf730c6a8da5841b904c62b1c3f
---
M includes/CentralAuthUtils.php
1 file changed, 9 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CentralAuth
refs/changes/10/266610/1
diff --git a/includes/CentralAuthUtils.php b/includes/CentralAuthUtils.php
index 6a7417c..80d128f 100644
--- a/includes/CentralAuthUtils.php
+++ b/includes/CentralAuthUtils.php
@@ -177,6 +177,8 @@
public static function setCentralSession( array $data, $reset = false,
$session = null ) {
global $wgCentralAuthCookies, $wgCentralAuthCookiePrefix;
+ static $keepKeys = array( 'user' => true, 'token' => true,
'expiry' => true );
+
if ( class_exists( 'MediaWiki\\Session\\Session' ) ) {
if ( $session === null ) {
$session =
MediaWiki\Session\SessionManager::getGlobalSession();
@@ -197,6 +199,13 @@
}
$data['sessionId'] = $id;
$key = CentralAuthUtils::memcKey( 'session', $id );
+
+ // Copy certain keys from the existing session, if any (T124821)
+ $existing = CentralAuthUtils::getSessionCache()->get( $key );
+ if ( is_array( $existing ) ) {
+ $data += array_intersect_key( $existing, $keepKeys );
+ }
+
$stime = microtime( true );
CentralAuthUtils::getSessionCache()->set( $key, $data, 86400 );
$real = microtime( true ) - $stime;
--
To view, visit https://gerrit.wikimedia.org/r/266610
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I0d2b07af2d946cf730c6a8da5841b904c62b1c3f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CentralAuth
Gerrit-Branch: master
Gerrit-Owner: Anomie
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Enable deferred writes to codfw swift cluster - change (operations/mediawiki-config)
Aaron Schulz has uploaded a new change for review. https://gerrit.wikimedia.org/r/266609 Change subject: Enable deferred writes to codfw swift cluster .. Enable deferred writes to codfw swift cluster * Writes go to eqiad first, codfw async * Reads go to the local swift cluster * Reads-for-writes go to eqiad, however Bug: T91869 Change-Id: I83db83dc5d95c6bd14f1f22e93feae6468d54ff5 --- M wmf-config/filebackend-production.php 1 file changed, 15 insertions(+), 3 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/09/266609/1 diff --git a/wmf-config/filebackend-production.php b/wmf-config/filebackend-production.php index 9e43842..be0ec62 100644 --- a/wmf-config/filebackend-production.php +++ b/wmf-config/filebackend-production.php @@ -37,7 +37,9 @@ => array( 'levels' => $wmfSwiftShardLocal, 'base' => 36, 'repeat' => 0 ) ), 'parallelize'=> 'implicit', - 'cacheAuthInfo' => true + 'cacheAuthInfo' => true, + // When used by FileBackendMultiWrite, read from this cluster if it's the local one + 'readAffinity' => ( $specificDC === $wmfDatacenter ) ); $wgFileBackends[] = array( // backend config for wiki's access to shared repo 'class' => 'SwiftFileBackend', @@ -59,7 +61,9 @@ => array( 'levels' => $wmfSwiftShardCommon, 'base' => 16, 'repeat' => 1 ), ), 'parallelize'=> 'implicit', - 'cacheAuthInfo' => true + 'cacheAuthInfo' => true, + // When used by FileBackendMultiWrite, read from this cluster if it's the local one + 'readAffinity' => ( $specificDC === $wmfDatacenter ) ); $wgFileBackends[] = array( // backend config for wiki's access to shared files 'class' => 'SwiftFileBackend', @@ -74,7 +78,9 @@ 'math-render' => array( 'levels' => 2, 'base' => 16, 'repeat' => 0 ), ), 'parallelize'=> 'implicit', - 'cacheAuthInfo' => true + 'cacheAuthInfo' => true, + // When used by FileBackendMultiWrite, read from this cluster if it's the local one + 'readAffinity' => ( $specificDC === $wmfDatacenter ) ); } /* end DC-specific Swift backend config */ @@ -88,7 +94,9 @@ 'backends'=> array( # DO NOT change the master backend unless it is fully trusted or autoRsync is off array( 'template' => 'local-swift-eqiad', 'isMultiMaster' => true ), + array( 'template' => 'local-swift-codfw' ), ), + 'replication' => 'async', 'syncChecks' => ( 1 | 4 ), // (size & sha1) 'autoResync' => 'conservative' // T41221 ); @@ -100,7 +108,9 @@ 'backends'=> array( # DO NOT change the master backend unless it is fully trusted or autoRsync is off array( 'template' => 'shared-swift-eqiad', 'isMultiMaster' => true ), + array( 'template' => 'shared-swift-codfw' ), ), + 'replication' => 'async', 'syncChecks' => ( 1 | 4 ), // (size & sha1) 'autoResync' => 'conservative' // T41221 ); @@ -112,7 +122,9 @@ 'backends'=> array( # DO NOT change the master backend unless it is fully trusted or autoRsync is off array( 'template' => 'global-swift-eqiad', 'isMultiMaster' => true ), + array( 'template' => 'global-swift-codfw' ), ), + 'replication' => 'async', 'syncChecks' => ( 1 | 4 ), // (size & sha1) 'autoResync' => 'conservative' ); -- To view, visit https://gerrit.wikimedia.org/r/266609 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I83db83dc5d95c6bd14f1f22e93feae6468d54ff5 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Aaron Schulz ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] releases: setup rsyncd to copy release files - change (operations/puppet)
Dzahn has submitted this change and it was merged.
Change subject: releases: setup rsyncd to copy release files
..
releases: setup rsyncd to copy release files
Temporarily set up an rsyncd on bromine to copy
release files over from caesium for migration.
Bug:T124261
Change-Id: Ieba88211506dcdf9d313542f5d4a7b02664f2841
---
A manifests/role/rsync_caesium.pp
D manifests/role/rsync_ruthenium.pp
M manifests/site.pp
3 files changed, 14 insertions(+), 14 deletions(-)
Approvals:
jenkins-bot: Verified
Dzahn: Looks good to me, approved
diff --git a/manifests/role/rsync_caesium.pp b/manifests/role/rsync_caesium.pp
new file mode 100644
index 000..c697db9
--- /dev/null
+++ b/manifests/role/rsync_caesium.pp
@@ -0,0 +1,13 @@
+class role::rsync_caesium {
+
+$sourceip='10.64.32.145'
+
+include rsync::server
+
+rsync::server::module { 'releases':
+path=> '/srv/org/wikimedia',
+read_only => 'no',
+hosts_allow => $sourceip,
+}
+
+}
diff --git a/manifests/role/rsync_ruthenium.pp
b/manifests/role/rsync_ruthenium.pp
deleted file mode 100644
index 5223063..000
--- a/manifests/role/rsync_ruthenium.pp
+++ /dev/null
@@ -1,13 +0,0 @@
-class role::rsync_ruthenium {
-
-$sourceip='10.64.32.146'
-
-include rsync::server
-
-rsync::server::module { 'ruthenium':
-path=> '/mnt/data',
-read_only => 'no',
-hosts_allow => $sourceip,
-}
-
-}
diff --git a/manifests/site.pp b/manifests/site.pp
index 4c17989..afc9933 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -242,7 +242,7 @@
# virtual machine for static misc. services
node 'bromine.eqiad.wmnet' {
-role bugzilla::static, annualreport, transparency, releases
+role bugzilla::static, annualreport, transparency, releases, rsync_caesium
include standard
}
--
To view, visit https://gerrit.wikimedia.org/r/266608
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ieba88211506dcdf9d313542f5d4a7b02664f2841
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn
Gerrit-Reviewer: Dzahn
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] releases: setup rsyncd to copy release files - change (operations/puppet)
Dzahn has uploaded a new change for review.
https://gerrit.wikimedia.org/r/266608
Change subject: releases: setup rsyncd to copy release files
..
releases: setup rsyncd to copy release files
Temporarily set up an rsyncd on bromine to copy
release files over from caesium for migration.
Bug:T124261
Change-Id: Ieba88211506dcdf9d313542f5d4a7b02664f2841
---
A manifests/role/rsync_caesium.pp
D manifests/role/rsync_ruthenium.pp
M manifests/site.pp
3 files changed, 14 insertions(+), 14 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/08/266608/1
diff --git a/manifests/role/rsync_caesium.pp b/manifests/role/rsync_caesium.pp
new file mode 100644
index 000..c697db9
--- /dev/null
+++ b/manifests/role/rsync_caesium.pp
@@ -0,0 +1,13 @@
+class role::rsync_caesium {
+
+$sourceip='10.64.32.145'
+
+include rsync::server
+
+rsync::server::module { 'releases':
+path=> '/srv/org/wikimedia',
+read_only => 'no',
+hosts_allow => $sourceip,
+}
+
+}
diff --git a/manifests/role/rsync_ruthenium.pp
b/manifests/role/rsync_ruthenium.pp
deleted file mode 100644
index 5223063..000
--- a/manifests/role/rsync_ruthenium.pp
+++ /dev/null
@@ -1,13 +0,0 @@
-class role::rsync_ruthenium {
-
-$sourceip='10.64.32.146'
-
-include rsync::server
-
-rsync::server::module { 'ruthenium':
-path=> '/mnt/data',
-read_only => 'no',
-hosts_allow => $sourceip,
-}
-
-}
diff --git a/manifests/site.pp b/manifests/site.pp
index 532dec9..c635389 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -242,7 +242,7 @@
# virtual machine for static misc. services
node 'bromine.eqiad.wmnet' {
-role bugzilla::static, annualreport, transparency, releases
+role bugzilla::static, annualreport, transparency, releases, rsync_caesium
include standard
}
--
To view, visit https://gerrit.wikimedia.org/r/266608
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ieba88211506dcdf9d313542f5d4a7b02664f2841
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Make ForeignTitle properties private - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged. Change subject: Make ForeignTitle properties private .. Make ForeignTitle properties private Change-Id: If9ea22f412a378aa1090ba761c19f77c97da7df0 --- M includes/title/ForeignTitle.php 1 file changed, 3 insertions(+), 3 deletions(-) Approvals: Legoktm: Looks good to me, approved jenkins-bot: Verified diff --git a/includes/title/ForeignTitle.php b/includes/title/ForeignTitle.php index ed96d17..6e6f2ea 100644 --- a/includes/title/ForeignTitle.php +++ b/includes/title/ForeignTitle.php @@ -30,11 +30,11 @@ * @var int|null * Null if we don't know the namespace ID (e.g. interwiki links) */ - protected $namespaceId; + private $namespaceId; /** @var string */ - protected $namespaceName; + private $namespaceName; /** @var string */ - protected $pageName; + private $pageName; /** * Creates a new ForeignTitle object. -- To view, visit https://gerrit.wikimedia.org/r/266553 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: If9ea22f412a378aa1090ba761c19f77c97da7df0 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Addshore Gerrit-Reviewer: Legoktm Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Group0 to 1.27.0-wmf.11 - change (operations/mediawiki-config)
jenkins-bot has submitted this change and it was merged.
Change subject: Group0 to 1.27.0-wmf.11
..
Group0 to 1.27.0-wmf.11
Change-Id: Iac80cd1e1e4c4def5a9d5a8f140946d516608957
---
M wikiversions.json
1 file changed, 896 insertions(+), 1 deletion(-)
Approvals:
Dduvall: Looks good to me, approved
jenkins-bot: Verified
diff --git a/wikiversions.json b/wikiversions.json
index b866777..a5d746a 100644
--- a/wikiversions.json
+++ b/wikiversions.json
@@ -1 +1,896 @@
-{"aawiki":"php-1.27.0-wmf.10","aawikibooks":"php-1.27.0-wmf.10","aawiktionary":"php-1.27.0-wmf.10","abwiki":"php-1.27.0-wmf.10","abwiktionary":"php-1.27.0-wmf.10","acewiki":"php-1.27.0-wmf.10","advisorywiki":"php-1.27.0-wmf.10","afwiki":"php-1.27.0-wmf.10","afwikibooks":"php-1.27.0-wmf.10","afwikiquote":"php-1.27.0-wmf.10","afwiktionary":"php-1.27.0-wmf.10","akwiki":"php-1.27.0-wmf.10","akwikibooks":"php-1.27.0-wmf.10","akwiktionary":"php-1.27.0-wmf.10","alswiki":"php-1.27.0-wmf.10","alswikibooks":"php-1.27.0-wmf.10","alswikiquote":"php-1.27.0-wmf.10","alswiktionary":"php-1.27.0-wmf.10","amwiki":"php-1.27.0-wmf.10","amwikiquote":"php-1.27.0-wmf.10","amwiktionary":"php-1.27.0-wmf.10","angwiki":"php-1.27.0-wmf.10","angwikibooks":"php-1.27.0-wmf.10","angwikiquote":"php-1.27.0-wmf.10","angwikisource":"php-1.27.0-wmf.10","angwiktionary":"php-1.27.0-wmf.10","anwiki":"php-1.27.0-wmf.10","anwiktionary":"php-1.27.0-wmf.10","arbcom_dewiki":"php-1.27.0-wmf.10","arbcom_enwiki":"php-1.27.0-wmf.10","arbcom_fiwiki":"php-1.27.0-wmf.10","arbcom_nlwiki":"php-1.27.0-wmf.10","arcwiki":"php-1.27.0-wmf.10","arwiki":"php-1.27.0-wmf.10","arwikibooks":"php-1.27.0-wmf.10","arwikimedia":"php-1.27.0-wmf.10","arwikinews":"php-1.27.0-wmf.10","arwikiquote":"php-1.27.0-wmf.10","arwikisource":"php-1.27.0-wmf.10","arwikiversity":"php-1.27.0-wmf.10","arwiktionary":"php-1.27.0-wmf.10","arzwiki":"php-1.27.0-wmf.10","astwiki":"php-1.27.0-wmf.10","astwikibooks":"php-1.27.0-wmf.10","astwikiquote":"php-1.27.0-wmf.10","astwiktionary":"php-1.27.0-wmf.10","aswiki":"php-1.27.0-wmf.10","aswikibooks":"php-1.27.0-wmf.10","aswikisource":"php-1.27.0-wmf.10","aswiktionary":"php-1.27.0-wmf.10","auditcomwiki":"php-1.27.0-wmf.10","avwiki":"php-1.27.0-wmf.10","avwiktionary":"php-1.27.0-wmf.10","aywiki":"php-1.27.0-wmf.10","aywikibooks":"php-1.27.0-wmf.10","aywiktionary":"php-1.27.0-wmf.10","azbwiki":"php-1.27.0-wmf.10","azwiki":"php-1.27.0-wmf.10","azwikibooks":"php-1.27.0-wmf.10","azwikiquote":"php-1.27.0-wmf.10","azwikisource":"php-1.27.0-wmf.10","azwiktionary":"php-1.27.0-wmf.10","barwiki":"php-1.27.0-wmf.10","bat_smgwiki":"php-1.27.0-wmf.10","bawiki":"php-1.27.0-wmf.10","bawikibooks":"php-1.27.0-wmf.10","bclwiki":"php-1.27.0-wmf.10","bdwikimedia":"php-1.27.0-wmf.10","be_x_oldwiki":"php-1.27.0-wmf.10","betawikiversity":"php-1.27.0-wmf.10","bewiki":"php-1.27.0-wmf.10","bewikibooks":"php-1.27.0-wmf.10","bewikimedia":"php-1.27.0-wmf.10","bewikiquote":"php-1.27.0-wmf.10","bewikisource":"php-1.27.0-wmf.10","bewiktionary":"php-1.27.0-wmf.10","bgwiki":"php-1.27.0-wmf.10","bgwikibooks":"php-1.27.0-wmf.10","bgwikinews":"php-1.27.0-wmf.10","bgwikiquote":"php-1.27.0-wmf.10","bgwikisource":"php-1.27.0-wmf.10","bgwiktionary":"php-1.27.0-wmf.10","bhwiki":"php-1.27.0-wmf.10","bhwiktionary":"php-1.27.0-wmf.10","biwiki":"php-1.27.0-wmf.10","biwikibooks":"php-1.27.0-wmf.10","biwiktionary":"php-1.27.0-wmf.10","bjnwiki":"php-1.27.0-wmf.10","bmwiki":"php-1.27.0-wmf.10","bmwikibooks":"php-1.27.0-wmf.10","bmwikiquote":"php-1.27.0-wmf.10","bmwiktionary":"php-1.27.0-wmf.10","bnwiki":"php-1.27.0-wmf.10","bnwikibooks":"php-1.27.0-wmf.10","bnwikisource":"php-1.27.0-wmf.10","bnwiktionary":"php-1.27.0-wmf.10","boardgovcomwiki":"php-1.27.0-wmf.10","boardwiki":"php-1.27.0-wmf.10","bowiki":"php-1.27.0-wmf.10","bowikibooks":"php-1.27.0-wmf.10","bowiktionary":"php-1.27.0-wmf.10","bpywiki":"php-1.27.0-wmf.10","brwiki":"php-1.27.0-wmf.10","brwikimedia":"php-1.27.0-wmf.10","brwikiquote":"php-1.27.0-wmf.10","brwikisource":"php-1.27.0-wmf.10","brwiktionary":"php-1.27.0-wmf.10","bswiki":"php-1.27.0-wmf.10","bswikibooks":"php-1.27.0-wmf.10","bswikinews":"php-1.27.0-wmf.10","bswikiquote":"php-1.27.0-wmf.10","bswikisource":"php-1.27.0-wmf.10","bswiktionary":"php-1.27.0-wmf.10","bugwiki":"php-1.27.0-wmf.10","bxrwiki":"php-1.27.0-wmf.10","cawiki":"php-1.27.0-wmf.10","cawikibooks":"php-1.27.0-wmf.10","cawikimedia":"php-1.27.0-wmf.10","cawikinews":"php-1.27.0-wmf.10","cawikiquote":"php-1.27.0-wmf.10","cawikisource":"php-1.27.0-wmf.10","cawiktionary":"php-1.27.0-wmf.10","cbk_zamwiki":"php-1.27.0-wmf.10","cdowiki":"php-1.27.0-wmf.10","cebwiki":"php-1.27.0-wmf.10","cewiki":"php-1.27.0-wmf.10","chairwiki":"php-1.27.0-wmf.10","chapcomwiki":"php-1.27.0-wmf.10","checkuserwiki":"php-1.27.0-wmf.10","chowiki":"php-1.27.0-wmf.10","chrwiki":"php-1.27.0-wmf.10","chrwiktionary":"php-1.27.0-wmf.10","chwiki":"php-1.27.0-wmf.10","chwikibooks":"php-1.27.0-wmf.10","chwiktionary":"php-1.27
[MediaWiki-commits] [Gerrit] [SemanticSifter] Replace jslint test with jshint and jsonlint - change (integration/config)
Paladox has uploaded a new change for review. https://gerrit.wikimedia.org/r/266607 Change subject: [SemanticSifter] Replace jslint test with jshint and jsonlint .. [SemanticSifter] Replace jslint test with jshint and jsonlint https://gerrit.wikimedia.org/r/#/c/264751/ Change-Id: I1ed5a34da6f1c4512225d047729472ebbe191bc6 --- M jjb/mediawiki-extensions.yaml M zuul/layout.yaml 2 files changed, 2 insertions(+), 4 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/integration/config refs/changes/07/266607/1 diff --git a/jjb/mediawiki-extensions.yaml b/jjb/mediawiki-extensions.yaml index 0062eb2..21af59b 100644 --- a/jjb/mediawiki-extensions.yaml +++ b/jjb/mediawiki-extensions.yaml @@ -869,7 +869,6 @@ - mwext-SemanticMaps - mwext-SemanticRating - mwext-SemanticResultFormats - - mwext-SemanticSifter - mwext-SemanticWatchlist - mwext-SemanticWebBrowser - mwext-SharedCssJs diff --git a/zuul/layout.yaml b/zuul/layout.yaml index 6c6d294..a65a8c0 100644 --- a/zuul/layout.yaml +++ b/zuul/layout.yaml @@ -859,8 +859,6 @@ voting: false - name: mwext-SemanticHighcharts-jslint voting: false - - name: mwext-SemanticSifter-jslint -voting: false - name: mwext-SignWritingMediaWikiPlugin-jslint voting: false - name: mwext-SlimboxThumbs-jslint @@ -5346,7 +5344,8 @@ - name: mediawiki/extensions/SemanticSifter template: - - name: extension-jslint + - name: jsonlint + - name: jshint - name: extension-unittests - name: mediawiki/extensions/SemanticWebBrowser -- To view, visit https://gerrit.wikimedia.org/r/266607 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I1ed5a34da6f1c4512225d047729472ebbe191bc6 Gerrit-PatchSet: 1 Gerrit-Project: integration/config Gerrit-Branch: master Gerrit-Owner: Paladox ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Group0 to 1.27.0-wmf.11 - change (operations/mediawiki-config)
Dduvall has uploaded a new change for review.
https://gerrit.wikimedia.org/r/266606
Change subject: Group0 to 1.27.0-wmf.11
..
Group0 to 1.27.0-wmf.11
Change-Id: Iac80cd1e1e4c4def5a9d5a8f140946d516608957
---
M wikiversions.json
1 file changed, 896 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config
refs/changes/06/266606/1
diff --git a/wikiversions.json b/wikiversions.json
index b866777..a5d746a 100644
--- a/wikiversions.json
+++ b/wikiversions.json
@@ -1 +1,896 @@
-{"aawiki":"php-1.27.0-wmf.10","aawikibooks":"php-1.27.0-wmf.10","aawiktionary":"php-1.27.0-wmf.10","abwiki":"php-1.27.0-wmf.10","abwiktionary":"php-1.27.0-wmf.10","acewiki":"php-1.27.0-wmf.10","advisorywiki":"php-1.27.0-wmf.10","afwiki":"php-1.27.0-wmf.10","afwikibooks":"php-1.27.0-wmf.10","afwikiquote":"php-1.27.0-wmf.10","afwiktionary":"php-1.27.0-wmf.10","akwiki":"php-1.27.0-wmf.10","akwikibooks":"php-1.27.0-wmf.10","akwiktionary":"php-1.27.0-wmf.10","alswiki":"php-1.27.0-wmf.10","alswikibooks":"php-1.27.0-wmf.10","alswikiquote":"php-1.27.0-wmf.10","alswiktionary":"php-1.27.0-wmf.10","amwiki":"php-1.27.0-wmf.10","amwikiquote":"php-1.27.0-wmf.10","amwiktionary":"php-1.27.0-wmf.10","angwiki":"php-1.27.0-wmf.10","angwikibooks":"php-1.27.0-wmf.10","angwikiquote":"php-1.27.0-wmf.10","angwikisource":"php-1.27.0-wmf.10","angwiktionary":"php-1.27.0-wmf.10","anwiki":"php-1.27.0-wmf.10","anwiktionary":"php-1.27.0-wmf.10","arbcom_dewiki":"php-1.27.0-wmf.10","arbcom_enwiki":"php-1.27.0-wmf.10","arbcom_fiwiki":"php-1.27.0-wmf.10","arbcom_nlwiki":"php-1.27.0-wmf.10","arcwiki":"php-1.27.0-wmf.10","arwiki":"php-1.27.0-wmf.10","arwikibooks":"php-1.27.0-wmf.10","arwikimedia":"php-1.27.0-wmf.10","arwikinews":"php-1.27.0-wmf.10","arwikiquote":"php-1.27.0-wmf.10","arwikisource":"php-1.27.0-wmf.10","arwikiversity":"php-1.27.0-wmf.10","arwiktionary":"php-1.27.0-wmf.10","arzwiki":"php-1.27.0-wmf.10","astwiki":"php-1.27.0-wmf.10","astwikibooks":"php-1.27.0-wmf.10","astwikiquote":"php-1.27.0-wmf.10","astwiktionary":"php-1.27.0-wmf.10","aswiki":"php-1.27.0-wmf.10","aswikibooks":"php-1.27.0-wmf.10","aswikisource":"php-1.27.0-wmf.10","aswiktionary":"php-1.27.0-wmf.10","auditcomwiki":"php-1.27.0-wmf.10","avwiki":"php-1.27.0-wmf.10","avwiktionary":"php-1.27.0-wmf.10","aywiki":"php-1.27.0-wmf.10","aywikibooks":"php-1.27.0-wmf.10","aywiktionary":"php-1.27.0-wmf.10","azbwiki":"php-1.27.0-wmf.10","azwiki":"php-1.27.0-wmf.10","azwikibooks":"php-1.27.0-wmf.10","azwikiquote":"php-1.27.0-wmf.10","azwikisource":"php-1.27.0-wmf.10","azwiktionary":"php-1.27.0-wmf.10","barwiki":"php-1.27.0-wmf.10","bat_smgwiki":"php-1.27.0-wmf.10","bawiki":"php-1.27.0-wmf.10","bawikibooks":"php-1.27.0-wmf.10","bclwiki":"php-1.27.0-wmf.10","bdwikimedia":"php-1.27.0-wmf.10","be_x_oldwiki":"php-1.27.0-wmf.10","betawikiversity":"php-1.27.0-wmf.10","bewiki":"php-1.27.0-wmf.10","bewikibooks":"php-1.27.0-wmf.10","bewikimedia":"php-1.27.0-wmf.10","bewikiquote":"php-1.27.0-wmf.10","bewikisource":"php-1.27.0-wmf.10","bewiktionary":"php-1.27.0-wmf.10","bgwiki":"php-1.27.0-wmf.10","bgwikibooks":"php-1.27.0-wmf.10","bgwikinews":"php-1.27.0-wmf.10","bgwikiquote":"php-1.27.0-wmf.10","bgwikisource":"php-1.27.0-wmf.10","bgwiktionary":"php-1.27.0-wmf.10","bhwiki":"php-1.27.0-wmf.10","bhwiktionary":"php-1.27.0-wmf.10","biwiki":"php-1.27.0-wmf.10","biwikibooks":"php-1.27.0-wmf.10","biwiktionary":"php-1.27.0-wmf.10","bjnwiki":"php-1.27.0-wmf.10","bmwiki":"php-1.27.0-wmf.10","bmwikibooks":"php-1.27.0-wmf.10","bmwikiquote":"php-1.27.0-wmf.10","bmwiktionary":"php-1.27.0-wmf.10","bnwiki":"php-1.27.0-wmf.10","bnwikibooks":"php-1.27.0-wmf.10","bnwikisource":"php-1.27.0-wmf.10","bnwiktionary":"php-1.27.0-wmf.10","boardgovcomwiki":"php-1.27.0-wmf.10","boardwiki":"php-1.27.0-wmf.10","bowiki":"php-1.27.0-wmf.10","bowikibooks":"php-1.27.0-wmf.10","bowiktionary":"php-1.27.0-wmf.10","bpywiki":"php-1.27.0-wmf.10","brwiki":"php-1.27.0-wmf.10","brwikimedia":"php-1.27.0-wmf.10","brwikiquote":"php-1.27.0-wmf.10","brwikisource":"php-1.27.0-wmf.10","brwiktionary":"php-1.27.0-wmf.10","bswiki":"php-1.27.0-wmf.10","bswikibooks":"php-1.27.0-wmf.10","bswikinews":"php-1.27.0-wmf.10","bswikiquote":"php-1.27.0-wmf.10","bswikisource":"php-1.27.0-wmf.10","bswiktionary":"php-1.27.0-wmf.10","bugwiki":"php-1.27.0-wmf.10","bxrwiki":"php-1.27.0-wmf.10","cawiki":"php-1.27.0-wmf.10","cawikibooks":"php-1.27.0-wmf.10","cawikimedia":"php-1.27.0-wmf.10","cawikinews":"php-1.27.0-wmf.10","cawikiquote":"php-1.27.0-wmf.10","cawikisource":"php-1.27.0-wmf.10","cawiktionary":"php-1.27.0-wmf.10","cbk_zamwiki":"php-1.27.0-wmf.10","cdowiki":"php-1.27.0-wmf.10","cebwiki":"php-1.27.0-wmf.10","cewiki":"php-1.27.0-wmf.10","chairwiki":"php-1.27.0-wmf.10","chapcomwiki":"php-1.27.0-wmf.10","checkuserwiki":"php-1.27.0-wmf.10","chowiki":"php-1.27.0-wmf.10","chrwiki":"php-1.27.0-wmf.10","chrwiktionary":"php-1.27.0-wmf.10","chwiki":"php-1.27.0-wmf.10","chwi
[MediaWiki-commits] [Gerrit] [Metrolook] Add extension-qunit-generic test - change (integration/config)
Paladox has uploaded a new change for review. https://gerrit.wikimedia.org/r/266605 Change subject: [Metrolook] Add extension-qunit-generic test .. [Metrolook] Add extension-qunit-generic test Change-Id: Ie41be77a8745faceec0f2baad4a44eda3582730e --- M zuul/layout.yaml 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/integration/config refs/changes/05/266605/1 diff --git a/zuul/layout.yaml b/zuul/layout.yaml index 6c6d294..10c60de 100644 --- a/zuul/layout.yaml +++ b/zuul/layout.yaml @@ -1910,6 +1910,7 @@ template: - name: composer-test - name: npm + - name: extension-qunit-generic check: - jsonlint - jshint -- To view, visit https://gerrit.wikimedia.org/r/266605 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie41be77a8745faceec0f2baad4a44eda3582730e Gerrit-PatchSet: 1 Gerrit-Project: integration/config Gerrit-Branch: master Gerrit-Owner: Paladox ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] [Vector] Add extension-qunit-generic test - change (integration/config)
Paladox has uploaded a new change for review. https://gerrit.wikimedia.org/r/266604 Change subject: [Vector] Add extension-qunit-generic test .. [Vector] Add extension-qunit-generic test This wont test the code instead only tests the resouces such as css and js. Change-Id: Ic0d3ce9ce8bbcd3592fef50cc9c067d5ce8b91a3 --- M zuul/layout.yaml 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/integration/config refs/changes/04/266604/1 diff --git a/zuul/layout.yaml b/zuul/layout.yaml index 6c6d294..a9799f4 100644 --- a/zuul/layout.yaml +++ b/zuul/layout.yaml @@ -2002,6 +2002,7 @@ template: - name: composer-test - name: npm + - name: extension-qunit-generic check: - jshint - jsonlint -- To view, visit https://gerrit.wikimedia.org/r/266604 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic0d3ce9ce8bbcd3592fef50cc9c067d5ce8b91a3 Gerrit-PatchSet: 1 Gerrit-Project: integration/config Gerrit-Branch: master Gerrit-Owner: Paladox ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Set $wgCentralAuthUseSlaves on all wikis - change (operations/mediawiki-config)
Aaron Schulz has uploaded a new change for review.
https://gerrit.wikimedia.org/r/266603
Change subject: Set $wgCentralAuthUseSlaves on all wikis
..
Set $wgCentralAuthUseSlaves on all wikis
T119689
Change-Id: I4cf4919d8188d0a1fff491de4ab794754d178391
---
M wmf-config/CommonSettings.php
1 file changed, 1 insertion(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config
refs/changes/03/266603/1
diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index 7574b43..a0c1d06 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -1255,10 +1255,7 @@
'PasswordCannotBePopular' => PHP_INT_MAX,
);
- // testing -- aaron 2016-01-12
- if ( in_array( $wgDBname, array( 'testwiki', 'mediawikiwiki',
'loginwiki' ) ) ) {
- $wgCentralAuthUseSlaves = true;
- }
+ $wgCentralAuthUseSlaves = true;
}
// Config for GlobalCssJs
--
To view, visit https://gerrit.wikimedia.org/r/266603
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I4cf4919d8188d0a1fff491de4ab794754d178391
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Wrap CallbackFilterIterator in a condition check - change (mediawiki...Echo)
jenkins-bot has submitted this change and it was merged.
Change subject: Wrap CallbackFilterIterator in a condition check
..
Wrap CallbackFilterIterator in a condition check
Wrap the CallbackFilterIterator backport class in a conditional check
for PHP runtimes that include the class natively. This really should
only be needed for linting as the class is loaded via an autoloader
and thus should not be loaded if the runtime already has it
available.
Bug: T124828
Change-Id: I39d27385186d4693a8babdd2b818e6b4bc16255a
---
M composer.json
M includes/iterator/CallbackFilterIterator.php
2 files changed, 22 insertions(+), 19 deletions(-)
Approvals:
Dduvall: Looks good to me, approved
jenkins-bot: Verified
diff --git a/composer.json b/composer.json
index 5aad829..a4e611c 100644
--- a/composer.json
+++ b/composer.json
@@ -5,7 +5,7 @@
},
"scripts": {
"test": [
- "parallel-lint . --exclude vendor --exclude
includes/iterator/CallbackFilterIterator.php",
+ "parallel-lint . --exclude vendor",
"phpcs"
]
}
diff --git a/includes/iterator/CallbackFilterIterator.php
b/includes/iterator/CallbackFilterIterator.php
index 4095d1d..e4aa4a2 100644
--- a/includes/iterator/CallbackFilterIterator.php
+++ b/includes/iterator/CallbackFilterIterator.php
@@ -1,24 +1,27 @@
callback = $callback;
- }
+ public function __construct( Iterator $iterator, $callback ) {
+ parent::__construct( $iterator );
+ $this->callback = $callback;
+ }
- public function accept() {
- return call_user_func(
- $this->callback,
- $this->current(),
- $this->key(),
- $this->getInnerIterator()
- );
+ public function accept() {
+ return call_user_func(
+ $this->callback,
+ $this->current(),
+ $this->key(),
+ $this->getInnerIterator()
+ );
+ }
}
}
--
To view, visit https://gerrit.wikimedia.org/r/266601
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I39d27385186d4693a8babdd2b818e6b4bc16255a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Echo
Gerrit-Branch: wmf/1.27.0-wmf.11
Gerrit-Owner: Dduvall
Gerrit-Reviewer: BryanDavis
Gerrit-Reviewer: Dduvall
Gerrit-Reviewer: Legoktm
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Wrap CallbackFilterIterator in a condition check - change (mediawiki...Echo)
jenkins-bot has submitted this change and it was merged.
Change subject: Wrap CallbackFilterIterator in a condition check
..
Wrap CallbackFilterIterator in a condition check
Wrap the CallbackFilterIterator backport class in a conditional check
for PHP runtimes that include the class natively. This really should
only be needed for linting as the class is loaded via an autoloader
and thus should not be loaded if the runtime already has it
available.
Bug: T124828
Change-Id: I39d27385186d4693a8babdd2b818e6b4bc16255a
---
M composer.json
M includes/iterator/CallbackFilterIterator.php
2 files changed, 22 insertions(+), 19 deletions(-)
Approvals:
Dduvall: Looks good to me, approved
jenkins-bot: Verified
diff --git a/composer.json b/composer.json
index 5aad829..a4e611c 100644
--- a/composer.json
+++ b/composer.json
@@ -5,7 +5,7 @@
},
"scripts": {
"test": [
- "parallel-lint . --exclude vendor --exclude
includes/iterator/CallbackFilterIterator.php",
+ "parallel-lint . --exclude vendor",
"phpcs"
]
}
diff --git a/includes/iterator/CallbackFilterIterator.php
b/includes/iterator/CallbackFilterIterator.php
index 4095d1d..e4aa4a2 100644
--- a/includes/iterator/CallbackFilterIterator.php
+++ b/includes/iterator/CallbackFilterIterator.php
@@ -1,24 +1,27 @@
callback = $callback;
- }
+ public function __construct( Iterator $iterator, $callback ) {
+ parent::__construct( $iterator );
+ $this->callback = $callback;
+ }
- public function accept() {
- return call_user_func(
- $this->callback,
- $this->current(),
- $this->key(),
- $this->getInnerIterator()
- );
+ public function accept() {
+ return call_user_func(
+ $this->callback,
+ $this->current(),
+ $this->key(),
+ $this->getInnerIterator()
+ );
+ }
}
}
--
To view, visit https://gerrit.wikimedia.org/r/266598
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I39d27385186d4693a8babdd2b818e6b4bc16255a
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Echo
Gerrit-Branch: master
Gerrit-Owner: BryanDavis
Gerrit-Reviewer: Dduvall
Gerrit-Reviewer: Reedy
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Suppress duplicate prefix/domain warnings for parserTests. - change (mediawiki...parsoid)
jenkins-bot has submitted this change and it was merged.
Change subject: Suppress duplicate prefix/domain warnings for parserTests.
..
Suppress duplicate prefix/domain warnings for parserTests.
Change-Id: Id0e66d3dd9cdeb066a4f4267dcd31aed181cda58
---
M bin/parserTests.js
1 file changed, 3 insertions(+), 1 deletion(-)
Approvals:
Arlolra: Looks good to me, approved
jenkins-bot: Verified
diff --git a/bin/parserTests.js b/bin/parserTests.js
index 64ff483..4f77e50 100755
--- a/bin/parserTests.js
+++ b/bin/parserTests.js
@@ -1655,7 +1655,8 @@
var extensions =
parsoidConfig.defaultNativeExtensions.concat(ParserHook);
// Send all requests to the mock API server.
- parsoidConfig.mwApiMap.forEach(function(apiConf) {
+
Array.from(parsoidConfig.mwApiMap.values()).forEach(function(apiConf) {
+ parsoidConfig.removeMwApi(apiConf);
parsoidConfig.setMwApi({
prefix: apiConf.prefix,
domain: apiConf.domain,
@@ -1666,6 +1667,7 @@
// This isn't part of the sitematrix but the
// "Check noCommafy in formatNum" test depends on it.
+ parsoidConfig.removeMwApi({ domain: 'be-tarask.wikipedia.org'
});
parsoidConfig.setMwApi({
prefix: 'be-taraskwiki',
domain: 'be-tarask.wikipedia.org',
--
To view, visit https://gerrit.wikimedia.org/r/266594
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Id0e66d3dd9cdeb066a4f4267dcd31aed181cda58
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/parsoid
Gerrit-Branch: master
Gerrit-Owner: Cscott
Gerrit-Reviewer: Arlolra
Gerrit-Reviewer: Subramanya Sastry
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Move extension content serialization to cite - change (mediawiki...parsoid)
Arlolra has uploaded a new change for review.
https://gerrit.wikimedia.org/r/266602
Change subject: Move extension content serialization to cite
..
Move extension content serialization to cite
* And allow for other native extensions to define a content handler.
* Small change to the way refs that can't locate their content by id
are handled (serialized as empty instead of dropped).
Change-Id: I1db0f3c3f3e85706125418bb431aa40c17a97407
---
M lib/ext/Cite.js
M lib/html2wt/DOMHandlers.js
M lib/html2wt/WikitextSerializer.js
3 files changed, 123 insertions(+), 96 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/parsoid
refs/changes/02/266602/1
diff --git a/lib/ext/Cite.js b/lib/ext/Cite.js
index 2ae98a4..081d906 100644
--- a/lib/ext/Cite.js
+++ b/lib/ext/Cite.js
@@ -96,6 +96,67 @@
});
};
+var contentHandler = Promise.method(function(node, state) {
+ var env = state.env;
+ var dataMw = DU.getDataMw(node);
+ var extName = dataMw.name;
+ var htmlText;
+
+ // First look for the extension's content in data-mw.body.html
+ if (typeof dataMw.body.html === 'string') {
+ htmlText = dataMw.body.html;
+ } else if (typeof dataMw.body.id === 'string') {
+ // If the body isn't contained in data-mw.body.html, look if
+ // there's an element pointed to by body.id.
+ var bodyElt = node.ownerDocument.getElementById(dataMw.body.id);
+ if (!bodyElt && env.page.editedDoc) {
+ // Try to get to it from the main page.
+ // This can happen when the is inside another
extension,
+ // most commonly inside a .
+ bodyElt =
env.page.editedDoc.getElementById(dataMw.body.id);
+ }
+ if (bodyElt) {
+ htmlText = bodyElt.innerHTML;
+ } else {
+ // Some extra debugging for VisualEditor
+ var extraDebug = '';
+ var firstA = node.querySelector('a[href]');
+ if (firstA && /^#/.test(firstA.getAttribute('href'))) {
+ var href = firstA.getAttribute('href');
+ var ref =
node.ownerDocument.querySelector(href);
+ if (ref) {
+ extraDebug += ' [own doc: ' +
ref.outerHTML + ']';
+ }
+ ref = env.page.editedDoc.querySelector(href);
+ if (ref) {
+ extraDebug += ' [main doc: ' +
ref.outerHTML + ']';
+ }
+ if (!extraDebug) {
+ extraDebug = ' [reference ' + href + '
not found]';
+ }
+ }
+ env.log("error/" + extName,
+ "extension src id " + dataMw.body.id +
+ " points to non-existent element for:",
node.outerHTML,
+ ". More debug info: ", extraDebug);
+ }
+ }
+ if (htmlText) {
+ return state.serializer.serializeHTML({
+ env: env,
+ extName: extName,
+ }, htmlText);
+ } else {
+ return '';
+ }
+});
+
+Ref.prototype.serialHandler = {
+ handle: Promise.method(function(node, state, wrapperUnmodified) {
+ return state.serializer.extensionHandler(node, state,
contentHandler);
+ }),
+};
+
/**
* Helper class used by implementation
*/
@@ -325,7 +386,7 @@
var doc = node.ownerDocument;
var span = doc.createElement('span');
var content = dp.content;
- var dataMW = Util.clone(DU.getDataMw(node));
+ var dataMw = Util.clone(DU.getDataMw(node));
var body;
if (dp.hasRefInRef) {
@@ -352,8 +413,8 @@
// data-mw will not be empty in scenarios where the is also
templated.
// In those cases, the transclusion markup takes precedence over the
markup.
// So, we aren't updating data-mw.
- if (!Object.keys(dataMW).length) {
- dataMW = {
+ if (!Object.keys(dataMw).length) {
+ dataMw = {
'name': 'ref',
// Dont set body if this is a reused reference
// like with empty content.
@@ -384,7 +445,7 @@
pi: dp.pi,
};
DU.setDataParsoid(span, dataParsoid);
- DU.setDataMw(span, dataMW);
+ DU.setDataMw(span, dataMw);
// refLink is the link to the citation
var refLink = doc.createElement('a');
@@ -409,7 +470,7 @@
[MediaWiki-commits] [Gerrit] Wrap CallbackFilterIterator in a condition check - change (mediawiki...Echo)
Dduvall has uploaded a new change for review.
https://gerrit.wikimedia.org/r/266601
Change subject: Wrap CallbackFilterIterator in a condition check
..
Wrap CallbackFilterIterator in a condition check
Wrap the CallbackFilterIterator backport class in a conditional check
for PHP runtimes that include the class natively. This really should
only be needed for linting as the class is loaded via an autoloader
and thus should not be loaded if the runtime already has it
available.
Bug: T124828
Change-Id: I39d27385186d4693a8babdd2b818e6b4bc16255a
---
M composer.json
M includes/iterator/CallbackFilterIterator.php
2 files changed, 22 insertions(+), 19 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Echo
refs/changes/01/266601/1
diff --git a/composer.json b/composer.json
index 5aad829..a4e611c 100644
--- a/composer.json
+++ b/composer.json
@@ -5,7 +5,7 @@
},
"scripts": {
"test": [
- "parallel-lint . --exclude vendor --exclude
includes/iterator/CallbackFilterIterator.php",
+ "parallel-lint . --exclude vendor",
"phpcs"
]
}
diff --git a/includes/iterator/CallbackFilterIterator.php
b/includes/iterator/CallbackFilterIterator.php
index 4095d1d..e4aa4a2 100644
--- a/includes/iterator/CallbackFilterIterator.php
+++ b/includes/iterator/CallbackFilterIterator.php
@@ -1,24 +1,27 @@
callback = $callback;
- }
+ public function __construct( Iterator $iterator, $callback ) {
+ parent::__construct( $iterator );
+ $this->callback = $callback;
+ }
- public function accept() {
- return call_user_func(
- $this->callback,
- $this->current(),
- $this->key(),
- $this->getInnerIterator()
- );
+ public function accept() {
+ return call_user_func(
+ $this->callback,
+ $this->current(),
+ $this->key(),
+ $this->getInnerIterator()
+ );
+ }
}
}
--
To view, visit https://gerrit.wikimedia.org/r/266601
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I39d27385186d4693a8babdd2b818e6b4bc16255a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Echo
Gerrit-Branch: wmf/1.27.0-wmf.11
Gerrit-Owner: Dduvall
Gerrit-Reviewer: BryanDavis
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] .redirectMsg needs to be 0 height - change (mediawiki...Vector)
jenkins-bot has submitted this change and it was merged.
Change subject: .redirectMsg needs to be 0 height
..
.redirectMsg needs to be 0 height
It wasn't because ".mw-body p" introduces a margin, causing an
undesired extra spacing on redirect pages.
Change-Id: I53f63703b086ff6b28c1fb5325ee6693e3322390
---
M components/common.less
1 file changed, 4 insertions(+), 0 deletions(-)
Approvals:
Jdlrobson: Looks good to me, approved
jenkins-bot: Verified
diff --git a/components/common.less b/components/common.less
index 16e2622..f50880a 100644
--- a/components/common.less
+++ b/components/common.less
@@ -147,6 +147,10 @@
font-size: 140%;
}
+.redirectMsg p {
+ margin: 0;
+}
+
.mw-body-content {
position: relative;
line-height: @content-line-height;
--
To view, visit https://gerrit.wikimedia.org/r/266562
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I53f63703b086ff6b28c1fb5325ee6693e3322390
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/Vector
Gerrit-Branch: master
Gerrit-Owner: TheDJ
Gerrit-Reviewer: Bartosz Dziewoński
Gerrit-Reviewer: Edokter
Gerrit-Reviewer: Isarra
Gerrit-Reviewer: Jdlrobson
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] replaceExcept tests for non-inverting lookbehind or lookbehind - change (pywikibot/core)
Mpaa has uploaded a new change for review.
https://gerrit.wikimedia.org/r/266600
Change subject: replaceExcept tests for non-inverting lookbehind or lookbehind
..
replaceExcept tests for non-inverting lookbehind or lookbehind
Bug: T123185
Change-Id: I1c0dba18e8db1bf1556c94dfb17e9a3b7dc45801
---
M tests/textlib_tests.py
1 file changed, 10 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core
refs/changes/00/266600/1
diff --git a/tests/textlib_tests.py b/tests/textlib_tests.py
index 00bf1f8..2dbce30 100644
--- a/tests/textlib_tests.py
+++ b/tests/textlib_tests.py
@@ -1026,6 +1026,16 @@
textlib.replaceExcept('A123B', r'A(?P\d)2(\d)B',
r'A\gx\2B', [], site=self.site),
'A1x3B')
+# test regex with lookbehind.
+self.assertEqual(
+textlib.replaceExcept('A behindB C', r'(?<=behind)\w',
+ r'Z', [], site=self.site),
+'A behindZ C')
+# test regex with lookahead.
+self.assertEqual(
+textlib.replaceExcept('A Bahead C', r'\w(?=ahead)',
+ r'Z', [], site=self.site),
+'A Zahead C')
def test_case_sensitive(self):
"""Test replacing with different case sensitivity."""
--
To view, visit https://gerrit.wikimedia.org/r/266600
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I1c0dba18e8db1bf1556c94dfb17e9a3b7dc45801
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: Mpaa
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Release 1.2.0 - change (mediawiki...QuickSurveys)
jenkins-bot has submitted this change and it was merged.
Change subject: Release 1.2.0
..
Release 1.2.0
Change-Id: Ie60f271b80ce3aec23f7382189eccdc376ff
---
M HISTORY
M extension.json
2 files changed, 6 insertions(+), 1 deletion(-)
Approvals:
Jdlrobson: Looks good to me, approved
jenkins-bot: Verified
diff --git a/HISTORY b/HISTORY
index 62bf7a5..2d939eb 100644
--- a/HISTORY
+++ b/HISTORY
@@ -1,3 +1,8 @@
+==QuickSurveys 1.2.0==
+6eeffdb Fix the failing QUnit tests
+c25869c Add support for logging to Schema:QuickSurveyInitiation
+0960344 Update Schema:QuickSurveysResponses fields
+4233c71 Make the master branch default
==QuickSurveys 1.1.2==
417f059 Fix the failing QUnit tests
==QuickSurveys 1.1.1==
diff --git a/extension.json b/extension.json
index 943dfd0..0cbead6 100644
--- a/extension.json
+++ b/extension.json
@@ -1,6 +1,6 @@
{
"name": "QuickSurveys",
- "version": "1.1.2",
+ "version": "1.2.0",
"author": [
"Bahodir Mansurov",
"Joaquin Hernandez",
--
To view, visit https://gerrit.wikimedia.org/r/266576
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie60f271b80ce3aec23f7382189eccdc376ff
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/QuickSurveys
Gerrit-Branch: master
Gerrit-Owner: Bmansurov
Gerrit-Reviewer: Jdlrobson
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] New set of speed experiments - change (operations/mediawiki-config)
jenkins-bot has submitted this change and it was merged. Change subject: New set of speed experiments .. New set of speed experiments Add three static copies of [[en:Barack_Obama]] on mobile: - Barack_Obama.701448389.original.html : straight copy, no changes. - Barack_Obama.701448389.NetSpeed_B.html : straight copy with NetSpeed=B cookie - Barack_Obama.701448389.no-images.html : rewritten to - Barack_Obama.701448389.no-refs.html: omits the references section. - Barack_Obama.701448389.no-top-css.html : omits the top external stylesheet. Change-Id: I9b054d847a4b6144f30577fff3dd1157efdddf50 --- D docroot/wikipedia.org/obama/sports.html D docroot/wikipedia.org/obama/sports2.html C docroot/wikipedia.org/speed-tests/Barack_Obama.701448389.NetSpeed_B.html C docroot/wikipedia.org/speed-tests/Barack_Obama.701448389.no-images.html A docroot/wikipedia.org/speed-tests/Barack_Obama.701448389.no-refs.html R docroot/wikipedia.org/speed-tests/Barack_Obama.701448389.no-top-css.html C docroot/wikipedia.org/speed-tests/Barack_Obama.701448389.original.html A docroot/wikipedia.org/speed-tests/pages.html 8 files changed, 6,086 insertions(+), 33,505 deletions(-) Approvals: Ori.livneh: Looks good to me, approved jenkins-bot: Verified -- To view, visit https://gerrit.wikimedia.org/r/266599 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I9b054d847a4b6144f30577fff3dd1157efdddf50 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Ori.livneh Gerrit-Reviewer: Ori.livneh Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] New set of speed experiments - change (operations/mediawiki-config)
Ori.livneh has uploaded a new change for review. https://gerrit.wikimedia.org/r/266599 Change subject: New set of speed experiments .. New set of speed experiments Add three static copies of [[en:Barack_Obama]] on mobile: - Barack_Obama.701448389.original.html : straight copy, no changes. - Barack_Obama.701448389.NetSpeed_B.html : straight copy with NetSpeed=B cookie - Barack_Obama.701448389.no-images.html : rewritten to - Barack_Obama.701448389.no-refs.html: omits the references section. - Barack_Obama.701448389.no-top-css.html : omits the top external stylesheet. Change-Id: I9b054d847a4b6144f30577fff3dd1157efdddf50 --- D docroot/wikipedia.org/obama/sports.html D docroot/wikipedia.org/obama/sports2.html C docroot/wikipedia.org/speed-tests/Barack_Obama.701448389.NetSpeed_B.html C docroot/wikipedia.org/speed-tests/Barack_Obama.701448389.no-images.html A docroot/wikipedia.org/speed-tests/Barack_Obama.701448389.no-refs.html R docroot/wikipedia.org/speed-tests/Barack_Obama.701448389.no-top-css.html C docroot/wikipedia.org/speed-tests/Barack_Obama.701448389.original.html A docroot/wikipedia.org/speed-tests/pages.html 8 files changed, 6,086 insertions(+), 33,505 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/99/266599/1 -- To view, visit https://gerrit.wikimedia.org/r/266599 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I9b054d847a4b6144f30577fff3dd1157efdddf50 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Ori.livneh ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Wrap CallbackFilterIterator in an check - change (mediawiki...Echo)
BryanDavis has uploaded a new change for review.
https://gerrit.wikimedia.org/r/266598
Change subject: Wrap CallbackFilterIterator in an check
..
Wrap CallbackFilterIterator in an check
Wrap the CallbackFilterIterator backport class in a conditional check
for PHP runtimes that include the class natively.
Bug: T124828
Change-Id: I39d27385186d4693a8babdd2b818e6b4bc16255a
---
M includes/iterator/CallbackFilterIterator.php
1 file changed, 20 insertions(+), 18 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Echo
refs/changes/98/266598/1
diff --git a/includes/iterator/CallbackFilterIterator.php
b/includes/iterator/CallbackFilterIterator.php
index 4095d1d..752cfbd 100644
--- a/includes/iterator/CallbackFilterIterator.php
+++ b/includes/iterator/CallbackFilterIterator.php
@@ -1,24 +1,26 @@
callback = $callback;
- }
+ public function __construct( Iterator $iterator, $callback ) {
+ parent::__construct( $iterator );
+ $this->callback = $callback;
+ }
- public function accept() {
- return call_user_func(
- $this->callback,
- $this->current(),
- $this->key(),
- $this->getInnerIterator()
- );
+ public function accept() {
+ return call_user_func(
+ $this->callback,
+ $this->current(),
+ $this->key(),
+ $this->getInnerIterator()
+ );
+ }
}
}
--
To view, visit https://gerrit.wikimedia.org/r/266598
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I39d27385186d4693a8babdd2b818e6b4bc16255a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Echo
Gerrit-Branch: master
Gerrit-Owner: BryanDavis
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix alert for eventlogging raw - valid rate - change (operations/puppet)
Ottomata has submitted this change and it was merged.
Change subject: Fix alert for eventlogging raw - valid rate
..
Fix alert for eventlogging raw - valid rate
Change-Id: Ic1cf7f4c6fe7aa41d13638e9466e7df6e680dd8c
---
M modules/eventlogging/manifests/monitoring/graphite.pp
1 file changed, 2 insertions(+), 2 deletions(-)
Approvals:
Ottomata: Verified; Looks good to me, approved
diff --git a/modules/eventlogging/manifests/monitoring/graphite.pp
b/modules/eventlogging/manifests/monitoring/graphite.pp
index 31b229c..e19542f 100644
--- a/modules/eventlogging/manifests/monitoring/graphite.pp
+++ b/modules/eventlogging/manifests/monitoring/graphite.pp
@@ -9,8 +9,8 @@
#kafka::server::jmxtrans
#
class eventlogging::monitoring::graphite($kafka_brokers_graphite_wildcard) {
-$raw_events_rate_metric =
"sumSeries(kafka.${kafka_brokers_graphite_wildcard}.kafka.server.BrokerTopicMetrics.MessagesInPerSec.{eventlogging-client-side,eventlogging-server-side}.OneMinuteRate)"
-$valid_events_rate_metric =
"sumSeries(kafka.${kafka_brokers_graphite_wildcard}.kafka.server.BrokerTopicMetrics.MessagesInPerSec.eventlogging_*.OneMinuteRate)"
+$raw_events_rate_metric =
"sumSeries(kafka.cluster.analytics-eqiad.kafka.${kafka_brokers_graphite_wildcard}.kafka.server.BrokerTopicMetrics.MessagesInPerSec.{eventlogging-client-side,eventlogging-server-side}.OneMinuteRate)"
+$valid_events_rate_metric =
"sumSeries(kafka.cluster.analytics-eqiad.kafka.${kafka_brokers_graphite_wildcard}.kafka.server.BrokerTopicMetrics.MessagesInPerSec.eventlogging_*.OneMinuteRate)"
# Warn if 15% of overall event throughput goes beyond 500 events/s
# in a 15 min period
--
To view, visit https://gerrit.wikimedia.org/r/266597
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ic1cf7f4c6fe7aa41d13638e9466e7df6e680dd8c
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ottomata
Gerrit-Reviewer: Ottomata
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix alert for eventlogging raw - valid rate - change (operations/puppet)
Ottomata has uploaded a new change for review.
https://gerrit.wikimedia.org/r/266597
Change subject: Fix alert for eventlogging raw - valid rate
..
Fix alert for eventlogging raw - valid rate
Change-Id: Ic1cf7f4c6fe7aa41d13638e9466e7df6e680dd8c
---
M modules/eventlogging/manifests/monitoring/graphite.pp
1 file changed, 2 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/97/266597/1
diff --git a/modules/eventlogging/manifests/monitoring/graphite.pp
b/modules/eventlogging/manifests/monitoring/graphite.pp
index 31b229c..e19542f 100644
--- a/modules/eventlogging/manifests/monitoring/graphite.pp
+++ b/modules/eventlogging/manifests/monitoring/graphite.pp
@@ -9,8 +9,8 @@
#kafka::server::jmxtrans
#
class eventlogging::monitoring::graphite($kafka_brokers_graphite_wildcard) {
-$raw_events_rate_metric =
"sumSeries(kafka.${kafka_brokers_graphite_wildcard}.kafka.server.BrokerTopicMetrics.MessagesInPerSec.{eventlogging-client-side,eventlogging-server-side}.OneMinuteRate)"
-$valid_events_rate_metric =
"sumSeries(kafka.${kafka_brokers_graphite_wildcard}.kafka.server.BrokerTopicMetrics.MessagesInPerSec.eventlogging_*.OneMinuteRate)"
+$raw_events_rate_metric =
"sumSeries(kafka.cluster.analytics-eqiad.kafka.${kafka_brokers_graphite_wildcard}.kafka.server.BrokerTopicMetrics.MessagesInPerSec.{eventlogging-client-side,eventlogging-server-side}.OneMinuteRate)"
+$valid_events_rate_metric =
"sumSeries(kafka.cluster.analytics-eqiad.kafka.${kafka_brokers_graphite_wildcard}.kafka.server.BrokerTopicMetrics.MessagesInPerSec.eventlogging_*.OneMinuteRate)"
# Warn if 15% of overall event throughput goes beyond 500 events/s
# in a 15 min period
--
To view, visit https://gerrit.wikimedia.org/r/266597
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic1cf7f4c6fe7aa41d13638e9466e7df6e680dd8c
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ottomata
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] [WIP] Refactor completion search to use SearchEngine - change (mediawiki/core)
Smalyshev has uploaded a new change for review.
https://gerrit.wikimedia.org/r/266596
Change subject: [WIP] Refactor completion search to use SearchEngine
..
[WIP] Refactor completion search to use SearchEngine
Bug: T121430
Change-Id: Ie78649591dff94d21b72fad8e4e5eab010a461df
---
M autoload.php
M includes/PrefixSearch.php
M includes/api/ApiOpenSearch.php
M includes/api/ApiQueryPrefixSearch.php
M includes/search/SearchEngine.php
A includes/search/SearchSuggestion.php
A includes/search/SearchSuggestionSet.php
A tests/phpunit/includes/search/SearchSuggestionSetTest.php
8 files changed, 680 insertions(+), 8 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/96/266596/1
diff --git a/autoload.php b/autoload.php
index 24a4d72..a5b4660 100644
--- a/autoload.php
+++ b/autoload.php
@@ -72,7 +72,6 @@
'ApiQueryAllMessages' => __DIR__ .
'/includes/api/ApiQueryAllMessages.php',
'ApiQueryAllPages' => __DIR__ . '/includes/api/ApiQueryAllPages.php',
'ApiQueryAllRevisions' => __DIR__ .
'/includes/api/ApiQueryAllRevisions.php',
- 'ApiQueryMyStashedFiles' => __DIR__ .
'/includes/api/ApiQueryMyStashedFiles.php',
'ApiQueryAllUsers' => __DIR__ . '/includes/api/ApiQueryAllUsers.php',
'ApiQueryBacklinks' => __DIR__ . '/includes/api/ApiQueryBacklinks.php',
'ApiQueryBacklinksprop' => __DIR__ .
'/includes/api/ApiQueryBacklinksprop.php',
@@ -101,6 +100,7 @@
'ApiQueryLangLinks' => __DIR__ . '/includes/api/ApiQueryLangLinks.php',
'ApiQueryLinks' => __DIR__ . '/includes/api/ApiQueryLinks.php',
'ApiQueryLogEvents' => __DIR__ . '/includes/api/ApiQueryLogEvents.php',
+ 'ApiQueryMyStashedFiles' => __DIR__ .
'/includes/api/ApiQueryMyStashedFiles.php',
'ApiQueryPagePropNames' => __DIR__ .
'/includes/api/ApiQueryPagePropNames.php',
'ApiQueryPageProps' => __DIR__ . '/includes/api/ApiQueryPageProps.php',
'ApiQueryPagesWithProp' => __DIR__ .
'/includes/api/ApiQueryPagesWithProp.php',
@@ -1129,6 +1129,8 @@
'SearchResult' => __DIR__ . '/includes/search/SearchResult.php',
'SearchResultSet' => __DIR__ . '/includes/search/SearchResultSet.php',
'SearchSqlite' => __DIR__ . '/includes/search/SearchSqlite.php',
+ 'SearchSuggestion' => __DIR__ . '/includes/search/SearchSuggestion.php',
+ 'SearchSuggestionSet' => __DIR__ .
'/includes/search/SearchSuggestionSet.php',
'SearchUpdate' => __DIR__ . '/includes/deferred/SearchUpdate.php',
'SectionProfileCallback' => __DIR__ .
'/includes/profiler/SectionProfiler.php',
'SectionProfiler' => __DIR__ . '/includes/profiler/SectionProfiler.php',
diff --git a/includes/PrefixSearch.php b/includes/PrefixSearch.php
index c6f187d..ec89054 100644
--- a/includes/PrefixSearch.php
+++ b/includes/PrefixSearch.php
@@ -259,12 +259,20 @@
* @param int $offset Number of items to skip
* @return array Array of Title objects
*/
- protected function defaultSearchBackend( $namespaces, $search, $limit,
$offset ) {
+ public function defaultSearchBackend( $namespaces, $search, $limit,
$offset ) {
$ns = array_shift( $namespaces ); // support only one namespace
if ( in_array( NS_MAIN, $namespaces ) ) {
$ns = NS_MAIN; // if searching on many always default
to main
}
+ if ( $ns == NS_SPECIAL ) {
+ return $this->specialSearch( $search, $limit, $offset );
+ }
+
+ if ( $ns == NS_MEDIA ) {
+ $ns = NS_FILE;
+ }
+
$t = Title::newFromText( $search, $ns );
$prefix = $t ? $t->getDBkey() : '';
diff --git a/includes/api/ApiOpenSearch.php b/includes/api/ApiOpenSearch.php
index 5ce43cc..3ed3d87 100644
--- a/includes/api/ApiOpenSearch.php
+++ b/includes/api/ApiOpenSearch.php
@@ -123,10 +123,13 @@
* @param array &$results Put results here. Keys have to be integers.
*/
protected function search( $search, $limit, $namespaces, $resolveRedir,
&$results ) {
- // Find matching titles as Title objects
- $searcher = new TitlePrefixSearch;
- $titles = $searcher->searchWithVariants( $search, $limit,
$namespaces );
- if ( !$titles ) {
+
+ $search = SearchEngine::create();
+ $search->setLimitOffset( $limit );
+ $search->setNamespaces( $namespaces );
+ $titles = $search->extractTitles(
$search->completionSearchWithVariants( $search ) );
+
+ if ( empty($titles) ) {
return;
}
diff --git a/includes/api/ApiQueryPrefixSearch.php
b/includes/api/ApiQueryPrefixSearch.php
index 25ff07c..595d993 100644
--- a/includes/api/ApiQueryPrefixSearch.php
+++ b/includes/ap
[MediaWiki-commits] [Gerrit] build: Update phpunit/phpunit to 4.8 - change (oojs/ui)
jenkins-bot has submitted this change and it was merged.
Change subject: build: Update phpunit/phpunit to 4.8
..
build: Update phpunit/phpunit to 4.8
Change-Id: I16bbd6f61616ba26c1052e68af2f29e4021c90f8
---
M composer.json
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Jforrester: Looks good to me, approved
jenkins-bot: Verified
diff --git a/composer.json b/composer.json
index e2bed14..8f6da43 100644
--- a/composer.json
+++ b/composer.json
@@ -52,7 +52,7 @@
"require-dev": {
"jakub-onderka/php-parallel-lint": "0.9.2",
"mediawiki/mediawiki-codesniffer": "0.5.1",
- "phpunit/phpunit": "~4.5"
+ "phpunit/phpunit": "4.8.21"
},
"autoload": {
"classmap": [
--
To view, visit https://gerrit.wikimedia.org/r/266091
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I16bbd6f61616ba26c1052e68af2f29e4021c90f8
Gerrit-PatchSet: 3
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: Paladox
Gerrit-Reviewer: Jforrester
Gerrit-Reviewer: Legoktm
Gerrit-Reviewer: Umherirrender
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 OOjs UI to v0.15.1 - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged. Change subject: Update OOjs UI to v0.15.1 .. Update OOjs UI to v0.15.1 Release notes: https://git.wikimedia.org/blob/oojs%2Fui.git/v0.15.1/History.md Change-Id: Ic5069503ebea193e117a9f7f3d520a6f04e0b1cd --- M composer.json M resources/lib/oojs-ui/i18n/ce.json M resources/lib/oojs-ui/i18n/glk.json M resources/lib/oojs-ui/i18n/ka.json M resources/lib/oojs-ui/i18n/tr.json M resources/lib/oojs-ui/i18n/tt-cyrl.json M resources/lib/oojs-ui/oojs-ui-apex-noimages.css M resources/lib/oojs-ui/oojs-ui-apex.js M resources/lib/oojs-ui/oojs-ui-mediawiki-noimages.css M resources/lib/oojs-ui/oojs-ui-mediawiki.js M resources/lib/oojs-ui/oojs-ui.js M resources/lib/oojs-ui/themes/apex/images/icons/advanced.png M resources/lib/oojs-ui/themes/apex/images/icons/advanced.svg M resources/lib/oojs-ui/themes/apex/images/icons/align-center.svg M resources/lib/oojs-ui/themes/apex/images/icons/align-float-left.svg M resources/lib/oojs-ui/themes/apex/images/icons/align-float-right.svg M resources/lib/oojs-ui/themes/apex/images/icons/arched-arrow-ltr.png M resources/lib/oojs-ui/themes/apex/images/icons/arched-arrow-ltr.svg M resources/lib/oojs-ui/themes/apex/images/icons/arrow-ltr.svg M resources/lib/oojs-ui/themes/apex/images/icons/arrow-rtl.svg M resources/lib/oojs-ui/themes/apex/images/icons/articleRedirect-rtl.png M resources/lib/oojs-ui/themes/apex/images/icons/articleRedirect-rtl.svg M resources/lib/oojs-ui/themes/apex/images/icons/block.svg M resources/lib/oojs-ui/themes/apex/images/icons/blockUndo-ltr.svg M resources/lib/oojs-ui/themes/apex/images/icons/blockUndo-rtl.svg M resources/lib/oojs-ui/themes/apex/images/icons/bold-a.svg M resources/lib/oojs-ui/themes/apex/images/icons/bold-arab-ain.png M resources/lib/oojs-ui/themes/apex/images/icons/bold-arab-ain.svg M resources/lib/oojs-ui/themes/apex/images/icons/bold-arab-dad.png M resources/lib/oojs-ui/themes/apex/images/icons/bold-arab-dad.svg M resources/lib/oojs-ui/themes/apex/images/icons/bold-armn-to.png M resources/lib/oojs-ui/themes/apex/images/icons/bold-armn-to.svg M resources/lib/oojs-ui/themes/apex/images/icons/bold-cyrl-be.svg M resources/lib/oojs-ui/themes/apex/images/icons/bold-cyrl-zhe.png M resources/lib/oojs-ui/themes/apex/images/icons/bold-cyrl-zhe.svg M resources/lib/oojs-ui/themes/apex/images/icons/bold-g.png M resources/lib/oojs-ui/themes/apex/images/icons/bold-g.svg M resources/lib/oojs-ui/themes/apex/images/icons/bookmark-rtl-invert.svg M resources/lib/oojs-ui/themes/apex/images/icons/bookmark-rtl.svg M resources/lib/oojs-ui/themes/apex/images/icons/browser-rtl-invert.svg M resources/lib/oojs-ui/themes/apex/images/icons/browser-rtl.svg M resources/lib/oojs-ui/themes/apex/images/icons/calendar-ltr.svg M resources/lib/oojs-ui/themes/apex/images/icons/calendar-rtl.svg M resources/lib/oojs-ui/themes/apex/images/icons/cancel.png M resources/lib/oojs-ui/themes/apex/images/icons/cancel.svg M resources/lib/oojs-ui/themes/apex/images/icons/caret-rtl.svg M resources/lib/oojs-ui/themes/apex/images/icons/caretDown.svg M resources/lib/oojs-ui/themes/apex/images/icons/caretUp.svg M resources/lib/oojs-ui/themes/apex/images/icons/case-sensitive.png M resources/lib/oojs-ui/themes/apex/images/icons/case-sensitive.svg M resources/lib/oojs-ui/themes/apex/images/icons/check.svg M resources/lib/oojs-ui/themes/apex/images/icons/clock-invert.png M resources/lib/oojs-ui/themes/apex/images/icons/clock-invert.svg M resources/lib/oojs-ui/themes/apex/images/icons/clock.png M resources/lib/oojs-ui/themes/apex/images/icons/clock.svg M resources/lib/oojs-ui/themes/apex/images/icons/code.png M resources/lib/oojs-ui/themes/apex/images/icons/code.svg M resources/lib/oojs-ui/themes/apex/images/icons/comment.png M resources/lib/oojs-ui/themes/apex/images/icons/comment.svg M resources/lib/oojs-ui/themes/apex/images/icons/edit-ltr.svg M resources/lib/oojs-ui/themes/apex/images/icons/edit-rtl.svg M resources/lib/oojs-ui/themes/apex/images/icons/editLock-ltr.svg M resources/lib/oojs-ui/themes/apex/images/icons/editLock-rtl.svg M resources/lib/oojs-ui/themes/apex/images/icons/editUndo-ltr.svg M resources/lib/oojs-ui/themes/apex/images/icons/editUndo-rtl.svg M resources/lib/oojs-ui/themes/apex/images/icons/ellipsis.svg M resources/lib/oojs-ui/themes/apex/images/icons/find-ltr.png M resources/lib/oojs-ui/themes/apex/images/icons/find-ltr.svg M resources/lib/oojs-ui/themes/apex/images/icons/find-rtl.png M resources/lib/oojs-ui/themes/apex/images/icons/find-rtl.svg M resources/lib/oojs-ui/themes/apex/images/icons/flag-ltr.svg M resources/lib/oojs-ui/themes/apex/images/icons/flag-rtl.svg M resources/lib/oojs-ui/themes/apex/images/icons/flagUndo-ltr.svg M resources/lib/oojs-ui/themes/apex/images/icons/flagUndo-rtl.svg M resources/lib/oojs-ui/themes/apex/images/icons/funnel-ltr-invert.svg M resources/lib/oojs-ui/themes/apex/images/icons/funnel-ltr.svg M resources/lib/oojs-ui/th
[MediaWiki-commits] [Gerrit] Update OOjs UI to v0.15.1 - change (VisualEditor/VisualEditor)
jenkins-bot has submitted this change and it was merged. Change subject: Update OOjs UI to v0.15.1 .. Update OOjs UI to v0.15.1 Release notes: https://git.wikimedia.org/blob/oojs%2Fui.git/v0.15.1/History.md Change-Id: Ic5069503ebea193e117a9f7f3d520a6f04e0b1cd --- M demos/ve/desktop-dist.html M demos/ve/desktop.html M demos/ve/minimal-rtl.html M demos/ve/mobile-dist.html M demos/ve/mobile.html M lib/oojs-ui/i18n/ce.json M lib/oojs-ui/i18n/glk.json M lib/oojs-ui/i18n/ka.json M lib/oojs-ui/i18n/tr.json M lib/oojs-ui/i18n/tt-cyrl.json M lib/oojs-ui/oojs-ui-apex-icons-content.css D lib/oojs-ui/oojs-ui-apex-icons-content.raster.css D lib/oojs-ui/oojs-ui-apex-icons-content.raster.rtl.css M lib/oojs-ui/oojs-ui-apex-icons-content.rtl.css D lib/oojs-ui/oojs-ui-apex-icons-content.vector.css D lib/oojs-ui/oojs-ui-apex-icons-content.vector.rtl.css M lib/oojs-ui/oojs-ui-apex-icons-editing-advanced.css D lib/oojs-ui/oojs-ui-apex-icons-editing-advanced.raster.css D lib/oojs-ui/oojs-ui-apex-icons-editing-advanced.raster.rtl.css M lib/oojs-ui/oojs-ui-apex-icons-editing-advanced.rtl.css D lib/oojs-ui/oojs-ui-apex-icons-editing-advanced.vector.css D lib/oojs-ui/oojs-ui-apex-icons-editing-advanced.vector.rtl.css M lib/oojs-ui/oojs-ui-apex-icons-editing-core.css D lib/oojs-ui/oojs-ui-apex-icons-editing-core.raster.css D lib/oojs-ui/oojs-ui-apex-icons-editing-core.raster.rtl.css M lib/oojs-ui/oojs-ui-apex-icons-editing-core.rtl.css D lib/oojs-ui/oojs-ui-apex-icons-editing-core.vector.css D lib/oojs-ui/oojs-ui-apex-icons-editing-core.vector.rtl.css M lib/oojs-ui/oojs-ui-apex-icons-editing-list.css D lib/oojs-ui/oojs-ui-apex-icons-editing-list.raster.css D lib/oojs-ui/oojs-ui-apex-icons-editing-list.raster.rtl.css M lib/oojs-ui/oojs-ui-apex-icons-editing-list.rtl.css D lib/oojs-ui/oojs-ui-apex-icons-editing-list.vector.css D lib/oojs-ui/oojs-ui-apex-icons-editing-list.vector.rtl.css M lib/oojs-ui/oojs-ui-apex-icons-editing-styling.css D lib/oojs-ui/oojs-ui-apex-icons-editing-styling.raster.css D lib/oojs-ui/oojs-ui-apex-icons-editing-styling.raster.rtl.css M lib/oojs-ui/oojs-ui-apex-icons-editing-styling.rtl.css D lib/oojs-ui/oojs-ui-apex-icons-editing-styling.vector.css D lib/oojs-ui/oojs-ui-apex-icons-editing-styling.vector.rtl.css M lib/oojs-ui/oojs-ui-apex-icons-interactions.css D lib/oojs-ui/oojs-ui-apex-icons-interactions.raster.css D lib/oojs-ui/oojs-ui-apex-icons-interactions.raster.rtl.css M lib/oojs-ui/oojs-ui-apex-icons-interactions.rtl.css D lib/oojs-ui/oojs-ui-apex-icons-interactions.vector.css D lib/oojs-ui/oojs-ui-apex-icons-interactions.vector.rtl.css M lib/oojs-ui/oojs-ui-apex-icons-media.css D lib/oojs-ui/oojs-ui-apex-icons-media.raster.css D lib/oojs-ui/oojs-ui-apex-icons-media.raster.rtl.css M lib/oojs-ui/oojs-ui-apex-icons-media.rtl.css D lib/oojs-ui/oojs-ui-apex-icons-media.vector.css D lib/oojs-ui/oojs-ui-apex-icons-media.vector.rtl.css M lib/oojs-ui/oojs-ui-apex-icons-moderation.css D lib/oojs-ui/oojs-ui-apex-icons-moderation.raster.css D lib/oojs-ui/oojs-ui-apex-icons-moderation.raster.rtl.css M lib/oojs-ui/oojs-ui-apex-icons-moderation.rtl.css D lib/oojs-ui/oojs-ui-apex-icons-moderation.vector.css D lib/oojs-ui/oojs-ui-apex-icons-moderation.vector.rtl.css M lib/oojs-ui/oojs-ui-apex-icons-movement.css D lib/oojs-ui/oojs-ui-apex-icons-movement.raster.css D lib/oojs-ui/oojs-ui-apex-icons-movement.raster.rtl.css M lib/oojs-ui/oojs-ui-apex-icons-movement.rtl.css D lib/oojs-ui/oojs-ui-apex-icons-movement.vector.css D lib/oojs-ui/oojs-ui-apex-icons-movement.vector.rtl.css M lib/oojs-ui/oojs-ui-apex-noimages.css D lib/oojs-ui/oojs-ui-apex-noimages.raster.css D lib/oojs-ui/oojs-ui-apex-noimages.raster.rtl.css M lib/oojs-ui/oojs-ui-apex-noimages.rtl.css D lib/oojs-ui/oojs-ui-apex-noimages.vector.css D lib/oojs-ui/oojs-ui-apex-noimages.vector.rtl.css M lib/oojs-ui/oojs-ui-apex.css M lib/oojs-ui/oojs-ui-apex.js D lib/oojs-ui/oojs-ui-apex.raster.css D lib/oojs-ui/oojs-ui-apex.raster.rtl.css M lib/oojs-ui/oojs-ui-apex.rtl.css D lib/oojs-ui/oojs-ui-apex.vector.css D lib/oojs-ui/oojs-ui-apex.vector.rtl.css M lib/oojs-ui/oojs-ui-mediawiki-icons-accessibility.css D lib/oojs-ui/oojs-ui-mediawiki-icons-accessibility.raster.css D lib/oojs-ui/oojs-ui-mediawiki-icons-accessibility.raster.rtl.css M lib/oojs-ui/oojs-ui-mediawiki-icons-accessibility.rtl.css D lib/oojs-ui/oojs-ui-mediawiki-icons-accessibility.vector.css D lib/oojs-ui/oojs-ui-mediawiki-icons-accessibility.vector.rtl.css M lib/oojs-ui/oojs-ui-mediawiki-icons-alerts.css D lib/oojs-ui/oojs-ui-mediawiki-icons-alerts.raster.css D lib/oojs-ui/oojs-ui-mediawiki-icons-alerts.raster.rtl.css M lib/oojs-ui/oojs-ui-mediawiki-icons-alerts.rtl.css D lib/oojs-ui/oojs-ui-mediawiki-icons-alerts.vector.css D lib/oojs-ui/oojs-ui-mediawiki-icons-alerts.vector.rtl.css M lib/oojs-ui/oojs-ui-mediawiki-icons-content.css D lib/oojs-ui/oojs-ui-mediawiki-icons-content.raster.css D lib/oojs-ui/oojs-ui-mediawiki-icons-con
[MediaWiki-commits] [Gerrit] Update OOjs UI to v0.15.1 - change (mediawiki/vendor)
jenkins-bot has submitted this change and it was merged.
Change subject: Update OOjs UI to v0.15.1
..
Update OOjs UI to v0.15.1
Release notes:
https://git.wikimedia.org/blob/oojs%2Fui.git/v0.15.1/History.md
Change-Id: Ic5069503ebea193e117a9f7f3d520a6f04e0b1cd
---
M composer.json
M composer.lock
M composer/installed.json
M oojs/oojs-ui/History.md
M oojs/oojs-ui/README.md
M oojs/oojs-ui/demos/demo.js
M oojs/oojs-ui/demos/pages/widgets.js
M oojs/oojs-ui/demos/widgets.php
M oojs/oojs-ui/i18n/ce.json
M oojs/oojs-ui/i18n/glk.json
M oojs/oojs-ui/i18n/ka.json
M oojs/oojs-ui/i18n/tr.json
M oojs/oojs-ui/i18n/tt-cyrl.json
M oojs/oojs-ui/package.json
M oojs/oojs-ui/php/Tag.php
15 files changed, 324 insertions(+), 213 deletions(-)
Approvals:
Bartosz Dziewoński: Looks good to me, approved
jenkins-bot: Verified
diff --git a/composer.json b/composer.json
index c870ed8..74b7bc3 100644
--- a/composer.json
+++ b/composer.json
@@ -16,7 +16,7 @@
"mediawiki/at-ease": "1.1.0",
"monolog/monolog": "1.17.2",
"nmred/kafka-php": "0.1.5",
- "oojs/oojs-ui": "0.15.0",
+ "oojs/oojs-ui": "0.15.1",
"oyejorge/less.php": "1.7.0.9",
"pear/console_getopt": "1.4.1",
"pear/mail": "1.2.0",
diff --git a/composer.lock b/composer.lock
index 062f51d..08edb3f 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,8 +4,8 @@
"Read more about it at
https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file";,
"This file is @generated automatically"
],
-"hash": "50c6a2cff5091adc820c5361256b8c38",
-"content-hash": "039f7bbf8f129ebb32e89b7a18070760",
+"hash": "1e11b7811354660159915303b915d65f",
+"content-hash": "aa78904fd3472b6a94b2dad4891ac274",
"packages": [
{
"name": "composer/semver",
@@ -363,16 +363,16 @@
},
{
"name": "oojs/oojs-ui",
-"version": "v0.15.0",
+"version": "v0.15.1",
"source": {
"type": "git",
"url": "https://github.com/wikimedia/oojs-ui.git";,
-"reference": "48aee04a6e84fbf3048e36a5a690a1f5dea6d62d"
+"reference": "488480477cb23b3eb922f24d57464a94d895b238"
},
"dist": {
"type": "zip",
-"url":
"https://api.github.com/repos/wikimedia/oojs-ui/zipball/48aee04a6e84fbf3048e36a5a690a1f5dea6d62d";,
-"reference": "48aee04a6e84fbf3048e36a5a690a1f5dea6d62d",
+"url":
"https://api.github.com/repos/wikimedia/oojs-ui/zipball/488480477cb23b3eb922f24d57464a94d895b238";,
+"reference": "488480477cb23b3eb922f24d57464a94d895b238",
"shasum": ""
},
"require": {
@@ -380,8 +380,8 @@
"php": ">=5.3.3"
},
"require-dev": {
-"jakub-onderka/php-parallel-lint": "0.9",
-"mediawiki/mediawiki-codesniffer": "0.5.0",
+"jakub-onderka/php-parallel-lint": "0.9.2",
+"mediawiki/mediawiki-codesniffer": "0.5.1",
"phpunit/phpunit": "~4.5"
},
"type": "library",
@@ -438,7 +438,7 @@
],
"description": "Provides library of common widgets, layouts, and
windows.",
"homepage": "https://www.mediawiki.org/wiki/OOjs_UI";,
-"time": "2016-01-12 22:08:10"
+"time": "2016-01-26 20:01:08"
},
{
"name": "oyejorge/less.php",
diff --git a/composer/installed.json b/composer/installed.json
index 7ce8858..0ef7acd 100644
--- a/composer/installed.json
+++ b/composer/installed.json
@@ -1153,87 +1153,6 @@
"homepage": "https://symfony.com";
},
{
-"name": "oojs/oojs-ui",
-"version": "v0.15.0",
-"version_normalized": "0.15.0.0",
-"source": {
-"type": "git",
-"url": "https://github.com/wikimedia/oojs-ui.git";,
-"reference": "48aee04a6e84fbf3048e36a5a690a1f5dea6d62d"
-},
-"dist": {
-"type": "zip",
-"url":
"https://api.github.com/repos/wikimedia/oojs-ui/zipball/48aee04a6e84fbf3048e36a5a690a1f5dea6d62d";,
-"reference": "48aee04a6e84fbf3048e36a5a690a1f5dea6d62d",
-"shasum": ""
-},
-"require": {
-"mediawiki/at-ease": "1.1.0",
-"php": ">=5.3.3"
-},
-"require-dev": {
-"jakub-onderka/php-parallel-lint": "0.9",
-"mediawiki/mediawiki-codesniffer": "0.5.0",
-"phpunit/phpunit": "~4.5"
-},
-"time": "2016-01-12 22:08:10",
-"type": "library",
-"installation-source": "dist",
-"autoload": {
-"classmap": [
-"php/"
-
[MediaWiki-commits] [Gerrit] Fix IP::isInRange() returning true on nonsensical outputs - change (mediawiki...AbuseFilter)
MtDu has uploaded a new change for review.
https://gerrit.wikimedia.org/r/266595
Change subject: Fix IP::isInRange() returning true on nonsensical outputs
..
Fix IP::isInRange() returning true on nonsensical outputs
Bug: T124117
Change-Id: Ibfe55c2ebac0fccfa8329436751b454f5e626457
---
M AbuseFilter.parser.php
1 file changed, 4 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/AbuseFilter
refs/changes/95/266595/1
diff --git a/AbuseFilter.parser.php b/AbuseFilter.parser.php
index 1ef3a1e..eeb73a4 100644
--- a/AbuseFilter.parser.php
+++ b/AbuseFilter.parser.php
@@ -1586,8 +1586,10 @@
$ip = $args[0]->toString();
$range = $args[1]->toString();
- $result = IP::isInRange( $ip, $range );
-
+ $result = null
+ if ( IP::isIPAddress( $ip ) ) {
+ $result = IP::isInRange( $ip, $range );
+ }
return new AFPData( AFPData::DBOOL, $result );
}
--
To view, visit https://gerrit.wikimedia.org/r/266595
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibfe55c2ebac0fccfa8329436751b454f5e626457
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/AbuseFilter
Gerrit-Branch: master
Gerrit-Owner: MtDu
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Suppress duplicate prefix/domain warnings for parserTests. - change (mediawiki...parsoid)
Cscott has uploaded a new change for review.
https://gerrit.wikimedia.org/r/266594
Change subject: Suppress duplicate prefix/domain warnings for parserTests.
..
Suppress duplicate prefix/domain warnings for parserTests.
Change-Id: Id0e66d3dd9cdeb066a4f4267dcd31aed181cda58
---
M bin/parserTests.js
1 file changed, 3 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/parsoid
refs/changes/94/266594/1
diff --git a/bin/parserTests.js b/bin/parserTests.js
index 64ff483..4f77e50 100755
--- a/bin/parserTests.js
+++ b/bin/parserTests.js
@@ -1655,7 +1655,8 @@
var extensions =
parsoidConfig.defaultNativeExtensions.concat(ParserHook);
// Send all requests to the mock API server.
- parsoidConfig.mwApiMap.forEach(function(apiConf) {
+
Array.from(parsoidConfig.mwApiMap.values()).forEach(function(apiConf) {
+ parsoidConfig.removeMwApi(apiConf);
parsoidConfig.setMwApi({
prefix: apiConf.prefix,
domain: apiConf.domain,
@@ -1666,6 +1667,7 @@
// This isn't part of the sitematrix but the
// "Check noCommafy in formatNum" test depends on it.
+ parsoidConfig.removeMwApi({ domain: 'be-tarask.wikipedia.org'
});
parsoidConfig.setMwApi({
prefix: 'be-taraskwiki',
domain: 'be-tarask.wikipedia.org',
--
To view, visit https://gerrit.wikimedia.org/r/266594
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Id0e66d3dd9cdeb066a4f4267dcd31aed181cda58
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/parsoid
Gerrit-Branch: master
Gerrit-Owner: Cscott
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update OOjs UI to v0.15.1 - change (mediawiki/vendor)
Jforrester has uploaded a new change for review.
https://gerrit.wikimedia.org/r/266593
Change subject: Update OOjs UI to v0.15.1
..
Update OOjs UI to v0.15.1
Release notes:
https://git.wikimedia.org/blob/oojs%2Fui.git/v0.15.1/History.md
Change-Id: Ic5069503ebea193e117a9f7f3d520a6f04e0b1cd
---
M composer.json
M composer.lock
M composer/installed.json
M oojs/oojs-ui/History.md
M oojs/oojs-ui/README.md
M oojs/oojs-ui/demos/demo.js
M oojs/oojs-ui/demos/pages/widgets.js
M oojs/oojs-ui/demos/widgets.php
M oojs/oojs-ui/i18n/ce.json
M oojs/oojs-ui/i18n/glk.json
M oojs/oojs-ui/i18n/ka.json
M oojs/oojs-ui/i18n/tr.json
M oojs/oojs-ui/i18n/tt-cyrl.json
M oojs/oojs-ui/package.json
M oojs/oojs-ui/php/Tag.php
15 files changed, 324 insertions(+), 213 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vendor
refs/changes/93/266593/1
diff --git a/composer.json b/composer.json
index c870ed8..74b7bc3 100644
--- a/composer.json
+++ b/composer.json
@@ -16,7 +16,7 @@
"mediawiki/at-ease": "1.1.0",
"monolog/monolog": "1.17.2",
"nmred/kafka-php": "0.1.5",
- "oojs/oojs-ui": "0.15.0",
+ "oojs/oojs-ui": "0.15.1",
"oyejorge/less.php": "1.7.0.9",
"pear/console_getopt": "1.4.1",
"pear/mail": "1.2.0",
diff --git a/composer.lock b/composer.lock
index 062f51d..08edb3f 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,8 +4,8 @@
"Read more about it at
https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file";,
"This file is @generated automatically"
],
-"hash": "50c6a2cff5091adc820c5361256b8c38",
-"content-hash": "039f7bbf8f129ebb32e89b7a18070760",
+"hash": "1e11b7811354660159915303b915d65f",
+"content-hash": "aa78904fd3472b6a94b2dad4891ac274",
"packages": [
{
"name": "composer/semver",
@@ -363,16 +363,16 @@
},
{
"name": "oojs/oojs-ui",
-"version": "v0.15.0",
+"version": "v0.15.1",
"source": {
"type": "git",
"url": "https://github.com/wikimedia/oojs-ui.git";,
-"reference": "48aee04a6e84fbf3048e36a5a690a1f5dea6d62d"
+"reference": "488480477cb23b3eb922f24d57464a94d895b238"
},
"dist": {
"type": "zip",
-"url":
"https://api.github.com/repos/wikimedia/oojs-ui/zipball/48aee04a6e84fbf3048e36a5a690a1f5dea6d62d";,
-"reference": "48aee04a6e84fbf3048e36a5a690a1f5dea6d62d",
+"url":
"https://api.github.com/repos/wikimedia/oojs-ui/zipball/488480477cb23b3eb922f24d57464a94d895b238";,
+"reference": "488480477cb23b3eb922f24d57464a94d895b238",
"shasum": ""
},
"require": {
@@ -380,8 +380,8 @@
"php": ">=5.3.3"
},
"require-dev": {
-"jakub-onderka/php-parallel-lint": "0.9",
-"mediawiki/mediawiki-codesniffer": "0.5.0",
+"jakub-onderka/php-parallel-lint": "0.9.2",
+"mediawiki/mediawiki-codesniffer": "0.5.1",
"phpunit/phpunit": "~4.5"
},
"type": "library",
@@ -438,7 +438,7 @@
],
"description": "Provides library of common widgets, layouts, and
windows.",
"homepage": "https://www.mediawiki.org/wiki/OOjs_UI";,
-"time": "2016-01-12 22:08:10"
+"time": "2016-01-26 20:01:08"
},
{
"name": "oyejorge/less.php",
diff --git a/composer/installed.json b/composer/installed.json
index 7ce8858..0ef7acd 100644
--- a/composer/installed.json
+++ b/composer/installed.json
@@ -1153,87 +1153,6 @@
"homepage": "https://symfony.com";
},
{
-"name": "oojs/oojs-ui",
-"version": "v0.15.0",
-"version_normalized": "0.15.0.0",
-"source": {
-"type": "git",
-"url": "https://github.com/wikimedia/oojs-ui.git";,
-"reference": "48aee04a6e84fbf3048e36a5a690a1f5dea6d62d"
-},
-"dist": {
-"type": "zip",
-"url":
"https://api.github.com/repos/wikimedia/oojs-ui/zipball/48aee04a6e84fbf3048e36a5a690a1f5dea6d62d";,
-"reference": "48aee04a6e84fbf3048e36a5a690a1f5dea6d62d",
-"shasum": ""
-},
-"require": {
-"mediawiki/at-ease": "1.1.0",
-"php": ">=5.3.3"
-},
-"require-dev": {
-"jakub-onderka/php-parallel-lint": "0.9",
-"mediawiki/mediawiki-codesniffer": "0.5.0",
-"phpunit/phpunit": "~4.5"
-},
-"time": "2016-01-12 22:08:10",
-"type": "library",
-"installation-source": "dist",
-"autoload": {
-"classmap": [
-
[MediaWiki-commits] [Gerrit] Update OOjs UI to v0.15.1 - change (mediawiki/core)
Jforrester has uploaded a new change for review. https://gerrit.wikimedia.org/r/266592 Change subject: Update OOjs UI to v0.15.1 .. Update OOjs UI to v0.15.1 Release notes: https://git.wikimedia.org/blob/oojs%2Fui.git/v0.15.1/History.md Change-Id: Ic5069503ebea193e117a9f7f3d520a6f04e0b1cd --- M composer.json M resources/lib/oojs-ui/i18n/ce.json M resources/lib/oojs-ui/i18n/glk.json M resources/lib/oojs-ui/i18n/ka.json M resources/lib/oojs-ui/i18n/tr.json M resources/lib/oojs-ui/i18n/tt-cyrl.json M resources/lib/oojs-ui/oojs-ui-apex-noimages.css M resources/lib/oojs-ui/oojs-ui-apex.js M resources/lib/oojs-ui/oojs-ui-mediawiki-noimages.css M resources/lib/oojs-ui/oojs-ui-mediawiki.js M resources/lib/oojs-ui/oojs-ui.js M resources/lib/oojs-ui/themes/apex/images/icons/advanced.png M resources/lib/oojs-ui/themes/apex/images/icons/advanced.svg M resources/lib/oojs-ui/themes/apex/images/icons/align-center.svg M resources/lib/oojs-ui/themes/apex/images/icons/align-float-left.svg M resources/lib/oojs-ui/themes/apex/images/icons/align-float-right.svg M resources/lib/oojs-ui/themes/apex/images/icons/arched-arrow-ltr.png M resources/lib/oojs-ui/themes/apex/images/icons/arched-arrow-ltr.svg M resources/lib/oojs-ui/themes/apex/images/icons/arrow-ltr.svg M resources/lib/oojs-ui/themes/apex/images/icons/arrow-rtl.svg M resources/lib/oojs-ui/themes/apex/images/icons/articleRedirect-rtl.png M resources/lib/oojs-ui/themes/apex/images/icons/articleRedirect-rtl.svg M resources/lib/oojs-ui/themes/apex/images/icons/block.svg M resources/lib/oojs-ui/themes/apex/images/icons/blockUndo-ltr.svg M resources/lib/oojs-ui/themes/apex/images/icons/blockUndo-rtl.svg M resources/lib/oojs-ui/themes/apex/images/icons/bold-a.svg M resources/lib/oojs-ui/themes/apex/images/icons/bold-arab-ain.png M resources/lib/oojs-ui/themes/apex/images/icons/bold-arab-ain.svg M resources/lib/oojs-ui/themes/apex/images/icons/bold-arab-dad.png M resources/lib/oojs-ui/themes/apex/images/icons/bold-arab-dad.svg M resources/lib/oojs-ui/themes/apex/images/icons/bold-armn-to.png M resources/lib/oojs-ui/themes/apex/images/icons/bold-armn-to.svg M resources/lib/oojs-ui/themes/apex/images/icons/bold-cyrl-be.svg M resources/lib/oojs-ui/themes/apex/images/icons/bold-cyrl-zhe.png M resources/lib/oojs-ui/themes/apex/images/icons/bold-cyrl-zhe.svg M resources/lib/oojs-ui/themes/apex/images/icons/bold-g.png M resources/lib/oojs-ui/themes/apex/images/icons/bold-g.svg M resources/lib/oojs-ui/themes/apex/images/icons/bookmark-rtl-invert.svg M resources/lib/oojs-ui/themes/apex/images/icons/bookmark-rtl.svg M resources/lib/oojs-ui/themes/apex/images/icons/browser-rtl-invert.svg M resources/lib/oojs-ui/themes/apex/images/icons/browser-rtl.svg M resources/lib/oojs-ui/themes/apex/images/icons/calendar-ltr.svg M resources/lib/oojs-ui/themes/apex/images/icons/calendar-rtl.svg M resources/lib/oojs-ui/themes/apex/images/icons/cancel.png M resources/lib/oojs-ui/themes/apex/images/icons/cancel.svg M resources/lib/oojs-ui/themes/apex/images/icons/caret-rtl.svg M resources/lib/oojs-ui/themes/apex/images/icons/caretDown.svg M resources/lib/oojs-ui/themes/apex/images/icons/caretUp.svg M resources/lib/oojs-ui/themes/apex/images/icons/case-sensitive.png M resources/lib/oojs-ui/themes/apex/images/icons/case-sensitive.svg M resources/lib/oojs-ui/themes/apex/images/icons/check.svg M resources/lib/oojs-ui/themes/apex/images/icons/clock-invert.png M resources/lib/oojs-ui/themes/apex/images/icons/clock-invert.svg M resources/lib/oojs-ui/themes/apex/images/icons/clock.png M resources/lib/oojs-ui/themes/apex/images/icons/clock.svg M resources/lib/oojs-ui/themes/apex/images/icons/code.png M resources/lib/oojs-ui/themes/apex/images/icons/code.svg M resources/lib/oojs-ui/themes/apex/images/icons/comment.png M resources/lib/oojs-ui/themes/apex/images/icons/comment.svg M resources/lib/oojs-ui/themes/apex/images/icons/edit-ltr.svg M resources/lib/oojs-ui/themes/apex/images/icons/edit-rtl.svg M resources/lib/oojs-ui/themes/apex/images/icons/editLock-ltr.svg M resources/lib/oojs-ui/themes/apex/images/icons/editLock-rtl.svg M resources/lib/oojs-ui/themes/apex/images/icons/editUndo-ltr.svg M resources/lib/oojs-ui/themes/apex/images/icons/editUndo-rtl.svg M resources/lib/oojs-ui/themes/apex/images/icons/ellipsis.svg M resources/lib/oojs-ui/themes/apex/images/icons/find-ltr.png M resources/lib/oojs-ui/themes/apex/images/icons/find-ltr.svg M resources/lib/oojs-ui/themes/apex/images/icons/find-rtl.png M resources/lib/oojs-ui/themes/apex/images/icons/find-rtl.svg M resources/lib/oojs-ui/themes/apex/images/icons/flag-ltr.svg M resources/lib/oojs-ui/themes/apex/images/icons/flag-rtl.svg M resources/lib/oojs-ui/themes/apex/images/icons/flagUndo-ltr.svg M resources/lib/oojs-ui/themes/apex/images/icons/flagUndo-rtl.svg M resources/lib/oojs-ui/themes/apex/images/icons/funnel-ltr-invert.svg M resources/lib/oojs-ui/themes/apex/images/icons/funnel-lt
[MediaWiki-commits] [Gerrit] Update OOjs UI to v0.15.1 - change (VisualEditor/VisualEditor)
Jforrester has uploaded a new change for review. https://gerrit.wikimedia.org/r/266591 Change subject: Update OOjs UI to v0.15.1 .. Update OOjs UI to v0.15.1 Release notes: https://git.wikimedia.org/blob/oojs%2Fui.git/v0.15.1/History.md Change-Id: Ic5069503ebea193e117a9f7f3d520a6f04e0b1cd --- M demos/ve/desktop-dist.html M demos/ve/desktop.html M demos/ve/minimal-rtl.html M demos/ve/mobile-dist.html M demos/ve/mobile.html M lib/oojs-ui/i18n/ce.json M lib/oojs-ui/i18n/glk.json M lib/oojs-ui/i18n/ka.json M lib/oojs-ui/i18n/tr.json M lib/oojs-ui/i18n/tt-cyrl.json M lib/oojs-ui/oojs-ui-apex-icons-content.css D lib/oojs-ui/oojs-ui-apex-icons-content.raster.css D lib/oojs-ui/oojs-ui-apex-icons-content.raster.rtl.css M lib/oojs-ui/oojs-ui-apex-icons-content.rtl.css D lib/oojs-ui/oojs-ui-apex-icons-content.vector.css D lib/oojs-ui/oojs-ui-apex-icons-content.vector.rtl.css M lib/oojs-ui/oojs-ui-apex-icons-editing-advanced.css D lib/oojs-ui/oojs-ui-apex-icons-editing-advanced.raster.css D lib/oojs-ui/oojs-ui-apex-icons-editing-advanced.raster.rtl.css M lib/oojs-ui/oojs-ui-apex-icons-editing-advanced.rtl.css D lib/oojs-ui/oojs-ui-apex-icons-editing-advanced.vector.css D lib/oojs-ui/oojs-ui-apex-icons-editing-advanced.vector.rtl.css M lib/oojs-ui/oojs-ui-apex-icons-editing-core.css D lib/oojs-ui/oojs-ui-apex-icons-editing-core.raster.css D lib/oojs-ui/oojs-ui-apex-icons-editing-core.raster.rtl.css M lib/oojs-ui/oojs-ui-apex-icons-editing-core.rtl.css D lib/oojs-ui/oojs-ui-apex-icons-editing-core.vector.css D lib/oojs-ui/oojs-ui-apex-icons-editing-core.vector.rtl.css M lib/oojs-ui/oojs-ui-apex-icons-editing-list.css D lib/oojs-ui/oojs-ui-apex-icons-editing-list.raster.css D lib/oojs-ui/oojs-ui-apex-icons-editing-list.raster.rtl.css M lib/oojs-ui/oojs-ui-apex-icons-editing-list.rtl.css D lib/oojs-ui/oojs-ui-apex-icons-editing-list.vector.css D lib/oojs-ui/oojs-ui-apex-icons-editing-list.vector.rtl.css M lib/oojs-ui/oojs-ui-apex-icons-editing-styling.css D lib/oojs-ui/oojs-ui-apex-icons-editing-styling.raster.css D lib/oojs-ui/oojs-ui-apex-icons-editing-styling.raster.rtl.css M lib/oojs-ui/oojs-ui-apex-icons-editing-styling.rtl.css D lib/oojs-ui/oojs-ui-apex-icons-editing-styling.vector.css D lib/oojs-ui/oojs-ui-apex-icons-editing-styling.vector.rtl.css M lib/oojs-ui/oojs-ui-apex-icons-interactions.css D lib/oojs-ui/oojs-ui-apex-icons-interactions.raster.css D lib/oojs-ui/oojs-ui-apex-icons-interactions.raster.rtl.css M lib/oojs-ui/oojs-ui-apex-icons-interactions.rtl.css D lib/oojs-ui/oojs-ui-apex-icons-interactions.vector.css D lib/oojs-ui/oojs-ui-apex-icons-interactions.vector.rtl.css M lib/oojs-ui/oojs-ui-apex-icons-media.css D lib/oojs-ui/oojs-ui-apex-icons-media.raster.css D lib/oojs-ui/oojs-ui-apex-icons-media.raster.rtl.css M lib/oojs-ui/oojs-ui-apex-icons-media.rtl.css D lib/oojs-ui/oojs-ui-apex-icons-media.vector.css D lib/oojs-ui/oojs-ui-apex-icons-media.vector.rtl.css M lib/oojs-ui/oojs-ui-apex-icons-moderation.css D lib/oojs-ui/oojs-ui-apex-icons-moderation.raster.css D lib/oojs-ui/oojs-ui-apex-icons-moderation.raster.rtl.css M lib/oojs-ui/oojs-ui-apex-icons-moderation.rtl.css D lib/oojs-ui/oojs-ui-apex-icons-moderation.vector.css D lib/oojs-ui/oojs-ui-apex-icons-moderation.vector.rtl.css M lib/oojs-ui/oojs-ui-apex-icons-movement.css D lib/oojs-ui/oojs-ui-apex-icons-movement.raster.css D lib/oojs-ui/oojs-ui-apex-icons-movement.raster.rtl.css M lib/oojs-ui/oojs-ui-apex-icons-movement.rtl.css D lib/oojs-ui/oojs-ui-apex-icons-movement.vector.css D lib/oojs-ui/oojs-ui-apex-icons-movement.vector.rtl.css M lib/oojs-ui/oojs-ui-apex-noimages.css D lib/oojs-ui/oojs-ui-apex-noimages.raster.css D lib/oojs-ui/oojs-ui-apex-noimages.raster.rtl.css M lib/oojs-ui/oojs-ui-apex-noimages.rtl.css D lib/oojs-ui/oojs-ui-apex-noimages.vector.css D lib/oojs-ui/oojs-ui-apex-noimages.vector.rtl.css M lib/oojs-ui/oojs-ui-apex.css M lib/oojs-ui/oojs-ui-apex.js D lib/oojs-ui/oojs-ui-apex.raster.css D lib/oojs-ui/oojs-ui-apex.raster.rtl.css M lib/oojs-ui/oojs-ui-apex.rtl.css D lib/oojs-ui/oojs-ui-apex.vector.css D lib/oojs-ui/oojs-ui-apex.vector.rtl.css M lib/oojs-ui/oojs-ui-mediawiki-icons-accessibility.css D lib/oojs-ui/oojs-ui-mediawiki-icons-accessibility.raster.css D lib/oojs-ui/oojs-ui-mediawiki-icons-accessibility.raster.rtl.css M lib/oojs-ui/oojs-ui-mediawiki-icons-accessibility.rtl.css D lib/oojs-ui/oojs-ui-mediawiki-icons-accessibility.vector.css D lib/oojs-ui/oojs-ui-mediawiki-icons-accessibility.vector.rtl.css M lib/oojs-ui/oojs-ui-mediawiki-icons-alerts.css D lib/oojs-ui/oojs-ui-mediawiki-icons-alerts.raster.css D lib/oojs-ui/oojs-ui-mediawiki-icons-alerts.raster.rtl.css M lib/oojs-ui/oojs-ui-mediawiki-icons-alerts.rtl.css D lib/oojs-ui/oojs-ui-mediawiki-icons-alerts.vector.css D lib/oojs-ui/oojs-ui-mediawiki-icons-alerts.vector.rtl.css M lib/oojs-ui/oojs-ui-mediawiki-icons-content.css D lib/oojs-ui/oojs-ui-mediawiki-icons-content.raster.css D lib/ooj
[MediaWiki-commits] [Gerrit] Capitalize "Url" - change (mediawiki...OpenBadges)
MtDu has uploaded a new change for review.
https://gerrit.wikimedia.org/r/266590
Change subject: Capitalize "Url"
..
Capitalize "Url"
Bug: T124745
Change-Id: Iedd3a12421aa9a24e9b1c7d86dcd7f3a0c7b8bc1
---
M i18n/en.json
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/OpenBadges
refs/changes/90/266590/1
diff --git a/i18n/en.json b/i18n/en.json
index b8e0730..9e44b79 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -47,5 +47,5 @@
"apihelp-openbadgesissue-description": "Issue an OpenBadge to a user.",
"apihelp-openbadgesissue-param-obl_badge_id": "OpenBadge to issue from
{{SITENAME}}.",
"apihelp-openbadgesissue-param-obl_receiver": "User name of the user
who will receive the OpenBadge.",
- "apihelp-openbadgesissue-param-obl_evidence_url": "Url to evidence for
user meeting the OpenBadge criteria."
+ "apihelp-openbadgesissue-param-obl_evidence_url": "URL to evidence for
user meeting the OpenBadge criteria."
}
--
To view, visit https://gerrit.wikimedia.org/r/266590
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iedd3a12421aa9a24e9b1c7d86dcd7f3a0c7b8bc1
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/OpenBadges
Gerrit-Branch: master
Gerrit-Owner: MtDu
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove @Expose Gson annotations - change (apps...wikipedia)
MtDu has uploaded a new change for review.
https://gerrit.wikimedia.org/r/266589
Change subject: Remove @Expose Gson annotations
..
Remove @Expose Gson annotations
Bug: T124375
Change-Id: Ie3c19fd26f99a989272a0db22a8b79e0e0ed55ae
---
M app/proguard-rules.pro
M app/src/main/java/org/wikipedia/page/Section.java
M app/src/main/java/org/wikipedia/server/Protection.java
M app/src/main/java/org/wikipedia/server/mwapi/MwPageLead.java
M app/src/main/java/org/wikipedia/server/mwapi/MwPageRemaining.java
M app/src/main/java/org/wikipedia/server/mwapi/MwPageSummary.java
M app/src/main/java/org/wikipedia/server/mwapi/MwServiceError.java
M app/src/main/java/org/wikipedia/server/restbase/RbDefinition.java
M app/src/main/java/org/wikipedia/server/restbase/RbPageCombo.java
M app/src/main/java/org/wikipedia/server/restbase/RbPageLead.java
M app/src/main/java/org/wikipedia/server/restbase/RbPageRemaining.java
M app/src/main/java/org/wikipedia/server/restbase/RbPageSummary.java
M app/src/main/java/org/wikipedia/server/restbase/RbServiceError.java
13 files changed, 79 insertions(+), 83 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia
refs/changes/89/266589/1
diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
index 9646917..7e4e811 100644
--- a/app/proguard-rules.pro
+++ b/app/proguard-rules.pro
@@ -44,9 +44,6 @@
# removes such information by default, so configure it to keep all of it.
#-keepattributes Signature (already specified)
-# For using GSON @Expose annotation
--keepattributes *Annotation*
-
# Gson specific classes
-keep class sun.misc.Unsafe { *; }
# --- /Gson ---
diff --git a/app/src/main/java/org/wikipedia/page/Section.java
b/app/src/main/java/org/wikipedia/page/Section.java
index 0ae2dbd..b2fcc8c 100644
--- a/app/src/main/java/org/wikipedia/page/Section.java
+++ b/app/src/main/java/org/wikipedia/page/Section.java
@@ -17,11 +17,11 @@
*/
public class Section {
-@Expose private int id;
-@Expose private int toclevel = 1;
-@Expose private String line;
-@Expose private String anchor;
-@Expose private String text;
+private int id;
+private int toclevel = 1;
+private String line;
+private String anchor;
+private String text;
// TODO: can we get rid of this? It's not efficient to
public static Section fromJson(JSONObject json) {
diff --git a/app/src/main/java/org/wikipedia/server/Protection.java
b/app/src/main/java/org/wikipedia/server/Protection.java
index 0c2489d..1d73bfc 100644
--- a/app/src/main/java/org/wikipedia/server/Protection.java
+++ b/app/src/main/java/org/wikipedia/server/Protection.java
@@ -15,7 +15,6 @@
/** Protection settings for a page */
public class Protection {
-@Expose
private String[] edit;
public Protection() {
diff --git a/app/src/main/java/org/wikipedia/server/mwapi/MwPageLead.java
b/app/src/main/java/org/wikipedia/server/mwapi/MwPageLead.java
index 353d85b..b3c97da 100644
--- a/app/src/main/java/org/wikipedia/server/mwapi/MwPageLead.java
+++ b/app/src/main/java/org/wikipedia/server/mwapi/MwPageLead.java
@@ -24,8 +24,8 @@
* Gson POJO for loading the first stage of page content.
*/
public class MwPageLead implements PageLead {
-@Expose private MwServiceError error;
-@Expose private Mobileview mobileview;
+private MwServiceError error;
+private Mobileview mobileview;
@Override
public boolean hasError() {
@@ -97,21 +97,21 @@
* Almost everything is in this inner class.
*/
public static class Mobileview implements PageLeadProperties {
-@Expose private int id;
-@Expose private long revision;
-@Expose @Nullable private String lastmodified;
-@Expose @Nullable private String displaytitle;
-@Expose @Nullable private String redirected;
-@Expose @Nullable private String normalizedtitle;
-@Expose private int languagecount;
-@Expose private boolean editable;
-@Expose private boolean mainpage;
-@Expose private boolean disambiguation;
-@Expose @Nullable private String description;
-@Expose @Nullable private Image image;
-@Expose @Nullable private Thumb thumb;
-@Expose @Nullable private Protection protection;
-@Expose @Nullable private List sections;
+private int id;
+private long revision;
+@Nullable private String lastmodified;
+@Nullable private String displaytitle;
+@Nullable private String redirected;
+@Nullable private String normalizedtitle;
+private int languagecount;
+private boolean editable;
+private boolean mainpage;
+private boolean disambiguation;
+@Nullable private String description;
+@Nullable private Image image;
+@Nullable private Thumb thumb;
+@Nullable private Protection protection;
+@Nullable private List sec
[MediaWiki-commits] [Gerrit] Tag v0.15.1 - change (oojs/ui)
jenkins-bot has submitted this change and it was merged.
Change subject: Tag v0.15.1
..
Tag v0.15.1
Change-Id: I7ca29eb9b64b3b6a5ee7e83c5cd1088e04904e7d
---
M History.md
M package.json
2 files changed, 41 insertions(+), 1 deletion(-)
Approvals:
Bartosz Dziewoński: Looks good to me, approved
jenkins-bot: Verified
diff --git a/History.md b/History.md
index 26f5906..44c2c61 100644
--- a/History.md
+++ b/History.md
@@ -1,5 +1,45 @@
# OOjs UI Release History
+## v0.15.1 / 2016-01-26
+
+### Features
+* Really filter out unsafe URLs, but don't throw silly exceptions (Bartosz
Dziewoński)
+* ClippableElement: Try to prevent unnecessary scrollbars (Bartosz Dziewoński)
+* Dialog: Don't set `overflow:hidden;` on `.oo-ui-window-body` elements (Alex
Monk)
+* TextInputWidget: Don't fail if 'validate' function returns null (Bartosz
Dziewoński)
+
+### Styles
+* WindowManager: Only apply `top: 1em; bottom: 1em;` to non-fullscreen windows
(Bartosz Dziewoński)
+* Align mixin whitespace to CSS/Less coding guidelines (Volker E)
+* Enable `cursor: pointer` just on enabled widgets (Volker E)
+* Apex, MediaWiki themes: Fix size of templateAdd icon (Ed Sanders)
+* Apex, MediaWiki themes: Quotes icon fixes (Ed Sanders)
+* Apex, MediaWiki themes: Re-crush SVGs, removing useless ID values and empty
groups (James D. Forrester)
+* Apex theme: Fix FieldLayout padding in inline mode (Ed Sanders)
+* Apex theme: NumberInputWidget: Fix width of +/- buttons (Ed Sanders)
+* MediaWiki theme: Add invert variant to 'accessibility' icon pack icons
(Bartosz Dziewoński)
+* MediaWiki theme: Align `@input-*` vars to coding guidelines (Volker E)
+* MediaWiki theme: Align `rgba()` values to CSS/Less guidelines (Volker E)
+* MediaWiki theme: Align size variables to CSS/Less guidelines (Volker E)
+* MediaWiki theme: Consolidate emphasized color values into variable (Volker E)
+* MediaWiki theme: Establish new `@border-default` variable (Volker E)
+* MediaWiki theme: Make icon variants actually work for all icons (Bartosz
Dziewoński)
+* MediaWiki theme: Make transition of text input fields smoother (Volker E)
+* MediaWiki theme: Merge `@oo-ui-toolbar-bar-text` & `@color-default` vars
(Volker E)
+* MediaWiki theme: Replace fixed & consolidate disabled values with vars
(Volker E)
+* MediaWiki theme: Update avatar icon (Pau Giner)
+
+### Code
+* NumberInputWidget: Replace `box-sizing` property with mixin as anywhere else
(Volker E)
+* SelectFileWidget: Order name and type spans in the order they are shown
(Prateek Saxena)
+* TextInputWidget: Simplify `#getValidity` (Bartosz Dziewoński)
+* README: Add a 'Contributing' section (James D. Forrester)
+* build: Don't generate .min.js and .min.css files by default (Bartosz
Dziewoński)
+* build: Only build one graphics distribution (mixed/vector/raster), not all
(Bartosz Dziewoński)
+* build: Update jakub-onderka/php-parallel-lint to 0.9.2 (Paladox)
+* build: Update mediawiki/mediawiki-codesniffer to 0.5.1 (Paladox)
+* demo: Extend compounded form in widget.js demo (Volker E)
+
## v0.15.0 / 2016-01-12
### Breaking changes
diff --git a/package.json b/package.json
index cfd91d5..fd89e55 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "oojs-ui",
- "version": "0.15.0",
+ "version": "0.15.1",
"description": "User interface classes built on the OOjs framework.",
"keywords": [
"oojs-plugin",
--
To view, visit https://gerrit.wikimedia.org/r/266570
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I7ca29eb9b64b3b6a5ee7e83c5cd1088e04904e7d
Gerrit-PatchSet: 1
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: Jforrester
Gerrit-Reviewer: Bartosz Dziewoński
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Make TopicTitleWidget pending on save - change (mediawiki...Flow)
Sbisson has uploaded a new change for review.
https://gerrit.wikimedia.org/r/266588
Change subject: Make TopicTitleWidget pending on save
..
Make TopicTitleWidget pending on save
Bug: T124796
Change-Id: I499d40d79765538190b32689b4e2ae584cae7c53
---
M modules/flow/ui/widgets/mw.flow.ui.TopicTitleWidget.js
1 file changed, 40 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Flow
refs/changes/88/266588/1
diff --git a/modules/flow/ui/widgets/mw.flow.ui.TopicTitleWidget.js
b/modules/flow/ui/widgets/mw.flow.ui.TopicTitleWidget.js
index 4388561..e939d59 100644
--- a/modules/flow/ui/widgets/mw.flow.ui.TopicTitleWidget.js
+++ b/modules/flow/ui/widgets/mw.flow.ui.TopicTitleWidget.js
@@ -78,7 +78,7 @@
this.$controls
);
- this.input.pushPending();
+ this.pushPending();
this.api.getPost( topicId, topicId, 'wikitext' ).then(
function ( topic ) {
var content = OO.getProp( topic, 'content',
'content' ),
@@ -93,7 +93,7 @@
}
).always(
function () {
- widget.input.popPending();
+ widget.popPending();
}
);
@@ -109,6 +109,8 @@
var content = this.input.getValue(),
captcha = this.captchaWidget.getResponse(),
widget = this;
+
+ widget.pushPending();
this.api.saveTopicTitle( this.topicId, content, captcha ).then(
function ( workflowId ) {
widget.emit( 'saveContent', workflowId );
@@ -120,7 +122,43 @@
widget.error.toggle( true );
}
}
+ ).always(
+ function() {
+ widget.popPending();
+ }
);
};
+ mw.flow.ui.TopicTitleWidget.prototype.isDisabled = function () {
+ // Auto-disable when pending
+ return ( this.input && this.input.isPending() ) ||
+ // Parent method
+
mw.flow.ui.TopicTitleWidget.parent.prototype.isDisabled.apply( this, arguments
);
+ };
+
+ mw.flow.ui.TopicTitleWidget.prototype.setDisabled = function ( disabled
) {
+ // Parent method
+ mw.flow.ui.TopicTitleWidget.parent.prototype.setDisabled.call(
this, disabled );
+
+ if ( this.input && this.saveButton && this.cancelButton ) {
+ this.input.setDisabled( this.isDisabled() );
+ this.saveButton.setDisabled( this.isDisabled() );
+ this.cancelButton.setDisabled( this.isDisabled() );
+ }
+ };
+
+ mw.flow.ui.TopicTitleWidget.prototype.pushPending = function () {
+ this.input.pushPending();
+
+ // Disabled state depends on pending state
+ this.updateDisabled();
+ };
+
+ mw.flow.ui.TopicTitleWidget.prototype.popPending = function () {
+ this.input.popPending();
+
+ // Disabled state depends on pending state
+ this.updateDisabled();
+ };
+
}( jQuery ) );
--
To view, visit https://gerrit.wikimedia.org/r/266588
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I499d40d79765538190b32689b4e2ae584cae7c53
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: Sbisson
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Moved 'section' tag parsing into SFPageSection class - change (mediawiki...SemanticForms)
Yaron Koren has submitted this change and it was merged.
Change subject: Moved 'section' tag parsing into SFPageSection class
..
Moved 'section' tag parsing into SFPageSection class
Change-Id: I2b2eaf01a6ea118eb5616c9c3783e68d102b33bf
---
M includes/SF_FormPrinter.php
M includes/SF_PageSection.php
2 files changed, 72 insertions(+), 54 deletions(-)
Approvals:
Yaron Koren: Checked; Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/SF_FormPrinter.php b/includes/SF_FormPrinter.php
index 25a8935..fa1be1d 100644
--- a/includes/SF_FormPrinter.php
+++ b/includes/SF_FormPrinter.php
@@ -1031,47 +1031,9 @@
//
=
} elseif ( $tag_title == 'section' ) {
$section_name = trim(
$tag_components[1] );
- $is_mandatory = false;
- $is_hidden = false;
- $is_restricted = false;
- $header_level = 2;
- $other_args = array( 'isSection' =>
true );
+ $page_section_in_form =
SFPageSection::newFromFormTag( $tag_components );
- // cycle through the other components
- for ( $i = 2; $i < count(
$tag_components ); $i++ ) {
-
- $component = trim(
$tag_components[$i] );
-
- if ( $component === 'mandatory'
) {
- $is_mandatory = true;
- } elseif ( $component ===
'hidden' ) {
- $is_hidden = true;
- } elseif ( $component ===
'restricted' ) {
- $is_restricted = !(
$wgUser && $wgUser->isAllowed( 'editrestrictedfields' ) );
- } elseif ( $component ===
'autogrow' ) {
- $other_args['autogrow']
= true;
- }
-
- $sub_components = array_map(
'trim', explode( '=', $component, 2 ) );
-
- if ( count( $sub_components )
=== 2 ) {
- switch (
$sub_components[0] ) {
- case 'level':
- $header_level =
$sub_components[1];
- break;
- case 'rows':
- case 'cols':
- case 'class':
- case 'editor':
-
$other_args[$sub_components[0]] = $sub_components[1];
- break;
- default:
- // Ignore
unknown
- }
- }
- }
-
- // split the existing page contents
into the textareas in the form
+ // Split the existing page contents
into the textareas in the form.
$default_value = "";
$section_start_loc = 0;
if ( $source_is_page &&
$existing_page_content !== null ) {
@@ -1122,21 +1084,23 @@
if ( ( ! $source_is_page ) &&
$wgRequest ) {
$text_per_section =
$wgRequest->getArray( '_section' );
$section_text =
$text_per_section[trim( $section_name )];
- $wiki_page->addSection(
$section_name, $header_level, $section_text );
+ $wiki_page->addSection(
$section_name, $page_section_in_form->getSectionLevel(), $section_text );
}
$section_text = trim( $section_text );
// Set input name for query string.
[MediaWiki-commits] [Gerrit] delete.py: warn if pages link to "page to be deleted" - change (pywikibot/core)
Mpaa has uploaded a new change for review.
https://gerrit.wikimedia.org/r/266587
Change subject: delete.py: warn if pages link to "page to be deleted"
..
delete.py: warn if pages link to "page to be deleted"
Add parameter -warn to check 'What links here' for pages to be deleted.
Set also automatic_quit=True in page.delete(), to quit script.
Change-Id: I365a5f9c067bae5637a6c628e308b35f8c4eb1b7
---
M pywikibot/page.py
M scripts/delete.py
2 files changed, 11 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core
refs/changes/87/266587/1
diff --git a/pywikibot/page.py b/pywikibot/page.py
index 82a9028..5a0bdad 100644
--- a/pywikibot/page.py
+++ b/pywikibot/page.py
@@ -1752,7 +1752,7 @@
u'Do you want to delete %s?' % self.title(
asLink=True, forceInterwiki=True),
[('Yes', 'y'), ('No', 'n'), ('All', 'a')],
-'n', automatic_quit=False)
+'n', automatic_quit=True)
if answer == 'a':
answer = 'y'
self.site._noDeletePrompt = True
diff --git a/scripts/delete.py b/scripts/delete.py
index cd52c6d..674c4eb 100755
--- a/scripts/delete.py
+++ b/scripts/delete.py
@@ -18,6 +18,9 @@
-undelete:Actually undelete pages instead of deleting.
Obviously makes sense only with -page and -file.
+-warn:Warn if there are pages that link to page to be
+ deleted (check 'What links here').
+
Usage:
python pwb.py delete [-category categoryName]
@@ -68,6 +71,7 @@
"""
self.availableOptions.update({
'undelete': False,
+'warn': False,
})
super(DeletionRobot, self).__init__(generator=generator, **kwargs)
@@ -83,6 +87,10 @@
self.current_page.undelete(self.summary)
else:
if self.current_page.exists():
+if self.getOption('warn'):
+for page in self.current_page.backlinks():
+pywikibot.warning('Page: {0} links to {1}.'.format(
+ page, self.current_page))
self.current_page.delete(self.summary,
not self.getOption('always'),
self.getOption('always'))
@@ -125,6 +133,8 @@
local_args.append('-imageused' + arg[7:])
elif arg.startswith('-undelete'):
options['undelete'] = True
+elif arg.startswith('-warn'):
+options['warn'] = True
else:
genFactory.handleArg(arg)
found = arg.find(':') + 1
--
To view, visit https://gerrit.wikimedia.org/r/266587
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I365a5f9c067bae5637a6c628e308b35f8c4eb1b7
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: Mpaa
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Don't send puppet nags to the novaadmin user. - change (operations/puppet)
Andrew Bogott has submitted this change and it was merged.
Change subject: Don't send puppet nags to the novaadmin user.
..
Don't send puppet nags to the novaadmin user.
Bug: T124516
Change-Id: Iddf913109e1e9752159a855f72c7ef330ce66d97
---
M modules/base/files/labs/puppetalert.py
1 file changed, 7 insertions(+), 0 deletions(-)
Approvals:
Andrew Bogott: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/base/files/labs/puppetalert.py
b/modules/base/files/labs/puppetalert.py
index facd0e2..9fe6df0 100755
--- a/modules/base/files/labs/puppetalert.py
+++ b/modules/base/files/labs/puppetalert.py
@@ -28,6 +28,10 @@
# Nag if it's been 24 hours since the last puppet run
NAG_INTERVAL = 60 * 60 * 24
+# Don't bother to notify the novaadmin user; that just
+# sends spam to ops@
+USER_IGNORE_LIST = ['uid=novaadmin,ou=people,dc=wikimedia,dc=org']
+
with open('/etc/wmflabs-project') as f:
PROJECT_NAME = f.read().strip()
@@ -75,6 +79,9 @@
admins = adminrec[0][1]['roleOccupant']
for admin in admins:
+if admin.lower() in USER_IGNORE_LIST:
+continue
+
userrec = conn.search_s(admin, ldap.SCOPE_BASE)
email = userrec[0][1]['mail'][0]
--
To view, visit https://gerrit.wikimedia.org/r/266192
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iddf913109e1e9752159a855f72c7ef330ce66d97
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott
Gerrit-Reviewer: Alex Monk
Gerrit-Reviewer: Alexandros Kosiaris
Gerrit-Reviewer: Andrew Bogott
Gerrit-Reviewer: Dzahn
Gerrit-Reviewer: Tim Landscheidt
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Moved 'section' tag parsing into SFPageSection class - change (mediawiki...SemanticForms)
Yaron Koren has uploaded a new change for review.
https://gerrit.wikimedia.org/r/266586
Change subject: Moved 'section' tag parsing into SFPageSection class
..
Moved 'section' tag parsing into SFPageSection class
Change-Id: I2b2eaf01a6ea118eb5616c9c3783e68d102b33bf
---
M includes/SF_FormPrinter.php
M includes/SF_PageSection.php
2 files changed, 72 insertions(+), 54 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/SemanticForms
refs/changes/86/266586/1
diff --git a/includes/SF_FormPrinter.php b/includes/SF_FormPrinter.php
index 25a8935..fa1be1d 100644
--- a/includes/SF_FormPrinter.php
+++ b/includes/SF_FormPrinter.php
@@ -1031,47 +1031,9 @@
//
=
} elseif ( $tag_title == 'section' ) {
$section_name = trim(
$tag_components[1] );
- $is_mandatory = false;
- $is_hidden = false;
- $is_restricted = false;
- $header_level = 2;
- $other_args = array( 'isSection' =>
true );
+ $page_section_in_form =
SFPageSection::newFromFormTag( $tag_components );
- // cycle through the other components
- for ( $i = 2; $i < count(
$tag_components ); $i++ ) {
-
- $component = trim(
$tag_components[$i] );
-
- if ( $component === 'mandatory'
) {
- $is_mandatory = true;
- } elseif ( $component ===
'hidden' ) {
- $is_hidden = true;
- } elseif ( $component ===
'restricted' ) {
- $is_restricted = !(
$wgUser && $wgUser->isAllowed( 'editrestrictedfields' ) );
- } elseif ( $component ===
'autogrow' ) {
- $other_args['autogrow']
= true;
- }
-
- $sub_components = array_map(
'trim', explode( '=', $component, 2 ) );
-
- if ( count( $sub_components )
=== 2 ) {
- switch (
$sub_components[0] ) {
- case 'level':
- $header_level =
$sub_components[1];
- break;
- case 'rows':
- case 'cols':
- case 'class':
- case 'editor':
-
$other_args[$sub_components[0]] = $sub_components[1];
- break;
- default:
- // Ignore
unknown
- }
- }
- }
-
- // split the existing page contents
into the textareas in the form
+ // Split the existing page contents
into the textareas in the form.
$default_value = "";
$section_start_loc = 0;
if ( $source_is_page &&
$existing_page_content !== null ) {
@@ -1122,21 +1084,23 @@
if ( ( ! $source_is_page ) &&
$wgRequest ) {
$text_per_section =
$wgRequest->getArray( '_section' );
$section_text =
$text_per_section[trim( $section_name )];
- $wiki_page->addSection(
$section_name, $header_level, $section_text );
+ $wiki_page->addSection(
$section_name, $page_section_in_form->getSectionLevel(), $section_text );
}
$section_text = trim( $section_text );
[MediaWiki-commits] [Gerrit] Avoid forceHTTPS cookie flapping if core and CA are setting ... - change (mediawiki...CentralAuth)
Anomie has uploaded a new change for review.
https://gerrit.wikimedia.org/r/266585
Change subject: Avoid forceHTTPS cookie flapping if core and CA are setting the
same cookie
..
Avoid forceHTTPS cookie flapping if core and CA are setting the same cookie
Ib7b0f77a mostly stopped CentralAuthSessionProvider from setting the
forceHTTPS cookie multiple times in one request, but if both core and CA
are setting the cookie with the same domain and path it will still
delete and reissue the cookie repeatedly. So detect that situation and
skip the "delete".
Bug: T124421
Change-Id: Ie74940d7bf4316acaaec037c6f0a3b92b96df380
---
M includes/session/CentralAuthSessionProvider.php
1 file changed, 11 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CentralAuth
refs/changes/85/266585/1
diff --git a/includes/session/CentralAuthSessionProvider.php
b/includes/session/CentralAuthSessionProvider.php
index 1350265..5b67784 100644
--- a/includes/session/CentralAuthSessionProvider.php
+++ b/includes/session/CentralAuthSessionProvider.php
@@ -392,17 +392,25 @@
$central = $backend
? CentralAuthUser::getInstance( $backend->getUser()
)->isAttached()
: false;
+ $sameCookie = (
+ $this->cookieOptions['path'] ===
$this->centralCookieOptions['path'] &&
+ $this->cookieOptions['domain'] ===
$this->centralCookieOptions['domain']
+ );
// If the account is centralized, have the parent clear its
cookie and
// set the central cookie. If it's not centralized, clear the
central
// cookie and have the parent set its cookie as it usually
would.
if ( $set && $central ) {
- parent::setForceHTTPSCookie( false, $backend, $request
);
+ if ( !$sameCookie ) {
+ parent::setForceHTTPSCookie( false, $backend,
$request );
+ }
$response->setCookie( 'forceHTTPS', 'true',
$backend->shouldRememberUser() ? 0 : null,
array( 'prefix' => '', 'secure' => false ) +
$this->centralCookieOptions );
} else {
- $response->clearCookie( 'forceHTTPS',
- array( 'prefix' => '', 'secure' => false ) +
$this->centralCookieOptions );
+ if ( !$sameCookie ) {
+ $response->clearCookie( 'forceHTTPS',
+ array( 'prefix' => '', 'secure' =>
false ) + $this->centralCookieOptions );
+ }
parent::setForceHTTPSCookie( $set, $backend, $request );
}
}
--
To view, visit https://gerrit.wikimedia.org/r/266585
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie74940d7bf4316acaaec037c6f0a3b92b96df380
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CentralAuth
Gerrit-Branch: master
Gerrit-Owner: Anomie
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove puppet classes and files associated with /srv/mediawi... - change (operations/puppet)
Andrew Bogott has submitted this change and it was merged.
Change subject: Remove puppet classes and files associated with
/srv/mediawiki/private/WikitechPrivateLdapSettings.php
..
Remove puppet classes and files associated with
/srv/mediawiki/private/WikitechPrivateLdapSettings.php
This file is now installed by the Openstack class directly
on wikitech hosts.
Bug: T124732
Change-Id: I3c26f3ae46a13851a75640d54c2ee0421caa2428
---
D modules/deployment/manifests/wikitech.pp
D modules/deployment/templates/wikitech_ldap.php.erb
M modules/role/manifests/deployment/mediawiki.pp
3 files changed, 0 insertions(+), 36 deletions(-)
Approvals:
Andrew Bogott: Looks good to me, approved
Alex Monk: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/modules/deployment/manifests/wikitech.pp
b/modules/deployment/manifests/wikitech.pp
deleted file mode 100644
index b6941ac..000
--- a/modules/deployment/manifests/wikitech.pp
+++ /dev/null
@@ -1,17 +0,0 @@
-# === Class deployment::wikitech
-# Installs the private settings file for wikitech connection to ldap
-class deployment::wikitech {
-$keystoneconfig = hiera_hash('keystoneconfig', {})
-
-$wikitech_nova_ldap_proxyagent_pass =
$keystoneconfig['ldap_proxyagent_pass']
-$wikitech_nova_ldap_user_pass = $keystoneconfig['ldap_user_pass']
-
-# Drop this file onto the mediawiki deployment host so that the passwords
are deployed
-file { '/srv/mediawiki/private/WikitechPrivateLdapSettings.php':
-ensure => present,
-content => template('deployment/wikitech_ldap.php.erb'),
-mode=> '0644',
-owner => 'mwdeploy',
-group => 'mwdeploy',
-}
-}
diff --git a/modules/deployment/templates/wikitech_ldap.php.erb
b/modules/deployment/templates/wikitech_ldap.php.erb
deleted file mode 100644
index 7791774..000
--- a/modules/deployment/templates/wikitech_ldap.php.erb
+++ /dev/null
@@ -1,15 +0,0 @@
-
'cn=proxyagent,ou=profile,dc=wikimedia,dc=org' );
-$wgLDAPProxyAgentPassword = array( 'labs' => "<%=
@wikitech_nova_ldap_proxyagent_pass %>" );
-
-$wgLDAPWriterDN = array( 'labs' =>
'uid=novaadmin,ou=people,dc=wikimedia,dc=org' );
-$wgLDAPWriterPassword = array( 'labs' => "<%= @wikitech_nova_ldap_user_pass
%>" );
-
-$wgOpenStackManagerLDAPUser =
'uid=novaadmin,ou=people,dc=wikimedia,dc=org';
-$wgOpenStackManagerLDAPUsername = 'novaadmin';
-$wgOpenStackManagerLDAPUserPassword = "<%= @wikitech_nova_ldap_user_pass %>";
diff --git a/modules/role/manifests/deployment/mediawiki.pp
b/modules/role/manifests/deployment/mediawiki.pp
index ab51727..e86e1ed 100644
--- a/modules/role/manifests/deployment/mediawiki.pp
+++ b/modules/role/manifests/deployment/mediawiki.pp
@@ -12,10 +12,6 @@
include scap::master
include scap::ferm
-if $::realm != 'labs' {
-include deployment::wikitech
-}
-
# Keyholder
require ::keyholder
require ::keyholder::monitoring
--
To view, visit https://gerrit.wikimedia.org/r/266452
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I3c26f3ae46a13851a75640d54c2ee0421caa2428
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott
Gerrit-Reviewer: Alex Monk
Gerrit-Reviewer: Andrew Bogott
Gerrit-Reviewer: BryanDavis
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove redundant index - change (mediawiki...PageAssessments)
Aaron Schulz has uploaded a new change for review. https://gerrit.wikimedia.org/r/266584 Change subject: Remove redundant index .. Remove redundant index Change-Id: I56df1cf5863db0519b6add6f816b390916c4c2f4 --- M db/addReviewsTable.sql 1 file changed, 0 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/PageAssessments refs/changes/84/266584/1 diff --git a/db/addReviewsTable.sql b/db/addReviewsTable.sql index 7907ab2..59d016b 100644 --- a/db/addReviewsTable.sql +++ b/db/addReviewsTable.sql @@ -11,5 +11,4 @@ )/*$wgDBTableOptions*/; CREATE INDEX /*i*/pa_project ON /*_*/ page_assessments (pa_project); -CREATE INDEX /*i*/pa_page_name ON /*_*/ page_assessments (pa_page_name); CREATE UNIQUE INDEX /*i*/pa_page_project ON /*_*/ page_assessments (pa_page_name, pa_project); -- To view, visit https://gerrit.wikimedia.org/r/266584 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I56df1cf5863db0519b6add6f816b390916c4c2f4 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/PageAssessments Gerrit-Branch: master Gerrit-Owner: Aaron Schulz ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Clean up INT fields - change (mediawiki...PageAssessments)
Aaron Schulz has uploaded a new change for review. https://gerrit.wikimedia.org/r/266583 Change subject: Clean up INT fields .. Clean up INT fields Change-Id: I68e84fb9f6ffb8b41ac30921d34b6e1bee92f1a9 --- M db/addReviewsTable.sql 1 file changed, 3 insertions(+), 3 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/PageAssessments refs/changes/83/266583/1 diff --git a/db/addReviewsTable.sql b/db/addReviewsTable.sql index 7907ab2..84db4fc 100644 --- a/db/addReviewsTable.sql +++ b/db/addReviewsTable.sql @@ -1,13 +1,13 @@ -- Add article assessments table CREATE TABLE IF NOT EXISTS /*_*/page_assessments ( - pa_page_id INT(10) NOT NULL, + pa_page_id INT UNSIGNED NOT NULL, pa_page_nameVARCHAR(255) NOT NULL, - pa_page_namespace INT(11) NOT NULL, + pa_page_namespace INT NOT NULL, pa_project VARCHAR(128) DEFAULT NULL, pa_classVARCHAR(20) DEFAULT NULL, pa_importance VARCHAR(20) DEFAULT NULL, - pa_page_revisionINT(10) NOT NULL + pa_page_revisionINT UNSIGNED NOT NULL )/*$wgDBTableOptions*/; CREATE INDEX /*i*/pa_project ON /*_*/ page_assessments (pa_project); -- To view, visit https://gerrit.wikimedia.org/r/266583 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I68e84fb9f6ffb8b41ac30921d34b6e1bee92f1a9 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/PageAssessments Gerrit-Branch: master Gerrit-Owner: Aaron Schulz ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Skip IPTCTest::testIPTCParseForcedUTFButInvalid() on pre-PHP... - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged.
Change subject: Skip IPTCTest::testIPTCParseForcedUTFButInvalid() on
pre-PHP5.5.26
..
Skip IPTCTest::testIPTCParseForcedUTFButInvalid() on pre-PHP5.5.26
Bug: T124574
Change-Id: If546c84a9449579cdea5af5b2a6b4b1e7203109e
---
M tests/phpunit/includes/media/IPTCTest.php
1 file changed, 3 insertions(+), 0 deletions(-)
Approvals:
BryanDavis: Looks good to me, but someone else must approve
Brian Wolff: Looks good to me, approved
jenkins-bot: Verified
diff --git a/tests/phpunit/includes/media/IPTCTest.php
b/tests/phpunit/includes/media/IPTCTest.php
index 06542cf..6556186 100644
--- a/tests/phpunit/includes/media/IPTCTest.php
+++ b/tests/phpunit/includes/media/IPTCTest.php
@@ -44,6 +44,9 @@
* @covers IPTC::Parse
*/
public function testIPTCParseForcedUTFButInvalid() {
+ if ( version_compare( PHP_VERSION, '5.5.26', '<' ) ) {
+ $this->markTestSkipped( 'Test fails on pre-PHP 5.5.25.
See T124574/T39665 for details.' );
+ }
$iptcData = "Photoshop
3.0\08BIM\4\4\0\0\0\0\0\x11\x1c\x02\x19\x00\x04\xC3\xC3\xC3\xB8"
. "\x1c\x01\x5A\x00\x03\x1B\x25\x47";
$res = IPTC::Parse( $iptcData );
--
To view, visit https://gerrit.wikimedia.org/r/266542
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: If546c84a9449579cdea5af5b2a6b4b1e7203109e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Legoktm
Gerrit-Reviewer: Brian Wolff
Gerrit-Reviewer: BryanDavis
Gerrit-Reviewer: Legoktm
Gerrit-Reviewer: Reedy
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add mw-content-ltr|rtl to file redirect pages - change (mediawiki/core)
TheDJ has uploaded a new change for review.
https://gerrit.wikimedia.org/r/266582
Change subject: Add mw-content-ltr|rtl to file redirect pages
..
Add mw-content-ltr|rtl to file redirect pages
As a side effect, this also makes the redirect arrows visible on File
redirect pages, because their CSS depends on these classes.
Bug: T60955
Change-Id: I6b14c17a4b74ff5964ea61554aa3afb197d206bf
---
M includes/skins/SkinTemplate.php
1 file changed, 2 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/82/266582/1
diff --git a/includes/skins/SkinTemplate.php b/includes/skins/SkinTemplate.php
index 1328870..98f7666 100644
--- a/includes/skins/SkinTemplate.php
+++ b/includes/skins/SkinTemplate.php
@@ -433,7 +433,8 @@
# Add a mw-content-ltr/rtl class to be able to style based on
text direction
# when the content is different from the UI language, i.e.:
# not for special pages or file pages AND only when viewing
- if ( !in_array( $title->getNamespace(), array( NS_SPECIAL,
NS_FILE ) ) &&
+ if ( ( $this->getWikiPage() instanceof WikiFilePage || // File
namespace can also show redirects
+ $title->getNamespace() === NS_SPECIAL ) &&
Action::getActionName( $this ) === 'view' ) {
$pageLang = $title->getPageViewLanguage();
$realBodyAttribs['lang'] = $pageLang->getHtmlCode();
--
To view, visit https://gerrit.wikimedia.org/r/266582
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I6b14c17a4b74ff5964ea61554aa3afb197d206bf
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: TheDJ
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fixes for handling of {{{section}}} tag - change (mediawiki...SemanticForms)
jenkins-bot has submitted this change and it was merged.
Change subject: Fixes for handling of {{{section}}} tag
..
Fixes for handling of {{{section}}} tag
Change-Id: Id8b673f709c01c7031a088b0f00828dd7accd8c6
---
M includes/SF_FormPrinter.php
1 file changed, 18 insertions(+), 10 deletions(-)
Approvals:
Yaron Koren: Checked; Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/SF_FormPrinter.php b/includes/SF_FormPrinter.php
index 10ec236..25a8935 100644
--- a/includes/SF_FormPrinter.php
+++ b/includes/SF_FormPrinter.php
@@ -1082,8 +1082,15 @@
$existing_page_content
.= "\n";
}
- $section_start_loc = strpos(
$existing_page_content, $header_text );
- $existing_page_content =
str_replace( $header_text, '', $existing_page_content );
+ $equalsSigns = str_pad( '',
$page_section_in_form->getSectionLevel(), '=' );
+ $searchStr = '/^' .
$equalsSigns . '[ ]*?' . $section_name . '[ ]*?' . $equalsSigns . '$/m';
+ if ( preg_match( $searchStr,
$existing_page_content, $matches, PREG_OFFSET_CAPTURE ) ) {
+ $section_start_loc =
$matches[0][1];
+ $header_text =
$matches[0][0];
+ $existing_page_content
= str_replace( $header_text, '', $existing_page_content );
+ } else {
+ $section_start_loc = 0;
+ }
$section_end_loc = -1;
// get the position of the next
template or section defined in the form
@@ -1096,39 +1103,40 @@
$tag_components_next_section = SFUtils::getFormTagComponents(
$bracketed_string_next_section );
$tag_title_next_section
= trim( $tag_components_next_section[0] );
if (
$tag_title_next_section == 'section' ) {
- if (
preg_match( '/(^={1,6}' . $tag_components_next_section[1] . '?={1,6}\s*?$)/m',
$existing_page_content, $matches, PREG_OFFSET_CAPTURE ) ) {
+ if (
preg_match( '/(^={1,6}[ ]*?' . $tag_components_next_section[1] . '[
]*?={1,6}\s*?$)/m', $existing_page_content, $matches, PREG_OFFSET_CAPTURE ) ) {
$section_end_loc = $matches[0][1];
}
}
}
if ( $section_end_loc === -1 ) {
- $default_value =
$existing_page_content;
+ $section_text =
$existing_page_content;
$existing_page_content
= '';
} else {
- $default_value =
substr( $existing_page_content, $section_start_loc, $section_end_loc -
$section_start_loc );
+ $section_text = substr(
$existing_page_content, $section_start_loc, $section_end_loc -
$section_start_loc );
$existing_page_content
= substr( $existing_page_content, $section_end_loc );
}
}
- //if input is from the form
- $section_text = "";
+ // If input is from the form.
if ( ( ! $source_is_page ) &&
$wgRequest ) {
$text_per_section =
$wgRequest->getArray( '_section' );
$section_text =
$text_per_section[trim( $section_name )];
$wiki_page->addSection(
$section_name, $header_level, $section_text );
}
- //set input name for query string
+
[MediaWiki-commits] [Gerrit] releases: use ensure_resource, avoid duplicate defs - change (operations/puppet)
Dzahn has submitted this change and it was merged.
Change subject: releases: use ensure_resource, avoid duplicate defs
..
releases: use ensure_resource, avoid duplicate defs
Use ensure_resource to avoid duplicate definitions of /srv/org
etc, when multiple roles are applied on the same host and they
all ensure something in that path exists.
Change-Id: Iec98b66d1b1bb54d049d1bc471898dcd11055e0f
---
M modules/releases/manifests/init.pp
1 file changed, 4 insertions(+), 10 deletions(-)
Approvals:
jenkins-bot: Verified
Dzahn: Looks good to me, approved
diff --git a/modules/releases/manifests/init.pp
b/modules/releases/manifests/init.pp
index 8bdf605..50974b3 100644
--- a/modules/releases/manifests/init.pp
+++ b/modules/releases/manifests/init.pp
@@ -25,16 +25,10 @@
$sitename = undef,
$server_admin = 'n...@wikimedia.org',
) {
-file { [
-'/srv/org',
-'/srv/org/wikimedia/',
-'/srv/org/wikimedia/releases',
-]:
-ensure => directory,
-owner => 'root',
-group => 'root',
-mode => '0755',
-}
+
+ensure_resource('file', '/srv/org', {'ensure' => 'directory' })
+ensure_resource('file', '/srv/org/wikimedia', {'ensure' => 'directory' })
+ensure_resource('file', '/srv/org/wikimedia/releases', {'ensure' =>
'directory' })
include ::apache::mod::rewrite
include ::apache::mod::headers
--
To view, visit https://gerrit.wikimedia.org/r/266581
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iec98b66d1b1bb54d049d1bc471898dcd11055e0f
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn
Gerrit-Reviewer: Dzahn
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] releases: use ensure_resource, avoid duplicate defs - change (operations/puppet)
Dzahn has uploaded a new change for review.
https://gerrit.wikimedia.org/r/266581
Change subject: releases: use ensure_resource, avoid duplicate defs
..
releases: use ensure_resource, avoid duplicate defs
Use ensure_resource to avoid duplicate definitions of /srv/org
etc, when multiple roles are applied on the same host and they
all ensure something in that path exists.
Change-Id: Iec98b66d1b1bb54d049d1bc471898dcd11055e0f
---
M modules/releases/manifests/init.pp
1 file changed, 4 insertions(+), 10 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/81/266581/1
diff --git a/modules/releases/manifests/init.pp
b/modules/releases/manifests/init.pp
index 8bdf605..50974b3 100644
--- a/modules/releases/manifests/init.pp
+++ b/modules/releases/manifests/init.pp
@@ -25,16 +25,10 @@
$sitename = undef,
$server_admin = 'n...@wikimedia.org',
) {
-file { [
-'/srv/org',
-'/srv/org/wikimedia/',
-'/srv/org/wikimedia/releases',
-]:
-ensure => directory,
-owner => 'root',
-group => 'root',
-mode => '0755',
-}
+
+ensure_resource('file', '/srv/org', {'ensure' => 'directory' })
+ensure_resource('file', '/srv/org/wikimedia', {'ensure' => 'directory' })
+ensure_resource('file', '/srv/org/wikimedia/releases', {'ensure' =>
'directory' })
include ::apache::mod::rewrite
include ::apache::mod::headers
--
To view, visit https://gerrit.wikimedia.org/r/266581
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iec98b66d1b1bb54d049d1bc471898dcd11055e0f
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update country-specific financial number labels - change (mediawiki...DonationInterface)
Ejegg has uploaded a new change for review.
https://gerrit.wikimedia.org/r/266580
Change subject: Update country-specific financial number labels
..
Update country-specific financial number labels
AstroPay tells us that these are the correct ID numbers for
conducting financial transactions in Latin America
Bug: T124329
Change-Id: I5ee0884be8a7a1231a8fc6cce240133a28be3649
---
M gateway_common/i18n/interface/en.json
M gateway_common/i18n/interface/pt-br.json
M gateway_common/i18n/interface/pt.json
M gateway_common/i18n/interface/qqq.json
4 files changed, 13 insertions(+), 13 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/DonationInterface
refs/changes/80/266580/1
diff --git a/gateway_common/i18n/interface/en.json
b/gateway_common/i18n/interface/en.json
index c897005..141222e 100644
--- a/gateway_common/i18n/interface/en.json
+++ b/gateway_common/i18n/interface/en.json
@@ -157,14 +157,14 @@
"donate_interface-donor-submit": "Donate",
"donate_interface-donor-currency-msg": "This donation is being made in
$1",
"donate_interface-donor-fiscal_number": "Fiscal number",
- "donate_interface-donor-fiscal_number-ar": "CUIT",
+ "donate_interface-donor-fiscal_number-ar": "DNI",
"donate_interface-donor-fiscal_number-bo": "NIT",
- "donate_interface-donor-fiscal_number-br": "CPF",
+ "donate_interface-donor-fiscal_number-br": "CPF/CNPJ",
"donate_interface-donor-fiscal_number-cl": "RUT",
- "donate_interface-donor-fiscal_number-co": "NIT",
- "donate_interface-donor-fiscal_number-mx": "RFC",
- "donate_interface-donor-fiscal_number-pe": "RUC",
- "donate_interface-donor-fiscal_number-uy": "RUT",
+ "donate_interface-donor-fiscal_number-co": "CC",
+ "donate_interface-donor-fiscal_number-mx": "CURP/RFC/IFE",
+ "donate_interface-donor-fiscal_number-pe": "DNI",
+ "donate_interface-donor-fiscal_number-uy": "CI",
"donate_interface-card-name-amex": "American Express",
"donate_interface-card-name-visa": "Visa",
"donate_interface-card-name-mc": "MasterCard",
diff --git a/gateway_common/i18n/interface/pt-br.json
b/gateway_common/i18n/interface/pt-br.json
index db8a79c..d595eb3 100644
--- a/gateway_common/i18n/interface/pt-br.json
+++ b/gateway_common/i18n/interface/pt-br.json
@@ -167,7 +167,7 @@
"donate_interface-donor-submit": "Doar",
"donate_interface-donor-currency-msg": "Esta doação está se realizando
em $1",
"donate_interface-donor-fiscal_number": "Número fiscal",
- "donate_interface-donor-fiscal_number-br": "CPF",
+ "donate_interface-donor-fiscal_number-br": "CPF/CNPJ",
"donate_interface-card-name-amex": "American Express",
"donate_interface-card-name-visa": "Visa",
"donate_interface-card-name-mc": "Mastercard",
diff --git a/gateway_common/i18n/interface/pt.json
b/gateway_common/i18n/interface/pt.json
index ce4d00b..7920bfb 100644
--- a/gateway_common/i18n/interface/pt.json
+++ b/gateway_common/i18n/interface/pt.json
@@ -170,7 +170,7 @@
"donate_interface-donor-submit": "Fazer donativo",
"donate_interface-donor-currency-msg": "Este donativo está a ser feito
na divisa $1",
"donate_interface-donor-fiscal_number": "Número fiscal",
- "donate_interface-donor-fiscal_number-br": "CPF",
+ "donate_interface-donor-fiscal_number-br": "CPF/CNPJ",
"donate_interface-card-name-amex": "American Express",
"donate_interface-card-name-visa": "Visa",
"donate_interface-card-name-mc": "Mastercard",
diff --git a/gateway_common/i18n/interface/qqq.json
b/gateway_common/i18n/interface/qqq.json
index 7410d9a..06ca161 100644
--- a/gateway_common/i18n/interface/qqq.json
+++ b/gateway_common/i18n/interface/qqq.json
@@ -182,14 +182,14 @@
"donate_interface-donor-submit": "{{Identical|Donate}}",
"donate_interface-donor-currency-msg": "Parameters:\n* $1 - 3 letter
currency code. e.g. USD",
"donate_interface-donor-fiscal_number": "{{Identical|Fiscal
number}}\n\nGeneric term for the donor's tax identification number, known
variously as a VAT identification number, business number, etc.
Country-specific variants should be given a new message key with a hyphen and
the country code appended.",
- "donate_interface-donor-fiscal_number-ar": "Argentina-specific term for
the fiscal number or tax id. This is the CUIT (Código Único de Identificación
Tributaria) assigned by the Argentine government.",
+ "donate_interface-donor-fiscal_number-ar": "Argentina-specific term for
the fiscal number or tax id. This is the DNI (Documento Nacional de Identidad)
number assigned by the Argentine government.",
"donate_interface-donor-fiscal_number-bo": "Bolivia-specific term for
the fiscal number or tax id. This is the NIT (Número de Identificación
Tributaria) assigned
[MediaWiki-commits] [Gerrit] Fixes for handling of {{{section}}} tag - change (mediawiki...SemanticForms)
Yaron Koren has uploaded a new change for review.
https://gerrit.wikimedia.org/r/266579
Change subject: Fixes for handling of {{{section}}} tag
..
Fixes for handling of {{{section}}} tag
Change-Id: Id8b673f709c01c7031a088b0f00828dd7accd8c6
---
M includes/SF_FormPrinter.php
1 file changed, 18 insertions(+), 10 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/SemanticForms
refs/changes/79/266579/1
diff --git a/includes/SF_FormPrinter.php b/includes/SF_FormPrinter.php
index 10ec236..25a8935 100644
--- a/includes/SF_FormPrinter.php
+++ b/includes/SF_FormPrinter.php
@@ -1082,8 +1082,15 @@
$existing_page_content
.= "\n";
}
- $section_start_loc = strpos(
$existing_page_content, $header_text );
- $existing_page_content =
str_replace( $header_text, '', $existing_page_content );
+ $equalsSigns = str_pad( '',
$page_section_in_form->getSectionLevel(), '=' );
+ $searchStr = '/^' .
$equalsSigns . '[ ]*?' . $section_name . '[ ]*?' . $equalsSigns . '$/m';
+ if ( preg_match( $searchStr,
$existing_page_content, $matches, PREG_OFFSET_CAPTURE ) ) {
+ $section_start_loc =
$matches[0][1];
+ $header_text =
$matches[0][0];
+ $existing_page_content
= str_replace( $header_text, '', $existing_page_content );
+ } else {
+ $section_start_loc = 0;
+ }
$section_end_loc = -1;
// get the position of the next
template or section defined in the form
@@ -1096,39 +1103,40 @@
$tag_components_next_section = SFUtils::getFormTagComponents(
$bracketed_string_next_section );
$tag_title_next_section
= trim( $tag_components_next_section[0] );
if (
$tag_title_next_section == 'section' ) {
- if (
preg_match( '/(^={1,6}' . $tag_components_next_section[1] . '?={1,6}\s*?$)/m',
$existing_page_content, $matches, PREG_OFFSET_CAPTURE ) ) {
+ if (
preg_match( '/(^={1,6}[ ]*?' . $tag_components_next_section[1] . '[
]*?={1,6}\s*?$)/m', $existing_page_content, $matches, PREG_OFFSET_CAPTURE ) ) {
$section_end_loc = $matches[0][1];
}
}
}
if ( $section_end_loc === -1 ) {
- $default_value =
$existing_page_content;
+ $section_text =
$existing_page_content;
$existing_page_content
= '';
} else {
- $default_value =
substr( $existing_page_content, $section_start_loc, $section_end_loc -
$section_start_loc );
+ $section_text = substr(
$existing_page_content, $section_start_loc, $section_end_loc -
$section_start_loc );
$existing_page_content
= substr( $existing_page_content, $section_end_loc );
}
}
- //if input is from the form
- $section_text = "";
+ // If input is from the form.
if ( ( ! $source_is_page ) &&
$wgRequest ) {
$text_per_section =
$wgRequest->getArray( '_section' );
$section_text =
$text_per_section[trim( $section_name )];
$wiki_page->addSection(
$section_name, $header_level, $section_text );
}
- //s
[MediaWiki-commits] [Gerrit] Pass group_prefix to analytics-eqiad kafka jmxtrans - change (operations/puppet)
Ottomata has submitted this change and it was merged.
Change subject: Pass group_prefix to analytics-eqiad kafka jmxtrans
..
Pass group_prefix to analytics-eqiad kafka jmxtrans
Change-Id: I142fe4a03becbbfcd772f14670a0b6469fa89f68
---
M modules/role/manifests/kafka/analytics/broker.pp
1 file changed, 5 insertions(+), 4 deletions(-)
Approvals:
Ottomata: Verified; Looks good to me, approved
diff --git a/modules/role/manifests/kafka/analytics/broker.pp
b/modules/role/manifests/kafka/analytics/broker.pp
index 7089c7c..d8fc5f2 100644
--- a/modules/role/manifests/kafka/analytics/broker.pp
+++ b/modules/role/manifests/kafka/analytics/broker.pp
@@ -135,10 +135,11 @@
$group_prefix = "kafka.cluster.${cluster_name}."
}
class { '::kafka::server::jmxtrans':
-ganglia => hiera('ganglia_aggregators', undef),
-statsd => hiera('statsd', undef),
-jmx_port => $::role::kafka::analytics::config::jmx_port,
-require => Class['::kafka::server'],
+group_prefix => $group_prefix,
+ganglia => hiera('ganglia_aggregators', undef),
+statsd => hiera('statsd', undef),
+jmx_port => $::role::kafka::analytics::config::jmx_port,
+require => Class['::kafka::server'],
}
# Monitor kafka in production
--
To view, visit https://gerrit.wikimedia.org/r/266578
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I142fe4a03becbbfcd772f14670a0b6469fa89f68
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ottomata
Gerrit-Reviewer: Ottomata
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] bugzilla-static: ensure_resource to fix duplicates - change (operations/puppet)
Dzahn has submitted this change and it was merged.
Change subject: bugzilla-static: ensure_resource to fix duplicates
..
bugzilla-static: ensure_resource to fix duplicates
Use ensure_resource instead of regular file definition
to avoid duplicate declaration puppet errors when combining
multiple roles on one host that all want to ensure /srv/org/wikimedia.
Change-Id: Ib2683860d422ae0991618b979574892adc24607e
---
M modules/bugzilla_static/manifests/init.pp
1 file changed, 3 insertions(+), 6 deletions(-)
Approvals:
jenkins-bot: Verified
Dzahn: Looks good to me, approved
diff --git a/modules/bugzilla_static/manifests/init.pp
b/modules/bugzilla_static/manifests/init.pp
index 8a77038..efb45b7 100644
--- a/modules/bugzilla_static/manifests/init.pp
+++ b/modules/bugzilla_static/manifests/init.pp
@@ -2,12 +2,9 @@
# T85140
class bugzilla_static {
-file { [ '/srv/org', '/srv/org/wikimedia',
'/srv/org/wikimedia/static-bugzilla' ]:
-ensure => directory,
-owner => 'root',
-group => 'root',
-mode => '0755',
-}
+ensure_resource('file', '/srv/org', {'ensure' => 'directory' })
+ensure_resource('file', '/srv/org/wikimedia', {'ensure' => 'directory' })
+ensure_resource('file', '/srv/org/wikimedia/static-bugzilla', {'ensure' =>
'directory' })
file { '/srv/org/wikimedia/static-bugzilla/index.html':
ensure => present,
--
To view, visit https://gerrit.wikimedia.org/r/266546
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib2683860d422ae0991618b979574892adc24607e
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn
Gerrit-Reviewer: Dzahn
Gerrit-Reviewer: John F. Lewis
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Pass group_prefix to analytics-eqiad kafka jmxtrans - change (operations/puppet)
Ottomata has uploaded a new change for review.
https://gerrit.wikimedia.org/r/266578
Change subject: Pass group_prefix to analytics-eqiad kafka jmxtrans
..
Pass group_prefix to analytics-eqiad kafka jmxtrans
Change-Id: I142fe4a03becbbfcd772f14670a0b6469fa89f68
---
M modules/role/manifests/kafka/analytics/broker.pp
1 file changed, 5 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/78/266578/1
diff --git a/modules/role/manifests/kafka/analytics/broker.pp
b/modules/role/manifests/kafka/analytics/broker.pp
index 7089c7c..d8fc5f2 100644
--- a/modules/role/manifests/kafka/analytics/broker.pp
+++ b/modules/role/manifests/kafka/analytics/broker.pp
@@ -135,10 +135,11 @@
$group_prefix = "kafka.cluster.${cluster_name}."
}
class { '::kafka::server::jmxtrans':
-ganglia => hiera('ganglia_aggregators', undef),
-statsd => hiera('statsd', undef),
-jmx_port => $::role::kafka::analytics::config::jmx_port,
-require => Class['::kafka::server'],
+group_prefix => $group_prefix,
+ganglia => hiera('ganglia_aggregators', undef),
+statsd => hiera('statsd', undef),
+jmx_port => $::role::kafka::analytics::config::jmx_port,
+require => Class['::kafka::server'],
}
# Monitor kafka in production
--
To view, visit https://gerrit.wikimedia.org/r/266578
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I142fe4a03becbbfcd772f14670a0b6469fa89f68
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ottomata
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add ITitle interface - change (mediawiki/core)
Addshore has uploaded a new change for review.
https://gerrit.wikimedia.org/r/266577
Change subject: Add ITitle interface
..
Add ITitle interface
To be used by things that do not care if they are
passed a Title or TitleValue so long as it has a
dbkey, namespace and possible fragment.
Change-Id: I2aa1a82129bb01155924a8e6a403c7a47391432f
---
M autoload.php
M includes/Title.php
A includes/title/ITitle.php
M includes/title/TitleValue.php
4 files changed, 34 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/77/266577/1
diff --git a/autoload.php b/autoload.php
index 24a4d72..0f1507e 100644
--- a/autoload.php
+++ b/autoload.php
@@ -560,6 +560,7 @@
'IPSet' => __DIR__ . '/includes/compat/IPSetCompat.php',
'IPTC' => __DIR__ . '/includes/media/IPTC.php',
'IRCColourfulRCFeedFormatter' => __DIR__ .
'/includes/rcfeed/IRCColourfulRCFeedFormatter.php',
+ 'ITitle' => __DIR__ . '/includes/title/ITitle.php',
'IcuCollation' => __DIR__ . '/includes/Collation.php',
'IdentityCollation' => __DIR__ . '/includes/Collation.php',
'ImageBuilder' => __DIR__ . '/maintenance/rebuildImages.php',
diff --git a/includes/Title.php b/includes/Title.php
index e549037..e21f7b8 100644
--- a/includes/Title.php
+++ b/includes/Title.php
@@ -30,7 +30,7 @@
* @note Consider using a TitleValue object instead. TitleValue is more
lightweight
* and does not rely on global state or the database.
*/
-class Title {
+class Title implements ITitle{
/** @var HashBagOStuff */
static private $titleCache = null;
diff --git a/includes/title/ITitle.php b/includes/title/ITitle.php
new file mode 100644
index 000..d458a53
--- /dev/null
+++ b/includes/title/ITitle.php
@@ -0,0 +1,31 @@
+https://www.mediawiki.org/wiki/Requests_for_comment/TitleValue
* @since 1.23
*/
-class TitleValue {
+class TitleValue implements ITitle{
/**
* @var int
*/
--
To view, visit https://gerrit.wikimedia.org/r/266577
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I2aa1a82129bb01155924a8e6a403c7a47391432f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Addshore
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Revert "Allow undefined labels for label service" - change (wikidata...rdf)
jenkins-bot has submitted this change and it was merged.
Change subject: Revert "Allow undefined labels for label service"
..
Revert "Allow undefined labels for label service"
This reverts commit 43456fc2d669b635d7829fbf68ba7c645f16f8f0.
Causes unmaterialized exceptions, see details in the bug
Bug: T113374
Change-Id: I1a63e4d7dc7423918b11bb05a33809115f6941f4
---
M
blazegraph/src/main/java/org/wikidata/query/rdf/blazegraph/label/LabelService.java
M
blazegraph/src/test/java/org/wikidata/query/rdf/blazegraph/label/LabelServiceUnitTest.java
2 files changed, 12 insertions(+), 12 deletions(-)
Approvals:
Smalyshev: Looks good to me, approved
jenkins-bot: Verified
diff --git
a/blazegraph/src/main/java/org/wikidata/query/rdf/blazegraph/label/LabelService.java
b/blazegraph/src/main/java/org/wikidata/query/rdf/blazegraph/label/LabelService.java
index 146ec53..b8018f3 100644
---
a/blazegraph/src/main/java/org/wikidata/query/rdf/blazegraph/label/LabelService.java
+++
b/blazegraph/src/main/java/org/wikidata/query/rdf/blazegraph/label/LabelService.java
@@ -397,9 +397,6 @@
public void resolve(Resolution resolution) {
resolvedSubject = resolveToIvOrError(resolution.subject(),
"subject");
resolvedLabelType = resolveToIvOrError(resolution.labelType(),
"label type");
-if (resolvedSubject == null || resolvedLabelType == null) {
-return;
-}
// TODO this is one at a time - maybe a batch things?
fillBestLabels();
IV label = pickOrBuildBestLabel();
@@ -499,10 +496,9 @@
private IV resolveToIvOrError(IValueExpression expression, String
nameOfExpression) {
Object resolved = expression.get(binding);
if (resolved == null) {
-return null;
-//throw new RuntimeException(String.format(Locale.ROOT,
-//"Refusing to lookup labels for unknown %s (%s).
That'd be way way way inefficient.",
-//nameOfExpression, expression));
+throw new RuntimeException(String.format(Locale.ROOT,
+"Refusing to lookup labels for unknown %s (%s). That'd
be way way way inefficient.",
+nameOfExpression, expression));
}
try {
return (IV) resolved;
diff --git
a/blazegraph/src/test/java/org/wikidata/query/rdf/blazegraph/label/LabelServiceUnitTest.java
b/blazegraph/src/test/java/org/wikidata/query/rdf/blazegraph/label/LabelServiceUnitTest.java
index 32f846d..b8da2f7 100644
---
a/blazegraph/src/test/java/org/wikidata/query/rdf/blazegraph/label/LabelServiceUnitTest.java
+++
b/blazegraph/src/test/java/org/wikidata/query/rdf/blazegraph/label/LabelServiceUnitTest.java
@@ -4,7 +4,6 @@
import static org.hamcrest.Matchers.containsString;
import static org.wikidata.query.rdf.test.Matchers.assertResult;
import static org.wikidata.query.rdf.test.Matchers.binds;
-import static org.wikidata.query.rdf.test.Matchers.notBinds;
import java.util.Locale;
@@ -59,10 +58,15 @@
}
@Test
-public void labelOverUnboundSubject() throws QueryEvaluationException {
-TupleQueryResult result = lookupLabel(null, "en", "?s", "rdfs:label");
-assertThat(result.next(), notBinds("sLabel"));
-assertFalse(result.hasNext());
+public void labelOverUnboundSubjectIsError() {
+try {
+lookupLabel(null, "en", "?s", "rdfs:label").next();
+fail();
+} catch (QueryEvaluationException e) {
+assertThat(
+e.getMessage(),
+containsString("Refusing to lookup labels for unknown
subject (s). That'd be way way way inefficient."));
+}
}
@Test
--
To view, visit https://gerrit.wikimedia.org/r/266563
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I1a63e4d7dc7423918b11bb05a33809115f6941f4
Gerrit-PatchSet: 1
Gerrit-Project: wikidata/query/rdf
Gerrit-Branch: master
Gerrit-Owner: Smalyshev
Gerrit-Reviewer: Smalyshev
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Release 1.2.0 - change (mediawiki...QuickSurveys)
Bmansurov has uploaded a new change for review.
https://gerrit.wikimedia.org/r/266576
Change subject: Release 1.2.0
..
Release 1.2.0
Change-Id: Ie60f271b80ce3aec23f7382189eccdc376ff
---
M HISTORY
M extension.json
2 files changed, 6 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/QuickSurveys
refs/changes/76/266576/1
diff --git a/HISTORY b/HISTORY
index 62bf7a5..2d939eb 100644
--- a/HISTORY
+++ b/HISTORY
@@ -1,3 +1,8 @@
+==QuickSurveys 1.2.0==
+6eeffdb Fix the failing QUnit tests
+c25869c Add support for logging to Schema:QuickSurveyInitiation
+0960344 Update Schema:QuickSurveysResponses fields
+4233c71 Make the master branch default
==QuickSurveys 1.1.2==
417f059 Fix the failing QUnit tests
==QuickSurveys 1.1.1==
diff --git a/extension.json b/extension.json
index 943dfd0..0cbead6 100644
--- a/extension.json
+++ b/extension.json
@@ -1,6 +1,6 @@
{
"name": "QuickSurveys",
- "version": "1.1.2",
+ "version": "1.2.0",
"author": [
"Bahodir Mansurov",
"Joaquin Hernandez",
--
To view, visit https://gerrit.wikimedia.org/r/266576
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie60f271b80ce3aec23f7382189eccdc376ff
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/QuickSurveys
Gerrit-Branch: master
Gerrit-Owner: Bmansurov
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] End kafka group_prefix propertly with . - change (operations/puppet)
Ottomata has uploaded a new change for review.
https://gerrit.wikimedia.org/r/266575
Change subject: End kafka group_prefix propertly with .
..
End kafka group_prefix propertly with .
Change-Id: Ia4ee709894b4940ea73d670705b9ffc540dab554
---
M modules/role/manifests/kafka/analytics/broker.pp
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/75/266575/1
diff --git a/modules/role/manifests/kafka/analytics/broker.pp
b/modules/role/manifests/kafka/analytics/broker.pp
index 81e60e1..7089c7c 100644
--- a/modules/role/manifests/kafka/analytics/broker.pp
+++ b/modules/role/manifests/kafka/analytics/broker.pp
@@ -129,7 +129,7 @@
# This cluster was named 'eqiad'. For the metrics, let's display
# a 'logical' cluster name of analytics-eqiad.
if ($::realm == 'production' and $::site == 'eqiad') {
-$group_prefix = 'kafka.cluster.analytics-eqiad'
+$group_prefix = 'kafka.cluster.analytics-eqiad.'
}
else {
$group_prefix = "kafka.cluster.${cluster_name}."
--
To view, visit https://gerrit.wikimedia.org/r/266575
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia4ee709894b4940ea73d670705b9ffc540dab554
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ottomata
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] End kafka group_prefix propertly with . - change (operations/puppet)
Ottomata has submitted this change and it was merged.
Change subject: End kafka group_prefix propertly with .
..
End kafka group_prefix propertly with .
Change-Id: Ia4ee709894b4940ea73d670705b9ffc540dab554
---
M modules/role/manifests/kafka/analytics/broker.pp
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Ottomata: Verified; Looks good to me, approved
diff --git a/modules/role/manifests/kafka/analytics/broker.pp
b/modules/role/manifests/kafka/analytics/broker.pp
index 81e60e1..7089c7c 100644
--- a/modules/role/manifests/kafka/analytics/broker.pp
+++ b/modules/role/manifests/kafka/analytics/broker.pp
@@ -129,7 +129,7 @@
# This cluster was named 'eqiad'. For the metrics, let's display
# a 'logical' cluster name of analytics-eqiad.
if ($::realm == 'production' and $::site == 'eqiad') {
-$group_prefix = 'kafka.cluster.analytics-eqiad'
+$group_prefix = 'kafka.cluster.analytics-eqiad.'
}
else {
$group_prefix = "kafka.cluster.${cluster_name}."
--
To view, visit https://gerrit.wikimedia.org/r/266575
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia4ee709894b4940ea73d670705b9ffc540dab554
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ottomata
Gerrit-Reviewer: Ottomata
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] WIP: enable mhchem - change (mediawiki...mathoid)
Physikerwelt has uploaded a new change for review.
https://gerrit.wikimedia.org/r/266574
Change subject: WIP: enable mhchem
..
WIP: enable mhchem
Change-Id: Ie2a209ddf064c1453e652c07ee18b7c594d082d4
---
M config.dev.yaml
M package.json
M routes/mathoid.js
3 files changed, 11 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/mathoid
refs/changes/74/266574/1
diff --git a/config.dev.yaml b/config.dev.yaml
index 5942320..b9dddb7 100644
--- a/config.dev.yaml
+++ b/config.dev.yaml
@@ -64,3 +64,4 @@
speech: true #new feature
texvcinfo: true
speechOn: true
+ chem: true
diff --git a/package.json b/package.json
index 981991e..abaa0b5 100644
--- a/package.json
+++ b/package.json
@@ -46,8 +46,8 @@
"js-yaml": "^3.4.3",
"preq": "^0.4.4",
"service-runner": "^0.3.5",
-"mathoid-mathjax-node": "0.4.4",
-"texvcinfo": "^0.3.3"
+"mathoid-mathjax-node":
"git+https://github.com/physikerwelt/MathJax-node#mhchem";,
+"texvcinfo": "git+https://github.com/physikerwelt/texvcinfo#mhchem";
},
"devDependencies": {
"extend": "^3.0.0",
diff --git a/routes/mathoid.js b/routes/mathoid.js
index 9941f32..803c0cd 100644
--- a/routes/mathoid.js
+++ b/routes/mathoid.js
@@ -57,9 +57,13 @@
var png = app.conf.png && /^png|json|complete$/.test(outFormat);
var img = app.conf.img && /^json|complete$/.test(outFormat);
var speech = (outFormat !== "png") && features.speech || outFormat ===
"speech";
+var chem = app.conf.chem && (type === "chem");
+if (chem) {
+type = "inline-TeX";
+}
if (type === "TeX" || type === "inline-TeX") {
-var feedback = texvcInfo.feedback(q);
+var feedback = texvcInfo.feedback(q,chem);
// XXX properly handle errors here!
if (feedback.success) {
sanitizedTex = feedback.checked || '';
@@ -164,6 +168,9 @@
case "asciimath":
type = "AsciiMath";
break;
+case "chem":
+type = "chem";
+break;
default :
emitError("Input format \"" + type + "\" is not recognized!");
}
--
To view, visit https://gerrit.wikimedia.org/r/266574
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie2a209ddf064c1453e652c07ee18b7c594d082d4
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/mathoid
Gerrit-Branch: master
Gerrit-Owner: Physikerwelt
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Merge remote-tracking branch 'origin/dev' - change (mediawiki...QuickSurveys)
Bmansurov has uploaded a new change for review. https://gerrit.wikimedia.org/r/266573 Change subject: Merge remote-tracking branch 'origin/dev' .. Merge remote-tracking branch 'origin/dev' Change-Id: I2ff90dda8792c2debf466dfa8af2af28a1ceb092 --- 0 files changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/QuickSurveys refs/changes/73/266573/1 -- To view, visit https://gerrit.wikimedia.org/r/266573 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I2ff90dda8792c2debf466dfa8af2af28a1ceb092 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/QuickSurveys Gerrit-Branch: master Gerrit-Owner: Bmansurov ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] WIP Move counting of watchers to WatchedItemStore - change (mediawiki/core)
Addshore has uploaded a new change for review.
https://gerrit.wikimedia.org/r/266572
Change subject: WIP Move counting of watchers to WatchedItemStore
..
WIP Move counting of watchers to WatchedItemStore
Also adds tests
Still not sure if this will stick hence WIP
Change-Id: I5a465773599cce9f8c9e94847cede6d12282c827
---
M includes/WatchedItem.php
M includes/WatchedItemStore.php
M includes/actions/InfoAction.php
M includes/api/ApiQueryInfo.php
M tests/phpunit/includes/WatchedItemStoreTest.php
5 files changed, 170 insertions(+), 41 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/72/266572/1
diff --git a/includes/WatchedItem.php b/includes/WatchedItem.php
index 1754f09..09df404 100644
--- a/includes/WatchedItem.php
+++ b/includes/WatchedItem.php
@@ -409,7 +409,7 @@
* @deprecated since 1.27. Use WatchedItemStore::duplicateEntries
*/
public static function duplicateEntries( $oldTitle, $newTitle ) {
- $store = new WatchedItemStore( wfGetDB( DB_MASTER ) );
+ $store = WatchedItemStore::newFromGlobalState();
$store->duplicateEntries( $oldTitle->getTitleValue(),
$newTitle->getTitleValue() );
}
diff --git a/includes/WatchedItemStore.php b/includes/WatchedItemStore.php
index 52110e4..c41b6ee 100644
--- a/includes/WatchedItemStore.php
+++ b/includes/WatchedItemStore.php
@@ -12,8 +12,81 @@
*/
private $masterDb;
- public function __construct( IDatabase $masterDb ) {
+ /**
+* @var IDatabase
+*/
+ private $slaveDb;
+
+ /**
+* @var Config
+*/
+ private $config;
+
+ public function __construct( IDatabase $masterDb, IDatabase $slaveDb,
Config $config ) {
$this->masterDb = $masterDb;
+ $this->slaveDb = $slaveDb;
+ $this->config = $config;
+ }
+
+ public static function newFromGlobalState() {
+ return new self(
+ wfGetDB( DB_MASTER, 'watchlist' ),
+ wfGetDB( DB_SLAVE, 'watchlist' ),
+ RequestContext::getMain()->getConfig()
+ );
+ }
+
+ /**
+* @param TitleValue $titleValue
+*
+* @return int
+*/
+ public function countWatchers( TitleValue $titleValue ) {
+ return (int)$this->slaveDb->selectField(
+ 'watchlist',
+ 'COUNT(*)',
+ array(
+ 'wl_namespace' => $titleValue->getNamespace(),
+ 'wl_title' => $titleValue->getDBkey(),
+ ),
+ __METHOD__
+ );
+ }
+
+ /**
+* @param TitleValue[]|Title[] $titleValues
+* @param bool $unwatchedPages show unwatched pages obeying
UnwatchedPageThreshold setting
+*
+* @return array multi dimensional like
$return[$namespaceId][$titleString] = $watchers
+*/
+ public function countWatchersMultiple( array $titleValues,
$unwatchedPages = false ) {
+ $unwatchedPageThreshold = $this->config->get(
'UnwatchedPageThreshold' );
+
+ if ( !$unwatchedPages && !is_int( $unwatchedPageThreshold ) ) {
+ // TODO throw exception?
+ return array();
+ }
+
+ $options = array( 'GROUP BY' => array( 'wl_namespace',
'wl_title' ) );
+ if ( !$unwatchedPages ) {
+ $options['HAVING'] = "COUNT(*) >=
$unwatchedPageThreshold";
+ }
+
+ $lb = new LinkBatch( $titleValues );
+ $res = $this->slaveDb->select(
+ 'watchlist',
+ array( 'wl_title', 'wl_namespace', 'count' =>
'COUNT(*)' ),
+ array( $lb->constructSet( 'wl', $this->slaveDb ) ),
+ __METHOD__,
+ $options
+ );
+
+ $watchCounts = array();
+ foreach ( $res as $row ) {
+ $watchCounts[$row->wl_namespace][$row->wl_title] =
(int)$row->count;
+ }
+
+ return $watchCounts;
}
/**
diff --git a/includes/actions/InfoAction.php b/includes/actions/InfoAction.php
index 6f33db7..b2ac800 100644
--- a/includes/actions/InfoAction.php
+++ b/includes/actions/InfoAction.php
@@ -670,6 +670,7 @@
86400 * 7,
function ( $oldValue, &$ttl, &$setOpts ) use ( $page,
$config, $fname ) {
$title = $page->getTitle();
+ $titleValue = $title->getTitleValue();
$id = $title->getArticleID();
$dbr = wfGetDB( DB_SLAVE );
@@ -678,
[MediaWiki-commits] [Gerrit] Remove extra group_prefix assignment - change (operations/puppet)
Ottomata has submitted this change and it was merged.
Change subject: Remove extra group_prefix assignment
..
Remove extra group_prefix assignment
Change-Id: Id8b0c605dc94d0bfd760c6a535210a9b43968915
---
M modules/role/manifests/kafka/analytics/broker.pp
1 file changed, 0 insertions(+), 1 deletion(-)
Approvals:
Ottomata: Verified; Looks good to me, approved
diff --git a/modules/role/manifests/kafka/analytics/broker.pp
b/modules/role/manifests/kafka/analytics/broker.pp
index 628af7b..81e60e1 100644
--- a/modules/role/manifests/kafka/analytics/broker.pp
+++ b/modules/role/manifests/kafka/analytics/broker.pp
@@ -134,7 +134,6 @@
else {
$group_prefix = "kafka.cluster.${cluster_name}."
}
-$group_prefix = "kafka.cluster.${cluster_name}."
class { '::kafka::server::jmxtrans':
ganglia => hiera('ganglia_aggregators', undef),
statsd => hiera('statsd', undef),
--
To view, visit https://gerrit.wikimedia.org/r/266571
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Id8b0c605dc94d0bfd760c6a535210a9b43968915
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ottomata
Gerrit-Reviewer: Ottomata
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove extra group_prefix assignment - change (operations/puppet)
Ottomata has uploaded a new change for review.
https://gerrit.wikimedia.org/r/266571
Change subject: Remove extra group_prefix assignment
..
Remove extra group_prefix assignment
Change-Id: Id8b0c605dc94d0bfd760c6a535210a9b43968915
---
M modules/role/manifests/kafka/analytics/broker.pp
1 file changed, 0 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/71/266571/1
diff --git a/modules/role/manifests/kafka/analytics/broker.pp
b/modules/role/manifests/kafka/analytics/broker.pp
index 628af7b..81e60e1 100644
--- a/modules/role/manifests/kafka/analytics/broker.pp
+++ b/modules/role/manifests/kafka/analytics/broker.pp
@@ -134,7 +134,6 @@
else {
$group_prefix = "kafka.cluster.${cluster_name}."
}
-$group_prefix = "kafka.cluster.${cluster_name}."
class { '::kafka::server::jmxtrans':
ganglia => hiera('ganglia_aggregators', undef),
statsd => hiera('statsd', undef),
--
To view, visit https://gerrit.wikimedia.org/r/266571
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Id8b0c605dc94d0bfd760c6a535210a9b43968915
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ottomata
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Make all kafka broker metrics prefixed with kafka.cluster.$c... - change (operations/puppet)
Ottomata has submitted this change and it was merged.
Change subject: Make all kafka broker metrics prefixed with
kafka.cluster.$cluster_name
..
Make all kafka broker metrics prefixed with kafka.cluster.$cluster_name
Bug: T121643
Change-Id: I9cac3f83a2c79dc895dcbed81b689144bc73c6da
---
M modules/role/manifests/graphite/alerts.pp
M modules/role/manifests/kafka/analytics/broker.pp
M modules/role/manifests/kafka/main/broker.pp
3 files changed, 15 insertions(+), 13 deletions(-)
Approvals:
Ottomata: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/role/manifests/graphite/alerts.pp
b/modules/role/manifests/graphite/alerts.pp
index 0365f98..e5e904d 100644
--- a/modules/role/manifests/graphite/alerts.pp
+++ b/modules/role/manifests/graphite/alerts.pp
@@ -20,9 +20,9 @@
swift::monitoring::graphite_alerts { 'codfw-prod': }
# Use graphite's anomaly detection support.
-monitoring::graphite_anomaly { 'kafka-broker-MessagesIn-anomaly':
-description => 'Kafka Broker Messages In Per Second',
-metric =>
'sumSeries(kafka.*.kafka.server.BrokerTopicMetrics-AllTopics.MessagesInPerSec.OneMinuteRate)',
+monitoring::graphite_anomaly {
'kafka-analytics-eqiad-broker-MessagesIn-anomaly':
+description => 'Kafka Cluster analytics-eqiad Broker Messages In Per
Second',
+metric =>
'sumSeries(kafka.cluster.analytics-eqiad.kafka.*.kafka.server.BrokerTopicMetrics-AllTopics.MessagesInPerSec.OneMinuteRate)',
# check over the 60 data points (an hour?) and:
# - alert warn if more than 30 are under the confidence band
# - alert critical if more than 45 are under the confidecne band
diff --git a/modules/role/manifests/kafka/analytics/broker.pp
b/modules/role/manifests/kafka/analytics/broker.pp
index ac187e7..628af7b 100644
--- a/modules/role/manifests/kafka/analytics/broker.pp
+++ b/modules/role/manifests/kafka/analytics/broker.pp
@@ -125,16 +125,17 @@
srange => '$ALL_NETWORKS',
}
-# Include Kafka Server Jmxtrans class
-# to send Kafka Broker metrics to Ganglia and statsd.
+# Historically there was only one kafka cluster in eqiad.
+# This cluster was named 'eqiad'. For the metrics, let's display
+# a 'logical' cluster name of analytics-eqiad.
+if ($::realm == 'production' and $::site == 'eqiad') {
+$group_prefix = 'kafka.cluster.analytics-eqiad'
+}
+else {
+$group_prefix = "kafka.cluster.${cluster_name}."
+}
+$group_prefix = "kafka.cluster.${cluster_name}."
class { '::kafka::server::jmxtrans':
-# TODO: move metrics under this prefix.
-# Historically there was only one kafka cluster, so
-# all kafka metrics were under that. We should change this.
-# Q: Should we make metrics for analytics-eqiad show as
-# kafka.analytics-eqiad, even if the real cluster name is
-# 'eqiad' for historical reasons?
-# group_prefix => "kafka.${cluster_name}.",
ganglia => hiera('ganglia_aggregators', undef),
statsd => hiera('statsd', undef),
jmx_port => $::role::kafka::analytics::config::jmx_port,
@@ -146,6 +147,7 @@
class { '::kafka::server::monitoring':
jmx_port=> $::role::kafka::analytics::config::jmx_port,
nagios_servicegroup => "analytics_${::site}",
+group_prefix=> $group_prefix,
}
}
}
\ No newline at end of file
diff --git a/modules/role/manifests/kafka/main/broker.pp
b/modules/role/manifests/kafka/main/broker.pp
index 38a5641..2582aa4 100644
--- a/modules/role/manifests/kafka/main/broker.pp
+++ b/modules/role/manifests/kafka/main/broker.pp
@@ -75,7 +75,7 @@
# Include Kafka Server Jmxtrans class
# to send Kafka Broker metrics to Ganglia and statsd.
-$group_prefix = "kafka.${cluster_name}."
+$group_prefix = "kafka.cluster.${cluster_name}."
class { '::kafka::server::jmxtrans':
group_prefix => $group_prefix,
ganglia => hiera('ganglia_aggregators', undef),
--
To view, visit https://gerrit.wikimedia.org/r/266568
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I9cac3f83a2c79dc895dcbed81b689144bc73c6da
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ottomata
Gerrit-Reviewer: Ottomata
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Tag v0.15.1 - change (oojs/ui)
Jforrester has uploaded a new change for review.
https://gerrit.wikimedia.org/r/266570
Change subject: Tag v0.15.1
..
Tag v0.15.1
Change-Id: I7ca29eb9b64b3b6a5ee7e83c5cd1088e04904e7d
---
M History.md
M package.json
2 files changed, 41 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/70/266570/1
diff --git a/History.md b/History.md
index 26f5906..44c2c61 100644
--- a/History.md
+++ b/History.md
@@ -1,5 +1,45 @@
# OOjs UI Release History
+## v0.15.1 / 2016-01-26
+
+### Features
+* Really filter out unsafe URLs, but don't throw silly exceptions (Bartosz
Dziewoński)
+* ClippableElement: Try to prevent unnecessary scrollbars (Bartosz Dziewoński)
+* Dialog: Don't set `overflow:hidden;` on `.oo-ui-window-body` elements (Alex
Monk)
+* TextInputWidget: Don't fail if 'validate' function returns null (Bartosz
Dziewoński)
+
+### Styles
+* WindowManager: Only apply `top: 1em; bottom: 1em;` to non-fullscreen windows
(Bartosz Dziewoński)
+* Align mixin whitespace to CSS/Less coding guidelines (Volker E)
+* Enable `cursor: pointer` just on enabled widgets (Volker E)
+* Apex, MediaWiki themes: Fix size of templateAdd icon (Ed Sanders)
+* Apex, MediaWiki themes: Quotes icon fixes (Ed Sanders)
+* Apex, MediaWiki themes: Re-crush SVGs, removing useless ID values and empty
groups (James D. Forrester)
+* Apex theme: Fix FieldLayout padding in inline mode (Ed Sanders)
+* Apex theme: NumberInputWidget: Fix width of +/- buttons (Ed Sanders)
+* MediaWiki theme: Add invert variant to 'accessibility' icon pack icons
(Bartosz Dziewoński)
+* MediaWiki theme: Align `@input-*` vars to coding guidelines (Volker E)
+* MediaWiki theme: Align `rgba()` values to CSS/Less guidelines (Volker E)
+* MediaWiki theme: Align size variables to CSS/Less guidelines (Volker E)
+* MediaWiki theme: Consolidate emphasized color values into variable (Volker E)
+* MediaWiki theme: Establish new `@border-default` variable (Volker E)
+* MediaWiki theme: Make icon variants actually work for all icons (Bartosz
Dziewoński)
+* MediaWiki theme: Make transition of text input fields smoother (Volker E)
+* MediaWiki theme: Merge `@oo-ui-toolbar-bar-text` & `@color-default` vars
(Volker E)
+* MediaWiki theme: Replace fixed & consolidate disabled values with vars
(Volker E)
+* MediaWiki theme: Update avatar icon (Pau Giner)
+
+### Code
+* NumberInputWidget: Replace `box-sizing` property with mixin as anywhere else
(Volker E)
+* SelectFileWidget: Order name and type spans in the order they are shown
(Prateek Saxena)
+* TextInputWidget: Simplify `#getValidity` (Bartosz Dziewoński)
+* README: Add a 'Contributing' section (James D. Forrester)
+* build: Don't generate .min.js and .min.css files by default (Bartosz
Dziewoński)
+* build: Only build one graphics distribution (mixed/vector/raster), not all
(Bartosz Dziewoński)
+* build: Update jakub-onderka/php-parallel-lint to 0.9.2 (Paladox)
+* build: Update mediawiki/mediawiki-codesniffer to 0.5.1 (Paladox)
+* demo: Extend compounded form in widget.js demo (Volker E)
+
## v0.15.0 / 2016-01-12
### Breaking changes
diff --git a/package.json b/package.json
index cfd91d5..fd89e55 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "oojs-ui",
- "version": "0.15.0",
+ "version": "0.15.1",
"description": "User interface classes built on the OOjs framework.",
"keywords": [
"oojs-plugin",
--
To view, visit https://gerrit.wikimedia.org/r/266570
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I7ca29eb9b64b3b6a5ee7e83c5cd1088e04904e7d
Gerrit-PatchSet: 1
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: Jforrester
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Simplify maintenance script - change (mediawiki...Gather)
Aaron Schulz has uploaded a new change for review.
https://gerrit.wikimedia.org/r/266569
Change subject: Simplify maintenance script
..
Simplify maintenance script
Change-Id: Ie6397da95a3541885c0cacebb4cab95afeea6c54
---
M maintenance/updateCounts.php
1 file changed, 13 insertions(+), 19 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Gather
refs/changes/69/266569/1
diff --git a/maintenance/updateCounts.php b/maintenance/updateCounts.php
index 1ceecb0..827d28a 100644
--- a/maintenance/updateCounts.php
+++ b/maintenance/updateCounts.php
@@ -40,8 +40,9 @@
// This locks the list record. All operations which can
add/remove list items (apart
// from full list deletion) lock the record as well, so
there cannot be race conditions.
- $res = $dbw->select( 'gather_list',
- array( 'gl_id' ),
+ $ids = $dbw->selectFieldValues(
+ 'gather_list',
+ 'gl_id',
array( 'gl_id > ' . $maxGlId ),
__METHOD__,
array(
@@ -51,26 +52,19 @@
)
);
- $ids = array();
- foreach ( $res as $row ) {
- $ids[] = $row->gl_id;
+ if ( $ids ) {
+ $dbw->update(
+ 'gather_list',
+ array( 'gl_item_count = ' .
+ '(SELECT COUNT(*) FROM
gather_list_item WHERE gli_gl_id = gl_id)' ),
+ array( 'gl_id' => $ids ),
+ __METHOD__
+ );
+ $maxGlId = max( $ids );
}
-
- if ( !$ids ) {
- $this->rollbackTransaction( $dbw, __METHOD__ );
- continue;
- }
-
- $dbw->update( 'gather_list',
- array( 'gl_item_count = (SELECT COUNT(*) FROM
gather_list_item WHERE gli_gl_id = gl_id)' ),
- array( 'gl_id' => $ids ),
- __METHOD__ );
$this->commitTransaction( $dbw, __METHOD__ );
- $maxGlId = max( $ids );
-
- wfWaitForSlaves();
- } while ( $res->numRows() );
+ } while ( $ids );
}
}
--
To view, visit https://gerrit.wikimedia.org/r/266569
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie6397da95a3541885c0cacebb4cab95afeea6c54
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Gather
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Make all kafka broker metrics prefixed with kafka.cluster.$c... - change (operations/puppet)
Ottomata has uploaded a new change for review.
https://gerrit.wikimedia.org/r/266568
Change subject: Make all kafka broker metrics prefixed with
kafka.cluster.$cluster_name
..
Make all kafka broker metrics prefixed with kafka.cluster.$cluster_name
Bug: T121643
Change-Id: I9cac3f83a2c79dc895dcbed81b689144bc73c6da
---
M modules/role/manifests/kafka/analytics/broker.pp
M modules/role/manifests/kafka/main/broker.pp
2 files changed, 20 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/68/266568/1
diff --git a/modules/role/manifests/kafka/analytics/broker.pp
b/modules/role/manifests/kafka/analytics/broker.pp
index ac187e7..c93e21e 100644
--- a/modules/role/manifests/kafka/analytics/broker.pp
+++ b/modules/role/manifests/kafka/analytics/broker.pp
@@ -127,6 +127,8 @@
# Include Kafka Server Jmxtrans class
# to send Kafka Broker metrics to Ganglia and statsd.
+# NOTE: This will be removed in favor of the below
+# jmxtrans use once icinga alerts are ported over to use this.
class { '::kafka::server::jmxtrans':
# TODO: move metrics under this prefix.
# Historically there was only one kafka cluster, so
@@ -141,6 +143,23 @@
require => Class['::kafka::server'],
}
+# Historically there was only one kafka cluster in eqiad.
+# This cluster was named 'eqiad'. For the metrics, let's display
+# a 'logical' cluster name of analytics-eqiad.
+if ($::realm == 'production' and $::site == 'eqiad') {
+$group_prefix = 'kafka.cluster.analytics-eqiad'
+}
+else {
+$group_prefix = "kafka.cluster.${cluster_name}."
+}
+$group_prefix = "kafka.cluster.${cluster_name}."
+class { '::kafka::server::jmxtrans':
+ganglia => hiera('ganglia_aggregators', undef),
+statsd => hiera('statsd', undef),
+jmx_port => $::role::kafka::analytics::config::jmx_port,
+require => Class['::kafka::server'],
+}
+
# Monitor kafka in production
if $::realm == 'production' {
class { '::kafka::server::monitoring':
diff --git a/modules/role/manifests/kafka/main/broker.pp
b/modules/role/manifests/kafka/main/broker.pp
index 38a5641..2582aa4 100644
--- a/modules/role/manifests/kafka/main/broker.pp
+++ b/modules/role/manifests/kafka/main/broker.pp
@@ -75,7 +75,7 @@
# Include Kafka Server Jmxtrans class
# to send Kafka Broker metrics to Ganglia and statsd.
-$group_prefix = "kafka.${cluster_name}."
+$group_prefix = "kafka.cluster.${cluster_name}."
class { '::kafka::server::jmxtrans':
group_prefix => $group_prefix,
ganglia => hiera('ganglia_aggregators', undef),
--
To view, visit https://gerrit.wikimedia.org/r/266568
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I9cac3f83a2c79dc895dcbed81b689144bc73c6da
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ottomata
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] build: Update mediawiki/mediawiki-codesniffer to 0.5.1 - change (oojs/ui)
jenkins-bot has submitted this change and it was merged.
Change subject: build: Update mediawiki/mediawiki-codesniffer to 0.5.1
..
build: Update mediawiki/mediawiki-codesniffer to 0.5.1
Change-Id: Ida6868341420d1d198816bd322d308c467ea4cfa
---
M composer.json
1 file changed, 2 insertions(+), 2 deletions(-)
Approvals:
Jforrester: Looks good to me, approved
jenkins-bot: Verified
diff --git a/composer.json b/composer.json
index 4e1f11b..e2bed14 100644
--- a/composer.json
+++ b/composer.json
@@ -51,7 +51,7 @@
],
"require-dev": {
"jakub-onderka/php-parallel-lint": "0.9.2",
- "mediawiki/mediawiki-codesniffer": "0.5.0",
+ "mediawiki/mediawiki-codesniffer": "0.5.1",
"phpunit/phpunit": "~4.5"
},
"autoload": {
@@ -68,7 +68,7 @@
"scripts": {
"test": [
"parallel-lint . --exclude vendor",
- "phpcs -p",
+ "phpcs -p -s",
"phpunit $PHPUNIT_ARGS"
],
"doc": [
--
To view, visit https://gerrit.wikimedia.org/r/266088
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ida6868341420d1d198816bd322d308c467ea4cfa
Gerrit-PatchSet: 4
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: Paladox
Gerrit-Reviewer: Jforrester
Gerrit-Reviewer: Legoktm
Gerrit-Reviewer: Paladox
Gerrit-Reviewer: Reedy
Gerrit-Reviewer: Umherirrender
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Keep daily graphite data for 5 years - change (operations/puppet)
EBernhardson has uploaded a new change for review.
https://gerrit.wikimedia.org/r/266567
Change subject: Keep daily graphite data for 5 years
..
Keep daily graphite data for 5 years
5 years worth of daily information (on top of the 1 year currently
stored) is only 1460 data points per metric. For reference that is
equivilent to one day worth of per-minute metrics. The value of
being able to look over metrics from previous years for purposes
of capacity planning and such far outweighs, imo, the overhead
of keeping this data.
Change-Id: I078a55be2dd6a0b01fb03caed8abbde43e6b4406
---
M modules/role/manifests/graphite/base.pp
1 file changed, 2 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/67/266567/1
diff --git a/modules/role/manifests/graphite/base.pp
b/modules/role/manifests/graphite/base.pp
index f6173e6..ecb4098 100644
--- a/modules/role/manifests/graphite/base.pp
+++ b/modules/role/manifests/graphite/base.pp
@@ -44,10 +44,10 @@
},
# Retain aggregated data at a one-minute resolution for one week;
at
# five-minute resolution for two weeks; at 15-minute resolution for
-# one month; and at one-hour resolution for one year.
+# one month; one-hour resolution for one year, and 1d for five
years
'default' => {
pattern=> '.*',
-retentions => '1m:7d,5m:14d,15m:30d,1h:1y',
+retentions => '1m:7d,5m:14d,15m:30d,1h:1y,1d:5y',
},
},
--
To view, visit https://gerrit.wikimedia.org/r/266567
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I078a55be2dd6a0b01fb03caed8abbde43e6b4406
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: EBernhardson
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Tables: Add getMaxColCount to count total columns in a table... - change (VisualEditor/VisualEditor)
jenkins-bot has submitted this change and it was merged.
Change subject: Tables: Add getMaxColCount to count total columns in a table
matrix
..
Tables: Add getMaxColCount to count total columns in a table matrix
The number of columns varies in a sparse table. Ensure
that getColCount is always called with a row parameter
and fix instances of it being used incorrectly.
Change-Id: Ic42f3d87f1b4f197a18791c6f0a3ff59a5a1eb0b
---
M src/ce/keydownhandlers/ve.ce.LinearDeleteKeyDownHandler.js
M src/ce/ve.ce.Surface.js
M src/dm/selections/ve.dm.TableSelection.js
M src/dm/ve.dm.TableMatrix.js
4 files changed, 31 insertions(+), 9 deletions(-)
Approvals:
Jforrester: Looks good to me, approved
jenkins-bot: Verified
diff --git a/src/ce/keydownhandlers/ve.ce.LinearDeleteKeyDownHandler.js
b/src/ce/keydownhandlers/ve.ce.LinearDeleteKeyDownHandler.js
index 7486cc9..77e0c1f 100644
--- a/src/ce/keydownhandlers/ve.ce.LinearDeleteKeyDownHandler.js
+++ b/src/ce/keydownhandlers/ve.ce.LinearDeleteKeyDownHandler.js
@@ -43,7 +43,7 @@
*/
ve.ce.LinearDeleteKeyDownHandler.static.execute = function ( surface, e ) {
var docLength, startNode, tableEditingRange, position, skipNode,
pairNode, linkNode, range,
- documentModelSelectedNodes, i, node, nodeRange, nodeOuterRange,
matrix,
+ documentModelSelectedNodes, i, node, nodeRange, nodeOuterRange,
matrix, col, row,
direction = e.keyCode === OO.ui.Keys.DELETE ? 1 : -1,
unit = ( e.altKey === true || e.ctrlKey === true ) ? 'word' :
'character',
offset = 0,
@@ -190,8 +190,10 @@
) );
} else {
matrix = node.getMatrix();
+ row = matrix.getRowCount() - 1;
+ col = matrix.getColCount( row ) - 1;
surface.getModel().setSelection( new
ve.dm.TableSelection(
- documentModel, nodeOuterRange,
matrix.getColCount() - 1, matrix.getRowCount() - 1
+ documentModel, nodeOuterRange,
col, row
) );
}
e.preventDefault();
diff --git a/src/ce/ve.ce.Surface.js b/src/ce/ve.ce.Surface.js
index 81bc1dd..127ba8c 100644
--- a/src/ce/ve.ce.Surface.js
+++ b/src/ce/ve.ce.Surface.js
@@ -1123,7 +1123,7 @@
*/
ve.ce.Surface.prototype.afterDocumentKeyDown = function ( e ) {
var direction, focusableNode, startOffset, endOffset, offsetDiff,
dmFocus, dmSelection,
- inNonSlug, ceSelection, ceNode, range, fixupCursorForUnicorn,
matrix, $focusNode,
+ inNonSlug, ceSelection, ceNode, range, fixupCursorForUnicorn,
matrix, col, row, $focusNode,
surface = this,
isArrow = (
e.keyCode === OO.ui.Keys.UP ||
@@ -1329,8 +1329,10 @@
) );
} else {
matrix = focusableNode.getModel().getMatrix();
+ row = matrix.getRowCount() - 1;
+ col = matrix.getColCount( row ) - 1;
this.model.setSelection( new
ve.dm.TableSelection(
- this.model.documentModel, range,
matrix.getColCount() - 1, matrix.getRowCount() - 1
+ this.model.documentModel, range, col,
row
) );
}
} else {
@@ -2126,7 +2128,7 @@
this.getModel().setSelection(
new ve.dm.TableSelection(
selection.getDocument(), selection.tableRange,
- 0, 0, matrix.getColCount() - 1,
matrix.getRowCount() - 1
+ 0, 0, matrix.getMaxColCount() - 1,
matrix.getRowCount() - 1
)
);
diff --git a/src/dm/selections/ve.dm.TableSelection.js
b/src/dm/selections/ve.dm.TableSelection.js
index 94f4b5e..afd8c27 100644
--- a/src/dm/selections/ve.dm.TableSelection.js
+++ b/src/dm/selections/ve.dm.TableSelection.js
@@ -392,7 +392,7 @@
*/
ve.dm.TableSelection.prototype.isFullRow = function () {
var matrix = this.getTableNode().getMatrix();
- return this.getColCount() === matrix.getColCount();
+ return this.getColCount() === matrix.getMaxColCount();
};
/**
diff --git a/src/dm/ve.dm.TableMatrix.js b/src/dm/ve.dm.TableMatrix.js
index df24e5a..9ce7cf5 100644
--- a/src/dm/ve.dm.TableMatrix.js
+++ b/src/dm/ve.dm.TableMatrix.js
@@ -202,14 +202,32 @@
};
/**
- * Get number of columns in the table
+ * Get number of columns in a row
*
- * @p
[MediaWiki-commits] [Gerrit] Use DeviceWidthTablet defined in core - change (mediawiki...QuickSurveys)
Bmansurov has uploaded a new change for review.
https://gerrit.wikimedia.org/r/266566
Change subject: Use DeviceWidthTablet defined in core
..
Use DeviceWidthTablet defined in core
Change-Id: I97d9600c839f2bd455524a224cd26d0c44b65e05
Depends-On: Ia229dcd9a816a37e639f8328b21ca9fbed048c11
---
M resources/ext.quicksurveys.init/init.js
M resources/ext.quicksurveys.lib/styles.less
2 files changed, 2 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/QuickSurveys
refs/changes/66/266566/1
diff --git a/resources/ext.quicksurveys.init/init.js
b/resources/ext.quicksurveys.init/init.js
index 511b429..5967ae5 100644
--- a/resources/ext.quicksurveys.init/init.js
+++ b/resources/ext.quicksurveys.init/init.js
@@ -1,7 +1,7 @@
( function ( $ ) {
var isMainPage = mw.config.get( 'wgIsMainPage' ),
$bodyContent = $( '#bodyContent' ),
- isMobileLayout = window.innerWidth <= 768,
+ isMobileLayout = window.innerWidth <= parseInt( mw.config.get(
'DeviceWidthTablet' ), 10 ),
isArticle = mw.config.get( 'wgIsArticle' );
// Do nothing when not on an article
diff --git a/resources/ext.quicksurveys.lib/styles.less
b/resources/ext.quicksurveys.lib/styles.less
index 7bbd8c6..0efecf5 100644
--- a/resources/ext.quicksurveys.lib/styles.less
+++ b/resources/ext.quicksurveys.lib/styles.less
@@ -21,7 +21,7 @@
}
}
-@media all and (min-width: 768px) {
+@media all and (min-width: @DeviceWidthTablet) {
.ext-qs-loader-bar,
.ext-quick-survey-panel {
margin-left: 1.4em;
--
To view, visit https://gerrit.wikimedia.org/r/266566
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I97d9600c839f2bd455524a224cd26d0c44b65e05
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/QuickSurveys
Gerrit-Branch: master
Gerrit-Owner: Bmansurov
Gerrit-Reviewer: Jdlrobson
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] TextInputWidget: Simplify #getValidity - change (oojs/ui)
jenkins-bot has submitted this change and it was merged.
Change subject: TextInputWidget: Simplify #getValidity
..
TextInputWidget: Simplify #getValidity
Use promise chaining and the rejectOrResolve() function for the case
where the 'validate' function returns a promise.
Change-Id: Ideaf541fa18ffe1bdc81a89d2ef3bd2cf8f75ec9
---
M src/widgets/TextInputWidget.js
1 file changed, 3 insertions(+), 14 deletions(-)
Approvals:
Jforrester: Looks good to me, approved
jenkins-bot: Verified
diff --git a/src/widgets/TextInputWidget.js b/src/widgets/TextInputWidget.js
index e8c49c8..895ffa2 100644
--- a/src/widgets/TextInputWidget.js
+++ b/src/widgets/TextInputWidget.js
@@ -705,7 +705,7 @@
* @return {jQuery.Promise} A promise that resolves if the value is valid,
rejects if not.
*/
OO.ui.TextInputWidget.prototype.getValidity = function () {
- var result, promise;
+ var result;
function rejectOrResolve( valid ) {
if ( valid ) {
@@ -717,21 +717,10 @@
if ( this.validate instanceof Function ) {
result = this.validate( this.getValue() );
-
if ( result && $.isFunction( result.promise ) ) {
- promise = $.Deferred();
-
- result.then( function ( valid ) {
- if ( valid ) {
- promise.resolve();
- } else {
- promise.reject();
- }
- }, function () {
- promise.reject();
+ return result.promise().then( function ( valid ) {
+ return rejectOrResolve( valid );
} );
-
- return promise.promise();
} else {
return rejectOrResolve( result );
}
--
To view, visit https://gerrit.wikimedia.org/r/265919
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ideaf541fa18ffe1bdc81a89d2ef3bd2cf8f75ec9
Gerrit-PatchSet: 2
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: Bartosz Dziewoński
Gerrit-Reviewer: Bartosz Dziewoński
Gerrit-Reviewer: Jforrester
Gerrit-Reviewer: Krinkle
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Enable EventBus on remaining (applicable) wikis - change (operations/mediawiki-config)
Eevans has uploaded a new change for review. https://gerrit.wikimedia.org/r/266564 Change subject: Enable EventBus on remaining (applicable) wikis .. Enable EventBus on remaining (applicable) wikis Bug: T116786 Change-Id: Ib50eb28b68da2b077f18f857379343ae90c4d4a3 --- M wmf-config/InitialiseSettings.php 1 file changed, 5 insertions(+), 4 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/64/266564/1 diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index a0b98c8..2ec0ddd 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -16357,10 +16357,11 @@ ), 'wmgUseEventBus' => array( - 'default' => false, - 'testwiki' => true, - 'test2wiki' => true, - 'mediawikiwiki' => true, + 'default' => true, + 'wikitech' => false, + 'private' => false, + 'loginwiki' => false, + 'votewiki' => false, ), ); -- To view, visit https://gerrit.wikimedia.org/r/266564 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib50eb28b68da2b077f18f857379343ae90c4d4a3 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Eevans ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] WindowManager: Only apply `top: 1em; bottom: 1em; ` to non-fu... - change (oojs/ui)
jenkins-bot has submitted this change and it was merged.
Change subject: WindowManager: Only apply `top: 1em; bottom: 1em;` to
non-fullscreen windows
..
WindowManager: Only apply `top: 1em; bottom: 1em;` to non-fullscreen windows
This was already supposed to be overridden in WindowManager.less
(see `&-fullscreen > .oo-ui-dialog > .oo-ui-window-frame`), but that
rule has the same specificity as this one and it was earlier in the
file, so it was being ignored.
I think a lot of this CSS could be moved to WindowManager.less and
made to apply only to fullscreen or floating windows, but it would
have to be done carefully.
Bug: T122238
Change-Id: I50fb372cf3c9dcc03d3677ffd27f4ea37cdfe610
---
M src/themes/apex/windows.less
M src/themes/mediawiki/windows.less
2 files changed, 4 insertions(+), 4 deletions(-)
Approvals:
Jforrester: Looks good to me, approved
jenkins-bot: Verified
diff --git a/src/themes/apex/windows.less b/src/themes/apex/windows.less
index 9489a30..80bf272 100644
--- a/src/themes/apex/windows.less
+++ b/src/themes/apex/windows.less
@@ -290,8 +290,6 @@
.oo-ui-transition(opacity @medium-ease);
> .oo-ui-window-frame {
- top: 1em;
- bottom: 1em;
background-color: #fff;
opacity: 0;
@@ -314,6 +312,8 @@
}
&-modal&-floating > .oo-ui-dialog > .oo-ui-window-frame {
+ top: 1em;
+ bottom: 1em;
border: 1px solid #ccc;
border-radius: 0.5em;
box-shadow: 0 0.2em 1em rgba(0, 0, 0, 0.3);
diff --git a/src/themes/mediawiki/windows.less
b/src/themes/mediawiki/windows.less
index 254bcf5..07dab75 100644
--- a/src/themes/mediawiki/windows.less
+++ b/src/themes/mediawiki/windows.less
@@ -268,8 +268,6 @@
.oo-ui-transition( opacity @transition-ease-medium );
> .oo-ui-window-frame {
- top: 1em;
- bottom: 1em;
background-color: #fff;
opacity: 0;
.oo-ui-transform( scale( 0.5 ) );
@@ -291,6 +289,8 @@
}
&-modal&-floating > .oo-ui-dialog > .oo-ui-window-frame {
+ top: 1em;
+ bottom: 1em;
border: 1px solid #aaa;
border-radius: @border-radius-default;
box-shadow: @box-shadow-dialog;
--
To view, visit https://gerrit.wikimedia.org/r/266236
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I50fb372cf3c9dcc03d3677ffd27f4ea37cdfe610
Gerrit-PatchSet: 1
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: Bartosz Dziewoński
Gerrit-Reviewer: Catrope
Gerrit-Reviewer: Esanders
Gerrit-Reviewer: Jforrester
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] "Truncate" overflowing title with a gradient - change (mediawiki...Cards)
jenkins-bot has submitted this change and it was merged.
Change subject: "Truncate" overflowing title with a gradient
..
"Truncate" overflowing title with a gradient
Per Nirzar's mock [0], when the title reaches its maximum of two lines,
"truncate" it using an absolutely-positioned psuedo-element with a
linear gradient background image.
[0] http://nirzar.github.io/prototypes/mobile-web/readmore/index.html
Bug: T122030
Change-Id: I0d56f009c14fb7f8c1c2cbe7e5c18289cd48a1b8
---
M resources/styles.less
1 file changed, 17 insertions(+), 1 deletion(-)
Approvals:
Jhernandez: Looks good to me, approved
jenkins-bot: Verified
diff --git a/resources/styles.less b/resources/styles.less
index f24174b..0dcca13 100644
--- a/resources/styles.less
+++ b/resources/styles.less
@@ -47,19 +47,35 @@
h3 {
@fontSize: 1em;
@lineHeight: 1.3;
+ @lineHeightEm: @lineHeight * @fontSize;
font-family: inherit;
font-size: @fontSize;
// max 2 lines
- max-height: 2 * @lineHeight * @fontSize;
+ max-height: 2 * @lineHeightEm;
line-height: @lineHeight;
margin: 0;
overflow: hidden;
padding: 0;
+ position: relative;
a {
color: #00;
}
+
+ &:after {
+ content: " ";
+ position: absolute;
+ right: 0;
+ bottom: 0;
+ width: 25%;
+ height: @lineHeightEm;
+ background-color: transparent;
+ background-image: -webkit-linear-gradient(to right,
rgba(255, 255, 255, 0), rgba(255, 255, 255, 1) 50%);
+ background-image: -moz-linear-gradient(to right,
rgba(255, 255, 255, 0), rgba(255, 255, 255, 1) 50%);
+background-image: -o-linear-gradient(to right,
rgba(255, 255, 255, 0), rgba(255, 255, 255, 1) 50%);
+ background-image: linear-gradient(to right,
rgba(255, 255, 255, 0), rgba(255, 255, 255, 1) 50%);
+ }
}
.ext-cards-card-detail {
--
To view, visit https://gerrit.wikimedia.org/r/265714
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I0d56f009c14fb7f8c1c2cbe7e5c18289cd48a1b8
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Cards
Gerrit-Branch: dev
Gerrit-Owner: Phuedx
Gerrit-Reviewer: Bmansurov
Gerrit-Reviewer: Jhernandez
Gerrit-Reviewer: Phuedx
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove some logspam in the index update process - change (mediawiki...CirrusSearch)
jenkins-bot has submitted this change and it was merged.
Change subject: Remove some logspam in the index update process
..
Remove some logspam in the index update process
I'm not sure if these have ever turned out to be useful, and they mostly
just spam up the CirrusSearch log making it harder to find other issues.
As such just removing them.
Change-Id: I28dcae8b5127080be8751777d8e1bfd5fbd38a98
---
M includes/DataSender.php
1 file changed, 0 insertions(+), 3 deletions(-)
Approvals:
Smalyshev: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/DataSender.php b/includes/DataSender.php
index 14f687e..b25ba75 100644
--- a/includes/DataSender.php
+++ b/includes/DataSender.php
@@ -128,10 +128,8 @@
$resp = $this->connection->getFrozenIndexNameType()->search(
$ids );
if ( $resp->count() === 0 ) {
- $this->log->debug( "Allowed writes to " . implode( ',',
$indexes ) );
return true;
} else {
- $this->log->debug( "Denied writes to " . implode( ',',
$indexes ) );
return false;
}
}
@@ -265,7 +263,6 @@
foreach ( $updates as $update ) {
$title = Title::makeTitle( $update['ns'],
$update['dbKey'] );
$action = $this->decideRequiredSetAction(
$title );
- $this->log->debug( "Performing `$action` for
{$update['dbKey']} in ns {$update['ns']} on $localSite against id
${update['id']} in $indexName" );
$script = new \Elastica\Script(
'super_detect_noop',
array(
--
To view, visit https://gerrit.wikimedia.org/r/266418
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I28dcae8b5127080be8751777d8e1bfd5fbd38a98
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CirrusSearch
Gerrit-Branch: master
Gerrit-Owner: EBernhardson
Gerrit-Reviewer: DCausse
Gerrit-Reviewer: Manybubbles
Gerrit-Reviewer: Smalyshev
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Document how LocalFile::upload() and UploadBase::performUplo... - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged.
Change subject: Document how LocalFile::upload() and
UploadBase::performUpload() ignore user permissions
..
Document how LocalFile::upload() and UploadBase::performUpload() ignore user
permissions
Follow-up to 61c7852049de45664593437f8b8335809fdbccae.
Change-Id: I6e69b1fa12f336dc4dd12e845cb8bf42abd599b2
---
M includes/filerepo/file/LocalFile.php
M includes/upload/UploadBase.php
2 files changed, 4 insertions(+), 1 deletion(-)
Approvals:
Anomie: Looks good to me, but someone else must approve
Aaron Schulz: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/filerepo/file/LocalFile.php
b/includes/filerepo/file/LocalFile.php
index 82d6a76..6d8f0b8 100644
--- a/includes/filerepo/file/LocalFile.php
+++ b/includes/filerepo/file/LocalFile.php
@@ -1120,6 +1120,7 @@
* current time
* @param User|null $user User object or null to use $wgUser
* @param string[] $tags Change tags to add to the log entry and page
revision.
+* (This doesn't check $user's permissions.)
* @return FileRepoStatus On success, the value member contains the
* archive name, or an empty string if it was a new file.
*/
diff --git a/includes/upload/UploadBase.php b/includes/upload/UploadBase.php
index ad26f7d..4294408 100644
--- a/includes/upload/UploadBase.php
+++ b/includes/upload/UploadBase.php
@@ -690,9 +690,11 @@
*
* @param string $comment
* @param string $pageText
-* @param bool $watch
+* @param bool $watch Whether the file page should be added to user's
watchlist.
+* (This doesn't check $user's permissions.)
* @param User $user
* @param string[] $tags Change tags to add to the log entry and page
revision.
+* (This doesn't check $user's permissions.)
* @return Status Indicating the whether the upload succeeded.
*/
public function performUpload( $comment, $pageText, $watch, $user,
$tags = array() ) {
--
To view, visit https://gerrit.wikimedia.org/r/266529
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I6e69b1fa12f336dc4dd12e845cb8bf42abd599b2
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Bartosz Dziewoński
Gerrit-Reviewer: Aaron Schulz
Gerrit-Reviewer: Anomie
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Revert "Allow undefined labels for label service" - change (wikidata...rdf)
Smalyshev has uploaded a new change for review.
https://gerrit.wikimedia.org/r/266563
Change subject: Revert "Allow undefined labels for label service"
..
Revert "Allow undefined labels for label service"
This reverts commit 43456fc2d669b635d7829fbf68ba7c645f16f8f0.
Causes unmaterialized exceptions, see details in the bug
Bug: T113374
Change-Id: I1a63e4d7dc7423918b11bb05a33809115f6941f4
---
M
blazegraph/src/main/java/org/wikidata/query/rdf/blazegraph/label/LabelService.java
M
blazegraph/src/test/java/org/wikidata/query/rdf/blazegraph/label/LabelServiceUnitTest.java
2 files changed, 12 insertions(+), 12 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/wikidata/query/rdf
refs/changes/63/266563/1
diff --git
a/blazegraph/src/main/java/org/wikidata/query/rdf/blazegraph/label/LabelService.java
b/blazegraph/src/main/java/org/wikidata/query/rdf/blazegraph/label/LabelService.java
index 146ec53..b8018f3 100644
---
a/blazegraph/src/main/java/org/wikidata/query/rdf/blazegraph/label/LabelService.java
+++
b/blazegraph/src/main/java/org/wikidata/query/rdf/blazegraph/label/LabelService.java
@@ -397,9 +397,6 @@
public void resolve(Resolution resolution) {
resolvedSubject = resolveToIvOrError(resolution.subject(),
"subject");
resolvedLabelType = resolveToIvOrError(resolution.labelType(),
"label type");
-if (resolvedSubject == null || resolvedLabelType == null) {
-return;
-}
// TODO this is one at a time - maybe a batch things?
fillBestLabels();
IV label = pickOrBuildBestLabel();
@@ -499,10 +496,9 @@
private IV resolveToIvOrError(IValueExpression expression, String
nameOfExpression) {
Object resolved = expression.get(binding);
if (resolved == null) {
-return null;
-//throw new RuntimeException(String.format(Locale.ROOT,
-//"Refusing to lookup labels for unknown %s (%s).
That'd be way way way inefficient.",
-//nameOfExpression, expression));
+throw new RuntimeException(String.format(Locale.ROOT,
+"Refusing to lookup labels for unknown %s (%s). That'd
be way way way inefficient.",
+nameOfExpression, expression));
}
try {
return (IV) resolved;
diff --git
a/blazegraph/src/test/java/org/wikidata/query/rdf/blazegraph/label/LabelServiceUnitTest.java
b/blazegraph/src/test/java/org/wikidata/query/rdf/blazegraph/label/LabelServiceUnitTest.java
index 32f846d..b8da2f7 100644
---
a/blazegraph/src/test/java/org/wikidata/query/rdf/blazegraph/label/LabelServiceUnitTest.java
+++
b/blazegraph/src/test/java/org/wikidata/query/rdf/blazegraph/label/LabelServiceUnitTest.java
@@ -4,7 +4,6 @@
import static org.hamcrest.Matchers.containsString;
import static org.wikidata.query.rdf.test.Matchers.assertResult;
import static org.wikidata.query.rdf.test.Matchers.binds;
-import static org.wikidata.query.rdf.test.Matchers.notBinds;
import java.util.Locale;
@@ -59,10 +58,15 @@
}
@Test
-public void labelOverUnboundSubject() throws QueryEvaluationException {
-TupleQueryResult result = lookupLabel(null, "en", "?s", "rdfs:label");
-assertThat(result.next(), notBinds("sLabel"));
-assertFalse(result.hasNext());
+public void labelOverUnboundSubjectIsError() {
+try {
+lookupLabel(null, "en", "?s", "rdfs:label").next();
+fail();
+} catch (QueryEvaluationException e) {
+assertThat(
+e.getMessage(),
+containsString("Refusing to lookup labels for unknown
subject (s). That'd be way way way inefficient."));
+}
}
@Test
--
To view, visit https://gerrit.wikimedia.org/r/266563
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I1a63e4d7dc7423918b11bb05a33809115f6941f4
Gerrit-PatchSet: 1
Gerrit-Project: wikidata/query/rdf
Gerrit-Branch: master
Gerrit-Owner: Smalyshev
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] .redirectMsg needs to be 0 height - change (mediawiki...Vector)
TheDJ has uploaded a new change for review.
https://gerrit.wikimedia.org/r/266562
Change subject: .redirectMsg needs to be 0 height
..
.redirectMsg needs to be 0 height
It wasn't because ".mw-body p" introduces a margin, causing an
undesired extra spacing on redirect pages.
Change-Id: I53f63703b086ff6b28c1fb5325ee6693e3322390
---
M components/common.less
1 file changed, 4 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/Vector
refs/changes/62/266562/1
diff --git a/components/common.less b/components/common.less
index 16e2622..f50880a 100644
--- a/components/common.less
+++ b/components/common.less
@@ -147,6 +147,10 @@
font-size: 140%;
}
+.redirectMsg p {
+ margin: 0;
+}
+
.mw-body-content {
position: relative;
line-height: @content-line-height;
--
To view, visit https://gerrit.wikimedia.org/r/266562
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I53f63703b086ff6b28c1fb5325ee6693e3322390
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/Vector
Gerrit-Branch: master
Gerrit-Owner: TheDJ
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] LinkBatch::addObj can also work with TitleValue objs - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged.
Change subject: LinkBatch::addObj can also work with TitleValue objs
..
LinkBatch::addObj can also work with TitleValue objs
Change-Id: I035d38a5eb8299fcce9cc0efa3952e391b325722
---
M includes/cache/LinkBatch.php
1 file changed, 2 insertions(+), 2 deletions(-)
Approvals:
Aaron Schulz: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/cache/LinkBatch.php b/includes/cache/LinkBatch.php
index d9f..d6c610a 100644
--- a/includes/cache/LinkBatch.php
+++ b/includes/cache/LinkBatch.php
@@ -56,13 +56,13 @@
}
/**
-* @param Title $title
+* @param Title|TitleValue $title
*/
public function addObj( $title ) {
if ( is_object( $title ) ) {
$this->add( $title->getNamespace(), $title->getDBkey()
);
} else {
- wfDebug( "Warning: LinkBatch::addObj got invalid title
object\n" );
+ wfDebug( "Warning: LinkBatch::addObj got invalid Title
or TitleValue object\n" );
}
}
--
To view, visit https://gerrit.wikimedia.org/r/266560
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I035d38a5eb8299fcce9cc0efa3952e391b325722
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Addshore
Gerrit-Reviewer: Aaron Schulz
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] build: Update jakub-onderka/php-parallel-lint to 0.9.2 - change (oojs/ui)
jenkins-bot has submitted this change and it was merged.
Change subject: build: Update jakub-onderka/php-parallel-lint to 0.9.2
..
build: Update jakub-onderka/php-parallel-lint to 0.9.2
Change-Id: Ia83bd962421def2f318a658f5f4c12f6f06c22de
---
M composer.json
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Jforrester: Looks good to me, approved
jenkins-bot: Verified
diff --git a/composer.json b/composer.json
index cb5c399..4e1f11b 100644
--- a/composer.json
+++ b/composer.json
@@ -50,7 +50,7 @@
}
],
"require-dev": {
- "jakub-onderka/php-parallel-lint": "0.9",
+ "jakub-onderka/php-parallel-lint": "0.9.2",
"mediawiki/mediawiki-codesniffer": "0.5.0",
"phpunit/phpunit": "~4.5"
},
--
To view, visit https://gerrit.wikimedia.org/r/266089
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia83bd962421def2f318a658f5f4c12f6f06c22de
Gerrit-PatchSet: 2
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: Paladox
Gerrit-Reviewer: Jforrester
Gerrit-Reviewer: Legoktm
Gerrit-Reviewer: Reedy
Gerrit-Reviewer: Umherirrender
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
