[MediaWiki-commits] [Gerrit] MediaWiki theme: Remove support for frameless primary buttons - change (oojs/ui)
jenkins-bot has submitted this change and it was merged.
Change subject: MediaWiki theme: Remove support for frameless primary buttons
..
MediaWiki theme: Remove support for frameless primary buttons
This reverts some of d6b05bc00e8261c371281365bfdfaad8dfb18abe.
In MediaWiki theme, now all buttons inserted into a toolbar will lose
the strict borders and look vaguely frameless. This was the intent of
the original patch. Frameless primary buttons make no sense in any
other context.
(It is still possible to put a frameless button into a toolbar, but it
will look rather silly.)
Bug: T103403
Change-Id: I9c70f447a1f000fbbd5f96ce9064f74f5fe809a1
---
M demos/pages/toolbars.js
M demos/pages/widgets.js
M src/themes/mediawiki/elements.less
M src/themes/mediawiki/tools.less
4 files changed, 17 insertions(+), 42 deletions(-)
Approvals:
Esanders: Looks good to me, approved
jenkins-bot: Verified
diff --git a/demos/pages/toolbars.js b/demos/pages/toolbars.js
index 4a58a33..9d257e0 100644
--- a/demos/pages/toolbars.js
+++ b/demos/pages/toolbars.js
@@ -217,8 +217,8 @@
}
] );
- saveButton = new OO.ui.ButtonWidget( { label: 'Save', framed: false,
flags: [ 'progressive', 'primary' ] } );
- deleteButton = new OO.ui.ButtonWidget( { label: 'Delete', framed:
false, flags: [ 'destructive' ] } );
+ saveButton = new OO.ui.ButtonWidget( { label: 'Save', flags: [
'progressive', 'primary' ] } );
+ deleteButton = new OO.ui.ButtonWidget( { label: 'Delete', flags: [
'destructive' ] } );
actionButton = new OO.ui.ButtonWidget( { label: 'Action' } );
actionButtonDisabled = new OO.ui.ButtonWidget( { label: 'Disabled',
disabled: true } );
toolbars[ 1 ].$actions
diff --git a/demos/pages/widgets.js b/demos/pages/widgets.js
index d4880b5..5c0843c 100644
--- a/demos/pages/widgets.js
+++ b/demos/pages/widgets.js
@@ -418,18 +418,6 @@
new OO.ui.FieldLayout(
new OO.ui.ButtonWidget( {
framed: false,
- flags: [ 'progressive',
'primary' ],
- icon: 'check',
- label: 'Primary'
- } ),
- {
- label: 'ButtonWidget
(frameless, primary, progressive)\u200E',
- align: 'top'
- }
- ),
- new OO.ui.FieldLayout(
- new OO.ui.ButtonWidget( {
- framed: false,
flags: [ 'warning' ],
icon: 'alert',
label: 'Warning'
diff --git a/src/themes/mediawiki/elements.less
b/src/themes/mediawiki/elements.less
index fa1b9d7..edf944b 100644
--- a/src/themes/mediawiki/elements.less
+++ b/src/themes/mediawiki/elements.less
@@ -29,7 +29,7 @@
height: @icon-size;
}
- -frameless:not( .oo-ui-flaggedElement-primary ) {
+ -frameless {
.oo-ui-buttonElement-button {
:focus {
box-shadow: inset 0 0 0 1px rgba(0,0,0,0.2), 0
0 0 1px rgba(0,0,0,0.2);
@@ -98,25 +98,6 @@
margin: 0.1em 0;
padding: 0.2em 0.8em;
border-radius: @border-radius;
- }
-
- // Support input/ from ButtonInputWidget
-input.oo-ui-buttonElement-button,
- .oo-ui-labelElement .oo-ui-buttonElement-button
.oo-ui-labelElement-label {
- line-height: @icon-size;
- }
-
- .oo-ui-widget-disabled .oo-ui-buttonElement-button {
- border: 1px solid @disabled-background;
- }
-
- .oo-ui-widget-enabled .oo-ui-buttonElement-button {
- border: @neutral-button-border;
- }
- }
-
- -framed, -frameless.oo-ui-flaggedElement-primary {
-.oo-ui-buttonElement-button {
:hover,
:focus {
@@ -130,6 +111,11 @@
);
}
+ // Support input/ from ButtonInputWidget
+input.oo-ui-buttonElement-button,
+ .oo-ui-labelElement .oo-ui-buttonElement-button
.oo-ui-labelElement-label {
+ line-height: @icon-size;
+ }
.oo-ui-iconElement {
.oo-ui-buttonElement-button
[MediaWiki-commits] [Gerrit] Tie translatewiki-shelllint to labs and Trusty - change (integration/config)
Hashar has uploaded a new change for review. https://gerrit.wikimedia.org/r/222587 Change subject: Tie translatewiki-shelllint to labs and Trusty .. Tie translatewiki-shelllint to labs and Trusty Change-Id: I4e53b0e852f45bd274cf75c9ab26d55c76a14521 --- M jjb/translatewiki.yaml 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/integration/config refs/changes/87/222587/1 diff --git a/jjb/translatewiki.yaml b/jjb/translatewiki.yaml index c3eae19..2bef02b 100644 --- a/jjb/translatewiki.yaml +++ b/jjb/translatewiki.yaml @@ -15,6 +15,7 @@ - job-template: name: 'translatewiki-shelllint' defaults: use-remote-zuul-no-submodules +node: contintLabsSlave UbuntuTrusty concurrent: true triggers: - zuul -- To view, visit https://gerrit.wikimedia.org/r/222587 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I4e53b0e852f45bd274cf75c9ab26d55c76a14521 Gerrit-PatchSet: 1 Gerrit-Project: integration/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] translatewiki-puppet-validate to labs + show puppet version - change (integration/config)
Hashar has uploaded a new change for review. https://gerrit.wikimedia.org/r/222588 Change subject: translatewiki-puppet-validate to labs + show puppet version .. translatewiki-puppet-validate to labs + show puppet version Change-Id: Ibc64a934679a5622265503237ae289a127bf149f --- M jjb/translatewiki.yaml 1 file changed, 3 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/integration/config refs/changes/88/222588/1 diff --git a/jjb/translatewiki.yaml b/jjb/translatewiki.yaml index 2bef02b..e5e24d6 100644 --- a/jjb/translatewiki.yaml +++ b/jjb/translatewiki.yaml @@ -2,13 +2,15 @@ - job-template: name: 'translatewiki-puppet-validate' defaults: use-remote-zuul -node: contintLabsSlave +node: contintLabsSlave UbuntuTrusty concurrent: true triggers: - zuul builders: - shell: | + echo -n Puppet version: + puppet --version find . -type f -name '*.pp' -print0 | xargs -t -n1 -0 puppet parser validate --verbose # Run bash on each file under /bin without actually executing the script (-n) -- To view, visit https://gerrit.wikimedia.org/r/222588 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ibc64a934679a5622265503237ae289a127bf149f Gerrit-PatchSet: 1 Gerrit-Project: integration/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] Tie mediawiki-core-release to labs and Precise - change (integration/config)
Hashar has uploaded a new change for review. https://gerrit.wikimedia.org/r/222593 Change subject: Tie mediawiki-core-release to labs and Precise .. Tie mediawiki-core-release to labs and Precise The job needs Zend 5.3 for now. It is no more triggered pending overhauling. Change-Id: I3232fbaf9ee2f09178da3f1a4ef7ce4dfd2463f6 --- M jjb/mediawiki.yaml 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/integration/config refs/changes/93/222593/1 diff --git a/jjb/mediawiki.yaml b/jjb/mediawiki.yaml index a490503..7d00228 100644 --- a/jjb/mediawiki.yaml +++ b/jjb/mediawiki.yaml @@ -292,6 +292,7 @@ - job-template: name: 'mediawiki-core-release' +node: contintLabsSlave UbuntuPrecise # Zend PHP 5.3.x concurrent: true triggers: -- To view, visit https://gerrit.wikimedia.org/r/222593 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I3232fbaf9ee2f09178da3f1a4ef7ce4dfd2463f6 Gerrit-PatchSet: 1 Gerrit-Project: integration/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] Remove usage of Entity::removeLabel - change (mediawiki...Wikibase)
Bene has uploaded a new change for review. https://gerrit.wikimedia.org/r/222603 Change subject: Remove usage of Entity::removeLabel .. Remove usage of Entity::removeLabel Change-Id: I091ad40999f958d4f33ac7baac2897658ddcac92 --- M lib/tests/phpunit/store/TermIndexTest.php M repo/tests/phpunit/includes/content/EntityHandlerTest.php 2 files changed, 20 insertions(+), 11 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase refs/changes/03/222603/1 diff --git a/lib/tests/phpunit/store/TermIndexTest.php b/lib/tests/phpunit/store/TermIndexTest.php index e2bf15a..b5514eb 100644 --- a/lib/tests/phpunit/store/TermIndexTest.php +++ b/lib/tests/phpunit/store/TermIndexTest.php @@ -461,14 +461,17 @@ $lookup-saveTermsOfEntity( $item ); // modify the item and save new set of terms + $item = new Item( new ItemId( 'Q568431314' ) ); $item-setLabel( 'en', 'abc' ); - $item-removeLabel( 'de' ); $item-setLabel( 'nl', 'jke' ); - $item-setDescription( 'it', '-xyz-' ); + $item-setDescription( 'en', '-abc-' ); + $item-setDescription( 'de', '-def-' ); + $item-setDescription( 'nl', '-ghi-' ); + $item-setDescription( 'it', 'ABC' ); $item-setAliases( 'en', array( 'ABC', 'X', '_' ) ); $item-setAliases( 'de', array( 'DEF', 'Y' ) ); $item-setAliases( 'nl', array( '_', 'Z', 'foo' ) ); - $item-setDescription( 'it', 'ABC' ); + $lookup-saveTermsOfEntity( $item ); // check that the stored terms are the ones in the modified items diff --git a/repo/tests/phpunit/includes/content/EntityHandlerTest.php b/repo/tests/phpunit/includes/content/EntityHandlerTest.php index 72deef9..ee399cd 100644 --- a/repo/tests/phpunit/includes/content/EntityHandlerTest.php +++ b/repo/tests/phpunit/includes/content/EntityHandlerTest.php @@ -232,27 +232,33 @@ $e1 = $this-newEntity(); $r1 = $this-fakeRevision( $this-newEntityContent( $e1 ), 1 ); - $e2 = $e1-copy(); + $e2 = $this-newEntity(); $e2-setLabel( 'en', 'Foo' ); $r2 = $this-fakeRevision( $this-newEntityContent( $e2 ), 2 ); - $e3 = $e2-copy(); + $e3 = $this-newEntity(); + $e3-setLabel( 'en', 'Foo' ); $e3-setLabel( 'de', 'Fuh' ); $r3 = $this-fakeRevision( $this-newEntityContent( $e3 ), 3 ); - $e4 = $e3-copy(); + $e4 = $this-newEntity(); + $e4-setLabel( 'en', 'Foo' ); + $e4-setLabel( 'de', 'Fuh' ); $e4-setLabel( 'fr', 'Fu' ); $r4 = $this-fakeRevision( $this-newEntityContent( $e4 ), 4 ); - $e5 = $e4-copy(); + $e5 = $this-newEntity(); $e5-setLabel( 'en', 'F00' ); + $e5-setLabel( 'de', 'Fuh' ); + $e5-setLabel( 'fr', 'Fu' ); $r5 = $this-fakeRevision( $this-newEntityContent( $e5 ), 5 ); - $e5u4 = $e5-copy(); - $e5u4-removeLabel( 'fr' ); + $e5u4 = $this-newEntity(); + $e5u4-setLabel( 'en', 'F00' ); + $e5u4-setLabel( 'de', 'Fuh' ); - $e5u4u3 = $e5u4-copy(); - $e5u4u3-removeLabel( 'de' ); + $e5u4u3 = $this-newEntity(); + $e5u4u3-setLabel( 'en', 'F00' ); return array( array( $r5, $r5, $r4, $this-newEntityContent( $e4 ), undo last edit ), -- To view, visit https://gerrit.wikimedia.org/r/222603 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I091ad40999f958d4f33ac7baac2897658ddcac92 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Wikibase Gerrit-Branch: master Gerrit-Owner: Bene benestar.wikime...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove i18n shim - change (mediawiki...DismissableSiteNotice)
Paladox has uploaded a new change for review.
https://gerrit.wikimedia.org/r/222572
Change subject: Remove i18n shim
..
Remove i18n shim
Change-Id: I6be0f8c67b9b48ab618e4b1ade4297d676bbed02
---
M .gitignore
D DismissableSiteNotice.i18n.php
M DismissableSiteNotice.php
A Gruntfile.js
A package.json
5 files changed, 33 insertions(+), 36 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/DismissableSiteNotice
refs/changes/72/222572/1
diff --git a/.gitignore b/.gitignore
index 98b092a..4bf4869 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
*~
*.kate-swp
.*.swp
+node_modules/
diff --git a/DismissableSiteNotice.i18n.php b/DismissableSiteNotice.i18n.php
deleted file mode 100644
index c232578..000
--- a/DismissableSiteNotice.i18n.php
+++ /dev/null
@@ -1,35 +0,0 @@
-?php
-/**
- * This is a backwards-compatibility shim, generated by:
- *
https://git.wikimedia.org/blob/mediawiki%2Fcore.git/HEAD/maintenance%2FgenerateJsonI18n.php
- *
- * Beginning with MediaWiki 1.23, translation strings are stored in json files,
- * and the EXTENSION.i18n.php file only exists to provide compatibility with
- * older releases of MediaWiki. For more information about this migration, see:
- * https://www.mediawiki.org/wiki/Requests_for_comment/Localisation_format
- *
- * This shim maintains compatibility back to MediaWiki 1.17.
- */
-$messages = array();
-if ( !function_exists( 'wfJsonI18nShim6a70a7d776e402df' ) ) {
- function wfJsonI18nShim6a70a7d776e402df( $cache, $code, $cachedData ) {
- $codeSequence = array_merge( array( $code ),
$cachedData['fallbackSequence'] );
- foreach ( $codeSequence as $csCode ) {
- $fileName = dirname( __FILE__ ) . /i18n/$csCode.json;
- if ( is_readable( $fileName ) ) {
- $data = FormatJson::decode( file_get_contents(
$fileName ), true );
- foreach ( array_keys( $data ) as $key ) {
- if ( $key === '' || $key[0] === '@' ) {
- unset( $data[$key] );
- }
- }
- $cachedData['messages'] = array_merge( $data,
$cachedData['messages'] );
- }
-
- $cachedData['deps'][] = new FileDependency( $fileName );
- }
- return true;
- }
-
- $GLOBALS['wgHooks']['LocalisationCacheRecache'][] =
'wfJsonI18nShim6a70a7d776e402df';
-}
diff --git a/DismissableSiteNotice.php b/DismissableSiteNotice.php
index 4e91e04..a1415e3 100644
--- a/DismissableSiteNotice.php
+++ b/DismissableSiteNotice.php
@@ -33,7 +33,6 @@
);
$wgMessagesDirs['DismissableSiteNotice'] = __DIR__ . '/i18n';
-$wgExtensionMessagesFiles['DismissableSiteNotice'] = __DIR__ .
'/DismissableSiteNotice.i18n.php';
$wgResourceModules['ext.dismissableSiteNotice'] = array(
'localBasePath' = __DIR__ . '/modules',
diff --git a/Gruntfile.js b/Gruntfile.js
new file mode 100644
index 000..9c56558
--- /dev/null
+++ b/Gruntfile.js
@@ -0,0 +1,20 @@
+/*jshint node:true */
+module.exports = function ( grunt ) {
+ grunt.loadNpmTasks( 'grunt-banana-checker' );
+ grunt.loadNpmTasks( 'grunt-jsonlint' );
+
+ grunt.initConfig( {
+ banana: {
+ all: 'i18n/'
+ },
+ jsonlint: {
+ all: [
+ '**/*.json',
+ '!node_modules/**'
+ ]
+ }
+ } );
+
+ grunt.registerTask( 'test', [ 'jsonlint', 'banana' ] );
+ grunt.registerTask( 'default', 'test' );
+};
diff --git a/package.json b/package.json
new file mode 100644
index 000..76e8a82
--- /dev/null
+++ b/package.json
@@ -0,0 +1,12 @@
+{
+ private: true,
+ scripts: {
+test: grunt test
+ },
+ devDependencies: {
+grunt: 0.4.5,
+grunt-cli: 0.1.13,
+grunt-banana-checker: 0.2.2,
+grunt-jsonlint: 1.0.4
+ }
+}
--
To view, visit https://gerrit.wikimedia.org/r/222572
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I6be0f8c67b9b48ab618e4b1ade4297d676bbed02
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/DismissableSiteNotice
Gerrit-Branch: master
Gerrit-Owner: Paladox thomasmulhall...@yahoo.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] ciperhsuites: add 'mid', changes to strong - change (operations/puppet)
BBlack has uploaded a new change for review.
https://gerrit.wikimedia.org/r/222575
Change subject: ciperhsuites: add 'mid', changes to strong
..
ciperhsuites: add 'mid', changes to strong
This should be a no-op for live production, as nothing is
currently using 'strong'.
This creates a new option 'mid', which is the same list that
'strong' had previously, but allows TLSv1.0. The compatibility of
such a setup is surprisingly decent, and is kind of an aiming
point for where the compat options eventually want to get to.
'strong' is updated to be stronger: TLSv1.2 + AEAD ciphersuites
only. This is the best we have available today in real browsers
and servers. If a service really requires that security trumps
all things, and is willing to reject insufficiently secure clients
that are common in the world, this is your choice.
This also limits apache2.2 to 'compat' only (which probably
should've been done back when compate-dhe was added).
Change-Id: I2960135f17af71eef1785a1d7104755f98f6bbda
---
M modules/wmflib/lib/puppet/parser/functions/ssl_ciphersuite.rb
1 file changed, 24 insertions(+), 19 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/75/222575/1
diff --git a/modules/wmflib/lib/puppet/parser/functions/ssl_ciphersuite.rb
b/modules/wmflib/lib/puppet/parser/functions/ssl_ciphersuite.rb
index 11edf96..93c96a1 100644
--- a/modules/wmflib/lib/puppet/parser/functions/ssl_ciphersuite.rb
+++ b/modules/wmflib/lib/puppet/parser/functions/ssl_ciphersuite.rb
@@ -14,9 +14,14 @@
# Note that due to POODLE, SSLv3 is universally disabled and none of these
# options are compatible with SSLv3-only clients such as IE6/XP.
# Current options are:
-# - strong: PFS required, ECDHE+AES suites only, TLSv1.1+ only.
-# Only works for fairly modern browsers. Definitely not
-# compatible with: Android 2.x, IE8/XP, OpenSSL 0.9.8, Java6.
+# - strong: Only TLSv1.2 with AEAD ciphers. In practice this is a very
+# short list, and requires a very modern client. No tradeoff
+# is made for compatibility. Definitely does not work with:
+# IE11, Android4.4, Java8, OpenSSL1.0, Safari(OSX)7
+# - mid:Supports TLSv1.0 and higher, and adds several forward-secret
+# options which are not AEAD. This is compatible with many
+# more clients than strong, but still not compatible with:
+# Android 2.x, IE8/XP, OpenSSL 0.9.8, Java6.
# - compat: Supports most legacy clients, PFS optional, TLSv1.0+ only.
# - compat-dhe: Upgrades 'compat' to use DHE for PFS with certain older
# clients. Breaks some older/commercial Java6 clients, but
@@ -58,20 +63,21 @@
module Puppet::Parser::Functions
# Basic list chunks, used to construct bigger lists
+ # General preference ordering:
+ # 0) ECDHE DHE Kx=RSA
+ # 1) GCM CBC
+ # 2) AES128 AES256
+ # 3) SHA-2 SHA-1
+ # 4) ECDSA RSA
basic = {
-# Only modern reasonably-secure browsers have these.
-# They're all forward-secret, and our preference ordering is
-# (higher trumps all lower considerations, if conflict):
-# 1) GCM CBC
-# 2) AES128 AES256
-# 3) SHA-2 SHA-1
-# 4) ECDSA RSA
'strong' = [
'-ALL',
'ECDHE-ECDSA-AES128-GCM-SHA256',
'ECDHE-RSA-AES128-GCM-SHA256',
'ECDHE-ECDSA-AES256-GCM-SHA384',
'ECDHE-RSA-AES256-GCM-SHA384',
+],
+'mid' = [
'ECDHE-ECDSA-AES128-SHA256',
'ECDHE-RSA-AES128-SHA256',
'ECDHE-ECDSA-AES128-SHA',
@@ -81,14 +87,12 @@
'ECDHE-ECDSA-AES256-SHA',
'ECDHE-RSA-AES256-SHA',
],
-# DHE-based forward-secret option to help e.g. Android 2 and OpenSSL 0.9.8
# Do not use on a server unless you're *sure* it's not using defaulted
# and/or weak DH parameters!
'compat-dhe' = [
'DHE-RSA-AES128-SHA',
],
# not-forward-secret compat for ancient stuff
-# pref rules same as 'strong' where applicable
'compat' = [
'AES128-GCM-SHA256',
'AES256-GCM-SHA384',
@@ -105,8 +109,9 @@
# Final lists exposed to callers
ciphersuites = {
'strong' = basic['strong'],
-'compat' = basic['strong'] + basic['compat'],
-'compat-dhe' = basic['strong'] + basic['compat-dhe'] + basic['compat'],
+'mid'= basic['strong'] + basic['mid'],
+'compat' = basic['strong'] + basic['mid'] + basic['compat'],
+'compat-dhe' = basic['strong'] + basic['mid'] + basic['compat-dhe'] +
basic['compat'],
}
newfunction(
@@ -116,7 +121,7 @@
Outputs the ssl configuration part of the webserver config.
Function parameters are:
servercode - either nginx, apache-2.2 or apache-2.4
- encryption_type - strong, compat, or compat-dhe (do not use compat-dhe unless
+ encryption_type - strong, mid, compat, or compat-dhe (do not
[MediaWiki-commits] [Gerrit] Check if links are 'known' rather than 'exist' locally - change (mediawiki...VisualEditor)
Esanders has uploaded a new change for review.
https://gerrit.wikimedia.org/r/222589
Change subject: Check if links are 'known' rather than 'exist' locally
..
Check if links are 'known' rather than 'exist' locally
This data is used for marking links red, but links which are known
but don't exist (e.g. interwikis) are not red.
Also fix bug in API caused by trying to return a value of (bool)true which is
apparently not allowed. Use (number)1 instead.
Bug: T104604
Change-Id: I599a513a27b31f7167e688d73bc3685141249971
---
M ApiVisualEditor.php
M modules/ve-mw/init/ve.init.mw.Target.js
2 files changed, 17 insertions(+), 17 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor
refs/changes/89/222589/1
diff --git a/ApiVisualEditor.php b/ApiVisualEditor.php
index 1055315..98da7c6 100644
--- a/ApiVisualEditor.php
+++ b/ApiVisualEditor.php
@@ -491,27 +491,27 @@
$links = array(
// Array of linked pages that are
missing
'missing' = array(),
- // For current revisions: true (treat
all non-missing pages as existing)
- // For old revisions: array of linked
pages that exist
- 'extant' = $restoring || !$cached ?
array() : true,
+ // For current revisions: true (treat
all non-missing pages as known)
+ // For old revisions: array of linked
pages that are known
+ 'known' = $restoring || !$cached ?
array() : 1,
);
if ( $cached ) {
- foreach ( $cached-getLinks() as $ns =
$dbks ) {
- foreach ( $dbks as $dbk = $id
) {
- $pft =
Title::makeTitle( $ns, $dbk )-getPrefixedText();
- if ( $id == 0 ) {
-
$links['missing'][] = $pft;
- } elseif ( $restoring )
{
-
$links['extant'][] = $pft;
+ foreach ( $cached-getLinks() as
$namespace = $cachedTitles ) {
+ foreach ( $cachedTitles as
$cachedTitleText = $exists ) {
+ $cachedTitle =
Title::makeTitle( $namespace, $cachedTitleText );
+ if (
!$cachedTitle-isKnown() ) {
+
$links['missing'][] = $cachedTitle-getPrefixedText();
+ } elseif (
$links['known'] !== 1 ) {
+
$links['known'][] = $cachedTitle-getPrefixedText();
}
}
}
}
// Add information about current page
- if ( !$title-exists() ) {
+ if ( !$title-isKnown() ) {
$links['missing'][] =
$title-getPrefixedText();
- } elseif ( $restoring ) {
- $links['extant'][] =
$title-getPrefixedText();
+ } elseif ( $links['known'] !== 1 ) {
+ $links['known'][] =
$title-getPrefixedText();
}
// On parser cache miss, just don't bother
populating red link data
diff --git a/modules/ve-mw/init/ve.init.mw.Target.js
b/modules/ve-mw/init/ve.init.mw.Target.js
index 62bab98..7d114da 100644
--- a/modules/ve-mw/init/ve.init.mw.Target.js
+++ b/modules/ve-mw/init/ve.init.mw.Target.js
@@ -367,18 +367,18 @@
// Populate link cache
if ( data.links ) {
- // Format from the API: { missing: [titles], extant:
true|[titles] }
+ // Format from the API: { missing: [titles], known:
1|[titles] }
// Format expected by LinkCache: { title: { missing:
true|false } }
linkData = {};
for ( i = 0, len = data.links.missing.length; i len;
i++ ) {
linkData[data.links.missing[i]] = { missing:
true };
}
- if (
[MediaWiki-commits] [Gerrit] Tie mediawiki-core-release to labs and Precise - change (integration/config)
jenkins-bot has submitted this change and it was merged. Change subject: Tie mediawiki-core-release to labs and Precise .. Tie mediawiki-core-release to labs and Precise The job needs Zend 5.3 for now. It is no more triggered pending overhauling. Change-Id: I3232fbaf9ee2f09178da3f1a4ef7ce4dfd2463f6 --- M jjb/mediawiki.yaml 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Hashar: Looks good to me, approved jenkins-bot: Verified diff --git a/jjb/mediawiki.yaml b/jjb/mediawiki.yaml index a490503..7d00228 100644 --- a/jjb/mediawiki.yaml +++ b/jjb/mediawiki.yaml @@ -292,6 +292,7 @@ - job-template: name: 'mediawiki-core-release' +node: contintLabsSlave UbuntuPrecise # Zend PHP 5.3.x concurrent: true triggers: -- To view, visit https://gerrit.wikimedia.org/r/222593 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I3232fbaf9ee2f09178da3f1a4ef7ce4dfd2463f6 Gerrit-PatchSet: 1 Gerrit-Project: integration/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] Unify whitespace in array() functions - change (mediawiki...Wikibase)
jenkins-bot has submitted this change and it was merged.
Change subject: Unify whitespace in array() functions
..
Unify whitespace in array() functions
How did I missed these in I038a0f4? I was sure I did a regex search
for these.
Change-Id: I03b0d9863e5bde22d4d2df98e4ceeb3e6e48e857
---
M
client/tests/phpunit/includes/DataAccess/PropertyParserFunction/VariantsAwareRendererTest.php
M lib/tests/phpunit/entity/EntityFactoryTest.php
M repo/includes/ChangePruner.php
M repo/includes/Diff/EntityDiffVisualizer.php
M repo/includes/store/sql/DispatchStats.php
M repo/tests/phpunit/includes/ChangeOp/ChangeOpAliasesTest.php
M repo/tests/phpunit/includes/ChangeOp/ChangeOpDescriptionTest.php
M repo/tests/phpunit/includes/ChangeOp/ChangeOpLabelTest.php
M repo/tests/phpunit/includes/ChangeOp/ChangeOpMainSnakTest.php
M repo/tests/phpunit/includes/ChangeOp/ChangeOpQualifierRemoveTest.php
M repo/tests/phpunit/includes/ChangeOp/ChangeOpQualifierTest.php
M repo/tests/phpunit/includes/ChangeOp/ChangeOpReferenceRemoveTest.php
M repo/tests/phpunit/includes/ChangeOp/ChangeOpReferenceTest.php
M repo/tests/phpunit/includes/ChangeOp/ChangeOpRemoveStatementTest.php
M repo/tests/phpunit/includes/ChangeOp/ChangeOpSiteLinkTest.php
M repo/tests/phpunit/includes/ChangeOp/ChangeOpStatementRankTest.php
M repo/tests/phpunit/includes/ChangeOp/ChangeOpsTest.php
M repo/tests/phpunit/includes/IO/EntityIdReaderTest.php
M repo/tests/phpunit/includes/Validators/SnakValidatorTest.php
M repo/tests/phpunit/includes/specials/SpecialMergeItemsTest.php
20 files changed, 59 insertions(+), 59 deletions(-)
Approvals:
Jeroen De Dauw: Looks good to me, approved
jenkins-bot: Verified
diff --git
a/client/tests/phpunit/includes/DataAccess/PropertyParserFunction/VariantsAwareRendererTest.php
b/client/tests/phpunit/includes/DataAccess/PropertyParserFunction/VariantsAwareRendererTest.php
index a7c56ba..c2eed75 100644
---
a/client/tests/phpunit/includes/DataAccess/PropertyParserFunction/VariantsAwareRendererTest.php
+++
b/client/tests/phpunit/includes/DataAccess/PropertyParserFunction/VariantsAwareRendererTest.php
@@ -60,7 +60,7 @@
array(
'-{zh:mo;zh-hans:mo;zh-hant:mo;zh-cn:mo;zh-hk:mo;}-',
$itemId,
- array ( 'zh', 'zh-hans', 'zh-hant', 'zh-cn',
'zh-hk' ),
+ array( 'zh', 'zh-hans', 'zh-hant', 'zh-cn',
'zh-hk' ),
'cat'
),
// Don't create -{}- for empty input,
diff --git a/lib/tests/phpunit/entity/EntityFactoryTest.php
b/lib/tests/phpunit/entity/EntityFactoryTest.php
index c8f783e..c7b5aab 100644
--- a/lib/tests/phpunit/entity/EntityFactoryTest.php
+++ b/lib/tests/phpunit/entity/EntityFactoryTest.php
@@ -35,10 +35,10 @@
$tests = array();
foreach ( $this-getEntityFactory()-getEntityTypes() as $type
) {
- $tests[] = array ( $type, true );
+ $tests[] = array( $type, true );
}
- $tests[] = array ( 'this-does-not-exist', false );
+ $tests[] = array( 'this-does-not-exist', false );
return $tests;
}
diff --git a/repo/includes/ChangePruner.php b/repo/includes/ChangePruner.php
index 91946e2..8a3e438 100644
--- a/repo/includes/ChangePruner.php
+++ b/repo/includes/ChangePruner.php
@@ -89,7 +89,7 @@
if ( !$this-ignoreDispatch ) {
$dbr = wfGetDB( DB_SLAVE );
$row = $dbr-selectRow(
- array ( 'wb_changes_dispatch', 'wb_changes' ),
+ array( 'wb_changes_dispatch', 'wb_changes' ),
'min(change_time) as timestamp',
array(
'chd_disabled' = 0,
diff --git a/repo/includes/Diff/EntityDiffVisualizer.php
b/repo/includes/Diff/EntityDiffVisualizer.php
index 49a85dd..f8fdc4e 100644
--- a/repo/includes/Diff/EntityDiffVisualizer.php
+++ b/repo/includes/Diff/EntityDiffVisualizer.php
@@ -109,7 +109,7 @@
$termDiffVisualizer = new DiffView(
array(),
new Diff(
- array (
+ array(
$this-context-getLanguage()-getMessage( 'wikibase-diffview-label' ) =
$diff-getLabelsDiff(),
$this-context-getLanguage()-getMessage( 'wikibase-diffview-alias' ) =
$diff-getAliasesDiff(),
$this-context-getLanguage()-getMessage( 'wikibase-diffview-description' ) =
$diff-getDescriptionsDiff(),
@@ -132,7 +132,7 @@
$linkDiffVisualizer = new DiffView(
[MediaWiki-commits] [Gerrit] repool db1022 with throttled traffic - change (operations/mediawiki-config)
Jcrespo has uploaded a new change for review. https://gerrit.wikimedia.org/r/222598 Change subject: repool db1022 with throttled traffic .. repool db1022 with throttled traffic db1022 has been recently upgraded to jessie, we repool it with lower precedence to be careful. Change-Id: I90767a0395b1467df7d290a50bec51eefe07f2f2 References: T101516 --- M wmf-config/db-eqiad.php 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/98/222598/1 diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php index fbc05a7..cc92013 100755 --- a/wmf-config/db-eqiad.php +++ b/wmf-config/db-eqiad.php @@ -134,10 +134,10 @@ ), 's6' = array( 'db1023' = 0, # 1.4TB 64GB -# 'db1022' = 0, # 1.4TB 64GB, snapshot, vslow, dump (down for maint) + 'db1022' = 10, # 1.4TB 64GB, (testing after maintenance) 'db1030' = 0, # 1.4TB 64GB, watchlist, recentchanges, contributions, logpager 'db1050' = 400, # 1.4TB 64GB - 'db1037' = 0, # 1.4TB 64GB, snapshot, vslow, dump (while 1022 down) + 'db1037' = 0, # 1.4TB 64GB, snapshot, vslow, dump (while 1022 test) 'db1061' = 500, # 2.8TB 128GB ), 's7' = array( -- To view, visit https://gerrit.wikimedia.org/r/222598 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I90767a0395b1467df7d290a50bec51eefe07f2f2 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Jcrespo jcre...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Blacklist kernel modules - change (operations/puppet)
Muehlenhoff has submitted this change and it was merged.
Change subject: Blacklist kernel modules
..
Blacklist kernel modules
Maintain a list of kernel modules blacklisted from autoloading through udev
or other automated loading mechanisms. Initially only blacklist overlayfs,
but more to follow in a later commit.
Bug: T102600
Change-Id: I3325cf131e9e18078bcdf657e14aab0b4ba27872
---
A modules/base/files/kernel/blacklist-wmf.conf
M modules/base/manifests/init.pp
A modules/base/manifests/kernel.pp
3 files changed, 17 insertions(+), 0 deletions(-)
Approvals:
Muehlenhoff: Verified; Looks good to me, approved
BBlack: Looks good to me, but someone else must approve
diff --git a/modules/base/files/kernel/blacklist-wmf.conf
b/modules/base/files/kernel/blacklist-wmf.conf
new file mode 100644
index 000..56a8751
--- /dev/null
+++ b/modules/base/files/kernel/blacklist-wmf.conf
@@ -0,0 +1 @@
+blacklist overlayfs
diff --git a/modules/base/manifests/init.pp b/modules/base/manifests/init.pp
index 2cac1e6..2cd0553 100644
--- a/modules/base/manifests/init.pp
+++ b/modules/base/manifests/init.pp
@@ -62,6 +62,7 @@
include role::salt::minions
include role::trebuchet
include nrpe
+include base::kernel
# include base::monitor::host.
# if $nagios_contact_group is set, then use it
diff --git a/modules/base/manifests/kernel.pp b/modules/base/manifests/kernel.pp
new file mode 100644
index 000..08e3436
--- /dev/null
+++ b/modules/base/manifests/kernel.pp
@@ -0,0 +1,15 @@
+# == Class: base::kernel
+#
+# Settings related to the Linux kernel (currently only blacklisting
+# risky kernel modules)
+#
+class base::kernel
+{
+file { '/etc/modprobe.d/blacklist-wmf.conf':
+ensure = present,
+owner = 'root',
+group = 'root',
+mode = '0444',
+source = 'puppet:///modules/base/kernel/blacklist-wmf.conf',
+}
+}
--
To view, visit https://gerrit.wikimedia.org/r/219786
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I3325cf131e9e18078bcdf657e14aab0b4ba27872
Gerrit-PatchSet: 4
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Muehlenhoff mmuhlenh...@wikimedia.org
Gerrit-Reviewer: BBlack bbl...@wikimedia.org
Gerrit-Reviewer: Dzahn dz...@wikimedia.org
Gerrit-Reviewer: Muehlenhoff mmuhlenh...@wikimedia.org
Gerrit-Reviewer: Yuvipanda yuvipa...@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] Allow Subject.originPage to be updated - change (pywikibot/core)
John Vandenberg has uploaded a new change for review. https://gerrit.wikimedia.org/r/222605 Change subject: Allow Subject.originPage to be updated .. Allow Subject.originPage to be updated 3488a4b1bb introduced a bug by changing a attribute to be a property without a setter, however interwiki.py frequently sets this value. Change-Id: I656e03a1d7499f7e1ba79185a8c55a5d3061681a --- M pywikibot/interwiki_graph.py 1 file changed, 13 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core refs/changes/05/222605/1 diff --git a/pywikibot/interwiki_graph.py b/pywikibot/interwiki_graph.py index 91aa181..2263dbc 100644 --- a/pywikibot/interwiki_graph.py +++ b/pywikibot/interwiki_graph.py @@ -91,6 +91,11 @@ Page on the origin wiki. return self._origin +@origin.setter +def origin(self, value): +Page on the origin wiki. +self._origin = value + @property def originPage(self): Deprecated property for the origin page. @@ -100,6 +105,14 @@ # TODO: deprecate this property return self.origin +@originPage.setter +def originPage(self, value): +Deprecated property for the origin page. + +DEPRECATED. Use origin. + +self.origin = value + @property def foundIn(self): Mapping of pages to others pages interwiki linked to it. -- To view, visit https://gerrit.wikimedia.org/r/222605 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I656e03a1d7499f7e1ba79185a8c55a5d3061681a Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: John Vandenberg jay...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Migrate parsoidsvc-php-parsertests to labs - change (integration/config)
Hashar has uploaded a new change for review. https://gerrit.wikimedia.org/r/222577 Change subject: Migrate parsoidsvc-php-parsertests to labs .. Migrate parsoidsvc-php-parsertests to labs Bug: T101966 Change-Id: I7b0deacf9d0aa15d2afcddc9308d710c4988c99f --- M jjb/parsoidsvc.yaml 1 file changed, 1 insertion(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/integration/config refs/changes/77/222577/1 diff --git a/jjb/parsoidsvc.yaml b/jjb/parsoidsvc.yaml index 6becd17..89f7ba5 100644 --- a/jjb/parsoidsvc.yaml +++ b/jjb/parsoidsvc.yaml @@ -10,7 +10,7 @@ # Runs MediaWiki core @master PHP parser tests - job-template: name: parsoidsvc-php-parsertests -node: hasSlaveScripts UbuntuPrecise +node: contintLabsSlave UbuntuPrecise concurrent: true wrappers: - timeout: @@ -23,7 +23,6 @@ scm: - git: url: '$ZUUL_URL/$ZUUL_PROJECT' -reference-repo: '/srv/ssd/gerrit/$ZUUL_PROJECT.git' branches: - '$ZUUL_COMMIT' refspec: '$ZUUL_REF' -- To view, visit https://gerrit.wikimedia.org/r/222577 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I7b0deacf9d0aa15d2afcddc9308d710c4988c99f Gerrit-PatchSet: 1 Gerrit-Project: integration/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] [QA] Check for user's own lists in browser tests - change (mediawiki...Gather)
Phuedx has uploaded a new change for review.
https://gerrit.wikimedia.org/r/222578
Change subject: [QA] Check for user's own lists in browser tests
..
[QA] Check for user's own lists in browser tests
When running the tests against a shared, dirty environment, i.e. the
beta cluster, checking to see whether there are 100 collections is
different from checking to see whether the user has 100 collections. If
tests have been run with a different user's credentials, then the former
will be true whereas the latter will be false.
Change the there are more than 100 collections step definition to
query for the user's collections.
Change-Id: Ia88c916604df5ab403e87e081e98d436961005ab
---
M tests/browser/features/step_definitions/recent_collections_steps.rb
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Gather
refs/changes/78/222578/1
diff --git
a/tests/browser/features/step_definitions/recent_collections_steps.rb
b/tests/browser/features/step_definitions/recent_collections_steps.rb
index befeddd..5c79fd5 100644
--- a/tests/browser/features/step_definitions/recent_collections_steps.rb
+++ b/tests/browser/features/step_definitions/recent_collections_steps.rb
@@ -1,5 +1,5 @@
Given(/^there are more than 100 collections$/) do
- response = api.action(:query, list: 'lists', lstmode: 'allpublic', lstlimit:
101)
+ response = api.action(:query, list: 'lists', owner: user, lstlimit: 101)
1.upto(101-response.data['lists'].length) { |i| make_collection(B#{i}) }
end
--
To view, visit https://gerrit.wikimedia.org/r/222578
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia88c916604df5ab403e87e081e98d436961005ab
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Gather
Gerrit-Branch: master
Gerrit-Owner: Phuedx g...@samsmith.io
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove last occurence of label 'hasSlaveScripts' - change (integration/config)
jenkins-bot has submitted this change and it was merged.
Change subject: Remove last occurence of label 'hasSlaveScripts'
..
Remove last occurence of label 'hasSlaveScripts'
The last use is in the job template '{name}-phpcs'. Although it is
unused, migrate it to 'contintLabsSlave'.
Bug: T101966
Change-Id: I370d4e5adf29e93f7f0e672c7ce5e41d9cb5ed24
---
M jjb/job-templates.yaml
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Hashar: Looks good to me, approved
jenkins-bot: Verified
diff --git a/jjb/job-templates.yaml b/jjb/job-templates.yaml
index bffbfc5..16eaa76 100644
--- a/jjb/job-templates.yaml
+++ b/jjb/job-templates.yaml
@@ -288,7 +288,7 @@
# PHP CodeSniffer on everything under the workspace
- job-template:
name: '{name}-phpcs'
-node: hasSlaveScripts UbuntuPrecise
+node: contintLabsSlave UbuntuPrecise
defaults: use-remote-zuul-no-submodules
concurrent: true
triggers:
--
To view, visit https://gerrit.wikimedia.org/r/222579
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I370d4e5adf29e93f7f0e672c7ce5e41d9cb5ed24
Gerrit-PatchSet: 1
Gerrit-Project: integration/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] Enable ShortUrl extension at orwiktionary - change (operations/mediawiki-config)
Glaisher has uploaded a new change for review. https://gerrit.wikimedia.org/r/222584 Change subject: Enable ShortUrl extension at orwiktionary .. Enable ShortUrl extension at orwiktionary Needs shorturls table to be created. Bug: T103644 Change-Id: I4728de7b9a8c304c597a329cc4aefb903094bdc7 --- M wmf-config/InitialiseSettings.php 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/84/222584/1 diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index da50cfe..f7f6e66 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -14129,6 +14129,7 @@ 'knwiki' = true, // T97218 'newiki' = true, // T92820 'orwiki' = true, + 'orwiktionary' = true, // T103644 'sawiki' = true, // T94660 'sawikibooks' = true, // T94660 'sawikiquote' = true, // T94660 -- To view, visit https://gerrit.wikimedia.org/r/222584 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I4728de7b9a8c304c597a329cc4aefb903094bdc7 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Glaisher glaisher.w...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Migrate analytics-kraken to labs - change (integration/config)
Hashar has uploaded a new change for review. https://gerrit.wikimedia.org/r/222583 Change subject: Migrate analytics-kraken to labs .. Migrate analytics-kraken to labs Change-Id: I04154a8b5b8fed3ff73845bf3a7a9f2b59b31f1f --- M jjb/analytics.yaml 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/integration/config refs/changes/83/222583/1 diff --git a/jjb/analytics.yaml b/jjb/analytics.yaml index fd91dc1..c00d4df 100644 --- a/jjb/analytics.yaml +++ b/jjb/analytics.yaml @@ -21,6 +21,7 @@ - job-template: name: 'analytics-kraken' project-type: maven +node: contintLabsSlave UbuntuTrusty triggers: - zuul scm: -- To view, visit https://gerrit.wikimedia.org/r/222583 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I04154a8b5b8fed3ff73845bf3a7a9f2b59b31f1f Gerrit-PatchSet: 1 Gerrit-Project: integration/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] Tie wikidata-gremlins to labs and Trusty - change (integration/config)
jenkins-bot has submitted this change and it was merged. Change subject: Tie wikidata-gremlins to labs and Trusty .. Tie wikidata-gremlins to labs and Trusty Prevents the job from roaming on prod slaves. Change-Id: I0116e5503e00b86e1731ebe3051b525073256a2c --- M jjb/wikidata.yaml 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Hashar: Looks good to me, approved jenkins-bot: Verified diff --git a/jjb/wikidata.yaml b/jjb/wikidata.yaml index e624d86..ea41544 100644 --- a/jjb/wikidata.yaml +++ b/jjb/wikidata.yaml @@ -158,6 +158,7 @@ - job: name: wikidata-gremlin project-type: maven +node: contintLabsSlave UbuntuTrusty jdk: 'Ubuntu - OpenJdk 7' triggers: - zuul -- To view, visit https://gerrit.wikimedia.org/r/222586 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I0116e5503e00b86e1731ebe3051b525073256a2c Gerrit-PatchSet: 1 Gerrit-Project: integration/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] Tie mwext-PoolCounter-build to labs and Trusty - change (integration/config)
Hashar has uploaded a new change for review. https://gerrit.wikimedia.org/r/222590 Change subject: Tie mwext-PoolCounter-build to labs and Trusty .. Tie mwext-PoolCounter-build to labs and Trusty Change-Id: If7bb2b8fe99e8979d33bf184db1828d3b8ecea36 --- M jjb/mediawiki-extensions.yaml 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/integration/config refs/changes/90/222590/1 diff --git a/jjb/mediawiki-extensions.yaml b/jjb/mediawiki-extensions.yaml index 987037b..e090bd1 100644 --- a/jjb/mediawiki-extensions.yaml +++ b/jjb/mediawiki-extensions.yaml @@ -318,6 +318,7 @@ - job-template: name: 'mwext-PoolCounter-build' +node: contintLabsSlave UbuntuTrusty defaults: use-remote-zuul triggers: - zuul -- To view, visit https://gerrit.wikimedia.org/r/222590 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If7bb2b8fe99e8979d33bf184db1828d3b8ecea36 Gerrit-PatchSet: 1 Gerrit-Project: integration/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] translatewiki-puppet-validate to labs + show puppet version - change (integration/config)
jenkins-bot has submitted this change and it was merged. Change subject: translatewiki-puppet-validate to labs + show puppet version .. translatewiki-puppet-validate to labs + show puppet version Change-Id: Ibc64a934679a5622265503237ae289a127bf149f --- M jjb/translatewiki.yaml 1 file changed, 3 insertions(+), 1 deletion(-) Approvals: Hashar: Looks good to me, approved jenkins-bot: Verified diff --git a/jjb/translatewiki.yaml b/jjb/translatewiki.yaml index 2bef02b..e5e24d6 100644 --- a/jjb/translatewiki.yaml +++ b/jjb/translatewiki.yaml @@ -2,13 +2,15 @@ - job-template: name: 'translatewiki-puppet-validate' defaults: use-remote-zuul -node: contintLabsSlave +node: contintLabsSlave UbuntuTrusty concurrent: true triggers: - zuul builders: - shell: | + echo -n Puppet version: + puppet --version find . -type f -name '*.pp' -print0 | xargs -t -n1 -0 puppet parser validate --verbose # Run bash on each file under /bin without actually executing the script (-n) -- To view, visit https://gerrit.wikimedia.org/r/222588 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ibc64a934679a5622265503237ae289a127bf149f Gerrit-PatchSet: 1 Gerrit-Project: integration/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] Tie translatewiki-shelllint to labs and Trusty - change (integration/config)
jenkins-bot has submitted this change and it was merged. Change subject: Tie translatewiki-shelllint to labs and Trusty .. Tie translatewiki-shelllint to labs and Trusty Change-Id: I4e53b0e852f45bd274cf75c9ab26d55c76a14521 --- M jjb/translatewiki.yaml 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Hashar: Looks good to me, approved jenkins-bot: Verified diff --git a/jjb/translatewiki.yaml b/jjb/translatewiki.yaml index c3eae19..2bef02b 100644 --- a/jjb/translatewiki.yaml +++ b/jjb/translatewiki.yaml @@ -15,6 +15,7 @@ - job-template: name: 'translatewiki-shelllint' defaults: use-remote-zuul-no-submodules +node: contintLabsSlave UbuntuTrusty concurrent: true triggers: - zuul -- To view, visit https://gerrit.wikimedia.org/r/222587 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I4e53b0e852f45bd274cf75c9ab26d55c76a14521 Gerrit-PatchSet: 1 Gerrit-Project: integration/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 i18n shim - change (mediawiki...MultimediaViewer)
jenkins-bot has submitted this change and it was merged.
Change subject: Remove i18n shim
..
Remove i18n shim
Change-Id: Icfce940ded9d5d942b6f4043b2c5c46da376fc3b
---
D MultimediaViewer.i18n.php
M MultimediaViewer.php
2 files changed, 0 insertions(+), 36 deletions(-)
Approvals:
Umherirrender: Looks good to me, approved
jenkins-bot: Verified
diff --git a/MultimediaViewer.i18n.php b/MultimediaViewer.i18n.php
deleted file mode 100644
index ddfc9aa..000
--- a/MultimediaViewer.i18n.php
+++ /dev/null
@@ -1,35 +0,0 @@
-?php
-/**
- * This is a backwards-compatibility shim, generated by:
- *
https://git.wikimedia.org/blob/mediawiki%2Fcore.git/HEAD/maintenance%2FgenerateJsonI18n.php
- *
- * Beginning with MediaWiki 1.23, translation strings are stored in json files,
- * and the EXTENSION.i18n.php file only exists to provide compatibility with
- * older releases of MediaWiki. For more information about this migration, see:
- * https://www.mediawiki.org/wiki/Requests_for_comment/Localisation_format
- *
- * This shim maintains compatibility back to MediaWiki 1.17.
- */
-$messages = array();
-if ( !function_exists( 'wfJsonI18nShimb0940a6dae262b5d' ) ) {
- function wfJsonI18nShimb0940a6dae262b5d( $cache, $code, $cachedData ) {
- $codeSequence = array_merge( array( $code ),
$cachedData['fallbackSequence'] );
- foreach ( $codeSequence as $csCode ) {
- $fileName = dirname( __FILE__ ) . /i18n/$csCode.json;
- if ( is_readable( $fileName ) ) {
- $data = FormatJson::decode( file_get_contents(
$fileName ), true );
- foreach ( array_keys( $data ) as $key ) {
- if ( $key === '' || $key[0] === '@' ) {
- unset( $data[$key] );
- }
- }
- $cachedData['messages'] = array_merge( $data,
$cachedData['messages'] );
- }
-
- $cachedData['deps'][] = new FileDependency( $fileName );
- }
- return true;
- }
-
- $GLOBALS['wgHooks']['LocalisationCacheRecache'][] =
'wfJsonI18nShimb0940a6dae262b5d';
-}
diff --git a/MultimediaViewer.php b/MultimediaViewer.php
index 41af5a7..508c5ba 100644
--- a/MultimediaViewer.php
+++ b/MultimediaViewer.php
@@ -126,7 +126,6 @@
}
$wgMessagesDirs['MultimediaViewer'] = __DIR__ . '/i18n';
-$wgExtensionMessagesFiles['MultimediaViewer'] = __DIR__ .
'/MultimediaViewer.i18n.php';
/**
* @param string $path
--
To view, visit https://gerrit.wikimedia.org/r/222571
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Icfce940ded9d5d942b6f4043b2c5c46da376fc3b
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/MultimediaViewer
Gerrit-Branch: master
Gerrit-Owner: Paladox thomasmulhall...@yahoo.com
Gerrit-Reviewer: Gilles gdu...@wikimedia.org
Gerrit-Reviewer: Jforrester jforres...@wikimedia.org
Gerrit-Reviewer: Legoktm legoktm.wikipe...@gmail.com
Gerrit-Reviewer: Siebrand siebr...@kitano.nl
Gerrit-Reviewer: Umherirrender umherirrender_de...@web.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] [WIP] Use QuantityInput expert - change (mediawiki...Wikibase)
Thiemo Mättig (WMDE) has uploaded a new change for review. https://gerrit.wikimedia.org/r/222597 Change subject: [WIP] Use QuantityInput expert .. [WIP] Use QuantityInput expert This requires a new release of ValueView! Change-Id: Id741223faad0918a3d0ccd2bd3294ab88f1b8e47 --- M repo/resources/experts/getStore.js M repo/resources/experts/resources.php 2 files changed, 2 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase refs/changes/97/222597/1 diff --git a/repo/resources/experts/getStore.js b/repo/resources/experts/getStore.js index 0fced22..85bc9ec 100644 --- a/repo/resources/experts/getStore.js +++ b/repo/resources/experts/getStore.js @@ -19,7 +19,7 @@ ); expertStore.registerDataValueExpert( - vv.experts.StringValue, + vv.experts.QuantityInput, dv.QuantityValue.TYPE ); diff --git a/repo/resources/experts/resources.php b/repo/resources/experts/resources.php index 3609ca8..fd06f4f 100644 --- a/repo/resources/experts/resources.php +++ b/repo/resources/experts/resources.php @@ -35,6 +35,7 @@ 'jquery.valueview.experts.CommonsMediaType', 'jquery.valueview.experts.GlobeCoordinateInput', 'jquery.valueview.experts.MonolingualText', + 'jquery.valueview.experts.QuantityInput', 'jquery.valueview.experts.StringValue', 'jquery.valueview.experts.TimeInput', 'jquery.valueview.experts.UnDeserializableValue', -- To view, visit https://gerrit.wikimedia.org/r/222597 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id741223faad0918a3d0ccd2bd3294ab88f1b8e47 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Wikibase Gerrit-Branch: master Gerrit-Owner: Thiemo Mättig (WMDE) thiemo.maet...@wikimedia.de ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix minor regression in tablet pre-content gutter - change (mediawiki...MobileFrontend)
Phuedx has uploaded a new change for review.
https://gerrit.wikimedia.org/r/222604
Change subject: Fix minor regression in tablet pre-content gutter
..
Fix minor regression in tablet pre-content gutter
42782198 made the base rule that defines the pre-content (title, page
actions, and page issues) gutter more specific than the tablet-specific
rule.
Match the specificity of the base rule in the tablet-specifc rule so
that the base rule is overridden correctly.
Bug: T98925
Change-Id: Id8e1931360e5942929d31a1fcd8295b25b2fe17f
---
M resources/skins.minerva.tablet.styles/common.less
1 file changed, 3 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend
refs/changes/04/222604/1
diff --git a/resources/skins.minerva.tablet.styles/common.less
b/resources/skins.minerva.tablet.styles/common.less
index f76ce18..b71531b 100644
--- a/resources/skins.minerva.tablet.styles/common.less
+++ b/resources/skins.minerva.tablet.styles/common.less
@@ -14,7 +14,9 @@
}
}
- .pre-content {
+ // FIXME: remove the .stable .pre-content selector when cache clears
+ .stable .pre-content,
+ .heading-holder {
position: relative;
padding: 20px @contentPaddingTablet 0 @contentPaddingTablet;
--
To view, visit https://gerrit.wikimedia.org/r/222604
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Id8e1931360e5942929d31a1fcd8295b25b2fe17f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Phuedx g...@samsmith.io
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Docs and cleanup - change (search/highlighter)
Manybubbles has uploaded a new change for review.
https://gerrit.wikimedia.org/r/222608
Change subject: Docs and cleanup
..
Docs and cleanup
Lots of work on how_it_works.md. Should be easier to understand.
Some cleanup of spacing and Javadocs.
Added a helper method to make the examples simpler.
Change-Id: I71d8a2118ce1745c5a78f67dd52d8760bb0390fe
---
M docs/how_it_works.md
M
experimental-highlighter-core/src/main/java/org/wikimedia/search/highlighter/experimental/HitEnum.java
M
experimental-highlighter-core/src/main/java/org/wikimedia/search/highlighter/experimental/SnippetFormatter.java
M
experimental-highlighter-core/src/main/java/org/wikimedia/search/highlighter/experimental/hit/BreakIteratorHitEnum.java
M
experimental-highlighter-core/src/main/java/org/wikimedia/search/highlighter/experimental/hit/weight/NoSourceTermSourceFinder.java
M
experimental-highlighter-core/src/main/java/org/wikimedia/search/highlighter/experimental/snippet/AbstractBasicSnippetChooser.java
M
experimental-highlighter-core/src/test/java/org/wikimedia/search/highlighter/experimental/hit/BreakIteratorHitEnumTest.java
7 files changed, 236 insertions(+), 65 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/search/highlighter
refs/changes/08/222608/1
diff --git a/docs/how_it_works.md b/docs/how_it_works.md
index dd457d9..2163bc6 100644
--- a/docs/how_it_works.md
+++ b/docs/how_it_works.md
@@ -1,71 +1,245 @@
How does it work?
=
-The highlighter has a few key types of components: dl
-dtHitEnum/dtddEnumerates hits (aka matches)/dd
-dtSnippetChooser/dtddUses HitEnum to pick snippets/dd
-dtSegmenter/dtddPlugged into AbstractBasicSnippetChooser implementations
-to pick where snippets (aka fragments) begin and end./dt
-/dl
+This highlighter was created to unify some of the good ideas in the three
+highlighters already in Lucene:
+* Finding hits should be possible by:
+ * Reanalyzing the field's contents
+ * Reading term vectors
+ * Reading offsets from the postings
+* Snippets should be split on:
+ * Sentence boundaries
+ * Word boundaries
+ * Some arbitrary list of characters that is quick to scan
+To do that this project builds a set of composable components and an
+Elasticsearch plugin that strings them all together.
+
+From front to back:
+* the query is decomposed into a tree of ```HitEnums```
+* which are iterated by a ```SnippetChooser```
+* which determines snippet boundaries using a ```Segmenter```
+* and scores the ```Snippets``` using a ```SnippetWeigher```
+* ultimately producing a ```ListSnippet```
+* which is then turned into ```String```s by a ```SnippetFormatter```.
HitEnum
---
-Comes in two flavors:dl
-dtPlain HitEnums/dt
-ddActually pulls hits from the source document. Examples are
-DocsAndPositionsHitEnum, TokenStreamHitEnum, and BreakIteratorHitEnum./dd
-dtTransforming HitEnums/dt
-ddWraps and transforms one or more HitEnums. Some transforms are simple like
-WeightFilterHitEnumWrapper or PositionBoostingHitEnumWrapper. Some are
-much more involved like PhraseHitEnumWrapper and
-MergingHitEnum. HitEnums that wrap a single HitEnum should be named
-FooHitEnumWrapper. I don't have a consistent naming scheme for those that
-wrap more than one HitEnum./dd
-/dl
+Comes in two flavors:
+* Source ```HitEnums``` pulls hits from the source document. Examples are
+```DocsAndPositionsHitEnum```, ```TokenStreamHitEnum```, and
+```BreakIteratorHitEnum```.
+* Transforming ```HitEnums``` wrap and transform one or more ```HitEnums```.
+Some transforms are simple like ```WeightFilterHitEnumWrapper``` or
+```PositionBoostingHitEnumWrapper```. Some are much more involved like
+```PhraseHitEnumWrapper``` and ```MergingHitEnum```. ```HitEnums``` that wrap a
+single ```HitEnum``` should be named ```FooHitEnumWrapper```. There isn't a
+consistent naming scheme for those that wrap more than one ```HitEnum```.
+Enum in this context is a riff on Lucene's ```TermsEnum```. Its just a
+convenient way of iterating without returning whole objects at each iteration.
+It looks like:
+
+```java
+public interface HitEnum {
+ /**
+ * Move the enum to the next hit.
+ *
+ * @return is there a next hit (true) or was the last one the final hit
+ * (false)
+ */
+ boolean next();
+
+ /**
+ * Ordinal position relative to the other terms in the text. Starts at 0.
+ */
+ int position();
+
+ /**
+ * The start offset of the current term within the text.
+ */
+ int startOffset();
+
+ ...
+}
+```
+Its not as fancy as ```TermsEnum``` with its nifty ```AttributeSource``` but it
+gets the job done.
+
+The idea is that you make one or more source ```HitEnums``` and wrap them in
+transforming ```HitEnums```. For testing most things we use
+```BreakIteraorHitEnum``` for the source ```HitEnum``` because it's simple. In
+the Elasticsearch plugin we use ```TokenStreamHitEnum``` when we have to
[MediaWiki-commits] [Gerrit] Unify whitespace in array() functions - change (mediawiki...Wikibase)
Thiemo Mättig (WMDE) has uploaded a new change for review. https://gerrit.wikimedia.org/r/222574 Change subject: Unify whitespace in array() functions .. Unify whitespace in array() functions This is an other step forward to enable more PHPCS sniffs. Again, this patch focuses on a single thing. Again, I can not enable the relevant PHPCS sniff at the moment because it would trigger much more errors and would need a much, much bigger patch. I want this to be done in small steps for the sake of a much easier review. Change-Id: I038a0f4830397f058fcdf4e7e5a4266c195351de --- M client/tests/phpunit/includes/DataAccess/Scribunto/Scribunto_LuaWikibaseLibraryTest.php M lib/resources/Resources.php M lib/tests/phpunit/formatters/FormatterLabelDescriptionLookupFactoryTest.php M lib/tests/phpunit/formatters/WikibaseValueFormatterBuildersTest.php M repo/includes/ChangeDispatcher.php M repo/includes/rdf/RdfVocabulary.php M repo/tests/phpunit/includes/Diff/ClaimDifferenceTest.php M repo/tests/phpunit/includes/Interactors/ItemMergeInteractorTest.php M repo/tests/phpunit/includes/LinkedData/HttpAcceptNegotiatorTest.php M repo/tests/phpunit/includes/api/EditEntityTest.php M repo/tests/phpunit/includes/api/GetEntitiesTest.php M repo/tests/phpunit/includes/api/ItemByTitleHelperTest.php M repo/tests/phpunit/includes/api/MergeItemsTest.php M repo/tests/phpunit/includes/api/ModifyTermTestCase.php M repo/tests/phpunit/includes/api/ResultBuilderTest.php M repo/tests/phpunit/includes/api/SetAliasesTest.php M repo/tests/phpunit/includes/rdf/ComplexValueRdfBuilderTest.php M view/tests/phpunit/ClaimHtmlGeneratorTest.php 18 files changed, 30 insertions(+), 33 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase refs/changes/74/222574/1 diff --git a/client/tests/phpunit/includes/DataAccess/Scribunto/Scribunto_LuaWikibaseLibraryTest.php b/client/tests/phpunit/includes/DataAccess/Scribunto/Scribunto_LuaWikibaseLibraryTest.php index 2d08b95..d3f6ee1 100644 --- a/client/tests/phpunit/includes/DataAccess/Scribunto/Scribunto_LuaWikibaseLibraryTest.php +++ b/client/tests/phpunit/includes/DataAccess/Scribunto/Scribunto_LuaWikibaseLibraryTest.php @@ -74,7 +74,7 @@ 'language' = 'ku-latn', 'value' = 'Pisîk' ), - 'ku-arab' = array ( + 'ku-arab' = array( 'language' = 'ku-arab', 'value' = 'پسیک', 'source-language' = 'ku-latn', diff --git a/lib/resources/Resources.php b/lib/resources/Resources.php index 1b5759b..9c85474 100644 --- a/lib/resources/Resources.php +++ b/lib/resources/Resources.php @@ -30,8 +30,6 @@ 'scripts' = array( 'wikibase.js', ), - 'dependencies' = array( - ), ), 'wikibase.buildErrorOutput' = $moduleTemplate + array( diff --git a/lib/tests/phpunit/formatters/FormatterLabelDescriptionLookupFactoryTest.php b/lib/tests/phpunit/formatters/FormatterLabelDescriptionLookupFactoryTest.php index 424d558..eb63c01 100644 --- a/lib/tests/phpunit/formatters/FormatterLabelDescriptionLookupFactoryTest.php +++ b/lib/tests/phpunit/formatters/FormatterLabelDescriptionLookupFactoryTest.php @@ -124,7 +124,7 @@ ) ), ), 'no options' = array( - new FormatterOptions( array( ) ), + new FormatterOptions( array() ), ), ); } diff --git a/lib/tests/phpunit/formatters/WikibaseValueFormatterBuildersTest.php b/lib/tests/phpunit/formatters/WikibaseValueFormatterBuildersTest.php index 4e71f93..de059b7 100644 --- a/lib/tests/phpunit/formatters/WikibaseValueFormatterBuildersTest.php +++ b/lib/tests/phpunit/formatters/WikibaseValueFormatterBuildersTest.php @@ -630,7 +630,7 @@ return array( 'empty' = array( - new FormatterOptions( array( ) ), + new FormatterOptions( array() ), 'en', // determined in WikibaseValueFormatterBuildersTest::newBuilder() 'en' // derived from language code ), diff --git a/repo/includes/ChangeDispatcher.php b/repo/includes/ChangeDispatcher.php index 5a94659..64fe338 100644 --- a/repo/includes/ChangeDispatcher.php +++ b/repo/includes/ChangeDispatcher.php @@ -261,7 +261,7 @@ * @param int $after: The last change ID processed by a previous
[MediaWiki-commits] [Gerrit] Migrate parsoidsvc-php-parsertests to labs - change (integration/config)
jenkins-bot has submitted this change and it was merged. Change subject: Migrate parsoidsvc-php-parsertests to labs .. Migrate parsoidsvc-php-parsertests to labs Bug: T101966 Change-Id: I7b0deacf9d0aa15d2afcddc9308d710c4988c99f --- M jjb/parsoidsvc.yaml 1 file changed, 1 insertion(+), 2 deletions(-) Approvals: Hashar: Looks good to me, approved jenkins-bot: Verified diff --git a/jjb/parsoidsvc.yaml b/jjb/parsoidsvc.yaml index 6becd17..89f7ba5 100644 --- a/jjb/parsoidsvc.yaml +++ b/jjb/parsoidsvc.yaml @@ -10,7 +10,7 @@ # Runs MediaWiki core @master PHP parser tests - job-template: name: parsoidsvc-php-parsertests -node: hasSlaveScripts UbuntuPrecise +node: contintLabsSlave UbuntuPrecise concurrent: true wrappers: - timeout: @@ -23,7 +23,6 @@ scm: - git: url: '$ZUUL_URL/$ZUUL_PROJECT' -reference-repo: '/srv/ssd/gerrit/$ZUUL_PROJECT.git' branches: - '$ZUUL_COMMIT' refspec: '$ZUUL_REF' -- To view, visit https://gerrit.wikimedia.org/r/222577 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I7b0deacf9d0aa15d2afcddc9308d710c4988c99f Gerrit-PatchSet: 1 Gerrit-Project: integration/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] Add missing dependency to mediawiki.widgets - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged. Change subject: Add missing dependency to mediawiki.widgets .. Add missing dependency to mediawiki.widgets mw.widgets.TitleOptionWidget.js depends upon jquery.autoEllipsis. Change-Id: I042d0630fce576911daaa891e1ab55650d1823a0 --- M resources/Resources.php 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Bartosz Dziewoński: Looks good to me, approved Jforrester: Looks good to me, but someone else must approve jenkins-bot: Verified diff --git a/resources/Resources.php b/resources/Resources.php index bd9788e..2db3aff 100644 --- a/resources/Resources.php +++ b/resources/Resources.php @@ -1737,6 +1737,7 @@ 'default' = 'resources/src/mediawiki.widgets/mw.widgets.TitleInputWidget.css', ), 'dependencies' = array( + 'jquery.autoEllipsis', 'mediawiki.Title', 'mediawiki.api', 'oojs-ui', -- To view, visit https://gerrit.wikimedia.org/r/222058 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I042d0630fce576911daaa891e1ab55650d1823a0 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Legoktm legoktm.wikipe...@gmail.com Gerrit-Reviewer: Bartosz Dziewoński matma@gmail.com Gerrit-Reviewer: Jack Phoenix j...@countervandalism.net Gerrit-Reviewer: Jforrester jforres...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove brackets in include/require_once calls - change (mediawiki...Wikibase)
jenkins-bot has submitted this change and it was merged.
Change subject: Remove brackets in include/require_once calls
..
Remove brackets in include/require_once calls
This patch contains a single change: brackets after include,
include_once, require and require_once are removed.
This is a requirement in the PHPCS rule set we want to use. These
are not functions and should not be used as functions.
I can not enable the relevant PHPCS sniff at the moment. This would
require a much larger patch. I want to avoid that for the sake of
an easy review.
Change-Id: Ibaf0e22d4af435ae52afc79543a07d4c22778688
---
M client/ExampleSettings.php
M client/WikibaseClient.php
M client/tests/phpunit/ClientDefaultsTest.php
M lib/WikibaseLib.hooks.php
M lib/WikibaseLib.php
M lib/maintenance/dispatchChanges.php
M lib/resources/Resources.php
M lib/tests/qunit/resources.php
M repo/ExampleSettings.php
M repo/Wikibase.hooks.php
M repo/Wikibase.php
M repo/resources/Resources.php
M view/resources/jquery/wikibase/resources.php
M view/resources/jquery/wikibase/toolbar/resources.php
M view/resources/resources.php
M view/src/Template/TemplateFactory.php
M view/tests/qunit/jquery/wikibase/resources.php
M view/tests/qunit/resources.php
18 files changed, 60 insertions(+), 53 deletions(-)
Approvals:
Addshore: Looks good to me, approved
jenkins-bot: Verified
diff --git a/client/ExampleSettings.php b/client/ExampleSettings.php
index dd9aa91..c31ddfc 100644
--- a/client/ExampleSettings.php
+++ b/client/ExampleSettings.php
@@ -2,4 +2,4 @@
define( 'WB_CLIENT_EXAMPLE_ENTRY', 1 );
-include_once( __DIR__ . '/config/WikibaseClient.example.php' );
+include_once __DIR__ . '/config/WikibaseClient.example.php';
diff --git a/client/WikibaseClient.php b/client/WikibaseClient.php
index 4c48108..449582f 100644
--- a/client/WikibaseClient.php
+++ b/client/WikibaseClient.php
@@ -56,7 +56,7 @@
// Include the WikibaseLib extension if that hasn't been done yet, since it's
required for WikibaseClient to work.
if ( !defined( 'WBL_VERSION' ) ) {
- include_once( __DIR__ . '/../lib/WikibaseLib.php' );
+ include_once __DIR__ . '/../lib/WikibaseLib.php';
}
if ( !defined( 'WBL_VERSION' ) ) {
@@ -79,12 +79,10 @@
'descriptionmsg' = 'wikibase-client-desc'
);
- $dir = __DIR__ . '/';
-
// i18n
$wgMessagesDirs['wikibaseclient'] = __DIR__ . '/i18n';
- $wgExtensionMessagesFiles['Wikibaseclientalias']= $dir .
'WikibaseClient.i18n.alias.php';
- $wgExtensionMessagesFiles['wikibaseclientmagic']= $dir .
'WikibaseClient.i18n.magic.php';
+ $wgExtensionMessagesFiles['Wikibaseclientalias'] = __DIR__ .
'/WikibaseClient.i18n.alias.php';
+ $wgExtensionMessagesFiles['wikibaseclientmagic'] = __DIR__ .
'/WikibaseClient.i18n.magic.php';
// Hooks
$wgHooks['UnitTestsList'][] =
'\Wikibase\ClientHooks::registerUnitTests';
@@ -152,15 +150,18 @@
$wgSpecialPages['UnconnectedPages']
= 'Wikibase\Client\Specials\SpecialUnconnectedPages';
// Resource loader modules
- $wgResourceModules = array_merge( $wgResourceModules, include(
$dir/resources/Resources.php ) );
+ $wgResourceModules = array_merge(
+ $wgResourceModules,
+ include __DIR__ . '/resources/Resources.php'
+ );
$wgWBClientSettings = array_merge(
- require( __DIR__ . '/../lib/config/WikibaseLib.default.php' ),
- require( __DIR__ . '/config/WikibaseClient.default.php' )
+ require __DIR__ . '/../lib/config/WikibaseLib.default.php',
+ require __DIR__ . '/config/WikibaseClient.default.php'
);
if ( defined( 'WB_EXPERIMENTAL_FEATURES' ) WB_EXPERIMENTAL_FEATURES
) {
- include_once( $dir . 'config/WikibaseClient.experimental.php' );
+ include_once __DIR__ .
'/config/WikibaseClient.experimental.php';
}
$wgRecentChangesFlags['wikibase-edit'] = array(
diff --git a/client/tests/phpunit/ClientDefaultsTest.php
b/client/tests/phpunit/ClientDefaultsTest.php
index dc7adfd..a139d40 100644
--- a/client/tests/phpunit/ClientDefaultsTest.php
+++ b/client/tests/phpunit/ClientDefaultsTest.php
@@ -157,7 +157,7 @@
public function testDefaults( array $settings, array $wg, $repoIsLocal,
$expected ) {
$this-setMwGlobals( $wg );
- $defaults = include( WBC_DIR .
'/config/WikibaseClient.default.php' );
+ $defaults = include WBC_DIR .
'/config/WikibaseClient.default.php';
$settings = array_merge( $defaults, $settings );
$settings = new SettingsArray( $settings );
diff --git a/lib/WikibaseLib.hooks.php b/lib/WikibaseLib.hooks.php
index 7d3c3a1..674332a 100644
--- a/lib/WikibaseLib.hooks.php
[MediaWiki-commits] [Gerrit] Tie wikidata-gremlins to labs and Trusty - change (integration/config)
Hashar has uploaded a new change for review. https://gerrit.wikimedia.org/r/222586 Change subject: Tie wikidata-gremlins to labs and Trusty .. Tie wikidata-gremlins to labs and Trusty Prevents the job from roaming on prod slaves. Change-Id: I0116e5503e00b86e1731ebe3051b525073256a2c --- M jjb/wikidata.yaml 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/integration/config refs/changes/86/222586/1 diff --git a/jjb/wikidata.yaml b/jjb/wikidata.yaml index e624d86..ea41544 100644 --- a/jjb/wikidata.yaml +++ b/jjb/wikidata.yaml @@ -158,6 +158,7 @@ - job: name: wikidata-gremlin project-type: maven +node: contintLabsSlave UbuntuTrusty jdk: 'Ubuntu - OpenJdk 7' triggers: - zuul -- To view, visit https://gerrit.wikimedia.org/r/222586 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I0116e5503e00b86e1731ebe3051b525073256a2c Gerrit-PatchSet: 1 Gerrit-Project: integration/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] Unify whitespace in array() functions - change (mediawiki...Wikibase)
jenkins-bot has submitted this change and it was merged. Change subject: Unify whitespace in array() functions .. Unify whitespace in array() functions This is an other step forward to enable more PHPCS sniffs. Again, this patch focuses on a single thing. Again, I can not enable the relevant PHPCS sniff at the moment because it would trigger much more errors and would need a much, much bigger patch. I want this to be done in small steps for the sake of a much easier review. Change-Id: I038a0f4830397f058fcdf4e7e5a4266c195351de --- M client/tests/phpunit/includes/DataAccess/Scribunto/Scribunto_LuaWikibaseLibraryTest.php M lib/resources/Resources.php M lib/tests/phpunit/formatters/FormatterLabelDescriptionLookupFactoryTest.php M lib/tests/phpunit/formatters/WikibaseValueFormatterBuildersTest.php M repo/includes/ChangeDispatcher.php M repo/includes/rdf/RdfVocabulary.php M repo/tests/phpunit/includes/Diff/ClaimDifferenceTest.php M repo/tests/phpunit/includes/Interactors/ItemMergeInteractorTest.php M repo/tests/phpunit/includes/LinkedData/HttpAcceptNegotiatorTest.php M repo/tests/phpunit/includes/api/EditEntityTest.php M repo/tests/phpunit/includes/api/GetEntitiesTest.php M repo/tests/phpunit/includes/api/ItemByTitleHelperTest.php M repo/tests/phpunit/includes/api/MergeItemsTest.php M repo/tests/phpunit/includes/api/ModifyTermTestCase.php M repo/tests/phpunit/includes/api/ResultBuilderTest.php M repo/tests/phpunit/includes/api/SetAliasesTest.php M repo/tests/phpunit/includes/rdf/ComplexValueRdfBuilderTest.php M view/tests/phpunit/ClaimHtmlGeneratorTest.php 18 files changed, 30 insertions(+), 33 deletions(-) Approvals: Addshore: Looks good to me, approved jenkins-bot: Verified diff --git a/client/tests/phpunit/includes/DataAccess/Scribunto/Scribunto_LuaWikibaseLibraryTest.php b/client/tests/phpunit/includes/DataAccess/Scribunto/Scribunto_LuaWikibaseLibraryTest.php index 2d08b95..d3f6ee1 100644 --- a/client/tests/phpunit/includes/DataAccess/Scribunto/Scribunto_LuaWikibaseLibraryTest.php +++ b/client/tests/phpunit/includes/DataAccess/Scribunto/Scribunto_LuaWikibaseLibraryTest.php @@ -74,7 +74,7 @@ 'language' = 'ku-latn', 'value' = 'Pisîk' ), - 'ku-arab' = array ( + 'ku-arab' = array( 'language' = 'ku-arab', 'value' = 'پسیک', 'source-language' = 'ku-latn', diff --git a/lib/resources/Resources.php b/lib/resources/Resources.php index 1b5759b..9c85474 100644 --- a/lib/resources/Resources.php +++ b/lib/resources/Resources.php @@ -30,8 +30,6 @@ 'scripts' = array( 'wikibase.js', ), - 'dependencies' = array( - ), ), 'wikibase.buildErrorOutput' = $moduleTemplate + array( diff --git a/lib/tests/phpunit/formatters/FormatterLabelDescriptionLookupFactoryTest.php b/lib/tests/phpunit/formatters/FormatterLabelDescriptionLookupFactoryTest.php index 424d558..eb63c01 100644 --- a/lib/tests/phpunit/formatters/FormatterLabelDescriptionLookupFactoryTest.php +++ b/lib/tests/phpunit/formatters/FormatterLabelDescriptionLookupFactoryTest.php @@ -124,7 +124,7 @@ ) ), ), 'no options' = array( - new FormatterOptions( array( ) ), + new FormatterOptions( array() ), ), ); } diff --git a/lib/tests/phpunit/formatters/WikibaseValueFormatterBuildersTest.php b/lib/tests/phpunit/formatters/WikibaseValueFormatterBuildersTest.php index 4e71f93..de059b7 100644 --- a/lib/tests/phpunit/formatters/WikibaseValueFormatterBuildersTest.php +++ b/lib/tests/phpunit/formatters/WikibaseValueFormatterBuildersTest.php @@ -630,7 +630,7 @@ return array( 'empty' = array( - new FormatterOptions( array( ) ), + new FormatterOptions( array() ), 'en', // determined in WikibaseValueFormatterBuildersTest::newBuilder() 'en' // derived from language code ), diff --git a/repo/includes/ChangeDispatcher.php b/repo/includes/ChangeDispatcher.php index 5a94659..64fe338 100644 --- a/repo/includes/ChangeDispatcher.php +++ b/repo/includes/ChangeDispatcher.php @@ -261,7 +261,7 @@ * @param int $after: The last change ID processed by a previous run. All changes returned * will have
[MediaWiki-commits] [Gerrit] Remove TODO from api/AvailableBadges - change (mediawiki...Wikibase)
jenkins-bot has submitted this change and it was merged. Change subject: Remove TODO from api/AvailableBadges .. Remove TODO from api/AvailableBadges This isn't really a TODO. Just file an 'issue' for this is you think it should be implemented! :D Change-Id: Ifc582d547af8c0d47958ec3c3b26a635f4c17051 --- M repo/includes/api/AvailableBadges.php 1 file changed, 0 insertions(+), 2 deletions(-) Approvals: Bene: Looks good to me, approved jenkins-bot: Verified diff --git a/repo/includes/api/AvailableBadges.php b/repo/includes/api/AvailableBadges.php index 90d6cd9..ebcf05b 100644 --- a/repo/includes/api/AvailableBadges.php +++ b/repo/includes/api/AvailableBadges.php @@ -9,8 +9,6 @@ /** * API module to query available badge items. * - * @todo this might also be useful to find badges suggestions based on labels - * * @since 0.5 * @licence GNU GPL v2+ * @author Bene* benestar.wikime...@gmail.com -- To view, visit https://gerrit.wikimedia.org/r/222576 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ifc582d547af8c0d47958ec3c3b26a635f4c17051 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Wikibase Gerrit-Branch: master Gerrit-Owner: Addshore addshorew...@gmail.com Gerrit-Reviewer: Bene benestar.wikime...@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] Add extension.json, empty php entry point - change (mediawiki...MaintenanceShell)
Paladox has uploaded a new change for review.
https://gerrit.wikimedia.org/r/222582
Change subject: Add extension.json, empty php entry point
..
Add extension.json, empty php entry point
Change-Id: I31d31a596f44805f465b6d34b70d6a2f0069a308
---
M MaintenanceShell.php
A extension.json
M i18n/es.json
3 files changed, 67 insertions(+), 51 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MaintenanceShell
refs/changes/82/222582/1
diff --git a/MaintenanceShell.php b/MaintenanceShell.php
index 02b5666..efb1466 100644
--- a/MaintenanceShell.php
+++ b/MaintenanceShell.php
@@ -9,55 +9,17 @@
* @license GNU GPL
*/
-$wgExtensionCredits['specialpage'][] = array(
- 'name' = 'MaintenanceShell',
- 'author' = array(
- '[http://swiftlytilting.com Andrew Fitzgerald]',
- 'Timo Tijhof',
- ),
- 'url' = 'https://www.mediawiki.org/wiki/Extension:MaintenanceShell',
- 'descriptionmsg' = 'maintenanceshell-desc',
- 'version' = '0.5.0',
-);
-
-/* Setup */
-
-$dir = dirname( __FILE__ );
-
-// Register files
-$wgAutoloadClasses['MaintenanceShellHooks'] = $dir .
'/MaintenanceShell.hooks.php';
-$wgAutoloadClasses['SpecialMaintenanceShell'] = $dir .
'/includes/SpecialMaintenanceShell.php';
-$wgAutoloadClasses['MaintenanceShellArgumentsParser'] = $dir .
'/includes/MaintenanceShellArgumentsParser.php';
-$wgMessagesDirs['MaintenanceShell'] = __DIR__ . '/i18n';
-$wgExtensionMessagesFiles['MaintenanceShell'] = $dir .
'/MaintenanceShell.i18n.php';
-$wgExtensionMessagesFiles['MaintenanceShellAlias'] = $dir .
'/MaintenanceShell.alias.php';
-
-// Register special pages
-$wgSpecialPages['MaintenanceShell'] = 'SpecialMaintenanceShell';
-
-// Register user rights
-$wgAvailableRights[] = 'maintenanceshell';
-
-// Register hooks
-$wgExtensionFunctions[] = 'MaintenanceShellHooks::onSetup';
-$wgHooks['UnitTestsList'][] = 'MaintenanceShellHooks::onUnitTestsList';
-
-// Register modules
-$wgResourceModules['ext.maintenanceShell'] = array(
- 'scripts' = 'resources/ext.maintenanceShell.js',
- 'styles' = 'resources/ext.maintenanceShell.css',
- 'localBasePath' = $dir,
- 'remoteExtPath' = 'MaintenanceShell',
- 'dependencies' = 'jquery.spinner'
-);
-
-// Not granted to anyone by default.
-// To grant to developer group, use:
-// $wgGroupPermissions['developer']['maintenanceshell'] = true;
-// Or create a new user group, use:
-// $wgGroupPermissions['maintainer']['maintenanceshell'] = true;
-
-/* Configuration */
-
-$wgMaintenanceShellPath = false;
+if ( function_exists( 'wfLoadExtension' ) ) {
+ wfLoadExtension( 'MaintenanceShell' );
+ // Keep i18n globals so mergeMessageFileList.php doesn't break
+ $wgMessagesDirs['MaintenanceShell'] = __DIR__ . '/i18n';
+ $wgExtensionMessagesFiles['MaintenanceShellAlias'] = __DIR__ .
'/MaintenanceShell.alias.php';
+ /* wfWarn(
+ 'Deprecated PHP entry point used for MaintenanceShell
extension. Please use wfLoadExtension instead, ' .
+ 'see https://www.mediawiki.org/wiki/Extension_registration for
more details.'
+ ); */
+ return;
+} else {
+ die( 'This version of the MaintenanceShell extension requires MediaWiki
1.25+' );
+}
diff --git a/extension.json b/extension.json
new file mode 100644
index 000..a968e1b
--- /dev/null
+++ b/extension.json
@@ -0,0 +1,53 @@
+{
+ name: MaintenanceShell,
+ version: 0.5.0,
+ author: [
+ [http://swiftlytilting.com Andrew Fitzgerald],
+ Timo Tijhof
+ ],
+ url: https://www.mediawiki.org/wiki/Extension:MaintenanceShell;,
+ descriptionmsg: maintenanceshell-desc,
+ type: specialpage,
+ AvailableRights: [
+ maintenanceshell
+ ],
+ ExtensionFunctions: [
+ MaintenanceShellHooks::onSetup
+ ],
+ SpecialPages: {
+ MaintenanceShell: SpecialMaintenanceShell
+ },
+ MessagesDirs: {
+ MaintenanceShell: [
+ i18n
+ ]
+ },
+ ExtensionMessagesFiles: {
+ MaintenanceShellAlias: MaintenanceShell.alias.php
+ },
+ AutoloadClasses: {
+ MaintenanceShellHooks: MaintenanceShell.hooks.php,
+ SpecialMaintenanceShell:
includes/SpecialMaintenanceShell.php,
+ MaintenanceShellArgumentsParser:
includes/MaintenanceShellArgumentsParser.php
+ },
+ ResourceModules: {
+ ext.maintenanceShell: {
+ scripts: resources/ext.maintenanceShell.js,
+ styles: resources/ext.maintenanceShell.css,
+ dependencies: jquery.spinner
+ }
+ },
+ ResourceFileModulePaths: {
+ localBasePath: ,
+ remoteExtPath: MaintenanceShell
+ },
+
[MediaWiki-commits] [Gerrit] Tie mwext-PoolCounter-build to labs and Trusty - change (integration/config)
jenkins-bot has submitted this change and it was merged. Change subject: Tie mwext-PoolCounter-build to labs and Trusty .. Tie mwext-PoolCounter-build to labs and Trusty Change-Id: If7bb2b8fe99e8979d33bf184db1828d3b8ecea36 --- M jjb/mediawiki-extensions.yaml 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Hashar: Looks good to me, approved jenkins-bot: Verified diff --git a/jjb/mediawiki-extensions.yaml b/jjb/mediawiki-extensions.yaml index 987037b..e090bd1 100644 --- a/jjb/mediawiki-extensions.yaml +++ b/jjb/mediawiki-extensions.yaml @@ -318,6 +318,7 @@ - job-template: name: 'mwext-PoolCounter-build' +node: contintLabsSlave UbuntuTrusty defaults: use-remote-zuul triggers: - zuul -- To view, visit https://gerrit.wikimedia.org/r/222590 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: If7bb2b8fe99e8979d33bf184db1828d3b8ecea36 Gerrit-PatchSet: 1 Gerrit-Project: integration/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] Add jsonlint and jshint test for MaintenanceShell - change (integration/config)
Paladox has uploaded a new change for review. https://gerrit.wikimedia.org/r/222592 Change subject: Add jsonlint and jshint test for MaintenanceShell .. Add jsonlint and jshint test for MaintenanceShell Change-Id: Ib652a1e85b9b15f50b64abceae906d8d14bd6d03 --- M jjb/analytics.yaml M zuul/layout.yaml 2 files changed, 4 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/integration/config refs/changes/92/222592/1 diff --git a/jjb/analytics.yaml b/jjb/analytics.yaml index fd91dc1..c00d4df 100644 --- a/jjb/analytics.yaml +++ b/jjb/analytics.yaml @@ -21,6 +21,7 @@ - job-template: name: 'analytics-kraken' project-type: maven +node: contintLabsSlave UbuntuTrusty triggers: - zuul scm: diff --git a/zuul/layout.yaml b/zuul/layout.yaml index 77af8d0..5f7b620 100644 --- a/zuul/layout.yaml +++ b/zuul/layout.yaml @@ -5136,8 +5136,11 @@ - name: mediawiki/extensions/MaintenanceShell template: + - name: jshint - name: extension-unittests-generic - name: npm +check: + - jsonlint - name: mediawiki/extensions/Maps template: -- To view, visit https://gerrit.wikimedia.org/r/222592 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib652a1e85b9b15f50b64abceae906d8d14bd6d03 Gerrit-PatchSet: 1 Gerrit-Project: integration/config Gerrit-Branch: master Gerrit-Owner: Paladox thomasmulhall...@yahoo.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Repool db2047 after maintenance - change (operations/mediawiki-config)
Jcrespo has submitted this change and it was merged. Change subject: Repool db2047 after maintenance .. Repool db2047 after maintenance Change-Id: I7fb2979742e8b38fa0bc35c36109ee05d5f82dbc References: T104471 --- M wmf-config/db-codfw.php 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jcrespo: Looks good to me, approved diff --git a/wmf-config/db-codfw.php b/wmf-config/db-codfw.php index ca80682..c1edd81 100755 --- a/wmf-config/db-codfw.php +++ b/wmf-config/db-codfw.php @@ -134,7 +134,7 @@ 'db1033' = 0, # 1.4TB 64GB, # 'db2029' = 100, down for maintenance 'db2040' = 100, -# 'db2047' = 100, down for maintenance + 'db2047' = 100, 'db2054' = 100, ), 'silver' = array( -- To view, visit https://gerrit.wikimedia.org/r/222591 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I7fb2979742e8b38fa0bc35c36109ee05d5f82dbc Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Jcrespo jcre...@wikimedia.org Gerrit-Reviewer: Jcrespo jcre...@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] Use grunt - change (mediawiki...MaintenanceShell)
Paladox has uploaded a new change for review.
https://gerrit.wikimedia.org/r/222594
Change subject: Use grunt
..
Use grunt
Change-Id: Ic343ddec88f7f229463eeb990e16aafedbf67ce8
---
A Gruntfile.js
M i18n/es.json
M package.json
3 files changed, 27 insertions(+), 4 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MaintenanceShell
refs/changes/94/222594/1
diff --git a/Gruntfile.js b/Gruntfile.js
new file mode 100644
index 000..9c56558
--- /dev/null
+++ b/Gruntfile.js
@@ -0,0 +1,20 @@
+/*jshint node:true */
+module.exports = function ( grunt ) {
+ grunt.loadNpmTasks( 'grunt-banana-checker' );
+ grunt.loadNpmTasks( 'grunt-jsonlint' );
+
+ grunt.initConfig( {
+ banana: {
+ all: 'i18n/'
+ },
+ jsonlint: {
+ all: [
+ '**/*.json',
+ '!node_modules/**'
+ ]
+ }
+ } );
+
+ grunt.registerTask( 'test', [ 'jsonlint', 'banana' ] );
+ grunt.registerTask( 'default', 'test' );
+};
diff --git a/i18n/es.json b/i18n/es.json
index a405834..e903cad 100644
--- a/i18n/es.json
+++ b/i18n/es.json
@@ -5,6 +5,7 @@
Ryo567
]
},
+ maintenanceshell-text: strongAdvertencia:/strong usa con cuidado
estos «scripts». Están destinados solo a desarrolladores.\n*
[https://www.mediawiki.org/wiki/Manual:Maintenance_scripts Manual:Scripts de
mantenimiento]\n* [https://www.mediawiki.org/wiki/Extension:MaintenanceShell
Extensión:MaintenanceShell],
maintenanceshell-return: Volver a
[[{{#special:maintenanceshell}}]].,
maintenanceshell-error-scriptname: No se encontró la secuencia de
órdenes,
maintenanceshell-error-rawsubmit: Por motivos de seguridad, esta
página requiere JavaScript para activarse.,
diff --git a/package.json b/package.json
index b175f11..a946048 100644
--- a/package.json
+++ b/package.json
@@ -1,10 +1,12 @@
{
- private: true,
scripts: {
-test: jshint . jscs .
+test: grunt test
},
devDependencies: {
-jscs: 1.13.1,
-jshint: 2.8.0
+grunt: 0.4.5,
+grunt-cli: 0.1.13,
+grunt-banana-checker: 0.2.2,
+grunt-jsonlint: 1.0.4
}
}
+
--
To view, visit https://gerrit.wikimedia.org/r/222594
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic343ddec88f7f229463eeb990e16aafedbf67ce8
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MaintenanceShell
Gerrit-Branch: master
Gerrit-Owner: Paladox thomasmulhall...@yahoo.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] repool db1022 with throttled traffic - change (operations/mediawiki-config)
Jcrespo has submitted this change and it was merged. Change subject: repool db1022 with throttled traffic .. repool db1022 with throttled traffic db1022 has been recently upgraded to jessie, we repool it with lower precedence to be careful. Change-Id: I90767a0395b1467df7d290a50bec51eefe07f2f2 References: T101516 --- M wmf-config/db-eqiad.php 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Jcrespo: Looks good to me, approved diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php index fbc05a7..9c25020 100755 --- a/wmf-config/db-eqiad.php +++ b/wmf-config/db-eqiad.php @@ -134,10 +134,10 @@ ), 's6' = array( 'db1023' = 0, # 1.4TB 64GB -# 'db1022' = 0, # 1.4TB 64GB, snapshot, vslow, dump (down for maint) + 'db1022' = 10, # 1.4TB 64GB, (testing after maintenance) 'db1030' = 0, # 1.4TB 64GB, watchlist, recentchanges, contributions, logpager 'db1050' = 400, # 1.4TB 64GB - 'db1037' = 0, # 1.4TB 64GB, snapshot, vslow, dump (while 1022 down) + 'db1037' = 0, # 1.4TB 64GB, vslow, dump (while 1022 test) 'db1061' = 500, # 2.8TB 128GB ), 's7' = array( -- To view, visit https://gerrit.wikimedia.org/r/222598 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I90767a0395b1467df7d290a50bec51eefe07f2f2 Gerrit-PatchSet: 2 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Jcrespo jcre...@wikimedia.org Gerrit-Reviewer: Jcrespo jcre...@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] [WIP] Add crossref data to scraper - change (mediawiki...citoid)
Mvolz has uploaded a new change for review.
https://gerrit.wikimedia.org/r/222601
Change subject: [WIP] Add crossref data to scraper
..
[WIP] Add crossref data to scraper
Super WIP.
Bug: T103238
Change-Id: I2fef682278f8b2d22af6e18595c3c288c69b7720
---
M lib/Scraper.js
A lib/crossRefRequest.js
M lib/pubMedRequest.js
A lib/translators/coins.js
M package.json
5 files changed, 166 insertions(+), 11 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/citoid
refs/changes/01/222601/1
diff --git a/lib/Scraper.js b/lib/Scraper.js
index 403da95..988e322 100644
--- a/lib/Scraper.js
+++ b/lib/Scraper.js
@@ -22,6 +22,7 @@
var og = require('./translators/openGraph.js');
var gen = require('./translators/general.js');
var addIDS = require('./Exporter.js').addIDSToCitation;
+var crossRefRequest = require('./crossRefRequest.js');
var Scraper = function(app){
@@ -266,6 +267,23 @@
};
+/**
+ * TODO: Add to parse HTML function when done
+ * Adds crossref rft properties to citation
+ * @param {Object} metaData objectGraph metaData obtained from html-metadata
+ * @param {Object} citation citation object
+ * @return {Object} BBPromise for citation object
+ */
+var crossRef = BBPromise.method(function(metaData, citation){
+ var typeTranslator;
+ if (!citation.DOI) {return BBPromise.reject('No DOI in citation');}
+
+ return crossRefRequest(citation.DOI).then(function(metaData){
+ // TODO: Actually translate
+ return citation;
+ });
+});
+
/**
* Adds open graph properties to citation
@@ -277,11 +295,13 @@
var typeTranslator;
// Set citation type from OpenGraph type
- if (metaData['type'] og.types[metaData['type']]){ // if there is a
type in the results and that type is defined in openGraph.js
- citation.itemType = og.types[metaData['type']];
- }
- else {
- citation.itemType = 'webpage'; //default itemType
+ if (!citation.itemType){ // Don't overwrite itemtype
+ if (!metaData['type'] og.types[metaData['type']]){ // if
there is a type in the results and that type is defined in openGraph.js
+ citation.itemType = og.types[metaData['type']];
+ }
+ else {
+ citation.itemType = 'webpage'; //default itemType
+ }
}
// Add universal (non type specific) OpenGraph properties
diff --git a/lib/crossRefRequest.js b/lib/crossRefRequest.js
new file mode 100644
index 000..dab4208
--- /dev/null
+++ b/lib/crossRefRequest.js
@@ -0,0 +1,49 @@
+'use strict';
+
+/**
+ * https://www.mediawiki.org/wiki/citoid
+ *
+ * Requests and sanity checks the response from PubMed's API
+ */
+
+var preq = require('preq');
+var BBPromise = require('bluebird');
+var parseCOinS = require('html-metadata').parseCOinSTitle;
+
+/**
+ * Requests a parsed rtf (citation) object from crossref given a doi
+ * @param {String} doi Valid PubMed identifier (PMID, PMCID,
Manuscript ID, versioned ID)
+ * @param {Object} logger logger object with log() method
+ * @return {Object}BBPromise for parsed rft object
+ */
+var crossRefRequest = function (doi, logger){
+ var message;
+ var urlEncodedDOI = encodeURIComponent(doi);
+ var url = http://search.crossref.org/dois?q=; + urlEncodedDOI;
+
+ return preq(url).then(function(response){
+ var body = response.body;
+ if (response.status !== 200) {
+ message = Unexpected HTTP status code: +
response.status;
+ logger.log('warn/crossref', message);
+ return BBPromise.reject(message);
+ } else {
+ if (!body || !Array.isArray(body) || !body.length ||
!body[0].coins || !body[0].coins.rft){
+ message = No citation metadata from crossRef;
+ logger.log('warn/crossref', message);
+ return BBPromise.reject(message);
+ } else {
+ return body[0].coins.rft;
+ }
+ }
+ })
+ .catch(function(error){
+ logger.log('warn/crossref', error);
+ throw error;
+ });
+};
+
+module.exports = crossRefRequest;
+
+
+
diff --git a/lib/pubMedRequest.js b/lib/pubMedRequest.js
index 3db0ffa..49b49fa 100644
--- a/lib/pubMedRequest.js
+++ b/lib/pubMedRequest.js
@@ -7,14 +7,15 @@
*/
var preq = require('preq');
+var BBPromise = require('bluebird');
/**
* Requests a PubMed object using any supported identifier
* @param {String} identifier Valid PubMed identifier (PMID, PMCID,
Manuscript ID, versioned ID)
* @param {Object} logger logger object with log() method
- * @param {Function}
[MediaWiki-commits] [Gerrit] Remove usage of Entity::removeLabel - change (mediawiki...Wikibase)
jenkins-bot has submitted this change and it was merged. Change subject: Remove usage of Entity::removeLabel .. Remove usage of Entity::removeLabel Change-Id: I091ad40999f958d4f33ac7baac2897658ddcac92 --- M lib/tests/phpunit/store/TermIndexTest.php M repo/tests/phpunit/includes/content/EntityHandlerTest.php 2 files changed, 20 insertions(+), 11 deletions(-) Approvals: Addshore: Looks good to me, approved jenkins-bot: Verified diff --git a/lib/tests/phpunit/store/TermIndexTest.php b/lib/tests/phpunit/store/TermIndexTest.php index e2bf15a..b5514eb 100644 --- a/lib/tests/phpunit/store/TermIndexTest.php +++ b/lib/tests/phpunit/store/TermIndexTest.php @@ -461,14 +461,17 @@ $lookup-saveTermsOfEntity( $item ); // modify the item and save new set of terms + $item = new Item( new ItemId( 'Q568431314' ) ); $item-setLabel( 'en', 'abc' ); - $item-removeLabel( 'de' ); $item-setLabel( 'nl', 'jke' ); - $item-setDescription( 'it', '-xyz-' ); + $item-setDescription( 'en', '-abc-' ); + $item-setDescription( 'de', '-def-' ); + $item-setDescription( 'nl', '-ghi-' ); + $item-setDescription( 'it', 'ABC' ); $item-setAliases( 'en', array( 'ABC', 'X', '_' ) ); $item-setAliases( 'de', array( 'DEF', 'Y' ) ); $item-setAliases( 'nl', array( '_', 'Z', 'foo' ) ); - $item-setDescription( 'it', 'ABC' ); + $lookup-saveTermsOfEntity( $item ); // check that the stored terms are the ones in the modified items diff --git a/repo/tests/phpunit/includes/content/EntityHandlerTest.php b/repo/tests/phpunit/includes/content/EntityHandlerTest.php index 72deef9..ee399cd 100644 --- a/repo/tests/phpunit/includes/content/EntityHandlerTest.php +++ b/repo/tests/phpunit/includes/content/EntityHandlerTest.php @@ -232,27 +232,33 @@ $e1 = $this-newEntity(); $r1 = $this-fakeRevision( $this-newEntityContent( $e1 ), 1 ); - $e2 = $e1-copy(); + $e2 = $this-newEntity(); $e2-setLabel( 'en', 'Foo' ); $r2 = $this-fakeRevision( $this-newEntityContent( $e2 ), 2 ); - $e3 = $e2-copy(); + $e3 = $this-newEntity(); + $e3-setLabel( 'en', 'Foo' ); $e3-setLabel( 'de', 'Fuh' ); $r3 = $this-fakeRevision( $this-newEntityContent( $e3 ), 3 ); - $e4 = $e3-copy(); + $e4 = $this-newEntity(); + $e4-setLabel( 'en', 'Foo' ); + $e4-setLabel( 'de', 'Fuh' ); $e4-setLabel( 'fr', 'Fu' ); $r4 = $this-fakeRevision( $this-newEntityContent( $e4 ), 4 ); - $e5 = $e4-copy(); + $e5 = $this-newEntity(); $e5-setLabel( 'en', 'F00' ); + $e5-setLabel( 'de', 'Fuh' ); + $e5-setLabel( 'fr', 'Fu' ); $r5 = $this-fakeRevision( $this-newEntityContent( $e5 ), 5 ); - $e5u4 = $e5-copy(); - $e5u4-removeLabel( 'fr' ); + $e5u4 = $this-newEntity(); + $e5u4-setLabel( 'en', 'F00' ); + $e5u4-setLabel( 'de', 'Fuh' ); - $e5u4u3 = $e5u4-copy(); - $e5u4u3-removeLabel( 'de' ); + $e5u4u3 = $this-newEntity(); + $e5u4u3-setLabel( 'en', 'F00' ); return array( array( $r5, $r5, $r4, $this-newEntityContent( $e4 ), undo last edit ), -- To view, visit https://gerrit.wikimedia.org/r/222603 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I091ad40999f958d4f33ac7baac2897658ddcac92 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Wikibase Gerrit-Branch: master Gerrit-Owner: Bene benestar.wikime...@gmail.com Gerrit-Reviewer: Addshore addshorew...@gmail.com Gerrit-Reviewer: Jeroen De Dauw jeroended...@gmail.com Gerrit-Reviewer: Thiemo Mättig (WMDE) thiemo.maet...@wikimedia.de Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix bug in titletranslate - change (pywikibot/core)
John Vandenberg has uploaded a new change for review.
https://gerrit.wikimedia.org/r/222606
Change subject: Fix bug in titletranslate
..
Fix bug in titletranslate
60c01fa552 introduced a dependency in titletranslate.translate on
its page parameter, however that parameter can be None.
Fix the spec of the method to indicate it can be None, and
also rewrite the only invocation, in interwiki.py, so it is more
easily understandable.
Bug: T75934
Change-Id: Ifca8a1c259d34e8c43c6ab331d2dc5196f3bfb44
---
M pywikibot/titletranslate.py
M scripts/interwiki.py
2 files changed, 24 insertions(+), 22 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core
refs/changes/06/222606/1
diff --git a/pywikibot/titletranslate.py b/pywikibot/titletranslate.py
index 5735163..831fa16 100644
--- a/pywikibot/titletranslate.py
+++ b/pywikibot/titletranslate.py
@@ -15,11 +15,12 @@
import pywikibot
import pywikibot.date as date
+
from pywikibot import config
+from pywikibot.tools import deprecated_args
-
-def translate(page, hints=None, auto=True, removebrackets=False, site=None,
- family=None):
+@deprecated_args(family=None)
+def translate(page=None, hints=None, auto=True, removebrackets=False,
site=None):
Return a list of links to pages on other sites based on hints.
@@ -32,10 +33,12 @@
result = set()
+
+assert page or site
+
if site is None and page:
site = page.site
-if family is None and site:
-family = site.family
+
if hints:
for h in hints:
if ':' not in h:
@@ -65,13 +68,15 @@
codes = site.family.language_groups[codes]
else:
codes = codes.split(',')
+
for newcode in codes:
if newcode in site.languages():
if newcode != site.code:
+ns = page.namespace() if page else 0
x = pywikibot.Link(newname,
site.getSite(code=newcode),
- defaultNamespace=page.namespace())
+ defaultNamespace=ns)
result.add(x)
else:
if config.verbose_output:
diff --git a/scripts/interwiki.py b/scripts/interwiki.py
index 151f21d..92d5255 100755
--- a/scripts/interwiki.py
+++ b/scripts/interwiki.py
@@ -925,24 +925,21 @@
Add the given translation hints to the todo list.
if globalvar.same and self.originPage:
if hints:
-links = titletranslate.translate(
-self.originPage,
-hints=hints + ['all:'],
-auto=globalvar.auto,
-removebrackets=globalvar.hintnobracket)
+hints += ['all:']
else:
-links = titletranslate.translate(
-self.originPage,
-hints=['all:'],
-auto=globalvar.auto,
-removebrackets=globalvar.hintnobracket)
+hints = ['all:']
+
+site = self.originPage.site
else:
-links = titletranslate.translate(
-self.originPage,
-hints=hints,
-auto=globalvar.auto,
-removebrackets=globalvar.hintnobracket,
-site=pywikibot.Site())
+site = pywikibot.Site()
+
+links = titletranslate.translate(
+self.originPage,
+hints=hints,
+auto=globalvar.auto,
+removebrackets=globalvar.hintnobracket,
+site=site)
+
for link in links:
page = pywikibot.Page(link)
if globalvar.contentsondisk:
--
To view, visit https://gerrit.wikimedia.org/r/222606
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ifca8a1c259d34e8c43c6ab331d2dc5196f3bfb44
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: John Vandenberg jay...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] All infusable widgets are now automatically infused - change (mediawiki...ExtensionDistributor)
jenkins-bot has submitted this change and it was merged.
Change subject: All infusable widgets are now automatically infused
..
All infusable widgets are now automatically infused
Follows up 7fea174c833 in MediaWiki core.
Change-Id: Ib30eb7c9d3c9337f41c2ac575795f2e7155762d0
---
M extension.json
D resources/ext.extensiondistributor.special.infuse.js
M specials/SpecialBaseDistributor.php
3 files changed, 0 insertions(+), 17 deletions(-)
Approvals:
Bartosz Dziewoński: Looks good to me, approved
jenkins-bot: Verified
diff --git a/extension.json b/extension.json
index fe5f43d..dfe1245 100644
--- a/extension.json
+++ b/extension.json
@@ -55,13 +55,5 @@
localBasePath: resources,
remoteExtPath: ExtensionDistributor/resources
},
- ResourceModules: {
- ext.extensiondistributor.special.infuse: {
- scripts: ext.extensiondistributor.special.infuse.js,
- dependencies: [
- oojs-ui
- ]
- }
- },
manifest_version: 1
}
diff --git a/resources/ext.extensiondistributor.special.infuse.js
b/resources/ext.extensiondistributor.special.infuse.js
deleted file mode 100644
index e69599d..000
--- a/resources/ext.extensiondistributor.special.infuse.js
+++ /dev/null
@@ -1,7 +0,0 @@
-/* global OO */
-( function ( $, OO ) {
- 'use strict';
- $( function () {
- OO.ui.infuse( 'mw-extdist-selector-version' );
- } );
-}( jQuery, OO ) );
diff --git a/specials/SpecialBaseDistributor.php
b/specials/SpecialBaseDistributor.php
index ba77278..7b42995 100644
--- a/specials/SpecialBaseDistributor.php
+++ b/specials/SpecialBaseDistributor.php
@@ -172,8 +172,6 @@
}
if ( $selected !== 0 ) {
$out-addHTML( $html );
- // Add JS infuse magic
- $out-addModules(
'ext.extensiondistributor.special.infuse' );
$out-enableOOUI();
$out-addHTML(
new OOUI\DropdownInputWidget( array(
--
To view, visit https://gerrit.wikimedia.org/r/44
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib30eb7c9d3c9337f41c2ac575795f2e7155762d0
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ExtensionDistributor
Gerrit-Branch: master
Gerrit-Owner: Legoktm legoktm.wikipe...@gmail.com
Gerrit-Reviewer: Bartosz Dziewoński matma@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] ciperhsuites: add 'mid', changes to strong - change (operations/puppet)
BBlack has submitted this change and it was merged.
Change subject: ciperhsuites: add 'mid', changes to strong
..
ciperhsuites: add 'mid', changes to strong
This should be a no-op for live production, as nothing is
currently using 'strong'.
This creates a new option 'mid', which is the same list that
'strong' had previously, but allows TLSv1.0. The compatibility of
such a setup is surprisingly decent, and is kind of an aiming
point for where the compat options eventually want to get to.
'strong' is updated to be stronger: TLSv1.2 + ECHDE-based AEAD
ciphersuites only. This is the best we have available today in
real browsers and servers. If a service really requires that
security trumps all things, and is willing to reject
insufficiently secure clients that are common in the world, this
is your choice.
This also limits apache2.2 to 'compat' only (which probably
should've been done back when compate-dhe was added).
Change-Id: I2960135f17af71eef1785a1d7104755f98f6bbda
---
M modules/wmflib/lib/puppet/parser/functions/ssl_ciphersuite.rb
1 file changed, 24 insertions(+), 19 deletions(-)
Approvals:
BBlack: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/wmflib/lib/puppet/parser/functions/ssl_ciphersuite.rb
b/modules/wmflib/lib/puppet/parser/functions/ssl_ciphersuite.rb
index 11edf96..93c96a1 100644
--- a/modules/wmflib/lib/puppet/parser/functions/ssl_ciphersuite.rb
+++ b/modules/wmflib/lib/puppet/parser/functions/ssl_ciphersuite.rb
@@ -14,9 +14,14 @@
# Note that due to POODLE, SSLv3 is universally disabled and none of these
# options are compatible with SSLv3-only clients such as IE6/XP.
# Current options are:
-# - strong: PFS required, ECDHE+AES suites only, TLSv1.1+ only.
-# Only works for fairly modern browsers. Definitely not
-# compatible with: Android 2.x, IE8/XP, OpenSSL 0.9.8, Java6.
+# - strong: Only TLSv1.2 with AEAD ciphers. In practice this is a very
+# short list, and requires a very modern client. No tradeoff
+# is made for compatibility. Definitely does not work with:
+# IE11, Android4.4, Java8, OpenSSL1.0, Safari(OSX)7
+# - mid:Supports TLSv1.0 and higher, and adds several forward-secret
+# options which are not AEAD. This is compatible with many
+# more clients than strong, but still not compatible with:
+# Android 2.x, IE8/XP, OpenSSL 0.9.8, Java6.
# - compat: Supports most legacy clients, PFS optional, TLSv1.0+ only.
# - compat-dhe: Upgrades 'compat' to use DHE for PFS with certain older
# clients. Breaks some older/commercial Java6 clients, but
@@ -58,20 +63,21 @@
module Puppet::Parser::Functions
# Basic list chunks, used to construct bigger lists
+ # General preference ordering:
+ # 0) ECDHE DHE Kx=RSA
+ # 1) GCM CBC
+ # 2) AES128 AES256
+ # 3) SHA-2 SHA-1
+ # 4) ECDSA RSA
basic = {
-# Only modern reasonably-secure browsers have these.
-# They're all forward-secret, and our preference ordering is
-# (higher trumps all lower considerations, if conflict):
-# 1) GCM CBC
-# 2) AES128 AES256
-# 3) SHA-2 SHA-1
-# 4) ECDSA RSA
'strong' = [
'-ALL',
'ECDHE-ECDSA-AES128-GCM-SHA256',
'ECDHE-RSA-AES128-GCM-SHA256',
'ECDHE-ECDSA-AES256-GCM-SHA384',
'ECDHE-RSA-AES256-GCM-SHA384',
+],
+'mid' = [
'ECDHE-ECDSA-AES128-SHA256',
'ECDHE-RSA-AES128-SHA256',
'ECDHE-ECDSA-AES128-SHA',
@@ -81,14 +87,12 @@
'ECDHE-ECDSA-AES256-SHA',
'ECDHE-RSA-AES256-SHA',
],
-# DHE-based forward-secret option to help e.g. Android 2 and OpenSSL 0.9.8
# Do not use on a server unless you're *sure* it's not using defaulted
# and/or weak DH parameters!
'compat-dhe' = [
'DHE-RSA-AES128-SHA',
],
# not-forward-secret compat for ancient stuff
-# pref rules same as 'strong' where applicable
'compat' = [
'AES128-GCM-SHA256',
'AES256-GCM-SHA384',
@@ -105,8 +109,9 @@
# Final lists exposed to callers
ciphersuites = {
'strong' = basic['strong'],
-'compat' = basic['strong'] + basic['compat'],
-'compat-dhe' = basic['strong'] + basic['compat-dhe'] + basic['compat'],
+'mid'= basic['strong'] + basic['mid'],
+'compat' = basic['strong'] + basic['mid'] + basic['compat'],
+'compat-dhe' = basic['strong'] + basic['mid'] + basic['compat-dhe'] +
basic['compat'],
}
newfunction(
@@ -116,7 +121,7 @@
Outputs the ssl configuration part of the webserver config.
Function parameters are:
servercode - either nginx, apache-2.2 or apache-2.4
- encryption_type - strong, compat, or compat-dhe (do not use compat-dhe unless
+ encryption_type - strong, mid, compat, or compat-dhe (do not use compat-dhe
unless
[MediaWiki-commits] [Gerrit] Migrate analytics-kraken to labs - change (integration/config)
jenkins-bot has submitted this change and it was merged. Change subject: Migrate analytics-kraken to labs .. Migrate analytics-kraken to labs Change-Id: I04154a8b5b8fed3ff73845bf3a7a9f2b59b31f1f --- M jjb/analytics.yaml 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Hashar: Looks good to me, approved jenkins-bot: Verified diff --git a/jjb/analytics.yaml b/jjb/analytics.yaml index fd91dc1..c00d4df 100644 --- a/jjb/analytics.yaml +++ b/jjb/analytics.yaml @@ -21,6 +21,7 @@ - job-template: name: 'analytics-kraken' project-type: maven +node: contintLabsSlave UbuntuTrusty triggers: - zuul scm: -- To view, visit https://gerrit.wikimedia.org/r/222583 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I04154a8b5b8fed3ff73845bf3a7a9f2b59b31f1f Gerrit-PatchSet: 1 Gerrit-Project: integration/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] Repool db2047 after maintenance - change (operations/mediawiki-config)
Jcrespo has uploaded a new change for review. https://gerrit.wikimedia.org/r/222591 Change subject: Repool db2047 after maintenance .. Repool db2047 after maintenance Change-Id: I7fb2979742e8b38fa0bc35c36109ee05d5f82dbc References: T104471 --- M wmf-config/db-codfw.php 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/91/222591/1 diff --git a/wmf-config/db-codfw.php b/wmf-config/db-codfw.php index ca80682..c1edd81 100755 --- a/wmf-config/db-codfw.php +++ b/wmf-config/db-codfw.php @@ -134,7 +134,7 @@ 'db1033' = 0, # 1.4TB 64GB, # 'db2029' = 100, down for maintenance 'db2040' = 100, -# 'db2047' = 100, down for maintenance + 'db2047' = 100, 'db2054' = 100, ), 'silver' = array( -- To view, visit https://gerrit.wikimedia.org/r/222591 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I7fb2979742e8b38fa0bc35c36109ee05d5f82dbc Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Jcrespo jcre...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove usage of Entity::removeDescription - change (mediawiki...Wikibase)
jenkins-bot has submitted this change and it was merged. Change subject: Remove usage of Entity::removeDescription .. Remove usage of Entity::removeDescription Change-Id: I5b0c9560b3f40feb35441046e47caeb2e2a56155 --- M repo/tests/phpunit/includes/ChangeOp/ChangeOpDescriptionTest.php M repo/tests/phpunit/includes/Diff/EntityContentDiffViewTest.php 2 files changed, 4 insertions(+), 6 deletions(-) Approvals: Addshore: Looks good to me, approved jenkins-bot: Verified diff --git a/repo/tests/phpunit/includes/ChangeOp/ChangeOpDescriptionTest.php b/repo/tests/phpunit/includes/ChangeOp/ChangeOpDescriptionTest.php index 9f5048d..4f062ca 100644 --- a/repo/tests/phpunit/includes/ChangeOp/ChangeOpDescriptionTest.php +++ b/repo/tests/phpunit/includes/ChangeOp/ChangeOpDescriptionTest.php @@ -122,7 +122,6 @@ $args[] = array( $entity, new ChangeOpDescription( 'de', null, $validatorFactory ), 'remove', 'de' ); $entity = $this-provideNewEntity(); - $entity-removeDescription( 'de' ); $args[] = array( $entity, new ChangeOpDescription( 'de', 'Zusammenfassung', $validatorFactory ), 'add', 'de' ); return $args; diff --git a/repo/tests/phpunit/includes/Diff/EntityContentDiffViewTest.php b/repo/tests/phpunit/includes/Diff/EntityContentDiffViewTest.php index c77ea40..e8e0b9f 100644 --- a/repo/tests/phpunit/includes/Diff/EntityContentDiffViewTest.php +++ b/repo/tests/phpunit/includes/Diff/EntityContentDiffViewTest.php @@ -37,13 +37,12 @@ $item = new Item( new ItemId( 'Q11' ) ); $item-setDescription( 'en', 'ohi there' ); $item-setLabel( 'de', 'o_O' ); - $item-addAliases( 'nl', array( 'foo', 'bar' ) ); + $item-setAliases( 'nl', array( 'foo', 'bar' ) ); - $item2 = $item-copy(); - $item-setId( new ItemId( 'Q12' ) ); - $item2-setAliases( 'nl', array( 'dh' ) ); + $item2 = new Item( new ItemId( 'Q12' ) ); + $item2-setLabel( 'de', 'o_O' ); $item2-setLabel( 'en', 'O_o' ); - $item2-removeDescription( 'en' ); + $item2-setAliases( 'nl', array( 'dh' ) ); $redirect = new EntityRedirect( new ItemId( 'Q11' ), new ItemId( 'Q21' ) ); $redirect2 = new EntityRedirect( new ItemId( 'Q11' ), new ItemId( 'Q22' ) ); -- To view, visit https://gerrit.wikimedia.org/r/222599 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I5b0c9560b3f40feb35441046e47caeb2e2a56155 Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/extensions/Wikibase Gerrit-Branch: master Gerrit-Owner: Bene benestar.wikime...@gmail.com Gerrit-Reviewer: Addshore addshorew...@gmail.com Gerrit-Reviewer: Jeroen De Dauw jeroended...@gmail.com Gerrit-Reviewer: Thiemo Mättig (WMDE) thiemo.maet...@wikimedia.de Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove TODO from api/AvailableBadges - change (mediawiki...Wikibase)
Addshore has uploaded a new change for review. https://gerrit.wikimedia.org/r/222576 Change subject: Remove TODO from api/AvailableBadges .. Remove TODO from api/AvailableBadges This isn't really a TODO. Just file an 'issue' for this is you think it should be implemented! :D Change-Id: Ifc582d547af8c0d47958ec3c3b26a635f4c17051 --- M repo/includes/api/AvailableBadges.php 1 file changed, 0 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase refs/changes/76/222576/1 diff --git a/repo/includes/api/AvailableBadges.php b/repo/includes/api/AvailableBadges.php index 90d6cd9..ebcf05b 100644 --- a/repo/includes/api/AvailableBadges.php +++ b/repo/includes/api/AvailableBadges.php @@ -9,8 +9,6 @@ /** * API module to query available badge items. * - * @todo this might also be useful to find badges suggestions based on labels - * * @since 0.5 * @licence GNU GPL v2+ * @author Bene* benestar.wikime...@gmail.com -- To view, visit https://gerrit.wikimedia.org/r/222576 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ifc582d547af8c0d47958ec3c3b26a635f4c17051 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Wikibase Gerrit-Branch: master Gerrit-Owner: Addshore addshorew...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Enable WikiLove extension at Spanish Wikipedia - change (operations/mediawiki-config)
Glaisher has uploaded a new change for review. https://gerrit.wikimedia.org/r/222581 Change subject: Enable WikiLove extension at Spanish Wikipedia .. Enable WikiLove extension at Spanish Wikipedia Needs extension's wikilove_log table to be created with this. Bug: T103424 Change-Id: I9b23b8a299e05f5c7ad77a04b2aab75b3c73b383 --- M wmf-config/InitialiseSettings.php 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/81/222581/1 diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index da50cfe..ce9c65c 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -12974,6 +12974,7 @@ 'commonswiki' = true, 'enwiki' = true, 'enwikivoyage' = true, // T52063 + 'eswiki' = true, // T103424 'fawiki' = true, // T35541 'fawiktionary' = true, // T35541 'hewiki' = true, -- To view, visit https://gerrit.wikimedia.org/r/222581 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I9b23b8a299e05f5c7ad77a04b2aab75b3c73b383 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Glaisher glaisher.w...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Unify whitespace in array() functions - change (mediawiki...Wikibase)
Thiemo Mättig (WMDE) has uploaded a new change for review.
https://gerrit.wikimedia.org/r/222585
Change subject: Unify whitespace in array() functions
..
Unify whitespace in array() functions
How did I missed these in I038a0f4? I was sure I did a regex search
for these.
Change-Id: I03b0d9863e5bde22d4d2df98e4ceeb3e6e48e857
---
M
client/tests/phpunit/includes/DataAccess/PropertyParserFunction/VariantsAwareRendererTest.php
M lib/tests/phpunit/entity/EntityFactoryTest.php
M repo/includes/ChangePruner.php
M repo/includes/Diff/EntityDiffVisualizer.php
M repo/includes/store/sql/DispatchStats.php
M repo/tests/phpunit/includes/ChangeOp/ChangeOpAliasesTest.php
M repo/tests/phpunit/includes/ChangeOp/ChangeOpDescriptionTest.php
M repo/tests/phpunit/includes/ChangeOp/ChangeOpLabelTest.php
M repo/tests/phpunit/includes/ChangeOp/ChangeOpMainSnakTest.php
M repo/tests/phpunit/includes/ChangeOp/ChangeOpQualifierRemoveTest.php
M repo/tests/phpunit/includes/ChangeOp/ChangeOpQualifierTest.php
M repo/tests/phpunit/includes/ChangeOp/ChangeOpReferenceRemoveTest.php
M repo/tests/phpunit/includes/ChangeOp/ChangeOpReferenceTest.php
M repo/tests/phpunit/includes/ChangeOp/ChangeOpRemoveStatementTest.php
M repo/tests/phpunit/includes/ChangeOp/ChangeOpSiteLinkTest.php
M repo/tests/phpunit/includes/ChangeOp/ChangeOpStatementRankTest.php
M repo/tests/phpunit/includes/ChangeOp/ChangeOpsTest.php
M repo/tests/phpunit/includes/IO/EntityIdReaderTest.php
M repo/tests/phpunit/includes/Validators/SnakValidatorTest.php
M repo/tests/phpunit/includes/specials/SpecialMergeItemsTest.php
20 files changed, 59 insertions(+), 59 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/85/222585/1
diff --git
a/client/tests/phpunit/includes/DataAccess/PropertyParserFunction/VariantsAwareRendererTest.php
b/client/tests/phpunit/includes/DataAccess/PropertyParserFunction/VariantsAwareRendererTest.php
index a7c56ba..c2eed75 100644
---
a/client/tests/phpunit/includes/DataAccess/PropertyParserFunction/VariantsAwareRendererTest.php
+++
b/client/tests/phpunit/includes/DataAccess/PropertyParserFunction/VariantsAwareRendererTest.php
@@ -60,7 +60,7 @@
array(
'-{zh:mo;zh-hans:mo;zh-hant:mo;zh-cn:mo;zh-hk:mo;}-',
$itemId,
- array ( 'zh', 'zh-hans', 'zh-hant', 'zh-cn',
'zh-hk' ),
+ array( 'zh', 'zh-hans', 'zh-hant', 'zh-cn',
'zh-hk' ),
'cat'
),
// Don't create -{}- for empty input,
diff --git a/lib/tests/phpunit/entity/EntityFactoryTest.php
b/lib/tests/phpunit/entity/EntityFactoryTest.php
index c8f783e..c7b5aab 100644
--- a/lib/tests/phpunit/entity/EntityFactoryTest.php
+++ b/lib/tests/phpunit/entity/EntityFactoryTest.php
@@ -35,10 +35,10 @@
$tests = array();
foreach ( $this-getEntityFactory()-getEntityTypes() as $type
) {
- $tests[] = array ( $type, true );
+ $tests[] = array( $type, true );
}
- $tests[] = array ( 'this-does-not-exist', false );
+ $tests[] = array( 'this-does-not-exist', false );
return $tests;
}
diff --git a/repo/includes/ChangePruner.php b/repo/includes/ChangePruner.php
index 91946e2..8a3e438 100644
--- a/repo/includes/ChangePruner.php
+++ b/repo/includes/ChangePruner.php
@@ -89,7 +89,7 @@
if ( !$this-ignoreDispatch ) {
$dbr = wfGetDB( DB_SLAVE );
$row = $dbr-selectRow(
- array ( 'wb_changes_dispatch', 'wb_changes' ),
+ array( 'wb_changes_dispatch', 'wb_changes' ),
'min(change_time) as timestamp',
array(
'chd_disabled' = 0,
diff --git a/repo/includes/Diff/EntityDiffVisualizer.php
b/repo/includes/Diff/EntityDiffVisualizer.php
index 49a85dd..f8fdc4e 100644
--- a/repo/includes/Diff/EntityDiffVisualizer.php
+++ b/repo/includes/Diff/EntityDiffVisualizer.php
@@ -109,7 +109,7 @@
$termDiffVisualizer = new DiffView(
array(),
new Diff(
- array (
+ array(
$this-context-getLanguage()-getMessage( 'wikibase-diffview-label' ) =
$diff-getLabelsDiff(),
$this-context-getLanguage()-getMessage( 'wikibase-diffview-alias' ) =
$diff-getAliasesDiff(),
$this-context-getLanguage()-getMessage( 'wikibase-diffview-description' ) =
$diff-getDescriptionsDiff(),
@@ -132,7 +132,7 @@
[MediaWiki-commits] [Gerrit] Remove Gerrit replication to lanthanum.eqiad.wmnet - change (operations/puppet)
Hashar has uploaded a new change for review.
https://gerrit.wikimedia.org/r/222595
Change subject: Remove Gerrit replication to lanthanum.eqiad.wmnet
..
Remove Gerrit replication to lanthanum.eqiad.wmnet
The host should no more run any slave, and definitely does not run any
job still relying on the Gerrit replication.
Remove Gerrit replication to lanthanum.eqiad.wmnet.
Bug: T86658
Bug: T86661
Change-Id: I63727298916faaded2b5e38c737eb50479669345
---
M manifests/role/gerrit.pp
1 file changed, 0 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/95/222595/1
diff --git a/manifests/role/gerrit.pp b/manifests/role/gerrit.pp
index 81c8429..fc177ac 100644
--- a/manifests/role/gerrit.pp
+++ b/manifests/role/gerrit.pp
@@ -84,7 +84,6 @@
#
# lint:ignore:single_quote_string_with_variables
'gerritsl...@gallium.wikimedia.org:/srv/ssd/gerrit/${name}.git',
-
'gerritslave@lanthanum.eqiad.wmnet:/srv/ssd/gerrit/${name}.git',
# lint:endignore
],
'threads' = '4',
--
To view, visit https://gerrit.wikimedia.org/r/222595
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I63727298916faaded2b5e38c737eb50479669345
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] Remove usage of Entity::removeDescription - change (mediawiki...Wikibase)
Bene has uploaded a new change for review. https://gerrit.wikimedia.org/r/222599 Change subject: Remove usage of Entity::removeDescription .. Remove usage of Entity::removeDescription Change-Id: I5b0c9560b3f40feb35441046e47caeb2e2a56155 --- M repo/tests/phpunit/includes/ChangeOp/ChangeOpDescriptionTest.php M repo/tests/phpunit/includes/Diff/EntityContentDiffViewTest.php 2 files changed, 4 insertions(+), 6 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase refs/changes/99/222599/1 diff --git a/repo/tests/phpunit/includes/ChangeOp/ChangeOpDescriptionTest.php b/repo/tests/phpunit/includes/ChangeOp/ChangeOpDescriptionTest.php index ab7e69c..8faed9b 100644 --- a/repo/tests/phpunit/includes/ChangeOp/ChangeOpDescriptionTest.php +++ b/repo/tests/phpunit/includes/ChangeOp/ChangeOpDescriptionTest.php @@ -122,7 +122,6 @@ $args[] = array ( $entity, new ChangeOpDescription( 'de', null, $validatorFactory ), 'remove', 'de' ); $entity = $this-provideNewEntity(); - $entity-removeDescription( 'de' ); $args[] = array ( $entity, new ChangeOpDescription( 'de', 'Zusammenfassung', $validatorFactory ), 'add', 'de' ); return $args; diff --git a/repo/tests/phpunit/includes/Diff/EntityContentDiffViewTest.php b/repo/tests/phpunit/includes/Diff/EntityContentDiffViewTest.php index c77ea40..e8e0b9f 100644 --- a/repo/tests/phpunit/includes/Diff/EntityContentDiffViewTest.php +++ b/repo/tests/phpunit/includes/Diff/EntityContentDiffViewTest.php @@ -37,13 +37,12 @@ $item = new Item( new ItemId( 'Q11' ) ); $item-setDescription( 'en', 'ohi there' ); $item-setLabel( 'de', 'o_O' ); - $item-addAliases( 'nl', array( 'foo', 'bar' ) ); + $item-setAliases( 'nl', array( 'foo', 'bar' ) ); - $item2 = $item-copy(); - $item-setId( new ItemId( 'Q12' ) ); - $item2-setAliases( 'nl', array( 'dh' ) ); + $item2 = new Item( new ItemId( 'Q12' ) ); + $item2-setLabel( 'de', 'o_O' ); $item2-setLabel( 'en', 'O_o' ); - $item2-removeDescription( 'en' ); + $item2-setAliases( 'nl', array( 'dh' ) ); $redirect = new EntityRedirect( new ItemId( 'Q11' ), new ItemId( 'Q21' ) ); $redirect2 = new EntityRedirect( new ItemId( 'Q11' ), new ItemId( 'Q22' ) ); -- To view, visit https://gerrit.wikimedia.org/r/222599 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I5b0c9560b3f40feb35441046e47caeb2e2a56155 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Wikibase Gerrit-Branch: master Gerrit-Owner: Bene benestar.wikime...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove i18n shim - change (mediawiki...MaintenanceShell)
Paladox has uploaded a new change for review.
https://gerrit.wikimedia.org/r/222580
Change subject: Remove i18n shim
..
Remove i18n shim
Change-Id: I94f6bb6cb76499526097d66d283141c1adeb3f90
---
D MaintenanceShell.i18n.php
M MaintenanceShell.php
M i18n/es.json
3 files changed, 1 insertion(+), 36 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MaintenanceShell
refs/changes/80/222580/1
diff --git a/MaintenanceShell.i18n.php b/MaintenanceShell.i18n.php
deleted file mode 100644
index 5acfcad..000
--- a/MaintenanceShell.i18n.php
+++ /dev/null
@@ -1,35 +0,0 @@
-?php
-/**
- * This is a backwards-compatibility shim, generated by:
- *
https://git.wikimedia.org/blob/mediawiki%2Fcore.git/HEAD/maintenance%2FgenerateJsonI18n.php
- *
- * Beginning with MediaWiki 1.23, translation strings are stored in json files,
- * and the EXTENSION.i18n.php file only exists to provide compatibility with
- * older releases of MediaWiki. For more information about this migration, see:
- * https://www.mediawiki.org/wiki/Requests_for_comment/Localisation_format
- *
- * This shim maintains compatibility back to MediaWiki 1.17.
- */
-$messages = array();
-if ( !function_exists( 'wfJsonI18nShim06bcb7686bca5f4b' ) ) {
- function wfJsonI18nShim06bcb7686bca5f4b( $cache, $code, $cachedData ) {
- $codeSequence = array_merge( array( $code ),
$cachedData['fallbackSequence'] );
- foreach ( $codeSequence as $csCode ) {
- $fileName = dirname( __FILE__ ) . /i18n/$csCode.json;
- if ( is_readable( $fileName ) ) {
- $data = FormatJson::decode( file_get_contents(
$fileName ), true );
- foreach ( array_keys( $data ) as $key ) {
- if ( $key === '' || $key[0] === '@' ) {
- unset( $data[$key] );
- }
- }
- $cachedData['messages'] = array_merge( $data,
$cachedData['messages'] );
- }
-
- $cachedData['deps'][] = new FileDependency( $fileName );
- }
- return true;
- }
-
- $GLOBALS['wgHooks']['LocalisationCacheRecache'][] =
'wfJsonI18nShim06bcb7686bca5f4b';
-}
diff --git a/MaintenanceShell.php b/MaintenanceShell.php
index 02b5666..6dd889a 100644
--- a/MaintenanceShell.php
+++ b/MaintenanceShell.php
@@ -30,7 +30,6 @@
$wgAutoloadClasses['SpecialMaintenanceShell'] = $dir .
'/includes/SpecialMaintenanceShell.php';
$wgAutoloadClasses['MaintenanceShellArgumentsParser'] = $dir .
'/includes/MaintenanceShellArgumentsParser.php';
$wgMessagesDirs['MaintenanceShell'] = __DIR__ . '/i18n';
-$wgExtensionMessagesFiles['MaintenanceShell'] = $dir .
'/MaintenanceShell.i18n.php';
$wgExtensionMessagesFiles['MaintenanceShellAlias'] = $dir .
'/MaintenanceShell.alias.php';
// Register special pages
diff --git a/i18n/es.json b/i18n/es.json
index a405834..e903cad 100644
--- a/i18n/es.json
+++ b/i18n/es.json
@@ -5,6 +5,7 @@
Ryo567
]
},
+ maintenanceshell-text: strongAdvertencia:/strong usa con cuidado
estos «scripts». Están destinados solo a desarrolladores.\n*
[https://www.mediawiki.org/wiki/Manual:Maintenance_scripts Manual:Scripts de
mantenimiento]\n* [https://www.mediawiki.org/wiki/Extension:MaintenanceShell
Extensión:MaintenanceShell],
maintenanceshell-return: Volver a
[[{{#special:maintenanceshell}}]].,
maintenanceshell-error-scriptname: No se encontró la secuencia de
órdenes,
maintenanceshell-error-rawsubmit: Por motivos de seguridad, esta
página requiere JavaScript para activarse.,
--
To view, visit https://gerrit.wikimedia.org/r/222580
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I94f6bb6cb76499526097d66d283141c1adeb3f90
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MaintenanceShell
Gerrit-Branch: master
Gerrit-Owner: Paladox thomasmulhall...@yahoo.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove last occurence of label 'hasSlaveScripts' - change (integration/config)
Hashar has uploaded a new change for review.
https://gerrit.wikimedia.org/r/222579
Change subject: Remove last occurence of label 'hasSlaveScripts'
..
Remove last occurence of label 'hasSlaveScripts'
The last use is in the job template '{name}-phpcs'. Although it is
unused, migrate it to 'contintLabsSlave'.
Bug: T101966
Change-Id: I370d4e5adf29e93f7f0e672c7ce5e41d9cb5ed24
---
M jjb/job-templates.yaml
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/integration/config
refs/changes/79/222579/1
diff --git a/jjb/job-templates.yaml b/jjb/job-templates.yaml
index bffbfc5..16eaa76 100644
--- a/jjb/job-templates.yaml
+++ b/jjb/job-templates.yaml
@@ -288,7 +288,7 @@
# PHP CodeSniffer on everything under the workspace
- job-template:
name: '{name}-phpcs'
-node: hasSlaveScripts UbuntuPrecise
+node: contintLabsSlave UbuntuPrecise
defaults: use-remote-zuul-no-submodules
concurrent: true
triggers:
--
To view, visit https://gerrit.wikimedia.org/r/222579
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I370d4e5adf29e93f7f0e672c7ce5e41d9cb5ed24
Gerrit-PatchSet: 1
Gerrit-Project: integration/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] Remove i18n shim - change (mediawiki...MaintenanceShell)
jenkins-bot has submitted this change and it was merged.
Change subject: Remove i18n shim
..
Remove i18n shim
Change-Id: I94f6bb6cb76499526097d66d283141c1adeb3f90
---
D MaintenanceShell.i18n.php
M MaintenanceShell.php
2 files changed, 0 insertions(+), 36 deletions(-)
Approvals:
Umherirrender: Looks good to me, approved
jenkins-bot: Verified
diff --git a/MaintenanceShell.i18n.php b/MaintenanceShell.i18n.php
deleted file mode 100644
index 5acfcad..000
--- a/MaintenanceShell.i18n.php
+++ /dev/null
@@ -1,35 +0,0 @@
-?php
-/**
- * This is a backwards-compatibility shim, generated by:
- *
https://git.wikimedia.org/blob/mediawiki%2Fcore.git/HEAD/maintenance%2FgenerateJsonI18n.php
- *
- * Beginning with MediaWiki 1.23, translation strings are stored in json files,
- * and the EXTENSION.i18n.php file only exists to provide compatibility with
- * older releases of MediaWiki. For more information about this migration, see:
- * https://www.mediawiki.org/wiki/Requests_for_comment/Localisation_format
- *
- * This shim maintains compatibility back to MediaWiki 1.17.
- */
-$messages = array();
-if ( !function_exists( 'wfJsonI18nShim06bcb7686bca5f4b' ) ) {
- function wfJsonI18nShim06bcb7686bca5f4b( $cache, $code, $cachedData ) {
- $codeSequence = array_merge( array( $code ),
$cachedData['fallbackSequence'] );
- foreach ( $codeSequence as $csCode ) {
- $fileName = dirname( __FILE__ ) . /i18n/$csCode.json;
- if ( is_readable( $fileName ) ) {
- $data = FormatJson::decode( file_get_contents(
$fileName ), true );
- foreach ( array_keys( $data ) as $key ) {
- if ( $key === '' || $key[0] === '@' ) {
- unset( $data[$key] );
- }
- }
- $cachedData['messages'] = array_merge( $data,
$cachedData['messages'] );
- }
-
- $cachedData['deps'][] = new FileDependency( $fileName );
- }
- return true;
- }
-
- $GLOBALS['wgHooks']['LocalisationCacheRecache'][] =
'wfJsonI18nShim06bcb7686bca5f4b';
-}
diff --git a/MaintenanceShell.php b/MaintenanceShell.php
index 02b5666..6dd889a 100644
--- a/MaintenanceShell.php
+++ b/MaintenanceShell.php
@@ -30,7 +30,6 @@
$wgAutoloadClasses['SpecialMaintenanceShell'] = $dir .
'/includes/SpecialMaintenanceShell.php';
$wgAutoloadClasses['MaintenanceShellArgumentsParser'] = $dir .
'/includes/MaintenanceShellArgumentsParser.php';
$wgMessagesDirs['MaintenanceShell'] = __DIR__ . '/i18n';
-$wgExtensionMessagesFiles['MaintenanceShell'] = $dir .
'/MaintenanceShell.i18n.php';
$wgExtensionMessagesFiles['MaintenanceShellAlias'] = $dir .
'/MaintenanceShell.alias.php';
// Register special pages
--
To view, visit https://gerrit.wikimedia.org/r/222580
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I94f6bb6cb76499526097d66d283141c1adeb3f90
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/MaintenanceShell
Gerrit-Branch: master
Gerrit-Owner: Paladox thomasmulhall...@yahoo.com
Gerrit-Reviewer: Krinkle krinklem...@gmail.com
Gerrit-Reviewer: Legoktm legoktm.wikipe...@gmail.com
Gerrit-Reviewer: Siebrand siebr...@kitano.nl
Gerrit-Reviewer: Umherirrender umherirrender_de...@web.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 i18n shim - change (mediawiki...DismissableSiteNotice)
jenkins-bot has submitted this change and it was merged.
Change subject: Remove i18n shim
..
Remove i18n shim
Change-Id: I6be0f8c67b9b48ab618e4b1ade4297d676bbed02
---
D DismissableSiteNotice.i18n.php
M DismissableSiteNotice.php
2 files changed, 0 insertions(+), 36 deletions(-)
Approvals:
Umherirrender: Looks good to me, approved
jenkins-bot: Verified
diff --git a/DismissableSiteNotice.i18n.php b/DismissableSiteNotice.i18n.php
deleted file mode 100644
index c232578..000
--- a/DismissableSiteNotice.i18n.php
+++ /dev/null
@@ -1,35 +0,0 @@
-?php
-/**
- * This is a backwards-compatibility shim, generated by:
- *
https://git.wikimedia.org/blob/mediawiki%2Fcore.git/HEAD/maintenance%2FgenerateJsonI18n.php
- *
- * Beginning with MediaWiki 1.23, translation strings are stored in json files,
- * and the EXTENSION.i18n.php file only exists to provide compatibility with
- * older releases of MediaWiki. For more information about this migration, see:
- * https://www.mediawiki.org/wiki/Requests_for_comment/Localisation_format
- *
- * This shim maintains compatibility back to MediaWiki 1.17.
- */
-$messages = array();
-if ( !function_exists( 'wfJsonI18nShim6a70a7d776e402df' ) ) {
- function wfJsonI18nShim6a70a7d776e402df( $cache, $code, $cachedData ) {
- $codeSequence = array_merge( array( $code ),
$cachedData['fallbackSequence'] );
- foreach ( $codeSequence as $csCode ) {
- $fileName = dirname( __FILE__ ) . /i18n/$csCode.json;
- if ( is_readable( $fileName ) ) {
- $data = FormatJson::decode( file_get_contents(
$fileName ), true );
- foreach ( array_keys( $data ) as $key ) {
- if ( $key === '' || $key[0] === '@' ) {
- unset( $data[$key] );
- }
- }
- $cachedData['messages'] = array_merge( $data,
$cachedData['messages'] );
- }
-
- $cachedData['deps'][] = new FileDependency( $fileName );
- }
- return true;
- }
-
- $GLOBALS['wgHooks']['LocalisationCacheRecache'][] =
'wfJsonI18nShim6a70a7d776e402df';
-}
diff --git a/DismissableSiteNotice.php b/DismissableSiteNotice.php
index 4e91e04..a1415e3 100644
--- a/DismissableSiteNotice.php
+++ b/DismissableSiteNotice.php
@@ -33,7 +33,6 @@
);
$wgMessagesDirs['DismissableSiteNotice'] = __DIR__ . '/i18n';
-$wgExtensionMessagesFiles['DismissableSiteNotice'] = __DIR__ .
'/DismissableSiteNotice.i18n.php';
$wgResourceModules['ext.dismissableSiteNotice'] = array(
'localBasePath' = __DIR__ . '/modules',
--
To view, visit https://gerrit.wikimedia.org/r/222572
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I6be0f8c67b9b48ab618e4b1ade4297d676bbed02
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/DismissableSiteNotice
Gerrit-Branch: master
Gerrit-Owner: Paladox thomasmulhall...@yahoo.com
Gerrit-Reviewer: Jforrester jforres...@wikimedia.org
Gerrit-Reviewer: Legoktm legoktm.wikipe...@gmail.com
Gerrit-Reviewer: Siebrand siebr...@kitano.nl
Gerrit-Reviewer: Umherirrender umherirrender_de...@web.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 i18n shim - change (mediawiki...AbuseFilter)
jenkins-bot has submitted this change and it was merged.
Change subject: Remove i18n shim
..
Remove i18n shim
Change-Id: Ic98f643d02c0e2a51fd07bf8a2d8a6cedba02135
---
D AbuseFilter.i18n.php
M AbuseFilter.php
2 files changed, 0 insertions(+), 36 deletions(-)
Approvals:
Umherirrender: Looks good to me, approved
jenkins-bot: Verified
diff --git a/AbuseFilter.i18n.php b/AbuseFilter.i18n.php
deleted file mode 100644
index ba953a4..000
--- a/AbuseFilter.i18n.php
+++ /dev/null
@@ -1,35 +0,0 @@
-?php
-/**
- * This is a backwards-compatibility shim, generated by:
- *
https://git.wikimedia.org/blob/mediawiki%2Fcore.git/HEAD/maintenance%2FgenerateJsonI18n.php
- *
- * Beginning with MediaWiki 1.23, translation strings are stored in json files,
- * and the EXTENSION.i18n.php file only exists to provide compatibility with
- * older releases of MediaWiki. For more information about this migration, see:
- * https://www.mediawiki.org/wiki/Requests_for_comment/Localisation_format
- *
- * This shim maintains compatibility back to MediaWiki 1.17.
- */
-$messages = array();
-if ( !function_exists( 'wfJsonI18nShim63590d5a30bb7ce5' ) ) {
- function wfJsonI18nShim63590d5a30bb7ce5( $cache, $code, $cachedData ) {
- $codeSequence = array_merge( array( $code ),
$cachedData['fallbackSequence'] );
- foreach ( $codeSequence as $csCode ) {
- $fileName = dirname( __FILE__ ) . /i18n/$csCode.json;
- if ( is_readable( $fileName ) ) {
- $data = FormatJson::decode( file_get_contents(
$fileName ), true );
- foreach ( array_keys( $data ) as $key ) {
- if ( $key === '' || $key[0] === '@' ) {
- unset( $data[$key] );
- }
- }
- $cachedData['messages'] = array_merge( $data,
$cachedData['messages'] );
- }
-
- $cachedData['deps'][] = new FileDependency( $fileName );
- }
- return true;
- }
-
- $GLOBALS['wgHooks']['LocalisationCacheRecache'][] =
'wfJsonI18nShim63590d5a30bb7ce5';
-}
diff --git a/AbuseFilter.php b/AbuseFilter.php
index 38cbab8..7508ef5 100644
--- a/AbuseFilter.php
+++ b/AbuseFilter.php
@@ -26,7 +26,6 @@
$dir = __DIR__;
$wgMessagesDirs['AbuseFilter'] = $dir/i18n;
-$wgExtensionMessagesFiles['AbuseFilter'] = $dir/AbuseFilter.i18n.php;
$wgExtensionMessagesFiles['AbuseFilterAliases'] = $dir/AbuseFilter.alias.php;
$wgAutoloadClasses['AbuseFilter'] = $dir/AbuseFilter.class.php;
--
To view, visit https://gerrit.wikimedia.org/r/222563
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ic98f643d02c0e2a51fd07bf8a2d8a6cedba02135
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/AbuseFilter
Gerrit-Branch: master
Gerrit-Owner: Paladox thomasmulhall...@yahoo.com
Gerrit-Reviewer: Alex Monk kren...@gmail.com
Gerrit-Reviewer: Jackmcbarn jackmcb...@gmail.com
Gerrit-Reviewer: Krinkle krinklem...@gmail.com
Gerrit-Reviewer: Legoktm legoktm.wikipe...@gmail.com
Gerrit-Reviewer: Se4598 se4...@gmx.de
Gerrit-Reviewer: Siebrand siebr...@kitano.nl
Gerrit-Reviewer: Umherirrender umherirrender_de...@web.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] Support both Site.lang and Site.code for _altlang fallback - change (pywikibot/compat)
Xqt has uploaded a new change for review. https://gerrit.wikimedia.org/r/222614 Change subject: Support both Site.lang and Site.code for _altlang fallback .. Support both Site.lang and Site.code for _altlang fallback This is the first step to enable language fallback for language code only and disable it for site.code at core. Site.code specific code must not be removed later because site.lang ist always equal to site.code in compat. Update from core. Change-Id: I969c0aa3e035b5419719e9a9878ed8eea371ddd2 --- M pywikibot/i18n.py 1 file changed, 80 insertions(+), 73 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/pywikibot/compat refs/changes/14/222614/1 diff --git a/pywikibot/i18n.py b/pywikibot/i18n.py index e62d04d..a1de982 100644 --- a/pywikibot/i18n.py +++ b/pywikibot/i18n.py @@ -4,7 +4,7 @@ and for TranslateWiki-based translations # -# (C) Pywikibot team, 2004-2014 +# (C) Pywikibot team, 2004-2015 # # Distributed under the terms of the MIT license. # @@ -24,44 +24,44 @@ def _altlang(code): Define fallback languages for particular languages. -@param code The language code -@type code string -@return a list of strings as language codes - If no translation is available to a specified language, translate() will try each of the specified fallback languages, in order, until it finds one with a translation, with 'en' and '_default' as a last resort. For example, if for language 'xx', you want the preference of languages -to be: xx fr ru en, you let altlang return ['fr', 'ru']. +to be: xx fr ru en, you let this method return ['fr', 'ru']. This code is used by other translating methods below. +@param code: The language code +@type code: string +@return: language codes +@rtype: list of str -#Akan +# Akan if code in ['ak', 'tw']: return ['ak', 'tw'] -#Amharic +# Amharic if code in ['aa', 'ti']: return ['am'] -#Arab +# Arab if code in ['arc', 'arz', 'so']: return ['ar'] if code == 'kab': return ['ar', 'fr'] -#Bulgarian +# Bulgarian if code in ['cu', 'mk']: return ['bg', 'sr', 'sh'] -#Czech +# Czech if code in ['cs', 'sk']: return ['cs', 'sk'] -#German +# German if code in ['bar', 'frr', 'ksh', 'pdc', 'pfl']: return ['de'] if code == 'lb': return ['de', 'fr'] -if code == 'als': -return ['gsw', 'de'] +if code in ['als', 'gsw']: +return ['als', 'gsw', 'de'] if code == 'nds': return ['nds-nl', 'de'] if code in ['dsb', 'hsb']: @@ -72,13 +72,13 @@ return ['de', 'it'] if code == 'stq': return ['nds', 'de'] -#Greek +# Greek if code in ['grc', 'pnt']: return ['el'] -#Esperanto +# Esperanto if code in ['io', 'nov']: return ['eo'] -#Spanish +# Spanish if code in ['an', 'arn', 'ast', 'ay', 'ca', 'ext', 'lad', 'nah', 'nv', 'qu', 'yua']: return ['es'] @@ -88,22 +88,22 @@ return ['es', 'fr'] if code == 'cbk-zam': return ['es', 'tl'] -#Estonian -if code == 'fiu-vro': -return ['et'] +# Estonian +if code in ['fiu-vro', 'vro']: +return ['fiu-vro', 'vro', 'et'] if code == 'liv': return ['et', 'lv'] -#Persian (Farsi) +# Persian (Farsi) if code == 'ps': return ['fa'] if code in ['glk', 'mzn']: return ['glk', 'mzn', 'fa', 'ar'] -#Finnish +# Finnish if code == 'vep': return ['fi', 'ru'] if code == 'fit': return ['fi', 'sv'] -#French +# French if code in ['bm', 'br', 'ht', 'kg', 'ln', 'mg', 'nrm', 'pcd', 'rw', 'sg', 'ty', 'wa']: return ['fr'] @@ -111,46 +111,50 @@ return ['fr', 'ca', 'es'] if code in ['co', 'frp']: return ['fr', 'it'] -#Hindi +# Hindi if code in ['sa']: return ['hi'] if code in ['ne', 'new']: return ['ne', 'new', 'hi'] -#Indonesian and Malay +if code in ['bh', 'bho']: +return ['bh', 'bho'] +# Indonesian and Malay if code in ['ace', 'bug', 'bjn', 'id', 'jv', 'ms', 'su']: return ['id', 'ms', 'jv'] if code == 'map-bms': return ['jv', 'id', 'ms'] -#Inuit languages +# Inuit languages if code in ['ik', 'iu']: return ['iu', 'kl'] if code == 'kl': -return ['da', 'iu', 'no'] -#Italian +return ['da', 'iu', 'no', 'nb'] +# Italian if code in ['eml', 'fur', 'lij', 'lmo', 'nap', 'pms', 'roa-tara', 'sc', 'scn', 'vec']: return ['it'] -#Lithuanian -if code in ['bat-smg']: -return ['lt'] -#Latvian +# Lithuanian +if code in ['bat-smg', 'sgs']: +return
[MediaWiki-commits] [Gerrit] Nother couple WorldPay-Worldpay - change (wikimedia...crm)
jenkins-bot has submitted this change and it was merged.
Change subject: Nother couple WorldPay-Worldpay
..
Nother couple WorldPay-Worldpay
Change-Id: I4027c8bd1614ce287dfd30da41e60b6ce9d0abe7
---
M sites/all/modules/wmf_audit/worldpay/WorldpayAuditProcessor.php
M
sites/all/modules/wmf_reports/CRM/Report/Form/Contribute/GatewayReconciliation.php
2 files changed, 2 insertions(+), 2 deletions(-)
Approvals:
Awight: Looks good to me, approved
jenkins-bot: Verified
diff --git a/sites/all/modules/wmf_audit/worldpay/WorldpayAuditProcessor.php
b/sites/all/modules/wmf_audit/worldpay/WorldpayAuditProcessor.php
index 90e8987..5f6ba59 100644
--- a/sites/all/modules/wmf_audit/worldpay/WorldpayAuditProcessor.php
+++ b/sites/all/modules/wmf_audit/worldpay/WorldpayAuditProcessor.php
@@ -70,7 +70,7 @@
*/
protected function parse_recon_file($file) {
$recon_data = array();
- $recon_parser = new WorldPayAudit();
+ $recon_parser = new WorldpayAudit();
$data = null;
try {
diff --git
a/sites/all/modules/wmf_reports/CRM/Report/Form/Contribute/GatewayReconciliation.php
b/sites/all/modules/wmf_reports/CRM/Report/Form/Contribute/GatewayReconciliation.php
index 09372cb..e52f6f4 100644
---
a/sites/all/modules/wmf_reports/CRM/Report/Form/Contribute/GatewayReconciliation.php
+++
b/sites/all/modules/wmf_reports/CRM/Report/Form/Contribute/GatewayReconciliation.php
@@ -17,7 +17,7 @@
'GLOBALCOLLECT' = 'GlobalCollect',
'JPMORGAN' = 'JP Morgan',
'PAYPAL' = 'PayPal',
-'WORLDPAY' = 'WorldPay',
+'WORLDPAY' = 'Worldpay',
);
$this-_columns = array(
--
To view, visit https://gerrit.wikimedia.org/r/222505
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I4027c8bd1614ce287dfd30da41e60b6ce9d0abe7
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: master
Gerrit-Owner: Ejegg eeggles...@wikimedia.org
Gerrit-Reviewer: Awight awi...@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] Changed the url for LanguageTool Server - change (mediawiki...LanguageTool)
Amire80 has submitted this change and it was merged.
Change subject: Changed the url for LanguageTool Server
..
Changed the url for LanguageTool Server
Change-Id: I3345c1b70c5bdd3984301439f5b5056f764efd8a
---
M modules/ext.LanguageToolAction.js
1 file changed, 4 insertions(+), 4 deletions(-)
Approvals:
Amire80: Verified; Looks good to me, approved
diff --git a/modules/ext.LanguageToolAction.js
b/modules/ext.LanguageToolAction.js
index 14e09e0..bcd2eab 100644
--- a/modules/ext.LanguageToolAction.js
+++ b/modules/ext.LanguageToolAction.js
@@ -48,12 +48,12 @@
var model = ve.init.target.getSurface().getModel();
function getTextNodes( obj ) {
var i;
-
+
for ( i = 0; i obj.children.length; i++ ) {
if ( obj.children[i].type === 'text'){
nodes.push(obj.children[i]);
}
-
+
if ( obj.children[i].children ) {
getTextNodes( obj.children[i] );
}
@@ -85,7 +85,7 @@
{
type: 'POST',
dataType: 'text',
- url: 'http://127.0.0.1:8081/',
+ url: 'http://tools.wmflabs.org/languageproofing/',
data: {language: lang, text: text}
}
)
@@ -101,7 +101,7 @@
windowManager.openWindow( messageDialog, {
title: 'LanguageTool Response',
message: d
- } );
+ } );
});
return;
}
--
To view, visit https://gerrit.wikimedia.org/r/222613
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I3345c1b70c5bdd3984301439f5b5056f764efd8a
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/LanguageTool
Gerrit-Branch: master
Gerrit-Owner: Ankita-ks kumariankita...@gmail.com
Gerrit-Reviewer: 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] Recursively create the graphviz images directory - change (mediawiki...GraphViz)
jenkins-bot has submitted this change and it was merged.
Change subject: Recursively create the graphviz images directory
..
Recursively create the graphviz images directory
This ensures that a missing parent directory is gracefully handled.
Change-Id: Iea9e6c70d5050fcfa23166c6d49c8c153beaacae
---
M GraphViz_body.php
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Welterkj: Looks good to me, approved
jenkins-bot: Verified
diff --git a/GraphViz_body.php b/GraphViz_body.php
index ba61ec1..69d82d0 100644
--- a/GraphViz_body.php
+++ b/GraphViz_body.php
@@ -1750,7 +1750,7 @@
// create the output directory if it does not exist
if ( !is_dir( $uploadSubdir ) ) {
$mode = fileperms ( $wgUploadDirectory );
- if ( !mkdir( $uploadSubdir, $mode ) ) {
+ if ( !mkdir( $uploadSubdir, $mode, true ) ) {
wfDebug( __METHOD__ . : mkdir($uploadSubdir,
$mode) failed\n );
return false;
}
--
To view, visit https://gerrit.wikimedia.org/r/207402
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iea9e6c70d5050fcfa23166c6d49c8c153beaacae
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/GraphViz
Gerrit-Branch: master
Gerrit-Owner: Rcdeboer remcocdeb...@gmail.com
Gerrit-Reviewer: Welterkj welterkj+...@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] Reload collection when exiting overlay after making changes. - change (mediawiki...Gather)
jenkins-bot has submitted this change and it was merged.
Change subject: Reload collection when exiting overlay after making changes.
..
Reload collection when exiting overlay after making changes.
* Reload collection if collection settings were changed and overlay
** Was exited by clicking the back or cancel button.
* If collection name changes, reload with correct url.
Bug: T104025
Change-Id: I991dc45335e0c5b97b335af795628147799b76b5
---
M resources/ext.gather.collection.editor/CollectionEditOverlay.js
1 file changed, 28 insertions(+), 6 deletions(-)
Approvals:
Jdlrobson: Looks good to me, approved
jenkins-bot: Verified
diff --git a/resources/ext.gather.collection.editor/CollectionEditOverlay.js
b/resources/ext.gather.collection.editor/CollectionEditOverlay.js
index 37427be..490386b 100644
--- a/resources/ext.gather.collection.editor/CollectionEditOverlay.js
+++ b/resources/ext.gather.collection.editor/CollectionEditOverlay.js
@@ -94,7 +94,8 @@
'input .search-header input': 'onRunSearch',
'click .search-header .back': 'onExitSearch',
'click .save-description': 'onSaveDescriptionClick',
- 'click .back': 'onBackClick',
+ 'click .back': 'onSettingsBackClick',
+ 'click .cancel': 'onCancelClick',
'click .save': 'onFirstPaneSaveClick',
'click .collection-privacy': 'onToggleCollectionPrivacy'
} ),
@@ -106,8 +107,13 @@
} ),
/** @inheritdoc */
initialize: function ( options ) {
+ // Initial properties;
+ this.id = null;
+ this.originalTitle = '';
+
if ( options options.collection ) {
this.id = options.collection.id;
+ this.originalTitle = options.collection.title;
} else {
options.collection = {
// New collection is public by default
@@ -121,13 +127,11 @@
},
/** @inheritdoc */
postRender: function () {
- var id = this.id;
Overlay.prototype.postRender.apply( this, arguments );
- if ( id ) {
+ if ( this.id ) {
this._populateCollectionMembers();
} else {
- this.id = null;
this._switchToSettingsPane();
}
},
@@ -300,9 +304,18 @@
deleteOverlay.show();
},
/**
+* Event handler when the cancel (back) button is clicked on
the edit pane.
+*/
+ onCancelClick: function () {
+ Overlay.prototype.onExit.apply( this, arguments );
+ if ( this._stateChanged ) {
+ this._reloadCollection();
+ }
+ },
+ /**
* Event handler when the back button is clicked on the
title/edit description pane.
*/
- onBackClick: function () {
+ onSettingsBackClick: function () {
if ( this.id ) {
// reset the values to their original values.
this.$( 'input.title' ).val(
this.options.collection.title );
@@ -320,9 +333,18 @@
_reloadCollection: function () {
var self = this;
window.setTimeout( function () {
+ var collection;
router.navigate( '/' );
if ( self.options.reloadOnSave ) {
- window.location.reload();
+ collection = self.options.collection;
+ // Reload collection with updated title
in url
+ if ( self.originalTitle !==
collection.title ) {
+ window.location.href =
mw.util.getUrl(
+ [ 'Special:Gather',
'id', collection.id, collection.title ].join( '/' )
+ );
+ } else {
+ window.location.reload();
+ }
}
}, 100 );
},
--
To view, visit https://gerrit.wikimedia.org/r/221772
To
[MediaWiki-commits] [Gerrit] mediawiki apache config: don't load mod_deflate on HHVMs - change (operations/puppet)
Ori.livneh has uploaded a new change for review. https://gerrit.wikimedia.org/r/222673 Change subject: mediawiki apache config: don't load mod_deflate on HHVMs .. mediawiki apache config: don't load mod_deflate on HHVMs The combination of mod_deflate and mod_fastcgi cause Apache to send responses with a Content-Length header that does not agree with the actual response size. This is suspected to be the cause of errors on the HHVM scaler. See https://ma.ttias.be/apaches-mod_fastcgi-mod_deflate-troubles/. Change-Id: I16c378ddccdc7e6e51b1c69c1cde9269843b909d --- M modules/mediawiki/files/apache/sites/main.conf 1 file changed, 3 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/73/222673/1 diff --git a/modules/mediawiki/files/apache/sites/main.conf b/modules/mediawiki/files/apache/sites/main.conf index b6d12fb..bed09f3 100644 --- a/modules/mediawiki/files/apache/sites/main.conf +++ b/modules/mediawiki/files/apache/sites/main.conf @@ -816,7 +816,9 @@ Alias /zh-tw /srv/mediawiki/docroot/wikivoyage.org/w/index.php /VirtualHost -LoadModule deflate_module /usr/lib/apache2/modules/mod_deflate.so +IfDefine !HHVM +LoadModule deflate_module /usr/lib/apache2/modules/mod_deflate.so +/IfDefine IfModule mod_deflate.c IfModule mod_filter.c AddOutputFilterByType DEFLATE text/css text/javascript application/x-javascript -- To view, visit https://gerrit.wikimedia.org/r/222673 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I16c378ddccdc7e6e51b1c69c1cde9269843b909d Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production 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] Changed the url for LanguageTool Server - change (mediawiki...LanguageTool)
Ankita-ks has uploaded a new change for review.
https://gerrit.wikimedia.org/r/222613
Change subject: Changed the url for LanguageTool Server
..
Changed the url for LanguageTool Server
Change-Id: I3345c1b70c5bdd3984301439f5b5056f764efd8a
---
M modules/ext.LanguageToolAction.js
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/LanguageTool
refs/changes/13/222613/1
diff --git a/modules/ext.LanguageToolAction.js
b/modules/ext.LanguageToolAction.js
index 14e09e0..e48f2e0 100644
--- a/modules/ext.LanguageToolAction.js
+++ b/modules/ext.LanguageToolAction.js
@@ -85,7 +85,7 @@
{
type: 'POST',
dataType: 'text',
- url: 'http://127.0.0.1:8081/',
+ url: 'http://tools.wmflabs.org/languageproofing/',
data: {language: lang, text: text}
}
)
--
To view, visit https://gerrit.wikimedia.org/r/222613
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I3345c1b70c5bdd3984301439f5b5056f764efd8a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/LanguageTool
Gerrit-Branch: master
Gerrit-Owner: Ankita-ks kumariankita...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Page actions and issues from beta to stable - change (mediawiki...MobileFrontend)
jenkins-bot has submitted this change and it was merged.
Change subject: Page actions and issues from beta to stable
..
Page actions and issues from beta to stable
* Merge beta/alpha page actions and issues styles with existing stable
styles
* Remove the MinervaTemplateBeta#renderPreContent method, which was
added merely to reposition the page actions container element
* Reposition the page actions container element in JavaScript to handle
cached HTML
* Promote all beta behaviour in the page issues module to stable
Bug: T101721
Change-Id: Id4b2508a2f71922a077f55e7f297f56ac7768a59
---
M i18n/en.json
M includes/skins/MinervaTemplate.php
M includes/skins/MinervaTemplateBeta.php
M resources/mobile.issues/init.js
M resources/mobile.issues/issues.less
M resources/mobile.startup/init.js
M resources/skins.minerva.base.styles/pageactions.less
M resources/skins.minerva.beta.styles/pageactions.less
M resources/skins.minerva.scripts/init.js
M resources/skins.minerva.tablet.beta.styles/common.less
M resources/skins.minerva.tablet.styles/common.less
11 files changed, 82 insertions(+), 187 deletions(-)
Approvals:
Jdlrobson: Looks good to me, approved
jenkins-bot: Verified
diff --git a/i18n/en.json b/i18n/en.json
index 72dde4e..e67ee6c 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -227,8 +227,7 @@
mobile-frontend-main-menu-watchlist: Watchlist,
mobile-frontend-media-details: Details,
mobile-frontend-media-license-link: License information,
- mobile-frontend-meta-data-issues: This page has some issues,
- mobile-frontend-meta-data-issues-beta: Page issues,
+ mobile-frontend-meta-data-issues: Page issues,
mobile-frontend-meta-data-issues-talk: About this talk page,
mobile-frontend-meta-data-issues-header: Issues,
mobile-frontend-meta-data-issues-header-talk: About this page,
diff --git a/includes/skins/MinervaTemplate.php
b/includes/skins/MinervaTemplate.php
index 67ce680..65cb427 100644
--- a/includes/skins/MinervaTemplate.php
+++ b/includes/skins/MinervaTemplate.php
@@ -277,22 +277,25 @@
*/
protected function renderPreContent( $data ) {
$internalBanner = $data[ 'internalBanner' ];
- $isSpecialPage = $this-isSpecialPage;
$preBodyText = isset( $data['prebodytext'] ) ?
$data['prebodytext'] : '';
if ( $internalBanner || $preBodyText ) {
?
div class=pre-content heading-holder
?php
+ if ( !$this-isSpecialPage ){
+ $this-renderPageActions( $data );
+ }
+
echo $preBodyText;
+
// FIXME: Temporary solution until we have
design
if ( isset( $data['_old_revision_warning'] ) ) {
echo $data['_old_revision_warning'];
- } elseif ( !$isSpecialPage ){
- $this-renderPageActions( $data );
}
+
echo $internalBanner;
- ?
+ ?
/div
?php
}
diff --git a/includes/skins/MinervaTemplateBeta.php
b/includes/skins/MinervaTemplateBeta.php
index e81a573..1fbf4b0 100644
--- a/includes/skins/MinervaTemplateBeta.php
+++ b/includes/skins/MinervaTemplateBeta.php
@@ -72,34 +72,4 @@
return $result;
}
-
- /**
-* Renders the list of page actions and then the title of the page in
its
-* container to keep LESS changes to a minimum.
-*
-* @param array $data
-*/
- protected function renderPreContent( $data ) {
- $internalBanner = $data[ 'internalBanner' ];
- $preBodyText = isset( $data['prebodytext'] ) ?
$data['prebodytext'] : '';
-
- if ( $internalBanner || $preBodyText ) {
-
- ?
- div class=pre-content heading-holder
- ?php
- if ( !$this-isSpecialPage ) {
- $this-renderPageActions( $data );
- }
- echo $preBodyText;
- // FIXME: Temporary solution until we have
design
- if ( isset( $data['_old_revision_warning'] ) ) {
- echo $data['_old_revision_warning'];
- }
- echo $internalBanner;
- ?
- /div
- ?php
- }
- }
}
diff --git a/resources/mobile.issues/init.js
[MediaWiki-commits] [Gerrit] Make filenames use consistent uppercase LanguageTool - change (mediawiki...LanguageTool)
Ankita-ks has submitted this change and it was merged.
Change subject: Make filenames use consistent uppercase LanguageTool
..
Make filenames use consistent uppercase LanguageTool
Change-Id: I3fab7c6c837c52a164eaa7802b2861ecc92b8e25
---
M extension.json
1 file changed, 5 insertions(+), 5 deletions(-)
Approvals:
Ankita-ks: Verified; Looks good to me, approved
diff --git a/extension.json b/extension.json
index 2dd3263..9e18188 100644
--- a/extension.json
+++ b/extension.json
@@ -16,11 +16,11 @@
]
},
ResourceModules: {
- ext.languageTool: {
+ ext.LanguageTool: {
scripts: [
- modules/ext.languageTool.js,
- modules/ext.languageToolAction.js,
- modules/ext.languageToolCommand.js
+ modules/ext.LanguageTool.js,
+ modules/ext.LanguageToolAction.js,
+ modules/ext.LanguageToolCommand.js
],
dependencies: [
ext.visualEditor.mwcore
@@ -33,7 +33,7 @@
},
config: {
VisualEditorPluginModules: [
- ext.languageTool
+ ext.LanguageTool
]
}
}
--
To view, visit https://gerrit.wikimedia.org/r/222623
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I3fab7c6c837c52a164eaa7802b2861ecc92b8e25
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/LanguageTool
Gerrit-Branch: master
Gerrit-Owner: Amire80 amir.ahar...@mail.huji.ac.il
Gerrit-Reviewer: Ankita-ks kumariankita...@gmail.com
Gerrit-Reviewer: Legoktm legoktm.wikipe...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Cleanup in doTableStuff - change (mediawiki/core)
Arlolra has uploaded a new change for review.
https://gerrit.wikimedia.org/r/222683
Change subject: Cleanup in doTableStuff
..
Cleanup in doTableStuff
Change-Id: I75c0a943b24f96a30c6ee1efc3f0b11388f892b7
---
M includes/parser/Parser.php
1 file changed, 7 insertions(+), 6 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/83/222683/1
diff --git a/includes/parser/Parser.php b/includes/parser/Parser.php
index 1603fc6..a745f4b 100644
--- a/includes/parser/Parser.php
+++ b/includes/parser/Parser.php
@@ -1023,6 +1023,7 @@
}
$first_character = $line[0];
+ $first_two = substr( $line, 0, 2 );
$matches = array();
if ( preg_match( '/^(:*)\{\|(.*)$/', $line, $matches )
) {
@@ -1042,7 +1043,7 @@
# Don't do any of the following
$out .= $outLine . \n;
continue;
- } elseif ( substr( $line, 0, 2 ) === '|}' ) {
+ } elseif ( $first_two === '|}' ) {
# We are ending a table
$line = '/table' . substr( $line, 2 );
$last_tag = array_pop( $last_tag_history );
@@ -1060,7 +1061,7 @@
}
array_pop( $tr_attributes );
$outLine = $line . str_repeat( '/dd/dl',
$indent_level );
- } elseif ( substr( $line, 0, 2 ) === '|-' ) {
+ } elseif ( $first_two === '|-' ) {
# Now we have a table row
$line = preg_replace( '#^\|-+#', '', $line );
@@ -1089,15 +1090,15 @@
array_push( $last_tag_history, '' );
} elseif ( $first_character === '|'
|| $first_character === '!'
- || substr( $line, 0, 2 ) === '|+'
+ || $first_two === '|+'
) {
# This might be cell elements, td, th or
captions
- if ( substr( $line, 0, 2 ) === '|+' ) {
+ if ( $first_two === '|+' ) {
$first_character = '+';
+ $line = substr( $line, 2 );
+ } else {
$line = substr( $line, 1 );
}
-
- $line = substr( $line, 1 );
if ( $first_character === '!' ) {
$line = str_replace( '!!', '||', $line
);
--
To view, visit https://gerrit.wikimedia.org/r/222683
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I75c0a943b24f96a30c6ee1efc3f0b11388f892b7
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Arlolra abrea...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Make filenames use consistent uppercase LanguageTool - change (mediawiki...LanguageTool)
Amire80 has uploaded a new change for review.
https://gerrit.wikimedia.org/r/222623
Change subject: Make filenames use consistent uppercase LanguageTool
..
Make filenames use consistent uppercase LanguageTool
Change-Id: I3fab7c6c837c52a164eaa7802b2861ecc92b8e25
---
M extension.json
1 file changed, 5 insertions(+), 5 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/LanguageTool
refs/changes/23/222623/1
diff --git a/extension.json b/extension.json
index 2dd3263..9e18188 100644
--- a/extension.json
+++ b/extension.json
@@ -16,11 +16,11 @@
]
},
ResourceModules: {
- ext.languageTool: {
+ ext.LanguageTool: {
scripts: [
- modules/ext.languageTool.js,
- modules/ext.languageToolAction.js,
- modules/ext.languageToolCommand.js
+ modules/ext.LanguageTool.js,
+ modules/ext.LanguageToolAction.js,
+ modules/ext.LanguageToolCommand.js
],
dependencies: [
ext.visualEditor.mwcore
@@ -33,7 +33,7 @@
},
config: {
VisualEditorPluginModules: [
- ext.languageTool
+ ext.LanguageTool
]
}
}
--
To view, visit https://gerrit.wikimedia.org/r/222623
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I3fab7c6c837c52a164eaa7802b2861ecc92b8e25
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/LanguageTool
Gerrit-Branch: master
Gerrit-Owner: Amire80 amir.ahar...@mail.huji.ac.il
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove old-style url redirects - change (mediawiki...parsoid)
Arlolra has uploaded a new change for review.
https://gerrit.wikimedia.org/r/222610
Change subject: Remove old-style url redirects
..
Remove old-style url redirects
* Hopefully people have updated since this was introduced in 2012.
* From f0f157adfe25056e27bd7d9f0d71c6d70e2ff0bd
Change-Id: Id8d330f2afae293c544406346111442200e9ceab
---
M api/ParsoidService.js
M api/routes.js
2 files changed, 0 insertions(+), 19 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/parsoid
refs/changes/10/222610/1
diff --git a/api/ParsoidService.js b/api/ParsoidService.js
index 842b59b..c9a0573 100644
--- a/api/ParsoidService.js
+++ b/api/ParsoidService.js
@@ -88,7 +88,6 @@
app.get( '/robots.txt', routes.robots );
// private routes
- app.get( re('^/((?:_rt|_rtve)/)?(' + mwApiRe + '):(.*)$'),
routes.redirectOldStyle );
app.get( re('^/_html/(?:(' + mwApiRe + ')/(.*))?'), i, p,
routes.html2wtForm );
app.get( re('^/_wikitext/(?:(' + mwApiRe + ')/(.*))?'), i, p,
routes.wt2htmlForm );
app.get( re('^/_rt/(?:(' + mwApiRe + ')/(.*))?'), i, p,
routes.roundtripTesting );
diff --git a/api/routes.js b/api/routes.js
index f2318d0..f503e10 100644
--- a/api/routes.js
+++ b/api/routes.js
@@ -174,24 +174,6 @@
});
};
- // Redirects for old-style URL compatibility
- routes.redirectOldStyle = function( req, res ) {
- if ( req.params[0] ) {
- apiUtils.relativeRedirect({
- path: '/' + req.params[0] + req.params[1] +
'/' + req.params[2],
- res: res,
- code: 301
- });
- } else {
- apiUtils.relativeRedirect({
- path: '/' + req.params[1] + '/' +
req.params[2],
- res: res,
- code: 301
- });
- }
- res.end();
- };
-
// Form-based HTML DOM - wikitext interface for manual testing.
routes.html2wtForm = function( req, res ) {
var env = res.local('env');
--
To view, visit https://gerrit.wikimedia.org/r/222610
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Id8d330f2afae293c544406346111442200e9ceab
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/parsoid
Gerrit-Branch: master
Gerrit-Owner: Arlolra abrea...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix typo w/ VRS URL construction, commit e126f75 - change (mediawiki...Collection)
Alex Monk has uploaded a new change for review.
https://gerrit.wikimedia.org/r/222616
Change subject: Fix typo w/ VRS URL construction, commit e126f75
..
Fix typo w/ VRS URL construction, commit e126f75
PHP's concatenation operator is ., not +. This creates invalid URLs
such as http://10.2.2.17:72310; and thus failing jobs.
This fixes a regression introduced with
e126f75b73a86436c5728b4cc3484ed50f9cc128.
Change-Id: If39b50013cc3aed7a59e40e22eae0ac072e519c2
---
M RenderingAPI.php
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Collection
refs/changes/16/222616/1
diff --git a/RenderingAPI.php b/RenderingAPI.php
index 5bbfeca..4dd7830 100644
--- a/RenderingAPI.php
+++ b/RenderingAPI.php
@@ -226,7 +226,7 @@
);
$url = preg_replace(
'#/?$#',
- '/' + $domain + '/v1/',
+ '/' . $domain . '/v1/',
$params['url']
);
for ( $i = 0; $i count( $result['wikis'] ); $i++ ) {
--
To view, visit https://gerrit.wikimedia.org/r/222616
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: If39b50013cc3aed7a59e40e22eae0ac072e519c2
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Collection
Gerrit-Branch: wmf/1.26wmf12
Gerrit-Owner: Alex Monk kren...@gmail.com
Gerrit-Reviewer: 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] Fix typo w/ VRS URL construction, commit e126f75 - change (mediawiki...Collection)
jenkins-bot has submitted this change and it was merged.
Change subject: Fix typo w/ VRS URL construction, commit e126f75
..
Fix typo w/ VRS URL construction, commit e126f75
PHP's concatenation operator is ., not +. This creates invalid URLs
such as http://10.2.2.17:72310; and thus failing jobs.
This fixes a regression introduced with
e126f75b73a86436c5728b4cc3484ed50f9cc128.
Change-Id: If39b50013cc3aed7a59e40e22eae0ac072e519c2
---
M RenderingAPI.php
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Alex Monk: Looks good to me, approved
jenkins-bot: Verified
diff --git a/RenderingAPI.php b/RenderingAPI.php
index 5bbfeca..4dd7830 100644
--- a/RenderingAPI.php
+++ b/RenderingAPI.php
@@ -226,7 +226,7 @@
);
$url = preg_replace(
'#/?$#',
- '/' + $domain + '/v1/',
+ '/' . $domain . '/v1/',
$params['url']
);
for ( $i = 0; $i count( $result['wikis'] ); $i++ ) {
--
To view, visit https://gerrit.wikimedia.org/r/222616
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: If39b50013cc3aed7a59e40e22eae0ac072e519c2
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Collection
Gerrit-Branch: wmf/1.26wmf12
Gerrit-Owner: Alex Monk kren...@gmail.com
Gerrit-Reviewer: Alex Monk kren...@gmail.com
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] Fix typo w/ VRS URL construction, commit e126f75 - change (mediawiki...Collection)
jenkins-bot has submitted this change and it was merged.
Change subject: Fix typo w/ VRS URL construction, commit e126f75
..
Fix typo w/ VRS URL construction, commit e126f75
PHP's concatenation operator is ., not +. This creates invalid URLs
such as http://10.2.2.17:72310; and thus failing jobs.
This fixes a regression introduced with
e126f75b73a86436c5728b4cc3484ed50f9cc128.
Change-Id: If39b50013cc3aed7a59e40e22eae0ac072e519c2
---
M RenderingAPI.php
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Alex Monk: Looks good to me, approved
jenkins-bot: Verified
diff --git a/RenderingAPI.php b/RenderingAPI.php
index 5bbfeca..4dd7830 100644
--- a/RenderingAPI.php
+++ b/RenderingAPI.php
@@ -226,7 +226,7 @@
);
$url = preg_replace(
'#/?$#',
- '/' + $domain + '/v1/',
+ '/' . $domain . '/v1/',
$params['url']
);
for ( $i = 0; $i count( $result['wikis'] ); $i++ ) {
--
To view, visit https://gerrit.wikimedia.org/r/222615
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: If39b50013cc3aed7a59e40e22eae0ac072e519c2
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Collection
Gerrit-Branch: master
Gerrit-Owner: Faidon Liambotis fai...@wikimedia.org
Gerrit-Reviewer: Alex Monk kren...@gmail.com
Gerrit-Reviewer: Cscott canan...@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 minor regression in tablet pre-content gutter - change (mediawiki...MobileFrontend)
jenkins-bot has submitted this change and it was merged.
Change subject: Fix minor regression in tablet pre-content gutter
..
Fix minor regression in tablet pre-content gutter
42782198 made the base rule that defines the pre-content (title, page
actions, and page issues) gutter more specific than the tablet-specific
rule.
Match the specificity of the base rule in the tablet-specifc rule so
that the base rule is overridden correctly.
Bug: T98925
Change-Id: Id8e1931360e5942929d31a1fcd8295b25b2fe17f
---
M resources/skins.minerva.tablet.styles/common.less
1 file changed, 3 insertions(+), 1 deletion(-)
Approvals:
Jdlrobson: Looks good to me, approved
jenkins-bot: Verified
diff --git a/resources/skins.minerva.tablet.styles/common.less
b/resources/skins.minerva.tablet.styles/common.less
index f76ce18..b71531b 100644
--- a/resources/skins.minerva.tablet.styles/common.less
+++ b/resources/skins.minerva.tablet.styles/common.less
@@ -14,7 +14,9 @@
}
}
- .pre-content {
+ // FIXME: remove the .stable .pre-content selector when cache clears
+ .stable .pre-content,
+ .heading-holder {
position: relative;
padding: 20px @contentPaddingTablet 0 @contentPaddingTablet;
--
To view, visit https://gerrit.wikimedia.org/r/222604
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Id8e1931360e5942929d31a1fcd8295b25b2fe17f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Phuedx g...@samsmith.io
Gerrit-Reviewer: BarryTheBrowserTestBot jdlrobson+ba...@gmail.com
Gerrit-Reviewer: Jdlrobson jrob...@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] Use .git in .gitreview - change (mediawiki...MathSearch)
Paladox has uploaded a new change for review.
https://gerrit.wikimedia.org/r/222624
Change subject: Use .git in .gitreview
..
Use .git in .gitreview
Change-Id: I3cb87860af9228d7759b678dc073937ef1d00b6a
---
M .gitreview
M i18n/zh-hant.json
2 files changed, 5 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MathSearch
refs/changes/24/222624/1
diff --git a/.gitreview b/.gitreview
index 95601d9..b29d8b4 100644
--- a/.gitreview
+++ b/.gitreview
@@ -1,6 +1,6 @@
[gerrit]
host=gerrit.wikimedia.org
port=29418
-project=mediawiki/extensions/MathSearch
+project=mediawiki/extensions/MathSearch.git
defaultbranch=master
defaultrebase=0
\ No newline at end of file
diff --git a/i18n/zh-hant.json b/i18n/zh-hant.json
index 30e9f7b..2198d19 100644
--- a/i18n/zh-hant.json
+++ b/i18n/zh-hant.json
@@ -1,7 +1,8 @@
{
@metadata: {
authors: [
- Liuxinyu970226
+ Liuxinyu970226,
+ Cwlin0416
]
},
mathsearch: 數學搜尋,
@@ -12,5 +13,6 @@
math-wmc-importing: 匯入中...,
math-search-relation-label: 關係：,
math-search-type-label: 類型：,
- math-search-type-0: 關鍵字
+ math-search-type-0: 關鍵字,
+ math-tex2nb-input: 輸入
}
--
To view, visit https://gerrit.wikimedia.org/r/222624
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I3cb87860af9228d7759b678dc073937ef1d00b6a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MathSearch
Gerrit-Branch: master
Gerrit-Owner: Paladox thomasmulhall...@yahoo.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: 9e730bf..422d824 - change (mediawiki/extensions)
Jenkins-mwext-sync has submitted this change and it was merged. Change subject: Syncronize VisualEditor: 9e730bf..422d824 .. Syncronize VisualEditor: 9e730bf..422d824 Change-Id: I9e8a014a419eba0c04dcd019253ec2e8f05766f0 --- M VisualEditor 1 file changed, 0 insertions(+), 0 deletions(-) Approvals: Jenkins-mwext-sync: Verified; Looks good to me, approved diff --git a/VisualEditor b/VisualEditor index 9e730bf..422d824 16 --- a/VisualEditor +++ b/VisualEditor -Subproject commit 9e730bf5288913c43d0218ea3160d612166f2eb9 +Subproject commit 422d82448d0e173367438e5537c93edd6c4f0a8c -- To view, visit https://gerrit.wikimedia.org/r/222689 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I9e8a014a419eba0c04dcd019253ec2e8f05766f0 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions Gerrit-Branch: master Gerrit-Owner: Jenkins-mwext-sync jenkins-...@wikimedia.org Gerrit-Reviewer: Jenkins-mwext-sync jenkins-...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: 9e730bf..422d824 - change (mediawiki/extensions)
Jenkins-mwext-sync has uploaded a new change for review. https://gerrit.wikimedia.org/r/222689 Change subject: Syncronize VisualEditor: 9e730bf..422d824 .. Syncronize VisualEditor: 9e730bf..422d824 Change-Id: I9e8a014a419eba0c04dcd019253ec2e8f05766f0 --- M VisualEditor 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions refs/changes/89/222689/1 diff --git a/VisualEditor b/VisualEditor index 9e730bf..422d824 16 --- a/VisualEditor +++ b/VisualEditor -Subproject commit 9e730bf5288913c43d0218ea3160d612166f2eb9 +Subproject commit 422d82448d0e173367438e5537c93edd6c4f0a8c -- To view, visit https://gerrit.wikimedia.org/r/222689 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I9e8a014a419eba0c04dcd019253ec2e8f05766f0 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions Gerrit-Branch: master Gerrit-Owner: Jenkins-mwext-sync jenkins-...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Enable VisualEditor for the Portal namespace on jawiki - change (operations/mediawiki-config)
Jforrester has uploaded a new change for review. https://gerrit.wikimedia.org/r/222617 Change subject: Enable VisualEditor for the Portal namespace on jawiki .. Enable VisualEditor for the Portal namespace on jawiki Change-Id: I52923cdeae699de3323db8f1fd8a722484f8ab60 --- M wmf-config/InitialiseSettings.php 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/17/222617/1 diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index da50cfe..74f3caf 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -12703,6 +12703,7 @@ '+cawiki' = array( NS_PROJECT, 100 /* Portal */, 102 /* Viquiprojecte */ ), // T58000 T88896 '+enwiki' = array( 100 /* Portal */, 108 /* Book */, 118 /* Draft */ ), // T58001 '+hewiki' = array( 118 /* Draft */ ), // T87027 + '+jawiki' = array( 100 /* Portal */), // T97313 '+kowiki' = array( 118 /* Draft */ ), // T92798 '+plwiki' = array( 102 /* Wikiprojekt */ ), // T92698 '+ruwiki' = array( 102 /* Draft / Incubator */ ), // T86688 -- To view, visit https://gerrit.wikimedia.org/r/222617 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I52923cdeae699de3323db8f1fd8a722484f8ab60 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Jforrester jforres...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Use AuditProcessor instance methods - change (wikimedia...crm)
Ejegg has uploaded a new change for review.
https://gerrit.wikimedia.org/r/222618
Change subject: Use AuditProcessor instance methods
..
Use AuditProcessor instance methods
One breakage fix, one bit of cleanup.
Change-Id: If20e6c48acb2817d9e016979e95ec9570825c4d2
---
M sites/all/modules/wmf_audit/BaseAuditProcessor.php
M sites/all/modules/wmf_audit/wmf_audit.module
2 files changed, 3 insertions(+), 35 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm
refs/changes/18/222618/1
diff --git a/sites/all/modules/wmf_audit/BaseAuditProcessor.php
b/sites/all/modules/wmf_audit/BaseAuditProcessor.php
index 06c6ce8..c1ef9f1 100644
--- a/sites/all/modules/wmf_audit/BaseAuditProcessor.php
+++ b/sites/all/modules/wmf_audit/BaseAuditProcessor.php
@@ -206,7 +206,7 @@
/**
* Checks to see if the refund or chargeback already exists in civi.
* NOTE: This does not check to see if the parent is present at all, nor
should
- * it. Call worldpay_audit_main_transaction_exists_in_civi for that.
+ * it. Call main_transaction_exists_in_civi for that.
* @param array $transaction Array of donation data
* @return boolean true if it's in there, otherwise false
*/
@@ -277,7 +277,7 @@
// which might be resolved below. Those are archived on the next run,
// once we can confirm they have hit Civi and are no longer missing.
if (wmf_audit_count_missing($missing) =
$this-get_runtime_options('recon_complete_count')) {
- wmf_audit_move_completed_recon_file($file,
$this-get_recon_completed_dir());
+ $this-move_completed_recon_file($file);
}
//grumble...
@@ -321,7 +321,7 @@
if (array_key_exists('negative', $total_missing)
!empty($total_missing['negative'])) {
foreach ($total_missing['negative'] as $record) {
//check to see if the parent exists. If it does, normalize and send.
- if (worldpay_audit_main_transaction_exists_in_civi($record)) {
+ if ($this-main_transaction_exists_in_civi($record)) {
$normal = $this-normalize_negative( $record );
if (wmf_audit_send_transaction($normal, 'negative')) {
$neg_count += 1;
diff --git a/sites/all/modules/wmf_audit/wmf_audit.module
b/sites/all/modules/wmf_audit/wmf_audit.module
index d0cbd76..8e186d4 100644
--- a/sites/all/modules/wmf_audit/wmf_audit.module
+++ b/sites/all/modules/wmf_audit/wmf_audit.module
@@ -116,38 +116,6 @@
}
/**
- * Moves recon files to the completed directory. This should probably only be
- * done at the beginning of a run: If we're running in queue flood mode, we
- * don't know if the data will actually make it all the way in.
- * @param string $file Full path to the file we want to move off
- * @param string $completed_dir Path to the recon completed directory.
- * @return boolean true on success, otherwise false
- */
-function wmf_audit_move_completed_recon_file($file, $completed_dir) {
- if (!is_dir($completed_dir)) {
-if (!mkdir($completed_dir, 0770)) {
- $message = Could not make $completed_dir;
- wmf_audit_log_error($message, 'FILE_PERMS');
- return false;
-}
- }
-
- $filename = basename($file);
- $newfile = $completed_dir . '/' . $filename;
-
- if (!rename($file, $newfile)) {
-$message = Unable to move $file to $newfile;
-
-wmf_audit_log_error($message, 'FILE_PERMS');
-return false;
- } else {
-chmod($newfile, 0770);
- }
- wmf_audit_echo(Moved $file to $newfile);
- return true;
-}
-
-/**
* Wrapper for echo
* Lets us switch on things we only want to see in verbose mode.
* Also allows us to impose a char limit per line for the benefit of jenkins
--
To view, visit https://gerrit.wikimedia.org/r/222618
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: If20e6c48acb2817d9e016979e95ec9570825c4d2
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: master
Gerrit-Owner: Ejegg eeggles...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix pt translation - change (labs...crosswatch)
Sitic has submitted this change and it was merged. Change subject: Fix pt translation .. Fix pt translation By request from he7d3r. Change-Id: If0c4e1580568b4f32cc4926ef36305b4249387e6 --- M frontend/src/i18n/locale-pt.json 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Sitic: Verified; Looks good to me, approved diff --git a/frontend/src/i18n/locale-pt.json b/frontend/src/i18n/locale-pt.json index 18f8afc..fd10e12 100644 --- a/frontend/src/i18n/locale-pt.json +++ b/frontend/src/i18n/locale-pt.json @@ -5,7 +5,7 @@ SIGN_IN: Entrar, SIGN_OUT: Sair, DESCRIPTION: Uma lista de páginas vigiadas aprimorada para os projetos Wikimedia., - SIGN_IN_BUTTON: Enrar com OAuth, + SIGN_IN_BUTTON: Entrar com OAuth, MINOREDIT_FLAG: m, BOTEDIT_FLAG: b, NEWPAGE_FLAG: N -- To view, visit https://gerrit.wikimedia.org/r/222621 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: If0c4e1580568b4f32cc4926ef36305b4249387e6 Gerrit-PatchSet: 1 Gerrit-Project: labs/tools/crosswatch Gerrit-Branch: master Gerrit-Owner: Sitic jan.leb...@online.de Gerrit-Reviewer: Sitic jan.leb...@online.de ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix pt translation - change (labs...crosswatch)
Sitic has uploaded a new change for review. https://gerrit.wikimedia.org/r/222621 Change subject: Fix pt translation .. Fix pt translation By request from he7d3r. Change-Id: If0c4e1580568b4f32cc4926ef36305b4249387e6 --- M frontend/src/i18n/locale-pt.json 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/labs/tools/crosswatch refs/changes/21/222621/1 diff --git a/frontend/src/i18n/locale-pt.json b/frontend/src/i18n/locale-pt.json index 18f8afc..fd10e12 100644 --- a/frontend/src/i18n/locale-pt.json +++ b/frontend/src/i18n/locale-pt.json @@ -5,7 +5,7 @@ SIGN_IN: Entrar, SIGN_OUT: Sair, DESCRIPTION: Uma lista de páginas vigiadas aprimorada para os projetos Wikimedia., - SIGN_IN_BUTTON: Enrar com OAuth, + SIGN_IN_BUTTON: Entrar com OAuth, MINOREDIT_FLAG: m, BOTEDIT_FLAG: b, NEWPAGE_FLAG: N -- To view, visit https://gerrit.wikimedia.org/r/222621 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If0c4e1580568b4f32cc4926ef36305b4249387e6 Gerrit-PatchSet: 1 Gerrit-Project: labs/tools/crosswatch Gerrit-Branch: master Gerrit-Owner: Sitic jan.leb...@online.de ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Testing CSS property order changes - change (oojs/ui)
VolkerE has uploaded a new change for review.
https://gerrit.wikimedia.org/r/222609
Change subject: Testing CSS property order changes
..
Testing CSS property order changes
Change-Id: Iec09e650eeb1639bbe144f92d718d52d0efc1a0f
---
M src/themes/mediawiki/elements.less
1 file changed, 9 insertions(+), 9 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/09/222609/1
diff --git a/src/themes/mediawiki/elements.less
b/src/themes/mediawiki/elements.less
index edf944b..df8d5f1 100644
--- a/src/themes/mediawiki/elements.less
+++ b/src/themes/mediawiki/elements.less
@@ -52,9 +52,9 @@
// Support input/ from ButtonInputWidget
input.oo-ui-buttonElement-button {
+ color: #333;
padding-left: 0.25em;
padding-right: 0.25em;
- color: #333;
}
.oo-ui-widget-enabled {
@@ -143,15 +143,15 @@
}
.oo-ui-widget-disabled .oo-ui-buttonElement-button {
- color: @disabled-framed-text;
background: @disabled-background;
+ color: @disabled-framed-text;
border: 1px solid @disabled-background;
}
.oo-ui-widget-enabled {
.oo-ui-buttonElement-button {
- color: @text;
background-color: @background;
+ color: @text;
border: @neutral-button-border;
:hover {
@@ -238,8 +238,8 @@
}
:focus {
- box-shadow: inset 0 0 0 1px @pressed;
border-color: @pressed;
+ box-shadow: inset 0 0 0 1px @pressed;
}
}
@@ -260,8 +260,8 @@
.mediawiki-framed-primary-button-colored( @neutral, @hover, @pressed ) {
.oo-ui-buttonElement-button {
- color: @background;
background-color: @neutral;
+ color: @background;
border-color: @neutral;
:hover {
@@ -270,16 +270,16 @@
}
:focus {
- box-shadow: inset 0 0 0 1px @background;
border-color: @neutral;
+ box-shadow: inset 0 0 0 1px @background;
}
}
.oo-ui-widget-enabled {
.oo-ui-buttonElement-button:active,
.oo-ui-buttonElement-pressed .oo-ui-buttonElement-button {
- color: @background;
background-color: @pressed;
+ color: @background;
border-color: @pressed;
box-shadow: none;
}
@@ -304,16 +304,16 @@
.theme-oo-ui-iconElement () {
.oo-ui-iconElement-icon,
.oo-ui-iconElement-icon {
- background-size: contain;
background-position: center center;
+ background-size: contain;
}
}
.theme-oo-ui-indicatorElement () {
.oo-ui-indicatorElement-indicator,
.oo-ui-indicatorElement-indicator {
- background-size: contain;
background-position: center center;
+ background-size: contain;
}
}
--
To view, visit https://gerrit.wikimedia.org/r/222609
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iec09e650eeb1639bbe144f92d718d52d0efc1a0f
Gerrit-PatchSet: 1
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: VolkerE ve...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Upgrade dev dependencies - change (mediawiki...parsoid)
Arlolra has uploaded a new change for review.
https://gerrit.wikimedia.org/r/222620
Change subject: Upgrade dev dependencies
..
Upgrade dev dependencies
* node v0.12 complains about mocha:
child_process: customFds option is deprecated, use stdio instead.
Change-Id: I4dc264fe53bc7f68a5c7169ee1b6a8a75c5d7a25
---
M package.json
1 file changed, 8 insertions(+), 8 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/parsoid
refs/changes/20/222620/1
diff --git a/package.json b/package.json
index 6e9efe0..4a84551 100644
--- a/package.json
+++ b/package.json
@@ -25,14 +25,14 @@
yargs: ~1.3.1
},
devDependencies: {
-chai: ~2.1.1,
-colors: ~0.6.2,
-coveralls: 2.11.2,
-istanbul: 0.3.5,
-jscs: ^1.13.0,
-jshint: ^2.7.0,
-mocha: ~1.21.4,
-supertest: 0.14.0
+chai: ^3.0.0,
+colors: ^1.1.2,
+coveralls: ^2.11.2,
+istanbul: ^0.3.17,
+jscs: ^1.13.1,
+jshint: ^2.8.0,
+mocha: ^2.2.5,
+supertest: ^1.0.1
},
main: lib/index.js,
bin: {
--
To view, visit https://gerrit.wikimedia.org/r/222620
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I4dc264fe53bc7f68a5c7169ee1b6a8a75c5d7a25
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/parsoid
Gerrit-Branch: master
Gerrit-Owner: Arlolra abrea...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] chmod 644 a few files - change (mediawiki...Echo)
Alex Monk has uploaded a new change for review. https://gerrit.wikimedia.org/r/222629 Change subject: chmod 644 a few files .. chmod 644 a few files Bug: T104721 Change-Id: Iee1ef18d3227807110d4e25f0c48f17907adf8ad --- M Gemfile M Hooks.php M includes/EmailBundler.php M scripts/generatecss.php 4 files changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Echo refs/changes/29/222629/1 diff --git a/Gemfile b/Gemfile old mode 100755 new mode 100644 diff --git a/Hooks.php b/Hooks.php old mode 100755 new mode 100644 diff --git a/includes/EmailBundler.php b/includes/EmailBundler.php old mode 100755 new mode 100644 diff --git a/scripts/generatecss.php b/scripts/generatecss.php old mode 100755 new mode 100644 -- To view, visit https://gerrit.wikimedia.org/r/222629 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iee1ef18d3227807110d4e25f0c48f17907adf8ad Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Echo Gerrit-Branch: master Gerrit-Owner: Alex Monk kren...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] labstore: Minor code cleanup of the exports daemon - change (operations/puppet)
Yuvipanda has uploaded a new change for review.
https://gerrit.wikimedia.org/r/222690
Change subject: labstore: Minor code cleanup of the exports daemon
..
labstore: Minor code cleanup of the exports daemon
Change-Id: I5f39013beaceee39d2a05fdc1ed43ac92e5ad79e
---
M modules/labstore/files/nfs-project-exports-daemon
1 file changed, 21 insertions(+), 12 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/90/222690/1
diff --git a/modules/labstore/files/nfs-project-exports-daemon
b/modules/labstore/files/nfs-project-exports-daemon
index 47901df..998e8ca 100755
--- a/modules/labstore/files/nfs-project-exports-daemon
+++ b/modules/labstore/files/nfs-project-exports-daemon
@@ -122,23 +122,21 @@
logging.info('Fetched config for project %s, with %s instances',
name, len(project.instance_ips))
-return projects
-
-
-def manage_exports(exports_d_base, projects_config_path):
-
-Collects projets that need exports, and then do the exports
-
-projects = get_projects_with_nfs(projects_config_path)
-logging.info(Found %s projects requiring private mounts, len(projects))
-
# Validate that there are no duplicate gids
-gids = [project.gid for project in projects]
+gids = [p.gid for p in projects]
if len(set(gids)) != len(gids):
# OMG DUPLICATES
logging.error('Duplicate GIDs found in project config, aborting')
sys.exit(1)
+logging.info(Found %s projects requiring private mounts, len(projects))
+return projects
+
+
+def sync_exports_files(projects, exports_d_base):
+
+Generate exports files for syncfs
+
for project in projects:
logging.debug('Writing exports file for %s', project.name)
path = os.path.join(exports_d_base, '%s.exports' % project.name)
@@ -147,6 +145,9 @@
logging.info('Wrote exports file for %s', project.name)
logging.debug('Attempting to exportfs')
+
+
+def exportfs():
try:
subprocess.check_call([
'/usr/bin/sudo',
@@ -173,6 +174,11 @@
help='Turn on debug logging',
action='store_true'
)
+argparser.add_argument(
+'--dry-run',
+help='Do a dry run, do not call exportfs',
+action='store_true'
+)
args = argparser.parse_args()
@@ -188,5 +194,8 @@
logging.info('Daemon starting')
while True:
-manage_exports(args.exports_d_path, args.projects_config_path)
+projects = get_projects_with_nfs(args.projects_config_path)
+sync_exports_files(projects, args.exports_d_path)
+if not args._dry_run:
+exportfs()
time.sleep(60)
--
To view, visit https://gerrit.wikimedia.org/r/222690
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I5f39013beaceee39d2a05fdc1ed43ac92e5ad79e
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
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] archivebot: standardized handling of on-site configuration e... - change (pywikibot/core)
Whym has uploaded a new change for review.
https://gerrit.wikimedia.org/r/222727
Change subject: archivebot: standardized handling of on-site configuration
errors
..
archivebot: standardized handling of on-site configuration errors
All ending of a run on a page will cause a sleep, with a configurable duration.
Previously a normal return from run() causes a 10-sec sleep,
while an exception causes no sleep and a stack trace will be printed.
Change-Id: I2cbb4026e331d0e23e07c1c8aef344ca194d
---
M scripts/archivebot.py
1 file changed, 18 insertions(+), 8 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core
refs/changes/27/222727/1
diff --git a/scripts/archivebot.py b/scripts/archivebot.py
index 1e82623..3199e39 100755
--- a/scripts/archivebot.py
+++ b/scripts/archivebot.py
@@ -112,12 +112,17 @@
ZERO = datetime.timedelta(0)
-class MalformedConfigError(pywikibot.Error):
+class ArchiveBotSiteConfigError(pywikibot.Error):
+
+There is an error originated by archivebot's on-site configuration.
+
+
+class MalformedConfigError(ArchiveBotSiteConfigError):
There is an error in the configuration template.
-class MissingConfigError(pywikibot.Error):
+class MissingConfigError(ArchiveBotSiteConfigError):
The config is missing in the header.
@@ -131,7 +136,7 @@
Invalid specification of archiving algorithm.
-class ArchiveSecurityError(pywikibot.Error):
+class ArchiveSecurityError(ArchiveBotSiteConfigError):
Page title is not a valid archive of page being archived.
@@ -473,7 +478,7 @@
else:
raise MissingConfigError(u'Missing or malformed template')
if not self.get_attr('algo', ''):
-raise MissingConfigError(u'Missing algo')
+raise MissingConfigError(u'Missing argument algo in template')
def feed_archive(self, archive, thread, max_archive_size, params=None):
Feed the thread to one of the archives.
@@ -554,8 +559,7 @@
rx = re.compile(r'\{\{%s\s*?\n.*?\n\}\}'
% (template_title_regex(self.tpl).pattern),
re.DOTALL)
if not rx.search(self.page.header):
-pywikibot.error(Couldn't find the template in the header)
-return
+raise MalformedConfigError(Couldn't find the template in the
header)
pywikibot.output(u'Archiving %d thread(s).' %
self.archived_threads)
# Save the archives first (so that bugs don't cause a loss of data)
@@ -595,6 +599,7 @@
salt = None
force = False
calc = None
+sleep = 10
args = []
def if_arg_value(arg, name):
@@ -624,6 +629,8 @@
pagename = v
for v in if_arg_value(arg, '-namespace'):
namespace = v
+for v in if_arg_value(arg, '-sleep'):
+sleep = int(v)
if not arg.startswith('-'):
args.append(arg)
@@ -678,11 +685,14 @@
try:
archiver = PageArchiver(pg, a, salt, force)
archiver.run()
-time.sleep(10)
+except ArchiveBotSiteConfigError as e:
+# no stack trace for errors originated by pages on-site
+pywikibot.error(u'Missing or malformed template in page %s:
%s' % (pg, e))
except Exception:
pywikibot.error(u'Error occurred while processing page %s' %
pg)
pywikibot.exception(tb=True)
-
+finally:
+time.sleep(sleep)
if __name__ == '__main__':
main()
--
To view, visit https://gerrit.wikimedia.org/r/222727
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I2cbb4026e331d0e23e07c1c8aef344ca194d
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: Whym w...@whym.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix talk and contribs links in results for prefix search - change (labs...guc)
Krinkle has uploaded a new change for review.
https://gerrit.wikimedia.org/r/222732
Change subject: Fix talk and contribs links in results for prefix search
..
Fix talk and contribs links in results for prefix search
Follows-up beb5d5b.
They used user search instead of rev_user_text for the link,
so it pointed to User_talk:JohnD% instead of User_talk:JohnDoe.
Change-Id: Ibc8136b1afa239cb0b62cb6d6ef67f031825c334
---
M lb/wikicontribs.php
1 file changed, 2 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/labs/tools/guc
refs/changes/32/222732/1
diff --git a/lb/wikicontribs.php b/lb/wikicontribs.php
index 7e381b9..345f6f0 100644
--- a/lb/wikicontribs.php
+++ b/lb/wikicontribs.php
@@ -311,8 +311,8 @@
if ($this-options['isPrefixPattern']) {
$item[] = 'a
href='.htmlspecialchars($this-getUrl(User:{$rc-rev_user_text})).''
. htmlspecialchars($rc-rev_user_text).'/a'
-. 'nbsp;(a
href='.htmlspecialchars($this-getUrl(User_talk:{$this-user})).'talk/anbsp;|
'
-. 'a
href='.htmlspecialchars($this-getUrl(Special:Contributions/{$this-user})).'
title=Special:Contributionscontribs/a)';
+. 'nbsp;(a
href='.htmlspecialchars($this-getUrl(User_talk:{$rc-rev_user_text})).'talk/anbsp;|
'
+. 'a
href='.htmlspecialchars($this-getUrl(Special:Contributions/{$rc-rev_user_text})).'
title=Special:Contributionscontribs/a)';
$item[] = '. .';
}
// Minor edit
--
To view, visit https://gerrit.wikimedia.org/r/222732
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibc8136b1afa239cb0b62cb6d6ef67f031825c334
Gerrit-PatchSet: 1
Gerrit-Project: labs/tools/guc
Gerrit-Branch: master
Gerrit-Owner: Krinkle krinklem...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] DOMPostProcessor: Generate head only for the final document - change (mediawiki...parsoid)
Subramanya Sastry has uploaded a new change for review.
https://gerrit.wikimedia.org/r/222735
Change subject: DOMPostProcessor: Generate head only for the final document
..
DOMPostProcessor: Generate head only for the final document
Change-Id: Ide54116ca629e1d9083c053b4e691e6be700ff72
---
M lib/mediawiki.DOMPostProcessor.js
1 file changed, 7 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/parsoid
refs/changes/35/222735/1
diff --git a/lib/mediawiki.DOMPostProcessor.js
b/lib/mediawiki.DOMPostProcessor.js
index 81db9da..17b4280 100644
--- a/lib/mediawiki.DOMPostProcessor.js
+++ b/lib/mediawiki.DOMPostProcessor.js
@@ -262,6 +262,13 @@
}
}
+ // For sub-pipeline documents, we are done.
+ // For the top-level document, we generate head and add it.
+ if (!this.atTopLevel) {
+ this.emit( 'document', document );
+ return;
+ }
+
// add head element if it was missing
if (!document.head) {
document.documentElement.
--
To view, visit https://gerrit.wikimedia.org/r/222735
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ide54116ca629e1d9083c053b4e691e6be700ff72
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/parsoid
Gerrit-Branch: master
Gerrit-Owner: Subramanya Sastry ssas...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] archivebot: consistent handling of on-site configuration errors - change (pywikibot/core)
jenkins-bot has submitted this change and it was merged.
Change subject: archivebot: consistent handling of on-site configuration errors
..
archivebot: consistent handling of on-site configuration errors
All ending of a run on a page will cause a sleep, with a configurable duration.
Previously a normal return from run() causes a 10-sec sleep,
while an exception causes no sleep and a stack trace will be printed.
Change-Id: I2cbb4026e331d0e23e07c1c8aef344ca194d
---
M scripts/archivebot.py
1 file changed, 21 insertions(+), 8 deletions(-)
Approvals:
John Vandenberg: Looks good to me, approved
jenkins-bot: Verified
diff --git a/scripts/archivebot.py b/scripts/archivebot.py
index 1e82623..37ca904 100755
--- a/scripts/archivebot.py
+++ b/scripts/archivebot.py
@@ -112,12 +112,17 @@
ZERO = datetime.timedelta(0)
-class MalformedConfigError(pywikibot.Error):
+class ArchiveBotSiteConfigError(pywikibot.Error):
+
+There is an error originated by archivebot's on-site configuration.
+
+
+class MalformedConfigError(ArchiveBotSiteConfigError):
There is an error in the configuration template.
-class MissingConfigError(pywikibot.Error):
+class MissingConfigError(ArchiveBotSiteConfigError):
The config is missing in the header.
@@ -131,7 +136,7 @@
Invalid specification of archiving algorithm.
-class ArchiveSecurityError(pywikibot.Error):
+class ArchiveSecurityError(ArchiveBotSiteConfigError):
Page title is not a valid archive of page being archived.
@@ -473,7 +478,7 @@
else:
raise MissingConfigError(u'Missing or malformed template')
if not self.get_attr('algo', ''):
-raise MissingConfigError(u'Missing algo')
+raise MissingConfigError('Missing argument algo in template')
def feed_archive(self, archive, thread, max_archive_size, params=None):
Feed the thread to one of the archives.
@@ -554,8 +559,9 @@
rx = re.compile(r'\{\{%s\s*?\n.*?\n\}\}'
% (template_title_regex(self.tpl).pattern),
re.DOTALL)
if not rx.search(self.page.header):
-pywikibot.error(Couldn't find the template in the header)
-return
+raise MalformedConfigError(
+Couldn't find the template in the header
+)
pywikibot.output(u'Archiving %d thread(s).' %
self.archived_threads)
# Save the archives first (so that bugs don't cause a loss of data)
@@ -595,6 +601,7 @@
salt = None
force = False
calc = None
+sleep = 10
args = []
def if_arg_value(arg, name):
@@ -624,6 +631,8 @@
pagename = v
for v in if_arg_value(arg, '-namespace'):
namespace = v
+for v in if_arg_value(arg, '-sleep'):
+sleep = int(v)
if not arg.startswith('-'):
args.append(arg)
@@ -678,11 +687,15 @@
try:
archiver = PageArchiver(pg, a, salt, force)
archiver.run()
-time.sleep(10)
+except ArchiveBotSiteConfigError as e:
+# no stack trace for errors originated by pages on-site
+pywikibot.error('Missing or malformed template in page %s: %s'
+% (pg, e))
except Exception:
pywikibot.error(u'Error occurred while processing page %s' %
pg)
pywikibot.exception(tb=True)
-
+finally:
+time.sleep(sleep)
if __name__ == '__main__':
main()
--
To view, visit https://gerrit.wikimedia.org/r/222727
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I2cbb4026e331d0e23e07c1c8aef344ca194d
Gerrit-PatchSet: 3
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: Whym w...@whym.org
Gerrit-Reviewer: John Vandenberg jay...@gmail.com
Gerrit-Reviewer: Ladsgroup ladsgr...@gmail.com
Gerrit-Reviewer: Merlijn van Deen valhall...@arctus.nl
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Support both Site.lang and Site.code for _altlang fallback - change (pywikibot/core)
Xqt has uploaded a new change for review. https://gerrit.wikimedia.org/r/222611 Change subject: Support both Site.lang and Site.code for _altlang fallback .. Support both Site.lang and Site.code for _altlang fallback This is the first step to enable language fallback for language code only and disable it for site.code. Site.code specific code may be removed when twn gives back the messages for the languages and not for the site code. Change-Id: I9cabcce3ed88f42b7596b8cf09dabb6255419f22 --- M pywikibot/i18n.py 1 file changed, 24 insertions(+), 18 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core refs/changes/11/222611/1 diff --git a/pywikibot/i18n.py b/pywikibot/i18n.py index b80f9ac..9497f3b 100644 --- a/pywikibot/i18n.py +++ b/pywikibot/i18n.py @@ -129,8 +129,8 @@ return ['de'] if code == 'lb': return ['de', 'fr'] -if code == 'als': -return ['gsw', 'de'] +if code in ['als', 'gsw']: +return ['als', 'gsw', 'de'] if code == 'nds': return ['nds-nl', 'de'] if code in ['dsb', 'hsb']: @@ -158,8 +158,8 @@ if code == 'cbk-zam': return ['es', 'tl'] # Estonian -if code == 'fiu-vro': -return ['et'] +if code in ['fiu-vro', 'vro']: +return ['fiu-vro', 'vro', 'et'] if code == 'liv': return ['et', 'lv'] # Persian (Farsi) @@ -185,6 +185,8 @@ return ['hi'] if code in ['ne', 'new']: return ['ne', 'new', 'hi'] +if code in ['bh', 'bho']: +return ['bh', 'bho'] # Indonesian and Malay if code in ['ace', 'bug', 'bjn', 'id', 'jv', 'ms', 'su']: return ['id', 'ms', 'jv'] @@ -194,14 +196,14 @@ if code in ['ik', 'iu']: return ['iu', 'kl'] if code == 'kl': -return ['da', 'iu', 'no'] +return ['da', 'iu', 'ike-cans', 'no', 'nb'] # Italian if code in ['eml', 'fur', 'lij', 'lmo', 'nap', 'pms', 'roa-tara', 'sc', 'scn', 'vec']: return ['it'] # Lithuanian -if code in ['bat-smg']: -return ['lt'] +if code in ['bat-smg', 'sgs']: +return ['bat-smg', 'sgs', 'lt'] # Latvian if code == 'ltg': return ['lv'] @@ -217,7 +219,9 @@ if code in ['fab', 'mwl', 'tet']: return ['pt'] # Romanian -if code in ['mo', 'roa-rup']: +if code in ['roa-rup', 'rup']: +return ['roa-rup', 'rup', 'ro'] +if code == 'mo': return ['ro'] # Russian and Belarusian if code in ['ab', 'av', 'ba', 'bxr', 'ce', 'cv', 'inh', 'kk', 'koi', 'krc', @@ -228,8 +232,8 @@ return ['kbd', 'ady', 'ru'] if code == 'tt': return ['tt-cyrl', 'ru'] -if code in ['be', 'be-x-old']: -return ['be', 'be-x-old', 'ru'] +if code in ['be', 'be-x-old', 'be-tarask']: +return ['be', 'be-x-old', 'be-tarask', 'ru'] if code == 'kaa': return ['uz', 'ru'] # Serbocroatian @@ -248,15 +252,17 @@ if code == 'ckb': return ['ku'] # Ukrainian -if code in ['crh', 'rue']: +if code in ['crh', 'crh-latn']: +return ['crh', 'crh-latn', 'uk', 'ru'] +if code in ['rue']: return ['uk', 'ru'] # Chinese -if code in ['minnan', 'zh', 'zh-classical', 'zh-min-nan', 'zh-tw', -'zh-hans', 'zh-hant']: -return ['zh', 'zh-tw', 'zh-cn', 'zh-classical'] -if code in ['cdo', 'gan', 'hak', 'ii', 'wuu', 'za', 'zh-cdo', -'zh-classical', 'zh-cn', 'zh-yue']: -return ['zh', 'zh-cn', 'zh-tw', 'zh-classical'] +if code in ['zh-classical', 'lzh', 'minnan', 'zh-min-nan', 'nan', 'zh-tw', +'zh', 'zh-hans']: +return ['zh', 'zh-hans', 'zh-tw', 'zh-cn', 'zh-classical', 'lzh'] +if code in ['cdo', 'gan', 'hak', 'ii', 'wuu', 'za', 'zh-classical', 'lzh', +'zh-cn', 'zh-yue', 'yue']: +return ['zh', 'zh-hans' 'zh-cn', 'zh-tw', 'zh-classical', 'lzh'] # Scandinavian languages if code in ['da', 'sv']: return ['da', 'no', 'nb', 'sv', 'nn'] @@ -264,7 +270,7 @@ return ['da', 'no', 'nb', 'nn', 'sv'] if code == 'nn': return ['no', 'nb', 'sv', 'da'] -if code in ['nb', 'no']: +if code in ['no', 'nb']: return ['no', 'nb', 'da', 'nn', 'sv'] if code == 'se': return ['sv', 'no', 'nb', 'nn', 'fi'] -- To view, visit https://gerrit.wikimedia.org/r/222611 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I9cabcce3ed88f42b7596b8cf09dabb6255419f22 Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core 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] Fix typo w/ VRS URL construction, commit e126f75 - change (mediawiki...Collection)
Faidon Liambotis has uploaded a new change for review.
https://gerrit.wikimedia.org/r/222615
Change subject: Fix typo w/ VRS URL construction, commit e126f75
..
Fix typo w/ VRS URL construction, commit e126f75
PHP's concatenation operator is ., not +. This creates invalid URLs
such as http://10.2.2.17:72310; and thus failing jobs.
This fixes a regression introduced with
e126f75b73a86436c5728b4cc3484ed50f9cc128.
Change-Id: If39b50013cc3aed7a59e40e22eae0ac072e519c2
---
M RenderingAPI.php
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Collection
refs/changes/15/222615/1
diff --git a/RenderingAPI.php b/RenderingAPI.php
index 5bbfeca..4dd7830 100644
--- a/RenderingAPI.php
+++ b/RenderingAPI.php
@@ -226,7 +226,7 @@
);
$url = preg_replace(
'#/?$#',
- '/' + $domain + '/v1/',
+ '/' . $domain . '/v1/',
$params['url']
);
for ( $i = 0; $i count( $result['wikis'] ); $i++ ) {
--
To view, visit https://gerrit.wikimedia.org/r/222615
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: If39b50013cc3aed7a59e40e22eae0ac072e519c2
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Collection
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] WIP: Fixup links - change (VisualEditor/VisualEditor)
Divec has uploaded a new change for review.
https://gerrit.wikimedia.org/r/222619
Change subject: WIP: Fixup links
..
WIP: Fixup links
This needs to go on top of the link nail stuff to be useful, but it illustrates
what ve.ce.adjustLinkSelection is for.
Change-Id: Id8d827b58cf63a11f89299388960d49224295685
---
M src/ce/ve.ce.Surface.js
1 file changed, 10 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/VisualEditor/VisualEditor
refs/changes/19/222619/1
diff --git a/src/ce/ve.ce.Surface.js b/src/ce/ve.ce.Surface.js
index dd63ea4..7e0f822 100644
--- a/src/ce/ve.ce.Surface.js
+++ b/src/ce/ve.ce.Surface.js
@@ -3201,6 +3201,16 @@
surface.getModel().setLinearSelection( newRange );
}
surface.surfaceObserver.pollOnce();
+
+ // Adjust selection for links, re-polling if necessary
+ // TODO: This can trigger
https://bugzilla.mozilla.org/show_bug.cgi?id=1180032
+ // (Left-arrow just before an element behaves as though the
cursor started
+ // immediately after the element)
+ if ( surface.showFrozenSelection(
+ ve.ce.adjustLinkSelection( surface.nativeSelection,
afterDirection )
+ ) ) {
+ surface.surfaceObserver.pollOnce();
+ }
} } );
};
--
To view, visit https://gerrit.wikimedia.org/r/222619
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Id8d827b58cf63a11f89299388960d49224295685
Gerrit-PatchSet: 1
Gerrit-Project: VisualEditor/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Divec da...@troi.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] T102117: Improve validating dp in the api - change (mediawiki...parsoid)
jenkins-bot has submitted this change and it was merged.
Change subject: T102117: Improve validating dp in the api
..
T102117: Improve validating dp in the api
* Check that ids is one of the keys and that body isn't a string.
* And check the dp on previous as well.
* Also ensure that it's present when expected. There's no case for
passing in stored html with inlined dp in the v2 api.
* Follows on 6ab612abb5c95230e59fe2c5c3419c110ec18acd
Change-Id: I40644bdc05b0737a9129869a3e8c0629b8da341e
---
M api/routes.js
M api/utils.js
M tests/mocha/api.js
3 files changed, 44 insertions(+), 8 deletions(-)
Approvals:
Subramanya Sastry: Looks good to me, approved
Mobrovac: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/api/routes.js b/api/routes.js
index 929fe8b..f2318d0 100644
--- a/api/routes.js
+++ b/api/routes.js
@@ -81,11 +81,6 @@
}
}
- if (v2 v2.original v2.original['data-parsoid']
-
!Object.keys(v2.original['data-parsoid'].body).length) {
- return errOut('data-parsoid was provided without an ids
property.', 400);
- }
-
res.local('v2', v2);
next();
};
@@ -456,6 +451,9 @@
if (revision) {
p2 = p2.then(function(ret) {
var doc =
DU.parseHTML(revision.html.body);
+ // Similar to the html2wt case,
stored html is expected
+ // to also pass in dp.
+ apiUtils.validateDp(revision);
DU.applyDataParsoid(doc,
revision['data-parsoid'].body);
ret.reuse = {
expansions:
DU.extractExpansions(doc),
@@ -542,14 +540,19 @@
var p = apiUtils.startHtml2wt(req, res,
html).then(function(ret) {
if (v2.original) {
var dp = v2.original['data-parsoid'];
+ // This is optional to support
serializing html with inlined
+ // data-parsoid.
if (dp) {
+
apiUtils.validateDp(v2.original);
DU.applyDataParsoid(ret.doc,
dp.body);
}
if (v2.original.html) {
env.page.dom =
DU.parseHTML(v2.original.html.body).body;
- if (dp) {
-
DU.applyDataParsoid(env.page.dom.ownerDocument, dp.body);
- }
+ // However, if we're given
stored html, data-parsoid
+ // should be provided as well.
We have no use case for
+ // stored inlined dp anymore.
+
apiUtils.validateDp(v2.original);
+
DU.applyDataParsoid(env.page.dom.ownerDocument, dp.body);
}
}
return ret;
diff --git a/api/utils.js b/api/utils.js
index ab19249..4bf618a 100644
--- a/api/utils.js
+++ b/api/utils.js
@@ -497,3 +497,12 @@
apiUtils.endWt2html(ret, doc);
}
};
+
+apiUtils.validateDp = function(obj) {
+ var dp = obj['data-parsoid'];
+ if (!dp || !dp.body || dp.body.constructor !== Object || !dp.body.ids) {
+ var err = new Error('Invalid data-parsoid was provided.');
+ err.code = 400;
+ throw err;
+ }
+};
diff --git a/tests/mocha/api.js b/tests/mocha/api.js
index 64b16ef..fc4b690 100644
--- a/tests/mocha/api.js
+++ b/tests/mocha/api.js
@@ -556,6 +556,30 @@
.end(done);
});
+ it('should return http 400 if supplied data-parsoid is
a string', function(done) {
+ request(api)
+ .post('v2/' + mockHost + '/wt/')
+ .send({
+ html:
'htmlhead/headbodyphi/p/body/html',
+ original: {
+ html: {
+ headers: {
[MediaWiki-commits] [Gerrit] Remove old-style url redirects - change (mediawiki...parsoid)
jenkins-bot has submitted this change and it was merged.
Change subject: Remove old-style url redirects
..
Remove old-style url redirects
* Hopefully people have updated since this was introduced in 2012.
* From f0f157adfe25056e27bd7d9f0d71c6d70e2ff0bd
Change-Id: Id8d330f2afae293c544406346111442200e9ceab
---
M api/ParsoidService.js
M api/routes.js
2 files changed, 0 insertions(+), 19 deletions(-)
Approvals:
Subramanya Sastry: Looks good to me, approved
jenkins-bot: Verified
diff --git a/api/ParsoidService.js b/api/ParsoidService.js
index 842b59b..c9a0573 100644
--- a/api/ParsoidService.js
+++ b/api/ParsoidService.js
@@ -88,7 +88,6 @@
app.get( '/robots.txt', routes.robots );
// private routes
- app.get( re('^/((?:_rt|_rtve)/)?(' + mwApiRe + '):(.*)$'),
routes.redirectOldStyle );
app.get( re('^/_html/(?:(' + mwApiRe + ')/(.*))?'), i, p,
routes.html2wtForm );
app.get( re('^/_wikitext/(?:(' + mwApiRe + ')/(.*))?'), i, p,
routes.wt2htmlForm );
app.get( re('^/_rt/(?:(' + mwApiRe + ')/(.*))?'), i, p,
routes.roundtripTesting );
diff --git a/api/routes.js b/api/routes.js
index f2318d0..f503e10 100644
--- a/api/routes.js
+++ b/api/routes.js
@@ -174,24 +174,6 @@
});
};
- // Redirects for old-style URL compatibility
- routes.redirectOldStyle = function( req, res ) {
- if ( req.params[0] ) {
- apiUtils.relativeRedirect({
- path: '/' + req.params[0] + req.params[1] +
'/' + req.params[2],
- res: res,
- code: 301
- });
- } else {
- apiUtils.relativeRedirect({
- path: '/' + req.params[1] + '/' +
req.params[2],
- res: res,
- code: 301
- });
- }
- res.end();
- };
-
// Form-based HTML DOM - wikitext interface for manual testing.
routes.html2wtForm = function( req, res ) {
var env = res.local('env');
--
To view, visit https://gerrit.wikimedia.org/r/222610
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Id8d330f2afae293c544406346111442200e9ceab
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/parsoid
Gerrit-Branch: master
Gerrit-Owner: Arlolra abrea...@wikimedia.org
Gerrit-Reviewer: Cscott canan...@wikimedia.org
Gerrit-Reviewer: Subramanya Sastry ssas...@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] Upgrade dev dependencies - change (mediawiki...parsoid)
jenkins-bot has submitted this change and it was merged.
Change subject: Upgrade dev dependencies
..
Upgrade dev dependencies
* node v0.12 complains about mocha:
child_process: customFds option is deprecated, use stdio instead.
Change-Id: I4dc264fe53bc7f68a5c7169ee1b6a8a75c5d7a25
---
M package.json
1 file changed, 8 insertions(+), 8 deletions(-)
Approvals:
Subramanya Sastry: Looks good to me, approved
jenkins-bot: Verified
diff --git a/package.json b/package.json
index 6e9efe0..4a84551 100644
--- a/package.json
+++ b/package.json
@@ -25,14 +25,14 @@
yargs: ~1.3.1
},
devDependencies: {
-chai: ~2.1.1,
-colors: ~0.6.2,
-coveralls: 2.11.2,
-istanbul: 0.3.5,
-jscs: ^1.13.0,
-jshint: ^2.7.0,
-mocha: ~1.21.4,
-supertest: 0.14.0
+chai: ^3.0.0,
+colors: ^1.1.2,
+coveralls: ^2.11.2,
+istanbul: ^0.3.17,
+jscs: ^1.13.1,
+jshint: ^2.8.0,
+mocha: ^2.2.5,
+supertest: ^1.0.1
},
main: lib/index.js,
bin: {
--
To view, visit https://gerrit.wikimedia.org/r/222620
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I4dc264fe53bc7f68a5c7169ee1b6a8a75c5d7a25
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/parsoid
Gerrit-Branch: master
Gerrit-Owner: Arlolra abrea...@wikimedia.org
Gerrit-Reviewer: Subramanya Sastry ssas...@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] Made recent changes purge jobs bail more aggressively - change (mediawiki/core)
Aaron Schulz has uploaded a new change for review.
https://gerrit.wikimedia.org/r/222626
Change subject: Made recent changes purge jobs bail more aggressively
..
Made recent changes purge jobs bail more aggressively
* This should handle unusual spikes better
Bug: T104670
Change-Id: I562f74d0871b192f1dfb2ac03ef2a4a87cecf0e2
---
M includes/jobqueue/jobs/RecentChangesUpdateJob.php
1 file changed, 4 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/26/222626/1
diff --git a/includes/jobqueue/jobs/RecentChangesUpdateJob.php
b/includes/jobqueue/jobs/RecentChangesUpdateJob.php
index e86d914..d6fa26b 100644
--- a/includes/jobqueue/jobs/RecentChangesUpdateJob.php
+++ b/includes/jobqueue/jobs/RecentChangesUpdateJob.php
@@ -75,11 +75,13 @@
$lockKey = wfWikiID() . ':recentchanges-prune';
$dbw = wfGetDB( DB_MASTER );
- if ( !$dbw-lock( $lockKey, __METHOD__, 1 ) ) {
+ if ( !$dbw-lockIsFree( $lockKey, __METHOD__ )
+ || !$dbw-lock( $lockKey, __METHOD__, 1 )
+ ) {
return; // already in progress
}
- $batchSize = 100; // Avoid slave lag
+ $batchSize = 100; // avoid slave lag
$cutoff = $dbw-timestamp( time() - $wgRCMaxAge );
do {
$rcIds = $dbw-selectFieldValues( 'recentchanges',
--
To view, visit https://gerrit.wikimedia.org/r/222626
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I562f74d0871b192f1dfb2ac03ef2a4a87cecf0e2
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] Fix missing message in Skin.js license generation - change (mediawiki...MobileFrontend)
Florianschmidtwelzow has uploaded a new change for review. https://gerrit.wikimedia.org/r/222730 Change subject: Fix missing message in Skin.js license generation .. Fix missing message in Skin.js license generation mobile-frontend-editor-terms-link is used in Skin.js, bjt is loaded in other modules only. fox it by loading it in Skin.js module only. Change-Id: I1234137330632392f7843aaf600a5d5dcaeeeb30 --- M includes/Resources.php 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend refs/changes/30/222730/1 diff --git a/includes/Resources.php b/includes/Resources.php index f5ebd24..d92732a 100644 --- a/includes/Resources.php +++ b/includes/Resources.php @@ -516,6 +516,8 @@ // icons.js 'mobile-frontend-loading-message', 'mobile-frontend-console-recruit', + // Skin.js + 'mobile-frontend-editor-terms-link', ), 'styles' = array( 'resources/mobile.startup/panel.less', @@ -663,7 +665,6 @@ 'mobile-frontend-editor-keep-editing', 'mobile-frontend-editor-licensing', 'mobile-frontend-editor-licensing-with-terms', - 'mobile-frontend-editor-terms-link', 'mobile-frontend-editor-placeholder', 'mobile-frontend-editor-placeholder-new-page', 'mobile-frontend-editor-summary', @@ -814,7 +815,6 @@ 'mobile-frontend-editor-cancel-confirm', 'mobile-frontend-editor-error', 'mobile-frontend-editor-error-conflict', - 'mobile-frontend-editor-terms-link', ), ), -- To view, visit https://gerrit.wikimedia.org/r/222730 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I1234137330632392f7843aaf600a5d5dcaeeeb30 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/MobileFrontend Gerrit-Branch: master Gerrit-Owner: Florianschmidtwelzow florian.schmidt.wel...@t-online.de ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] robots: Disallow xenon/logs and xenon/svgs - change (performance/docroot)
jenkins-bot has submitted this change and it was merged. Change subject: robots: Disallow xenon/logs and xenon/svgs .. robots: Disallow xenon/logs and xenon/svgs Change-Id: I78a7207f79b1eeba8cb93ab1fd8f9f39efe102fa --- A public_html/robots.txt 1 file changed, 3 insertions(+), 0 deletions(-) Approvals: Krinkle: Looks good to me, approved jenkins-bot: Verified diff --git a/public_html/robots.txt b/public_html/robots.txt new file mode 100644 index 000..ae45e84 --- /dev/null +++ b/public_html/robots.txt @@ -0,0 +1,3 @@ +User-Agent: * +Disallow: /xenon/logs/ +Disallow: /xenon/svgs/ -- To view, visit https://gerrit.wikimedia.org/r/222731 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I78a7207f79b1eeba8cb93ab1fd8f9f39efe102fa Gerrit-PatchSet: 1 Gerrit-Project: performance/docroot Gerrit-Branch: master Gerrit-Owner: Krinkle krinklem...@gmail.com Gerrit-Reviewer: Krinkle krinklem...@gmail.com 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] robots: Disallow xenon/logs and xenon/svgs - change (performance/docroot)
Krinkle has uploaded a new change for review. https://gerrit.wikimedia.org/r/222731 Change subject: robots: Disallow xenon/logs and xenon/svgs .. robots: Disallow xenon/logs and xenon/svgs Change-Id: I78a7207f79b1eeba8cb93ab1fd8f9f39efe102fa --- A public_html/robots.txt 1 file changed, 3 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/performance/docroot refs/changes/31/222731/1 diff --git a/public_html/robots.txt b/public_html/robots.txt new file mode 100644 index 000..ae45e84 --- /dev/null +++ b/public_html/robots.txt @@ -0,0 +1,3 @@ +User-Agent: * +Disallow: /xenon/logs/ +Disallow: /xenon/svgs/ -- To view, visit https://gerrit.wikimedia.org/r/222731 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I78a7207f79b1eeba8cb93ab1fd8f9f39efe102fa Gerrit-PatchSet: 1 Gerrit-Project: performance/docroot Gerrit-Branch: master Gerrit-Owner: Krinkle krinklem...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Use Site with i18n.tw* - change (pywikibot/core)
John Vandenberg has uploaded a new change for review.
https://gerrit.wikimedia.org/r/222734
Change subject: Use Site with i18n.tw*
..
Use Site with i18n.tw*
Change-Id: I5758346c20b6da33ac40aa3ad62ef74490bb5aca
---
M scripts/catall.py
M scripts/category_redirect.py
M scripts/commonscat.py
M scripts/redirect.py
4 files changed, 12 insertions(+), 12 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core
refs/changes/34/222734/1
diff --git a/scripts/catall.py b/scripts/catall.py
index 4998c93..cc065e0 100755
--- a/scripts/catall.py
+++ b/scripts/catall.py
@@ -78,7 +78,7 @@
pllist.append(pywikibot.Page(site, cattitle))
page.put_async(textlib.replaceCategoryLinks(page.get(), pllist,
site=page.site),
- summary=i18n.twtranslate(site.code, 'catall-changing'))
+ summary=i18n.twtranslate(site, 'catall-changing'))
def main(*args):
diff --git a/scripts/category_redirect.py b/scripts/category_redirect.py
index 7860d67..6f0378f 100755
--- a/scripts/category_redirect.py
+++ b/scripts/category_redirect.py
@@ -96,9 +96,9 @@
self.dbl_redir_comment = 'category_redirect-fix-double'
self.maint_comment = 'category_redirect-comment'
self.edit_request_text = i18n.twtranslate(
-self.site.code, 'category_redirect-edit-request') + u'\n'
+self.site, 'category_redirect-edit-request') + u'\n'
self.edit_request_item = i18n.twtranslate(
-self.site.code, 'category_redirect-edit-request-item')
+self.site, 'category_redirect-edit-request-item')
def get_cat_title(self):
Specify the category title.
@@ -215,7 +215,7 @@
softredirect template.
pywikibot.output(Checking hard-redirect category pages.)
-comment = i18n.twtranslate(self.site.code, self.redir_comment)
+comment = i18n.twtranslate(self.site, self.redir_comment)
# generator yields all hard redirect pages in namespace 14
for page in pagegenerators.PreloadingGenerator(
@@ -303,7 +303,7 @@
self.check_hard_redirect()
-comment = i18n.twtranslate(self.site.code, self.move_comment)
+comment = i18n.twtranslate(self.site, self.move_comment)
counts = {}
nonemptypages = []
redircat = pywikibot.Category(pywikibot.Link(self.cat_title,
self.site))
@@ -405,7 +405,7 @@
newtext = newtext + oldtext.strip()
try:
cat.text = newtext
-cat.save(i18n.twtranslate(self.site.code,
+cat.save(i18n.twtranslate(self.site,
self.dbl_redir_comment))
except pywikibot.Error as e:
self.log_text.append(** Failed: %s % e)
@@ -436,7 +436,7 @@
self.log_text.sort()
self.problems.sort()
newredirs.sort()
-comment = i18n.twtranslate(self.site.code, self.maint_comment)
+comment = i18n.twtranslate(self.site, self.maint_comment)
self.log_page.text = (u\n== %i-%02i-%02iT%02i:%02i:%02iZ ==\n
% time.gmtime()[:6] +
u'\n'.join(self.log_text) +
diff --git a/scripts/commonscat.py b/scripts/commonscat.py
index 64b6b12..2289005 100755
--- a/scripts/commonscat.py
+++ b/scripts/commonscat.py
@@ -365,7 +365,7 @@
if self.getOption('summary'):
comment = self.getOption('summary')
else:
-comment = i18n.twtranslate(page.site.code,
+comment = i18n.twtranslate(page.site,
'commonscat-msg_change',
{'oldcat': oldcat, 'newcat': newcat})
diff --git a/scripts/redirect.py b/scripts/redirect.py
index f50e183..e2b53ad 100755
--- a/scripts/redirect.py
+++ b/scripts/redirect.py
@@ -603,17 +603,17 @@
targetPage.title(withSection=False))
content = content_page.get(get_redirect=True)
if i18n.twhas_key(
-targetPage.site.lang,
+targetPage.site,
'redirect-broken-redirect-template') and \
-i18n.twhas_key(targetPage.site.lang,
+i18n.twhas_key(targetPage.site,
'redirect-remove-loop'):
pywikibot.output(uTagging redirect for deletion)
# Delete the two redirects
content = i18n.twtranslate(
-targetPage.site.lang,
+targetPage.site,
'redirect-broken-redirect-template'
) + \n + content
-
[MediaWiki-commits] [Gerrit] Replace navtiming page with link to Grafana dashboard - change (performance/docroot)
Krinkle has uploaded a new change for review.
https://gerrit.wikimedia.org/r/222729
Change subject: Replace navtiming page with link to Grafana dashboard
..
Replace navtiming page with link to Grafana dashboard
Change-Id: Iecddf964e886304aeeb733303f17ce7cce947850
---
M public_html/index.html
D public_html/navtiming/index.html
D public_html/src/navtiming.js
3 files changed, 1 insertion(+), 401 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/performance/docroot
refs/changes/29/222729/1
diff --git a/public_html/index.html b/public_html/index.html
index 6a9c5e1..69ce6d4 100644
--- a/public_html/index.html
+++ b/public_html/index.html
@@ -38,7 +38,7 @@
ul class=navbar-nav nav
li class=activeaMetrics/a/li
lia href=xenon/Flame Graphs/a/li
-lia href=navtiming/Navigation Timing/a/li
+lia
href=https://grafana.wikimedia.org/#/dashboard/db/navigation-timing;Navigation
Timing/a/li
/ul
/nav
/div
diff --git a/public_html/navtiming/index.html b/public_html/navtiming/index.html
deleted file mode 100644
index 5c47f35..000
--- a/public_html/navtiming/index.html
+++ /dev/null
@@ -1,44 +0,0 @@
-!DOCTYPE html
-html lang=en
- meta charset=utf-8
- titleNavigation Timing — Wikimedia Performance/title
- link href=../lib/bootstrap-3.3.5/css/bootstrap.min.css rel=stylesheet
- style
-.perf-container {
- min-height: 400px;
-}
-.perf-container label {
- font-weight: normal;
-}
-.perf-container .pull-right {
- clear: right;
-}
-.footer {
- margin-top: 40px;
- background-color: #f5f5f5;
- padding: 20px 0;
-}
- /style
- link rel=shortcut icon
href=https://www.wikimedia.org/static/favicon/wmf.ico;
- body
-header class=navbar navbar-default navbar-static-top role=banner
- div class=container
-div class=navbar-headera class=navbar-brand href=../
title=PerformancePerformance/a/div
-nav class=navbar-default
- ul class=navbar-nav nav
-lia href=../Metrics/a/li
-lia href=../xenon/Flame Graphs/a/li
-li class=activeaNavigation Timing/a/li
- /ul
-/nav
- /div
-/header
-div class=container perf-container id=output/div
-div class=footer
- div class=container
-p class=pull-leftMore information at a
href=https://wikitech.wikimedia.org/wiki/Performance;https://wikitech.wikimedia.org/wiki/Performance/a./p
-p class=pull-righta href=https://www.wikimedia.org;img
src=https://www.wikimedia.org/static/images/wikimedia-button.png;
srcset=https://www.wikimedia.org/static/images/wikimedia-button-2x.png 2x
width=88 height=31 alt=Wikimedia Foundation/a/p
- /div
-/div
-script src=../lib/jquery.min.js/script
-script src=../src/navtiming.js/script
diff --git a/public_html/src/navtiming.js b/public_html/src/navtiming.js
deleted file mode 100644
index 52aa097..000
--- a/public_html/src/navtiming.js
+++ /dev/null
@@ -1,356 +0,0 @@
-/**
- * Dashboard for Navigation Timing metrics from Graphite.
- *
- * See https://wikitech.wikimedia.org/wiki/performance.wikimedia.org.
- *
- * Copyright 2015 Timo Tijhof krinklem...@gmail.com
- *
- * Licensed under the Apache License, Version 2.0 (the License);
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an AS IS BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/*global $ */
-( function () {
- var conf, state, ui;
-
- /**
-* @param {string...} Target property
-*/
- function GraphiteTarget() {
- var target = [].join.call( arguments, '.' );
-
- function quote( str ) {
- return '' + str + '';
- }
-
- function apply( funcName, args ) {
- args = args.length ? ',' + [].join.call( args, ',' ) :
'';
- target = funcName + '(' + target + args + ')';
- }
-
- function call( funcName ) {
- apply( funcName, [].slice.call( arguments, 1 ) );
- }
-
- function factory( funcName ) {
- return function () {
- apply( funcName, arguments );
- return this;
- };
- }
-
- this.aliasByNode = factory( 'aliasByNode' );
- this.dashed = factory( 'dashed' );
- this.lineWidth = factory( 'lineWidth' );
