[MediaWiki-commits] [Gerrit] config: Add Czech (cs) - change (mediawiki...cxserver)
KartikMistry has uploaded a new change for review.
https://gerrit.wikimedia.org/r/205826
Change subject: config: Add Czech (cs)
..
config: Add Czech (cs)
Bug: T96486
Change-Id: I41598daebc73ccd9a69247297627e9d13002c160
---
M config.defaults.js
1 file changed, 2 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/cxserver
refs/changes/26/205826/1
diff --git a/config.defaults.js b/config.defaults.js
index b764167..bb1b583 100644
--- a/config.defaults.js
+++ b/config.defaults.js
@@ -22,8 +22,8 @@
cert: null,
// Service registry
registry: {
- source: [ 'af', 'an', 'ar', 'ast', 'az', 'ba', 'bg', 'bs',
'ca', 'cr', 'cv', 'cy', 'el', 'en', 'eo', 'es', 'eu', 'fr', 'gl', 'gu', 'hi',
'hr', 'id', 'ja', 'kk', 'km', 'kn', 'koi', 'kv', 'ky', 'kz', 'lez', 'min',
'mk', 'ms', 'mt', 'nl', 'no', 'nn', 'oc', 'pa', 'pl', 'pt', 'ru', 'sah', 'sh',
'simple', 'sl', 'tr', 'tt', 'tyv', 'udm', 'uk', 'ur', 'uz', 'vi', 'xh', 'zh',
'zu' ],
- target: [ 'af', 'an', 'ar', 'ast', 'az', 'ba', 'bg', 'bs',
'ca', 'cr', 'cv', 'cy', 'el', 'eo', 'es', 'eu', 'fr', 'gl', 'gu', 'hi', 'hr',
'id', 'ja', 'kk', 'km', 'kn', 'koi', 'kv', 'ky', 'kz', 'lez', 'min', 'mk',
'ms', 'mt', 'nl', 'no', 'nn', 'oc', 'pa', 'pl', 'pt', 'ru', 'sah', 'sh',
'simple', 'sl', 'tt', 'tr', 'tyv', 'udm', 'uk', 'ur', 'uz', 'vi', 'xh', 'zh',
'zu' ],
+ source: [ 'af', 'an', 'ar', 'ast', 'az', 'ba', 'bg', 'bs',
'ca', 'cr', 'cs', 'cv', 'cy', 'el', 'en', 'eo', 'es', 'eu', 'fr', 'gl', 'gu',
'hi', 'hr', 'id', 'ja', 'kk', 'km', 'kn', 'koi', 'kv', 'ky', 'kz', 'lez',
'min', 'mk', 'ms', 'mt', 'nl', 'no', 'nn', 'oc', 'pa', 'pl', 'pt', 'ru', 'sah',
'sh', 'simple', 'sl', 'tr', 'tt', 'tyv', 'udm', 'uk', 'ur', 'uz', 'vi', 'xh',
'zh', 'zu' ],
+ target: [ 'af', 'an', 'ar', 'ast', 'az', 'ba', 'bg', 'bs',
'ca', 'cr', 'cs', 'cv', 'cy', 'el', 'eo', 'es', 'eu', 'fr', 'gl', 'gu', 'hi',
'hr', 'id', 'ja', 'kk', 'km', 'kn', 'koi', 'kv', 'ky', 'kz', 'lez', 'min',
'mk', 'ms', 'mt', 'nl', 'no', 'nn', 'oc', 'pa', 'pl', 'pt', 'ru', 'sah', 'sh',
'simple', 'sl', 'tt', 'tr', 'tyv', 'udm', 'uk', 'ur', 'uz', 'vi', 'xh', 'zh',
'zu' ],
mt: {
Apertium: {
af: [ 'nl' ],
--
To view, visit https://gerrit.wikimedia.org/r/205826
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I41598daebc73ccd9a69247297627e9d13002c160
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/cxserver
Gerrit-Branch: master
Gerrit-Owner: KartikMistry
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] end float after li - change (mediawiki...BlueSpiceSkin)
jenkins-bot has submitted this change and it was merged.
Change subject: end float after li
..
end float after li
new fix after https://gerrit.wikimedia.org/r/#/c/205204/
Change-Id: I43f0e9529528b237b7a0dda36d560c2cd993
---
M resources/components/skin.titleActions.less
1 file changed, 5 insertions(+), 0 deletions(-)
Approvals:
Robert Vogel: Looks good to me, approved
jenkins-bot: Verified
diff --git a/resources/components/skin.titleActions.less
b/resources/components/skin.titleActions.less
index a68dad9..cf0e4b1 100644
--- a/resources/components/skin.titleActions.less
+++ b/resources/components/skin.titleActions.less
@@ -6,6 +6,11 @@
display: block;
float: right;
}
+ul#bs-title-actions:after{
+ float: none;
+ clear: both;
+ content: "";
+}
ul#bs-title-actions li a{
display: block;
--
To view, visit https://gerrit.wikimedia.org/r/205823
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I43f0e9529528b237b7a0dda36d560c2cd993
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/BlueSpiceSkin
Gerrit-Branch: REL1_23
Gerrit-Owner: Tweichart
Gerrit-Reviewer: Mglaser
Gerrit-Reviewer: Pigpen
Gerrit-Reviewer: Robert Vogel
Gerrit-Reviewer: Smuggli
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] end float after li - change (mediawiki...BlueSpiceSkin)
jenkins-bot has submitted this change and it was merged.
Change subject: end float after li
..
end float after li
new fix after https://gerrit.wikimedia.org/r/#/c/205204/
Change-Id: I43f0e9529528b237b7a0dda36d560c2cd993
---
M resources/components/skin.titleActions.less
1 file changed, 5 insertions(+), 0 deletions(-)
Approvals:
Robert Vogel: Looks good to me, approved
jenkins-bot: Verified
diff --git a/resources/components/skin.titleActions.less
b/resources/components/skin.titleActions.less
index a68dad9..cf0e4b1 100644
--- a/resources/components/skin.titleActions.less
+++ b/resources/components/skin.titleActions.less
@@ -6,6 +6,11 @@
display: block;
float: right;
}
+ul#bs-title-actions:after{
+ float: none;
+ clear: both;
+ content: "";
+}
ul#bs-title-actions li a{
display: block;
--
To view, visit https://gerrit.wikimedia.org/r/205822
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I43f0e9529528b237b7a0dda36d560c2cd993
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/BlueSpiceSkin
Gerrit-Branch: master
Gerrit-Owner: Tweichart
Gerrit-Reviewer: Mglaser
Gerrit-Reviewer: Pigpen
Gerrit-Reviewer: Robert Vogel
Gerrit-Reviewer: Smuggli
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] [WIP] Added $wgJobSerialCommitThreshold setting - change (mediawiki/core)
Aaron Schulz has uploaded a new change for review.
https://gerrit.wikimedia.org/r/205825
Change subject: [WIP] Added $wgJobSerialCommitThreshold setting
..
[WIP] Added $wgJobSerialCommitThreshold setting
Change-Id: Id707c9a840fa23d56407e03aaae4e25149a1f906
---
M includes/DefaultSettings.php
M includes/db/Database.php
M includes/db/DatabaseMysqlBase.php
M includes/db/LoadBalancer.php
M includes/jobqueue/JobRunner.php
5 files changed, 77 insertions(+), 9 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/25/205825/1
diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index b08fe4d..c61ff9c 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -6452,6 +6452,15 @@
$wgJobBackoffThrottling = array();
/**
+ * Issue COMMITs from the job runner one at a time, first waiting on slave lag.
+ * This is useful if there are many job workers that race on slave lag checks.
+ * If set, jobs that take this many seconds of DB time have serialized commits.
+ *
+ * @since 1.26
+ */
+$wgJobSerialCommitThreshold = false;
+
+/**
* Map of job types to configuration arrays.
* This determines which queue class and storage system is used for each job
type.
* Job types that do not have explicit configuration will use the 'default'
config.
diff --git a/includes/db/Database.php b/includes/db/Database.php
index 0bef28a..ccf572a 100644
--- a/includes/db/Database.php
+++ b/includes/db/Database.php
@@ -4209,7 +4209,7 @@
}
/**
-* Check to see if a named lock is available. This is non-blocking.
+* Check to see if a named lock is available (non-blocking)
*
* @param string $lockName Name of lock to poll
* @param string $method Name of method calling us
@@ -4223,8 +4223,7 @@
/**
* Acquire a named lock
*
-* Abstracted from Filestore::lock() so child classes can implement for
-* their own needs.
+* Named lock are not related to transactions
*
* @param string $lockName Name of lock to aquire
* @param string $method Name of method calling us
@@ -4236,7 +4235,9 @@
}
/**
-* Release a lock.
+* Release a lock
+*
+* Named lock are not related to transactions
*
* @param string $lockName Name of lock to release
* @param string $method Name of method calling us
@@ -4250,6 +4251,16 @@
}
/**
+* Check to see if a named locks used by lock() use blocking queues
+*
+* @return bool
+* @since 1.26
+*/
+ public function namedLocksEnqueue() {
+ return false;
+ }
+
+ /**
* Lock specific tables
*
* @param array $read Array of tables to lock for read access
diff --git a/includes/db/DatabaseMysqlBase.php
b/includes/db/DatabaseMysqlBase.php
index aac95a8..64917cc 100644
--- a/includes/db/DatabaseMysqlBase.php
+++ b/includes/db/DatabaseMysqlBase.php
@@ -873,6 +873,10 @@
return ( $row->lockstatus == 1 );
}
+ public function namedLocksEnqueue() {
+ return true;
+ }
+
/**
* @param array $read
* @param array $write
diff --git a/includes/db/LoadBalancer.php b/includes/db/LoadBalancer.php
index c748e4b..e7cdf26 100644
--- a/includes/db/LoadBalancer.php
+++ b/includes/db/LoadBalancer.php
@@ -845,8 +845,9 @@
/**
* @return int
+* @since 1.26
*/
- private function getWriterIndex() {
+ public function getWriterIndex() {
return 0;
}
diff --git a/includes/jobqueue/JobRunner.php b/includes/jobqueue/JobRunner.php
index d5262a1..f541951 100644
--- a/includes/jobqueue/JobRunner.php
+++ b/includes/jobqueue/JobRunner.php
@@ -124,7 +124,7 @@
// Bail out if there is too much DB lag
$maxAllowedLag = 5;
- list( , $maxLag ) = wfGetLBFactory()->getMainLB( wfWikiID()
)->getMaxLag();
+ list( , $maxLag ) = wfGetLB( wfWikiID() )->getMaxLag();
if ( $maxLag >= $maxAllowedLag ) {
$response['reached'] = 'slave-lag-limit';
return $response;
@@ -182,7 +182,9 @@
++$jobsRun;
$status = $job->run();
$error = $job->getLastError();
- wfGetLBFactory()->commitMasterChanges();
+ // @TODO: just count db write query time
+ $preCommitSec = microtime( true ) -
$jobStartTime;
+ $this->commitMasterChanges(
$preCommitSec );
} catch ( Exception $e ) {
[MediaWiki-commits] [Gerrit] Added LoadBalancer::waitForSlave method - change (mediawiki/core)
Aaron Schulz has uploaded a new change for review.
https://gerrit.wikimedia.org/r/205824
Change subject: Added LoadBalancer::waitForSlave method
..
Added LoadBalancer::waitForSlave method
Change-Id: I4d4a96806d55b119fa535556e11abd55736e9077
---
M includes/db/LoadBalancer.php
1 file changed, 31 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/24/205824/1
diff --git a/includes/db/LoadBalancer.php b/includes/db/LoadBalancer.php
index bc17911..c748e4b 100644
--- a/includes/db/LoadBalancer.php
+++ b/includes/db/LoadBalancer.php
@@ -359,6 +359,37 @@
}
/**
+* Set the master wait position and wait for a "generic" slave to catch
up to it
+*
+* This can be used a faster proxy for waitForAll()
+*
+* @param DBMasterPos $pos
+* @param int $timeout Max seconds to wait; default is mWaitTimeout
+* @return bool Success (able to connect and no timeouts reached)
+* @since 1.26
+*/
+ public function waitForSlave( $pos, $timeout = null ) {
+ $this->mWaitForPos = $pos;
+
+ $i = $this->mReadIndex;
+ if ( $i <= 0 ) {
+ // Pick a generic slave if there isn't one yet
+ $readLoads = $this->mLoads;
+ unset( $readLoads[$this->getWriterIndex()] ); // slaves
only
+ $readLoads = array_filter( $readLoads );
+ $i = ArrayUtils::pickRandom( $readLoads );
+ }
+
+ if ( $i > 0 ) {
+ $ok = $this->doWait( $i, true, $timeout );
+ } else {
+ $ok = true; // no applicable loads
+ }
+
+ return $ok;
+ }
+
+ /**
* Set the master wait position and wait for ALL slaves to catch up to
it
* @param DBMasterPos $pos
* @param int $timeout Max seconds to wait; default is mWaitTimeout
--
To view, visit https://gerrit.wikimedia.org/r/205824
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I4d4a96806d55b119fa535556e11abd55736e9077
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] end float after li - change (mediawiki...BlueSpiceSkin)
Tweichart has uploaded a new change for review.
https://gerrit.wikimedia.org/r/205823
Change subject: end float after li
..
end float after li
new fix after https://gerrit.wikimedia.org/r/#/c/205204/
Change-Id: I43f0e9529528b237b7a0dda36d560c2cd993
---
M resources/components/skin.titleActions.less
1 file changed, 5 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/BlueSpiceSkin
refs/changes/23/205823/1
diff --git a/resources/components/skin.titleActions.less
b/resources/components/skin.titleActions.less
index a68dad9..cf0e4b1 100644
--- a/resources/components/skin.titleActions.less
+++ b/resources/components/skin.titleActions.less
@@ -6,6 +6,11 @@
display: block;
float: right;
}
+ul#bs-title-actions:after{
+ float: none;
+ clear: both;
+ content: "";
+}
ul#bs-title-actions li a{
display: block;
--
To view, visit https://gerrit.wikimedia.org/r/205823
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I43f0e9529528b237b7a0dda36d560c2cd993
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/BlueSpiceSkin
Gerrit-Branch: REL1_23
Gerrit-Owner: Tweichart
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] end float after li - change (mediawiki...BlueSpiceSkin)
Tweichart has uploaded a new change for review.
https://gerrit.wikimedia.org/r/205822
Change subject: end float after li
..
end float after li
new fix after https://gerrit.wikimedia.org/r/#/c/205204/
Change-Id: I43f0e9529528b237b7a0dda36d560c2cd993
---
M resources/components/skin.titleActions.less
1 file changed, 5 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/BlueSpiceSkin
refs/changes/22/205822/1
diff --git a/resources/components/skin.titleActions.less
b/resources/components/skin.titleActions.less
index a68dad9..cf0e4b1 100644
--- a/resources/components/skin.titleActions.less
+++ b/resources/components/skin.titleActions.less
@@ -6,6 +6,11 @@
display: block;
float: right;
}
+ul#bs-title-actions:after{
+ float: none;
+ clear: both;
+ content: "";
+}
ul#bs-title-actions li a{
display: block;
--
To view, visit https://gerrit.wikimedia.org/r/205822
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I43f0e9529528b237b7a0dda36d560c2cd993
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/BlueSpiceSkin
Gerrit-Branch: master
Gerrit-Owner: Tweichart
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] [Gather] Add message key to ignore - change (translatewiki)
Raimond Spekking has uploaded a new change for review. https://gerrit.wikimedia.org/r/205821 Change subject: [Gather] Add message key to ignore .. [Gather] Add message key to ignore https://gerrit.wikimedia.org/r/#/c/203949/7/i18n/en.json,unified Change-Id: Ic99d3e6fd78062b0bbf6cb9e41cb4597d7dc1f03 --- M groups/MediaWiki/mediawiki-extensions.txt 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/translatewiki refs/changes/21/205821/1 diff --git a/groups/MediaWiki/mediawiki-extensions.txt b/groups/MediaWiki/mediawiki-extensions.txt index 3a6c81a..77d86f7 100644 --- a/groups/MediaWiki/mediawiki-extensions.txt +++ b/groups/MediaWiki/mediawiki-extensions.txt @@ -1005,6 +1005,7 @@ Gather aliasfile = Gather/Gather.alias.php +ignored = gather-lists-hide-protocol Gadgets aliasfile = Gadgets/Gadgets.alias.php -- To view, visit https://gerrit.wikimedia.org/r/205821 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic99d3e6fd78062b0bbf6cb9e41cb4597d7dc1f03 Gerrit-PatchSet: 1 Gerrit-Project: translatewiki Gerrit-Branch: master Gerrit-Owner: Raimond Spekking ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] [Gather] Add message key to ignore - change (translatewiki)
Raimond Spekking has submitted this change and it was merged. Change subject: [Gather] Add message key to ignore .. [Gather] Add message key to ignore https://gerrit.wikimedia.org/r/#/c/203949/7/i18n/en.json,unified Change-Id: Ic99d3e6fd78062b0bbf6cb9e41cb4597d7dc1f03 --- M groups/MediaWiki/mediawiki-extensions.txt 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Raimond Spekking: Verified; Looks good to me, approved diff --git a/groups/MediaWiki/mediawiki-extensions.txt b/groups/MediaWiki/mediawiki-extensions.txt index 3a6c81a..77d86f7 100644 --- a/groups/MediaWiki/mediawiki-extensions.txt +++ b/groups/MediaWiki/mediawiki-extensions.txt @@ -1005,6 +1005,7 @@ Gather aliasfile = Gather/Gather.alias.php +ignored = gather-lists-hide-protocol Gadgets aliasfile = Gadgets/Gadgets.alias.php -- To view, visit https://gerrit.wikimedia.org/r/205821 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ic99d3e6fd78062b0bbf6cb9e41cb4597d7dc1f03 Gerrit-PatchSet: 1 Gerrit-Project: translatewiki Gerrit-Branch: master Gerrit-Owner: Raimond Spekking Gerrit-Reviewer: Raimond Spekking Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Review/ResponsibleEditors: Added missing I18N - change (mediawiki...BlueSpiceExtensions)
Robert Vogel has submitted this change and it was merged.
Change subject: Review/ResponsibleEditors: Added missing I18N
..
Review/ResponsibleEditors: Added missing I18N
There were some keys missing that are used in Special:Log
Change-Id: Ibdfd7137578f46f0499a6ab11ed01458f90d8ce2
(cherry picked from commit 70d1b4cc150de61c696f1024a9e467c7344d96bc)
---
M ResponsibleEditors/i18n/de.json
M ResponsibleEditors/i18n/en.json
M ResponsibleEditors/i18n/qqq.json
M Review/i18n/de.json
M Review/i18n/en.json
M Review/i18n/qqq.json
6 files changed, 9 insertions(+), 3 deletions(-)
Approvals:
Robert Vogel: Verified; Looks good to me, approved
diff --git a/ResponsibleEditors/i18n/de.json b/ResponsibleEditors/i18n/de.json
index cffc11f..135c3c4 100644
--- a/ResponsibleEditors/i18n/de.json
+++ b/ResponsibleEditors/i18n/de.json
@@ -55,5 +55,6 @@
"bs-responsibleeditors-cbnamespacesemptytext": "Namensraum auswählen",
"bs-responsibleeditors-columneesponsibleeditornotset": "Nicht
zugewiesen.",
"log-name-bs-responsibleeditors": "Verantwortliche Redakteure-Logbuch",
- "log-description-bs-responsibleeditors": "Logbuch von Redakteuren die
für gewisse Seiten verantwortlich sind."
+ "log-description-bs-responsibleeditors": "Logbuch von Redakteuren die
für gewisse Seiten verantwortlich sind.",
+ "log-show-hide-bs-responsibleeditors": "Verantwortliche
Redakteure-Logbuch $1"
}
diff --git a/ResponsibleEditors/i18n/en.json b/ResponsibleEditors/i18n/en.json
index 9317807..b0ae9b4 100644
--- a/ResponsibleEditors/i18n/en.json
+++ b/ResponsibleEditors/i18n/en.json
@@ -53,5 +53,6 @@
"bs-responsibleeditors-cbnamespacesemptytext": "Select a namespace",
"bs-responsibleeditors-columneesponsibleeditornotset": "Not assigned",
"log-name-bs-responsibleeditors": "Responsible editors log",
- "log-description-bs-responsibleeditors": "This is a log of editors
responsible for pages."
+ "log-description-bs-responsibleeditors": "This is a log of editors
responsible for pages.",
+ "log-show-hide-bs-responsibleeditors": "$1 responsible editors log"
}
diff --git a/ResponsibleEditors/i18n/qqq.json b/ResponsibleEditors/i18n/qqq.json
index c4519ce..19bd5c8 100644
--- a/ResponsibleEditors/i18n/qqq.json
+++ b/ResponsibleEditors/i18n/qqq.json
@@ -59,5 +59,6 @@
"bs-responsibleeditors-cbnamespacesemptytext": "Placeholder for
\"Namespace\" selector.",
"bs-responsibleeditors-columneesponsibleeditornotset": "Text for not
assigned",
"log-name-bs-responsibleeditors": "Used in [[Special:Log]], label for
responsible editors log",
- "log-description-bs-responsibleeditors": "Used in [[Special:Log]], log
description for editors responsible for pages."
+ "log-description-bs-responsibleeditors": "Used in [[Special:Log]], log
description for editors responsible for pages.",
+ "log-show-hide-bs-responsibleeditors": "Used in [[Special:Log]].
Parameters:\n* $1 - link text; one of {{msg-mw|Show}} or
{{msg-mw|Hide}}\n{{Related|Log-show-hide}}"
}
diff --git a/Review/i18n/de.json b/Review/i18n/de.json
index 0dea3af..0de7977 100644
--- a/Review/i18n/de.json
+++ b/Review/i18n/de.json
@@ -55,6 +55,7 @@
"bs-review-finished-review": "$1 {{GENDER:$1|schloss}} die Begutachtung
für die Seite \"$2\" ab.",
"log-name-bs-review": "Begutachtung-Logbuch",
"log-description-bs-review": "Logbuch von Seiten, die Begutachtet
werden oder wurden.",
+ "log-show-hide-bs-review": "Begutachtung-Logbuch $1",
"bs-review-pref-checkowner": "Eine Begutachtung kann nur durch ihren
Besitzer verändert werden",
"bs-review-pref-shownameintooltip": "Namen der Beteiligten anzeigen",
"bs-review-pref-emailnotifyowner": "Bei Änderungen einer Begutachtung
den Besitzer benachrichtigen",
diff --git a/Review/i18n/en.json b/Review/i18n/en.json
index 50cea49..3dd6d6b 100644
--- a/Review/i18n/en.json
+++ b/Review/i18n/en.json
@@ -53,6 +53,7 @@
"bs-review-finished-review": "$1 {{GENDER:$1|finished}} a review to
page \"$2\".",
"log-name-bs-review": "Review log",
"log-description-bs-review": "This is a log of pages which are or were
under review.",
+ "log-show-hide-bs-review": "$1 review log",
"bs-review-pref-checkowner": "Only the owner of a review can change it",
"bs-review-pref-shownameintooltip": "Show names of the participants",
"bs-review-pref-emailnotifyowner": "Notify the owner of a review about
changes",
diff --git a/Review/i18n/qqq.json b/Review/i18n/qqq.json
index e79cc91..7b61f14 100644
--- a/Review/i18n/qqq.json
+++ b/Review/i18n/qqq.json
@@ -59,6 +59,7 @@
"bs-review-finished-review": "Log message that someone finished a
review on page.\n*$1 is the username of the user\n*$2 is the name of the page
as a link.",
"log-name-bs-review": "Used in [[Special:Log]], headline for review
lo
[MediaWiki-commits] [Gerrit] Review/ResponsibleEditors: Added missing I18N - change (mediawiki...BlueSpiceExtensions)
Robert Vogel has uploaded a new change for review.
https://gerrit.wikimedia.org/r/205820
Change subject: Review/ResponsibleEditors: Added missing I18N
..
Review/ResponsibleEditors: Added missing I18N
There were some keys missing that are used in Special:Log
Change-Id: Ibdfd7137578f46f0499a6ab11ed01458f90d8ce2
(cherry picked from commit 70d1b4cc150de61c696f1024a9e467c7344d96bc)
---
M ResponsibleEditors/i18n/de.json
M ResponsibleEditors/i18n/en.json
M ResponsibleEditors/i18n/qqq.json
M Review/i18n/de.json
M Review/i18n/en.json
M Review/i18n/qqq.json
6 files changed, 9 insertions(+), 3 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceExtensions
refs/changes/20/205820/1
diff --git a/ResponsibleEditors/i18n/de.json b/ResponsibleEditors/i18n/de.json
index cffc11f..135c3c4 100644
--- a/ResponsibleEditors/i18n/de.json
+++ b/ResponsibleEditors/i18n/de.json
@@ -55,5 +55,6 @@
"bs-responsibleeditors-cbnamespacesemptytext": "Namensraum auswählen",
"bs-responsibleeditors-columneesponsibleeditornotset": "Nicht
zugewiesen.",
"log-name-bs-responsibleeditors": "Verantwortliche Redakteure-Logbuch",
- "log-description-bs-responsibleeditors": "Logbuch von Redakteuren die
für gewisse Seiten verantwortlich sind."
+ "log-description-bs-responsibleeditors": "Logbuch von Redakteuren die
für gewisse Seiten verantwortlich sind.",
+ "log-show-hide-bs-responsibleeditors": "Verantwortliche
Redakteure-Logbuch $1"
}
diff --git a/ResponsibleEditors/i18n/en.json b/ResponsibleEditors/i18n/en.json
index 9317807..b0ae9b4 100644
--- a/ResponsibleEditors/i18n/en.json
+++ b/ResponsibleEditors/i18n/en.json
@@ -53,5 +53,6 @@
"bs-responsibleeditors-cbnamespacesemptytext": "Select a namespace",
"bs-responsibleeditors-columneesponsibleeditornotset": "Not assigned",
"log-name-bs-responsibleeditors": "Responsible editors log",
- "log-description-bs-responsibleeditors": "This is a log of editors
responsible for pages."
+ "log-description-bs-responsibleeditors": "This is a log of editors
responsible for pages.",
+ "log-show-hide-bs-responsibleeditors": "$1 responsible editors log"
}
diff --git a/ResponsibleEditors/i18n/qqq.json b/ResponsibleEditors/i18n/qqq.json
index c4519ce..19bd5c8 100644
--- a/ResponsibleEditors/i18n/qqq.json
+++ b/ResponsibleEditors/i18n/qqq.json
@@ -59,5 +59,6 @@
"bs-responsibleeditors-cbnamespacesemptytext": "Placeholder for
\"Namespace\" selector.",
"bs-responsibleeditors-columneesponsibleeditornotset": "Text for not
assigned",
"log-name-bs-responsibleeditors": "Used in [[Special:Log]], label for
responsible editors log",
- "log-description-bs-responsibleeditors": "Used in [[Special:Log]], log
description for editors responsible for pages."
+ "log-description-bs-responsibleeditors": "Used in [[Special:Log]], log
description for editors responsible for pages.",
+ "log-show-hide-bs-responsibleeditors": "Used in [[Special:Log]].
Parameters:\n* $1 - link text; one of {{msg-mw|Show}} or
{{msg-mw|Hide}}\n{{Related|Log-show-hide}}"
}
diff --git a/Review/i18n/de.json b/Review/i18n/de.json
index 0dea3af..0de7977 100644
--- a/Review/i18n/de.json
+++ b/Review/i18n/de.json
@@ -55,6 +55,7 @@
"bs-review-finished-review": "$1 {{GENDER:$1|schloss}} die Begutachtung
für die Seite \"$2\" ab.",
"log-name-bs-review": "Begutachtung-Logbuch",
"log-description-bs-review": "Logbuch von Seiten, die Begutachtet
werden oder wurden.",
+ "log-show-hide-bs-review": "Begutachtung-Logbuch $1",
"bs-review-pref-checkowner": "Eine Begutachtung kann nur durch ihren
Besitzer verändert werden",
"bs-review-pref-shownameintooltip": "Namen der Beteiligten anzeigen",
"bs-review-pref-emailnotifyowner": "Bei Änderungen einer Begutachtung
den Besitzer benachrichtigen",
diff --git a/Review/i18n/en.json b/Review/i18n/en.json
index 50cea49..3dd6d6b 100644
--- a/Review/i18n/en.json
+++ b/Review/i18n/en.json
@@ -53,6 +53,7 @@
"bs-review-finished-review": "$1 {{GENDER:$1|finished}} a review to
page \"$2\".",
"log-name-bs-review": "Review log",
"log-description-bs-review": "This is a log of pages which are or were
under review.",
+ "log-show-hide-bs-review": "$1 review log",
"bs-review-pref-checkowner": "Only the owner of a review can change it",
"bs-review-pref-shownameintooltip": "Show names of the participants",
"bs-review-pref-emailnotifyowner": "Notify the owner of a review about
changes",
diff --git a/Review/i18n/qqq.json b/Review/i18n/qqq.json
index e79cc91..7b61f14 100644
--- a/Review/i18n/qqq.json
+++ b/Review/i18n/qqq.json
@@ -59,6 +59,7 @@
"bs-review-finished-review": "Log message that someone finished a
review on page.\n*$1 is the username of the user\n*$2 is the name of the page
as a link.",
[MediaWiki-commits] [Gerrit] Review/ResponsibleEditors: Added missing I18N - change (mediawiki...BlueSpiceExtensions)
jenkins-bot has submitted this change and it was merged.
Change subject: Review/ResponsibleEditors: Added missing I18N
..
Review/ResponsibleEditors: Added missing I18N
There were some keys missing that are used in Special:Log
Change-Id: Ibdfd7137578f46f0499a6ab11ed01458f90d8ce2
---
M ResponsibleEditors/i18n/de.json
M ResponsibleEditors/i18n/en.json
M ResponsibleEditors/i18n/qqq.json
M Review/i18n/de.json
M Review/i18n/en.json
M Review/i18n/qqq.json
6 files changed, 9 insertions(+), 3 deletions(-)
Approvals:
Robert Vogel: Looks good to me, approved
Siebrand: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/ResponsibleEditors/i18n/de.json b/ResponsibleEditors/i18n/de.json
index cffc11f..135c3c4 100644
--- a/ResponsibleEditors/i18n/de.json
+++ b/ResponsibleEditors/i18n/de.json
@@ -55,5 +55,6 @@
"bs-responsibleeditors-cbnamespacesemptytext": "Namensraum auswählen",
"bs-responsibleeditors-columneesponsibleeditornotset": "Nicht
zugewiesen.",
"log-name-bs-responsibleeditors": "Verantwortliche Redakteure-Logbuch",
- "log-description-bs-responsibleeditors": "Logbuch von Redakteuren die
für gewisse Seiten verantwortlich sind."
+ "log-description-bs-responsibleeditors": "Logbuch von Redakteuren die
für gewisse Seiten verantwortlich sind.",
+ "log-show-hide-bs-responsibleeditors": "Verantwortliche
Redakteure-Logbuch $1"
}
diff --git a/ResponsibleEditors/i18n/en.json b/ResponsibleEditors/i18n/en.json
index 9317807..b0ae9b4 100644
--- a/ResponsibleEditors/i18n/en.json
+++ b/ResponsibleEditors/i18n/en.json
@@ -53,5 +53,6 @@
"bs-responsibleeditors-cbnamespacesemptytext": "Select a namespace",
"bs-responsibleeditors-columneesponsibleeditornotset": "Not assigned",
"log-name-bs-responsibleeditors": "Responsible editors log",
- "log-description-bs-responsibleeditors": "This is a log of editors
responsible for pages."
+ "log-description-bs-responsibleeditors": "This is a log of editors
responsible for pages.",
+ "log-show-hide-bs-responsibleeditors": "$1 responsible editors log"
}
diff --git a/ResponsibleEditors/i18n/qqq.json b/ResponsibleEditors/i18n/qqq.json
index c4519ce..19bd5c8 100644
--- a/ResponsibleEditors/i18n/qqq.json
+++ b/ResponsibleEditors/i18n/qqq.json
@@ -59,5 +59,6 @@
"bs-responsibleeditors-cbnamespacesemptytext": "Placeholder for
\"Namespace\" selector.",
"bs-responsibleeditors-columneesponsibleeditornotset": "Text for not
assigned",
"log-name-bs-responsibleeditors": "Used in [[Special:Log]], label for
responsible editors log",
- "log-description-bs-responsibleeditors": "Used in [[Special:Log]], log
description for editors responsible for pages."
+ "log-description-bs-responsibleeditors": "Used in [[Special:Log]], log
description for editors responsible for pages.",
+ "log-show-hide-bs-responsibleeditors": "Used in [[Special:Log]].
Parameters:\n* $1 - link text; one of {{msg-mw|Show}} or
{{msg-mw|Hide}}\n{{Related|Log-show-hide}}"
}
diff --git a/Review/i18n/de.json b/Review/i18n/de.json
index 0dea3af..0de7977 100644
--- a/Review/i18n/de.json
+++ b/Review/i18n/de.json
@@ -55,6 +55,7 @@
"bs-review-finished-review": "$1 {{GENDER:$1|schloss}} die Begutachtung
für die Seite \"$2\" ab.",
"log-name-bs-review": "Begutachtung-Logbuch",
"log-description-bs-review": "Logbuch von Seiten, die Begutachtet
werden oder wurden.",
+ "log-show-hide-bs-review": "Begutachtung-Logbuch $1",
"bs-review-pref-checkowner": "Eine Begutachtung kann nur durch ihren
Besitzer verändert werden",
"bs-review-pref-shownameintooltip": "Namen der Beteiligten anzeigen",
"bs-review-pref-emailnotifyowner": "Bei Änderungen einer Begutachtung
den Besitzer benachrichtigen",
diff --git a/Review/i18n/en.json b/Review/i18n/en.json
index 50cea49..3dd6d6b 100644
--- a/Review/i18n/en.json
+++ b/Review/i18n/en.json
@@ -53,6 +53,7 @@
"bs-review-finished-review": "$1 {{GENDER:$1|finished}} a review to
page \"$2\".",
"log-name-bs-review": "Review log",
"log-description-bs-review": "This is a log of pages which are or were
under review.",
+ "log-show-hide-bs-review": "$1 review log",
"bs-review-pref-checkowner": "Only the owner of a review can change it",
"bs-review-pref-shownameintooltip": "Show names of the participants",
"bs-review-pref-emailnotifyowner": "Notify the owner of a review about
changes",
diff --git a/Review/i18n/qqq.json b/Review/i18n/qqq.json
index e79cc91..7b61f14 100644
--- a/Review/i18n/qqq.json
+++ b/Review/i18n/qqq.json
@@ -59,6 +59,7 @@
"bs-review-finished-review": "Log message that someone finished a
review on page.\n*$1 is the username of the user\n*$2 is the name of the page
as a link.",
"log-name-bs-review": "Used in [[Special:Log]], headline for review
[MediaWiki-commits] [Gerrit] build: Commit sync-gh-pages script - change (VisualEditor/VisualEditor)
Krinkle has uploaded a new change for review.
https://gerrit.wikimedia.org/r/205819
Change subject: build: Commit sync-gh-pages script
..
build: Commit sync-gh-pages script
Resolve SPOF on me for knowing how.
Change-Id: I3602d7ae5556dc3ac6f743a77aa69ce8e82f82da
---
A bin/sync-gh-pages.sh
1 file changed, 40 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/VisualEditor/VisualEditor
refs/changes/19/205819/1
diff --git a/bin/sync-gh-pages.sh b/bin/sync-gh-pages.sh
new file mode 100755
index 000..ca2e20d
--- /dev/null
+++ b/bin/sync-gh-pages.sh
@@ -0,0 +1,40 @@
+#!/bin/bash -eu
+
+# This script builds a new gh-pages branch from latest master
+
+cd "$(dirname $0)/.."
+git fetch origin
+git checkout -B gh-pages origin/master
+git reset --hard origin/master
+
+git clean -dffx
+npm install # runs "grunt build"
+
+html='
+
+VisualEditor
+
+
+
+ article {
+ margin: 1em auto;
+ width: 45em;
+ max-width: 80%;
+ text-align: center;
+ }
+ article img {
+ max-width: 100%;
+ }
+
+
+
+ Demo
+ Test
suite
+'
+echo "$html" > index.html
+
+git add index.html
+git add -f node_modules/qunitjs dist/
+
+git commit -m "Create gh-pages branch"
+git push origin -f HEAD
--
To view, visit https://gerrit.wikimedia.org/r/205819
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I3602d7ae5556dc3ac6f743a77aa69ce8e82f82da
Gerrit-PatchSet: 1
Gerrit-Project: VisualEditor/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Krinkle
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Move internal link regex to textlib - change (pywikibot/core)
John Vandenberg has uploaded a new change for review.
https://gerrit.wikimedia.org/r/205818
Change subject: Move internal link regex to textlib
..
Move internal link regex to textlib
Change-Id: If72ae65a708b31d54ffd9e08408d5692fd3e0982
---
M pywikibot/textlib.py
M scripts/cosmetic_changes.py
M scripts/disambredir.py
M scripts/fixing_redirects.py
M scripts/selflink.py
M scripts/solve_disambiguation.py
M scripts/unlink.py
7 files changed, 35 insertions(+), 58 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core
refs/changes/18/205818/1
diff --git a/pywikibot/textlib.py b/pywikibot/textlib.py
index 4c2da87..efb5c9b 100644
--- a/pywikibot/textlib.py
+++ b/pywikibot/textlib.py
@@ -36,6 +36,25 @@
TEMP_REGEX = re.compile(
r'{{(?:msg:)?(?P[^{\|]+?)(?:\|(?P[^{]+?(?:{[^{]+?}[^{]*?)?))?}}')
+# The regular expression which finds links. Results consist of five
+# groups:
+# 1. depends whether the links starts with a new line.
+# 2. is the target page title, everything before | or ].
+# 3. is the page section. It'll include the # to make life
+#easier for us.
+# 4. is the alternative link title between | and ].
+# 5. is the link trail after ]] which are part of the word.
+# Note: the definition of 'letter' varies from language to language.
+# Note: site.linktrail must be substituted into this regex, and flags=re.X
+# used to as it uses whitespace mode.
+INTERNAL_LINK_REGEX = r"""
+(?P[\n]*)
+\[\[ (?P [^\[\]\|#]*)
+ (?P \#[^\]\|]*)?
+ (\|(?P [^\]]*))?
+\]\] (?P%s)
+"""
+
NON_LATIN_DIGITS = {
'ckb': u'٠١٢٣٤٥٦٧٨٩',
'fa': u'۰۱۲۳۴۵۶۷۸۹',
diff --git a/scripts/cosmetic_changes.py b/scripts/cosmetic_changes.py
index bb99a30..d0dab20 100755
--- a/scripts/cosmetic_changes.py
+++ b/scripts/cosmetic_changes.py
@@ -441,7 +441,10 @@
# helper function which works on one link and either returns it
# unmodified, or returns a replacement.
def handleOneLink(match):
-titleWithSection = match.group('titleWithSection')
+titleWithSection = match.group('title')
+if match.group('section'):
+titleWithSection += match.group('section')
+
label = match.group('label')
trailingChars = match.group('linktrail')
newline = match.group('newline')
@@ -546,16 +549,7 @@
return match.group()
trailR = re.compile(self.site.linktrail())
-# The regular expression which finds links. Results consist of four groups:
-# group depends whether the links starts with a new line.
-# group is the page title and section, that is,
-# everything before | or ]. It'll include the # to make life easier for us.
-# group is the alternative link title between | and ].
-# group is the link trail after ]] which are part of the word.
-# note that the definition of 'letter' varies from language to language.
-linkR = re.compile(
-
r'(?P[\n]*)\[\[(?P[^\]\|]+)(\|(?P[^\]\|]*))?\]\](?P'
+
-self.site.linktrail() + ')')
+linkR = re.compile(textlib.INTERNAL_LINK % self.site.linktrail(), re.X)
text = textlib.replaceExcept(text, linkR, handleOneLink,
['comment', 'math', 'nowiki', 'pre',
diff --git a/scripts/disambredir.py b/scripts/disambredir.py
index fe5bd49..5eae272 100755
--- a/scripts/disambredir.py
+++ b/scripts/disambredir.py
@@ -20,8 +20,10 @@
__version__ = '$Id$'
#
import re
+
import pywikibot
-from pywikibot import i18n, pagegenerators
+
+from pywikibot import i18n, pagegenerators, textlib
from pywikibot.tools import first_lower, first_upper as firstcap
msg = {
@@ -45,9 +47,7 @@
# make a backup of the original text so we can show the changes later
mysite = pywikibot.Site()
linktrail = mysite.linktrail()
-linkR = re.compile(
-
r'\[\[(?P[^\]\|#]*)(?P#[^\]\|]*)?(\|(?P[^\]]*))?\]\](?P%s)'
-% linktrail)
+linkR = re.compile(textlib.INTERNAL_LINK_REGEX % linktrail, re.X)
curpos = 0
# This loop will run until we have finished the current page
while True:
diff --git a/scripts/fixing_redirects.py b/scripts/fixing_redirects.py
index ebfb555..1624a62 100755
--- a/scripts/fixing_redirects.py
+++ b/scripts/fixing_redirects.py
@@ -25,9 +25,10 @@
#
import re
import sys
+
import pywikibot
-from pywikibot import pagegenerators
-from pywikibot import i18n
+
+from pywikibot import i18n, pagegenerators, textlib
from pywikibot.tools import first_lower, first_upper as firstcap
# This is required for the text that is shown when you run this script
@@ -65,8 +66,7 @@
linktrail = mysite.linktrail()
# make a backup of the original text so we can show the changes later
-linkR = re.compile(r'\[\[(?P[^\]\|#]*)(?P#[^\]\|]*)?'
- r'(\|(?P[^\]]*))?\]\](?P' + linktrail
+ ')')
+linkR =
[MediaWiki-commits] [Gerrit] shinken: Make sure hosts are unique - change (operations/puppet)
Yuvipanda has submitted this change and it was merged.
Change subject: shinken: Make sure hosts are unique
..
shinken: Make sure hosts are unique
Temporary fix for T96817
Bug: T96817
Change-Id: Icc8d0b16922c2fceeaf0aa8d77cc03f1b1dcb8ef
---
M modules/shinken/files/shinkengen
1 file changed, 5 insertions(+), 0 deletions(-)
Approvals:
Yuvipanda: Verified; Looks good to me, approved
diff --git a/modules/shinken/files/shinkengen b/modules/shinken/files/shinkengen
index 8021746..c673069 100755
--- a/modules/shinken/files/shinkengen
+++ b/modules/shinken/files/shinkengen
@@ -89,6 +89,7 @@
ldap3.SEARCH_SCOPE_WHOLE_SUBTREE,
attributes=ldap3.ALL_ATTRIBUTES)
hosts = []
+hostnames = set() # Temp fix for T96817
for responseitem in self.conn.response:
hostinfo = responseitem['attributes']
ip = [a for a in hostinfo['aRecord'] if a.startswith('10.')][0]
@@ -96,6 +97,10 @@
var[0]: var[1]
for var in [pv.split("=") for pv in hostinfo['puppetVar']]
}
+if puppetvars['instancename'] in hostnames:
+continue
+else:
+hostnames.add(puppetvars['instancename'])
hosts.append({
'ec2id': hostinfo['dc'][0],
'ip': ip,
--
To view, visit https://gerrit.wikimedia.org/r/205817
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Icc8d0b16922c2fceeaf0aa8d77cc03f1b1dcb8ef
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Yuvipanda
Gerrit-Reviewer: Yuvipanda
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] shinken: Make sure hosts are unique - change (operations/puppet)
Yuvipanda has uploaded a new change for review.
https://gerrit.wikimedia.org/r/205817
Change subject: shinken: Make sure hosts are unique
..
shinken: Make sure hosts are unique
Temporary fix for T96817
Bug: T96817
Change-Id: Icc8d0b16922c2fceeaf0aa8d77cc03f1b1dcb8ef
---
M modules/shinken/files/shinkengen
1 file changed, 5 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/17/205817/1
diff --git a/modules/shinken/files/shinkengen b/modules/shinken/files/shinkengen
index 8021746..c673069 100755
--- a/modules/shinken/files/shinkengen
+++ b/modules/shinken/files/shinkengen
@@ -89,6 +89,7 @@
ldap3.SEARCH_SCOPE_WHOLE_SUBTREE,
attributes=ldap3.ALL_ATTRIBUTES)
hosts = []
+hostnames = set() # Temp fix for T96817
for responseitem in self.conn.response:
hostinfo = responseitem['attributes']
ip = [a for a in hostinfo['aRecord'] if a.startswith('10.')][0]
@@ -96,6 +97,10 @@
var[0]: var[1]
for var in [pv.split("=") for pv in hostinfo['puppetVar']]
}
+if puppetvars['instancename'] in hostnames:
+continue
+else:
+hostnames.add(puppetvars['instancename'])
hosts.append({
'ec2id': hostinfo['dc'][0],
'ip': ip,
--
To view, visit https://gerrit.wikimedia.org/r/205817
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Icc8d0b16922c2fceeaf0aa8d77cc03f1b1dcb8ef
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Yuvipanda
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Move BeforePageDisplay hook to separate class - change (mediawiki...XAnalytics)
jenkins-bot has submitted this change and it was merged.
Change subject: Move BeforePageDisplay hook to separate class
..
Move BeforePageDisplay hook to separate class
Bug: T92875
Change-Id: Iddbf2f330b753ca721f9964ccd15e550d2b4a501
---
A XAnalytics.class.php
M XAnalytics.php
2 files changed, 34 insertions(+), 26 deletions(-)
Approvals:
Ori.livneh: Looks good to me, approved
jenkins-bot: Verified
diff --git a/XAnalytics.class.php b/XAnalytics.class.php
new file mode 100644
index 000..46df7cb
--- /dev/null
+++ b/XAnalytics.class.php
@@ -0,0 +1,29 @@
+https://wikitech.wikimedia.org/wiki/X-Analytics
+*/
+ public static function onBeforePageDisplay( OutputPage &$out, Skin
&$skin ) {
+ $response = $out->getRequest()->response();
+ $currentHeader = $response->getHeader( 'X-Analytics' );
+ parse_str( preg_replace( '/; */', '&', $currentHeader ),
$headerItems );
+ Hooks::run( 'XAnalyticsSetHeader', array( $out, &$headerItems )
);
+
+ if ( count( $headerItems ) ) {
+ $headerValue = http_build_query( $headerItems, null,
';' );
+ $response->header( 'X-Analytics: ' . $headerValue, true
);
+ }
+ }
+}
diff --git a/XAnalytics.php b/XAnalytics.php
index 1856335..73c769d 100644
--- a/XAnalytics.php
+++ b/XAnalytics.php
@@ -21,31 +21,10 @@
$wgMessagesDirs['XAnalytics'] = __DIR__ . '/i18n';
+// Autoload
+
+$wgAutoloadClasses['XAnalytics'] = __DIR__ . '/XAnalytics.class.php';
+
// Hooks
-/**
- * Set X-Analytics header before the output buffer is flushed.
- *
- * The PHP output buffer is flushed from multiple places in the MediaWiki
- * codebase (and the codebase of MediaWiki extensions), making it difficult to
- * ensure that the header is reliably injected into every response generated by
- * MediaWiki. This should be fixed. The output buffer of normal page view
- * responses is done in one place, however, so for that use-case, the code is
- * reliable.
- *
- * X-Analytics items can be declared by adding items to the configuration
- * variable $wgXAnalyticsHeaderItems.
- *
- * @see https://wikitech.wikimedia.org/wiki/X-Analytics
- */
-$wgHooks['BeforePageDisplay'][] = function ( OutputPage &$out, Skin &$skin ) {
- $response = $out->getRequest()->response();
- $currentHeader = $response->getHeader( 'X-Analytics' );
- parse_str( preg_replace( '/; */', '&', $currentHeader ), $headerItems );
- wfRunHooks( 'XAnalyticsSetHeader', array( $out, &$headerItems ) );
-
- if ( count( $headerItems ) ) {
- $headerValue = http_build_query( $headerItems, null, ';' );
- $response->header( 'X-Analytics: ' . $headerValue, true );
- }
-};
+$wgHooks['BeforePageDisplay'][] = 'XAnalytics::onBeforePageDisplay';
--
To view, visit https://gerrit.wikimedia.org/r/202799
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iddbf2f330b753ca721f9964ccd15e550d2b4a501
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/XAnalytics
Gerrit-Branch: master
Gerrit-Owner: Legoktm
Gerrit-Reviewer: Ori.livneh
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Set workflow_page_id when creating a workflow - change (mediawiki...Flow)
jenkins-bot has submitted this change and it was merged.
Change subject: Set workflow_page_id when creating a workflow
..
Set workflow_page_id when creating a workflow
Bug: T95280
Bug: T94649
Change-Id: If4d8284ace3d28e82cc2326a8d96355325cb5650
---
M container.php
M includes/Content/BoardContent.php
M includes/Content/BoardContentHandler.php
M includes/Data/Listener/OccupationListener.php
M includes/Formatter/TopicFormatter.php
M includes/Model/Workflow.php
M includes/SubmissionHandler.php
M includes/TalkpageManager.php
M includes/View.php
M tests/phpunit/HookTest.php
M tests/phpunit/Import/LiquidThreadsApi/ConversionStrategyTest.php
M tests/phpunit/api/ApiFlowModerateTopicTest.php
M tests/phpunit/api/ApiTestCase.php
13 files changed, 125 insertions(+), 39 deletions(-)
Approvals:
Mattflaschen: Looks good to me, approved
jenkins-bot: Verified
diff --git a/container.php b/container.php
index 9336bee..5077e4e 100644
--- a/container.php
+++ b/container.php
@@ -776,7 +776,7 @@
$wgFlowDefaultWorkflow
);
};
-// Initialized in FlowHooks to faciliate only loading the flow container
+// Initialized in FlowHooks to facilitate only loading the flow container
// when flow is specifically requested to run. Extension initialization
// must always happen before calling flow code.
$c['occupation_controller'] = FlowHooks::getOccupationController();
diff --git a/includes/Content/BoardContent.php
b/includes/Content/BoardContent.php
index 7d72b60..ca4b76e 100644
--- a/includes/Content/BoardContent.php
+++ b/includes/Content/BoardContent.php
@@ -33,10 +33,7 @@
throw new MWException( "Invalid argument for 'workflow'
parameter." );
}
- if (
- $workflow instanceof UUID ||
- ( $workflow instanceof Workflow && !$workflow->isNew() )
- ) {
+ if ( $workflow instanceof UUID || $workflow instanceof Workflow
) {
$this->workflow = $workflow;
}
}
@@ -82,7 +79,7 @@
* @return string The summary text.
*/
public function getTextForSummary( $maxLength = 250 ) {
- return '[Flow board ' .
$this->getWorkflowId()->getAlphaDecimal() . ']';
+ return '[Flow board ' .
$this->getWorkflowId()->getAlphadecimal() . ']';
}
/**
@@ -191,10 +188,7 @@
Container::get( 'flow_actions' )
);
- // Load workflow and run View.
- /** @var WorkflowLoaderFactory $factory */
- $factory = Container::get('factory.loader.workflow');
- $loader = $factory->createWorkflowLoader( $title,
$this->getWorkflowId() );
+ $loader = $this->getWorkflowLoader( $title );
$view->show( $loader, 'view' );
// Extract data from derivative context
@@ -211,6 +205,26 @@
return $parserOutput;
}
+ /**
+* @param Title $title
+* @return \Flow\WorkflowLoader
+* @throws MWException
+* @throws \Flow\Exception\CrossWikiException
+* @throws \Flow\Exception\InvalidInputException
+*/
+ protected function getWorkflowLoader( Title $title ) {
+ if ( $this->workflow instanceof Workflow &&
$this->workflow->isNew() ) {
+ // as long as workflow is new, we shouldn't rely on its
id
+ $workflowId = null;
+ } else {
+ $workflowId = $this->getWorkflowId();
+ }
+
+ /** @var WorkflowLoaderFactory $factory */
+ $factory = Container::get( 'factory.loader.workflow' );
+ return $factory->createWorkflowLoader( $title, $workflowId );
+ }
+
public function getWorkflowId() {
if ( $this->workflow instanceof UUID ) {
return $this->workflow;
diff --git a/includes/Content/BoardContentHandler.php
b/includes/Content/BoardContentHandler.php
index 1f15942..d6375a7 100644
--- a/includes/Content/BoardContentHandler.php
+++ b/includes/Content/BoardContentHandler.php
@@ -102,8 +102,7 @@
public function canBeUsedOn( \Title $title ) {
/** @var \Flow\TalkpageManager $manager */
$manager = Container::get( 'occupation_controller' );
- return $manager->canBeUsedOn( $title )
- || $manager->isTalkpageOccupied( $title );
+ return $manager->canBeUsedOn( $title );
}
/**
@@ -140,7 +139,7 @@
}
}
- // Flow has its own handlling for action=edit
+ // Flow has its own handling for action=edit
$output['edit'] = 'Fl
[MediaWiki-commits] [Gerrit] Fix abstract method error from JobTest - change (mediawiki/core)
BryanDavis has uploaded a new change for review.
https://gerrit.wikimedia.org/r/205816
Change subject: Fix abstract method error from JobTest
..
Fix abstract method error from JobTest
Explicitly stub the Job::run() abstract method.
Bug: T95864
Change-Id: I1f43b40b6f89a729e818a0095ccbdda1dbe555ee
---
M tests/phpunit/includes/jobqueue/JobTest.php
1 file changed, 3 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/16/205816/1
diff --git a/tests/phpunit/includes/jobqueue/JobTest.php
b/tests/phpunit/includes/jobqueue/JobTest.php
index 93069d2..1740e1b 100644
--- a/tests/phpunit/includes/jobqueue/JobTest.php
+++ b/tests/phpunit/includes/jobqueue/JobTest.php
@@ -61,6 +61,9 @@
array( 'someCommand', new Title(), $params ),
'SomeJob'
);
+ $mock->expects($this->any())
+ ->method('run')
+ ->will($this->returnValue(true));
return $mock;
}
--
To view, visit https://gerrit.wikimedia.org/r/205816
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I1f43b40b6f89a729e818a0095ccbdda1dbe555ee
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: BryanDavis
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] [roundtrip-test] Improvements to findMatchingNodes code - change (mediawiki...parsoid)
Subramanya Sastry has uploaded a new change for review.
https://gerrit.wikimedia.org/r/205815
Change subject: [roundtrip-test] Improvements to findMatchingNodes code
..
[roundtrip-test] Improvements to findMatchingNodes code
Fix #1
--
Don't walk DOM subtrees generated by templates / extensions.
All DSR computation there would be bogus anyway. If the node's
DSR overlaps the target range, then the subtree's root should be
considered a matching node.
This fix improves the fidelity of semantic error classification
on this test: "node roundtrip-test.js --prefix kowiki 홍콩_지하철"
if you comment out the HTML normalization fix from 9851f3c
Fix #2
--
For zero-length target ranges, return the smallest node that contains
the start(=end) range DSR value instead of returning an empty subtree.
With this test: "node roundtrip-test.js --prefix nlwiki Watergang"
the semantic diff context is more accurate than before. This sets the
stage for eliminating false positive reports from Bug T89629.
Change-Id: I4374882a33a447ee4b5c1e949d3477b05ab07455
---
M tests/roundtrip-test.js
1 file changed, 51 insertions(+), 20 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/parsoid
refs/changes/15/205815/1
diff --git a/tests/roundtrip-test.js b/tests/roundtrip-test.js
index b14ee8a..f849ace 100755
--- a/tests/roundtrip-test.js
+++ b/tests/roundtrip-test.js
@@ -156,6 +156,7 @@
};
var findMatchingNodes = function(root, targetRange, sourceLen) {
+ var isZeroLength = (targetRange.start === targetRange.end);
var currentOffset = null;
var wasWaiting = false;
var waitingForEndMatch = false;
@@ -163,14 +164,28 @@
function walkDOM(element) {
var elements = [];
var precedingNodes = [];
- var attribs = DU.getJSONAttribute(element, 'data-parsoid');
+ var dp = DU.getDataParsoid(element);
- if (attribs.dsr && attribs.dsr.length) {
- var start = attribs.dsr[0] || 0;
- var end = attribs.dsr[1] || sourceLen - 1;
+ // NOTE: We are not using Util.isValidDSR(dp.dsr)
+ // since we want to use partially valid info as well.
+ //
+ // SSS FIXME: Is this an issue anymore now??
+ if (dp.dsr && dp.dsr.length) {
+ var start = dp.dsr[0] || 0;
+ var end = dp.dsr[1] || sourceLen - 1;
- if ((targetRange.end - 1) < start || targetRange.start
> (end - 1)) {
- return null;
+ // For zero-length ranges, find the smallest node
+ // that includes the start/end value. So, use a less
+ // restrictive check to decide if this subtree can be
+ // skipped or not.
+ if (isZeroLength) {
+ if (targetRange.start > end || targetRange.end
< start) {
+ return null;
+ }
+ } else {
+ if (targetRange.start >= end || targetRange.end
<= start) {
+ return null;
+ }
}
if (waitingForEndMatch) {
@@ -180,22 +195,40 @@
return { done: true, nodes: [element] };
}
- if (attribs.dsr[0] !== null && targetRange.start ===
start &&
- end === targetRange.end) {
+ if (dp.dsr[0] !== null &&
+ targetRange.start === start &&
+ end === targetRange.end) {
return { done: true, nodes: [element] };
} else if (targetRange.start === start) {
waitingForEndMatch = true;
if (end < targetRange.end) {
- // No need to walk children
+ // No need to examine children since
+ // the subtree range is smaller than
+ // what we want.
return { done: false, nodes: [element]
};
}
- } else if (start > targetRange.start && end <
targetRange.end) {
- // No need to walk children
+ } else if (start >= targetRange.start && end <=
targetRange.end) {
+ // No need to examine children since
+ // the subtree range is smaller than
+ // wha
[MediaWiki-commits] [Gerrit] Introduce and use tools.first_lower() and tools.first_upper() - change (pywikibot/core)
jenkins-bot has submitted this change and it was merged.
Change subject: Introduce and use tools.first_lower() and tools.first_upper()
..
Introduce and use tools.first_lower() and tools.first_upper()
Standardize two simple functions that have been
scattered over several scripts for a while.
Change-Id: Iddfe30fcbca2334399841bd15a878db4b37def59
---
M pwb.py
M pywikibot/date.py
M pywikibot/page.py
M pywikibot/site.py
M pywikibot/tools/__init__.py
M scripts/casechecker.py
M scripts/cosmetic_changes.py
M scripts/disambredir.py
M scripts/fixing_redirects.py
M scripts/interwiki.py
M scripts/solve_disambiguation.py
M tests/pwb/print_env.py
12 files changed, 54 insertions(+), 48 deletions(-)
Approvals:
John Vandenberg: Looks good to me, approved
jenkins-bot: Verified
diff --git a/pwb.py b/pwb.py
index b1bb52c..b15b927 100644
--- a/pwb.py
+++ b/pwb.py
@@ -100,6 +100,7 @@
path = os.path.abspath(path)
if path[0] != '/':
# normalise Windows drive letter
+# TODO: use pywikibot.tools.first_upper
path = path[0].upper() + path[1:]
return path
diff --git a/pywikibot/date.py b/pywikibot/date.py
index 976edef..75fdc9d 100644
--- a/pywikibot/date.py
+++ b/pywikibot/date.py
@@ -20,6 +20,8 @@
import re
import sys
+from pywikibot.tools import first_lower, first_upper
+
if sys.version_info[0] > 2:
unicode = str
basestring = (str,)
@@ -1982,9 +1984,9 @@
if makeUpperCase is None:
f = lambda s: s
elif makeUpperCase:
-f = lambda s: s[0].upper() + s[1:]
+f = first_upper
else:
-f = lambda s: s[0].lower() + s[1:]
+f = first_lower
return [pattern % f(monthName(lang, m)) for m in range(1, 13)]
#
@@ -2337,9 +2339,9 @@
if ignoreFirstLetterCase:
try:
if title[0].isupper():
-title = title[0].lower() + title[1:]
+title = first_lower(title)
else:
-title = title[0].upper() + title[1:]
+title = first_upper(title)
return getAutoFormat(lang, title, ignoreFirstLetterCase=False)
except:
pass
diff --git a/pywikibot/page.py b/pywikibot/page.py
index a2eb04c..e089fc2 100644
--- a/pywikibot/page.py
+++ b/pywikibot/page.py
@@ -51,7 +51,7 @@
from pywikibot.tools import (
UnicodeMixin, DotReadableDict,
ComparableMixin, deprecated, deprecate_arg, deprecated_args,
-remove_last_args, _NotImplementedWarning,
+first_upper, remove_last_args, _NotImplementedWarning,
OrderedDict, Counter,
)
from pywikibot.tools.ip import ip_regexp # noqa & deprecated
@@ -784,20 +784,19 @@
regex = re.compile('\(\((.+?)\)\)')
content = disambigpages.get()
for index in regex.findall(content):
-indexes.add(index[:1].upper() + index[1:])
+indexes.add(first_upper(index))
self.site._indextemplates = indexes
else:
message = self.site.mediawiki_message(
'disambiguationspage').split(':', 1)[1]
# add the default template(s) for default mw message
# only
-disambigs = set([message[:1].upper() +
- message[1:]]) | default
+disambigs = set([first_upper(message)]) | default
self.site._disambigtemplates = disambigs
else:
# Normalize template capitalization
self.site._disambigtemplates = set(
-t[:1].upper() + t[1:] for t in distl
+first_upper(t) for t in distl
)
templates = set(tl.title(withNamespace=False)
for tl in self.templates())
@@ -4575,7 +4574,7 @@
"title")
if self._site.namespaces[self._namespace].case == 'first-letter':
-t = t[:1].upper() + t[1:]
+t = first_upper(t)
self._title = t
diff --git a/pywikibot/site.py b/pywikibot/site.py
index 5848169..b9fe830 100644
--- a/pywikibot/site.py
+++ b/pywikibot/site.py
@@ -34,7 +34,7 @@
from pywikibot.tools import (
itergroup, UnicodeMixin, ComparableMixin, SelfCallDict, SelfCallString,
deprecated, deprecate_arg, deprecated_args, remove_last_args,
-redirect_func, manage_wrapping, MediaWikiVersion, normalize_username,
+redirect_func, manage_wrapping, MediaWikiVersion, first_upper,
normalize_username,
)
from pywikibot.tools.ip import is_IP
from pywikibot.throttle import Throttle
@@ -681,7 +681,7 @@
"""Return list of language codes that can be used in interwiki
links."""
nsnames = [name for name in self.namespaces().values()]
return [lang for lang in self.languages()
-
[MediaWiki-commits] [Gerrit] tools: Set 30d expiry for all things from tools-static cdn - change (operations/puppet)
Yuvipanda has submitted this change and it was merged.
Change subject: tools: Set 30d expiry for all things from tools-static cdn
..
tools: Set 30d expiry for all things from tools-static cdn
Bug: T96799
Change-Id: I8b23ea2df79cd87b9d9abf58b5137df06dd92987
---
M modules/toollabs/templates/static-server.conf.erb
1 file changed, 1 insertion(+), 0 deletions(-)
Approvals:
Yuvipanda: Verified; Looks good to me, approved
diff --git a/modules/toollabs/templates/static-server.conf.erb
b/modules/toollabs/templates/static-server.conf.erb
index 8178859..26cd3fd 100644
--- a/modules/toollabs/templates/static-server.conf.erb
+++ b/modules/toollabs/templates/static-server.conf.erb
@@ -58,6 +58,7 @@
location ^~ /cdnjs/ {
autoindex on;
add_header Access-Control-Allow-Origin '*';
+expires 30d; # These are all immutable URLs
root /srv/; # Is ok, nginx ensures that this is /cdnjs/* only
}
--
To view, visit https://gerrit.wikimedia.org/r/205814
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I8b23ea2df79cd87b9d9abf58b5137df06dd92987
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Yuvipanda
Gerrit-Reviewer: Yuvipanda
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] tools: Set 30d expiry for all things from tools-static cdn - change (operations/puppet)
Yuvipanda has uploaded a new change for review.
https://gerrit.wikimedia.org/r/205814
Change subject: tools: Set 30d expiry for all things from tools-static cdn
..
tools: Set 30d expiry for all things from tools-static cdn
Bug: T96799
Change-Id: I8b23ea2df79cd87b9d9abf58b5137df06dd92987
---
M modules/toollabs/templates/static-server.conf.erb
1 file changed, 1 insertion(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/14/205814/1
diff --git a/modules/toollabs/templates/static-server.conf.erb
b/modules/toollabs/templates/static-server.conf.erb
index 8178859..26cd3fd 100644
--- a/modules/toollabs/templates/static-server.conf.erb
+++ b/modules/toollabs/templates/static-server.conf.erb
@@ -58,6 +58,7 @@
location ^~ /cdnjs/ {
autoindex on;
add_header Access-Control-Allow-Origin '*';
+expires 30d; # These are all immutable URLs
root /srv/; # Is ok, nginx ensures that this is /cdnjs/* only
}
--
To view, visit https://gerrit.wikimedia.org/r/205814
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I8b23ea2df79cd87b9d9abf58b5137df06dd92987
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Yuvipanda
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] tools: Fix nginx order matching for cdnjs - change (operations/puppet)
Yuvipanda has submitted this change and it was merged.
Change subject: tools: Fix nginx order matching for cdnjs
..
tools: Fix nginx order matching for cdnjs
Bug: T96799
Change-Id: Id0009c39e431b4ac62640bdbc34171f169ebd952
---
M modules/toollabs/templates/static-server.conf.erb
1 file changed, 3 insertions(+), 3 deletions(-)
Approvals:
Yuvipanda: Verified; Looks good to me, approved
diff --git a/modules/toollabs/templates/static-server.conf.erb
b/modules/toollabs/templates/static-server.conf.erb
index 47b6120..8178859 100644
--- a/modules/toollabs/templates/static-server.conf.erb
+++ b/modules/toollabs/templates/static-server.conf.erb
@@ -51,14 +51,14 @@
# Default to utf-8 charset
charset utf-8;
-location /$ {
+location = / {
return 302 "https://tools.wmflabs.org";;
}
-location /cdnjs/ {
+location ^~ /cdnjs/ {
autoindex on;
add_header Access-Control-Allow-Origin '*';
-root /srv/cdnjs;
+root /srv/; # Is ok, nginx ensures that this is /cdnjs/* only
}
location ~ ^/([^/]+)(/.*)?$ {
--
To view, visit https://gerrit.wikimedia.org/r/205813
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Id0009c39e431b4ac62640bdbc34171f169ebd952
Gerrit-PatchSet: 4
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Yuvipanda
Gerrit-Reviewer: Yuvipanda
Gerrit-Reviewer: coren
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] tools: Fix nginx order matching for cdnjs - change (operations/puppet)
Yuvipanda has uploaded a new change for review.
https://gerrit.wikimedia.org/r/205813
Change subject: tools: Fix nginx order matching for cdnjs
..
tools: Fix nginx order matching for cdnjs
Bug: T96799
Change-Id: Id0009c39e431b4ac62640bdbc34171f169ebd952
---
M modules/toollabs/templates/static-server.conf.erb
1 file changed, 3 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/13/205813/1
diff --git a/modules/toollabs/templates/static-server.conf.erb
b/modules/toollabs/templates/static-server.conf.erb
index 47b6120..573ba72 100644
--- a/modules/toollabs/templates/static-server.conf.erb
+++ b/modules/toollabs/templates/static-server.conf.erb
@@ -51,11 +51,12 @@
# Default to utf-8 charset
charset utf-8;
-location /$ {
+location = / {
return 302 "https://tools.wmflabs.org";;
}
-location /cdnjs/ {
+location ^~ /cdnjs/ {
+rewrite ^/cdnjs/(.*)?$ /$1 break;
autoindex on;
add_header Access-Control-Allow-Origin '*';
root /srv/cdnjs;
--
To view, visit https://gerrit.wikimedia.org/r/205813
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Id0009c39e431b4ac62640bdbc34171f169ebd952
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Yuvipanda
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Increment a counter on fatals - change (operations/mediawiki-config)
jenkins-bot has submitted this change and it was merged. Change subject: Increment a counter on fatals .. Increment a counter on fatals Change-Id: I528e5384c716ca2bef88f028511e4e51be982f2e --- M hhvm-fatal-error.php 1 file changed, 6 insertions(+), 0 deletions(-) Approvals: Ori.livneh: Looks good to me, approved jenkins-bot: Verified diff --git a/hhvm-fatal-error.php b/hhvm-fatal-error.php index 8544d6b..c2be802 100644 --- a/hhvm-fatal-error.php +++ b/hhvm-fatal-error.php @@ -822,6 +822,12 @@ $parts = explode( "\n", $message ); $message = $parts[0]; $message = preg_replace( "/^.*?exception '.*?' with message '(.*?)'.*$/im", '\1', $message ); + + // Increment a counter. + $sock = socket_create( AF_INET, SOCK_DGRAM, SOL_UDP ); + $stat = 'MediaWiki.errors.fatal:1|c'; + socket_sendto( $sock, $stat, strlen( $stat ), 0, 'statsd.eqiad.wmnet', 8125 ); + ?>: -- To view, visit https://gerrit.wikimedia.org/r/205812 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I528e5384c716ca2bef88f028511e4e51be982f2e Gerrit-PatchSet: 2 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Ori.livneh Gerrit-Reviewer: Ori.livneh Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Increment a counter on fatals - change (operations/mediawiki-config)
Ori.livneh has uploaded a new change for review. https://gerrit.wikimedia.org/r/205812 Change subject: Increment a counter on fatals .. Increment a counter on fatals Change-Id: I528e5384c716ca2bef88f028511e4e51be982f2e --- M hhvm-fatal-error.php 1 file changed, 6 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/12/205812/1 diff --git a/hhvm-fatal-error.php b/hhvm-fatal-error.php index 8544d6b..c2be802 100644 --- a/hhvm-fatal-error.php +++ b/hhvm-fatal-error.php @@ -822,6 +822,12 @@ $parts = explode( "\n", $message ); $message = $parts[0]; $message = preg_replace( "/^.*?exception '.*?' with message '(.*?)'.*$/im", '\1', $message ); + + // Increment a counter. + $sock = socket_create( AF_INET, SOCK_DGRAM, SOL_UDP ); + $stat = 'MediaWiki.errors.fatal:1|c'; + socket_sendto( $sock, $stat, strlen( $stat ), 0, 'statsd.eqiad.wmnet', 8125 ); + ?>: -- To view, visit https://gerrit.wikimedia.org/r/205812 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I528e5384c716ca2bef88f028511e4e51be982f2e Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Ori.livneh ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Set services to start on boot - change (mediawiki/vagrant)
BryanDavis has uploaded a new change for review.
https://gerrit.wikimedia.org/r/205811
Change subject: Set services to start on boot
..
Set services to start on boot
Setting `enable => true` for a Puppet service resource tells Puppet to
configure the service to start automatically on boot. This is necessary
because `ensure => 'running'` will only take effect during a Puppet run
which is not an automatic or periodic function in MediaWiki-Vagrant.
Bug: T96231
Change-Id: Ib0e8843d4fe586c83d89f0929f7c803787551372
---
M puppet/modules/activemq/manifests/init.pp
M puppet/modules/graphoid/manifests/init.pp
M puppet/modules/hhvm/manifests/init.pp
M puppet/modules/mathoid/manifests/init.pp
M puppet/modules/mediawiki/manifests/jobrunner.pp
M puppet/modules/mediawiki/manifests/parsoid.pp
M puppet/modules/mysql/manifests/init.pp
M puppet/modules/phabricator/manifests/init.pp
M puppet/modules/role/manifests/fundraising.pp
M puppet/modules/role/manifests/poolcounter.pp
M puppet/modules/rsyslog/manifests/init.pp
M puppet/modules/sentry/manifests/init.pp
M puppet/modules/smtplog/manifests/init.pp
M puppet/modules/xvfb/manifests/init.pp
14 files changed, 14 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant
refs/changes/11/205811/1
diff --git a/puppet/modules/activemq/manifests/init.pp
b/puppet/modules/activemq/manifests/init.pp
index 8e9d92a..d6df86f 100644
--- a/puppet/modules/activemq/manifests/init.pp
+++ b/puppet/modules/activemq/manifests/init.pp
@@ -49,6 +49,7 @@
}
service { 'activemq':
+enable=> true,
ensure=> running,
provider => 'upstart',
require => [
diff --git a/puppet/modules/graphoid/manifests/init.pp
b/puppet/modules/graphoid/manifests/init.pp
index 0b279a1..4bc801a 100644
--- a/puppet/modules/graphoid/manifests/init.pp
+++ b/puppet/modules/graphoid/manifests/init.pp
@@ -52,6 +52,7 @@
}
service { 'graphoid':
+enable => true,
ensure => running,
hasstatus => true,
hasrestart => true,
diff --git a/puppet/modules/hhvm/manifests/init.pp
b/puppet/modules/hhvm/manifests/init.pp
index a70bfd4..e2d8ace 100644
--- a/puppet/modules/hhvm/manifests/init.pp
+++ b/puppet/modules/hhvm/manifests/init.pp
@@ -135,6 +135,7 @@
}
service { 'hhvm':
+enable => true,
ensure => running,
provider => upstart,
require => File['/etc/init/hhvm.conf'],
diff --git a/puppet/modules/mathoid/manifests/init.pp
b/puppet/modules/mathoid/manifests/init.pp
index 35c544e..c15184b 100644
--- a/puppet/modules/mathoid/manifests/init.pp
+++ b/puppet/modules/mathoid/manifests/init.pp
@@ -52,6 +52,7 @@
}
service { 'mathoid':
+enable => true,
ensure => running,
hasstatus => true,
hasrestart => true,
diff --git a/puppet/modules/mediawiki/manifests/jobrunner.pp
b/puppet/modules/mediawiki/manifests/jobrunner.pp
index 86bfe55..36918a8 100644
--- a/puppet/modules/mediawiki/manifests/jobrunner.pp
+++ b/puppet/modules/mediawiki/manifests/jobrunner.pp
@@ -54,6 +54,7 @@
}
service { 'jobrunner':
+enable => true,
ensure => 'running',
provider => 'upstart',
require => Mediawiki::Wiki[$::mediawiki::wiki_name],
diff --git a/puppet/modules/mediawiki/manifests/parsoid.pp
b/puppet/modules/mediawiki/manifests/parsoid.pp
index e35fdad..6a491ca 100644
--- a/puppet/modules/mediawiki/manifests/parsoid.pp
+++ b/puppet/modules/mediawiki/manifests/parsoid.pp
@@ -67,6 +67,7 @@
}
service { 'parsoid':
+enable=> true,
ensure=> running,
provider => 'upstart',
subscribe => File['localsettings.js', '/etc/init/parsoid.conf'],
diff --git a/puppet/modules/mysql/manifests/init.pp
b/puppet/modules/mysql/manifests/init.pp
index bf410d2..d015b97 100644
--- a/puppet/modules/mysql/manifests/init.pp
+++ b/puppet/modules/mysql/manifests/init.pp
@@ -26,6 +26,7 @@
include ::mysql::packages
service { 'mysql':
+enable => true,
ensure => running,
hasrestart => true,
require=> Package['mysql-server'],
diff --git a/puppet/modules/phabricator/manifests/init.pp
b/puppet/modules/phabricator/manifests/init.pp
index 32e1e86..1780106 100644
--- a/puppet/modules/phabricator/manifests/init.pp
+++ b/puppet/modules/phabricator/manifests/init.pp
@@ -79,6 +79,7 @@
$phd = "${deploy_dir}/phabricator/bin/phd"
service { 'phd':
+enable => true,
ensure => running,
provider => base,
binary => $phd,
diff --git a/puppet/modules/role/manifests/fundraising.pp
b/puppet/modules/role/manifests/fundraising.pp
index 80ae5e7..06441e0 100644
--- a/puppet/modules/role/manifests/fundraising.pp
+++ b/puppet/modules/role/manifests/fundraising.pp
@@ -13,6 +13,7 @@
$rsyslog_
[MediaWiki-commits] [Gerrit] Ensure hhvm is fully provisioned before starting jobrunner - change (mediawiki/vagrant)
jenkins-bot has submitted this change and it was merged.
Change subject: Ensure hhvm is fully provisioned before starting jobrunner
..
Ensure hhvm is fully provisioned before starting jobrunner
Bug: T96232
Change-Id: I2343fcb675a67ab98331b42eeabd359a60746beb
---
M puppet/modules/mediawiki/manifests/jobrunner.pp
1 file changed, 1 insertion(+), 2 deletions(-)
Approvals:
Mattflaschen: Looks good to me, approved
jenkins-bot: Verified
diff --git a/puppet/modules/mediawiki/manifests/jobrunner.pp
b/puppet/modules/mediawiki/manifests/jobrunner.pp
index be7b858..86bfe55 100644
--- a/puppet/modules/mediawiki/manifests/jobrunner.pp
+++ b/puppet/modules/mediawiki/manifests/jobrunner.pp
@@ -11,8 +11,7 @@
class mediawiki::jobrunner(
$dir,
) {
-include ::mediawiki
-require ::mediawiki::multiwiki
+require ::mediawiki
git::clone { 'mediawiki/services/jobrunner':
directory => $dir,
--
To view, visit https://gerrit.wikimedia.org/r/204466
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I2343fcb675a67ab98331b42eeabd359a60746beb
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: BryanDavis
Gerrit-Reviewer: Mattflaschen
Gerrit-Reviewer: Ori.livneh
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Initialize phd directory - change (operations/puppet)
Negative24 has uploaded a new change for review.
https://gerrit.wikimedia.org/r/205810
Change subject: Initialize phd directory
..
Initialize phd directory
This directory is needed for the phd service to work and isn't
initialized in new installations.
Bug: T96567
Change-Id: I5ecbeb3a72f72303a2ee64da92e3267aaafd4221
---
M modules/phabricator/manifests/init.pp
1 file changed, 4 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/10/205810/1
diff --git a/modules/phabricator/manifests/init.pp
b/modules/phabricator/manifests/init.pp
index aeea0a1..7be4158 100644
--- a/modules/phabricator/manifests/init.pp
+++ b/modules/phabricator/manifests/init.pp
@@ -168,6 +168,10 @@
before=> File["${phabdir}/phabricator/.git/config"],
}
+file { "/var/run/phd":
+ensure => directory,
+}
+
file { "${phabdir}/phabricator/.git/config":
source => 'puppet:///modules/phabricator/phabricator.gitconfig',
before => File["${phabdir}/phabricator/scripts/"],
--
To view, visit https://gerrit.wikimedia.org/r/205810
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I5ecbeb3a72f72303a2ee64da92e3267aaafd4221
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Negative24
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix for article centric strings not using article lang local... - change (apps...wikipedia)
Mhurd has uploaded a new change for review.
https://gerrit.wikimedia.org/r/205809
Change subject: Fix for article centric strings not using article lang
localizations.
..
Fix for article centric strings not using article lang localizations.
Native element localization is based on the device's lang.
However, there are certain localization strings which appear in the
context of an article. These should always use the article lang not
the device lang.
Among these strings:
-"Contents" at the top of the table of contents.
-"Page issues" and "Similar pages" buttons at top of articles.
-"Quick facts" and "Other information" collapsed table headers.
-"Close" collapsed table footer.
-"Read more", "Edited by...", "Other langs..." and licence article
footer text.
This patch uses the current article's language when retrieving
these localized strings.
Reproduction steps: from "Read in other languages" at the bottom
of an enwiki article, pick Chinese. When it loads, you'll
see the strings listed above all appear in English. Since all
of these strings are within the context of the article, they
should all share the article language.
Change-Id: Ifdfdd6d0481ba18cf8a6658cb243939994b87577
---
M Wikipedia/Categories/MWKSection+TOC.m
M Wikipedia/Protocols/WMFLocalizationProtocol.m
M Wikipedia/View Controllers/SearchResults/SearchResultsController.m
M Wikipedia/View Controllers/TableOfContents/TOCViewController.m
M Wikipedia/View
Controllers/WebView/Footer/SubFooters/Legal/WMFLegalFooterViewController.h
M Wikipedia/View
Controllers/WebView/Footer/SubFooters/Legal/WMFLegalFooterViewController.m
M Wikipedia/View
Controllers/WebView/Footer/SubFooters/Options/WMFOptionsFooterViewController.m
M Wikipedia/View
Controllers/WebView/Footer/SubFooters/ReadMore/WMFReadMoreViewController.m
M Wikipedia/View Controllers/WebView/Footer/WMFWebViewFooterViewController.h
M Wikipedia/View Controllers/WebView/Footer/WMFWebViewFooterViewController.m
M Wikipedia/View Controllers/WebView/WebViewController.m
M Wikipedia/mw-utils/WikipediaAppUtils.h
M Wikipedia/mw-utils/WikipediaAppUtils.m
13 files changed, 45 insertions(+), 10 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/apps/ios/wikipedia
refs/changes/09/205809/1
diff --git a/Wikipedia/Categories/MWKSection+TOC.m
b/Wikipedia/Categories/MWKSection+TOC.m
index 8929328..01325f9 100644
--- a/Wikipedia/Categories/MWKSection+TOC.m
+++ b/Wikipedia/Categories/MWKSection+TOC.m
@@ -35,7 +35,7 @@
NSFontAttributeName: [UIFont fontWithName:@"Times New Roman" size:24.0
* MENUS_SCALE_MULTIPLIER]
};
-NSString* heading = MWLocalizedString(@"table-of-contents-heading", nil);
+NSString* heading =
MWCurrentArticleLanguageLocalizedString(@"table-of-contents-heading", nil);
if ([[SessionSingleton sharedInstance].currentArticleSite.language
isEqualToString:@"en"]) {
heading = [heading uppercaseString];
diff --git a/Wikipedia/Protocols/WMFLocalizationProtocol.m
b/Wikipedia/Protocols/WMFLocalizationProtocol.m
index 6f70573..8b089c9 100644
--- a/Wikipedia/Protocols/WMFLocalizationProtocol.m
+++ b/Wikipedia/Protocols/WMFLocalizationProtocol.m
@@ -46,7 +46,7 @@
-(NSString *)getTranslationForKey:(NSString *)key {
if (key && (key.length > 0)) {
-return MWLocalizedString(key, nil);
+return MWCurrentArticleLanguageLocalizedString(key, nil);
}else{
return @"";
}
diff --git a/Wikipedia/View Controllers/SearchResults/SearchResultsController.m
b/Wikipedia/View Controllers/SearchResults/SearchResultsController.m
index e899708..418f621 100644
--- a/Wikipedia/View Controllers/SearchResults/SearchResultsController.m
+++ b/Wikipedia/View Controllers/SearchResults/SearchResultsController.m
@@ -516,7 +516,7 @@
self.searchSuggestion = [searchResultFetcher.searchSuggestion
copy];
}
if (self.searchSuggestion) {
-[self.didYouMeanButton
showWithText:MWLocalizedString(@"search-did-you-mean", nil)
+[self.didYouMeanButton showWithText:(self.type ==
WMFSearchResultsControllerTypeReadMore) ?
MWCurrentArticleLanguageLocalizedString(@"search-did-you-mean", nil) :
MWLocalizedString(@"search-did-you-mean", nil)
term:self.searchSuggestion];
}
} else if ([sender isKindOfClass:[ThumbnailFetcher class]]) {
diff --git a/Wikipedia/View Controllers/TableOfContents/TOCViewController.m
b/Wikipedia/View Controllers/TableOfContents/TOCViewController.m
index 2c3275a..78db6b7 100644
--- a/Wikipedia/View Controllers/TableOfContents/TOCViewController.m
+++ b/Wikipedia/View Controllers/TableOfContents/TOCViewController.m
@@ -598,7 +598,7 @@
@"id": @(10),
@"isLead": @(NO),
@"level": @0,
- @"title": MWLocalizedString(@"article-read-more-title", @"Read more")
+ @"title":
MWCurrentArticleLanguageLocalizedString(@"article-
[MediaWiki-commits] [Gerrit] dumps: let htmldumps-admin own HTML dumps docroot - change (operations/puppet)
Dzahn has submitted this change and it was merged.
Change subject: dumps: let htmldumps-admin own HTML dumps docroot
..
dumps: let htmldumps-admin own HTML dumps docroot
Let the newly created htmldumps-admin group own
the document root used for HTML/ZIM dumps.
Bug:T94093
Change-Id: Ia93bc112548915410e8b34f00b103479e8c6ee8f
---
M modules/dumps/manifests/zim.pp
1 file changed, 2 insertions(+), 2 deletions(-)
Approvals:
jenkins-bot: Verified
Dzahn: Looks good to me, approved
diff --git a/modules/dumps/manifests/zim.pp b/modules/dumps/manifests/zim.pp
index f7e1be4..7e1d800 100644
--- a/modules/dumps/manifests/zim.pp
+++ b/modules/dumps/manifests/zim.pp
@@ -31,9 +31,9 @@
file { '/srv/www/htmldumps':
ensure => directory,
-mode => '0755',
+mode => '0775',
owner => 'root',
-group => 'www-data',
+group => 'htmldumps-admin',
}
# don't know if we want bw limits etc so let's slap 'extras'
--
To view, visit https://gerrit.wikimedia.org/r/205790
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia93bc112548915410e8b34f00b103479e8c6ee8f
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn
Gerrit-Reviewer: ArielGlenn
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] Update WikiEditor for Ica0bb9f5 - change (mediawiki/core)
Jforrester has uploaded a new change for review. https://gerrit.wikimedia.org/r/205808 Change subject: Update WikiEditor for Ica0bb9f5 .. Update WikiEditor for Ica0bb9f5 6e80252 Remove extraneous comma Change-Id: I150097f1bf1c64a597ff9cb2717effaf1e876f9c --- M extensions/WikiEditor 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/08/205808/1 diff --git a/extensions/WikiEditor b/extensions/WikiEditor index ba7b148..6e80252 16 --- a/extensions/WikiEditor +++ b/extensions/WikiEditor -Subproject commit ba7b148b228c5dd0926e1052d7a3899443ce8e01 +Subproject commit 6e8025252e578c0a4e730bd2f6a7a6de2e4e62e9 -- To view, visit https://gerrit.wikimedia.org/r/205808 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I150097f1bf1c64a597ff9cb2717effaf1e876f9c Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: wmf/1.26wmf1 Gerrit-Owner: Jforrester ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] htmldumps: include admins on francium - change (operations/puppet)
Dzahn has submitted this change and it was merged.
Change subject: htmldumps: include admins on francium
..
htmldumps: include admins on francium
Need to include admins and the role class in the right
way to get the admin group defined in Hiera.
Bug:T94093
Change-Id: I81fdeb7d13489ca385297429e64288621a581b34
---
M manifests/site.pp
1 file changed, 3 insertions(+), 2 deletions(-)
Approvals:
jenkins-bot: Verified
Dzahn: Looks good to me, approved
diff --git a/manifests/site.pp b/manifests/site.pp
index 8f72dd9..407c308 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -995,9 +995,10 @@
node 'francium.eqiad.wmnet' {
-include standard
-include base::firewall
role dumps::zim
+include standard
+include admin
+include base::firewall
}
# gadolinium is the webrequest socat multicast relay.
--
To view, visit https://gerrit.wikimedia.org/r/205799
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I81fdeb7d13489ca385297429e64288621a581b34
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn
Gerrit-Reviewer: ArielGlenn
Gerrit-Reviewer: Dzahn
Gerrit-Reviewer: RobH
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update WikiEditor for Ica0bb9f5 - change (mediawiki/core)
Jforrester has uploaded a new change for review. https://gerrit.wikimedia.org/r/205807 Change subject: Update WikiEditor for Ica0bb9f5 .. Update WikiEditor for Ica0bb9f5 6ef3acb Remove extraneous comma Change-Id: Ia0176be37210f58cf40753af8f0c686c6181a729 --- M extensions/WikiEditor 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/07/205807/1 diff --git a/extensions/WikiEditor b/extensions/WikiEditor index 1c66524..6ef3acb 16 --- a/extensions/WikiEditor +++ b/extensions/WikiEditor -Subproject commit 1c6652452c8dfd2b0e7d904c263b5a6c21d0b349 +Subproject commit 6ef3acbbe71d8dd985ffe16fe27525d0f186a420 -- To view, visit https://gerrit.wikimedia.org/r/205807 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ia0176be37210f58cf40753af8f0c686c6181a729 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: wmf/1.26wmf2 Gerrit-Owner: Jforrester ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update VisualEditor for I61d418d - change (mediawiki/core)
Jforrester has uploaded a new change for review. https://gerrit.wikimedia.org/r/205806 Change subject: Update VisualEditor for I61d418d .. Update VisualEditor for I61d418d 49cbf51 Update VisualEditor core submodule to 1.26wmf2 HEAD (c90fcc4) Change-Id: If97cdc238c0df829499814422be6a3d05f362256 --- M extensions/VisualEditor 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/06/205806/1 diff --git a/extensions/VisualEditor b/extensions/VisualEditor index 4a6bea5..5fb2243 16 --- a/extensions/VisualEditor +++ b/extensions/VisualEditor -Subproject commit 4a6bea56fd805e901784105ce46ad0f526ac15ef +Subproject commit 5fb2243815d67b494936fd71fca5950618f008da -- To view, visit https://gerrit.wikimedia.org/r/205806 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If97cdc238c0df829499814422be6a3d05f362256 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: wmf/1.26wmf2 Gerrit-Owner: Jforrester ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] repool db1019 - change (operations/mediawiki-config)
jenkins-bot has submitted this change and it was merged. Change subject: repool db1019 .. repool db1019 Change-Id: I97ba353ddea597a68752e90a31149840a711b6c4 --- M wmf-config/db-eqiad.php 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Springle: Looks good to me, approved jenkins-bot: Verified diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php index baee55e..131b4c7 100644 --- a/wmf-config/db-eqiad.php +++ b/wmf-config/db-eqiad.php @@ -108,9 +108,9 @@ ), /* s3 */ 'DEFAULT' => array( 'db1038' => 0, # 1.4TB 64GB - # upgrade 'db1019' => 0, # 1.4TB 64GB, 'db1027' => 0, # 1.4TB 64GB, vslow, dump 'db1015' => 0, # 1.4TB 64GB, watchlist, recentchanges, contributions, logpager + 'db1019' => 400, # 1.4TB 64GB 'db1035' => 400, # 1.4TB 64GB 'db1044' => 400, # 1.4TB 64GB ), -- To view, visit https://gerrit.wikimedia.org/r/205805 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I97ba353ddea597a68752e90a31149840a711b6c4 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Springle Gerrit-Reviewer: Springle Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Send user information including gender to flow-subscribe mes... - change (mediawiki...Flow)
jenkins-bot has submitted this change and it was merged.
Change subject: Send user information including gender to flow-subscribe message
..
Send user information including gender to flow-subscribe message
Make sure that the gender is resolved so the i18n message can be
displayed correctly between genders.
Bug: T96804
Change-Id: I1927190d313e341ce4b3a993a5de6b9c52f9fc23
---
M handlebars/flow_subscribed.partial.handlebars
M modules/engine/components/board/flow-board.js
M modules/engine/components/common/flow-component-events.js
3 files changed, 6 insertions(+), 4 deletions(-)
Approvals:
Mattflaschen: Looks good to me, approved
jenkins-bot: Verified
diff --git a/handlebars/flow_subscribed.partial.handlebars
b/handlebars/flow_subscribed.partial.handlebars
index 21c5771..964b567 100644
--- a/handlebars/flow_subscribed.partial.handlebars
+++ b/handlebars/flow_subscribed.partial.handlebars
@@ -1,7 +1,9 @@
- {{l10n (concat "flow-" type "-notification-subscribe-title") username}}
+ {{!-- flow-topic-notification-subscribe-title and
flow-board-notification-subscribe-title --}}
+ {{l10n (concat "flow-" type "-notification-subscribe-title") user }}
- {{l10n (concat "flow-" type "-notification-subscribe-description")
username}}
+ {{!-- flow-topic-notification-subscribe-description and
flow-board-notification-subscribe-description --}}
+ {{l10n (concat "flow-" type "-notification-subscribe-description") user
}}
diff --git a/modules/engine/components/board/flow-board.js
b/modules/engine/components/board/flow-board.js
index 6f3839a..5ae8f47 100644
--- a/modules/engine/components/board/flow-board.js
+++ b/modules/engine/components/board/flow-board.js
@@ -185,7 +185,7 @@
'flow_subscribed.partial',
{
type: 'board',
- username: mw.user.getName()
+ user: mw.user
}
) ).children();
}
diff --git a/modules/engine/components/common/flow-component-events.js
b/modules/engine/components/common/flow-component-events.js
index 21ffb69..f58dfbd 100644
--- a/modules/engine/components/common/flow-component-events.js
+++ b/modules/engine/components/common/flow-component-events.js
@@ -833,7 +833,7 @@
unsubscribe: false,
type: type,
direction: dir,
- username: mw.user.getName()
+ user: mw.user
}
)
).children(),
--
To view, visit https://gerrit.wikimedia.org/r/205796
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I1927190d313e341ce4b3a993a5de6b9c52f9fc23
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: Mooeypoo
Gerrit-Reviewer: Mattflaschen
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] repool db1019 - change (operations/mediawiki-config)
Springle has uploaded a new change for review. https://gerrit.wikimedia.org/r/205805 Change subject: repool db1019 .. repool db1019 Change-Id: I97ba353ddea597a68752e90a31149840a711b6c4 --- M wmf-config/db-eqiad.php 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/05/205805/1 diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php index baee55e..131b4c7 100644 --- a/wmf-config/db-eqiad.php +++ b/wmf-config/db-eqiad.php @@ -108,9 +108,9 @@ ), /* s3 */ 'DEFAULT' => array( 'db1038' => 0, # 1.4TB 64GB - # upgrade 'db1019' => 0, # 1.4TB 64GB, 'db1027' => 0, # 1.4TB 64GB, vslow, dump 'db1015' => 0, # 1.4TB 64GB, watchlist, recentchanges, contributions, logpager + 'db1019' => 400, # 1.4TB 64GB 'db1035' => 400, # 1.4TB 64GB 'db1044' => 400, # 1.4TB 64GB ), -- To view, visit https://gerrit.wikimedia.org/r/205805 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I97ba353ddea597a68752e90a31149840a711b6c4 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Springle ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: 3375b2f..8340df1 - change (mediawiki/extensions)
Jenkins-mwext-sync has uploaded a new change for review. https://gerrit.wikimedia.org/r/205804 Change subject: Syncronize VisualEditor: 3375b2f..8340df1 .. Syncronize VisualEditor: 3375b2f..8340df1 Change-Id: Ia4823783e931939bb3c054e011cd2179f66681bf --- M VisualEditor 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions refs/changes/04/205804/1 diff --git a/VisualEditor b/VisualEditor index 3375b2f..8340df1 16 --- a/VisualEditor +++ b/VisualEditor -Subproject commit 3375b2fcb94341d81e6f5706ab9bead445cb4a84 +Subproject commit 8340df15ad3b53bacc247220a543fcea12fb8528 -- To view, visit https://gerrit.wikimedia.org/r/205804 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ia4823783e931939bb3c054e011cd2179f66681bf Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions Gerrit-Branch: master Gerrit-Owner: Jenkins-mwext-sync ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: 3375b2f..8340df1 - change (mediawiki/extensions)
Jenkins-mwext-sync has submitted this change and it was merged. Change subject: Syncronize VisualEditor: 3375b2f..8340df1 .. Syncronize VisualEditor: 3375b2f..8340df1 Change-Id: Ia4823783e931939bb3c054e011cd2179f66681bf --- M VisualEditor 1 file changed, 0 insertions(+), 0 deletions(-) Approvals: Jenkins-mwext-sync: Verified; Looks good to me, approved diff --git a/VisualEditor b/VisualEditor index 3375b2f..8340df1 16 --- a/VisualEditor +++ b/VisualEditor -Subproject commit 3375b2fcb94341d81e6f5706ab9bead445cb4a84 +Subproject commit 8340df15ad3b53bacc247220a543fcea12fb8528 -- To view, visit https://gerrit.wikimedia.org/r/205804 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ia4823783e931939bb3c054e011cd2179f66681bf Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions Gerrit-Branch: master Gerrit-Owner: Jenkins-mwext-sync Gerrit-Reviewer: Jenkins-mwext-sync ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: 76b1839..3375b2f - change (mediawiki/extensions)
Jenkins-mwext-sync has submitted this change and it was merged. Change subject: Syncronize VisualEditor: 76b1839..3375b2f .. Syncronize VisualEditor: 76b1839..3375b2f Change-Id: I05fa7e2aee92f75e5a620dfd77001d0dde7c9c23 --- M VisualEditor 1 file changed, 0 insertions(+), 0 deletions(-) Approvals: Jenkins-mwext-sync: Verified; Looks good to me, approved diff --git a/VisualEditor b/VisualEditor index 76b1839..3375b2f 16 --- a/VisualEditor +++ b/VisualEditor -Subproject commit 76b1839e305df76ed508af0770bdaa1acdb6c310 +Subproject commit 3375b2fcb94341d81e6f5706ab9bead445cb4a84 -- To view, visit https://gerrit.wikimedia.org/r/205803 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I05fa7e2aee92f75e5a620dfd77001d0dde7c9c23 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions Gerrit-Branch: master Gerrit-Owner: Jenkins-mwext-sync Gerrit-Reviewer: Jenkins-mwext-sync ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: 76b1839..3375b2f - change (mediawiki/extensions)
Jenkins-mwext-sync has uploaded a new change for review. https://gerrit.wikimedia.org/r/205803 Change subject: Syncronize VisualEditor: 76b1839..3375b2f .. Syncronize VisualEditor: 76b1839..3375b2f Change-Id: I05fa7e2aee92f75e5a620dfd77001d0dde7c9c23 --- M VisualEditor 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions refs/changes/03/205803/1 diff --git a/VisualEditor b/VisualEditor index 76b1839..3375b2f 16 --- a/VisualEditor +++ b/VisualEditor -Subproject commit 76b1839e305df76ed508af0770bdaa1acdb6c310 +Subproject commit 3375b2fcb94341d81e6f5706ab9bead445cb4a84 -- To view, visit https://gerrit.wikimedia.org/r/205803 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I05fa7e2aee92f75e5a620dfd77001d0dde7c9c23 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions Gerrit-Branch: master Gerrit-Owner: Jenkins-mwext-sync ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update VE core submodule to master (54819a1) - change (mediawiki...VisualEditor)
jenkins-bot has submitted this change and it was merged. Change subject: Update VE core submodule to master (54819a1) .. Update VE core submodule to master (54819a1) New changes: a7789f5 ve.ui.WhitespacePreservingTextInputWidget: Trim whitespace in input a420c83 Filibuster: fix stringification errors 7ebcd63 ce.Document#getNodeAndOffset: Document better ahead of cleanup 29344e7 Localisation updates from https://translatewiki.net. Change-Id: I66607501135c7046e026130feadeae9d0962d2b9 --- M lib/ve 1 file changed, 0 insertions(+), 0 deletions(-) Approvals: Catrope: Looks good to me, approved jenkins-bot: Verified diff --git a/lib/ve b/lib/ve index a666ccc..54819a1 16 --- a/lib/ve +++ b/lib/ve -Subproject commit a666ccc888c5cd29d7a9dac635ddc417fda321d4 +Subproject commit 54819a1e247ef85b9028ae0d79d27a9e14c2076e -- To view, visit https://gerrit.wikimedia.org/r/205802 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I66607501135c7046e026130feadeae9d0962d2b9 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/VisualEditor Gerrit-Branch: master Gerrit-Owner: Jforrester Gerrit-Reviewer: Catrope Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Enable DBO_TRX for runJobs.php, just like HTTP job runner - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged.
Change subject: Enable DBO_TRX for runJobs.php, just like HTTP job runner
..
Enable DBO_TRX for runJobs.php, just like HTTP job runner
Change-Id: Ic6fa2f9f0d18aeeb15f482e2faab2ebc56650570
---
M maintenance/runJobs.php
1 file changed, 13 insertions(+), 3 deletions(-)
Approvals:
Legoktm: Looks good to me, approved
jenkins-bot: Verified
diff --git a/maintenance/runJobs.php b/maintenance/runJobs.php
index c8445da..3c5d28b 100644
--- a/maintenance/runJobs.php
+++ b/maintenance/runJobs.php
@@ -52,6 +52,8 @@
}
public function execute() {
+ global $wgCommandLineMode;
+
if ( $this->hasOption( 'procs' ) ) {
$procs = intval( $this->getOption( 'procs' ) );
if ( $procs < 1 || $procs > 1000 ) {
@@ -64,21 +66,29 @@
}
}
- $json = ( $this->getOption( 'result' ) === 'json' );
+ $outputJSON = ( $this->getOption( 'result' ) === 'json' );
+
+ // Enable DBO_TRX for atomicity; JobRunner manages transactions
+ // and works well in web server mode already (@TODO: this is a
hack)
+ $wgCommandLineMode = false;
$runner = new JobRunner( LoggerFactory::getInstance( 'runJobs'
) );
- if ( !$json ) {
+ if ( !$outputJSON ) {
$runner->setDebugHandler( array( $this, 'debugInternal'
) );
}
+
$response = $runner->run( array(
'type' => $this->getOption( 'type', false ),
'maxJobs' => $this->getOption( 'maxjobs', false ),
'maxTime' => $this->getOption( 'maxtime', false ),
'throttle' => $this->hasOption( 'nothrottle' ) ? false
: true,
) );
- if ( $json ) {
+
+ if ( $outputJSON ) {
$this->output( FormatJson::encode( $response, true ) );
}
+
+ $wgCommandLineMode = true;
}
/**
--
To view, visit https://gerrit.wikimedia.org/r/205787
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ic6fa2f9f0d18aeeb15f482e2faab2ebc56650570
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz
Gerrit-Reviewer: Aaron Schulz
Gerrit-Reviewer: Legoktm
Gerrit-Reviewer: Parent5446
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Rearrange images when the media search window resizes - change (mediawiki...VisualEditor)
jenkins-bot has submitted this change and it was merged.
Change subject: Rearrange images when the media search window resizes
..
Rearrange images when the media search window resizes
This is a quickfix to make the masonry fit recalculate itself after
the window is resized. It is most significant for orientation changes
in mobile devices, as those lead to a resizing of the window and a
complete reorganization of the masonry fit rows.
Bug: T95017
Change-Id: Ibf3c74ea21d42f4a159d0b855be5672c8455639f
---
M modules/ve-mw/ui/dialogs/ve.ui.MWMediaDialog.js
M modules/ve-mw/ui/widgets/ve.ui.MWMediaSearchWidget.js
2 files changed, 55 insertions(+), 0 deletions(-)
Approvals:
Jforrester: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/ve-mw/ui/dialogs/ve.ui.MWMediaDialog.js
b/modules/ve-mw/ui/dialogs/ve.ui.MWMediaDialog.js
index 534e8c4..ebd03dc 100644
--- a/modules/ve-mw/ui/dialogs/ve.ui.MWMediaDialog.js
+++ b/modules/ve-mw/ui/dialogs/ve.ui.MWMediaDialog.js
@@ -970,6 +970,8 @@
this.isInsertion = true;
}
+ this.search.setup();
+
this.resetCaption();
this.actions.setAbilities( { insert: false, apply:
false } );
@@ -1210,6 +1212,7 @@
.first( function () {
// Cleanup
this.search.getQuery().setValue( '' );
+ this.search.teardown();
if ( this.imageModel ) {
this.imageModel.disconnect( this );
this.sizeWidget.disconnect( this );
diff --git a/modules/ve-mw/ui/widgets/ve.ui.MWMediaSearchWidget.js
b/modules/ve-mw/ui/widgets/ve.ui.MWMediaSearchWidget.js
index 3102ba5..d497a7c 100644
--- a/modules/ve-mw/ui/widgets/ve.ui.MWMediaSearchWidget.js
+++ b/modules/ve-mw/ui/widgets/ve.ui.MWMediaSearchWidget.js
@@ -44,6 +44,9 @@
this.queryMediaQueueCallback = this.queryMediaQueue.bind( this );
this.layoutQueue = [];
this.numItems = 0;
+ this.currentItemCache = [];
+
+ this.resultsSize = {};
this.selected = null;
@@ -61,6 +64,8 @@
remove: 'onResultsRemove'
} );
+ this.resizeHandler = ve.debounce( this.afterResultsResize.bind( this ),
500 );
+
// Initialization
this.$element.addClass( 've-ui-mwMediaSearchWidget' );
};
@@ -71,6 +76,49 @@
/* Methods */
+/**
+ * Respond to window resize and check if the result display should
+ * be updated.
+ */
+ve.ui.MWMediaSearchWidget.prototype.afterResultsResize = function () {
+ var items = this.currentItemCache,
+ value = this.query.getValue();
+
+ if (
+ items.length > 0 &&
+ (
+ this.resultsSize.width !== this.$results.width() ||
+ this.resultsSize.height !== this.$results.height()
+ )
+ ) {
+ this.resetRows();
+ this.itemCache = {};
+ this.processQueueResults( items, value );
+ if ( this.results.getItems().length > 0 ) {
+ this.lazyLoadResults();
+ }
+
+ // Cache the size
+ this.resultsSize = {
+ width: this.$results.width(),
+ height: this.$results.height()
+ };
+ }
+};
+
+/**
+ * Teardown the widget; disconnect the window resize event.
+ */
+ve.ui.MWMediaSearchWidget.prototype.teardown = function () {
+ $( window ).off( 'resize', this.resizeHandler );
+};
+
+/**
+ * Setup the widget; activate the resize event.
+ */
+ve.ui.MWMediaSearchWidget.prototype.setup = function () {
+ $( window ).on( 'resize', this.resizeHandler );
+};
/**
* Query all sources for media.
*
@@ -92,6 +140,7 @@
.then( function ( items ) {
if ( items.length > 0 ) {
search.processQueueResults( items, value );
+ search.currentItemCache =
search.currentItemCache.concat( items );
}
search.query.popPending();
@@ -157,6 +206,7 @@
// Reset
this.itemCache = {};
+ this.currentItemCache = [];
this.resetRows();
// Empty the results queue
@@ -218,6 +268,7 @@
}
this.rows = [];
+ this.itemCache = {};
};
/**
@@ -359,6 +410,7 @@
// In the case of the media search widget, if any items are
removed
// all are removed (new search)
this.resetRows();
+ this.currentItemCache = [];
}
};
--
To view, visit https://gerrit.wikimedia.org/r/204568
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change
[MediaWiki-commits] [Gerrit] Update VE core submodule to master (54819a1) - change (mediawiki...VisualEditor)
Jforrester has uploaded a new change for review. https://gerrit.wikimedia.org/r/205802 Change subject: Update VE core submodule to master (54819a1) .. Update VE core submodule to master (54819a1) New changes: a7789f5 ve.ui.WhitespacePreservingTextInputWidget: Trim whitespace in input a420c83 Filibuster: fix stringification errors 7ebcd63 ce.Document#getNodeAndOffset: Document better ahead of cleanup 29344e7 Localisation updates from https://translatewiki.net. Change-Id: I66607501135c7046e026130feadeae9d0962d2b9 --- M lib/ve 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor refs/changes/02/205802/1 diff --git a/lib/ve b/lib/ve index a666ccc..54819a1 16 --- a/lib/ve +++ b/lib/ve -Subproject commit a666ccc888c5cd29d7a9dac635ddc417fda321d4 +Subproject commit 54819a1e247ef85b9028ae0d79d27a9e14c2076e -- To view, visit https://gerrit.wikimedia.org/r/205802 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I66607501135c7046e026130feadeae9d0962d2b9 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/VisualEditor Gerrit-Branch: master Gerrit-Owner: Jforrester ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] i18n: Gender support for various messages - change (mediawiki...Gather)
Jdlrobson has uploaded a new change for review.
https://gerrit.wikimedia.org/r/205801
Change subject: i18n: Gender support for various messages
..
i18n: Gender support for various messages
Change-Id: Id1bd4e0d2780c63285d3b1b1a7685392ec9ab382
---
M i18n/en.json
M i18n/qqq.json
M includes/specials/SpecialGather.php
M includes/views/Collection.php
4 files changed, 8 insertions(+), 8 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Gather
refs/changes/01/205801/1
diff --git a/i18n/en.json b/i18n/en.json
index d930196..2301e00 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -61,7 +61,7 @@
"gather-new-collection-failed-toast": "There was a problem creating
your \"$1\" collection.",
"gather-add-failed-toast": "There was a problem adding the item to your
\"$1\" collection.",
"gather-add-title-invalid-toast": "There was an issue with the title
you entered. Please try something else",
- "gather-add-to-collection-summary": "Add $1 to a collection of pages
you can share with the world!",
+ "gather-add-to-collection-summary": "{{GENDER:$2|Add}} $1 to a
collection of pages you can share with the world!",
"gather-add-to-collection-confirm": "Add to collection",
"gather-add-to-collection-cancel": "No thanks",
"gather-update-collection-success": "Collection was successfully
updated.",
@@ -78,14 +78,14 @@
"gather-watchlist-description": "A list of pages that I am interested
in.",
"gather-lists-title": "Collections",
"gather-lists-from-user-title": "Collections by $1",
- "gather-meta-description": "Here are the collections $1 has created on
{{SITENAME}}.",
+ "gather-meta-description": "{{GENDER:$1|Here}} are the collections $1
has created on {{SITENAME}}.",
"gather-read-more": "Read more",
"gather-private": "Private",
"gather-public": "Public",
"gather-hidden": "Hidden",
"gather-article-count": "$1 {{PLURAL:$1|page|pages}}",
"gather-empty": "Nothing in this collection yet...",
- "gather-empty-footer-mine": "Add pages to this collection by clicking
the edit button.",
+ "gather-empty-footer-mine": "{{GENDER:$1|Add}} pages to this collection
by clicking the edit button.",
"gather-empty-footer": "This is an empty collection.",
"gather-edit-button": "Edit",
"gather-delete-button": "Delete",
diff --git a/i18n/qqq.json b/i18n/qqq.json
index eb50b70..eff0ec7 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -65,7 +65,7 @@
"gather-new-collection-failed-toast": "Message displayed when creating
a new collection fails. Parameters:\n* $1 - Name of collection.",
"gather-add-failed-toast": "Message displayed when adding an item to a
collection fails. Parameters:\n* $1 - Name of collection.",
"gather-add-title-invalid-toast": "Message displayed to a user when
editing or creating a collection fails because of an invalid title.",
- "gather-add-to-collection-summary": "Text for a tutorial overlay
presented to a user the first time they see the collections watchstar asking
them if they would like to add the current page to a
collection.\n\nParameters:\n* $1 - page title",
+ "gather-add-to-collection-summary": "Text for a tutorial overlay
presented to a user the first time they see the collections watchstar asking
them if they would like to add the current page to a
collection.\n\nParameters:\n* $1 - page title\n* $2 - gender of user",
"gather-add-to-collection-confirm": "Label for button that user can
click if they would like to add the current page to a collection",
"gather-add-to-collection-cancel": "Label for button that user can
click if they do not want to add to a collection.\n{{Identical|No thanks}}",
"gather-update-collection-success": "Message that shows when collection
description and/or title changed.",
@@ -81,14 +81,14 @@
"gather-watchlist-description": "Default description for special casing
the Watchlist collection on the [[Special:Gather]] page.",
"gather-lists-title": "Title for [[Special:Gather]] when displaying
user curated lists.\n{{Identical|Collection}}",
"gather-lists-from-user-title": "Title for [[Special:Gather]] when
displaying user curated lists for a known user.\nParameters: $1 - name of user
who collections belong to.",
- "gather-meta-description": "Description of the [[Special:Gather]] page
of collections of a user. Added to the meta tag on the html.\nParameters: $1 -
name of user who collections belong to.",
+ "gather-meta-description": "Description of the [[Special:Gather]] page
of collections of a user. Added to the meta tag on the html.\nParameters: $1 -
name of user who collections belong to.\n $2 - their gender",
"gather-read-more": "Label for the read more link used on
[[Special:Gather]].\n{{Id
[MediaWiki-commits] [Gerrit] Add title to query pages - change (analytics...web)
jenkins-bot has submitted this change and it was merged.
Change subject: Add title to query pages
..
Add title to query pages
Change-Id: I3fdfc8147bb14592d563b4fec7dc7cc051c82667
---
M quarry/web/templates/base.html
M quarry/web/templates/query/view.html
2 files changed, 4 insertions(+), 0 deletions(-)
Approvals:
Yuvipanda: Looks good to me, approved
jenkins-bot: Verified
diff --git a/quarry/web/templates/base.html b/quarry/web/templates/base.html
index fc0aec4..dc252de 100644
--- a/quarry/web/templates/base.html
+++ b/quarry/web/templates/base.html
@@ -11,6 +11,7 @@
Quarry
+{% block title %} {% endblock %} - Quarry
{% if jsvars %}
var vars = {{jsvars|tojson}};
diff --git a/quarry/web/templates/query/view.html
b/quarry/web/templates/query/view.html
index 6a016de..7fcfe01 100644
--- a/quarry/web/templates/query/view.html
+++ b/quarry/web/templates/query/view.html
@@ -14,6 +14,9 @@