[MediaWiki-commits] [Gerrit] Removed ScopedPHPTimeout; unused - change (mediawiki/core)
Aaron Schulz has uploaded a new change for review.
https://gerrit.wikimedia.org/r/230251
Change subject: Removed ScopedPHPTimeout; unused
..
Removed ScopedPHPTimeout; unused
Change-Id: Ic3a3500ddd410c68a30d3f3d1947f632e1aff5fd
---
M autoload.php
D includes/libs/ScopedPHPTimeout.php
2 files changed, 0 insertions(+), 85 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/51/230251/1
diff --git a/autoload.php b/autoload.php
index a6c7488..e001805 100644
--- a/autoload.php
+++ b/autoload.php
@@ -1064,7 +1064,6 @@
'SavepointPostgres' = __DIR__ . '/includes/db/DatabasePostgres.php',
'ScopedCallback' = __DIR__ . '/includes/libs/ScopedCallback.php',
'ScopedLock' = __DIR__ .
'/includes/filebackend/lockmanager/ScopedLock.php',
- 'ScopedPHPTimeout' = __DIR__ . '/includes/libs/ScopedPHPTimeout.php',
'SearchDatabase' = __DIR__ . '/includes/search/SearchDatabase.php',
'SearchDump' = __DIR__ . '/maintenance/dumpIterator.php',
'SearchEngine' = __DIR__ . '/includes/search/SearchEngine.php',
diff --git a/includes/libs/ScopedPHPTimeout.php
b/includes/libs/ScopedPHPTimeout.php
deleted file mode 100644
index d1493c3..000
--- a/includes/libs/ScopedPHPTimeout.php
+++ /dev/null
@@ -1,84 +0,0 @@
-?php
-/**
- * Expansion of the PHP execution time limit feature for a function call.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- * http://www.gnu.org/copyleft/gpl.html
- *
- * @file
- */
-
-/**
- * Class to expand PHP execution time for a function call.
- * Use this when performing changes that should not be interrupted.
- *
- * On construction, set_time_limit() is called and set to $seconds.
- * If the client aborts the connection, PHP will continue to run.
- * When the object goes out of scope, the timer is restarted, with
- * the original time limit minus the time the object existed.
- */
-class ScopedPHPTimeout {
- protected $startTime; // float; seconds
- protected $oldTimeout; // integer; seconds
- protected $oldIgnoreAbort; // boolean
-
- protected static $stackDepth = 0; // integer
- protected static $totalCalls = 0; // integer
- protected static $totalElapsed = 0; // float; seconds
-
- /* Prevent callers in infinite loops from running forever */
- const MAX_TOTAL_CALLS = 100;
- const MAX_TOTAL_TIME = 300; // seconds
-
- /**
-* @param $seconds integer
-*/
- public function __construct( $seconds ) {
- if ( ini_get( 'max_execution_time' ) 0 ) { // CLI uses 0
- if ( self::$totalCalls = self::MAX_TOTAL_CALLS ) {
- trigger_error( Maximum invocations of .
__CLASS__ . exceeded. );
- } elseif ( self::$totalElapsed = self::MAX_TOTAL_TIME
) {
- trigger_error( Time limit within invocations
of . __CLASS__ . exceeded. );
- } elseif ( self::$stackDepth 0 ) { // recursion guard
- trigger_error( Resursive invocation of .
__CLASS__ . attempted. );
- } else {
- $this-oldIgnoreAbort = ignore_user_abort( true
);
- $this-oldTimeout = ini_set(
'max_execution_time', $seconds );
- $this-startTime = microtime( true );
- ++self::$stackDepth;
- ++self::$totalCalls; // proof against 1us
scopes
- }
- }
- }
-
- /**
-* Restore the original timeout.
-* This does not account for the timer value on __construct().
-*/
- public function __destruct() {
- if ( $this-oldTimeout ) {
- $elapsed = microtime( true ) - $this-startTime;
- // Note: a limit of 0 is treated as forever
- set_time_limit( max( 1, $this-oldTimeout -
(int)$elapsed ) );
- // If each scoped timeout is for less than one second,
we end up
- // restoring the original timeout without any decrease
in value.
-
[MediaWiki-commits] [Gerrit] k8s: Don't have kubelet confibure cbr0 - change (operations/puppet)
Yuvipanda has uploaded a new change for review. https://gerrit.wikimedia.org/r/230161 Change subject: k8s: Don't have kubelet confibure cbr0 .. k8s: Don't have kubelet confibure cbr0 According to user 'beeps' from IRC, this is causing trouble when used with flannel Change-Id: I6534d8f4fa4d059ce885d468dca63f5ce760553b --- M modules/k8s/templates/initscripts/kubelet.systemd.erb 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/61/230161/1 diff --git a/modules/k8s/templates/initscripts/kubelet.systemd.erb b/modules/k8s/templates/initscripts/kubelet.systemd.erb index c702da3..6f59001 100644 --- a/modules/k8s/templates/initscripts/kubelet.systemd.erb +++ b/modules/k8s/templates/initscripts/kubelet.systemd.erb @@ -5,7 +5,7 @@ ExecStart=/usr/local/bin/kubelet \ --api-servers=http://%= @master_ip %:8080 \ --config=/etc/kubernetes/manifests \ ---configure-cbr0=true +--configure-cbr0=false [Install] WantedBy=multi-user.target -- To view, visit https://gerrit.wikimedia.org/r/230161 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I6534d8f4fa4d059ce885d468dca63f5ce760553b Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Yuvipanda yuvipa...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] k8s: Don't have kubelet confibure cbr0 - change (operations/puppet)
Yuvipanda has submitted this change and it was merged. Change subject: k8s: Don't have kubelet confibure cbr0 .. k8s: Don't have kubelet confibure cbr0 According to user 'beeps' from IRC, this is causing trouble when used with flannel Change-Id: I6534d8f4fa4d059ce885d468dca63f5ce760553b --- M modules/k8s/templates/initscripts/kubelet.systemd.erb 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Yuvipanda: Verified; Looks good to me, approved diff --git a/modules/k8s/templates/initscripts/kubelet.systemd.erb b/modules/k8s/templates/initscripts/kubelet.systemd.erb index c702da3..6f59001 100644 --- a/modules/k8s/templates/initscripts/kubelet.systemd.erb +++ b/modules/k8s/templates/initscripts/kubelet.systemd.erb @@ -5,7 +5,7 @@ ExecStart=/usr/local/bin/kubelet \ --api-servers=http://%= @master_ip %:8080 \ --config=/etc/kubernetes/manifests \ ---configure-cbr0=true +--configure-cbr0=false [Install] WantedBy=multi-user.target -- To view, visit https://gerrit.wikimedia.org/r/230161 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I6534d8f4fa4d059ce885d468dca63f5ce760553b Gerrit-PatchSet: 2 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Yuvipanda yuvipa...@wikimedia.org Gerrit-Reviewer: Yuvipanda yuvipa...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: b6d587b..385e2e9 - change (mediawiki/extensions)
Jenkins-mwext-sync has submitted this change and it was merged. Change subject: Syncronize VisualEditor: b6d587b..385e2e9 .. Syncronize VisualEditor: b6d587b..385e2e9 Change-Id: I84443df91d8ae00f9564bf41e72545129554b329 --- 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 b6d587b..385e2e9 16 --- a/VisualEditor +++ b/VisualEditor -Subproject commit b6d587b80033f03f96fac728f06bfcd1f0474b9a +Subproject commit 385e2e9b27f8737cbd05290f117f93a4b429035c -- To view, visit https://gerrit.wikimedia.org/r/230228 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I84443df91d8ae00f9564bf41e72545129554b329 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions Gerrit-Branch: master Gerrit-Owner: Jenkins-mwext-sync jenkins-...@wikimedia.org Gerrit-Reviewer: Jenkins-mwext-sync jenkins-...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: b6d587b..385e2e9 - change (mediawiki/extensions)
Jenkins-mwext-sync has uploaded a new change for review. https://gerrit.wikimedia.org/r/230228 Change subject: Syncronize VisualEditor: b6d587b..385e2e9 .. Syncronize VisualEditor: b6d587b..385e2e9 Change-Id: I84443df91d8ae00f9564bf41e72545129554b329 --- M VisualEditor 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions refs/changes/28/230228/1 diff --git a/VisualEditor b/VisualEditor index b6d587b..385e2e9 16 --- a/VisualEditor +++ b/VisualEditor -Subproject commit b6d587b80033f03f96fac728f06bfcd1f0474b9a +Subproject commit 385e2e9b27f8737cbd05290f117f93a4b429035c -- To view, visit https://gerrit.wikimedia.org/r/230228 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I84443df91d8ae00f9564bf41e72545129554b329 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions Gerrit-Branch: master Gerrit-Owner: Jenkins-mwext-sync jenkins-...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Do not use globals in ChangeHandlerTest - change (mediawiki...Wikibase)
jenkins-bot has submitted this change and it was merged.
Change subject: Do not use globals in ChangeHandlerTest
..
Do not use globals in ChangeHandlerTest
This code makes the custom PHPCS sniff
MediaWiki.NamingConventions.ValidGlobalName.wgPrefix complain.
I'm very happy with my solution. I think this is the most mininal
implementation of a spy you can have.
Change-Id: I72bff4836e359d72c3b11bfbc811eca056ff3d2d
---
M client/tests/phpunit/includes/Changes/ChangeHandlerTest.php
1 file changed, 10 insertions(+), 16 deletions(-)
Approvals:
Addshore: Looks good to me, approved
jenkins-bot: Verified
diff --git a/client/tests/phpunit/includes/Changes/ChangeHandlerTest.php
b/client/tests/phpunit/includes/Changes/ChangeHandlerTest.php
index d3e0e61..9e695b4 100644
--- a/client/tests/phpunit/includes/Changes/ChangeHandlerTest.php
+++ b/client/tests/phpunit/includes/Changes/ChangeHandlerTest.php
@@ -153,36 +153,30 @@
* @dataProvider provideHandleChanges
*/
public function testHandleChanges() {
- global $handleChangeCallCount, $handleChangesCallCount;
$changes = func_get_args();
+ $spy = new \stdClass();
+ $spy-handleChangeCallCount = 0;
+ $spy-handleChangesCallCount = 0;
+
$testHooks = array(
- 'WikibaseHandleChange' = array( function( Change
$change ) {
- global $handleChangeCallCount;
- $handleChangeCallCount++;
+ 'WikibaseHandleChange' = array( function( Change
$change ) use ( $spy ) {
+ $spy-handleChangeCallCount++;
return true;
} ),
- 'WikibaseHandleChanges' = array( function( array
$changes ) {
- global $handleChangesCallCount;
- $handleChangesCallCount++;
+ 'WikibaseHandleChanges' = array( function( array
$changes ) use ( $spy ) {
+ $spy-handleChangesCallCount++;
return true;
} )
);
$this-mergeMwGlobalArrayValue( 'wgHooks', $testHooks );
- $handleChangeCallCount = 0;
- $handleChangesCallCount = 0;
-
$changeHandler = $this-getChangeHandler();
-
$changeHandler-handleChanges( $changes );
- $this-assertEquals( count( $changes ), $handleChangeCallCount
);
- $this-assertEquals( 1, $handleChangesCallCount );
-
- unset( $handleChangeCallCount );
- unset( $handleChangesCallCount );
+ $this-assertEquals( count( $changes ),
$spy-handleChangeCallCount );
+ $this-assertEquals( 1, $spy-handleChangesCallCount );
}
public function provideGetUpdateActions() {
--
To view, visit https://gerrit.wikimedia.org/r/230089
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I72bff4836e359d72c3b11bfbc811eca056ff3d2d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Thiemo Mättig (WMDE) thiemo.maet...@wikimedia.de
Gerrit-Reviewer: Addshore addshorew...@gmail.com
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Make extensionname-timedmedia optional - change (translatewiki)
Amire80 has uploaded a new change for review. https://gerrit.wikimedia.org/r/230094 Change subject: Make extensionname-timedmedia optional .. Make extensionname-timedmedia optional It's supposed to be optional according to its qqq documentation. Change-Id: Ic8ac733b9ad92620abe1dd65bf12ae6ee1a83b5c --- M groups/MediaWiki/mediawiki-extensions.txt 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/translatewiki refs/changes/94/230094/1 diff --git a/groups/MediaWiki/mediawiki-extensions.txt b/groups/MediaWiki/mediawiki-extensions.txt index b4434ed..2d6aad3 100644 --- a/groups/MediaWiki/mediawiki-extensions.txt +++ b/groups/MediaWiki/mediawiki-extensions.txt @@ -2217,6 +2217,7 @@ optional = timedmedia-derivative-opus, timedmedia-derivative-desc-opus optional = timedmedia-derivative-mp3, timedmedia-derivative-desc-mp3 optional = timedmedia-derivative-m4a, timedmedia-derivative-desc-m4a +optional = extensionname-timedmedia Timeline file = timeline/i18n/%CODE%.json -- To view, visit https://gerrit.wikimedia.org/r/230094 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic8ac733b9ad92620abe1dd65bf12ae6ee1a83b5c Gerrit-PatchSet: 1 Gerrit-Project: translatewiki Gerrit-Branch: master Gerrit-Owner: Amire80 amir.ahar...@mail.huji.ac.il ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove title styling from heading. - change (mediawiki...MobileFrontend)
jenkins-bot has submitted this change and it was merged.
Change subject: Remove title styling from heading.
..
Remove title styling from heading.
Text in toolbar should be use toolbar fonts, not content fonts.
Change-Id: I4945efac632fbc3c46fb8065cdc50746139721ff
---
M resources/mobile.editor.ve/VisualEditorOverlay.less
1 file changed, 0 insertions(+), 4 deletions(-)
Approvals:
Jforrester: Looks good to me, approved
jenkins-bot: Verified
diff --git a/resources/mobile.editor.ve/VisualEditorOverlay.less
b/resources/mobile.editor.ve/VisualEditorOverlay.less
index 70fce40..2ae5131 100644
--- a/resources/mobile.editor.ve/VisualEditorOverlay.less
+++ b/resources/mobile.editor.ve/VisualEditorOverlay.less
@@ -62,10 +62,6 @@
}
.editor-overlay-ve {
- .ve-init-mw-mobileArticleTarget-title {
- font-family: @fontFamilyHeading;
- }
-
// prevent disappearing after scrolling when
-webkit-overflow-scrolling: touch
// is used (http://stackoverflow.com/a/10170170)
.overlay-content * {
--
To view, visit https://gerrit.wikimedia.org/r/230076
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I4945efac632fbc3c46fb8065cdc50746139721ff
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Esanders esand...@wikimedia.org
Gerrit-Reviewer: Jforrester jforres...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix api-flow-topic-history - change (mediawiki...Flow)
Sbisson has uploaded a new change for review. https://gerrit.wikimedia.org/r/230098 Change subject: Fix api-flow-topic-history .. Fix api-flow-topic-history ApiFlowViewPostHistory and ApiFlowViewTopicHistory were not in autoload.php for some reason. Bug: T108317 Change-Id: Id99f5fc4c1ca727763fc645cb02ccd0ac1224cc6 --- M autoload.php 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Flow refs/changes/98/230098/1 diff --git a/autoload.php b/autoload.php index 98b153b..c6d1cf6 100644 --- a/autoload.php +++ b/autoload.php @@ -29,7 +29,9 @@ 'Flow\\Api\\ApiFlowUndoEditTopicSummary' = __DIR__ . '/includes/Api/ApiFlowUndoEditTopicSummary.php', 'Flow\\Api\\ApiFlowViewHeader' = __DIR__ . '/includes/Api/ApiFlowViewHeader.php', 'Flow\\Api\\ApiFlowViewPost' = __DIR__ . '/includes/Api/ApiFlowViewPost.php', + 'Flow\\Api\\ApiFlowViewPostHistory' = __DIR__ . '/includes/Api/ApiFlowViewPostHistory.php', 'Flow\\Api\\ApiFlowViewTopic' = __DIR__ . '/includes/Api/ApiFlowViewTopic.php', + 'Flow\\Api\\ApiFlowViewTopicHistory' = __DIR__ . '/includes/Api/ApiFlowViewTopicHistory.php', 'Flow\\Api\\ApiFlowViewTopicList' = __DIR__ . '/includes/Api/ApiFlowViewTopicList.php', 'Flow\\Api\\ApiFlowViewTopicSummary' = __DIR__ . '/includes/Api/ApiFlowViewTopicSummary.php', 'Flow\\Api\\ApiParsoidUtilsFlow' = __DIR__ . '/includes/Api/ApiParsoidUtilsFlow.php', -- To view, visit https://gerrit.wikimedia.org/r/230098 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id99f5fc4c1ca727763fc645cb02ccd0ac1224cc6 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Flow Gerrit-Branch: master Gerrit-Owner: Sbisson sbis...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Use .attr() to set the resource attribute of image, while ad... - change (mediawiki...ContentTranslation)
KartikMistry has uploaded a new change for review.
https://gerrit.wikimedia.org/r/230101
Change subject: Use .attr() to set the resource attribute of image, while
adapting
..
Use .attr() to set the resource attribute of image, while adapting
Bug: T108302
Change-Id: Ic427e91928d95502a71e089b58f4c1c1673766e0
(cherry picked from commit 308cdea21198c71df0c3a880264d184d2edeb171)
---
M modules/tools/ext.cx.tools.images.js
1 file changed, 1 insertion(+), 1 deletion(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ContentTranslation
refs/changes/01/230101/1
diff --git a/modules/tools/ext.cx.tools.images.js
b/modules/tools/ext.cx.tools.images.js
index 10c597d..08a7190 100644
--- a/modules/tools/ext.cx.tools.images.js
+++ b/modules/tools/ext.cx.tools.images.js
@@ -113,7 +113,7 @@
if ( resource ) {
resource = resource.replace(
/(\.\/)*(.+)(:)/g,
'$1' +
translatedNamespace + '$3' );
- $image.prop( {
+ $image.attr( {
resource: resource,
id: 'cx' +
$sourceImage.prop( 'id' )
} );
--
To view, visit https://gerrit.wikimedia.org/r/230101
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic427e91928d95502a71e089b58f4c1c1673766e0
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ContentTranslation
Gerrit-Branch: wmf/1.26wmf17
Gerrit-Owner: KartikMistry kartik.mis...@gmail.com
Gerrit-Reviewer: Santhosh santhosh.thottin...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] add benefactors.wm.o to wikimedia_domains list for exim - change (operations/puppet)
BBlack has uploaded a new change for review. https://gerrit.wikimedia.org/r/230102 Change subject: add benefactors.wm.o to wikimedia_domains list for exim .. add benefactors.wm.o to wikimedia_domains list for exim Bug: T107940 Change-Id: Iad8530b5f578659f1015c3256d9a594d6af96307 --- M files/exim/wikimedia_domains 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/02/230102/1 diff --git a/files/exim/wikimedia_domains b/files/exim/wikimedia_domains index 98d1020..54af80b 100644 --- a/files/exim/wikimedia_domains +++ b/files/exim/wikimedia_domains @@ -33,3 +33,4 @@ donate.wikimedia.org rt.wikimedia.org phabricator.wikimedia.org +benefactors.wikimedia.org -- To view, visit https://gerrit.wikimedia.org/r/230102 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iad8530b5f578659f1015c3256d9a594d6af96307 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: BBlack bbl...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] add benefactors.wm.o to wikimedia_domains list for exim - change (operations/puppet)
BBlack has submitted this change and it was merged. Change subject: add benefactors.wm.o to wikimedia_domains list for exim .. add benefactors.wm.o to wikimedia_domains list for exim Bug: T107940 Change-Id: Iad8530b5f578659f1015c3256d9a594d6af96307 --- M files/exim/wikimedia_domains 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: BBlack: Verified; Looks good to me, approved diff --git a/files/exim/wikimedia_domains b/files/exim/wikimedia_domains index 98d1020..54af80b 100644 --- a/files/exim/wikimedia_domains +++ b/files/exim/wikimedia_domains @@ -33,3 +33,4 @@ donate.wikimedia.org rt.wikimedia.org phabricator.wikimedia.org +benefactors.wikimedia.org -- To view, visit https://gerrit.wikimedia.org/r/230102 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iad8530b5f578659f1015c3256d9a594d6af96307 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: BBlack bbl...@wikimedia.org Gerrit-Reviewer: BBlack bbl...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix validation in wbparsevalue. - change (mediawiki...Wikibase)
jenkins-bot has submitted this change and it was merged.
Change subject: Fix validation in wbparsevalue.
..
Fix validation in wbparsevalue.
Change-Id: Ib1dd337d9131a0ba7762cd3d6bf57f6fed47b92f
---
M repo/includes/api/ParseValue.php
M repo/tests/phpunit/includes/api/ParseValueTest.php
2 files changed, 7 insertions(+), 2 deletions(-)
Approvals:
Jonas Kress (WMDE): Looks good to me, approved
jenkins-bot: Verified
diff --git a/repo/includes/api/ParseValue.php b/repo/includes/api/ParseValue.php
index d615343..6a516f0 100644
--- a/repo/includes/api/ParseValue.php
+++ b/repo/includes/api/ParseValue.php
@@ -214,7 +214,7 @@
}
if ( $validator ) {
- $validatorResult = $validator-validate( $value );
+ $validatorResult = $validator-validate( $parseResult );
$validationStatus =
$this-validatorErrorLocalizer-getResultStatus( $validatorResult );
$result['valid'] = $validationStatus-isOK();
diff --git a/repo/tests/phpunit/includes/api/ParseValueTest.php
b/repo/tests/phpunit/includes/api/ParseValueTest.php
index d48af07..46585d4 100644
--- a/repo/tests/phpunit/includes/api/ParseValueTest.php
+++ b/repo/tests/phpunit/includes/api/ParseValueTest.php
@@ -11,6 +11,8 @@
use Wikibase\Repo\Api\ApiErrorReporter;
use Wikibase\Repo\Api\ParseValue;
use Wikibase\Repo\BuilderBasedDataTypeValidatorFactory;
+use Wikibase\Repo\Validators\DataFieldValidator;
+use Wikibase\Repo\Validators\DataValueValidator;
use Wikibase\Repo\ValueParserFactory;
use Wikibase\Repo\WikibaseRepo;
use Wikibase\Repo\Validators\RegexValidator;
@@ -80,7 +82,10 @@
}
public function newArrayWithStringValidator() {
- return array( new RegexValidator( '/INVALID/', true,
'no-kittens' ) );
+ return array(
+ new DataValueValidator(
+ new RegexValidator( '/INVALID/', true,
'no-kittens' )
+ ) );
}
public function newStringDataType( $name ) {
--
To view, visit https://gerrit.wikimedia.org/r/230100
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib1dd337d9131a0ba7762cd3d6bf57f6fed47b92f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Daniel Kinzler daniel.kinz...@wikimedia.de
Gerrit-Reviewer: Addshore addshorew...@gmail.com
Gerrit-Reviewer: Jonas Kress (WMDE) jonas.kr...@wikimedia.de
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove skipping of a test case on SQLite - change (mediawiki...Wikibase)
jenkins-bot has submitted this change and it was merged.
Change subject: Remove skipping of a test case on SQLite
..
Remove skipping of a test case on SQLite
Needs https://gerrit.wikimedia.org/r/229613 in core.
Change-Id: I969c3d64c09b49925a0afa0bf1c809eb2dffc0dd
---
M lib/tests/phpunit/store/Sql/SiteLinkTableTest.php
1 file changed, 0 insertions(+), 4 deletions(-)
Approvals:
Thiemo Mättig (WMDE): Looks good to me, approved
jenkins-bot: Verified
diff --git a/lib/tests/phpunit/store/Sql/SiteLinkTableTest.php
b/lib/tests/phpunit/store/Sql/SiteLinkTableTest.php
index b04beac..9361e99 100644
--- a/lib/tests/phpunit/store/Sql/SiteLinkTableTest.php
+++ b/lib/tests/phpunit/store/Sql/SiteLinkTableTest.php
@@ -69,10 +69,6 @@
* @depends testSaveLinksOfItem
*/
public function testSaveLinksOfItem_duplicate() {
- if ( wfGetDB( DB_MASTER )-getType() === 'sqlite' ) {
- $this-markTestSkipped( Duplicated tables don't have
indexes on them in SQLite, thus we can't test uniqueness handling. );
- }
-
$item = new Item( new ItemId( 'Q2' ) );
$item-getSiteLinkList()-addNewSiteLink( 'enwiki', 'Beer' );
--
To view, visit https://gerrit.wikimedia.org/r/229615
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I969c3d64c09b49925a0afa0bf1c809eb2dffc0dd
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Hoo man h...@online.de
Gerrit-Reviewer: Thiemo Mättig (WMDE) thiemo.maet...@wikimedia.de
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Introduce scb100{1, 2}.eqiad.wmnet - change (operations/dns)
Alexandros Kosiaris has submitted this change and it was merged.
Change subject: Introduce scb100{1,2}.eqiad.wmnet
..
Introduce scb100{1,2}.eqiad.wmnet
A cluster meant to gradually succeed the SCA cluster. Comprised of 2
boxes in different rack rows
Bug: T107287
Change-Id: I258e357d9a6443220dd5919ae968afa1a766fdef
---
M templates/10.in-addr.arpa
M templates/wmnet
2 files changed, 9 insertions(+), 3 deletions(-)
Approvals:
Alexandros Kosiaris: Looks good to me, approved
jenkins-bot: Verified
diff --git a/templates/10.in-addr.arpa b/templates/10.in-addr.arpa
index 05a977e..8c7be5b 100644
--- a/templates/10.in-addr.arpa
+++ b/templates/10.in-addr.arpa
@@ -221,7 +221,7 @@
13 1H IN PTR db1009.eqiad.wmnet.
14 1H IN PTR db1010.eqiad.wmnet.
15 1H IN PTR db1011.eqiad.wmnet.
-
+14 1H IN PTR scb1002.eqiad.wmnet.
17 1H IN PTR rcs1002.eqiad.wmnet.
18 1H IN PTR conf1001.eqiad.wmnet.
19 1H IN PTR db1015.eqiad.wmnet.
@@ -419,7 +419,7 @@
18 1H IN PTR db1029.eqiad.wmnet.
19 1H IN PTR db1030.eqiad.wmnet.
20 1H IN PTR db1031.eqiad.wmnet.
-
+21 1H IN PTR scb1001.eqiad.wmnet.
22 1H IN PTR db1033.eqiad.wmnet.
23 1H IN PTR db1034.eqiad.wmnet.
24 1H IN PTR db1035.eqiad.wmnet.
@@ -1924,7 +1924,9 @@
177 1H IN PTR wmf5844.mgmt.eqiad.wmnet.
177 1H IN PTR eventlog1001.mgmt.eqiad.wmnet.
178 1H IN PTR wmf5842.mgmt.eqiad.wmnet.
+178 1H IN PTR scb1001.mgmt.eqiad.wmnet.
179 1H IN PTR wmf5843.mgmt.eqiad.wmnet.
+179 1H IN PTR scb1002.mgmt.eqiad.wmnet.
180 1H IN PTR wmf4540.mgmt.eqiad.wmnet.
180 1H IN PTR analytics1001.mgmt.eqiad.wmnet.
181 1H IN PTR wmf4541.mgmt.eqiad.wmnet.
diff --git a/templates/wmnet b/templates/wmnet
index e08fb19..10be054 100644
--- a/templates/wmnet
+++ b/templates/wmnet
@@ -721,6 +721,8 @@
ruthenium 1H IN A10.64.16.151
sca1001 1H IN A10.64.32.153
sca1002 1H IN A10.64.48.29
+scb1001 1H IN A10.64.16.21
+scb1002 1H IN A10.64.0.14
snapshot10011H IN A10.64.0.120
snapshot10021H IN A10.64.0.121
snapshot10031H IN A10.64.16.141
@@ -1933,8 +1935,10 @@
WMF3564 1H IN A10.65.3.138
terbium 1H IN A10.65.3.138
WMF3565 1H IN A10.65.3.139
-WMF5843 1H IN A10.65.3.179
WMF5842 1H IN A10.65.3.178
+scb1001 1H IN A10.65.3.178
+WMF5843 1H IN A10.65.3.179
+scb1002 1H IN A10.65.3.179
WMF5844 1H IN A10.65.3.177
eventlog1001 1H IN A10.65.3.177
WMF3566 1H IN A10.65.3.140
--
To view, visit https://gerrit.wikimedia.org/r/229700
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I258e357d9a6443220dd5919ae968afa1a766fdef
Gerrit-PatchSet: 2
Gerrit-Project: operations/dns
Gerrit-Branch: master
Gerrit-Owner: Alexandros Kosiaris akosia...@wikimedia.org
Gerrit-Reviewer: Alexandros Kosiaris akosia...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Introduce pybal-test200{1, 2, 3}.codfw.wmnet - change (operations/dns)
Alexandros Kosiaris has submitted this change and it was merged.
Change subject: Introduce pybal-test200{1,2,3}.codfw.wmnet
..
Introduce pybal-test200{1,2,3}.codfw.wmnet
Since this is a 3 VM set, giving it a cluster status and name of
pybal-test200X. Given that this is a testing cluster and roles and
functionalities are probably gonna be flactuating, do not hardcode the
roles into the hostnames but rather allow puppet roles to do so.
Bug: T107901
Change-Id: I97763f73141b5585d7051c25b3ca1f1bd07402bc
---
M templates/10.in-addr.arpa
M templates/wmnet
2 files changed, 6 insertions(+), 2 deletions(-)
Approvals:
Alexandros Kosiaris: Looks good to me, approved
jenkins-bot: Verified
diff --git a/templates/10.in-addr.arpa b/templates/10.in-addr.arpa
index 8c7be5b..81af65a 100644
--- a/templates/10.in-addr.arpa
+++ b/templates/10.in-addr.arpa
@@ -2751,6 +2751,9 @@
136 1H IN PTR cp2010.codfw.wmnet.
137 1H IN PTR cp2011.codfw.wmnet.
138 1H IN PTR cp2012.codfw.wmnet.
+139 1H IN PTR pybal-test2001.codfw.wmnet. ; VM on the
ganeti01.svc.codfw.wmnet cluster
+140 1H IN PTR pybal-test2002.codfw.wmnet. ; VM on the
ganeti01.svc.codfw.wmnet cluster
+141 1H IN PTR pybal-test2003.codfw.wmnet. ; VM on the
ganeti01.svc.codfw.wmnet cluster
$ORIGIN 17.192.{{ zonename }}.
1 1H IN PTR vl2018-eth1.lvs2001.codfw.wmnet.
diff --git a/templates/wmnet b/templates/wmnet
index 10be054..a184e3c 100644
--- a/templates/wmnet
+++ b/templates/wmnet
@@ -2510,12 +2510,13 @@
mw2212 1H IN A10.192.32.100
mw2213 1H IN A10.192.32.101
mw2214 1H IN A10.192.32.102
+pybal-test2001 1H IN A10.192.16.139 ; VM on the ganeti01.svc.codfw.wmnet
cluster
+pybal-test2002 1H IN A10.192.16.140 ; VM on the ganeti01.svc.codfw.wmnet
cluster
+pybal-test2003 1H IN A10.192.16.141 ; VM on the ganeti01.svc.codfw.wmnet
cluster
rdb2001 1H IN A10.192.0.119
rdb2002 1H IN A10.192.0.120
rdb2003 1H IN A10.192.16.122
rdb2004 1H IN A10.192.16.123
-
-
subra 1H IN A10.192.16.124
suhail 1H IN A10.192.0.121
wtp2001 1H IN A10.192.16.43
--
To view, visit https://gerrit.wikimedia.org/r/229696
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I97763f73141b5585d7051c25b3ca1f1bd07402bc
Gerrit-PatchSet: 3
Gerrit-Project: operations/dns
Gerrit-Branch: master
Gerrit-Owner: Alexandros Kosiaris akosia...@wikimedia.org
Gerrit-Reviewer: Alexandros Kosiaris akosia...@wikimedia.org
Gerrit-Reviewer: Ori.livneh o...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Introduce pybal-test200{1, 2, 3}.codfw.wmnet - change (operations/puppet)
Alexandros Kosiaris has uploaded a new change for review.
https://gerrit.wikimedia.org/r/230091
Change subject: Introduce pybal-test200{1,2,3}.codfw.wmnet
..
Introduce pybal-test200{1,2,3}.codfw.wmnet
VMs on the ganeti01.svc.codfw.wmnet cluster to help with the
development/testing of pybal software. Flat partitioning, just include
standard for now
TODO: Get the MACs
Change-Id: I08b0ab8774cd24a21a5f98f341435374431778ce
---
M manifests/site.pp
M modules/install_server/files/autoinstall/netboot.cfg
M modules/install_server/files/dhcpd/linux-host-entries.ttyS0-115200
3 files changed, 28 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/91/230091/1
diff --git a/manifests/site.pp b/manifests/site.pp
index 5f907c5..7ec2990 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -2109,6 +2109,11 @@
include base::firewall
}
+# pybal-test200X VMs are used for pybal testing/development
+node /^pybal-test200[123]\.codfw\.wmnet$/ {
+include standard
+}
+
# Tor relay
node 'radium.wikimedia.org' {
include base::firewall
diff --git a/modules/install_server/files/autoinstall/netboot.cfg
b/modules/install_server/files/autoinstall/netboot.cfg
index 7e7be34..298fec1 100755
--- a/modules/install_server/files/autoinstall/netboot.cfg
+++ b/modules/install_server/files/autoinstall/netboot.cfg
@@ -101,6 +101,7 @@
nembus|neptunium|nickel|plutonium|pollux|protactinium|radium|silver|uranium)
echo partman/raid1.cfg ;; \
osm-cp*) echo partman/mw.cfg ;; \
pc100[1-3]) echo partman/mw.cfg ;; \
+ pybal-test200[1-3]) echo partman/flat.cfg virtual.cfg;; \
rdb100[1-4]) echo partman/mw.cfg ;; \
restbase100[1-6]) echo partman/cassandrahosts-3ssd.cfg ;; \
restbase100[789]) echo partman/cassandrahosts-2ssd.cfg ;; \
diff --git a/modules/install_server/files/dhcpd/linux-host-entries.ttyS0-115200
b/modules/install_server/files/dhcpd/linux-host-entries.ttyS0-115200
index e7d3c61..e5e5950 100644
--- a/modules/install_server/files/dhcpd/linux-host-entries.ttyS0-115200
+++ b/modules/install_server/files/dhcpd/linux-host-entries.ttyS0-115200
@@ -110,6 +110,28 @@
filename jessie-installer/debian-installer/amd64/pxelinux.0;
}
+# ganeti VMs used for pybal testing/development
+host pybal-test2001 {
+ hardware ethernet
+ fixed-address pybal-test2001.codfw.wmnet;
+ option pxelinux.pathprefix jessie-installer/;
+ filename jessie-installer/debian-installer/amd64/pxelinux.0;
+}
+
+host pybal-test2002 {
+ hardware ethernet
+ fixed-address pybal-test2002.codfw.wmnet;
+ option pxelinux.pathprefix jessie-installer/;
+ filename jessie-installer/debian-installer/amd64/pxelinux.0;
+}
+
+host pybal-test2003 {
+ hardware ethernet
+ fixed-address pybal-test2003.codfw.wmnet;
+ option pxelinux.pathprefix jessie-installer/;
+ filename jessie-installer/debian-installer/amd64/pxelinux.0;
+}
+
# ganeti VM used for d-i testing
host d-i-test {
hardware ethernet aa:00:00:3b:60:cb;
--
To view, visit https://gerrit.wikimedia.org/r/230091
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I08b0ab8774cd24a21a5f98f341435374431778ce
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alexandros Kosiaris akosia...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Introduce scb100{1, 2}.eqiad.wmnet - change (operations/puppet)
Alexandros Kosiaris has submitted this change and it was merged.
Change subject: Introduce scb100{1,2}.eqiad.wmnet
..
Introduce scb100{1,2}.eqiad.wmnet
Have scb1001, scb1002 install as jessie and an exact copy of sca1001,
sca1002
Bug: T107287
Change-Id: I599daa51b2b2e4078786dcf5a3d9e758973ff277
---
M manifests/site.pp
M modules/install_server/files/autoinstall/netboot.cfg
M modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
3 files changed, 16 insertions(+), 2 deletions(-)
Approvals:
Alexandros Kosiaris: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/site.pp b/manifests/site.pp
index 5f907c5..582e4b6 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -2170,7 +2170,7 @@
include standard
}
-node /^sca100[12]\.eqiad\.wmnet$/ {
+node /^sc[ab]100[12]\.eqiad\.wmnet$/ {
role sca
}
diff --git a/modules/install_server/files/autoinstall/netboot.cfg
b/modules/install_server/files/autoinstall/netboot.cfg
index 7e7be34..0c69942 100755
--- a/modules/install_server/files/autoinstall/netboot.cfg
+++ b/modules/install_server/files/autoinstall/netboot.cfg
@@ -69,7 +69,7 @@
elastic10[0-2][0-9]|elastic103[0-1]) echo
partman/elasticsearch.cfg ;; \
etcd100[1-9]) echo partman/lvm-etcd.cfg virtual.cfg;; \
bromine|etherpad[12]001|fermium|krypton|planet1001) echo
partman/flat.cfg virtual.cfg ;; \
- eventlog[1-2]001|labcontrol2001|ocg100[1-3]|sca100[1-2]) echo
partman/raid1.cfg ;; \
+ eventlog[1-2]001|labcontrol2001|ocg100[1-3]|sc[ab]100[1-2])
echo partman/raid1.cfg ;; \
francium) echo partman/raid10-gpt.cfg ;; \
ganeti100[1-9]) echo partman/ganeti-raid1.cfg ;; \
ganeti200[1-9]) echo partman/ganeti.cfg ;; \
diff --git a/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
b/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
index e2d6b4c..c8e5e3b 100644
--- a/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
+++ b/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
@@ -5806,6 +5806,20 @@
fixed-address sca1002.eqiad.wmnet;
}
+host scb1001 {
+ hardware ethernet 90:b1:1c:2d:87:0c;
+ fixed-address scb1001.eqiad.wmnet;
+ option pxelinux.pathprefix jessie-installer/;
+ filename jessie-installer/debian-installer/amd64/pxelinux.0;
+}
+
+host scb1002 {
+ hardware ethernet 90:b1:1c:2d:7f:6b;
+ fixed-address scb1002.eqiad.wmnet;
+ option pxelinux.pathprefix jessie-installer/;
+ filename jessie-installer/debian-installer/amd64/pxelinux.0;
+}
+
host silver {
hardware ethernet 18:03:73:f1:58:67;
fixed-address silver.wikimedia.org;
--
To view, visit https://gerrit.wikimedia.org/r/229710
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I599daa51b2b2e4078786dcf5a3d9e758973ff277
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alexandros Kosiaris akosia...@wikimedia.org
Gerrit-Reviewer: Alexandros Kosiaris akosia...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix toolbar position in iOS - change (mediawiki...MobileFrontend)
Esanders has uploaded a new change for review.
https://gerrit.wikimedia.org/r/230093
Change subject: Fix toolbar position in iOS
..
Fix toolbar position in iOS
When the CE is focused in iOS it calculates the overlap between
the desired cursor position and the keyboard, and it scrolls the
window up by that amount.
The problem is the window contains just the toolbar and a scrollable
container, so we end up losing the toolbar.
To work around this, wait for the keyboard to appear then apply
the window's scroll offset to the scrollable container and
reset the window scroll offset to 0.
Change-Id: Ib4ff64589d299cac53a7d12f2a97dfc3149ea65a
---
M resources/mobile.editor.ve/ve.init.mw.MobileFrontendArticleTarget.js
1 file changed, 24 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend
refs/changes/93/230093/1
diff --git
a/resources/mobile.editor.ve/ve.init.mw.MobileFrontendArticleTarget.js
b/resources/mobile.editor.ve/ve.init.mw.MobileFrontendArticleTarget.js
index 239dce0..bc8205b 100644
--- a/resources/mobile.editor.ve/ve.init.mw.MobileFrontendArticleTarget.js
+++ b/resources/mobile.editor.ve/ve.init.mw.MobileFrontendArticleTarget.js
@@ -5,7 +5,7 @@
* @license The MIT License (MIT); see LICENSE.txt
*/
-/* global ve */
+/* global ve, $ */
// jscs:disable
@@ -24,6 +24,7 @@
ve.init.mw.MobileFrontendArticleTarget.super.call( this, config );
this.overlay = overlay;
+ this.$overlayContent = overlay.$el.find( '.overlay-content' );
this.$overlaySurface = overlay.$el.find( '.surface' );
// Initialization
@@ -41,6 +42,28 @@
/*
* FIXME: @inheritdoc once this file is in the right repo
*/
+ve.init.mw.MobileFrontendArticleTarget.prototype.onSurfaceFocus = function () {
+ // Parent method
+
ve.init.mw.MobileFrontendArticleTarget.super.prototype.onSurfaceFocus.call(
this );
+
+ var target = this;
+ if ( ve.init.platform.constructor.static.isIos() ) {
+ // Wait until after the iOS keyboard opening transition
+ setTimeout( function () {
+ // iOS applies a scroll offset to the window to move
the cursor
+ // into view. Apply this offset to the surface instead.
+ var windowTop = $( window ).scrollTop(),
+ contentTop = target.$overlayContent.scrollTop();
+
+ $( window ).scrollTop( 0 );
+ target.$overlayContent.scrollTop( contentTop +
windowTop );
+ }, 500 );
+ }
+};
+
+/*
+ * FIXME: @inheritdoc once this file is in the right repo
+ */
ve.init.mw.MobileFrontendArticleTarget.prototype.createSurface = function (
dmDoc, config ) {
if ( this.overlay.isNewPage ) {
config = ve.extendObject( {
--
To view, visit https://gerrit.wikimedia.org/r/230093
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib4ff64589d299cac53a7d12f2a97dfc3149ea65a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Esanders esand...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] No longer need to pass isIOS to VE target - change (mediawiki...MobileFrontend)
Esanders has uploaded a new change for review. https://gerrit.wikimedia.org/r/230092 Change subject: No longer need to pass isIOS to VE target .. No longer need to pass isIOS to VE target Depends on Ic206d54ae in VE. Change-Id: I8ea9b1c507f548bf521d66074d5d0bfc0bb57b2e --- M resources/mobile.editor.ve/VisualEditorOverlay.js 1 file changed, 1 insertion(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend refs/changes/92/230092/1 diff --git a/resources/mobile.editor.ve/VisualEditorOverlay.js b/resources/mobile.editor.ve/VisualEditorOverlay.js index 0a786da..63579e7 100644 --- a/resources/mobile.editor.ve/VisualEditorOverlay.js +++ b/resources/mobile.editor.ve/VisualEditorOverlay.js @@ -67,8 +67,7 @@ $element: overlay.$el, // || undefined so that scrolling is not triggered for the lead (0) section // (which has no header to scroll to) - section: overlay.options.sectionId || undefined, - isIos: overlay.isIos + section: overlay.options.sectionId || undefined } ); overlay.target.activating = true; overlay.target.load(); -- To view, visit https://gerrit.wikimedia.org/r/230092 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I8ea9b1c507f548bf521d66074d5d0bfc0bb57b2e Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/MobileFrontend Gerrit-Branch: master Gerrit-Owner: Esanders esand...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add benefactors.wm.o A, MX, SPF, DKIM - change (operations/dns)
BBlack has submitted this change and it was merged. Change subject: Add benefactors.wm.o A, MX, SPF, DKIM .. Add benefactors.wm.o A, MX, SPF, DKIM Bug: T107940 Change-Id: I4d6395a8acbf35534440aa1dc82293def1051e73 --- M templates/wikimedia.org 1 file changed, 7 insertions(+), 0 deletions(-) Approvals: BBlack: Looks good to me, approved jenkins-bot: Verified diff --git a/templates/wikimedia.org b/templates/wikimedia.org index 962f4e3..f780327 100644 --- a/templates/wikimedia.org +++ b/templates/wikimedia.org @@ -402,7 +402,14 @@ apt 1H IN CNAMEcarbon archiva 1H IN CNAMEtitanium + benefactorevents 1H IN CNAMEtrilogytools1.azurewebsites.net. +benefactors 1H IN DYNA geoip!text-addrs +1H IN MX 10 polonium.wikimedia.org. +1H IN MX 50 lead.wikimedia.org. +1H IN TXT v=spf1 include:wikimedia.org include:jangosmtp.com ?all +benefactors._domainkey.benefactors 1H IN TXT v=DKIM1; k=rsa; p=MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC5yoFvu5O1XFxYE8Runib984wintsyQEz9c0WuvgSv69xKh20RvZqX3/YCE1a58JJKQ6FV62AqEeM8iOI2P88XlxHvt7We356Ztb8HUb23fmadXwKbfPzg+beij2MQUB4DTUf9nVifAUs9VH1YteUKHJ7n7SLgd2ANzhgz5soobQIDAQAB + cache 600 IN DYNA geoip!text-addrs config-master 1H IN CNAMEmisc-web-lb.eqiad -- To view, visit https://gerrit.wikimedia.org/r/230090 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I4d6395a8acbf35534440aa1dc82293def1051e73 Gerrit-PatchSet: 5 Gerrit-Project: operations/dns Gerrit-Branch: master Gerrit-Owner: BBlack bbl...@wikimedia.org Gerrit-Reviewer: BBlack bbl...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] benefactors SPF: s/jangosmtp/jangomail/ - change (operations/dns)
BBlack has uploaded a new change for review. https://gerrit.wikimedia.org/r/230095 Change subject: benefactors SPF: s/jangosmtp/jangomail/ .. benefactors SPF: s/jangosmtp/jangomail/ Bug: T107940 Change-Id: Ic010cbb633bf1242d9bec9f73cf02824c4986267 --- M templates/wikimedia.org 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/dns refs/changes/95/230095/1 diff --git a/templates/wikimedia.org b/templates/wikimedia.org index f780327..9301afb 100644 --- a/templates/wikimedia.org +++ b/templates/wikimedia.org @@ -407,7 +407,7 @@ benefactors 1H IN DYNA geoip!text-addrs 1H IN MX 10 polonium.wikimedia.org. 1H IN MX 50 lead.wikimedia.org. -1H IN TXT v=spf1 include:wikimedia.org include:jangosmtp.com ?all +1H IN TXT v=spf1 include:wikimedia.org include:jangomail.com ?all benefactors._domainkey.benefactors 1H IN TXT v=DKIM1; k=rsa; p=MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC5yoFvu5O1XFxYE8Runib984wintsyQEz9c0WuvgSv69xKh20RvZqX3/YCE1a58JJKQ6FV62AqEeM8iOI2P88XlxHvt7We356Ztb8HUb23fmadXwKbfPzg+beij2MQUB4DTUf9nVifAUs9VH1YteUKHJ7n7SLgd2ANzhgz5soobQIDAQAB cache 600 IN DYNA geoip!text-addrs -- To view, visit https://gerrit.wikimedia.org/r/230095 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic010cbb633bf1242d9bec9f73cf02824c4986267 Gerrit-PatchSet: 1 Gerrit-Project: operations/dns Gerrit-Branch: master Gerrit-Owner: BBlack bbl...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] benefactors SPF: s/jangosmtp/jangomail/ - change (operations/dns)
BBlack has submitted this change and it was merged. Change subject: benefactors SPF: s/jangosmtp/jangomail/ .. benefactors SPF: s/jangosmtp/jangomail/ Bug: T107940 Change-Id: Ic010cbb633bf1242d9bec9f73cf02824c4986267 --- M templates/wikimedia.org 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: BBlack: Verified; Looks good to me, approved jenkins-bot: Verified diff --git a/templates/wikimedia.org b/templates/wikimedia.org index f780327..9301afb 100644 --- a/templates/wikimedia.org +++ b/templates/wikimedia.org @@ -407,7 +407,7 @@ benefactors 1H IN DYNA geoip!text-addrs 1H IN MX 10 polonium.wikimedia.org. 1H IN MX 50 lead.wikimedia.org. -1H IN TXT v=spf1 include:wikimedia.org include:jangosmtp.com ?all +1H IN TXT v=spf1 include:wikimedia.org include:jangomail.com ?all benefactors._domainkey.benefactors 1H IN TXT v=DKIM1; k=rsa; p=MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC5yoFvu5O1XFxYE8Runib984wintsyQEz9c0WuvgSv69xKh20RvZqX3/YCE1a58JJKQ6FV62AqEeM8iOI2P88XlxHvt7We356Ztb8HUb23fmadXwKbfPzg+beij2MQUB4DTUf9nVifAUs9VH1YteUKHJ7n7SLgd2ANzhgz5soobQIDAQAB cache 600 IN DYNA geoip!text-addrs -- To view, visit https://gerrit.wikimedia.org/r/230095 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ic010cbb633bf1242d9bec9f73cf02824c4986267 Gerrit-PatchSet: 1 Gerrit-Project: operations/dns Gerrit-Branch: master Gerrit-Owner: BBlack bbl...@wikimedia.org Gerrit-Reviewer: BBlack bbl...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Mobile toolbar style tweak - change (mediawiki...VisualEditor)
Esanders has uploaded a new change for review.
https://gerrit.wikimedia.org/r/230096
Change subject: Mobile toolbar style tweak
..
Mobile toolbar style tweak
Remove incorrect border.
Change-Id: I9fcb7251afd0e3aa1601c31a684b15bf880b1152
---
M modules/ve-mw/init/styles/ve.init.mw.MobileArticleTarget.css
1 file changed, 0 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor
refs/changes/96/230096/1
diff --git a/modules/ve-mw/init/styles/ve.init.mw.MobileArticleTarget.css
b/modules/ve-mw/init/styles/ve.init.mw.MobileArticleTarget.css
index 66636f5..af57c29 100644
--- a/modules/ve-mw/init/styles/ve.init.mw.MobileArticleTarget.css
+++ b/modules/ve-mw/init/styles/ve.init.mw.MobileArticleTarget.css
@@ -89,7 +89,6 @@
.ve-init-mw-mobileArticleTarget-toolbar .oo-ui-toolbar-tools
.oo-ui-toolGroup .oo-ui-toolGroup-tools
.oo-ui-tool {
- border-left: 1px solid #ddd;
width: 100%;
}
--
To view, visit https://gerrit.wikimedia.org/r/230096
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I9fcb7251afd0e3aa1601c31a684b15bf880b1152
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders esand...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Make extensionname-timedmedia optional - change (translatewiki)
jenkins-bot has submitted this change and it was merged. Change subject: Make extensionname-timedmedia optional .. Make extensionname-timedmedia optional It's supposed to be optional according to its qqq documentation. Change-Id: Ic8ac733b9ad92620abe1dd65bf12ae6ee1a83b5c --- M groups/MediaWiki/mediawiki-extensions.txt 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Raimond Spekking: Looks good to me, approved jenkins-bot: Verified diff --git a/groups/MediaWiki/mediawiki-extensions.txt b/groups/MediaWiki/mediawiki-extensions.txt index b4434ed..2d6aad3 100644 --- a/groups/MediaWiki/mediawiki-extensions.txt +++ b/groups/MediaWiki/mediawiki-extensions.txt @@ -2217,6 +2217,7 @@ optional = timedmedia-derivative-opus, timedmedia-derivative-desc-opus optional = timedmedia-derivative-mp3, timedmedia-derivative-desc-mp3 optional = timedmedia-derivative-m4a, timedmedia-derivative-desc-m4a +optional = extensionname-timedmedia Timeline file = timeline/i18n/%CODE%.json -- To view, visit https://gerrit.wikimedia.org/r/230094 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ic8ac733b9ad92620abe1dd65bf12ae6ee1a83b5c Gerrit-PatchSet: 1 Gerrit-Project: translatewiki Gerrit-Branch: master Gerrit-Owner: Amire80 amir.ahar...@mail.huji.ac.il Gerrit-Reviewer: Raimond Spekking raimond.spekk...@gmail.com Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix validation in wbparsevalue. - change (mediawiki...Wikibase)
Daniel Kinzler has uploaded a new change for review.
https://gerrit.wikimedia.org/r/230100
Change subject: Fix validation in wbparsevalue.
..
Fix validation in wbparsevalue.
Change-Id: Ib1dd337d9131a0ba7762cd3d6bf57f6fed47b92f
---
M repo/includes/api/ParseValue.php
M repo/tests/phpunit/includes/api/ParseValueTest.php
2 files changed, 7 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/00/230100/1
diff --git a/repo/includes/api/ParseValue.php b/repo/includes/api/ParseValue.php
index d615343..6a516f0 100644
--- a/repo/includes/api/ParseValue.php
+++ b/repo/includes/api/ParseValue.php
@@ -214,7 +214,7 @@
}
if ( $validator ) {
- $validatorResult = $validator-validate( $value );
+ $validatorResult = $validator-validate( $parseResult );
$validationStatus =
$this-validatorErrorLocalizer-getResultStatus( $validatorResult );
$result['valid'] = $validationStatus-isOK();
diff --git a/repo/tests/phpunit/includes/api/ParseValueTest.php
b/repo/tests/phpunit/includes/api/ParseValueTest.php
index d48af07..46585d4 100644
--- a/repo/tests/phpunit/includes/api/ParseValueTest.php
+++ b/repo/tests/phpunit/includes/api/ParseValueTest.php
@@ -11,6 +11,8 @@
use Wikibase\Repo\Api\ApiErrorReporter;
use Wikibase\Repo\Api\ParseValue;
use Wikibase\Repo\BuilderBasedDataTypeValidatorFactory;
+use Wikibase\Repo\Validators\DataFieldValidator;
+use Wikibase\Repo\Validators\DataValueValidator;
use Wikibase\Repo\ValueParserFactory;
use Wikibase\Repo\WikibaseRepo;
use Wikibase\Repo\Validators\RegexValidator;
@@ -80,7 +82,10 @@
}
public function newArrayWithStringValidator() {
- return array( new RegexValidator( '/INVALID/', true,
'no-kittens' ) );
+ return array(
+ new DataValueValidator(
+ new RegexValidator( '/INVALID/', true,
'no-kittens' )
+ ) );
}
public function newStringDataType( $name ) {
--
To view, visit https://gerrit.wikimedia.org/r/230100
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib1dd337d9131a0ba7762cd3d6bf57f6fed47b92f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Daniel Kinzler daniel.kinz...@wikimedia.de
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Tweak the layout of the experiments code - change (mediawiki...MobileFrontend)
Phuedx has uploaded a new change for review.
https://gerrit.wikimedia.org/r/230099
Change subject: Tweak the layout of the experiments code
..
Tweak the layout of the experiments code
In order to ease extracting the experiments code - either upstreaming
it to mediawiki/core or creating a micro-library - the core function,
bucket, needs to be made agnostic of MobileFrontend.
* Create the getBucketInternal function from the bucket function and
those parts of the getBucket function that aren't MobileFrontend-
specific
* Make getBucket wrap the getBucketInternal function, passing in the
MobileFrontend experiments configuration, wgMFExperiments, and the
user's session ID
Bug: T107592
Change-Id: Id23edeffb3cd025bf0db7f80e4133e5334e704f7
---
M resources/mobile.experiments/experiments.js
M tests/qunit/mobile.experiments/test_experiments.js
2 files changed, 42 insertions(+), 30 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend
refs/changes/99/230099/1
diff --git a/resources/mobile.experiments/experiments.js
b/resources/mobile.experiments/experiments.js
index a5d8cb8..f2f82aa 100644
--- a/resources/mobile.experiments/experiments.js
+++ b/resources/mobile.experiments/experiments.js
@@ -32,32 +32,57 @@
}
/**
-* Assigns a user to a bucket.
+* Gets the bucket for the experiment given the token.
*
* The name of the experiment and the user's token are hashed. The hash
is converted to a number
* which is then used to assign the user to a bucket.
*
-* Based on the `mw.user.bucket` function.
+* Consider the following experiment configuration:
*
+* code
+* {
+* enabled: true,
+* buckets: {
+* control: 0.5
+* A: 0.25,
+* B: 0.25
+* }
+* }
+* /code
+*
+* The experiment has three buckets: control, A, and B. The user has a
50% chance of being
+* assigned to the control bucket, and a 25% chance of being assigned
to either the A or B
+* buckets. If the experiment were disabled, then the user would always
be assigned to the
+* control bucket.
+*
+* This function is based on the deprecated `mw.user.bucket` function.
+*
+* @param {Object} experiments A map of experiment name to experiment
definition
* @param {String} experiment
-* @param {Object} buckets A map of bucket name to weight, e.g.
-* code
-* {
-* control: 0.5,
-* A: 0.25,
-* B: 0.25
-* }
-* /code
-* @ignore
* @param {String} token
-* @return {String}
+* @throws Error If the experiment hasn't been defined
+* @returns {String}
*/
- function bucket( experiment, buckets, token ) {
- var key,
+ function getBucketInternal( experiments, experiment, token ) {
+ var options,
+ buckets,
+ key,
range = 0,
hash,
max,
acc = 0;
+
+ if ( !experiments.hasOwnProperty( experiment ) ) {
+ throw new Error( 'The experiment ' + experiment + '
hasn\'t been defined.' );
+ }
+
+ options = experiments[experiment];
+
+ if ( !options.enabled ) {
+ return CONTROL_BUCKET;
+ }
+
+ buckets = options.buckets;
for ( key in buckets ) {
range += buckets[key];
@@ -97,26 +122,14 @@
getBucket: function ( experiment ) {
var experiments = mw.config.get( 'wgMFExperiments' ) ||
{},
options,
- token;
-
- if ( !experiments.hasOwnProperty( experiment ) ) {
- throw new Error( 'The experiment ' +
experiment + ' hasn\'t been defined.' );
- }
-
- options = experiments[experiment];
-
- if ( !options.enabled ) {
- return CONTROL_BUCKET;
- }
-
- token = user.getSessionId();
+ token = user.getSessionId();
// The browser doesn't support local storage? See
`browser.supportsLocalStorage`.
if ( token === '' ) {
return CONTROL_BUCKET;
}
- return bucket( experiment, options.buckets, token );
+ return getBucketInternal( experiments, experiment,
token )
}
} );
[MediaWiki-commits] [Gerrit] Get URL params via mw.Uri() instead of ad-hoc methods - change (mediawiki...CentralNotice)
AndyRussG has uploaded a new change for review.
https://gerrit.wikimedia.org/r/230192
Change subject: Get URL params via mw.Uri() instead of ad-hoc methods
..
Get URL params via mw.Uri() instead of ad-hoc methods
Change-Id: Idee6c32d06afbc946aa0a03d632b63630af95240
---
M resources/subscribing/ext.centralNotice.display.state.js
1 file changed, 1 insertion(+), 31 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CentralNotice
refs/changes/92/230192/1
diff --git a/resources/subscribing/ext.centralNotice.display.state.js
b/resources/subscribing/ext.centralNotice.display.state.js
index 1f6890b..96f43f5 100644
--- a/resources/subscribing/ext.centralNotice.display.state.js
+++ b/resources/subscribing/ext.centralNotice.display.state.js
@@ -40,34 +40,6 @@
};
/**
-* Return an object with URL query string parameters.
-* TODO Taken from legacy code. Is this the right way to do this?
-* @returns {Object}
-*/
- function setURLParams() {
-
- document.location.search.replace( /\??(?:([^=]+)=([^]*)?)/g,
- function ( str, p1, p2 ) {
- state.urlParams[decode( p1 )] = decode( p2 );
- } );
- }
-
- /**
-* '+'-replacer and try-catch wrapper for decodeURIComponent
-* TODO Taken from legacy code. Is this the right way to do this?
-* @param {string} s
-* @returns {string}
-*/
- function decode( s ) {
- try {
- // decodeURIComponent can throw an exception for
unknown char encodings.
- return decodeURIComponent( s.replace( rPlus, ' ' ) );
- } catch ( e ) {
- return '';
- }
- }
-
- /**
* Get a code for the general category the user's device is in.
*/
function getDeviceCode() {
@@ -102,7 +74,7 @@
*/
function setInitialData() {
- var urlParams = state.urlParams;
+ var urlParams = state.urlParams = $.extend( {}, ( new mw.Uri()
).query );
data.anonymous = ( mw.config.get( 'wgUserName' ) === null );
data.project = mw.config.get( 'wgNoticeProject' );
@@ -165,13 +137,11 @@
},
setUp: function() {
- setURLParams();
setInitialData();
data.status = STATUSES.CAMPAIGN_NOT_CHOSEN;
},
setUpForTestingBanner: function() {
- setURLParams();
setInitialData();
// Load banner and campaign URL params into data
--
To view, visit https://gerrit.wikimedia.org/r/230192
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Idee6c32d06afbc946aa0a03d632b63630af95240
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CentralNotice
Gerrit-Branch: campaign_mixins
Gerrit-Owner: AndyRussG andrew.green...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Added position to ResourceLoader module - necessary for MW 1... - change (mediawiki...ApprovedRevs)
Yaron Koren has uploaded a new change for review. https://gerrit.wikimedia.org/r/230223 Change subject: Added position to ResourceLoader module - necessary for MW 1.26+ .. Added position to ResourceLoader module - necessary for MW 1.26+ Change-Id: If0614da5303ac53c1f234afc1cdef96ff4d6de39 --- M ApprovedRevs.php 1 file changed, 2 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ApprovedRevs refs/changes/23/230223/1 diff --git a/ApprovedRevs.php b/ApprovedRevs.php index 0412df3..6506cf3 100644 --- a/ApprovedRevs.php +++ b/ApprovedRevs.php @@ -90,5 +90,6 @@ $wgResourceModules['ext.ApprovedRevs'] = array( 'styles' = 'ApprovedRevs.css', 'localBasePath' = __DIR__, - 'remoteExtPath' = 'ApprovedRevs' + 'remoteExtPath' = 'ApprovedRevs', + 'position' = 'bottom' ); -- To view, visit https://gerrit.wikimedia.org/r/230223 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If0614da5303ac53c1f234afc1cdef96ff4d6de39 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/ApprovedRevs Gerrit-Branch: master Gerrit-Owner: Yaron Koren yaro...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Hygiene: Fix PageFragment MenuItem variable names - change (apps...wikipedia)
jenkins-bot has submitted this change and it was merged.
Change subject: Hygiene: Fix PageFragment MenuItem variable names
..
Hygiene: Fix PageFragment MenuItem variable names
They're menu items, not menus.
Change-Id: Idf8feaa06e08c30c3c8ea0cae1fc2c8e0ce3df10
---
M app/src/main/java/org/wikipedia/page/PageFragment.java
1 file changed, 21 insertions(+), 22 deletions(-)
Approvals:
Dbrant: Looks good to me, approved
Niedzielski: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/app/src/main/java/org/wikipedia/page/PageFragment.java
b/app/src/main/java/org/wikipedia/page/PageFragment.java
index 8ef820a..611a983 100755
--- a/app/src/main/java/org/wikipedia/page/PageFragment.java
+++ b/app/src/main/java/org/wikipedia/page/PageFragment.java
@@ -679,39 +679,38 @@
if (!isAdded() || getPageActivity().isSearching()) {
return;
}
-MenuItem savePageMenu = menu.findItem(R.id.menu_save_page);
-if (savePageMenu == null) {
+MenuItem savePageItem = menu.findItem(R.id.menu_save_page);
+if (savePageItem == null) {
return;
}
-MenuItem shareMenu = menu.findItem(R.id.menu_share_page);
-MenuItem otherLangMenu = menu.findItem(R.id.menu_other_languages);
-MenuItem findInPageMenu = menu.findItem(R.id.menu_find_in_page);
-MenuItem themeChooserMenu = menu.findItem(R.id.menu_themechooser);
-MenuItem tabsMenu = menu.findItem(R.id.menu_show_tabs);
+MenuItem shareItem = menu.findItem(R.id.menu_share_page);
+MenuItem otherLangItem = menu.findItem(R.id.menu_other_languages);
+MenuItem findInPageItem = menu.findItem(R.id.menu_find_in_page);
+MenuItem themeChooserItem = menu.findItem(R.id.menu_themechooser);
if (pageLoadStrategy.isLoading()) {
-savePageMenu.setEnabled(false);
-shareMenu.setEnabled(false);
-otherLangMenu.setEnabled(false);
-findInPageMenu.setEnabled(false);
-themeChooserMenu.setEnabled(false);
+savePageItem.setEnabled(false);
+shareItem.setEnabled(false);
+otherLangItem.setEnabled(false);
+findInPageItem.setEnabled(false);
+themeChooserItem.setEnabled(false);
} else {
-savePageMenu.setEnabled(true);
-shareMenu.setEnabled(true);
+savePageItem.setEnabled(true);
+shareItem.setEnabled(true);
// Only display Read in other languages if the article is in
other languages
-otherLangMenu.setVisible(model.getPage() != null
model.getPage().getPageProperties().getLanguageCount() != 0);
-otherLangMenu.setEnabled(true);
-findInPageMenu.setEnabled(true);
-themeChooserMenu.setEnabled(true);
+otherLangItem.setVisible(model.getPage() != null
model.getPage().getPageProperties().getLanguageCount() != 0);
+otherLangItem.setEnabled(true);
+findInPageItem.setEnabled(true);
+themeChooserItem.setEnabled(true);
int subState = pageLoadStrategy.getSubState();
if (subState == SUBSTATE_PAGE_SAVED) {
-savePageMenu.setEnabled(false);
-
savePageMenu.setTitle(WikipediaApp.getInstance().getString(R.string.menu_page_saved));
+savePageItem.setEnabled(false);
+
savePageItem.setTitle(WikipediaApp.getInstance().getString(R.string.menu_page_saved));
} else if (subState == SUBSTATE_SAVED_PAGE_LOADED) {
-
savePageMenu.setTitle(WikipediaApp.getInstance().getString(R.string.menu_refresh_saved_page));
+
savePageItem.setTitle(WikipediaApp.getInstance().getString(R.string.menu_refresh_saved_page));
} else {
-
savePageMenu.setTitle(WikipediaApp.getInstance().getString(R.string.menu_save_page));
+
savePageItem.setTitle(WikipediaApp.getInstance().getString(R.string.menu_save_page));
}
}
}
--
To view, visit https://gerrit.wikimedia.org/r/229990
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Idf8feaa06e08c30c3c8ea0cae1fc2c8e0ce3df10
Gerrit-PatchSet: 2
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Mholloway mhollo...@wikimedia.org
Gerrit-Reviewer: BearND bsitzm...@wikimedia.org
Gerrit-Reviewer: Brion VIBBER br...@wikimedia.org
Gerrit-Reviewer: Dbrant dbr...@wikimedia.org
Gerrit-Reviewer: Mholloway mhollo...@wikimedia.org
Gerrit-Reviewer: Niedzielski sniedziel...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] WPB followup - move maxheight - change (mediawiki...WikidataPageBanner)
Sumit has uploaded a new change for review.
https://gerrit.wikimedia.org/r/230226
Change subject: WPB followup - move maxheight
..
WPB followup - move maxheight
Followup to Ifd696117d4614389685945ad3853a473179c2c03 to move max-height outside
media query as a general rule.
Bug: T108232
Change-Id: I385b11a55beea1c2a6922d5eb92b2da3268f3844
---
M resources/ext.WikidataPageBanner.styles/ext.WikidataPageBanner.less
1 file changed, 4 insertions(+), 5 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikidataPageBanner
refs/changes/26/230226/1
diff --git
a/resources/ext.WikidataPageBanner.styles/ext.WikidataPageBanner.less
b/resources/ext.WikidataPageBanner.styles/ext.WikidataPageBanner.less
index ed938c9..fac010a 100644
--- a/resources/ext.WikidataPageBanner.styles/ext.WikidataPageBanner.less
+++ b/resources/ext.WikidataPageBanner.styles/ext.WikidataPageBanner.less
@@ -18,6 +18,10 @@
max-width: 1800px;
height: auto;
margin: 1em 0;
+ overflow: hidden;
+ // rule for banners whose height may be much due to a different aspect
ratio other than
+ // Wikivoyage banners
+ max-height: 300px;
}
.wpb-topbanner .wpb-name {
@@ -67,11 +71,6 @@
// banner enlargement and faking banner cropping for small screens
@media screen and ( max-width: 400px ) {
.wpb-topbanner {
- overflow: hidden;
- // rule for banners whose height may be much due to a different
aspect ratio other than
- // Wikivoyage banners
- max-height: 300px;
-
.wpb-banner-image {
// this rule overrides the max-width:100% rule for
images in Skin Minerva so that banner
// can be increased in size for increasing the height
accordingly. The overflowing
--
To view, visit https://gerrit.wikimedia.org/r/230226
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I385b11a55beea1c2a6922d5eb92b2da3268f3844
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikidataPageBanner
Gerrit-Branch: master
Gerrit-Owner: Sumit asthana.sumi...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Don't try to create accounts on non-existent beta mediawikiwiki - change (operations/mediawiki-config)
Alex Monk has uploaded a new change for review.
https://gerrit.wikimedia.org/r/230227
Change subject: Don't try to create accounts on non-existent beta mediawikiwiki
..
Don't try to create accounts on non-existent beta mediawikiwiki
Caused the videoscaler (yes, really) jobrunner to be very unhappy
Bug: T108375
Change-Id: Icc2e2ace61ef2c31609c9d0e9d64144d7fd1f1dd
---
M wmf-config/CommonSettings.php
1 file changed, 4 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config
refs/changes/27/230227/1
diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index 945b08f..cba11f3 100755
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -1268,7 +1268,10 @@
$wgCentralAuthStrict = true;
// Create some local accounts as soon as the global registration happens
- $wgCentralAuthAutoCreateWikis = array( 'loginwiki', 'metawiki',
'mediawikiwiki' );
+ $wgCentralAuthAutoCreateWikis = array( 'loginwiki', 'metawiki' );
+ if ( $wmfRealm === 'production' ) {
+ $wgCentralAuthAutoCreateWikis[] = 'mediawikiwiki';
+ }
}
// Config for GlobalCssJs
--
To view, visit https://gerrit.wikimedia.org/r/230227
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Icc2e2ace61ef2c31609c9d0e9d64144d7fd1f1dd
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Alex Monk kren...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: 385e2e9..08df630 - change (mediawiki/extensions)
Jenkins-mwext-sync has uploaded a new change for review. https://gerrit.wikimedia.org/r/230229 Change subject: Syncronize VisualEditor: 385e2e9..08df630 .. Syncronize VisualEditor: 385e2e9..08df630 Change-Id: Iaee8d173728cd0f1aee018691d4587536901868a --- M VisualEditor 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions refs/changes/29/230229/1 diff --git a/VisualEditor b/VisualEditor index 385e2e9..08df630 16 --- a/VisualEditor +++ b/VisualEditor -Subproject commit 385e2e9b27f8737cbd05290f117f93a4b429035c +Subproject commit 08df630526dc6a7271cb91e511a75c3866180390 -- To view, visit https://gerrit.wikimedia.org/r/230229 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iaee8d173728cd0f1aee018691d4587536901868a Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions Gerrit-Branch: master Gerrit-Owner: Jenkins-mwext-sync jenkins-...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: 385e2e9..08df630 - change (mediawiki/extensions)
Jenkins-mwext-sync has submitted this change and it was merged. Change subject: Syncronize VisualEditor: 385e2e9..08df630 .. Syncronize VisualEditor: 385e2e9..08df630 Change-Id: Iaee8d173728cd0f1aee018691d4587536901868a --- 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 385e2e9..08df630 16 --- a/VisualEditor +++ b/VisualEditor -Subproject commit 385e2e9b27f8737cbd05290f117f93a4b429035c +Subproject commit 08df630526dc6a7271cb91e511a75c3866180390 -- To view, visit https://gerrit.wikimedia.org/r/230229 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iaee8d173728cd0f1aee018691d4587536901868a Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions Gerrit-Branch: master Gerrit-Owner: Jenkins-mwext-sync jenkins-...@wikimedia.org Gerrit-Reviewer: Jenkins-mwext-sync jenkins-...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Localisation updates from https://translatewiki.net. - change (apps...wikipedia)
jenkins-bot has submitted this change and it was merged. Change subject: Localisation updates from https://translatewiki.net. .. Localisation updates from https://translatewiki.net. Change-Id: I9a9cf9a5ac3b2e1a7822d9700a638c2d91004782 --- M app/src/main/res/values-bn/strings.xml M app/src/main/res/values-ca/strings.xml M app/src/main/res/values-da/strings.xml M app/src/main/res/values-gl/strings.xml M app/src/main/res/values-in/strings.xml M app/src/main/res/values-it/strings.xml M app/src/main/res/values-ja/strings.xml M app/src/main/res/values-ko/strings.xml M app/src/main/res/values-mk/strings.xml M app/src/main/res/values-sr/strings.xml M app/src/main/res/values-te/strings.xml 11 files changed, 41 insertions(+), 30 deletions(-) Approvals: BearND: Looks good to me, approved jenkins-bot: Verified diff --git a/app/src/main/res/values-bn/strings.xml b/app/src/main/res/values-bn/strings.xml index ad6ce5f..ee3f13e 100644 --- a/app/src/main/res/values-bn/strings.xml +++ b/app/src/main/res/values-bn/strings.xml @@ -91,7 +91,7 @@ string name=login_error_wrong_passwordভুল পাসওয়ার্ড/string string name=login_error_wrong_usernameভুল ব্যবহারকারী নাম/string string name=login_error_illegalঅগ্রহণযোগ্য ব্যবহারকারী নাম/string - string name=login_success_toast fuzzy=trueপ্রবেশ সফল!/string + string name=login_success_toastপ্রবেশ করা সফল!/string string name=login_error_blockedএই ব্যবহারকারীকে ব্লক করা হয়েছে/string string name=login_error_throttledঅনেকবার প্রবেশের চেষ্টা করা হয়েছে। কয়েক মিনিট অপেক্ষা করে আবার চেষ্টা করুন।/string string name=login_error_unknownপ্রবেশ ব্যর্থ :(/string diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml index f2075be..7c74bed 100644 --- a/app/src/main/res/values-ca/strings.xml +++ b/app/src/main/res/values-ca/strings.xml @@ -91,7 +91,7 @@ string name=login_error_wrong_passwordContrasenya incorrecta/string string name=login_error_wrong_usernameNom d\'usuari incorrecte/string string name=login_error_illegalNom d\'usuari no vàlid/string - string name=login_success_toast fuzzy=trueS\'ha iniciat sessió correctament!/string + string name=login_success_toastS\'ha iniciat la sessió correctament!/string string name=login_error_blockedAquest usuari ha estat bloquejat/string string name=login_error_throttledMassa intents. Espereu uns minuts i torneu-ho a intentar./string string name=login_error_unknownHa fallat l\'inici de sessió :(/string diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml index 400a6b9..6085a07 100644 --- a/app/src/main/res/values-da/strings.xml +++ b/app/src/main/res/values-da/strings.xml @@ -7,10 +7,10 @@ string name=noNej/string string name=acra_report_dialog_titleWikipedia gik ned :(/string string name=acra_report_dialog_textSend os en nedbrudsrapport/string - string name=acra_report_dialog_commentHvad lavede du, da nedbruddet skete?/string + string name=acra_report_dialog_commentHvad lavede du, da appen gik ned?/string string name=search_hintSøg i Wikipedia/string string name=nav_item_historyHistorik/string - string name=error_network_errorNetværksforbindelsen kunne ikke oprettes./string + string name=error_network_errorNetværksforbindelsen kunne ikke etableres./string string name=search_network_errorNetværksfejl. Tryk for at prøve igen./string string name=generic_page_errorDer opstod et problem under behandlingen af din forespørgsel./string string name=status_code_unavailableServerens statuskode er ikke tilgængelig./string @@ -19,7 +19,7 @@ string name=menu_clear_all_saved_pagesRyd gemte sider/string string name=page_does_not_exist_errorDenne side findes ikke./string string name=nav_item_todayI dag/string - string name=dialog_title_clear_historyRyd browserhistorikken?/string + string name=dialog_title_clear_historyVil du rydde browserhistorikken?/string string name=nav_item_saved_pagesGemte sider/string string name=menu_update_all_saved_pagesOpdater gemte sider/string string name=menu_update_selected_saved_pagesOpdater gemte sider/string @@ -34,7 +34,7 @@ string name=toast_refresh_saved_pageOpdaterer gemt side…/string string name=delete_selected_saved_pagesSlet/string string name=toast_saved_page_deletedGemt(e) side(r) slettet/string - string name=saved_pages_search_list_hintSøg i gemte sider/string + string name=saved_pages_search_list_hintSøg i Gemte sider/string string name=saved_pages_search_empty_messageIngen sider fundet der matcher din forespørgsel./string string name=nav_item_nearbyI nærheden/string string name=menu_update_nearbyOpdater \i nærheden\/string @@ -70,7 +70,7 @@ string name=edit_saved_successfullyRedigering gemt!/string string name=dialog_message_edit_failedRedigering mislykkedes!/string string name=dialog_message_edit_failed_retryPrøv igen/string - string
[MediaWiki-commits] [Gerrit] QuickSurveys extension boilerplate commit - change (mediawiki...QuickSurveys)
Robmoen has uploaded a new change for review.
https://gerrit.wikimedia.org/r/230237
Change subject: QuickSurveys extension boilerplate commit
..
QuickSurveys extension boilerplate commit
Bug: T107581
Change-Id: I258e4cda2e3a4acd4f0a2162194c47c4b9fc5e1e
---
A QuickSurveys.php
A phpcs.xml
2 files changed, 20 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/QuickSurveys
refs/changes/37/230237/1
diff --git a/QuickSurveys.php b/QuickSurveys.php
new file mode 100644
index 000..b88b819
--- /dev/null
+++ b/QuickSurveys.php
@@ -0,0 +1,13 @@
+?php
+if ( function_exists( 'wfLoadExtension' ) ) {
+ wfLoadExtension( 'QuickSurveys' );
+ // Keep i18n globals so mergeMessageFileList.php doesn't break
+ $wgMessagesDirs['QuickSurveys'] = __DIR__ . '/i18n';
+ /* wfWarn(
+ 'Deprecated PHP entry point used for QuickSurveys extension.
Please use wfLoadExtension instead, ' .
+ 'see https://www.mediawiki.org/wiki/Extension_registration for
more details.'
+ ); */
+ return;
+} else {
+ die( 'This version of the QuickSurveys extension requires MediaWiki
1.25+' );
+}
diff --git a/phpcs.xml b/phpcs.xml
new file mode 100644
index 000..cb19440
--- /dev/null
+++ b/phpcs.xml
@@ -0,0 +1,7 @@
+?xml version=1.0?
+ruleset
+ rule ref=vendor/mediawiki/mediawiki-codesniffer/MediaWiki/
+ file./file
+ arg name=extensions value=php/
+ exclude-patternvendor/exclude-pattern
+/ruleset
--
To view, visit https://gerrit.wikimedia.org/r/230237
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I258e4cda2e3a4acd4f0a2162194c47c4b9fc5e1e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/QuickSurveys
Gerrit-Branch: master
Gerrit-Owner: Robmoen rm...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] pybal-test: include admin - change (operations/puppet)
Dzahn has uploaded a new change for review.
https://gerrit.wikimedia.org/r/230238
Change subject: pybal-test: include admin
..
pybal-test: include admin
Change-Id: Ifaf8c4a45eb05baaa85f2ca722e3bc0398831ea9
---
M manifests/site.pp
1 file changed, 1 insertion(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/38/230238/1
diff --git a/manifests/site.pp b/manifests/site.pp
index 9181bb8..d12ed5c 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -2113,6 +2113,7 @@
# pybal-test200X VMs are used for pybal testing/development
node /^pybal-test200[123]\.codfw\.wmnet$/ {
include standard
+include admin
}
# Tor relay
--
To view, visit https://gerrit.wikimedia.org/r/230238
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ifaf8c4a45eb05baaa85f2ca722e3bc0398831ea9
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn dz...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] [toollabs] Allow HBA login to all hosts - change (operations/puppet)
Merlijn van Deen has uploaded a new change for review.
https://gerrit.wikimedia.org/r/230245
Change subject: [toollabs] Allow HBA login to all hosts
..
[toollabs] Allow HBA login to all hosts
Bug: T104613
Change-Id: Ie510cd32c26743ee83165c097d38535d452cccd5
---
M modules/toollabs/manifests/compute.pp
M modules/toollabs/manifests/init.pp
M modules/toollabs/manifests/submit.pp
3 files changed, 4 insertions(+), 5 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/45/230245/1
diff --git a/modules/toollabs/manifests/compute.pp
b/modules/toollabs/manifests/compute.pp
index 08fa2f2..1035377 100644
--- a/modules/toollabs/manifests/compute.pp
+++ b/modules/toollabs/manifests/compute.pp
@@ -16,8 +16,7 @@
#
class toollabs::compute inherits toollabs {
-include toollabs::exec_environ,
-toollabs::hba
+include toollabs::exec_environ
motd::script { 'exechost-banner':
ensure = present,
diff --git a/modules/toollabs/manifests/init.pp
b/modules/toollabs/manifests/init.pp
index 8089a8f..a2f051c 100644
--- a/modules/toollabs/manifests/init.pp
+++ b/modules/toollabs/manifests/init.pp
@@ -23,7 +23,8 @@
$mail_domain = 'tools.wmflabs.org',
) {
-include labs_lvm
+include labs_lvm,
+toollabs::hba
$sysdir = '/data/project/.system'
$store = ${sysdir}/store
diff --git a/modules/toollabs/manifests/submit.pp
b/modules/toollabs/manifests/submit.pp
index 456c217..ab28a8a 100644
--- a/modules/toollabs/manifests/submit.pp
+++ b/modules/toollabs/manifests/submit.pp
@@ -15,8 +15,7 @@
class toollabs::submit inherits toollabs {
include gridengine::submit_host,
-toollabs::exec_environ,
-toollabs::hba
+toollabs::exec_environ
file { '/etc/ssh/ssh_config':
ensure = file,
--
To view, visit https://gerrit.wikimedia.org/r/230245
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie510cd32c26743ee83165c097d38535d452cccd5
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Merlijn van Deen valhall...@arctus.nl
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add cache_maps and related LVS config, using cp104[34] - change (operations/puppet)
BBlack has uploaded a new change for review.
https://gerrit.wikimedia.org/r/230246
Change subject: Add cache_maps and related LVS config, using cp104[34]
..
Add cache_maps and related LVS config, using cp104[34]
Bug: T105076
Change-Id: If05c07a32e89c8c5ec73716281cf4526943f5b7e
---
M conftool-data/nodes/eqiad.yaml
M conftool-data/services/cache.yaml
M hieradata/common.yaml
A hieradata/common/cache/ipsec/maps.yaml
A hieradata/common/cache/maps.yaml
M hieradata/common/lvs/configuration.yaml
M hieradata/labs.yaml
M manifests/role/cache.pp
M manifests/site.pp
M modules/role/manifests/cache/configuration.pp
A modules/role/manifests/cache/maps.pp
M modules/role/manifests/lvs/balancer.pp
M modules/varnish/templates/vcl/wikimedia.vcl.erb
A templates/varnish/maps-backend.inc.vcl.web
A templates/varnish/maps-frontend.inc.vcl.erb
15 files changed, 244 insertions(+), 5 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/46/230246/1
diff --git a/conftool-data/nodes/eqiad.yaml b/conftool-data/nodes/eqiad.yaml
index 78bf1ee..3d45f13 100644
--- a/conftool-data/nodes/eqiad.yaml
+++ b/conftool-data/nodes/eqiad.yaml
@@ -259,6 +259,9 @@
cp1073.eqiad.wmnet: [varnish-fe, varnish-be, nginx]
cp1074.eqiad.wmnet: [varnish-fe, varnish-be, nginx]
cp1099.eqiad.wmnet: [varnish-fe, varnish-be, nginx]
+cache_maps:
+ cp1043.eqiad.wmnet: [varnish-fe, varnish-be, nginx]
+ cp1044.eqiad.wmnet: [varnish-fe, varnish-be, nginx]
pdf:
ocg1001.eqiad.wmnet: [ocg]
ocg1002.eqiad.wmnet: [ocg]
diff --git a/conftool-data/services/cache.yaml
b/conftool-data/services/cache.yaml
index ad62f5e..70381f0 100644
--- a/conftool-data/services/cache.yaml
+++ b/conftool-data/services/cache.yaml
@@ -101,6 +101,28 @@
- eqiad
- esams
- ulsfo
+cache_maps:
+ varnish-fe:
+port: 80
+default_values:
+ pooled: no
+ weight: 1
+datacenters:
+ - eqiad
+ varnish-be:
+port: 3128
+default_values:
+ pooled: no
+ weight: 100
+datacenters:
+ - eqiad
+ nginx:
+port: 443
+default_values:
+ pooled: no
+ weight: 1
+datacenters:
+ - eqiad
cache_misc:
varnish-fe:
port: 80
diff --git a/hieradata/common.yaml b/hieradata/common.yaml
index 8702339..d818b9c 100644
--- a/hieradata/common.yaml
+++ b/hieradata/common.yaml
@@ -215,6 +215,11 @@
id: 50
sites:
codfw: []
+ cache_maps:
+name: Maps caches
+id: 51
+sites:
+ eqiad: []
zookeeper_hosts:
conf1001.eqiad.wmnet: '1101'
conf1002.eqiad.wmnet: '1102'
diff --git a/hieradata/common/cache/ipsec/maps.yaml
b/hieradata/common/cache/ipsec/maps.yaml
new file mode 100644
index 000..deafd12
--- /dev/null
+++ b/hieradata/common/cache/ipsec/maps.yaml
@@ -0,0 +1,4 @@
+nodes:
+ eqiad:
+- 'cp1043.eqiad.wmnet'
+- 'cp1044.eqiad.wmnet'
diff --git a/hieradata/common/cache/maps.yaml b/hieradata/common/cache/maps.yaml
new file mode 100644
index 000..deafd12
--- /dev/null
+++ b/hieradata/common/cache/maps.yaml
@@ -0,0 +1,4 @@
+nodes:
+ eqiad:
+- 'cp1043.eqiad.wmnet'
+- 'cp1044.eqiad.wmnet'
diff --git a/hieradata/common/lvs/configuration.yaml
b/hieradata/common/lvs/configuration.yaml
index f554a2e..8835878 100644
--- a/hieradata/common/lvs/configuration.yaml
+++ b/hieradata/common/lvs/configuration.yaml
@@ -25,6 +25,10 @@
ulsfo:
uploadlb: 198.35.26.112
uploadlb6: 2620:0:863:ed1a::2:b
+ maps: maps
+eqiad:
+ mapslb: 208.80.154.244
+ mapslb6: 2620:0:861:ed1a::2:d
apaches: apaches
eqiad: 10.2.2.1
codfw: 10.2.1.1
@@ -60,8 +64,6 @@
esams:
dns_rec: 91.198.174.216
dns_rec6: 2620:0:862:ed1a::3:fe
- osm: osm
-eqiad: 208.80.154.244
misc_web: misc_web
eqiad:
misc_weblb: 208.80.154.241
@@ -196,6 +198,46 @@
conftool:
cluster: cache_upload
service: nginx
+ maps:
+description: Maps service maps.%{::site}.wikimedia.org
+class: high-traffic2
+sites:
+- eqiad
+ip: *maps
+bgp: 'yes'
+depool-threshold: .5
+monitors:
+ IdleConnection:
+timeout-clean-reconnect: 3
+max-delay: 300
+conftool:
+ cluster: cache_maps
+ service: varnish-fe
+icinga:
+ uri: maps.wikimedia.org!/_info
+ sites:
+eqiad:
+ hostname: maps-lb.eqiad.wikimedia.org
+ maps-https:
+description: Maps service maps.%{::site}.wikimedia.org
+class: high-traffic2
+sites:
+- eqiad
+ip: *maps
+port: 443
+scheduler: sh
+bgp: 'no'
+depool-threshold: .5
+monitors:
+ ProxyFetch:
+url:
+- https://maps.wikimedia.org/_info
+ IdleConnection:
+timeout-clean-reconnect: 3
+max-delay: 300
+conftool:
+ cluster: cache_maps
+ service: nginx
mobile:
description: MediaWiki based mobile site
class: high-traffic1
diff --git
[MediaWiki-commits] [Gerrit] Revert toollabs: Add ecdsa keys to ssh_known_hosts - change (operations/puppet)
Merlijn van Deen has uploaded a new change for review.
https://gerrit.wikimedia.org/r/230248
Change subject: Revert toollabs: Add ecdsa keys to ssh_known_hosts
..
Revert toollabs: Add ecdsa keys to ssh_known_hosts
This reverts commit 3f345ebce5ed3e5ee73db98a28b1086cb155b660.
Change-Id: I3dfe7972c61e463ca3154a2950f21485b1f7a0b6
---
M modules/toollabs/manifests/init.pp
1 file changed, 1 insertion(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/48/230248/1
diff --git a/modules/toollabs/manifests/init.pp
b/modules/toollabs/manifests/init.pp
index 64b08b7..8089a8f 100644
--- a/modules/toollabs/manifests/init.pp
+++ b/modules/toollabs/manifests/init.pp
@@ -61,8 +61,7 @@
group = 'root',
mode= '0444',
require = File[$store],
-content = ${::fqdn},${::hostname},${::ipaddress} ssh-rsa
${::sshrsakey}\n +
-${::fqdn},${::hostname},${::ipaddress} ecdsa-sha2-nistp256
${::sshecdsakey}\n
+content = ${::fqdn},${::hostname},${::ipaddress} ssh-rsa
${::sshrsakey}\n,
}
exec { 'make_known_hosts':
--
To view, visit https://gerrit.wikimedia.org/r/230248
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I3dfe7972c61e463ca3154a2950f21485b1f7a0b6
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Merlijn van Deen valhall...@arctus.nl
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Revert toollabs: Add ecdsa keys to ssh_known_hosts - change (operations/puppet)
Yuvipanda has submitted this change and it was merged.
Change subject: Revert toollabs: Add ecdsa keys to ssh_known_hosts
..
Revert toollabs: Add ecdsa keys to ssh_known_hosts
This reverts commit 3f345ebce5ed3e5ee73db98a28b1086cb155b660.
Change-Id: I3dfe7972c61e463ca3154a2950f21485b1f7a0b6
---
M modules/toollabs/manifests/init.pp
1 file changed, 1 insertion(+), 2 deletions(-)
Approvals:
Yuvipanda: Verified; Looks good to me, approved
diff --git a/modules/toollabs/manifests/init.pp
b/modules/toollabs/manifests/init.pp
index 64b08b7..8089a8f 100644
--- a/modules/toollabs/manifests/init.pp
+++ b/modules/toollabs/manifests/init.pp
@@ -61,8 +61,7 @@
group = 'root',
mode= '0444',
require = File[$store],
-content = ${::fqdn},${::hostname},${::ipaddress} ssh-rsa
${::sshrsakey}\n +
-${::fqdn},${::hostname},${::ipaddress} ecdsa-sha2-nistp256
${::sshecdsakey}\n
+content = ${::fqdn},${::hostname},${::ipaddress} ssh-rsa
${::sshrsakey}\n,
}
exec { 'make_known_hosts':
--
To view, visit https://gerrit.wikimedia.org/r/230248
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I3dfe7972c61e463ca3154a2950f21485b1f7a0b6
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Merlijn van Deen valhall...@arctus.nl
Gerrit-Reviewer: Yuvipanda yuvipa...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] logstash: Enable doc_values in template mapping - change (operations/puppet)
BryanDavis has uploaded a new change for review.
https://gerrit.wikimedia.org/r/230250
Change subject: logstash: Enable doc_values in template mapping
..
logstash: Enable doc_values in template mapping
Add 'doc_values: true' to numeric, boolean, geo-point and not_analyzed
strings in the template mapping for new Elasticsearch logstash-*
indices.
Doc values reduce runtime heap consumption for fielddata usage by
creating pre-computed on-disk structures. We were doing this dynamic raw
strings previously but the configuration syntax has changed and upstream
Elasticsearch is not recommending this for all applicable field types.
The next major version (2.0) of Elasticsearch will use doc_values by
default.
Changing this in Puppet is just a bookkeeping and new Elasticsearch
cluster feature. Existing clusters will need to have their mappings
updated manually via HTTP PUT to /_template/logstash to replace the
current index template.
This template has already been applied to the production and beta
logstash clusters.
Ref:
https://www.elastic.co/guide/en/elasticsearch/guide/current/doc-values.html
Change-Id: Ie8cf588f7a0a9ebdb1ba0ca337e1cf934065b3e9
---
M files/logstash/elasticsearch-template.json
1 file changed, 45 insertions(+), 12 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/50/230250/1
diff --git a/files/logstash/elasticsearch-template.json
b/files/logstash/elasticsearch-template.json
index 91fff22..a29c3f5 100644
--- a/files/logstash/elasticsearch-template.json
+++ b/files/logstash/elasticsearch-template.json
@@ -16,7 +16,10 @@
},
mappings : {
_default_ : {
- _all : {enabled : true},
+ _all : {
+enabled : true,
+omit_norms: true
+ },
dynamic_templates : [ {
string_fields : {
match : *,
@@ -32,22 +35,40 @@
raw : {
type : string,
index : not_analyzed,
-ignore_above : 256
+ignore_above : 256,
+doc_values: true
}
}
}
}
} ],
properties : {
-@timestamp : { type : date, index : not_analyzed },
-@version : { type : string, index : not_analyzed },
+@timestamp : {
+ type : date,
+ index : not_analyzed,
+ doc_values: true
+},
+@version : {
+ type : string,
+ index : not_analyzed,
+ doc_values: true
+},
geoip : {
type : object,
dynamic : true,
path : full,
- properties : { location : { type : geo_point } }
+ properties : {
+location : {
+ type : geo_point,
+ doc_values: true
+}
+ }
},
-host : { type : string, index : not_analyzed },
+host : {
+ type : string,
+ index : not_analyzed,
+ doc_values: true
+},
message : {
type : string,
index : analyzed,
@@ -58,8 +79,8 @@
fields: {
raw: {
type: string,
- index: no,
- fielddata: { format: doc_values }
+ index: not_analyzed,
+ doc_values: true
},
normalized_message: {
index : analyzed,
@@ -68,14 +89,26 @@
}
}
},
-sequence_id : { type: long },
+sequence_id : {
+ type: long,
+ doc_values: true
+},
tags : {
type : string,
index : not_analyzed,
- index_name : tag
+ index_name : tag,
+ doc_values: true
},
-type : { type : string, index : not_analyzed },
-udp_sender : { type : string, index : not_analyzed }
+type : {
+ type : string,
+ index : not_analyzed,
+ doc_values: true
+},
+udp_sender : {
+ type : string,
+ index : not_analyzed,
+ doc_values: true
+}
}
}
}
--
To view, visit https://gerrit.wikimedia.org/r/230250
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie8cf588f7a0a9ebdb1ba0ca337e1cf934065b3e9
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BryanDavis bda...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] toollabs: Add ecdsa keys to ssh_known_hosts - change (operations/puppet)
Yuvipanda has submitted this change and it was merged.
Change subject: toollabs: Add ecdsa keys to ssh_known_hosts
..
toollabs: Add ecdsa keys to ssh_known_hosts
Bug: T103999
Original-Change-Id: I171c36f8d1ead3b664057258f5a86ab2f2d978ce
Change-Id: I3cfc5a406fc4bb820e7d2e5cee9cd09c850492f6
---
M modules/toollabs/manifests/init.pp
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Yuvipanda: Verified; Looks good to me, approved
diff --git a/modules/toollabs/manifests/init.pp
b/modules/toollabs/manifests/init.pp
index 8089a8f..d67ef99 100644
--- a/modules/toollabs/manifests/init.pp
+++ b/modules/toollabs/manifests/init.pp
@@ -61,7 +61,7 @@
group = 'root',
mode= '0444',
require = File[$store],
-content = ${::fqdn},${::hostname},${::ipaddress} ssh-rsa
${::sshrsakey}\n,
+content = ${::fqdn},${::hostname},${::ipaddress} ssh-rsa
${::sshrsakey}\n${::fqdn},${::hostname},${::ipaddress} ecdsa-sha2-nistp256
${::sshecdsakey}\n
}
exec { 'make_known_hosts':
--
To view, visit https://gerrit.wikimedia.org/r/230249
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I3cfc5a406fc4bb820e7d2e5cee9cd09c850492f6
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Merlijn van Deen valhall...@arctus.nl
Gerrit-Reviewer: Yuvipanda yuvipa...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Decouple session annotation from Cucumber - change (mediawiki/selenium)
Dduvall has uploaded a new change for review.
https://gerrit.wikimedia.org/r/230234
Change subject: Decouple session annotation from Cucumber
..
Decouple session annotation from Cucumber
Moved the annotation of the Selenium session into `Environment#setup`.
Bug: T108273
Change-Id: I3d1434ee94d07c014fc42d399bc5c219dcd769f1
---
M lib/mediawiki_selenium/environment.rb
M lib/mediawiki_selenium/support/hooks.rb
M spec/environment_spec.rb
3 files changed, 34 insertions(+), 18 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/selenium
refs/changes/34/230234/1
diff --git a/lib/mediawiki_selenium/environment.rb
b/lib/mediawiki_selenium/environment.rb
index 49acff5..f5f9085 100644
--- a/lib/mediawiki_selenium/environment.rb
+++ b/lib/mediawiki_selenium/environment.rb
@@ -346,14 +346,31 @@
RemoteBrowserFactory::REQUIRED_CONFIG.all? { |name| lookup(name,
default: false) }
end
-# Executes setup tasks. Currently no tasks are performed by default but
-# additional helpers may perform their own tasks by implementing this
+# Executes setup tasks, annotating the Selenium session with any
+# configured `job_name` and `build_number`.
+#
+# Additional helpers may perform their own tasks by implementing this
# method.
#
-# @param _info [Hash] Hash of test case information.
+# @example Setup the environment before each scenario starts
+# Before do |scenario|
+# setup(name: scenario.name)
+# end
#
-def setup(_info = {})
- # no-op
+# @param info [Hash] Hash of test case information.
+#
+def setup(info = {})
+ browser_factory.configure do |options|
+options[:desired_capabilities][:name] = info[:name] || 'scenario'
+ end
+
+ browser_factory.configure(:job_name) do |job, options|
+options[:desired_capabilities][:name] += #{job}
+ end
+
+ browser_factory.configure(:build_number) do |build, options|
+options[:desired_capabilities][:name] += ##{build}
+ end
end
# Executes teardown tasks including instructing all browser factories to
diff --git a/lib/mediawiki_selenium/support/hooks.rb
b/lib/mediawiki_selenium/support/hooks.rb
index 70cff16..d9971bb 100644
--- a/lib/mediawiki_selenium/support/hooks.rb
+++ b/lib/mediawiki_selenium/support/hooks.rb
@@ -59,19 +59,6 @@
Before do
# Create a unique random string for this scenario
@random_string = Random.new.rand.to_s
-
- # Annotate sessions with the scenario name and Jenkins build info
- browser_factory.configure do |options|
-options[:desired_capabilities][:name] = @scenario_name
- end
-
- browser_factory.configure(:job_name) do |job, options|
-options[:desired_capabilities][:name] += #{job}
- end
-
- browser_factory.configure(:build_number) do |build, options|
-options[:desired_capabilities][:name] += ##{build}
- end
end
After do |scenario|
diff --git a/spec/environment_spec.rb b/spec/environment_spec.rb
index 57c0924..833882a 100644
--- a/spec/environment_spec.rb
+++ b/spec/environment_spec.rb
@@ -396,6 +396,18 @@
end
end
+describe '#setup' do
+ subject { env.setup(name: 'Some test name') }
+
+ it 'configures the browser factory to accept `:job_name` and
`:build_number`' do
+expect(env.browser_factory).to receive(:configure)
+expect(env.browser_factory).to receive(:configure).with(:job_name)
+expect(env.browser_factory).to receive(:configure).with(:build_number)
+
+subject
+ end
+end
+
describe '#teardown' do
subject { env.teardown(status: status) }
--
To view, visit https://gerrit.wikimedia.org/r/230234
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I3d1434ee94d07c014fc42d399bc5c219dcd769f1
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/selenium
Gerrit-Branch: master
Gerrit-Owner: Dduvall dduv...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove use of deprecated TestUser-user - change (mediawiki...Wikibase)
jenkins-bot has submitted this change and it was merged.
Change subject: Remove use of deprecated TestUser-user
..
Remove use of deprecated TestUser-user
Change-Id: Ia1ffbfd75778f797c4f8451182c94024178dff1f
---
M repo/tests/phpunit/includes/api/BotEditTest.php
M repo/tests/phpunit/includes/api/IndependentWikibaseApiTestCase.php
M repo/tests/phpunit/includes/api/WikibaseApiTestCase.php
3 files changed, 4 insertions(+), 4 deletions(-)
Approvals:
Hoo man: Looks good to me, approved
jenkins-bot: Verified
diff --git a/repo/tests/phpunit/includes/api/BotEditTest.php
b/repo/tests/phpunit/includes/api/BotEditTest.php
index a623a1c..58b9939 100644
--- a/repo/tests/phpunit/includes/api/BotEditTest.php
+++ b/repo/tests/phpunit/includes/api/BotEditTest.php
@@ -129,7 +129,7 @@
$params['fromid'] = EntityTestHelper::getId(
$params['fromid'] );
$params['toid'] = EntityTestHelper::getId(
$params['toid'] );
}
- list( $result, , ) = $this-doApiRequestWithToken( $params,
null, self::$users['wbbot']-user );
+ list( $result, , ) = $this-doApiRequestWithToken( $params,
null, self::$users['wbbot']-getUser() );
// -- check the result
$this-assertArrayHasKey( 'success', $result, Missing
'success' marker in response. );
@@ -153,7 +153,7 @@
);
//@todo this really makes this test slow, is there a better way?
- $rcResult = $this-doApiRequest( $rcRequest, null, false,
self::$users['wbbot']-user );
+ $rcResult = $this-doApiRequest( $rcRequest, null, false,
self::$users['wbbot']-getUser() );
// -- check the recent changes result
-
$this-assertArrayHasKey( 'query', $rcResult[0], Must have a
'query' key in the result from the API );
diff --git a/repo/tests/phpunit/includes/api/IndependentWikibaseApiTestCase.php
b/repo/tests/phpunit/includes/api/IndependentWikibaseApiTestCase.php
index 6d4b5de..553ce9f 100644
--- a/repo/tests/phpunit/includes/api/IndependentWikibaseApiTestCase.php
+++ b/repo/tests/phpunit/includes/api/IndependentWikibaseApiTestCase.php
@@ -32,7 +32,7 @@
array( 'wbeditor' )
);
- $this-setMwGlobals( 'wgUser', self::$users['wbeditor']-user );
+ $this-setMwGlobals( 'wgUser',
self::$users['wbeditor']-getUser() );
if ( !$isSetup ) {
//TODO remove me once everything that needs this is
overridden
diff --git a/repo/tests/phpunit/includes/api/WikibaseApiTestCase.php
b/repo/tests/phpunit/includes/api/WikibaseApiTestCase.php
index 7505fef..fa475da 100644
--- a/repo/tests/phpunit/includes/api/WikibaseApiTestCase.php
+++ b/repo/tests/phpunit/includes/api/WikibaseApiTestCase.php
@@ -58,7 +58,7 @@
ApiTestCase::$users['wbeditor'] = self::$wbTestUser;
- $this-setMwGlobals( 'wgUser', self::$users['wbeditor']-user );
+ $this-setMwGlobals( 'wgUser',
self::$users['wbeditor']-getUser() );
$this-setMwGlobals( 'wgGroupPermissions', array( '*' = array(
'property-create' = true,
'createpage' = true,
--
To view, visit https://gerrit.wikimedia.org/r/230123
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia1ffbfd75778f797c4f8451182c94024178dff1f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Addshore addshorew...@gmail.com
Gerrit-Reviewer: Hoo man h...@online.de
Gerrit-Reviewer: Legoktm legoktm.wikipe...@gmail.com
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove use of deprecated wfSuppress/RestoreWarnings - change (mediawiki...Wikibase)
jenkins-bot has submitted this change and it was merged.
Change subject: Remove use of deprecated wfSuppress/RestoreWarnings
..
Remove use of deprecated wfSuppress/RestoreWarnings
Change-Id: I36b63b226a221710abb273987c998c80c27addf0
---
M lib/includes/store/EntityContentDataCodec.php
M lib/tests/phpunit/changes/ItemChangeTest.php
M repo/maintenance/dumpEntities.php
M repo/tests/phpunit/includes/PidLockTest.php
M repo/tests/phpunit/includes/RepoHooksTest.php
5 files changed, 13 insertions(+), 13 deletions(-)
Approvals:
Hoo man: Looks good to me, approved
jenkins-bot: Verified
diff --git a/lib/includes/store/EntityContentDataCodec.php
b/lib/includes/store/EntityContentDataCodec.php
index bf0953a..c1ecabc 100644
--- a/lib/includes/store/EntityContentDataCodec.php
+++ b/lib/includes/store/EntityContentDataCodec.php
@@ -184,7 +184,7 @@
throw new InvalidArgumentException( '$blob must be a
string' );
}
- wfSuppressWarnings();
+ \MediaWiki\suppressWarnings();
switch ( $this-sanitizeFormat( $format ) ) {
case CONTENT_FORMAT_JSON:
$data = json_decode( $blob, true );
@@ -195,7 +195,7 @@
default:
throw new InvalidArgumentException(
Unsupported decoding format: $format );
}
- wfRestoreWarnings();
+ \MediaWiki\restoreWarnings();
if ( !is_array( $data ) ) {
throw new MWContentSerializationException( Failed to
decode as $format );
diff --git a/lib/tests/phpunit/changes/ItemChangeTest.php
b/lib/tests/phpunit/changes/ItemChangeTest.php
index 6fba5b4..a613bcf 100644
--- a/lib/tests/phpunit/changes/ItemChangeTest.php
+++ b/lib/tests/phpunit/changes/ItemChangeTest.php
@@ -86,7 +86,7 @@
//NOTE: Disable developer warnings that may get triggered by
// the B/C code path.
$wgDevelopmentWarnings = false;
- wfSuppressWarnings();
+ \MediaWiki\suppressWarnings();
try {
$cases = array();
@@ -121,12 +121,12 @@
$cases['atomic-sitelink-diff'] = array( $change );
$wgDevelopmentWarnings = true;
- wfRestoreWarnings();
+ \MediaWiki\restoreWarnings();
return $cases;
} catch ( Exception $ex ) {
$wgDevelopmentWarnings = true;
- wfRestoreWarnings();
+ \MediaWiki\restoreWarnings();
throw $ex;
}
}
@@ -143,7 +143,7 @@
$this-setMwGlobals( 'wgDevelopmentWarnings', false );
// Also suppress notices that may be triggered by wfLogWarning
- wfSuppressWarnings();
+ \MediaWiki\suppressWarnings();
$exception = null;
try {
@@ -156,7 +156,7 @@
}
// this is our make-shift `finally` section.
- wfRestoreWarnings();
+ \MediaWiki\restoreWarnings();
if ( $exception ) {
throw $exception;
diff --git a/repo/maintenance/dumpEntities.php
b/repo/maintenance/dumpEntities.php
index 5c618d7..a5ac48b 100644
--- a/repo/maintenance/dumpEntities.php
+++ b/repo/maintenance/dumpEntities.php
@@ -174,9 +174,9 @@
$dumper-setBatchSize( $batchSize );
$idStream = $this-makeIdStream( $entityType,
$exceptionReporter );
- wfSuppressWarnings();
+ \MediaWiki\suppressWarnings();
$dumper-generateDump( $idStream );
- wfRestoreWarnings();
+ \MediaWiki\restoreWarnings();
if ( $idStream instanceof Disposable ) {
// close stream / free resources
diff --git a/repo/tests/phpunit/includes/PidLockTest.php
b/repo/tests/phpunit/includes/PidLockTest.php
index 99cb8f8..4791b6c 100644
--- a/repo/tests/phpunit/includes/PidLockTest.php
+++ b/repo/tests/phpunit/includes/PidLockTest.php
@@ -30,9 +30,9 @@
// Make sure that the given file has actually been removed.
// unlink gives a warning if you use it a file that doesn't
exist, suppress that
- wfSuppressWarnings();
+ \MediaWiki\suppressWarnings();
$this-assertFalse( $pidLock-removeLock() );
- wfRestoreWarnings();
+ \MediaWiki\restoreWarnings();
}
public function wikiIdProvider() {
diff --git a/repo/tests/phpunit/includes/RepoHooksTest.php
b/repo/tests/phpunit/includes/RepoHooksTest.php
index bda9272..e40cefb 100644
---
[MediaWiki-commits] [Gerrit] Made JobRunner bail more smoothly on near OOM - change (mediawiki/core)
Aaron Schulz has uploaded a new change for review.
https://gerrit.wikimedia.org/r/230236
Change subject: Made JobRunner bail more smoothly on near OOM
..
Made JobRunner bail more smoothly on near OOM
* Use the regular limit-X style response instead of throwing an
exception. This avoids loss of statd data and the like.
Change-Id: Ia08384a0d13c268f6e7a673b2265ab2e5539
---
M includes/jobqueue/JobRunner.php
1 file changed, 13 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/36/230236/1
diff --git a/includes/jobqueue/JobRunner.php b/includes/jobqueue/JobRunner.php
index 3982134..2465e5a 100644
--- a/includes/jobqueue/JobRunner.php
+++ b/includes/jobqueue/JobRunner.php
@@ -263,7 +263,10 @@
}
// Bail if near-OOM instead of in a job
- $this-assertMemoryOK();
+ if ( !$this-checkMemoryOK() ) {
+ $response['reached'] = 'memory-limit';
+ break;
+ }
}
} while ( $job ); // stop when there are no jobs
@@ -392,9 +395,9 @@
/**
* Make sure that this script is not too close to the memory usage
limit.
* It is better to die in between jobs than OOM right in the middle of
one.
-* @throws MWException
+* @return bool
*/
- private function assertMemoryOK() {
+ private function checkMemoryOK() {
static $maxBytes = null;
if ( $maxBytes === null ) {
$m = array();
@@ -408,8 +411,14 @@
}
$usedBytes = memory_get_usage();
if ( $maxBytes $usedBytes = 0.95 * $maxBytes ) {
- throw new MWException( Detected excessive memory usage
($usedBytes/$maxBytes). );
+ $msg = Detected excessive memory usage
($usedBytes/$maxBytes).;
+ $this-debugCallback( $msg );
+ $this-logger-error( $msg );
+
+ return false;
}
+
+ return true;
}
/**
--
To view, visit https://gerrit.wikimedia.org/r/230236
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia08384a0d13c268f6e7a673b2265ab2e5539
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz asch...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update ogv.js to 0.9.7 release - change (mediawiki...TimedMediaHandler)
jenkins-bot has submitted this change and it was merged. Change subject: Update ogv.js to 0.9.7 release .. Update ogv.js to 0.9.7 release Performance fixes for IE: * disable WebGL if using software rendering * reduce Flash audio shim overhead Change-Id: Ic5d0cf684939f7f41b62e2087ddc113a4971a703 --- M MwEmbedModules/EmbedPlayer/binPlayers/ogv.js/ogv-decoder-audio-opus.js M MwEmbedModules/EmbedPlayer/binPlayers/ogv.js/ogv-decoder-audio-vorbis.js M MwEmbedModules/EmbedPlayer/binPlayers/ogv.js/ogv-demuxer-ogg.js M MwEmbedModules/EmbedPlayer/binPlayers/ogv.js/ogv-support.js M MwEmbedModules/EmbedPlayer/binPlayers/ogv.js/ogv-version.js M MwEmbedModules/EmbedPlayer/binPlayers/ogv.js/ogv-worker-audio.js M MwEmbedModules/EmbedPlayer/binPlayers/ogv.js/ogv-worker-video.js M MwEmbedModules/EmbedPlayer/binPlayers/ogv.js/ogv.js M MwEmbedModules/EmbedPlayer/binPlayers/ogv.js/readme.md 9 files changed, 39 insertions(+), 15 deletions(-) Approvals: Paladox: Looks good to me, but someone else must approve TheDJ: Looks good to me, approved jenkins-bot: Verified -- To view, visit https://gerrit.wikimedia.org/r/230138 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ic5d0cf684939f7f41b62e2087ddc113a4971a703 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/TimedMediaHandler Gerrit-Branch: master Gerrit-Owner: Brion VIBBER br...@wikimedia.org Gerrit-Reviewer: Paladox thomasmulhall...@yahoo.com Gerrit-Reviewer: TheDJ hartman.w...@gmail.com Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix regression in iframe embedding for MediaWiki core updates - change (mediawiki...TimedMediaHandler)
jenkins-bot has submitted this change and it was merged.
Change subject: Fix regression in iframe embedding for MediaWiki core updates
..
Fix regression in iframe embedding for MediaWiki core updates
RL startup module is now loaded asynchronously, so have to stick
things in the window.RLQ queue instead of running them directly.
Recommend a further rewrite of the iframe embed mode later, it's
all a bit scary. :)
Bug: T108359
Change-Id: Ie8a5d47dc3df8301630743c95263736719625c6c
---
M TimedMediaIframeOutput.php
1 file changed, 25 insertions(+), 20 deletions(-)
Approvals:
TheDJ: Looks good to me, approved
jenkins-bot: Verified
diff --git a/TimedMediaIframeOutput.php b/TimedMediaIframeOutput.php
index 91859c7..22c6d79 100644
--- a/TimedMediaIframeOutput.php
+++ b/TimedMediaIframeOutput.php
@@ -100,11 +100,14 @@
/style
?php echo $wgOut-getHeadScripts(); ?
script
- mw.loader.using( 'mw.MwEmbedSupport', function() {
- mw.setConfig('EmbedPlayer.RewriteSelector', '');
+ window.RLQ = window.RLQ || [];
+ window.RLQ.push( function() {
+ mw.loader.using( 'mw.MwEmbedSupport', function() {
+ mw.setConfig('EmbedPlayer.RewriteSelector', '');
+ } );
+ // Turn off rewrite selector. This prevents automatic
conversion of
+ // video tags, since we are going to do that
ourselves later.
} );
- // Turn off rewrite selector. This prevents automatic
conversion of
- // video tags, since we are going to do that ourselves later.
/script
/head
body
@@ -114,27 +117,29 @@
/div
?php echo $wgOut-getBottomScripts(); ?
script
- mw.loader.using( 'mw.MwEmbedSupport', function() {
- // only enable fullscreen if enabled in iframe
- mw.setConfig('EmbedPlayer.EnableFullscreen',
document.fullscreenEnabled || document.webkitFullscreenEnabled ||
document.mozFullScreenEnabled || false );
- $('#bgimage').remove();
+ window.RLQ.push( function() {
+ mw.loader.using( 'mw.MwEmbedSupport', function() {
+ // only enable fullscreen if enabled in iframe
+ mw.setConfig('EmbedPlayer.EnableFullscreen',
document.fullscreenEnabled || document.webkitFullscreenEnabled ||
document.mozFullScreenEnabled || false );
+ $('#bgimage').remove();
- mw.setConfig( 'EmbedPlayer.IsIframeServer', true );
+ mw.setConfig( 'EmbedPlayer.IsIframeServer',
true );
- // rewrite player
- $( '#?php echo
TimedMediaTransformOutput::PLAYER_ID_PREFIX . '0' ?' ).embedPlayer(function(){
+ // rewrite player
+ $( '#?php echo
TimedMediaTransformOutput::PLAYER_ID_PREFIX . '0' ?' ).embedPlayer(function(){
- // Bind window resize to reize the player:
- var fitPlayer = function(){
- $( '#?php echo
TimedMediaTransformOutput::PLAYER_ID_PREFIX . '0' ?' )
- [0].updateLayout();
- }
+ // Bind window resize to reize the
player:
+ var fitPlayer = function(){
+ $( '#?php echo
TimedMediaTransformOutput::PLAYER_ID_PREFIX . '0' ?' )
+ [0].updateLayout();
+ }
- $( window ).resize( fitPlayer );
- $('#videoContainer').css({
- 'visibility':'visible'
+ $( window ).resize( fitPlayer );
+ $('#videoContainer').css({
+ 'visibility':'visible'
+ } );
+ fitPlayer();
} );
- fitPlayer();
} );
} );
/script
--
To view, visit https://gerrit.wikimedia.org/r/230151
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie8a5d47dc3df8301630743c95263736719625c6c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/TimedMediaHandler
Gerrit-Branch: master
Gerrit-Owner: Brion VIBBER br...@wikimedia.org
Gerrit-Reviewer: Catrope roan.katt...@gmail.com
Gerrit-Reviewer: TheDJ
[MediaWiki-commits] [Gerrit] remove unused revdns for osm-lb.esams - change (operations/dns)
BBlack has uploaded a new change for review. https://gerrit.wikimedia.org/r/230241 Change subject: remove unused revdns for osm-lb.esams .. remove unused revdns for osm-lb.esams Change-Id: I06c61214b17f5f5f52357ca933dae1064edd0984 --- M templates/174.198.91.in-addr.arpa M templates/2.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa 2 files changed, 0 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/dns refs/changes/41/230241/1 diff --git a/templates/174.198.91.in-addr.arpa b/templates/174.198.91.in-addr.arpa index b87b837..0926c79 100644 --- a/templates/174.198.91.in-addr.arpa +++ b/templates/174.198.91.in-addr.arpa @@ -56,7 +56,6 @@ ; - - 91.198.174.208/29 LVS Multimedia 208 1H IN PTR upload-lb.esams.wikimedia.org. -209 1H IN PTR osm-lb.esams.wikimedia.org. ; - - 91.198.174.216/29 LVS Misc diff --git a/templates/2.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa b/templates/2.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa index 9c1b4cb..d3ed811 100644 --- a/templates/2.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa +++ b/templates/2.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa @@ -100,7 +100,6 @@ 1.0.0.0 1H IN PTR text-lb.esams.wikimedia.org. e.0.0.0 1H IN PTR ns2.wikimedia.org. -0.1.0.0 1H IN PTR osm-lb.esams.wikimedia.org. ; LVS Mobile Zero general support, 2620:0:862:ed1a::1:0/112 -- To view, visit https://gerrit.wikimedia.org/r/230241 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I06c61214b17f5f5f52357ca933dae1064edd0984 Gerrit-PatchSet: 1 Gerrit-Project: operations/dns Gerrit-Branch: master Gerrit-Owner: BBlack bbl...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] [toollabs] Add ecdsa keys to ssh_known_hosts - change (operations/puppet)
Merlijn van Deen has uploaded a new change for review.
https://gerrit.wikimedia.org/r/230244
Change subject: [toollabs] Add ecdsa keys to ssh_known_hosts
..
[toollabs] Add ecdsa keys to ssh_known_hosts
Bug: T103999
Change-Id: I171c36f8d1ead3b664057258f5a86ab2f2d978ce
---
M modules/toollabs/manifests/init.pp
1 file changed, 2 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/44/230244/1
diff --git a/modules/toollabs/manifests/init.pp
b/modules/toollabs/manifests/init.pp
index 8089a8f..a131ae8 100644
--- a/modules/toollabs/manifests/init.pp
+++ b/modules/toollabs/manifests/init.pp
@@ -61,7 +61,8 @@
group = 'root',
mode= '0444',
require = File[$store],
-content = ${::fqdn},${::hostname},${::ipaddress} ssh-rsa
${::sshrsakey}\n,
+content = ${::fqdn},${::hostname},${::ipaddress} ssh-rsa
${::sshrsakey}\n +
+ ${::fqdn},${::hostname},${::ipaddress} ecdsa-sha2-nistp256
${::sshecdsakey}\n
}
exec { 'make_known_hosts':
--
To view, visit https://gerrit.wikimedia.org/r/230244
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I171c36f8d1ead3b664057258f5a86ab2f2d978ce
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Merlijn van Deen valhall...@arctus.nl
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] create maps-lb.eqiad, repurposing osm-lb.eqiad ipv4 - change (operations/dns)
BBlack has uploaded a new change for review.
https://gerrit.wikimedia.org/r/230242
Change subject: create maps-lb.eqiad, repurposing osm-lb.eqiad ipv4
..
create maps-lb.eqiad, repurposing osm-lb.eqiad ipv4
Change-Id: I1a81ccc29950eca912f1faea815aa5115bb7877e
---
M templates/1.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
M templates/154.80.208.in-addr.arpa
M templates/wikimedia.org
3 files changed, 4 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/dns
refs/changes/42/230242/1
diff --git a/templates/1.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
b/templates/1.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
index 56c697d..98b612a 100644
--- a/templates/1.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
+++ b/templates/1.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
@@ -218,7 +218,6 @@
1.0.0.0 1H IN PTR text-lb.eqiad.wikimedia.org.
e.0.0.0 1H IN PTR ns0.wikimedia.org.
-0.1.0.0 1H IN PTR osm-lb.eqiad.wikimedia.org.
1.1.0.0 1H IN PTR misc-web-lb.eqiad.wikimedia.org.
; LVS Mobile Zero general support, 2620:0:861:ed1a::1:0/112
@@ -232,6 +231,7 @@
$ORIGIN 2.0.0.0.0.0.0.0.0.0.0.0.a.1.d.e.{{ zonename }}.
b.0.0.0 1H IN PTR upload-lb.eqiad.wikimedia.org.
+d.0.0.0 1H IN PTR maps-lb.eqiad.wikimedia.org.
; LVS Misc, 2620:0:861:ed1a::3:0/112
diff --git a/templates/154.80.208.in-addr.arpa
b/templates/154.80.208.in-addr.arpa
index f7a1ff1..5dec1da 100644
--- a/templates/154.80.208.in-addr.arpa
+++ b/templates/154.80.208.in-addr.arpa
@@ -146,7 +146,7 @@
240 1H IN PTR upload-lb.eqiad.wikimedia.org.
241 1H IN PTR misc-web-lb.eqiad.wikimedia.org.
-244 1H IN PTR osm-lb.eqiad.wikimedia.org.
+244 1H IN PTR maps-lb.eqiad.wikimedia.org.
; Misc 208.80.154.248 - 208.80.154.255 (208.80.154.248/29)
248 1H IN PTR parsoid-lb.eqiad.wikimedia.org.
diff --git a/templates/wikimedia.org b/templates/wikimedia.org
index 9301afb..50b4df8 100644
--- a/templates/wikimedia.org
+++ b/templates/wikimedia.org
@@ -209,7 +209,8 @@
;;; ns0 208.80.154.238
dns-rec-lb.eqiad1H IN A208.80.154.239
1H IN 2620:0:861:ed1a::3:fe
-osm-lb.eqiad1H IN A208.80.154.244
+maps-lb.eqiad 1H IN A208.80.154.244
+1H IN A2620:0:861:ed1a::2:d
misc-web-lb.eqiad 1H IN A208.80.154.241
1H IN 2620:0:861:ed1a::11
--
To view, visit https://gerrit.wikimedia.org/r/230242
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I1a81ccc29950eca912f1faea815aa5115bb7877e
Gerrit-PatchSet: 1
Gerrit-Project: operations/dns
Gerrit-Branch: master
Gerrit-Owner: BBlack bbl...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] add maps.wikimedia.org (- maps-lb.eqiad) - change (operations/dns)
BBlack has uploaded a new change for review. https://gerrit.wikimedia.org/r/230243 Change subject: add maps.wikimedia.org (- maps-lb.eqiad) .. add maps.wikimedia.org (- maps-lb.eqiad) Change-Id: Ib145f13a7d86416bc2fa2949f335d899786dfea1 --- M templates/wikimedia.org 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/dns refs/changes/43/230243/1 diff --git a/templates/wikimedia.org b/templates/wikimedia.org index 50b4df8..84d19e6 100644 --- a/templates/wikimedia.org +++ b/templates/wikimedia.org @@ -211,6 +211,8 @@ 1H IN 2620:0:861:ed1a::3:fe maps-lb.eqiad 1H IN A208.80.154.244 1H IN A2620:0:861:ed1a::2:d +maps1H IN A208.80.154.244 +1H IN A2620:0:861:ed1a::2:d misc-web-lb.eqiad 1H IN A208.80.154.241 1H IN 2620:0:861:ed1a::11 -- To view, visit https://gerrit.wikimedia.org/r/230243 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib145f13a7d86416bc2fa2949f335d899786dfea1 Gerrit-PatchSet: 1 Gerrit-Project: operations/dns Gerrit-Branch: master Gerrit-Owner: BBlack bbl...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] add maps.wikimedia.org (- maps-lb.eqiad) - change (operations/dns)
BBlack has submitted this change and it was merged. Change subject: add maps.wikimedia.org (- maps-lb.eqiad) .. add maps.wikimedia.org (- maps-lb.eqiad) Bug: T105076 Change-Id: Ib145f13a7d86416bc2fa2949f335d899786dfea1 --- M templates/wikimedia.org 1 file changed, 2 insertions(+), 0 deletions(-) Approvals: BBlack: Looks good to me, approved jenkins-bot: Verified diff --git a/templates/wikimedia.org b/templates/wikimedia.org index ac852b4..c0a11a6 100644 --- a/templates/wikimedia.org +++ b/templates/wikimedia.org @@ -211,6 +211,8 @@ 1H IN 2620:0:861:ed1a::3:fe maps-lb.eqiad 1H IN A208.80.154.244 1H IN 2620:0:861:ed1a::2:d +maps1H IN A208.80.154.244 +1H IN 2620:0:861:ed1a::2:d misc-web-lb.eqiad 1H IN A208.80.154.241 1H IN 2620:0:861:ed1a::11 -- To view, visit https://gerrit.wikimedia.org/r/230243 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ib145f13a7d86416bc2fa2949f335d899786dfea1 Gerrit-PatchSet: 3 Gerrit-Project: operations/dns Gerrit-Branch: master Gerrit-Owner: BBlack bbl...@wikimedia.org Gerrit-Reviewer: BBlack bbl...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] create maps-lb.eqiad, repurposing osm-lb.eqiad ipv4 - change (operations/dns)
BBlack has submitted this change and it was merged.
Change subject: create maps-lb.eqiad, repurposing osm-lb.eqiad ipv4
..
create maps-lb.eqiad, repurposing osm-lb.eqiad ipv4
Bug: T105076
Change-Id: I1a81ccc29950eca912f1faea815aa5115bb7877e
---
M templates/1.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
M templates/154.80.208.in-addr.arpa
M templates/wikimedia.org
3 files changed, 4 insertions(+), 3 deletions(-)
Approvals:
BBlack: Looks good to me, approved
jenkins-bot: Verified
diff --git a/templates/1.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
b/templates/1.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
index 56c697d..98b612a 100644
--- a/templates/1.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
+++ b/templates/1.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
@@ -218,7 +218,6 @@
1.0.0.0 1H IN PTR text-lb.eqiad.wikimedia.org.
e.0.0.0 1H IN PTR ns0.wikimedia.org.
-0.1.0.0 1H IN PTR osm-lb.eqiad.wikimedia.org.
1.1.0.0 1H IN PTR misc-web-lb.eqiad.wikimedia.org.
; LVS Mobile Zero general support, 2620:0:861:ed1a::1:0/112
@@ -232,6 +231,7 @@
$ORIGIN 2.0.0.0.0.0.0.0.0.0.0.0.a.1.d.e.{{ zonename }}.
b.0.0.0 1H IN PTR upload-lb.eqiad.wikimedia.org.
+d.0.0.0 1H IN PTR maps-lb.eqiad.wikimedia.org.
; LVS Misc, 2620:0:861:ed1a::3:0/112
diff --git a/templates/154.80.208.in-addr.arpa
b/templates/154.80.208.in-addr.arpa
index f7a1ff1..5dec1da 100644
--- a/templates/154.80.208.in-addr.arpa
+++ b/templates/154.80.208.in-addr.arpa
@@ -146,7 +146,7 @@
240 1H IN PTR upload-lb.eqiad.wikimedia.org.
241 1H IN PTR misc-web-lb.eqiad.wikimedia.org.
-244 1H IN PTR osm-lb.eqiad.wikimedia.org.
+244 1H IN PTR maps-lb.eqiad.wikimedia.org.
; Misc 208.80.154.248 - 208.80.154.255 (208.80.154.248/29)
248 1H IN PTR parsoid-lb.eqiad.wikimedia.org.
diff --git a/templates/wikimedia.org b/templates/wikimedia.org
index 9301afb..ac852b4 100644
--- a/templates/wikimedia.org
+++ b/templates/wikimedia.org
@@ -209,7 +209,8 @@
;;; ns0 208.80.154.238
dns-rec-lb.eqiad1H IN A208.80.154.239
1H IN 2620:0:861:ed1a::3:fe
-osm-lb.eqiad1H IN A208.80.154.244
+maps-lb.eqiad 1H IN A208.80.154.244
+1H IN 2620:0:861:ed1a::2:d
misc-web-lb.eqiad 1H IN A208.80.154.241
1H IN 2620:0:861:ed1a::11
--
To view, visit https://gerrit.wikimedia.org/r/230242
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I1a81ccc29950eca912f1faea815aa5115bb7877e
Gerrit-PatchSet: 3
Gerrit-Project: operations/dns
Gerrit-Branch: master
Gerrit-Owner: BBlack bbl...@wikimedia.org
Gerrit-Reviewer: BBlack bbl...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] toollabs: Add ecdsa keys to ssh_known_hosts - change (operations/puppet)
Merlijn van Deen has uploaded a new change for review.
https://gerrit.wikimedia.org/r/230249
Change subject: toollabs: Add ecdsa keys to ssh_known_hosts
..
toollabs: Add ecdsa keys to ssh_known_hosts
Bug: T103999
Change-Id: I3cfc5a406fc4bb820e7d2e5cee9cd09c850492f6
Original-Change-Id: I171c36f8d1ead3b664057258f5a86ab2f2d978ce
---
M modules/toollabs/manifests/init.pp
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/49/230249/1
diff --git a/modules/toollabs/manifests/init.pp
b/modules/toollabs/manifests/init.pp
index 8089a8f..d67ef99 100644
--- a/modules/toollabs/manifests/init.pp
+++ b/modules/toollabs/manifests/init.pp
@@ -61,7 +61,7 @@
group = 'root',
mode= '0444',
require = File[$store],
-content = ${::fqdn},${::hostname},${::ipaddress} ssh-rsa
${::sshrsakey}\n,
+content = ${::fqdn},${::hostname},${::ipaddress} ssh-rsa
${::sshrsakey}\n${::fqdn},${::hostname},${::ipaddress} ecdsa-sha2-nistp256
${::sshecdsakey}\n
}
exec { 'make_known_hosts':
--
To view, visit https://gerrit.wikimedia.org/r/230249
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I3cfc5a406fc4bb820e7d2e5cee9cd09c850492f6
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Merlijn van Deen valhall...@arctus.nl
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] dotfiles: make `field` read from either stdin or a file - change (operations/puppet)
Ori.livneh has submitted this change and it was merged.
Change subject: dotfiles: make `field` read from either stdin or a file
..
dotfiles: make `field` read from either stdin or a file
Change-Id: Ie1dbbe264cff5f4123134c048564deb3330a0724
---
M modules/admin/files/home/ori/.bash_profile
1 file changed, 2 insertions(+), 2 deletions(-)
Approvals:
Ori.livneh: Verified; Looks good to me, approved
diff --git a/modules/admin/files/home/ori/.bash_profile
b/modules/admin/files/home/ori/.bash_profile
index 8f5d3c0..f7e2d09 100644
--- a/modules/admin/files/home/ori/.bash_profile
+++ b/modules/admin/files/home/ori/.bash_profile
@@ -69,8 +69,8 @@
perf() { sudo perf $@; }
gdbh() { sudo gdb -p $(pidof -s hhvm); }
redis-cli() { command redis-cli -a $(grep -Po '(?=masterauth )\S+'
/etc/redis/redis.conf) $@; }
-fields() { tail -1 ${@:---} | awk 'END { for (i = 1; i = NF; i++)
printf(%s : %s\n, i, $i) }' ; }
-field() { awk -v field=$1 '{print $(field)}'; }
+fields() { tail -1 ${@:---} | awk 'END { for (i = 1; i = NF; i++)
printf(%s : %s\n, i, $i) }'; }
+field() { local fieldnum=$1; shift; awk -v field=$fieldnum '{print
$(field)}' ${@}; }
lat(){ ls -lat *${@:+.}${@} | head; }
sudo() { command sudo -E $@; }
hbnt() { /usr/bin/comm -23 $1 $2; } # Here but not there (lines in
$1 that are not in $2)
--
To view, visit https://gerrit.wikimedia.org/r/230174
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie1dbbe264cff5f4123134c048564deb3330a0724
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ori.livneh o...@wikimedia.org
Gerrit-Reviewer: Ori.livneh o...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add a new Wikitext editor with very basic formatting features - change (mediawiki...MobileFrontend)
jenkins-bot has submitted this change and it was merged.
Change subject: Add a new Wikitext editor with very basic formatting features
..
Add a new Wikitext editor with very basic formatting features
With this new editor, MobileFrontend get's some very basic editing
features to easier:
* add (or format existing) text to in bold or italic to the wikitext
* add a reference to the cursor position
The editor is sampled to 50% of wikitext editors and logged with the
editor name SourceEditorWithFormatting to EventLogging.
Depends on: Idd2275788f11303bd965994c9fb2e6c2d59daa33
Bug: T91752
Change-Id: Ib5215d859118bad83e9cd12ea7691283707b13b5
---
M i18n/en.json
M i18n/qqq.json
A images/icons/reference-ltr.svg
A images/icons/reference-rtl.svg
M includes/Resources.php
M jsduck.json
M minerva.less/minerva.variables.less
M resources/mobile.editor.common/EditorOverlayBase.hogan
A resources/mobile.editor.overlay.withtoolbar/AddReferenceOverlay.js
A resources/mobile.editor.overlay.withtoolbar/EditorOverlayWithToolbar.js
A resources/mobile.editor.overlay.withtoolbar/EditorOverlayWithToolbar.less
A resources/mobile.editor.overlay.withtoolbar/contentAddReference.hogan
A resources/mobile.editor.overlay.withtoolbar/editorFooter.hogan
M resources/mobile.editor/init.js
M resources/mobile.overlays/Overlay.less
15 files changed, 381 insertions(+), 3 deletions(-)
Approvals:
Kaldari: Looks good to me, approved
jenkins-bot: Verified
diff --git a/i18n/en.json b/i18n/en.json
index 3b167ba..c56b6b4 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -142,6 +142,14 @@
mobile-frontend-editor-redlink-leave: No, thanks.,
mobile-frontend-editor-redlink-explain: This page has not yet been
created on {{SITENAME}}.,
mobile-frontend-editor-redlink-create: Create page,
+ mobile-frontend-editor-bold: Bold,
+ mobile-frontend-editor-italic: Italic,
+ mobile-frontend-editor-bold-text: Bold text,
+ mobile-frontend-editor-italic-text: Italic text,
+ mobile-frontend-editor-reference: Reference,
+ mobile-frontend-editor-insert-reference: Insert reference,
+ mobile-frontend-editor-reference-placeholder: Which source do you
refer to?,
+ mobile-frontend-editor-add-reference: Add,
mobile-frontend-enable-images: Enable images on mobile site,
mobile-frontend-errorreport-button-label: Report an error,
mobile-frontend-errorreport-error: Error, feedback could not be
posted.,
diff --git a/i18n/qqq.json b/i18n/qqq.json
index 6c56e41..e0d3fcb 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -137,6 +137,14 @@
mobile-frontend-editor-redlink-leave: Used as a message for a link,
that the user doesn't want to edit a page, that does not exist
yet.\n{{Identical|No thanks}},
mobile-frontend-editor-redlink-explain: Question for the user, if he
want to edit a page, which link he clicked and that does not exist yet, or
not.,
mobile-frontend-editor-redlink-create: Label for a create page
button.\n{{Identical|Create page}},
+ mobile-frontend-editor-bold: Title of \Bold\ button in editor.,
+ mobile-frontend-editor-italic: Title of \Italic\ button in
editor.,
+ mobile-frontend-editor-bold-text: Placeholder, which will be
inserted into the text area, if the user clicks the bold text button in editor,
and no text is selected.,
+ mobile-frontend-editor-italic-text: Placeholder, which will be
inserted into the text area, if the user clicks the italic text button in
editor, and no text is selected.,
+ mobile-frontend-editor-reference: Title of \Reference\ button in
editor.,
+ mobile-frontend-editor-insert-reference: Title of the insert
reference overlay in editor.,
+ mobile-frontend-editor-reference-placeholder: Placeholder text for
the textarea on the reference overlay.,
+ mobile-frontend-editor-add-reference: Message used in the reference
overlay to add a reference to the wikitext textarea.,
mobile-frontend-enable-images: Unused at this time.\n\nSee also:\n*
{{msg-mw|Mobile-frontend-disable-images}},
mobile-frontend-errorreport-button-label: Label for button for
submitting an error report. Keep this short.,
mobile-frontend-errorreport-error: Error displayed when feedback
could not be posted.,
diff --git a/images/icons/reference-ltr.svg b/images/icons/reference-ltr.svg
new file mode 100644
index 000..11e1c75
--- /dev/null
+++ b/images/icons/reference-ltr.svg
@@ -0,0 +1,6 @@
+?xml version=1.0 encoding=utf-8?
+svg xmlns=http://www.w3.org/2000/svg; width=24 height=24 viewBox=0 0 24
24
+g id=reference
+path id=bookmark d=M5 4v17h12c1 0 2-1 2-2v-15h-14zm12 14c0 1-1 1-1
1h-8v-13h2v6l2-2 2 2v-6h3v12z/
+/g
+/svg
diff --git a/images/icons/reference-rtl.svg b/images/icons/reference-rtl.svg
new file mode 100644
index 000..b31bbac
--- /dev/null
+++ b/images/icons/reference-rtl.svg
@@
[MediaWiki-commits] [Gerrit] Added position to ResourceLoader module - necessary for MW 1... - change (mediawiki...ApprovedRevs)
Yaron Koren has submitted this change and it was merged. Change subject: Added position to ResourceLoader module - necessary for MW 1.26+ .. Added position to ResourceLoader module - necessary for MW 1.26+ Change-Id: If0614da5303ac53c1f234afc1cdef96ff4d6de39 --- M ApprovedRevs.php 1 file changed, 2 insertions(+), 1 deletion(-) Approvals: Yaron Koren: Checked; Looks good to me, approved diff --git a/ApprovedRevs.php b/ApprovedRevs.php index 0412df3..6506cf3 100644 --- a/ApprovedRevs.php +++ b/ApprovedRevs.php @@ -90,5 +90,6 @@ $wgResourceModules['ext.ApprovedRevs'] = array( 'styles' = 'ApprovedRevs.css', 'localBasePath' = __DIR__, - 'remoteExtPath' = 'ApprovedRevs' + 'remoteExtPath' = 'ApprovedRevs', + 'position' = 'bottom' ); -- To view, visit https://gerrit.wikimedia.org/r/230223 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: If0614da5303ac53c1f234afc1cdef96ff4d6de39 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/ApprovedRevs Gerrit-Branch: master Gerrit-Owner: Yaron Koren yaro...@gmail.com Gerrit-Reviewer: Yaron Koren yaro...@gmail.com Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Halve RGB values of background colors in tables in night mode - change (apps...wikipedia)
jenkins-bot has submitted this change and it was merged.
Change subject: Halve RGB values of background colors in tables in night mode
..
Halve RGB values of background colors in tables in night mode
Most colors are inverted in night mode. However, the background colors
of some elements in tables look strange when given this treatment, so
it was earlier decided to simply strip them as a temporary fix. This
resulted, however, in a loss of useful information (see, e.g., the diagram
in the quick facts box for 'National Assembly of Pakistan').
This patch halves the RGB values of these elements rather than simply
stripping the colors in order to preserve necessary information.
Bug: T104101
Change-Id: I567089abf4d39ed1db562d51bd419f26d97d429d
---
M app/src/main/assets/bundle.js
M app/src/main/assets/preview.js
M www/js/night.js
3 files changed, 57 insertions(+), 24 deletions(-)
Approvals:
Dbrant: Looks good to me, approved
jenkins-bot: Verified
diff --git a/app/src/main/assets/bundle.js b/app/src/main/assets/bundle.js
index fc3f2be..aa6d3c1 100644
--- a/app/src/main/assets/bundle.js
+++ b/app/src/main/assets/bundle.js
@@ -291,25 +291,36 @@
var loader = require(./loader);
var util = require(./util);
-function invertColorProperty( el, propertyName ) {
+function parseRgbValues( el, propertyName ) {
var property = el.style[propertyName];
- console.log( JSON.stringify( parseCSSColor ) );
var bits = parseCSSColor( property );
if ( bits === null ) {
- // We couldn't parse the color, nevermind
return;
}
- var r = parseInt( bits[0] ), g = parseInt( bits[1] ), b = parseInt(
bits[2] );
- el.style[propertyName] = 'rgb(' + (255 - r) + ', ' + (255 - g) + ', ' +
(255 - b ) + ')';
+ return [ parseInt( bits[0] ), parseInt( bits[1] ), parseInt( bits[2] )];
+}
+
+function invertColorProperty( el, propertyName ) {
+ var rgb = parseRgbValues( el, propertyName );
+ if ( rgb ) {
+ el.style[propertyName] = 'rgb(' + (255 - rgb[0]) + ', ' + (255
- rgb[1]) + ', ' + (255 - rgb[2]) + ')';
+ }
+}
+
+function halveRgbValues( el, propertyName ) {
+ var rgb = parseRgbValues( el, propertyName );
+ if ( rgb ) {
+ el.style[propertyName] = 'rgb(' + Math.floor(rgb[0] / 2) + ', '
+ Math.floor(rgb[1] / 2) + ', ' + Math.floor(rgb[2] / 2) + ')';
+ }
}
var invertProperties = [ 'color', 'background-color', 'border-color' ];
function invertOneElement( el ) {
- var shouldStrip = util.hasAncestor( el, 'TABLE' );
+ var isInTable = util.hasAncestor( el, 'TABLE' );
for ( var i = 0; i invertProperties.length; i++ ) {
if ( el.style[invertProperties[i]] ) {
- if ( shouldStrip ) {
- el.style[invertProperties[i]] = 'inherit';
+ if ( isInTable ) {
+ halveRgbValues( el, invertProperties[i] );
} else {
invertColorProperty( el, invertProperties[i] );
}
diff --git a/app/src/main/assets/preview.js b/app/src/main/assets/preview.js
index 753bdb2..bb2519f 100644
--- a/app/src/main/assets/preview.js
+++ b/app/src/main/assets/preview.js
@@ -186,25 +186,36 @@
var loader = require(./loader);
var util = require(./util);
-function invertColorProperty( el, propertyName ) {
+function parseRgbValues( el, propertyName ) {
var property = el.style[propertyName];
- console.log( JSON.stringify( parseCSSColor ) );
var bits = parseCSSColor( property );
if ( bits === null ) {
- // We couldn't parse the color, nevermind
return;
}
- var r = parseInt( bits[0] ), g = parseInt( bits[1] ), b = parseInt(
bits[2] );
- el.style[propertyName] = 'rgb(' + (255 - r) + ', ' + (255 - g) + ', ' +
(255 - b ) + ')';
+ return [ parseInt( bits[0] ), parseInt( bits[1] ), parseInt( bits[2] )];
+}
+
+function invertColorProperty( el, propertyName ) {
+ var rgb = parseRgbValues( el, propertyName );
+ if ( rgb ) {
+ el.style[propertyName] = 'rgb(' + (255 - rgb[0]) + ', ' + (255
- rgb[1]) + ', ' + (255 - rgb[2]) + ')';
+ }
+}
+
+function halveRgbValues( el, propertyName ) {
+ var rgb = parseRgbValues( el, propertyName );
+ if ( rgb ) {
+ el.style[propertyName] = 'rgb(' + Math.floor(rgb[0] / 2) + ', '
+ Math.floor(rgb[1] / 2) + ', ' + Math.floor(rgb[2] / 2) + ')';
+ }
}
var invertProperties = [ 'color', 'background-color', 'border-color' ];
function invertOneElement( el ) {
- var shouldStrip = util.hasAncestor( el, 'TABLE' );
+ var isInTable = util.hasAncestor( el, 'TABLE' );
for ( var i = 0; i invertProperties.length; i++ ) {
if ( el.style[invertProperties[i]]
[MediaWiki-commits] [Gerrit] Add PTR record for mailrelay-02.tools.wmflabs.org - change (operations/dns)
coren has submitted this change and it was merged. Change subject: Add PTR record for mailrelay-02.tools.wmflabs.org .. Add PTR record for mailrelay-02.tools.wmflabs.org https://wikitech.wikimedia.org/wiki/Nova_Resource:Tools-mailrelay-02.tools.eqiad.wmflabs Bug: T97574 Change-Id: Ic7d1cfc836e16451ce0cec8baa7a965451a41b08 --- M templates/155.80.208.in-addr.arpa 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: coren: Looks good to me, approved jenkins-bot: Verified diff --git a/templates/155.80.208.in-addr.arpa b/templates/155.80.208.in-addr.arpa index a1746d5..23b97d1 100644 --- a/templates/155.80.208.in-addr.arpa +++ b/templates/155.80.208.in-addr.arpa @@ -77,4 +77,5 @@ ; to the transitional toolserver.org email relay. 162 1H IN PTR mail.tools.wmflabs.org. +188 1H IN PTR mailrelay-02.tools.wmflabs.org. 197 1H IN PTR relay.toolserver.org. -- To view, visit https://gerrit.wikimedia.org/r/222362 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ic7d1cfc836e16451ce0cec8baa7a965451a41b08 Gerrit-PatchSet: 2 Gerrit-Project: operations/dns Gerrit-Branch: master Gerrit-Owner: Merlijn van Deen valhall...@arctus.nl Gerrit-Reviewer: coren mpellet...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Don't try to create accounts on non-existent beta mediawikiwiki - change (operations/mediawiki-config)
jenkins-bot has submitted this change and it was merged.
Change subject: Don't try to create accounts on non-existent beta mediawikiwiki
..
Don't try to create accounts on non-existent beta mediawikiwiki
Caused the videoscaler (yes, really) jobrunner to be very unhappy
Bug: T108375
Change-Id: Icc2e2ace61ef2c31609c9d0e9d64144d7fd1f1dd
---
M wmf-config/CommonSettings.php
1 file changed, 4 insertions(+), 1 deletion(-)
Approvals:
Alex Monk: Looks good to me, approved
jenkins-bot: Verified
diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index 945b08f..cba11f3 100755
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -1268,7 +1268,10 @@
$wgCentralAuthStrict = true;
// Create some local accounts as soon as the global registration happens
- $wgCentralAuthAutoCreateWikis = array( 'loginwiki', 'metawiki',
'mediawikiwiki' );
+ $wgCentralAuthAutoCreateWikis = array( 'loginwiki', 'metawiki' );
+ if ( $wmfRealm === 'production' ) {
+ $wgCentralAuthAutoCreateWikis[] = 'mediawikiwiki';
+ }
}
// Config for GlobalCssJs
--
To view, visit https://gerrit.wikimedia.org/r/230227
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Icc2e2ace61ef2c31609c9d0e9d64144d7fd1f1dd
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Alex Monk kren...@gmail.com
Gerrit-Reviewer: Alex Monk kren...@gmail.com
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Switch to using surface model focus/blur events - change (mediawiki...VisualEditor)
jenkins-bot has submitted this change and it was merged.
Change subject: Switch to using surface model focus/blur events
..
Switch to using surface model focus/blur events
Depends on Ibcda9a79 in core.
Change-Id: Ieb2f99d7d1d24c24a0f00cf7c33e23b8206bf753
---
M modules/ve-mw/init/targets/ve.init.mw.MobileArticleTarget.js
1 file changed, 19 insertions(+), 11 deletions(-)
Approvals:
Alex Monk: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/ve-mw/init/targets/ve.init.mw.MobileArticleTarget.js
b/modules/ve-mw/init/targets/ve.init.mw.MobileArticleTarget.js
index dcc510f..b839d52 100644
--- a/modules/ve-mw/init/targets/ve.init.mw.MobileArticleTarget.js
+++ b/modules/ve-mw/init/targets/ve.init.mw.MobileArticleTarget.js
@@ -78,24 +78,32 @@
// Parent method
ve.init.mw.MobileArticleTarget.super.prototype.onSurfaceReady.apply(
this, arguments );
- this.getSurface().getModel().connect( this, { select: 'onSurfaceSelect'
} );
- this.onSurfaceSelect();
+ var surfaceModel = this.getSurface().getModel();
+ surfaceModel.connect( this, {
+ blur: 'onSurfaceBlur',
+ focus: 'onSurfaceFocus'
+ } );
+ this[surfaceModel.getSelection().isNull() ? 'onSurfaceBlur' :
'onSurfaceFocus']();
this.events.trackActivationComplete();
};
/**
- * Handle surface select events
+ * Handle surface blur events
*/
-ve.init.mw.MobileArticleTarget.prototype.onSurfaceSelect = function () {
+ve.init.mw.MobileArticleTarget.prototype.onSurfaceBlur = function () {
var toolbar = this.getToolbar();
- if ( this.getSurface().getModel().getSelection().isNull() ) {
- toolbar.$group.addClass( 'oo-ui-element-hidden' );
- toolbar.$actions.removeClass( 'oo-ui-element-hidden' );
- } else {
- toolbar.$group.removeClass( 'oo-ui-element-hidden' );
- toolbar.$actions.addClass( 'oo-ui-element-hidden' );
- }
+ toolbar.$group.addClass( 'oo-ui-element-hidden' );
+ toolbar.$actions.removeClass( 'oo-ui-element-hidden' );
+};
+
+/**
+ * Handle surface focus events
+ */
+ve.init.mw.MobileArticleTarget.prototype.onSurfaceFocus = function () {
+ var toolbar = this.getToolbar();
+ toolbar.$group.removeClass( 'oo-ui-element-hidden' );
+ toolbar.$actions.addClass( 'oo-ui-element-hidden' );
};
/**
--
To view, visit https://gerrit.wikimedia.org/r/230085
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ieb2f99d7d1d24c24a0f00cf7c33e23b8206bf753
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders esand...@wikimedia.org
Gerrit-Reviewer: Alex Monk kren...@gmail.com
Gerrit-Reviewer: Jforrester jforres...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update VE core submodule to master (07288e0) - change (mediawiki...VisualEditor)
jenkins-bot has submitted this change and it was merged. Change subject: Update VE core submodule to master (07288e0) .. Update VE core submodule to master (07288e0) New changes: 552fec6 MobileContext: Use frameless buttons, fix vertical heights/alignments ebb4d08 Emit blur/focus events from the surface model Change-Id: I9227a8795378826f1cee6dc2d3ac562b9970b9e2 --- M lib/ve 1 file changed, 0 insertions(+), 0 deletions(-) Approvals: Esanders: Looks good to me, approved jenkins-bot: Verified diff --git a/lib/ve b/lib/ve index 1360bca..07288e0 16 --- a/lib/ve +++ b/lib/ve -Subproject commit 1360bca2664edb7f1317cf7f9705e274a91a4589 +Subproject commit 07288e0dd1ba14e747d6d71e56ad49c7e4b877d6 -- To view, visit https://gerrit.wikimedia.org/r/230143 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I9227a8795378826f1cee6dc2d3ac562b9970b9e2 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/VisualEditor Gerrit-Branch: master Gerrit-Owner: Jforrester jforres...@wikimedia.org Gerrit-Reviewer: Esanders esand...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix toolbar position in iOS - change (mediawiki...MobileFrontend)
jenkins-bot has submitted this change and it was merged.
Change subject: Fix toolbar position in iOS
..
Fix toolbar position in iOS
When the anything is focused in iOS it calculates the overlap between
the desired cursor position and the keyboard, and it scrolls the
window up by that amount.
The problem is the window contains just the toolbar and a scrollable
container, so we end up losing the toolbar.
To work around this, whenever the *window* is scrolled apply
the window's scroll offset to the scrollable container and
reset the window scroll offset to 0.
We also need to reapply the native selection so the cursor doesn't
magically disappear.
Change-Id: Ib4ff64589d299cac53a7d12f2a97dfc3149ea65a
---
M resources/mobile.editor.ve/ve.init.mw.MobileFrontendArticleTarget.js
1 file changed, 44 insertions(+), 1 deletion(-)
Approvals:
Jforrester: Looks good to me, approved
jenkins-bot: Verified
diff --git
a/resources/mobile.editor.ve/ve.init.mw.MobileFrontendArticleTarget.js
b/resources/mobile.editor.ve/ve.init.mw.MobileFrontendArticleTarget.js
index 239dce0..8451afe 100644
--- a/resources/mobile.editor.ve/ve.init.mw.MobileFrontendArticleTarget.js
+++ b/resources/mobile.editor.ve/ve.init.mw.MobileFrontendArticleTarget.js
@@ -5,7 +5,7 @@
* @license The MIT License (MIT); see LICENSE.txt
*/
-/* global ve */
+/* global ve, $ */
// jscs:disable
@@ -24,7 +24,12 @@
ve.init.mw.MobileFrontendArticleTarget.super.call( this, config );
this.overlay = overlay;
+ this.$overlayContent = overlay.$el.find( '.overlay-content' );
this.$overlaySurface = overlay.$el.find( '.surface' );
+
+ // Events
+ this.onWindowScrollDebounced = ve.debounce( this.onWindowScroll.bind(
this ), 100 );
+ $( this.getElementWindow() ).on( 'scroll', this.onWindowScrollDebounced
);
// Initialization
this.$element.addClass( 've-init-mw-mobileFrontendArticleTarget' );
@@ -38,6 +43,44 @@
/* Methods */
+/**
+ * Destroy the target
+ */
+ve.init.mw.MobileFrontendArticleTarget.prototype.destroy = function () {
+ // Parent method
+ ve.init.mw.MobileFrontendArticleTarget.super.prototype.destroy.call(
this );
+
+ $( this.getElementWindow() ).off( 'scroll',
this.onWindowScrollDebounced );
+};
+
+/**
+ * Handle window scroll events
+ */
+ve.init.mw.MobileFrontendArticleTarget.prototype.onWindowScroll = function () {
+ var target = this;
+ // The window can only scroll in iOS if the keyboard has been opened
+ if ( ve.init.platform.constructor.static.isIos() ) {
+ // iOS applies a scroll offset to the window to move the cursor
+ // into view. Apply this offset to the surface instead.
+ var range,
+ nativeSelection =
target.getSurface().getView().nativeSelection,
+ windowTop = $( window ).scrollTop(),
+ contentTop = target.$overlayContent.scrollTop();
+
+ $( window ).scrollTop( 0 );
+ target.$overlayContent.scrollTop( contentTop + windowTop );
+
+ // iOS has another bug (!) where if you change the scroll
offset of a
+ // contentEditable with a cursor visible it disappears, so
remove and
+ // reapply the selection in that case.
+ if ( nativeSelection.rangeCount
document.activeElement.contentEditable === 'true' ) {
+ range = nativeSelection.getRangeAt(0);
+ nativeSelection.removeAllRanges();
+ nativeSelection.addRange( range );
+ }
+ }
+};
+
/*
* FIXME: @inheritdoc once this file is in the right repo
*/
--
To view, visit https://gerrit.wikimedia.org/r/230093
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib4ff64589d299cac53a7d12f2a97dfc3149ea65a
Gerrit-PatchSet: 6
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Esanders esand...@wikimedia.org
Gerrit-Reviewer: Esanders esand...@wikimedia.org
Gerrit-Reviewer: Jdlrobson jrob...@wikimedia.org
Gerrit-Reviewer: Jforrester jforres...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Localisation updates from https://translatewiki.net. - change (apps...wikipedia)
Niedzielski has uploaded a new change for review. https://gerrit.wikimedia.org/r/230231 Change subject: Localisation updates from https://translatewiki.net. .. Localisation updates from https://translatewiki.net. Change-Id: I9a9cf9a5ac3b2e1a7822d9700a638c2d91004782 --- M app/src/main/res/values-bn/strings.xml M app/src/main/res/values-ca/strings.xml M app/src/main/res/values-da/strings.xml M app/src/main/res/values-gl/strings.xml M app/src/main/res/values-in/strings.xml M app/src/main/res/values-it/strings.xml M app/src/main/res/values-ja/strings.xml M app/src/main/res/values-ko/strings.xml M app/src/main/res/values-mk/strings.xml M app/src/main/res/values-sr/strings.xml M app/src/main/res/values-te/strings.xml 11 files changed, 41 insertions(+), 30 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia refs/changes/31/230231/1 diff --git a/app/src/main/res/values-bn/strings.xml b/app/src/main/res/values-bn/strings.xml index ad6ce5f..ee3f13e 100644 --- a/app/src/main/res/values-bn/strings.xml +++ b/app/src/main/res/values-bn/strings.xml @@ -91,7 +91,7 @@ string name=login_error_wrong_passwordভুল পাসওয়ার্ড/string string name=login_error_wrong_usernameভুল ব্যবহারকারী নাম/string string name=login_error_illegalঅগ্রহণযোগ্য ব্যবহারকারী নাম/string - string name=login_success_toast fuzzy=trueপ্রবেশ সফল!/string + string name=login_success_toastপ্রবেশ করা সফল!/string string name=login_error_blockedএই ব্যবহারকারীকে ব্লক করা হয়েছে/string string name=login_error_throttledঅনেকবার প্রবেশের চেষ্টা করা হয়েছে। কয়েক মিনিট অপেক্ষা করে আবার চেষ্টা করুন।/string string name=login_error_unknownপ্রবেশ ব্যর্থ :(/string diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml index f2075be..7c74bed 100644 --- a/app/src/main/res/values-ca/strings.xml +++ b/app/src/main/res/values-ca/strings.xml @@ -91,7 +91,7 @@ string name=login_error_wrong_passwordContrasenya incorrecta/string string name=login_error_wrong_usernameNom d\'usuari incorrecte/string string name=login_error_illegalNom d\'usuari no vàlid/string - string name=login_success_toast fuzzy=trueS\'ha iniciat sessió correctament!/string + string name=login_success_toastS\'ha iniciat la sessió correctament!/string string name=login_error_blockedAquest usuari ha estat bloquejat/string string name=login_error_throttledMassa intents. Espereu uns minuts i torneu-ho a intentar./string string name=login_error_unknownHa fallat l\'inici de sessió :(/string diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml index 400a6b9..6085a07 100644 --- a/app/src/main/res/values-da/strings.xml +++ b/app/src/main/res/values-da/strings.xml @@ -7,10 +7,10 @@ string name=noNej/string string name=acra_report_dialog_titleWikipedia gik ned :(/string string name=acra_report_dialog_textSend os en nedbrudsrapport/string - string name=acra_report_dialog_commentHvad lavede du, da nedbruddet skete?/string + string name=acra_report_dialog_commentHvad lavede du, da appen gik ned?/string string name=search_hintSøg i Wikipedia/string string name=nav_item_historyHistorik/string - string name=error_network_errorNetværksforbindelsen kunne ikke oprettes./string + string name=error_network_errorNetværksforbindelsen kunne ikke etableres./string string name=search_network_errorNetværksfejl. Tryk for at prøve igen./string string name=generic_page_errorDer opstod et problem under behandlingen af din forespørgsel./string string name=status_code_unavailableServerens statuskode er ikke tilgængelig./string @@ -19,7 +19,7 @@ string name=menu_clear_all_saved_pagesRyd gemte sider/string string name=page_does_not_exist_errorDenne side findes ikke./string string name=nav_item_todayI dag/string - string name=dialog_title_clear_historyRyd browserhistorikken?/string + string name=dialog_title_clear_historyVil du rydde browserhistorikken?/string string name=nav_item_saved_pagesGemte sider/string string name=menu_update_all_saved_pagesOpdater gemte sider/string string name=menu_update_selected_saved_pagesOpdater gemte sider/string @@ -34,7 +34,7 @@ string name=toast_refresh_saved_pageOpdaterer gemt side…/string string name=delete_selected_saved_pagesSlet/string string name=toast_saved_page_deletedGemt(e) side(r) slettet/string - string name=saved_pages_search_list_hintSøg i gemte sider/string + string name=saved_pages_search_list_hintSøg i Gemte sider/string string name=saved_pages_search_empty_messageIngen sider fundet der matcher din forespørgsel./string string name=nav_item_nearbyI nærheden/string string name=menu_update_nearbyOpdater \i nærheden\/string @@ -70,7 +70,7 @@ string name=edit_saved_successfullyRedigering gemt!/string string name=dialog_message_edit_failedRedigering mislykkedes!/string string
[MediaWiki-commits] [Gerrit] Remove non-functional Echo integration - change (mediawiki...LiquidThreads)
jenkins-bot has submitted this change and it was merged.
Change subject: Remove non-functional Echo integration
..
Remove non-functional Echo integration
As far as I can tell, this wouldn't have worked since it was missing
i18n messages and never updated for Echo changes.
Also remove $wgLiquidThreadsNotificationTypes since the whole purpose of
that was to allow using Echo notifications.
Change-Id: Ide9ff9ec369e5d642e90ba4c459beedaf2b66068
---
M LiquidThreads.php
D classes/EchoLiquidThreadsFormatter.php
M classes/Hooks.php
M classes/NewMessagesController.php
M i18n/en.json
M i18n/qqq.json
6 files changed, 0 insertions(+), 178 deletions(-)
Approvals:
Mattflaschen: Looks good to me, approved
jenkins-bot: Verified
diff --git a/LiquidThreads.php b/LiquidThreads.php
index 80835e4..6575683 100644
--- a/LiquidThreads.php
+++ b/LiquidThreads.php
@@ -119,7 +119,6 @@
$wgHooks['SpecialWatchlistQuery'][] = 'LqtHooks::beforeWatchlist';
$wgHooks['ArticleEditUpdateNewTalk'][] = 'LqtHooks::updateNewtalkOnEdit';
$wgHooks['PersonalUrls'][] = 'LqtHooks::onPersonalUrls';
-$wgHooks['EchoGetDefaultNotifiedUsers'][] =
'NewMessages::getDefaultNotifiedUsers';
// Preferences
$wgHooks['GetPreferences'][] = 'LqtHooks::getPreferences';
@@ -205,7 +204,6 @@
$wgAutoloadClasses['Thread'] = __DIR__ . '/classes/Thread.php';
$wgAutoloadClasses['Threads'] = __DIR__ . '/classes/Threads.php';
$wgAutoloadClasses['NewMessages'] = __DIR__ .
'/classes/NewMessagesController.php';
-$wgAutoloadClasses['EchoLiquidThreadsFormatter'] = __DIR__.
/classes/EchoLiquidThreadsFormatter.php;
$wgAutoloadClasses['LqtParserFunctions'] = __DIR__ .
'/classes/ParserFunctions.php';
$wgAutoloadClasses['LqtDeletionController'] = __DIR__ .
'/classes/DeletionController.php';
$wgAutoloadClasses['LqtHooks'] = __DIR__ . '/classes/Hooks.php';
@@ -265,50 +263,6 @@
$wgAPIModules['feedthreads'] = 'ApiFeedLQTThreads';
$wgAutoloadClasses['ApiThreadAction'] = __DIR__ . '/api/ApiThreadAction.php';
$wgAPIModules['threadaction'] = 'ApiThreadAction';
-
-// Whether or not to use the standard LiquidThreads notifications
-$wgLiquidThreadsNotificationTypes = array( 'standard' );
-
-// Echo
-$wgExtensionFunctions[] = 'wfLiquidThreadsSetupEcho';
-
-function wfLiquidThreadsSetupEcho() {
- // LiquidThreads echo notifications have not been fully tested,
- // turn it off temporarily till expected behaviors are verified
- /*
- global $wgLiquidThreadsNotificationTypes;
- global $wgEchoNotificationFormatters;
- global $wgEchoEnabledEvents;
-
- if ( isset( $wgEchoNotificationFormatters ) ) {
- $wgLiquidThreadsNotificationTypes = array( 'echo' );
-
- $wgEchoNotificationFormatters += array(
- 'lqt-new-topic' = array(
- 'class' = 'EchoLiquidThreadsFormatter',
- 'title-message' =
'notification-add-talkpage-topic',
- 'title-params' = array( 'agent', 'subject',
'title', 'content-page' ),
- 'content-message' =
'notification-talkpage-content',
- 'content-params' = array( 'commentText' ),
- 'icon' = 'chat',
- ),
- 'lqt-reply' = array(
- 'class' = 'EchoLiquidThreadsFormatter',
- 'title-message' = 'notification-add-comment',
- 'title-params' = array( 'agent', 'subject',
'title', 'content-page' ),
- 'content-message' =
'notification-talkpage-content',
- 'content-params' = array( 'commentText' ),
- 'icon' = 'chat',
- ),
- );
-
- $wgEchoEnabledEvents = array_merge( $wgEchoEnabledEvents, array(
- 'lqt-new-topic',
- 'lqt-reply',
- ) );
- }
- */
-}
// Path to the LQT directory
$wgLiquidThreadsExtensionPath = {$wgScriptPath}/extensions/LiquidThreads;
diff --git a/classes/EchoLiquidThreadsFormatter.php
b/classes/EchoLiquidThreadsFormatter.php
deleted file mode 100644
index d7c478c..000
--- a/classes/EchoLiquidThreadsFormatter.php
+++ /dev/null
@@ -1,46 +0,0 @@
-?php
-
-class EchoLiquidThreadsFormatter extends EchoBasicFormatter {
- protected function processParam( $event, $param, $message, $user ) {
- $extra = $event-getExtra();
- if ( $param === 'subject' ) {
- $thread = $this-getThread( $event );
- if ( $thread ) {
- $message-params( $thread-subject() );
- } else {
- $message-params( '' );
- }
- } elseif
[MediaWiki-commits] [Gerrit] Decouple screenshot-ing and artifacts from Cucumber hooks - change (mediawiki/selenium)
Dduvall has uploaded a new change for review.
https://gerrit.wikimedia.org/r/230230
Change subject: Decouple screenshot-ing and artifacts from Cucumber hooks
..
Decouple screenshot-ing and artifacts from Cucumber hooks
Created `ScreenshotHelper` to encapsulate and generalize the
screenshot-ing previously implemented directly in a Cucumber `After`
hook.
Refactored `Environment#teardown` and friends to return artifacts in the
form `{ path = mime_type }` which can then be logged in the way
appropriate to the test runner.
Moved logging of SauceLabs job URL to a `RemoteBrowserFactory#teardown`
and refactored `HeadlessHelper` for the new artifacts system.
Bug: T108273
Change-Id: I4534fcb05180419ee9aa354f12616aadec160659
---
A features/screenshots.feature
A features/step_definitions/screenshot_steps.rb
M lib/mediawiki_selenium.rb
M lib/mediawiki_selenium/browser_factory/base.rb
M lib/mediawiki_selenium/environment.rb
M lib/mediawiki_selenium/remote_browser_factory.rb
M lib/mediawiki_selenium/support/env.rb
M lib/mediawiki_selenium/support/hooks.rb
M lib/mediawiki_selenium/support/modules/headless_helper.rb
A lib/mediawiki_selenium/support/modules/screenshot_helper.rb
A spec/screenshot_helper_spec.rb
11 files changed, 230 insertions(+), 36 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/selenium
refs/changes/30/230230/1
diff --git a/features/screenshots.feature b/features/screenshots.feature
new file mode 100644
index 000..84be3f7
--- /dev/null
+++ b/features/screenshots.feature
@@ -0,0 +1,21 @@
+@integration
+Feature: Screenshots of failed scenarios
+
+ As a developer writing and running tests, it would be helpful to have a
+ screenshot of the browser window at the point where each scenario has
+ failed.
+
+ Background:
+Given I have configured my environment with:
+
+ screenshot_failures: true
+ screenshot_failures_path: tmp/screenshots
+
+ And the tmp/screenshots directory exists
+ And I am using the screenshot helper
+
+ Scenario: A screenshot is taken for failed scenarios
+Given the current scenario name is Some scenario
+ And I have started a browser
+When the scenario fails
+Then the file tmp/screenshots/Some scenario.png should exist
diff --git a/features/step_definitions/screenshot_steps.rb
b/features/step_definitions/screenshot_steps.rb
new file mode 100644
index 000..52fedbd
--- /dev/null
+++ b/features/step_definitions/screenshot_steps.rb
@@ -0,0 +1,3 @@
+Given(/^I am using the screenshot helper$/) do
+ @env.extend(MediawikiSelenium::ScreenshotHelper)
+end
diff --git a/lib/mediawiki_selenium.rb b/lib/mediawiki_selenium.rb
index 505c50a..ee3a256 100644
--- a/lib/mediawiki_selenium.rb
+++ b/lib/mediawiki_selenium.rb
@@ -9,6 +9,7 @@
autoload :PageFactory, 'mediawiki_selenium/page_factory'
autoload :Raita, 'mediawiki_selenium/raita'
autoload :RemoteBrowserFactory, 'mediawiki_selenium/remote_browser_factory'
+ autoload :ScreenshotHelper,
'mediawiki_selenium/support/modules/screenshot_helper'
autoload :StrictPending, 'mediawiki_selenium/support/modules/strict_pending'
autoload :UserFactory, 'mediawiki_selenium/user_factory'
autoload :UserFactoryHelper,
'mediawiki_selenium/support/modules/user_factory_helper'
diff --git a/lib/mediawiki_selenium/browser_factory/base.rb
b/lib/mediawiki_selenium/browser_factory/base.rb
index 8684bfd..70a6815 100644
--- a/lib/mediawiki_selenium/browser_factory/base.rb
+++ b/lib/mediawiki_selenium/browser_factory/base.rb
@@ -200,8 +200,12 @@
# @param _env [Environment] Environment.
# @param _status [Symbol] Status of the executed scenario.
#
+ # @return [Hash{String = String}] Artifacts.
+ #
+ # @see Environment#teardown
+ #
def teardown(_env, _status)
-# abstract
+{}
end
protected
diff --git a/lib/mediawiki_selenium/environment.rb
b/lib/mediawiki_selenium/environment.rb
index f772707..61b9460 100644
--- a/lib/mediawiki_selenium/environment.rb
+++ b/lib/mediawiki_selenium/environment.rb
@@ -359,9 +359,13 @@
# Executes teardown tasks including instructing all browser factories to
# close any open browsers and perform their own teardown tasks.
#
+# Teardown tasks may produce artifacts, which will be returned in the form
+# `{ path = mime_type }`.
+#
# @example Teardown environment resources after each scenario completes
# After do |scenario|
-# teardown(name: scenario.name, status: scenario.status)
+# artifacts = teardown(name: scenario.name, status: scenario.status)
+# artifacts.each { |path, mime_type| embed(path, mime_type) }
# end
#
# @param info [Hash] Hash of test case information.
@@ -369,15 +373,22 @@
# @yield [browser]
# @yieldparam browser [Watir::Browser] Browser object, before it's closed.
#
+# @return
[MediaWiki-commits] [Gerrit] Add WikidataPageBanner extension to beta labs - change (operations/mediawiki-config)
jenkins-bot has submitted this change and it was merged.
Change subject: Add WikidataPageBanner extension to beta labs
..
Add WikidataPageBanner extension to beta labs
Add integration with Wikidata
Change-Id: I68ca5c86918574993e9f4f684f68cc3a068bff04
---
M wmf-config/CommonSettings-labs.php
M wmf-config/InitialiseSettings-labs.php
M wmf-config/extension-list-labs
3 files changed, 13 insertions(+), 0 deletions(-)
Approvals:
Kaldari: Looks good to me, approved
jenkins-bot: Verified
diff --git a/wmf-config/CommonSettings-labs.php
b/wmf-config/CommonSettings-labs.php
index 75212b3..e88f2fa 100644
--- a/wmf-config/CommonSettings-labs.php
+++ b/wmf-config/CommonSettings-labs.php
@@ -234,6 +234,11 @@
$wgSentryLogPhpErrors = false;
}
+if ( $wmgUseWPB ) {
+ require_once(
$IP/extensions/WikidataPageBanner/WikidataPageBanner.php );
+ $wgWPBBannerProperty = $wmgWPBBannerProperty;
+}
+
if ( $wmgUseCapiunto ) {
require_once $IP/extensions/Capiunto/Capiunto.php;
}
diff --git a/wmf-config/InitialiseSettings-labs.php
b/wmf-config/InitialiseSettings-labs.php
index 5be7cc7..6f8fe5a 100644
--- a/wmf-config/InitialiseSettings-labs.php
+++ b/wmf-config/InitialiseSettings-labs.php
@@ -1028,6 +1028,13 @@
'wmgUseGather' = array(
'default' = true,
),
+ 'wmgUseWPB' = array(
+ 'default' = false,
+ 'enwiki' = true,
+ ),
+ 'wmgWPBBannerProperty' = array(
+ 'default' = 'P751',
+ ),
'wmgUseGuidedTour' = array(
'wikidatawiki' = true,
),
diff --git a/wmf-config/extension-list-labs b/wmf-config/extension-list-labs
index 25f8fe5..ff20bd1 100644
--- a/wmf-config/extension-list-labs
+++ b/wmf-config/extension-list-labs
@@ -1,3 +1,4 @@
$IP/extensions/Capiunto/Capiunto.php
$IP/extensions/GlobalUserPage/GlobalUserPage.php
$IP/extensions/Sentry/Sentry.php
+$IP/extensions/WikidataPageBanner/WikidataPageBanner.php
--
To view, visit https://gerrit.wikimedia.org/r/230232
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I68ca5c86918574993e9f4f684f68cc3a068bff04
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson jrob...@wikimedia.org
Gerrit-Reviewer: Kaldari rkald...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] logstash: Count MediaWiki log events with statsd - change (operations/puppet)
BryanDavis has uploaded a new change for review.
https://gerrit.wikimedia.org/r/230233
Change subject: logstash: Count MediaWiki log events with statsd
..
logstash: Count MediaWiki log events with statsd
Count each MediaWiki logstash event by sending an increment command for
the counter logstash.rate.mediawiki.$CHANNEL.$LEVEL (eg
logstash.rate.mediawiki.memcached.ERROR) to a statsd server.
Bug: T100735
Change-Id: I4771abef68a151d08340b63f95cc556c8010416d
---
M hieradata/labs/deployment-prep/common.yaml
M hieradata/role/common/logstash.yaml
M manifests/role/logstash.pp
A modules/logstash/manifests/output/statsd.pp
A modules/logstash/templates/output/statsd.erb
5 files changed, 107 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/33/230233/1
diff --git a/hieradata/labs/deployment-prep/common.yaml
b/hieradata/labs/deployment-prep/common.yaml
index 0879893..f2461ad 100644
--- a/hieradata/labs/deployment-prep/common.yaml
+++ b/hieradata/labs/deployment-prep/common.yaml
@@ -132,6 +132,7 @@
- deployment-elastic08
elasticsearch::cluster_name: beta-search
elasticsearch::script_disable_dynamic: false
+role::logstash::statsd_host: labmon1001.eqiad.wmnet
nfs_mounts:
project: false
home: false
diff --git a/hieradata/role/common/logstash.yaml
b/hieradata/role/common/logstash.yaml
index f77985e..b040192 100644
--- a/hieradata/role/common/logstash.yaml
+++ b/hieradata/role/common/logstash.yaml
@@ -39,6 +39,8 @@
- logstash1005.eqiad.wmnet
- logstash1006.eqiad.wmnet
+role::logstash::statsd_host: statsd.eqiad.wmnet
+
# Kibana
role::kibana::vhost: logstash.wmflabs.org
role::kibana::serveradmin: n...@wikimedia.org
diff --git a/manifests/role/logstash.pp b/manifests/role/logstash.pp
index 2834399..3892ce9 100644
--- a/manifests/role/logstash.pp
+++ b/manifests/role/logstash.pp
@@ -5,7 +5,12 @@
#
# Provisions Logstash and ElasticSearch.
#
-class role::logstash {
+# == Parameters:
+# - $statsd_host: Host to send statsd data to.
+#
+class role::logstash (
+$statsd_host,
+) {
include ::role::logstash::elasticsearch
include ::logstash
@@ -71,6 +76,7 @@
priority = 70,
}
+## Outputs (90)
# Template for Elasticsearch index creation
file { '/etc/logstash/elasticsearch-template.json':
ensure = present,
@@ -88,6 +94,14 @@
template= '/etc/logstash/elasticsearch-template.json',
require = File['/etc/logstash/elasticsearch-template.json'],
}
+
+logstash::output::statsd { 'MW_channel_rate':
+host= $statsd_host,
+guard_condition = '[type] == mediawiki and es in [tags]',
+namespace = 'logstash.rate',
+sender = 'mediawiki',
+increment = [ '%{channel}.%{level}' ],
+}
}
# == Class: role::logstash::elasticsearch
diff --git a/modules/logstash/manifests/output/statsd.pp
b/modules/logstash/manifests/output/statsd.pp
new file mode 100644
index 000..82dd2ea
--- /dev/null
+++ b/modules/logstash/manifests/output/statsd.pp
@@ -0,0 +1,60 @@
+# == Define: logstash::output::statsd
+#
+# Configure logstash to output to statsd
+#
+# Metric names are formed as ${namespace}.${sender}.${metric} following the
+# Etsy naming style. $namespace will be omitted if set to an empty string and
+# can be formed using Logstash %{foo} style printf substution based on the
+# contents of the Logstash event being processed. $sender will have dots
+# replaced with underscores. These conventions are enforced by the Logstash
+# output plugin, so figure out how deal with them for your use case.
+#
+# == Parameters:
+# - $ensure: Whether the config should exist. Default present.
+# - $host: statsd server. Default '127.0.0.1'.
+# - $port: statsd server port. Default 8125.
+# - $guard_condition: Logstash condition to require to pass events to output.
+# Default undef.
+# - $namespace: The statsd namespace to use for this metric.
+# Default 'logstash'.
+# - $sender: Name of the sender. Dots will be replaced with underscores.
+# Default $host.
+# - $count: Hash of metric_name = count values. Default undef.
+# - $decrement: Array of metric names to decrement. Default undef.
+# - $gauge: Hash of metric_name = gauge values. Default undef.
+# - $increment: Array of metric names to increment. Default undef.
+# - $set: Hash of metric_name = set values. Default undef.
+# - $timing: Hash of metric_name = timing values. Default undef.
+# - $sample_rate: The sample rate for the metric. Default 1.
+#
+# == Sample usage:
+#
+# logstash::output::statsd { 'MW_channel_rate':
+# guard_condition = '[type] == mediawiki and es in [tags]',
+# namespace = 'logstash.rate',
+# sender = 'mediawiki',
+# increment = [ %{channel}.%{level} ],
+# }
+#
+define logstash::output::statsd(
+$ensure =
[MediaWiki-commits] [Gerrit] Fix phpdoc for hooks - change (mediawiki...CodeMirror)
jenkins-bot has submitted this change and it was merged.
Change subject: Fix phpdoc for hooks
..
Fix phpdoc for hooks
Change-Id: Ie55df605d721dfe67eded0145d630329d0ba2c06
---
M CodeMirror.hooks.php
1 file changed, 12 insertions(+), 5 deletions(-)
Approvals:
Hoo man: Looks good to me, approved
jenkins-bot: Verified
diff --git a/CodeMirror.hooks.php b/CodeMirror.hooks.php
index c787958..dcd6421 100644
--- a/CodeMirror.hooks.php
+++ b/CodeMirror.hooks.php
@@ -1,7 +1,7 @@
?php
-
class CodeMirrorHooks {
+
/** @var null|array Cached version of global variables, if available,
otherwise null */
private static $globalVariableScript = null;
/** @var null|boolean Saves, if CodeMirror should be loaded on this
page or not */
@@ -14,7 +14,8 @@
*
* @see
https://www.mediawiki.org/wiki/Manual:Hooks/ResourceLoaderRegisterModules
*
-* @param ResourceLoader $resourceLoader The ResourceLoader object
+* @param ResourceLoader $rl The ResourceLoader object
+*
* @return bool Always true
*/
public static function onResourceLoaderRegisterModules( ResourceLoader
$rl ) {
@@ -145,7 +146,9 @@
*
* @see
https://www.mediawiki.org/wiki/Manual:Hooks/MakeGlobalVariablesScript
*
-* @param ResourceLoader $resourceLoader The ResourceLoader object
+* @param array $vars
+* @param OutputPage $out
+*
* @return bool Always true
*/
public static function onMakeGlobalVariablesScript( array $vars,
OutputPage $out ) {
@@ -161,7 +164,9 @@
*
* @see https://www.mediawiki.org/wiki/Manual:Hooks/BeforePageDisplay
*
-* @param ResourceLoader $resourceLoader The ResourceLoader object
+* @param OutputPage $out
+* @param Skin $skin
+*
* @return bool Always true
*/
public static function onBeforePageDisplay( OutputPage $out, Skin
$skin ) {
@@ -175,7 +180,9 @@
*
* @see https://www.mediawiki.org/wiki/Manual:Hooks/GetPreferences
*
-* @param ResourceLoader $resourceLoader The ResourceLoader object
+* @param User $user
+* @param array $defaultPreferences
+*
* @return bool Always true
*/
public static function onGetPreferences( User $user,
$defaultPreferences ) {
--
To view, visit https://gerrit.wikimedia.org/r/230107
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie55df605d721dfe67eded0145d630329d0ba2c06
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CodeMirror
Gerrit-Branch: master
Gerrit-Owner: Addshore addshorew...@gmail.com
Gerrit-Reviewer: Hoo man h...@online.de
Gerrit-Reviewer: Kaldari rkald...@wikimedia.org
Gerrit-Reviewer: Legoktm legoktm.wikipe...@gmail.com
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] DO NOT MERGE Strip out deprecated parameters - change (mediawiki/vagrant)
Awight has uploaded a new change for review.
https://gerrit.wikimedia.org/r/230235
Change subject: DO NOT MERGE Strip out deprecated parameters
..
DO NOT MERGE Strip out deprecated parameters
TODO: These... aren't quite deprecated yet. Wait at least until the legacy
code is removed from production.
Change-Id: I678f8ad37fe1ebd3dcee8876d39737fc0d088ca5
---
M puppet/modules/payments/manifests/donation_interface.pp
1 file changed, 0 insertions(+), 14 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant
refs/changes/35/230235/1
diff --git a/puppet/modules/payments/manifests/donation_interface.pp
b/puppet/modules/payments/manifests/donation_interface.pp
index 8af8b7d..1e69b3a 100644
--- a/puppet/modules/payments/manifests/donation_interface.pp
+++ b/puppet/modules/payments/manifests/donation_interface.pp
@@ -14,7 +14,6 @@
wgPaypalGatewayEnabled = true,
wgDonationInterfaceEnableFormChooser = true,
wgDonationInterfaceEnableQueue = true,
- wgDonationInterfaceEnableStomp = true,
wgDonationInterfaceEnableFunctionsFilter = true,
wgDonationInterfaceEnableMinfraud= false,
wgDonationInterfaceEnableReferrerFilter = true,
@@ -52,18 +51,6 @@
wgPaypalGatewayURL =
'https://www.sandbox.paypal.com/cgi-bin/webscr',
- wgStompServer= 'tcp://localhost:61613',
-
- wgStompQueueNames= {
-'default'= 'complete',
-'pending'= 'pending',
-'limbo' = 'limbo',
-'cc-limbo' = 'cc-limbo',
-'globalcollect-cc-limbo' = 'globalcollect-cc-limbo',
-'payments-antifraud' = 'payments-antifraud',
-'payments-init' = 'payments-init',
- },
-
wgDonationInterfaceMemcacheHost = 'localhost',
wgDonationInterfaceUseSyslog = true,
@@ -91,7 +78,6 @@
wgDonationInterfaceOrphanCron= {
'enable' = true,
-'function' = 'orphan_stomp',
'max_per_execute' = '',
'override_command_line_params' = true,
'target_execute_time' = 300,
--
To view, visit https://gerrit.wikimedia.org/r/230235
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I678f8ad37fe1ebd3dcee8876d39737fc0d088ca5
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: Awight awi...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] fermium: add mapped ipv6 - change (operations/puppet)
John F. Lewis has uploaded a new change for review.
https://gerrit.wikimedia.org/r/230239
Change subject: fermium: add mapped ipv6
..
fermium: add mapped ipv6
Change-Id: I3c70b752ef69dfd6fc55aa790277ba639905c4cf
---
M manifests/site.pp
1 file changed, 5 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/39/230239/1
diff --git a/manifests/site.pp b/manifests/site.pp
index 9181bb8..a7f76a7 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -969,6 +969,11 @@
include admin
include base::firewall
include role::lists::migration
+
+interface::add_ip6_mapped { 'main':
+interface = 'eth0',
+}
+
}
node 'fluorine.eqiad.wmnet' {
--
To view, visit https://gerrit.wikimedia.org/r/230239
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I3c70b752ef69dfd6fc55aa790277ba639905c4cf
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: John F. Lewis johnflewi...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] fermium: override role default IPs - change (operations/puppet)
John F. Lewis has uploaded a new change for review. https://gerrit.wikimedia.org/r/230240 Change subject: fermium: override role default IPs .. fermium: override role default IPs Add placeholders of 127.0.0.1 and ::1 for the service IPs. This exists now just to provide an easy patch to modify for when fermium gets service IPs for new mailman lists service. Change-Id: I37abd8e17f5b81b10cb520f26fcc0e85de4b93bd --- M hieradata/hosts/fermium.yaml 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/40/230240/1 diff --git a/hieradata/hosts/fermium.yaml b/hieradata/hosts/fermium.yaml index aa787e4..1d0bb9e 100644 --- a/hieradata/hosts/fermium.yaml +++ b/hieradata/hosts/fermium.yaml @@ -1,2 +1,4 @@ admin::groups: - mailman-users +mailman::lists_ipv4: '127.0.0.1' +mailman::lists_ipv6: '::1' -- To view, visit https://gerrit.wikimedia.org/r/230240 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I37abd8e17f5b81b10cb520f26fcc0e85de4b93bd Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: John F. Lewis johnflewi...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Isolate wikidata.org cookies and CORS policies - change (operations/mediawiki-config)
Legoktm has uploaded a new change for review. https://gerrit.wikimedia.org/r/230247 Change subject: Isolate wikidata.org cookies and CORS policies .. Isolate wikidata.org cookies and CORS policies query.wikidata.org is a new service that should not have access to MediaWiki/CentralAuth cookies, nor be allowed to send CORS requests. The login cookie is now only set for www.wikidata.org. Users of test.wikidata.org will need to manually visit the wiki to be logged in. CORS requests are now only accepted from www.wikidata.org and test.wikidata.org. Bug: T108101 Change-Id: I67dba772a239e3dec50809c4252419cfdb90ee36 --- M wmf-config/CommonSettings.php M wmf-config/InitialiseSettings.php 2 files changed, 3 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/47/230247/1 diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php index cba11f3..b9fe5ee 100755 --- a/wmf-config/CommonSettings.php +++ b/wmf-config/CommonSettings.php @@ -456,7 +456,8 @@ '*.wikisource.org', 'wikisource.org', '*.wikiquote.org', - '*.wikidata.org', + 'www.wikidata.org', + 'test.wikidata.org', '*.wikivoyage.org', 'www.mediawiki.org', 'm.mediawiki.org', diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index 9f7f35f..f4b069d 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -10907,7 +10907,7 @@ '.wikinews.org' = 'enwikinews', '.wikiversity.org' = 'enwikiversity', '.mediawiki.org' = 'mediawikiwiki', - '.wikidata.org' = 'wikidatawiki', + 'www.wikidata.org' = 'wikidatawiki', 'species.wikimedia.org' = 'specieswiki', 'incubator.wikimedia.org' = 'incubatorwiki', '.wikivoyage.org' = 'enwikivoyage', -- To view, visit https://gerrit.wikimedia.org/r/230247 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I67dba772a239e3dec50809c4252419cfdb90ee36 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Legoktm legoktm.wikipe...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] remove unused revdns for osm-lb.esams - change (operations/dns)
BBlack has submitted this change and it was merged. Change subject: remove unused revdns for osm-lb.esams .. remove unused revdns for osm-lb.esams Bug: T105076 Change-Id: I06c61214b17f5f5f52357ca933dae1064edd0984 --- M templates/174.198.91.in-addr.arpa M templates/2.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa 2 files changed, 0 insertions(+), 2 deletions(-) Approvals: BBlack: Looks good to me, approved jenkins-bot: Verified diff --git a/templates/174.198.91.in-addr.arpa b/templates/174.198.91.in-addr.arpa index b87b837..0926c79 100644 --- a/templates/174.198.91.in-addr.arpa +++ b/templates/174.198.91.in-addr.arpa @@ -56,7 +56,6 @@ ; - - 91.198.174.208/29 LVS Multimedia 208 1H IN PTR upload-lb.esams.wikimedia.org. -209 1H IN PTR osm-lb.esams.wikimedia.org. ; - - 91.198.174.216/29 LVS Misc diff --git a/templates/2.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa b/templates/2.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa index 9c1b4cb..d3ed811 100644 --- a/templates/2.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa +++ b/templates/2.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa @@ -100,7 +100,6 @@ 1.0.0.0 1H IN PTR text-lb.esams.wikimedia.org. e.0.0.0 1H IN PTR ns2.wikimedia.org. -0.1.0.0 1H IN PTR osm-lb.esams.wikimedia.org. ; LVS Mobile Zero general support, 2620:0:862:ed1a::1:0/112 -- To view, visit https://gerrit.wikimedia.org/r/230241 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I06c61214b17f5f5f52357ca933dae1064edd0984 Gerrit-PatchSet: 2 Gerrit-Project: operations/dns Gerrit-Branch: master Gerrit-Owner: BBlack bbl...@wikimedia.org Gerrit-Reviewer: BBlack bbl...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] toollabs: Add ecdsa keys to ssh_known_hosts - change (operations/puppet)
Yuvipanda has submitted this change and it was merged.
Change subject: toollabs: Add ecdsa keys to ssh_known_hosts
..
toollabs: Add ecdsa keys to ssh_known_hosts
Bug: T103999
Change-Id: I171c36f8d1ead3b664057258f5a86ab2f2d978ce
---
M modules/toollabs/manifests/init.pp
1 file changed, 2 insertions(+), 1 deletion(-)
Approvals:
Yuvipanda: Verified; Looks good to me, approved
diff --git a/modules/toollabs/manifests/init.pp
b/modules/toollabs/manifests/init.pp
index 8089a8f..64b08b7 100644
--- a/modules/toollabs/manifests/init.pp
+++ b/modules/toollabs/manifests/init.pp
@@ -61,7 +61,8 @@
group = 'root',
mode= '0444',
require = File[$store],
-content = ${::fqdn},${::hostname},${::ipaddress} ssh-rsa
${::sshrsakey}\n,
+content = ${::fqdn},${::hostname},${::ipaddress} ssh-rsa
${::sshrsakey}\n +
+${::fqdn},${::hostname},${::ipaddress} ecdsa-sha2-nistp256
${::sshecdsakey}\n
}
exec { 'make_known_hosts':
--
To view, visit https://gerrit.wikimedia.org/r/230244
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I171c36f8d1ead3b664057258f5a86ab2f2d978ce
Gerrit-PatchSet: 4
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Merlijn van Deen valhall...@arctus.nl
Gerrit-Reviewer: Yuvipanda yuvipa...@wikimedia.org
Gerrit-Reviewer: coren mpellet...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Logstash: Cleanup exclusion of API continuation logging - change (operations/puppet)
Yuvipanda has submitted this change and it was merged.
Change subject: Logstash: Cleanup exclusion of API continuation logging
..
Logstash: Cleanup exclusion of API continuation logging
These log messages are no longer generated since I984e6358, so there's
no point in cluttering the logstash config with rules to ignore them
anymore.
Change-Id: I44e9881d67345205e5ec97e0aab0f58ecb9ac751
---
M files/logstash/filter-mediawiki.conf
1 file changed, 0 insertions(+), 5 deletions(-)
Approvals:
BryanDavis: Looks good to me, but someone else must approve
Yuvipanda: Looks good to me, approved
jenkins-bot: Verified
diff --git a/files/logstash/filter-mediawiki.conf
b/files/logstash/filter-mediawiki.conf
index e7c0776..3373774 100644
--- a/files/logstash/filter-mediawiki.conf
+++ b/files/logstash/filter-mediawiki.conf
@@ -92,11 +92,6 @@
source = agent
prefix = ua_
}
-
-# Ignore this one for now, too many hits
-if [feature] == action=query!rawcontinue!continue {
- drop {}
-}
}
} # end [channel] == api-feature-usage
--
To view, visit https://gerrit.wikimedia.org/r/223301
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I44e9881d67345205e5ec97e0aab0f58ecb9ac751
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Anomie bjor...@wikimedia.org
Gerrit-Reviewer: BryanDavis bda...@wikimedia.org
Gerrit-Reviewer: Gage jger...@wikimedia.org
Gerrit-Reviewer: Yuvipanda yuvipa...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove not needed nesting - change (mediawiki...Wikibase)
Jeroen De Dauw has uploaded a new change for review.
https://gerrit.wikimedia.org/r/230043
Change subject: Remove not needed nesting
..
Remove not needed nesting
Change-Id: Ib5d64393964631e070fd6d8b1cbc2f767c0d85ef
---
M client/includes/DataAccess/PropertyParserFunction/Runner.php
1 file changed, 10 insertions(+), 10 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/43/230043/1
diff --git a/client/includes/DataAccess/PropertyParserFunction/Runner.php
b/client/includes/DataAccess/PropertyParserFunction/Runner.php
index ca50e1c..e3ec1d7 100644
--- a/client/includes/DataAccess/PropertyParserFunction/Runner.php
+++ b/client/includes/DataAccess/PropertyParserFunction/Runner.php
@@ -135,24 +135,24 @@
* Gets the entity and increments the expensive parser function count.
*
* @param Parser $parser
-* @param string $from
+* @param string $entityIdString
*
* @return EntityId|null
*/
- private function getEntityIdFromString( Parser $parser, $from ) {
+ private function getEntityIdFromString( Parser $parser, $entityIdString
) {
try {
- $entityId = $this-entityIdParser-parse( $from );
-
- // Getting a foreign item is expensive (unless we
already loaded it and it's cached)
- if (
!$this-restrictedEntityLookup-hasEntityBeenAccessed( $entityId ) ) {
- $parser-incrementExpensiveFunctionCount();
- }
-
- return $entityId;
+ $entityId = $this-entityIdParser-parse(
$entityIdString );
} catch ( EntityIdParsingException $ex ) {
// Just ignore this
return null;
}
+
+ // Getting a foreign item is expensive (unless we already
loaded it and it's cached)
+ if ( !$this-restrictedEntityLookup-hasEntityBeenAccessed(
$entityId ) ) {
+ $parser-incrementExpensiveFunctionCount();
+ }
+
+ return $entityId;
}
/**
--
To view, visit https://gerrit.wikimedia.org/r/230043
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib5d64393964631e070fd6d8b1cbc2f767c0d85ef
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Jeroen De Dauw jeroended...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Improve wording of method - change (mediawiki...Wikibase)
Jeroen De Dauw has uploaded a new change for review.
https://gerrit.wikimedia.org/r/230044
Change subject: Improve wording of method
..
Improve wording of method
Change-Id: I6348d27f8b1db5f13ee0209d6b827d4f94c29089
---
M client/includes/DataAccess/PropertyParserFunction/Runner.php
M client/includes/DataAccess/RestrictedEntityLookup.php
M client/tests/phpunit/includes/DataAccess/RestrictedEntityLookupTest.php
3 files changed, 4 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/44/230044/1
diff --git a/client/includes/DataAccess/PropertyParserFunction/Runner.php
b/client/includes/DataAccess/PropertyParserFunction/Runner.php
index e3ec1d7..a1754bc 100644
--- a/client/includes/DataAccess/PropertyParserFunction/Runner.php
+++ b/client/includes/DataAccess/PropertyParserFunction/Runner.php
@@ -148,7 +148,7 @@
}
// Getting a foreign item is expensive (unless we already
loaded it and it's cached)
- if ( !$this-restrictedEntityLookup-hasEntityBeenAccessed(
$entityId ) ) {
+ if ( !$this-restrictedEntityLookup-entityHasBeenAccessed(
$entityId ) ) {
$parser-incrementExpensiveFunctionCount();
}
diff --git a/client/includes/DataAccess/RestrictedEntityLookup.php
b/client/includes/DataAccess/RestrictedEntityLookup.php
index 42aaefb..1de2e85 100644
--- a/client/includes/DataAccess/RestrictedEntityLookup.php
+++ b/client/includes/DataAccess/RestrictedEntityLookup.php
@@ -106,7 +106,7 @@
*
* @return bool
*/
- public function hasEntityBeenAccessed( EntityId $entityId ) {
+ public function entityHasBeenAccessed( EntityId $entityId ) {
$entityIdSerialization = $entityId-getSerialization();
return array_key_exists( $entityIdSerialization,
$this-entitiesAccessed );
diff --git
a/client/tests/phpunit/includes/DataAccess/RestrictedEntityLookupTest.php
b/client/tests/phpunit/includes/DataAccess/RestrictedEntityLookupTest.php
index ef3228a..c71513e 100644
--- a/client/tests/phpunit/includes/DataAccess/RestrictedEntityLookupTest.php
+++ b/client/tests/phpunit/includes/DataAccess/RestrictedEntityLookupTest.php
@@ -77,8 +77,8 @@
$lookup = new RestrictedEntityLookup( $this-getEntityLookup(),
200 );
$lookup-getEntity( new ItemId( 'Q2' ) );
- $this-assertTrue( $lookup-hasEntityBeenAccessed( new ItemId(
'Q2' ) ) );
- $this-assertFalse( $lookup-hasEntityBeenAccessed( new ItemId(
'Q42' ) ) );
+ $this-assertTrue( $lookup-entityHasBeenAccessed( new ItemId(
'Q2' ) ) );
+ $this-assertFalse( $lookup-entityHasBeenAccessed( new ItemId(
'Q42' ) ) );
}
}
--
To view, visit https://gerrit.wikimedia.org/r/230044
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I6348d27f8b1db5f13ee0209d6b827d4f94c29089
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Jeroen De Dauw jeroended...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Don't try to use broken XiphQT-as-HTML5 in Safari - change (mediawiki...TimedMediaHandler)
jenkins-bot has submitted this change and it was merged.
Change subject: Don't try to use broken XiphQT-as-HTML5 in Safari
..
Don't try to use broken XiphQT-as-HTML5 in Safari
XiphQT components perhaps once worked in video and audio in
Safari but they don't as of Safari 8 on OS X 10.10.
Removed weird workaround that detected a registered ogg plugin
and claimed to support ogg natively in video and audio,
which resulted in just a blank screen (and even took priority
over ogv.js).
With this fixed, Safari will select ogv.js as expected.
Bug: T108251
Change-Id: I046814576efe04168e2eb75c9083caeee7bbe648
---
M MwEmbedModules/EmbedPlayer/resources/mw.EmbedTypes.js
1 file changed, 0 insertions(+), 4 deletions(-)
Approvals:
TheDJ: Looks good to me, approved
jenkins-bot: Verified
diff --git a/MwEmbedModules/EmbedPlayer/resources/mw.EmbedTypes.js
b/MwEmbedModules/EmbedPlayer/resources/mw.EmbedTypes.js
index 42edfcd..2d3c5e5 100644
--- a/MwEmbedModules/EmbedPlayer/resources/mw.EmbedTypes.js
+++ b/MwEmbedModules/EmbedPlayer/resources/mw.EmbedTypes.js
@@ -266,10 +266,6 @@
dummyvid.canPlayType(
'audio/ogg; codecs=vorbis' )
) {
this.mediaPlayers.addPlayer(
oggNativePlayer );
- // older versions of safari do not
support canPlayType,
- // but xiph qt registers mimetype via
quicktime plugin
- } else if ( this.supportedMimeType(
'video/ogg' ) ) {
- this.mediaPlayers.addPlayer(
oggNativePlayer );
}
// Test for opus
--
To view, visit https://gerrit.wikimedia.org/r/229980
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I046814576efe04168e2eb75c9083caeee7bbe648
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/TimedMediaHandler
Gerrit-Branch: master
Gerrit-Owner: Brion VIBBER br...@wikimedia.org
Gerrit-Reviewer: TheDJ hartman.w...@gmail.com
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Split up page object into lead and remaining objects - change (mediawiki...mobileapps)
BearND has uploaded a new change for review.
https://gerrit.wikimedia.org/r/230042
Change subject: Split up page object into lead and remaining objects
..
Split up page object into lead and remaining objects
The output format has changed so we can easily split off objects
for the two requests:
* lead
* remaining
Added two new routes to take advantage of the two objects:
* mobile-html-sections-lead
* mobile-html-sections-remaining
Note: To be able to use the two new routes from a local installation
you should change the restbase_uri value in config.dev.yaml to
http://localhost:6927
Extra improvements:
* Build lead image URLs for common sizes.
Motto: We munge the URLs so the clients don't have to.
* Fixed an gallery issue where redirects where not followed.
Change-Id: I46a07c56dac7789f307f8e0ec0e261289c3af4df
---
M config.dev.yaml
M lib/gallery.js
M lib/mwapi.js
A routes/mobile-html-sections-lead.js
A routes/mobile-html-sections-remaining.js
M routes/mobile-html-sections.js
M spec.yaml
M test/features/mobile-html-sections/pagecontent.js
M test/utils/assert.js
9 files changed, 205 insertions(+), 13 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/mobileapps
refs/changes/42/230042/1
diff --git a/config.dev.yaml b/config.dev.yaml
index 80b5d04..00ff47a 100644
--- a/config.dev.yaml
+++ b/config.dev.yaml
@@ -48,3 +48,4 @@
# - domain1.com
# - domain2.org
restbase_uri: https://restbase.wikimedia.org
+ #restbase_uri: http://localhost:6927
diff --git a/lib/gallery.js b/lib/gallery.js
index 0ce1c8b..1c101f2 100644
--- a/lib/gallery.js
+++ b/lib/gallery.js
@@ -184,7 +184,8 @@
prop: imageinfo,
iiprop: dimensions|mime,
generator: images,
-gimlimit: MAX_ITEM_COUNT
+gimlimit: MAX_ITEM_COUNT,
+redirects: true
}).then(function (response) {
var detailsPromises = onGalleryCollectionsResponse(logger, response,
domain);
return BBPromise.props({
diff --git a/lib/mwapi.js b/lib/mwapi.js
index af4602a..cf36dea 100644
--- a/lib/mwapi.js
+++ b/lib/mwapi.js
@@ -10,6 +10,8 @@
// shortcut
var HTTPError = sUtil.HTTPError;
+var DEFAULT_LEAD_IMAGE_WIDTH = 640;
+
/**
* A helper function that obtains the HTML from the MW API and
* loads it into a domino DOM document instance.
@@ -41,8 +43,22 @@
prop:
text|sections|thumb|image|id|revision|description|lastmodified|normalizedtitle|displaytitle|protection|editable,
sections: all,
sectionprop: toclevel|line|anchor,
-noheadings: true
+noheadings: true,
+thumbsize: DEFAULT_LEAD_IMAGE_WIDTH
});
+}
+
+/**
+ * Builds an array of URLs for lead images with different sizes based on
common bucket widths: 640, 800, 1024.
+ * @param initialUrl the initial URL for an actual lead image (caller already
checked for undefined)
+ *example URL:
//upload.wikimedia.org/wikipedia/commons/thumb/0/0b/Cat_poster_1.jpg/640px-Cat_poster_1.jpg
+ */
+function buildLeadImageUrls(initialUrl) {
+return {
+640: initialUrl.replace(/\/\d+px-/, /640px-),
+800: initialUrl.replace(/\/\d+px-/, /800px-),
+1024: initialUrl.replace(/\/\d+px-/, /1024px-)
+};
}
function checkApiResponse(response) {
@@ -74,6 +90,7 @@
module.exports = {
apiGet: apiGet,
getAllSections: getAllSections,
+buildLeadImageUrls: buildLeadImageUrls,
checkApiResponse: checkApiResponse,
checkForQueryPagesInResponse: checkForQueryPagesInResponse
};
\ No newline at end of file
diff --git a/routes/mobile-html-sections-lead.js
b/routes/mobile-html-sections-lead.js
new file mode 100644
index 000..f165e97
--- /dev/null
+++ b/routes/mobile-html-sections-lead.js
@@ -0,0 +1,43 @@
+/**
+ * Return only remaining sections of mobile page content
+ */
+
+'use strict';
+
+var BBPromise = require('bluebird');
+var preq = require('preq');
+var sUtil = require('../lib/util');
+
+
+/**
+ * The main router object
+ */
+var router = sUtil.router();
+
+/**
+ * The main application object reported when this module is require()d
+ */
+var app;
+
+/**
+ * GET {domain}/v1/page/mobile-html-sections-remaining/{title}
+ * Gets the remaining sections for the mobile app version of a given wiki page.
+ */
+router.get('/mobile-html-sections-remaining/:title', function (req, res) {
+preq.get({
+uri: app.conf.restbase_uri + '/' +
req.params.domain.replace(/^(\w+\.)m\./, '$1')
++ '/v1/page/mobile-html-sections/' +
encodeURIComponent(req.params.title),
+}).then(function (response) {
+
res.status(200).type('json').end(JSON.stringify(response.body.remaining));
+});
+});
+
+module.exports = function (appObj) {
+app = appObj;
+return {
+path: '/page',
+api_version: 1,
+router: router
+};
+};
+
diff --git a/routes/mobile-html-sections-remaining.js
[MediaWiki-commits] [Gerrit] Remove dead interface - change (mediawiki...Wikibase)
Jeroen De Dauw has uploaded a new change for review.
https://gerrit.wikimedia.org/r/230045
Change subject: Remove dead interface
..
Remove dead interface
Change-Id: Ib8c8beb80e1098674db24a338313a494271f0237
---
M lib/includes/store/EntityRevision.php
M lib/includes/store/RedirectRevision.php
D lib/includes/store/RevisionInfo.php
3 files changed, 2 insertions(+), 31 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/45/230045/1
diff --git a/lib/includes/store/EntityRevision.php
b/lib/includes/store/EntityRevision.php
index 955ae53..c49a791 100644
--- a/lib/includes/store/EntityRevision.php
+++ b/lib/includes/store/EntityRevision.php
@@ -13,7 +13,7 @@
* @licence GNU GPL v2+
* @author Daniel Kinzler
*/
-class EntityRevision implements RevisionInfo {
+class EntityRevision {
/**
* @var EntityDocument
diff --git a/lib/includes/store/RedirectRevision.php
b/lib/includes/store/RedirectRevision.php
index aa518cb..102d244 100644
--- a/lib/includes/store/RedirectRevision.php
+++ b/lib/includes/store/RedirectRevision.php
@@ -13,7 +13,7 @@
* @licence GNU GPL v2+
* @author Daniel Kinzler
*/
-class RedirectRevision implements RevisionInfo {
+class RedirectRevision {
/**
* @var EntityRedirect
diff --git a/lib/includes/store/RevisionInfo.php
b/lib/includes/store/RevisionInfo.php
deleted file mode 100644
index 327283b..000
--- a/lib/includes/store/RevisionInfo.php
+++ /dev/null
@@ -1,29 +0,0 @@
-?php
-
-namespace Wikibase;
-
-/**
- * Interface for value objects that hold basic revision info.
- *
- * @since 0.5
- *
- * @licence GNU GPL v2+
- * @author Daniel Kinzler
- */
-interface RevisionInfo {
-
- /**
-* @see Revision::getId
-*
-* @return int
-*/
- public function getRevisionId();
-
- /**
-* @see Revision::getTimestamp
-*
-* @return string in MediaWiki format or an empty string
-*/
- public function getTimestamp();
-
-}
--
To view, visit https://gerrit.wikimedia.org/r/230045
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib8c8beb80e1098674db24a338313a494271f0237
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Jeroen De Dauw jeroended...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Revert Add executable rights for executable (bash) files - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged. Change subject: Revert Add executable rights for executable (bash) files .. Revert Add executable rights for executable (bash) files These are not meant to be complete shell scripts, so shebang lines don't really make sense here. Rather, as noted by the author (Daniel Friesen), scripts in the parent directory include these files using the source or . command. This reverts commit 96e0ed45a81dfb4783c74353a8e70d0b926ad900. Change-Id: I7a0b7bb2a5ea1b1c141cb36f38736fe562b22c10 --- M maintenance/dev/includes/php.sh M maintenance/dev/includes/require-php.sh 2 files changed, 0 insertions(+), 0 deletions(-) Approvals: Legoktm: Looks good to me, approved jenkins-bot: Verified diff --git a/maintenance/dev/includes/php.sh b/maintenance/dev/includes/php.sh old mode 100755 new mode 100644 diff --git a/maintenance/dev/includes/require-php.sh b/maintenance/dev/includes/require-php.sh old mode 100755 new mode 100644 -- To view, visit https://gerrit.wikimedia.org/r/228834 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I7a0b7bb2a5ea1b1c141cb36f38736fe562b22c10 Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Southparkfan southparkfan...@hotmail.com Gerrit-Reviewer: Daniel Friesen dan...@nadir-seen-fire.com Gerrit-Reviewer: Legoktm legoktm.wikipe...@gmail.com Gerrit-Reviewer: Parent5446 tylerro...@gmail.com Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] VisualEditor: Fixed internal link check - change (mediawiki...BlueSpiceExtensions)
Pwirth has uploaded a new change for review.
https://gerrit.wikimedia.org/r/230048
Change subject: VisualEditor: Fixed internal link check
..
VisualEditor: Fixed internal link check
* needs merge to REL1_23
Change-Id: I629d3d44054425714a307b8a5e659fed9c584c34
---
M VisualEditor/resources/tiny_mce_plugins/bswikicode/plugin.js
1 file changed, 5 insertions(+), 1 deletion(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceExtensions
refs/changes/48/230048/1
diff --git a/VisualEditor/resources/tiny_mce_plugins/bswikicode/plugin.js
b/VisualEditor/resources/tiny_mce_plugins/bswikicode/plugin.js
index b101013..9297683 100644
--- a/VisualEditor/resources/tiny_mce_plugins/bswikicode/plugin.js
+++ b/VisualEditor/resources/tiny_mce_plugins/bswikicode/plugin.js
@@ -2321,7 +2321,11 @@
var internalLinks = [];
var internalLinksTitles = [];
$(this.dom.doc).find('a.bs-internal-link').each(function(){
- internalLinksTitles.push( $(this).attr('href') );
+ var href = $(this).attr('data-mce-href');
+ if( !href ) {
+ href = $(this).attr('href');
+ }
+ internalLinksTitles.push( href );
internalLinks.push($(this));
});
--
To view, visit https://gerrit.wikimedia.org/r/230048
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I629d3d44054425714a307b8a5e659fed9c584c34
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: master
Gerrit-Owner: Pwirth wi...@hallowelt.biz
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Sort the group list based on search result count - change (mediawiki...Translate)
jenkins-bot has submitted this change and it was merged.
Change subject: Sort the group list based on search result count
..
Sort the group list based on search result count
Provide unformatted number to sortGroups() to compare 'count' value
between different groups in descending order.
Bug: T100393
Change-Id: Ie0ff348c698133a2d33b3e7dd3bfbf66ec7f
---
M Resources.php
M resources/js/ext.translate.special.searchtranslations.js
M specials/SpecialSearchTranslations.php
3 files changed, 12 insertions(+), 6 deletions(-)
Approvals:
Nikerabbit: Looks good to me, approved
jenkins-bot: Verified
diff --git a/Resources.php b/Resources.php
index 93246b4..ba7089e 100644
--- a/Resources.php
+++ b/Resources.php
@@ -404,6 +404,7 @@
'ext.uls.geoclient',
'ext.translate.groupselector',
'mediawiki.Uri',
+ 'mediawiki.language',
),
'messages' = array(
'translate-documentation-language',
diff --git a/resources/js/ext.translate.special.searchtranslations.js
b/resources/js/ext.translate.special.searchtranslations.js
index 8c8ff2c..48dc535 100644
--- a/resources/js/ext.translate.special.searchtranslations.js
+++ b/resources/js/ext.translate.special.searchtranslations.js
@@ -235,7 +235,7 @@
),
$( 'span' )
.addClass( 'facet-count ' +
selectedClass )
- .text( group.count )
+ .text(
mw.language.convertNumber( group.count ) )
);
$parent.append( $groupRow );
if ( group.groups level 2 ) {
@@ -289,10 +289,16 @@
}
function sortGroups( groupIdA, groupIdB ) {
- var groupAName = mw.translate.findGroup( groupIdA, resultGroups
).label,
- groupBName = mw.translate.findGroup( groupIdB,
resultGroups ).label;
+ var groupAName = mw.translate.findGroup( groupIdA, resultGroups
).count,
+ groupBName = mw.translate.findGroup( groupIdB,
resultGroups ).count;
- return groupAName.localeCompare( groupBName );
+ if ( groupAName groupBName ) {
+ return -1;
+ } else if ( groupAName groupBName ) {
+ return 1;
+ }
+
+ return 0;
}
function sortLanguages( languageA, languageB ) {
diff --git a/specials/SpecialSearchTranslations.php
b/specials/SpecialSearchTranslations.php
index 527ca40..2e05d7a 100644
--- a/specials/SpecialSearchTranslations.php
+++ b/specials/SpecialSearchTranslations.php
@@ -280,11 +280,10 @@
}
$value = isset( $counts[$id] ) ? $counts[$id] : 0;
- $count = $this-getLanguage()-formatNum( $value );
$output[$id] = array(
'id' = $id,
- 'count' = $count,
+ 'count' = $value,
'label' = $group-getLabel(),
);
--
To view, visit https://gerrit.wikimedia.org/r/213781
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie0ff348c698133a2d33b3e7dd3bfbf66ec7f
Gerrit-PatchSet: 8
Gerrit-Project: mediawiki/extensions/Translate
Gerrit-Branch: master
Gerrit-Owner: Phoenix303 divyalife...@gmail.com
Gerrit-Reviewer: Krinkle krinklem...@gmail.com
Gerrit-Reviewer: Nemo bis federicol...@tiscali.it
Gerrit-Reviewer: Nikerabbit niklas.laxst...@gmail.com
Gerrit-Reviewer: Phoenix303 divyalife...@gmail.com
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] WikidataPageBanner reduce margin-top for minerva - change (mediawiki...WikidataPageBanner)
Sumit has uploaded a new change for review.
https://gerrit.wikimedia.org/r/230051
Change subject: WikidataPageBanner reduce margin-top for minerva
..
WikidataPageBanner reduce margin-top for minerva
Reduces margin-top from 3em to 1em for skin Minerva.
Bug: T108214
Change-Id: Ia4eddd15cf1e3876e3c236426080b5819f516eb2
---
M resources/ext.WikidataPageBanner.styles/ext.WikidataPageBanner.minerva.less
1 file changed, 1 insertion(+), 1 deletion(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikidataPageBanner
refs/changes/51/230051/1
diff --git
a/resources/ext.WikidataPageBanner.styles/ext.WikidataPageBanner.minerva.less
b/resources/ext.WikidataPageBanner.styles/ext.WikidataPageBanner.minerva.less
index 3f747f1..ff2cd7f 100644
---
a/resources/ext.WikidataPageBanner.styles/ext.WikidataPageBanner.minerva.less
+++
b/resources/ext.WikidataPageBanner.styles/ext.WikidataPageBanner.minerva.less
@@ -4,7 +4,7 @@
@import mediawiki.mixins;
.wpb-topbanner{
// some extra margin to make banner stand out and prevent overlapping
elements
- margin: 3em 0 1em 0;
+ margin: 1em 0 1em 0;
}
.ext-wpb-pagebanner {
--
To view, visit https://gerrit.wikimedia.org/r/230051
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia4eddd15cf1e3876e3c236426080b5819f516eb2
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikidataPageBanner
Gerrit-Branch: master
Gerrit-Owner: Sumit asthana.sumi...@gmail.com
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Use TUX elements to build tabs. - change (mediawiki...Translate)
Phoenix303 has uploaded a new change for review.
https://gerrit.wikimedia.org/r/230046
Change subject: Use TUX elements to build tabs.
..
Use TUX elements to build tabs.
Make a switch between translated, untranslated and outdated translations
through tabs. Used ellipsis options to swap between the last two tabs
since the tab header overflows, thereby misaligning the tabs.
Bug: T100175
Change-Id: I85f691b6fed96434ef0b5e80cefa1e0d59dba2ff
---
M i18n/search/en.json
M resources/css/ext.translate.special.searchtranslations.css
M specials/SpecialSearchTranslations.php
3 files changed, 135 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Translate
refs/changes/46/230046/1
diff --git a/i18n/search/en.json b/i18n/search/en.json
index 8677188..081fa3d 100644
--- a/i18n/search/en.json
+++ b/i18n/search/en.json
@@ -18,5 +18,11 @@
tux-sst-solr-offline-title: Search unavailable,
tux-sst-solr-offline-body: The search service is temporarily
unavailable.,
tux-sst-next: Next ›,
- tux-sst-prev: ‹ Previous
+ tux-sst-prev: ‹ Previous,
+ tux-sst-default: Messages containing,
+ tux-sst-translated: Translations,
+ tux-sst-untranslated: No translations,
+ tux-sst-outdated: Outdated translations,
+ tux-sst-from: from ,
+ tux-sst-of: of
}
diff --git a/resources/css/ext.translate.special.searchtranslations.css
b/resources/css/ext.translate.special.searchtranslations.css
index 5a7b8c6..3fe8f25 100644
--- a/resources/css/ext.translate.special.searchtranslations.css
+++ b/resources/css/ext.translate.special.searchtranslations.css
@@ -167,3 +167,20 @@
font-size: 14px;
padding: 0 8px;
}
+
+/* Override tabs */
+.tux-searchpage .tux-message-selector li {
+font-size: 14px;
+}
+
+.tux-searchpage .tux-messagetable-header .seven {
+width: 100%;
+}
+
+.tux-searchpage .tux-message-selector .more ul {
+width: auto;
+}
+
+.tux-searchpage .tux-message-selector .more ul a {
+ white-space: pre-wrap;
+}
diff --git a/specials/SpecialSearchTranslations.php
b/specials/SpecialSearchTranslations.php
index 83e140e..0b3823f 100644
--- a/specials/SpecialSearchTranslations.php
+++ b/specials/SpecialSearchTranslations.php
@@ -62,6 +62,7 @@
$out = $this-getOutput();
$out-addModules( 'ext.translate.special.searchtranslations' );
+ $out-addModuleStyles( 'ext.translate.special.translate' );
$this-opts = $opts = new FormOptions();
$opts-add( 'query', '' );
@@ -289,7 +290,13 @@
$definitions = new MessageDefinitions( $messages );
$collection = MessageCollection::newFromDefinitions(
$definitions, $language );
- $collection-filter( 'hastranslation', true );
+
+ $filter = $this-opts-getValue( 'filter' );
+ if ( $filter[0] === '!' ) {
+ $collection-filter( substr( $filter, 1 ), true );
+ } else {
+ $collection-filter( $filter, false );
+ }
$total = count( $collection );
$offset = $collection-slice( $offset, $limit );
@@ -400,10 +407,11 @@
}
protected function showSearch( $search, $count, $facets, $results ) {
+ $messageSelector = $this-messageSelector();
$this-getOutput()-addHtml( HTML
div class=grid tux-searchpage
div class=row searchinput
- div class=nine columns offset-by-three$search/div
+ div class=nine columns offset-by-three$messageSelector
$search/div
/div
div class=row count
div class=nine columns offset-by-three$count/div
@@ -429,6 +437,107 @@
);
}
+ // Build ellipsis to select options
+ protected function ellipsisSelector( $key, $value ) {
+ $nondefaults = $this-opts-getChangedValues();
+ $taskParams = array( 'filter' = $value ) + $nondefaults;
+ ksort( $taskParams );
+ $href = $this-getTitle()-getLocalUrl( $taskParams );
+ $link = Html::element( 'a',
+ array( 'href' = $href ),
+ $this-msg( 'tux-sst-' . $key )-text()
+ );
+
+ $container = Html::rawElement( 'li', array(
+ 'class' = 'column ' ,
+ 'data-filter' = $value,
+ 'data-title' = $key,
+ ), $link );
+
+ return $container;
+ }
+
+ /*
+* Design the tabs
+*/
+ protected function messageSelector() {
+ $nondefaults = $this-opts-getChangedValues();
+ $output = Html::openElement( 'div', array( 'class' = 'row
tux-messagetable-header' ) );
+
[MediaWiki-commits] [Gerrit] Load Flow object content in Pywikibot - change (pywikibot/core)
jenkins-bot has submitted this change and it was merged.
Change subject: Load Flow object content in Pywikibot
..
Load Flow object content in Pywikibot
This change allows Pywikibot bots to load basic Flow content from
Flow-enabled wikis. This includes loading the contents of posts,
loading topics from boards, and loading replies to topics and posts.
Tests have been added to ensure that content is indeed loaded.
Bug: T101260
Bug: T101261
Bug: T101262
Bug: T101263
Change-Id: Ibd84d0763a7745da6410c194b8d5ddf9ba8b57de
---
M pywikibot/flow.py
M pywikibot/site.py
M tests/flow_tests.py
3 files changed, 429 insertions(+), 31 deletions(-)
Approvals:
John Vandenberg: Looks good to me, approved
jenkins-bot: Verified
diff --git a/pywikibot/flow.py b/pywikibot/flow.py
index 8645532..c9fe320 100644
--- a/pywikibot/flow.py
+++ b/pywikibot/flow.py
@@ -11,7 +11,16 @@
import logging
+from pywikibot.exceptions import NoPage, UnknownExtension
from pywikibot.page import BasePage
+from pywikibot.tools import PY2
+
+if not PY2:
+unicode = str
+basestring = (str,)
+from urllib.parse import urlparse, parse_qs
+else:
+from urlparse import urlparse, parse_qs
logger = logging.getLogger('pywiki.wiki.flow')
@@ -43,7 +52,7 @@
super(FlowPage, self).__init__(source, title)
if not self.site.has_extension('Flow'):
-raise ValueError('site is not Flow-enabled')
+raise UnknownExtension('site is not Flow-enabled')
def _load_uuid(self):
Load and save the UUID of the page.
@@ -60,6 +69,13 @@
self._load_uuid()
return self._uuid
+def get(self, force=False, get_redirect=False, sysop=False):
+if get_redirect or force or sysop:
+raise NotImplementedError
+
+# TODO: Return more useful data
+return self._data
+
class Board(FlowPage):
@@ -70,6 +86,57 @@
if not hasattr(self, '_data'):
self._data = self.site.load_board(self)
return self._data
+
+def _parse_url(self, links):
+Parse a URL retrieved from the API.
+rule = links['fwd']
+parsed_url = urlparse(rule['url'])
+params = parse_qs(parsed_url.query)
+new_params = {}
+for key, value in params.items():
+if key != 'title':
+key = key.replace('topiclist_', '').replace('-', '_')
+if key == 'offset_dir':
+new_params['reverse'] = (value == 'rev')
+else:
+new_params[key] = value
+return new_params
+
+def topics(self, format='wikitext', limit=100, sort_by='newest',
+offset=None, offset_uuid='', reverse=False,
+include_offset=False, toc_only=False):
+Load this board's topics.
+
+@param format: The content format to request the data in.
+@type format: str (either 'wikitext', 'html', or 'fixed-html')
+@param limit: The number of topics to fetch in each request.
+@type limit: int
+@param sort_by: Algorithm to sort topics by.
+@type sort_by: str (either 'newest' or 'updated')
+@param offset: The timestamp to start at (when sortby is 'updated').
+@type offset: Timestamp or equivalent str
+@param offset_uuid: The UUID to start at (when sortby is 'newest').
+@type offset_uuid: str (in the form of a UUID)
+@param reverse: Whether to reverse the topic ordering.
+@type reverse: bool
+@param include_offset: Whether to include the offset topic.
+@type include_offset: bool
+@param toc_only: Whether to only include information for the TOC.
+@type toc_only: bool
+@return: A generator of this board's topics.
+@rtype: generator of Topic objects
+
+data = self.site.load_topiclist(self, format=format, limit=limit,
+sortby=sort_by, toconly=toc_only,
+offset=offset, offset_id=offset_uuid,
+reverse=reverse,
+include_offset=include_offset)
+while data['roots']:
+for root in data['roots']:
+topic = Topic.from_topiclist_data(self, root, data)
+yield topic
+cont_args = self._parse_url(data['links']['pagination'])
+data = self.site.load_topiclist(self, **cont_args)
class Topic(FlowPage):
@@ -82,8 +149,52 @@
self._data = self.site.load_topic(self)
return self._data
+@classmethod
+def from_topiclist_data(cls, board, root_uuid, topiclist_data):
+Create a Topic object from API data.
-# Flow non-page-like objects (currently just posts)
+@param board: The topic's parent Flow board
+@type board: Board
+@param root_uuid: The
[MediaWiki-commits] [Gerrit] ferm: NOTRACK needs to be applied on raw table - change (operations/puppet)
Alexandros Kosiaris has submitted this change and it was merged.
Change subject: ferm: NOTRACK needs to be applied on raw table
..
ferm: NOTRACK needs to be applied on raw table
Fix bug where NOTRACK was applied on the filter table instead of the raw
table. Also NOTRACK in this context needs to be applied to the
PREROUTING chain and not the INPUT chain
Bug: T104996
Change-Id: I7077050dc517e6745e9bc36b9709fbee77c308b5
---
M modules/ferm/files/functions.conf
1 file changed, 6 insertions(+), 2 deletions(-)
Approvals:
Alexandros Kosiaris: Verified; Looks good to me, approved
diff --git a/modules/ferm/files/functions.conf
b/modules/ferm/files/functions.conf
index 214f6d4..aec786f 100644
--- a/modules/ferm/files/functions.conf
+++ b/modules/ferm/files/functions.conf
@@ -13,7 +13,11 @@
# Exempt service from connection tracking (for high traffic services)
@def NO_TRACK($proto, $port) = {
- domain (ip ip6) chain INPUT {
- proto $proto dport $port NOTRACK;
+ domain (ip ip6) {
+ table raw {
+ chain PREROUTING {
+ proto $proto dport $port NOTRACK;
+ }
+ }
}
}
--
To view, visit https://gerrit.wikimedia.org/r/230052
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I7077050dc517e6745e9bc36b9709fbee77c308b5
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alexandros Kosiaris akosia...@wikimedia.org
Gerrit-Reviewer: Alexandros Kosiaris akosia...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Tools: Fix mail address for webservice jobs - change (operations/puppet)
Yuvipanda has submitted this change and it was merged. Change subject: Tools: Fix mail address for webservice jobs .. Tools: Fix mail address for webservice jobs By default, qsub uses a mail address for error messages that is undeliverable ($user@$host.eqiad.wmflabs). jsub works around that by explicitly setting the mail address to $u...@tools.wmflabs.org. This change applies the same logic to webservice2. Bug: T106462 Change-Id: Iff6f591e6b21a04b7f952b238440d9bbd85b1cb5 --- M modules/toollabs/files/webservice2 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Yuvipanda: Verified; Looks good to me, approved diff --git a/modules/toollabs/files/webservice2 b/modules/toollabs/files/webservice2 index 75a67e4..26769cc 100644 --- a/modules/toollabs/files/webservice2 +++ b/modules/toollabs/files/webservice2 @@ -54,6 +54,7 @@ '-l', 'h_vmem=%s,release=%s' % (MEMLIMIT, release), '-b', 'y', '-N', '%s-%s' % (server, TOOL), + '-M', '%s...@tools.wmflabs.org' % USER, '/usr/local/bin/tool-%s' % server] subprocess.check_call(command, stdout=open(os.devnull, 'wb')) -- To view, visit https://gerrit.wikimedia.org/r/226311 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iff6f591e6b21a04b7f952b238440d9bbd85b1cb5 Gerrit-PatchSet: 2 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Tim Landscheidt t...@tim-landscheidt.de Gerrit-Reviewer: Merlijn van Deen valhall...@arctus.nl Gerrit-Reviewer: Tim Landscheidt t...@tim-landscheidt.de Gerrit-Reviewer: Yuvipanda yuvipa...@wikimedia.org Gerrit-Reviewer: coren mpellet...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] WPB followup - fine tune banner position using js - change (mediawiki...WikidataPageBanner)
Sumit has uploaded a new change for review.
https://gerrit.wikimedia.org/r/230050
Change subject: WPB followup - fine tune banner position using js
..
WPB followup - fine tune banner position using js
This is a followup to
https://gerrit.wikimedia.org/r/#q,Ifd696117d4614389685945ad3853a473179c2c03,n,z
It further refines the position of banner using data-pos coordinates set by
parser function when js is enabled.
Also moves max-height of banner outside media-query as a general rule.
Adds tests for position coordinates.
Bug: T108232
Change-Id: I856690b82cacd295147f89a1f740ecac56c3176c
---
M extension.json
M includes/WikidataPageBanner.hooks.php
A
resources/ext.WikidataPageBanner.positionBanner/ext.WikidataPageBanner.positionBanner.js
M resources/ext.WikidataPageBanner.styles/ext.WikidataPageBanner.less
M tests/phpunit/BannerOptionsTest.php
5 files changed, 93 insertions(+), 4 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikidataPageBanner
refs/changes/50/230050/1
diff --git a/extension.json b/extension.json
index cb7d6d3..4ded47d 100644
--- a/extension.json
+++ b/extension.json
@@ -48,6 +48,16 @@
mobile
],
position: top
+ },
+ ext.WikidataPageBanner.positionBanner: {
+ scripts: [
+
ext.WikidataPageBanner.positionBanner/ext.WikidataPageBanner.positionBanner.js
+ ],
+ targets: [
+ desktop,
+ mobile
+ ],
+ position: bottom
}
},
ResourceFileModulePaths: {
diff --git a/includes/WikidataPageBanner.hooks.php
b/includes/WikidataPageBanner.hooks.php
index 4df78c1..146d3e9 100644
--- a/includes/WikidataPageBanner.hooks.php
+++ b/includes/WikidataPageBanner.hooks.php
@@ -26,6 +26,7 @@
// only add banner and styling if valid banner generated
if ( $banner !== null ) {
$out-addModuleStyles( 'ext.WikidataPageBanner'
);
+ $out-addModules(
'ext.WikidataPageBanner.positionBanner' );
if ( isset( $params['toc'] ) ) {
$out-addModuleStyles(
'ext.WikidataPageBanner.toc.styles' );
}
@@ -56,6 +57,7 @@
// only add banner and styling if valid banner
generated
if ( $banner !== null ) {
$out-addModuleStyles(
'ext.WikidataPageBanner' );
+ $out-addModules(
'ext.WikidataPageBanner.positionBanner' );
$out-prependHtml( $banner );
// hide primary title
$out-setPageTitle( '' );
diff --git
a/resources/ext.WikidataPageBanner.positionBanner/ext.WikidataPageBanner.positionBanner.js
b/resources/ext.WikidataPageBanner.positionBanner/ext.WikidataPageBanner.positionBanner.js
new file mode 100644
index 000..cbdace0
--- /dev/null
+++
b/resources/ext.WikidataPageBanner.positionBanner/ext.WikidataPageBanner.positionBanner.js
@@ -0,0 +1,57 @@
+( function( mw, $ ) {
+ /**
+* Javascript to fine tune position of banner according to position
coordinates.
+*/
+ // extract position parameters
+ var centrex = $( '.wpb-banner-image' ).data( 'pos-x' );
+ var centrey = $( '.wpb-banner-image' ).data( 'pos-y' );
+ // reset translations applied by css
+ $( '.wpb-banner-image' ).css( {
+ transform: 'translate(0)',
+ MozTransform: 'translate(0)',
+ WebkitTransform: 'translate(0)',
+ msTransform: 'translate(0)'
+ } );
+ if ( $( '.wpb-banner-image' ).height() $( '.wpb-topbanner' ).height()
) {
+ // first reset margin
+ $( '.wpb-banner-image' ).css( 'margin-top', 0 );
+ // do not shift below to leave blank space
+ var minOffsetTop = 0;
+ // this is the max shift up that can be achieved without
leaving blank space below
+ var maxOffsetTop = $( '.wpb-banner-image' ).height() -
+ $( '.wpb-topbanner' ).height();
+ // offset beyond centre 0
+ var offsetTop = centrey * $( '.wpb-banner-image' ).height() / 2;
+ // offset for default centre is maxOffsetTop/2
+ // total offset = offset for centre + manual offset
+ var totalOffset = maxOffsetTop / 2 + offsetTop;
+ // shift the banner no more than maxOffsets on either side
+ if (
[MediaWiki-commits] [Gerrit] Temporarily disable helium's poolcounter - change (operations/mediawiki-config)
jenkins-bot has submitted this change and it was merged. Change subject: Temporarily disable helium's poolcounter .. Temporarily disable helium's poolcounter While enabling firewall on helium and in order to avoid another self-inflicted DoS. Bug: T104996 Change-Id: I55ac9df8cb918e520d146b5d73e60dbfd3903d1c --- M wmf-config/PoolCounterSettings-eqiad.php 1 file changed, 0 insertions(+), 1 deletion(-) Approvals: Alexandros Kosiaris: Looks good to me, approved jenkins-bot: Verified diff --git a/wmf-config/PoolCounterSettings-eqiad.php b/wmf-config/PoolCounterSettings-eqiad.php index 8aaebe5..ff4b0ed 100644 --- a/wmf-config/PoolCounterSettings-eqiad.php +++ b/wmf-config/PoolCounterSettings-eqiad.php @@ -2,7 +2,6 @@ $wgPoolCountClientConf = array( 'servers' = array( - '10.64.0.179', '10.64.16.152' ), 'timeout' = 0.5 -- To view, visit https://gerrit.wikimedia.org/r/230049 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I55ac9df8cb918e520d146b5d73e60dbfd3903d1c Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Alexandros Kosiaris akosia...@wikimedia.org Gerrit-Reviewer: Alexandros Kosiaris akosia...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Revert Revert bacula: enable firewall on helium - change (operations/puppet)
Alexandros Kosiaris has uploaded a new change for review.
https://gerrit.wikimedia.org/r/230053
Change subject: Revert Revert bacula: enable firewall on helium
..
Revert Revert bacula: enable firewall on helium
This reverts commit 4f9a27cf859d697a4bfe7db63997f6c50aad4ed7.
Bug: T104996
Change-Id: I7f0a791024bcf17902bef825a507b91fa6ef093f
---
M manifests/site.pp
1 file changed, 1 insertion(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/53/230053/1
diff --git a/manifests/site.pp b/manifests/site.pp
index 0541b16..5f907c5 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1059,6 +1059,7 @@
# poolcounter - careful
node 'helium.eqiad.wmnet' {
include standard
+include base::firewall
include role::poolcounter
include role::backup::director
include role::backup::storage
--
To view, visit https://gerrit.wikimedia.org/r/230053
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I7f0a791024bcf17902bef825a507b91fa6ef093f
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alexandros Kosiaris akosia...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Delete deleteAllData maintenance and WikibaseDeleteData hooks - change (mediawiki...Wikibase)
jenkins-bot has submitted this change and it was merged.
Change subject: Delete deleteAllData maintenance and WikibaseDeleteData hooks
..
Delete deleteAllData maintenance and WikibaseDeleteData hooks
Not 100% sure it is no longer used, though it certainly is no longer
deleting ALL data.
Change-Id: I08d3e2407856f9d2bc5764c76af801f5c2e489a6
---
M client/WikibaseClient.hooks.php
M client/WikibaseClient.php
D lib/maintenance/deleteAllData.php
M repo/Wikibase.hooks.php
M repo/Wikibase.php
5 files changed, 0 insertions(+), 176 deletions(-)
Approvals:
Thiemo Mättig (WMDE): Looks good to me, but someone else must approve
Addshore: Looks good to me, approved
jenkins-bot: Verified
diff --git a/client/WikibaseClient.hooks.php b/client/WikibaseClient.hooks.php
index e54758c..ca3e3b9 100644
--- a/client/WikibaseClient.hooks.php
+++ b/client/WikibaseClient.hooks.php
@@ -77,35 +77,6 @@
}
/**
-* Deletes all the data stored on the repository.
-*
-* @since 0.2
-*
-* @param callable $reportMessage // takes a string param and echos it
-*
-* @return bool
-*/
- public static function onWikibaseDeleteData( $reportMessage ) {
- $store = WikibaseClient::getDefaultInstance()-getStore();
-
- $reportMessage( Deleting data from the . get_class( $store )
. store... );
-
- $store-clear();
-
- // @todo filter by something better than RC_EXTERNAL, in case
something else uses that someday
- $dbw = wfGetDB( DB_MASTER );
- $dbw-delete(
- 'recentchanges',
- array( 'rc_type' = RC_EXTERNAL ),
- __METHOD__
- );
-
- $reportMessage( done!\n );
-
- return true;
- }
-
- /**
* External library for Scribunto
*
* @since 0.4
diff --git a/client/WikibaseClient.php b/client/WikibaseClient.php
index 699a5f4..cc3fd52 100644
--- a/client/WikibaseClient.php
+++ b/client/WikibaseClient.php
@@ -121,9 +121,6 @@
// update hooks
$wgHooks['LoadExtensionSchemaUpdates'][] =
'\Wikibase\Client\Usage\Sql\SqlUsageTrackerSchemaUpdater::onSchemaUpdate';
- // extension hooks
- $wgHooks['WikibaseDeleteData'][] =
'\Wikibase\ClientHooks::onWikibaseDeleteData';
-
// job classes
$wgJobClasses['wikibase-addUsagesForPage'] =
'Wikibase\Client\Store\AddUsagesForPageJob';
diff --git a/lib/maintenance/deleteAllData.php
b/lib/maintenance/deleteAllData.php
deleted file mode 100644
index a6a9767..000
--- a/lib/maintenance/deleteAllData.php
+++ /dev/null
@@ -1,90 +0,0 @@
-?php
-
-namespace Wikibase;
-
-use Hooks;
-
-$basePath = getenv( 'MW_INSTALL_PATH' ) !== false ? getenv( 'MW_INSTALL_PATH'
) : __DIR__ . '/../../../..';
-
-require_once $basePath . '/maintenance/Maintenance.php';
-
-/**
- * Maintenance script for deleting all Wikibase data.
- *
- * @since 0.1
- *
- * @licence GNU GPL v2+
- * @author Jeroen De Dauw jeroended...@gmail.com
- */
-class DeleteAllData extends \Maintenance {
-
- public function __construct() {
- $this-mDescription = 'Delete the Wikidata data';
-
- parent::__construct();
- }
-
- public function execute() {
- if ( !defined( 'WBL_VERSION' ) ) {
- $this-output( You need to have WikibaseLib enabled in
order to use this maintenance script!\n\n );
- exit;
- }
-
- $quick = $_SERVER['argc'] 1 $_SERVER['argv'][1] ==
'--yes-im-sure-maybe';
-
- if ( !$quick ) {
- echo Are you really really sure you want to delete all
the Wikibase data?? If so, type DELETE\n;
-
- if ( $this-readconsole() !== 'DELETE' ) {
- return;
- }
- }
-
- $report = function( $message ) {
- echo $message;
- };
-
- Hooks::run( 'WikibaseDeleteData', array( $report ) );
-
- $report( EOT
-Some tasty bits there... omnomnom...
-
-.. .. ,,
- ..=~.. ZD. :=,.
- ..:++=.. .,. .:.M,=+++...
- ...=+++~..:~.~= .. ...~==.7.:+=.. .
- . :+~.. .,+=...,++... ..~++=..:++~...
-.+++~..:++=..~++,.. .:~===+=.
-.~~::=++=..~:=:..
- ..=+M7IM~+=+=+++8:.
- .=:.. .,++:M:~D~~:M...I++M+++:.
- ...,=+=,... .=?N ..M. .?++I++=..
-...:+++=,...+O.M.. .O= ,.
[MediaWiki-commits] [Gerrit] Revert Revert bacula: enable firewall on helium - change (operations/puppet)
Alexandros Kosiaris has submitted this change and it was merged.
Change subject: Revert Revert bacula: enable firewall on helium
..
Revert Revert bacula: enable firewall on helium
This reverts commit 4f9a27cf859d697a4bfe7db63997f6c50aad4ed7.
Bug: T104996
Change-Id: I7f0a791024bcf17902bef825a507b91fa6ef093f
---
M manifests/site.pp
1 file changed, 1 insertion(+), 0 deletions(-)
Approvals:
Alexandros Kosiaris: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/site.pp b/manifests/site.pp
index 0541b16..5f907c5 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1059,6 +1059,7 @@
# poolcounter - careful
node 'helium.eqiad.wmnet' {
include standard
+include base::firewall
include role::poolcounter
include role::backup::director
include role::backup::storage
--
To view, visit https://gerrit.wikimedia.org/r/230053
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I7f0a791024bcf17902bef825a507b91fa6ef093f
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alexandros Kosiaris akosia...@wikimedia.org
Gerrit-Reviewer: Alexandros Kosiaris akosia...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Separate Blueprint JS and style modules - change (mediawiki...Blueprint)
jenkins-bot has submitted this change and it was merged.
Change subject: Separate Blueprint JS and style modules
..
Separate Blueprint JS and style modules
This undoes part of https://gerrit.wikimedia.org/r/#/c/207395/ but keeps
the FOUC (T96889) from reappearing. It fixes the addModuleStyles call
instead of removing it as https://gerrit.wikimedia.org/r/#/c/228613/
does.
Bug: T107689
Change-Id: I6790f37d2898dc66600c95edafd4a31ca770e905
---
M skin.json
M src/SkinBlueprint.php
2 files changed, 6 insertions(+), 2 deletions(-)
Approvals:
Spage: Looks good to me, approved
jenkins-bot: Verified
diff --git a/skin.json b/skin.json
index 9e7b6f5..b82e9b9 100644
--- a/skin.json
+++ b/skin.json
@@ -26,8 +26,12 @@
scripts: lib/bootstrap/bootstrap.min.js,
styles: lib/bootstrap/bootstrap.min.css
},
- skin.blueprint: {
+ skin.blueprint.styles: {
styles: resources/master.less,
+ dependencies: ext.bootstrap,
+ position: top
+ },
+ skin.blueprint.js: {
scripts: [
resources/menu.js,
resources/toc.js
diff --git a/src/SkinBlueprint.php b/src/SkinBlueprint.php
index 399585b..b0ef50d 100644
--- a/src/SkinBlueprint.php
+++ b/src/SkinBlueprint.php
@@ -7,7 +7,7 @@
public function initPage( OutputPage $out ) {
parent::initPage( $out );
- $out-addModules( array( 'skin.blueprint' ) );
+ $out-addModules( array( 'skin.blueprint.js' ) );
}
public function setupSkinUserCss( OutputPage $out ) {
--
To view, visit https://gerrit.wikimedia.org/r/229382
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I6790f37d2898dc66600c95edafd4a31ca770e905
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/skins/Blueprint
Gerrit-Branch: master
Gerrit-Owner: Paladox thomasmulhall...@yahoo.com
Gerrit-Reviewer: Bartosz Dziewoński matma@gmail.com
Gerrit-Reviewer: Legoktm legoktm.wikipe...@gmail.com
Gerrit-Reviewer: Paladox thomasmulhall...@yahoo.com
Gerrit-Reviewer: Prtksxna psax...@wikimedia.org
Gerrit-Reviewer: Spage sp...@wikimedia.org
Gerrit-Reviewer: VolkerE ve...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Temporarily disable helium's poolcounter - change (operations/mediawiki-config)
Alexandros Kosiaris has uploaded a new change for review. https://gerrit.wikimedia.org/r/230049 Change subject: Temporarily disable helium's poolcounter .. Temporarily disable helium's poolcounter While enabling firewall on helium and in order to avoid another self-inflicted DoS. Bug: T104996 Change-Id: I55ac9df8cb918e520d146b5d73e60dbfd3903d1c --- M wmf-config/PoolCounterSettings-eqiad.php 1 file changed, 0 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/49/230049/1 diff --git a/wmf-config/PoolCounterSettings-eqiad.php b/wmf-config/PoolCounterSettings-eqiad.php index 8aaebe5..ff4b0ed 100644 --- a/wmf-config/PoolCounterSettings-eqiad.php +++ b/wmf-config/PoolCounterSettings-eqiad.php @@ -2,7 +2,6 @@ $wgPoolCountClientConf = array( 'servers' = array( - '10.64.0.179', '10.64.16.152' ), 'timeout' = 0.5 -- To view, visit https://gerrit.wikimedia.org/r/230049 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I55ac9df8cb918e520d146b5d73e60dbfd3903d1c Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Alexandros Kosiaris akosia...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] k8s: Add scheduler class - change (operations/puppet)
Yuvipanda has uploaded a new change for review.
https://gerrit.wikimedia.org/r/230055
Change subject: k8s: Add scheduler class
..
k8s: Add scheduler class
Change-Id: I3b453a90fcef8779ed628058784eb0703f5e2606
---
M manifests/role/labsk8s.pp
A modules/k8s/manifests/scheduler.pp
A modules/k8s/templates/initscripts/kube-scheduler.systemd.erb
3 files changed, 30 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/55/230055/1
diff --git a/manifests/role/labsk8s.pp b/manifests/role/labsk8s.pp
index d78ee9a..c3df389 100644
--- a/manifests/role/labsk8s.pp
+++ b/manifests/role/labsk8s.pp
@@ -12,6 +12,10 @@
}
+class { 'k8s::scheduler':
+master_host = $master_host,
+}
+
include role::labs::k8s::worker
}
diff --git a/modules/k8s/manifests/scheduler.pp
b/modules/k8s/manifests/scheduler.pp
new file mode 100644
index 000..2835860
--- /dev/null
+++ b/modules/k8s/manifests/scheduler.pp
@@ -0,0 +1,17 @@
+class k8s::scheduler(
+$master_host,
+) {
+file { '/usr/local/bin/kube-scheduler':
+source = '/data/scratch/k8s/kubernetes/server/bin/kube-scheduler',
+owner = 'root',
+group = 'root',
+mode = '0555',
+}
+
+$master_ip = ipresolve($master_host, 4, $::nameservers[0])
+
+base::service_unit { 'kube-scheduler':
+systemd = true,
+require = File['/usr/local/bin/kube-scheduler'],
+}
+}
diff --git a/modules/k8s/templates/initscripts/kube-scheduler.systemd.erb
b/modules/k8s/templates/initscripts/kube-scheduler.systemd.erb
new file mode 100644
index 000..4017c85
--- /dev/null
+++ b/modules/k8s/templates/initscripts/kube-scheduler.systemd.erb
@@ -0,0 +1,9 @@
+[Unit]
+Description=Kubernetes Scheduler
+
+[Service]
+ExecStart=/usr/local/bin/kube-scheduler \
+--master=%= @master_ip %:8080
+
+[Install]
+WantedBy=multi-user.target
--
To view, visit https://gerrit.wikimedia.org/r/230055
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I3b453a90fcef8779ed628058784eb0703f5e2606
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Yuvipanda yuvipa...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Revert Temporarily disable helium's poolcounter - change (operations/mediawiki-config)
jenkins-bot has submitted this change and it was merged. Change subject: Revert Temporarily disable helium's poolcounter .. Revert Temporarily disable helium's poolcounter This reverts commit 889ddcb7c0ad6542a75365eb9e9082570ce98b3a. Bug: T104996 Change-Id: I253ecb97244717b403f77e93d8b1bace0b0e1ef5 --- M wmf-config/PoolCounterSettings-eqiad.php 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Alexandros Kosiaris: Looks good to me, approved jenkins-bot: Verified diff --git a/wmf-config/PoolCounterSettings-eqiad.php b/wmf-config/PoolCounterSettings-eqiad.php index ff4b0ed..8aaebe5 100644 --- a/wmf-config/PoolCounterSettings-eqiad.php +++ b/wmf-config/PoolCounterSettings-eqiad.php @@ -2,6 +2,7 @@ $wgPoolCountClientConf = array( 'servers' = array( + '10.64.0.179', '10.64.16.152' ), 'timeout' = 0.5 -- To view, visit https://gerrit.wikimedia.org/r/230054 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I253ecb97244717b403f77e93d8b1bace0b0e1ef5 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Alexandros Kosiaris akosia...@wikimedia.org Gerrit-Reviewer: Alexandros Kosiaris akosia...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
