[MediaWiki-commits] [Gerrit] Removed deprecated job ID cruft - change (mediawiki/core)
Aaron Schulz has submitted this change and it was merged.
Change subject: Removed deprecated job ID cruft
..
Removed deprecated job ID cruft
Change-Id: I1db3b9adeaaeb66821e9ff6a931f7905ce916b7f
---
M includes/job/Job.php
M includes/job/JobQueueDB.php
M includes/job/jobs/DuplicateJob.php
3 files changed, 5 insertions(+), 22 deletions(-)
Approvals:
Tim Starling: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/job/Job.php b/includes/job/Job.php
index e33baf5..f08a367 100644
--- a/includes/job/Job.php
+++ b/includes/job/Job.php
@@ -28,9 +28,6 @@
* @ingroup JobQueue
*/
abstract class Job {
- /** @var int Job identifier */
- public $id;
-
/** @var string */
public $command;
@@ -145,24 +142,14 @@
* @param $command
* @param $title
* @param $params array|bool
-* @param $id int
*/
- public function __construct( $command, $title, $params = false, $id = 0
) {
+ public function __construct( $command, $title, $params = false ) {
$this-command = $command;
$this-title = $title;
$this-params = $params;
- $this-id = $id;
// expensive jobs may set this to true
$this-removeDuplicates = false;
- }
-
- /**
-* @return int May be 0 for jobs stored outside the DB
-* @deprecated since 1.22
-*/
- public function getId() {
- return $this-id;
}
/**
diff --git a/includes/job/JobQueueDB.php b/includes/job/JobQueueDB.php
index b795695..79ff4e8 100644
--- a/includes/job/JobQueueDB.php
+++ b/includes/job/JobQueueDB.php
@@ -324,7 +324,6 @@
$job = Job::factory( $row-job_cmd, $title,
self::extractBlob( $row-job_params ),
$row-job_id );
$job-metadata['id'] = $row-job_id;
- $job-id = $row-job_id; // XXX: work around
broken subclasses
break; // done
} while ( true );
} catch ( DBError $e ) {
@@ -596,11 +595,9 @@
$job = Job::factory(
$row-job_cmd,
Title::makeTitle(
$row-job_namespace, $row-job_title ),
- strlen( $row-job_params ) ?
unserialize( $row-job_params ) : false,
- $row-job_id
+ strlen( $row-job_params ) ?
unserialize( $row-job_params ) : false
);
$job-metadata['id'] = $row-job_id;
- $job-id = $row-job_id; // XXX: work
around broken subclasses
return $job;
}
);
diff --git a/includes/job/jobs/DuplicateJob.php
b/includes/job/jobs/DuplicateJob.php
index 7e5bd3c..b0a6ef7 100644
--- a/includes/job/jobs/DuplicateJob.php
+++ b/includes/job/jobs/DuplicateJob.php
@@ -32,10 +32,9 @@
*
* @param Title $title
* @param array $params job parameters
-* @param $id Integer: job id
*/
- function __construct( $title, $params, $id = 0 ) {
- parent::__construct( 'duplicate', $title, $params, $id );
+ function __construct( $title, $params ) {
+ parent::__construct( 'duplicate', $title, $params );
}
/**
@@ -45,7 +44,7 @@
* @return Job
*/
public static function newFromJob( Job $job ) {
- $djob = new self( $job-getTitle(), $job-getParams(), $job-id
);
+ $djob = new self( $job-getTitle(), $job-getParams() );
$djob-command = $job-getType();
$djob-params = is_array( $djob-params ) ? $djob-params :
array();
$djob-params = array( 'isDuplicate' = true ) + $djob-params;
--
To view, visit https://gerrit.wikimedia.org/r/101815
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I1db3b9adeaaeb66821e9ff6a931f7905ce916b7f
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz asch...@wikimedia.org
Gerrit-Reviewer: Aaron Schulz asch...@wikimedia.org
Gerrit-Reviewer: Tim Starling tstarl...@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] Added streamFile() unit tests - change (mediawiki/core)
Aaron Schulz has uploaded a new change for review.
https://gerrit.wikimedia.org/r/102086
Change subject: Added streamFile() unit tests
..
Added streamFile() unit tests
Change-Id: I2ef5680829048ab4fcc0a9f7ff9064d016800217
---
M tests/phpunit/includes/filebackend/FileBackendTest.php
1 file changed, 60 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/86/102086/1
diff --git a/tests/phpunit/includes/filebackend/FileBackendTest.php
b/tests/phpunit/includes/filebackend/FileBackendTest.php
index 072cb7c..46a8ec6 100644
--- a/tests/phpunit/includes/filebackend/FileBackendTest.php
+++ b/tests/phpunit/includes/filebackend/FileBackendTest.php
@@ -1115,6 +1115,66 @@
}
/**
+* @dataProvider provider_testGetFileStat
+* @covers FileBackend::streamFile
+*/
+ public function testStreamFile( $path, $content, $alreadyExists ) {
+ $this-backend = $this-singleBackend;
+ $this-tearDownFiles();
+ $this-doTestStreamFile( $path, $content, $alreadyExists );
+ $this-tearDownFiles();
+
+ $this-backend = $this-multiBackend;
+ $this-tearDownFiles();
+ $this-doTestStreamFile( $path, $content, $alreadyExists );
+ $this-tearDownFiles();
+ }
+
+ private function doTestStreamFile( $path, $content ) {
+ $backendName = $this-backendClass();
+
+ if ( $this-backend instanceof FileBackendMultiWrite ) {
+ return; // XXX: does not implement doStreamFile, uses
that of children
+ }
+
+ // Test doStreamFile() directly to avoid header madness
+ $class = new ReflectionClass( $this-backend );
+ $method = $class-getMethod( 'doStreamFile' );
+ $method-setAccessible( true );
+
+ if ( $content !== null ) {
+ $this-prepare( array( 'dir' = dirname( $path ) ) );
+ $status = $this-create( array( 'dst' = $path,
'content' = $content ) );
+ $this-assertGoodStatus( $status,
+ Creation of file at $path succeeded
($backendName). );
+
+ ob_start();
+ $method-invokeArgs( $this-backend, array( array(
'src' = $path ) ) );
+ $data = ob_get_contents();
+ ob_end_clean();
+
+ $this-assertEquals( $content, $data, Correct content
streamed from '$path' );
+ } else { // 404 case
+ ob_start();
+ $method-invokeArgs( $this-backend, array( array(
'src' = $path ) ) );
+ $data = ob_get_contents();
+ ob_end_clean();
+
+ $this-assertEquals( '', $data, Correct content
streamed from '$path' ($backendName) );
+ }
+ }
+
+ public static function provider_testStreamFile() {
+ $cases = array();
+
+ $base = self::baseStorePath();
+ $cases[] = array( $base/unittest-cont1/e/b/z/some_file.txt,
some file contents );
+ $cases[] = array(
$base/unittest-cont1/e/b/some-other_file.txt, null );
+
+ return $cases;
+ }
+
+ /**
* @dataProvider provider_testGetFileContents
* @covers FileBackend::getFileContents
* @covers FileBackend::getFileContentsMulti
--
To view, visit https://gerrit.wikimedia.org/r/102086
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I2ef5680829048ab4fcc0a9f7ff9064d016800217
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] Test sandbox translations to multiple languages - change (mediawiki...Translate)
jenkins-bot has submitted this change and it was merged.
Change subject: Test sandbox translations to multiple languages
..
Test sandbox translations to multiple languages
Change-Id: Ifd896ff38e34238675f42a0b2b8aa25db09e6134
---
M specials/SpecialTranslateSandbox.php
M tests/browser/features/manage_translator_sandbox.feature
M tests/browser/features/step_definitions/manage_translator_sandbox_steps.rb
M tests/browser/features/support/pages/manage_translator_sandbox_page.rb
4 files changed, 58 insertions(+), 30 deletions(-)
Approvals:
Nikerabbit: Looks good to me, approved
jenkins-bot: Verified
diff --git a/specials/SpecialTranslateSandbox.php
b/specials/SpecialTranslateSandbox.php
index 5d9e9d7..f3e9dbe 100644
--- a/specials/SpecialTranslateSandbox.php
+++ b/specials/SpecialTranslateSandbox.php
@@ -48,12 +48,16 @@
}
if ( $request-getVal( 'integrationtesting' ) === 'populate' ) {
+ // Empty all the users, even if they were created
manually
+ // to ensure the number of users is what the tests
expect
+ $this-emptySandbox();
+
$textUsernamePrefixes = array( 'Orava', 'Pupu' );
$testLanguages = array( 'fi', 'uk', 'nl', 'he', 'bn' );
- $userCount = count( $testLanguages );
+ $testLanguagesCount = count( $testLanguages );
foreach ( $textUsernamePrefixes as $prefix ) {
- for ( $i = 0; $i $userCount; $i++ ) {
+ for ( $i = 0; $i $testLanguagesCount; $i++ ) {
$name = $prefix$i;
// Get rid of users, even if promoted
during tests
@@ -81,13 +85,37 @@
$user-saveSettings();
for ( $j = 0; $j $i; $j++ ) {
- $title = Title::makeTitle(
NS_MEDIAWIKI, wfRandomString( 24 ) . '/' . $testLanguages[$i] );
+ $title = Title::makeTitle(
+ NS_MEDIAWIKI,
+ wfRandomString( 24 ) .
'/' . $testLanguages[$i]
+ );
$translation = 'plop';
$stashedTranslation = new
StashedTranslation( $user, $title, $translation );
$this-stash-addTranslation(
$stashedTranslation );
}
}
}
+
+ // Another account for testing a translator to multiple
languages
+ TranslateSandbox::deleteUser( User::newFromName(
'Kissa', false ), 'force' );
+ $polyglotUser = TranslateSandbox::addUser( 'Kissa',
'ki...@pupun.kolo', 'porkkana' );
+ $polyglotUser-setOption(
+ 'translate-sandbox',
+ FormatJson::encode( array(
+ 'languages' = $testLanguages,
+ 'comment' = ''
+ ) )
+ );
+ $polyglotUser-saveSettings();
+ for ( $polyglotLang = 0; $polyglotLang
$testLanguagesCount; $polyglotLang++ ) {
+ $title = Title::makeTitle(
+ NS_MEDIAWIKI,
+ wfRandomString( 24 ) . '/' .
$testLanguages[$polyglotLang]
+ );
+ $translation = plop in
$testLanguages[$polyglotLang];
+ $stashedTranslation = new StashedTranslation(
$polyglotUser, $title, $translation );
+ $this-stash-addTranslation(
$stashedTranslation );
+ }
} elseif ( $request-getVal( 'integrationtesting' ) === 'empty'
) {
$this-emptySandbox();
}
diff --git a/tests/browser/features/manage_translator_sandbox.feature
b/tests/browser/features/manage_translator_sandbox.feature
index 9c55ac2..8c3e256 100644
--- a/tests/browser/features/manage_translator_sandbox.feature
+++ b/tests/browser/features/manage_translator_sandbox.feature
@@ -62,15 +62,15 @@
Given I am on the Translator sandbox management page with users in the
sandbox
And I click the checkbox to select all users
Then I should not see the older requests link at the bottom of the first
column
- And I should see '10 users selected' at the bottom of
[MediaWiki-commits] [Gerrit] Breakdown of texvc - change (mediawiki...Math)
Physikerwelt has submitted this change and it was merged. Change subject: Breakdown of texvc .. Breakdown of texvc texvc had several tasks in the past: 1 checking the input 2 convert MediaWiki custom syntax to standard LaTeX 3 run LaTeX 4 convert dvi2png This change provides a simplified version that performs only steps 1+2. This is required to avoid security problems with tools like MathJax, especially if these tools are run at the server-side. Bug: 54624 Change-Id: I1650e6ec2ccefff6335fbc36bbe8ca8f59db0faa --- A texvccheck/.gitignore A texvccheck/Makefile A texvccheck/README A texvccheck/lexer.mll A texvccheck/parser.mly A texvccheck/test.pl A texvccheck/tex.mli A texvccheck/texutil.ml A texvccheck/texvccheck.ml A texvccheck/util.ml 10 files changed, 1,204 insertions(+), 0 deletions(-) Approvals: Frédéric Wang: Looks good to me, but someone else must approve Physikerwelt: Verified; Looks good to me, approved TheDJ: Looks good to me, but someone else must approve diff --git a/texvccheck/.gitignore b/texvccheck/.gitignore new file mode 100644 index 000..be7dcb9 --- /dev/null +++ b/texvccheck/.gitignore @@ -0,0 +1,9 @@ +# Compiled source +*.mli +!tex.mli +*.cmi +*.cmx +*.o + +# The binaries +texvccheck diff --git a/texvccheck/Makefile b/texvccheck/Makefile new file mode 100644 index 000..14b44f7 --- /dev/null +++ b/texvccheck/Makefile @@ -0,0 +1,65 @@ +.PHONY: clean all +PREFIX = /usr/local +DESTDIR = /usr +SOURCEDIR = $(PWD) +INSTALL = /usr/bin/install +OBJ= tex.cmo texutil.cmo parser.cmo lexer.cmo texvccheck.cmo \ +tex.cmx texutil.cmx parser.cmx lexer.cmx texvccheck.cmx \ +lexer.cmi parser.cmi tex.cmi texutil.cmi texvccheck.cmi \ +lexer.o parser.o tex.o texutil.o texvccheck.o \ +lexer.ml parser.ml parser.mli texvccheck texvccheck.bc util.o \ +util.cmo util.cmx util.cmi \ + +COMMON_NATIVE_OBJ =util.cmx parser.cmx texutil.cmx lexer.cmx +COMMON_BYTECODE_OBJ=util.cmo parser.cmo texutil.cmo lexer.cmo + +all: texvccheck +clean: + rm -f $(OBJ) + +# Native versions +texvccheck: $(COMMON_NATIVE_OBJ) texvccheck.cmx + ocamlopt -o $@ unix.cmxa $^ + +# Bytecode version +texvccheck.bc: $(COMMON_BYTECODE_OBJ) texvccheck.cmo + ocamlc -o $@ unix.cma $^ + +install: texvccheck + $(INSTALL) -dm777 $(DESTDIR)/bin + $(INSTALL) -m777 texvccheck $(DESTDIR)/bin + +remove: + rm -f $(DESTDIR)/bin/texvccheck + +# +# Pattern rules +# + +# .ml source .mli interface +# .cmi compiled interface +# .cmo object .cma library object +# .cmx object file .cmxa library object file +%.ml: %.mll + ocamllex $ +%.mli %.ml: %.mly + ocamlyacc $ +%.cmo: %.ml + ocamlc -c $ +%.cmx: %.ml + ocamlopt -c $ +%.cmi: %.mli + ocamlc -c $ + +# Various dependencies + +lexer.cmo: parser.cmi tex.cmi texutil.cmi +lexer.cmx: parser.cmx tex.cmi texutil.cmx +parser.cmo: tex.cmi parser.cmi +parser.cmx: tex.cmi parser.cmi +parser.cmi: tex.cmi +texutil.cmo: parser.cmi tex.cmi util.cmo texutil.cmi +texutil.cmx: parser.cmx tex.cmi util.cmx texutil.cmi +texutil.cmi: parser.cmi tex.cmi +texvccheck.cmo: lexer.cmo parser.cmi texutil.cmi util.cmo +texvccheck.cmx: lexer.cmx parser.cmx texutil.cmx util.cmx diff --git a/texvccheck/README b/texvccheck/README new file mode 100644 index 000..0e87fce --- /dev/null +++ b/texvccheck/README @@ -0,0 +1,77 @@ +== About texvccheck == + +texvc takes the user input validates it and replaces MediaWiki specific functions. +Input data is parsed and scrutinized for safety. + +texvc was written by Tomasz Wegrzanowski for use with MediaWiki; it's +included as part of the MediaWiki package (http://www.mediawiki.org) and is +under the GPL license. + +texvc-lite, was extracted from the original texvc program in 2013 by +Moritz Schubotz and uses only the sanitizing and customization part. + +The list of all commands can be viewed by browsing the source files. +Most commands are listed at +http://sdrv.ms/15w2gVw +there is also a tool for convenient whitelisting of special commands +that are used in local wikis. + +Please report bugs at: https://bugzilla.wikimedia.org/ +with MediaWiki extensions as product and Math as component. + +== Setup == + +=== Requirements === + +OCaml 3.06 or later is required to compile texvc; this can be acquired from +http://caml.inria.fr/ if your system doesn't have it available. + +The makefile requires GNU make. + +In Ubuntu Precise, all dependencies can be installed using: + + $ sudo apt-get install ocaml + +=== Installation === + +Run 'make' (or 'gmake' if GNU make is not your default make). This should +produce the texvccheck executable. + +By default, +MediaWiki will search in this directory for texvc, if you moved it elsewhere, +you'll have to modify $wgTexvc and set it to the path of the texvc executable. + +== Usage == + +Normally texvc is called from MediaWiki's Math modules and everything +Just Works. It can be run manually for testing or
[MediaWiki-commits] [Gerrit] Remove unused job ID parameter from jobs - change (mediawiki/core)
Aaron Schulz has uploaded a new change for review.
https://gerrit.wikimedia.org/r/102087
Change subject: Remove unused job ID parameter from jobs
..
Remove unused job ID parameter from jobs
Change-Id: I2bedd0ff311bff027d998f193d6cb799d70d2a93
---
M includes/job/Job.php
M includes/job/jobs/AssembleUploadChunksJob.php
M includes/job/jobs/DoubleRedirectJob.php
M includes/job/jobs/EmaillingJob.php
M includes/job/jobs/EnotifNotifyJob.php
M includes/job/jobs/HTMLCacheUpdateJob.php
M includes/job/jobs/NullJob.php
M includes/job/jobs/PublishStashedFileJob.php
M includes/job/jobs/RefreshLinksJob.php
M includes/job/jobs/RefreshLinksJob2.php
M includes/job/jobs/UploadFromUrlJob.php
11 files changed, 22 insertions(+), 23 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/87/102087/1
diff --git a/includes/job/Job.php b/includes/job/Job.php
index f08a367..77652a4 100644
--- a/includes/job/Job.php
+++ b/includes/job/Job.php
@@ -66,16 +66,15 @@
* @param string $command Job command
* @param Title $title Associated title
* @param array|bool $params Job parameters
-* @param int $id Job identifier
* @throws MWException
* @return Job
*/
- public static function factory( $command, Title $title, $params =
false, $id = 0 ) {
+ public static function factory( $command, Title $title, $params = false
) {
global $wgJobClasses;
if ( isset( $wgJobClasses[$command] ) ) {
$class = $wgJobClasses[$command];
- return new $class( $title, $params, $id );
+ return new $class( $title, $params );
}
throw new MWException( Invalid job command `{$command}` );
}
diff --git a/includes/job/jobs/AssembleUploadChunksJob.php
b/includes/job/jobs/AssembleUploadChunksJob.php
index eff16b9..19b0558 100644
--- a/includes/job/jobs/AssembleUploadChunksJob.php
+++ b/includes/job/jobs/AssembleUploadChunksJob.php
@@ -27,8 +27,8 @@
* @ingroup Upload
*/
class AssembleUploadChunksJob extends Job {
- public function __construct( $title, $params, $id = 0 ) {
- parent::__construct( 'AssembleUploadChunks', $title, $params,
$id );
+ public function __construct( $title, $params ) {
+ parent::__construct( 'AssembleUploadChunks', $title, $params );
$this-removeDuplicates = true;
}
diff --git a/includes/job/jobs/DoubleRedirectJob.php
b/includes/job/jobs/DoubleRedirectJob.php
index f5f0d63..99d7527 100644
--- a/includes/job/jobs/DoubleRedirectJob.php
+++ b/includes/job/jobs/DoubleRedirectJob.php
@@ -86,8 +86,8 @@
* @param array|bool $params
* @param int $id
*/
- function __construct( $title, $params = false, $id = 0 ) {
- parent::__construct( 'fixDoubleRedirect', $title, $params, $id
);
+ function __construct( $title, $params = false ) {
+ parent::__construct( 'fixDoubleRedirect', $title, $params );
$this-reason = $params['reason'];
$this-redirTitle = Title::newFromText( $params['redirTitle'] );
}
diff --git a/includes/job/jobs/EmaillingJob.php
b/includes/job/jobs/EmaillingJob.php
index f24cebb..df8ae63 100644
--- a/includes/job/jobs/EmaillingJob.php
+++ b/includes/job/jobs/EmaillingJob.php
@@ -28,8 +28,8 @@
* @ingroup JobQueue
*/
class EmaillingJob extends Job {
- function __construct( $title, $params, $id = 0 ) {
- parent::__construct( 'sendMail', Title::newMainPage(), $params,
$id );
+ function __construct( $title, $params ) {
+ parent::__construct( 'sendMail', Title::newMainPage(), $params
);
}
function run() {
diff --git a/includes/job/jobs/EnotifNotifyJob.php
b/includes/job/jobs/EnotifNotifyJob.php
index 97a7af6..1ed99a5 100644
--- a/includes/job/jobs/EnotifNotifyJob.php
+++ b/includes/job/jobs/EnotifNotifyJob.php
@@ -27,8 +27,8 @@
* @ingroup JobQueue
*/
class EnotifNotifyJob extends Job {
- function __construct( $title, $params, $id = 0 ) {
- parent::__construct( 'enotifNotify', $title, $params, $id );
+ function __construct( $title, $params ) {
+ parent::__construct( 'enotifNotify', $title, $params );
}
function run() {
diff --git a/includes/job/jobs/HTMLCacheUpdateJob.php
b/includes/job/jobs/HTMLCacheUpdateJob.php
index 0415906..833616d 100644
--- a/includes/job/jobs/HTMLCacheUpdateJob.php
+++ b/includes/job/jobs/HTMLCacheUpdateJob.php
@@ -33,8 +33,8 @@
* @ingroup JobQueue
*/
class HTMLCacheUpdateJob extends Job {
- function __construct( $title, $params = '', $id = 0 ) {
- parent::__construct( 'htmlCacheUpdate', $title, $params, $id );
+ function __construct( $title, $params = '' ) {
+
[MediaWiki-commits] [Gerrit] Sort requests with newer on the top - change (mediawiki...Translate)
Amire80 has uploaded a new change for review.
https://gerrit.wikimedia.org/r/102088
Change subject: Sort requests with newer on the top
..
Sort requests with newer on the top
Change-Id: I4e2df63ee11342c9d18b4bb9b9b53ba59b8e9f96
---
M specials/SpecialTranslateSandbox.php
1 file changed, 2 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Translate
refs/changes/88/102088/1
diff --git a/specials/SpecialTranslateSandbox.php
b/specials/SpecialTranslateSandbox.php
index f3e9dbe..f624cbd 100644
--- a/specials/SpecialTranslateSandbox.php
+++ b/specials/SpecialTranslateSandbox.php
@@ -52,7 +52,7 @@
// to ensure the number of users is what the tests
expect
$this-emptySandbox();
- $textUsernamePrefixes = array( 'Orava', 'Pupu' );
+ $textUsernamePrefixes = array( 'Pupu', 'Orava' );
$testLanguages = array( 'fi', 'uk', 'nl', 'he', 'bn' );
$testLanguagesCount = count( $testLanguages );
@@ -276,7 +276,7 @@
return $translationCountDiff;
}
- $registrationDateDiff = $a['registrationdate'] -
$b['registrationdate'];
+ $registrationDateDiff = $b['registrationdate'] -
$a['registrationdate'];
if ( $registrationDateDiff !== 0 ) {
return $registrationDateDiff;
}
--
To view, visit https://gerrit.wikimedia.org/r/102088
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I4e2df63ee11342c9d18b4bb9b9b53ba59b8e9f96
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Translate
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] Update backward compatibiliy for MediaWiki export - change (translatewiki)
Siebrand has uploaded a new change for review. https://gerrit.wikimedia.org/r/102090 Change subject: Update backward compatibiliy for MediaWiki export .. Update backward compatibiliy for MediaWiki export Change-Id: I8e750e59ed893d393a42aba2b3710d6213195094 --- M bin/repoexport 1 file changed, 5 insertions(+), 3 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/translatewiki refs/changes/90/102090/1 diff --git a/bin/repoexport b/bin/repoexport index 75c35de..e0fe9d0 100755 --- a/bin/repoexport +++ b/bin/repoexport @@ -93,12 +93,14 @@ fi if [ -d mediawiki/REL1_21/ ] then - php $EXPORTER --target mediawiki/REL1_21/languages/messages --core-meta --group 'core-1.21' --lang '*' --skip=$SKIPLANGS --threshold 15 + # Skip gv because plurals are not compatible pre 1.22. + php $EXPORTER --target mediawiki/REL1_21/languages/messages --core-meta --group 'core-1.21' --lang '*' --skip=gv,$SKIPLANGS --threshold 15 fi if [ -d mediawiki/REL1_20/ ] then - # Also skip gd because plurals are not compatible pre 1.21. - php $EXPORTER --target mediawiki/REL1_20/languages/messages --core-meta --group 'core-1.20' --lang '*' --skip=gd,$SKIPLANGS --threshold 15 + # Skip gd because plurals are not compatible pre 1.21. + # Skip gv because plurals are not compatible pre 1.22. + php $EXPORTER --target mediawiki/REL1_20/languages/messages --core-meta --group 'core-1.20' --lang '*' --skip=gd,gv,$SKIPLANGS --threshold 15 fi wait -- To view, visit https://gerrit.wikimedia.org/r/102090 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I8e750e59ed893d393a42aba2b3710d6213195094 Gerrit-PatchSet: 1 Gerrit-Project: translatewiki Gerrit-Branch: master Gerrit-Owner: Siebrand siebr...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] ValueParser QUnit tests: Renamed getObject to getConstructor - change (mediawiki...DataValues)
Henning Snater has uploaded a new change for review.
https://gerrit.wikimedia.org/r/102091
Change subject: ValueParser QUnit tests: Renamed getObject to getConstructor
..
ValueParser QUnit tests: Renamed getObject to getConstructor
Change-Id: If48baf7950055bf53f037bdc5b5d955e0e2d9408
---
M DataValuesCommon/js/tests/ValueParsers/ValueParser.tests.js
M DataValuesCommon/js/tests/ValueParsers/parsers/BoolParser.tests.js
M DataValuesCommon/js/tests/ValueParsers/parsers/FloatParser.tests.js
M DataValuesCommon/js/tests/ValueParsers/parsers/GlobeCoordinateParser.tests.js
M DataValuesCommon/js/tests/ValueParsers/parsers/IntParser.tests.js
M DataValuesCommon/js/tests/ValueParsers/parsers/NullParser.tests.js
M DataValuesCommon/js/tests/ValueParsers/parsers/QuantityParser.tests.js
M DataValuesCommon/js/tests/ValueParsers/parsers/StringParser.tests.js
M DataValuesCommon/js/tests/ValueParsers/parsers/TimeParser.tests.js
9 files changed, 26 insertions(+), 31 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/DataValues
refs/changes/91/102091/1
diff --git a/DataValuesCommon/js/tests/ValueParsers/ValueParser.tests.js
b/DataValuesCommon/js/tests/ValueParsers/ValueParser.tests.js
index 7882e97..38ed173 100644
--- a/DataValuesCommon/js/tests/ValueParsers/ValueParser.tests.js
+++ b/DataValuesCommon/js/tests/ValueParsers/ValueParser.tests.js
@@ -1,11 +1,9 @@
/**
- * @file
- * @ingroup DataValues
* @licence GNU GPL v2+
* @author Jeroen De Dauw jeroended...@gmail.com
* @author Daniel Werner danwe...@web.de
*/
-( function( vp, dv, $, QUnit, undefined ) {
+( function( vp, dv, $, QUnit ) {
'use strict';
vp.tests = {};
@@ -30,34 +28,34 @@
getParseArguments: vp.util.abstractMember,
/**
-* Returns the ValueParser object to be tested (ie
vp.IntParser).
+* Returns the ValueParser constructor to be tested.
*
* @since 0.1
*
-* @return vp.ValueParser
+* @return {Function}
*/
- getObject: vp.util.abstractMember,
+ getConstructor: vp.util.abstractMember,
/**
-* Returns the dataValue object to be tested (ie
dv.StringValue).
+* Returns the ValueParser instance to be tested.
*
* @since 0.1
*
* @param {Array} constructorArguments
*
-* @return vp.ValueParser
+* @return {valueParsers.ValueParser}
*/
getInstance: function( constructorArguments ) {
constructorArguments = constructorArguments ||
this.getDefaultConstructorArgs();
var
self = this,
- ValueParserInstance = function(
constructorArguments ) {
- self.getObject().apply( this,
constructorArguments );
+ ValueParserConstructor = function(
constructorArguments ) {
+ self.getConstructor().apply( this,
constructorArguments );
};
- ValueParserInstance.prototype =
this.getObject().prototype;
- return new ValueParserInstance( constructorArguments );
+ ValueParserConstructor.prototype =
this.getConstructor().prototype;
+ return new ValueParserConstructor( constructorArguments
);
},
getDefaultConstructorArgs: function() {
@@ -111,9 +109,6 @@
: '';
var request = parser.parse( parseInput )
- .always( function() {
- //QUnit.start();
- } )
.done( function( dataValue ) {
// promise resolved, so no
error has occured
assert.ok( true, 'parsing
succeeded' );
diff --git a/DataValuesCommon/js/tests/ValueParsers/parsers/BoolParser.tests.js
b/DataValuesCommon/js/tests/ValueParsers/parsers/BoolParser.tests.js
index 442ba9c..15cb6f3 100644
--- a/DataValuesCommon/js/tests/ValueParsers/parsers/BoolParser.tests.js
+++ b/DataValuesCommon/js/tests/ValueParsers/parsers/BoolParser.tests.js
@@ -23,9 +23,9 @@
vp.tests.BoolParserTest = vp.util.inherit( PARENT, constructor, {
/**
-* @see vp.tests.ValueParserTest.getObject
+* @see vp.tests.ValueParserTest.getConstructor
*/
- getObject: function() {
+
[MediaWiki-commits] [Gerrit] Added default parser test to ValueParserFactory QUnit tests - change (mediawiki...DataValues)
Henning Snater has uploaded a new change for review.
https://gerrit.wikimedia.org/r/102092
Change subject: Added default parser test to ValueParserFactory QUnit tests
..
Added default parser test to ValueParserFactory QUnit tests
Change-Id: I22148a963ba9a6f3572e45c7f39ad8c785ca4b6d
---
M DataValuesCommon/js/tests/ValueParsers/ValueParserFactory.tests.js
1 file changed, 41 insertions(+), 17 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/DataValues
refs/changes/92/102092/1
diff --git a/DataValuesCommon/js/tests/ValueParsers/ValueParserFactory.tests.js
b/DataValuesCommon/js/tests/ValueParsers/ValueParserFactory.tests.js
index ad504fd..35d121e 100644
--- a/DataValuesCommon/js/tests/ValueParsers/ValueParserFactory.tests.js
+++ b/DataValuesCommon/js/tests/ValueParsers/ValueParserFactory.tests.js
@@ -29,8 +29,8 @@
BoolValue = dv.BoolValue,
stringType = new dt.DataType( 'somestringtype', StringValue ),
numberType = new dt.DataType( 'somenumbertype', dv.NumberValue
),
- stringParser = vp.StringParser,
- boolParser = vp.BoolParser;
+ StringParser = vp.StringParser,
+ BoolParser = vp.BoolParser;
QUnit.module( 'valueParsers.ValueParserFactory' );
@@ -55,18 +55,42 @@
assert.throws(
function() {
- parserFactory.register( 'invalid', stringParser
);
+ parserFactory.register( 'invalid', StringParser
);
},
'Failed trying to register a parser with an invalid
purpose.'
);
- parserFactory.registerParser( StringValue.TYPE, stringParser );
+ parserFactory.registerParser( StringValue.TYPE, StringParser );
assert.throws(
function() {
parserFactory.getParser( StringValue );
},
'Failed trying to get a parser with an invalid purpose.'
+ );
+ } );
+
+ QUnit.test( 'Return default parser on getParser()', function( assert ) {
+ var parserFactory = new vp.ValueParserFactory( BoolParser );
+
+ assert.equal(
+ parserFactory.getParser( StringValue.TYPE ),
+ BoolParser,
+ 'Returning default parser if no parser is registered
for a specific data value.'
+ );
+
+ parserFactory.registerParser( StringValue.TYPE, StringParser );
+
+ assert.equal(
+ parserFactory.getParser( StringValue.TYPE ),
+ StringParser,
+ 'Returning specific parser if a parser is registered
for a specific data value.'
+ );
+
+ assert.equal(
+ parserFactory.getParser( BoolValue.TYPE ),
+ BoolParser,
+ 'Still returning default parser if no parser is
registered for a specific data value.'
);
} );
@@ -89,11 +113,11 @@
title: 'Factory with parser for string DataValue which
is also suitable for string '
+ 'DataType',
register: [
- [ StringValue.TYPE, stringParser ]
+ [ StringValue.TYPE, StringParser ]
],
expect: [
- [ StringValue.TYPE, stringParser ],
- [ stringType, stringParser ], // data type uses
value type
+ [ StringValue.TYPE, StringParser ],
+ [ stringType, StringParser ], // data type uses
value type
[ BoolValue.TYPE, null ],
[ numberType, null ]
]
@@ -102,35 +126,35 @@
title: 'Factory for string DataType. String DataValue
can\'t use this potentially more '
+ 'specialized parser',
register: [
- [ stringType, stringParser ]
+ [ stringType, StringParser ]
],
expect: [
[ StringValue.TYPE, null ],
- [ stringType, stringParser ]
+ [ stringType, StringParser ]
]
},
{
title: 'Factory with two parsers: For DataValue and for
DataType using that DataValue '
+ 'type',
register: [
-
[MediaWiki-commits] [Gerrit] Sort requests with newer on the top - change (mediawiki...Translate)
jenkins-bot has submitted this change and it was merged.
Change subject: Sort requests with newer on the top
..
Sort requests with newer on the top
Change-Id: I4e2df63ee11342c9d18b4bb9b9b53ba59b8e9f96
---
M specials/SpecialTranslateSandbox.php
1 file changed, 2 insertions(+), 2 deletions(-)
Approvals:
Nikerabbit: Looks good to me, approved
jenkins-bot: Verified
diff --git a/specials/SpecialTranslateSandbox.php
b/specials/SpecialTranslateSandbox.php
index f3e9dbe..f624cbd 100644
--- a/specials/SpecialTranslateSandbox.php
+++ b/specials/SpecialTranslateSandbox.php
@@ -52,7 +52,7 @@
// to ensure the number of users is what the tests
expect
$this-emptySandbox();
- $textUsernamePrefixes = array( 'Orava', 'Pupu' );
+ $textUsernamePrefixes = array( 'Pupu', 'Orava' );
$testLanguages = array( 'fi', 'uk', 'nl', 'he', 'bn' );
$testLanguagesCount = count( $testLanguages );
@@ -276,7 +276,7 @@
return $translationCountDiff;
}
- $registrationDateDiff = $a['registrationdate'] -
$b['registrationdate'];
+ $registrationDateDiff = $b['registrationdate'] -
$a['registrationdate'];
if ( $registrationDateDiff !== 0 ) {
return $registrationDateDiff;
}
--
To view, visit https://gerrit.wikimedia.org/r/102088
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I4e2df63ee11342c9d18b4bb9b9b53ba59b8e9f96
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Translate
Gerrit-Branch: master
Gerrit-Owner: Amire80 amir.ahar...@mail.huji.ac.il
Gerrit-Reviewer: Amire80 amir.ahar...@mail.huji.ac.il
Gerrit-Reviewer: Nikerabbit niklas.laxst...@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] Move demos/widgets.html inline script to a .js file - change (oojs/ui)
jenkins-bot has submitted this change and it was merged.
Change subject: Move demos/widgets.html inline script to a .js file
..
Move demos/widgets.html inline script to a .js file
This way jshint runs on it properly.
Change-Id: I077732b740c86fd774525d84a7f3c96f54bb1428
---
M Gruntfile.js
R demos/demo.css
M demos/widgets.html
A demos/widgets.js
4 files changed, 168 insertions(+), 169 deletions(-)
Approvals:
Catrope: Looks good to me, approved
jenkins-bot: Verified
diff --git a/Gruntfile.js b/Gruntfile.js
index c8958ee..7091b1b 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -38,7 +38,7 @@
jshint: {
options: JSON.parse( grunt.file.read( '.jshintrc' )
.replace( /\/\*(?:(?!\*\/)[\s\S])*\*\//g, ''
).replace( /\/\/[^\n\r]*/g, '' ) ),
- all: ['*.js', '{build,dist,src,test}/**/*.js']
+ all: ['*.js', '{build,demos,dist,src,test}/**/*.js']
},
csslint: {
options: {
diff --git a/demos/demos.css b/demos/demo.css
similarity index 100%
rename from demos/demos.css
rename to demos/demo.css
diff --git a/demos/widgets.html b/demos/widgets.html
index 130ec29..ecffa70 100644
--- a/demos/widgets.html
+++ b/demos/widgets.html
@@ -4,179 +4,13 @@
meta charset=UTF-8
titleOOjs UI Widget Demo/title
link rel=stylesheet href=../dist/oojs-ui.svg.css
- link rel=stylesheet href=demos.css
+ link rel=stylesheet href=demo.css
/head
body
div class=oo-ui-demo/div
script src=../lib/jquery.js/script
script src=../lib/oojs.js/script
script src=../dist/oojs-ui.js/script
- script
- $( function () {
- var i, j, key, iLen, jLen, item, items, fieldset,
- $demo = $( '.oo-ui-demo' ),
- sections = {
- 'Widgets': [
- {
- 'label':
'PushButtonWidget',
- 'widget': new
OO.ui.PushButtonWidget( { 'label': 'Normal' } ),
- },
- {
- 'widget': new
OO.ui.PushButtonWidget( {
- 'label':
'Primary',
- 'flags': [
'primary' ]
- } ),
- },
- {
- 'widget': new
OO.ui.PushButtonWidget( {
- 'label':
'Constructive',
- 'flags': [
'constructive' ]
- } ),
- },
- {
- 'widget': new
OO.ui.PushButtonWidget( {
- 'label':
'Destructive',
- 'flags': [
'destructive' ]
- } ),
- },
- {
- 'widget': new
OO.ui.PushButtonWidget( {
- 'label':
'Disabled',
- 'disabled': true
- } ),
- },
- {
- 'label':
'IconButtonWidget',
- 'widget': new
OO.ui.IconButtonWidget( {
- 'icon': 'help',
- 'title': 'Icon
only'
- } )
- },
- {
- 'widget': new
OO.ui.IconButtonWidget( {
- 'icon': 'alert',
- 'label':
'Labeled'
- } )
-
[MediaWiki-commits] [Gerrit] Remove unused .csslintignore - change (oojs/ui)
jenkins-bot has submitted this change and it was merged. Change subject: Remove unused .csslintignore .. Remove unused .csslintignore This file was for the Jenkins job of csslint (since it didn't use the Gruntfile), now that it does, this file is redundant. Note that .jshintignore should not be removed because, contrary to csslint, jshint actually supports the ignore file natively, so .jshintignore is used by Grunt as well (wheareas in our csslint setup we had to duplicate it). Change-Id: I6fdb22a382d8aba09b5a73b92866288d2ae70c7b --- D .csslintignore 1 file changed, 0 insertions(+), 3 deletions(-) Approvals: Catrope: Looks good to me, approved jenkins-bot: Verified diff --git a/.csslintignore b/.csslintignore deleted file mode 100644 index 950ca9d..000 --- a/.csslintignore +++ /dev/null @@ -1,3 +0,0 @@ -dist/** -lib/** -node_modules/** -- To view, visit https://gerrit.wikimedia.org/r/102073 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I6fdb22a382d8aba09b5a73b92866288d2ae70c7b Gerrit-PatchSet: 1 Gerrit-Project: oojs/ui Gerrit-Branch: master Gerrit-Owner: Krinkle krinklem...@gmail.com Gerrit-Reviewer: Catrope roan.katt...@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] Translation Editor: Change the information text for non tran... - change (mediawiki...Translate)
Santhosh has uploaded a new change for review.
https://gerrit.wikimedia.org/r/102095
Change subject: Translation Editor: Change the information text for non
translators
..
Translation Editor: Change the information text for non translators
Changed the wording. If sandbox is enabled, use translation stash URL
for getting translation rights
Change-Id: Iee6a36fa3332ff19dabfce7a7dd0fa11641c2e6f
---
M Translate.i18n.php
M TranslateHooks.php
M resources/js/ext.translate.editor.js
3 files changed, 10 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Translate
refs/changes/95/102095/1
diff --git a/Translate.i18n.php b/Translate.i18n.php
index 512b06d..2fde65a 100644
--- a/Translate.i18n.php
+++ b/Translate.i18n.php
@@ -82,8 +82,8 @@
'translate-edit-tmmatch' = '$1% match',
'translate-use-suggestion' = 'Replace current translation with this
suggestion.',
- 'translate-edit-nopermission' = 'You need permission to translate
messages.',
- 'translate-edit-askpermission' = 'Request permission',
+ 'translate-edit-nopermission' = 'You need translation rights to
translate messages.',
+ 'translate-edit-askpermission' = 'Get permission',
'translate-edit-tag-warning' = '',
diff --git a/TranslateHooks.php b/TranslateHooks.php
index 03ff2c3..0f12a34 100644
--- a/TranslateHooks.php
+++ b/TranslateHooks.php
@@ -486,12 +486,14 @@
|| $alias === 'TranslationStash'
|| $alias === 'SearchTranslations' )
) {
- global $wgTranslateDocumentationLanguageCode,
$wgTranslatePermissionUrl;
+ global $wgTranslateDocumentationLanguageCode,
$wgTranslatePermissionUrl,
+ $wgTranslateUseSandbox;
$vars['TranslateRight'] = $out-getUser()-isAllowed(
'translate' );
$vars['TranslateMessageReviewRight'] =
$out-getUser()-isAllowed(
'translate-messagereview' );
$vars['wgTranslateDocumentationLanguageCode'] =
$wgTranslateDocumentationLanguageCode;
$vars['wgTranslatePermissionUrl'] =
$wgTranslatePermissionUrl;
+ $vars['wgTranslateUseSandbox'] = $wgTranslateUseSandbox;
}
return true;
diff --git a/resources/js/ext.translate.editor.js
b/resources/js/ext.translate.editor.js
index cb20c39..1953e16 100644
--- a/resources/js/ext.translate.editor.js
+++ b/resources/js/ext.translate.editor.js
@@ -605,7 +605,11 @@
.text( mw.msg(
'translate-edit-askpermission' ) )
.addClass(
'tux-editor-ask-permission' )
.attr( {
- href: getUrl(
mw.config.get( 'wgTranslatePermissionUrl' ) )
+ href: getUrl(
+ mw.config.get(
'wgTranslateUseSandbox' )
+ ?
'Special:TranslationStash'
+ :
mw.config.get( 'wgTranslatePermissionUrl' )
+ )
} )
);
--
To view, visit https://gerrit.wikimedia.org/r/102095
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iee6a36fa3332ff19dabfce7a7dd0fa11641c2e6f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Translate
Gerrit-Branch: master
Gerrit-Owner: 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] Simplify the quickList option to ULS - change (mediawiki...TwnMainPage)
jenkins-bot has submitted this change and it was merged.
Change subject: Simplify the quickList option to ULS
..
Simplify the quickList option to ULS
Change-Id: I4ae266d51be4be2b39b9bd35cdd12c8e4ab04284
---
M resources/js/ext.translate.mainpage.signup.js
1 file changed, 1 insertion(+), 3 deletions(-)
Approvals:
KartikMistry: Looks good to me, approved
jenkins-bot: Verified
diff --git a/resources/js/ext.translate.mainpage.signup.js
b/resources/js/ext.translate.mainpage.signup.js
index 9d04a5f..bfb985f 100644
--- a/resources/js/ext.translate.mainpage.signup.js
+++ b/resources/js/ext.translate.mainpage.signup.js
@@ -81,9 +81,7 @@
)
);
},
- quickList: function () {
- return mw.uls.getFrequentLanguageList();
- }
+ quickList: mw.uls.getFrequentLanguageList
} );
}
--
To view, visit https://gerrit.wikimedia.org/r/101822
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I4ae266d51be4be2b39b9bd35cdd12c8e4ab04284
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/TwnMainPage
Gerrit-Branch: master
Gerrit-Owner: Santhosh santhosh.thottin...@gmail.com
Gerrit-Reviewer: KartikMistry kartik.mis...@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] Translation Editor: Change the information text for non tran... - change (mediawiki...Translate)
jenkins-bot has submitted this change and it was merged.
Change subject: Translation Editor: Change the information text for non
translators
..
Translation Editor: Change the information text for non translators
Changed the wording. If sandbox is enabled, use translation stash URL
for getting translation rights
Change-Id: Iee6a36fa3332ff19dabfce7a7dd0fa11641c2e6f
---
M Translate.i18n.php
M TranslateHooks.php
M resources/js/ext.translate.editor.js
3 files changed, 10 insertions(+), 4 deletions(-)
Approvals:
Nikerabbit: Looks good to me, approved
jenkins-bot: Verified
diff --git a/Translate.i18n.php b/Translate.i18n.php
index 512b06d..2fde65a 100644
--- a/Translate.i18n.php
+++ b/Translate.i18n.php
@@ -82,8 +82,8 @@
'translate-edit-tmmatch' = '$1% match',
'translate-use-suggestion' = 'Replace current translation with this
suggestion.',
- 'translate-edit-nopermission' = 'You need permission to translate
messages.',
- 'translate-edit-askpermission' = 'Request permission',
+ 'translate-edit-nopermission' = 'You need translation rights to
translate messages.',
+ 'translate-edit-askpermission' = 'Get permission',
'translate-edit-tag-warning' = '',
diff --git a/TranslateHooks.php b/TranslateHooks.php
index 03ff2c3..0f12a34 100644
--- a/TranslateHooks.php
+++ b/TranslateHooks.php
@@ -486,12 +486,14 @@
|| $alias === 'TranslationStash'
|| $alias === 'SearchTranslations' )
) {
- global $wgTranslateDocumentationLanguageCode,
$wgTranslatePermissionUrl;
+ global $wgTranslateDocumentationLanguageCode,
$wgTranslatePermissionUrl,
+ $wgTranslateUseSandbox;
$vars['TranslateRight'] = $out-getUser()-isAllowed(
'translate' );
$vars['TranslateMessageReviewRight'] =
$out-getUser()-isAllowed(
'translate-messagereview' );
$vars['wgTranslateDocumentationLanguageCode'] =
$wgTranslateDocumentationLanguageCode;
$vars['wgTranslatePermissionUrl'] =
$wgTranslatePermissionUrl;
+ $vars['wgTranslateUseSandbox'] = $wgTranslateUseSandbox;
}
return true;
diff --git a/resources/js/ext.translate.editor.js
b/resources/js/ext.translate.editor.js
index cb20c39..1953e16 100644
--- a/resources/js/ext.translate.editor.js
+++ b/resources/js/ext.translate.editor.js
@@ -605,7 +605,11 @@
.text( mw.msg(
'translate-edit-askpermission' ) )
.addClass(
'tux-editor-ask-permission' )
.attr( {
- href: getUrl(
mw.config.get( 'wgTranslatePermissionUrl' ) )
+ href: getUrl(
+ mw.config.get(
'wgTranslateUseSandbox' )
+ ?
'Special:TranslationStash'
+ :
mw.config.get( 'wgTranslatePermissionUrl' )
+ )
} )
);
--
To view, visit https://gerrit.wikimedia.org/r/102095
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iee6a36fa3332ff19dabfce7a7dd0fa11641c2e6f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Translate
Gerrit-Branch: master
Gerrit-Owner: Santhosh santhosh.thottin...@gmail.com
Gerrit-Reviewer: Amire80 amir.ahar...@mail.huji.ac.il
Gerrit-Reviewer: Nikerabbit niklas.laxst...@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 check if user is logged-in in a given step - change (mediawiki...TwnMainPage)
Zfilipin has uploaded a new change for review. https://gerrit.wikimedia.org/r/102096 Change subject: Do not check if user is logged-in in a given step .. Do not check if user is logged-in in a given step If the check needs to be made, then it should be in a then step. Change-Id: I759d3606e32e44603a8fac04b3d5d12d45a89209 --- M tests/browser/features/step_definitions/common_steps.rb 1 file changed, 0 insertions(+), 3 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/TwnMainPage refs/changes/96/102096/1 diff --git a/tests/browser/features/step_definitions/common_steps.rb b/tests/browser/features/step_definitions/common_steps.rb index 0ecd565..e26044b 100644 --- a/tests/browser/features/step_definitions/common_steps.rb +++ b/tests/browser/features/step_definitions/common_steps.rb @@ -3,9 +3,6 @@ Given(/^I am logged in$/) do visit(LoginPage).login_with(ENV[MEDIAWIKI_USER], ENV[MEDIAWIKI_PASSWORD]) - # Assert that login worked - loggedin = !@browser.execute_script( return mw.user.isAnon(); ) - loggedin.should be_true end Given(/^I am on the main page$/) do -- To view, visit https://gerrit.wikimedia.org/r/102096 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I759d3606e32e44603a8fac04b3d5d12d45a89209 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/TwnMainPage Gerrit-Branch: master Gerrit-Owner: Zfilipin zfili...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Removed @sandbox.translatewiki.net tags from unimplemented f... - change (mediawiki...TwnMainPage)
Zfilipin has uploaded a new change for review. https://gerrit.wikimedia.org/r/102097 Change subject: Removed @sandbox.translatewiki.net tags from unimplemented features .. Removed @sandbox.translatewiki.net tags from unimplemented features Change-Id: Ic813f7e8d858af63f8c93007fe833a8617416bb3 --- M tests/browser/features/user_not_signed_in.feature M tests/browser/features/user_signed_in_not_approved.feature 2 files changed, 1 insertion(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/TwnMainPage refs/changes/97/102097/1 diff --git a/tests/browser/features/user_not_signed_in.feature b/tests/browser/features/user_not_signed_in.feature index fee40e3..643c3bb 100644 --- a/tests/browser/features/user_not_signed_in.feature +++ b/tests/browser/features/user_not_signed_in.feature @@ -1,4 +1,3 @@ -@sandbox.translatewiki.net Feature: Users who are not signed-in (and for other scenarios common to all users) Background: diff --git a/tests/browser/features/user_signed_in_not_approved.feature b/tests/browser/features/user_signed_in_not_approved.feature index 47b4a70..fcd4163 100644 --- a/tests/browser/features/user_signed_in_not_approved.feature +++ b/tests/browser/features/user_signed_in_not_approved.feature @@ -1,4 +1,4 @@ -@login @sandbox.translatewiki.net +@login Feature: Signed-in New Users who have not been approved (only onboarding view will be available for them) -- To view, visit https://gerrit.wikimedia.org/r/102097 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic813f7e8d858af63f8c93007fe833a8617416bb3 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/TwnMainPage Gerrit-Branch: master Gerrit-Owner: Zfilipin zfili...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] [WIP] Add support for JSON i18n files - change (mediawiki/core)
Catrope has uploaded a new change for review.
https://gerrit.wikimedia.org/r/102098
Change subject: [WIP] Add support for JSON i18n files
..
[WIP] Add support for JSON i18n files
Draft implementation for
https://www.mediawiki.org/wiki/Requests_for_comment/Localisation_format
Change-Id: I8d137e15e1670880a9847263e6ce796c62a4670d
---
M includes/DefaultSettings.php
M includes/cache/LocalisationCache.php
2 files changed, 70 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/98/102098/1
diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index 40f943f..adfc4f0 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -5935,10 +5935,39 @@
* @code
*$wgExtensionMessagesFiles['ConfirmEdit'] =
__DIR__.'/ConfirmEdit.i18n.php';
* @endcode
+ * @deprecated since 1.23 Store messages in JSON files instead and use
$wgExtensionMessagesDirs
*/
$wgExtensionMessagesFiles = array();
/**
+ * Extension messages directories.
+ *
+ * Associative array mapping extension name to the path of the directory where
message files can
+ * be found. The message files are expected to be JSON files named for their
language code, e.g.
+ * en.json, de.json, etc.
+ *
+ * Extensions with messages in multiple places may specify an associative
array mapping group names
+ * to message directories.
+ *
+ * @par Simple example:
+ * @code
+ *$wgExtensionMessagesDirs['ConfirmEdit'] = __DIR__ . '/i18n';
+ * @endcode
+ *
+ * @par Complex example:
+ * @code
+ *$wgExtensionMessagesDirs['VisualEditor'] = array(
+ *'' = __DIR__ . '/i18n',
+ *'ve-core' = __DIR__ . '/modules/ve-core/i18n',
+ *'qunit' = __DIR__ . '/modules/qunit/localisation',
+ *'oojs-ui' = __DIR__ . '/modules/oojs-ui/messages',
+ *)
+ * @endcode
+ * @since 1.23
+ */
+$wgExtensionMessagesDirs = array();
+
+/**
* Array of files with list(s) of extension entry points to be used in
* maintenance/mergeMessageFileList.php
* @since 1.22
diff --git a/includes/cache/LocalisationCache.php
b/includes/cache/LocalisationCache.php
index ccb94a2..7623898 100644
--- a/includes/cache/LocalisationCache.php
+++ b/includes/cache/LocalisationCache.php
@@ -528,6 +528,28 @@
}
/**
+* Read a JSON file containing localisation messages.
+* @param $fileName
+* @throws MWException if there is a syntax error in the JSON file
+* @return array with a 'messages' key, or empty array if the file
doesn't exist
+*/
+ protected function readJSONFile( $fileName ) {
+ wfProfileIn( __METHOD__ );
+ $json = file_get_contents( $fileName );
+ if ( $json === false ) {
+ return array();
+ }
+ $data = FormatJson::decode( $json, true );
+ if ( $data === null ) {
+ throw new MWException( __METHOD__ . : Invalid JSON
file: $fileName );
+ }
+ // Remove metadata
+ unset( $data['@metadata'] );
+ // The JSON format only supports messages, none of the other
variables, so wrap the data
+ return array( 'messages' = $data );
+ }
+
+ /**
* Get the compiled plural rules for a given language from the XML
files.
* @since 1.20
*/
@@ -736,7 +758,7 @@
* @throws MWException
*/
public function recache( $code ) {
- global $wgExtensionMessagesFiles;
+ global $wgExtensionMessagesFiles, $wgExtensionMessagesDirs;
wfProfileIn( __METHOD__ );
if ( !$code ) {
@@ -824,6 +846,24 @@
$deps[] = new FileDependency( $fileName );
}
}
+ foreach ( $wgExtensionMessagesDirs as $dirs ) {
+ foreach ( (array)$dirs as $dir ) {
+ $fileName = $dir/$code.json;
+ wfDebugLog(__METHOD__ . : Reading
$fileName\n);
+ $data = $this-readJSONFile( $fileName );
+ $used = false;
+
+ foreach ( $data as $key = $item ) {
+ $this-mergeItem( $key, $allData[$key],
$item );
+ $used = true;
+ }
+
+ if ( $used ) {
+ wfDebugLog( __METHOD__ . : Adding
dependency on $fileName\n );
+ $deps[] = new FileDependency( $fileName
);
+ }
+ }
+ }
# Merge core data into extension data
foreach ( $coreData as $key = $item ) {
--
To
[MediaWiki-commits] [Gerrit] Fixing failing tests on phantomjs - change (qa/browsertests)
Mayankmadan has uploaded a new change for review.
https://gerrit.wikimedia.org/r/102099
Change subject: Fixing failing tests on phantomjs
..
Fixing failing tests on phantomjs
Bug: 49813
Change-Id: I65fd84f7b3a8f1d6849ac723ae608c52a8d3b4f8
---
M features/step_definitions/upload_wizard_steps.rb
1 file changed, 5 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/qa/browsertests
refs/changes/99/102099/1
diff --git a/features/step_definitions/upload_wizard_steps.rb
b/features/step_definitions/upload_wizard_steps.rb
index a93fff1..0aafba1 100644
--- a/features/step_definitions/upload_wizard_steps.rb
+++ b/features/step_definitions/upload_wizard_steps.rb
@@ -51,7 +51,6 @@
When(/^upload file (.+)$/) do |file_name|
require tempfile
path = #{Dir.tmpdir}/#{file_name}
-
require chunky_png
ChunkyPNG::Image.new(Random.new.rand(255), Random.new.rand(255),
Random.new.rand(255)).save path
@@ -59,8 +58,11 @@
@browser.execute_script
document.getElementsByName('file')[0].removeAttribute('class');
@browser.execute_script
document.getElementsByName('file')[0].removeAttribute('style');
end
-
- on(UploadPage).select_file = path
+ if @browser.driver.browser == :phantomjs
+@browser.file_field(:name =file).value=path
+ else
+on(UploadPage).select_file = path
+ end
end
Then(/^(.+) checkbox should be there$/) do |_|
on(LearnPage).skip_element.when_present.should be_visible
--
To view, visit https://gerrit.wikimedia.org/r/102099
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I65fd84f7b3a8f1d6849ac723ae608c52a8d3b4f8
Gerrit-PatchSet: 1
Gerrit-Project: qa/browsertests
Gerrit-Branch: master
Gerrit-Owner: Mayankmadan maddiema...@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] [WIP] Use JSON support in core - change (mediawiki...VisualEditor)
Catrope has uploaded a new change for review. https://gerrit.wikimedia.org/r/102100 Change subject: [WIP] Use JSON support in core .. [WIP] Use JSON support in core Depends on https://gerrit.wikimedia.org/r/#/c/102098/ in core Change-Id: Ib8490d3e327ddf5852827c24ee2aa2916c8af072 --- M VisualEditor.php 1 file changed, 6 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor refs/changes/00/102100/1 diff --git a/VisualEditor.php b/VisualEditor.php index f5e74df..8803d17 100644 --- a/VisualEditor.php +++ b/VisualEditor.php @@ -40,7 +40,12 @@ $wgAutoloadClasses['ApiVisualEditorEdit'] = $dir . 'ApiVisualEditorEdit.php'; $wgAutoloadClasses['VisualEditorHooks'] = $dir . 'VisualEditor.hooks.php'; $wgAutoloadClasses['VisualEditorDataModule'] = $dir . 'VisualEditorDataModule.php'; -$wgExtensionMessagesFiles['VisualEditor'] = $dir . 'VisualEditor.i18n.php'; +$wgExtensionMessagesDirs['VisualEditor'] = array( + 've-core' = __DIR__ . '/modules/ve/i18n', + 've-mw' = __DIR__ . '/modules/ve-mw/i18n', + 've-wmf' = __DIR__ . '/modules/ve-wmf/i18n', + 'oojs-ui' = __DIR__ . '/modules/oojs-ui/i18n' +); // Register API modules $wgAPIModules['visualeditor'] = 'ApiVisualEditor'; -- To view, visit https://gerrit.wikimedia.org/r/102100 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib8490d3e327ddf5852827c24ee2aa2916c8af072 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/VisualEditor Gerrit-Branch: master Gerrit-Owner: Catrope roan.katt...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update backward compatibiliy for MediaWiki export - change (translatewiki)
Siebrand has submitted this change and it was merged. Change subject: Update backward compatibiliy for MediaWiki export .. Update backward compatibiliy for MediaWiki export Change-Id: I8e750e59ed893d393a42aba2b3710d6213195094 --- M bin/repoexport 1 file changed, 5 insertions(+), 3 deletions(-) Approvals: Siebrand: Verified; Looks good to me, approved diff --git a/bin/repoexport b/bin/repoexport index 75c35de..e0fe9d0 100755 --- a/bin/repoexport +++ b/bin/repoexport @@ -93,12 +93,14 @@ fi if [ -d mediawiki/REL1_21/ ] then - php $EXPORTER --target mediawiki/REL1_21/languages/messages --core-meta --group 'core-1.21' --lang '*' --skip=$SKIPLANGS --threshold 15 + # Skip gv because plurals are not compatible pre 1.22. + php $EXPORTER --target mediawiki/REL1_21/languages/messages --core-meta --group 'core-1.21' --lang '*' --skip=gv,$SKIPLANGS --threshold 15 fi if [ -d mediawiki/REL1_20/ ] then - # Also skip gd because plurals are not compatible pre 1.21. - php $EXPORTER --target mediawiki/REL1_20/languages/messages --core-meta --group 'core-1.20' --lang '*' --skip=gd,$SKIPLANGS --threshold 15 + # Skip gd because plurals are not compatible pre 1.21. + # Skip gv because plurals are not compatible pre 1.22. + php $EXPORTER --target mediawiki/REL1_20/languages/messages --core-meta --group 'core-1.20' --lang '*' --skip=gd,gv,$SKIPLANGS --threshold 15 fi wait -- To view, visit https://gerrit.wikimedia.org/r/102090 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I8e750e59ed893d393a42aba2b3710d6213195094 Gerrit-PatchSet: 1 Gerrit-Project: translatewiki Gerrit-Branch: master Gerrit-Owner: Siebrand siebr...@wikimedia.org Gerrit-Reviewer: Siebrand siebr...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Revert beta: let sysops add/remove gwtoolset group - change (operations/mediawiki-config)
jenkins-bot has submitted this change and it was merged.
Change subject: Revert beta: let sysops add/remove gwtoolset group
..
Revert beta: let sysops add/remove gwtoolset group
This reverts commit f53c74068835d52899c0c977711c66cb841f47dc.
Permissions moved into extension in I6bfc539.
Change-Id: I0010601d103527dbc6001976741d6b5c6f230ce3
---
M wmf-config/CommonSettings-labs.php
1 file changed, 0 insertions(+), 2 deletions(-)
Approvals:
Dan-nl: Looks good to me, but someone else must approve
Hashar: Looks good to me, approved
jenkins-bot: Verified
diff --git a/wmf-config/CommonSettings-labs.php
b/wmf-config/CommonSettings-labs.php
index 4941240..588f2e6 100644
--- a/wmf-config/CommonSettings-labs.php
+++ b/wmf-config/CommonSettings-labs.php
@@ -90,8 +90,6 @@
$wgGWTFileBackend = 'gwtoolset-backend';
$wgGWTFBMaxAge = '1 week';
$wgJobTypeConf['gwtoolsetUploadMetadataJob'] = array( 'checkDelay' =
true ) + $wgJobTypeConf['default'];
- $wgAddGroups['sysop'][] = 'gwtoolset';
- $wgRemoveGroups['sysop'][] = 'gwtoolset';
}
if ( $wmgUseOAuth ) {
--
To view, visit https://gerrit.wikimedia.org/r/101881
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I0010601d103527dbc6001976741d6b5c6f230ce3
Gerrit-PatchSet: 2
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: BryanDavis bda...@wikimedia.org
Gerrit-Reviewer: Dan-nl d_ent...@yahoo.com
Gerrit-Reviewer: Hashar has...@free.fr
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Removed indentation button from WikiEditor extension - change (mediawiki...WikiEditor)
Tinaj1234 has uploaded a new change for review.
https://gerrit.wikimedia.org/r/102101
Change subject: Removed indentation button from WikiEditor extension
..
Removed indentation button from WikiEditor extension
The button and its remnants are removed.
Bug: 24489
Change-Id: I1445fa188770e0c73369f9d1c5fc557326383017
---
M WikiEditor.i18n.php
M WikiEditor.php
M modules/jquery.wikiEditor.toolbar.config.js
3 files changed, 0 insertions(+), 26 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikiEditor
refs/changes/01/102101/1
diff --git a/WikiEditor.i18n.php b/WikiEditor.i18n.php
index 0392b3f..83364bb 100644
--- a/WikiEditor.i18n.php
+++ b/WikiEditor.i18n.php
@@ -120,8 +120,6 @@
'wikieditor-toolbar-tool-ulist-example' = 'Bulleted list item',
'wikieditor-toolbar-tool-olist' = 'Numbered list',
'wikieditor-toolbar-tool-olist-example' = 'Numbered list item',
- 'wikieditor-toolbar-tool-indent' = 'Indentation',
- 'wikieditor-toolbar-tool-indent-example' = 'Indented line',
'wikieditor-toolbar-tool-nowiki' = 'No wiki formatting',
'wikieditor-toolbar-tool-nowiki-example' = 'Insert non-formatted text
here',
'wikieditor-toolbar-tool-redirect' = 'Redirect',
diff --git a/WikiEditor.php b/WikiEditor.php
index 103c9eb..838e984 100644
--- a/WikiEditor.php
+++ b/WikiEditor.php
@@ -269,8 +269,6 @@
'wikieditor-toolbar-tool-ulist-example',
'wikieditor-toolbar-tool-olist',
'wikieditor-toolbar-tool-olist-example',
- 'wikieditor-toolbar-tool-indent',
- 'wikieditor-toolbar-tool-indent-example',
'wikieditor-toolbar-tool-nowiki',
'wikieditor-toolbar-tool-nowiki-example',
'wikieditor-toolbar-tool-redirect',
diff --git a/modules/jquery.wikiEditor.toolbar.config.js
b/modules/jquery.wikiEditor.toolbar.config.js
index 780eb2c..0068290 100644
--- a/modules/jquery.wikiEditor.toolbar.config.js
+++ b/modules/jquery.wikiEditor.toolbar.config.js
@@ -314,28 +314,6 @@
}
}
},
- 'indent': {
- 'labelMsg':
'wikieditor-toolbar-tool-indent',
- 'type': 'button',
- 'icon': {
- 'default':
'format-indent.png',
- 'default-rtl':
'format-indent-rtl.png'
- },
- 'offset': {
- 'default': [2,
-646],
- 'default-rtl':
[-70, -430]
- },
- 'action': {
- 'type':
'encapsulate',
- 'options': {
- 'pre':
:,
-
'periMsg': 'wikieditor-toolbar-tool-indent-example',
- 'post':
,
-
'ownline': true,
-
'splitlines': true
- }
- }
- },
'nowiki': {
'labelMsg':
'wikieditor-toolbar-tool-nowiki',
'type': 'button',
--
To view, visit https://gerrit.wikimedia.org/r/102101
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I1445fa188770e0c73369f9d1c5fc557326383017
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikiEditor
Gerrit-Branch: master
Gerrit-Owner: Tinaj1234 tinajohnson.1...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Removing pending block for a bug that was resolved - change (mediawiki...UniversalLanguageSelector)
Zfilipin has uploaded a new change for review.
https://gerrit.wikimedia.org/r/102102
Change subject: Removing pending block for a bug that was resolved
..
Removing pending block for a bug that was resolved
Had to increase timeout that waits for a div to disappear, the default
5 seconds was not enough.
Change-Id: I2def25828865a21eb321d0d9ea2e57764d86c1a2
---
M tests/browser/features/step_definitions/panel_steps.rb
M tests/browser/features/step_definitions/textarea_font_steps.rb
2 files changed, 2 insertions(+), 4 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/UniversalLanguageSelector
refs/changes/02/102102/1
diff --git a/tests/browser/features/step_definitions/panel_steps.rb
b/tests/browser/features/step_definitions/panel_steps.rb
index 84e576f..b34882c 100644
--- a/tests/browser/features/step_definitions/panel_steps.rb
+++ b/tests/browser/features/step_definitions/panel_steps.rb
@@ -35,7 +35,7 @@
When(/^I apply the changes$/) do
on(PanelPage) do |page|
page.panel_button_apply_element.click
- page.language_settings_dialog_element.when_not_present
+ page.language_settings_dialog_element.when_not_present(10)
end
end
diff --git a/tests/browser/features/step_definitions/textarea_font_steps.rb
b/tests/browser/features/step_definitions/textarea_font_steps.rb
index 0904ef8..71c0011 100644
--- a/tests/browser/features/step_definitions/textarea_font_steps.rb
+++ b/tests/browser/features/step_definitions/textarea_font_steps.rb
@@ -18,9 +18,7 @@
step I open the Universal Language Selector
step I open Display panel of language settings
step I open Fonts panel of language settings
- pending(Bug 56885) do
- step I select #{font} font for the content language for the
live preview
- end
+ step I select #{font} font for the content language for the live
preview
step I apply the changes
end
--
To view, visit https://gerrit.wikimedia.org/r/102102
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I2def25828865a21eb321d0d9ea2e57764d86c1a2
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/UniversalLanguageSelector
Gerrit-Branch: master
Gerrit-Owner: Zfilipin zfili...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove all node definitions for Squids - change (operations/puppet)
Mark Bergsma has submitted this change and it was merged.
Change subject: Remove all node definitions for Squids
..
Remove all node definitions for Squids
Change-Id: Icbed660fe0786fa58f549432fbecc2e1633e02fc
---
M manifests/site.pp
1 file changed, 0 insertions(+), 76 deletions(-)
Approvals:
Mark Bergsma: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/site.pp b/manifests/site.pp
index c9665ad..855a104 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -102,16 +102,6 @@
interface::offload { eth0 gro: interface = eth0, setting = gro,
value = off }
}
-# amssq31-46 are text squids
-node /amssq(3[1-9]|4[0-6])\.esams\.wikimedia\.org/ {
-$squid_coss_disks = [ 'sda5', 'sdb5' ]
-if $::hostname =~ /^amssq3[12]$/ {
-$ganglia_aggregator = true
-}
-
-include role::cache::text
-}
-
# amssq47 is a text varnish
node /^amssq47\.esams\.wikimedia\.org$/ {
include role::cache::text, role::cache::ssl::unified
@@ -370,25 +360,6 @@
role::dns::recursor
interface::add_ip6_mapped { main: interface = eth0 }
-}
-
-node /^cp10(0[1-9]|1[0-9]|20)\.eqiad\.wmnet$/ {
-$squid_coss_disks = [ 'sda5', 'sdb5' ]
-if $::hostname =~ /^cp100(1|2)$/ {
-$ganglia_aggregator = true
-}
-
-include role::cache::text
-}
-
-node /^cp10(2[1-9]|3[0-6])\.eqiad\.wmnet$/ {
-interface::aggregate { bond0: orig_interface = eth0, members = [
eth0, eth1 ] }
-
-interface::add_ip6_mapped { main:
-require = Interface::Aggregate[bond0],
-interface = bond0
-}
-include standard
}
node /^cp10(3[7-9]|40)\.eqiad\.wmnet$/ {
@@ -2466,39 +2437,6 @@
include role::protoproxy::ssl
}
-# sq37-40 are text squids
-node /sq(3[7-9]|40)\.wikimedia\.org/ {
-$squid_coss_disks = [ 'sda5', 'sdb5', 'sdc', 'sdd' ]
-
-include role::cache::text
-}
-
-# sq43-50 are old 4 disk upload squids
-node /sq(4[3-9]|50)\.wikimedia\.org/ {
-$squid_coss_disks = [ 'sdb5', 'sdc', 'sdd' ]
-if $::hostname =~ /^sq4[3]$/ {
-$ganglia_aggregator = true
-}
-
-include role::cache::upload
-}
-
-# sq51-58 are new ssd upload squids
-node /sq5[0-8]\.wikimedia\.org/ {
-$squid_coss_disks = [ 'sdb5' ]
-include role::cache::upload
-}
-
-# sq59-66 are text squids
-node /sq(59|6[0-6])\.wikimedia\.org/ {
-$squid_coss_disks = [ 'sda5', 'sdb5' ]
-if $::hostname =~ /^sq(59|60)$/ {
-$ganglia_aggregator = true
-}
-
-include role::cache::text
-}
-
# sq67-70 are varnishes for bits.wikimedia.org
node /sq(6[7-9]|70)\.wikimedia\.org/ {
if $::hostname =~ /^sq6[68]$/ {
@@ -2516,20 +2454,6 @@
}
include role::cache::bits
-}
-
-# sq71-78 are text squids
-node /sq7[1-8]\.wikimedia\.org/ {
-$squid_coss_disks = [ 'sda5', 'sdb5' ]
-
-include role::cache::text
-}
-
-# sq79-86 are upload squids
-node /sq(79|8[0-6])\.wikimedia\.org/ {
-$squid_coss_disks = [ 'sdb5' ]
-
-include role::cache::upload
}
node stafford.pmtpa.wmnet {
--
To view, visit https://gerrit.wikimedia.org/r/101856
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Icbed660fe0786fa58f549432fbecc2e1633e02fc
Gerrit-PatchSet: 4
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Mark Bergsma m...@wikimedia.org
Gerrit-Reviewer: Mark Bergsma m...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Move esams text IPv6 termination to Varnish directly - change (operations/puppet)
Mark Bergsma has uploaded a new change for review.
https://gerrit.wikimedia.org/r/102103
Change subject: Move esams text IPv6 termination to Varnish directly
..
Move esams text IPv6 termination to Varnish directly
Change-Id: I671e634d2457aa77680bd4f30597e74c1811d780
---
M manifests/lvs.pp
1 file changed, 5 insertions(+), 5 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/03/102103/1
diff --git a/manifests/lvs.pp b/manifests/lvs.pp
index abbd3dd..ef151a2 100644
--- a/manifests/lvs.pp
+++ b/manifests/lvs.pp
@@ -168,7 +168,7 @@
'textlb'= '91.198.174.192',
'loginlb' = '91.198.174.201',
- #'textlb6' = '2620:0:862:ed1a::1',
+ 'textlb6' = '2620:0:862:ed1a::1',
'loginlb6' = '2620:0:862:ed1a::1:9',
},
'ulsfo' = {
@@ -266,10 +266,10 @@
'wikidatalbsecure' = '91.198.174.237',
'wikivoyagelbsecure' =
'91.198.174.238',
- #'textlb6secure' =
'2620:0:862:ed1a::1',
+ 'textlb6secure' =
'2620:0:862:ed1a::1',
'loginlbsecure6' =
'2620:0:862:ed1a::1:9',
'wikimedialbsecure6' =
2620:0:862:ed1a::0,
- 'wikipedialbsecure6' =
2620:0:862:ed1a::1,
+ #'wikipedialbsecure6' =
2620:0:862:ed1a::1,
'wiktionarylbsecure6' =
2620:0:862:ed1a::2,
'wikiquotelbsecure6' =
2620:0:862:ed1a::3,
'wikibookslbsecure6' =
2620:0:862:ed1a::4,
@@ -319,7 +319,7 @@
},
'esams' = {
'wikimedialb6' = 2620:0:862:ed1a::0,
- 'wikipedialb6' = 2620:0:862:ed1a::1,
+ #'wikipedialb6' = 2620:0:862:ed1a::1,
'wiktionarylb6' = 2620:0:862:ed1a::2,
'wikiquotelb6' = 2620:0:862:ed1a::3,
'wikibookslb6' = 2620:0:862:ed1a::4,
@@ -1292,7 +1292,7 @@
monitor_service_lvs6_http_https {
text-lb.esams.wikimedia.org:
- ip_address = $ip['ipv6']['esams']['wikipedialb6'], #
FIXME
+ ip_address = $ip['text-varnish']['esams']['textlb6'],
uri = en.wikipedia.org!/wiki/Main_Page;
bits-lb.esams.wikimedia.org:
ip_address = $ip['bits']['esams']['bitslb6'],
--
To view, visit https://gerrit.wikimedia.org/r/102103
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I671e634d2457aa77680bd4f30597e74c1811d780
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Mark Bergsma m...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Clean up: Remove a few redundant 'scm' properties - change (integration/jenkins-job-builder-config)
jenkins-bot has submitted this change and it was merged.
Change subject: Clean up: Remove a few redundant 'scm' properties
..
Clean up: Remove a few redundant 'scm' properties
* scm 'git-remote-zuul-no-submodules' for a job with
default 'use-remote-zuul-no-submodules' (that scm is already
specified in defaults.yaml for that default).
* scm 'git-remote-zuul' for a job with
default 'use-remote-zuul' (that scm is already
specified in defaults.yaml for that default).
Verified for a few random jobs that the output is 100% equal.
Change-Id: I861daa6ef284a4b228a9d3ad99e635f31aa0d25e
---
M job-templates.yaml
M python-jobs.yaml
2 files changed, 0 insertions(+), 55 deletions(-)
Approvals:
Hashar: Looks good to me, approved
jenkins-bot: Verified
diff --git a/job-templates.yaml b/job-templates.yaml
index 71e1448..4fabddc 100644
--- a/job-templates.yaml
+++ b/job-templates.yaml
@@ -18,8 +18,6 @@
concurrent: true
triggers:
- zuul
-scm:
- - git-remote-zuul-no-submodules
builders:
- jshint
@@ -30,8 +28,6 @@
concurrent: true
triggers:
- zuul
-scm:
- - git-remote-zuul-no-submodules
builders:
- csslint
@@ -51,8 +47,6 @@
concurrent: true
triggers:
- zuul
-scm:
- - git-remote-zuul
builders:
- npmtest:
node-modules: '{node-modules}'
@@ -95,13 +89,8 @@
concurrent: true
triggers:
- zuul
-
-scm:
- - git-remote-zuul-no-submodules
-
builders:
- phpcs
-
publishers:
- checkstyle-xml
- phpcs
@@ -114,13 +103,8 @@
concurrent: true
triggers:
- zuul
-
-scm:
- - git-remote-zuul-no-submodules
-
builders:
- phpcs-HEAD
-
publishers:
- checkstyle-xml
- phpcs
@@ -132,13 +116,8 @@
concurrent: true
triggers:
- zuul
-
-scm:
- - git-remote-zuul-no-submodules
-
builders:
- phpcs-strict
-
publishers:
- checkstyle-xml
- phpcs
@@ -150,13 +129,8 @@
concurrent: true
triggers:
- zuul
-
-scm:
- - git-remote-zuul-no-submodules
-
builders:
- phpcs-strict-HEAD
-
publishers:
- checkstyle-xml
- phpcs
@@ -168,13 +142,8 @@
concurrent: true
triggers:
- zuul
-
-scm:
- - git-remote-zuul-no-submodules
-
builders:
- phpcs-lenient
-
publishers:
- checkstyle-xml
- phpcs
@@ -186,13 +155,8 @@
concurrent: true
triggers:
- zuul
-
-scm:
- - git-remote-zuul-no-submodules
-
builders:
- phpcs-lenient-HEAD
-
publishers:
- checkstyle-xml
- phpcs
@@ -213,10 +177,8 @@
name: '{name}-puppet-validate'
defaults: use-remote-zuul-no-submodules
concurrent: true
-
triggers:
- zuul
-
builders:
- puppet-validate
@@ -224,10 +186,8 @@
name: '{name}-rubylint'
defaults: use-remote-zuul-no-submodules
concurrent: true
-
triggers:
- zuul
-
builders:
- ruby-lint:
interpreter: 'ruby'
@@ -236,10 +196,8 @@
name: '{name}-ruby1.8lint'
defaults: use-remote-zuul-no-submodules
concurrent: true
-
triggers:
- zuul
-
builders:
- ruby-lint:
interpreter: 'ruby1.8'
@@ -248,10 +206,8 @@
name: '{name}-ruby1.9.3lint'
defaults: use-remote-zuul-no-submodules
concurrent: true
-
triggers:
- zuul
-
builders:
- ruby-lint:
interpreter: 'ruby1.9.3'
@@ -261,9 +217,7 @@
defaults: use-remote-zuul-no-submodules
node: hasSlaveScripts
concurrent: true
-
triggers:
- zuul
-
builders:
- yaml-lint
diff --git a/python-jobs.yaml b/python-jobs.yaml
index 4f7374d..8ddb04c 100644
--- a/python-jobs.yaml
+++ b/python-jobs.yaml
@@ -2,10 +2,8 @@
name: '{name}-sphinx-doc'
node: hasContintPackages
defaults: use-remote-zuul
-
triggers:
- zuul
-
builders:
- shell: python setup.py build_sphinx
@@ -16,16 +14,12 @@
node: hasContintPackages
defaults: use-remote-zuul
concurrent: true
-
triggers:
- zuul
-
scm:
- git-remote-zuul-no-submodules
-
builders:
- pep8
-
publishers:
- pep8
@@ -34,13 +28,10 @@
node: hasContintPackages
defaults: use-remote-zuul
concurrent: true
-
triggers:
- zuul
-
scm:
- git-remote-zuul-no-submodules
-
builders:
- pyflakes
--
To view, visit https://gerrit.wikimedia.org/r/101462
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I861daa6ef284a4b228a9d3ad99e635f31aa0d25e
Gerrit-PatchSet: 4
Gerrit-Project: integration/jenkins-job-builder-config
Gerrit-Branch: master
Gerrit-Owner: Krinkle krinklem...@gmail.com
Gerrit-Reviewer: Hashar has...@free.fr
Gerrit-Reviewer: jenkins-bot
[MediaWiki-commits] [Gerrit] Move esams text IPv6 termination to Varnish directly - change (operations/puppet)
Mark Bergsma has submitted this change and it was merged.
Change subject: Move esams text IPv6 termination to Varnish directly
..
Move esams text IPv6 termination to Varnish directly
Change-Id: I671e634d2457aa77680bd4f30597e74c1811d780
---
M manifests/lvs.pp
1 file changed, 5 insertions(+), 5 deletions(-)
Approvals:
Mark Bergsma: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/lvs.pp b/manifests/lvs.pp
index abbd3dd..ef151a2 100644
--- a/manifests/lvs.pp
+++ b/manifests/lvs.pp
@@ -168,7 +168,7 @@
'textlb'= '91.198.174.192',
'loginlb' = '91.198.174.201',
- #'textlb6' = '2620:0:862:ed1a::1',
+ 'textlb6' = '2620:0:862:ed1a::1',
'loginlb6' = '2620:0:862:ed1a::1:9',
},
'ulsfo' = {
@@ -266,10 +266,10 @@
'wikidatalbsecure' = '91.198.174.237',
'wikivoyagelbsecure' =
'91.198.174.238',
- #'textlb6secure' =
'2620:0:862:ed1a::1',
+ 'textlb6secure' =
'2620:0:862:ed1a::1',
'loginlbsecure6' =
'2620:0:862:ed1a::1:9',
'wikimedialbsecure6' =
2620:0:862:ed1a::0,
- 'wikipedialbsecure6' =
2620:0:862:ed1a::1,
+ #'wikipedialbsecure6' =
2620:0:862:ed1a::1,
'wiktionarylbsecure6' =
2620:0:862:ed1a::2,
'wikiquotelbsecure6' =
2620:0:862:ed1a::3,
'wikibookslbsecure6' =
2620:0:862:ed1a::4,
@@ -319,7 +319,7 @@
},
'esams' = {
'wikimedialb6' = 2620:0:862:ed1a::0,
- 'wikipedialb6' = 2620:0:862:ed1a::1,
+ #'wikipedialb6' = 2620:0:862:ed1a::1,
'wiktionarylb6' = 2620:0:862:ed1a::2,
'wikiquotelb6' = 2620:0:862:ed1a::3,
'wikibookslb6' = 2620:0:862:ed1a::4,
@@ -1292,7 +1292,7 @@
monitor_service_lvs6_http_https {
text-lb.esams.wikimedia.org:
- ip_address = $ip['ipv6']['esams']['wikipedialb6'], #
FIXME
+ ip_address = $ip['text-varnish']['esams']['textlb6'],
uri = en.wikipedia.org!/wiki/Main_Page;
bits-lb.esams.wikimedia.org:
ip_address = $ip['bits']['esams']['bitslb6'],
--
To view, visit https://gerrit.wikimedia.org/r/102103
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I671e634d2457aa77680bd4f30597e74c1811d780
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Mark Bergsma m...@wikimedia.org
Gerrit-Reviewer: Mark Bergsma m...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix regression in 99709718 - change (mediawiki...Translate)
Nikerabbit has uploaded a new change for review.
https://gerrit.wikimedia.org/r/102104
Change subject: Fix regression in 99709718
..
Fix regression in 99709718
Message table was emptied before each message was added.
Now it empties only before adding any messages.
Change-Id: I98840ebba4b8307545129a2355e4223e659b0ba4
---
M resources/js/ext.translate.special.translationstash.js
1 file changed, 2 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Translate
refs/changes/04/102104/1
diff --git a/resources/js/ext.translate.special.translationstash.js
b/resources/js/ext.translate.special.translationstash.js
index 08c7fe6..32b14c1 100644
--- a/resources/js/ext.translate.special.translationstash.js
+++ b/resources/js/ext.translate.special.translationstash.js
@@ -163,6 +163,8 @@
getMessages( messagegroup, $messageTable.data( 'targetlangcode'
) )
.done( function ( result ) {
var untranslated, messages =
result.query.messagecollection;
+
+ $messageTable.empty();
$.each( messages, function ( index, message ) {
message.properties = {};
message.properties.status =
'untranslated';
@@ -173,7 +175,6 @@
message.properties.status =
'translated';
}
- $messageTable.empty();
addMessage( message );
} );
--
To view, visit https://gerrit.wikimedia.org/r/102104
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I98840ebba4b8307545129a2355e4223e659b0ba4
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Translate
Gerrit-Branch: master
Gerrit-Owner: Nikerabbit niklas.laxst...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Allow concurrent builds for {name}-npm jobs - change (integration/jenkins-job-builder-config)
jenkins-bot has submitted this change and it was merged.
Change subject: Allow concurrent builds for {name}-npm jobs
..
Allow concurrent builds for {name}-npm jobs
Jobs {name}-jslint and {name}-npmtest had this already.
Change-Id: Ia8256b8a629ff3ba74d6d28ca060382f42fc0f63
---
M job-templates.yaml
1 file changed, 1 insertion(+), 0 deletions(-)
Approvals:
Hashar: Looks good to me, approved
jenkins-bot: Verified
diff --git a/job-templates.yaml b/job-templates.yaml
index 4fabddc..218ca5b 100644
--- a/job-templates.yaml
+++ b/job-templates.yaml
@@ -35,6 +35,7 @@
name: '{name}-npm'
node: hasNpm
defaults: use-remote-zuul
+concurrent: true
triggers:
- zuul
builders:
--
To view, visit https://gerrit.wikimedia.org/r/102078
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia8256b8a629ff3ba74d6d28ca060382f42fc0f63
Gerrit-PatchSet: 3
Gerrit-Project: integration/jenkins-job-builder-config
Gerrit-Branch: master
Gerrit-Owner: Krinkle krinklem...@gmail.com
Gerrit-Reviewer: Hashar has...@free.fr
Gerrit-Reviewer: Krinkle krinklem...@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 command-line argument handling for Vagrant 1.4 - change (mediawiki/vagrant)
Ori.livneh has uploaded a new change for review.
https://gerrit.wikimedia.org/r/102105
Change subject: Fix command-line argument handling for Vagrant 1.4
..
Fix command-line argument handling for Vagrant 1.4
Vagrant 1.40 adds an implicit '--' argument to argv, even if you did not supply
one on the command line. It was causing the enable-role / disable-role
sub-commands to fail.
Change-Id: I9582727302f0e91b20b8019a59e0f5d0603c38b0
---
M lib/mediawiki-vagrant/roles.rb
1 file changed, 2 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant
refs/changes/05/102105/1
diff --git a/lib/mediawiki-vagrant/roles.rb b/lib/mediawiki-vagrant/roles.rb
index 7a610da..c7a2f6f 100644
--- a/lib/mediawiki-vagrant/roles.rb
+++ b/lib/mediawiki-vagrant/roles.rb
@@ -23,7 +23,7 @@
return 0
end
avail = roles_available
-@argv.map!(:downcase)
+@argv = @argv.take_while { |r| r != '--' }.map(:downcase)
@argv.each do |r|
if not avail.include? r
@env.ui.error '#{r}' is not a valid role.
@@ -44,7 +44,7 @@
return 0
end
enabled = roles_enabled
-@argv.map!(:downcase)
+@argv = @argv.take_while { |r| r != '--' }.map(:downcase)
@argv.each do |r|
if not enabled.include? r
@env.ui.error '#{r}' is not enabled.
--
To view, visit https://gerrit.wikimedia.org/r/102105
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I9582727302f0e91b20b8019a59e0f5d0603c38b0
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: Ori.livneh o...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix command-line argument handling for Vagrant 1.4 - change (mediawiki/vagrant)
jenkins-bot has submitted this change and it was merged.
Change subject: Fix command-line argument handling for Vagrant 1.4
..
Fix command-line argument handling for Vagrant 1.4
Vagrant 1.40 adds an implicit '--' argument to argv, even if you did not supply
one on the command line. It was causing the enable-role / disable-role
sub-commands to fail.
Change-Id: I9582727302f0e91b20b8019a59e0f5d0603c38b0
---
M lib/mediawiki-vagrant/roles.rb
1 file changed, 2 insertions(+), 2 deletions(-)
Approvals:
Ori.livneh: Looks good to me, approved
jenkins-bot: Verified
diff --git a/lib/mediawiki-vagrant/roles.rb b/lib/mediawiki-vagrant/roles.rb
index 7a610da..c7a2f6f 100644
--- a/lib/mediawiki-vagrant/roles.rb
+++ b/lib/mediawiki-vagrant/roles.rb
@@ -23,7 +23,7 @@
return 0
end
avail = roles_available
-@argv.map!(:downcase)
+@argv = @argv.take_while { |r| r != '--' }.map(:downcase)
@argv.each do |r|
if not avail.include? r
@env.ui.error '#{r}' is not a valid role.
@@ -44,7 +44,7 @@
return 0
end
enabled = roles_enabled
-@argv.map!(:downcase)
+@argv = @argv.take_while { |r| r != '--' }.map(:downcase)
@argv.each do |r|
if not enabled.include? r
@env.ui.error '#{r}' is not enabled.
--
To view, visit https://gerrit.wikimedia.org/r/102105
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I9582727302f0e91b20b8019a59e0f5d0603c38b0
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
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] Remove old esams text LVS service IPs - change (operations/puppet)
Mark Bergsma has uploaded a new change for review.
https://gerrit.wikimedia.org/r/102106
Change subject: Remove old esams text LVS service IPs
..
Remove old esams text LVS service IPs
Change-Id: I3d0161a2555a56e2ea311e004278e07951ceff66
---
M manifests/lvs.pp
1 file changed, 2 insertions(+), 16 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/06/102106/1
diff --git a/manifests/lvs.pp b/manifests/lvs.pp
index ef151a2..413cea8 100644
--- a/manifests/lvs.pp
+++ b/manifests/lvs.pp
@@ -128,22 +128,8 @@
'wikidatalb' = '208.80.152.218',
'wikivoyagelb' = 208.80.152.219
},
- 'eqiad' = {
- },
- 'esams' = {
- 'wikipedialb' = 91.198.174.225,
- 'wikimedialb' = 91.198.174.224,
- 'wiktionarylb' = 91.198.174.226,
- 'wikiquotelb' = 91.198.174.227,
- 'wikibookslb' = 91.198.174.228,
- 'wikisourcelb' = 91.198.174.229,
- 'wikinewslb' = 91.198.174.230,
- 'wikiversitylb' = 91.198.174.231,
- 'mediawikilb' = 91.198.174.232,
- 'foundationlb' = 91.198.174.235,
- 'wikidatalb' = '91.198.174.237',
- 'wikivoyagelb' = '91.198.174.238',
- },
+ 'eqiad' = {},
+ 'esams' = {},
'ulsfo' = {},
},
'text-varnish' = {
--
To view, visit https://gerrit.wikimedia.org/r/102106
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I3d0161a2555a56e2ea311e004278e07951ceff66
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Mark Bergsma m...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove old esams text LVS service IPs - change (operations/puppet)
Mark Bergsma has submitted this change and it was merged.
Change subject: Remove old esams text LVS service IPs
..
Remove old esams text LVS service IPs
Change-Id: I3d0161a2555a56e2ea311e004278e07951ceff66
---
M manifests/lvs.pp
1 file changed, 2 insertions(+), 16 deletions(-)
Approvals:
Mark Bergsma: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/lvs.pp b/manifests/lvs.pp
index ef151a2..413cea8 100644
--- a/manifests/lvs.pp
+++ b/manifests/lvs.pp
@@ -128,22 +128,8 @@
'wikidatalb' = '208.80.152.218',
'wikivoyagelb' = 208.80.152.219
},
- 'eqiad' = {
- },
- 'esams' = {
- 'wikipedialb' = 91.198.174.225,
- 'wikimedialb' = 91.198.174.224,
- 'wiktionarylb' = 91.198.174.226,
- 'wikiquotelb' = 91.198.174.227,
- 'wikibookslb' = 91.198.174.228,
- 'wikisourcelb' = 91.198.174.229,
- 'wikinewslb' = 91.198.174.230,
- 'wikiversitylb' = 91.198.174.231,
- 'mediawikilb' = 91.198.174.232,
- 'foundationlb' = 91.198.174.235,
- 'wikidatalb' = '91.198.174.237',
- 'wikivoyagelb' = '91.198.174.238',
- },
+ 'eqiad' = {},
+ 'esams' = {},
'ulsfo' = {},
},
'text-varnish' = {
--
To view, visit https://gerrit.wikimedia.org/r/102106
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I3d0161a2555a56e2ea311e004278e07951ceff66
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Mark Bergsma m...@wikimedia.org
Gerrit-Reviewer: Mark Bergsma m...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Do not check if user is logged-in in a given step - change (mediawiki...TwnMainPage)
jenkins-bot has submitted this change and it was merged. Change subject: Do not check if user is logged-in in a given step .. Do not check if user is logged-in in a given step If the check needs to be made, then it should be in a then step. Change-Id: I759d3606e32e44603a8fac04b3d5d12d45a89209 --- M tests/browser/features/step_definitions/common_steps.rb 1 file changed, 0 insertions(+), 3 deletions(-) Approvals: Nikerabbit: Looks good to me, approved jenkins-bot: Verified diff --git a/tests/browser/features/step_definitions/common_steps.rb b/tests/browser/features/step_definitions/common_steps.rb index 0ecd565..e26044b 100644 --- a/tests/browser/features/step_definitions/common_steps.rb +++ b/tests/browser/features/step_definitions/common_steps.rb @@ -3,9 +3,6 @@ Given(/^I am logged in$/) do visit(LoginPage).login_with(ENV[MEDIAWIKI_USER], ENV[MEDIAWIKI_PASSWORD]) - # Assert that login worked - loggedin = !@browser.execute_script( return mw.user.isAnon(); ) - loggedin.should be_true end Given(/^I am on the main page$/) do -- To view, visit https://gerrit.wikimedia.org/r/102096 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I759d3606e32e44603a8fac04b3d5d12d45a89209 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/TwnMainPage Gerrit-Branch: master Gerrit-Owner: Zfilipin zfili...@wikimedia.org Gerrit-Reviewer: Amire80 amir.ahar...@mail.huji.ac.il Gerrit-Reviewer: KartikMistry kartik.mis...@gmail.com Gerrit-Reviewer: Nikerabbit niklas.laxst...@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 99709718 - change (mediawiki...Translate)
jenkins-bot has submitted this change and it was merged.
Change subject: Fix regression in 99709718
..
Fix regression in 99709718
Message table was emptied before each message was added.
Now it empties only before adding any messages.
Change-Id: I98840ebba4b8307545129a2355e4223e659b0ba4
---
M resources/js/ext.translate.special.translationstash.js
1 file changed, 2 insertions(+), 1 deletion(-)
Approvals:
Santhosh: Looks good to me, approved
jenkins-bot: Verified
diff --git a/resources/js/ext.translate.special.translationstash.js
b/resources/js/ext.translate.special.translationstash.js
index 08c7fe6..32b14c1 100644
--- a/resources/js/ext.translate.special.translationstash.js
+++ b/resources/js/ext.translate.special.translationstash.js
@@ -163,6 +163,8 @@
getMessages( messagegroup, $messageTable.data( 'targetlangcode'
) )
.done( function ( result ) {
var untranslated, messages =
result.query.messagecollection;
+
+ $messageTable.empty();
$.each( messages, function ( index, message ) {
message.properties = {};
message.properties.status =
'untranslated';
@@ -173,7 +175,6 @@
message.properties.status =
'translated';
}
- $messageTable.empty();
addMessage( message );
} );
--
To view, visit https://gerrit.wikimedia.org/r/102104
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I98840ebba4b8307545129a2355e4223e659b0ba4
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Translate
Gerrit-Branch: master
Gerrit-Owner: Nikerabbit niklas.laxst...@gmail.com
Gerrit-Reviewer: Santhosh santhosh.thottin...@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] Log X-Analytics header of response instead of request - change (operations/puppet)
Hello Ottomata,
I'd like you to do a code review. Please visit
https://gerrit.wikimedia.org/r/102107
to review the following change.
Change subject: Log X-Analytics header of response instead of request
..
Log X-Analytics header of response instead of request
As varnish may mangle the X-Analytics header through backend (“mf-m”
key), or directly through vcl files (“zero” key), we're more
interested in the response's X-Analytics header than the request's
vanilla header.
modules/varnish/files/varnishncsa.default also uses the X-Analytics
header of the response in LOG_FORMAT.
Change-Id: If5bbc6f38b0674653bfbfe150b6ed8f30a98de15
---
M manifests/role/cache.pp
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/07/102107/1
diff --git a/manifests/role/cache.pp b/manifests/role/cache.pp
index 47a46a5..a5b53d8 100644
--- a/manifests/role/cache.pp
+++ b/manifests/role/cache.pp
@@ -483,7 +483,7 @@
# Note: fake_tag tricks varnishkafka into
allowing hardcoded string into a JSON field.
# Hardcoding the $fqdn into hostname rather
than using %l to account for
# possible slip ups where varnish only writes
the short hostname for %l.
- format =
%{fake_tag0@hostname?${::fqdn}}x %{@sequence!num?0}n %{%FT%T@dt}t
%{Varnish:time_firstbyte@time_firstbyte!num?0.0}x %{@ip}h
%{Varnish:handling@cache_status}x %{@http_status}s %{@response_size!num?0}b
%{@http_method}m %{Host@uri_host}i %{@uri_path}U %{@uri_query}q
%{Content-Type@content_type}o %{Referer@referer}i
%{X-Forwarded-For@x_forwarded_for}i %{User-Agent@user_agent}i
%{Accept-Language@accept_language}i %{X-Analytics@x_analytics}i,
+ format =
%{fake_tag0@hostname?${::fqdn}}x %{@sequence!num?0}n %{%FT%T@dt}t
%{Varnish:time_firstbyte@time_firstbyte!num?0.0}x %{@ip}h
%{Varnish:handling@cache_status}x %{@http_status}s %{@response_size!num?0}b
%{@http_method}m %{Host@uri_host}i %{@uri_path}U %{@uri_query}q
%{Content-Type@content_type}o %{Referer@referer}i
%{X-Forwarded-For@x_forwarded_for}i %{User-Agent@user_agent}i
%{Accept-Language@accept_language}i %{X-Analytics@x_analytics}o,
message_send_max_retries = 3,
queue_buffering_max_messages = 100,
# large timeout to account for potential cross
DC latencies
--
To view, visit https://gerrit.wikimedia.org/r/102107
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: If5bbc6f38b0674653bfbfe150b6ed8f30a98de15
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: QChris christ...@quelltextlich.at
Gerrit-Reviewer: Ottomata o...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] (bug 55584) only install pywikibot.* - change (pywikibot/core)
jenkins-bot has submitted this change and it was merged.
Change subject: (bug 55584) only install pywikibot.*
..
(bug 55584) only install pywikibot.*
After hitting setuptools with a hammer in the right places, this
seems to be the best way of doing it. The alternative is listing
packages manually (['pywikibot', 'pywikibot.comms', ...]) or
having a huge exclude list (['tests', 'tests.*', ...]).
Change-Id: Ie1dd6b6e5558edd48b6a1a2fef96b665f7339b78
---
M setup.py
1 file changed, 3 insertions(+), 1 deletion(-)
Approvals:
Xqt: Looks good to me, approved
jenkins-bot: Verified
diff --git a/setup.py b/setup.py
index 855c91b..2c7c279 100644
--- a/setup.py
+++ b/setup.py
@@ -56,7 +56,9 @@
version='2.0b1',
description='Python Wikipedia Bot Framework',
license='MIT License',
-packages=find_packages(),
+packages=[package
+ for package in find_packages()
+ if package.startswith('pywikibot.')],
install_requires=[
'httplib2=0.6.0'
],
--
To view, visit https://gerrit.wikimedia.org/r/101661
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie1dd6b6e5558edd48b6a1a2fef96b665f7339b78
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: Merlijn van Deen valhall...@arctus.nl
Gerrit-Reviewer: Ladsgroup ladsgr...@gmail.com
Gerrit-Reviewer: Legoktm legoktm.wikipe...@gmail.com
Gerrit-Reviewer: Xqt i...@gno.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 old esams text LVS service IPs for https - change (operations/puppet)
Mark Bergsma has uploaded a new change for review.
https://gerrit.wikimedia.org/r/102108
Change subject: Remove old esams text LVS service IPs for https
..
Remove old esams text LVS service IPs for https
Change-Id: Ie8bfa1e20a5c9bc5bf56ba11f361070d2d26af23
---
M manifests/lvs.pp
1 file changed, 1 insertion(+), 27 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/08/102108/1
diff --git a/manifests/lvs.pp b/manifests/lvs.pp
index 413cea8..65e7330 100644
--- a/manifests/lvs.pp
+++ b/manifests/lvs.pp
@@ -235,41 +235,15 @@
'esams' = {
'textlbsecure' = '91.198.174.192',
'loginlbsecure' = '91.198.174.201',
- 'wikimedialbsecure' = 91.198.174.224,
- 'wikipedialbsecure' = 91.198.174.225,
'bitslbsecure' = 91.198.174.233,
- 'uploadlbsecure-new' =
'91.198.174.208',
- 'uploadlbsecure' = 91.198.174.234,
+ 'uploadlbsecure' = '91.198.174.208',
'mobilelbsecure' = '91.198.174.236',
- 'wiktionarylbsecure' =
91.198.174.226,
- 'wikiquotelbsecure' = 91.198.174.227,
- 'wikibookslbsecure' = 91.198.174.228,
- 'wikisourcelbsecure' =
91.198.174.229,
- 'wikinewslbsecure' = 91.198.174.230,
- 'wikiversitylbsecure' =
91.198.174.231,
- 'mediawikilbsecure' = '91.198.174.232',
- 'foundationlbsecure' =
91.198.174.235,
- 'wikidatalbsecure' = '91.198.174.237',
- 'wikivoyagelbsecure' =
'91.198.174.238',
'textlb6secure' =
'2620:0:862:ed1a::1',
'loginlbsecure6' =
'2620:0:862:ed1a::1:9',
- 'wikimedialbsecure6' =
2620:0:862:ed1a::0,
- #'wikipedialbsecure6' =
2620:0:862:ed1a::1,
- 'wiktionarylbsecure6' =
2620:0:862:ed1a::2,
- 'wikiquotelbsecure6' =
2620:0:862:ed1a::3,
- 'wikibookslbsecure6' =
2620:0:862:ed1a::4,
- 'wikisourcelbsecure6' =
2620:0:862:ed1a::5,
- 'wikinewslbsecure6' =
2620:0:862:ed1a::6,
- 'wikiversitylbsecure6' =
2620:0:862:ed1a::7,
- 'mediawikilbsecure6' =
2620:0:862:ed1a::8,
- 'foundationlbsecure6' =
2620:0:862:ed1a::9,
'bitslbsecure6' = 2620:0:862:ed1a::a,
'uploadlbsecure6' =
'2620:0:862:ed1a::2:b',
- 'uploadlbsecure6-old' =
2620:0:862:ed1a::b,
'mobilelbsecure6' =
'2620:0:862:ed1a::c',
- 'wikidatalbsecure6' =
2620:0:862:ed1a::12,
- 'wikivoyagelbsecure6' =
2620:0:862:ed1a::13
},
'ulsfo' = {}
},
--
To view, visit https://gerrit.wikimedia.org/r/102108
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie8bfa1e20a5c9bc5bf56ba11f361070d2d26af23
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Mark Bergsma m...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove old esams text LVS service IPs for https - change (operations/puppet)
Mark Bergsma has submitted this change and it was merged.
Change subject: Remove old esams text LVS service IPs for https
..
Remove old esams text LVS service IPs for https
Change-Id: Ie8bfa1e20a5c9bc5bf56ba11f361070d2d26af23
---
M manifests/lvs.pp
1 file changed, 1 insertion(+), 27 deletions(-)
Approvals:
Mark Bergsma: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/lvs.pp b/manifests/lvs.pp
index 413cea8..65e7330 100644
--- a/manifests/lvs.pp
+++ b/manifests/lvs.pp
@@ -235,41 +235,15 @@
'esams' = {
'textlbsecure' = '91.198.174.192',
'loginlbsecure' = '91.198.174.201',
- 'wikimedialbsecure' = 91.198.174.224,
- 'wikipedialbsecure' = 91.198.174.225,
'bitslbsecure' = 91.198.174.233,
- 'uploadlbsecure-new' =
'91.198.174.208',
- 'uploadlbsecure' = 91.198.174.234,
+ 'uploadlbsecure' = '91.198.174.208',
'mobilelbsecure' = '91.198.174.236',
- 'wiktionarylbsecure' =
91.198.174.226,
- 'wikiquotelbsecure' = 91.198.174.227,
- 'wikibookslbsecure' = 91.198.174.228,
- 'wikisourcelbsecure' =
91.198.174.229,
- 'wikinewslbsecure' = 91.198.174.230,
- 'wikiversitylbsecure' =
91.198.174.231,
- 'mediawikilbsecure' = '91.198.174.232',
- 'foundationlbsecure' =
91.198.174.235,
- 'wikidatalbsecure' = '91.198.174.237',
- 'wikivoyagelbsecure' =
'91.198.174.238',
'textlb6secure' =
'2620:0:862:ed1a::1',
'loginlbsecure6' =
'2620:0:862:ed1a::1:9',
- 'wikimedialbsecure6' =
2620:0:862:ed1a::0,
- #'wikipedialbsecure6' =
2620:0:862:ed1a::1,
- 'wiktionarylbsecure6' =
2620:0:862:ed1a::2,
- 'wikiquotelbsecure6' =
2620:0:862:ed1a::3,
- 'wikibookslbsecure6' =
2620:0:862:ed1a::4,
- 'wikisourcelbsecure6' =
2620:0:862:ed1a::5,
- 'wikinewslbsecure6' =
2620:0:862:ed1a::6,
- 'wikiversitylbsecure6' =
2620:0:862:ed1a::7,
- 'mediawikilbsecure6' =
2620:0:862:ed1a::8,
- 'foundationlbsecure6' =
2620:0:862:ed1a::9,
'bitslbsecure6' = 2620:0:862:ed1a::a,
'uploadlbsecure6' =
'2620:0:862:ed1a::2:b',
- 'uploadlbsecure6-old' =
2620:0:862:ed1a::b,
'mobilelbsecure6' =
'2620:0:862:ed1a::c',
- 'wikidatalbsecure6' =
2620:0:862:ed1a::12,
- 'wikivoyagelbsecure6' =
2620:0:862:ed1a::13
},
'ulsfo' = {}
},
--
To view, visit https://gerrit.wikimedia.org/r/102108
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie8bfa1e20a5c9bc5bf56ba11f361070d2d26af23
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Mark Bergsma m...@wikimedia.org
Gerrit-Reviewer: Mark Bergsma m...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Sort the sandbox translations by language - change (mediawiki...Translate)
jenkins-bot has submitted this change and it was merged.
Change subject: Sort the sandbox translations by language
..
Sort the sandbox translations by language
Change-Id: If18b69eb09aa3f79363e10754f94d2fc6e5b9914
---
M resources/js/ext.translate.special.translatesandbox.js
M tests/browser/features/manage_translator_sandbox.feature
M tests/browser/features/step_definitions/manage_translator_sandbox_steps.rb
M tests/browser/features/support/pages/manage_translator_sandbox_page.rb
4 files changed, 31 insertions(+), 3 deletions(-)
Approvals:
Santhosh: Looks good to me, approved
jenkins-bot: Verified
diff --git a/resources/js/ext.translate.special.translatesandbox.js
b/resources/js/ext.translate.special.translatesandbox.js
index 8f9ed72..79d87e2 100644
--- a/resources/js/ext.translate.special.translatesandbox.js
+++ b/resources/js/ext.translate.special.translatesandbox.js
@@ -12,6 +12,19 @@
var delay;
+ /**
+* A callback for sorting translations
+* @param {object} translationA Object loaded from translation stash
+* @param {object} translationB Object loaded from translation stash
+* @return {number} String comparison of language codes
+*/
+ function sortTranslationsByLanguage( translationA, translationB ) {
+ var a = translationA.title.split( '/' ).pop(),
+ b = translationB.title.split( '/' ).pop();
+
+ return a.localeCompare( b );
+ }
+
function doApiAction( options ) {
var api = new mw.Api();
@@ -168,6 +181,9 @@
.addClass( 'four
columns' )
)
);
+
+ translations.translationstash.translations.sort(
sortTranslationsByLanguage );
+
$.each( translations.translationstash.translations,
function( index, translation ) {
var translationLang = translation.title.split(
'/' ).pop();
diff --git a/tests/browser/features/manage_translator_sandbox.feature
b/tests/browser/features/manage_translator_sandbox.feature
index 8c3e256..e017f5c 100644
--- a/tests/browser/features/manage_translator_sandbox.feature
+++ b/tests/browser/features/manage_translator_sandbox.feature
@@ -122,6 +122,7 @@
And I should see the 'Reject' button displayed in the second column
And I should see '1 user selected' at the bottom of the first column
And I should see '10 older requests' in the older requests link at the
bottom of the first column
+ And I should see that the user's translations are sorted by the language
code
Scenario: Clicking on a name of a user who didn't make any translations
shows the user information and the action buttons and doesn't show translations
Given I am on the Translator sandbox management page with users in the
sandbox
diff --git
a/tests/browser/features/step_definitions/manage_translator_sandbox_steps.rb
b/tests/browser/features/step_definitions/manage_translator_sandbox_steps.rb
index ed1c550..50e4439 100644
--- a/tests/browser/features/step_definitions/manage_translator_sandbox_steps.rb
+++ b/tests/browser/features/step_definitions/manage_translator_sandbox_steps.rb
@@ -111,7 +111,7 @@
end
Then(/^I should see that the language of the first translation is '(.+)'$/) do
|language|
- on(ManageTranslatorSandboxPage).translations_autonym.text.should ==
language
+ on(ManageTranslatorSandboxPage).translations_autonyms[0].text.should ==
language
end
Then(/^only users whose name begins with '(.*)' are displayed in the first
column$/) do |prefix|
@@ -193,3 +193,7 @@
page.older_requests_indicator_element.text.should == text
end
end
+
+Then(/^I should see that the user's translations are sorted by the language
code$/) do
+
on(ManageTranslatorSandboxPage).translations_languages_are_sorted?.should
be_true
+end
diff --git
a/tests/browser/features/support/pages/manage_translator_sandbox_page.rb
b/tests/browser/features/support/pages/manage_translator_sandbox_page.rb
index 7fe187e..cffb12a 100644
--- a/tests/browser/features/support/pages/manage_translator_sandbox_page.rb
+++ b/tests/browser/features/support/pages/manage_translator_sandbox_page.rb
@@ -107,8 +107,15 @@
@browser.elements(css: .details.pane .languages span)[0]
end
- def translations_autonym
- @browser.elements(css: .details.pane .translations
.info.autonym)[0]
+ def translations_languages_are_sorted?
+ expected_langs = [bn, fi, he, nl, uk]
+ langs = translations_autonyms.collect { |element|
element.attribute_value(lang) }
+
+ expected_langs == langs
+ end
+
+ def translations_autonyms
+ @browser.elements(css:
[MediaWiki-commits] [Gerrit] Add Scribunto as dependency for Wikibase (client) tests - change (integration/jenkins-job-builder-config)
Aude has uploaded a new change for review.
https://gerrit.wikimedia.org/r/102109
Change subject: Add Scribunto as dependency for Wikibase (client) tests
..
Add Scribunto as dependency for Wikibase (client) tests
Change-Id: Ib58b22fa05737ec8e3631497a9243fa559463e97
---
M mediawiki-extensions.yaml
1 file changed, 3 insertions(+), 3 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/integration/jenkins-job-builder-config
refs/changes/09/102109/1
diff --git a/mediawiki-extensions.yaml b/mediawiki-extensions.yaml
index aa60305..0152a6d 100644
--- a/mediawiki-extensions.yaml
+++ b/mediawiki-extensions.yaml
@@ -549,10 +549,10 @@
- '{name}-{ext-name}-testextensions-{mwbranch}':
name: mwext
ext-name: Wikibase
-dependencies: 'Diff,DataValues,DataTypes,WikibaseDataModel'
+dependencies: 'Diff,DataValues,DataTypes,WikibaseDataModel,Scribunto'
- 'mwext-Wikibase-{kind}-tests':
ext-name: Wikibase
-dependencies: 'Diff,DataValues,DataTypes,WikibaseDataModel'
+dependencies: 'Diff,DataValues,DataTypes,WikibaseDataModel,Scribunto'
kind: 'client'
- 'mwext-Wikibase-{kind}-tests':
ext-name: Wikibase
@@ -564,7 +564,7 @@
kind: 'repoapi'
- '{name}-{ext-name}-qunit':
ext-name: Wikibase
-dependencies: 'Diff,DataValues,DataTypes,WikibaseDataModel'
+dependencies: 'Diff,DataValues,DataTypes,WikibaseDataModel,Scribunto'
- '{name}-{ext-name}-testextensions-{mwbranch}':
ext-name: WikibaseDataModel
dependencies: 'Diff,DataValues'
--
To view, visit https://gerrit.wikimedia.org/r/102109
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib58b22fa05737ec8e3631497a9243fa559463e97
Gerrit-PatchSet: 1
Gerrit-Project: integration/jenkins-job-builder-config
Gerrit-Branch: master
Gerrit-Owner: Aude aude.w...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] TranslateSandbox: Refactor language filter to a plugin - change (mediawiki...Translate)
jenkins-bot has submitted this change and it was merged.
Change subject: TranslateSandbox: Refactor language filter to a plugin
..
TranslateSandbox: Refactor language filter to a plugin
Abstracts the language selection, filtering of requests, showing
and clearing of selected language.
Change-Id: Iea6c8cdbfd2b480f42c6636289651f8ac3041f7f
---
M resources/js/ext.translate.special.translatesandbox.js
M specials/SpecialTranslateSandbox.php
2 files changed, 44 insertions(+), 15 deletions(-)
Approvals:
Nikerabbit: Looks good to me, approved
jenkins-bot: Verified
diff --git a/resources/js/ext.translate.special.translatesandbox.js
b/resources/js/ext.translate.special.translatesandbox.js
index 79d87e2..4933d3b 100644
--- a/resources/js/ext.translate.special.translatesandbox.js
+++ b/resources/js/ext.translate.special.translatesandbox.js
@@ -315,8 +315,6 @@
$( document ).ready( function () {
var $requestCheckboxes = $( '.request-selector' ),
- $languageSelector = $( '.language-selector' ),
- $clearLanguageSelector = $( '.clear-language-selector'
),
$selectAll = $( '.request-selector-all' ),
$requestRows = $( '.requests .request' ),
$detailsPane = $( '.details.pane' );
@@ -326,6 +324,7 @@
$( window ).on( 'resize', setPanesHeight );
$( '.request-filter-box' ).translatorSearch();
+ $( '.language-selector' ).languageFilter();
// Handle clicks for the 'Select all' checkbox
$selectAll.on( 'click', function () {
@@ -463,10 +462,29 @@
$detailsPane.text( mw.msg(
'tsb-no-requests-from-new-users' ) );
}
+ } );
+
+ // ==
+ // LanguageFilter plugin
+ // ==
+ function LanguageFilter( element ) {
+ this.$selector = $( element );
+ this.init();
+ }
+
+ LanguageFilter.prototype.init = function () {
+ var languageFilter = this,
+ $clearButton;
+
+ $clearButton = $( 'button' )
+ .addClass( 'clear-language-selector hide' )
+ .text( '×' );
+
+ languageFilter.$selector.after( $clearButton );
// Activate language selector
- $languageSelector.uls( {
+ languageFilter.$selector.uls( {
onSelect: function ( language ) {
- $languageSelector
+ languageFilter.$selector
.removeClass( 'unselected' )
.addClass( 'selected autonym' )
.prop( {
@@ -475,17 +493,17 @@
} )
.text( $.uls.data.getAutonym( language
) );
- filterRequestsByLanguage( language );
-
- $clearLanguageSelector.removeClass( 'hide' );
+ languageFilter.filter( language );
+ $clearButton.removeClass( 'hide' );
},
quickList: mw.uls.getFrequentLanguageList
} );
- $clearLanguageSelector.on( 'click', function() {
+
+ $clearButton.on( 'click', function() {
var userLang = mw.config.get( 'wgUserLanguage' );
- $languageSelector
+ languageFilter.$selector
.removeClass( 'selected autonym' )
.prop( {
dir: $.uls.data.getDir( userLang ),
@@ -494,16 +512,17 @@
.addClass( 'unselected' )
.text( mw.msg( 'tsb-all-languages-button-label'
) );
- filterRequestsByLanguage();
- $clearLanguageSelector.addClass( 'hide' );
+ languageFilter.filter();
+ $clearButton.addClass( 'hide' );
} );
- } );
+
+ };
/**
* Filter the requests by language.
* @param {string} [language] Language code
*/
- function filterRequestsByLanguage( language ) {
+ LanguageFilter.prototype.filter = function ( language ) {
var $requests = $( '.request' );
$requests.each( function ( index, request ) {
@@ -523,8 +542,19 @@
} );
updateAfterFiltering();
- }
+ };
+ $.fn.languageFilter = function () {
+ return this.each(
[MediaWiki-commits] [Gerrit] Removed @sandbox.translatewiki.net tags from features that d... - change (mediawiki...TwnMainPage)
jenkins-bot has submitted this change and it was merged. Change subject: Removed @sandbox.translatewiki.net tags from features that do not have implemented tests. .. Removed @sandbox.translatewiki.net tags from features that do not have implemented tests. Change-Id: Ic813f7e8d858af63f8c93007fe833a8617416bb3 --- M tests/browser/features/user_not_signed_in.feature M tests/browser/features/user_signed_in_not_approved.feature 2 files changed, 1 insertion(+), 2 deletions(-) Approvals: Nikerabbit: Looks good to me, approved jenkins-bot: Verified diff --git a/tests/browser/features/user_not_signed_in.feature b/tests/browser/features/user_not_signed_in.feature index fee40e3..643c3bb 100644 --- a/tests/browser/features/user_not_signed_in.feature +++ b/tests/browser/features/user_not_signed_in.feature @@ -1,4 +1,3 @@ -@sandbox.translatewiki.net Feature: Users who are not signed-in (and for other scenarios common to all users) Background: diff --git a/tests/browser/features/user_signed_in_not_approved.feature b/tests/browser/features/user_signed_in_not_approved.feature index 47b4a70..fcd4163 100644 --- a/tests/browser/features/user_signed_in_not_approved.feature +++ b/tests/browser/features/user_signed_in_not_approved.feature @@ -1,4 +1,4 @@ -@login @sandbox.translatewiki.net +@login Feature: Signed-in New Users who have not been approved (only onboarding view will be available for them) -- To view, visit https://gerrit.wikimedia.org/r/102097 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ic813f7e8d858af63f8c93007fe833a8617416bb3 Gerrit-PatchSet: 3 Gerrit-Project: mediawiki/extensions/TwnMainPage Gerrit-Branch: master Gerrit-Owner: Zfilipin zfili...@wikimedia.org Gerrit-Reviewer: Amire80 amir.ahar...@mail.huji.ac.il Gerrit-Reviewer: KartikMistry kartik.mis...@gmail.com Gerrit-Reviewer: Nikerabbit niklas.laxst...@gmail.com Gerrit-Reviewer: Zfilipin zfili...@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 text-lb.eqiad.wikimedia.org - change (operations/dns)
Mark Bergsma has uploaded a new change for review. https://gerrit.wikimedia.org/r/102112 Change subject: Add text-lb.eqiad.wikimedia.org .. Add text-lb.eqiad.wikimedia.org Change-Id: I432c623e298c1d02f701a31afb6557b0066a8b90 --- M templates/wikimedia.org 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/dns refs/changes/12/102112/1 diff --git a/templates/wikimedia.org b/templates/wikimedia.org index 57e7988..e1b6f74 100644 --- a/templates/wikimedia.org +++ b/templates/wikimedia.org @@ -324,6 +324,8 @@ geoiplookup-lb.pmtpa 1H IN A208.80.152.210 ;;; eqiad +text-lb.eqiad 1H IN A208.80.154.224 +1H IN 2620:0:861:ed1a::1 donate-lb.eqiad1H IN A208.80.154.224 ; Explicitly v4 only IN MX 10 mchenry.wikimedia.org. IN MX 20 sodium.wikimedia.org. -- To view, visit https://gerrit.wikimedia.org/r/102112 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I432c623e298c1d02f701a31afb6557b0066a8b90 Gerrit-PatchSet: 1 Gerrit-Project: operations/dns Gerrit-Branch: master Gerrit-Owner: Mark Bergsma m...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update reverse DNS for text-lb.eqiad - change (operations/dns)
Mark Bergsma has uploaded a new change for review.
https://gerrit.wikimedia.org/r/102115
Change subject: Update reverse DNS for text-lb.eqiad
..
Update reverse DNS for text-lb.eqiad
Change-Id: If2bc252ef38698190ce3569e2bf63bcfa538fce2
---
M templates/1.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
M templates/154.80.208.in-addr.arpa
2 files changed, 2 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/dns
refs/changes/15/102115/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 e3953de..467f1b4 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
@@ -146,7 +146,7 @@
$ORIGIN a.1.d.e.{{ zonename }}.
0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0 1H IN PTR
wikimedia-lb.eqiad.wikimedia.org.
-1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0 1H IN PTR
wikipedia-lb.eqiad.wikimedia.org.
+1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0 1H IN PTR text-lb.eqiad.wikimedia.org.
2.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0 1H IN PTR
wiktionary-lb.eqiad.wikimedia.org.
3.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0 1H IN PTR
wikiquote-lb.eqiad.wikimedia.org.
4.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0 1H IN PTR
wikibooks-lb.eqiad.wikimedia.org.
diff --git a/templates/154.80.208.in-addr.arpa
b/templates/154.80.208.in-addr.arpa
index 660ab73..1a3bb87 100644
--- a/templates/154.80.208.in-addr.arpa
+++ b/templates/154.80.208.in-addr.arpa
@@ -139,7 +139,7 @@
; FIXME : These will be slowly rearranged to fit
; Desktop Text Assets 208.80.154.224 - 231 (208.80.154.224/29)
-224 1H IN PTR wikimedia-lb.eqiad.wikimedia.org.
+224 1H IN PTR text-lb.eqiad.wikimedia.org.
225 1H IN PTR wikipedia-lb.eqiad.wikimedia.org.
226 1H IN PTR wiktionary-lb.eqiad.wikimedia.org.
227 1H IN PTR wikiquote-lb.eqiad.wikimedia.org.
--
To view, visit https://gerrit.wikimedia.org/r/102115
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: If2bc252ef38698190ce3569e2bf63bcfa538fce2
Gerrit-PatchSet: 1
Gerrit-Project: operations/dns
Gerrit-Branch: master
Gerrit-Owner: Mark Bergsma m...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Kill some noisy Log messages that are no longer useful - change (apps...wikipedia)
Yuvipanda has uploaded a new change for review.
https://gerrit.wikimedia.org/r/102113
Change subject: Kill some noisy Log messages that are no longer useful
..
Kill some noisy Log messages that are no longer useful
Change-Id: I53629094052a9c20e6688a151715532cad5788ca
---
M wikipedia/src/main/java/org/wikimedia/wikipedia/PageQueryTask.java
M wikipedia/src/main/java/org/wikimedia/wikipedia/SearchArticlesFragment.java
M wikipedia/src/main/java/org/wikimedia/wikipedia/pageimages/PageImagesTask.java
3 files changed, 0 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia
refs/changes/13/102113/1
diff --git a/wikipedia/src/main/java/org/wikimedia/wikipedia/PageQueryTask.java
b/wikipedia/src/main/java/org/wikimedia/wikipedia/PageQueryTask.java
index 33af595..876f71e 100644
--- a/wikipedia/src/main/java/org/wikimedia/wikipedia/PageQueryTask.java
+++ b/wikipedia/src/main/java/org/wikimedia/wikipedia/PageQueryTask.java
@@ -36,7 +36,6 @@
JSONObject data = result.asObject();
JSONObject query = data.getJSONObject(query);
JSONObject pages = query.getJSONObject(pages);
-Log.d(Wikipedia, thumbs pages are: + pages.toString());
// You would think you could use foreach on an Iterator, but you can't.
IteratorString keys = pages.keys();
diff --git
a/wikipedia/src/main/java/org/wikimedia/wikipedia/SearchArticlesFragment.java
b/wikipedia/src/main/java/org/wikimedia/wikipedia/SearchArticlesFragment.java
index 33fbf8c..bcc7c63 100644
---
a/wikipedia/src/main/java/org/wikimedia/wikipedia/SearchArticlesFragment.java
+++
b/wikipedia/src/main/java/org/wikimedia/wikipedia/SearchArticlesFragment.java
@@ -123,7 +123,6 @@
@Override
public boolean handleMessage(Message msg) {
final String searchTerm = (String) msg.obj;
-Log.d(Wikipedia, Searching for + searchTerm);
SearchArticlesTask searchTask = new
SearchArticlesTask(app.getAPIForSite(app.getPrimarySite()),
app.getPrimarySite(), searchTerm) {
@Override
public void onFinish(ListPageTitle result) {
diff --git
a/wikipedia/src/main/java/org/wikimedia/wikipedia/pageimages/PageImagesTask.java
b/wikipedia/src/main/java/org/wikimedia/wikipedia/pageimages/PageImagesTask.java
index 4665c1a..c34f023 100644
---
a/wikipedia/src/main/java/org/wikimedia/wikipedia/pageimages/PageImagesTask.java
+++
b/wikipedia/src/main/java/org/wikimedia/wikipedia/pageimages/PageImagesTask.java
@@ -1,6 +1,5 @@
package org.wikimedia.wikipedia.pageimages;
-import android.util.Log;
import org.json.JSONObject;
import org.mediawiki.api.json.Api;
import org.mediawiki.api.json.RequestBuilder;
@@ -38,7 +37,6 @@
@Override
public String processPage(int pageId, PageTitle pageTitle, JSONObject
pageData) throws Throwable {
-Log.d(Wikipedia, thumb info: + pageData.toString());
JSONObject thumbnail = pageData.optJSONObject(thumbnail);
if (thumbnail == null) {
return null;
--
To view, visit https://gerrit.wikimedia.org/r/102113
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I53629094052a9c20e6688a151715532cad5788ca
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Yuvipanda yuvipa...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add text-lb.eqiad.wikimedia.org - change (operations/dns)
Mark Bergsma has submitted this change and it was merged. Change subject: Add text-lb.eqiad.wikimedia.org .. Add text-lb.eqiad.wikimedia.org Change-Id: I432c623e298c1d02f701a31afb6557b0066a8b90 --- M templates/wikimedia.org 1 file changed, 2 insertions(+), 0 deletions(-) Approvals: Mark Bergsma: Looks good to me, approved jenkins-bot: Verified diff --git a/templates/wikimedia.org b/templates/wikimedia.org index 57e7988..e1b6f74 100644 --- a/templates/wikimedia.org +++ b/templates/wikimedia.org @@ -324,6 +324,8 @@ geoiplookup-lb.pmtpa 1H IN A208.80.152.210 ;;; eqiad +text-lb.eqiad 1H IN A208.80.154.224 +1H IN 2620:0:861:ed1a::1 donate-lb.eqiad1H IN A208.80.154.224 ; Explicitly v4 only IN MX 10 mchenry.wikimedia.org. IN MX 20 sodium.wikimedia.org. -- To view, visit https://gerrit.wikimedia.org/r/102112 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I432c623e298c1d02f701a31afb6557b0066a8b90 Gerrit-PatchSet: 1 Gerrit-Project: operations/dns Gerrit-Branch: master Gerrit-Owner: Mark Bergsma m...@wikimedia.org Gerrit-Reviewer: Mark Bergsma m...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove old eqiad/esams LVS service IPs - change (operations/puppet)
Mark Bergsma has uploaded a new change for review.
https://gerrit.wikimedia.org/r/102116
Change subject: Remove old eqiad/esams LVS service IPs
..
Remove old eqiad/esams LVS service IPs
Change-Id: I3cb76911ca748a5c294c11a9bed3446288db057c
---
M manifests/lvs.pp
1 file changed, 2 insertions(+), 5 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/16/102116/1
diff --git a/manifests/lvs.pp b/manifests/lvs.pp
index 65e7330..0b7a55d 100644
--- a/manifests/lvs.pp
+++ b/manifests/lvs.pp
@@ -202,7 +202,6 @@
'wikipedialbsecure' = 208.80.154.225,
'bitslbsecure' = 208.80.154.234,
'uploadlbsecure' = '208.80.154.240',
- 'uploadlbsecure-old' =
208.80.154.235,
'wiktionarylbsecure' =
208.80.154.226,
'wikiquotelbsecure' = 208.80.154.227,
'wikibookslbsecure' = 208.80.154.228,
@@ -227,7 +226,6 @@
'foundationlbsecure6' =
2620:0:861:ed1a::9,
'bitslbsecure6' = 2620:0:861:ed1a::a,
'uploadlbsecure6' =
'2620:0:861:ed1a::2:b',
- 'uploadlbsecure6-old' =
2620:0:861:ed1a::b,
'mobilelbsecure6' =
2620:0:861:ed1a::c,
'wikidatalbsecure6' =
2620:0:861:ed1a::12,
'wikivoyagelbsecure6' =
2620:0:861:ed1a::13
@@ -288,7 +286,6 @@
'wikiversitylb6' =
2620:0:862:ed1a::7,
'mediawikilb6' = 2620:0:862:ed1a::8,
'foundationlb6' = 2620:0:862:ed1a::9,
- 'uploadlb6-old' = 2620:0:862:ed1a::b,
'wikidatalb6' = 2620:0:862:ed1a::12,
'wikivoyagelb6' = 2620:0:862:ed1a::13
},
@@ -302,8 +299,8 @@
},
'upload' = {
'pmtpa' = { 'uploadlb' = 208.80.152.211,
'uploadsvc' = 10.2.1.24 },
- 'eqiad' = { 'uploadlb' = '208.80.154.240',
'uploadlb-old' = '208.80.154.235', 'uploadlb6' = '2620:0:861:ed1a::2:b',
'uploadlb6-old' = '2620:0:861:ed1a::b', 'uploadsvc' = '10.2.2.24' },
- 'esams' = { 'uploadlb' = '91.198.174.208',
'uploadlb-old' = '91.198.174.234', 'uploadlb6' = '2620:0:862:ed1a::2:b',
'uploadsvc' = '10.2.3.24' },
+ 'eqiad' = { 'uploadlb' = '208.80.154.240',
'uploadlb6' = '2620:0:861:ed1a::2:b', 'uploadsvc' = '10.2.2.24' },
+ 'esams' = { 'uploadlb' = '91.198.174.208',
'uploadlb6' = '2620:0:862:ed1a::2:b', 'uploadsvc' = '10.2.3.24' },
'ulsfo' = { 'uploadlb' = '198.35.26.112',
'uploadlb6' = '2620:0:863:ed1a::2:b' },
},
'payments' = {
--
To view, visit https://gerrit.wikimedia.org/r/102116
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I3cb76911ca748a5c294c11a9bed3446288db057c
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Mark Bergsma m...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove old eqiad/esams LVS service IPs - change (operations/puppet)
Mark Bergsma has submitted this change and it was merged.
Change subject: Remove old eqiad/esams LVS service IPs
..
Remove old eqiad/esams LVS service IPs
Change-Id: I3cb76911ca748a5c294c11a9bed3446288db057c
---
M manifests/lvs.pp
1 file changed, 2 insertions(+), 5 deletions(-)
Approvals:
Mark Bergsma: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/lvs.pp b/manifests/lvs.pp
index 65e7330..0b7a55d 100644
--- a/manifests/lvs.pp
+++ b/manifests/lvs.pp
@@ -202,7 +202,6 @@
'wikipedialbsecure' = 208.80.154.225,
'bitslbsecure' = 208.80.154.234,
'uploadlbsecure' = '208.80.154.240',
- 'uploadlbsecure-old' =
208.80.154.235,
'wiktionarylbsecure' =
208.80.154.226,
'wikiquotelbsecure' = 208.80.154.227,
'wikibookslbsecure' = 208.80.154.228,
@@ -227,7 +226,6 @@
'foundationlbsecure6' =
2620:0:861:ed1a::9,
'bitslbsecure6' = 2620:0:861:ed1a::a,
'uploadlbsecure6' =
'2620:0:861:ed1a::2:b',
- 'uploadlbsecure6-old' =
2620:0:861:ed1a::b,
'mobilelbsecure6' =
2620:0:861:ed1a::c,
'wikidatalbsecure6' =
2620:0:861:ed1a::12,
'wikivoyagelbsecure6' =
2620:0:861:ed1a::13
@@ -288,7 +286,6 @@
'wikiversitylb6' =
2620:0:862:ed1a::7,
'mediawikilb6' = 2620:0:862:ed1a::8,
'foundationlb6' = 2620:0:862:ed1a::9,
- 'uploadlb6-old' = 2620:0:862:ed1a::b,
'wikidatalb6' = 2620:0:862:ed1a::12,
'wikivoyagelb6' = 2620:0:862:ed1a::13
},
@@ -302,8 +299,8 @@
},
'upload' = {
'pmtpa' = { 'uploadlb' = 208.80.152.211,
'uploadsvc' = 10.2.1.24 },
- 'eqiad' = { 'uploadlb' = '208.80.154.240',
'uploadlb-old' = '208.80.154.235', 'uploadlb6' = '2620:0:861:ed1a::2:b',
'uploadlb6-old' = '2620:0:861:ed1a::b', 'uploadsvc' = '10.2.2.24' },
- 'esams' = { 'uploadlb' = '91.198.174.208',
'uploadlb-old' = '91.198.174.234', 'uploadlb6' = '2620:0:862:ed1a::2:b',
'uploadsvc' = '10.2.3.24' },
+ 'eqiad' = { 'uploadlb' = '208.80.154.240',
'uploadlb6' = '2620:0:861:ed1a::2:b', 'uploadsvc' = '10.2.2.24' },
+ 'esams' = { 'uploadlb' = '91.198.174.208',
'uploadlb6' = '2620:0:862:ed1a::2:b', 'uploadsvc' = '10.2.3.24' },
'ulsfo' = { 'uploadlb' = '198.35.26.112',
'uploadlb6' = '2620:0:863:ed1a::2:b' },
},
'payments' = {
--
To view, visit https://gerrit.wikimedia.org/r/102116
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I3cb76911ca748a5c294c11a9bed3446288db057c
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Mark Bergsma m...@wikimedia.org
Gerrit-Reviewer: Mark Bergsma m...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Removing pending block for a bug that was resolved - change (mediawiki...UniversalLanguageSelector)
jenkins-bot has submitted this change and it was merged.
Change subject: Removing pending block for a bug that was resolved
..
Removing pending block for a bug that was resolved
Had to increase timeout that waits for a div to disappear, the default
5 seconds was not enough. Increased timeout also fixes this test that
fails sometimes: http://goo.gl/YXBDAj
Bug: 56885
Change-Id: I2def25828865a21eb321d0d9ea2e57764d86c1a2
---
M tests/browser/features/step_definitions/panel_steps.rb
M tests/browser/features/step_definitions/textarea_font_steps.rb
2 files changed, 2 insertions(+), 4 deletions(-)
Approvals:
Nikerabbit: Looks good to me, approved
jenkins-bot: Verified
diff --git a/tests/browser/features/step_definitions/panel_steps.rb
b/tests/browser/features/step_definitions/panel_steps.rb
index 84e576f..b34882c 100644
--- a/tests/browser/features/step_definitions/panel_steps.rb
+++ b/tests/browser/features/step_definitions/panel_steps.rb
@@ -35,7 +35,7 @@
When(/^I apply the changes$/) do
on(PanelPage) do |page|
page.panel_button_apply_element.click
- page.language_settings_dialog_element.when_not_present
+ page.language_settings_dialog_element.when_not_present(10)
end
end
diff --git a/tests/browser/features/step_definitions/textarea_font_steps.rb
b/tests/browser/features/step_definitions/textarea_font_steps.rb
index 0904ef8..71c0011 100644
--- a/tests/browser/features/step_definitions/textarea_font_steps.rb
+++ b/tests/browser/features/step_definitions/textarea_font_steps.rb
@@ -18,9 +18,7 @@
step I open the Universal Language Selector
step I open Display panel of language settings
step I open Fonts panel of language settings
- pending(Bug 56885) do
- step I select #{font} font for the content language for the
live preview
- end
+ step I select #{font} font for the content language for the live
preview
step I apply the changes
end
--
To view, visit https://gerrit.wikimedia.org/r/102102
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I2def25828865a21eb321d0d9ea2e57764d86c1a2
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/UniversalLanguageSelector
Gerrit-Branch: master
Gerrit-Owner: Zfilipin zfili...@wikimedia.org
Gerrit-Reviewer: Amire80 amir.ahar...@mail.huji.ac.il
Gerrit-Reviewer: KartikMistry kartik.mis...@gmail.com
Gerrit-Reviewer: Nikerabbit niklas.laxst...@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 esams ipv6 LVS service IPs - change (operations/puppet)
Mark Bergsma has uploaded a new change for review.
https://gerrit.wikimedia.org/r/102117
Change subject: Remove esams ipv6 LVS service IPs
..
Remove esams ipv6 LVS service IPs
Change-Id: Ifc048f5b939506844785f87832d2899519fe4bcc
---
M manifests/lvs.pp
1 file changed, 1 insertion(+), 14 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/17/102117/1
diff --git a/manifests/lvs.pp b/manifests/lvs.pp
index 0b7a55d..13e7cd3 100644
--- a/manifests/lvs.pp
+++ b/manifests/lvs.pp
@@ -275,20 +275,7 @@
'wikidatalb6' = 2620:0:861:ed1a::12,
'wikivoyagelb6' = 2620:0:861:ed1a::13
},
- 'esams' = {
- 'wikimedialb6' = 2620:0:862:ed1a::0,
- #'wikipedialb6' = 2620:0:862:ed1a::1,
- 'wiktionarylb6' = 2620:0:862:ed1a::2,
- 'wikiquotelb6' = 2620:0:862:ed1a::3,
- 'wikibookslb6' = 2620:0:862:ed1a::4,
- 'wikisourcelb6' = 2620:0:862:ed1a::5,
- 'wikinewslb6' = 2620:0:862:ed1a::6,
- 'wikiversitylb6' =
2620:0:862:ed1a::7,
- 'mediawikilb6' = 2620:0:862:ed1a::8,
- 'foundationlb6' = 2620:0:862:ed1a::9,
- 'wikidatalb6' = 2620:0:862:ed1a::12,
- 'wikivoyagelb6' = 2620:0:862:ed1a::13
- },
+ 'esams' = {},
'ulsfo' = {},
},
'bits' = {
--
To view, visit https://gerrit.wikimedia.org/r/102117
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ifc048f5b939506844785f87832d2899519fe4bcc
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Mark Bergsma m...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] TranslateSandbox: Refactor code for showing translations of ... - change (mediawiki...Translate)
Santhosh has uploaded a new change for review.
https://gerrit.wikimedia.org/r/102118
Change subject: TranslateSandbox: Refactor code for showing translations of a
new user
..
TranslateSandbox: Refactor code for showing translations of a new user
Moved the code to showTranlations and showTranslation methods
Change-Id: Ia736d624f127e534a3d03b0e2bf0c59d86fb32ec
---
M resources/js/ext.translate.special.translatesandbox.js
1 file changed, 65 insertions(+), 61 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Translate
refs/changes/18/102118/1
diff --git a/resources/js/ext.translate.special.translatesandbox.js
b/resources/js/ext.translate.special.translatesandbox.js
index 4933d3b..caf8a37 100644
--- a/resources/js/ext.translate.special.translatesandbox.js
+++ b/resources/js/ext.translate.special.translatesandbox.js
@@ -150,78 +150,82 @@
// @todo: move higher in the tree
storage = new mw.translate.TranslationStashStorage();
- storage.getUserTranslations( request.username ).done( function
( translations ) {
- var $target = $( '.translations' );
+ storage.getUserTranslations( request.username ).done(
showTranslations );
+ }
- $target.empty();
+ function showTranslations( translations ) {
+ var $target = $( '.translations' );
- // Display a message if the user didn't make any
translations
- if ( !translations.translationstash.translations.length
) {
- $target.append(
- $( 'div' )
- .addClass(
'tsb-details-no-translations' )
- .text( mw.msg(
'tsb-didnt-make-any-translations' ) )
- );
+ $target.empty();
- return;
- }
-
+ // Display a message if the user didn't make any translations
+ if ( !translations.translationstash.translations.length ) {
$target.append(
$( 'div' )
- .addClass( 'row title' )
- .append(
- $( 'div' )
- .text( mw.msg(
'tsb-translations-source' ) )
- .addClass( 'four
columns' ),
- $( 'div' )
- .text( mw.msg(
'tsb-translations-user' ) )
- .addClass( 'four
columns' ),
- $( 'div' )
- .text( mw.msg(
'tsb-translations-current' ) )
- .addClass( 'four
columns' )
- )
- );
+ .addClass(
'tsb-details-no-translations' )
+ .text( mw.msg(
'tsb-didnt-make-any-translations' ) )
+ );
- translations.translationstash.translations.sort(
sortTranslationsByLanguage );
+ return;
+ }
- $.each( translations.translationstash.translations,
function( index, translation ) {
- var translationLang = translation.title.split(
'/' ).pop();
-
- $target.append(
+ $target.append(
+ $( 'div' )
+ .addClass( 'row title' )
+ .append(
$( 'div' )
- .addClass( 'row' )
- .append(
- $( 'div' )
- .addClass(
'four columns source' )
- .text(
translation.definition ),
- $( 'div' )
- .addClass(
'four columns translation' )
- .append(
- $(
'div' ).text( translation.translation ),
- $(
'div' )
-
[MediaWiki-commits] [Gerrit] Remove old esams service IPs from protoproxies - change (operations/puppet)
Mark Bergsma has uploaded a new change for review.
https://gerrit.wikimedia.org/r/102119
Change subject: Remove old esams service IPs from protoproxies
..
Remove old esams service IPs from protoproxies
Change-Id: Ia9de9f6e917d7d25f8269c085c089ee1276ee1ca
---
M manifests/role/protoproxy.pp
1 file changed, 13 insertions(+), 13 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/19/102119/1
diff --git a/manifests/role/protoproxy.pp b/manifests/role/protoproxy.pp
index 95dd257..fe420cf 100644
--- a/manifests/role/protoproxy.pp
+++ b/manifests/role/protoproxy.pp
@@ -81,7 +81,7 @@
proxy_addresses = {
'pmtpa' = [ '208.80.152.200', '[2620:0:860:ed1a::]' ],
'eqiad' = [ '208.80.154.224', '[2620:0:861:ed1a::]' ],
-'esams' = [ '91.198.174.192', '91.198.174.201', '91.198.174.224',
'[2620:0:862:ed1a::]', '[2620:0:862:ed1a::1:9]' ],
+'esams' = [ '91.198.174.192', '91.198.174.201',
'[2620:0:862:ed1a::1:9]' ],
},
proxy_server_name = '*.wikimedia.org',
proxy_server_cert_name = 'unified.wikimedia.org',
@@ -114,7 +114,7 @@
proxy_addresses = {
'pmtpa' = [ '208.80.152.211', '[2620:0:860:ed1a::b]' ],
'eqiad' = [ '208.80.154.240', '208.80.154.235',
'[2620:0:861:ed1a::2:b]', '[2620:0:861:ed1a::b]' ],
-'esams' = [ '91.198.174.208', '91.198.174.234',
'[2620:0:862:ed1a::2:b]', '[2620:0:862:ed1a::b]' ],
+'esams' = [ '91.198.174.208', '[2620:0:862:ed1a::2:b]' ],
},
proxy_server_name = 'upload.wikimedia.org',
proxy_server_cert_name = 'unified.wikimedia.org',
@@ -130,7 +130,7 @@
proxy_addresses = {
'pmtpa' = [ '208.80.152.201', '[2620:0:860:ed1a::1]' ],
'eqiad' = [ '208.80.154.225', '[2620:0:861:ed1a::1]' ],
-'esams' = [ '91.198.174.225', '[2620:0:862:ed1a::1]' ],
+'esams' = [ '[2620:0:862:ed1a::1]' ],
},
proxy_server_name = '*.wikipedia.org',
proxy_server_cert_name = 'unified.wikimedia.org',
@@ -146,7 +146,7 @@
proxy_addresses = {
'pmtpa' = [ '208.80.152.202', '[2620:0:860:ed1a::2]' ],
'eqiad' = [ '208.80.154.226', '[2620:0:861:ed1a::2]' ],
-'esams' = [ '91.198.174.226', '[2620:0:862:ed1a::2]' ],
+'esams' = [],
},
proxy_server_name = '*.wiktionary.org',
proxy_server_cert_name = 'unified.wikimedia.org',
@@ -162,7 +162,7 @@
proxy_addresses = {
'pmtpa' = [ '208.80.152.203', '[2620:0:860:ed1a::3]' ],
'eqiad' = [ '208.80.154.227', '[2620:0:861:ed1a::3]' ],
-'esams' = [ '91.198.174.227', '[2620:0:862:ed1a::3]' ],
+'esams' = [],
},
proxy_server_name = '*.wikiquote.org',
proxy_server_cert_name = 'unified.wikimedia.org',
@@ -178,7 +178,7 @@
proxy_addresses = {
'pmtpa' = [ '208.80.152.204', '[2620:0:860:ed1a::4]' ],
'eqiad' = [ '208.80.154.228', '[2620:0:861:ed1a::4]' ],
-'esams' = [ '91.198.174.228', '[2620:0:862:ed1a::4]' ],
+'esams' = [],
},
proxy_server_name = '*.wikibooks.org',
proxy_server_cert_name = 'unified.wikimedia.org',
@@ -194,7 +194,7 @@
proxy_addresses = {
'pmtpa' = [ '208.80.152.205', '[2620:0:860:ed1a::5]' ],
'eqiad' = [ '208.80.154.229', '[2620:0:861:ed1a::5]' ],
-'esams' = [ '91.198.174.229', '[2620:0:862:ed1a::5]' ],
+'esams' = [],
},
proxy_server_name = '*.wikisource.org',
proxy_server_cert_name = 'unified.wikimedia.org',
@@ -210,7 +210,7 @@
proxy_addresses = {
'pmtpa' = [ '208.80.152.206', '[2620:0:860:ed1a::6]' ],
'eqiad' = [ '208.80.154.230', '[2620:0:861:ed1a::6]' ],
-'esams' = [ '91.198.174.230', '[2620:0:862:ed1a::6]' ],
+'esams' = [],
},
proxy_server_name = '*.wikinews.org',
proxy_server_cert_name = 'unified.wikimedia.org',
@@ -226,7 +226,7 @@
proxy_addresses = {
'pmtpa' = [ '208.80.152.207', '[2620:0:860:ed1a::7]' ],
'eqiad' = [ '208.80.154.231', '[2620:0:861:ed1a::7]' ],
-'esams' = [ '91.198.174.231', '[2620:0:862:ed1a::7]' ],
+'esams' = [],
},
proxy_server_name = '*.wikiversity.org',
proxy_server_cert_name = 'unified.wikimedia.org',
@@ -242,7 +242,7 @@
proxy_addresses = {
'pmtpa' = [ '208.80.152.208', '[2620:0:860:ed1a::8]' ],
'eqiad' = [ '208.80.154.232', '[2620:0:861:ed1a::8]' ],
-'esams' = [ '91.198.174.232', '[2620:0:862:ed1a::8]' ],
+'esams' = [],
},
proxy_server_name = '*.mediawiki.org',
proxy_server_cert_name = 'unified.wikimedia.org',
@@ -258,7
[MediaWiki-commits] [Gerrit] Remove old esams service IPs from protoproxies - change (operations/puppet)
Mark Bergsma has submitted this change and it was merged.
Change subject: Remove old esams service IPs from protoproxies
..
Remove old esams service IPs from protoproxies
Change-Id: Ia9de9f6e917d7d25f8269c085c089ee1276ee1ca
---
M manifests/role/protoproxy.pp
1 file changed, 13 insertions(+), 13 deletions(-)
Approvals:
Mark Bergsma: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/role/protoproxy.pp b/manifests/role/protoproxy.pp
index 95dd257..fe420cf 100644
--- a/manifests/role/protoproxy.pp
+++ b/manifests/role/protoproxy.pp
@@ -81,7 +81,7 @@
proxy_addresses = {
'pmtpa' = [ '208.80.152.200', '[2620:0:860:ed1a::]' ],
'eqiad' = [ '208.80.154.224', '[2620:0:861:ed1a::]' ],
-'esams' = [ '91.198.174.192', '91.198.174.201', '91.198.174.224',
'[2620:0:862:ed1a::]', '[2620:0:862:ed1a::1:9]' ],
+'esams' = [ '91.198.174.192', '91.198.174.201',
'[2620:0:862:ed1a::1:9]' ],
},
proxy_server_name = '*.wikimedia.org',
proxy_server_cert_name = 'unified.wikimedia.org',
@@ -114,7 +114,7 @@
proxy_addresses = {
'pmtpa' = [ '208.80.152.211', '[2620:0:860:ed1a::b]' ],
'eqiad' = [ '208.80.154.240', '208.80.154.235',
'[2620:0:861:ed1a::2:b]', '[2620:0:861:ed1a::b]' ],
-'esams' = [ '91.198.174.208', '91.198.174.234',
'[2620:0:862:ed1a::2:b]', '[2620:0:862:ed1a::b]' ],
+'esams' = [ '91.198.174.208', '[2620:0:862:ed1a::2:b]' ],
},
proxy_server_name = 'upload.wikimedia.org',
proxy_server_cert_name = 'unified.wikimedia.org',
@@ -130,7 +130,7 @@
proxy_addresses = {
'pmtpa' = [ '208.80.152.201', '[2620:0:860:ed1a::1]' ],
'eqiad' = [ '208.80.154.225', '[2620:0:861:ed1a::1]' ],
-'esams' = [ '91.198.174.225', '[2620:0:862:ed1a::1]' ],
+'esams' = [ '[2620:0:862:ed1a::1]' ],
},
proxy_server_name = '*.wikipedia.org',
proxy_server_cert_name = 'unified.wikimedia.org',
@@ -146,7 +146,7 @@
proxy_addresses = {
'pmtpa' = [ '208.80.152.202', '[2620:0:860:ed1a::2]' ],
'eqiad' = [ '208.80.154.226', '[2620:0:861:ed1a::2]' ],
-'esams' = [ '91.198.174.226', '[2620:0:862:ed1a::2]' ],
+'esams' = [],
},
proxy_server_name = '*.wiktionary.org',
proxy_server_cert_name = 'unified.wikimedia.org',
@@ -162,7 +162,7 @@
proxy_addresses = {
'pmtpa' = [ '208.80.152.203', '[2620:0:860:ed1a::3]' ],
'eqiad' = [ '208.80.154.227', '[2620:0:861:ed1a::3]' ],
-'esams' = [ '91.198.174.227', '[2620:0:862:ed1a::3]' ],
+'esams' = [],
},
proxy_server_name = '*.wikiquote.org',
proxy_server_cert_name = 'unified.wikimedia.org',
@@ -178,7 +178,7 @@
proxy_addresses = {
'pmtpa' = [ '208.80.152.204', '[2620:0:860:ed1a::4]' ],
'eqiad' = [ '208.80.154.228', '[2620:0:861:ed1a::4]' ],
-'esams' = [ '91.198.174.228', '[2620:0:862:ed1a::4]' ],
+'esams' = [],
},
proxy_server_name = '*.wikibooks.org',
proxy_server_cert_name = 'unified.wikimedia.org',
@@ -194,7 +194,7 @@
proxy_addresses = {
'pmtpa' = [ '208.80.152.205', '[2620:0:860:ed1a::5]' ],
'eqiad' = [ '208.80.154.229', '[2620:0:861:ed1a::5]' ],
-'esams' = [ '91.198.174.229', '[2620:0:862:ed1a::5]' ],
+'esams' = [],
},
proxy_server_name = '*.wikisource.org',
proxy_server_cert_name = 'unified.wikimedia.org',
@@ -210,7 +210,7 @@
proxy_addresses = {
'pmtpa' = [ '208.80.152.206', '[2620:0:860:ed1a::6]' ],
'eqiad' = [ '208.80.154.230', '[2620:0:861:ed1a::6]' ],
-'esams' = [ '91.198.174.230', '[2620:0:862:ed1a::6]' ],
+'esams' = [],
},
proxy_server_name = '*.wikinews.org',
proxy_server_cert_name = 'unified.wikimedia.org',
@@ -226,7 +226,7 @@
proxy_addresses = {
'pmtpa' = [ '208.80.152.207', '[2620:0:860:ed1a::7]' ],
'eqiad' = [ '208.80.154.231', '[2620:0:861:ed1a::7]' ],
-'esams' = [ '91.198.174.231', '[2620:0:862:ed1a::7]' ],
+'esams' = [],
},
proxy_server_name = '*.wikiversity.org',
proxy_server_cert_name = 'unified.wikimedia.org',
@@ -242,7 +242,7 @@
proxy_addresses = {
'pmtpa' = [ '208.80.152.208', '[2620:0:860:ed1a::8]' ],
'eqiad' = [ '208.80.154.232', '[2620:0:861:ed1a::8]' ],
-'esams' = [ '91.198.174.232', '[2620:0:862:ed1a::8]' ],
+'esams' = [],
},
proxy_server_name = '*.mediawiki.org',
proxy_server_cert_name = 'unified.wikimedia.org',
@@ -258,7 +258,7 @@
proxy_addresses = {
[MediaWiki-commits] [Gerrit] Remove esams ipv6 LVS service IPs - change (operations/puppet)
Mark Bergsma has submitted this change and it was merged.
Change subject: Remove esams ipv6 LVS service IPs
..
Remove esams ipv6 LVS service IPs
Change-Id: Ifc048f5b939506844785f87832d2899519fe4bcc
---
M manifests/lvs.pp
1 file changed, 1 insertion(+), 14 deletions(-)
Approvals:
Mark Bergsma: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/lvs.pp b/manifests/lvs.pp
index 0b7a55d..13e7cd3 100644
--- a/manifests/lvs.pp
+++ b/manifests/lvs.pp
@@ -275,20 +275,7 @@
'wikidatalb6' = 2620:0:861:ed1a::12,
'wikivoyagelb6' = 2620:0:861:ed1a::13
},
- 'esams' = {
- 'wikimedialb6' = 2620:0:862:ed1a::0,
- #'wikipedialb6' = 2620:0:862:ed1a::1,
- 'wiktionarylb6' = 2620:0:862:ed1a::2,
- 'wikiquotelb6' = 2620:0:862:ed1a::3,
- 'wikibookslb6' = 2620:0:862:ed1a::4,
- 'wikisourcelb6' = 2620:0:862:ed1a::5,
- 'wikinewslb6' = 2620:0:862:ed1a::6,
- 'wikiversitylb6' =
2620:0:862:ed1a::7,
- 'mediawikilb6' = 2620:0:862:ed1a::8,
- 'foundationlb6' = 2620:0:862:ed1a::9,
- 'wikidatalb6' = 2620:0:862:ed1a::12,
- 'wikivoyagelb6' = 2620:0:862:ed1a::13
- },
+ 'esams' = {},
'ulsfo' = {},
},
'bits' = {
--
To view, visit https://gerrit.wikimedia.org/r/102117
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ifc048f5b939506844785f87832d2899519fe4bcc
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Mark Bergsma m...@wikimedia.org
Gerrit-Reviewer: Mark Bergsma m...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove esams videos.wikimedia.org - change (operations/puppet)
Mark Bergsma has uploaded a new change for review.
https://gerrit.wikimedia.org/r/102120
Change subject: Remove esams videos.wikimedia.org
..
Remove esams videos.wikimedia.org
...whatever that is, it's broken.
Change-Id: Id825fc59fab6e560763a96e0eb1c808fdc82625b
---
M manifests/role/protoproxy.pp
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/20/102120/1
diff --git a/manifests/role/protoproxy.pp b/manifests/role/protoproxy.pp
index fe420cf..12997cb 100644
--- a/manifests/role/protoproxy.pp
+++ b/manifests/role/protoproxy.pp
@@ -325,7 +325,7 @@
proxy_addresses = {
'pmtpa' = [ '208.80.152.200', '[2620:0:860:2::80:2]' ],
'eqiad' = [ '208.80.154.224', '[2620:0:862:3::80:2]' ],
-'esams' = [ '91.198.174.224', '[2620:0:862:1::80:2]' ] },
+'esams' = [] },
proxy_server_name = 'videos.wikimedia.org',
proxy_server_cert_name = 'unified.wikimedia.org',
proxy_backend = {
--
To view, visit https://gerrit.wikimedia.org/r/102120
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Id825fc59fab6e560763a96e0eb1c808fdc82625b
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Mark Bergsma m...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove esams videos.wikimedia.org - change (operations/puppet)
Mark Bergsma has submitted this change and it was merged.
Change subject: Remove esams videos.wikimedia.org
..
Remove esams videos.wikimedia.org
...whatever that is, it's broken.
Change-Id: Id825fc59fab6e560763a96e0eb1c808fdc82625b
---
M manifests/role/protoproxy.pp
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Mark Bergsma: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/role/protoproxy.pp b/manifests/role/protoproxy.pp
index fe420cf..12997cb 100644
--- a/manifests/role/protoproxy.pp
+++ b/manifests/role/protoproxy.pp
@@ -325,7 +325,7 @@
proxy_addresses = {
'pmtpa' = [ '208.80.152.200', '[2620:0:860:2::80:2]' ],
'eqiad' = [ '208.80.154.224', '[2620:0:862:3::80:2]' ],
-'esams' = [ '91.198.174.224', '[2620:0:862:1::80:2]' ] },
+'esams' = [] },
proxy_server_name = 'videos.wikimedia.org',
proxy_server_cert_name = 'unified.wikimedia.org',
proxy_backend = {
--
To view, visit https://gerrit.wikimedia.org/r/102120
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Id825fc59fab6e560763a96e0eb1c808fdc82625b
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Mark Bergsma m...@wikimedia.org
Gerrit-Reviewer: Mark Bergsma m...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add raw HTML output functionality - change (mediawiki/core)
Theopolisme has uploaded a new change for review.
https://gerrit.wikimedia.org/r/102121
Change subject: Add raw HTML output functionality
..
Add raw HTML output functionality
A new checkbox labeled Show raw HTML at
Special:ExpandTemplates will display the
raw HTML output in a textarea when checked.
Bug: 56694
Change-Id: If7895d2f9a257d8dd753a58cdb26da8a66aceb29
---
M includes/specials/SpecialExpandTemplates.php
M languages/messages/MessagesEn.php
M languages/messages/MessagesQqq.php
3 files changed, 50 insertions(+), 18 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/21/102121/1
diff --git a/includes/specials/SpecialExpandTemplates.php
b/includes/specials/SpecialExpandTemplates.php
index a78133c..24476fe 100644
--- a/includes/specials/SpecialExpandTemplates.php
+++ b/includes/specials/SpecialExpandTemplates.php
@@ -32,6 +32,9 @@
/** @var boolean whether or not to show the XML parse tree */
protected $generateXML;
+ /** @var boolean whether or not to show the raw HTML code */
+ protected $generateRawHtml;
+
/** @var boolean whether or not to remove comments in the expanded
wikitext */
protected $removeComments;
@@ -62,6 +65,7 @@
}
$input = $request-getText( 'wpInput' );
$this-generateXML = $request-getBool( 'wpGenerateXml' );
+ $this-generateRawHtml = $request-getBool( 'wpGenerateRawHtml'
);
if ( strlen( $input ) ) {
$this-removeComments = $request-getBool(
'wpRemoveComments', false );
@@ -113,7 +117,15 @@
}
$out-addHTML( $tmp );
- $this-showHtmlPreview( $title, $output, $out );
+
+ $rawhtml = $this-generateHtml( $title, $output );
+
+ if ( $this-generateRawHtml strlen( $rawhtml ) 0 )
{
+ $out-addHTML( $this-makeOutput( $rawhtml,
'expand_templates_html_output' ) );
+ }
+
+ $this-showHtmlPreview( $title, $rawhtml, $out );
+
}
}
@@ -171,6 +183,12 @@
'generate_xml',
$this-generateXML
) . '/p';
+ $form .= 'p' . Xml::checkLabel(
+ $this-msg( 'expand_templates_generate_rawhtml'
)-text(),
+ 'wpGenerateRawHtml',
+ 'generate_rawhtml',
+ $this-generateRawHtml
+ ) . '/p';
$form .= 'p' . Xml::submitButton(
$this-msg( 'expand_templates_ok' )-text(),
array( 'accesskey' = 's' )
@@ -202,28 +220,38 @@
}
/**
-* Render the supplied wiki text and append to the page as a preview
+* Renders the supplied wikitext as html
*
* @param Title $title
* @param string $text
-* @param OutputPage $out
+* @return string
*/
- private function showHtmlPreview( Title $title, $text, OutputPage $out
) {
+ private function generateHtml( Title $title, $text ) {
global $wgParser;
$popts = ParserOptions::newFromContext( $this-getContext() );
$popts-setTargetLanguage( $title-getPageLanguage() );
$pout = $wgParser-parse( $text, $title, $popts );
- $lang = $title-getPageViewLanguage();
+ return $pout-getText();
+ }
+
+ /**
+* Wraps the provided html code in a div and outputs it to the page
+*
+* @param Title $title
+* @param string $html
+* @param OutputPage $out
+*/
+ private function showHtmlPreview( Title $title, $html, OutputPage $out
) {
+ $lang = $title-getPageViewLanguage();
$out-addHTML( h2 . $this-msg( 'expand_templates_preview'
)-escaped() . /h2\n );
$out-addHTML( Html::openElement( 'div', array(
'class' = 'mw-content-' . $lang-getDir(),
'dir' = $lang-getDir(),
'lang' = $lang-getHtmlCode(),
) ) );
-
- $out-addHTML( $pout-getText() );
+ $out-addHTML( $html );
$out-addHTML( Html::closeElement( 'div' ) );
}
}
diff --git a/languages/messages/MessagesEn.php
b/languages/messages/MessagesEn.php
index 0fe59e0..f1094b7 100644
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@ -5110,19 +5110,21 @@
'limitreport-expensivefunctioncount-value' = '$1/$2', # only translate this
message to other languages if you have to change it
# ExpandTemplates
-'expandtemplates' = 'Expand templates',
-'expand_templates_intro' = 'This special
[MediaWiki-commits] [Gerrit] Use eqiad ($mw_primary) as secondary upstream instead of pmtpa - change (operations/puppet)
Mark Bergsma has uploaded a new change for review.
https://gerrit.wikimedia.org/r/102122
Change subject: Use eqiad ($mw_primary) as secondary upstream instead of pmtpa
..
Use eqiad ($mw_primary) as secondary upstream instead of pmtpa
Reference service IPs from lvs.pp instead of hardcoding as well.
Change-Id: Ic0fe461b66e3205f98ebced80200e5c4075cfa0c
---
M manifests/role/protoproxy.pp
1 file changed, 16 insertions(+), 16 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/22/102122/1
diff --git a/manifests/role/protoproxy.pp b/manifests/role/protoproxy.pp
index 12997cb..be6c460 100644
--- a/manifests/role/protoproxy.pp
+++ b/manifests/role/protoproxy.pp
@@ -88,7 +88,7 @@
proxy_backend = {
'pmtpa' = { 'primary' = '10.2.1.25' },
'eqiad' = { 'primary' = '10.2.2.25' },
-'esams' = { 'primary' = '10.2.3.25', 'secondary' =
'208.80.152.200' },
+'esams' = { 'primary' = '10.2.3.25', 'secondary' =
$lvs::configuration::$lvs_service_ips[$::realm]['text-varnish'][$::mw_primary]['textlb']
},
},
ipv6_enabled = true,
enabled = true,
@@ -105,7 +105,7 @@
proxy_backend = {
'pmtpa' = { 'primary' = '10.2.1.23' },
'eqiad' = { 'primary' = '10.2.2.23' },
-'esams' = { 'primary' = '10.2.3.23', 'secondary' =
'208.80.152.210' },
+'esams' = { 'primary' = '10.2.3.23', 'secondary' =
$lvs::configuration::$lvs_service_ips[$::realm]['bits'][$::mw_primary]['bitslb']
},
},
ipv6_enabled = true,
enabled = true,
@@ -121,7 +121,7 @@
proxy_backend = {
'pmtpa' = { 'primary' = '10.2.1.24' },
'eqiad' = { 'primary' = '10.2.2.24' },
-'esams' = { 'primary' = '10.2.3.24', 'secondary' =
'208.80.152.211' },
+'esams' = { 'primary' = '10.2.3.24', 'secondary' =
$lvs::configuration::$lvs_service_ips[$::realm]['upload'][$::mw_primary]['uploadlb']
},
},
ipv6_enabled = true,
enabled = true,
@@ -137,7 +137,7 @@
proxy_backend = {
'pmtpa' = { 'primary' = '10.2.1.25' },
'eqiad' = { 'primary' = '10.2.2.25' },
-'esams' = { 'primary' = '10.2.3.25', 'secondary' =
'208.80.152.201' },
+'esams' = { 'primary' = '10.2.3.25', 'secondary' =
$lvs::configuration::$lvs_service_ips[$::realm]['text-varnish'][$::mw_primary]['textlb']
},
},
ipv6_enabled = true,
enabled = true,
@@ -153,7 +153,7 @@
proxy_backend = {
'pmtpa' = { 'primary' = '10.2.1.25' },
'eqiad' = { 'primary' = '10.2.2.25' },
-'esams' = { 'primary' = '10.2.3.25', 'secondary' =
'208.80.152.202' },
+'esams' = { 'primary' = '10.2.3.25', 'secondary' =
$lvs::configuration::$lvs_service_ips[$::realm]['text-varnish'][$::mw_primary]['textlb']
},
},
ipv6_enabled = true,
enabled = true,
@@ -169,7 +169,7 @@
proxy_backend = {
'pmtpa' = { 'primary' = '10.2.1.25' },
'eqiad' = { 'primary' = '10.2.2.25' },
-'esams' = { 'primary' = '10.2.3.25', 'secondary' =
'208.80.152.203' },
+'esams' = { 'primary' = '10.2.3.25', 'secondary' =
$lvs::configuration::$lvs_service_ips[$::realm]['text-varnish'][$::mw_primary]['textlb']
},
},
ipv6_enabled = true,
enabled = true,
@@ -185,7 +185,7 @@
proxy_backend = {
'pmtpa' = { 'primary' = '10.2.1.25' },
'eqiad' = { 'primary' = '10.2.2.25' },
-'esams' = { 'primary' = '10.2.3.25', 'secondary' =
'208.80.152.204' },
+'esams' = { 'primary' = '10.2.3.25', 'secondary' =
$lvs::configuration::$lvs_service_ips[$::realm]['text-varnish'][$::mw_primary]['textlb']
},
},
ipv6_enabled = true,
enabled = true,
@@ -201,7 +201,7 @@
proxy_backend = {
'pmtpa' = { 'primary' = '10.2.1.25' },
'eqiad' = { 'primary' = '10.2.2.25' },
-'esams' = { 'primary' = '10.2.3.25', 'secondary' =
'208.80.152.205' },
+'esams' = { 'primary' = '10.2.3.25', 'secondary' =
$lvs::configuration::$lvs_service_ips[$::realm]['text-varnish'][$::mw_primary]['textlb']
},
},
ipv6_enabled = true,
enabled = true,
@@ -217,7 +217,7 @@
proxy_backend = {
'pmtpa' = { 'primary' = '10.2.1.25' },
'eqiad' = { 'primary' = '10.2.2.25' },
-'esams' = { 'primary' = '10.2.3.25', 'secondary' =
'208.80.152.206' },
+'esams' = { 'primary' = '10.2.3.25', 'secondary' =
$lvs::configuration::$lvs_service_ips[$::realm]['text-varnish'][$::mw_primary]['textlb']
},
},
ipv6_enabled = true,
enabled = true,
@@ -233,7 +233,7 @@
proxy_backend = {
'pmtpa' = {
[MediaWiki-commits] [Gerrit] Use eqiad ($mw_primary) as secondary upstream instead of pmtpa - change (operations/puppet)
Mark Bergsma has submitted this change and it was merged.
Change subject: Use eqiad ($mw_primary) as secondary upstream instead of pmtpa
..
Use eqiad ($mw_primary) as secondary upstream instead of pmtpa
Change-Id: Ic0fe461b66e3205f98ebced80200e5c4075cfa0c
---
M manifests/role/protoproxy.pp
1 file changed, 15 insertions(+), 15 deletions(-)
Approvals:
Mark Bergsma: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/role/protoproxy.pp b/manifests/role/protoproxy.pp
index 12997cb..1d5abd0 100644
--- a/manifests/role/protoproxy.pp
+++ b/manifests/role/protoproxy.pp
@@ -88,7 +88,7 @@
proxy_backend = {
'pmtpa' = { 'primary' = '10.2.1.25' },
'eqiad' = { 'primary' = '10.2.2.25' },
-'esams' = { 'primary' = '10.2.3.25', 'secondary' =
'208.80.152.200' },
+'esams' = { 'primary' = '10.2.3.25', 'secondary' =
'208.80.154.224' },
},
ipv6_enabled = true,
enabled = true,
@@ -105,7 +105,7 @@
proxy_backend = {
'pmtpa' = { 'primary' = '10.2.1.23' },
'eqiad' = { 'primary' = '10.2.2.23' },
-'esams' = { 'primary' = '10.2.3.23', 'secondary' =
'208.80.152.210' },
+'esams' = { 'primary' = '10.2.3.23', 'secondary' =
'208.80.154.234' },
},
ipv6_enabled = true,
enabled = true,
@@ -121,7 +121,7 @@
proxy_backend = {
'pmtpa' = { 'primary' = '10.2.1.24' },
'eqiad' = { 'primary' = '10.2.2.24' },
-'esams' = { 'primary' = '10.2.3.24', 'secondary' =
'208.80.152.211' },
+'esams' = { 'primary' = '10.2.3.24', 'secondary' =
'208.80.154.240' },
},
ipv6_enabled = true,
enabled = true,
@@ -137,7 +137,7 @@
proxy_backend = {
'pmtpa' = { 'primary' = '10.2.1.25' },
'eqiad' = { 'primary' = '10.2.2.25' },
-'esams' = { 'primary' = '10.2.3.25', 'secondary' =
'208.80.152.201' },
+'esams' = { 'primary' = '10.2.3.25', 'secondary' =
'208.80.154.224' },
},
ipv6_enabled = true,
enabled = true,
@@ -153,7 +153,7 @@
proxy_backend = {
'pmtpa' = { 'primary' = '10.2.1.25' },
'eqiad' = { 'primary' = '10.2.2.25' },
-'esams' = { 'primary' = '10.2.3.25', 'secondary' =
'208.80.152.202' },
+'esams' = { 'primary' = '10.2.3.25', 'secondary' =
'208.80.154.224' },
},
ipv6_enabled = true,
enabled = true,
@@ -169,7 +169,7 @@
proxy_backend = {
'pmtpa' = { 'primary' = '10.2.1.25' },
'eqiad' = { 'primary' = '10.2.2.25' },
-'esams' = { 'primary' = '10.2.3.25', 'secondary' =
'208.80.152.203' },
+'esams' = { 'primary' = '10.2.3.25', 'secondary' =
'208.80.154.224' },
},
ipv6_enabled = true,
enabled = true,
@@ -185,7 +185,7 @@
proxy_backend = {
'pmtpa' = { 'primary' = '10.2.1.25' },
'eqiad' = { 'primary' = '10.2.2.25' },
-'esams' = { 'primary' = '10.2.3.25', 'secondary' =
'208.80.152.204' },
+'esams' = { 'primary' = '10.2.3.25', 'secondary' =
'208.80.154.224' },
},
ipv6_enabled = true,
enabled = true,
@@ -201,7 +201,7 @@
proxy_backend = {
'pmtpa' = { 'primary' = '10.2.1.25' },
'eqiad' = { 'primary' = '10.2.2.25' },
-'esams' = { 'primary' = '10.2.3.25', 'secondary' =
'208.80.152.205' },
+'esams' = { 'primary' = '10.2.3.25', 'secondary' =
'208.80.154.224' },
},
ipv6_enabled = true,
enabled = true,
@@ -217,7 +217,7 @@
proxy_backend = {
'pmtpa' = { 'primary' = '10.2.1.25' },
'eqiad' = { 'primary' = '10.2.2.25' },
-'esams' = { 'primary' = '10.2.3.25', 'secondary' =
'208.80.152.206' },
+'esams' = { 'primary' = '10.2.3.25', 'secondary' =
'208.80.154.224' },
},
ipv6_enabled = true,
enabled = true,
@@ -233,7 +233,7 @@
proxy_backend = {
'pmtpa' = { 'primary' = '10.2.1.25' },
'eqiad' = { 'primary' = '10.2.2.25' },
-'esams' = { 'primary' = '10.2.3.25', 'secondary' =
'208.80.152.207' },
+'esams' = { 'primary' = '10.2.3.25', 'secondary' =
'208.80.154.224' },
},
ipv6_enabled = true,
enabled = true,
@@ -249,7 +249,7 @@
proxy_backend = {
'pmtpa' = { 'primary' = '10.2.1.25' },
'eqiad' = { 'primary' = '10.2.2.25' },
-'esams' = { 'primary' = '10.2.3.25', 'secondary' =
'208.80.152.208' },
+'esams' = { 'primary' = '10.2.3.25', 'secondary' =
'208.80.154.224' },
},
ipv6_enabled = true,
enabled = true,
@@ -265,7 +265,7 @@
proxy_backend = {
[MediaWiki-commits] [Gerrit] Changed aliasesTitle to aliases_title - change (mediawiki...Wikibase)
Aaron1011 has uploaded a new change for review. https://gerrit.wikimedia.org/r/102123 Change subject: Changed aliasesTitle to aliases_title .. Changed aliasesTitle to aliases_title Change-Id: Ie88fb6adf55245578d0013c3ed90c851a63612c9 --- M tests/browser/features/support/modules/alias_module.rb 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase refs/changes/23/102123/1 diff --git a/tests/browser/features/support/modules/alias_module.rb b/tests/browser/features/support/modules/alias_module.rb index 5a715dc..7e5ce58 100644 --- a/tests/browser/features/support/modules/alias_module.rb +++ b/tests/browser/features/support/modules/alias_module.rb @@ -10,7 +10,7 @@ include PageObject # aliases UI elements div(:aliases_div, class: wb-aliases) - span(:aliasesTitle, class: wb-aliases-label) + span(:aliases_title, class: wb-aliases-label) ul(:aliases_list, class: wb-aliases-container) a(:add_aliases, css: div.wb-aliases a.wb-ui-propertyedittool-toolbarbutton-addbutton:not(.wikibase-toolbarbutton-disabled)) a(:edit_aliases, css: div.wb-aliases a.wikibase-toolbareditgroup-editbutton:not(.wikibase-toolbarbutton-disabled)) -- To view, visit https://gerrit.wikimedia.org/r/102123 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie88fb6adf55245578d0013c3ed90c851a63612c9 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Wikibase Gerrit-Branch: master Gerrit-Owner: Aaron1011 aa1ron...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Rename add_aliases method to populate_aliases - change (mediawiki...Wikibase)
Aaron1011 has uploaded a new change for review.
https://gerrit.wikimedia.org/r/102124
Change subject: Rename add_aliases method to populate_aliases
..
Rename add_aliases method to populate_aliases
This avoids a conflict with the add_aliases element.
Change-Id: I51c616dd021cbe9612e91b47207369408dfc92df
---
M tests/browser/features/step_definitions/aliases_steps.rb
M tests/browser/features/support/modules/alias_module.rb
2 files changed, 2 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/24/102124/1
diff --git a/tests/browser/features/step_definitions/aliases_steps.rb
b/tests/browser/features/step_definitions/aliases_steps.rb
index e25b222..2a3518e 100644
--- a/tests/browser/features/step_definitions/aliases_steps.rb
+++ b/tests/browser/features/step_definitions/aliases_steps.rb
@@ -41,7 +41,7 @@
end
When /^I enter (.+) as new aliases$/ do |values|
- on(ItemPage).add_aliases(eval([#{values}]))
+ on(ItemPage).populate_aliases(eval([#{values}]))
end
When /^I change the first alias to (.+)$/ do |value|
diff --git a/tests/browser/features/support/modules/alias_module.rb
b/tests/browser/features/support/modules/alias_module.rb
index 7e5ce58..00da241 100644
--- a/tests/browser/features/support/modules/alias_module.rb
+++ b/tests/browser/features/support/modules/alias_module.rb
@@ -44,7 +44,7 @@
count
end
- def add_aliases(aliases)
+ def populate_aliases(aliases)
aliases.each do |ali|
self.aliases_input_empty= ali
end
--
To view, visit https://gerrit.wikimedia.org/r/102124
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I51c616dd021cbe9612e91b47207369408dfc92df
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Aaron1011 aa1ron...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Move all existing Squids to the decommission lists - change (operations/puppet)
Mark Bergsma has submitted this change and it was merged.
Change subject: Move all existing Squids to the decommission lists
..
Move all existing Squids to the decommission lists
Change-Id: I7703544e902ea3e8c52499d6c1d4183aad8af18b
---
M manifests/role/cache.pp
1 file changed, 84 insertions(+), 93 deletions(-)
Approvals:
Mark Bergsma: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/role/cache.pp b/manifests/role/cache.pp
index 47a46a5..86c1a1d 100644
--- a/manifests/role/cache.pp
+++ b/manifests/role/cache.pp
@@ -32,48 +32,9 @@
$active_nodes = {
'production' = {
text = {
- pmtpa-squid = [
- 'sq37.wikimedia.org',
- 'sq59.wikimedia.org',
- 'sq60.wikimedia.org',
- 'sq61.wikimedia.org',
- 'sq62.wikimedia.org',
- 'sq63.wikimedia.org',
- 'sq64.wikimedia.org',
- 'sq65.wikimedia.org',
- 'sq66.wikimedia.org',
- 'sq71.wikimedia.org',
- 'sq72.wikimedia.org',
- 'sq73.wikimedia.org',
- 'sq74.wikimedia.org',
- 'sq75.wikimedia.org',
- 'sq76.wikimedia.org',
- 'sq77.wikimedia.org',
- 'sq78.wikimedia.org',
- ],
+ pmtpa-squid = [],
pmtpa = [],
- eqiad-squid = [
- 'cp1001.eqiad.wmnet', # API
- 'cp1002.eqiad.wmnet', # API
- 'cp1003.eqiad.wmnet', # API
- 'cp1004.eqiad.wmnet', # API
- 'cp1005.eqiad.wmnet', # API
- 'cp1006.eqiad.wmnet',
- 'cp1007.eqiad.wmnet',
- 'cp1008.eqiad.wmnet',
- 'cp1009.eqiad.wmnet',
- 'cp1010.eqiad.wmnet',
- 'cp1011.eqiad.wmnet',
- 'cp1012.eqiad.wmnet',
- 'cp1013.eqiad.wmnet',
- 'cp1014.eqiad.wmnet',
- 'cp1015.eqiad.wmnet',
- 'cp1016.eqiad.wmnet',
- 'cp1017.eqiad.wmnet',
- 'cp1018.eqiad.wmnet',
- 'cp1019.eqiad.wmnet',
- 'cp1020.eqiad.wmnet',
- ],
+ eqiad-squid = [],
eqiad = [
'cp1052.eqiad.wmnet',
'cp1053.eqiad.wmnet',
@@ -84,24 +45,7 @@
'cp1067.eqiad.wmnet',
'cp1068.eqiad.wmnet',
],
- esams-squid = [
- amssq31.esams.wikimedia.org,
- amssq32.esams.wikimedia.org,
- amssq33.esams.wikimedia.org,
- amssq34.esams.wikimedia.org,
- amssq35.esams.wikimedia.org,
- amssq36.esams.wikimedia.org,
- amssq37.esams.wikimedia.org,
- amssq38.esams.wikimedia.org,
- amssq39.esams.wikimedia.org,
- amssq40.esams.wikimedia.org,
-
[MediaWiki-commits] [Gerrit] Remove role::cache::squid - change (operations/puppet)
Mark Bergsma has submitted this change and it was merged.
Change subject: Remove role::cache::squid
..
Remove role::cache::squid
Change-Id: Ifa77e4dfd085bedacc7b9706ccb7cafcfb68d37b
---
M manifests/role/cache.pp
1 file changed, 3 insertions(+), 55 deletions(-)
Approvals:
Mark Bergsma: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/role/cache.pp b/manifests/role/cache.pp
index 86c1a1d..03054fa 100644
--- a/manifests/role/cache.pp
+++ b/manifests/role/cache.pp
@@ -1,5 +1,5 @@
# role/cache.pp
-# cache::squid and cache::varnish role classes
+# cache::varnish role classes
# Virtual resources for the monitoring server
@monitor_group { cache_text_pmtpa: description = text squids pmtpa }
@@ -400,45 +400,6 @@
}
}
- class squid {
- class common($role) {
- system::role { role::cache::${role}: description =
${role} Squid cache server}
-
- $cluster = squids_${role}
- $nagios_group = cache_${role}_${::site}
-
- include lvs::configuration
-
- include standard,
- ::squid
-
- if !defined(Class['lvs::realserver']) {
- class { lvs::realserver: realserver_ips =
$lvs::configuration::lvs_service_ips[$::realm][$role][$::site] }
- }
-
- # Monitoring
- monitor_service {
- frontend http:
- description = Frontend Squid HTTP,
- check_command = $role ? {
- text = 'check_http',
- upload = 'check_http_upload',
- };
- backend http:
- description = Backend Squid HTTP,
- check_command = $role ? {
- text =
'check_http_on_port!3128',
- upload =
'check_http_upload_on_port!3128',
- };
- }
-
- # HTCP packet loss monitoring on the ganglia aggregators
- if $ganglia_aggregator and $::site != esams {
- include misc::monitoring::htcp-loss
- }
- }
- }
-
class varnish::logging {
if $::realm == 'production' {
$cliargs = '-m RxRequest:^(?!PURGE$) -D'
@@ -877,25 +838,12 @@
$lvs::configuration::lvs_service_ips[$::realm]['text-varnish'][$::site]])
}
- if ($::hostname =~ /^sq[0-9][0-9]$/ or $::hostname =~
/^cp10([01][0-9]|20)$/ or $::hostname =~ /^amssq(3[1-9]|4[0-6])$/) {
- class { role::cache::squid::common: role = text }
- }
- else {
- # Varnish
- include role::cache::varnish::text
- }
+ include role::cache::varnish::text
}
class upload {
# FIXME: remove this hack
- if $::realm == labs or $::site != pmtpa {
- # Varnish
- include role::cache::varnish::upload
- }
- else {
- # Squid
- class { role::cache::squid::common: role = upload }
- }
+ include role::cache::varnish::upload
}
class bits inherits role::cache::varnish::1layer {
--
To view, visit https://gerrit.wikimedia.org/r/101860
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ifa77e4dfd085bedacc7b9706ccb7cafcfb68d37b
Gerrit-PatchSet: 5
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Mark Bergsma m...@wikimedia.org
Gerrit-Reviewer: Mark Bergsma m...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] make some more jobs concurrent - change (integration/jenkins-job-builder-config)
Hashar has uploaded a new change for review.
https://gerrit.wikimedia.org/r/102125
Change subject: make some more jobs concurrent
..
make some more jobs concurrent
mediawiki-core-jsduck
mediawiki-core-whitespaces
operations-dns-lint
operations-mw-config-tests
Change-Id: I90e0cbfcd286c884aaa24c57e885f9b8be537111
---
M mediawiki.yaml
M operations-misc.yaml
M operations-mw-config.yaml
3 files changed, 6 insertions(+), 0 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/integration/jenkins-job-builder-config
refs/changes/25/102125/1
diff --git a/mediawiki.yaml b/mediawiki.yaml
index e514bdb..e7120c5 100644
--- a/mediawiki.yaml
+++ b/mediawiki.yaml
@@ -35,6 +35,7 @@
- job-template:
name: '{name}-jsduck'
defaults: use-zuul
+concurrent: true
scm:
- git-mwcore
triggers:
@@ -47,6 +48,7 @@
name: '{name}-jsduck-publish'
node: gallium
defaults: use-zuul
+concurrent: false # avoid race condition
scm:
- git-mwcore
triggers:
@@ -77,6 +79,7 @@
name: '{name}-whitespaces'
node: hasSlaveScripts
defaults: use-remote-zuul
+concurrent: true
scm:
- git-mwcore
triggers:
diff --git a/operations-misc.yaml b/operations-misc.yaml
index bf0924a..7e038d3 100644
--- a/operations-misc.yaml
+++ b/operations-misc.yaml
@@ -17,6 +17,7 @@
name: 'operations-dns-lint'
node: hasContintPackages
defaults: use-remote-zuul
+concurrent: true
triggers:
- zuul
builders:
diff --git a/operations-mw-config.yaml b/operations-mw-config.yaml
index 96e9a50..0d990c3 100644
--- a/operations-mw-config.yaml
+++ b/operations-mw-config.yaml
@@ -5,6 +5,8 @@
#
node: gallium
defaults: use-remote-zuul
+concurrent: true
+
triggers:
- zuul
builders:
--
To view, visit https://gerrit.wikimedia.org/r/102125
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I90e0cbfcd286c884aaa24c57e885f9b8be537111
Gerrit-PatchSet: 1
Gerrit-Project: integration/jenkins-job-builder-config
Gerrit-Branch: master
Gerrit-Owner: Hashar has...@free.fr
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Disable $wgUseTidy: not working and we're not interested in it - change (translatewiki)
jenkins-bot has submitted this change and it was merged. Change subject: Disable $wgUseTidy: not working and we're not interested in it .. Disable $wgUseTidy: not working and we're not interested in it According to bawolff, this misleading HTML comment in all pages usually means the binary is not found: Tidy found serious XHTML errors. Probably due to what explained in [[mw:$wgTidyInternal]]. According to Nikerabbit, we're not interested in tidy. Change-Id: Ib7e433297fde220b1c2605cd3ef90db8f53bf5cb --- M TranslatewikiSettings.php 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Siebrand: Looks good to me, approved jenkins-bot: Verified diff --git a/TranslatewikiSettings.php b/TranslatewikiSettings.php index aa12d17..15f5d93 100644 --- a/TranslatewikiSettings.php +++ b/TranslatewikiSettings.php @@ -27,7 +27,7 @@ $wgRightsText = ; $wgRightsIcon = ; -$wgUseTidy = true; +$wgUseTidy = false; $wgSVGConverter = 'rsvg'; $wgMaxShellMemory = 1024 * 200; -- To view, visit https://gerrit.wikimedia.org/r/101205 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ib7e433297fde220b1c2605cd3ef90db8f53bf5cb Gerrit-PatchSet: 1 Gerrit-Project: translatewiki Gerrit-Branch: master Gerrit-Owner: Nemo bis federicol...@tiscali.it Gerrit-Reviewer: Nikerabbit niklas.laxst...@gmail.com Gerrit-Reviewer: Siebrand siebr...@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] make some more jobs concurrent - change (integration/jenkins-job-builder-config)
jenkins-bot has submitted this change and it was merged.
Change subject: make some more jobs concurrent
..
make some more jobs concurrent
mediawiki-core-jsduck
mediawiki-core-whitespaces
operations-dns-lint
operations-mw-config-tests
Change-Id: I90e0cbfcd286c884aaa24c57e885f9b8be537111
---
M mediawiki.yaml
M operations-misc.yaml
M operations-mw-config.yaml
3 files changed, 6 insertions(+), 0 deletions(-)
Approvals:
Hashar: Looks good to me, approved
jenkins-bot: Verified
diff --git a/mediawiki.yaml b/mediawiki.yaml
index e514bdb..e7120c5 100644
--- a/mediawiki.yaml
+++ b/mediawiki.yaml
@@ -35,6 +35,7 @@
- job-template:
name: '{name}-jsduck'
defaults: use-zuul
+concurrent: true
scm:
- git-mwcore
triggers:
@@ -47,6 +48,7 @@
name: '{name}-jsduck-publish'
node: gallium
defaults: use-zuul
+concurrent: false # avoid race condition
scm:
- git-mwcore
triggers:
@@ -77,6 +79,7 @@
name: '{name}-whitespaces'
node: hasSlaveScripts
defaults: use-remote-zuul
+concurrent: true
scm:
- git-mwcore
triggers:
diff --git a/operations-misc.yaml b/operations-misc.yaml
index bf0924a..7e038d3 100644
--- a/operations-misc.yaml
+++ b/operations-misc.yaml
@@ -17,6 +17,7 @@
name: 'operations-dns-lint'
node: hasContintPackages
defaults: use-remote-zuul
+concurrent: true
triggers:
- zuul
builders:
diff --git a/operations-mw-config.yaml b/operations-mw-config.yaml
index 96e9a50..0d990c3 100644
--- a/operations-mw-config.yaml
+++ b/operations-mw-config.yaml
@@ -5,6 +5,8 @@
#
node: gallium
defaults: use-remote-zuul
+concurrent: true
+
triggers:
- zuul
builders:
--
To view, visit https://gerrit.wikimedia.org/r/102125
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I90e0cbfcd286c884aaa24c57e885f9b8be537111
Gerrit-PatchSet: 1
Gerrit-Project: integration/jenkins-job-builder-config
Gerrit-Branch: master
Gerrit-Owner: Hashar has...@free.fr
Gerrit-Reviewer: Hashar has...@free.fr
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 -squid host lists - change (operations/puppet)
Mark Bergsma has submitted this change and it was merged.
Change subject: Remove -squid host lists
..
Remove -squid host lists
Change-Id: Id609197fcbd7eeef26c6097f82ad7947843600af
---
M manifests/role/cache.pp
1 file changed, 2 insertions(+), 8 deletions(-)
Approvals:
Mark Bergsma: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/role/cache.pp b/manifests/role/cache.pp
index 03054fa..3607951 100644
--- a/manifests/role/cache.pp
+++ b/manifests/role/cache.pp
@@ -32,9 +32,7 @@
$active_nodes = {
'production' = {
text = {
- pmtpa-squid = [],
pmtpa = [],
- eqiad-squid = [],
eqiad = [
'cp1052.eqiad.wmnet',
'cp1053.eqiad.wmnet',
@@ -45,7 +43,6 @@
'cp1067.eqiad.wmnet',
'cp1068.eqiad.wmnet',
],
- esams-squid = [],
esams = [
#'amssq47.esams.wikimedia.org',
# Test host
'amssq48.esams.wikimedia.org',
@@ -74,8 +71,8 @@
]
},
api = {
- pmtpa-squid = [],
- eqiad-squid = [],
+ pmtpa = [],
+ eqiad = [],
esams = [],
},
bits = {
@@ -85,9 +82,7 @@
ulsfo = [cp4001.ulsfo.wmnet,
cp4002.ulsfo.wmnet, cp4003.ulsfo.wmnet, cp4004.ulsfo.wmnet],
},
upload = {
- pmtpa-squid = [],
pmtpa = [],
- eqiad-squid = [],
'eqiad' = [
'cp1048.eqiad.wmnet',
'cp1049.eqiad.wmnet',
@@ -98,7 +93,6 @@
'cp1063.eqiad.wmnet',
'cp1064.eqiad.wmnet',
],
- esams-squid = [],
esams = [
'cp3003.esams.wikimedia.org',
'cp3004.esams.wikimedia.org',
--
To view, visit https://gerrit.wikimedia.org/r/101863
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Id609197fcbd7eeef26c6097f82ad7947843600af
Gerrit-PatchSet: 5
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Mark Bergsma m...@wikimedia.org
Gerrit-Reviewer: Mark Bergsma m...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix typo - change (mediawiki...Flow)
jenkins-bot has submitted this change and it was merged.
Change subject: Fix typo
..
Fix typo
Change-Id: If409b5993f9c82b1b217b8a29c65190086380509
---
M includes/Container.php
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Matthias Mullie: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/Container.php b/includes/Container.php
index 750d117..3ace465 100644
--- a/includes/Container.php
+++ b/includes/Container.php
@@ -12,7 +12,7 @@
* special page or API module), there is a good chance that your code
* requires refactoring
*
-* @return FLow\Container
+* @return Flow\Container
*/
public static function getContainer() {
static $container;
--
To view, visit https://gerrit.wikimedia.org/r/102028
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: If409b5993f9c82b1b217b8a29c65190086380509
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: Legoktm legoktm.wikipe...@gmail.com
Gerrit-Reviewer: Matthias Mullie mmul...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove Squid manifests and files - change (operations/puppet)
Mark Bergsma has submitted this change and it was merged.
Change subject: Remove Squid manifests and files
..
Remove Squid manifests and files
Change-Id: I73329f40612f57b2de325d1ff735d4fe2e0852f1
---
D files/logrotate/squid-frontend
D files/squid/redirector
D files/squid/setup-aufs-cachedirs
D files/squid/squid-frontend
M manifests/site.pp
D manifests/squid.pp
D templates/squid/cachemgr.conf.erb
D templates/squid/redirector.conf.erb
D templates/squid/squid-disk-permissions.erb
9 files changed, 0 insertions(+), 303 deletions(-)
Approvals:
Mark Bergsma: Looks good to me, approved
jenkins-bot: Verified
diff --git a/files/logrotate/squid-frontend b/files/logrotate/squid-frontend
deleted file mode 100644
index eed4ebb..000
--- a/files/logrotate/squid-frontend
+++ /dev/null
@@ -1,18 +0,0 @@
-#
-# Logrotate fragment for squid.
-#
-/var/log/squid-frontend/*.log {
- daily
- compress
- delaycompress
- rotate 2
- missingok
- nocreate
- sharedscripts
- prerotate
- test ! -x /usr/sbin/sarg-maint || /usr/sbin/sarg-maint
- endscript
- postrotate
- test ! -e /var/run/squid-frontend.pid ||
/usr/sbin/squid-frontend -k rotate
- endscript
-}
diff --git a/files/squid/redirector b/files/squid/redirector
deleted file mode 100755
index 7cce08b..000
--- a/files/squid/redirector
+++ /dev/null
Binary files differ
diff --git a/files/squid/setup-aufs-cachedirs b/files/squid/setup-aufs-cachedirs
deleted file mode 100644
index 26aeeba..000
--- a/files/squid/setup-aufs-cachedirs
+++ /dev/null
@@ -1,78 +0,0 @@
-#!/bin/bash
-# Script to mkfs and mount Squid AUFS cache dirs as specified
-# in squid.conf
-#
-# Written on 2007/04/17 by Mark Bergsma m...@wikimedia.org
-
-set -e
-
-export PATH=/bin:/sbin:/usr/bin:/usr/sbin:
-
-# Defaults
-AUFSROOTDIR=/aufs
-PROXY_UID=proxy
-PROXY_GID=proxy
-SQUIDCONF=/etc/squid/squid.conf
-
-PART_TYPE=82
-
-# File system options for mkfs and mount
-FS=xfs
-FS_MOUNT_OPTIONS=noatime,nodiratime
-FS_OPTIONS=-f
-
-if [ ! -f $SQUIDCONF ]
-then
- echo File $SQUIDCONF not found. Exiting.
- exit 1
-fi
-
-AUFS_DIRS=`egrep ^cache_dir aufs $AUFSROOTDIR $SQUIDCONF | awk '{ print $3
}'`
-
-if [ ! -d $AUFSROOTDIR ]
-then
- echo AUFS root dir $AUFSROOTDIR does not exist, exiting.
- exit 1
-fi
-
-for aufsdir in $AUFS_DIRS
-do
- DEV_FILE=/dev${aufsdir:${#AUFSROOTDIR}}
- PARENT_DEV=${DEV_FILE/%[0-9]}
-
- echo Setting up $DEV_FILE on $aufsdir on parent device $PARENT_DEV
-
- # Check whether the partition has the wanted type, linux-swap
- if [ $(fdisk -l $PARENT_DEV | egrep ^$DEV_FILE | awk '{ print $5 }')
!= $PART_TYPE ]
- then
- echo Partition $DEV_FILE is not of type $PART_TYPE. Skipping...
- continue
- fi
-
- # Check if the partition is listed in /etc/fstab, and if not, add it
- if ! egrep -q ^$DEV_FILE[[:space:]]+ /etc/fstab
- then
- echo -e $DEV_FILE\t$aufsdir\t$FS\t$FS_MOUNT_OPTIONS\t0\t0
/etc/fstab
- else
- if ! egrep -q ^$DEV_FILE[[:space:]]+$aufsdir[[:space:]]+
/etc/fstab
- then
- echo Mountpoint $aufsdir is listed in /etc/fstab, but
is incorrect. Skipping...
- continue
- fi
- fi
-
- # Check whether the file system is already mounted
- if egrep ^[^[:space:]]+[[:space:]]$aufsdir /proc/mounts
- then
- echo File system $aufsdir already mounted! Skipping...
- continue
- fi
-
- # Create the file system
- mkfs -t $FS $FS_OPTIONS $DEV_FILE
-
- # Mount the newly created file system and set user/group
- [ -d $aufsdir ] || mkdir $aufsdir
- mount $aufsdir
- chown $PROXY_UID:$PROXY_GID $aufsdir
-done
diff --git a/files/squid/squid-frontend b/files/squid/squid-frontend
deleted file mode 100644
index 869da5d..000
--- a/files/squid/squid-frontend
+++ /dev/null
@@ -1,12 +0,0 @@
-#
-### THIS FILE IS MANAGED BY PUPPET
-### puppet:///files/squid/squid-frontend
-#
-
-#
-# /etc/default/squid-frontendConfiguration settings for the Squid proxy
server.
-#
-
-# Max. number of filedescriptors to use. You can increase this on a busy
-# cache to a maximum of (currently) 65536 filedescriptors. Default is 32768.
-SQUID_MAXFD=65536
diff --git a/manifests/site.pp b/manifests/site.pp
index 855a104..8c5a713 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -28,7 +28,6 @@
import role/analytics/*.pp
import search.pp
import snapshots.pp
-import squid.pp
import sudo.pp
import svn.pp
import swift.pp
@@ -943,7 +942,6 @@
misc::noc-wikimedia,
nrpe,
drac,
-
[MediaWiki-commits] [Gerrit] Add support from casechecker.py and commons_link.py - change (translatewiki)
Siebrand has submitted this change and it was merged. Change subject: Add support from casechecker.py and commons_link.py .. Add support from casechecker.py and commons_link.py Change-Id: Ie4d42eec4d9a9703323ae4d9f363056c4f2a5111 --- M groups/Pywikibot/Pywikibot.yaml 1 file changed, 18 insertions(+), 0 deletions(-) Approvals: Siebrand: Verified; Looks good to me, approved diff --git a/groups/Pywikibot/Pywikibot.yaml b/groups/Pywikibot/Pywikibot.yaml index 305c812..46194ba 100644 --- a/groups/Pywikibot/Pywikibot.yaml +++ b/groups/Pywikibot/Pywikibot.yaml @@ -109,6 +109,15 @@ targetPattern: pywikibot/capitalize_redirects.py --- BASIC: + id: out-pywikipedia-casechecker + label: Pywikibot Casechecker + +FILES: + sourcePattern: %GROUPROOT%/pywikibot/casechecker.py + definitionFile: %GROUPROOT%/pywikibot/casechecker.py + targetPattern: pywikibot/casechecker.py +--- +BASIC: id: out-pywikipedia-catall label: Pywikibot Catall @@ -154,6 +163,15 @@ targetPattern: pywikibot/commons.py --- BASIC: + id: out-pywikipedia-commonslink + label: Pywikibot Commons Link + +FILES: + sourcePattern: %GROUPROOT%/pywikibot/commons_link.py + definitionFile: %GROUPROOT%/pywikibot/commons_link.py + targetPattern: pywikibot/commons_link.py +--- +BASIC: id: out-pywikipedia-cosmeticchanges label: Pywikibot Cosmetic Changes -- To view, visit https://gerrit.wikimedia.org/r/101675 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ie4d42eec4d9a9703323ae4d9f363056c4f2a5111 Gerrit-PatchSet: 3 Gerrit-Project: translatewiki Gerrit-Branch: master Gerrit-Owner: Xqt i...@gno.de Gerrit-Reviewer: Siebrand siebr...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Cleanup ApiQueryFlow - change (mediawiki...Flow)
jenkins-bot has submitted this change and it was merged.
Change subject: Cleanup ApiQueryFlow
..
Cleanup ApiQueryFlow
* Defined $container
* Removed namespace that isn't used
* Removed deprecated getVersion() and useless getHelpUrls()
Change-Id: I73c29663da6e083b307a611b3efc249bc120
---
M includes/api/ApiQueryFlow.php
1 file changed, 1 insertion(+), 10 deletions(-)
Approvals:
Werdna: Looks good to me, but someone else must approve
Matthias Mullie: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/api/ApiQueryFlow.php b/includes/api/ApiQueryFlow.php
index 995f93f..9a35aba 100644
--- a/includes/api/ApiQueryFlow.php
+++ b/includes/api/ApiQueryFlow.php
@@ -1,10 +1,9 @@
?php
-use Flow\WorkflowLoader;
use Flow\Model\UUID;
class ApiQueryFlow extends ApiQueryBase {
- protected $loader, $workflow, $definition;
+ protected $loader, $workflow, $definition, $container;
public function __construct( $query, $moduleName ) {
parent::__construct( $query, $moduleName, 'flow' );
@@ -86,13 +85,5 @@
return array(
'api.php?action=querylist=flowflowpage=Main_Page',
);
- }
-
- public function getHelpUrls() {
- return 'https://www.mediawiki.org/wiki/Flow_Portal';
- }
-
- public function getVersion() {
- return __CLASS__ . '-0.1';
}
}
--
To view, visit https://gerrit.wikimedia.org/r/102030
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I73c29663da6e083b307a611b3efc249bc120
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: Legoktm legoktm.wikipe...@gmail.com
Gerrit-Reviewer: Matthias Mullie mmul...@wikimedia.org
Gerrit-Reviewer: Werdna agarr...@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] [SYNC] Synchronize with compat, code improvements, enable -x... - change (pywikibot/core)
Xqt has uploaded a new change for review.
https://gerrit.wikimedia.org/r/102126
Change subject: [SYNC] Synchronize with compat, code improvements, enable -xml
option
..
[SYNC] Synchronize with compat, code improvements, enable -xml option
- use mediawiki's comma-separator
- remove obsolete config and catlib import
- remove unused variables
- reorder generators
Change-Id: I19a6b377022e00491ba50d3d3e4a01ea0c36f507
---
M scripts/template.py
1 file changed, 25 insertions(+), 26 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core
refs/changes/26/102126/1
diff --git a/scripts/template.py b/scripts/template.py
index 3400c60..782893c 100755
--- a/scripts/template.py
+++ b/scripts/template.py
@@ -99,8 +99,8 @@
#
# (C) Daniel Herding, 2004
# (C) Rob W.W. Hooft, 2003
-# (C) xqt, 2009-2011
-# (C) Pywikibot team, 2004-2010
+# (C) xqt, 2009-2013
+# (C) Pywikibot team, 2004-2013
#
# Distributed under the terms of the MIT license.
#
@@ -110,7 +110,8 @@
import re
import pywikibot
from pywikibot import i18n
-from pywikibot import config, pagegenerators, catlib
+from pywikibot import pagegenerators as pg
+from pywikibot import xmlreader
from scripts import replace
@@ -155,14 +156,13 @@
* templateNames - A list of Page object representing the searched
templates
* xmlfilename - The dump's path, either absolute or relative
+
-raise NotImplementedError(Sorry, no XML reader in rewrite yet.)
self.templates = templates
self.xmlfilename = xmlfilename
def __iter__(self):
Yield page objects until the entire XML dump has been read.
-from pywikibot import xmlreader
mysite = pywikibot.getSite()
dump = xmlreader.XmlDump(self.xmlfilename)
# regular expression to find the original template.
@@ -171,7 +171,7 @@
# TODO: check site.nocapitalize()
templatePatterns = []
for template in self.templates:
-templatePattern = template.titleWithoutNamespace()
+templatePattern = template.title(withNamespace=False)
if not pywikibot.getSite().nocapitalize:
templatePattern = '[%s%s]%s' % (templatePattern[0].upper(),
templatePattern[0].lower(),
@@ -192,6 +192,7 @@
This robot will load all pages yielded by a page generator and replace or
remove all occurences of the old template, or substitute them with the
template's text.
+
def __init__(self, generator, templates, subst=False, remove=False,
editSummary='', acceptAll=False, addedCat=None):
@@ -204,6 +205,7 @@
removed/resolved to None.
* remove - True if the template should be removed.
* subst- True if the template should be resolved.
+
self.generator = generator
self.templates = templates
@@ -217,9 +219,11 @@
self.addedCat = pywikibot.Category(
site, u'%s:%s' % (site.namespace(14), self.addedCat))
+comma = site.mediawiki_message('comma-separator')
+
# get edit summary message if it's empty
-if (self.editSummary == ''):
-Param = {'list': (', ').join(self.templates.keys()),
+if not self.editSummary:
+Param = {'list': comma.join(self.templates.keys()),
'num': len(self.templates)}
if self.remove:
self.editSummary = i18n.twntranslate(
@@ -232,9 +236,7 @@
site, 'template-changing', Param)
def run(self):
-
-Starts the robot's action.
-
+Starts the robot's action.
# regular expression to find the original template.
# {{vfd}} does the same thing as {{Vfd}}, so both will be found.
# The old syntax, {{msg:vfd}}, will also be found.
@@ -285,11 +287,10 @@
templates = {}
subst = False
remove = False
-namespaces = []
editSummary = ''
addedCat = ''
acceptAll = False
-genFactory = pagegenerators.GeneratorFactory()
+genFactory = pg.GeneratorFactory()
# If xmlfilename is None, references will be loaded from the live wiki.
xmlfilename = None
user = None
@@ -326,7 +327,8 @@
if not genFactory.handleArg(arg):
templateNames.append(
pywikibot.Page(pywikibot.Site(), arg,
- ns=10).title(withNamespace=False))
+ ns=10
+ ).title(withNamespace=False))
if subst ^ remove:
for templateName in templateNames:
@@ -341,27 +343,24 @@
return
oldTemplates = []
-ns = pywikibot.Site().template_namespace()
for templateName in templates.keys():
-
[MediaWiki-commits] [Gerrit] [SYNC] Synchronize with core, code improvements - change (pywikibot/compat)
Xqt has uploaded a new change for review.
https://gerrit.wikimedia.org/r/102127
Change subject: [SYNC] Synchronize with core, code improvements
..
[SYNC] Synchronize with core, code improvements
- remove obsolete config, sys and string import
- remove unused variables
Change-Id: I88a29b5e3654eb70df412c3f1d65182ccd02811b
---
M template.py
1 file changed, 14 insertions(+), 12 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/pywikibot/compat
refs/changes/27/102127/1
diff --git a/template.py b/template.py
index 33c7ef0..ac1c2a1 100644
--- a/template.py
+++ b/template.py
@@ -1,3 +1,4 @@
+#!/usr/bin/python
# -*- coding: utf-8 -*-
Very simple script to replace a template with another one,
@@ -105,15 +106,14 @@
#
__version__ = '$Id$'
#
+
import re
-import sys
-import string
import wikipedia as pywikibot
from pywikibot import i18n
-import config
-import catlib
import pagegenerators as pg
+import xmlreader
import replace
+import catlib
def UserEditFilterGenerator(generator, username, timestamp=None, skip=False):
@@ -159,13 +159,11 @@
* xmlfilename - The dump's path, either absolute or relative
-
self.templates = templates
self.xmlfilename = xmlfilename
def __iter__(self):
Yield page objects until the entire XML dump has been read.
-import xmlreader
mysite = pywikibot.getSite()
dump = xmlreader.XmlDump(self.xmlfilename)
# regular expression to find the original template.
@@ -176,11 +174,14 @@
for template in self.templates:
templatePattern = template.title(withNamespace=False)
if not pywikibot.getSite().nocapitalize:
-templatePattern = '[' + templatePattern[0].upper() +
templatePattern[0].lower() + ']' + templatePattern[1:]
+templatePattern = '[%s%s]%s' % (templatePattern[0].upper(),
+templatePattern[0].lower(),
+templatePattern[1:])
templatePattern = re.sub(' ', '[_ ]', templatePattern)
templatePatterns.append(templatePattern)
-templateRegex = re.compile(r'\{\{ *([mM][sS][gG]:)?(?:%s)
*(?Pparameters\|[^}]+|) *}}' % '|'.join(templatePatterns))
-
+templateRegex = re.compile(
+r'\{\{ *([mM][sS][gG]:)?(?:%s) *(?Pparameters\|[^}]+|) *}}'
+% '|'.join(templatePatterns))
for entry in dump.parse():
if templateRegex.search(entry.text):
page = pywikibot.Page(mysite, entry.title)
@@ -219,7 +220,7 @@
self.addedCat = catlib.Category(
site, u'%s:%s' % (site.namespace(14), self.addedCat))
-comma = self.summary = site.mediawiki_message('comma-separator')
+comma = site.mediawiki_message('comma-separator')
# get edit summary message if it's empty
if not self.editSummary:
@@ -326,7 +327,8 @@
else:
if not genFactory.handleArg(arg):
templateNames.append(
-pywikibot.Page(pywikibot.getSite(), arg,
defaultNamespace=10
+pywikibot.Page(pywikibot.getSite(), arg,
+ defaultNamespace=10
).title(withNamespace=False))
if subst ^ remove:
@@ -342,7 +344,6 @@
return
oldTemplates = []
-ns = pywikibot.getSite().template_namespace()
for templateName in templates.keys():
oldTemplate = pywikibot.Page(pywikibot.getSite(), templateName,
defaultNamespace=10)
@@ -361,6 +362,7 @@
gen = pg.DuplicateFilterPageGenerator(gen)
preloadingGen = pg.PreloadingGenerator(gen)
+
bot = TemplateRobot(preloadingGen, templates, subst, remove, editSummary,
acceptAll, addedCat)
bot.run()
--
To view, visit https://gerrit.wikimedia.org/r/102127
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I88a29b5e3654eb70df412c3f1d65182ccd02811b
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/compat
Gerrit-Branch: master
Gerrit-Owner: Xqt i...@gno.de
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove pmtpa text LVS service IPs - change (operations/puppet)
Mark Bergsma has uploaded a new change for review.
https://gerrit.wikimedia.org/r/102128
Change subject: Remove pmtpa text LVS service IPs
..
Remove pmtpa text LVS service IPs
Change-Id: Ia52a0981ea8311e77d167e8b3e7602819bba9fd0
---
M manifests/lvs.pp
1 file changed, 2 insertions(+), 54 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/28/102128/1
diff --git a/manifests/lvs.pp b/manifests/lvs.pp
index 13e7cd3..eb194c2 100644
--- a/manifests/lvs.pp
+++ b/manifests/lvs.pp
@@ -113,21 +113,7 @@
$lvs_service_ips = {
'production' = {
'text' = {
- 'pmtpa' = {
- 'textsvc' = 10.2.1.25,
- 'wikipedialb' = 208.80.152.201,
- 'wikimedialb' = 208.80.152.200,
- 'wiktionarylb' = 208.80.152.202,
- 'wikiquotelb' = 208.80.152.203,
- 'wikibookslb' = 208.80.152.204,
- 'wikisourcelb' = 208.80.152.205,
- 'wikinewslb' = 208.80.152.206,
- 'wikiversitylb' = 208.80.152.207,
- 'mediawikilb' = 208.80.152.208,
- 'foundationlb' = 208.80.152.209,
- 'wikidatalb' = '208.80.152.218',
- 'wikivoyagelb' = 208.80.152.219
- },
+ 'pmtpa' = {},
'eqiad' = {},
'esams' = {},
'ulsfo' = {},
@@ -167,35 +153,11 @@
},
'https' = {
'pmtpa' = {
- 'wikimedialbsecure' = 208.80.152.200,
- 'wikipedialbsecure' = 208.80.152.201,
'bitslbsecure' = 208.80.152.210,
'uploadlbsecure' = 208.80.152.211,
- 'wiktionarylbsecure' =
208.80.152.202,
- 'wikiquotelbsecure' = 208.80.152.203,
- 'wikibookslbsecure' = 208.80.152.204,
- 'wikisourcelbsecure' =
208.80.152.205,
- 'wikinewslbsecure' = 208.80.152.206,
- 'wikiversitylbsecure' =
208.80.152.207,
- 'mediawikilbsecure' = 208.80.152.208,
- 'foundationlbsecure' =
208.80.152.209,
- 'wikidatalbsecure' = 208.80.152.218,
- 'wikivoyagelbsecure' =
208.80.152.219,
- 'wikimedialbsecure6' =
2620:0:860:ed1a::0,
- 'wikipedialbsecure6' =
2620:0:860:ed1a::1,
- 'wiktionarylbsecure6' =
2620:0:860:ed1a::2,
- 'wikiquotelbsecure6' =
2620:0:860:ed1a::3,
- 'wikibookslbsecure6' =
2620:0:860:ed1a::4,
- 'wikisourcelbsecure6' =
2620:0:860:ed1a::5,
- 'wikinewslbsecure6' =
2620:0:860:ed1a::6,
- 'wikiversitylbsecure6' =
2620:0:860:ed1a::7,
- 'mediawikilbsecure6' =
2620:0:860:ed1a::8,
- 'foundationlbsecure6' =
2620:0:860:ed1a::9,
'bitslbsecure6' = 2620:0:860:ed1a::a,
'uploadlbsecure6' =
2620:0:860:ed1a::b,
- 'wikidatalbsecure6' =
2620:0:860:ed1a::12,
- 'wikivoyagelbsecure6' =
2620:0:860:ed1a::13
},
'eqiad' = {
'wikimedialbsecure' = 208.80.154.224,
@@ -246,21 +208,7 @@
'ulsfo' = {}
},
'ipv6' = {
- 'pmtpa' = {
- 'wikimedialb6' = 2620:0:860:ed1a::0,
- 'wikipedialb6' = 2620:0:860:ed1a::1,
- 'wiktionarylb6' = 2620:0:860:ed1a::2,
- 'wikiquotelb6' = 2620:0:860:ed1a::3,
- 'wikibookslb6' =
[MediaWiki-commits] [Gerrit] Remove pmtpa text LVS service IPs - change (operations/puppet)
Mark Bergsma has submitted this change and it was merged.
Change subject: Remove pmtpa text LVS service IPs
..
Remove pmtpa text LVS service IPs
Change-Id: Ia52a0981ea8311e77d167e8b3e7602819bba9fd0
---
M manifests/lvs.pp
1 file changed, 2 insertions(+), 54 deletions(-)
Approvals:
Mark Bergsma: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/lvs.pp b/manifests/lvs.pp
index 13e7cd3..eb194c2 100644
--- a/manifests/lvs.pp
+++ b/manifests/lvs.pp
@@ -113,21 +113,7 @@
$lvs_service_ips = {
'production' = {
'text' = {
- 'pmtpa' = {
- 'textsvc' = 10.2.1.25,
- 'wikipedialb' = 208.80.152.201,
- 'wikimedialb' = 208.80.152.200,
- 'wiktionarylb' = 208.80.152.202,
- 'wikiquotelb' = 208.80.152.203,
- 'wikibookslb' = 208.80.152.204,
- 'wikisourcelb' = 208.80.152.205,
- 'wikinewslb' = 208.80.152.206,
- 'wikiversitylb' = 208.80.152.207,
- 'mediawikilb' = 208.80.152.208,
- 'foundationlb' = 208.80.152.209,
- 'wikidatalb' = '208.80.152.218',
- 'wikivoyagelb' = 208.80.152.219
- },
+ 'pmtpa' = {},
'eqiad' = {},
'esams' = {},
'ulsfo' = {},
@@ -167,35 +153,11 @@
},
'https' = {
'pmtpa' = {
- 'wikimedialbsecure' = 208.80.152.200,
- 'wikipedialbsecure' = 208.80.152.201,
'bitslbsecure' = 208.80.152.210,
'uploadlbsecure' = 208.80.152.211,
- 'wiktionarylbsecure' =
208.80.152.202,
- 'wikiquotelbsecure' = 208.80.152.203,
- 'wikibookslbsecure' = 208.80.152.204,
- 'wikisourcelbsecure' =
208.80.152.205,
- 'wikinewslbsecure' = 208.80.152.206,
- 'wikiversitylbsecure' =
208.80.152.207,
- 'mediawikilbsecure' = 208.80.152.208,
- 'foundationlbsecure' =
208.80.152.209,
- 'wikidatalbsecure' = 208.80.152.218,
- 'wikivoyagelbsecure' =
208.80.152.219,
- 'wikimedialbsecure6' =
2620:0:860:ed1a::0,
- 'wikipedialbsecure6' =
2620:0:860:ed1a::1,
- 'wiktionarylbsecure6' =
2620:0:860:ed1a::2,
- 'wikiquotelbsecure6' =
2620:0:860:ed1a::3,
- 'wikibookslbsecure6' =
2620:0:860:ed1a::4,
- 'wikisourcelbsecure6' =
2620:0:860:ed1a::5,
- 'wikinewslbsecure6' =
2620:0:860:ed1a::6,
- 'wikiversitylbsecure6' =
2620:0:860:ed1a::7,
- 'mediawikilbsecure6' =
2620:0:860:ed1a::8,
- 'foundationlbsecure6' =
2620:0:860:ed1a::9,
'bitslbsecure6' = 2620:0:860:ed1a::a,
'uploadlbsecure6' =
2620:0:860:ed1a::b,
- 'wikidatalbsecure6' =
2620:0:860:ed1a::12,
- 'wikivoyagelbsecure6' =
2620:0:860:ed1a::13
},
'eqiad' = {
'wikimedialbsecure' = 208.80.154.224,
@@ -246,21 +208,7 @@
'ulsfo' = {}
},
'ipv6' = {
- 'pmtpa' = {
- 'wikimedialb6' = 2620:0:860:ed1a::0,
- 'wikipedialb6' = 2620:0:860:ed1a::1,
- 'wiktionarylb6' = 2620:0:860:ed1a::2,
- 'wikiquotelb6' = 2620:0:860:ed1a::3,
- 'wikibookslb6' = 2620:0:860:ed1a::4,
-
[MediaWiki-commits] [Gerrit] Remove pmtpa as bits backend for esams/ulsfo - change (operations/puppet)
Mark Bergsma has uploaded a new change for review.
https://gerrit.wikimedia.org/r/102130
Change subject: Remove pmtpa as bits backend for esams/ulsfo
..
Remove pmtpa as bits backend for esams/ulsfo
Change-Id: I1412dded3872bf752da2fdedbd5d4730dd11f0b5
---
M manifests/role/cache.pp
1 file changed, 0 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/30/102130/1
diff --git a/manifests/role/cache.pp b/manifests/role/cache.pp
index 3607951..6bfe748 100644
--- a/manifests/role/cache.pp
+++ b/manifests/role/cache.pp
@@ -343,7 +343,6 @@
'api' =
$lvs::configuration::lvs_service_ips['production']['api'],
'rendering' =
$lvs::configuration::lvs_service_ips['production']['rendering'],
'bits' = {
- 'pmtpa' =
flatten([$lvs::configuration::lvs_service_ips['production']['bits']['pmtpa']['bitslb']]),
'eqiad' =
flatten([$lvs::configuration::lvs_service_ips['production']['bits']['eqiad']['bitslb']]),
},
'bits_appservers' = {
--
To view, visit https://gerrit.wikimedia.org/r/102130
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I1412dded3872bf752da2fdedbd5d4730dd11f0b5
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Mark Bergsma m...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove pmtpa as bits backend for esams/ulsfo - change (operations/puppet)
Mark Bergsma has submitted this change and it was merged.
Change subject: Remove pmtpa as bits backend for esams/ulsfo
..
Remove pmtpa as bits backend for esams/ulsfo
Change-Id: I1412dded3872bf752da2fdedbd5d4730dd11f0b5
---
M manifests/role/cache.pp
1 file changed, 0 insertions(+), 1 deletion(-)
Approvals:
Mark Bergsma: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/role/cache.pp b/manifests/role/cache.pp
index 3607951..6bfe748 100644
--- a/manifests/role/cache.pp
+++ b/manifests/role/cache.pp
@@ -343,7 +343,6 @@
'api' =
$lvs::configuration::lvs_service_ips['production']['api'],
'rendering' =
$lvs::configuration::lvs_service_ips['production']['rendering'],
'bits' = {
- 'pmtpa' =
flatten([$lvs::configuration::lvs_service_ips['production']['bits']['pmtpa']['bitslb']]),
'eqiad' =
flatten([$lvs::configuration::lvs_service_ips['production']['bits']['eqiad']['bitslb']]),
},
'bits_appservers' = {
--
To view, visit https://gerrit.wikimedia.org/r/102130
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I1412dded3872bf752da2fdedbd5d4730dd11f0b5
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Mark Bergsma m...@wikimedia.org
Gerrit-Reviewer: Mark Bergsma m...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Corrected the MediaWiki 1.22 Release notes - change (mediawiki/core)
01tonythomas has uploaded a new change for review. https://gerrit.wikimedia.org/r/102131 Change subject: Corrected the MediaWiki 1.22 Release notes .. Corrected the MediaWiki 1.22 Release notes The MediaWiki 1.22 Release notes say THIS IS NOT A RELEASE YET, which was corrected. The stable release version is 1.22.0, not 1.22 Bug: 58233 Change-Id: I20e2754912b9fd76a4c57e980d5166545229c417 --- M RELEASE-NOTES-1.22 1 file changed, 19 insertions(+), 21 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/31/102131/1 diff --git a/RELEASE-NOTES-1.22 b/RELEASE-NOTES-1.22 index dad2438..67089cb 100644 --- a/RELEASE-NOTES-1.22 +++ b/RELEASE-NOTES-1.22 @@ -1,22 +1,20 @@ Security reminder: MediaWiki does not require PHP's register_globals. If you have it on, turn it '''off''' if you can. -== MediaWiki 1.22 == +== MediaWiki 1.22.0 == -THIS IS NOT A RELEASE YET +MediaWiki 1.22.0 is the stable branch and is recommended for use in production. +This is a security and maintenance release of the MediaWiki 1.21 branch. -MediaWiki 1.22 is an alpha-quality branch and is not recommended for use in -production. +* Breaking Changes in 1.22.0 +* New features in 1.22.0 +* Configuration changes in 1.22.0 +* Bug fixes in 1.22.0 +* API changes in 1.22.0 +* Languages updated in 1.22.0 +* Other changes in 1.22.0 -* Breaking Changes in 1.22 -* New features in 1.22 -* Configuration changes in 1.22 -* Bug fixes in 1.22 -* API changes in 1.22 -* Languages updated in 1.22 -* Other changes in 1.22 - -=== Breaking Changes in 1.22 === +=== Breaking Changes in 1.22.0 === * BREAKING CHANGE: (bug 41729) Display editsection links next to headings. Also change their class name from .editsection to .mw-editsection and place them at the end of the heading element instead of the beginning. Client-side code and @@ -74,7 +72,7 @@ 'mediawiki.legacy.wikibits' (which IEFixes depends on) and that will import IEFixes automatically if user agent conditions are met. -=== New features in 1.22 === +=== New features in 1.22.0 === * You can now install extensions using Composer. See https://www.mediawiki.org/wiki/Composer * (bug 44525) mediawiki.jqueryMsg can now parse (whitelisted) HTML elements and attributes. @@ -267,7 +265,7 @@ prefix. Also fixed PHPUnit test suite when using a MySQL backend containing views. -=== Configuration changes in 1.22 === +=== Configuration changes in 1.22.0 === * $wgRedirectScript was removed. It was unused. * Removed $wgLocalMessageCacheSerialized, it is now always true. * $wgVectorUseIconWatch is now enabled by default. @@ -325,7 +323,7 @@ script they were added for. * Default value of $wgMaxShellMemory has been tripled (it's now 300 MB). -=== Bug fixes in 1.22 === +=== Bug fixes in 1.22.0 === * (bug 47271) $wgContentHandlerUseDB should be set to false during the upgrade * Disable Special:PasswordReset when $wgEnableEmail is false. Previously one could still navigate to the page by entering the URL directly. @@ -413,7 +411,7 @@ * (bug 56707) Correct tooltip of Next n results on query special pages. * (bug 56770) mw.util.addPortletLink: Check length before access array index. -=== API changes in 1.22 === +=== API changes in 1.22.0 === * (bug 25553) The JSON output formatter now leaves forward slashes unescaped to improve human readability of URLs and similar strings. Also, a utf8 option is now provided to use UTF-8 encoding instead of hex escape codes @@ -467,7 +465,7 @@ file repositories, and related ForeignAPIRepo methods getInfo and getApiUrl. * The new query module list=allfileusages to enumerate file usages was added. -=== Languages updated in 1.22 === +=== Languages updated in 1.22.0 === MediaWiki supports over 350 languages. Many localisations are updated regularly. Below only new and removed languages are listed, as well as @@ -476,7 +474,7 @@ * Batak Toba (bbc-latn) added. * (bug 46751) Made Buryat (Russia) (буряад) (bxr) fallback to Russian. -=== Other changes in 1.22 === +=== Other changes in 1.22.0 === * redirect.php was removed. It was unused. * ClickTracking integration was dropped from the mediaWiki.user.bucket JavaScript function. The 'tracked' option is now ignored. @@ -547,7 +545,7 @@ == Compatibility == -MediaWiki 1.22 requires PHP 5.3.2 or later. +MediaWiki 1.22.0 requires PHP 5.3.2 or later. MySQL is the recommended DBMS. PostgreSQL or SQLite can also be used, but support for them is somewhat less mature. There is experimental support for @@ -562,7 +560,7 @@ == Upgrading == -1.22 has several database changes since 1.21, and will not work without schema +1.22.0 has several database changes since 1.21, and will not work without schema updates. Note that due to changes to some very large tables like the revision table, the schema update may take quite long (minutes on a medium sized site, many hours on a
[MediaWiki-commits] [Gerrit] Corrected the MediaWiki 1.22 Release notes - change (mediawiki/core)
01tonythomas has uploaded a new change for review. https://gerrit.wikimedia.org/r/102132 Change subject: Corrected the MediaWiki 1.22 Release notes .. Corrected the MediaWiki 1.22 Release notes The MediaWiki 1.22 Release notes say THIS IS NOT A RELEASE YET, which was corrected. The stable release version is 1.22.0, not 1.22. Bug: 58233 Change-Id: I20e2754912b9fd76a4c57e980d5166545229c417 --- M RELEASE-NOTES-1.22 1 file changed, 19 insertions(+), 21 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/32/102132/1 diff --git a/RELEASE-NOTES-1.22 b/RELEASE-NOTES-1.22 index dad2438..67089cb 100644 --- a/RELEASE-NOTES-1.22 +++ b/RELEASE-NOTES-1.22 @@ -1,22 +1,20 @@ Security reminder: MediaWiki does not require PHP's register_globals. If you have it on, turn it '''off''' if you can. -== MediaWiki 1.22 == +== MediaWiki 1.22.0 == -THIS IS NOT A RELEASE YET +MediaWiki 1.22.0 is the stable branch and is recommended for use in production. +This is a security and maintenance release of the MediaWiki 1.21 branch. -MediaWiki 1.22 is an alpha-quality branch and is not recommended for use in -production. +* Breaking Changes in 1.22.0 +* New features in 1.22.0 +* Configuration changes in 1.22.0 +* Bug fixes in 1.22.0 +* API changes in 1.22.0 +* Languages updated in 1.22.0 +* Other changes in 1.22.0 -* Breaking Changes in 1.22 -* New features in 1.22 -* Configuration changes in 1.22 -* Bug fixes in 1.22 -* API changes in 1.22 -* Languages updated in 1.22 -* Other changes in 1.22 - -=== Breaking Changes in 1.22 === +=== Breaking Changes in 1.22.0 === * BREAKING CHANGE: (bug 41729) Display editsection links next to headings. Also change their class name from .editsection to .mw-editsection and place them at the end of the heading element instead of the beginning. Client-side code and @@ -74,7 +72,7 @@ 'mediawiki.legacy.wikibits' (which IEFixes depends on) and that will import IEFixes automatically if user agent conditions are met. -=== New features in 1.22 === +=== New features in 1.22.0 === * You can now install extensions using Composer. See https://www.mediawiki.org/wiki/Composer * (bug 44525) mediawiki.jqueryMsg can now parse (whitelisted) HTML elements and attributes. @@ -267,7 +265,7 @@ prefix. Also fixed PHPUnit test suite when using a MySQL backend containing views. -=== Configuration changes in 1.22 === +=== Configuration changes in 1.22.0 === * $wgRedirectScript was removed. It was unused. * Removed $wgLocalMessageCacheSerialized, it is now always true. * $wgVectorUseIconWatch is now enabled by default. @@ -325,7 +323,7 @@ script they were added for. * Default value of $wgMaxShellMemory has been tripled (it's now 300 MB). -=== Bug fixes in 1.22 === +=== Bug fixes in 1.22.0 === * (bug 47271) $wgContentHandlerUseDB should be set to false during the upgrade * Disable Special:PasswordReset when $wgEnableEmail is false. Previously one could still navigate to the page by entering the URL directly. @@ -413,7 +411,7 @@ * (bug 56707) Correct tooltip of Next n results on query special pages. * (bug 56770) mw.util.addPortletLink: Check length before access array index. -=== API changes in 1.22 === +=== API changes in 1.22.0 === * (bug 25553) The JSON output formatter now leaves forward slashes unescaped to improve human readability of URLs and similar strings. Also, a utf8 option is now provided to use UTF-8 encoding instead of hex escape codes @@ -467,7 +465,7 @@ file repositories, and related ForeignAPIRepo methods getInfo and getApiUrl. * The new query module list=allfileusages to enumerate file usages was added. -=== Languages updated in 1.22 === +=== Languages updated in 1.22.0 === MediaWiki supports over 350 languages. Many localisations are updated regularly. Below only new and removed languages are listed, as well as @@ -476,7 +474,7 @@ * Batak Toba (bbc-latn) added. * (bug 46751) Made Buryat (Russia) (буряад) (bxr) fallback to Russian. -=== Other changes in 1.22 === +=== Other changes in 1.22.0 === * redirect.php was removed. It was unused. * ClickTracking integration was dropped from the mediaWiki.user.bucket JavaScript function. The 'tracked' option is now ignored. @@ -547,7 +545,7 @@ == Compatibility == -MediaWiki 1.22 requires PHP 5.3.2 or later. +MediaWiki 1.22.0 requires PHP 5.3.2 or later. MySQL is the recommended DBMS. PostgreSQL or SQLite can also be used, but support for them is somewhat less mature. There is experimental support for @@ -562,7 +560,7 @@ == Upgrading == -1.22 has several database changes since 1.21, and will not work without schema +1.22.0 has several database changes since 1.21, and will not work without schema updates. Note that due to changes to some very large tables like the revision table, the schema update may take quite long (minutes on a medium sized site, many hours on a
[MediaWiki-commits] [Gerrit] Remove bits-lb.pmtpa LVS service monitoring - change (operations/puppet)
Mark Bergsma has uploaded a new change for review.
https://gerrit.wikimedia.org/r/102133
Change subject: Remove bits-lb.pmtpa LVS service monitoring
..
Remove bits-lb.pmtpa LVS service monitoring
Change-Id: I6759172afa66eb5fb7c9f336748154854b15
---
M manifests/lvs.pp
1 file changed, 0 insertions(+), 11 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/33/102133/1
diff --git a/manifests/lvs.pp b/manifests/lvs.pp
index eb194c2..8b48ca2 100644
--- a/manifests/lvs.pp
+++ b/manifests/lvs.pp
@@ -1018,17 +1018,6 @@
monitor_service_lvs_custom { search-prefix.svc.eqiad.wmnet:
ip_address = 10.2.2.15, port = 8123, description = LVS Lucene,
check_command = check_lucene }
# PMTPA
- monitor_service_lvs_http_https {
- bits-lb.pmtpa.wikimedia.org:
- ip_address = $ip['bits']['pmtpa']['bitslb'],
- uri =
bits.wikimedia.org!/skins-1.5/common/images/poweredby_mediawiki_88x31.png;
- }
-
- monitor_service_lvs6_http_https {
- bits-lb.pmtpa.wikimedia.org:
- ip_address = $ip['bits']['pmtpa']['bitslb6'],
- uri =
bits.wikimedia.org!/skins-1.5/common/images/poweredby_mediawiki_88x31.png;
- }
# FIXME: remove after pmtpa decommissioning
monitor_service_lvs_custom { payments.wikimedia.org:
--
To view, visit https://gerrit.wikimedia.org/r/102133
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I6759172afa66eb5fb7c9f336748154854b15
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Mark Bergsma m...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update .gitreview for REL1_22 branch - change (mediawiki/core)
Bartosz Dziewoński has uploaded a new change for review. https://gerrit.wikimedia.org/r/102134 Change subject: Update .gitreview for REL1_22 branch .. Update .gitreview for REL1_22 branch Change-Id: I837bf55af31fc2a5b1d021213098664486f51280 --- M .gitreview 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/34/102134/1 diff --git a/.gitreview b/.gitreview index 0ec44b8..bb83fd3 100644 --- a/.gitreview +++ b/.gitreview @@ -2,5 +2,5 @@ host=gerrit.wikimedia.org port=29418 project=mediawiki/core.git -defaultbranch=master +defaultbranch=REL1_22 defaultrebase=0 -- To view, visit https://gerrit.wikimedia.org/r/102134 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I837bf55af31fc2a5b1d021213098664486f51280 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: REL1_22 Gerrit-Owner: Bartosz Dziewoński matma@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove bits-lb.pmtpa LVS service monitoring - change (operations/puppet)
Mark Bergsma has submitted this change and it was merged.
Change subject: Remove bits-lb.pmtpa LVS service monitoring
..
Remove bits-lb.pmtpa LVS service monitoring
Change-Id: I6759172afa66eb5fb7c9f336748154854b15
---
M manifests/lvs.pp
1 file changed, 0 insertions(+), 11 deletions(-)
Approvals:
Mark Bergsma: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/lvs.pp b/manifests/lvs.pp
index eb194c2..8b48ca2 100644
--- a/manifests/lvs.pp
+++ b/manifests/lvs.pp
@@ -1018,17 +1018,6 @@
monitor_service_lvs_custom { search-prefix.svc.eqiad.wmnet:
ip_address = 10.2.2.15, port = 8123, description = LVS Lucene,
check_command = check_lucene }
# PMTPA
- monitor_service_lvs_http_https {
- bits-lb.pmtpa.wikimedia.org:
- ip_address = $ip['bits']['pmtpa']['bitslb'],
- uri =
bits.wikimedia.org!/skins-1.5/common/images/poweredby_mediawiki_88x31.png;
- }
-
- monitor_service_lvs6_http_https {
- bits-lb.pmtpa.wikimedia.org:
- ip_address = $ip['bits']['pmtpa']['bitslb6'],
- uri =
bits.wikimedia.org!/skins-1.5/common/images/poweredby_mediawiki_88x31.png;
- }
# FIXME: remove after pmtpa decommissioning
monitor_service_lvs_custom { payments.wikimedia.org:
--
To view, visit https://gerrit.wikimedia.org/r/102133
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I6759172afa66eb5fb7c9f336748154854b15
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Mark Bergsma m...@wikimedia.org
Gerrit-Reviewer: Mark Bergsma m...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update .gitreview for REL1_22 branch - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged. Change subject: Update .gitreview for REL1_22 branch .. Update .gitreview for REL1_22 branch Change-Id: I837bf55af31fc2a5b1d021213098664486f51280 --- M .gitreview 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Bartosz Dziewoński: Looks good to me, approved jenkins-bot: Verified diff --git a/.gitreview b/.gitreview index 0ec44b8..bb83fd3 100644 --- a/.gitreview +++ b/.gitreview @@ -2,5 +2,5 @@ host=gerrit.wikimedia.org port=29418 project=mediawiki/core.git -defaultbranch=master +defaultbranch=REL1_22 defaultrebase=0 -- To view, visit https://gerrit.wikimedia.org/r/102134 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I837bf55af31fc2a5b1d021213098664486f51280 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: REL1_22 Gerrit-Owner: Bartosz Dziewoński matma@gmail.com Gerrit-Reviewer: Bartosz Dziewoński matma@gmail.com Gerrit-Reviewer: Chad ch...@wikimedia.org Gerrit-Reviewer: MarkAHershberger mhershber...@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 pmtpa squids from dsh, dhcp, netboot.conf, decom rt #... - change (operations/puppet)
ArielGlenn has uploaded a new change for review. https://gerrit.wikimedia.org/r/102135 Change subject: remove pmtpa squids from dsh, dhcp, netboot.conf, decom rt #6520 .. remove pmtpa squids from dsh, dhcp, netboot.conf, decom rt #6520 this is sq37-40, 43-66, 71-86 Change-Id: Ibe2659c7bcdccda67ca94af106da697115e7d3c5 --- M files/dsh/group/ALL M files/dsh/group/mysq M files/dsh/group/pmtpa M files/dsh/group/pmtpa.text M files/dsh/group/pmtpa.upload M files/dsh/group/sq M files/dsh/group/sq.old M modules/install-server/files/autoinstall/netboot.cfg M modules/install-server/files/dhcpd/linux-host-entries.ttyS1-115200 M modules/install-server/files/dhcpd/linux-host-entries.ttyS1-57600 10 files changed, 1 insertion(+), 438 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/35/102135/1 diff --git a/files/dsh/group/ALL b/files/dsh/group/ALL index aee0287..d7541bf 100644 --- a/files/dsh/group/ALL +++ b/files/dsh/group/ALL @@ -73,47 +73,10 @@ cp1043 cp1044 -sq37 - -sq43 -sq49 -sq50 -sq51 -sq52 -sq53 -sq54 -sq55 -sq56 -sq57 -sq58 -sq59 -sq60 -sq61 -sq62 -sq63 -sq64 -sq65 -sq66 sq67 sq68 sq69 sq70 -sq71 -sq72 -sq73 -sq74 -sq75 -sq76 -sq77 -sq78 -sq79 -sq80 -sq81 -sq82 -sq83 -sq84 -sq85 -sq86 sage ragweed diff --git a/files/dsh/group/mysq b/files/dsh/group/mysq index f199753..8b13789 100644 --- a/files/dsh/group/mysq +++ b/files/dsh/group/mysq @@ -1,4 +1 @@ -sq54 -sq55 -sq59 diff --git a/files/dsh/group/pmtpa b/files/dsh/group/pmtpa index 57a3082..d63f2f7 100644 --- a/files/dsh/group/pmtpa +++ b/files/dsh/group/pmtpa @@ -164,46 +164,10 @@ snapshot3 snapshot4 -sq37 -sq43 -sq49 -sq50 -sq51 -sq52 -sq53 -sq54 -sq55 -sq56 -sq57 -sq58 -sq59 -sq60 -sq61 -sq62 -sq63 -sq64 -sq65 -sq66 sq67 sq68 sq69 sq70 -sq71 -sq72 -sq73 -sq74 -sq75 -sq76 -sq77 -sq78 -sq79 -sq80 -sq81 -sq82 -sq83 -sq84 -sq85 -sq86 srv193 diff --git a/files/dsh/group/pmtpa.text b/files/dsh/group/pmtpa.text index 40ad837..e69de29 100644 --- a/files/dsh/group/pmtpa.text +++ b/files/dsh/group/pmtpa.text @@ -1,17 +0,0 @@ -sq37.wikimedia.org -sq59.wikimedia.org -sq60.wikimedia.org -sq61.wikimedia.org -sq62.wikimedia.org -sq63.wikimedia.org -sq64.wikimedia.org -sq65.wikimedia.org -sq66.wikimedia.org -sq71.wikimedia.org -sq72.wikimedia.org -sq73.wikimedia.org -sq74.wikimedia.org -sq75.wikimedia.org -sq76.wikimedia.org -sq77.wikimedia.org -sq78.wikimedia.org diff --git a/files/dsh/group/pmtpa.upload b/files/dsh/group/pmtpa.upload index 6c40005..e69de29 100644 --- a/files/dsh/group/pmtpa.upload +++ b/files/dsh/group/pmtpa.upload @@ -1,19 +0,0 @@ -sq43.wikimedia.org -sq49.wikimedia.org -sq50.wikimedia.org -sq51.wikimedia.org -sq52.wikimedia.org -sq53.wikimedia.org -sq54.wikimedia.org -sq55.wikimedia.org -sq56.wikimedia.org -sq57.wikimedia.org -sq58.wikimedia.org -sq79.wikimedia.org -sq80.wikimedia.org -sq81.wikimedia.org -sq82.wikimedia.org -sq83.wikimedia.org -sq84.wikimedia.org -sq85.wikimedia.org -sq86.wikimedia.org diff --git a/files/dsh/group/sq b/files/dsh/group/sq index 99a6f40..42873e1 100644 --- a/files/dsh/group/sq +++ b/files/dsh/group/sq @@ -1,40 +1,4 @@ -sq37 -sq43 -sq49 -sq50 -sq51 -sq52 -sq53 -sq54 -sq55 -sq56 -sq57 -sq58 -sq59 -sq60 -sq61 -sq62 -sq63 -sq64 -sq65 -sq66 sq67 sq68 sq69 sq70 -sq71 -sq72 -sq73 -sq74 -sq75 -sq76 -sq77 -sq78 -sq79 -sq80 -sq81 -sq82 -sq83 -sq84 -sq85 -sq86 diff --git a/files/dsh/group/sq.old b/files/dsh/group/sq.old index 8a6eb19..42873e1 100644 --- a/files/dsh/group/sq.old +++ b/files/dsh/group/sq.old @@ -1,41 +1,4 @@ -sq37 - -sq43 -sq49 -sq50 -sq51 -sq52 -sq53 -sq54 -sq55 -sq56 -sq57 -sq58 -sq59 -sq60 -sq61 -sq62 -sq63 -sq64 -sq65 -sq66 sq67 sq68 sq69 sq70 -sq71 -sq72 -sq73 -sq74 -sq75 -sq76 -sq77 -sq78 -sq79 -sq80 -sq81 -sq82 -sq83 -sq84 -sq85 -sq86 diff --git a/modules/install-server/files/autoinstall/netboot.cfg b/modules/install-server/files/autoinstall/netboot.cfg index ee4255b..2879f26 100755 --- a/modules/install-server/files/autoinstall/netboot.cfg +++ b/modules/install-server/files/autoinstall/netboot.cfg @@ -33,7 +33,7 @@ case $(debconf-get netcfg/get_hostname) in \ amslvs*) echo partman/raid1-squid.cfg ;; \ amssq4[7-9]|amssq[56][0-9]) echo partman/raid1-varnish.cfg ;; \ - amssq*|sq[3-8][0-9]) echo partman/raid1-squid.cfg ;; \ + amssq*|sq[6][7-9]|sq70) echo partman/raid1-squid.cfg ;; \ analytics100[1-9]|analytics1010) echo partman/analytics-cisco.cfg ;; \ analytics101[1-9]|analytics102[0-2]) echo partman/raid1-30G.cfg ;; \ analytics102[3-7]) echo partman/analytics-dell.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 b107e6c..1a73a52 100644 --- a/modules/install-server/files/dhcpd/linux-host-entries.ttyS1-115200 +++
[MediaWiki-commits] [Gerrit] remove pmtpa squids from dsh, dhcp, netboot.conf, decom rt #... - change (operations/puppet)
ArielGlenn has submitted this change and it was merged. Change subject: remove pmtpa squids from dsh, dhcp, netboot.conf, decom rt #6520 .. remove pmtpa squids from dsh, dhcp, netboot.conf, decom rt #6520 this is sq37-40, 43-66, 71-86 Change-Id: Ibe2659c7bcdccda67ca94af106da697115e7d3c5 --- M files/dsh/group/ALL M files/dsh/group/mysq M files/dsh/group/pmtpa M files/dsh/group/pmtpa.text M files/dsh/group/pmtpa.upload M files/dsh/group/sq M files/dsh/group/sq.old M modules/install-server/files/autoinstall/netboot.cfg M modules/install-server/files/dhcpd/linux-host-entries.ttyS1-115200 M modules/install-server/files/dhcpd/linux-host-entries.ttyS1-57600 10 files changed, 1 insertion(+), 438 deletions(-) Approvals: ArielGlenn: Looks good to me, approved jenkins-bot: Verified diff --git a/files/dsh/group/ALL b/files/dsh/group/ALL index aee0287..d7541bf 100644 --- a/files/dsh/group/ALL +++ b/files/dsh/group/ALL @@ -73,47 +73,10 @@ cp1043 cp1044 -sq37 - -sq43 -sq49 -sq50 -sq51 -sq52 -sq53 -sq54 -sq55 -sq56 -sq57 -sq58 -sq59 -sq60 -sq61 -sq62 -sq63 -sq64 -sq65 -sq66 sq67 sq68 sq69 sq70 -sq71 -sq72 -sq73 -sq74 -sq75 -sq76 -sq77 -sq78 -sq79 -sq80 -sq81 -sq82 -sq83 -sq84 -sq85 -sq86 sage ragweed diff --git a/files/dsh/group/mysq b/files/dsh/group/mysq index f199753..8b13789 100644 --- a/files/dsh/group/mysq +++ b/files/dsh/group/mysq @@ -1,4 +1 @@ -sq54 -sq55 -sq59 diff --git a/files/dsh/group/pmtpa b/files/dsh/group/pmtpa index 57a3082..d63f2f7 100644 --- a/files/dsh/group/pmtpa +++ b/files/dsh/group/pmtpa @@ -164,46 +164,10 @@ snapshot3 snapshot4 -sq37 -sq43 -sq49 -sq50 -sq51 -sq52 -sq53 -sq54 -sq55 -sq56 -sq57 -sq58 -sq59 -sq60 -sq61 -sq62 -sq63 -sq64 -sq65 -sq66 sq67 sq68 sq69 sq70 -sq71 -sq72 -sq73 -sq74 -sq75 -sq76 -sq77 -sq78 -sq79 -sq80 -sq81 -sq82 -sq83 -sq84 -sq85 -sq86 srv193 diff --git a/files/dsh/group/pmtpa.text b/files/dsh/group/pmtpa.text index 40ad837..e69de29 100644 --- a/files/dsh/group/pmtpa.text +++ b/files/dsh/group/pmtpa.text @@ -1,17 +0,0 @@ -sq37.wikimedia.org -sq59.wikimedia.org -sq60.wikimedia.org -sq61.wikimedia.org -sq62.wikimedia.org -sq63.wikimedia.org -sq64.wikimedia.org -sq65.wikimedia.org -sq66.wikimedia.org -sq71.wikimedia.org -sq72.wikimedia.org -sq73.wikimedia.org -sq74.wikimedia.org -sq75.wikimedia.org -sq76.wikimedia.org -sq77.wikimedia.org -sq78.wikimedia.org diff --git a/files/dsh/group/pmtpa.upload b/files/dsh/group/pmtpa.upload index 6c40005..e69de29 100644 --- a/files/dsh/group/pmtpa.upload +++ b/files/dsh/group/pmtpa.upload @@ -1,19 +0,0 @@ -sq43.wikimedia.org -sq49.wikimedia.org -sq50.wikimedia.org -sq51.wikimedia.org -sq52.wikimedia.org -sq53.wikimedia.org -sq54.wikimedia.org -sq55.wikimedia.org -sq56.wikimedia.org -sq57.wikimedia.org -sq58.wikimedia.org -sq79.wikimedia.org -sq80.wikimedia.org -sq81.wikimedia.org -sq82.wikimedia.org -sq83.wikimedia.org -sq84.wikimedia.org -sq85.wikimedia.org -sq86.wikimedia.org diff --git a/files/dsh/group/sq b/files/dsh/group/sq index 99a6f40..42873e1 100644 --- a/files/dsh/group/sq +++ b/files/dsh/group/sq @@ -1,40 +1,4 @@ -sq37 -sq43 -sq49 -sq50 -sq51 -sq52 -sq53 -sq54 -sq55 -sq56 -sq57 -sq58 -sq59 -sq60 -sq61 -sq62 -sq63 -sq64 -sq65 -sq66 sq67 sq68 sq69 sq70 -sq71 -sq72 -sq73 -sq74 -sq75 -sq76 -sq77 -sq78 -sq79 -sq80 -sq81 -sq82 -sq83 -sq84 -sq85 -sq86 diff --git a/files/dsh/group/sq.old b/files/dsh/group/sq.old index 8a6eb19..42873e1 100644 --- a/files/dsh/group/sq.old +++ b/files/dsh/group/sq.old @@ -1,41 +1,4 @@ -sq37 - -sq43 -sq49 -sq50 -sq51 -sq52 -sq53 -sq54 -sq55 -sq56 -sq57 -sq58 -sq59 -sq60 -sq61 -sq62 -sq63 -sq64 -sq65 -sq66 sq67 sq68 sq69 sq70 -sq71 -sq72 -sq73 -sq74 -sq75 -sq76 -sq77 -sq78 -sq79 -sq80 -sq81 -sq82 -sq83 -sq84 -sq85 -sq86 diff --git a/modules/install-server/files/autoinstall/netboot.cfg b/modules/install-server/files/autoinstall/netboot.cfg index ee4255b..2879f26 100755 --- a/modules/install-server/files/autoinstall/netboot.cfg +++ b/modules/install-server/files/autoinstall/netboot.cfg @@ -33,7 +33,7 @@ case $(debconf-get netcfg/get_hostname) in \ amslvs*) echo partman/raid1-squid.cfg ;; \ amssq4[7-9]|amssq[56][0-9]) echo partman/raid1-varnish.cfg ;; \ - amssq*|sq[3-8][0-9]) echo partman/raid1-squid.cfg ;; \ + amssq*|sq[6][7-9]|sq70) echo partman/raid1-squid.cfg ;; \ analytics100[1-9]|analytics1010) echo partman/analytics-cisco.cfg ;; \ analytics101[1-9]|analytics102[0-2]) echo partman/raid1-30G.cfg ;; \ analytics102[3-7]) echo partman/analytics-dell.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 b107e6c..1a73a52 100644 --- a/modules/install-server/files/dhcpd/linux-host-entries.ttyS1-115200 +++
[MediaWiki-commits] [Gerrit] Add space between '[Show]' and 'Hidden by User' - change (mediawiki...Flow)
Matthias Mullie has uploaded a new change for review.
https://gerrit.wikimedia.org/r/102136
Change subject: Add space between '[Show]' and 'Hidden by User'
..
Add space between '[Show]' and 'Hidden by User'
Change-Id: I0a57d73501ed92152328b1be72a55a6c93922893
---
M modules/discussion/ui.js
1 file changed, 1 insertion(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Flow
refs/changes/36/102136/1
diff --git a/modules/discussion/ui.js b/modules/discussion/ui.js
index 23c19c9..f716a42 100644
--- a/modules/discussion/ui.js
+++ b/modules/discussion/ui.js
@@ -373,6 +373,7 @@
// Moderated posts need click to display content
$( 'a href=# class=flow-post-moderated-view/a' )
+ .after( ' ' )
.text( mw.msg( 'flow-post-moderated-toggle-show' ) )
.click( function ( e ) {
e.preventDefault();
--
To view, visit https://gerrit.wikimedia.org/r/102136
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I0a57d73501ed92152328b1be72a55a6c93922893
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: Matthias Mullie mmul...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki-core-code-coverage with phpclover plugin - change (integration/jenkins-job-builder-config)
Hashar has uploaded a new change for review. https://gerrit.wikimedia.org/r/102137 Change subject: mediawiki-core-code-coverage with phpclover plugin .. mediawiki-core-code-coverage with phpclover plugin Add in the Jenkins Clover PHP Plugin for the MediaWiki core code coverage report. That should generate some kind of metric dashboard on the job page. Plugin page: https://wiki.jenkins-ci.org/display/JENKINS/Clover+PHP+Plugin Require JJB to have support for the cloverphp publisher which I have submitted upstream as https://review.openstack.org/#/c/52940/ Change-Id: I358d92bcbbc48763b306ab037e88638acf84bac0 --- M mediawiki.yaml 1 file changed, 6 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/integration/jenkins-job-builder-config refs/changes/37/102137/1 diff --git a/mediawiki.yaml b/mediawiki.yaml index e7120c5..929a523 100644 --- a/mediawiki.yaml +++ b/mediawiki.yaml @@ -218,12 +218,18 @@ - mw-install-sqlite # FIXME should use the mw-run-phpunit.sh wrapper - shell: | +mkdir -p log +rm -f log/clover.xml nice -n 19 php tests/phpunit/phpunit.php \ --with-phpunitdir /srv/deployment/integration/phpunit/vendor/phpunit/phpunit \ --exclude-group Dump,Broken,ParserFuzz,Stub \ +--coverage-clover log/clover.xml' --coverage-html /srv/org/wikimedia/integration/cover/mediawiki-core/master/php echo Code coverage report is available at: echo https://integration.wikimedia.org/cover/mediawiki-core/master/php; +publishers: + - cloverphp: + xml-location: 'log/clover.xml' triggers: - timed: '0 3 * * *' wrappers: -- To view, visit https://gerrit.wikimedia.org/r/102137 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I358d92bcbbc48763b306ab037e88638acf84bac0 Gerrit-PatchSet: 1 Gerrit-Project: integration/jenkins-job-builder-config Gerrit-Branch: master Gerrit-Owner: Hashar has...@free.fr ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki-core-code-coverage with phpclover plugin - change (integration/jenkins-job-builder-config)
jenkins-bot has submitted this change and it was merged. Change subject: mediawiki-core-code-coverage with phpclover plugin .. mediawiki-core-code-coverage with phpclover plugin Add in the Jenkins Clover PHP Plugin for the MediaWiki core code coverage report. That should generate some kind of metric dashboard on the job page. Plugin page: https://wiki.jenkins-ci.org/display/JENKINS/Clover+PHP+Plugin Require JJB to have support for the cloverphp publisher which I have submitted upstream as https://review.openstack.org/#/c/52940/ Change-Id: I358d92bcbbc48763b306ab037e88638acf84bac0 --- M mediawiki.yaml 1 file changed, 6 insertions(+), 0 deletions(-) Approvals: Hashar: Looks good to me, approved jenkins-bot: Verified diff --git a/mediawiki.yaml b/mediawiki.yaml index e7120c5..929a523 100644 --- a/mediawiki.yaml +++ b/mediawiki.yaml @@ -218,12 +218,18 @@ - mw-install-sqlite # FIXME should use the mw-run-phpunit.sh wrapper - shell: | +mkdir -p log +rm -f log/clover.xml nice -n 19 php tests/phpunit/phpunit.php \ --with-phpunitdir /srv/deployment/integration/phpunit/vendor/phpunit/phpunit \ --exclude-group Dump,Broken,ParserFuzz,Stub \ +--coverage-clover log/clover.xml' --coverage-html /srv/org/wikimedia/integration/cover/mediawiki-core/master/php echo Code coverage report is available at: echo https://integration.wikimedia.org/cover/mediawiki-core/master/php; +publishers: + - cloverphp: + xml-location: 'log/clover.xml' triggers: - timed: '0 3 * * *' wrappers: -- To view, visit https://gerrit.wikimedia.org/r/102137 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I358d92bcbbc48763b306ab037e88638acf84bac0 Gerrit-PatchSet: 1 Gerrit-Project: integration/jenkins-job-builder-config Gerrit-Branch: master Gerrit-Owner: Hashar has...@free.fr Gerrit-Reviewer: Hashar has...@free.fr Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] typo in mediawiki-core-code-coverage - change (integration/jenkins-job-builder-config)
Hashar has uploaded a new change for review. https://gerrit.wikimedia.org/r/102138 Change subject: typo in mediawiki-core-code-coverage .. typo in mediawiki-core-code-coverage Change-Id: I3b0077322d0e1fc133449c945069a59742de4b11 --- M mediawiki.yaml 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/integration/jenkins-job-builder-config refs/changes/38/102138/1 diff --git a/mediawiki.yaml b/mediawiki.yaml index 929a523..61472b1 100644 --- a/mediawiki.yaml +++ b/mediawiki.yaml @@ -223,7 +223,7 @@ nice -n 19 php tests/phpunit/phpunit.php \ --with-phpunitdir /srv/deployment/integration/phpunit/vendor/phpunit/phpunit \ --exclude-group Dump,Broken,ParserFuzz,Stub \ ---coverage-clover log/clover.xml' +--coverage-clover log/clover.xml \ --coverage-html /srv/org/wikimedia/integration/cover/mediawiki-core/master/php echo Code coverage report is available at: echo https://integration.wikimedia.org/cover/mediawiki-core/master/php; -- To view, visit https://gerrit.wikimedia.org/r/102138 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I3b0077322d0e1fc133449c945069a59742de4b11 Gerrit-PatchSet: 1 Gerrit-Project: integration/jenkins-job-builder-config Gerrit-Branch: master Gerrit-Owner: Hashar has...@free.fr ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] typo in mediawiki-core-code-coverage - change (integration/jenkins-job-builder-config)
jenkins-bot has submitted this change and it was merged. Change subject: typo in mediawiki-core-code-coverage .. typo in mediawiki-core-code-coverage Change-Id: I3b0077322d0e1fc133449c945069a59742de4b11 --- M mediawiki.yaml 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Hashar: Looks good to me, approved jenkins-bot: Verified diff --git a/mediawiki.yaml b/mediawiki.yaml index 929a523..61472b1 100644 --- a/mediawiki.yaml +++ b/mediawiki.yaml @@ -223,7 +223,7 @@ nice -n 19 php tests/phpunit/phpunit.php \ --with-phpunitdir /srv/deployment/integration/phpunit/vendor/phpunit/phpunit \ --exclude-group Dump,Broken,ParserFuzz,Stub \ ---coverage-clover log/clover.xml' +--coverage-clover log/clover.xml \ --coverage-html /srv/org/wikimedia/integration/cover/mediawiki-core/master/php echo Code coverage report is available at: echo https://integration.wikimedia.org/cover/mediawiki-core/master/php; -- To view, visit https://gerrit.wikimedia.org/r/102138 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I3b0077322d0e1fc133449c945069a59742de4b11 Gerrit-PatchSet: 1 Gerrit-Project: integration/jenkins-job-builder-config Gerrit-Branch: master Gerrit-Owner: Hashar has...@free.fr Gerrit-Reviewer: Hashar has...@free.fr Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fixes for plural handling - change (mediawiki/core)
MarkAHershberger has submitted this change and it was merged.
Change subject: Fixes for plural handling
..
Fixes for plural handling
* A new protected method looks for explicitly defined forms. Every
overriden language class is required to use this method.
* Make explicit plural forms work for Russian. Russian has overridden
convertPlural method, that was not taking care of explicit plural
forms.
* Plural rules were updated to CLDR 24 for Manx (gv).
Bug: 46422
Bug: 47099
Bug: 54514
Change-Id: I46ab3dadc7fe08c1e60bbd81a1ee841e166e9608
---
M RELEASE-NOTES-1.22
M languages/Language.php
M languages/classes/LanguageBe_tarask.php
D languages/classes/LanguageGv.php
M languages/classes/LanguageHr.php
M languages/classes/LanguageKsh.php
M languages/classes/LanguageRu.php
M languages/classes/LanguageSr.php
M languages/classes/LanguageSr_ec.php
M languages/classes/LanguageSr_el.php
M languages/classes/LanguageUk.php
M languages/data/plurals-mediawiki.xml
M tests/phpunit/languages/LanguageBe_taraskTest.php
M tests/phpunit/languages/LanguageGvTest.php
M tests/phpunit/languages/LanguageRuTest.php
M tests/phpunit/languages/LanguageUkTest.php
16 files changed, 113 insertions(+), 81 deletions(-)
Approvals:
MarkAHershberger: Looks good to me, approved
diff --git a/RELEASE-NOTES-1.22 b/RELEASE-NOTES-1.22
index dad2438..8d93542 100644
--- a/RELEASE-NOTES-1.22
+++ b/RELEASE-NOTES-1.22
@@ -473,6 +473,10 @@
regularly. Below only new and removed languages are listed, as well as
changes to languages because of Bugzilla reports.
+* (bug 47099) Plural rules were updated to those from CLDR 24 for Manx (gv).
+* (bug 54514) Explicit plural forms now work for Russian.
+* (bug 46422) Explicit plural forms for languages that use a custom
+ implementation for Language::convertPlural now work correctly.
* Batak Toba (bbc-latn) added.
* (bug 46751) Made Buryat (Russia) (буряад) (bxr) fallback to Russian.
diff --git a/languages/Language.php b/languages/Language.php
index c24dc18..11d9103 100644
--- a/languages/Language.php
+++ b/languages/Language.php
@@ -3633,17 +3633,10 @@
*/
function convertPlural( $count, $forms ) {
// Handle explicit n=pluralform cases
- foreach ( $forms as $index = $form ) {
- if ( preg_match( '/^\d+=/i', $form ) ) {
- $pos = strpos( $form, '=' );
- if ( substr( $form, 0, $pos ) ===
(string)$count ) {
- return substr( $form, $pos + 1 );
- }
- unset( $forms[$index] );
- }
+ $forms = $this-handleExplicitPluralForms( $count, $forms );
+ if ( is_string( $forms ) ) {
+ return $forms;
}
-
- $forms = array_values( $forms );
if ( !count( $forms ) ) {
return '';
}
@@ -3654,6 +3647,34 @@
}
/**
+* Handles explicit plural forms for Language::convertPlural()
+*
+* In {{PLURAL:$1|0=nothing|one|many}}, 0=nothing will be returned if
$1 equals zero.
+* If an explicitly defined plural form matches the $count, then
+* string value returned, otherwise array returned for further
consideration
+* by CLDR rules or overridden convertPlural().
+*
+* @since 1.22.1
+*
+* @param int $count non-localized number
+* @param array $forms different plural forms
+*
+* @return array|string
+*/
+ protected function handleExplicitPluralForms( $count, array $forms ) {
+ foreach ( $forms as $index = $form ) {
+ if ( preg_match( '/\d+=/i', $form ) ) {
+ $pos = strpos( $form, '=' );
+ if ( substr( $form, 0, $pos ) === (string)
$count ) {
+ return substr( $form, $pos + 1 );
+ }
+ unset( $forms[$index] );
+ }
+ }
+ return array_values( $forms );
+ }
+
+ /**
* Checks that convertPlural was given an array and pads it to requested
* amount of forms by copying the last one.
*
diff --git a/languages/classes/LanguageBe_tarask.php
b/languages/classes/LanguageBe_tarask.php
index 6497b50..d3e78fe 100644
--- a/languages/classes/LanguageBe_tarask.php
+++ b/languages/classes/LanguageBe_tarask.php
@@ -46,6 +46,10 @@
* @return string
*/
function convertPlural( $count, $forms ) {
+ $forms = $this-handleExplicitPluralForms( $count, $forms );
+ if ( is_string( $forms ) ) {
+ return $forms;
+ }
[MediaWiki-commits] [Gerrit] Switch donate-lb esams to the text-lb IP - change (operations/dns)
Faidon Liambotis has uploaded a new change for review. https://gerrit.wikimedia.org/r/102139 Change subject: Switch donate-lb esams to the text-lb IP .. Switch donate-lb esams to the text-lb IP Apparently wikimedia-lb is no more and this is a separate DNS entry just by virtue of the IPv4/v6 split. Change-Id: I44ffd9c262e347447ff8672f13045bb59e901242 --- M templates/wikimedia.org 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/dns refs/changes/39/102139/1 diff --git a/templates/wikimedia.org b/templates/wikimedia.org index e1b6f74..c280777 100644 --- a/templates/wikimedia.org +++ b/templates/wikimedia.org @@ -946,7 +946,7 @@ ; Round robin record -donate-lb 1H IN A91.198.174.224 ; Explicitly v4 only +donate-lb 1H IN A91.198.174.192 ; Explicitly v4 only IN MX 10 aluminium.wikimedia.org. IN MX 20 grosley.wikimedia.org. text-lb1H IN A91.198.174.192 -- To view, visit https://gerrit.wikimedia.org/r/102139 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I44ffd9c262e347447ff8672f13045bb59e901242 Gerrit-PatchSet: 1 Gerrit-Project: operations/dns Gerrit-Branch: master Gerrit-Owner: Faidon Liambotis fai...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] git-logs: count categories in deploy script - change (mediawiki...release)
jenkins-bot has submitted this change and it was merged. Change subject: git-logs: count categories in deploy script .. git-logs: count categories in deploy script Change-Id: I559a8d3bf37669c6b76e02f63bcf4ff8c5ebaeeb --- M git-logs/log_updates.py 1 file changed, 3 insertions(+), 2 deletions(-) Approvals: Hashar: Looks good to me, approved jenkins-bot: Verified diff --git a/git-logs/log_updates.py b/git-logs/log_updates.py index 0283e22..70eb1a4 100755 --- a/git-logs/log_updates.py +++ b/git-logs/log_updates.py @@ -128,8 +128,9 @@ info(Generating wikitext ...) out = '' for heading in headings: -if len(log[heading]) 0: -out += '== %s ==\n\n' % heading.capitalize() +changes = len(log[heading]) +if changes 0: +out += '== %s (%s) ==\n\n' % (heading.capitalize(), changes) for commit in log[heading]: if 'pre' not in commit: out += '* %s\n' % commit -- To view, visit https://gerrit.wikimedia.org/r/101130 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I559a8d3bf37669c6b76e02f63bcf4ff8c5ebaeeb Gerrit-PatchSet: 3 Gerrit-Project: mediawiki/tools/release Gerrit-Branch: master Gerrit-Owner: Jdlrobson jrob...@wikimedia.org Gerrit-Reviewer: Awjrichards aricha...@wikimedia.org Gerrit-Reviewer: Hashar has...@free.fr Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Switch donate-lb esams to the text-lb IP - change (operations/dns)
Faidon Liambotis has submitted this change and it was merged. Change subject: Switch donate-lb esams to the text-lb IP .. Switch donate-lb esams to the text-lb IP Apparently wikimedia-lb is no more and this is a separate DNS entry just by virtue of the IPv4/v6 split. Change-Id: I44ffd9c262e347447ff8672f13045bb59e901242 --- M templates/wikimedia.org 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Faidon Liambotis: Looks good to me, approved jenkins-bot: Verified diff --git a/templates/wikimedia.org b/templates/wikimedia.org index e1b6f74..c280777 100644 --- a/templates/wikimedia.org +++ b/templates/wikimedia.org @@ -946,7 +946,7 @@ ; Round robin record -donate-lb 1H IN A91.198.174.224 ; Explicitly v4 only +donate-lb 1H IN A91.198.174.192 ; Explicitly v4 only IN MX 10 aluminium.wikimedia.org. IN MX 20 grosley.wikimedia.org. text-lb1H IN A91.198.174.192 -- To view, visit https://gerrit.wikimedia.org/r/102139 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I44ffd9c262e347447ff8672f13045bb59e901242 Gerrit-PatchSet: 1 Gerrit-Project: operations/dns Gerrit-Branch: master Gerrit-Owner: Faidon Liambotis fai...@wikimedia.org Gerrit-Reviewer: Faidon Liambotis fai...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add tests for scribunto integration and implementation - change (mediawiki...Wikibase)
jenkins-bot has submitted this change and it was merged. Change subject: Add tests for scribunto integration and implementation .. Add tests for scribunto integration and implementation Change-Id: I999bd41c3fdee94fef52d260903998aa11604544 --- M client/includes/scribunto/Scribunto_LuaWikibaseLibrary.php M client/includes/scribunto/Scribunto_LuaWikibaseLibraryImplementation.php M client/tests/phpunit/includes/scribunto/Scribunto_LuaWikibaseLibraryImplementationTest.php A client/tests/phpunit/includes/scribunto/Scribunto_LuaWikibaseLibraryTest.php 4 files changed, 215 insertions(+), 44 deletions(-) Approvals: Hoo man: Looks good to me, approved Jens Ohlig: Looks good to me, but someone else must approve Jeroen De Dauw: Looks good to me, but someone else must approve jenkins-bot: Verified diff --git a/client/includes/scribunto/Scribunto_LuaWikibaseLibrary.php b/client/includes/scribunto/Scribunto_LuaWikibaseLibrary.php index 2d7c373..278b3e7 100644 --- a/client/includes/scribunto/Scribunto_LuaWikibaseLibrary.php +++ b/client/includes/scribunto/Scribunto_LuaWikibaseLibrary.php @@ -3,6 +3,7 @@ use Wikibase\Settings; use ValueParsers\ParseException; use Wikibase\Client\WikibaseClient; +use Wikibase\Utils; /** * Registers and defines functions to access Wikibase through the Scribunto extension @@ -29,14 +30,19 @@ // See Scribunto_LuaLanguageLibrary::getContLangCode(). global $wgContLang; $language = $wgContLang; + $wikibaseClient = WikibaseClient::getDefaultInstance(); + $this-wbLibrary = new Scribunto_LuaWikibaseLibraryImplementation( - WikibaseClient::getDefaultInstance()-getEntityIdParser(), // EntityIdParser - WikibaseClient::getDefaultInstance()-getStore()-getEntityLookup(), // EntityLookup - WikibaseClient::getDefaultInstance()-getEntityIdFormatter(), // EntityIdFormatter - WikibaseClient::getDefaultInstance()-getStore()-getSiteLinkTable(), // SiteLinkLookup - $language, // language - Settings::get( 'siteGlobalID' ) // SiteID + $wikibaseClient-getEntityIdParser(), + $wikibaseClient-getStore()-getEntityLookup(), + $wikibaseClient-getEntityIdFormatter(), + $wikibaseClient-getStore()-getSiteLinkTable(), + $wikibaseClient-getLanguageFallbackChainFactory(), + $language, + Utils::getLanguageCodes(), + Settings::get( 'siteGlobalID' ) ); + parent::__construct( $engine ); } @@ -52,7 +58,9 @@ 'getGlobalSiteId' = array( $this, 'getGlobalSiteId' ) ); - $this-getEngine()-registerInterface( dirname( __FILE__ ) . '/mw.wikibase.lua', $lib, array() ); + return $this-getEngine()-registerInterface( + dirname( __FILE__ ) . '/mw.wikibase.lua', $lib, array() + ); } /** diff --git a/client/includes/scribunto/Scribunto_LuaWikibaseLibraryImplementation.php b/client/includes/scribunto/Scribunto_LuaWikibaseLibraryImplementation.php index 302619e..e72bbaf 100644 --- a/client/includes/scribunto/Scribunto_LuaWikibaseLibraryImplementation.php +++ b/client/includes/scribunto/Scribunto_LuaWikibaseLibraryImplementation.php @@ -1,7 +1,10 @@ ?php +use Wikibase\Entity; use Wikibase\Item; use Wikibase\DataModel\Entity\EntityId; +use Wikibase\DataModel\Entity\ItemId; +use Wikibase\DataModel\SimpleSiteLink; use Wikibase\EntityLookup; use Wikibase\SiteLinkLookup; use Wikibase\Lib\Serializers\SerializationOptions; @@ -10,7 +13,6 @@ use Wikibase\Lib\EntityIdParser; use Wikibase\LanguageFallbackChainFactory; use Wikibase\Utils; -use \Language; /** * Actual implementations of the functions to access Wikibase through the Scribunto extension @@ -34,27 +36,38 @@ /* @var SiteLinkLookup */ protected $siteLinkTable; + /* @var LanguageFallbackChainFactory */ + protected $fallbackChainFactory; + /* @var Language */ protected $language; + + /* @var string[] */ + protected $languageCodes; /* @var mixed */ protected $siteId; - /** * @param EntityIdParser $entityIdParser */ - public function __construct( EntityIdParser $entityIdParser, -EntityLookup $entityLookup, - EntityIdFormatter $entityIdFormatter, -SiteLinkLookup $siteLinkTable, -
[MediaWiki-commits] [Gerrit] i18n: add full-stop to error message - change (mediawiki...TwnMainPage)
Shirayuki has uploaded a new change for review. https://gerrit.wikimedia.org/r/102140 Change subject: i18n: add full-stop to error message .. i18n: add full-stop to error message Change-Id: I9586b662da3c93cc8e5a1ec0f4e96a975a48d80a --- M MainPage.i18n.php 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/TwnMainPage refs/changes/40/102140/1 diff --git a/MainPage.i18n.php b/MainPage.i18n.php index 0d5ff8d..e2447a7 100644 --- a/MainPage.i18n.php +++ b/MainPage.i18n.php @@ -62,7 +62,7 @@ 'twnmp-signup-error-invalidusername' = 'This username is not available. Please, pick a different one.', 'twnmp-signup-error-nonfreeusername' = 'This username already exists. Please, pick a different one.', - 'twnmp-signup-error-invalidpassword' = 'The password is invalid', + 'twnmp-signup-error-invalidpassword' = 'The password is invalid.', 'twnmp-signup-error-invalidemail' = 'This does not look like a valid email address. Please, provide a valid one.', 'twnmp-signup-error-other' = 'Signing up failed. The server returned an error: $1.', 'twnmp-signup-error-unknown' = 'Account creation failed for an unknown reason.', -- To view, visit https://gerrit.wikimedia.org/r/102140 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I9586b662da3c93cc8e5a1ec0f4e96a975a48d80a Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/TwnMainPage Gerrit-Branch: master Gerrit-Owner: Shirayuki shirayuk...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] contint: install libsikuli-script-java for browser tests - change (operations/puppet)
Hashar has uploaded a new change for review.
https://gerrit.wikimedia.org/r/102141
Change subject: contint: install libsikuli-script-java for browser tests
..
contint: install libsikuli-script-java for browser tests
Sikuli is a java application test to test input in web browsers. Going
to be used by QA to test VisualEditor. Luckily, the software has been
packaged for Debian/Ubuntu so it is really simple to install.
bug: 54393
Change-Id: I32e33f00899e77c9eb2bad88e73d718d99d9f8d9
---
M modules/contint/manifests/browsertests.pp
1 file changed, 1 insertion(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/41/102141/1
diff --git a/modules/contint/manifests/browsertests.pp
b/modules/contint/manifests/browsertests.pp
index 7403900..451a3a8 100644
--- a/modules/contint/manifests/browsertests.pp
+++ b/modules/contint/manifests/browsertests.pp
@@ -23,6 +23,7 @@
package { [
'wikimedia-task-appserver',
'php5-sqlite', # MediaWiki DB backend
+'libsikuli-script-java', # bug 54393
]: ensure = present
}
--
To view, visit https://gerrit.wikimedia.org/r/102141
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I32e33f00899e77c9eb2bad88e73d718d99d9f8d9
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Hashar has...@free.fr
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Temporarily restore the old wikimedia-lb IP (for donate) - change (operations/puppet)
Mark Bergsma has uploaded a new change for review.
https://gerrit.wikimedia.org/r/102142
Change subject: Temporarily restore the old wikimedia-lb IP (for donate)
..
Temporarily restore the old wikimedia-lb IP (for donate)
Change-Id: Icb320e07d0add9c807de528dd92a4844719d1720
---
M manifests/lvs.pp
M manifests/role/protoproxy.pp
2 files changed, 2 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/42/102142/1
diff --git a/manifests/lvs.pp b/manifests/lvs.pp
index 8b48ca2..f86e4ad 100644
--- a/manifests/lvs.pp
+++ b/manifests/lvs.pp
@@ -198,6 +198,7 @@
'bitslbsecure' = 91.198.174.233,
'uploadlbsecure' = '91.198.174.208',
'mobilelbsecure' = '91.198.174.236',
+ 'donatelbsecure' = '91.198.174.224',
'textlb6secure' =
'2620:0:862:ed1a::1',
'loginlbsecure6' =
'2620:0:862:ed1a::1:9',
diff --git a/manifests/role/protoproxy.pp b/manifests/role/protoproxy.pp
index 1d5abd0..b04d815 100644
--- a/manifests/role/protoproxy.pp
+++ b/manifests/role/protoproxy.pp
@@ -81,7 +81,7 @@
proxy_addresses = {
'pmtpa' = [ '208.80.152.200', '[2620:0:860:ed1a::]' ],
'eqiad' = [ '208.80.154.224', '[2620:0:861:ed1a::]' ],
-'esams' = [ '91.198.174.192', '91.198.174.201',
'[2620:0:862:ed1a::1:9]' ],
+'esams' = [ '91.198.174.192', '91.198.174.201', '91.198.174.224',
'[2620:0:862:ed1a::1:9]' ],
},
proxy_server_name = '*.wikimedia.org',
proxy_server_cert_name = 'unified.wikimedia.org',
--
To view, visit https://gerrit.wikimedia.org/r/102142
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Icb320e07d0add9c807de528dd92a4844719d1720
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Mark Bergsma m...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
