[MediaWiki-commits] [Gerrit] operations/puppet[production]: Add Druid hosts to network constants
Muehlenhoff has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/356189 )
Change subject: Add Druid hosts to network constants
..
Add Druid hosts to network constants
Initially to be used for revised zookeeper ferm rules restricting
access to those hosts which actually access it. But mid-term the
same definition can be reused by other ferm rules/puppet code as
well.
Change-Id: I36c797779e172709689cb72a2bf4e52c3954fa7e
---
M modules/network/manifests/constants.pp
1 file changed, 8 insertions(+), 0 deletions(-)
Approvals:
Muehlenhoff: Looks good to me, approved
Elukey: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/modules/network/manifests/constants.pp
b/modules/network/manifests/constants.pp
index 788fa7d..d7190dc 100644
--- a/modules/network/manifests/constants.pp
+++ b/modules/network/manifests/constants.pp
@@ -108,6 +108,14 @@
'10.64.53.21',#
analytics1002.eqiad.wmnet
'2620:0:861:108:f21f:afff:fee8:bc3f', #
analytics1002.eqiad.wmnet
],
+'druid_hosts' => [
+'10.64.5.101',#
druid1001.eqiad.wmnet
+'2620:0:861:104:1e98:ecff:fe29:e298', #
druid1001.eqiad.wmnet
+'10.64.36.102', #
druid1002.eqiad.wmnet
+'2620:0:861:106:1602:ecff:fe06:8bec', #
druid1002.eqiad.wmnet
+'10.64.53.103', #
druid1003.eqiad.wmnet
+'2620:0:861:108:1e98:ecff:fe29:e278', #
druid1003.eqiad.wmnet
+],
},
'labs' => {
'bastion_hosts' => concat([
--
To view, visit https://gerrit.wikimedia.org/r/356189
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I36c797779e172709689cb72a2bf4e52c3954fa7e
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Muehlenhoff
Gerrit-Reviewer: Elukey
Gerrit-Reviewer: Faidon Liambotis
Gerrit-Reviewer: Giuseppe Lavagetto
Gerrit-Reviewer: Muehlenhoff
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] mediawiki...Translate[master]: ArrayFlattener: Remove empty lines from beginning of methods
Nikerabbit has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/356534 )
Change subject: ArrayFlattener: Remove empty lines from beginning of methods
..
ArrayFlattener: Remove empty lines from beginning of methods
Change-Id: I553f83db1239cf3acd3b7e808248c3c53b8816b3
---
M utils/ArrayFlattener.php
1 file changed, 0 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Translate
refs/changes/34/356534/1
diff --git a/utils/ArrayFlattener.php b/utils/ArrayFlattener.php
index b1e6c35..28065a5 100644
--- a/utils/ArrayFlattener.php
+++ b/utils/ArrayFlattener.php
@@ -77,7 +77,6 @@
* @return bool|string
*/
public function flattenCLDRPlurals( $messages ) {
-
$pluralKeys = false;
$nonPluralKeys = false;
foreach ( $messages as $key => $value ) {
@@ -128,7 +127,6 @@
* @return array
*/
public function unflatten( $flat ) {
-
$unflat = [];
if ( $this->parseCLDRPlurals ) {
@@ -189,7 +187,6 @@
* @return bool|array
*/
public function unflattenCLDRPlurals( $key, $message ) {
-
// Quick escape.
if ( strpos( $message, '{{PLURAL' ) === false ) {
return false;
--
To view, visit https://gerrit.wikimedia.org/r/356534
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I553f83db1239cf3acd3b7e808248c3c53b8816b3
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Translate
Gerrit-Branch: master
Gerrit-Owner: Nikerabbit
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...SecurePoll[master]: Avoid error suppressing
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/356461 )
Change subject: Avoid error suppressing
..
Avoid error suppressing
Silencing errors is discouraged
Change-Id: I6c94a25fd4a867196f00da03df802b88ce6f2e95
---
M includes/pages/VotePage.php
1 file changed, 3 insertions(+), 3 deletions(-)
Approvals:
Huji: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/pages/VotePage.php b/includes/pages/VotePage.php
index 8cc5777..b1c01ac 100644
--- a/includes/pages/VotePage.php
+++ b/includes/pages/VotePage.php
@@ -178,9 +178,9 @@
);
# Add vote to log
- $xff = @$_SERVER['HTTP_X_FORWARDED_FOR'];
- if ( !$xff ) {
- $xff = '';
+ $xff = '';
+ if ( !empty( $_SERVER['HTTP_X_FORWARDED_FOR'] ) ) {
+ $xff = $_SERVER['HTTP_X_FORWARDED_FOR'];
}
$tokenMatch = $this->specialPage->getEditToken() ==
$request->getVal( 'edit_token' );
--
To view, visit https://gerrit.wikimedia.org/r/356461
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I6c94a25fd4a867196f00da03df802b88ce6f2e95
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SecurePoll
Gerrit-Branch: master
Gerrit-Owner: Umherirrender
Gerrit-Reviewer: Huji
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Translate[master]: ArrayFlattener: Declare member variable
Nikerabbit has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/356533 )
Change subject: ArrayFlattener: Declare member variable
..
ArrayFlattener: Declare member variable
Change-Id: I109534c9e52502b112a430ba4139d10ec9c2fb2c
---
M utils/ArrayFlattener.php
1 file changed, 1 insertion(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Translate
refs/changes/33/356533/1
diff --git a/utils/ArrayFlattener.php b/utils/ArrayFlattener.php
index b1e6c35..d719a28 100644
--- a/utils/ArrayFlattener.php
+++ b/utils/ArrayFlattener.php
@@ -13,6 +13,7 @@
class ArrayFlattener {
protected $sep;
+ protected $parseCLDRPlurals;
// For CLDR pluralization rules
protected static $pluralWords = [
--
To view, visit https://gerrit.wikimedia.org/r/356533
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I109534c9e52502b112a430ba4139d10ec9c2fb2c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Translate
Gerrit-Branch: master
Gerrit-Owner: Nikerabbit
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/dns[master]: Revert "wmnet: Point m3 slave to eqiad master"
Marostegui has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/356525 ) Change subject: Revert "wmnet: Point m3 slave to eqiad master" .. Revert "wmnet: Point m3 slave to eqiad master" This reverts commit a1f193e5485f50900f9658d5edba94d7c7a2927f. Change-Id: I107586b60ac4a2ee5c4e9947f03aa9dea6a90cae --- M templates/wmnet 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Marostegui: Looks good to me, approved jenkins-bot: Verified diff --git a/templates/wmnet b/templates/wmnet index b1e0948..c8f5b60 100644 --- a/templates/wmnet +++ b/templates/wmnet @@ -46,7 +46,7 @@ m2-master 5M IN CNAMEdbproxy1002.eqiad.wmnet. m2-slave5M IN CNAMEdb2011.codfw.wmnet. m3-master 5M IN CNAMEdbproxy1003.eqiad.wmnet. -m3-slave5M IN CNAMEdb1043.eqiad.wmnet. +m3-slave5M IN CNAMEdb1048.eqiad.wmnet. m4-master 5M IN CNAMEdbproxy1004.eqiad.wmnet. m5-master 5M IN CNAMEdb1009.eqiad.wmnet. m5-slave5M IN CNAMEdb2030.codfw.wmnet. -- To view, visit https://gerrit.wikimedia.org/r/356525 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I107586b60ac4a2ee5c4e9947f03aa9dea6a90cae Gerrit-PatchSet: 1 Gerrit-Project: operations/dns Gerrit-Branch: master Gerrit-Owner: Marostegui Gerrit-Reviewer: Jcrespo Gerrit-Reviewer: Marostegui Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: db-eqiad.php: Repool db1035
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/356532 ) Change subject: db-eqiad.php: Repool db1035 .. db-eqiad.php: Repool db1035 db1035 finished alter table Bug: T166278 Change-Id: Ie316243bfd854349a7a9718d9600c906f2909298 --- M wmf-config/db-eqiad.php 1 file changed, 6 insertions(+), 6 deletions(-) Approvals: Marostegui: Looks good to me, approved jenkins-bot: Verified diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php index ea0fd4e..b61e60b 100644 --- a/wmf-config/db-eqiad.php +++ b/wmf-config/db-eqiad.php @@ -119,9 +119,9 @@ 'db1075' => 0, # A2 3.6TB 512GB, master 'db1038' => 0, # B2 1.4TB 64GB, vslow, dump, old master # 'db1015' => 1, # A2 1.4TB 64GB, do not pool, it is missing cebwiki -# 'db1035' => 50, # B2 1.4TB 64GB, watchlist, recentchanges, contributions, logpager #T166278 + 'db1035' => 50, # B2 1.4TB 64GB, watchlist, recentchanges, contributions, logpager # 'db1044' => 0, # B2 1.4TB 64GB, #Temporary master for db1095 - new sanitarium #T150802 - 'db1077' => 100, # B1 3.6TB 512GB #temporary rc service #T166278 + 'db1077' => 500, # B1 3.6TB 512GB 'db1078' => 500, # C3 3.6TB 512GB ], 's4' => [ @@ -303,16 +303,16 @@ 'db1077' => 1, ], 'recentchanges' => [ - 'db1077' => 1, + 'db1035' => 1, ], 'recentchangeslinked' => [ - 'db1077' => 1, + 'db1035' => 1, ], 'contributions' => [ - 'db1077' => 1, + 'db1035' => 1, ], 'logpager' => [ - 'db1077' => 1, + 'db1035' => 1, ], ], 's4' => [ -- To view, visit https://gerrit.wikimedia.org/r/356532 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ie316243bfd854349a7a9718d9600c906f2909298 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Marostegui Gerrit-Reviewer: Florianschmidtwelzow Gerrit-Reviewer: Jcrespo Gerrit-Reviewer: Marostegui Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: db-eqiad.php: Repool db1035
Marostegui has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/356532 ) Change subject: db-eqiad.php: Repool db1035 .. db-eqiad.php: Repool db1035 db1035 finished alter table Bug: T166278 Change-Id: Ie316243bfd854349a7a9718d9600c906f2909298 --- M wmf-config/db-eqiad.php 1 file changed, 6 insertions(+), 6 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/32/356532/1 diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php index ea0fd4e..b61e60b 100644 --- a/wmf-config/db-eqiad.php +++ b/wmf-config/db-eqiad.php @@ -119,9 +119,9 @@ 'db1075' => 0, # A2 3.6TB 512GB, master 'db1038' => 0, # B2 1.4TB 64GB, vslow, dump, old master # 'db1015' => 1, # A2 1.4TB 64GB, do not pool, it is missing cebwiki -# 'db1035' => 50, # B2 1.4TB 64GB, watchlist, recentchanges, contributions, logpager #T166278 + 'db1035' => 50, # B2 1.4TB 64GB, watchlist, recentchanges, contributions, logpager # 'db1044' => 0, # B2 1.4TB 64GB, #Temporary master for db1095 - new sanitarium #T150802 - 'db1077' => 100, # B1 3.6TB 512GB #temporary rc service #T166278 + 'db1077' => 500, # B1 3.6TB 512GB 'db1078' => 500, # C3 3.6TB 512GB ], 's4' => [ @@ -303,16 +303,16 @@ 'db1077' => 1, ], 'recentchanges' => [ - 'db1077' => 1, + 'db1035' => 1, ], 'recentchangeslinked' => [ - 'db1077' => 1, + 'db1035' => 1, ], 'contributions' => [ - 'db1077' => 1, + 'db1035' => 1, ], 'logpager' => [ - 'db1077' => 1, + 'db1035' => 1, ], ], 's4' => [ -- To view, visit https://gerrit.wikimedia.org/r/356532 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie316243bfd854349a7a9718d9600c906f2909298 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Marostegui ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceExtensions[REL1_27]: BSAvatars: Fixed missing initial avatars for new users
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/356531 )
Change subject: BSAvatars: Fixed missing initial avatars for new users
..
BSAvatars: Fixed missing initial avatars for new users
=> #5787
=> Needs cherry-pick to REL1_27
Change-Id: Iaef178a2eba774b99361e715cdb939bafe89f68a
---
M Avatars/Avatars.class.php
M Avatars/extension.json
2 files changed, 43 insertions(+), 1 deletion(-)
Approvals:
Robert Vogel: Looks good to me, approved
jenkins-bot: Verified
diff --git a/Avatars/Avatars.class.php b/Avatars/Avatars.class.php
index 2f3b34d..1fc7c2c 100644
--- a/Avatars/Avatars.class.php
+++ b/Avatars/Avatars.class.php
@@ -263,4 +263,44 @@
return $sNewUserImageSrc;
}
+ /**
+* Create an initial Avatar
+* @param User $user
+* @param boolean $autocreated
+* @return boolean
+*/
+ public static function onLocalUserCreated( $user, $autocreated ) {
+ $oAvatars = BsExtensionManager::getExtension( 'Avatars' );
+ try{
+ $sNewPath = $oAvatars->generateAvatar( $user, array(),
true );
+ } catch( Exception $e ) {
+ wfDebugLog(
+ 'BS::Avatars',
+ 'onLocalUserCreated: Error: '.$e->getMessage()
+ );
+ }
+ return true;
+ }
+
+ /**
+* Create an initial Avatar
+* @param UserManager $oUserManager
+* @param User $oUser
+* @param array $aMetaData
+* @param Status $oStatus
+* @param User $oPerformer
+* @return boolean
+*/
+ public static function onBSUserManagerAfterAddUser( $oUserManager,
$oUser, $aMetaData, &$oStatus, $oPerformer ) {
+ $oAvatars = BsExtensionManager::getExtension( 'Avatars' );
+ try{
+ $sNewPath = $oAvatars->generateAvatar( $oUser, array(),
true );
+ } catch( Exception $e ) {
+ wfDebugLog(
+ 'BS::Avatars',
+ 'onBSUserManagerAfterAddUser: Error:
'.$e->getMessage()
+ );
+ }
+ return true;
+ }
}
diff --git a/Avatars/extension.json b/Avatars/extension.json
index 593caff..5140c5f 100644
--- a/Avatars/extension.json
+++ b/Avatars/extension.json
@@ -50,7 +50,9 @@
"remoteExtPath": "BlueSpiceExtensions/Avatars/resources"
},
"Hooks": {
- "BeforePageDisplay": "Avatars::onBeforePageDisplay"
+ "BeforePageDisplay": "Avatars::onBeforePageDisplay",
+ "BSUserManagerAfterAddUser":
"Avatars::onBSUserManagerAfterAddUser",
+ "LocalUserCreated": "Avatars::onLocalUserCreated"
},
"manifest_version": 1
}
--
To view, visit https://gerrit.wikimedia.org/r/356531
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iaef178a2eba774b99361e715cdb939bafe89f68a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: REL1_27
Gerrit-Owner: Robert Vogel
Gerrit-Reviewer: Pwirth
Gerrit-Reviewer: Robert Vogel
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceExtensions[master]: BSAvatars: Fixed missing initial avatars for new users
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/356404 )
Change subject: BSAvatars: Fixed missing initial avatars for new users
..
BSAvatars: Fixed missing initial avatars for new users
=> #5787
=> Needs cherry-pick to REL1_27
Change-Id: Iaef178a2eba774b99361e715cdb939bafe89f68a
---
M Avatars/Avatars.class.php
M Avatars/extension.json
2 files changed, 43 insertions(+), 1 deletion(-)
Approvals:
Robert Vogel: Looks good to me, approved
jenkins-bot: Verified
diff --git a/Avatars/Avatars.class.php b/Avatars/Avatars.class.php
index 40bed85..ef82456 100644
--- a/Avatars/Avatars.class.php
+++ b/Avatars/Avatars.class.php
@@ -278,4 +278,44 @@
return $sNewUserImageSrc;
}
+ /**
+* Create an initial Avatar
+* @param User $user
+* @param boolean $autocreated
+* @return boolean
+*/
+ public static function onLocalUserCreated( $user, $autocreated ) {
+ $oAvatars = BsExtensionManager::getExtension( 'Avatars' );
+ try{
+ $sNewPath = $oAvatars->generateAvatar( $user, array(),
true );
+ } catch( Exception $e ) {
+ wfDebugLog(
+ 'BS::Avatars',
+ 'onLocalUserCreated: Error: '.$e->getMessage()
+ );
+ }
+ return true;
+ }
+
+ /**
+* Create an initial Avatar
+* @param UserManager $oUserManager
+* @param User $oUser
+* @param array $aMetaData
+* @param Status $oStatus
+* @param User $oPerformer
+* @return boolean
+*/
+ public static function onBSUserManagerAfterAddUser( $oUserManager,
$oUser, $aMetaData, &$oStatus, $oPerformer ) {
+ $oAvatars = BsExtensionManager::getExtension( 'Avatars' );
+ try{
+ $sNewPath = $oAvatars->generateAvatar( $oUser, array(),
true );
+ } catch( Exception $e ) {
+ wfDebugLog(
+ 'BS::Avatars',
+ 'onBSUserManagerAfterAddUser: Error:
'.$e->getMessage()
+ );
+ }
+ return true;
+ }
}
diff --git a/Avatars/extension.json b/Avatars/extension.json
index 03da66d..806b80d 100644
--- a/Avatars/extension.json
+++ b/Avatars/extension.json
@@ -50,7 +50,9 @@
"remoteExtPath": "BlueSpiceExtensions/Avatars/resources"
},
"Hooks": {
- "BeforePageDisplay": "Avatars::onBeforePageDisplay"
+ "BeforePageDisplay": "Avatars::onBeforePageDisplay",
+ "BSUserManagerAfterAddUser":
"Avatars::onBSUserManagerAfterAddUser",
+ "LocalUserCreated": "Avatars::onLocalUserCreated"
},
"manifest_version": 1
}
--
To view, visit https://gerrit.wikimedia.org/r/356404
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iaef178a2eba774b99361e715cdb939bafe89f68a
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: master
Gerrit-Owner: Pwirth
Gerrit-Reviewer: Ljonka
Gerrit-Reviewer: Mglaser
Gerrit-Reviewer: Robert Vogel
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceExtensions[REL1_27]: BSAvatars: Fixed missing initial avatars for new users
Robert Vogel has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/356531 )
Change subject: BSAvatars: Fixed missing initial avatars for new users
..
BSAvatars: Fixed missing initial avatars for new users
=> #5787
=> Needs cherry-pick to REL1_27
Change-Id: Iaef178a2eba774b99361e715cdb939bafe89f68a
---
M Avatars/Avatars.class.php
M Avatars/extension.json
2 files changed, 43 insertions(+), 1 deletion(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceExtensions
refs/changes/31/356531/1
diff --git a/Avatars/Avatars.class.php b/Avatars/Avatars.class.php
index 2f3b34d..1fc7c2c 100644
--- a/Avatars/Avatars.class.php
+++ b/Avatars/Avatars.class.php
@@ -263,4 +263,44 @@
return $sNewUserImageSrc;
}
+ /**
+* Create an initial Avatar
+* @param User $user
+* @param boolean $autocreated
+* @return boolean
+*/
+ public static function onLocalUserCreated( $user, $autocreated ) {
+ $oAvatars = BsExtensionManager::getExtension( 'Avatars' );
+ try{
+ $sNewPath = $oAvatars->generateAvatar( $user, array(),
true );
+ } catch( Exception $e ) {
+ wfDebugLog(
+ 'BS::Avatars',
+ 'onLocalUserCreated: Error: '.$e->getMessage()
+ );
+ }
+ return true;
+ }
+
+ /**
+* Create an initial Avatar
+* @param UserManager $oUserManager
+* @param User $oUser
+* @param array $aMetaData
+* @param Status $oStatus
+* @param User $oPerformer
+* @return boolean
+*/
+ public static function onBSUserManagerAfterAddUser( $oUserManager,
$oUser, $aMetaData, &$oStatus, $oPerformer ) {
+ $oAvatars = BsExtensionManager::getExtension( 'Avatars' );
+ try{
+ $sNewPath = $oAvatars->generateAvatar( $oUser, array(),
true );
+ } catch( Exception $e ) {
+ wfDebugLog(
+ 'BS::Avatars',
+ 'onBSUserManagerAfterAddUser: Error:
'.$e->getMessage()
+ );
+ }
+ return true;
+ }
}
diff --git a/Avatars/extension.json b/Avatars/extension.json
index 593caff..5140c5f 100644
--- a/Avatars/extension.json
+++ b/Avatars/extension.json
@@ -50,7 +50,9 @@
"remoteExtPath": "BlueSpiceExtensions/Avatars/resources"
},
"Hooks": {
- "BeforePageDisplay": "Avatars::onBeforePageDisplay"
+ "BeforePageDisplay": "Avatars::onBeforePageDisplay",
+ "BSUserManagerAfterAddUser":
"Avatars::onBSUserManagerAfterAddUser",
+ "LocalUserCreated": "Avatars::onLocalUserCreated"
},
"manifest_version": 1
}
--
To view, visit https://gerrit.wikimedia.org/r/356531
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iaef178a2eba774b99361e715cdb939bafe89f68a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: REL1_27
Gerrit-Owner: Robert Vogel
Gerrit-Reviewer: Pwirth
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/dns[master]: Revert "wmnet: Point m3 slave to eqiad master"
Hello jenkins-bot, Jcrespo, I'd like you to do a code review. Please visit https://gerrit.wikimedia.org/r/356525 to review the following change. Change subject: Revert "wmnet: Point m3 slave to eqiad master" .. Revert "wmnet: Point m3 slave to eqiad master" This reverts commit a1f193e5485f50900f9658d5edba94d7c7a2927f. Change-Id: I107586b60ac4a2ee5c4e9947f03aa9dea6a90cae --- M templates/wmnet 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/dns refs/changes/25/356525/1 diff --git a/templates/wmnet b/templates/wmnet index b1e0948..c8f5b60 100644 --- a/templates/wmnet +++ b/templates/wmnet @@ -46,7 +46,7 @@ m2-master 5M IN CNAMEdbproxy1002.eqiad.wmnet. m2-slave5M IN CNAMEdb2011.codfw.wmnet. m3-master 5M IN CNAMEdbproxy1003.eqiad.wmnet. -m3-slave5M IN CNAMEdb1043.eqiad.wmnet. +m3-slave5M IN CNAMEdb1048.eqiad.wmnet. m4-master 5M IN CNAMEdbproxy1004.eqiad.wmnet. m5-master 5M IN CNAMEdb1009.eqiad.wmnet. m5-slave5M IN CNAMEdb2030.codfw.wmnet. -- To view, visit https://gerrit.wikimedia.org/r/356525 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I107586b60ac4a2ee5c4e9947f03aa9dea6a90cae Gerrit-PatchSet: 1 Gerrit-Project: operations/dns Gerrit-Branch: master Gerrit-Owner: Marostegui Gerrit-Reviewer: Jcrespo Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Flow[master]: Use MediaWiki\suppressWarnings to suppress warnings
Umherirrender has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/356523 )
Change subject: Use MediaWiki\suppressWarnings to suppress warnings
..
Use MediaWiki\suppressWarnings to suppress warnings
Silencing errors is discouraged
Change-Id: Idb02e9936a64d0c2c1d8a02e52df21c59fdad096
---
M maintenance/repair_missing_revision_content.php
1 file changed, 7 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Flow
refs/changes/23/356523/1
diff --git a/maintenance/repair_missing_revision_content.php
b/maintenance/repair_missing_revision_content.php
index 8af19d5..b243415 100644
--- a/maintenance/repair_missing_revision_content.php
+++ b/maintenance/repair_missing_revision_content.php
@@ -125,11 +125,16 @@
foreach ( $range as $possible ) {
$url = "DB://$cluster/$possible";
$content = gzinflate(
ExternalStore::fetchFromURL( $url ) );
- if ( false !== @unserialize( $content )
) {
+ MediaWiki\suppressWarnings();
+ $unserializedContent = unserialize(
$content );
+ MediaWiki\restoreWarnings();
+ if ( false !== $unserializedContent ) {
// if it unserializes, its not
our content
continue;
}
- $json = @json_decode( $content, true );
+ MediaWiki\suppressWarnings();
+ $json = json_decode( $content, true );
+ MediaWiki\restoreWarnings();
if ( $json && count( $json ) === 1 &&
isset( $json['flow-workflow'] ) ) {
// while technically possible
to be a topic title, i'm almost
// certain this is a core
revisions inserted by flow in the form
--
To view, visit https://gerrit.wikimedia.org/r/356523
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Idb02e9936a64d0c2c1d8a02e52df21c59fdad096
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: Umherirrender
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...CodeReview[master]: Avoid error suppressing
Umherirrender has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/356522 )
Change subject: Avoid error suppressing
..
Avoid error suppressing
Silencing errors is discouraged
Change-Id: Icb681dd6a2ea3866d15b020bf82b4a66f6817d13
---
M backend/Subversion.php
1 file changed, 2 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CodeReview
refs/changes/22/356522/1
diff --git a/backend/Subversion.php b/backend/Subversion.php
index f1caecd..bf71495 100644
--- a/backend/Subversion.php
+++ b/backend/Subversion.php
@@ -295,7 +295,8 @@
);
$document = new DOMDocument();
- if ( !@$document->loadXML( wfShellExec( $command ) ) ) {
+ $listXml = wfShellExec( $command );
+ if ( !$listXml || !$document->loadXML( $listXml ) ) {
// svn list --xml returns invalid XML if the file does
not exist
// FIXME: report bug upstream
return false;
--
To view, visit https://gerrit.wikimedia.org/r/356522
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Icb681dd6a2ea3866d15b020bf82b4a66f6817d13
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CodeReview
Gerrit-Branch: master
Gerrit-Owner: Umherirrender
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Apply $wgShellLocale in Setup.php
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/352861 )
Change subject: Apply $wgShellLocale in Setup.php
..
Apply $wgShellLocale in Setup.php
While most of MediaWiki ignores the shell's/C library's locale setting,
there are some things other than shell execs that use it (e.g. the
luasandbox PHP extension).
To provide a consistent environment, set the locale in Setup.php instead
of letting it be changed mid-request depending on whether something else
happened to have called certain functions.
Bug: T107128
Change-Id: I02943803d26d5b1b3ac00ef9216f69cdfa149585
---
M RELEASE-NOTES-1.30
M includes/DefaultSettings.php
M includes/GlobalFunctions.php
M includes/Setup.php
4 files changed, 9 insertions(+), 19 deletions(-)
Approvals:
Tim Starling: Looks good to me, approved
jenkins-bot: Verified
diff --git a/RELEASE-NOTES-1.30 b/RELEASE-NOTES-1.30
index e61277a..22fed0c 100644
--- a/RELEASE-NOTES-1.30
+++ b/RELEASE-NOTES-1.30
@@ -21,6 +21,8 @@
to plain class names, using the 'factory' key in the module description
array. This allows dependency injection to be used for ResourceLoader
modules.
* $wgExceptionHooks has been removed.
+* $wgShellLocale is now applied for all requests. wfInitShellLocale() is
+ deprecated and a no-op, as it is no longer needed.
=== New features in 1.30 ===
* (T37247) Output from Parser::parse() will now be wrapped in a div with
diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index 19c585d..f7f52e5 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -8183,7 +8183,6 @@
* @note If multiple wikis are being served from the same process (e.g. the
* same fastCGI or Apache server), this setting must be the same on all those
* wikis.
- * @see wfInitShellLocale()
*/
$wgShellLocale = 'C.UTF-8';
diff --git a/includes/GlobalFunctions.php b/includes/GlobalFunctions.php
index 9150338..c6ccf31 100644
--- a/includes/GlobalFunctions.php
+++ b/includes/GlobalFunctions.php
@@ -2192,8 +2192,6 @@
* @return string
*/
function wfEscapeShellArg( /*...*/ ) {
- wfInitShellLocale();
-
$args = func_get_args();
if ( count( $args ) === 1 && is_array( reset( $args ) ) ) {
// If only one argument has been passed, and that argument is
an array,
@@ -2307,8 +2305,6 @@
$includeStderr = isset( $options['duplicateStderr'] ) &&
$options['duplicateStderr'];
$profileMethod = isset( $options['profileMethod'] ) ?
$options['profileMethod'] : wfGetCaller();
-
- wfInitShellLocale();
$envcmd = '';
foreach ( $environ as $k => $v ) {
@@ -2533,25 +2529,14 @@
}
/**
- * Set the locale for locale-sensitive operations
+ * Formerly set the locale for locale-sensitive operations
*
- * Sets LC_ALL to a known value to work around issues like the following:
- * - https://bugs.php.net/bug.php?id=45132 escapeshellarg() destroys non-ASCII
- * characters if LANG is not a UTF-8 locale
- * - T107128 Scribunto string comparison works case insensitive while the
- * standard Lua case sensitive
+ * This is now done in Setup.php.
*
+ * @deprecated since 1.30, no longer needed
* @see $wgShellLocale
*/
function wfInitShellLocale() {
- static $done = false;
- if ( $done ) {
- return;
- }
- $done = true;
- global $wgShellLocale;
- putenv( "LC_ALL=$wgShellLocale" );
- setlocale( LC_ALL, $wgShellLocale );
}
/**
diff --git a/includes/Setup.php b/includes/Setup.php
index 5ea96dd..b10cf23 100644
--- a/includes/Setup.php
+++ b/includes/Setup.php
@@ -49,6 +49,10 @@
mb_internal_encoding( 'UTF-8' );
+// Set the configured locale on all requests for consisteny
+putenv( "LC_ALL=$wgShellLocale" );
+setlocale( LC_ALL, $wgShellLocale );
+
// Set various default paths sensibly...
$ps_default = Profiler::instance()->scopedProfileIn( $fname . '-defaults' );
--
To view, visit https://gerrit.wikimedia.org/r/352861
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I02943803d26d5b1b3ac00ef9216f69cdfa149585
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Anomie
Gerrit-Reviewer: Krinkle
Gerrit-Reviewer: Legoktm
Gerrit-Reviewer: Tim Starling
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Avoid scoped lock errors in Category::refreshCounts() due to...
Aaron Schulz has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/356520 )
Change subject: Avoid scoped lock errors in Category::refreshCounts() due to
nesting
..
Avoid scoped lock errors in Category::refreshCounts() due to nesting
Bug: T166757
Change-Id: Ie59523a8b3315f063c914cd25d7b53c11e03fbcd
---
M includes/deferred/LinksDeletionUpdate.php
M includes/page/WikiPage.php
2 files changed, 9 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/20/356520/1
diff --git a/includes/deferred/LinksDeletionUpdate.php
b/includes/deferred/LinksDeletionUpdate.php
index ca29078..3dd9de6 100644
--- a/includes/deferred/LinksDeletionUpdate.php
+++ b/includes/deferred/LinksDeletionUpdate.php
@@ -106,7 +106,11 @@
__METHOD__
);
if ( $row ) {
- Category::newFromRow( $row, $title
)->refreshCounts();
+ $cat = Category::newFromRow( $row, $title );
+ // T166757: do the update after the main job DB
commit
+ DeferredUpdates::addCallableUpdate( function ()
use ( $cat ) {
+ $cat->refreshCounts();
+ } );
}
}
diff --git a/includes/page/WikiPage.php b/includes/page/WikiPage.php
index 7489f44..2adc5fb 100644
--- a/includes/page/WikiPage.php
+++ b/includes/page/WikiPage.php
@@ -3496,7 +3496,10 @@
);
foreach ( $rows as $row ) {
$cat = Category::newFromRow( $row );
- $cat->refreshCounts();
+ // T166757: do the update after this DB commit
+ DeferredUpdates::addCallableUpdate( function ()
use ( $cat ) {
+ $cat->refreshCounts();
+ } );
}
}
}
--
To view, visit https://gerrit.wikimedia.org/r/356520
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie59523a8b3315f063c914cd25d7b53c11e03fbcd
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: contint: Fix stretch support in package_builder
Dzahn has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/356237 )
Change subject: contint: Fix stretch support in package_builder
..
contint: Fix stretch support in package_builder
Causing puppet to fail on stretch
Error: Could not retrieve catalog from remote server: Error 400 on SERVER:
OS debian == jessie required. at
/etc/puppet/modules/contint/manifests/package_builder.pp:8 on node
jenkins-slave-01.git.eqiad.wmflabs
Bug: T166611
Change-Id: I7d1f1e84017b7afad3e18bd74e2c03fc08c3f407
---
M modules/contint/manifests/package_builder.pp
1 file changed, 0 insertions(+), 3 deletions(-)
Approvals:
Hashar: Looks good to me, but someone else must approve
jenkins-bot: Verified
Dzahn: Looks good to me, approved
diff --git a/modules/contint/manifests/package_builder.pp
b/modules/contint/manifests/package_builder.pp
index 1ef005b..2b5c3aa 100644
--- a/modules/contint/manifests/package_builder.pp
+++ b/modules/contint/manifests/package_builder.pp
@@ -4,9 +4,6 @@
#
class contint::package_builder {
-# We dont want package builder all over the place. Safeguard.
-requires_os('debian == jessie')
-
# Shell script wrappers to ease package building
# Package generated via the mirror operations/debs/jenkins-debian-glue.git
--
To view, visit https://gerrit.wikimedia.org/r/356237
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I7d1f1e84017b7afad3e18bd74e2c03fc08c3f407
Gerrit-PatchSet: 6
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Paladox
Gerrit-Reviewer: Dzahn
Gerrit-Reviewer: Giuseppe Lavagetto
Gerrit-Reviewer: Hashar
Gerrit-Reviewer: Muehlenhoff
Gerrit-Reviewer: Paladox
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: Gerrit: Add systemd service to base::service_unit
Paladox has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/356518 ) Change subject: Gerrit: Add systemd service to base::service_unit .. Gerrit: Add systemd service to base::service_unit Also whilst at it, set ulimit with the reasons below Change-Id: I4411fb8a565f68460087e3f432eb12c0d2144dd2 --- 0 files changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/18/356518/1 -- To view, visit https://gerrit.wikimedia.org/r/356518 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I4411fb8a565f68460087e3f432eb12c0d2144dd2 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Paladox Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: gerrit: import systemd unit file from deb to puppet
Dzahn has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/356517 ) Change subject: gerrit: import systemd unit file from deb to puppet .. gerrit: import systemd unit file from deb to puppet As a second step after Ib3acbe3b17351, import the systemd unit file from the Debian package into the puppet repo, in the correct location for base::service_unit. In addition add the (missing) "Limit" lines that should replace the ulimit lines from the sysvinit init script, as Paladox suggested on I8499dac8edbb3815. Not having those most likely caused the issue we experienced today with Gerrit opening too many files. Just instead of adding more things to the package we are adding it here in puppet right away. NOT actually setting "systemd => true" in base::service_unit, the Limit settings especially need more testing. Change-Id: Ie2ccf1386754cc2224bc62d723f9e45170bb4566 --- A modules/gerrit/templates/initscripts/gerrit.systemd.erb 1 file changed, 31 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/17/356517/1 diff --git a/modules/gerrit/templates/initscripts/gerrit.systemd.erb b/modules/gerrit/templates/initscripts/gerrit.systemd.erb new file mode 100644 index 000..0cc3bce --- /dev/null +++ b/modules/gerrit/templates/initscripts/gerrit.systemd.erb @@ -0,0 +1,31 @@ +[Unit] +Description=Gerrit code review tool +After=network.target + +[Service] +User=gerrit2 +Group=gerrit2 +Type=simple +PIDFile=/var/lib/gerrit2/review_site/logs/gerrit.pid +StandardOutput=syslog +StandardError=syslog +SyslogIdentifier=gerrit2 +EnvironmentFile=/etc/default/gerrit +ExecStart=/var/lib/gerrit2/review_site/bin/gerrit.sh start +ExecReload=/var/lib/gerrit2/review_site/bin/gerrit.sh reload +ExecStop=/var/lib/gerrit2/review_site/bin/gerrit.sh stop + +# default gerrit ulimits set by the init.d script... your choice +LimitCORE=0 +LimitDATA=infinity +LimitFSIZE=infinity +LimitRSS=infinity +# NOFILE : GERRIT_FDS, determined by "core.packedGitOpenFiles" in the script +LimitNOFILE=65536 +LimitCPU=infinity +LimitAS=infinity +LimitLOCKS=infinity + +[Install] +WantedBy=multi-user.target + -- To view, visit https://gerrit.wikimedia.org/r/356517 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie2ccf1386754cc2224bc62d723f9e45170bb4566 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] mediawiki...VisualEditor[master]: Update VE core submodule to master (8be817396)
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/356451 )
Change subject: Update VE core submodule to master (8be817396)
..
Update VE core submodule to master (8be817396)
New changes:
26085a853 Make author list a ListPopupTool
c4ea53eef Update OOjs to v2.1.0
8c94697f3 Update OOjs UI to v0.22.0
cdebc4817 Follow-up 8c94697f: Actually commit the icon changes I had locally
8be817396 Update OOjs UI to v0.22.1
Local changes for author list popup
Change-Id: I36bcaf122528a4a12882aaff3b33ef936082a391
---
M .jsduck/categories.json
M .jsduck/eg-iframe.html
M extension.json
M lib/ve
M modules/ve-mw-collab/ve.init.mw.CollabTarget.js
R modules/ve-mw/themes/wikimediaui/widgets.css
R modules/ve-mw/ui/styles/wikimediaui/ve.ui.Icons.json
7 files changed, 32 insertions(+), 24 deletions(-)
Approvals:
jenkins-bot: Verified
Jforrester: Looks good to me, approved
diff --git a/.jsduck/categories.json b/.jsduck/categories.json
index 24ca660..98f50d1 100644
--- a/.jsduck/categories.json
+++ b/.jsduck/categories.json
@@ -231,9 +231,8 @@
"OO.ui.Element",
"OO.ui.HtmlSnippet",
"OO.ui.Toolbar",
- "OO.ui.Window",
+ "OO.ui.Window*",
"OO.ui.Dialog",
- "OO.ui.WindowManager",
"OO.ui.Process",
"OO.ui.Error",
"OO.ui.ActionSet"
diff --git a/.jsduck/eg-iframe.html b/.jsduck/eg-iframe.html
index ea1723b..23fe457 100644
--- a/.jsduck/eg-iframe.html
+++ b/.jsduck/eg-iframe.html
@@ -6,6 +6,10 @@
+
+
+
+
diff --git a/extension.json b/extension.json
index adc3be9..4bc8cb5 100644
--- a/extension.json
+++ b/extension.json
@@ -912,8 +912,8 @@
],
"skinStyles": {
"vector": [
-
"lib/ve/src/themes/mediawiki/dialogs.css",
-
"lib/ve/src/themes/mediawiki/widgets.css"
+
"lib/ve/src/themes/wikimediaui/dialogs.css",
+
"lib/ve/src/themes/wikimediaui/widgets.css"
],
"apex": [
"lib/ve/src/themes/apex/dialogs.css",
@@ -1080,16 +1080,17 @@
"lib/ve/src/dm/ve.dm.Change.js",
"lib/ve/src/dm/ve.dm.RebaseClient.js",
"lib/ve/src/dm/ve.dm.SurfaceSynchronizer.js",
-
"lib/ve/src/ui/widgets/ve.ui.AuthorListWidget.js"
+
"lib/ve/src/ui/widgets/ve.ui.AuthorItemWidget.js",
+
"lib/ve/src/ui/tools/ve.ui.AuthorListPopupTool.js"
],
"styles": [
-
"lib/ve/src/ui/styles/widgets/ve.ui.AuthorListWidget.css"
+
"lib/ve/src/ui/styles/widgets/ve.ui.AuthorItemWidget.css"
],
"dependencies": [
"ext.visualEditor.core",
"dompurify",
"socket.io",
- "oojs-ui.styles.icons-alerts"
+ "oojs-ui.styles.icons-user"
],
"messages": [
"visualeditor-rebase-client-author-name"
@@ -1261,7 +1262,7 @@
],
"skinStyles": {
"vector": [
-
"modules/ve-mw/themes/mediawiki/widgets.css"
+
"modules/ve-mw/themes/wikimediaui/widgets.css"
],
"monobook": [
"modules/ve-mw/themes/apex/widgets.css"
diff --git a/lib/ve b/lib/ve
index 9cd1842..8be8173 16
--- a/lib/ve
+++ b/lib/ve
@@ -1 +1 @@
-Subproject commit 9cd18424bf77a191a9735ff2bfc5f75e7b54b7e3
+Subproject commit 8be81739624b35c984e8f777f7941f622d89cb8e
diff --git a/modules/ve-mw-collab/ve.init.mw.CollabTarget.js
b/modules/ve-mw-collab/ve.init.mw.CollabTarget.js
index 4c8a6e4..4d95271 100644
--- a/modules/ve-mw-collab/ve.init.mw.CollabTarget.js
+++ b/modules/ve-mw-collab/ve.init.mw.CollabTarget.js
@@ -47,6 +47,10 @@
ve.init.mw.CollabTarget.static.trackingName
[MediaWiki-commits] [Gerrit] operations/puppet[production]: gerrit: switch to base::service_unit, import sysvinit script...
Dzahn has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/356516 )
Change subject: gerrit: switch to base::service_unit, import sysvinit script to
puppet
..
gerrit: switch to base::service_unit, import sysvinit script to puppet
This replaces the service{} with base::service_unit, which is made
to be init-system agnostic. (see modules/base/manifests/service_unit.pp).
Deliberately not also switching it to use the new systemd unit file, which
caused the problems today, in this step.
Just importing the existing /etc/init.d/gerrit sysvinit script from cobalt
that comes from the package (which is planned to be replaced by scap deploy)
and importing it here in puppet.
Using it worked just fine today and always has. The next separate step
would then be to actually switch to systemd (after testing the unit file
and the ulimit thing etc), but i did not want to do all that in one change,
rather first do this and later change the initsystem. The point of this
abstraction
is to be initsystem-agnostic after all.
Change-Id: Ib3acbe3b1735121f679403f70e18dd1746c0070c
---
M modules/gerrit/manifests/jetty.pp
A modules/gerrit/templates/initscripts/gerrit.sysvinit.erb
2 files changed, 587 insertions(+), 5 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/16/356516/1
diff --git a/modules/gerrit/manifests/jetty.pp
b/modules/gerrit/manifests/jetty.pp
index 134eeb5..a5f9222 100644
--- a/modules/gerrit/manifests/jetty.pp
+++ b/modules/gerrit/manifests/jetty.pp
@@ -197,11 +197,17 @@
source => 'puppet:///modules/gerrit/static',
}
-service { 'gerrit':
-ensure=> running,
-enable=> true,
-hasstatus => false,
-status=> '/etc/init.d/gerrit check',
+base::service_unit { 'gerrit':
+ensure => present, # implies ensure => running
+sysvinit => true,# still working fine
+systemd => false, # coming soon
+systemd_override => false, # if we wanted to use unit file from deb
package
+upstart => false, # skip that
+refresh => false, # do not restart on config changes
+service_params => {
+hasstatus => false,
+status=> '/etc/init.d/gerrit check',
+}
}
file { '/etc/default/gerritcodereview':
diff --git a/modules/gerrit/templates/initscripts/gerrit.sysvinit.erb
b/modules/gerrit/templates/initscripts/gerrit.sysvinit.erb
new file mode 100644
index 000..4117fd7
--- /dev/null
+++ b/modules/gerrit/templates/initscripts/gerrit.sysvinit.erb
@@ -0,0 +1,576 @@
+#!/bin/sh
+#
+# Launch Gerrit Code Review as a daemon process.
+
+# To get the service to restart correctly on reboot, uncomment below (3 lines):
+#
+# chkconfig: 3 99 99
+# description: Gerrit Code Review
+# processname: gerrit
+#
+
+### BEGIN INIT INFO
+# Provides: gerrit
+# Required-Start:$named $remote_fs $syslog
+# Required-Stop: $named $remote_fs $syslog
+# Default-Start: 2 3 4 5
+# Default-Stop: 0 1 6
+# Short-Description: Start/stop Gerrit Code Review
+# Description: Gerrit is a web based code review system, facilitating
online code reviews
+#for projects using the Git version control system.
+### END INIT INFO
+
+# Configuration files:
+#
+# /etc/default/gerritcodereview
+# If it exists, sourced at the start of this script. It may perform any
+# sequence of shell commands, like setting relevant environment variables.
+#
+# The files will be checked for existence before being sourced.
+
+# Configuration variables. These may be set in /etc/default/gerritcodereview.
+#
+# GERRIT_SITE
+# Path of the Gerrit site to run. $GERRIT_SITE/etc/gerrit.config
+# will be used to configure the process.
+#
+# GERRIT_WAR
+# Location of the gerrit.war download that we will execute. Defaults to
+# container.war property in $GERRIT_SITE/etc/gerrit.config.
+#
+# NO_START
+# If set to "1" disables Gerrit from starting.
+#
+# START_STOP_DAEMON
+# If set to "0" disables using start-stop-daemon. This may need to
+# be set on SuSE systems.
+
+usage() {
+me=`basename "$0"`
+echo >&2 "Usage: $me
{start|stop|restart|check|status|run|supervise|threads} [-d site]"
+exit 1
+}
+
+test $# -gt 0 || usage
+
+##
+# Some utility functions
+##
+running() {
+ test -f $1 || return 1
+ PID=`cat $1`
+ ps -p $PID >/dev/null 2>/dev/null || return 1
+ return 0
+}
+
+thread_dump() {
+ test -f $1 || return 1
+ PID=`cat $1`
+ $JSTACK $PID || return 1
+ return 0;
+}
+
+get_config() {
+ if test -f "$GERRIT_CONFIG" ; then
+if test "x$1" = x--int ; then
+ # Git might not be able to expand "8g" properly. If it gives
+ # us 0 b
[MediaWiki-commits] [Gerrit] mediawiki...DonationInterface[master]: Switch TestingAccessWrapper to librarized version
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/349092 )
Change subject: Switch TestingAccessWrapper to librarized version
..
Switch TestingAccessWrapper to librarized version
Bug: T163434
Change-Id: Iab1a2d6ec361eb282378df8de5126005942a870f
---
M composer.json
M composer.lock
M tests/phpunit/Adapter/Adyen/AdyenTest.php
M tests/phpunit/Adapter/AstroPay/AstroPayTest.php
M tests/phpunit/Adapter/GatewayAdapterTest.php
M tests/phpunit/Adapter/GlobalCollect/GlobalCollectOrphanAdapterTest.php
M tests/phpunit/Adapter/GlobalCollect/GlobalCollectTest.php
M tests/phpunit/DonationInterfaceTestCase.php
M tests/phpunit/FraudFiltersTest.php
9 files changed, 69 insertions(+), 5 deletions(-)
Approvals:
jenkins-bot: Verified
Ejegg: Looks good to me, approved
diff --git a/composer.json b/composer.json
index 21e4495..b0c1d68 100644
--- a/composer.json
+++ b/composer.json
@@ -35,7 +35,8 @@
"addshore/psr-6-mediawiki-bagostuff-adapter": "0.1"
},
"require-dev": {
- "jakub-onderka/php-parallel-lint": "0.9.2"
+ "jakub-onderka/php-parallel-lint": "0.9.2",
+ "wikimedia/testing-access-wrapper": "~1.0"
},
"repositories": [
{
diff --git a/composer.lock b/composer.lock
index ace867d..828001b 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
"Read more about it at
https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file";,
"This file is @generated automatically"
],
-"content-hash": "c77aa55a881981c2f2170a5894371bc0",
+"content-hash": "22b27fd4e340d42c6a3b461f7f1fd7a6",
"packages": [
{
"name": "addshore/psr-6-mediawiki-bagostuff-adapter",
@@ -198,7 +198,7 @@
"queue",
"transaction"
],
-"time": "2017-04-17 14:11:55"
+"time": "2017-04-17T14:11:55+00:00"
},
{
"name": "corneltek/getoptionkit",
@@ -1037,7 +1037,7 @@
"donations",
"payments"
],
-"time": "2017-05-19 17:03:40"
+"time": "2017-05-19T17:03:40+00:00"
},
{
"name": "zordius/lightncandy",
@@ -1134,6 +1134,56 @@
"description": "This tool check syntax of PHP files about 20x
faster than serial check.",
"homepage": "https://github.com/JakubOnderka/PHP-Parallel-Lint";,
"time": "2015-12-15T10:42:16+00:00"
+},
+{
+"name": "wikimedia/testing-access-wrapper",
+"version": "1.0.0",
+"source": {
+"type": "git",
+"url":
"https://github.com/wikimedia/testing-access-wrapper.git";,
+"reference": "e18b87c86739733506bd184a70852c30cdb30699"
+},
+"dist": {
+"type": "zip",
+"url":
"https://api.github.com/repos/wikimedia/testing-access-wrapper/zipball/e18b87c86739733506bd184a70852c30cdb30699";,
+"reference": "e18b87c86739733506bd184a70852c30cdb30699",
+"shasum": ""
+},
+"require": {
+"php": ">=5.3.0"
+},
+"require-dev": {
+"jakub-onderka/php-parallel-lint": "0.9.2",
+"mediawiki/mediawiki-codesniffer": "0.7.2",
+"phpunit/phpunit": "4.8.31"
+},
+"type": "library",
+"autoload": {
+"classmap": [
+"src/"
+]
+},
+"notification-url": "https://packagist.org/downloads/";,
+"license": [
+"GPL-2.0+"
+],
+"authors": [
+{
+"name": "Adam Roses Wight",
+"email": "awi...@wikimedia.org"
+},
+{
+"name": "Brad Jorsch",
+"email": "bjor...@wikimedia.org"
+},
+{
+"name": "Gergő Tisza",
+"email": "gti...@wikimedia.org"
+}
+],
+"description": "A simple helper class to access non-public
elements of a class when testing.",
+"homepage":
"https://www.mediawiki.org/wiki/Testing-access-wrapper";,
+"time": "2017-04-19T16:43:33+00:00"
}
],
"aliases": [],
diff --git a/tests/phpunit/Adapter/Adyen/AdyenTest.php
b/tests/phpunit/Adapter/Adyen/AdyenTest.php
index d13be4f..ef39dce 100644
--- a/tests/phpunit/Adapter/Adyen/AdyenTest.php
+++ b/tests/phpunit/Adapter/Adyen/AdyenTest.php
@@ -15,6 +15,8 @@
* GNU General Public License for more details.
*/
+use Wikimedia\TestingAccessWrapper;
+
/**
*
* @group Fundraising
diff --git a/tests/phpunit/Adapter/A
[MediaWiki-commits] [Gerrit] mediawiki...VisualEditor[master]: Replace uses of the removed 'remove' icon with the 'trash' one
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/356501 )
Change subject: Replace uses of the removed 'remove' icon with the 'trash' one
..
Replace uses of the removed 'remove' icon with the 'trash' one
Bug: T166730
Change-Id: I528dcdb390a4488ffac89fc823ff35bc1eda4f24
---
M extension.json
M modules/ve-mw/ui/pages/ve.ui.MWParameterPlaceholderPage.js
M modules/ve-mw/ui/pages/ve.ui.MWTemplatePage.js
M modules/ve-mw/ui/pages/ve.ui.MWTemplatePlaceholderPage.js
M modules/ve-mw/ui/pages/ve.ui.MWTransclusionContentPage.js
M modules/ve-mw/ui/widgets/ve.ui.MWCategoryPopupWidget.js
6 files changed, 6 insertions(+), 5 deletions(-)
Approvals:
Catrope: Looks good to me, approved
jenkins-bot: Verified
diff --git a/extension.json b/extension.json
index adc3be9..d930692 100644
--- a/extension.json
+++ b/extension.json
@@ -2020,6 +2020,7 @@
"oojs-ui.styles.icons-editing-core",
"oojs-ui.styles.icons-editing-styling",
"oojs-ui.styles.icons-editing-list",
+ "oojs-ui.styles.icons-moderation",
"oojs-ui.styles.indicators",
"oojs-ui.styles.textures",
"ext.visualEditor.moduleIcons",
diff --git a/modules/ve-mw/ui/pages/ve.ui.MWParameterPlaceholderPage.js
b/modules/ve-mw/ui/pages/ve.ui.MWParameterPlaceholderPage.js
index e822a0b..62e7e3c 100644
--- a/modules/ve-mw/ui/pages/ve.ui.MWParameterPlaceholderPage.js
+++ b/modules/ve-mw/ui/pages/ve.ui.MWParameterPlaceholderPage.js
@@ -39,7 +39,7 @@
this.removeButton = new OO.ui.ButtonWidget( {
framed: false,
- icon: 'remove',
+ icon: 'trash',
title: ve.msg( 'visualeditor-dialog-transclusion-remove-param'
),
flags: [ 'destructive' ],
classes: [ 've-ui-mwTransclusionDialog-removeButton' ]
diff --git a/modules/ve-mw/ui/pages/ve.ui.MWTemplatePage.js
b/modules/ve-mw/ui/pages/ve.ui.MWTemplatePage.js
index 571d519..6adf3ac 100644
--- a/modules/ve-mw/ui/pages/ve.ui.MWTemplatePage.js
+++ b/modules/ve-mw/ui/pages/ve.ui.MWTemplatePage.js
@@ -35,7 +35,7 @@
this.$description = $( '' );
this.removeButton = new OO.ui.ButtonWidget( {
framed: false,
- icon: 'remove',
+ icon: 'trash',
title: ve.msg(
'visualeditor-dialog-transclusion-remove-template' ),
flags: [ 'destructive' ],
classes: [ 've-ui-mwTransclusionDialog-removeButton' ]
diff --git a/modules/ve-mw/ui/pages/ve.ui.MWTemplatePlaceholderPage.js
b/modules/ve-mw/ui/pages/ve.ui.MWTemplatePlaceholderPage.js
index 553058d..a75eabd 100644
--- a/modules/ve-mw/ui/pages/ve.ui.MWTemplatePlaceholderPage.js
+++ b/modules/ve-mw/ui/pages/ve.ui.MWTemplatePlaceholderPage.js
@@ -49,7 +49,7 @@
this.removeButton = new OO.ui.ButtonWidget( {
framed: false,
- icon: 'remove',
+ icon: 'trash',
title: ve.msg(
'visualeditor-dialog-transclusion-remove-template' ),
flags: [ 'destructive' ],
classes: [ 've-ui-mwTransclusionDialog-removeButton' ]
diff --git a/modules/ve-mw/ui/pages/ve.ui.MWTransclusionContentPage.js
b/modules/ve-mw/ui/pages/ve.ui.MWTransclusionContentPage.js
index 0d1a99e..15c5cab 100644
--- a/modules/ve-mw/ui/pages/ve.ui.MWTransclusionContentPage.js
+++ b/modules/ve-mw/ui/pages/ve.ui.MWTransclusionContentPage.js
@@ -36,7 +36,7 @@
.connect( this, { change: 'onTextInputChange' } );
this.removeButton = new OO.ui.ButtonWidget( {
framed: false,
- icon: 'remove',
+ icon: 'trash',
title: ve.msg(
'visualeditor-dialog-transclusion-remove-content' ),
flags: [ 'destructive' ],
classes: [ 've-ui-mwTransclusionDialog-removeButton' ]
diff --git a/modules/ve-mw/ui/widgets/ve.ui.MWCategoryPopupWidget.js
b/modules/ve-mw/ui/widgets/ve.ui.MWCategoryPopupWidget.js
index 4ad25a7..3deb53a 100644
--- a/modules/ve-mw/ui/widgets/ve.ui.MWCategoryPopupWidget.js
+++ b/modules/ve-mw/ui/widgets/ve.ui.MWCategoryPopupWidget.js
@@ -29,7 +29,7 @@
this.$menu = $( '' );
this.removeButton = new OO.ui.ButtonWidget( {
framed: false,
- icon: 'remove',
+ icon: 'trash',
title: ve.msg( 'visualeditor-inspector-remove-tooltip' )
} );
this.sortKeyInput = new OO.ui.TextInputWidget();
--
To view, visit https://gerrit.wikimedia.org/r/356501
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I528dcdb390a4488ffac89fc823ff35bc1eda4f24
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
[MediaWiki-commits] [Gerrit] mediawiki...CentralNotice[master]: Add explict var visibility
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/355767 ) Change subject: Add explict var visibility .. Add explict var visibility Change-Id: I39a4e6f428f8584e958d91d365ca690daf6b46b5 --- M includes/CampaignLog.php 1 file changed, 3 insertions(+), 3 deletions(-) Approvals: jenkins-bot: Verified Ejegg: Looks good to me, approved diff --git a/includes/CampaignLog.php b/includes/CampaignLog.php index 76e0ab5..e0500c9 100644 --- a/includes/CampaignLog.php +++ b/includes/CampaignLog.php @@ -1,9 +1,9 @@ https://gerrit.wikimedia.org/r/355767 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I39a4e6f428f8584e958d91d365ca690daf6b46b5 Gerrit-PatchSet: 3 Gerrit-Project: mediawiki/extensions/CentralNotice Gerrit-Branch: master Gerrit-Owner: Umherirrender Gerrit-Reviewer: AndyRussG Gerrit-Reviewer: Awight Gerrit-Reviewer: Cdentinger Gerrit-Reviewer: Ejegg Gerrit-Reviewer: Thiemo Mättig (WMDE) Gerrit-Reviewer: Umherirrender Gerrit-Reviewer: XenoRyet Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...CentralNotice[master]: Remove unused global
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/356408 )
Change subject: Remove unused global
..
Remove unused global
Change-Id: Id4549426f80053ad4d990024b1298c5fbdd8cf0f
---
M TemplatePager.php
M special/SpecialGlobalAllocation.php
2 files changed, 0 insertions(+), 4 deletions(-)
Approvals:
Hashar: Looks good to me, but someone else must approve
jenkins-bot: Verified
Ejegg: Looks good to me, approved
diff --git a/TemplatePager.php b/TemplatePager.php
index c612f3b..56c19de 100644
--- a/TemplatePager.php
+++ b/TemplatePager.php
@@ -75,8 +75,6 @@
* @return string HTML
*/
function formatRow( $row ) {
- global $wgLanguageCode;
-
// Begin banner row
$htmlOut = Xml::openElement( 'tr' );
diff --git a/special/SpecialGlobalAllocation.php
b/special/SpecialGlobalAllocation.php
index eda2f98..9246e95 100644
--- a/special/SpecialGlobalAllocation.php
+++ b/special/SpecialGlobalAllocation.php
@@ -222,8 +222,6 @@
* Show a list of banners with allocation. Newer banners are shown
first.
*/
public function showList() {
- global $wgNoticeNumberOfBuckets;
-
// Begin building HTML
$htmlOut = '';
--
To view, visit https://gerrit.wikimedia.org/r/356408
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Id4549426f80053ad4d990024b1298c5fbdd8cf0f
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/CentralNotice
Gerrit-Branch: master
Gerrit-Owner: Umherirrender
Gerrit-Reviewer: AndyRussG
Gerrit-Reviewer: Awight
Gerrit-Reviewer: Cdentinger
Gerrit-Reviewer: Ejegg
Gerrit-Reviewer: Hashar
Gerrit-Reviewer: XenoRyet
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...FundraiserLandingPage[master]: Add phpcs and make pass
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/356211 )
Change subject: Add phpcs and make pass
..
Add phpcs and make pass
Change-Id: I468d4ba37291c387e4f4f95ece049b814a06a881
---
M FundraiserLandingPage.alias.php
M FundraiserLandingPage.body.php
M FundraiserLandingPage.i18n.magic.php
M FundraiserLandingPage.php
M FundraiserRedirector.body.php
M composer.json
A phpcs.xml
7 files changed, 74 insertions(+), 54 deletions(-)
Approvals:
jenkins-bot: Verified
Thiemo Mättig (WMDE): Looks good to me, but someone else must approve
Ejegg: Looks good to me, approved
diff --git a/FundraiserLandingPage.alias.php b/FundraiserLandingPage.alias.php
index 3931949..4e4b844 100644
--- a/FundraiserLandingPage.alias.php
+++ b/FundraiserLandingPage.alias.php
@@ -1,9 +1,9 @@
array( 'FundraiserLandingPage', 'FLP' ),
- 'FundraiserRedirector' => array( 'FundraiserRedirector', 'FR' ),
-);
+$specialPageAliases[ 'en' ] = [
+ 'FundraiserLandingPage' => [ 'FundraiserLandingPage', 'FLP' ],
+ 'FundraiserRedirector' => [ 'FundraiserRedirector', 'FR' ],
+];
diff --git a/FundraiserLandingPage.body.php b/FundraiserLandingPage.body.php
index ec2c319..07eaf8f 100644
--- a/FundraiserLandingPage.body.php
+++ b/FundraiserLandingPage.body.php
@@ -15,40 +15,41 @@
$wgContributionTrackingFundraiserMaintenance,
$wgContributionTrackingFundraiserMaintenanceUnsched;
- if( $wgContributionTrackingFundraiserMaintenance
- || $wgContributionTrackingFundraiserMaintenanceUnsched
){
+ if ( $wgContributionTrackingFundraiserMaintenance
+ || $wgContributionTrackingFundraiserMaintenanceUnsched
+ ){
$this->getOutput()->redirect(
-
Title::newFromText("Special:FundraiserMaintenance")->getFullURL(), "302"
+ Title::newFromText(
'Special:FundraiserMaintenance' )->getFullURL(), '302'
);
}
$out = $this->getOutput();
$request = $this->getRequest();
- #Set squid age
+ // Set squid age
$out->setSquidMaxage( $wgFundraiserLandingPageMaxAge );
$this->setHeaders();
- # set the page title to something useful
+ // set the page title to something useful
$out->setPageTitle( $this->msg(
'donate_interface-make-your-donation' ) );
- # clear output variable to be safe
+ // clear output variable to be safe
$output = '';
-
- # begin generating the template call
+
+ // begin generating the template call
$template = self::fundraiserLandingPageMakeSafe(
$request->getText( 'template', $wgFundraiserLPDefaults[
'template' ] )
);
$output .= "{{ $template\n";
- # get the required variables (except template and country) to
use for the landing page
- $requiredParams = array(
+ // get the required variables (except template and country) to
use for the landing page
+ $requiredParams = [
'appeal',
'appeal-template',
'form-template',
'form-countryspecific'
- );
- foreach( $requiredParams as $requiredParam ) {
+ ];
+ foreach ( $requiredParams as $requiredParam ) {
$param = self::fundraiserLandingPageMakeSafe(
$request->getText( $requiredParam,
$wgFundraiserLPDefaults[$requiredParam] )
);
@@ -56,38 +57,38 @@
$output .= "| $requiredParam = $param\n";
}
- # get the country code
+ // get the country code
$country = $request->getVal( 'country' );
- # If country still isn't set, set it to the default
+ // If country still isn't set, set it to the default
if ( !$country ) {
$country = $wgFundraiserLPDefaults[ 'country' ];
}
$country = self::fundraiserLandingPageMakeSafe( $country );
$output .= "| country = $country\n";
- $excludeKeys = $requiredParams + array( 'template', 'country',
'title' );
+ $excludeKeys = $requiredParams + [ 'template', 'country',
'title' ];
- # add any other parameters passed in the querystring
+ // add any other parameters passed in the querystring
foreach ( $request->getValues() as $k_unsafe => $v_unsafe ) {
-
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Follow-up 7668836236: oojs-ui.styles.icons is now gone
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/356515 ) Change subject: Follow-up 7668836236: oojs-ui.styles.icons is now gone .. Follow-up 7668836236: oojs-ui.styles.icons is now gone Change-Id: If7fcde0cebe74998a31ca1e88f1d8d90ee1b1b80 --- M resources/ResourcesOOUI.php 1 file changed, 0 insertions(+), 1 deletion(-) Approvals: Catrope: Looks good to me, approved jenkins-bot: Verified diff --git a/resources/ResourcesOOUI.php b/resources/ResourcesOOUI.php index a320278..c9b5d89 100644 --- a/resources/ResourcesOOUI.php +++ b/resources/ResourcesOOUI.php @@ -67,7 +67,6 @@ 'dependencies' => [ 'oojs', 'oojs-ui-core.styles', - 'oojs-ui.styles.icons', 'oojs-ui.styles.indicators', 'oojs-ui.styles.textures', 'mediawiki.language', -- To view, visit https://gerrit.wikimedia.org/r/356515 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: If7fcde0cebe74998a31ca1e88f1d8d90ee1b1b80 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Jforrester Gerrit-Reviewer: Catrope Gerrit-Reviewer: Jack Phoenix Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Echo[master]: Use the "movement" icon pack for the "expand" icon now that ...
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/356514 ) Change subject: Use the "movement" icon pack for the "expand" icon now that the core icon pack has been removed .. Use the "movement" icon pack for the "expand" icon now that the core icon pack has been removed Change-Id: Ie3a9f2b2c638512e11646430bef18e84f45aae9c --- M extension.json 1 file changed, 2 insertions(+), 1 deletion(-) Approvals: jenkins-bot: Verified Jforrester: Looks good to me, approved diff --git a/extension.json b/extension.json index 68ff130..1ed6285 100644 --- a/extension.json +++ b/extension.json @@ -265,7 +265,8 @@ "oojs-ui.styles.icons-alerts", "oojs-ui.styles.icons-content", "oojs-ui.styles.icons-interactions", - "oojs-ui.styles.icons-moderation" + "oojs-ui.styles.icons-moderation", + "oojs-ui.styles.icons-movement" ], "messages": [ "echo-badge-count", -- To view, visit https://gerrit.wikimedia.org/r/356514 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ie3a9f2b2c638512e11646430bef18e84f45aae9c Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Echo Gerrit-Branch: master Gerrit-Owner: Catrope 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] mediawiki/core[master]: Follow-up 7668836236: oojs-ui.styles.icons is now gone
Jforrester has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/356515 ) Change subject: Follow-up 7668836236: oojs-ui.styles.icons is now gone .. Follow-up 7668836236: oojs-ui.styles.icons is now gone Change-Id: If7fcde0cebe74998a31ca1e88f1d8d90ee1b1b80 --- M resources/ResourcesOOUI.php 1 file changed, 0 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/15/356515/1 diff --git a/resources/ResourcesOOUI.php b/resources/ResourcesOOUI.php index a320278..c9b5d89 100644 --- a/resources/ResourcesOOUI.php +++ b/resources/ResourcesOOUI.php @@ -67,7 +67,6 @@ 'dependencies' => [ 'oojs', 'oojs-ui-core.styles', - 'oojs-ui.styles.icons', 'oojs-ui.styles.indicators', 'oojs-ui.styles.textures', 'mediawiki.language', -- To view, visit https://gerrit.wikimedia.org/r/356515 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If7fcde0cebe74998a31ca1e88f1d8d90ee1b1b80 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core 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] mediawiki...ContributionTracking[master]: Remove unused global
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/356400 )
Change subject: Remove unused global
..
Remove unused global
Change-Id: I945e797c59679229d957af9d1b78a2278ae5f54c
---
M ContributionTracking.processor.php
1 file changed, 0 insertions(+), 7 deletions(-)
Approvals:
Hashar: Looks good to me, but someone else must approve
jenkins-bot: Verified
Ejegg: Looks good to me, approved
diff --git a/ContributionTracking.processor.php
b/ContributionTracking.processor.php
index 83302d5..8bbd8a9 100644
--- a/ContributionTracking.processor.php
+++ b/ContributionTracking.processor.php
@@ -72,8 +72,6 @@
* @return array Staged key-value pairs ready to be saved as a
contribution.
*/
static function stage_contribution( $params ) {
- global $wgContributionTrackingUTMKey,
$wgContributionTrackingAnalyticsUpgrade;
-
//change the posted names to match the db where necessary
ContributionTrackingProcessor::rekey( $params, 'comment',
'note' );
@@ -90,15 +88,10 @@
/**
* Stages the relevent data that will be sent to the gateway
-* @global string $wgContributionTrackingPayPalRecurringIPN URL for
paypal
-* recurring donations : Defined in ContributionTracking.php
-* @global string $wgContributionTrackingPayPalIPN URL for paypal
recurring
-* donations : Defined in ContributionTracking.php
* @param array $params Parameters to post to the gateway
* @return array Staged array
*/
static function stage_repost( $params ) {
- global $wgContributionTrackingPayPalRecurringIPN,
$wgContributionTrackingPayPalIPN;
//TODO: assert that gateway makes The Sense here.
//change the posted names to match the db where necessary
ContributionTrackingProcessor::rekey( $params, 'amountGiven',
'amount_given' );
--
To view, visit https://gerrit.wikimedia.org/r/356400
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I945e797c59679229d957af9d1b78a2278ae5f54c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ContributionTracking
Gerrit-Branch: master
Gerrit-Owner: Umherirrender
Gerrit-Reviewer: Awight
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] mediawiki...Echo[master]: Use the "movement" icon pack for the "expand" icon now that ...
Catrope has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/356514 ) Change subject: Use the "movement" icon pack for the "expand" icon now that the core icon pack has been removed .. Use the "movement" icon pack for the "expand" icon now that the core icon pack has been removed Change-Id: Ie3a9f2b2c638512e11646430bef18e84f45aae9c --- M extension.json 1 file changed, 2 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Echo refs/changes/14/356514/1 diff --git a/extension.json b/extension.json index 68ff130..1ed6285 100644 --- a/extension.json +++ b/extension.json @@ -265,7 +265,8 @@ "oojs-ui.styles.icons-alerts", "oojs-ui.styles.icons-content", "oojs-ui.styles.icons-interactions", - "oojs-ui.styles.icons-moderation" + "oojs-ui.styles.icons-moderation", + "oojs-ui.styles.icons-movement" ], "messages": [ "echo-badge-count", -- To view, visit https://gerrit.wikimedia.org/r/356514 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie3a9f2b2c638512e11646430bef18e84f45aae9c Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Echo Gerrit-Branch: master Gerrit-Owner: Catrope ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Change "...." (four dots) to "..." (three dots) in the only ...
Catrope has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/356513 ) Change subject: Change "" (four dots) to "..." (three dots) in the only two messages that use it .. Change "" (four dots) to "..." (three dots) in the only two messages that use it Bug: T166377 Change-Id: Ia47d7aa27bcaf1ede08d762b243d7fe605f8b43d --- M languages/i18n/en.json 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/13/356513/1 diff --git a/languages/i18n/en.json b/languages/i18n/en.json index 25879c8..0cc25d7 100644 --- a/languages/i18n/en.json +++ b/languages/i18n/en.json @@ -1436,13 +1436,13 @@ "rcfilters-filter-watchlist-notwatched-description": "Everything except changes to your Watchlisted pages.", "rcfilters-filtergroup-changetype": "Type of change", "rcfilters-filter-pageedits-label": "Page edits", - "rcfilters-filter-pageedits-description": "Edits to wiki content, discussions, category descriptions", + "rcfilters-filter-pageedits-description": "Edits to wiki content, discussions, category descriptions...", "rcfilters-filter-newpages-label": "Page creations", "rcfilters-filter-newpages-description": "Edits that make new pages.", "rcfilters-filter-categorization-label": "Category changes", "rcfilters-filter-categorization-description": "Records of pages being added or removed from categories.", "rcfilters-filter-logactions-label": "Logged actions", - "rcfilters-filter-logactions-description": "Administrative actions, account creations, page deletions, uploads", + "rcfilters-filter-logactions-description": "Administrative actions, account creations, page deletions, uploads...", "rcfilters-hideminor-conflicts-typeofchange-global": "The \"Minor edits\" filter conflicts with one or more Type of Change filters, because certain types of change cannot be designated as \"minor.\" The conflicting filters are marked in the Active Filters area, above.", "rcfilters-hideminor-conflicts-typeofchange": "Certain types of change cannot be designated as \"minor,\" so this filter conflicts with the following Type of Change filters: $1", "rcfilters-typeofchange-conflicts-hideminor": "This Type of Change filter conflicts with the \"Minor Edits\" filter. Certain types of change cannot be designated as \"minor.\"", -- To view, visit https://gerrit.wikimedia.org/r/356513 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ia47d7aa27bcaf1ede08d762b243d7fe605f8b43d Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Catrope ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Flow[master]: Use "trash" icon instead of deprecated and removed "remove" ...
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/356512 )
Change subject: Use "trash" icon instead of deprecated and removed "remove" icon
..
Use "trash" icon instead of deprecated and removed "remove" icon
Bug: T166742
Change-Id: I79250860db7f3922685c2ec7baeb8198c467fe1c
---
M handlebars/compiled/flow_block_board-history.handlebars.php
M handlebars/compiled/flow_block_topic.handlebars.php
M handlebars/compiled/flow_block_topiclist.handlebars.php
M handlebars/compiled/flow_post.handlebars.php
M handlebars/flow_moderation_actions_list.partial.handlebars
M handlebars/flow_topic_moderation_flag.partial.handlebars
6 files changed, 13 insertions(+), 13 deletions(-)
Approvals:
jenkins-bot: Verified
Jforrester: Looks good to me, approved
diff --git a/handlebars/compiled/flow_block_board-history.handlebars.php
b/handlebars/compiled/flow_block_board-history.handlebars.php
index f5ff83f..da21c04 100644
--- a/handlebars/compiled/flow_block_board-history.handlebars.php
+++ b/handlebars/compiled/flow_block_board-history.handlebars.php
@@ -65,11 +65,11 @@
'.$sp.'
href="'.htmlentities((string)((isset($in['actions']['delete']['url']) &&
is_array($in['actions']['delete'])) ? $in['actions']['delete']['url'] : null),
ENT_QUOTES, 'UTF-8').'"
'.$sp.'
data-flow-interactive-handler="moderationDialog"
'.$sp.'
data-flow-template="flow_moderate_'.htmlentities((string)((isset($in['moderationTemplate'])
&& is_array($in)) ? $in['moderationTemplate'] : null), ENT_QUOTES,
'UTF-8').'.partial"
-'.$sp.' data-role="delete">'.((LCRun3::ifvar($cx,
((isset($in['moderationIcons']) && is_array($in)) ? $in['moderationIcons'] :
null))) ? ' ' : '').''.LCRun3::ch($cx, 'l10n',
array(array(LCRun3::ch($cx, 'concat',
array(array('flow-',((isset($in['moderationType']) && is_array($in)) ?
$in['moderationType'] :
null),'-action-delete-',((isset($in['moderationTemplate']) && is_array($in)) ?
$in['moderationTemplate'] : null)),array()), 'raw')),array()),
'encq').''.htmlentities((string)((isset($in['noop']) && is_array($in)) ?
$in['noop'] : null), ENT_QUOTES, 'UTF-8').'' : '').''.((LCRun3::ifvar($cx,
((isset($in['actions']['undelete']) && is_array($in['actions'])) ?
$in['actions']['undelete'] : null))) ?
''.htmlentities((string)((isset($in['noop']) && is_array($in)) ?
$in['noop'] : null), ENT_QUOTES, 'UTF-8').''.((LCRun3::ifvar($cx,
((isset($in['moderationIcons']) && is_array($in)) ? $in['moderationIcons'] :
null))) ? ' ' : '').''.LCRun3::ch($cx, 'l10n',
array(array(LCRun3::ch($cx, 'concat',
array(array('flow-',((isset($in['moderationType']) && is_array($in)) ?
$in['moderationType'] :
null),'-action-delete-',((isset($in['moderationTemplate']) && is_array($in)) ?
$in['moderationTemplate'] : null)),array()), 'raw')),array()),
'encq').''.htmlentities((string)((isset($in['noop']) && is_array($in)) ?
$in['noop'] : null), ENT_QUOTES, 'UTF-8').'' : '').''.((LCRun3::ifvar($cx,
((isset($in['actions']['undelete']) && is_array($in['actions'])) ?
$in['actions']['undelete'] : null))) ?
''.htmlentities((string)((isset($in['noop']) && is_array($in)) ?
$in['noop'] : null), ENT_QUOTES, 'UTF-8').''.((LCRun3::ifvar($cx,
((isset($in['moderationIcons']) && is_array($in)) ? $in['moderationIcons'] :
null))) ? ' ' : '').''.LCRun3::ch($cx, 'l10n',
array(array(LCRun3::ch($cx, 'concat',
array(array('flow-',((isset($in['moderationType']) && is_array($in)) ?
$in['moderationType'] :
null),'-action-undelete-',((isset($in['moderationTemplate']) && is_array($in))
? $in['moderationTemplate'] : null)),array()), 'raw')),array()),
'encq').''.htmlentities((string)((isset($in['noop']) && is_array($in)) ?
$in['noop'] : null), ENT_QUOTES, 'UTF-8').'' : '').''.((LCRun3::ifvar($cx,
((isset($in['actions']['suppress']) && is_array($in['actions'])) ?
$in['actions']['suppress'] : null))) ?
''.htmlentities((string)((isset($in['noop']) && is_array($in)) ?
$in['noop'] : null), ENT_QUOTES, 'UTF-8').''.((LCRun3::ifvar($cx,
((isset($in['moderationIcons']) && is_array($in)) ? $in['moderationIcons'] :
null))) ? ' ' : '').''.LCRun3::ch($cx, 'l10n',
array(array(LCRun3::ch($cx, 'concat',
array(array('flow-',((isset($in['moderationType']) && is_array($in)) ?
$in['moderationType'] :
null),'-action-undelete-',((isset($in['moderationTemplate']) && is_array($in))
? $in['moderationTemplate'] : null)),array()), 'raw')),array()),
'encq').''.htmlentities((string)((isset($in['noop']) && is_array($in)) ?
$in['noop'] : null), ENT_QUOTES, 'UTF-8').'' : '').''.((LCRun3::ifvar($cx,
((isset($in['actions']['suppress']) && is_array($in['actions'])) ?
$in['actions']['suppress'] : null))) ?
''.htmlentities((string)((isset($in['noop']) && is_array($in)) ?
$in['noop'] : null), ENT_QUOTES, 'UTF-8').'
'.$sp.'
'.$sp.'' : '').'
-';},'flow_topic_mod
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: RCFilters UI: Make monobook override of the 'checkmark' more...
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/356015 )
Change subject: RCFilters UI: Make monobook override of the 'checkmark' more
specific
..
RCFilters UI: Make monobook override of the 'checkmark' more specific
Bug: T165444
Bug: T165446
Change-Id: I6412fb84767332259955462e53bde8dffe17e905
Depends-On: Ibe4b4fc92de1a864059d9cd37168c7ef33b6d874
---
M
resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.FilterMenuOptionWidget.monobook.less
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Catrope: Looks good to me, approved
jenkins-bot: Verified
diff --git
a/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.FilterMenuOptionWidget.monobook.less
b/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.FilterMenuOptionWidget.monobook.less
index dbcc3e4..01b87c0 100644
---
a/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.FilterMenuOptionWidget.monobook.less
+++
b/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.FilterMenuOptionWidget.monobook.less
@@ -1,5 +1,5 @@
.mw-rcfilters-ui-filterMenuOptionWidget {
- &.oo-ui-menuOptionWidget.oo-ui-optionWidget-selected
.oo-ui-iconElement-icon {
+ &.oo-ui-menuOptionWidget.oo-ui-optionWidget-selected >
.oo-ui-iconElement-icon {
background-image: none;
}
}
--
To view, visit https://gerrit.wikimedia.org/r/356015
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I6412fb84767332259955462e53bde8dffe17e905
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Mooeypoo
Gerrit-Reviewer: Catrope
Gerrit-Reviewer: Jack Phoenix
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Flow[master]: Use "trash" icon instead of deprecated and removed "remove" ...
Catrope has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/356512 )
Change subject: Use "trash" icon instead of deprecated and removed "remove" icon
..
Use "trash" icon instead of deprecated and removed "remove" icon
Bug: T166742
Change-Id: I79250860db7f3922685c2ec7baeb8198c467fe1c
---
M handlebars/compiled/flow_block_board-history.handlebars.php
M handlebars/compiled/flow_block_topic.handlebars.php
M handlebars/compiled/flow_block_topiclist.handlebars.php
M handlebars/compiled/flow_post.handlebars.php
M handlebars/flow_moderation_actions_list.partial.handlebars
M handlebars/flow_topic_moderation_flag.partial.handlebars
6 files changed, 13 insertions(+), 13 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Flow
refs/changes/12/356512/1
diff --git a/handlebars/compiled/flow_block_board-history.handlebars.php
b/handlebars/compiled/flow_block_board-history.handlebars.php
index f5ff83f..da21c04 100644
--- a/handlebars/compiled/flow_block_board-history.handlebars.php
+++ b/handlebars/compiled/flow_block_board-history.handlebars.php
@@ -65,11 +65,11 @@
'.$sp.'
href="'.htmlentities((string)((isset($in['actions']['delete']['url']) &&
is_array($in['actions']['delete'])) ? $in['actions']['delete']['url'] : null),
ENT_QUOTES, 'UTF-8').'"
'.$sp.'
data-flow-interactive-handler="moderationDialog"
'.$sp.'
data-flow-template="flow_moderate_'.htmlentities((string)((isset($in['moderationTemplate'])
&& is_array($in)) ? $in['moderationTemplate'] : null), ENT_QUOTES,
'UTF-8').'.partial"
-'.$sp.' data-role="delete">'.((LCRun3::ifvar($cx,
((isset($in['moderationIcons']) && is_array($in)) ? $in['moderationIcons'] :
null))) ? ' ' : '').''.LCRun3::ch($cx, 'l10n',
array(array(LCRun3::ch($cx, 'concat',
array(array('flow-',((isset($in['moderationType']) && is_array($in)) ?
$in['moderationType'] :
null),'-action-delete-',((isset($in['moderationTemplate']) && is_array($in)) ?
$in['moderationTemplate'] : null)),array()), 'raw')),array()),
'encq').''.htmlentities((string)((isset($in['noop']) && is_array($in)) ?
$in['noop'] : null), ENT_QUOTES, 'UTF-8').'' : '').''.((LCRun3::ifvar($cx,
((isset($in['actions']['undelete']) && is_array($in['actions'])) ?
$in['actions']['undelete'] : null))) ?
''.htmlentities((string)((isset($in['noop']) && is_array($in)) ?
$in['noop'] : null), ENT_QUOTES, 'UTF-8').''.((LCRun3::ifvar($cx,
((isset($in['moderationIcons']) && is_array($in)) ? $in['moderationIcons'] :
null))) ? ' ' : '').''.LCRun3::ch($cx, 'l10n',
array(array(LCRun3::ch($cx, 'concat',
array(array('flow-',((isset($in['moderationType']) && is_array($in)) ?
$in['moderationType'] :
null),'-action-delete-',((isset($in['moderationTemplate']) && is_array($in)) ?
$in['moderationTemplate'] : null)),array()), 'raw')),array()),
'encq').''.htmlentities((string)((isset($in['noop']) && is_array($in)) ?
$in['noop'] : null), ENT_QUOTES, 'UTF-8').'' : '').''.((LCRun3::ifvar($cx,
((isset($in['actions']['undelete']) && is_array($in['actions'])) ?
$in['actions']['undelete'] : null))) ?
''.htmlentities((string)((isset($in['noop']) && is_array($in)) ?
$in['noop'] : null), ENT_QUOTES, 'UTF-8').''.((LCRun3::ifvar($cx,
((isset($in['moderationIcons']) && is_array($in)) ? $in['moderationIcons'] :
null))) ? ' ' : '').''.LCRun3::ch($cx, 'l10n',
array(array(LCRun3::ch($cx, 'concat',
array(array('flow-',((isset($in['moderationType']) && is_array($in)) ?
$in['moderationType'] :
null),'-action-undelete-',((isset($in['moderationTemplate']) && is_array($in))
? $in['moderationTemplate'] : null)),array()), 'raw')),array()),
'encq').''.htmlentities((string)((isset($in['noop']) && is_array($in)) ?
$in['noop'] : null), ENT_QUOTES, 'UTF-8').'' : '').''.((LCRun3::ifvar($cx,
((isset($in['actions']['suppress']) && is_array($in['actions'])) ?
$in['actions']['suppress'] : null))) ?
''.htmlentities((string)((isset($in['noop']) && is_array($in)) ?
$in['noop'] : null), ENT_QUOTES, 'UTF-8').''.((LCRun3::ifvar($cx,
((isset($in['moderationIcons']) && is_array($in)) ? $in['moderationIcons'] :
null))) ? ' ' : '').''.LCRun3::ch($cx, 'l10n',
array(array(LCRun3::ch($cx, 'concat',
array(array('flow-',((isset($in['moderationType']) && is_array($in)) ?
$in['moderationType'] :
null),'-action-undelete-',((isset($in['moderationTemplate']) && is_array($in))
? $in['moderationTemplate'] : null)),array()), 'raw')),array()),
'encq').''.htmlentities((string)((isset($in['noop']) && is_array($in)) ?
$in['noop'] : null), ENT_QUOTES, 'UTF-8').'' : '').''.((LCRun3::ifvar($cx,
((isset($in['actions']['suppress']) && is_array($in['actions'])) ?
$in['actions']['suppress'] : null))) ?
''.htmlentities((string)((isset($in['noop']) && is_array($in)) ?
$in['noop'] : null), ENT_QUOTES, 'UTF-8').'
'.$sp.'
'.$sp.'' : '').'
-';},'flow_to
[MediaWiki-commits] [Gerrit] mediawiki...Wikibase[master]: Add badge to other project sidebar
Ladsgroup has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/356511 )
Change subject: Add badge to other project sidebar
..
Add badge to other project sidebar
Most parts of this is coming from I7a92b54c7b24fb23171d4eec0bd136b19fa8fdb9
Bug: T73887
Change-Id: Id2c94167b6ce29c8104818a12bc5dfa1e3435ef4
---
M client/includes/Hooks/OtherProjectsSidebarGenerator.php
M client/includes/Hooks/OtherProjectsSidebarGeneratorFactory.php
M client/includes/WikibaseClient.php
M
client/tests/phpunit/includes/Hooks/OtherProjectsSidebarGeneratorFactoryTest.php
M client/tests/phpunit/includes/Hooks/OtherProjectsSidebarGeneratorTest.php
M client/tests/phpunit/includes/Hooks/ParserOutputUpdateHookHandlersTest.php
M client/tests/phpunit/includes/WikibaseClientTest.php
7 files changed, 140 insertions(+), 38 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/11/356511/1
diff --git a/client/includes/Hooks/OtherProjectsSidebarGenerator.php
b/client/includes/Hooks/OtherProjectsSidebarGenerator.php
index 929e414..346e903 100644
--- a/client/includes/Hooks/OtherProjectsSidebarGenerator.php
+++ b/client/includes/Hooks/OtherProjectsSidebarGenerator.php
@@ -35,6 +35,11 @@
private $siteLookup;
/**
+* @var SidebarLinkBadgeDisplay
+*/
+ private $sidebarLinkBadgeDisplay;
+
+ /**
* @var string[]
*/
private $siteIdsToOutput;
@@ -43,17 +48,20 @@
* @param string $localSiteId
* @param SiteLinkLookup $siteLinkLookup
* @param SiteLookup $siteLookup
+* @param SidebarLinkBadgeDisplay $sidebarLinkBadgeDisplay
* @param string[] $siteIdsToOutput
*/
public function __construct(
$localSiteId,
SiteLinkLookup $siteLinkLookup,
SiteLookup $siteLookup,
+ SidebarLinkBadgeDisplay $sidebarLinkBadgeDisplay,
array $siteIdsToOutput
) {
$this->localSiteId = $localSiteId;
$this->siteLinkLookup = $siteLinkLookup;
$this->siteLookup = $siteLookup;
+ $this->sidebarLinkBadgeDisplay = $sidebarLinkBadgeDisplay;
$this->siteIdsToOutput = $siteIdsToOutput;
}
@@ -224,6 +232,11 @@
$attributes['hreflang'] = $siteLanguageCode;
}
+ $this->sidebarLinkBadgeDisplay->applyBadgeToLink(
+ $attributes,
+ $this->sidebarLinkBadgeDisplay->getBadgeInfo(
$siteLink->getBadges() )
+ );
+
return $attributes;
}
diff --git a/client/includes/Hooks/OtherProjectsSidebarGeneratorFactory.php
b/client/includes/Hooks/OtherProjectsSidebarGeneratorFactory.php
index 64db769..44aaccd 100644
--- a/client/includes/Hooks/OtherProjectsSidebarGeneratorFactory.php
+++ b/client/includes/Hooks/OtherProjectsSidebarGeneratorFactory.php
@@ -33,6 +33,11 @@
private $siteLookup;
/**
+* @var SidebarLinkBadgeDisplay
+*/
+ private $sidebarLinkBadgeDisplay;
+
+ /**
* @param SettingsArray $settings
* @param SiteLinkLookup $siteLinkLookup
* @param SiteLookup $siteLookup
@@ -40,11 +45,13 @@
public function __construct(
SettingsArray $settings,
SiteLinkLookup $siteLinkLookup,
- SiteLookup $siteLookup
+ SiteLookup $siteLookup,
+ SidebarLinkBadgeDisplay $sidebarLinkBadgeDisplay
) {
$this->settings = $settings;
$this->siteLinkLookup = $siteLinkLookup;
$this->siteLookup = $siteLookup;
+ $this->sidebarLinkBadgeDisplay = $sidebarLinkBadgeDisplay;
}
/**
@@ -66,6 +73,7 @@
$this->settings->getSetting( 'siteGlobalID' ),
$this->siteLinkLookup,
$this->siteLookup,
+ $this->sidebarLinkBadgeDisplay,
$this->settings->getSetting( 'otherProjectsLinks' )
);
}
diff --git a/client/includes/WikibaseClient.php
b/client/includes/WikibaseClient.php
index f6cc602..8d03b95 100644
--- a/client/includes/WikibaseClient.php
+++ b/client/includes/WikibaseClient.php
@@ -241,6 +241,11 @@
private $propertyOrderProvider = null;
/**
+* @var SidebarLinkBadgeDisplay|null
+*/
+ private $sidebarLinkBadgeDisplay = null;
+
+ /**
* @warning This is for use with bootstrap code in
WikibaseClient.datatypes.php only!
* Program logic should use WikibaseClient::getSnakFormatterFactory()
instead!
*
@@ -894,19 +899,30 @@
}
/**
-* @return LanguageLinkBadgeDisplay
+* @return SidebarLinkBadgeDisplay
*/
-
[MediaWiki-commits] [Gerrit] mediawiki/vagrant[master]: Silence mediawiki::user exec-spam
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/355036 )
Change subject: Silence mediawiki::user exec-spam
..
Silence mediawiki::user exec-spam
The SQL-based 'unless' rule for setting user groups did not work
for wikis where one of the groups (such as 'steward') did not exist.
Change-Id: Ic22468404e21dab1cff0d26a79c0b9b58aecbee2
---
M puppet/modules/mediawiki/manifests/user.pp
1 file changed, 13 insertions(+), 11 deletions(-)
Approvals:
BryanDavis: Looks good to me, approved
jenkins-bot: Verified
diff --git a/puppet/modules/mediawiki/manifests/user.pp
b/puppet/modules/mediawiki/manifests/user.pp
index 6e270db..432a518 100644
--- a/puppet/modules/mediawiki/manifests/user.pp
+++ b/puppet/modules/mediawiki/manifests/user.pp
@@ -70,15 +70,17 @@
if ! empty($groups) {
$comma_groups = join($groups, ',')
-$comma_groups_sql = join($groups, "', '")
+$comma_groups_php = join($groups, "', '")
-$group_count = size($groups)
-$sql_unless = "
-SELECT COUNT(*)
-FROM user_groups
-JOIN user ON ug_user = user_id
-WHERE user_name = '${canonical_username}'
-AND ug_group IN ('${$comma_groups_sql}');"
+# eval.php requires each command to be a single line
+# double-escape $ against puppet + shell
+$eval_unless = "
+\\\$u = User::newFromName( '${username}' );
+\\\$u->load( User::READ_LATEST );
+\\\$expected_groups = array_intersect( [ '${comma_groups_php}' ],
User::GetAllGroups() );
+\\\$actual_groups = \\\$u->getGroups();
+echo array_diff( \\\$expected_groups, \\\$actual_groups ) ? 'Bad'
: 'Good';
+"
mediawiki::maintenance {
"mediawiki_user_${canonical_username}_${wiki}_${comma_groups}":
command => "/usr/local/bin/mwscript createAndPromote.php
--wiki='${wiki}' \
@@ -87,9 +89,9 @@
# Check that they're already in all the requested groups,
# using counts.
-unless => "/bin/echo \"${sql_unless}\" | \
-/usr/local/bin/mwscript sql.php --wikidb='${wiki}' | \
-/bin/grep -q '=> ${group_count}'",
+unless => "/bin/echo \"${eval_unless}\" | \
+/usr/local/bin/mwscript eval.php --wiki='${wiki}' | \
+/bin/grep -q '^Good$'",
require => [
Mediawiki::Maintenance["mediawiki_user_${canonical_username}_${wiki}"],
]
--
To view, visit https://gerrit.wikimedia.org/r/355036
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ic22468404e21dab1cff0d26a79c0b9b58aecbee2
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: Gergő Tisza
Gerrit-Reviewer: BryanDavis
Gerrit-Reviewer: Dduvall
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: New throttle rule
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/356503 ) Change subject: New throttle rule .. New throttle rule Rule for event in a school in Fortaleza for 2017-06-01 Bug: T166619 Change-Id: Ib48723d88451ddb412ac19e260ed463be99b8228 --- M wmf-config/throttle.php 1 file changed, 7 insertions(+), 0 deletions(-) Approvals: jenkins-bot: Verified Dereckson: Looks good to me, approved diff --git a/wmf-config/throttle.php b/wmf-config/throttle.php index 59d9d12..d56e306 100644 --- a/wmf-config/throttle.php +++ b/wmf-config/throttle.php @@ -62,6 +62,13 @@ 'value' => 40 // 30 expected ]; +$wmgThrottlingExceptions[] = [ // T166619 + 'from' => '2017-06-01T17:00 UTC', + 'to' => '2017-06-01T21:00 UTC', + 'IP' => '189.90.160.22', + 'dbname' => [ 'ptwiki', 'wikidatawiki', 'commonswiki' ], + 'value' => 20 // 10 expected +]; ## Add throttling definitions above. /** -- To view, visit https://gerrit.wikimedia.org/r/356503 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ib48723d88451ddb412ac19e260ed463be99b8228 Gerrit-PatchSet: 2 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Chico Venancio Gerrit-Reviewer: Dereckson Gerrit-Reviewer: Florianschmidtwelzow Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...CollaborationKit[master]: ext.CollaborationKit.list.ui: Switch from 'remove' to 'trash...
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/356505 )
Change subject: ext.CollaborationKit.list.ui: Switch from 'remove' to 'trash'
icon
..
ext.CollaborationKit.list.ui: Switch from 'remove' to 'trash' icon
Change-Id: I79640111cdf728d781f19614f095248f62d0c048
---
M extension.json
M modules/ext.CollaborationKit.list.ui.js
2 files changed, 2 insertions(+), 1 deletion(-)
Approvals:
Harej: Looks good to me, approved
jenkins-bot: Verified
diff --git a/extension.json b/extension.json
index db5658e..5f0a516 100644
--- a/extension.json
+++ b/extension.json
@@ -113,6 +113,7 @@
"scripts": "ext.CollaborationKit.iconbrowser.js",
"dependencies": [
"oojs-ui",
+ "oojs-ui.styles.icons-moderation",
"oojs-ui.styles.icons-movement",
"mediawiki.widgets",
"mediawiki.widgets.UserInputWidget",
diff --git a/modules/ext.CollaborationKit.list.ui.js
b/modules/ext.CollaborationKit.list.ui.js
index 7560ad4..dd6cfaa 100644
--- a/modules/ext.CollaborationKit.list.ui.js
+++ b/modules/ext.CollaborationKit.list.ui.js
@@ -287,7 +287,7 @@
colId = LE.getColId( item );
deleteButton = new OO.ui.ButtonWidget( {
framed: false,
- icon: 'remove',
+ icon: 'trash',
iconTitle: mw.msg(
'collaborationkit-list-delete' )
} );
--
To view, visit https://gerrit.wikimedia.org/r/356505
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I79640111cdf728d781f19614f095248f62d0c048
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CollaborationKit
Gerrit-Branch: master
Gerrit-Owner: Jforrester
Gerrit-Reviewer: Harej
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...examples[master]: add file1.cpp
Viktor3507 has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/356510 ) Change subject: add file1.cpp .. add file1.cpp Change-Id: I55862204ef71f69bc88c79fe2259f7cb8365699a --- A example2/file1.cpp 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/examples refs/changes/10/356510/1 diff --git a/example2/file1.cpp b/example2/file1.cpp new file mode 100644 index 000..3b18e51 --- /dev/null +++ b/example2/file1.cpp @@ -0,0 +1 @@ +hello world -- To view, visit https://gerrit.wikimedia.org/r/356510 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I55862204ef71f69bc88c79fe2259f7cb8365699a Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/examples Gerrit-Branch: master Gerrit-Owner: Viktor3507 ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...CentralNotice[master]: ext.centralNotice.adminUi.bannerSequence: Switch from 'remov...
Jforrester has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/356509 )
Change subject: ext.centralNotice.adminUi.bannerSequence: Switch from 'remove'
to 'trash' icon
..
ext.centralNotice.adminUi.bannerSequence: Switch from 'remove' to 'trash' icon
Bug: T166749
Change-Id: I654a62fb18bd00e4709a9945f8a16d5a158280f1
---
M extension.json
M resources/infrastructure/ext.centralNotice.adminUi.bannerSequence.js
2 files changed, 2 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CentralNotice
refs/changes/09/356509/1
diff --git a/extension.json b/extension.json
index df1a594..bad2b90 100644
--- a/extension.json
+++ b/extension.json
@@ -347,6 +347,7 @@
"dependencies": [
"ext.centralNotice.adminUi.campaignManager",
"oojs-ui",
+ "oojs-ui.styles.icons-moderation",
"mediawiki.jqueryMsg"
],
"messages": [
diff --git
a/resources/infrastructure/ext.centralNotice.adminUi.bannerSequence.js
b/resources/infrastructure/ext.centralNotice.adminUi.bannerSequence.js
index c3591ff..87930df 100644
--- a/resources/infrastructure/ext.centralNotice.adminUi.bannerSequence.js
+++ b/resources/infrastructure/ext.centralNotice.adminUi.bannerSequence.js
@@ -1228,7 +1228,7 @@
} );
this.removeBtn = new OO.ui.ButtonWidget( {
- icon: 'remove',
+ icon: 'trash',
flags: 'destructive'
} );
--
To view, visit https://gerrit.wikimedia.org/r/356509
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I654a62fb18bd00e4709a9945f8a16d5a158280f1
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CentralNotice
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] mediawiki/core[master]: mediawiki.special/mediawiki.special.apisandbox: Use 'trash' ...
Jforrester has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/356508 )
Change subject: mediawiki.special/mediawiki.special.apisandbox: Use 'trash'
icon which still exists
..
mediawiki.special/mediawiki.special.apisandbox: Use 'trash' icon which still
exists
Bug: T166730
Change-Id: I38c526d2660aae8c221f74ce2927c2e338c01be1
---
M resources/src/mediawiki.special/mediawiki.special.apisandbox.js
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/08/356508/1
diff --git a/resources/src/mediawiki.special/mediawiki.special.apisandbox.js
b/resources/src/mediawiki.special/mediawiki.special.apisandbox.js
index da8bdcd..bf26f50 100644
--- a/resources/src/mediawiki.special/mediawiki.special.apisandbox.js
+++ b/resources/src/mediawiki.special/mediawiki.special.apisandbox.js
@@ -1340,7 +1340,7 @@
nooptional: true
} );
button = new OO.ui.ButtonWidget( {
- icon: 'remove',
+ icon: 'trash',
flags: 'destructive'
} );
layout = new OO.ui.ActionFieldLayout(
--
To view, visit https://gerrit.wikimedia.org/r/356508
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I38c526d2660aae8c221f74ce2927c2e338c01be1
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
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] mediawiki/core[master]: mediawiki.widgets.datetime/DateTimeInputWidget: Use 'trash' ...
Jforrester has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/356506 )
Change subject: mediawiki.widgets.datetime/DateTimeInputWidget: Use 'trash'
icon which still exists
..
mediawiki.widgets.datetime/DateTimeInputWidget: Use 'trash' icon which still
exists
Bug: T166730
Change-Id: I30a833ee93d49bb9480f5cfed332a9aa8e306713
---
M resources/Resources.php
M resources/src/mediawiki.widgets.datetime/DateTimeInputWidget.js
2 files changed, 2 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/06/356506/1
diff --git a/resources/Resources.php b/resources/Resources.php
index e30196c..6f6c1a2 100644
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -1863,6 +1863,7 @@
'mediawiki.jqueryMsg',
'mediawiki.util',
'oojs-ui',
+ 'oojs-ui.styles.icons-moderation',
'mediawiki.widgets.datetime',
],
'messages' => [
diff --git a/resources/src/mediawiki.widgets.datetime/DateTimeInputWidget.js
b/resources/src/mediawiki.widgets.datetime/DateTimeInputWidget.js
index 3e4c5e2..e42ab25 100644
--- a/resources/src/mediawiki.widgets.datetime/DateTimeInputWidget.js
+++ b/resources/src/mediawiki.widgets.datetime/DateTimeInputWidget.js
@@ -412,7 +412,7 @@
this.clearButton = new OO.ui.ButtonWidget( {
classes: [
'mw-widgets-datetime-dateTimeInputWidget-field',
'mw-widgets-datetime-dateTimeInputWidget-clearButton' ],
framed: false,
- icon: 'remove',
+ icon: 'trash',
disabled: disabled
} ).connect( this, {
click: 'onClearClick'
--
To view, visit https://gerrit.wikimedia.org/r/356506
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I30a833ee93d49bb9480f5cfed332a9aa8e306713
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
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] mediawiki...MobileFrontend[master]: Hygiene: MFContentNamespace may not exist
Jdlrobson has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/356507 )
Change subject: Hygiene: MFContentNamespace may not exist
..
Hygiene: MFContentNamespace may not exist
Since the config variable is not provided by Minerva and we can
not guarantee it will always exist, given Jon has the goal of
seperating Minerva and MobileFrontend, we should ensure this falls
back to 0.
Note this is also used by Special:Nearby.
At a future time, we may want to consider migrating this to core.
Change-Id: I9861d9f18a137ec6d14284c6b53165d723845cc2
---
M includes/skins/SkinMinerva.php
1 file changed, 2 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend
refs/changes/07/356507/1
diff --git a/includes/skins/SkinMinerva.php b/includes/skins/SkinMinerva.php
index 3439300..2e6c34f 100644
--- a/includes/skins/SkinMinerva.php
+++ b/includes/skins/SkinMinerva.php
@@ -634,6 +634,7 @@
protected function getDiscoveryTools() {
$config = $this->getMFConfig();
$menu = new MenuBuilder();
+ $discoveryNamespace = $config->get( 'MFContentNamespace', 0 );
// Home link
$menu->insert( 'home' )
@@ -649,7 +650,7 @@
->addComponent(
$this->msg( 'mobile-frontend-random-button'
)->escaped(),
SpecialPage::getTitleFor( 'Randompage',
- MWNamespace::getCanonicalName(
$config->get( 'MFContentNamespace' ) ) )->getLocalUrl() .
+ MWNamespace::getCanonicalName(
$discoveryNamespace ) )->getLocalUrl() .
'#/random',
MobileUI::iconClass( 'mf-random', 'before' ),
[
--
To view, visit https://gerrit.wikimedia.org/r/356507
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I9861d9f18a137ec6d14284c6b53165d723845cc2
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/vagrant[master]: Add whoops role
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/355033 )
Change subject: Add whoops role
..
Add whoops role
Bug: T111731
Change-Id: I3353fe599b551c8ad381db5161650b631efa2229
---
A puppet/modules/role/manifests/whoops.pp
1 file changed, 14 insertions(+), 0 deletions(-)
Approvals:
BryanDavis: Looks good to me, approved
jenkins-bot: Verified
diff --git a/puppet/modules/role/manifests/whoops.pp
b/puppet/modules/role/manifests/whoops.pp
new file mode 100644
index 000..3cb09d5
--- /dev/null
+++ b/puppet/modules/role/manifests/whoops.pp
@@ -0,0 +1,14 @@
+# == Class: role::whoops
+# Installs the Whoops[https://www.mediawiki.org/wiki/Extension:Whoops]
+# extension for nice exception display.
+#
+class role::whoops () {
+mediawiki::extension { 'Whoops':
+settings => {
+wgShowExceptionDetails => true,
+wgShowDBErrorBacktrace => true,
+},
+composer => true,
+}
+}
+
--
To view, visit https://gerrit.wikimedia.org/r/355033
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I3353fe599b551c8ad381db5161650b631efa2229
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: Gergő Tisza
Gerrit-Reviewer: BryanDavis
Gerrit-Reviewer: Dduvall
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...CollaborationKit[master]: ext.CollaborationKit.list.ui: Switch from 'remove' to 'trash...
Jforrester has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/356505 )
Change subject: ext.CollaborationKit.list.ui: Switch from 'remove' to 'trash'
icon
..
ext.CollaborationKit.list.ui: Switch from 'remove' to 'trash' icon
Change-Id: I79640111cdf728d781f19614f095248f62d0c048
---
M extension.json
M modules/ext.CollaborationKit.list.ui.js
2 files changed, 2 insertions(+), 1 deletion(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CollaborationKit
refs/changes/05/356505/1
diff --git a/extension.json b/extension.json
index db5658e..5f0a516 100644
--- a/extension.json
+++ b/extension.json
@@ -113,6 +113,7 @@
"scripts": "ext.CollaborationKit.iconbrowser.js",
"dependencies": [
"oojs-ui",
+ "oojs-ui.styles.icons-moderation",
"oojs-ui.styles.icons-movement",
"mediawiki.widgets",
"mediawiki.widgets.UserInputWidget",
diff --git a/modules/ext.CollaborationKit.list.ui.js
b/modules/ext.CollaborationKit.list.ui.js
index 7560ad4..dd6cfaa 100644
--- a/modules/ext.CollaborationKit.list.ui.js
+++ b/modules/ext.CollaborationKit.list.ui.js
@@ -287,7 +287,7 @@
colId = LE.getColId( item );
deleteButton = new OO.ui.ButtonWidget( {
framed: false,
- icon: 'remove',
+ icon: 'trash',
iconTitle: mw.msg(
'collaborationkit-list-delete' )
} );
--
To view, visit https://gerrit.wikimedia.org/r/356505
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I79640111cdf728d781f19614f095248f62d0c048
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CollaborationKit
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] mediawiki...UploadWizard[master]: uw.DescriptionDetailsWidget: Switch from 'remove' to 'trash'...
Jforrester has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/356504 )
Change subject: uw.DescriptionDetailsWidget: Switch from 'remove' to 'trash'
icon
..
uw.DescriptionDetailsWidget: Switch from 'remove' to 'trash' icon
Bug: T166745
Change-Id: I6f632c33a298f6b97dd050eddce8f98befc5905b
---
M extension.json
M resources/details/uw.DescriptionDetailsWidget.js
2 files changed, 2 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/UploadWizard
refs/changes/04/356504/1
diff --git a/extension.json b/extension.json
index 3641a91..31efd50 100644
--- a/extension.json
+++ b/extension.json
@@ -208,10 +208,10 @@
"uw.units",
"oojs",
"oojs-ui",
- "oojs-ui.styles.icons",
"oojs-ui.styles.icons-editing-core",
"oojs-ui.styles.icons-editing-advanced",
"oojs-ui.styles.icons-location",
+ "oojs-ui.styles.icons-moderation",
"mediawiki.widgets.DateInputWidget",
"mediawiki.widgets.CategoryMultiselectWidget"
],
diff --git a/resources/details/uw.DescriptionDetailsWidget.js
b/resources/details/uw.DescriptionDetailsWidget.js
index fc06561..96aa84a 100644
--- a/resources/details/uw.DescriptionDetailsWidget.js
+++ b/resources/details/uw.DescriptionDetailsWidget.js
@@ -27,7 +27,7 @@
} );
this.removeButton = new OO.ui.ButtonWidget( {
classes: [ 'mwe-upwiz-remove-ctrl',
'mwe-upwiz-descriptionDetailsWidget-removeItem' ],
- icon: 'remove',
+ icon: 'trash',
framed: false,
flags: [ 'destructive' ],
title: mw.message( 'mwe-upwiz-remove-description'
).text()
--
To view, visit https://gerrit.wikimedia.org/r/356504
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I6f632c33a298f6b97dd050eddce8f98befc5905b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/UploadWizard
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] operations/mediawiki-config[master]: New throttle rule
Chico Venancio has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/356503 ) Change subject: New throttle rule .. New throttle rule Rule for event in a school in Fortaleza for 2017-06-01 Bug: T166619 Change-Id: Ib48723d88451ddb412ac19e260ed463be99b8228 --- M wmf-config/throttle.php 1 file changed, 7 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/03/356503/1 diff --git a/wmf-config/throttle.php b/wmf-config/throttle.php index 59d9d12..d56e306 100644 --- a/wmf-config/throttle.php +++ b/wmf-config/throttle.php @@ -62,6 +62,13 @@ 'value' => 40 // 30 expected ]; +$wmgThrottlingExceptions[] = [ // T166619 + 'from' => '2017-06-01T17:00 UTC', + 'to' => '2017-06-01T21:00 UTC', + 'IP' => '189.90.160.22', + 'dbname' => [ 'ptwiki', 'wikidatawiki', 'commonswiki' ], + 'value' => 20 // 10 expected +]; ## Add throttling definitions above. /** -- To view, visit https://gerrit.wikimedia.org/r/356503 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib48723d88451ddb412ac19e260ed463be99b8228 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Chico Venancio ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] oojs/ui[master]: Let's stop referring to removed icons, hmm?
Jforrester has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/356502 )
Change subject: Let's stop referring to removed icons, hmm?
..
Let's stop referring to removed icons, hmm?
Change-Id: Ieac6bf0f7d74badb806b591cbf3805dbb74555e7
---
M src/widgets/ButtonWidget.js
M src/widgets/OutlineControlsWidget.js
2 files changed, 2 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/02/356502/1
diff --git a/src/widgets/ButtonWidget.js b/src/widgets/ButtonWidget.js
index a519880..c0cd9a4 100644
--- a/src/widgets/ButtonWidget.js
+++ b/src/widgets/ButtonWidget.js
@@ -10,7 +10,7 @@
* // A button widget
* var button = new OO.ui.ButtonWidget( {
* label: 'Button with Icon',
- * icon: 'remove',
+ * icon: 'trash',
* iconTitle: 'Remove'
* } );
* $( 'body' ).append( button.$element );
diff --git a/src/widgets/OutlineControlsWidget.js
b/src/widgets/OutlineControlsWidget.js
index 1abc461..dce3608 100644
--- a/src/widgets/OutlineControlsWidget.js
+++ b/src/widgets/OutlineControlsWidget.js
@@ -48,7 +48,7 @@
} );
this.removeButton = new OO.ui.ButtonWidget( {
framed: false,
- icon: 'remove',
+ icon: 'trash',
title: OO.ui.msg( 'ooui-outline-control-remove' )
} );
this.abilities = { move: true, remove: true };
--
To view, visit https://gerrit.wikimedia.org/r/356502
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ieac6bf0f7d74badb806b591cbf3805dbb74555e7
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] mediawiki...VisualEditor[master]: Replace uses of the removed 'remove' icon with the 'trash' one
Jforrester has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/356501 )
Change subject: Replace uses of the removed 'remove' icon with the 'trash' one
..
Replace uses of the removed 'remove' icon with the 'trash' one
Bug: T166730
Change-Id: I528dcdb390a4488ffac89fc823ff35bc1eda4f24
---
M extension.json
M modules/ve-mw/ui/pages/ve.ui.MWParameterPlaceholderPage.js
M modules/ve-mw/ui/pages/ve.ui.MWTemplatePage.js
M modules/ve-mw/ui/pages/ve.ui.MWTemplatePlaceholderPage.js
M modules/ve-mw/ui/pages/ve.ui.MWTransclusionContentPage.js
M modules/ve-mw/ui/widgets/ve.ui.MWCategoryPopupWidget.js
6 files changed, 6 insertions(+), 5 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor
refs/changes/01/356501/1
diff --git a/extension.json b/extension.json
index adc3be9..d930692 100644
--- a/extension.json
+++ b/extension.json
@@ -2020,6 +2020,7 @@
"oojs-ui.styles.icons-editing-core",
"oojs-ui.styles.icons-editing-styling",
"oojs-ui.styles.icons-editing-list",
+ "oojs-ui.styles.icons-moderation",
"oojs-ui.styles.indicators",
"oojs-ui.styles.textures",
"ext.visualEditor.moduleIcons",
diff --git a/modules/ve-mw/ui/pages/ve.ui.MWParameterPlaceholderPage.js
b/modules/ve-mw/ui/pages/ve.ui.MWParameterPlaceholderPage.js
index e822a0b..62e7e3c 100644
--- a/modules/ve-mw/ui/pages/ve.ui.MWParameterPlaceholderPage.js
+++ b/modules/ve-mw/ui/pages/ve.ui.MWParameterPlaceholderPage.js
@@ -39,7 +39,7 @@
this.removeButton = new OO.ui.ButtonWidget( {
framed: false,
- icon: 'remove',
+ icon: 'trash',
title: ve.msg( 'visualeditor-dialog-transclusion-remove-param'
),
flags: [ 'destructive' ],
classes: [ 've-ui-mwTransclusionDialog-removeButton' ]
diff --git a/modules/ve-mw/ui/pages/ve.ui.MWTemplatePage.js
b/modules/ve-mw/ui/pages/ve.ui.MWTemplatePage.js
index 571d519..6adf3ac 100644
--- a/modules/ve-mw/ui/pages/ve.ui.MWTemplatePage.js
+++ b/modules/ve-mw/ui/pages/ve.ui.MWTemplatePage.js
@@ -35,7 +35,7 @@
this.$description = $( '' );
this.removeButton = new OO.ui.ButtonWidget( {
framed: false,
- icon: 'remove',
+ icon: 'trash',
title: ve.msg(
'visualeditor-dialog-transclusion-remove-template' ),
flags: [ 'destructive' ],
classes: [ 've-ui-mwTransclusionDialog-removeButton' ]
diff --git a/modules/ve-mw/ui/pages/ve.ui.MWTemplatePlaceholderPage.js
b/modules/ve-mw/ui/pages/ve.ui.MWTemplatePlaceholderPage.js
index 553058d..a75eabd 100644
--- a/modules/ve-mw/ui/pages/ve.ui.MWTemplatePlaceholderPage.js
+++ b/modules/ve-mw/ui/pages/ve.ui.MWTemplatePlaceholderPage.js
@@ -49,7 +49,7 @@
this.removeButton = new OO.ui.ButtonWidget( {
framed: false,
- icon: 'remove',
+ icon: 'trash',
title: ve.msg(
'visualeditor-dialog-transclusion-remove-template' ),
flags: [ 'destructive' ],
classes: [ 've-ui-mwTransclusionDialog-removeButton' ]
diff --git a/modules/ve-mw/ui/pages/ve.ui.MWTransclusionContentPage.js
b/modules/ve-mw/ui/pages/ve.ui.MWTransclusionContentPage.js
index 0d1a99e..15c5cab 100644
--- a/modules/ve-mw/ui/pages/ve.ui.MWTransclusionContentPage.js
+++ b/modules/ve-mw/ui/pages/ve.ui.MWTransclusionContentPage.js
@@ -36,7 +36,7 @@
.connect( this, { change: 'onTextInputChange' } );
this.removeButton = new OO.ui.ButtonWidget( {
framed: false,
- icon: 'remove',
+ icon: 'trash',
title: ve.msg(
'visualeditor-dialog-transclusion-remove-content' ),
flags: [ 'destructive' ],
classes: [ 've-ui-mwTransclusionDialog-removeButton' ]
diff --git a/modules/ve-mw/ui/widgets/ve.ui.MWCategoryPopupWidget.js
b/modules/ve-mw/ui/widgets/ve.ui.MWCategoryPopupWidget.js
index 4ad25a7..3deb53a 100644
--- a/modules/ve-mw/ui/widgets/ve.ui.MWCategoryPopupWidget.js
+++ b/modules/ve-mw/ui/widgets/ve.ui.MWCategoryPopupWidget.js
@@ -29,7 +29,7 @@
this.$menu = $( '' );
this.removeButton = new OO.ui.ButtonWidget( {
framed: false,
- icon: 'remove',
+ icon: 'trash',
title: ve.msg( 'visualeditor-inspector-remove-tooltip' )
} );
this.sortKeyInput = new OO.ui.TextInputWidget();
--
To view, visit https://gerrit.wikimedia.org/r/356501
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I528dcdb390a4488ffac89fc823ff35bc1eda4f24
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki
[MediaWiki-commits] [Gerrit] mediawiki...MobileFrontend[master]: Hygiene: Remove dead uploads code
Jdlrobson has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/356500 )
Change subject: Hygiene: Remove dead uploads code
..
Hygiene: Remove dead uploads code
Photo uploading was removed a long time ago and
there are no browser tests for the Special:Uploads page
Change-Id: If7ab05d51527f5851d2337288a5143d18d9eafb4
---
M extension.json
M resources/mobile.special.uploads.styles/default.less
D resources/mobile.special.uploads.styles/uploads.less
D tests/browser/features/support/pages/special_uploads_page.rb
4 files changed, 1 insertion(+), 41 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend
refs/changes/00/356500/1
diff --git a/extension.json b/extension.json
index 27a7bfd..7e4c251 100644
--- a/extension.json
+++ b/extension.json
@@ -1310,11 +1310,8 @@
"mobile.special.uploads.styles": {
"targets": "mobile",
"styles": [
-
"resources/mobile.special.uploads.styles/uploads.less"
+
"resources/mobile.special.uploads.styles/default.less"
],
- "skinStyles": {
- "default":
"resources/mobile.special.uploads.styles/default.less"
- },
"position": "top"
},
"mobile.special.pagefeed.styles": {
diff --git a/resources/mobile.special.uploads.styles/default.less
b/resources/mobile.special.uploads.styles/default.less
index d929111..32ebf50 100644
--- a/resources/mobile.special.uploads.styles/default.less
+++ b/resources/mobile.special.uploads.styles/default.less
@@ -4,7 +4,3 @@
text-align: left;
}
}
-
-.ctaUploadPhoto {
- display: none;
-}
diff --git a/resources/mobile.special.uploads.styles/uploads.less
b/resources/mobile.special.uploads.styles/uploads.less
deleted file mode 100644
index 4abbe42..000
--- a/resources/mobile.special.uploads.styles/uploads.less
+++ /dev/null
@@ -1,19 +0,0 @@
-@import 'minerva.variables';
-@import 'minerva.mixins';
-
-.ctaUploadPhoto {
- text-align: center;
- padding: 0.5em;
-
- h2 {
- font-size: 1.25em;
- margin: 0 0 0.5em;
- }
-}
-
-@media all and ( min-width: @deviceWidthTablet ) {
- .ctaUploadPhoto {
- border-bottom: 0;
- background: none;
- }
-}
diff --git a/tests/browser/features/support/pages/special_uploads_page.rb
b/tests/browser/features/support/pages/special_uploads_page.rb
deleted file mode 100644
index e0ffa04..000
--- a/tests/browser/features/support/pages/special_uploads_page.rb
+++ /dev/null
@@ -1,14 +0,0 @@
-# FIXME: this inherits from ArticlePage here for the photo_description element
-# move uploads related elements to BasePage?
-class UploadPage < ArticlePage
- include PageObject
-
- page_url 'Special:Uploads'
-
- div(:contribute_image, class: 'ctaUploadPhoto')
- # This may seem confusing but one is a DIV and one is an A tag
- a(:tutorial_link, href: '#/upload-tutorial/uploads')
- file_field(:select_file, name: 'file')
- button(:upload_button, text: 'Upload')
- a(:uploaded_image_link, class: 'image')
-end
--
To view, visit https://gerrit.wikimedia.org/r/356500
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: If7ab05d51527f5851d2337288a5143d18d9eafb4
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: Gerrit: Add non-masters to have public DNS entries
Chad has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/356499 )
Change subject: Gerrit: Add non-masters to have public DNS entries
..
Gerrit: Add non-masters to have public DNS entries
This way, you can have public & private slaves. Public slaves
get nice DNS entries that aren't the standard hostname
Change-Id: I4ce94cb92d959d2598b2e338a11f0f5a1b4a239d
---
M hieradata/role/common/gerrit/server.yaml
M modules/gerrit/manifests/init.pp
M modules/gerrit/manifests/proxy.pp
M modules/gerrit/templates/gerrit.wikimedia.org.erb
M modules/profile/manifests/gerrit/server.pp
5 files changed, 27 insertions(+), 15 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/99/356499/1
diff --git a/hieradata/role/common/gerrit/server.yaml
b/hieradata/role/common/gerrit/server.yaml
index 4b42a98..5af2d48 100644
--- a/hieradata/role/common/gerrit/server.yaml
+++ b/hieradata/role/common/gerrit/server.yaml
@@ -6,6 +6,8 @@
value: standard
gerrit::server::host: 'gerrit.wikimedia.org'
+gerrit::server::slave_hosts:
+- 'gerrit.wikimedia.org'
gerrit::server::master_host: 'cobalt.wikimedia.org'
gerrit::server::bacula: 'srv-gerrit-git'
diff --git a/modules/gerrit/manifests/init.pp b/modules/gerrit/manifests/init.pp
index 5339aca..47a157a 100644
--- a/modules/gerrit/manifests/init.pp
+++ b/modules/gerrit/manifests/init.pp
@@ -1,6 +1,7 @@
# Manifest to setup a Gerrit instance
class gerrit(
$host,
+$slave_hosts = [],
$slave = false,
) {
@@ -8,11 +9,12 @@
slave => $slave,
}
-if !$slave {
-class { '::gerrit::proxy':
-require => Class['gerrit::jetty'],
-}
+class { '::gerrit::proxy':
+require => Class['gerrit::jetty'],
+slave_hosts => $slave_hosts,
+}
+if !$slave {
class { '::gerrit::crons':
require => Class['gerrit::jetty'],
}
diff --git a/modules/gerrit/manifests/proxy.pp
b/modules/gerrit/manifests/proxy.pp
index b055e5c..ea32251 100644
--- a/modules/gerrit/manifests/proxy.pp
+++ b/modules/gerrit/manifests/proxy.pp
@@ -1,5 +1,6 @@
class gerrit::proxy(
$host = $::gerrit::host,
+$slave_hosts = [],
$maint_mode = false,
) {
diff --git a/modules/gerrit/templates/gerrit.wikimedia.org.erb
b/modules/gerrit/templates/gerrit.wikimedia.org.erb
index 1a564c7..7e829e8 100644
--- a/modules/gerrit/templates/gerrit.wikimedia.org.erb
+++ b/modules/gerrit/templates/gerrit.wikimedia.org.erb
@@ -11,6 +11,9 @@
ServerAdmin n...@wikimedia.org
ServerName <%= @host %>
+<%- if @slave_hosts -%>
+ServerAlias <%= Array(@slave_hosts).join(' ') %>
+<%- else -%>
DocumentRoot /var/www
@@ -41,6 +44,10 @@
ServerAdmin n...@wikimedia.org
ServerName <%= @host %>
+<%- if @slave_hosts -%>
+ServerAlias <%= Array(@slave_hosts).join(' ') %>
+<%- else -%>
+
# https://httpoxy.org/
RequestHeader unset Proxy early
diff --git a/modules/profile/manifests/gerrit/server.pp
b/modules/profile/manifests/gerrit/server.pp
index 7ef290b..9a4e064 100644
--- a/modules/profile/manifests/gerrit/server.pp
+++ b/modules/profile/manifests/gerrit/server.pp
@@ -5,6 +5,7 @@
$ipv4 = hiera('gerrit::service::ipv4'),
$ipv6 = hiera('gerrit::service::ipv6'),
$host = hiera('gerrit::server::host'),
+$slave_hosts = hiera('gerrit::server::slave_hosts'),
$master_host = hiera('gerrit::server::master_host'),
$bacula = hiera('gerrit::server::bacula'),
$gerrit_servers = join(hiera('gerrit::servers'), ' ')
@@ -46,16 +47,14 @@
srange => "(@resolve((${gerrit_servers}))
@resolve((${gerrit_servers}), ))",
}
-if !$slave {
-ferm::service { 'gerrit_http':
-proto => 'tcp',
-port => 'http',
-}
+ferm::service { 'gerrit_http':
+proto => 'tcp',
+port => 'http',
+}
-ferm::service { 'gerrit_https':
-proto => 'tcp',
-port => 'https',
-}
+ferm::service { 'gerrit_https':
+proto => 'tcp',
+port => 'https',
}
if $bacula != undef and !$slave {
@@ -63,7 +62,8 @@
}
class { '::gerrit':
-host => $host,
-slave => $slave,
+host=> $host,
+slave => $slave,
+slave_hosts => $slave_hosts,
}
}
--
To view, visit https://gerrit.wikimedia.org/r/356499
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I4ce94cb92d959d2598b2e338a11f0f5a1b4a239d
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Chad
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: MWExceptionRenderer::useOutputPage: Don't bother if we have ...
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/312962 ) Change subject: MWExceptionRenderer::useOutputPage: Don't bother if we have no Title context .. MWExceptionRenderer::useOutputPage: Don't bother if we have no Title context Change-Id: Ieb6d682a9f2fb4def4c01908ccd035fcce2e1895 --- M includes/exception/MWExceptionRenderer.php 1 file changed, 5 insertions(+), 0 deletions(-) Approvals: Bartosz Dziewoński: Looks good to me, approved Chad: Looks good to me, approved jenkins-bot: Verified Jforrester: Looks good to me, but someone else must approve diff --git a/includes/exception/MWExceptionRenderer.php b/includes/exception/MWExceptionRenderer.php index bd43934..5162a1f 100644 --- a/includes/exception/MWExceptionRenderer.php +++ b/includes/exception/MWExceptionRenderer.php @@ -96,9 +96,14 @@ } } + // Don't even bother with OutputPage if there's no Title context set, + // (e.g. we're in RL code on load.php) - the Skin system (and probably + // most of MediaWiki) won't work. + return ( !empty( $GLOBALS['wgFullyInitialised'] ) && !empty( $GLOBALS['wgOut'] ) && + RequestContext::getMain()->getTitle() && !defined( 'MEDIAWIKI_INSTALL' ) ); } -- To view, visit https://gerrit.wikimedia.org/r/312962 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ieb6d682a9f2fb4def4c01908ccd035fcce2e1895 Gerrit-PatchSet: 5 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Alex Monk Gerrit-Reviewer: Bartosz Dziewoński Gerrit-Reviewer: Chad Gerrit-Reviewer: Jforrester 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] mediawiki...DonationInterface[master]: When requested GW is disabled, form chooser allows others
Ejegg has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/356498 )
Change subject: When requested GW is disabled, form chooser allows others
..
When requested GW is disabled, form chooser allows others
Let's not be too picky
Change-Id: Ica672fa8c6c2d11b81dd746174bc4f67dc994f75
---
M special/GatewayFormChooser.php
1 file changed, 2 insertions(+), 3 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/DonationInterface
refs/changes/98/356498/1
diff --git a/special/GatewayFormChooser.php b/special/GatewayFormChooser.php
index 84159f8..1ffe4b5 100644
--- a/special/GatewayFormChooser.php
+++ b/special/GatewayFormChooser.php
@@ -227,11 +227,10 @@
// First get all the valid and enabled gateways capable of
processing shtuff
$valid_gateways = self::getAllEnabledGateways();
if ( $gateway !== null ) {
+ // If the requested gateway is valid and enabled, only
allow
+ // forms for that gateway. Otherwise try 'em all.
if ( in_array( $gateway, $valid_gateways ) ) {
$valid_gateways = array( $gateway );
- } else {
- // Aaah; the requested gateway is not valid :'(
Nothing to do but return nothing
- return array();
}
}
--
To view, visit https://gerrit.wikimedia.org/r/356498
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ica672fa8c6c2d11b81dd746174bc4f67dc994f75
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/DonationInterface
Gerrit-Branch: master
Gerrit-Owner: Ejegg
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...MobileFrontend[master]: When page properties are not available do not throw exceptions
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/356481 )
Change subject: When page properties are not available do not throw exceptions
..
When page properties are not available do not throw exceptions
There is an edge case where a page does not have any page properties
and an api request results in a notice, warning and exception.
To support testing and readability I've broken out the offending code
and added tests and fixed the edge case.
Bug: T161026
Bug: T166530
Change-Id: I52e991f5bd97edd09db837257673e73077a981ad
---
M includes/api/ApiMobileView.php
M tests/phpunit/api/ApiMobileViewTest.php
2 files changed, 87 insertions(+), 9 deletions(-)
Approvals:
Pmiazga: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/api/ApiMobileView.php b/includes/api/ApiMobileView.php
index 5897db7..d1beb22 100644
--- a/includes/api/ApiMobileView.php
+++ b/includes/api/ApiMobileView.php
@@ -43,6 +43,27 @@
}
/**
+* Obtain the requested page properties.
+* @param string $propNames requested list of pageprops separated by
'|'. If '*'
+* all page props will be returned.
+* @param array $data data available as returned by getData
+* @return Array associative
+*/
+ public function getMobileViewPageProps( $propNames, $data ) {
+ if ( array_key_exists( 'pageprops', $data ) ) {
+ if ( $propNames == '*' ) {
+ $pageProps = $data['pageprops'];
+ } else {
+ $pageProps = array_intersect_key(
$data['pageprops'],
+ array_flip( explode( '|', $propNames )
) );
+ }
+ } else {
+ $pageProps = [];
+ }
+ return $pageProps;
+ }
+
+ /**
* Execute the requested Api actions.
* @todo: Write some unit tests for API results
*/
@@ -122,18 +143,13 @@
$this->addXAnalyticsItem( 'page_id',
(string)$data['id'] );
}
if ( isset( $prop['pageprops'] ) ) {
- $propNames = $params['pageprops'];
- if ( $propNames == '*' && isset( $data['pageprops'] ) )
{
- $pageProps = $data['pageprops'];
- } else {
- $propNames = explode( '|', $propNames );
- $pageProps = array_intersect_key(
$data['pageprops'], array_flip( $propNames ) );
- }
- ApiResult::setArrayType( $pageProps, 'assoc' );
+ $mvPageProps = $this->getMobileViewPageProps(
$params['pageprops'], $data );
+ ApiResult::setArrayType( $mvPageProps, 'assoc' );
$resultObj->addValue( null, $moduleName,
- [ 'pageprops' => $pageProps ]
+ [ 'pageprops' => $mvPageProps ]
);
}
+
if ( isset( $prop['description'] ) && isset(
$data['pageprops']['wikibase_item'] ) ) {
$desc = ExtMobileFrontend::getWikibaseDescription(
$data['pageprops']['wikibase_item']
diff --git a/tests/phpunit/api/ApiMobileViewTest.php
b/tests/phpunit/api/ApiMobileViewTest.php
index 45e996f..1d43f3c 100644
--- a/tests/phpunit/api/ApiMobileViewTest.php
+++ b/tests/phpunit/api/ApiMobileViewTest.php
@@ -544,6 +544,68 @@
$this->assertFalse( $isSVG->invokeArgs( $api, [ null ] ) );
}
+ public function provideGetMobileViewPageProps() {
+ return [
+ // Request all available page properties
+ [
+ '*',
+ [
+ 'pageprops' => [ 'wikibase_item' =>
'Q76', 'notoc' => true ],
+ ],
+ [ 'wikibase_item' => 'Q76', 'notoc' => true ],
+ ],
+ // Request non-existent property
+ [
+ 'monkey',
+ [
+ 'pageprops' => [ 'wikibase_item' =>
'Q76', 'notoc' => true ],
+ ],
+ [],
+ ],
+ // Filter out available page properties with '|'
+ [
+ 'wikibase_item|notoc',
+ [
+ 'pageprops' => [ 'wikibase_item' =>
'Q76', 'notoc' => true ],
+ ],
+
[MediaWiki-commits] [Gerrit] mediawiki...WikibaseLexeme[master]: Use LexemeBuilder to improve `LexemeSerializerTest` readability
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/355232 )
Change subject: Use LexemeBuilder to improve `LexemeSerializerTest` readability
..
Use LexemeBuilder to improve `LexemeSerializerTest` readability
Change-Id: Icc8d27b2b8541a3ec1b5d401a5bf0aba0ebaa537
---
M src/DataModel/Serialization/LexemeSerializer.php
A tests/phpunit/composer/DataModel/LexemeBuilder.php
M tests/phpunit/composer/DataModel/Serialization/LexemeSerializerTest.php
3 files changed, 167 insertions(+), 21 deletions(-)
Approvals:
WMDE-leszek: Looks good to me, but someone else must approve
Ladsgroup: Looks good to me, approved
jenkins-bot: Verified
diff --git a/src/DataModel/Serialization/LexemeSerializer.php
b/src/DataModel/Serialization/LexemeSerializer.php
index f1fa9f1..ce1476c 100644
--- a/src/DataModel/Serialization/LexemeSerializer.php
+++ b/src/DataModel/Serialization/LexemeSerializer.php
@@ -76,7 +76,7 @@
$id = $lexeme->getId();
- if ( $id !== null ) {
+ if ( $id !== null ) { // TODO: Should fail if ID is not present
$serialization['id'] = $id->getSerialization();
}
diff --git a/tests/phpunit/composer/DataModel/LexemeBuilder.php
b/tests/phpunit/composer/DataModel/LexemeBuilder.php
new file mode 100644
index 000..7e0a4d9
--- /dev/null
+++ b/tests/phpunit/composer/DataModel/LexemeBuilder.php
@@ -0,0 +1,138 @@
+lexicalCategory = $this->newRandomItemId();
+ $this->language = $this->newRandomItemId();
+ }
+
+ public static function create() {
+ return new self();
+ }
+
+ public function build() {
+ $lexeme = new Lexeme(
+ $this->lexemeId,
+ null,
+ $this->lexicalCategory,
+ $this->language,
+ null,
+ []
+ );
+
+ $lemmas = new TermList();
+ foreach ( $this->lemmas as $lang => $term ) {
+ $lemmas->setTextForLanguage( $lang, $term );
+ }
+ $lexeme->setLemmas( $lemmas );
+
+ foreach ( $this->statements as $statement ) {
+ $lexeme->getStatements()->addNewStatement( $statement );
+ }
+
+ return $lexeme;
+ }
+
+ /**
+* @param ItemId|string $itemId
+* @return LexemeBuilder
+*/
+ public function withLexicalCategory( $itemId ) {
+ $result = clone $this;
+ if ( !$itemId instanceof ItemId ) {
+ $itemId = new ItemId( $itemId );
+ }
+ $result->lexicalCategory = $itemId;
+ return $result;
+ }
+
+ /**
+* @param ItemId|string $itemId
+* @return LexemeBuilder
+*/
+ public function withLanguage( $itemId ) {
+ $result = clone $this;
+ if ( !$itemId instanceof ItemId ) {
+ $itemId = new ItemId( $itemId );
+ }
+ $result->language = $itemId;
+ return $result;
+ }
+
+ /**
+* @param LexemeId|string $lexemeId
+* @return LexemeBuilder
+*/
+ public function withId( $lexemeId ) {
+ $result = clone $this;
+ if ( !$lexemeId instanceof LexemeId ) {
+ $lexemeId = new LexemeId( $lexemeId );
+ }
+ $result->lexemeId = $lexemeId;
+ return $result;
+ }
+
+ public function withStatement( Snak $statement ) {
+ $result = clone $this;
+ $result->statements[] = clone $statement;
+ return $result;
+ }
+
+ /**
+* @param string $language
+* @param string $lemma
+* @return LexemeBuilder
+*/
+ public function withLemma( $language, $lemma ) {
+ $result = clone $this;
+ $result->lemmas[$language] = $lemma;
+ return $result;
+ }
+
+ private function newRandomItemId() {
+ return new ItemId( 'Q' . mt_rand( 1, mt_getrandmax() ) );
+ }
+
+ public function __clone() {
+ $statements = [];
+ foreach ( $this->statements as $statement ) {
+ $statements[] = clone $statement;
+ }
+ $this->statements = $statements;
+ }
+
+}
diff --git
a/tests/phpunit/composer/DataModel/Serialization/LexemeSerializerTest.php
b/tests/phpunit/composer/DataModel/Serialization/LexemeSerializerTest.php
index c9c88b2..c7e1699 100644
--- a/tests/phpunit/composer/DataModel/Serialization/LexemeSerializerTest.php
+++ b/tests/phpunit/composer/DataModel/Serialization/LexemeSerializerTest.php
@@ -12,13 +1
[MediaWiki-commits] [Gerrit] pywikibot/core[master]: MWSite.__init__: Re-raise the RequestException of _parse_pos...
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/356432 )
Change subject: MWSite.__init__: Re-raise the RequestException of
_parse_post_117
..
MWSite.__init__: Re-raise the RequestException of _parse_post_117
If there is any kind of RequestException in _parse_post_117, it means
that the `private_wiki` attribute has not had a chance to be set and
will definitly cause AttributeError later in the code.
Raising the RequestException is more clear and will allow the related
test to be skipped.
Bug: T160355
Change-Id: I75eb7c35a1e030a309bdf271a7ddc8ac69052ab9
---
M pywikibot/site_detect.py
1 file changed, 3 insertions(+), 1 deletion(-)
Approvals:
jenkins-bot: Verified
Xqt: Looks good to me, approved
diff --git a/pywikibot/site_detect.py b/pywikibot/site_detect.py
index d4bf878..347bd63 100644
--- a/pywikibot/site_detect.py
+++ b/pywikibot/site_detect.py
@@ -13,6 +13,8 @@
import json
import re
+from requests import RequestException
+
import pywikibot
from pywikibot.comms.http import fetch
@@ -82,7 +84,7 @@
if self.api:
try:
self._parse_post_117()
-except ServerError:
+except (ServerError, RequestException):
raise
except Exception as e:
pywikibot.log('MW 1.17+ detection failed: {0!r}'.format(e))
--
To view, visit https://gerrit.wikimedia.org/r/356432
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I75eb7c35a1e030a309bdf271a7ddc8ac69052ab9
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: Dalba
Gerrit-Reviewer: John Vandenberg
Gerrit-Reviewer: Magul
Gerrit-Reviewer: Xqt
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...DonationInterface[master]: Fix retry link for disabled gateway
Ejegg has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/356497 )
Change subject: Fix retry link for disabled gateway
..
Fix retry link for disabled gateway
FormChooser doesn't help if the gateway is hardcoded to something
disabled!
Bug: T140314
Change-Id: Iff15ef84287e205dd13c4820bd924f26eb6dfcd0
---
M gateway_common/DonationData.php
M gateway_forms/MustacheErrorForm.php
2 files changed, 5 insertions(+), 4 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/DonationInterface
refs/changes/97/356497/1
diff --git a/gateway_common/DonationData.php b/gateway_common/DonationData.php
index 0b2943b..ff80ea1 100644
--- a/gateway_common/DonationData.php
+++ b/gateway_common/DonationData.php
@@ -957,7 +957,6 @@
*/
public static function getRetryFields() {
$fields = array(
- 'gateway',
'country',
'currency',
'amount',
diff --git a/gateway_forms/MustacheErrorForm.php
b/gateway_forms/MustacheErrorForm.php
index b46ac53..c818546 100644
--- a/gateway_forms/MustacheErrorForm.php
+++ b/gateway_forms/MustacheErrorForm.php
@@ -32,9 +32,11 @@
//add data we're going to need for the error page!
$back_form = $this->gateway->session_getLastFormName();
- $params = array (
- 'gateway' => $this->gateway->getIdentifier()
- );
+ $params = array ();
+ if ( $this->gateway->getGlobal( 'Enabled' ) ) {
+ $params['gateway'] = $this->gateway->getIdentifier();
+ }
+
if ( !$this->gateway->session_hasDonorData() ) {
foreach ( DonationData::getRetryFields() as $field ) {
if ( isset( $data[$field] ) ) {
--
To view, visit https://gerrit.wikimedia.org/r/356497
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iff15ef84287e205dd13c4820bd924f26eb6dfcd0
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/DonationInterface
Gerrit-Branch: master
Gerrit-Owner: Ejegg
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: Drop test/testrepo from trebuchet-deployed repos
Chad has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/356496 ) Change subject: Drop test/testrepo from trebuchet-deployed repos .. Drop test/testrepo from trebuchet-deployed repos Not used anymore. Can also be dropped from tin/naos when merged Change-Id: I931ba317442b91e579d7ebb309da963557581034 --- M hieradata/common/role/deployment.yaml 1 file changed, 0 insertions(+), 3 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/96/356496/1 diff --git a/hieradata/common/role/deployment.yaml b/hieradata/common/role/deployment.yaml index 7612021..db05640 100644 --- a/hieradata/common/role/deployment.yaml +++ b/hieradata/common/role/deployment.yaml @@ -16,9 +16,6 @@ upstream: https://gerrit.wikimedia.org/r/mediawiki/tools/fluoride statsv/statsv: upstream: https://gerrit.wikimedia.org/r/analytics/statsv - test/testrepo: -service_name: puppet -checkout_submodules: true elasticsearch/plugins: gitfat_enabled: true upstream: https://gerrit.wikimedia.org/r/operations/software/elasticsearch/plugins -- To view, visit https://gerrit.wikimedia.org/r/356496 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I931ba317442b91e579d7ebb309da963557581034 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Chad ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: icinga: give permissions to run commands to herron
Herron has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/356309 ) Change subject: icinga: give permissions to run commands to herron .. icinga: give permissions to run commands to herron Let Keith Herron execute commands for all hosts and services in Icinga, like other Operations team members. This is needed to schedule downtimes, ACK Icinga alerts and similar things that can be selected from dropdown menus in the web UI. The Icinga-internal "user" (contact) needs to match the LDAP "cn" field because Apache LDAP auth is in front of Icinga but it's unrelated to the actual permissions from Icinga's point of view. Caveat is the LDAP login allows both capitalized and non-capitalized user name, so you can be "logged in as: " but still not have the permissions if using the wrong case. Bug: T166587 Change-Id: I2bc06fd8cd9df7a23e6c7b362846c9ec4ab92e1f --- M modules/icinga/files/cgi.cfg 1 file changed, 5 insertions(+), 5 deletions(-) Approvals: Herron: Looks good to me, approved jenkins-bot: Verified diff --git a/modules/icinga/files/cgi.cfg b/modules/icinga/files/cgi.cfg index 7a8abf0..6996653 100644 --- a/modules/icinga/files/cgi.cfg +++ b/modules/icinga/files/cgi.cfg @@ -131,7 +131,7 @@ # not use authorization. You may use an asterisk (*) to # authorize any user who has authenticated to the web server. -authorized_for_system_information=tim starling,robh,mark bergsma,domas,arielglenn,cmjohnson,dzahn,jgreen,Faidon Liambotis,katie horn,catrope,alexandros kosiaris,ori.livneh,andrew bogott,ottomata,rush,Giuseppe Lavagetto,Filippo Giunchedi,bblack,manybubbles,Coren,yuvipanda,Muehlenhoff,Jcrespo,20after4,eevans,mobrovac,gwicke,ppchelko,Ema,Elukey,Volans,Gehel,Madhuvishy,Marostegui,Ayounsi +authorized_for_system_information=tim starling,robh,mark bergsma,domas,arielglenn,cmjohnson,dzahn,jgreen,Faidon Liambotis,katie horn,catrope,alexandros kosiaris,ori.livneh,andrew bogott,ottomata,rush,Giuseppe Lavagetto,Filippo Giunchedi,bblack,manybubbles,Coren,yuvipanda,Muehlenhoff,Jcrespo,20after4,eevans,mobrovac,gwicke,ppchelko,Ema,Elukey,Volans,Gehel,Madhuvishy,Marostegui,Ayounsi,Herron # CONFIGURATION INFORMATION ACCESS @@ -142,7 +142,7 @@ # an asterisk (*) to authorize any user who has authenticated # to the web server. -authorized_for_configuration_information=tim starling,robh,mark bergsma,domas,arielglenn,cmjohnson,dzahn,jgreen,Faidon Liambotis,katie horn,catrope,alexandros kosiaris,ori.livneh,andrew bogott,ottomata,rush,Giuseppe Lavagetto,Filippo Giunchedi,bblack,manybubbles,Coren,yuvipanda,Muehlenhoff,Jcrespo,20after4,eevans,mobrovac,gwicke,ppchelko,Ema,Elukey,Volans,Gehel,Madhuvishy,Marostegui,Ayounsi +authorized_for_configuration_information=tim starling,robh,mark bergsma,domas,arielglenn,cmjohnson,dzahn,jgreen,Faidon Liambotis,katie horn,catrope,alexandros kosiaris,ori.livneh,andrew bogott,ottomata,rush,Giuseppe Lavagetto,Filippo Giunchedi,bblack,manybubbles,Coren,yuvipanda,Muehlenhoff,Jcrespo,20after4,eevans,mobrovac,gwicke,ppchelko,Ema,Elukey,Volans,Gehel,Madhuvishy,Marostegui,Ayounsi,Herron @@ -155,7 +155,7 @@ # You may use an asterisk (*) to authorize any user who has # authenticated to the web server. -authorized_for_system_commands=tim starling,robh,mark bergsma,domas,arielglenn,cmjohnson,dzahn,jgreen,Faidon Liambotis,katie horn,catrope,alexandros kosiaris,ori.livneh,andrew bogott,ottomata,rush,Giuseppe Lavagetto,Filippo Giunchedi,bblack,manybubbles,Coren,yuvipanda,Muehlenhoff,Jcrespo,20after4,eevans,mobrovac,gwicke,ppchelko,Ema,Elukey,Volans,Gehel,Madhuvishy,Marostegui,Ayounsi +authorized_for_system_commands=tim starling,robh,mark bergsma,domas,arielglenn,cmjohnson,dzahn,jgreen,Faidon Liambotis,katie horn,catrope,alexandros kosiaris,ori.livneh,andrew bogott,ottomata,rush,Giuseppe Lavagetto,Filippo Giunchedi,bblack,manybubbles,Coren,yuvipanda,Muehlenhoff,Jcrespo,20after4,eevans,mobrovac,gwicke,ppchelko,Ema,Elukey,Volans,Gehel,Madhuvishy,Marostegui,Ayounsi,Herron # GLOBAL HOST/SERVICE VIEW ACCESS @@ -181,8 +181,8 @@ # authorization). You may use an asterisk (*) to authorize any # user who has authenticated to the web server. -authorized_for_all_service_commands=tim starling,robh,mark bergsma,domas,arielglenn,cmjohnson,dzahn,jgreen,Faidon Liambotis,katie horn,catrope,alexandros kosiaris,ori.livneh,andrew bogott,ottomata,rush,Giuseppe Lavagetto,Filippo Giunchedi,bblack,manybubbles,Coren,yuvipanda,Muehlenhoff,Jcrespo,20after4,eevans,mobrovac,gwicke,ppchelko,Ema,Elukey,Volans,Gehel,Madhuvishy,Marostegui,Ayounsi -authorized_for_all_host_commands=tim starling,robh,mark bergsma,domas,arielglenn,cmjohnson,dzahn,jgreen,Faidon Liambotis,katie horn,catrope,alexandros kosiaris,ori.livneh,andrew bogott,ottomata,rush,Giuseppe Lavagetto,Filippo Giunchedi,bblack,manybubbles,Coren,yuvipanda,Muehlenhoff,Jcrespo,20after4,eevans,mobrovac,gwicke,ppchelko,Ema
[MediaWiki-commits] [Gerrit] mediawiki/core[fundraising/REL1_27]: update DonationInterface submodule
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/356495 ) Change subject: update DonationInterface submodule .. update DonationInterface submodule Change-Id: I2a500ca9fa23c5f83d83061d1b1df4fb9be195c2 --- M extensions/DonationInterface 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: jenkins-bot: Verified Ejegg: Looks good to me, approved diff --git a/extensions/DonationInterface b/extensions/DonationInterface index a85495b..91ac51e 16 --- a/extensions/DonationInterface +++ b/extensions/DonationInterface @@ -1 +1 @@ -Subproject commit a85495bb17f3fa704edaa0cdab636ee84b997347 +Subproject commit 91ac51eccf8e2a2657ae387f4b27bba73d393b2d -- To view, visit https://gerrit.wikimedia.org/r/356495 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I2a500ca9fa23c5f83d83061d1b1df4fb9be195c2 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: fundraising/REL1_27 Gerrit-Owner: Ejegg Gerrit-Reviewer: Ejegg Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Graph[master]: Fix fatal error on graph api
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/356490 )
Change subject: Fix fatal error on graph api
..
Fix fatal error on graph api
Constant was renamed, but the usage of the constant in ApiGraph was
not.
Follow-up to: Id4314f3a2021a0d5c2f35fed5314882ec0f8e8b0
Bug: T166713
Change-Id: Idde94f1c9e1a3549dc44d00522e9f5cd860600b4
---
M includes/ApiGraph.php
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Legoktm: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/ApiGraph.php b/includes/ApiGraph.php
index fa88d34..26027a2 100644
--- a/includes/ApiGraph.php
+++ b/includes/ApiGraph.php
@@ -76,7 +76,7 @@
*/
private function preprocess( $text ) {
global $wgParser;
- $title = Title::makeTitle( NS_SPECIAL, Sandbox::PageName
)->fixSpecialName();
+ $title = Title::makeTitle( NS_SPECIAL, Sandbox::PAGENAME
)->fixSpecialName();
$text = $wgParser->getFreshParser()->preprocess( $text, $title,
new ParserOptions() );
$st = FormatJson::parse( $text );
if ( !$st->isOK() ) {
--
To view, visit https://gerrit.wikimedia.org/r/356490
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Idde94f1c9e1a3549dc44d00522e9f5cd860600b4
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Graph
Gerrit-Branch: master
Gerrit-Owner: TheDJ
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] operations/puppet[production]: Revert "admins: revoke ladsgroups key temporarily"
Dzahn has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/356489 ) Change subject: Revert "admins: revoke ladsgroups key temporarily" .. Revert "admins: revoke ladsgroups key temporarily" This reverts commit 08e09a2a7a9c954ead3145522fb911c4afa15a44. Change-Id: I2ed108c8d2a7b9968a8868382cb86913c3a3a2a7 --- M modules/admin/data/data.yaml 1 file changed, 3 insertions(+), 1 deletion(-) Approvals: jenkins-bot: Verified Dzahn: Looks good to me, approved diff --git a/modules/admin/data/data.yaml b/modules/admin/data/data.yaml index d008e44..549bf25 100644 --- a/modules/admin/data/data.yaml +++ b/modules/admin/data/data.yaml @@ -986,7 +986,9 @@ gid: 500 name: ladsgroup realname: Amir Sarabadani -ssh_keys: [] +ssh_keys: + - ssh-rsa B3NzaC1yc2EDAQABAAACAQC4VTfdeTSboPh/af2zT6ov13A7kSygXEspRgq3/d2BWcNFvwIIpgtpCnHzA6YPvuhrjksw34jk3OvuuQoTyWYfuwql8Wu8O9f32WD4dhrKhB8Rchxj6rrncBrGS5k0HeLr+HMrknVSSXGH60GAFNRGYLCGA+zBXLAja+xROTipIRHOF0SLlsfpY04HTrEtKcKdj8n9BnGpbT7vFp+AmXeSHg9DwRn6yvem3x1ghBFdfg+XwmIqsV4wR2b7GLX2Y6+ei53657v2VxVsORdfn4yV7FcjeVYnwNxMOVMfYcFCz+1LU9ROPDw5sCqyDPMtyQPxExiprKNT9UHkUj7aqE61o4AF1vSb9AEdUpjGgiMl+Dr8Sd+T2sNOq5uFxtWSfuNqgGHY+nOYPmSHsxthwXc7CH7x/eBDefUZwTdwX8Vf/FYOAyiviknCzwLoAbkQwRjOwFZVqJMwRwRyMToKODTTgOM0s3g/5P8n5AYwTLt1I6dLeC3nju3lywyeWb6DkFOB48mg561AU1soTnSKffse7AtJ5Ye3GFEBKxBCRJUpc7EVesOhjTdcmBWYeSSmwxHCjiCact4tyk8ZiLuRqd3EZ0KFT/6W5d4csrJUwBDNWo+7M69gVIMn/zDCy3ZViGMsqPFfXSrpKw8k0WtPBTKdHFPJ0KoLERctzkrNkfBTVw== Ladsgroup @ prod + - ssh-rsa B3NzaC1yc2EDAQABAAABAQCY5EyIRrtuxDgh8SOkTQl8tYAu5ZOGMO0MA9RiqMb6za8ossDmKCwD5JKwooYmT8yFA5JnvyOC0adsCCA+enylrX6r6FK0ur+dekfCGF/dsyxSJU9aw6WwVr2BThrfPjzbMR1IuN4I0t134fYE0VUvibod1kGoxSGYdWvqEFf+v7b2MqWtU+xASBFEbrx2knqVBjyy6+O8sUikfKX+vyCSxiQa2GE66LM8SuX+0JnhlDNuXleQzdFpJ9novw/+/1KqOJOg3i8/Jb1/AEMf/eChombWdjNccGtPueRyJAXEl2tCuLvt9Vf7PBZaoxhAV0Bo0GcwRVBwvsyaNDuVabLJ uid: 3182 email: amir.tafreshi_...@wikimedia.de manybubbles: -- To view, visit https://gerrit.wikimedia.org/r/356489 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I2ed108c8d2a7b9968a8868382cb86913c3a3a2a7 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] mediawiki/core[fundraising/REL1_27]: update DonationInterface submodule
Ejegg has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/356495 ) Change subject: update DonationInterface submodule .. update DonationInterface submodule Change-Id: I2a500ca9fa23c5f83d83061d1b1df4fb9be195c2 --- M extensions/DonationInterface 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/95/356495/1 diff --git a/extensions/DonationInterface b/extensions/DonationInterface index a85495b..91ac51e 16 --- a/extensions/DonationInterface +++ b/extensions/DonationInterface @@ -1 +1 @@ -Subproject commit a85495bb17f3fa704edaa0cdab636ee84b997347 +Subproject commit 91ac51eccf8e2a2657ae387f4b27bba73d393b2d -- To view, visit https://gerrit.wikimedia.org/r/356495 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I2a500ca9fa23c5f83d83061d1b1df4fb9be195c2 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: fundraising/REL1_27 Gerrit-Owner: Ejegg ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...DonationInterface[deployment]: Merge branch 'master' into deployment
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/356494 ) Change subject: Merge branch 'master' into deployment .. Merge branch 'master' into deployment 7ac8d07d Restore accidentally deleted line f6c38fa2 Log User-Agent on dead session error Change-Id: I490c02668722506987ea5dcfe4d8afa7efa87226 --- 0 files changed, 0 insertions(+), 0 deletions(-) Approvals: jenkins-bot: Verified Ejegg: Looks good to me, approved -- To view, visit https://gerrit.wikimedia.org/r/356494 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I490c02668722506987ea5dcfe4d8afa7efa87226 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/DonationInterface Gerrit-Branch: deployment Gerrit-Owner: Ejegg Gerrit-Reviewer: Ejegg Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...DonationInterface[deployment]: Merge branch 'master' into deployment
Ejegg has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/356494 ) Change subject: Merge branch 'master' into deployment .. Merge branch 'master' into deployment 7ac8d07d Restore accidentally deleted line f6c38fa2 Log User-Agent on dead session error Change-Id: I490c02668722506987ea5dcfe4d8afa7efa87226 --- 0 files changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/DonationInterface refs/changes/94/356494/1 -- To view, visit https://gerrit.wikimedia.org/r/356494 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I490c02668722506987ea5dcfe4d8afa7efa87226 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/DonationInterface Gerrit-Branch: deployment Gerrit-Owner: Ejegg ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Babel[master]: Invalidate languages cache whenever language list updates
Legoktm has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/356493 )
Change subject: Invalidate languages cache whenever language list updates
..
Invalidate languages cache whenever language list updates
Change-Id: I8ef5819c71e68260744d3bf3e7da35d56218807d
---
M Babel.class.php
M BabelStatic.class.php
M includes/Database.php
3 files changed, 12 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Babel
refs/changes/93/356493/1
diff --git a/Babel.class.php b/Babel.class.php
index acaaa69..654c784 100644
--- a/Babel.class.php
+++ b/Babel.class.php
@@ -352,15 +352,19 @@
public static function getCachedUserLanguageInfo( User $user ) {
$cache = ObjectCache::getMainWANInstance();
$userId = $user->getId();
+ $key = $cache->makeKey( 'babel', 'userLanguages', $userId );
$cachedUserLanguageInfo = $cache->getWithSetCallback(
- $cache->makeKey( 'babel', 'userLanguages', $userId ),
+ $key,
$cache::TTL_MINUTE * 30,
function ( $oldValue, &$ttl, array &$setOpts ) use (
$userId, $user ) {
wfDebug( "Babel: cache miss for user $userId\n"
);
return self::getUserLanguageInfo( $user );
- }
+ },
+ [
+ 'checkKeys' => [ $key ],
+ ]
);
return $cachedUserLanguageInfo;
diff --git a/BabelStatic.class.php b/BabelStatic.class.php
index 7f21faa..6aeb583 100644
--- a/BabelStatic.class.php
+++ b/BabelStatic.class.php
@@ -50,5 +50,7 @@
$babelDB = new MediaWiki\Babel\Database();
$data = $linksUpdate->getParserOutput()->getExtensionData(
'babel' ) ?: [];
$babelDB->setForUser( $user->getId(), $data );
+ $cache = ObjectCache::getMainWANInstance();
+ $cache->touchCheckKey( $cache->makeKey( 'babel',
'userLanguages', $user->getId() ) );
}
}
diff --git a/includes/Database.php b/includes/Database.php
index 847bc39..d1dea48 100644
--- a/includes/Database.php
+++ b/includes/Database.php
@@ -64,6 +64,7 @@
/**
* @param string $id
* @param string[] $data [ lang => level ]
+* @return bool true if changes to the db were made
*/
public function setForUser( $id, array $data ) {
$dbw = $this->getDB( DB_MASTER );
@@ -71,7 +72,7 @@
// Populate data as long as the table exists, so
// we can pre-populate the database before switching
// reads to the database
- return;
+ return false;
}
$newRows = [];
@@ -116,5 +117,7 @@
__METHOD__
);
}
+
+ return $rowsDelete || $newRows;
}
}
--
To view, visit https://gerrit.wikimedia.org/r/356493
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I8ef5819c71e68260744d3bf3e7da35d56218807d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Babel
Gerrit-Branch: master
Gerrit-Owner: Legoktm
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...DonationInterface[master]: Log User-Agent on dead session error
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/356491 ) Change subject: Log User-Agent on dead session error .. Log User-Agent on dead session error Change-Id: I6c8d44e630679bae3a8685e3047b5d684683c048 --- M gateway_common/GatewayPage.php 1 file changed, 3 insertions(+), 1 deletion(-) Approvals: XenoRyet: Looks good to me, approved jenkins-bot: Verified diff --git a/gateway_common/GatewayPage.php b/gateway_common/GatewayPage.php index 53b87f5..4b1f2ba 100644 --- a/gateway_common/GatewayPage.php +++ b/gateway_common/GatewayPage.php @@ -403,7 +403,9 @@ wfHttpError( 403, 'Forbidden', wfMessage( 'donate_interface-error-http-403' )->text() ); throw new RuntimeException( 'Resultswitcher: Request forbidden. No active donation in the session. ' . - "Adapter Order ID: $oid. Cookies: " . print_r( $_COOKIE, true ) + "Adapter Order ID: $oid.\n" . + "Cookies: " . print_r( $_COOKIE, true ) ."\n" . + "User-Agent: " . $_SERVER['HTTP_USER_AGENT'] ); } // If it's possible for a donation to go through without our -- To view, visit https://gerrit.wikimedia.org/r/356491 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I6c8d44e630679bae3a8685e3047b5d684683c048 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/DonationInterface Gerrit-Branch: master Gerrit-Owner: Ejegg Gerrit-Reviewer: XenoRyet Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: [Whoops] Restore search results filtering tests
Mholloway has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/356492 )
Change subject: [Whoops] Restore search results filtering tests
..
[Whoops] Restore search results filtering tests
There were some nice unit tests for filtering behavior in SuggestionsTask-
Test that were lumped in with an AsyncTask call test and got deleted in
I4bde23e. This restores them in a new test class.
Change-Id: I6a39211ec84b963ab43c664149f6a6a4bee5821d
---
A app/src/test/java/org/wikipedia/search/SearchResultsFilterTest.java
1 file changed, 51 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia
refs/changes/92/356492/1
diff --git
a/app/src/test/java/org/wikipedia/search/SearchResultsFilterTest.java
b/app/src/test/java/org/wikipedia/search/SearchResultsFilterTest.java
new file mode 100644
index 000..1ee2c6b
--- /dev/null
+++ b/app/src/test/java/org/wikipedia/search/SearchResultsFilterTest.java
@@ -0,0 +1,51 @@
+package org.wikipedia.search;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.wikipedia.Constants;
+import org.wikipedia.dataclient.WikiSite;
+import org.wikipedia.page.PageTitle;
+import org.wikipedia.test.TestRunner;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import static org.hamcrest.Matchers.is;
+import static org.junit.Assert.assertThat;
+
+@RunWith(TestRunner.class) public class SearchResultsFilterTest {
+private static final WikiSite WIKI = WikiSite.forLanguageCode("test");
+
+@Test public void testFilterNoResults() {
+List originalResults = new ArrayList<>();
+checkFilter(0, originalResults);
+}
+
+@Test public void testFilter1ResultSameAsTitleIgnoreCase() {
+List originalResults = new ArrayList<>();
+originalResults.add(new SearchResult(new PageTitle("Test", WIKI, null,
null)));
+checkFilter(0, originalResults);
+}
+
+@Test public void testFilter1ResultDifferentFromTitle() {
+List originalResults = new ArrayList<>();
+originalResults.add(new SearchResult(new PageTitle("something else",
WIKI, null, null)));
+checkFilter(1, originalResults);
+}
+
+@Test public void testFilter4ResultsDifferentFromTitle() {
+List originalResults = new ArrayList<>();
+originalResults.add(new SearchResult(new PageTitle("something else",
WIKI, null, null)));
+originalResults.add(new SearchResult(new PageTitle("something else",
WIKI, null, null)));
+originalResults.add(new SearchResult(new PageTitle("something else",
WIKI, null, null)));
+originalResults.add(new SearchResult(new PageTitle("something else",
WIKI, null, null)));
+checkFilter(Constants.MAX_SUGGESTION_RESULTS, originalResults);
+}
+
+private void checkFilter(int expected, List originalResults)
{
+String title = "test";
+SearchResults searchResults = new SearchResults(originalResults, null,
null);
+List filteredList = SearchResults.filter(searchResults,
title, false).getResults();
+assertThat(expected, is(filteredList.size()));
+}
+}
--
To view, visit https://gerrit.wikimedia.org/r/356492
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I6a39211ec84b963ab43c664149f6a6a4bee5821d
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Mholloway
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...DonationInterface[master]: Restore accidentally deleted line
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/356487 )
Change subject: Restore accidentally deleted line
..
Restore accidentally deleted line
Change-Id: I07c9adcb2aecc07396217ff959b23982d179d0d0
---
M extras/custom_filters/filters/minfraud/minfraud.body.php
1 file changed, 1 insertion(+), 0 deletions(-)
Approvals:
XenoRyet: Looks good to me, approved
jenkins-bot: Verified
diff --git a/extras/custom_filters/filters/minfraud/minfraud.body.php
b/extras/custom_filters/filters/minfraud/minfraud.body.php
index 3f17ac6..dc39aed 100644
--- a/extras/custom_filters/filters/minfraud/minfraud.body.php
+++ b/extras/custom_filters/filters/minfraud/minfraud.body.php
@@ -261,6 +261,7 @@
$weight = $this->gateway_adapter->getGlobal( 'MinfraudWeight' );
$multiplier = $weight / 100;
try {
+ $minfraud_query = $this->build_query(
$this->gateway_adapter->getData_Unstaged_Escaped() );
$this->query_minfraud( $minfraud_query );
// Write the query/response to the log before we go mad.
$this->log_query();
--
To view, visit https://gerrit.wikimedia.org/r/356487
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I07c9adcb2aecc07396217ff959b23982d179d0d0
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/DonationInterface
Gerrit-Branch: master
Gerrit-Owner: Ejegg
Gerrit-Reviewer: XenoRyet
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...MobileFrontend[master]: Hygiene: Define notifications in extension.json
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/354715 )
Change subject: Hygiene: Define notifications in extension.json
..
Hygiene: Define notifications in extension.json
These ResourceLoader modules can safely be defined in extension.json.
It has no hard dependencies on ResourceLoader modules provided by
Echo.
Registering this in Echo makes this code more discoverable. Hooks should
only be used as a last resort as they performance penalties.
Change-Id: I952aeb7501cf45605860eefcf0213ea1ae555755
---
M extension.json
M includes/Minerva.hooks.php
M resources/skins.minerva.notifications.badge/NotificationBadge.js
3 files changed, 26 insertions(+), 53 deletions(-)
Approvals:
Pmiazga: Looks good to me, approved
jenkins-bot: Verified
diff --git a/extension.json b/extension.json
index 1d0b25f..e6ee3e3 100644
--- a/extension.json
+++ b/extension.json
@@ -1457,6 +1457,30 @@
"mobile-frontend-editor-tutorial-cancel"
]
},
+ "skins.minerva.notifications.badge": {
+ "dependencies": [
+ "mediawiki.router",
+ "mobile.startup"
+ ],
+ "scripts": [
+
"resources/skins.minerva.notifications.badge/NotificationBadge.js"
+ ],
+ "templates": {
+ "badge.hogan":
"includes/skins/secondaryButton.mustache"
+ },
+ "targets": [ "mobile", "desktop" ]
+ },
+ "skins.minerva.notifications": {
+ "dependencies": [
+ "skins.minerva.notifications.badge",
+ "mediawiki.ui.anchor",
+ "skins.minerva.scripts"
+ ],
+ "scripts": [
+ "resources/skins.minerva.notifications/init.js"
+ ],
+ "targets": [ "mobile", "desktop" ]
+ },
"skins.minerva.editor": {
"class": "MFResourceLoaderParsedMessageModule",
"dependencies": [
@@ -1706,7 +1730,6 @@
"MobileFrontendHooks::onCentralAuthSilentLoginRedirect"
],
"ResourceLoaderRegisterModules": [
- "MinervaHooks::onResourceLoaderRegisterModules",
"MobileFrontendHooks::onResourceLoaderRegisterModules"
],
"EventLoggingRegisterSchemas": [
diff --git a/includes/Minerva.hooks.php b/includes/Minerva.hooks.php
index 596c0f2..86d2874 100644
--- a/includes/Minerva.hooks.php
+++ b/includes/Minerva.hooks.php
@@ -104,57 +104,6 @@
}
/**
-* ResourceLoaderRegisterModules hook handler.
-*
-* Registers:
-*
-* * EventLogging schema modules, if the EventLogging extension is
loaded;
-* * Modules for the Visual Editor overlay, if the VisualEditor
extension is loaded; and
-* * Modules for the notifications overlay, if the Echo extension is
loaded.
-*
-* @see
https://www.mediawiki.org/wiki/Manual:Hooks/ResourceLoaderRegisterModules
-*
-* @param ResourceLoader &$resourceLoader The ResourceLoader object
-* @return bool Always true
-*/
- public static function onResourceLoaderRegisterModules( ResourceLoader
&$resourceLoader ) {
- $resourceBoilerplate = [
- 'localBasePath' => dirname( __DIR__ ),
- // Rename to Minerva when you move to a skin
- 'remoteExtPath' => 'MobileFrontend',
- ];
-
- if ( class_exists( 'MWEchoNotifUser' ) ) {
- $resourceLoader->register( [
- 'skins.minerva.notifications.badge' =>
$resourceBoilerplate + [
- 'dependencies' => [
- 'mediawiki.router',
- 'mobile.startup',
- ],
- 'scripts' => [
-
'resources/skins.minerva.notifications.badge/NotificationBadge.js',
- ],
- 'templates' => [
- 'badge.hogan' =>
'includes/skins/secondaryButton.mustache',
- ],
- 'targets' => [ 'mobile', 'desktop' ],
- ],
- 's
[MediaWiki-commits] [Gerrit] mediawiki...DonationInterface[master]: Log User-Agent on dead session error
Ejegg has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/356491 ) Change subject: Log User-Agent on dead session error .. Log User-Agent on dead session error Change-Id: I6c8d44e630679bae3a8685e3047b5d684683c048 --- M gateway_common/GatewayPage.php 1 file changed, 3 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/DonationInterface refs/changes/91/356491/1 diff --git a/gateway_common/GatewayPage.php b/gateway_common/GatewayPage.php index 53b87f5..4b1f2ba 100644 --- a/gateway_common/GatewayPage.php +++ b/gateway_common/GatewayPage.php @@ -403,7 +403,9 @@ wfHttpError( 403, 'Forbidden', wfMessage( 'donate_interface-error-http-403' )->text() ); throw new RuntimeException( 'Resultswitcher: Request forbidden. No active donation in the session. ' . - "Adapter Order ID: $oid. Cookies: " . print_r( $_COOKIE, true ) + "Adapter Order ID: $oid.\n" . + "Cookies: " . print_r( $_COOKIE, true ) ."\n" . + "User-Agent: " . $_SERVER['HTTP_USER_AGENT'] ); } // If it's possible for a donation to go through without our -- To view, visit https://gerrit.wikimedia.org/r/356491 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I6c8d44e630679bae3a8685e3047b5d684683c048 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/DonationInterface Gerrit-Branch: master Gerrit-Owner: Ejegg ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Graph[master]: Fix fatal error on graph api
TheDJ has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/356490 )
Change subject: Fix fatal error on graph api
..
Fix fatal error on graph api
Constant was renamed, but the usage of the constant in ApiGraph was
not.
Follow-up to: Id4314f3a2021a0d5c2f35fed5314882ec0f8e8b0
Bug: T166713
Change-Id: Idde94f1c9e1a3549dc44d00522e9f5cd860600b4
---
M includes/ApiGraph.php
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Graph
refs/changes/90/356490/1
diff --git a/includes/ApiGraph.php b/includes/ApiGraph.php
index fa88d34..26027a2 100644
--- a/includes/ApiGraph.php
+++ b/includes/ApiGraph.php
@@ -76,7 +76,7 @@
*/
private function preprocess( $text ) {
global $wgParser;
- $title = Title::makeTitle( NS_SPECIAL, Sandbox::PageName
)->fixSpecialName();
+ $title = Title::makeTitle( NS_SPECIAL, Sandbox::PAGENAME
)->fixSpecialName();
$text = $wgParser->getFreshParser()->preprocess( $text, $title,
new ParserOptions() );
$st = FormatJson::parse( $text );
if ( !$st->isOK() ) {
--
To view, visit https://gerrit.wikimedia.org/r/356490
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Idde94f1c9e1a3549dc44d00522e9f5cd860600b4
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Graph
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] operations/puppet[production]: Revert "admins: revoke ladsgroups key temporarily"
Hello jenkins-bot, I'd like you to do a code review. Please visit https://gerrit.wikimedia.org/r/356489 to review the following change. Change subject: Revert "admins: revoke ladsgroups key temporarily" .. Revert "admins: revoke ladsgroups key temporarily" This reverts commit 08e09a2a7a9c954ead3145522fb911c4afa15a44. Change-Id: I2ed108c8d2a7b9968a8868382cb86913c3a3a2a7 --- M modules/admin/data/data.yaml 1 file changed, 3 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/89/356489/1 diff --git a/modules/admin/data/data.yaml b/modules/admin/data/data.yaml index b06e497..b7a5144 100644 --- a/modules/admin/data/data.yaml +++ b/modules/admin/data/data.yaml @@ -985,7 +985,9 @@ gid: 500 name: ladsgroup realname: Amir Sarabadani -ssh_keys: [] +ssh_keys: + - ssh-rsa B3NzaC1yc2EDAQABAAACAQC4VTfdeTSboPh/af2zT6ov13A7kSygXEspRgq3/d2BWcNFvwIIpgtpCnHzA6YPvuhrjksw34jk3OvuuQoTyWYfuwql8Wu8O9f32WD4dhrKhB8Rchxj6rrncBrGS5k0HeLr+HMrknVSSXGH60GAFNRGYLCGA+zBXLAja+xROTipIRHOF0SLlsfpY04HTrEtKcKdj8n9BnGpbT7vFp+AmXeSHg9DwRn6yvem3x1ghBFdfg+XwmIqsV4wR2b7GLX2Y6+ei53657v2VxVsORdfn4yV7FcjeVYnwNxMOVMfYcFCz+1LU9ROPDw5sCqyDPMtyQPxExiprKNT9UHkUj7aqE61o4AF1vSb9AEdUpjGgiMl+Dr8Sd+T2sNOq5uFxtWSfuNqgGHY+nOYPmSHsxthwXc7CH7x/eBDefUZwTdwX8Vf/FYOAyiviknCzwLoAbkQwRjOwFZVqJMwRwRyMToKODTTgOM0s3g/5P8n5AYwTLt1I6dLeC3nju3lywyeWb6DkFOB48mg561AU1soTnSKffse7AtJ5Ye3GFEBKxBCRJUpc7EVesOhjTdcmBWYeSSmwxHCjiCact4tyk8ZiLuRqd3EZ0KFT/6W5d4csrJUwBDNWo+7M69gVIMn/zDCy3ZViGMsqPFfXSrpKw8k0WtPBTKdHFPJ0KoLERctzkrNkfBTVw== Ladsgroup @ prod + - ssh-rsa B3NzaC1yc2EDAQABAAABAQCY5EyIRrtuxDgh8SOkTQl8tYAu5ZOGMO0MA9RiqMb6za8ossDmKCwD5JKwooYmT8yFA5JnvyOC0adsCCA+enylrX6r6FK0ur+dekfCGF/dsyxSJU9aw6WwVr2BThrfPjzbMR1IuN4I0t134fYE0VUvibod1kGoxSGYdWvqEFf+v7b2MqWtU+xASBFEbrx2knqVBjyy6+O8sUikfKX+vyCSxiQa2GE66LM8SuX+0JnhlDNuXleQzdFpJ9novw/+/1KqOJOg3i8/Jb1/AEMf/eChombWdjNccGtPueRyJAXEl2tCuLvt9Vf7PBZaoxhAV0Bo0GcwRVBwvsyaNDuVabLJ uid: 3182 email: amir.tafreshi_...@wikimedia.de manybubbles: -- To view, visit https://gerrit.wikimedia.org/r/356489 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I2ed108c8d2a7b9968a8868382cb86913c3a3a2a7 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: 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] operations...gerrit[master]: Add core plugins @ 2.13.8
Chad has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/356488 ) Change subject: Add core plugins @ 2.13.8 .. Add core plugins @ 2.13.8 Change-Id: I53d7ef24e67b6b7ebe61864dd8b8aa6ab2837c6b --- A plugins/commit-message-length-validator.jar A plugins/download-commands.jar A plugins/replication.jar A plugins/reviewnotes.jar 4 files changed, 4 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/software/gerrit refs/changes/88/356488/1 diff --git a/plugins/commit-message-length-validator.jar b/plugins/commit-message-length-validator.jar new file mode 100644 index 000..9bc6e96 --- /dev/null +++ b/plugins/commit-message-length-validator.jar @@ -0,0 +1 @@ +#$# git-fat cc93672c7896532e8e11d7538ece712397663454 4316 diff --git a/plugins/download-commands.jar b/plugins/download-commands.jar new file mode 100644 index 000..ff58052 --- /dev/null +++ b/plugins/download-commands.jar @@ -0,0 +1 @@ +#$# git-fat 310414c4ed82d4b7a6505800b240be02fdb11e7b24970 diff --git a/plugins/replication.jar b/plugins/replication.jar new file mode 100644 index 000..91ca080 --- /dev/null +++ b/plugins/replication.jar @@ -0,0 +1 @@ +#$# git-fat 1aba9efd991aa924b7d0c98915b771dcb24e510d 210135 diff --git a/plugins/reviewnotes.jar b/plugins/reviewnotes.jar new file mode 100644 index 000..07267b3 --- /dev/null +++ b/plugins/reviewnotes.jar @@ -0,0 +1 @@ +#$# git-fat 1dcfc64ff86760c737a815ed3587515380ae049824583 -- To view, visit https://gerrit.wikimedia.org/r/356488 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I53d7ef24e67b6b7ebe61864dd8b8aa6ab2837c6b Gerrit-PatchSet: 1 Gerrit-Project: operations/software/gerrit Gerrit-Branch: master Gerrit-Owner: Chad ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...DonationInterface[master]: Restore accidentally deleted line
Ejegg has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/356487 )
Change subject: Restore accidentally deleted line
..
Restore accidentally deleted line
Change-Id: I07c9adcb2aecc07396217ff959b23982d179d0d0
---
M extras/custom_filters/filters/minfraud/minfraud.body.php
1 file changed, 1 insertion(+), 0 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/DonationInterface
refs/changes/87/356487/1
diff --git a/extras/custom_filters/filters/minfraud/minfraud.body.php
b/extras/custom_filters/filters/minfraud/minfraud.body.php
index 3f17ac6..dc39aed 100644
--- a/extras/custom_filters/filters/minfraud/minfraud.body.php
+++ b/extras/custom_filters/filters/minfraud/minfraud.body.php
@@ -261,6 +261,7 @@
$weight = $this->gateway_adapter->getGlobal( 'MinfraudWeight' );
$multiplier = $weight / 100;
try {
+ $minfraud_query = $this->build_query(
$this->gateway_adapter->getData_Unstaged_Escaped() );
$this->query_minfraud( $minfraud_query );
// Write the query/response to the log before we go mad.
$this->log_query();
--
To view, visit https://gerrit.wikimedia.org/r/356487
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I07c9adcb2aecc07396217ff959b23982d179d0d0
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/DonationInterface
Gerrit-Branch: master
Gerrit-Owner: Ejegg
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: ExtensionDistributor: Add REL1_29, drop REL1_23
Legoktm has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/356486 ) Change subject: ExtensionDistributor: Add REL1_29, drop REL1_23 .. ExtensionDistributor: Add REL1_29, drop REL1_23 Change-Id: I2209d478e289da0200358793feccdc7d32da20bf --- M wmf-config/CommonSettings.php 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/86/356486/1 diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php index 50af02a..13af83d 100644 --- a/wmf-config/CommonSettings.php +++ b/wmf-config/CommonSettings.php @@ -961,14 +961,14 @@ $wgExtDistDefaultSnapshot = 'REL1_28'; // Current development snapshot - // $wgExtDistCandidateSnapshot = 'REL1_29'; + $wgExtDistCandidateSnapshot = 'REL1_29'; // Available snapshots $wgExtDistSnapshotRefs = [ 'master', + 'REL1_29', 'REL1_28', 'REL1_27', - 'REL1_23', ]; // Use Graphite for popular list -- To view, visit https://gerrit.wikimedia.org/r/356486 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I2209d478e289da0200358793feccdc7d32da20bf Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Legoktm ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Hygiene: FullSearchArticlesTask retrofit follow-up
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/356292 )
Change subject: Hygiene: FullSearchArticlesTask retrofit follow-up
..
Hygiene: FullSearchArticlesTask retrofit follow-up
* Delete FullSearchArticlesTask[Test]
* Update a comment
Change-Id: I87e10c71278c4a16e7b6262ca7b2e75e5cbd495d
---
D app/src/androidTest/java/org/wikipedia/search/FullSearchArticlesTaskTest.java
D app/src/main/java/org/wikipedia/search/FullSearchArticlesTask.java
M app/src/main/java/org/wikipedia/search/SearchResults.java
3 files changed, 1 insertion(+), 243 deletions(-)
Approvals:
Dbrant: Looks good to me, approved
jenkins-bot: Verified
diff --git
a/app/src/androidTest/java/org/wikipedia/search/FullSearchArticlesTaskTest.java
b/app/src/androidTest/java/org/wikipedia/search/FullSearchArticlesTaskTest.java
deleted file mode 100644
index 4712f27..000
---
a/app/src/androidTest/java/org/wikipedia/search/FullSearchArticlesTaskTest.java
+++ /dev/null
@@ -1,94 +0,0 @@
-package org.wikipedia.search;
-
-
-import org.junit.Test;
-import org.wikipedia.WikipediaApp;
-import org.wikipedia.dataclient.WikiSite;
-import org.wikipedia.testlib.TestLatch;
-
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.is;
-import static org.hamcrest.Matchers.notNullValue;
-import static org.hamcrest.Matchers.nullValue;
-import static org.wikipedia.test.TestUtil.runOnMainSync;
-
-/**
- * Tests for full text search.
- * TODO: Remove.
- */
-public class FullSearchArticlesTaskTest {
-private static final int BATCH_SIZE = 12;
-private static final WikiSite WIKI = WikiSite.forLanguageCode("en");
-
-/** Have to use enwiki since I don't think there are any Wikidata
descriptions for testwiki. */
-@Test public void testFullTextSearchWithResults() throws Throwable {
-final TestLatch latch = new TestLatch();
-runOnMainSync(new Runnable() {
-@Override
-public void run() {
-WikipediaApp app = WikipediaApp.getInstance();
-new FullSearchArticlesTask(app.getAPIForSite(WIKI), WIKI,
"test", BATCH_SIZE, null, false) {
-@Override
-public void onFinish(SearchResults results) {
-assertThat(results, notNullValue());
-assertThat(results.getResults().size(),
is(BATCH_SIZE));
-assertThat(results.getSuggestion(), is(""));
-assertThat(results.getContinuation(), notNullValue());
-
-for (SearchResult result : results.getResults()) {
-if
(result.getPageTitle().getPrefixedText().equals("Test")) {
-
assertThat(result.getPageTitle().getDescription(), is("Wikipedia disambiguation
page"));
-}
-}
-latch.countDown();
-}
-}.execute();
-}
-});
-latch.await();
-}
-
-// TODO: move to TitleSearchTest once we have it
-
-//@Test public void testFullTextSearchWithSuggestion() throws Throwable {
-//startActivity(new Intent(), null, null);
-//final CountDownLatch completionLatch = new CountDownLatch(1);
-//runTestOnUiThread(new Runnable() {
-//@Override
-//public void run() {
-//WikipediaApp app = WikipediaApp.getInstance();
-//new FullSearchArticlesTask(app.getAPIForSite(WIKI), WIKI,
"teest", BATCH_SIZE, null) { // small typo should produce a suggestion
-//@Override
-//public void onFinish(SearchResults results) {
-//assertNotNull(results);
-//assertEquals(results.getSuggestion(), "test");
-//completionLatch.countDown();
-//}
-//}.execute();
-//}
-//});
-//assertTrue(completionLatch.await(TASK_COMPLETION_TIMEOUT,
TimeUnit.MILLISECONDS));
-//}
-
-@Test public void testEmptyResults() throws Throwable {
-final TestLatch latch = new TestLatch();
-runOnMainSync(new Runnable() {
-@Override
-public void run() {
-WikipediaApp app = WikipediaApp.getInstance();
-new FullSearchArticlesTask(app.getAPIForSite(WIKI), WIKI,
"jkfsdfpefdsfwoirpoik", BATCH_SIZE, null, false) { // total gibberish, should
not exist on enwiki
-@Override
-public void onFinish(SearchResults results) {
-assertThat(results, notNullValue());
-assertThat(results.getResults().size(), is(0));
-assertThat(results.getSuggestion(), is(""));
-assertThat(results.getCon
[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Update: Sort search results in the SearchResults constructor
Mholloway has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/356485 )
Change subject: Update: Sort search results in the SearchResults constructor
..
Update: Sort search results in the SearchResults constructor
Search results sorting was omitted, by me (facepalm), from the recent
patch moving full text search queries to Retrofit. It was partially
restored by Jcasariego in a downstream consumer. This centralizes sorting
in the new SearchResults constructor, so that it doesn't have to be
duplicated either in both search clients or in all n consumers.
Also takes out the recent addition of an 'index' property to PageTitle
and restores it to being solely a concern of MwQueryPage.
Change-Id: I154e6730573782a98ba0bc2bcf6cf8291fc61eab
---
M app/src/main/java/org/wikipedia/page/PageTitle.java
M app/src/main/java/org/wikipedia/page/bottomcontent/BottomContentHandler.java
M app/src/main/java/org/wikipedia/search/SearchResult.java
M app/src/main/java/org/wikipedia/search/SearchResults.java
4 files changed, 18 insertions(+), 34 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia
refs/changes/85/356485/1
diff --git a/app/src/main/java/org/wikipedia/page/PageTitle.java
b/app/src/main/java/org/wikipedia/page/PageTitle.java
index 8404b6d..4bc1f8b 100644
--- a/app/src/main/java/org/wikipedia/page/PageTitle.java
+++ b/app/src/main/java/org/wikipedia/page/PageTitle.java
@@ -74,7 +74,6 @@
@SerializedName("site") @NonNull private final WikiSite wiki;
@Nullable private String description;
@Nullable private final PageProperties properties;
-@Nullable private int index;
/**
* Creates a new PageTitle object.
@@ -113,12 +112,6 @@
public PageTitle(@Nullable String text, @NonNull WikiSite wiki, @Nullable
String thumbUrl, @Nullable String description) {
this(text, wiki, thumbUrl);
this.description = description;
-}
-
-public PageTitle(@Nullable String text, @NonNull WikiSite wiki, @Nullable
String thumbUrl, @Nullable String description, @Nullable int index) {
-this(text, wiki, thumbUrl);
-this.description = description;
-this.index = index;
}
public PageTitle(@Nullable String namespace, @NonNull String text,
@NonNull WikiSite wiki) {
@@ -237,10 +230,6 @@
return properties;
}
-@Nullable public int getIndex() {
-return index;
-}
-
public boolean isMainPage() {
if (properties != null) {
return properties.isMainPage();
@@ -334,7 +323,6 @@
parcel.writeParcelable(properties, flags);
parcel.writeString(thumbUrl);
parcel.writeString(description);
-parcel.writeInt(index);
}
@Override public boolean equals(Object o) {
@@ -397,6 +385,5 @@
properties = in.readParcelable(PageProperties.class.getClassLoader());
thumbUrl = in.readString();
description = in.readString();
-index = in.readInt();
}
}
diff --git
a/app/src/main/java/org/wikipedia/page/bottomcontent/BottomContentHandler.java
b/app/src/main/java/org/wikipedia/page/bottomcontent/BottomContentHandler.java
index cefad7a..7a7200e 100644
---
a/app/src/main/java/org/wikipedia/page/bottomcontent/BottomContentHandler.java
+++
b/app/src/main/java/org/wikipedia/page/bottomcontent/BottomContentHandler.java
@@ -48,8 +48,6 @@
import org.wikipedia.views.ObservableWebView;
import org.wikipedia.views.ViewUtil;
-import java.util.Collections;
-import java.util.Comparator;
import java.util.List;
import retrofit2.Call;
@@ -335,20 +333,7 @@
public void success(@NonNull
Call> call,
@NonNull SearchResults results) {
funnel.setLatency(System.currentTimeMillis() -
timeMillis);
-
-// Sort the array based on the "index" property
-Collections.sort(results.getResults(), new
Comparator() {
-@Override
-public int compare(SearchResult result,
SearchResult t1) {
-int ret =
((Integer)result.getPageTitle().getIndex()).compareTo(t1.getPageTitle().getIndex());
-return ret;
-}
-});
-
-readMoreItems = SearchResults.filter(new
SearchResults(results.getResults(), results.getContinuation(), null),
-entry.getTitle().getPrefixedText(),
-true);
-
+readMoreItems = SearchResults.filter(results,
entry.getTitle().getPrefixedText(), true);
if (!readMoreItems.getResults().isEmpty()) {
// If there are results, set up section and make
sure it's visible
setUpRea
[MediaWiki-commits] [Gerrit] operations...gerrit[master]: Adding scap3 config
Chad has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/356484 ) Change subject: Adding scap3 config .. Adding scap3 config Change-Id: I12ac64804a497206b97ba50f5acdc87f7ad3c1bc --- A scap/scap.cfg 1 file changed, 4 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/software/gerrit refs/changes/84/356484/1 diff --git a/scap/scap.cfg b/scap/scap.cfg new file mode 100644 index 000..631a89f --- /dev/null +++ b/scap/scap.cfg @@ -0,0 +1,4 @@ +git_repo: operations/software/gerrit +ssh_user: gerrit2 +dsh_targets: /etc/dsh/group/gerrit +git_fat: True -- To view, visit https://gerrit.wikimedia.org/r/356484 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I12ac64804a497206b97ba50f5acdc87f7ad3c1bc Gerrit-PatchSet: 1 Gerrit-Project: operations/software/gerrit Gerrit-Branch: master Gerrit-Owner: Chad ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: motd::script: Don't use validate_re on an integer
Alexandros Kosiaris has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/356483 )
Change subject: motd::script: Don't use validate_re on an integer
..
motd::script: Don't use validate_re on an integer
Rewrite the validate_re check to use integer friendly functions and
comparisons instead
Change-Id: Iabd27cd00a83f86d380f854c326a678bb8499b23
---
M modules/motd/manifests/script.pp
1 file changed, 3 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/83/356483/1
diff --git a/modules/motd/manifests/script.pp b/modules/motd/manifests/script.pp
index a352e09..9051130 100644
--- a/modules/motd/manifests/script.pp
+++ b/modules/motd/manifests/script.pp
@@ -34,7 +34,9 @@
include ::motd
validate_ensure($ensure)
-validate_re($priority, '^\d?\d$', '"priority" must be between 0 - 99')
+if !is_integer($priority) or $priority < 0 or $priority > 99 {
+fail('"priority" must be between 0 - 99')
+}
if $source == undef and $content == undef { fail('you must provide either
"source" or "content"') }
if $source != undef and $content != undef { fail('"source" and "content"
are mutually exclusive') }
--
To view, visit https://gerrit.wikimedia.org/r/356483
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iabd27cd00a83f86d380f854c326a678bb8499b23
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alexandros Kosiaris
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations...gerrit[master]: Configuring git-fat to work with Archiva
Chad has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/356482 ) Change subject: Configuring git-fat to work with Archiva .. Configuring git-fat to work with Archiva Change-Id: I0ae4402cdf176486cff042de316de585800200c1 --- A .gitattributes A .gitfat 2 files changed, 5 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/software/gerrit refs/changes/82/356482/1 diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 000..647f7c9 --- /dev/null +++ b/.gitattributes @@ -0,0 +1 @@ +*.jar filter=fat -text diff --git a/.gitfat b/.gitfat new file mode 100644 index 000..2f1eb33 --- /dev/null +++ b/.gitfat @@ -0,0 +1,4 @@ +[rsync] +.gitremote = archiva.wikimedia.org::archiva/git-fat +.gitoptions = --copy-links --verbose + -- To view, visit https://gerrit.wikimedia.org/r/356482 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I0ae4402cdf176486cff042de316de585800200c1 Gerrit-PatchSet: 1 Gerrit-Project: operations/software/gerrit Gerrit-Branch: master Gerrit-Owner: Chad ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...MobileFrontend[master]: When page properties are not available do not throw exceptions
Jdlrobson has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/356481 )
Change subject: When page properties are not available do not throw exceptions
..
When page properties are not available do not throw exceptions
There is an edge case where a page does not have any page properties
and an api request results in a notice, warning and exception.
To support testing and readability I've broken out the offending code
and added tests and fixed the edge case.
Bug: T161026
Bug: T166530
Change-Id: I52e991f5bd97edd09db837257673e73077a981ad
---
M includes/api/ApiMobileView.php
M tests/phpunit/api/ApiMobileViewTest.php
2 files changed, 87 insertions(+), 9 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend
refs/changes/81/356481/1
diff --git a/includes/api/ApiMobileView.php b/includes/api/ApiMobileView.php
index 5897db7..8d4532f 100644
--- a/includes/api/ApiMobileView.php
+++ b/includes/api/ApiMobileView.php
@@ -43,6 +43,27 @@
}
/**
+* Obtain the requested page properties.
+* @param string $propNames requested list of pageprops separated by
'|'. If '*'
+* all page props will be returned.
+* @param array $data data available as returned by getData
+* @return Array associative
+*/
+ public function getMobileViewPageProps( $propNames, $data ) {
+ if ( array_key_exists( 'pageprops', $data ) ) {
+ if ( $propNames == '*' ) {
+ $pageProps = $data['pageprops'];
+ } else {
+ $propNames = explode( '|', $propNames );
+ $pageProps = array_intersect_key(
$data['pageprops'], array_flip( $propNames ) );
+ }
+ } else {
+ $pageProps = [];
+ }
+ return $pageProps;
+ }
+
+ /**
* Execute the requested Api actions.
* @todo: Write some unit tests for API results
*/
@@ -122,18 +143,13 @@
$this->addXAnalyticsItem( 'page_id',
(string)$data['id'] );
}
if ( isset( $prop['pageprops'] ) ) {
- $propNames = $params['pageprops'];
- if ( $propNames == '*' && isset( $data['pageprops'] ) )
{
- $pageProps = $data['pageprops'];
- } else {
- $propNames = explode( '|', $propNames );
- $pageProps = array_intersect_key(
$data['pageprops'], array_flip( $propNames ) );
- }
- ApiResult::setArrayType( $pageProps, 'assoc' );
+ $mvPageProps = $this->getMobileViewPageProps(
$params['pageprops'], $data );
+ ApiResult::setArrayType( $mvPageProps, 'assoc' );
$resultObj->addValue( null, $moduleName,
- [ 'pageprops' => $pageProps ]
+ [ 'pageprops' => $mvPageProps ]
);
}
+
if ( isset( $prop['description'] ) && isset(
$data['pageprops']['wikibase_item'] ) ) {
$desc = ExtMobileFrontend::getWikibaseDescription(
$data['pageprops']['wikibase_item']
diff --git a/tests/phpunit/api/ApiMobileViewTest.php
b/tests/phpunit/api/ApiMobileViewTest.php
index 45e996f..1d43f3c 100644
--- a/tests/phpunit/api/ApiMobileViewTest.php
+++ b/tests/phpunit/api/ApiMobileViewTest.php
@@ -544,6 +544,68 @@
$this->assertFalse( $isSVG->invokeArgs( $api, [ null ] ) );
}
+ public function provideGetMobileViewPageProps() {
+ return [
+ // Request all available page properties
+ [
+ '*',
+ [
+ 'pageprops' => [ 'wikibase_item' =>
'Q76', 'notoc' => true ],
+ ],
+ [ 'wikibase_item' => 'Q76', 'notoc' => true ],
+ ],
+ // Request non-existent property
+ [
+ 'monkey',
+ [
+ 'pageprops' => [ 'wikibase_item' =>
'Q76', 'notoc' => true ],
+ ],
+ [],
+ ],
+ // Filter out available page properties with '|'
+ [
+ 'wikibase_item|notoc',
+ [
+ 'pageprops' => [ 'wikibase_item' =>
'Q76', 'notoc' => true ],
+
[MediaWiki-commits] [Gerrit] mediawiki...WikibaseQualityExternalValidation[master]: Use %d to inject integer into SQL query
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/353762 ) Change subject: Use %d to inject integer into SQL query .. Use %d to inject integer into SQL query The fact alone that an SQL query is constructed with sprintf() is scary. This patch does not fix this, but it makes one detail less scary. Change-Id: Ic37fd259e591bd232818d049bae242927a864c68 --- M includes/ExternalDataRepo.php 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Ladsgroup: Looks good to me, approved jenkins-bot: Verified diff --git a/includes/ExternalDataRepo.php b/includes/ExternalDataRepo.php index bcc1eb1..29bf2ba 100644 --- a/includes/ExternalDataRepo.php +++ b/includes/ExternalDataRepo.php @@ -131,7 +131,7 @@ wfGetLBFactory()->waitForReplication(); $table = $db->tableName( self::TABLE_NAME ); $condition = 'dump_id = ' . $db->addQuotes( $dumpId ); - $db->query( sprintf( 'DELETE FROM %s WHERE %s LIMIT %s', $table, $condition, $batchSize ) ); + $db->query( sprintf( 'DELETE FROM %s WHERE %s LIMIT %d', $table, $condition, $batchSize ) ); } while ( $db->affectedRows() > 0 ); } } -- To view, visit https://gerrit.wikimedia.org/r/353762 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ic37fd259e591bd232818d049bae242927a864c68 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/WikibaseQualityExternalValidation Gerrit-Branch: master Gerrit-Owner: Thiemo Mättig (WMDE) Gerrit-Reviewer: Addshore Gerrit-Reviewer: Aude Gerrit-Reviewer: Hoo man Gerrit-Reviewer: Ladsgroup Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Wikibase[master]: Fix typo in accessKey attribute for undo/restor save button
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/356376 ) Change subject: Fix typo in accessKey attribute for undo/restor save button .. Fix typo in accessKey attribute for undo/restor save button Bug: T165078 Change-Id: I61ee06a0f3e0ab19a96c6aa42f40cf33f859b5ef --- M repo/includes/Actions/EditEntityAction.php 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Ladsgroup: Looks good to me, approved jenkins-bot: Verified diff --git a/repo/includes/Actions/EditEntityAction.php b/repo/includes/Actions/EditEntityAction.php index ef9d402..f183fbe 100644 --- a/repo/includes/Actions/EditEntityAction.php +++ b/repo/includes/Actions/EditEntityAction.php @@ -452,7 +452,7 @@ 'name' => 'wpSave', 'value' => $this->msg( 'savearticle' )->text(), 'label' => $this->msg( 'savearticle' )->text(), - 'accesskey' => $this->msg( 'accesskey-save' )->text(), + 'accessKey' => $this->msg( 'accesskey-save' )->plain(), 'flags' => [ 'primary', 'progressive' ], 'type' => 'submit', 'title' => $this->msg( 'tooltip-save' )->text() . ' [' . $this->msg( 'accesskey-save' )->text() . ']', -- To view, visit https://gerrit.wikimedia.org/r/356376 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I61ee06a0f3e0ab19a96c6aa42f40cf33f859b5ef Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Wikibase Gerrit-Branch: master Gerrit-Owner: Thiemo Mättig (WMDE) Gerrit-Reviewer: Bartosz Dziewoński Gerrit-Reviewer: Ladsgroup Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations...gerrit[master]: Gerrit: Set ulimit's in gerrit.service
Paladox has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/356480 ) Change subject: Gerrit: Set ulimit's in gerrit.service .. Gerrit: Set ulimit's in gerrit.service I believe this is why gerrit failed to work since using /etc/init.d fixed the problem. Change-Id: I8499dac8edbb381524460b543f466fb19640122b --- 0 files changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/debs/gerrit refs/changes/80/356480/1 -- To view, visit https://gerrit.wikimedia.org/r/356480 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I8499dac8edbb381524460b543f466fb19640122b Gerrit-PatchSet: 1 Gerrit-Project: operations/debs/gerrit Gerrit-Branch: master Gerrit-Owner: Paladox Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...codesniffer[master]: Add usage of && in generic_pass
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/356440 )
Change subject: Add usage of && in generic_pass
..
Add usage of && in generic_pass
Change-Id: I4d3696fe4aad92798e4386c2859092e89b34ec5c
---
M MediaWiki/Tests/files/generic_pass.php
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Legoktm: Looks good to me, approved
jenkins-bot: Verified
diff --git a/MediaWiki/Tests/files/generic_pass.php
b/MediaWiki/Tests/files/generic_pass.php
index 9489fd4..18c46dc 100644
--- a/MediaWiki/Tests/files/generic_pass.php
+++ b/MediaWiki/Tests/files/generic_pass.php
@@ -9,7 +9,7 @@
* @return null
*/
function wfTimestampOrNull( $outputtype = TS_UNIX, $ts = null ) {
- if ( is_null( $ts ) ) {
+ if ( is_null( $ts ) && true ) {
return null;
} else {
return wfTimestamp( $outputtype, $ts );
--
To view, visit https://gerrit.wikimedia.org/r/356440
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I4d3696fe4aad92798e4386c2859092e89b34ec5c
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/tools/codesniffer
Gerrit-Branch: master
Gerrit-Owner: Addshore
Gerrit-Reviewer: Krinkle
Gerrit-Reviewer: Legoktm
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...parsoid[master]: Fix html2wt of new transclusion/extension added after a list
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/356415 )
Change subject: Fix html2wt of new transclusion/extension added after a list
..
Fix html2wt of new transclusion/extension added after a list
* Discovered via a bug report on WP:VE/F page
* Added new parser test recording this expectation
* Changes in parser test blacklist for cite are an improvement
Change-Id: I017acc0400522489ab94ce69113c48c91d64ba32
---
M lib/html2wt/DOMHandlers.js
M tests/citeParserTests-blacklist.js
M tests/parserTests.txt
3 files changed, 16 insertions(+), 5 deletions(-)
Approvals:
jenkins-bot: Verified
Arlolra: Looks good to me, approved
diff --git a/lib/html2wt/DOMHandlers.js b/lib/html2wt/DOMHandlers.js
index 4c64f2c..0916281 100644
--- a/lib/html2wt/DOMHandlers.js
+++ b/lib/html2wt/DOMHandlers.js
@@ -178,11 +178,14 @@
}
function wtListEOL(node, otherNode) {
- if (!DU.isElt(otherNode) || DU.isBody(otherNode) ||
- DU.isFirstEncapsulationWrapperNode(otherNode)) {
+ if (!DU.isElt(otherNode) || DU.isBody(otherNode)) {
return { min: 0, max: 2 };
}
+ if (DU.isFirstEncapsulationWrapperNode(otherNode)) {
+ return { min: DU.isList(node) ? 1 : 0, max: 2 };
+ }
+
var nextSibling = DU.nextNonSepSibling(node);
var dp = DU.getDataParsoid(otherNode);
if (nextSibling === otherNode && dp.stx === 'html' || dp.src !==
undefined) {
diff --git a/tests/citeParserTests-blacklist.js
b/tests/citeParserTests-blacklist.js
index 87c887f..50b48eb 100644
--- a/tests/citeParserTests-blacklist.js
+++ b/tests/citeParserTests-blacklist.js
@@ -480,9 +480,6 @@
add("selser", "Simple , with in group [[0,0,4,0],0,0,3,0]",
"Wikipedia rocks!Proceeds of Rockology, vol. XXI4n06kcl11el2qpviProceeds of Rockology, vol. XXI\n\n");
add("selser", "Simple , with in group [[2,0,3,0],0,0,0,0]",
"12oceydq60qkt9Wikipedia rocks!Proceeds of Rockology, vol. XXIProceeds of Rockology, vol. XXI\n\n\n");
add("selser", "Simple , with in group [2,0,0,0,0]",
"uwhp5n35gin97ldi\n\nWikipedia rocks!Proceeds of Rockology, vol.
XXI\nWikipedia rocks!Proceeds of Rockology, vol.
XXI\n\n\n");
-add("selser", "Simple , with in group, with groupname in
Chinese [[3,0,0,0,0,0],2,[1],3,0,0,[2],3,0]", "ref
aBBBnote bCCCref
c\n\nca1bqjo8189z4cxr\n\n;refs\n\n:
wrje21qkvvi8jjor\n;notes");
-add("selser", "Simple , with in group, with groupname in
Chinese [4,2,1,3,0,4,[1],0,0]",
"l6wq05n2y1tf0f6r\n\nzz66axs9t25oecdi\n\n;refs\n8pu5kqayp04wjyvi\n;notes\n");
-add("selser", "Simple , with in group, with groupname in
Chinese [2,2,[3],3,0,0,[2],4,0]", "yttgkuvn6irudi\n\nAAAref
aBBBnote bCCCref
c\n\nf2jxenertwlba9k9\n\n\n\n:
uqqa7lk5kizilik9\n;notes\n8cjkzpv2vsawnrk9");
add("selser", " defined in [0,2,0]", "\n\n93dppaj01lhj8aor\n\n\nBAR\n");
add("selser", " defined in [0,3,0]", "\nBAR\n");
add("selser", " defined in [2,4,0]",
"v6kn5nr0bsh8h0k9\n\n\n\nti4uisx86e34bo6r\nBAR\n");
diff --git a/tests/parserTests.txt b/tests/parserTests.txt
index 37e86cb..5c4c971 100644
--- a/tests/parserTests.txt
+++ b/tests/parserTests.txt
@@ -28096,6 +28096,17 @@
!! end
+!! test
+New transclusion added after a list should be serialized after the list
+!! options
+parsoid=html2wt
+!! html/parsoid
+afoo
+!! wikitext
+* a
+{{echo|foo}}
+!! end
+
# -
# End of section for Parsoid-only html2wt tests for serialization
# of new content
--
To view, visit https://gerrit.wikimedia.org/r/356415
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I017acc0400522489ab94ce69113c48c91d64ba32
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/parsoid
Gerrit-Branch: master
Gerrit-Owner: Subramanya Sastry
Gerrit-Reviewer: Arlolra
Gerrit-Reviewer: C. Scott Ananian
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] wikimedia...dashboard[master]: Deploy dashboards that use new dataset paths
Bearloga has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/356476 ) Change subject: Deploy dashboards that use new dataset paths .. Deploy dashboards that use new dataset paths Bug: T166724 Change-Id: I6ed6cbc1be6acf5f2338a6cdc405bb4a4213c154 --- M shiny-server/external M shiny-server/maps M shiny-server/metrics M shiny-server/portal M shiny-server/wdqs 5 files changed, 5 insertions(+), 5 deletions(-) Approvals: Bearloga: Verified; Looks good to me, approved diff --git a/shiny-server/external b/shiny-server/external index fdee988..a9627fc 16 --- a/shiny-server/external +++ b/shiny-server/external @@ -1 +1 @@ -Subproject commit fdee988d65137bd03520c08496dc68cba40ff4cd +Subproject commit a9627fc557d9671b5fae9d9b62fc64e8b372998d diff --git a/shiny-server/maps b/shiny-server/maps index eeeb0e5..3b0c1ab 16 --- a/shiny-server/maps +++ b/shiny-server/maps @@ -1 +1 @@ -Subproject commit eeeb0e51d381dd386c693fc8d847dac6df7255e8 +Subproject commit 3b0c1ab91cb3ed21c101bd6cc79843e82b5fdbb0 diff --git a/shiny-server/metrics b/shiny-server/metrics index c6602b0..494ea7b 16 --- a/shiny-server/metrics +++ b/shiny-server/metrics @@ -1 +1 @@ -Subproject commit c6602b03d58e258248ac14219374eeb63c40f6a5 +Subproject commit 494ea7b1fe2c4e30f80191fe34865adbdf4c diff --git a/shiny-server/portal b/shiny-server/portal index 659ea81..51df8cf 16 --- a/shiny-server/portal +++ b/shiny-server/portal @@ -1 +1 @@ -Subproject commit 659ea8173379140454b89d791e370f149313dc38 +Subproject commit 51df8cf55d3856c0277a55f15d43a780b477b8f8 diff --git a/shiny-server/wdqs b/shiny-server/wdqs index e5dda9d..3ba7bf3 16 --- a/shiny-server/wdqs +++ b/shiny-server/wdqs @@ -1 +1 @@ -Subproject commit e5dda9d2249dba3691097e00077dabfc8e0e7f1d +Subproject commit 3ba7bf36aa00f1bce8f6056423ffc4135d096a12 -- To view, visit https://gerrit.wikimedia.org/r/356476 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I6ed6cbc1be6acf5f2338a6cdc405bb4a4213c154 Gerrit-PatchSet: 1 Gerrit-Project: wikimedia/discovery/dashboard Gerrit-Branch: master Gerrit-Owner: Bearloga Gerrit-Reviewer: Bearloga ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...parsoid[master]: Use wikilinkHandler to escape wikilink fragments.
C. Scott Ananian has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/356479 )
Change subject: Use wikilinkHandler to escape wikilink fragments.
..
Use wikilinkHandler to escape wikilink fragments.
Change-Id: Ic8a5bf50dd9087d7c3ed717016a7df626a9c5ccb
---
M lib/html2wt/LinkHandler.js
1 file changed, 11 insertions(+), 5 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/parsoid
refs/changes/79/356479/1
diff --git a/lib/html2wt/LinkHandler.js b/lib/html2wt/LinkHandler.js
index b2db533..e5e08bf 100644
--- a/lib/html2wt/LinkHandler.js
+++ b/lib/html2wt/LinkHandler.js
@@ -652,16 +652,22 @@
} else {
// serialize as auto-numbered external link
// [http://example.com]
- var linktext, Construct;
+ var linktext;
// If it's just anchor text, serialize as an internal
link.
if (/^#/.test(urlStr)) {
- Construct = WikiLinkText;
- linktext = '[[' + urlStr + (contentStr ? '|' +
contentStr : '') + ']]';
+ // Reserialize content using wikilinkHandler
+ return state.serializeLinkChildrenToString(
+ node,
+
state.serializer.wteHandlers.wikilinkHandler
+ ).then(function(ncontentStr) {
+ linktext = '[[' + urlStr + (ncontentStr
? '|' + ncontentStr : '') + ']]';
+ state.emitChunk(new
WikiLinkText(linktext, node, wiki, linkData.type));
+ return;
+ });
} else {
- Construct = ExtLinkText;
linktext = '[' + urlStr + (contentStr ? ' ' +
contentStr : '') + ']';
+ state.emitChunk(new ExtLinkText(linktext, node,
wiki, linkData.type), node);
}
- state.emitChunk(new Construct(linktext, node, wiki,
linkData.type), node);
return;
}
});
--
To view, visit https://gerrit.wikimedia.org/r/356479
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic8a5bf50dd9087d7c3ed717016a7df626a9c5ccb
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/parsoid
Gerrit-Branch: master
Gerrit-Owner: C. Scott Ananian
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/core[fundraising/REL1_27]: update DonationInterface submodule
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/356471 ) Change subject: update DonationInterface submodule .. update DonationInterface submodule Change-Id: Iaa25578bd2576a8705b370ce38dff26cb9b9e2e0 --- M extensions/DonationInterface 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: jenkins-bot: Verified Ejegg: Looks good to me, approved diff --git a/extensions/DonationInterface b/extensions/DonationInterface index 1c64806..a85495b 16 --- a/extensions/DonationInterface +++ b/extensions/DonationInterface @@ -1 +1 @@ -Subproject commit 1c6480669cf4f0eb9e93ca139d42938f2ee434fd +Subproject commit a85495bb17f3fa704edaa0cdab636ee84b997347 -- To view, visit https://gerrit.wikimedia.org/r/356471 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iaa25578bd2576a8705b370ce38dff26cb9b9e2e0 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: fundraising/REL1_27 Gerrit-Owner: Ejegg Gerrit-Reviewer: Ejegg Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: Fix typos on Gerrit downtime page
Bartosz Dziewoński has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/356477 ) Change subject: Fix typos on Gerrit downtime page .. Fix typos on Gerrit downtime page This message sure looks like it was written in panic. Change-Id: I1fd52be400f28df568bba5aaaf77b3ea0d04fb52 --- M modules/gerrit/templates/error.html.erb 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/77/356477/1 diff --git a/modules/gerrit/templates/error.html.erb b/modules/gerrit/templates/error.html.erb index d424386..81876b7 100644 --- a/modules/gerrit/templates/error.html.erb +++ b/modules/gerrit/templates/error.html.erb @@ -37,7 +37,7 @@ <%- else -%> Gerrit is down. We're working on bringing it back as soon as possible. -Please follow along the disccusion at #wikimedia-operations on freenode as we debug. +Please follow along the discussion at #wikimedia-operations on Freenode as we debug. <%- end -%> -- To view, visit https://gerrit.wikimedia.org/r/356477 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I1fd52be400f28df568bba5aaaf77b3ea0d04fb52 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Bartosz Dziewoński ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: Fix indentation of Gerrit downtime page
Bartosz Dziewoński has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/356478 )
Change subject: Fix indentation of Gerrit downtime page
..
Fix indentation of Gerrit downtime page
Failing in style.
Change-Id: I01e56c390cab94b4684db1e03c5ee9641602aee6
---
M modules/gerrit/templates/error.html.erb
1 file changed, 44 insertions(+), 44 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/78/356478/1
diff --git a/modules/gerrit/templates/error.html.erb
b/modules/gerrit/templates/error.html.erb
index 81876b7..f414cf0 100644
--- a/modules/gerrit/templates/error.html.erb
+++ b/modules/gerrit/templates/error.html.erb
@@ -1,47 +1,47 @@
-
-
-Gerrit - Error
-
- body {
- color: #353535 !important;
- background: #fff url(/page-bkg.cache.jpg) no-repeat 0 0
!important;
- position: static;
- }
- h1 {
- margin: 0;
- padding: 14px 0 0 17px;
- font-family: 'PT Sans', sans-serif;
- font-weight: normal;
- letter-spacing: -1px;
- /* This color isn't used since there is an image there,
-* but it kept for consistency when used for display of
alt-text
-*/
- color: #99;
- min-height: 59px;
- background: transparent
url(/wikimedia-codereview-logo.cache.png) no-repeat 0 0;
- text-indent: -px;
- overflow: hidden;
- }
- p {
- font-size: 150%;
- }
-
-
-
-Wikimedia Code Review
-
-<%- if @maint_mode -%>
-Gerrit is currently down for planned maintenance. Current ETA is
<%= @maint_mode %>.
-<%- else -%>
-Gerrit is down. We're working on bringing it back as soon as possible.
-
-Please follow along the discussion at #wikimedia-operations on
Freenode as we debug.
-<%- end -%>
-
-
-Please try again later!
-
-
+
+
+ Gerrit - Error
+
+ body {
+ color: #353535 !important;
+ background: #fff url(/page-bkg.cache.jpg)
no-repeat 0 0 !important;
+ position: static;
+ }
+ h1 {
+ margin: 0;
+ padding: 14px 0 0 17px;
+ font-family: 'PT Sans', sans-serif;
+ font-weight: normal;
+ letter-spacing: -1px;
+ /* This color isn't used since there is an
image there,
+* but it kept for consistency when used for
display of alt-text
+*/
+ color: #99;
+ min-height: 59px;
+ background: transparent
url(/wikimedia-codereview-logo.cache.png) no-repeat 0 0;
+ text-indent: -px;
+ overflow: hidden;
+ }
+ p {
+ font-size: 150%;
+ }
+
+
+
+ Wikimedia Code Review
+
+ <%- if @maint_mode -%>
+ Gerrit is currently down for planned maintenance.
Current ETA is <%= @maint_mode %>.
+ <%- else -%>
+ Gerrit is down. We're working on bringing it back as
soon as possible.
+
+ Please follow along the discussion at
#wikimedia-operations on Freenode as we debug.
+ <%- end -%>
+
+
+ Please try again later!
+
+
--
To view, visit https://gerrit.wikimedia.org/r/356478
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I01e56c390cab94b4684db1e03c5ee9641602aee6
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Bartosz Dziewoński
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] wikimedia...dashboard[master]: Deploy dashboards that use new dataset paths
Bearloga has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/356476 ) Change subject: Deploy dashboards that use new dataset paths .. Deploy dashboards that use new dataset paths Bug: T166724 Change-Id: I6ed6cbc1be6acf5f2338a6cdc405bb4a4213c154 --- M shiny-server/external M shiny-server/maps M shiny-server/metrics M shiny-server/portal M shiny-server/wdqs 5 files changed, 5 insertions(+), 5 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/wikimedia/discovery/dashboard refs/changes/76/356476/1 diff --git a/shiny-server/external b/shiny-server/external index fdee988..a9627fc 16 --- a/shiny-server/external +++ b/shiny-server/external @@ -1 +1 @@ -Subproject commit fdee988d65137bd03520c08496dc68cba40ff4cd +Subproject commit a9627fc557d9671b5fae9d9b62fc64e8b372998d diff --git a/shiny-server/maps b/shiny-server/maps index eeeb0e5..3b0c1ab 16 --- a/shiny-server/maps +++ b/shiny-server/maps @@ -1 +1 @@ -Subproject commit eeeb0e51d381dd386c693fc8d847dac6df7255e8 +Subproject commit 3b0c1ab91cb3ed21c101bd6cc79843e82b5fdbb0 diff --git a/shiny-server/metrics b/shiny-server/metrics index c6602b0..494ea7b 16 --- a/shiny-server/metrics +++ b/shiny-server/metrics @@ -1 +1 @@ -Subproject commit c6602b03d58e258248ac14219374eeb63c40f6a5 +Subproject commit 494ea7b1fe2c4e30f80191fe34865adbdf4c diff --git a/shiny-server/portal b/shiny-server/portal index 659ea81..51df8cf 16 --- a/shiny-server/portal +++ b/shiny-server/portal @@ -1 +1 @@ -Subproject commit 659ea8173379140454b89d791e370f149313dc38 +Subproject commit 51df8cf55d3856c0277a55f15d43a780b477b8f8 diff --git a/shiny-server/wdqs b/shiny-server/wdqs index e5dda9d..3ba7bf3 16 --- a/shiny-server/wdqs +++ b/shiny-server/wdqs @@ -1 +1 @@ -Subproject commit e5dda9d2249dba3691097e00077dabfc8e0e7f1d +Subproject commit 3ba7bf36aa00f1bce8f6056423ffc4135d096a12 -- To view, visit https://gerrit.wikimedia.org/r/356476 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I6ed6cbc1be6acf5f2338a6cdc405bb4a4213c154 Gerrit-PatchSet: 1 Gerrit-Project: wikimedia/discovery/dashboard Gerrit-Branch: master Gerrit-Owner: Bearloga ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] wikimedia...rainbow[master]: Use new path
Bearloga has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/356475 )
Change subject: Use new path
..
Use new path
Bug: T166724
Change-Id: I159b0ef879eb1548903ab3b9436d80c8ca1bfa30
---
M README.md
M utils.R
2 files changed, 32 insertions(+), 34 deletions(-)
Approvals:
Bearloga: Verified; Looks good to me, approved
diff --git a/README.md b/README.md
index bf1bcb8..d1de5d9 100644
--- a/README.md
+++ b/README.md
@@ -1,22 +1,20 @@
# Search Metrics Dashboard
-This project is part of the [Discovery
Dashboards](http://discovery.wmflabs.org/) project.
+This project is part of the [Discovery
Dashboards](https://discovery.wmflabs.org/) project, using datasets publicly
available at
[analytics.wikimedia.org/datasets/discovery](https://analytics.wikimedia.org/datasets/discovery/).
For more information on the datasets, refer to [README on the GitHub
mirror](https://github.com/wikimedia/wikimedia-discovery-golden/blob/master/docs/README.md).
## Quick start
Install the dependencies:
-```
-$ R
-R> install.packages(c('reshape2', 'ggplot2', 'toOrdinal', 'devtools',
'magrittr', 'xts'))
-R>
devtools::install_git('https://gerrit.wikimedia.org/r/wikimedia/discovery/polloi')
+```R
+install.packages(c("devtools", "shiny", "reshape2", "data.table"))
+devtools::install_git("https://gerrit.wikimedia.org/r/wikimedia/discovery/polloi";)
```
-Run the server:
+Run the app:
-```
-$ R
-R> shiny::runApp(launch.browser = 0)
+```R
+shiny::runApp(launch.browser = 0)
```
Please note that this project is released with a [Contributor Code of
Conduct](CONDUCT.md). By participating in this project you agree to abide by
its terms.
diff --git a/utils.R b/utils.R
index 81b1593..5c4a178 100644
--- a/utils.R
+++ b/utils.R
@@ -8,14 +8,14 @@
## Read in desktop data and generate means for the value boxes, along with a
time-series appropriate form for
## dygraphs.
read_desktop <- function() {
- desktop_dygraph_set <<-
polloi::read_dataset("discovery/search/desktop_event_counts.tsv", col_types =
"Dci") %>%
+ desktop_dygraph_set <<-
polloi::read_dataset("discovery/metrics/search/desktop_event_counts.tsv",
col_types = "Dci") %>%
dplyr::filter(!is.na(action), !is.na(events)) %>%
tidyr::spread(action, events, fill = 0)
desktop_dygraph_means <<- round(colMeans(desktop_dygraph_set[, 2:5]))
- desktop_load_data <<-
polloi::read_dataset("discovery/search/desktop_load_times.tsv", col_types =
"Dddd") %>%
+ desktop_load_data <<-
polloi::read_dataset("discovery/metrics/search/desktop_load_times.tsv",
col_types = "Dddd") %>%
dplyr::filter(!is.na(Median))
# Broken down by language-project pair
- desktop_langproj_dygraph_set <<-
polloi::read_dataset("discovery/search/desktop_event_counts_langproj_breakdown.tsv",
col_types = "Dccci") %>%
+ desktop_langproj_dygraph_set <<-
polloi::read_dataset("discovery/metrics/search/desktop_event_counts_langproj_breakdown.tsv",
col_types = "Dccci") %>%
dplyr::filter(!is.na(action), !is.na(events)) %>%
dplyr::mutate(language = ifelse(is.na(language), "(None)", language)) %>%
tidyr::spread(action, events, fill = 0)
@@ -37,16 +37,16 @@
}
read_web <- function() {
- mobile_dygraph_set <<-
polloi::read_dataset("discovery/search/mobile_event_counts.tsv", col_types =
"Dci") %>%
+ mobile_dygraph_set <<-
polloi::read_dataset("discovery/metrics/search/mobile_event_counts.tsv",
col_types = "Dci") %>%
dplyr::filter(!is.na(action), !is.na(events)) %>%
tidyr::spread(action, events, fill = 0)
mobile_dygraph_means <<- round(colMeans(mobile_dygraph_set[, 2:4]))
- mobile_load_data <<-
polloi::read_dataset("discovery/search/mobile_load_times.tsv", col_types =
"Dddd") %>%
+ mobile_load_data <<-
polloi::read_dataset("discovery/metrics/search/mobile_load_times.tsv",
col_types = "Dddd") %>%
dplyr::filter(!is.na(Median))
}
read_apps <- function() {
- data <- polloi::read_dataset("discovery/search/app_event_counts.tsv",
col_types = "Dcci") %>%
+ data <-
polloi::read_dataset("discovery/metrics/search/app_event_counts.tsv", col_types
= "Dcci") %>%
dplyr::filter(!is.na(action), !is.na(events)) %>%
dplyr::distinct(date, platform, action, .keep_all = TRUE)
ios <- data %>%
@@ -64,13 +64,13 @@
android_dygraph_set <<- android
android_dygraph_means <<- round(colMeans(android[, 2:4]))
- app_load_data <- polloi::read_dataset("discovery/search/app_load_times.tsv",
col_types = "Dcddd") %>%
+ app_load_data <-
polloi::read_dataset("discovery/metrics/search/app_load_times.tsv", col_types =
"Dcddd") %>%
dplyr::filter(!is.na(Median)) %>%
dplyr::distinct(date, platform, .keep_all = TRUE)
ios_load_data <<- app_load_data[app_load_data$platform == "iOS",
names(app_load_data) != "platform"]
android_load_data <<- app_load_data[app_load_data$platform == "Android",
names(app_load_data) != "platform"]
- position_i
[MediaWiki-commits] [Gerrit] wikimedia...experimental[master]: Use new path
Bearloga has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/356468 ) Change subject: Use new path .. Use new path Bug: T166724 Change-Id: I3652ef656fe887365976216d34c198dbfc44931f --- M shiny-server/forecast 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Bearloga: Verified; Looks good to me, approved diff --git a/shiny-server/forecast b/shiny-server/forecast index fdda2de..1e25310 16 --- a/shiny-server/forecast +++ b/shiny-server/forecast @@ -1 +1 @@ -Subproject commit fdda2de410da8ce0f83ecc97ab98cf071f17889d +Subproject commit 1e2531048b22045d8be11a5725f72ad5c73a0bdc -- To view, visit https://gerrit.wikimedia.org/r/356468 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I3652ef656fe887365976216d34c198dbfc44931f Gerrit-PatchSet: 1 Gerrit-Project: wikimedia/discovery/experimental Gerrit-Branch: master Gerrit-Owner: Bearloga Gerrit-Reviewer: Bearloga ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] wikimedia...twilightsparql[master]: Use new path
Bearloga has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/356473 )
Change subject: Use new path
..
Use new path
Bug: T166724
Change-Id: I8657d66daab1a9f9f64ffa8187b24062e0755e4c
---
M README.md
M utils.R
2 files changed, 8 insertions(+), 10 deletions(-)
Approvals:
Bearloga: Verified; Looks good to me, approved
diff --git a/README.md b/README.md
index e3693c5..5ce05f6 100644
--- a/README.md
+++ b/README.md
@@ -1,22 +1,20 @@
# Wikidata Query Service (WDQS) Dashboard
-This project is part of the [Discovery
Dashboards](http://discovery.wmflabs.org/) project.
+This project is part of the [Discovery
Dashboards](https://discovery.wmflabs.org/) project, using datasets publicly
available at
[analytics.wikimedia.org/datasets/discovery](https://analytics.wikimedia.org/datasets/discovery/).
For more information on the datasets, refer to [README on the GitHub
mirror](https://github.com/wikimedia/wikimedia-discovery-golden/blob/master/docs/README.md).
## Quick start
Install the dependencies:
-```
-$ R
-R> install.packages(c('reshape2', 'dplyr', 'devtools'))
-R>
devtools::install_git('https://gerrit.wikimedia.org/r/wikimedia/discovery/polloi')
+```R
+install.packages(c("devtools", "shiny", "reshape2", "data.table"))
+devtools::install_git("https://gerrit.wikimedia.org/r/wikimedia/discovery/polloi";)
```
-Run the server:
+Run the app:
-```
-$ R
-R> shiny::runApp(launch.browser = 0)
+```R
+shiny::runApp(launch.browser = 0)
```
Please note that this project is released with a [Contributor Code of
Conduct](CONDUCT.md). By participating in this project you agree to abide by
its terms.
diff --git a/utils.R b/utils.R
index 841c251..19579a4 100644
--- a/utils.R
+++ b/utils.R
@@ -1,7 +1,7 @@
library(magrittr)
read_wdqs <- function() {
- data <- polloi::read_dataset("discovery/wdqs/basic_usage.tsv", col_types =
"Dclli") %>%
+ data <- polloi::read_dataset("discovery/metrics/wdqs/basic_usage.tsv",
col_types = "Dclli") %>%
dplyr::arrange(date)
wdqs_visits <<- data %>%
dplyr::filter(path == "/" & http_success) %>%
--
To view, visit https://gerrit.wikimedia.org/r/356473
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I8657d66daab1a9f9f64ffa8187b24062e0755e4c
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/discovery/twilightsparql
Gerrit-Branch: master
Gerrit-Owner: Bearloga
Gerrit-Reviewer: Bearloga
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] wikimedia...wonderbolt[master]: Use new path
Bearloga has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/356469 )
Change subject: Use new path
..
Use new path
Bug: T166724
Change-Id: I01378d734655e7dd423c995d2665311589cfe2a8
---
M README.md
M utils.R
2 files changed, 9 insertions(+), 11 deletions(-)
Approvals:
Bearloga: Verified; Looks good to me, approved
diff --git a/README.md b/README.md
index 07d9ccd..6687c11 100644
--- a/README.md
+++ b/README.md
@@ -1,22 +1,20 @@
# External Referrals Dashboard
-This project is part of the [Discovery
Dashboards](http://discovery.wmflabs.org/) project.
+This project is part of the [Discovery
Dashboards](https://discovery.wmflabs.org/) project, using datasets publicly
available at
[analytics.wikimedia.org/datasets/discovery](https://analytics.wikimedia.org/datasets/discovery/).
For more information on the datasets, refer to [README on the GitHub
mirror](https://github.com/wikimedia/wikimedia-discovery-golden/blob/master/docs/README.md).
## Quick start
Install the dependencies:
-```
-$ R
-R> install.packages(c('reshape2', 'devtools', 'data.table'))
-R>
devtools::install_git('https://gerrit.wikimedia.org/r/wikimedia/discovery/polloi')
+```R
+install.packages(c("devtools", "shiny", "reshape2", "data.table"))
+devtools::install_git("https://gerrit.wikimedia.org/r/wikimedia/discovery/polloi";)
```
-Run the server:
+Run the app:
-```
-$ R
-R> shiny::runApp(launch.browser = 0)
+```R
+shiny::runApp(launch.browser = 0)
```
Please note that this project is released with a [Contributor Code of
Conduct](CONDUCT.md). By participating in this project you agree to abide by
its terms.
diff --git a/utils.R b/utils.R
index 3f00556..2169808 100644
--- a/utils.R
+++ b/utils.R
@@ -4,7 +4,7 @@
read_traffic <- function() {
# Read in the initial data.
- data <- polloi::read_dataset(path =
"discovery/external_traffic/referer_data.tsv", col_types = "Dlccci") %>%
+ data <- polloi::read_dataset(path =
"discovery/metrics/external_traffic/referer_data.tsv", col_types = "Dlccci") %>%
dplyr::filter(!is.na(referer_class), !is.na(pageviews)) %>%
dplyr::mutate(
search_engine = dplyr::if_else(search_engine == "none", "Not referred by
search", search_engine),
@@ -63,7 +63,7 @@
read_nonbot_traffic <- function() {
# Read in the initial data.
- data <- polloi::read_dataset(path =
"discovery/external_traffic/referer_nonbot_data.tsv", col_types = "Dlccci") %>%
+ data <- polloi::read_dataset(path =
"discovery/metrics/external_traffic/referer_nonbot_data.tsv", col_types =
"Dlccci") %>%
dplyr::filter(!is.na(referer_class), !is.na(pageviews)) %>%
dplyr::mutate(
search_engine = dplyr::if_else(search_engine == "none", "Not referred by
search", search_engine),
--
To view, visit https://gerrit.wikimedia.org/r/356469
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I01378d734655e7dd423c995d2665311589cfe2a8
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/discovery/wonderbolt
Gerrit-Branch: master
Gerrit-Owner: Bearloga
Gerrit-Reviewer: Bearloga
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] wikimedia...prince[master]: Use new path & add README
Bearloga has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/356474 )
Change subject: Use new path & add README
..
Use new path & add README
Bug: T166724
Change-Id: Iec24bb600f24c3695ecc46c5b26b1a3f1e4d52fb
---
A README.md
M utils.R
2 files changed, 36 insertions(+), 16 deletions(-)
Approvals:
Bearloga: Verified; Looks good to me, approved
diff --git a/README.md b/README.md
new file mode 100644
index 000..5fd2f2b
--- /dev/null
+++ b/README.md
@@ -0,0 +1,20 @@
+# Wikipedia.org Portal Dashboard
+
+This project is part of the [Discovery
Dashboards](https://discovery.wmflabs.org/) project, using datasets publicly
available at
[analytics.wikimedia.org/datasets/discovery](https://analytics.wikimedia.org/datasets/discovery/).
For more information on the datasets, refer to [README on the GitHub
mirror](https://github.com/wikimedia/wikimedia-discovery-golden/blob/master/docs/README.md).
+
+## Quick start
+
+Install the dependencies:
+
+```R
+install.packages(c("devtools", "shiny", "reshape2", "data.table"))
+devtools::install_git("https://gerrit.wikimedia.org/r/wikimedia/discovery/polloi";)
+```
+
+Run the app:
+
+```R
+shiny::runApp(launch.browser = 0)
+```
+
+Please note that this project is released with a [Contributor Code of
Conduct](CONDUCT.md). By participating in this project you agree to abide by
its terms.
diff --git a/utils.R b/utils.R
index da2b8ee..d0e7ab5 100644
--- a/utils.R
+++ b/utils.R
@@ -6,22 +6,22 @@
read_clickthrough <- function(){
# Read in and format the high-level data
clickthrough_rate <<- data.table::as.data.table(
-polloi::read_dataset("discovery/portal/clickthrough_rate.tsv", col_types =
"Dci")
+polloi::read_dataset("discovery/metrics/portal/clickthrough_rate.tsv",
col_types = "Dci")
)[, j = list(`clickthrough rate` = 100 * (events[type ==
"clickthrough"]/sum(events))), by = "date"]
# Read in and format the breakdown data
interim <- data.table::as.data.table(
-polloi::read_dataset("discovery/portal/clickthrough_breakdown.tsv",
col_types = "Dci")
+
polloi::read_dataset("discovery/metrics/portal/clickthrough_breakdown.tsv",
col_types = "Dci")
)[, j = list(section_used = section_used, proportion = 100 *
(events/sum(events))), by = "date"]
action_breakdown <<- tidyr::spread(dplyr::distinct(interim, date,
section_used, .keep_all = TRUE),
section_used, proportion, fill = 0)
# Read in most common section per visit data
interim <- data.table::as.data.table(
-polloi::read_dataset("discovery/portal/most_common_per_visit.tsv",
col_types = "Dci")
+polloi::read_dataset("discovery/metrics/portal/most_common_per_visit.tsv",
col_types = "Dci")
)[, j = list(section_used = section_used, proportion = 100 *
(visits/sum(visits))), by = "date"]
most_common <<- tidyr::spread(dplyr::distinct(interim, date, section_used,
.keep_all = TRUE),
section_used, proportion, fill = 0)
# Read in first visit clickthrough rates
- interim <-
polloi::read_dataset("discovery/portal/clickthrough_firstvisit.tsv", col_types
= "Ddd")
+ interim <-
polloi::read_dataset("discovery/metrics/portal/clickthrough_firstvisit.tsv",
col_types = "Ddd")
interim[, -1] <- 100 * interim[, -1] # first column is always going to be
the date
interim$`language search` <- 0
first_visit_ctrs <<- interim[, names(action_breakdown)]
@@ -29,7 +29,7 @@
}
read_langs <- function() {
- interim <- polloi::read_dataset("discovery/portal/language_destination.tsv",
col_types = "Dci")
+ interim <-
polloi::read_dataset("discovery/metrics/portal/language_destination.tsv",
col_types = "Dci")
suppressMessages({
prefixes <- polloi::get_prefixes()[, -2]
})
@@ -38,13 +38,13 @@
}
read_dwelltime <- function(){
- dwelltime_data <<-
data.table::as.data.table(polloi::read_dataset("discovery/portal/dwell_metrics.tsv",
col_types = "Dddd"))
+ dwelltime_data <<-
data.table::as.data.table(polloi::read_dataset("discovery/metrics/portal/dwell_metrics.tsv",
col_types = "Dddd"))
return(invisible())
}
read_country <- function(){
interim <- data.table::as.data.table(
-polloi::read_dataset("discovery/portal/country_data.tsv", col_types =
"Dci")
+polloi::read_dataset("discovery/metrics/portal/country_data.tsv",
col_types = "Dci")
)[, list(country = country, events = 100 * (events/sum(events))), by =
"date"]
country_data <<- tidyr::spread(
dplyr::distinct(interim, date, country, .keep_all = TRUE),
@@ -54,7 +54,7 @@
}
read_useragents <- function(){
- interim <- polloi::read_dataset("discovery/portal/user_agent_data.tsv",
col_types = "Dccd")
+ interim <-
polloi::read_dataset("discovery/metrics/portal/user_agent_data.tsv", col_types
= "Dccd")
interim$browser[interim$browser == "Chrome Mobile"] <- "Chrome Mobile
(Android)"
interim$br
[MediaWiki-commits] [Gerrit] wikimedia...polloi[master]: Update dataset path, downloaded prefixes, and documentation
Bearloga has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/356470 )
Change subject: Update dataset path, downloaded prefixes, and documentation
..
Update dataset path, downloaded prefixes, and documentation
- Updates dataset of prefixes
- Changes path to download datasets from
- Uses latest roxygen with markdown support
Bug: T166724
Change-Id: I34172c3198624425f6dfe55358d79e964791137a
---
M DESCRIPTION
M NEWS.md
M R/check_notify.R
M R/data.R
M R/dygraphs.R
M R/manipulate.R
M R/maths.R
M R/reading.R
M R/shiny.R
M R/smoothing.R
M R/utils.R
M README.md
M inst/extdata/prefixes.csv
M man/automata_select.Rd
M man/cbind_fill.Rd
M man/check_notify.Rd
M man/compress.Rd
M man/cond_color.Rd
M man/cond_icon.Rd
M man/custom_axis_formatter.Rd
M man/data_select.Rd
M man/get_langproj.Rd
M man/get_prefixes.Rd
M man/get_projects.Rd
M man/half.Rd
M man/make_dygraph.Rd
M man/na_box.Rd
M man/parse_wikiid.Rd
M man/percent_change.Rd
M man/read_dataset.Rd
M man/safe_tail.Rd
M man/smart_palette.Rd
M man/smooth_select.Rd
M man/smooth_switch.Rd
M man/smoother.Rd
M man/subset_by_date_range.Rd
M man/time_frame_range.Rd
M man/timeframe_daterange.Rd
M man/timeframe_select.Rd
M man/update_prefixes.Rd
M man/update_projects.Rd
41 files changed, 276 insertions(+), 304 deletions(-)
Approvals:
Bearloga: Verified; Looks good to me, approved
diff --git a/DESCRIPTION b/DESCRIPTION
index 86c6f83..5435797 100644
--- a/DESCRIPTION
+++ b/DESCRIPTION
@@ -1,17 +1,17 @@
Package: polloi
Type: Package
Title: Common Functionality for Wikimedia Dashboards
-Version: 0.1.7
-Date: 2016-12-07
+Version: 0.1.8
+Date: 2017-05-31
Authors@R: c(
-person("Oliver", "Keyes", role = "aut"),
-person("Mikhail", "Popov", email = "mpo...@wikimedia.org", role = c("aut",
"cre")))
+person("Mikhail", "Popov", email = "mpo...@wikimedia.org", role = c("aut",
"cre")),
+person("Oliver", "Keyes", role = "aut")
+)
Description: This package contains common functionality for all of the
Wikimedia Foundation's Shiny Dashboards.
License: MIT + file LICENSE
URL: https://phabricator.wikimedia.org/diffusion/WDPL/
-BugReports: https://phabricator.wikimedia.org/maniphest/task/create/?
-projects=Discovery-Analysis
+BugReports:
https://phabricator.wikimedia.org/maniphest/task/create/?projects=Discovery-Analysis
Depends:
R (>= 3.1.0)
Imports:
@@ -28,9 +28,10 @@
dplyr (>= 0.4.3),
tidyr (>= 0.4.1),
mgcv
-LazyData: TRUE
-RoxygenNote: 5.0.1
Suggests:
rvest (>= 0.3.1),
xml2 (>= 0.1.2),
httr (>= 1.1.0)
+LazyData: TRUE
+Roxygen: list(markdown = TRUE)
+RoxygenNote: 6.0.1
diff --git a/NEWS.md b/NEWS.md
index b8cfd3a..28f0995 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -1,3 +1,9 @@
+polloi 0.1.8
+
+- Updates dataset of prefixes
+- Changes path to download datasets from
+- Uses latest roxygen with markdown support
+
polloi 0.1.7
- Fixes a bug wherein a "found duplicated data in" message was incorrectly
displayed (specifically, when there was no duplicated data).
diff --git a/R/check_notify.R b/R/check_notify.R
index 5492e60..1e5c840 100644
--- a/R/check_notify.R
+++ b/R/check_notify.R
@@ -1,17 +1,17 @@
-#'@title Check 'n' Notify
-#'@description Check a dataset for missing data from the day before and the
-#' past week, and create a \code{notificationItem} if missing data has been
+#' @title Check 'n' Notify
+#' @description Check a dataset for missing data from the day before and the
+#' past week, and create a `notificationItem` if missing data has been
#' detected.
-#'@param dataset A data.frame with a 'date' column.
-#'@param label The label to use in the notification.
-#'@family Shiny Dashboarding
-#'@name check_notify
+#' @param dataset A data.frame with a 'date' column.
+#' @param label The label to use in the notification.
+#' @family Shiny Dashboarding
+#' @name check_notify
NULL
-#'@rdname check_notify
-#'@importFrom shinydashboard notificationItem
-#'@importFrom shiny icon
-#'@export
+#' @rdname check_notify
+#' @importFrom shinydashboard notificationItem
+#' @importFrom shiny icon
+#' @export
check_yesterday <- function(dataset, label) {
# e.g. label = "desktop events"
yesterday_date <- Sys.Date() - 1
@@ -22,10 +22,10 @@
return(NULL)
}
-#'@rdname check_notify
-#'@importFrom shinydashboard notificationItem
-#'@importFrom shiny icon
-#'@export
+#' @rdname check_notify
+#' @importFrom shinydashboard notificationItem
+#' @importFrom shiny icon
+#' @export
check_past_week <- function(dataset, label) {
past_week <- Sys.Date() - c(2:7) # Sys.Date()-1 is already handled by
check_yesterday()
if (any(!(past_week %in% dataset$date))) {
diff --git a/R/data.R b/R/data.R
index 2dfc8d4..288de6e 100644
--- a/R/data.R
+++ b/R/data.R
@@ -17,7 +17,7 @@
#'
#' @source
\url{https://meta.wikimedia.org/wiki/Template:Table_of_Wikimedia_projects#Projects_per_language_codes}
#' @importFr
[MediaWiki-commits] [Gerrit] wikimedia...wetzel[master]: Use new path
Bearloga has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/356472 )
Change subject: Use new path
..
Use new path
Bug: T166724
Change-Id: I60c2d64b49b3ef5d361f7438f64c390407368307
---
M README.md
M utils.R
2 files changed, 12 insertions(+), 14 deletions(-)
Approvals:
Bearloga: Verified; Looks good to me, approved
diff --git a/README.md b/README.md
index 6f4c025..1cd09ef 100644
--- a/README.md
+++ b/README.md
@@ -1,22 +1,20 @@
# Wikimedia Maps Dashboard
-This project is part of the [Discovery
Dashboards](http://searchdata.wmflabs.org/) project.
+This project is part of the [Discovery
Dashboards](https://discovery.wmflabs.org/) project, using datasets publicly
available at
[analytics.wikimedia.org/datasets/discovery](https://analytics.wikimedia.org/datasets/discovery/).
For more information on the datasets, refer to [README on the GitHub
mirror](https://github.com/wikimedia/wikimedia-discovery-golden/blob/master/docs/README.md).
## Quick start
Install the dependencies:
-```
-$ R
-R> install.packages(c('reshape2', 'devtools'))
-R>
devtools::install_git('https://gerrit.wikimedia.org/r/wikimedia/discovery/polloi')
+```R
+install.packages(c("devtools", "shiny", "reshape2", "data.table"))
+devtools::install_git("https://gerrit.wikimedia.org/r/wikimedia/discovery/polloi";)
```
-Run the server:
+Run the app:
-```
-$ R
-R> shiny::runApp(launch.browser = 0)
+```R
+shiny::runApp(launch.browser = 0)
```
Please note that this project is released with a [Contributor Code of
Conduct](CONDUCT.md). By participating in this project you agree to abide by
its terms.
diff --git a/utils.R b/utils.R
index 53f8744..e060be7 100644
--- a/utils.R
+++ b/utils.R
@@ -5,7 +5,7 @@
# used in dygraphs.
read_actions <- function() {
# Read in data, split and rename it, and write it o
- usage_data <<- polloi::read_dataset("discovery/maps/actions_per_tool.tsv",
col_types = "Dcci") %>%
+ usage_data <<-
polloi::read_dataset("discovery/metrics/maps/actions_per_tool.tsv", col_types =
"Dcci") %>%
dplyr::filter(!is.na(feature), !is.na(action), !is.na(events)) %>%
{ split(.[, c(1, 3, 4)], .$feature) } %>%
lapply(tidyr::spread_, key = "action", value = "events", fill = 0)
@@ -14,24 +14,24 @@
# Read in user count
read_users <- function() {
- user_data <<- polloi::read_dataset("discovery/maps/users_per_feature.tsv",
col_types = "Dci") %>%
+ user_data <<-
polloi::read_dataset("discovery/metrics/maps/users_per_feature.tsv", col_types
= "Dci") %>%
dplyr::filter(!is.na(feature), !is.na(users)) %>%
tidyr::spread(feature, users, fill = 0)
return(invisible())
}
read_tiles <- function() {
- new_tiles_automata <<-
polloi::read_dataset("discovery/maps/tile_aggregates_with_automata.tsv",
col_types = "Dcidcciidiii") %>%
+ new_tiles_automata <<-
polloi::read_dataset("discovery/metrics/maps/tile_aggregates_with_automata.tsv",
col_types = "Dcidcciidiii") %>%
dplyr::filter(!is.na(total), !is.na(users)) %>%
data.table::as.data.table()
- new_tiles_no_automata <<-
polloi::read_dataset("discovery/maps/tile_aggregates_no_automata.tsv",
col_types = "Dcidcciidiii") %>%
+ new_tiles_no_automata <<-
polloi::read_dataset("discovery/metrics/maps/tile_aggregates_no_automata.tsv",
col_types = "Dcidcciidiii") %>%
dplyr::filter(!is.na(total), !is.na(users)) %>%
data.table::as.data.table()
return(invisible())
}
read_countries <- function(){
- country_data <<- polloi::read_dataset("discovery/maps/users_by_country.tsv",
col_types = "Dcd") %>%
+ country_data <<-
polloi::read_dataset("discovery/metrics/maps/users_by_country.tsv", col_types =
"Dcd") %>%
dplyr::filter(!is.na(country), !is.na(users)) %>%
dplyr::mutate(users = users * 100) %>%
tidyr::spread(country, users, fill = 0)
--
To view, visit https://gerrit.wikimedia.org/r/356472
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I60c2d64b49b3ef5d361f7438f64c390407368307
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/discovery/wetzel
Gerrit-Branch: master
Gerrit-Owner: Bearloga
Gerrit-Reviewer: Bearloga
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
