[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Add copyright info for Wikidata API
Ladsgroup has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/370611 )
Change subject: Add copyright info for Wikidata API
..
Add copyright info for Wikidata API
Bug: T112606
Change-Id: I29b793a3b40e4e8ade94b79f921ac1571800c492
---
M wmf-config/Wikibase-production.php
1 file changed, 7 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config
refs/changes/11/370611/1
diff --git a/wmf-config/Wikibase-production.php
b/wmf-config/Wikibase-production.php
index 714fbd4..586d874 100644
--- a/wmf-config/Wikibase-production.php
+++ b/wmf-config/Wikibase-production.php
@@ -111,6 +111,13 @@
$wgWBQualityConstraintsEnableConstraintsImportFromStatements = true;
$wgWBRepoSettings['dispatchingLockManager'] = 'redisLockManager';
$wgWBRepoSettings['writeFullEntityIdColumn'] = true;
+
+ // T112606
+ $wgRightsPage = 'Wikidata:Copyright';
+ $wgRightsText = 'All structured data from the main and property
namespace is available under ' .
+ 'the Creative Commons CC0 License; text in the other namespaces
is available under ' .
+ 'the Creative Commons Attribution-ShareAlike License;
additional terms may apply.';
+ $wgRightsUrl = 'creativecommons.org/licenses/by-sa/3.0';
}
if ( $wmgUseWikibaseClient ) {
--
To view, visit https://gerrit.wikimedia.org/r/370611
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I29b793a3b40e4e8ade94b79f921ac1571800c492
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Ladsgroup
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] labs...ZppixBot[master]: Add so that people know who to ask if they need ZppixBot in ...
Reception123 has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/370610 ) Change subject: Add so that people know who to ask if they need ZppixBot in their channel .. Add so that people know who to ask if they need ZppixBot in their channel Change-Id: I56390c06fc42a07b919ae848a80bf2d5b81f3d31 --- M public_html/index.php 1 file changed, 3 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/labs/tools/ZppixBot refs/changes/10/370610/1 diff --git a/public_html/index.php b/public_html/index.php index a8ac953..fc37f65 100644 --- a/public_html/index.php +++ b/public_html/index.php @@ -3,4 +3,6 @@ Inital release of ZppixBot is here! - For more information please check out, https://github.com/Pix1234/ZppixBot-Source/releases/tag/v1 !!! \ No newline at end of file + For more information please check out, https://github.com/Pix1234/ZppixBot-Source/releases/tag/v1 !!! + +If you need ZppixBot in your channel, please contact Zppix. -- To view, visit https://gerrit.wikimedia.org/r/370610 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I56390c06fc42a07b919ae848a80bf2d5b81f3d31 Gerrit-PatchSet: 1 Gerrit-Project: labs/tools/ZppixBot Gerrit-Branch: master Gerrit-Owner: Reception123 ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] pywikibot/core[master]: [bugfix] Test page_image() for older mw version and missing ...
Xqt has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/370609 )
Change subject: [bugfix] Test page_image() for older mw version and missing
extension
..
[bugfix] Test page_image() for older mw version and missing extension
Bug: T172770
Change-Id: Idb3f66df995ad3b20710ef2a3358d2c066e9663b
---
M tests/page_tests.py
1 file changed, 13 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core
refs/changes/09/370609/1
diff --git a/tests/page_tests.py b/tests/page_tests.py
index d6698ce..38f26bc 100644
--- a/tests/page_tests.py
+++ b/tests/page_tests.py
@@ -559,10 +559,19 @@
site = self.get_site()
mainpage = self.get_mainpage()
image = pywikibot.FilePage(site, 'File:Jean-Léon Gérôme 003.jpg')
-self.assertIsInstance(mainpage.page_image(), pywikibot.FilePage)
-# for file pages, the API should return the file itself
-self.assertEqual(image.page_image(), image)
-
+
+if MediaWikiVersion(site.version()) < MediaWikiVersion('1.20'):
+self.assertRaises(NotImplementedError, mainpage.page_image())
+elif site.has_extension('PageImages'):
+self.assertIsInstance(mainpage.page_image(), pywikibot.FilePage)
+# for file pages, the API should return the file itself
+self.assertEqual(image.page_image(), image)
+else:
+self.assertRaises(pywikibot.UnknownExtension,
+ 'Method "loadpageimage" is not implemented '
+ 'without the extension PageImages'
+ mainpage.page_image())
+
class TestPageDeprecation(DefaultSiteTestCase, DeprecationTestCase):
--
To view, visit https://gerrit.wikimedia.org/r/370609
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Idb3f66df995ad3b20710ef2a3358d2c066e9663b
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: Xqt
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...mathoid[master]: Update to MathJax-node 1.0
Physikerwelt has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/370603 ) Change subject: Update to MathJax-node 1.0 .. Update to MathJax-node 1.0 Adjust the mathoid package to be compatible with MathJax-node 1.0 Change-Id: I6da6df392f1d5d36d52ac36aa607d2766c758aac Calculate the mathoid style attribute * This was formerly done in mathjax-node Change-Id: I61d0da4e6bb715e8ad5e09c37bf192df4cb21804 Add speech support Adapted from https://github.com/pkra/mathjax-node-sre/blob/master/lib/main.js Change-Id: I594e6d01e7a9e099c0a90a7416075e6af6e9dbbf Fix: Config MathJax only once Remove accidentally added second MathJax config call. Change-Id: I73229ca286af3d54f39157c883f10705c1a0b6ed Investigate differences in test results * Temporarily disable verbose output and rely on the IDE capabilities Change-Id: I0cbf5a5da383443bd47fdbd8b2be02129ff89b1e Add option to expose enriched pmml Expose the enriched pmml as well Change-Id: I9a35103307f4003636912053f0bd40105bd52a2b Fix order of expected and actual output The order of actual and expected output was swapped. Change-Id: I443e17016821735922a1b037d52c0b7001a54dc5 \definecolor is unknown Explicitly load color module. See also https://github.com/mathjax/MathJax-node/issues/307 Change-Id: I0c051ceff40afbc2a63cd66ad8f8a14358daeb2a Do not use semantic annotations for simple tests Change-Id: I59bba1bd9045bfb3f010a9ef07e3d2efa084c5ec Re add png support Reused some code from mathoid-mathjax-node version 0.6.6 Change-Id: If7f8a02255ec1a0f963e8b62741de0b5030bcb9c Update dependencies Change-Id: Ic085ad4fab6723a32cfd16d1b9336943be4fe552 Update reference images Change-Id: I55a032c4960a26009e675e082d766e05aa1615f9 Improve testing infrastructure ignore XML inherent differences Change-Id: Ib887d170b7b3bb003177db192f92b7cd7db01914 Fix dimensions in test cases Change-Id: Ia839f75e0a5004ece105df40b0e64d54376af11c Store testdata in a seperate file Change-Id: I0a61aa8bcf725691834f973a9e3329704353 Deduplicate test code Change-Id: I44a635802e9075bae634b999b6811b747c5e618a Add script to adjust test * Add more options to skip tests * Update test data Change-Id: I9fe1e0e5fe0585edc4f85d6a3747e3f3c748083f --- M app.js M config.dev.yaml M config.prod.yaml M package.json M routes/mathoid.js A scripts/apiTestDataUpdate.js D test/features/math/no-check.js M test/features/math/simple.js A test/files/mathjax-texvc/basic-test-data.json M test/files/mathjax-texvc/png/1.png M test/files/mathjax-texvc/png/10.png M test/files/mathjax-texvc/png/11.png M test/files/mathjax-texvc/png/12.png M test/files/mathjax-texvc/png/13.png M test/files/mathjax-texvc/png/14.png M test/files/mathjax-texvc/png/15.png M test/files/mathjax-texvc/png/16.png M test/files/mathjax-texvc/png/17.png M test/files/mathjax-texvc/png/18.png M test/files/mathjax-texvc/png/19.png M test/files/mathjax-texvc/png/2.png M test/files/mathjax-texvc/png/20.png M test/files/mathjax-texvc/png/21.png M test/files/mathjax-texvc/png/22.png M test/files/mathjax-texvc/png/23.png M test/files/mathjax-texvc/png/24.png M test/files/mathjax-texvc/png/25.png M test/files/mathjax-texvc/png/26.png M test/files/mathjax-texvc/png/27.png M test/files/mathjax-texvc/png/28.png M test/files/mathjax-texvc/png/29.png M test/files/mathjax-texvc/png/3.png M test/files/mathjax-texvc/png/30.png M test/files/mathjax-texvc/png/31.png M test/files/mathjax-texvc/png/32.png M test/files/mathjax-texvc/png/33.png M test/files/mathjax-texvc/png/34.png M test/files/mathjax-texvc/png/35.png M test/files/mathjax-texvc/png/36.png M test/files/mathjax-texvc/png/37.png M test/files/mathjax-texvc/png/38.png M test/files/mathjax-texvc/png/39.png M test/files/mathjax-texvc/png/4.png M test/files/mathjax-texvc/png/40.png M test/files/mathjax-texvc/png/41.png M test/files/mathjax-texvc/png/42.png M test/files/mathjax-texvc/png/43.png M test/files/mathjax-texvc/png/44.png M test/files/mathjax-texvc/png/45.png M test/files/mathjax-texvc/png/46.png M test/files/mathjax-texvc/png/47.png M test/files/mathjax-texvc/png/48.png M test/files/mathjax-texvc/png/49.png M test/files/mathjax-texvc/png/5.png M test/files/mathjax-texvc/png/50.png M test/files/mathjax-texvc/png/51.png M test/files/mathjax-texvc/png/52.png M test/files/mathjax-texvc/png/53.png M test/files/mathjax-texvc/png/54.png M test/files/mathjax-texvc/png/55.png M test/files/mathjax-texvc/png/56.png M test/files/mathjax-texvc/png/57.png M test/files/mathjax-texvc/png/6.png M test/files/mathjax-texvc/png/60.png M test/files/mathjax-texvc/png/61.png M test/files/mathjax-texvc/png/62.png M test/files/mathjax-texvc/png/63.png M test/files/mathjax-texvc/png/64.png M test/files/mathjax-texvc/png/65.png M test/files/mathjax-texvc/png/66.png M test/files/mathjax-texvc/png/67.png M test/files/mathjax-texvc/png/68.png M test/files/mathjax-texvc/png/69.png M test/files/mathjax-texvc/png/7.png M test/files/mathja
[MediaWiki-commits] [Gerrit] mediawiki...PageForms[master]: Fixes for Cargo handling in Special:CreateTemplate
Yaron Koren has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/370608 )
Change subject: Fixes for Cargo handling in Special:CreateTemplate
..
Fixes for Cargo handling in Special:CreateTemplate
Change-Id: I647d9b6fe9ad24e6915d1480a0b14bb83fee6c11
---
M libs/PF_CreateTemplate.js
M specials/PF_CreateTemplate.php
2 files changed, 9 insertions(+), 4 deletions(-)
Approvals:
Yaron Koren: Looks good to me, approved
jenkins-bot: Verified
diff --git a/libs/PF_CreateTemplate.js b/libs/PF_CreateTemplate.js
index 4dcb541..cab466d 100644
--- a/libs/PF_CreateTemplate.js
+++ b/libs/PF_CreateTemplate.js
@@ -33,8 +33,8 @@
function validateCreateTemplateForm() {
var blankTemplateName = ( jQuery( '#template_name' ).val() === '' );
- var blankCargoTableName = ( jQuery( '#use_cargo' ).is(':checked') ||
- jQuery( '#table_name' ).val() === '' );
+ var blankCargoTableName = ( jQuery( '#use_cargo' ).is(':checked') &&
+ jQuery( '#cargo_table' ).val() === '' );
if ( blankTemplateName || blankCargoTableName ) {
scroll( 0, 0 );
if ( blankTemplateName ) {
diff --git a/specials/PF_CreateTemplate.php b/specials/PF_CreateTemplate.php
index 728ed7e..0ba2cce 100644
--- a/specials/PF_CreateTemplate.php
+++ b/specials/PF_CreateTemplate.php
@@ -202,8 +202,13 @@
$req->getVal( 'delimiter_' .
$id )
);
$field->setFieldType( $req->getVal(
'field_type_' . $id ) );
- // Fake attribute.
- $field->mAllowedValuesStr =
$req->getVal( 'allowed_values_' . $id );
+
+ if ( defined( 'CARGO_VERSION' ) ) {
+ $allowedValuesStr =
$req->getVal( 'allowed_values_' . $id );
+ $possibleValues =
CargoUtils::smartSplit( ',', $allowedValuesStr );
+ $field->setPossibleValues(
$possibleValues );
+ }
+
$fields[] = $field;
}
}
--
To view, visit https://gerrit.wikimedia.org/r/370608
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I647d9b6fe9ad24e6915d1480a0b14bb83fee6c11
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/PageForms
Gerrit-Branch: master
Gerrit-Owner: Yaron Koren
Gerrit-Reviewer: Yaron Koren
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...PageForms[master]: Fixes for Cargo handling in Special:CreateTemplate
Yaron Koren has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/370608 )
Change subject: Fixes for Cargo handling in Special:CreateTemplate
..
Fixes for Cargo handling in Special:CreateTemplate
Change-Id: I647d9b6fe9ad24e6915d1480a0b14bb83fee6c11
---
M libs/PF_CreateTemplate.js
M specials/PF_CreateTemplate.php
2 files changed, 9 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/PageForms
refs/changes/08/370608/2
diff --git a/libs/PF_CreateTemplate.js b/libs/PF_CreateTemplate.js
index 4dcb541..cab466d 100644
--- a/libs/PF_CreateTemplate.js
+++ b/libs/PF_CreateTemplate.js
@@ -33,8 +33,8 @@
function validateCreateTemplateForm() {
var blankTemplateName = ( jQuery( '#template_name' ).val() === '' );
- var blankCargoTableName = ( jQuery( '#use_cargo' ).is(':checked') ||
- jQuery( '#table_name' ).val() === '' );
+ var blankCargoTableName = ( jQuery( '#use_cargo' ).is(':checked') &&
+ jQuery( '#cargo_table' ).val() === '' );
if ( blankTemplateName || blankCargoTableName ) {
scroll( 0, 0 );
if ( blankTemplateName ) {
diff --git a/specials/PF_CreateTemplate.php b/specials/PF_CreateTemplate.php
index 728ed7e..0ba2cce 100644
--- a/specials/PF_CreateTemplate.php
+++ b/specials/PF_CreateTemplate.php
@@ -202,8 +202,13 @@
$req->getVal( 'delimiter_' .
$id )
);
$field->setFieldType( $req->getVal(
'field_type_' . $id ) );
- // Fake attribute.
- $field->mAllowedValuesStr =
$req->getVal( 'allowed_values_' . $id );
+
+ if ( defined( 'CARGO_VERSION' ) ) {
+ $allowedValuesStr =
$req->getVal( 'allowed_values_' . $id );
+ $possibleValues =
CargoUtils::smartSplit( ',', $allowedValuesStr );
+ $field->setPossibleValues(
$possibleValues );
+ }
+
$fields[] = $field;
}
}
--
To view, visit https://gerrit.wikimedia.org/r/370608
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I647d9b6fe9ad24e6915d1480a0b14bb83fee6c11
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/PageForms
Gerrit-Branch: master
Gerrit-Owner: Yaron Koren
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: Phabricator: Install package heirloom-mailx for mail command
Dzahn has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/370518 ) Change subject: Phabricator: Install package heirloom-mailx for mail command .. Phabricator: Install package heirloom-mailx for mail command this is required so we can do mail -r otherwise the -r command is unavailable. root@phabricator:/home/paladox# mail -r mail: option requires an argument -- r Usage: mail -eiIUdEFntBDNHRV~ -T FILE -u USER -h hops -r address -s SUBJECT -a FILE -q FILE -f FILE -A ACCOUNT -b USERS -c USERS -S OPTION users Change-Id: Icba46457863c82b3fe199aeb928be449a8836bc7 --- M modules/phabricator/manifests/init.pp 1 file changed, 2 insertions(+), 1 deletion(-) Approvals: jenkins-bot: Verified Dzahn: Looks good to me, approved diff --git a/modules/phabricator/manifests/init.pp b/modules/phabricator/manifests/init.pp index 6ceb2e4..d4f1e80 100644 --- a/modules/phabricator/manifests/init.pp +++ b/modules/phabricator/manifests/init.pp @@ -138,7 +138,8 @@ 'python-pygments', 'python-phabricator', 'apachetop', -'subversion']: +'subversion', +'heirloom-mailx']: ensure => present; } -- To view, visit https://gerrit.wikimedia.org/r/370518 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Icba46457863c82b3fe199aeb928be449a8836bc7 Gerrit-PatchSet: 3 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Paladox Gerrit-Reviewer: 20after4 Gerrit-Reviewer: Aklapper Gerrit-Reviewer: Dzahn Gerrit-Reviewer: Paladox Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: phabricator: ensure /srv/dumps exists
Dzahn has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/370607 )
Change subject: phabricator: ensure /srv/dumps exists
..
phabricator: ensure /srv/dumps exists
This directory wasn't puppetized and must have been
manually created on iridium or something.
It exists there but not on phab1001, and i noticed
because there was cron spam to root from
/srv/phab/tools/public_task_dump.py which said:
IOError: [Errno 2] No such file or directory:
'/srv/dumps/phabricator_public.dump'
when trying to write a dump.
Bug: T163938
Change-Id: I3247552f49d4e1e6d67ae78312d1f47e47ff0c96
---
M modules/phabricator/manifests/tools.pp
1 file changed, 7 insertions(+), 0 deletions(-)
Approvals:
jenkins-bot: Verified
Dzahn: Looks good to me, approved
diff --git a/modules/phabricator/manifests/tools.pp
b/modules/phabricator/manifests/tools.pp
index 8bfb4f6..7733d21 100644
--- a/modules/phabricator/manifests/tools.pp
+++ b/modules/phabricator/manifests/tools.pp
@@ -32,6 +32,13 @@
mode=> '0660',
}
+file { '/srv/dumps':
+ensure => 'directory',
+owner => 'root',
+group => 'root',
+mode => '0755',
+}
+
$dump_script = "${directory}/public_task_dump.py"
file { $dump_script:
--
To view, visit https://gerrit.wikimedia.org/r/370607
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I3247552f49d4e1e6d67ae78312d1f47e47ff0c96
Gerrit-PatchSet: 6
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn
Gerrit-Reviewer: 20after4
Gerrit-Reviewer: ArielGlenn
Gerrit-Reviewer: Dzahn
Gerrit-Reviewer: Paladox
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: phabricator: ensure /srv/dumps exists
Dzahn has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/370607 )
Change subject: phabricator: ensure /srv/dumps exists
..
phabricator: ensure /srv/dumps exists
This directory wasn't puppetized and must have been
manually credit on iridium or something.
It exists there but not on phab1001, and i noticed
because there was cron spam to root from
/srv/phab/tools/public_task_dump.py which said:
IOError: [Errno 2] No such file or directory:
'/srv/dumps/phabricator_public.dump'
when trying to write a dump.
Bug: T163938
Change-Id: I3247552f49d4e1e6d67ae78312d1f47e47ff0c96
---
M modules/phabricator/manifests/tools.pp
1 file changed, 7 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/07/370607/1
diff --git a/modules/phabricator/manifests/tools.pp
b/modules/phabricator/manifests/tools.pp
index 8bfb4f6..36d365f 100644
--- a/modules/phabricator/manifests/tools.pp
+++ b/modules/phabricator/manifests/tools.pp
@@ -32,6 +32,13 @@
mode=> '0660',
}
+file { '/srv/dumps':
+ensure => 'directory',
+owner => 'root',
+group => 'root',
+mode=> '0755'
+}
+,
$dump_script = "${directory}/public_task_dump.py"
file { $dump_script:
--
To view, visit https://gerrit.wikimedia.org/r/370607
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I3247552f49d4e1e6d67ae78312d1f47e47ff0c96
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...GeoData[master]: Fix imports
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/370604 )
Change subject: Fix imports
..
Fix imports
Change-Id: I8c18dec3735285fbdc1b6eacf326f33697a59e54
---
M includes/GeoData.body.php
M includes/Hooks.php
M includes/Search/CirrusGeoFeature.php
M includes/Search/GeoPointIndexField.php
4 files changed, 2 insertions(+), 6 deletions(-)
Approvals:
Krinkle: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/GeoData.body.php b/includes/GeoData.body.php
index b508f85..73b7061 100644
--- a/includes/GeoData.body.php
+++ b/includes/GeoData.body.php
@@ -2,9 +2,9 @@
namespace GeoData;
-use IDatabase;
use MediaWiki\MediaWikiServices;
use Title;
+use Wikimedia\Rdbms\Database;
class GeoData {
/**
@@ -41,7 +41,7 @@
/**
* @param int $dbType DB_MASTER or DB_SLAVE
-* @return IDatabase
+* @return Database
*/
private static function getDB( $dbType ) {
return MediaWikiServices::getInstance()
diff --git a/includes/Hooks.php b/includes/Hooks.php
index 3fab59c..94b4053 100644
--- a/includes/Hooks.php
+++ b/includes/Hooks.php
@@ -5,7 +5,6 @@
use ApiModuleManager;
use Article;
use CirrusSearch\SearchConfig;
-use Content;
use DatabaseUpdater;
use LinksUpdate;
use LocalFile;
@@ -13,7 +12,6 @@
use MWException;
use OutputPage;
use Parser;
-use ParserOptions;
use ParserOutput;
use Title;
use User;
diff --git a/includes/Search/CirrusGeoFeature.php
b/includes/Search/CirrusGeoFeature.php
index 5b24755..97926a7 100644
--- a/includes/Search/CirrusGeoFeature.php
+++ b/includes/Search/CirrusGeoFeature.php
@@ -4,7 +4,6 @@
use CirrusSearch\Query\SimpleKeywordFeature;
use CirrusSearch\Search\SearchContext;
-use CirrusSearch\SearchConfig;
use Elastica\Query\AbstractQuery;
use Title;
diff --git a/includes/Search/GeoPointIndexField.php
b/includes/Search/GeoPointIndexField.php
index 267ccbe..4e17d4d 100644
--- a/includes/Search/GeoPointIndexField.php
+++ b/includes/Search/GeoPointIndexField.php
@@ -3,7 +3,6 @@
use CirrusSearch\Search\CirrusIndexField;
use CirrusSearch\SearchConfig;
-use SearchEngine;
/**
* GeoPoint type for CirrusSearch mapping
--
To view, visit https://gerrit.wikimedia.org/r/370604
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I8c18dec3735285fbdc1b6eacf326f33697a59e54
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/GeoData
Gerrit-Branch: master
Gerrit-Owner: MaxSem
Gerrit-Reviewer: EBernhardson
Gerrit-Reviewer: Krinkle
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] analytics...web[master]: fix name and link of host from labs
Quiddity has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/370606 ) Change subject: fix name and link of host from labs .. fix name and link of host from labs Change-Id: I43e9d0ebfae436e83a8575944791829dda4df2ab --- M quarry/web/templates/base.html 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/analytics/quarry/web refs/changes/06/370606/2 diff --git a/quarry/web/templates/base.html b/quarry/web/templates/base.html index 01c7df5..12b307a 100644 --- a/quarry/web/templates/base.html +++ b/quarry/web/templates/base.html @@ -83,7 +83,7 @@ https://phabricator.wikimedia.org/maniphest/task/create/?projects=quarry";>Report a bug! -Hosted on https://wikitech.wikimedia.org";>Wikimedia Labs, written in https://python.org";>Python by mailto:yuvipa...@gmail.com";>YuviPanda +Hosted on https://wikitech.wikimedia.org/wiki/Portal:Cloud_VPS";>Wikimedia Cloud VPS, written in https://python.org";>Python by mailto:yuvipa...@gmail.com";>YuviPanda -- To view, visit https://gerrit.wikimedia.org/r/370606 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I43e9d0ebfae436e83a8575944791829dda4df2ab Gerrit-PatchSet: 2 Gerrit-Project: analytics/quarry/web Gerrit-Branch: master Gerrit-Owner: Quiddity Gerrit-Reviewer: BryanDavis Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...GeoData[master]: Fix deprecated function usage
MaxSem has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/370605 )
Change subject: Fix deprecated function usage
..
Fix deprecated function usage
Change-Id: Ifa35dc5e6ecf60ab24c3b42449c07daa767a4343
---
M includes/Searcher.php
1 file changed, 2 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/GeoData
refs/changes/05/370605/1
diff --git a/includes/Searcher.php b/includes/Searcher.php
index f3f9d00..cedb71e 100644
--- a/includes/Searcher.php
+++ b/includes/Searcher.php
@@ -5,8 +5,8 @@
use CirrusSearch\ElasticsearchIntermediary;
use CirrusSearch\SearchConfig;
use CirrusSearch\SearchRequestLog;
-use ConfigFactory;
use Elastica\Exception\ExceptionInterface;
+use MediaWiki\MediaWikiServices;
use User;
/**
@@ -15,7 +15,7 @@
class Searcher extends ElasticsearchIntermediary {
public function __construct( User $user = null ) {
/** @var SearchConfig $config */
- $config = ConfigFactory::getDefaultInstance()->makeConfig(
'CirrusSearch' );
+ $config =
MediaWikiServices::getInstance()->getConfigFactory()->makeConfig(
'CirrusSearch' );
/** @suppress PhanTypeMismatchArgument */
$connection = new \CirrusSearch\Connection( $config );
--
To view, visit https://gerrit.wikimedia.org/r/370605
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ifa35dc5e6ecf60ab24c3b42449c07daa767a4343
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/GeoData
Gerrit-Branch: master
Gerrit-Owner: MaxSem
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...GeoData[master]: Fix imports
MaxSem has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/370604 )
Change subject: Fix imports
..
Fix imports
Change-Id: I8c18dec3735285fbdc1b6eacf326f33697a59e54
---
M includes/GeoData.body.php
M includes/Hooks.php
M includes/Search/CirrusGeoFeature.php
M includes/Search/GeoPointIndexField.php
4 files changed, 2 insertions(+), 6 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/GeoData
refs/changes/04/370604/1
diff --git a/includes/GeoData.body.php b/includes/GeoData.body.php
index b508f85..73b7061 100644
--- a/includes/GeoData.body.php
+++ b/includes/GeoData.body.php
@@ -2,9 +2,9 @@
namespace GeoData;
-use IDatabase;
use MediaWiki\MediaWikiServices;
use Title;
+use Wikimedia\Rdbms\Database;
class GeoData {
/**
@@ -41,7 +41,7 @@
/**
* @param int $dbType DB_MASTER or DB_SLAVE
-* @return IDatabase
+* @return Database
*/
private static function getDB( $dbType ) {
return MediaWikiServices::getInstance()
diff --git a/includes/Hooks.php b/includes/Hooks.php
index 3fab59c..94b4053 100644
--- a/includes/Hooks.php
+++ b/includes/Hooks.php
@@ -5,7 +5,6 @@
use ApiModuleManager;
use Article;
use CirrusSearch\SearchConfig;
-use Content;
use DatabaseUpdater;
use LinksUpdate;
use LocalFile;
@@ -13,7 +12,6 @@
use MWException;
use OutputPage;
use Parser;
-use ParserOptions;
use ParserOutput;
use Title;
use User;
diff --git a/includes/Search/CirrusGeoFeature.php
b/includes/Search/CirrusGeoFeature.php
index 5b24755..97926a7 100644
--- a/includes/Search/CirrusGeoFeature.php
+++ b/includes/Search/CirrusGeoFeature.php
@@ -4,7 +4,6 @@
use CirrusSearch\Query\SimpleKeywordFeature;
use CirrusSearch\Search\SearchContext;
-use CirrusSearch\SearchConfig;
use Elastica\Query\AbstractQuery;
use Title;
diff --git a/includes/Search/GeoPointIndexField.php
b/includes/Search/GeoPointIndexField.php
index 267ccbe..4e17d4d 100644
--- a/includes/Search/GeoPointIndexField.php
+++ b/includes/Search/GeoPointIndexField.php
@@ -3,7 +3,6 @@
use CirrusSearch\Search\CirrusIndexField;
use CirrusSearch\SearchConfig;
-use SearchEngine;
/**
* GeoPoint type for CirrusSearch mapping
--
To view, visit https://gerrit.wikimedia.org/r/370604
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I8c18dec3735285fbdc1b6eacf326f33697a59e54
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/GeoData
Gerrit-Branch: master
Gerrit-Owner: MaxSem
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...AbuseFilter[master]: Fix some deprecated function usage
MaxSem has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/370602 )
Change subject: Fix some deprecated function usage
..
Fix some deprecated function usage
Change-Id: I544cdfa75c7472f2d98b2561bc6f6f9c2d2ad639
---
M includes/api/ApiAbuseFilterCheckMatch.php
M includes/api/ApiAbuseFilterCheckSyntax.php
M includes/api/ApiAbuseFilterUnblockAutopromote.php
M includes/api/ApiQueryAbuseFilters.php
M includes/api/ApiQueryAbuseLog.php
M includes/parser/AFPData.php
6 files changed, 17 insertions(+), 80 deletions(-)
Approvals:
Krinkle: Looks good to me, approved
MaxSem: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/api/ApiAbuseFilterCheckMatch.php
b/includes/api/ApiAbuseFilterCheckMatch.php
index 60ee658..d2d4410 100644
--- a/includes/api/ApiAbuseFilterCheckMatch.php
+++ b/includes/api/ApiAbuseFilterCheckMatch.php
@@ -7,11 +7,7 @@
// "Anti-DoS"
if ( !$this->getUser()->isAllowed( 'abusefilter-modify' ) ) {
- if ( is_callable( [ $this, 'dieWithError' ] ) ) {
- $this->dieWithError(
'apierror-abusefilter-canttest', 'permissiondenied' );
- } else {
- $this->dieUsage( 'You don\'t have permission to
test abuse filters', 'permissiondenied' );
- }
+ $this->dieWithError( 'apierror-abusefilter-canttest',
'permissiondenied' );
}
$vars = null;
@@ -31,11 +27,7 @@
);
if ( !$row ) {
- if ( is_callable( [ $this, 'dieWithError' ] ) )
{
- $this->dieWithError( [
'apierror-nosuchrcid', $params['rcid'] ] );
- } else {
- $this->dieUsageMsg( [ 'nosuchrcid',
$params['rcid'] ] );
- }
+ $this->dieWithError( [ 'apierror-nosuchrcid',
$params['rcid'] ] );
}
$vars = AbuseFilter::getVarsFromRCRow( $row );
@@ -49,25 +41,14 @@
);
if ( !$row ) {
- if ( is_callable( [ $this, 'dieWithError' ] ) )
{
- $this->dieWithError( [
'apierror-abusefilter-nosuchlogid', $params['logid'] ], 'nosuchlogid' );
- } else {
- $this->dieUsage(
- "There is no abuselog entry
with the id ``{$params['logid']}''",
- 'nosuchlogid'
- );
- }
+ $this->dieWithError( [
'apierror-abusefilter-nosuchlogid', $params['logid'] ], 'nosuchlogid' );
}
$vars = AbuseFilter::loadVarDump( $row->afl_var_dump );
}
if ( AbuseFilter::checkSyntax( $params[ 'filter' ] ) !== true )
{
- if ( is_callable( [ $this, 'dieWithError' ] ) ) {
- $this->dieWithError(
'apierror-abusefilter-badsyntax', 'badsyntax' );
- } else {
- $this->dieUsage( 'The filter has invalid
syntax', 'badsyntax' );
- }
+ $this->dieWithError( 'apierror-abusefilter-badsyntax',
'badsyntax' );
}
$result = [
diff --git a/includes/api/ApiAbuseFilterCheckSyntax.php
b/includes/api/ApiAbuseFilterCheckSyntax.php
index 05fb699..b0ac3f7 100644
--- a/includes/api/ApiAbuseFilterCheckSyntax.php
+++ b/includes/api/ApiAbuseFilterCheckSyntax.php
@@ -5,14 +5,7 @@
public function execute() {
// "Anti-DoS"
if ( !$this->getUser()->isAllowed( 'abusefilter-modify' ) ) {
- if ( is_callable( [ $this, 'dieWithError' ] ) ) {
- $this->dieWithError(
'apierror-abusefilter-cantcheck', 'permissiondenied' );
- } else {
- $this->dieUsage(
- 'You don\'t have permission to check
syntax of abuse filters',
- 'permissiondenied'
- );
- }
+ $this->dieWithError( 'apierror-abusefilter-cantcheck',
'permissiondenied' );
}
$params = $this->extractRequestParams();
diff --git a/includes/api/ApiAbuseFilterUnblockAutopromote.php
b/includes/api/ApiAbuseFilterUnblockAutopromote.php
index e616dc3..5ceb17f 100644
--- a/includes/api/ApiAbuseFilterUnblockAutopromote.php
+++ b/includes/a
[MediaWiki-commits] [Gerrit] mediawiki...OAuthAuthentication[master]: Set @group Database for unit tests
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/369876 )
Change subject: Set @group Database for unit tests
..
Set @group Database for unit tests
1)
MediaWiki\Extensions\OAuthAuthentication\OAuthAuthHooksTest::testOnPersonalUrls
Wikimedia\Rdbms\DBQueryError: A database query error has occurred. Did
you forget to run your application's database schema updater after
upgrading?
Query: INSERT INTO `unittest_oauthauth_user`
(oaau_rid,oaau_uid,oaau_username) VALUES ('100','2','OAuthUser')
Function:
MediaWiki\Extensions\OAuthAuthentication\OAuthExternalUser::addToDatabase
Error: 1146 Table 'jenkins_u0_mw.unittest_oauthauth_user' doesn't exist
(127.0.0.1:3306)
Change-Id: I05defa7eabed6da837832212396ae38602fa4b9f
---
M tests/OAuthAuthConfigTest.php
M tests/OAuthAuthDBTest.php
M tests/OAuthAuthExternalUserTest.php
M tests/OAuthAuthHooksTest.php
4 files changed, 5 insertions(+), 13 deletions(-)
Approvals:
Krinkle: Looks good to me, approved
jenkins-bot: Verified
diff --git a/tests/OAuthAuthConfigTest.php b/tests/OAuthAuthConfigTest.php
index 2fc4512..79079c7 100644
--- a/tests/OAuthAuthConfigTest.php
+++ b/tests/OAuthAuthConfigTest.php
@@ -4,6 +4,7 @@
/**
* @group OAuthAuthentication
+ * @group Database
*/
class OAuthAuthConfigTest extends OAuthAuthDBTest {
diff --git a/tests/OAuthAuthDBTest.php b/tests/OAuthAuthDBTest.php
index 7afb2fd..037e725 100644
--- a/tests/OAuthAuthDBTest.php
+++ b/tests/OAuthAuthDBTest.php
@@ -4,19 +4,17 @@
/**
* @group OAuthAuthentication
+ * @group Database
*/
class OAuthAuthDBTest extends \MediaWikiTestCase {
public function __construct( $name = null, array $data = [], $dataName
= '' ) {
parent::__construct( $name, $data, $dataName );
+ $this->tablesUsed[] = 'oauthauth_user';
}
protected function setUp() {
parent::setUp();
- if ( $this->db->tableExists( 'oauthauth_user' ) ) {
- $this->db->dropTable( 'oauthauth_user' );
- }
- $this->db->sourceFile( __DIR__ . '/../store/oauthauth.sql' );
// TODO: Setup some test data
$user = \User::newFromName( 'OAuthUser' );
@@ -27,15 +25,6 @@
}
$exUser = new OAuthExternalUser( 100, $user->getId(),
'OAuthUser' );
$exUser->addToDatabase( $this->db );
- }
-
- protected function tearDown() {
- $this->db->dropTable( 'oauthauth_user' );
- parent::tearDown();
- }
-
- public function needsDB() {
- return true;
}
// Stub to make sure db handling is working
diff --git a/tests/OAuthAuthExternalUserTest.php
b/tests/OAuthAuthExternalUserTest.php
index 102c2d0..f533c87 100644
--- a/tests/OAuthAuthExternalUserTest.php
+++ b/tests/OAuthAuthExternalUserTest.php
@@ -4,6 +4,7 @@
/**
* @group OAuthAuthentication
+ * @group Database
*/
class OAuthAuthExternalUserTest extends OAuthAuthDBTest {
diff --git a/tests/OAuthAuthHooksTest.php b/tests/OAuthAuthHooksTest.php
index 8548669..1a372e6 100644
--- a/tests/OAuthAuthHooksTest.php
+++ b/tests/OAuthAuthHooksTest.php
@@ -3,6 +3,7 @@
/**
* @group OAuthAuthentication
+ * @group Database
*/
class OAuthAuthHooksTest extends OAuthAuthDBTest {
--
To view, visit https://gerrit.wikimedia.org/r/369876
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I05defa7eabed6da837832212396ae38602fa4b9f
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/extensions/OAuthAuthentication
Gerrit-Branch: master
Gerrit-Owner: Umherirrender
Gerrit-Reviewer: Hashar
Gerrit-Reviewer: Krinkle
Gerrit-Reviewer: Legoktm
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...AbuseFilter[master]: Rm unused locals
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/370600 ) Change subject: Rm unused locals .. Rm unused locals Change-Id: Ieb77c089645b858290a15c5804de636c5a7b53cc --- M includes/AbuseFilter.hooks.php M includes/Views/AbuseFilterViewEdit.php 2 files changed, 0 insertions(+), 3 deletions(-) Approvals: Huji: Looks good to me, but someone else must approve Krinkle: Looks good to me, approved jenkins-bot: Verified diff --git a/includes/AbuseFilter.hooks.php b/includes/AbuseFilter.hooks.php index 3fd8c46..6bd4d0c 100644 --- a/includes/AbuseFilter.hooks.php +++ b/includes/AbuseFilter.hooks.php @@ -949,7 +949,6 @@ $text = AbuseFilter::contentToString( $content ); $oldcontent = $revision->getContent( Revision::RAW ); - $oldtext = AbuseFilter::contentToString( $oldcontent ); $user = $user ?: RequestContext::getMain()->getUser(); // Cache any resulting filter matches. diff --git a/includes/Views/AbuseFilterViewEdit.php b/includes/Views/AbuseFilterViewEdit.php index 3ccff64..3d73d4b 100644 --- a/includes/Views/AbuseFilterViewEdit.php +++ b/includes/Views/AbuseFilterViewEdit.php @@ -51,8 +51,6 @@ return $tagNameStatus; } - $tagEditor = $this->getUser(); - $finalStatus = Status::newGood(); $canAddStatus = -- To view, visit https://gerrit.wikimedia.org/r/370600 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ieb77c089645b858290a15c5804de636c5a7b53cc Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/AbuseFilter Gerrit-Branch: master Gerrit-Owner: MaxSem Gerrit-Reviewer: Dmaza Gerrit-Reviewer: Huji Gerrit-Reviewer: Jackmcbarn Gerrit-Reviewer: Krinkle Gerrit-Reviewer: MaxSem Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...AbuseFilter[master]: Get rid of deprecated manual profiling
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/370599 )
Change subject: Get rid of deprecated manual profiling
..
Get rid of deprecated manual profiling
Change-Id: Iefbfb4b9937ed265156fb1b644889fd9e2b29a2e
---
M includes/AbuseFilter.class.php
M includes/parser/AbuseFilterParser.php
2 files changed, 1 insertion(+), 15 deletions(-)
Approvals:
Krinkle: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/AbuseFilter.class.php b/includes/AbuseFilter.class.php
index 1713d99..6bdf837 100644
--- a/includes/AbuseFilter.class.php
+++ b/includes/AbuseFilter.class.php
@@ -1105,8 +1105,6 @@
$var_dump = self::storeVarDump( $vars );
$var_dump = "stored-text:$var_dump"; // To distinguish from
stuff stored directly
- wfProfileIn( __METHOD__ . '-hitstats' );
-
$stash = ObjectCache::getMainStashInstance();
// Increment trigger counter
@@ -1206,8 +1204,6 @@
// Check for emergency disabling.
$total = $stash->get( self::filterUsedKey( $group ) );
self::checkEmergencyDisable( $group, $logged_local_filters,
$total );
-
- wfProfileOut( __METHOD__ . '-hitstats' );
}
/**
diff --git a/includes/parser/AbuseFilterParser.php
b/includes/parser/AbuseFilterParser.php
index 4f1534e..097e248 100644
--- a/includes/parser/AbuseFilterParser.php
+++ b/includes/parser/AbuseFilterParser.php
@@ -448,13 +448,11 @@
// We can go on quickly as either one statement with |
is true or on with & is false
if ( ( $op == '&' && !$result->toBool() ) || ( $op ==
'|' && $result->toBool() ) ) {
- wfProfileIn( __METHOD__ . '-shortcircuit' );
$orig = $this->mShortCircuit;
$this->mShortCircuit = $this->mAllowShort;
$this->doLevelCompares( $r2 );
$this->mShortCircuit = $orig;
$result = new AFPData( AFPData::DBOOL,
$result->toBool() );
- wfProfileOut( __METHOD__ . '-shortcircuit' );
continue;
}
@@ -575,9 +573,8 @@
}
AbuseFilter::triggerLimiter();
- wfProfileIn( __METHOD__ . "-$func" );
+
$result = AFPData::$func( $result, $r2,
$this->mCur->pos );
- wfProfileOut( __METHOD__ . "-$func" );
}
}
@@ -677,7 +674,6 @@
return; // The result doesn't matter.
}
- wfProfileIn( __METHOD__ . '-loadargs' );
$args = [];
do {
$r = new AFPData();
@@ -697,10 +693,6 @@
}
$this->move();
- wfProfileOut( __METHOD__ . '-loadargs' );
-
- wfProfileIn( __METHOD__ . "-$func" );
-
$funcHash = md5( $func . serialize( $args ) );
if ( isset( self::$funcCache[$funcHash] ) &&
@@ -715,8 +707,6 @@
if ( count( self::$funcCache ) > 1000 ) {
self::$funcCache = [];
}
-
- wfProfileOut( __METHOD__ . "-$func" );
} else {
$this->doLevelAtom( $result );
}
--
To view, visit https://gerrit.wikimedia.org/r/370599
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iefbfb4b9937ed265156fb1b644889fd9e2b29a2e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/AbuseFilter
Gerrit-Branch: master
Gerrit-Owner: MaxSem
Gerrit-Reviewer: Dmaza
Gerrit-Reviewer: Jackmcbarn
Gerrit-Reviewer: Krinkle
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...AbuseFilter[master]: Fix class and function name case
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/370601 )
Change subject: Fix class and function name case
..
Fix class and function name case
Change-Id: I55ed3b26ee457863372ec063b7c3ff27bc849b8b
---
M includes/AbuseFilter.class.php
M includes/AbuseFilter.hooks.php
M includes/Views/AbuseFilterViewRevert.php
3 files changed, 3 insertions(+), 3 deletions(-)
Approvals:
Huji: Looks good to me, but someone else must approve
Krinkle: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/AbuseFilter.class.php b/includes/AbuseFilter.class.php
index 6bdf837..f0af762 100644
--- a/includes/AbuseFilter.class.php
+++ b/includes/AbuseFilter.class.php
@@ -2019,7 +2019,7 @@
static function translateFromHistory( $row ) {
# Translate into an abuse_filter row with some black magic.
# This is ever so slightly evil!
- $af_row = new StdClass;
+ $af_row = new stdClass;
foreach ( self::$history_mappings as $af_col => $afh_col ) {
$af_row->$af_col = $row->$afh_col;
diff --git a/includes/AbuseFilter.hooks.php b/includes/AbuseFilter.hooks.php
index 6bd4d0c..b102341 100644
--- a/includes/AbuseFilter.hooks.php
+++ b/includes/AbuseFilter.hooks.php
@@ -277,7 +277,7 @@
$fdb->update( 'abuse_filter_log',
[ 'afl_rev_id' => $revision->getId() ],
- [ 'afl_id' => $log_ids, 'afl_wiki' =>
wfWikiId() ],
+ [ 'afl_id' => $log_ids, 'afl_wiki' =>
wfWikiID() ],
__METHOD__
);
}
diff --git a/includes/Views/AbuseFilterViewRevert.php
b/includes/Views/AbuseFilterViewRevert.php
index 496da51..98e853e 100644
--- a/includes/Views/AbuseFilterViewRevert.php
+++ b/includes/Views/AbuseFilterViewRevert.php
@@ -211,7 +211,7 @@
return true;
case 'blockautopromote':
ObjectCache::getMainStashInstance()->delete(
- AbuseFilter::autopromoteBlockKey(
User::newFromId( $result['userid'] ) )
+ AbuseFilter::autoPromoteBlockKey(
User::newFromId( $result['userid'] ) )
);
return true;
case 'degroup':
--
To view, visit https://gerrit.wikimedia.org/r/370601
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I55ed3b26ee457863372ec063b7c3ff27bc849b8b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/AbuseFilter
Gerrit-Branch: master
Gerrit-Owner: MaxSem
Gerrit-Reviewer: Dmaza
Gerrit-Reviewer: Huji
Gerrit-Reviewer: Jackmcbarn
Gerrit-Reviewer: Krinkle
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...AbuseFilter[master]: Normalize file layout
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/370598 ) Change subject: Normalize file layout .. Normalize file layout Aka move all code into includes/. Change-Id: I21f7b80bb6df04abbed6bfccb94f92100dc8f071 --- M extension.json R includes/AbuseFilter.hooks.php R includes/Views/AbuseFilterView.php R includes/Views/AbuseFilterViewDiff.php R includes/Views/AbuseFilterViewEdit.php R includes/Views/AbuseFilterViewExamine.php R includes/Views/AbuseFilterViewHistory.php R includes/Views/AbuseFilterViewImport.php R includes/Views/AbuseFilterViewList.php R includes/Views/AbuseFilterViewRevert.php R includes/Views/AbuseFilterViewTestBatch.php R includes/Views/AbuseFilterViewTools.php R includes/api/ApiAbuseFilterCheckMatch.php R includes/api/ApiAbuseFilterCheckSyntax.php R includes/api/ApiAbuseFilterEvalExpression.php R includes/api/ApiAbuseFilterUnblockAutopromote.php R includes/api/ApiQueryAbuseFilters.php R includes/api/ApiQueryAbuseLog.php R includes/special/SpecialAbuseFilter.php R includes/special/SpecialAbuseLog.php 20 files changed, 27 insertions(+), 27 deletions(-) Approvals: Huji: Looks good to me, but someone else must approve Krinkle: Looks good to me, approved jenkins-bot: Verified diff --git a/extension.json b/extension.json index 75838ef..9cd5ab9 100644 --- a/extension.json +++ b/extension.json @@ -74,28 +74,28 @@ "AbuseFilterCachingParser" : "includes/parser/AbuseFilterCachingParser.php", "AbuseFilterParser": "includes/parser/AbuseFilterParser.php", "AbuseFilterTokenizer": "includes/parser/AbuseFilterTokenizer.php", - "AbuseFilterHooks": "AbuseFilter.hooks.php", + "AbuseFilterHooks": "includes/AbuseFilter.hooks.php", "AbuseFilterPreAuthenticationProvider": "includes/AbuseFilterPreAuthenticationProvider.php", - "SpecialAbuseLog": "special/SpecialAbuseLog.php", - "AbuseLogPager": "special/SpecialAbuseLog.php", - "SpecialAbuseFilter": "special/SpecialAbuseFilter.php", + "SpecialAbuseLog": "includes/special/SpecialAbuseLog.php", + "AbuseLogPager": "includes/special/SpecialAbuseLog.php", + "SpecialAbuseFilter": "includes/special/SpecialAbuseFilter.php", "AbuseLogHitFormatter": "includes/AbuseLogHitFormatter.php", - "AbuseFilterViewList": "Views/AbuseFilterViewList.php", - "AbuseFilterPager": "Views/AbuseFilterViewList.php", - "GlobalAbuseFilterPager": "Views/AbuseFilterViewList.php", - "AbuseFilterView": "Views/AbuseFilterView.php", - "AbuseFilterViewEdit": "Views/AbuseFilterViewEdit.php", - "AbuseFilterViewTools": "Views/AbuseFilterViewTools.php", - "AbuseFilterViewHistory": "Views/AbuseFilterViewHistory.php", - "AbuseFilterHistoryPager": "Views/AbuseFilterViewHistory.php", - "AbuseFilterViewRevert": "Views/AbuseFilterViewRevert.php", - "AbuseFilterViewTestBatch": "Views/AbuseFilterViewTestBatch.php", - "AbuseFilterViewExamine": "Views/AbuseFilterViewExamine.php", - "AbuseFilterExaminePager": "Views/AbuseFilterViewExamine.php", - "AbuseFilterChangesList": "Views/AbuseFilterView.php", - "AbuseFilterViewDiff": "Views/AbuseFilterViewDiff.php", - "TableDiffFormatterFullContext": "Views/AbuseFilterViewDiff.php", - "AbuseFilterViewImport": "Views/AbuseFilterViewImport.php", + "AbuseFilterViewList": "includes/Views/AbuseFilterViewList.php", + "AbuseFilterPager": "includes/Views/AbuseFilterViewList.php", + "GlobalAbuseFilterPager": "includes/Views/AbuseFilterViewList.php", + "AbuseFilterView": "includes/Views/AbuseFilterView.php", + "AbuseFilterViewEdit": "includes/Views/AbuseFilterViewEdit.php", + "AbuseFilterViewTools": "includes/Views/AbuseFilterViewTools.php", + "AbuseFilterViewHistory": "includes/Views/AbuseFilterViewHistory.php", + "AbuseFilterHistoryPager": "includes/Views/AbuseFilterViewHistory.php", + "AbuseFilterViewRevert": "includes/Views/AbuseFilterViewRevert.php", + "AbuseFilterViewTestBatch": "includes/Views/AbuseFilterViewTestBatch.php", + "AbuseFilterViewExamine": "includes/Views/AbuseFilterViewExamine.php", + "AbuseFilterExaminePager": "includes/Views/AbuseFilterViewExamine.php", + "AbuseFilterChangesList": "includes/Views/AbuseFilterView.php", + "AbuseFilterViewDiff": "includes/Views/AbuseFilterViewDiff.php", + "TableDiffFormatterFullContext": "includes/Views/AbuseFilterViewDiff.php", + "AbuseFilterViewImport": "includes/Views/
[MediaWiki-commits] [Gerrit] mediawiki...codesniffer[master]: Fix phpunit test on windows
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/370229 )
Change subject: Fix phpunit test on windows
..
Fix phpunit test on windows
The lines are not empty or dash only on windows, because the phpcs
output contains also \r
Change-Id: Ib0677d6aad430f4c2af090912dca4aab719d5fd5
---
M MediaWiki/Tests/MediaWikiStandardTest.php
1 file changed, 5 insertions(+), 0 deletions(-)
Approvals:
Krinkle: Looks good to me, approved
jenkins-bot: Verified
diff --git a/MediaWiki/Tests/MediaWikiStandardTest.php
b/MediaWiki/Tests/MediaWikiStandardTest.php
index aff79b4..2ceb11e 100644
--- a/MediaWiki/Tests/MediaWikiStandardTest.php
+++ b/MediaWiki/Tests/MediaWikiStandardTest.php
@@ -128,11 +128,16 @@
*/
private function prepareOutput( $outputStr ) {
if ( $outputStr ) {
+ // Do a "\r\n" -> "\n" and "\r" -> "\n" transformation
for windows machine
+ $outputStr = str_replace( [ "\r\n", "\r" ], "\n",
$outputStr );
+
// Remove colors
$outputStr = preg_replace( '`\033\[[0-9;]+m`', '',
$outputStr );
$outputLines = explode( "\n", $outputStr );
+
// Remove lines that are empty or all dashes:
$outputLines = preg_grep( '/^-*$/', $outputLines,
PREG_GREP_INVERT );
+
// Remove lines that start with 'Time:', 'FOUND', or
'FILE:':
$outputLines = preg_grep( '/^(Time:|FOUND|FILE:) .*$/',
$outputLines, PREG_GREP_INVERT );
$outputStr = implode( "\n", $outputLines );
--
To view, visit https://gerrit.wikimedia.org/r/370229
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib0677d6aad430f4c2af090912dca4aab719d5fd5
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/tools/codesniffer
Gerrit-Branch: master
Gerrit-Owner: Umherirrender
Gerrit-Reviewer: Addshore
Gerrit-Reviewer: Krinkle
Gerrit-Reviewer: Legoktm
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...codesniffer[master]: Fix Undefined offset in FunctionCommentSniff
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/370231 )
Change subject: Fix Undefined offset in FunctionCommentSniff
..
Fix Undefined offset in FunctionCommentSniff
On "@return boolean" without comment the undefined offset was raised.
Bug: T171776
Change-Id: Id83b96e5e39b9de6265dbe6dc2fef5ed0c35a3e4
---
M MediaWiki/Sniffs/Commenting/FunctionCommentSniff.php
M MediaWiki/Tests/files/Commenting/commenting_function.php
M MediaWiki/Tests/files/Commenting/commenting_function.php.expect
M MediaWiki/Tests/files/Commenting/commenting_function.php.fixed
4 files changed, 27 insertions(+), 3 deletions(-)
Approvals:
Krinkle: Looks good to me, approved
jenkins-bot: Verified
diff --git a/MediaWiki/Sniffs/Commenting/FunctionCommentSniff.php
b/MediaWiki/Sniffs/Commenting/FunctionCommentSniff.php
index 443da15..9fdc490 100644
--- a/MediaWiki/Sniffs/Commenting/FunctionCommentSniff.php
+++ b/MediaWiki/Sniffs/Commenting/FunctionCommentSniff.php
@@ -216,7 +216,7 @@
);
if ( $fix === true ) {
$phpcsFile->fixer->replaceToken(
- $retType, 'bool ' . $exploded[1]
+ $retType, 'bool' . ( isset(
$exploded[1] ) ? ' ' . $exploded[1] : '' )
);
}
} elseif ( $first === 'integer' ) {
@@ -227,7 +227,7 @@
);
if ( $fix === true ) {
$phpcsFile->fixer->replaceToken(
- $retType, 'int ' . $exploded[1]
+ $retType, 'int' . ( isset(
$exploded[1] ) ? ' ' . $exploded[1] : '' )
);
}
}
diff --git a/MediaWiki/Tests/files/Commenting/commenting_function.php
b/MediaWiki/Tests/files/Commenting/commenting_function.php
index 3036faf..0967fa2 100644
--- a/MediaWiki/Tests/files/Commenting/commenting_function.php
+++ b/MediaWiki/Tests/files/Commenting/commenting_function.php
@@ -54,6 +54,15 @@
return $a();
}
+
+ /**
+* @param boolean $aBool
+* @param integer $anInt
+* @return boolean
+*/
+ public function testLongTypesNoComment( $aBool, $anInt ) {
+ return $aBool;
+ }
}
class TestPassedExamples {
diff --git a/MediaWiki/Tests/files/Commenting/commenting_function.php.expect
b/MediaWiki/Tests/files/Commenting/commenting_function.php.expect
index a05b7c3..fe8b805 100644
--- a/MediaWiki/Tests/files/Commenting/commenting_function.php.expect
+++ b/MediaWiki/Tests/files/Commenting/commenting_function.php.expect
@@ -14,5 +14,11 @@
| | (MediaWiki.Commenting.FunctionComment.NotShortIntReturn)
49 | ERROR | [ ] Missing @return tag in function comment
| | (MediaWiki.Commenting.FunctionComment.MissingReturn)
+ 59 | ERROR | [ ] Missing parameter comment
+| | (MediaWiki.Commenting.FunctionComment.MissingParamComment)
+ 60 | ERROR | [ ] Missing parameter comment
+| | (MediaWiki.Commenting.FunctionComment.MissingParamComment)
+ 61 | ERROR | [x] Short type of "bool" should be used for @return tag
+| | (MediaWiki.Commenting.FunctionComment.NotShortBoolReturn)
-PHPCBF CAN FIX THE 4 MARKED SNIFF VIOLATIONS AUTOMATICALLY
+PHPCBF CAN FIX THE 5 MARKED SNIFF VIOLATIONS AUTOMATICALLY
diff --git a/MediaWiki/Tests/files/Commenting/commenting_function.php.fixed
b/MediaWiki/Tests/files/Commenting/commenting_function.php.fixed
index f414562..ebc9665 100644
--- a/MediaWiki/Tests/files/Commenting/commenting_function.php.fixed
+++ b/MediaWiki/Tests/files/Commenting/commenting_function.php.fixed
@@ -54,6 +54,15 @@
return $a();
}
+
+ /**
+* @param boolean $aBool
+* @param integer $anInt
+* @return bool
+*/
+ public function testLongTypesNoComment( $aBool, $anInt ) {
+ return $aBool;
+ }
}
class TestPassedExamples {
--
To view, visit https://gerrit.wikimedia.org/r/370231
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Id83b96e5e39b9de6265dbe6dc2fef5ed0c35a3e4
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/tools/codesniffer
Gerrit-Branch: master
Gerrit-Owner: Umherirrender
Gerrit-Reviewer: Addshore
Gerrit-Reviewer: Krinkle
Gerrit-Reviewer: Legoktm
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...AbuseFilter[master]: Rm unused locals
MaxSem has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/370600 ) Change subject: Rm unused locals .. Rm unused locals Change-Id: Ieb77c089645b858290a15c5804de636c5a7b53cc --- M includes/AbuseFilter.hooks.php M includes/Views/AbuseFilterViewEdit.php 2 files changed, 0 insertions(+), 3 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/AbuseFilter refs/changes/00/370600/1 diff --git a/includes/AbuseFilter.hooks.php b/includes/AbuseFilter.hooks.php index 3fd8c46..6bd4d0c 100644 --- a/includes/AbuseFilter.hooks.php +++ b/includes/AbuseFilter.hooks.php @@ -949,7 +949,6 @@ $text = AbuseFilter::contentToString( $content ); $oldcontent = $revision->getContent( Revision::RAW ); - $oldtext = AbuseFilter::contentToString( $oldcontent ); $user = $user ?: RequestContext::getMain()->getUser(); // Cache any resulting filter matches. diff --git a/includes/Views/AbuseFilterViewEdit.php b/includes/Views/AbuseFilterViewEdit.php index 3ccff64..3d73d4b 100644 --- a/includes/Views/AbuseFilterViewEdit.php +++ b/includes/Views/AbuseFilterViewEdit.php @@ -51,8 +51,6 @@ return $tagNameStatus; } - $tagEditor = $this->getUser(); - $finalStatus = Status::newGood(); $canAddStatus = -- To view, visit https://gerrit.wikimedia.org/r/370600 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ieb77c089645b858290a15c5804de636c5a7b53cc Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/AbuseFilter Gerrit-Branch: master Gerrit-Owner: MaxSem ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...AbuseFilter[master]: Fix class and function name case
MaxSem has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/370601 )
Change subject: Fix class and function name case
..
Fix class and function name case
Change-Id: I55ed3b26ee457863372ec063b7c3ff27bc849b8b
---
M includes/AbuseFilter.class.php
M includes/AbuseFilter.hooks.php
M includes/Views/AbuseFilterViewRevert.php
3 files changed, 3 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/AbuseFilter
refs/changes/01/370601/1
diff --git a/includes/AbuseFilter.class.php b/includes/AbuseFilter.class.php
index 6bdf837..f0af762 100644
--- a/includes/AbuseFilter.class.php
+++ b/includes/AbuseFilter.class.php
@@ -2019,7 +2019,7 @@
static function translateFromHistory( $row ) {
# Translate into an abuse_filter row with some black magic.
# This is ever so slightly evil!
- $af_row = new StdClass;
+ $af_row = new stdClass;
foreach ( self::$history_mappings as $af_col => $afh_col ) {
$af_row->$af_col = $row->$afh_col;
diff --git a/includes/AbuseFilter.hooks.php b/includes/AbuseFilter.hooks.php
index 6bd4d0c..b102341 100644
--- a/includes/AbuseFilter.hooks.php
+++ b/includes/AbuseFilter.hooks.php
@@ -277,7 +277,7 @@
$fdb->update( 'abuse_filter_log',
[ 'afl_rev_id' => $revision->getId() ],
- [ 'afl_id' => $log_ids, 'afl_wiki' =>
wfWikiId() ],
+ [ 'afl_id' => $log_ids, 'afl_wiki' =>
wfWikiID() ],
__METHOD__
);
}
diff --git a/includes/Views/AbuseFilterViewRevert.php
b/includes/Views/AbuseFilterViewRevert.php
index 496da51..98e853e 100644
--- a/includes/Views/AbuseFilterViewRevert.php
+++ b/includes/Views/AbuseFilterViewRevert.php
@@ -211,7 +211,7 @@
return true;
case 'blockautopromote':
ObjectCache::getMainStashInstance()->delete(
- AbuseFilter::autopromoteBlockKey(
User::newFromId( $result['userid'] ) )
+ AbuseFilter::autoPromoteBlockKey(
User::newFromId( $result['userid'] ) )
);
return true;
case 'degroup':
--
To view, visit https://gerrit.wikimedia.org/r/370601
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I55ed3b26ee457863372ec063b7c3ff27bc849b8b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/AbuseFilter
Gerrit-Branch: master
Gerrit-Owner: MaxSem
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...AbuseFilter[master]: Fix some deprecated function usage
MaxSem has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/370602 )
Change subject: Fix some deprecated function usage
..
Fix some deprecated function usage
Change-Id: I544cdfa75c7472f2d98b2561bc6f6f9c2d2ad639
---
M includes/api/ApiAbuseFilterCheckMatch.php
M includes/api/ApiAbuseFilterCheckSyntax.php
M includes/api/ApiAbuseFilterUnblockAutopromote.php
M includes/api/ApiQueryAbuseFilters.php
M includes/api/ApiQueryAbuseLog.php
M includes/parser/AFPData.php
6 files changed, 17 insertions(+), 80 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/AbuseFilter
refs/changes/02/370602/1
diff --git a/includes/api/ApiAbuseFilterCheckMatch.php
b/includes/api/ApiAbuseFilterCheckMatch.php
index 60ee658..d2d4410 100644
--- a/includes/api/ApiAbuseFilterCheckMatch.php
+++ b/includes/api/ApiAbuseFilterCheckMatch.php
@@ -7,11 +7,7 @@
// "Anti-DoS"
if ( !$this->getUser()->isAllowed( 'abusefilter-modify' ) ) {
- if ( is_callable( [ $this, 'dieWithError' ] ) ) {
- $this->dieWithError(
'apierror-abusefilter-canttest', 'permissiondenied' );
- } else {
- $this->dieUsage( 'You don\'t have permission to
test abuse filters', 'permissiondenied' );
- }
+ $this->dieWithError( 'apierror-abusefilter-canttest',
'permissiondenied' );
}
$vars = null;
@@ -31,11 +27,7 @@
);
if ( !$row ) {
- if ( is_callable( [ $this, 'dieWithError' ] ) )
{
- $this->dieWithError( [
'apierror-nosuchrcid', $params['rcid'] ] );
- } else {
- $this->dieUsageMsg( [ 'nosuchrcid',
$params['rcid'] ] );
- }
+ $this->dieWithError( [ 'apierror-nosuchrcid',
$params['rcid'] ] );
}
$vars = AbuseFilter::getVarsFromRCRow( $row );
@@ -49,25 +41,14 @@
);
if ( !$row ) {
- if ( is_callable( [ $this, 'dieWithError' ] ) )
{
- $this->dieWithError( [
'apierror-abusefilter-nosuchlogid', $params['logid'] ], 'nosuchlogid' );
- } else {
- $this->dieUsage(
- "There is no abuselog entry
with the id ``{$params['logid']}''",
- 'nosuchlogid'
- );
- }
+ $this->dieWithError( [
'apierror-abusefilter-nosuchlogid', $params['logid'] ], 'nosuchlogid' );
}
$vars = AbuseFilter::loadVarDump( $row->afl_var_dump );
}
if ( AbuseFilter::checkSyntax( $params[ 'filter' ] ) !== true )
{
- if ( is_callable( [ $this, 'dieWithError' ] ) ) {
- $this->dieWithError(
'apierror-abusefilter-badsyntax', 'badsyntax' );
- } else {
- $this->dieUsage( 'The filter has invalid
syntax', 'badsyntax' );
- }
+ $this->dieWithError( 'apierror-abusefilter-badsyntax',
'badsyntax' );
}
$result = [
diff --git a/includes/api/ApiAbuseFilterCheckSyntax.php
b/includes/api/ApiAbuseFilterCheckSyntax.php
index 05fb699..b0ac3f7 100644
--- a/includes/api/ApiAbuseFilterCheckSyntax.php
+++ b/includes/api/ApiAbuseFilterCheckSyntax.php
@@ -5,14 +5,7 @@
public function execute() {
// "Anti-DoS"
if ( !$this->getUser()->isAllowed( 'abusefilter-modify' ) ) {
- if ( is_callable( [ $this, 'dieWithError' ] ) ) {
- $this->dieWithError(
'apierror-abusefilter-cantcheck', 'permissiondenied' );
- } else {
- $this->dieUsage(
- 'You don\'t have permission to check
syntax of abuse filters',
- 'permissiondenied'
- );
- }
+ $this->dieWithError( 'apierror-abusefilter-cantcheck',
'permissiondenied' );
}
$params = $this->extractRequestParams();
diff --git a/includes/api/ApiAbuseFilterUnblockAutopromote.php
b/includes/api/ApiAbuseFilterUnblockAutopromote.php
index e616dc3..5ceb17f 100644
--- a/includes/api/ApiAbuseFilterUnblockAutopromote.php
+++ b/includes/api/ApiAbuseFilte
[MediaWiki-commits] [Gerrit] mediawiki...AbuseFilter[master]: Get rid of deprecated manual profiling
MaxSem has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/370599 )
Change subject: Get rid of deprecated manual profiling
..
Get rid of deprecated manual profiling
Change-Id: Iefbfb4b9937ed265156fb1b644889fd9e2b29a2e
---
M includes/AbuseFilter.class.php
M includes/parser/AbuseFilterParser.php
2 files changed, 1 insertion(+), 15 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/AbuseFilter
refs/changes/99/370599/1
diff --git a/includes/AbuseFilter.class.php b/includes/AbuseFilter.class.php
index 1713d99..6bdf837 100644
--- a/includes/AbuseFilter.class.php
+++ b/includes/AbuseFilter.class.php
@@ -1105,8 +1105,6 @@
$var_dump = self::storeVarDump( $vars );
$var_dump = "stored-text:$var_dump"; // To distinguish from
stuff stored directly
- wfProfileIn( __METHOD__ . '-hitstats' );
-
$stash = ObjectCache::getMainStashInstance();
// Increment trigger counter
@@ -1206,8 +1204,6 @@
// Check for emergency disabling.
$total = $stash->get( self::filterUsedKey( $group ) );
self::checkEmergencyDisable( $group, $logged_local_filters,
$total );
-
- wfProfileOut( __METHOD__ . '-hitstats' );
}
/**
diff --git a/includes/parser/AbuseFilterParser.php
b/includes/parser/AbuseFilterParser.php
index 4f1534e..097e248 100644
--- a/includes/parser/AbuseFilterParser.php
+++ b/includes/parser/AbuseFilterParser.php
@@ -448,13 +448,11 @@
// We can go on quickly as either one statement with |
is true or on with & is false
if ( ( $op == '&' && !$result->toBool() ) || ( $op ==
'|' && $result->toBool() ) ) {
- wfProfileIn( __METHOD__ . '-shortcircuit' );
$orig = $this->mShortCircuit;
$this->mShortCircuit = $this->mAllowShort;
$this->doLevelCompares( $r2 );
$this->mShortCircuit = $orig;
$result = new AFPData( AFPData::DBOOL,
$result->toBool() );
- wfProfileOut( __METHOD__ . '-shortcircuit' );
continue;
}
@@ -575,9 +573,8 @@
}
AbuseFilter::triggerLimiter();
- wfProfileIn( __METHOD__ . "-$func" );
+
$result = AFPData::$func( $result, $r2,
$this->mCur->pos );
- wfProfileOut( __METHOD__ . "-$func" );
}
}
@@ -677,7 +674,6 @@
return; // The result doesn't matter.
}
- wfProfileIn( __METHOD__ . '-loadargs' );
$args = [];
do {
$r = new AFPData();
@@ -697,10 +693,6 @@
}
$this->move();
- wfProfileOut( __METHOD__ . '-loadargs' );
-
- wfProfileIn( __METHOD__ . "-$func" );
-
$funcHash = md5( $func . serialize( $args ) );
if ( isset( self::$funcCache[$funcHash] ) &&
@@ -715,8 +707,6 @@
if ( count( self::$funcCache ) > 1000 ) {
self::$funcCache = [];
}
-
- wfProfileOut( __METHOD__ . "-$func" );
} else {
$this->doLevelAtom( $result );
}
--
To view, visit https://gerrit.wikimedia.org/r/370599
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iefbfb4b9937ed265156fb1b644889fd9e2b29a2e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/AbuseFilter
Gerrit-Branch: master
Gerrit-Owner: MaxSem
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...AbuseFilter[master]: Normalize file layout
MaxSem has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/370598 ) Change subject: Normalize file layout .. Normalize file layout Aka move all code into includes/. Change-Id: I21f7b80bb6df04abbed6bfccb94f92100dc8f071 --- M extension.json R includes/AbuseFilter.hooks.php R includes/Views/AbuseFilterView.php R includes/Views/AbuseFilterViewDiff.php R includes/Views/AbuseFilterViewEdit.php R includes/Views/AbuseFilterViewExamine.php R includes/Views/AbuseFilterViewHistory.php R includes/Views/AbuseFilterViewImport.php R includes/Views/AbuseFilterViewList.php R includes/Views/AbuseFilterViewRevert.php R includes/Views/AbuseFilterViewTestBatch.php R includes/Views/AbuseFilterViewTools.php R includes/api/ApiAbuseFilterCheckMatch.php R includes/api/ApiAbuseFilterCheckSyntax.php R includes/api/ApiAbuseFilterEvalExpression.php R includes/api/ApiAbuseFilterUnblockAutopromote.php R includes/api/ApiQueryAbuseFilters.php R includes/api/ApiQueryAbuseLog.php R includes/special/SpecialAbuseFilter.php R includes/special/SpecialAbuseLog.php 20 files changed, 27 insertions(+), 27 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/AbuseFilter refs/changes/98/370598/1 diff --git a/extension.json b/extension.json index 75838ef..9cd5ab9 100644 --- a/extension.json +++ b/extension.json @@ -74,28 +74,28 @@ "AbuseFilterCachingParser" : "includes/parser/AbuseFilterCachingParser.php", "AbuseFilterParser": "includes/parser/AbuseFilterParser.php", "AbuseFilterTokenizer": "includes/parser/AbuseFilterTokenizer.php", - "AbuseFilterHooks": "AbuseFilter.hooks.php", + "AbuseFilterHooks": "includes/AbuseFilter.hooks.php", "AbuseFilterPreAuthenticationProvider": "includes/AbuseFilterPreAuthenticationProvider.php", - "SpecialAbuseLog": "special/SpecialAbuseLog.php", - "AbuseLogPager": "special/SpecialAbuseLog.php", - "SpecialAbuseFilter": "special/SpecialAbuseFilter.php", + "SpecialAbuseLog": "includes/special/SpecialAbuseLog.php", + "AbuseLogPager": "includes/special/SpecialAbuseLog.php", + "SpecialAbuseFilter": "includes/special/SpecialAbuseFilter.php", "AbuseLogHitFormatter": "includes/AbuseLogHitFormatter.php", - "AbuseFilterViewList": "Views/AbuseFilterViewList.php", - "AbuseFilterPager": "Views/AbuseFilterViewList.php", - "GlobalAbuseFilterPager": "Views/AbuseFilterViewList.php", - "AbuseFilterView": "Views/AbuseFilterView.php", - "AbuseFilterViewEdit": "Views/AbuseFilterViewEdit.php", - "AbuseFilterViewTools": "Views/AbuseFilterViewTools.php", - "AbuseFilterViewHistory": "Views/AbuseFilterViewHistory.php", - "AbuseFilterHistoryPager": "Views/AbuseFilterViewHistory.php", - "AbuseFilterViewRevert": "Views/AbuseFilterViewRevert.php", - "AbuseFilterViewTestBatch": "Views/AbuseFilterViewTestBatch.php", - "AbuseFilterViewExamine": "Views/AbuseFilterViewExamine.php", - "AbuseFilterExaminePager": "Views/AbuseFilterViewExamine.php", - "AbuseFilterChangesList": "Views/AbuseFilterView.php", - "AbuseFilterViewDiff": "Views/AbuseFilterViewDiff.php", - "TableDiffFormatterFullContext": "Views/AbuseFilterViewDiff.php", - "AbuseFilterViewImport": "Views/AbuseFilterViewImport.php", + "AbuseFilterViewList": "includes/Views/AbuseFilterViewList.php", + "AbuseFilterPager": "includes/Views/AbuseFilterViewList.php", + "GlobalAbuseFilterPager": "includes/Views/AbuseFilterViewList.php", + "AbuseFilterView": "includes/Views/AbuseFilterView.php", + "AbuseFilterViewEdit": "includes/Views/AbuseFilterViewEdit.php", + "AbuseFilterViewTools": "includes/Views/AbuseFilterViewTools.php", + "AbuseFilterViewHistory": "includes/Views/AbuseFilterViewHistory.php", + "AbuseFilterHistoryPager": "includes/Views/AbuseFilterViewHistory.php", + "AbuseFilterViewRevert": "includes/Views/AbuseFilterViewRevert.php", + "AbuseFilterViewTestBatch": "includes/Views/AbuseFilterViewTestBatch.php", + "AbuseFilterViewExamine": "includes/Views/AbuseFilterViewExamine.php", + "AbuseFilterExaminePager": "includes/Views/AbuseFilterViewExamine.php", + "AbuseFilterChangesList": "includes/Views/AbuseFilterView.php", + "AbuseFilterViewDiff": "includes/Views/AbuseFilterViewDiff.php", + "TableDiffFormatterFullContext": "includes/Views/AbuseFilterViewDiff.php", + "AbuseFilterViewImport": "includes/Views/AbuseFilterViewImport.php",
[MediaWiki-commits] [Gerrit] mediawiki...PluggableAuth[master]: Add earlier hook to avoid JS redirect
Cicalese has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/369585 )
Change subject: Add earlier hook to avoid JS redirect
..
Add earlier hook to avoid JS redirect
Note that we have to pass in $title by ref because we will replace the object.
Change-Id: I3eff5988c95738ef6de5fd8404ad3becba09b0c8
---
M PluggableAuthHooks.php
D ext.PluggableAuthAutoLogin.js
M extension.json
3 files changed, 28 insertions(+), 78 deletions(-)
Approvals:
Cicalese: Verified; Looks good to me, approved
jenkins-bot: Checked
diff --git a/PluggableAuthHooks.php b/PluggableAuthHooks.php
index a82d024..325dc6f 100644
--- a/PluggableAuthHooks.php
+++ b/PluggableAuthHooks.php
@@ -120,24 +120,22 @@
}
/**
-* Implements BeforePageDisplay hook.
-* See https://www.mediawiki.org/wiki/Manual:Hooks/BeforePageDisplay
-* Adds auto login JavaScript module if all of the following are true:
-* - auto login is enabled
-* - no user is already logged in
-* - the current page is not a PluggableAuth login special page (which
would
-* cause an infinite loop)
-* - if the wiki requires login to read, the current page is
whitelisted (in
-* other words, users than cannot login to a wiki that requires login
to
-* read will still be able to read whitelisted pages, since those
pages
-* will not trigger auto login).
+* Grab the page request early
+* See https://www.mediawiki.org/wiki/Manual:Hooks/BeforeInitialize
+* Redirects ASAP to login
+* @param Title &$title being used for request
+* @param null $article unused
+* @param OutputPage $out object
+* @param User $user current user
+* @param WebRequest $request why we're here
+* @param MediaWiki $mw object
*
-* @since 2.0
-*
-* @param OutputPage &$out output page obj
-* @param Skin &$skin will be used to generate the page
+* Note that $title has to be passed by ref so we can replace it.
*/
- public static function autoLoginInit( &$out, &$skin ) {
+ public static function doBeforeInitialize(
+ Title &$title, $article, OutputPage $out, User $user,
+ WebRequest $request, MediaWiki $mw
+ ) {
if ( !$GLOBALS['wgPluggableAuth_EnableAutoLogin'] ) {
return;
}
@@ -148,14 +146,20 @@
return;
}
$loginSpecialPages =
ExtensionRegistry::getInstance()->getAttribute(
- 'PluggableAuthLoginSpecialPages' );
- $title = $out->getTitle();
+ 'PluggableAuthLoginSpecialPages'
+ );
foreach ( $loginSpecialPages as $page ) {
if ( $title->isSpecial( $page ) ) {
return;
}
}
- $out->addModules( 'ext.PluggableAuthAutoLogin' );
+
+ $oldTitle = $title;
+ $title = Title::newFromText( "UserLogin", NS_SPECIAL );
+ $out->redirect( $title->getFullURL( [
+ 'returnto' => $oldTitle,
+ 'returntoquery' => $request->getRawQueryString()
+ ] ) );
}
/**
diff --git a/ext.PluggableAuthAutoLogin.js b/ext.PluggableAuthAutoLogin.js
deleted file mode 100644
index 864f816..000
--- a/ext.PluggableAuthAutoLogin.js
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Copyright (c) 2016 The MITRE Corporation
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
- */
-
-( function ( mw ) {
- mw.loader.using( [ 'mediawiki.Uri', 'mediawiki.Title' ], function () {
- var pageName = mw.config.get( 'wgPageName' );
- var ur
[MediaWiki-commits] [Gerrit] mediawiki...Popups[master]: Use EcmaScript modules instead of common.js modules
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/368460 ) Change subject: Use EcmaScript modules instead of common.js modules .. Use EcmaScript modules instead of common.js modules Why: Because they are the approved standard by TC39 and Ecma for JavaScript modules. Changes: * Wrap mw-node-qunit in run.js to register babel to transpile modules for node v6 * Change all sources in src/ to use ES modules * Change constants.js to be able to run without jQuery.bracketedDevicePixelRatio given ES modules are hoisted to the top by spec so we can't patch globals before importing it * Change all tests in tests/node-qunit/ to use ES modules * Drop usage of mock-require given ES modules are easy to stub with sinon Additional changes: * Rename tests/node-qunit/renderer.js to renderer.test.js to follow the convention of all the other files * Make npm run test:node run only .test.js test files so that it doesn't run the stubs.js or run.js file. Bug: T171951 Change-Id: I17a0b76041d5e2fd18e2d54950d9d7c0db99a941 --- M .eslintrc.json M package.json M resources/dist/index.js M resources/dist/index.js.map M src/actionTypes.js M src/actions.js M src/changeListener.js M src/changeListeners/eventLogging.js M src/changeListeners/footerLink.js M src/changeListeners/index.js M src/changeListeners/linkTitle.js M src/changeListeners/render.js M src/changeListeners/settings.js M src/changeListeners/statsv.js M src/changeListeners/syncUserSettings.js M src/constants.js M src/container.js M src/experiments.js M src/formatter.js M src/gateway/index.js M src/gateway/mediawiki.js M src/gateway/rest.js M src/gateway/restFormatters.js M src/index.js M src/instrumentation/eventLogging.js M src/instrumentation/statsv.js M src/isEnabled.js M src/preview/model.js M src/previewBehavior.js M src/reducers/eventLogging.js M src/reducers/index.js M src/reducers/nextState.js M src/reducers/preview.js M src/reducers/settings.js M src/reducers/statsv.js M src/title.js M src/ui/renderer.js M src/ui/settingsDialog.js M src/userSettings.js M src/wait.js M tests/node-qunit/actions.test.js M tests/node-qunit/changeListener.test.js M tests/node-qunit/changeListeners/eventLogging.test.js M tests/node-qunit/changeListeners/footerLink.test.js M tests/node-qunit/changeListeners/linkTitle.test.js M tests/node-qunit/changeListeners/render.test.js M tests/node-qunit/changeListeners/settings.test.js M tests/node-qunit/changeListeners/statsv.test.js M tests/node-qunit/changeListeners/syncUserSettings.test.js M tests/node-qunit/container.test.js M tests/node-qunit/counts.test.js M tests/node-qunit/experiments.test.js M tests/node-qunit/formatter.test.js M tests/node-qunit/gateway/index.test.js M tests/node-qunit/gateway/mediawiki.test.js M tests/node-qunit/gateway/rest.test.js M tests/node-qunit/instrumentation/eventLogging.test.js M tests/node-qunit/instrumentation/statsv.test.js M tests/node-qunit/integration.test.js M tests/node-qunit/isEnabled.test.js M tests/node-qunit/preview/model.test.js M tests/node-qunit/previewBehavior.test.js M tests/node-qunit/reducers/eventLogging.test.js M tests/node-qunit/reducers/preview.test.js M tests/node-qunit/reducers/settings.test.js M tests/node-qunit/reducers/statsv.test.js A tests/node-qunit/run.js M tests/node-qunit/stubs.js M tests/node-qunit/title.test.js R tests/node-qunit/ui/renderer.test.js M tests/node-qunit/ui/settingsDialog.test.js M tests/node-qunit/userSettings.test.js M tests/node-qunit/wait.test.js 73 files changed, 298 insertions(+), 341 deletions(-) Approvals: Pmiazga: Looks good to me, but someone else must approve jenkins-bot: Verified Phuedx: Looks good to me, but someone else must approve Jdlrobson: Looks good to me, approved -- To view, visit https://gerrit.wikimedia.org/r/368460 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I17a0b76041d5e2fd18e2d54950d9d7c0db99a941 Gerrit-PatchSet: 5 Gerrit-Project: mediawiki/extensions/Popups Gerrit-Branch: master Gerrit-Owner: Jhernandez Gerrit-Reviewer: BarryTheBrowserTestBot Gerrit-Reviewer: Frankiebot Gerrit-Reviewer: Jdlrobson Gerrit-Reviewer: Jhernandez Gerrit-Reviewer: Niedzielski Gerrit-Reviewer: Phuedx Gerrit-Reviewer: Pmiazga Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Show protection log on creation-protected pages
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/367033 )
Change subject: Show protection log on creation-protected pages
..
Show protection log on creation-protected pages
This change would add the message 'titleprotectedwarning'
to pages that have been protected against creation, just
like how deleted pages have their log visible beforere-creation.
It is visible to everyone, whether or not they are allowed to
recreate the page.
Bug: T171338
Change-Id: I5acf1bee9cea056b20b77fd386bc9df65033cded
---
M includes/page/Article.php
M languages/i18n/en.json
2 files changed, 3 insertions(+), 3 deletions(-)
Approvals:
Aaron Schulz: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/page/Article.php b/includes/page/Article.php
index d13fb3c..932c6bc 100644
--- a/includes/page/Article.php
+++ b/includes/page/Article.php
@@ -1180,7 +1180,7 @@
$key = $cache->makeKey( 'page-recent-delete', md5(
$title->getPrefixedText() ) );
$loggedIn = $this->getContext()->getUser()->isLoggedIn();
if ( $loggedIn || $cache->get( $key ) ) {
- $logTypes = [ 'delete', 'move' ];
+ $logTypes = [ 'delete', 'move', 'protect' ];
$dbr = wfGetDB( DB_REPLICA );
diff --git a/languages/i18n/en.json b/languages/i18n/en.json
index 929042f..d750551 100644
--- a/languages/i18n/en.json
+++ b/languages/i18n/en.json
@@ -735,8 +735,8 @@
"permissionserrorstext-withaction": "You do not have permission to $2,
for the following {{PLURAL:$1|reason|reasons}}:",
"contentmodelediterror": "You cannot edit this revision because its
content model is $1, which differs from the current content model
of the page $2.",
"recreate-moveddeleted-warn": "Warning: You are recreating a
page that was previously deleted.\n\nYou should consider whether it is
appropriate to continue editing this page.\nThe deletion and move log for this
page are provided here for convenience:",
- "moveddeleted-notice": "This page has been deleted.\nThe deletion and
move log for the page are provided below for reference.",
- "moveddeleted-notice-recent": "Sorry, this page was recently deleted
(within the last 24 hours).\nThe deletion and move log for the page are
provided below for reference.",
+ "moveddeleted-notice": "This page has been deleted.\nThe deletion,
protection, and move log for the page are provided below for reference.",
+ "moveddeleted-notice-recent": "Sorry, this page was recently deleted
(within the last 24 hours).\nThe deletion, protection, and move log for the
page are provided below for reference.",
"log-fulllog": "View full log",
"edit-hook-aborted": "Edit aborted by hook.\nIt gave no explanation.",
"edit-gone-missing": "Could not update the page.\nIt appears to have
been deleted.",
--
To view, visit https://gerrit.wikimedia.org/r/367033
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I5acf1bee9cea056b20b77fd386bc9df65033cded
Gerrit-PatchSet: 7
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Ebe123
Gerrit-Reviewer: Aaron Schulz
Gerrit-Reviewer: Ebe123
Gerrit-Reviewer: Mainframe98
Gerrit-Reviewer: Mbch331
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...MobileFrontend[master]: Replace `@colorGray6` with appropriate WikimediaUI palette c...
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/370591 )
Change subject: Replace `@colorGray6` with appropriate WikimediaUI palette color
..
Replace `@colorGray6` with appropriate WikimediaUI palette color
Replacing `@colorGray6` with appropriate closest color with slightly increased
contrast and in case of `.mw-echo-ui-actionMenuPopupWidget-menu` border with
WikimediaUI Base dropdown border color.
Bug: T146799
Change-Id: If12ebb317ca9035c04c3b952010afcda971bc8f7
---
M resources/mobile.notifications.overlay/NotificationsOverlay.less
M resources/mobile.pagelist.styles/pagelist.less
2 files changed, 5 insertions(+), 6 deletions(-)
Approvals:
Bmansurov: Looks good to me, approved
jenkins-bot: Verified
diff --git a/resources/mobile.notifications.overlay/NotificationsOverlay.less
b/resources/mobile.notifications.overlay/NotificationsOverlay.less
index 9e4e78a..81bdabb 100644
--- a/resources/mobile.notifications.overlay/NotificationsOverlay.less
+++ b/resources/mobile.notifications.overlay/NotificationsOverlay.less
@@ -27,7 +27,7 @@
padding: 0.5em;
font-size: 1.5em;
box-shadow: none;
- border: 1px solid @colorGray6;
+ border: 1px solid @colorGray10;
// Override the positioning of the menu
// so it is "stuck" on the bottom of the
// notification overlay panel
diff --git a/resources/mobile.pagelist.styles/pagelist.less
b/resources/mobile.pagelist.styles/pagelist.less
index ce3ef18..c72688a 100644
--- a/resources/mobile.pagelist.styles/pagelist.less
+++ b/resources/mobile.pagelist.styles/pagelist.less
@@ -39,9 +39,9 @@
overflow: hidden;
li {
- color: @colorGray6;
+ color: @colorGray5;
position: relative;
- border-bottom: solid 1px @grayLightest;
+ border-bottom: 1px solid @grayLightest;
padding-top: @itemPaddingV;
padding-bottom: @itemPaddingV;
// avoid the gap between thumbnails
@@ -65,13 +65,13 @@
> a {
display: block;
- color: @colorGray6;
+ color: @colorGray5;
&:active,
&:hover,
&:visited {
text-decoration: none;
- color: @colorGray6;
+ color: @colorGray5;
}
}
}
@@ -96,7 +96,6 @@
}
.title {
-
h3,
.mw-mf-user,
.component,
--
To view, visit https://gerrit.wikimedia.org/r/370591
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: If12ebb317ca9035c04c3b952010afcda971bc8f7
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: VolkerE
Gerrit-Reviewer: Bmansurov
Gerrit-Reviewer: Jdlrobson
Gerrit-Reviewer: Niedzielski
Gerrit-Reviewer: Pmiazga
Gerrit-Reviewer: VolkerE
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...WikidataPageBanner[master]: Make QUnit test more compatible by using expect()
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/370323 )
Change subject: Make QUnit test more compatible by using expect()
..
Make QUnit test more compatible by using expect()
Bug: T170515
Change-Id: I3abd06180d04aa681cc82a06778ce77421683b32
---
M
tests/qunit/ext.WikidataPageBanner.positionBanner/test_ext.WikidataPageBanner.positionBanner.js
1 file changed, 2 insertions(+), 1 deletion(-)
Approvals:
Krinkle: Looks good to me, approved
jenkins-bot: Verified
diff --git
a/tests/qunit/ext.WikidataPageBanner.positionBanner/test_ext.WikidataPageBanner.positionBanner.js
b/tests/qunit/ext.WikidataPageBanner.positionBanner/test_ext.WikidataPageBanner.positionBanner.js
index 5a60398..d429026 100644
---
a/tests/qunit/ext.WikidataPageBanner.positionBanner/test_ext.WikidataPageBanner.positionBanner.js
+++
b/tests/qunit/ext.WikidataPageBanner.positionBanner/test_ext.WikidataPageBanner.positionBanner.js
@@ -1,6 +1,7 @@
( function ( mw, $ ) {
QUnit.module( 'ext.WikidataPageBanner.positionBanner',
QUnit.newMwEnvironment() );
- QUnit.test( 'testFocus', 10, function ( assert ) {
+ QUnit.test( 'testFocus', function ( assert ) {
+ assert.expect( 10 );
this.$wpbBannerImageContainer = $( '', {
width: 600,
height: 300
--
To view, visit https://gerrit.wikimedia.org/r/370323
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I3abd06180d04aa681cc82a06778ce77421683b32
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/WikidataPageBanner
Gerrit-Branch: master
Gerrit-Owner: Thiemo Mättig (WMDE)
Gerrit-Reviewer: Krinkle
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Quiz[master]: Use WMF style colors in graded quizzes
Phantom42 has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/370597 )
Change subject: Use WMF style colors in graded quizzes
..
Use WMF style colors in graded quizzes
Bug: T168304
Change-Id: I5bc5cc377b5e8d4421cff3ba4338875139d81e29
---
M modules/ext.quiz.css
1 file changed, 16 insertions(+), 16 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Quiz
refs/changes/97/370597/1
diff --git a/modules/ext.quiz.css b/modules/ext.quiz.css
index fb14907..5dd02d4 100644
--- a/modules/ext.quiz.css
+++ b/modules/ext.quiz.css
@@ -31,11 +31,11 @@
}
.quiz .margin.right {
- background-color: #1ff72d;
+ background-color: #14866d;
}
.quiz .margin.wrong {
- background-color: #f74245;
+ background-color: #d33;
}
.quiz .margin.correction {
@@ -43,11 +43,11 @@
}
.quiz .margin.NA {
- background-color: #2834ff;
+ background-color: #36c;
}
.quiz .margin.error {
- background-color: #d700d7;
+ background-color: #fc3;
}
/* This should be based on content direction, not interface direction */
@@ -70,11 +70,11 @@
}
.quiz .question .border.right {
- border-color: #1ff72d;
+ border-color: #14866d;
}
.quiz .question .border.wrong {
- border-color: #f74245;
+ border-color: #d33;
}
.quiz .question .border.correction {
@@ -82,21 +82,21 @@
}
.quiz .question .border.NA {
- border-color: #2834ff;
+ border-color: #36c;
}
.quiz .question .border.error {
- border-color: #d700d7;
+ border-color: #fc3;
}
.quiz .question .check.right {
- outline: 3px solid #1ff72d;
- *border: 3px solid #1ff72d;
+ outline: 3px solid #14866d;
+ *border: 3px solid #14866d;
}
.quiz .question .check.wrong {
- outline: 3px solid #f74245;
- *border: 3px solid #f74245;
+ outline: 3px solid #d33;
+ *border: 3px solid #d33;
}
.quiz .question .check.correction {
@@ -105,13 +105,13 @@
}
.quiz .question .check.NA {
- outline: 3px solid #2834ff;
- *border: 3px solid #2834ff;
+ outline: 3px solid #36c;
+ *border: 3px solid #36c;
}
.quiz .question .check.error {
- outline: 3px solid #d700d7;
- *border: 3px solid #d700d7;
+ outline: 3px solid #fc3;
+ *border: 3px solid #fc3;
}
.quiz .header .questionId {
--
To view, visit https://gerrit.wikimedia.org/r/370597
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I5bc5cc377b5e8d4421cff3ba4338875139d81e29
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Quiz
Gerrit-Branch: master
Gerrit-Owner: Phantom42
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Comments[master]: Fix E_NOTICE in CommentsOfTheDay.class.php
Jack Phoenix has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/370596 )
Change subject: Fix E_NOTICE in CommentsOfTheDay.class.php
..
Fix E_NOTICE in CommentsOfTheDay.class.php
Notice: Undefined index: nocache in
../extensions/Comments/includes/CommentsOfTheDay.class.php on line 30
Change-Id: Ib4c52ce62b9c824bae2be7df78c5315fe7bf05a6
---
M includes/CommentsOfTheDay.class.php
1 file changed, 2 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Comments
refs/changes/96/370596/1
diff --git a/includes/CommentsOfTheDay.class.php
b/includes/CommentsOfTheDay.class.php
index 4f89d34..eeb86b1 100644
--- a/includes/CommentsOfTheDay.class.php
+++ b/includes/CommentsOfTheDay.class.php
@@ -5,7 +5,6 @@
*
* @file
* @ingroup Extensions
- * @date 27 November 2015
*/
class CommentsOfTheDay {
@@ -27,7 +26,8 @@
* @return string HTML
*/
public static function getHTML( $input, $args, $parser ) {
- $comments = self::get( (bool)$args['nocache'] );
+ $skipCache = isset( $args['nocache'] ) && $args['nocache'];
+ $comments = self::get( $skipCache );
$commentOutput = '';
foreach ( $comments as $comment ) {
--
To view, visit https://gerrit.wikimedia.org/r/370596
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib4c52ce62b9c824bae2be7df78c5315fe7bf05a6
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Comments
Gerrit-Branch: master
Gerrit-Owner: Jack Phoenix
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] wikimedia/TransparencyReport-private[master]: Update frame text
Siddparmar has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/370595 ) Change subject: Update frame text .. Update frame text Change-Id: I93dae1cb877e4336ad75be16014a3499e7d352e6 --- M build/content.html M build/faq.html M build/fr/content.html M build/fr/faq.html M build/fr/privacy.html M build/index.html M build/javascripts/privacy.js M build/privacy.html M build/stylesheets/master.css M locales/en.yml M source/javascripts/privacy.js M source/localizable/privacy.html.erb M source/stylesheets/master.css.scss 13 files changed, 30 insertions(+), 19 deletions(-) Approvals: Siddparmar: Verified; Looks good to me, approved -- To view, visit https://gerrit.wikimedia.org/r/370595 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I93dae1cb877e4336ad75be16014a3499e7d352e6 Gerrit-PatchSet: 1 Gerrit-Project: wikimedia/TransparencyReport-private Gerrit-Branch: master Gerrit-Owner: Siddparmar Gerrit-Reviewer: Siddparmar ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] wikimedia/TransparencyReport-private[master]: Update frame text
Siddparmar has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/370595 ) Change subject: Update frame text .. Update frame text Change-Id: I93dae1cb877e4336ad75be16014a3499e7d352e6 --- M build/content.html M build/faq.html M build/fr/content.html M build/fr/faq.html M build/fr/privacy.html M build/index.html M build/javascripts/privacy.js M build/privacy.html M build/stylesheets/master.css M locales/en.yml M source/javascripts/privacy.js M source/localizable/privacy.html.erb M source/stylesheets/master.css.scss 13 files changed, 30 insertions(+), 19 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/wikimedia/TransparencyReport-private refs/changes/95/370595/1 -- To view, visit https://gerrit.wikimedia.org/r/370595 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I93dae1cb877e4336ad75be16014a3499e7d352e6 Gerrit-PatchSet: 1 Gerrit-Project: wikimedia/TransparencyReport-private Gerrit-Branch: master Gerrit-Owner: Siddparmar ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...SemanticGenealogy[master]: Patch for the previous commit in review - fixing syntax base...
Wilkins has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/370594 )
Change subject: Patch for the previous commit in review - fixing syntax based
on codesniffer v0.10 - deleting composer.lock
..
Patch for the previous commit in review
- fixing syntax based on codesniffer v0.10
- deleting composer.lock
Change-Id: I726a246e89c8b5b381f7ff1233ca59019ae86d57
---
M Gedcom5FilePrinter.php
M Gedcom5ResultPrinter.php
M GenealogicalFilePrinter.php
M PersonPageValues.php
M SemanticGenealogy.alias.php
M SemanticGenealogy.body.php
M SemanticGenealogy.i18n.php
M SemanticGenealogy.php
M SemanticGenealogyException.php
M SpecialFamilyTree.php
M Tools.php
M composer.json
D composer.lock
M src/Decorator/BoxDecorator.php
M src/Decorator/SimpleDecorator.php
M src/Decorator/TreeDecorator.php
M src/Decorator/TreeDecoratorFactory.php
M src/Tree/AncestorsFamilyTree.php
M src/Tree/DescendantFamilyTree.php
M src/Tree/DescendantListFamilyTree.php
M src/Tree/FamilyTree.php
M src/Tree/FamilyTreeFactory.php
M src/Tree/LinkFamilyTree.php
23 files changed, 319 insertions(+), 352 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/SemanticGenealogy
refs/changes/94/370594/1
diff --git a/Gedcom5FilePrinter.php b/Gedcom5FilePrinter.php
index e13811e..47b3787 100644
--- a/Gedcom5FilePrinter.php
+++ b/Gedcom5FilePrinter.php
@@ -11,11 +11,10 @@
* @licence GNU GPL v2+
* @author Thomas Pellissier Tanon
*/
-class Gedcom5FilePrinter extends GenealogicalFilePrinter
-{
+class Gedcom5FilePrinter extends GenealogicalFilePrinter {
- protected $families = array();
- protected $familiesByPerson = array();
+ protected $families = [];
+ protected $familiesByPerson = [];
/**
* Set file in $this->file property
@@ -23,7 +22,6 @@
* @return void
*/
protected function setFile() {
-
$this->setFamiliesList();
$this->addHead();
@@ -42,20 +40,25 @@
* @return void
*/
protected function setFamiliesList() {
-
foreach ( $this->people as $child ) {
- $id = $this->getFamilyIdForChild( $child );
- if ( $id != '0S0' ) {
- $this->addChildToFamily( $id, $child );
- list( $fatherId, $motherId ) = explode( 'S',
$id );
- $this->addFamilyToPerson( $id, $fatherId );
- $this->addFamilyToPerson( $id, $motherId );
+ $familyId = $this->getFamilyIdForChild( $child );
+ if ( $familyId != '0S0' ) {
+ $this->addChildToFamily( $familyId, $child );
+ list( $fatherId, $motherId ) = explode( 'S',
$familyId );
+ $this->addFamilyToPerson( $familyId, $fatherId
);
+ $this->addFamilyToPerson( $familyId, $motherId
);
}
}
}
+ /**
+* Get the family Id if the given child
+*
+* @param object $child the PersonPageValues object of the child
+*
+* @return string the key
+*/
protected function getFamilyIdForChild( PersonPageValues $child ) {
-
$key = '';
if ( $child->father instanceof SMWDIWikiPage
&& isset(
$this->people[$child->father->getTitle()->getArticleID()] ) ) {
@@ -78,36 +81,51 @@
return $key;
}
+ /**
+* Adds a child to a family
+*
+* @param string $familyKey the family key
+* @param object $child the PersonPageValues object of the child to add
+*
+* @return void
+*/
protected function addChildToFamily( $familyKey, PersonPageValues
$child ) {
-
$childId = $child->title->getArticleID();
if ( isset( $this->families[$familyKey] ) ) {
if ( !in_array( $childId, $this->families[$familyKey] )
) {
$this->families[$familyKey][] = $childId;
}
} else {
- $this->families[$familyKey] = array( $childId );
+ $this->families[$familyKey] = [ $childId ];
}
}
+ /**
+* Adds a family to a person
+*
+* @param integer $familyId the id of the family
+* @param integer $personId the id of the person
+*
+* @return void
+*/
protected function addFamilyToPerson( $familyId, $personId ) {
-
if ( $personId != 0 ) {
if ( isset( $this->familiesByPerson[$personId] ) ) {
if ( !in_array( $familyId,
$this->familiesByPerson[$personId] ) ) {
[MediaWiki-commits] [Gerrit] wikidata...rdf[master]: Uppercase item ids received from services.
Smalyshev has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/370593 )
Change subject: Uppercase item ids received from services.
..
Uppercase item ids received from services.
Bug: T172642
Change-Id: I017d88425f734ffcdc45b565867ca70b142e88d2
---
M
blazegraph/src/main/java/org/wikidata/query/rdf/blazegraph/mwapi/ApiTemplate.java
M
blazegraph/src/test/java/org/wikidata/query/rdf/blazegraph/mwapi/ApiTemplateUnitTest.java
2 files changed, 8 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/wikidata/query/rdf
refs/changes/93/370593/1
diff --git
a/blazegraph/src/main/java/org/wikidata/query/rdf/blazegraph/mwapi/ApiTemplate.java
b/blazegraph/src/main/java/org/wikidata/query/rdf/blazegraph/mwapi/ApiTemplate.java
index 89711d5..147247d 100644
---
a/blazegraph/src/main/java/org/wikidata/query/rdf/blazegraph/mwapi/ApiTemplate.java
+++
b/blazegraph/src/main/java/org/wikidata/query/rdf/blazegraph/mwapi/ApiTemplate.java
@@ -4,6 +4,7 @@
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
+import java.util.Locale;
import java.util.Map;
import java.util.Set;
@@ -372,7 +373,7 @@
case URI:
return new URIImpl(value);
case ITEM:
-return new URIImpl(WikibaseUris.getURISystem().entity() +
value);
+return new URIImpl(WikibaseUris.getURISystem().entity() +
value.toUpperCase(Locale.ROOT));
default:
throw new IllegalArgumentException("Can not produce URI for
non-URI type " + type);
}
diff --git
a/blazegraph/src/test/java/org/wikidata/query/rdf/blazegraph/mwapi/ApiTemplateUnitTest.java
b/blazegraph/src/test/java/org/wikidata/query/rdf/blazegraph/mwapi/ApiTemplateUnitTest.java
index 9abc865..8898ada 100644
---
a/blazegraph/src/test/java/org/wikidata/query/rdf/blazegraph/mwapi/ApiTemplateUnitTest.java
+++
b/blazegraph/src/test/java/org/wikidata/query/rdf/blazegraph/mwapi/ApiTemplateUnitTest.java
@@ -22,6 +22,7 @@
import static org.hamcrest.Matchers.equalTo;
import static org.hamcrest.Matchers.not;
import static org.hamcrest.Matchers.instanceOf;
+import static org.hamcrest.Matchers.endsWith;
import static
org.wikidata.query.rdf.blazegraph.mwapi.MWApiServiceFactory.paramNameToURI;
public class ApiTemplateUnitTest extends AbstractRandomizedBlazegraphTestBase {
@@ -144,12 +145,16 @@
assertThat(var.getPath(), equalTo("@somedata"));
assertTrue(var.isURI());
assertThat(var.getURI("http://test.com/";), instanceOf(URI.class));
-// User-defined variable
+// URI keeps the case
+assertThat(var.getURI("http://test.com/test";).toString(),
endsWith("test"));
+// User-defined variable which is an item
var = outputs.get(2);
assertThat(var.getName(), equalTo("var3"));
assertThat(var.getPath(), equalTo("item/@wikibase_id"));
assertTrue(var.isURI());
assertThat(var.getURI("test"), instanceOf(URI.class));
+// T172642: Item URIs will be uppercased
+assertThat(var.getURI("test").toString(), endsWith("TEST"));
}
@Test(expected = NullPointerException.class)
--
To view, visit https://gerrit.wikimedia.org/r/370593
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I017d88425f734ffcdc45b565867ca70b142e88d2
Gerrit-PatchSet: 1
Gerrit-Project: wikidata/query/rdf
Gerrit-Branch: master
Gerrit-Owner: Smalyshev
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...MobileFrontend[master]: Replace `@colorGray6` with appropriate WikimediaUI palette c...
VolkerE has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/370591 )
Change subject: Replace `@colorGray6` with appropriate WikimediaUI palette color
..
Replace `@colorGray6` with appropriate WikimediaUI palette color
Replacing `@colorGray6` with appropriate closest color with slightly increased
contrast and in case of `.mw-echo-ui-actionMenuPopupWidget-menu` border with
WikimediaUI Base dropdown border color.
Bug: T146799
Change-Id: If12ebb317ca9035c04c3b952010afcda971bc8f7
---
M resources/mobile.notifications.overlay/NotificationsOverlay.less
M resources/mobile.pagelist.styles/pagelist.less
2 files changed, 5 insertions(+), 6 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend
refs/changes/91/370591/1
diff --git a/resources/mobile.notifications.overlay/NotificationsOverlay.less
b/resources/mobile.notifications.overlay/NotificationsOverlay.less
index 9e4e78a..81bdabb 100644
--- a/resources/mobile.notifications.overlay/NotificationsOverlay.less
+++ b/resources/mobile.notifications.overlay/NotificationsOverlay.less
@@ -27,7 +27,7 @@
padding: 0.5em;
font-size: 1.5em;
box-shadow: none;
- border: 1px solid @colorGray6;
+ border: 1px solid @colorGray10;
// Override the positioning of the menu
// so it is "stuck" on the bottom of the
// notification overlay panel
diff --git a/resources/mobile.pagelist.styles/pagelist.less
b/resources/mobile.pagelist.styles/pagelist.less
index ce3ef18..c72688a 100644
--- a/resources/mobile.pagelist.styles/pagelist.less
+++ b/resources/mobile.pagelist.styles/pagelist.less
@@ -39,9 +39,9 @@
overflow: hidden;
li {
- color: @colorGray6;
+ color: @colorGray5;
position: relative;
- border-bottom: solid 1px @grayLightest;
+ border-bottom: 1px solid @grayLightest;
padding-top: @itemPaddingV;
padding-bottom: @itemPaddingV;
// avoid the gap between thumbnails
@@ -65,13 +65,13 @@
> a {
display: block;
- color: @colorGray6;
+ color: @colorGray5;
&:active,
&:hover,
&:visited {
text-decoration: none;
- color: @colorGray6;
+ color: @colorGray5;
}
}
}
@@ -96,7 +96,6 @@
}
.title {
-
h3,
.mw-mf-user,
.component,
--
To view, visit https://gerrit.wikimedia.org/r/370591
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: If12ebb317ca9035c04c3b952010afcda971bc8f7
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: VolkerE
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...OATHAuth[master]: Add in-process cache for OATHUser lookups
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/294860 )
Change subject: Add in-process cache for OATHUser lookups
..
Add in-process cache for OATHUser lookups
Change-Id: I9392b7b1a23944dfd91d690fa30b5a7fdf0f2e51
---
M OATHAuth.hooks.php
M OATHUser.php
M OATHUserRepository.php
3 files changed, 33 insertions(+), 10 deletions(-)
Approvals:
Aaron Schulz: Looks good to me, approved
jenkins-bot: Verified
diff --git a/OATHAuth.hooks.php b/OATHAuth.hooks.php
index 8718224..365c589 100644
--- a/OATHAuth.hooks.php
+++ b/OATHAuth.hooks.php
@@ -22,7 +22,14 @@
if ( $service == null ) {
$factory =
MediaWikiServices::getInstance()->getDBLoadBalancerFactory();
- $service = new OATHUserRepository( $factory->getMainLB(
$wgOATHAuthDatabase ) );
+ $service = new OATHUserRepository(
+ $factory->getMainLB( $wgOATHAuthDatabase ),
+ new HashBagOStuff(
+ [
+ 'maxKeys' => 5,
+ ]
+ )
+ );
}
return $service;
diff --git a/OATHUser.php b/OATHUser.php
index 10a6312..8290e10 100644
--- a/OATHUser.php
+++ b/OATHUser.php
@@ -13,6 +13,7 @@
private $key;
/**
+* Constructor. Can't be called directly. Use
OATHUserRepository::findByUser instead.
* @param User $user
* @param OATHAuthKey $key
*/
diff --git a/OATHUserRepository.php b/OATHUserRepository.php
index 8185187..6f68d12 100644
--- a/OATHUserRepository.php
+++ b/OATHUserRepository.php
@@ -4,12 +4,17 @@
/** @var LoadBalancer */
protected $lb;
+ /** @var BagOStuff */
+ protected $cache;
+
/**
* OATHUserRepository constructor.
* @param LoadBalancer $lb
+* @param BagOStuff $cache
*/
- public function __construct( LoadBalancer $lb ) {
+ public function __construct( LoadBalancer $lb, BagOStuff $cache ) {
$this->lb = $lb;
+ $this->cache = $cache;
}
/**
@@ -17,16 +22,24 @@
* @return OATHUser
*/
public function findByUser( User $user ) {
- $oathUser = new OATHUser( $user, null );
+ $oathUser = $this->cache->get( $user->getName() );
+ if ( !$oathUser ) {
+ $oathUser = new OATHUser( $user, null );
- $uid = CentralIdLookup::factory()->centralIdFromLocalUser(
$user );
- $res = $this->getDB( DB_SLAVE )
- ->selectRow( 'oathauth_users', '*', [ 'id' => $uid ],
__METHOD__ );
- if ( $res ) {
- $key = new OATHAuthKey( $res->secret, explode( ',',
$res->scratch_tokens ) );
- $oathUser->setKey( $key );
+ $uid =
CentralIdLookup::factory()->centralIdFromLocalUser( $user );
+ $res = $this->getDB( DB_SLAVE )->selectRow(
+ 'oathauth_users',
+ '*',
+ [ 'id' => $uid ],
+ __METHOD__
+ );
+ if ( $res ) {
+ $key = new OATHAuthKey( $res->secret, explode(
',', $res->scratch_tokens ) );
+ $oathUser->setKey( $key );
+ }
+
+ $this->cache->set( $user->getName(), $oathUser );
}
-
return $oathUser;
}
@@ -44,6 +57,7 @@
],
__METHOD__
);
+ $this->cache->set( $user->getUser()->getName(), $user );
}
/**
@@ -55,6 +69,7 @@
[ 'id' =>
CentralIdLookup::factory()->centralIdFromLocalUser( $user->getUser() ) ],
__METHOD__
);
+ $this->cache->delete( $user->getUser()->getName() );
}
/**
--
To view, visit https://gerrit.wikimedia.org/r/294860
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I9392b7b1a23944dfd91d690fa30b5a7fdf0f2e51
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/extensions/OATHAuth
Gerrit-Branch: master
Gerrit-Owner: Gergő Tisza
Gerrit-Reviewer: Aaron Schulz
Gerrit-Reviewer: Anomie
Gerrit-Reviewer: Dpatrick
Gerrit-Reviewer: Reedy
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: add AShahrestani to admin module for inclusion in wmf group
RobH has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/370579 ) Change subject: add AShahrestani to admin module for inclusion in wmf group .. add AShahrestani to admin module for inclusion in wmf group must list the ldap user here for inclusion in the wmf group via ldap settings Bug: T140380 Change-Id: I5542152ae78005268038e76092f70a85f042f200 --- M modules/admin/data/data.yaml 1 file changed, 4 insertions(+), 0 deletions(-) Approvals: RobH: Looks good to me, approved jenkins-bot: Verified diff --git a/modules/admin/data/data.yaml b/modules/admin/data/data.yaml index 155ea40..365fd71 100644 --- a/modules/admin/data/data.yaml +++ b/modules/admin/data/data.yaml @@ -2540,6 +2540,10 @@ ensure: present realname: Aeryn Palmer email: apal...@wikimedia.org + ashahrestani: +ensure: present +realname: A Shahrestani +email: ashahrest...@wikimedia.org audiohazel: ensure: present realname: Victoria Coleman -- To view, visit https://gerrit.wikimedia.org/r/370579 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I5542152ae78005268038e76092f70a85f042f200 Gerrit-PatchSet: 2 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: RobH Gerrit-Reviewer: Alex Monk Gerrit-Reviewer: Muehlenhoff Gerrit-Reviewer: RobH Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: add AShahrestani to admin module for inclusion in wmf group
RobH has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/370579 ) Change subject: add AShahrestani to admin module for inclusion in wmf group .. add AShahrestani to admin module for inclusion in wmf group must list the ldap user here for inclusion in the wmf group via ldap settings Bug: T140380 Change-Id: I5542152ae78005268038e76092f70a85f042f200 --- M modules/admin/data/data.yaml 1 file changed, 4 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/79/370579/1 diff --git a/modules/admin/data/data.yaml b/modules/admin/data/data.yaml index 155ea40..365fd71 100644 --- a/modules/admin/data/data.yaml +++ b/modules/admin/data/data.yaml @@ -2540,6 +2540,10 @@ ensure: present realname: Aeryn Palmer email: apal...@wikimedia.org + ashahrestani: +ensure: present +realname: A Shahrestani +email: ashahrest...@wikimedia.org audiohazel: ensure: present realname: Victoria Coleman -- To view, visit https://gerrit.wikimedia.org/r/370579 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I5542152ae78005268038e76092f70a85f042f200 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: RobH ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: openstack: libvirtd.conf from Jessie package [2/2]
Andrew Bogott has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/369617 ) Change subject: openstack: libvirtd.conf from Jessie package [2/2] .. openstack: libvirtd.conf from Jessie package [2/2] Synchronize libvirtd.conf from libvirt-daemon-system 1.2.9-+deb8u4 installed from jessie/main. Highlight newly introduced settings: mdns advertisements are now disabled by default. Apparently they do not occur when there is no Avahi daemon which is most probably the case on the Compute nodes. access_drivers to add access control to authenticated client. Default is 'nop', ie no access control. max_clients went from 20 to 5000. New: max_queued_clients = 1000 max_anonymous_clients = 20, queue of anonymous client default to disabled. log_outputs supports 'journald' and buckets can now be prefixed with '+' to dump a stacktrace. We do not use the future. Change is a noop, it only updates commented out lines. Change-Id: I8c5cfb0cb0f4096346bc1e8f2cf3d2dd897326d1 --- M modules/openstack/templates/common/nova/libvirtd.conf.erb 1 file changed, 29 insertions(+), 5 deletions(-) Approvals: Andrew Bogott: Looks good to me, approved jenkins-bot: Verified diff --git a/modules/openstack/templates/common/nova/libvirtd.conf.erb b/modules/openstack/templates/common/nova/libvirtd.conf.erb index 2dbfe64..537fb61 100644 --- a/modules/openstack/templates/common/nova/libvirtd.conf.erb +++ b/modules/openstack/templates/common/nova/libvirtd.conf.erb @@ -60,8 +60,8 @@ # Alternatively can disable for all services on a host by # stopping the Avahi daemon # -# This is enabled by default, uncomment this to disable it -#mdns_adv = 0 +# This is disabled by default, uncomment this to enable it +#mdns_adv = 1 # Override the default mDNS advertizement name. This must be # unique on the immediate broadcast network. @@ -164,6 +164,15 @@ #auth_tls = "none" +# Change the API access control scheme +# +# By default an authenticated user is allowed access +# to all APIs. Access drivers can place restrictions +# on this. By default the 'nop' driver is enabled, +# meaning no access control checks are done once a +# client has authenticated with libvirtd +# +#access_drivers = [ "polkit" ] # # @@ -255,8 +264,18 @@ # The maximum number of concurrent client connections to allow # over all sockets combined. -#max_clients = 20 +#max_clients = 5000 +# The maximum length of queue of connections waiting to be +# accepted by the daemon. Note, that some protocols supporting +# retransmission may obey this so that a later reattempt at +# connection succeeds. +#max_queued_clients = 1000 + +# The maximum length of queue of accepted but not yet not +# authenticated clients. The default value is zero, meaning +# the feature is disabled. +#max_anonymous_clients = 20 # The minimum limit sets the number of workers to start up # initially. If the number of active clients exceeds this, @@ -306,8 +325,11 @@ # of logs # The format for a filter is one of: #x:name -# where name is a match string e.g. remote or qemu -# the x prefix is the minimal level where matching messages should be logged +#x:+name +# where name is a string which is matched against source file name, +# e.g., "remote", "qemu", or "util/json", the optional "+" prefix +# tells libvirt to log stack trace for each message matching name, +# and x is the minimal level where matching messages should be logged: #1: DEBUG #2: INFO #3: WARNING @@ -329,6 +351,8 @@ # use syslog for the output and use the given name as the ident #x:file:file_path # output to a file, with the given filepath +#x:journald +# output to journald logging system # In all case the x prefix is the minimal level, acting as a filter #1: DEBUG #2: INFO -- To view, visit https://gerrit.wikimedia.org/r/369617 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I8c5cfb0cb0f4096346bc1e8f2cf3d2dd897326d1 Gerrit-PatchSet: 2 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Hashar Gerrit-Reviewer: Alex Monk Gerrit-Reviewer: Andrew Bogott Gerrit-Reviewer: Hashar Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: openstack: libvirtd.conf from Jessie package [1/2]
Andrew Bogott has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/369615 ) Change subject: openstack: libvirtd.conf from Jessie package [1/2] .. openstack: libvirtd.conf from Jessie package [1/2] Synchronize libvirtd.conf from libvirt-daemon-system 1.2.9-+deb8u4 installed from jessie/main. Comments/typos change only. Change-Id: Icf97bb5529fab767883f18f87f92ef3b73933ef0 --- M modules/openstack/templates/common/nova/libvirtd.conf.erb 1 file changed, 34 insertions(+), 22 deletions(-) Approvals: Andrew Bogott: Looks good to me, approved jenkins-bot: Verified diff --git a/modules/openstack/templates/common/nova/libvirtd.conf.erb b/modules/openstack/templates/common/nova/libvirtd.conf.erb index 42ac60a..2dbfe64 100644 --- a/modules/openstack/templates/common/nova/libvirtd.conf.erb +++ b/modules/openstack/templates/common/nova/libvirtd.conf.erb @@ -48,6 +48,10 @@ # Override the default configuration which binds to all network # interfaces. This can be a numeric IPv4/6 address, or hostname # +# If the libvirtd service is started in parallel with network +# startup (e.g. with systemd), binding to addresses other than +# the wildcards (0.0.0.0/::) might not be available yet. +# #listen_addr = "192.168.0.1" @@ -63,7 +67,7 @@ # unique on the immediate broadcast network. # # The default is "Virtualization Host HOSTNAME", where HOSTNAME -# is subsituted for the short hostname of the machine (without domain) +# is substituted for the short hostname of the machine (without domain) # #mdns_name = "Virtualization Host Joe Demo" @@ -72,6 +76,11 @@ # # UNIX socket access controls # + +# Beware that if you are changing *any* of these options, and you use +# socket activation with systemd, you need to adjust the settings in +# the libvirtd.socket file as well since it could impose a security +# risk if you rely on file permission checking only. # Set the UNIX domain socket group ownership. This can be used to # allow a 'trusted' set of users access to management capabilities @@ -83,8 +92,8 @@ # Set the UNIX socket permissions for the R/O socket. This is used # for monitoring VM status only # -# Default allows any user. If setting group ownership may want to -# restrict this to: +# Default allows any user. If setting group ownership, you may want to +# restrict this too. #unix_sock_ro_perms = "0777" # Set the UNIX socket permissions for the R/W socket. This is used @@ -94,7 +103,7 @@ # the default will change to allow everyone (eg, 0777) # # If not using PolicyKit and setting group ownership for access -# control then you may want to relax this to: +# control, then you may want to relax this too. unix_sock_rw_perms = "0770" # Set the name of the directory in which sockets will be found/created. @@ -113,7 +122,7 @@ # - sasl: use SASL infrastructure. The actual auth scheme is then # controlled from /etc/sasl2/libvirt.conf. For the TCP # socket only GSSAPI & DIGEST-MD5 mechanisms will be used. -# For non-TCP or TLS sockets, any scheme is allowed. +# For non-TCP or TLS sockets, any scheme is allowed. # # - polkit: use PolicyKit to authenticate. This is only suitable #for use on the UNIX sockets. The default policy will @@ -207,7 +216,7 @@ #tls_no_verify_certificate = 1 -# A whitelist of allowed x509 Distinguished Names +# A whitelist of allowed x509 Distinguished Names # This list may contain wildcards such as # #"C=GB,ST=London,L=London,O=Red Hat,CN=*" @@ -251,7 +260,7 @@ # The minimum limit sets the number of workers to start up # initially. If the number of active clients exceeds this, -# then more threads are spawned, upto max_workers limit. +# then more threads are spawned, up to max_workers limit. # Typically you'd want max_workers to equal maximum number # of clients allowed #min_workers = 5 @@ -259,15 +268,15 @@ # The number of priority workers. If all workers from above -# pool will stuck, some calls marked as high priority +# pool are stuck, some calls marked as high priority # (notably domainDestroy) can be executed in this pool. #prio_workers = 5 # Total global limit on concurrent RPC calls. Should be # at least as large as max_workers. Beyond this, RPC requests -# will be read into memory and queued. This directly impact +# will be read into memory and queued. This directly impacts # memory usage, currently each request requires 256 KB of -# memory. So by default upto 5 MB of memory is used +# memory. So by default up to 5 MB of memory is used # # XXX this isn't actually enforced yet, only the per-client # limit is used so far @@ -286,12 +295,16 @@ # Logging level: 4 errors, 3 warnings, 2 information, 1 debug # basically 1 will log everything possible +# Note: Journald may employ rate limiting of the messages logged +# and thus lock up the libvirt daemon. To use the debug level with
[MediaWiki-commits] [Gerrit] mediawiki...DonationInterface[master]: Remove obsolete selenium tests and WP responses.
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/368474 ) Change subject: Remove obsolete selenium tests and WP responses. .. Remove obsolete selenium tests and WP responses. These are for the old RapidHTML forms, and are not being run in CI WorldPay is no longer an option Change-Id: I27fdebf894411a2c8c5bd83f0f9fcb29838e5144 --- D tests/macros/form.twostepamount.banktransfer.netherlands.fail.not.a.valid.combination.htm D tests/macros/form.twostepamount.banktransfer.netherlands.htm D tests/macros/form.twostepamount.banktransfer.spain.htm D tests/macros/form.twostepamount.creditcard.visa.us.htm D tests/macros/form.twostepamount.directdebit.austria.htm D tests/macros/form.twostepamount.directdebit.belgium.htm D tests/macros/form.twostepamount.directdebit.belgium.invalid.length.htm D tests/macros/form.twostepamount.directdebit.italy.htm D tests/macros/form.twostepamount.directdebit.netherlands.fail.invalid.accountnumber.length.htm D tests/macros/form.twostepamount.directdebit.netherlands.htm D tests/macros/form.twostepamount.directdebit.spain.htm D tests/macros/form.twostepamount.ewallets.webmoney.htm D tests/macros/form.twostepamount.onlinebanktransfer.australia.htm D tests/macros/form.twostepamount.realtimebanktransfer.enets.htm D tests/macros/form.twostepamount.realtimebanktransfer.eps.824.htm D tests/macros/form.twostepamount.realtimebanktransfer.ideal.771.htm D tests/macros/form.twostepamount.realtimebanktransfer.nordea_sweden.htm D tests/macros/suite-all-payment-gateways.htm D tests/phpunit/includes/Responses/worldpay/AuthorizeAndDepositPayment.testresponse D tests/phpunit/includes/Responses/worldpay/AuthorizePaymentForFraud.testresponse D tests/phpunit/includes/Responses/worldpay/AuthorizePaymentForFraud_2208.testresponse D tests/phpunit/includes/Responses/worldpay/AuthorizePaymentForFraud_9000.testresponse D tests/phpunit/includes/Responses/worldpay/AuthorizePaymentForFraud_snowflake.testresponse D tests/phpunit/includes/Responses/worldpay/GenerateToken.testresponse D tests/phpunit/includes/Responses/worldpay/QueryTokenData.testresponse 25 files changed, 0 insertions(+), 1,960 deletions(-) Approvals: Mepps: Looks good to me, approved jenkins-bot: Verified diff --git a/tests/macros/form.twostepamount.banktransfer.netherlands.fail.not.a.valid.combination.htm b/tests/macros/form.twostepamount.banktransfer.netherlands.fail.not.a.valid.combination.htm deleted file mode 100644 index 795c26a..000 --- a/tests/macros/form.twostepamount.banktransfer.netherlands.fail.not.a.valid.combination.htm +++ /dev/null @@ -1,91 +0,0 @@ - -http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd";> -http://www.w3.org/1999/xhtml"; xml:lang="en" lang="en"> -http://selenium-ide.openqa.org/profiles/test-case";> - -http://wikimedia-fundraising-1.17.localhost.wikimedia.org/"; /> -form.twostepamount.banktransfer - - - - -form.twostepamount.banktransfer - - - open - /index.php/Special:GlobalCollectGateway?form_name=TwoStepAmount&payment_method=bt&payment_submethod=bt - - - - type - id=fname - Testy - - - type - id=lname - Testerton - - - select - id=country - label=Netherlands - - - type - id=street - 123 Happy Street - - - type - id=city - Madrid - - - type - id=emailAdd - nob...@wikimedia.org - - - click - id=input_amount_other - - - - type - id=other-amount - 1 - - - selectWindow - null - - - - select - id=state - label=Outside the U.S. - - - type - id=zip - 123 - - - select - id=input_currency_code - label=U.S. dollar - - - clickAndWait - css=input.button-plain - - - - verifyText - css=p.payment_error_message.payment_error_message_general - There was an error processing your transaction. Please try again later. - - - - diff --git a/tests/macros/form.twostepamount.banktransfer.netherlands.htm b/tests/macros/form.twostepamount.banktransfer.netherlands.htm deleted file mode 100644 index 19199c4..000 --- a/tests/macros/form.twostepamount.banktransfer.netherlands.htm +++ /dev/null @@ -1,111 +0,0 @@ - -http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd";> -http://www.w3.org/1999/xhtml"; xml:lang="en" lang="en"> -http://selenium-ide.openqa.org/profiles/test-case";> - -http://wikimedia-fundraising-1.17.localhost.wikimedia.org/"; /> -form.twostepamount.banktransfer - - - - -form.twostepamount.banktransfer - - - open - /index.php/Special:GlobalCollectGateway?form_name=TwoStepAmount&payment_method=bt&payment_submethod=bt - - - - type - id=fname - Testy - - - type - id=lname - Testerton - - - select - id=country - label=Netherlands - - - type - id=stree
[MediaWiki-commits] [Gerrit] operations/puppet[production]: Revert "adding AShahrestani to ldap per request"
RobH has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/370556 ) Change subject: Revert "adding AShahrestani to ldap per request" .. Revert "adding AShahrestani to ldap per request" This reverts commit 19c3c9277edf5ecbc7157adcd6463b698e44ed9b. Change-Id: I84adacd9fda0f40995dd2a4060b4f58d0cd8e114 --- M modules/admin/data/data.yaml 1 file changed, 0 insertions(+), 4 deletions(-) Approvals: jenkins-bot: Verified RobH: Looks good to me, approved diff --git a/modules/admin/data/data.yaml b/modules/admin/data/data.yaml index 365fd71..155ea40 100644 --- a/modules/admin/data/data.yaml +++ b/modules/admin/data/data.yaml @@ -2540,10 +2540,6 @@ ensure: present realname: Aeryn Palmer email: apal...@wikimedia.org - ashahrestani: -ensure: present -realname: A Shahrestani -email: ashahrest...@wikimedia.org audiohazel: ensure: present realname: Victoria Coleman -- To view, visit https://gerrit.wikimedia.org/r/370556 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I84adacd9fda0f40995dd2a4060b4f58d0cd8e114 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: RobH Gerrit-Reviewer: RobH Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: Revert "adding AShahrestani to ldap per request"
Hello jenkins-bot, I'd like you to do a code review. Please visit https://gerrit.wikimedia.org/r/370556 to review the following change. Change subject: Revert "adding AShahrestani to ldap per request" .. Revert "adding AShahrestani to ldap per request" This reverts commit 19c3c9277edf5ecbc7157adcd6463b698e44ed9b. Change-Id: I84adacd9fda0f40995dd2a4060b4f58d0cd8e114 --- M modules/admin/data/data.yaml 1 file changed, 0 insertions(+), 4 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/56/370556/1 diff --git a/modules/admin/data/data.yaml b/modules/admin/data/data.yaml index 365fd71..155ea40 100644 --- a/modules/admin/data/data.yaml +++ b/modules/admin/data/data.yaml @@ -2540,10 +2540,6 @@ ensure: present realname: Aeryn Palmer email: apal...@wikimedia.org - ashahrestani: -ensure: present -realname: A Shahrestani -email: ashahrest...@wikimedia.org audiohazel: ensure: present realname: Victoria Coleman -- To view, visit https://gerrit.wikimedia.org/r/370556 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I84adacd9fda0f40995dd2a4060b4f58d0cd8e114 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: RobH Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: adding AShahrestani to ldap per request
RobH has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/370555 ) Change subject: adding AShahrestani to ldap per request .. adding AShahrestani to ldap per request adding to the file for ldap inclusion, then can manually add the user to the wmf group required Bug: T140380 Change-Id: I83c0781204f7511d268da5e2ded37c17f3110ccf --- M modules/admin/data/data.yaml 1 file changed, 4 insertions(+), 0 deletions(-) Approvals: jenkins-bot: Verified RobH: Looks good to me, approved diff --git a/modules/admin/data/data.yaml b/modules/admin/data/data.yaml index 155ea40..365fd71 100644 --- a/modules/admin/data/data.yaml +++ b/modules/admin/data/data.yaml @@ -2540,6 +2540,10 @@ ensure: present realname: Aeryn Palmer email: apal...@wikimedia.org + ashahrestani: +ensure: present +realname: A Shahrestani +email: ashahrest...@wikimedia.org audiohazel: ensure: present realname: Victoria Coleman -- To view, visit https://gerrit.wikimedia.org/r/370555 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I83c0781204f7511d268da5e2ded37c17f3110ccf Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: RobH Gerrit-Reviewer: RobH Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: adding AShahrestani to ldap per request
RobH has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/370555 ) Change subject: adding AShahrestani to ldap per request .. adding AShahrestani to ldap per request adding to the file for ldap inclusion, then can manually add the user to the wmf group required Bug: T140380 Change-Id: I83c0781204f7511d268da5e2ded37c17f3110ccf --- M modules/admin/data/data.yaml 1 file changed, 4 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/55/370555/1 diff --git a/modules/admin/data/data.yaml b/modules/admin/data/data.yaml index 155ea40..365fd71 100644 --- a/modules/admin/data/data.yaml +++ b/modules/admin/data/data.yaml @@ -2540,6 +2540,10 @@ ensure: present realname: Aeryn Palmer email: apal...@wikimedia.org + ashahrestani: +ensure: present +realname: A Shahrestani +email: ashahrest...@wikimedia.org audiohazel: ensure: present realname: Victoria Coleman -- To view, visit https://gerrit.wikimedia.org/r/370555 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I83c0781204f7511d268da5e2ded37c17f3110ccf Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: RobH ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: Cassandra: Do not include the main DNS in the list of seeds
Mobrovac has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/370554 )
Change subject: Cassandra: Do not include the main DNS in the list of seeds
..
Cassandra: Do not include the main DNS in the list of seeds
Bug: T172610
Change-Id: I49313adaf5fb6c1028df21a2c18ca4385df734f5
---
M modules/cassandra/templates/cassandra.yaml-3.x.erb
1 file changed, 2 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/54/370554/1
diff --git a/modules/cassandra/templates/cassandra.yaml-3.x.erb
b/modules/cassandra/templates/cassandra.yaml-3.x.erb
index 5462ba6..7aa0ffc 100644
--- a/modules/cassandra/templates/cassandra.yaml-3.x.erb
+++ b/modules/cassandra/templates/cassandra.yaml-3.x.erb
@@ -401,7 +401,8 @@
x != @hostname \
&& ! (x.start_with?
"#{@hostname}-") \
&& x != @ipaddress \
- && x != @fqdn
+ && x != @fqdn \
+ && /^.+-.\.\w+\.\w+$/ =~
x
}.join(',') :
@seeds.join(',') %>
- seeds: <%= clean_seeds %>
# For workloads with more data than can fit in memory, Cassandra's
--
To view, visit https://gerrit.wikimedia.org/r/370554
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I49313adaf5fb6c1028df21a2c18ca4385df734f5
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Mobrovac
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: RCFilters: tweak old changes indicator
Sbisson has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/370553 )
Change subject: RCFilters: tweak old changes indicator
..
RCFilters: tweak old changes indicator
Bug: T172213
Change-Id: Ia9e669376390a56e52422352840a5d9e2576b1a8
---
M languages/i18n/en.json
M languages/i18n/qqq.json
M
resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.ChangesListWrapperWidget.less
M
resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.ChangesListWrapperWidget.js
4 files changed, 17 insertions(+), 22 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/53/370553/1
diff --git a/languages/i18n/en.json b/languages/i18n/en.json
index a14e926..52d3e32 100644
--- a/languages/i18n/en.json
+++ b/languages/i18n/en.json
@@ -1378,7 +1378,6 @@
"rcfilters-restore-default-filters": "Restore default filters",
"rcfilters-clear-all-filters": "Clear all filters",
"rcfilters-show-new-changes": "View newest changes",
- "rcfilters-previous-changes-label": "Previously viewed changes",
"rcfilters-search-placeholder": "Filter recent changes (browse or start
typing)",
"rcfilters-invalid-filter": "Invalid filter",
"rcfilters-empty-filter": "No active filters. All contributions are
shown.",
diff --git a/languages/i18n/qqq.json b/languages/i18n/qqq.json
index 7be71f0..21051f5 100644
--- a/languages/i18n/qqq.json
+++ b/languages/i18n/qqq.json
@@ -1568,7 +1568,6 @@
"rcfilters-restore-default-filters": "Label for the button that resets
filters to defaults",
"rcfilters-clear-all-filters": "Title for the button that clears all
filters",
"rcfilters-show-new-changes": "Label for the button to show new
changes.",
- "rcfilters-previous-changes-label": "Label to indicate the changes
below have been previously viewed.",
"rcfilters-search-placeholder": "Placeholder for the filter search
input.",
"rcfilters-invalid-filter": "A label for an invalid filter.",
"rcfilters-empty-filter": "Placeholder for the filter list when no
filters were chosen.",
diff --git
a/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.ChangesListWrapperWidget.less
b/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.ChangesListWrapperWidget.less
index d60e616..31f3f1d 100644
---
a/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.ChangesListWrapperWidget.less
+++
b/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.ChangesListWrapperWidget.less
@@ -1,5 +1,14 @@
@import 'mw.rcfilters.mixins';
+@keyframes fadeBlue {
+ 60% {
+ border-top-color: #36c;
+ }
+ 100% {
+ border-top-color: #c8ccd1;
+ }
+}
+
.mw-rcfilters-ui-changesListWrapperWidget {
&-newChanges {
@@ -10,15 +19,8 @@
&-previousChangesIndicator {
margin: 10px 0;
- color: #36c;
- border-top: 2px solid #36c;
- text-align: center;
-
- &:hover {
- color: #72777d;
- border-top-color: #72777d;
- cursor: pointer;
- }
+ border-top: 2px solid #c8ccd1;
+ animation: 1s ease fadeBlue;
}
&-results {
diff --git
a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.ChangesListWrapperWidget.js
b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.ChangesListWrapperWidget.js
index 7eab6cb..ba3ca97 100644
---
a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.ChangesListWrapperWidget.js
+++
b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.ChangesListWrapperWidget.js
@@ -167,7 +167,7 @@
* @param {string} from Anything newer than this is considered 'new'
*/
mw.rcfilters.ui.ChangesListWrapperWidget.prototype.emphasizeNewChanges
= function ( from ) {
- var $lastSeen,
+ var $firstNew,
$indicator,
$newChanges = $( [] ),
selector = this.inEnhancedMode() ?
@@ -182,25 +182,20 @@
if ( ts >= from ) {
$newChanges = $newChanges.add( $this );
- $lastSeen = $this;
+ $firstNew = $this;
// guards against putting the marker after the
last element
if ( index === ( length - 1 ) ) {
- $lastSeen = null;
+ $firstNew = null;
}
}
} );
- if ( $lastSeen ) {
+ if ( $firstNew ) {
$indicator = $( '' )
- .addClass(
'mw-rcfilters-ui-changesListWrapperWidget-previousChangesIndicator' )
[MediaWiki-commits] [Gerrit] mediawiki...PageForms[master]: Fix cargo table name blank validation error
Fz-29 has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/370552 )
Change subject: Fix cargo table name blank validation error
..
Fix cargo table name blank validation error
Change-Id: I5b5f69650090c882fc6bdab9e2bacdf14e3a2688
---
M libs/PF_CreateTemplate.js
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/PageForms
refs/changes/52/370552/1
diff --git a/libs/PF_CreateTemplate.js b/libs/PF_CreateTemplate.js
index 4dcb541..ad0cafc 100644
--- a/libs/PF_CreateTemplate.js
+++ b/libs/PF_CreateTemplate.js
@@ -34,7 +34,7 @@
function validateCreateTemplateForm() {
var blankTemplateName = ( jQuery( '#template_name' ).val() === '' );
var blankCargoTableName = ( jQuery( '#use_cargo' ).is(':checked') ||
- jQuery( '#table_name' ).val() === '' );
+ jQuery( '#cargo_table' ).val() === '' );
if ( blankTemplateName || blankCargoTableName ) {
scroll( 0, 0 );
if ( blankTemplateName ) {
--
To view, visit https://gerrit.wikimedia.org/r/370552
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I5b5f69650090c882fc6bdab9e2bacdf14e3a2688
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/PageForms
Gerrit-Branch: master
Gerrit-Owner: Fz-29
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...WikimediaEvents[master]: Update relevance survey to 60s, and bump schema rev id
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/370531 )
Change subject: Update relevance survey to 60s, and bump schema rev id
..
Update relevance survey to 60s, and bump schema rev id
* The survey was supposed to be presented after 60s, but was mistakenly
presented after 60ms. Fix that to hopefully reduce the noise in the
survey.
* The schema mistakenly had "i don't know" as an enum for the choice
parameter, when it should have been "unsure" to match the i18n keys.
Update schema with a new version that has the correct enum.
Bug: T171741
Change-Id: I8735678ed315134059d9a10fbe4ba44b761589e1
---
M extension.json
M modules/ext.wikimediaEvents.humanSearchRelevance.js
2 files changed, 2 insertions(+), 2 deletions(-)
Approvals:
MaxSem: Looks good to me, approved
jenkins-bot: Verified
diff --git a/extension.json b/extension.json
index cd0ca67..22f3a14 100644
--- a/extension.json
+++ b/extension.json
@@ -154,7 +154,7 @@
"schema.HumanSearchRelevance": {
"class": "ResourceLoaderSchemaModule",
"schema": "HumanSearchRelevance",
- "revision": 17069968
+ "revision": 17073843
},
"ext.wikimediaEvents": {
"scripts": [
diff --git a/modules/ext.wikimediaEvents.humanSearchRelevance.js
b/modules/ext.wikimediaEvents.humanSearchRelevance.js
index 4410588..7ac 100644
--- a/modules/ext.wikimediaEvents.humanSearchRelevance.js
+++ b/modules/ext.wikimediaEvents.humanSearchRelevance.js
@@ -306,6 +306,6 @@
// TODO: We probably want to vary this 60s for some AB tests, to see if
the quality
// of human grades varies depending on how long we wait.
- setTimeout( askQuestion, 60 );
+ setTimeout( askQuestion, 6 );
}( mediaWiki, jQuery ) );
--
To view, visit https://gerrit.wikimedia.org/r/370531
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I8735678ed315134059d9a10fbe4ba44b761589e1
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikimediaEvents
Gerrit-Branch: master
Gerrit-Owner: EBernhardson
Gerrit-Reviewer: Jdrewniak
Gerrit-Reviewer: MaxSem
Gerrit-Reviewer: Smalyshev
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] labs...ZppixBot[master]: Add myself to contributers for ZppixBot
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/370523 ) Change subject: Add myself to contributers for ZppixBot .. Add myself to contributers for ZppixBot Change-Id: Ib95ca903bfb0dab1ed63b161ea69aefdc3273887 --- M public_html/contribs.php 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Zppix: Looks good to me, approved jenkins-bot: Verified diff --git a/public_html/contribs.php b/public_html/contribs.php index 621f805..e3c0fcf 100644 --- a/public_html/contribs.php +++ b/public_html/contribs.php @@ -2,3 +2,4 @@ Zppix- Operator tom29739- Release version bot operator, developer SwisterTwister- Zppixbot web design, and friend. +Reception123 - Helps with new features -- To view, visit https://gerrit.wikimedia.org/r/370523 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ib95ca903bfb0dab1ed63b161ea69aefdc3273887 Gerrit-PatchSet: 1 Gerrit-Project: labs/tools/ZppixBot Gerrit-Branch: master Gerrit-Owner: Reception123 Gerrit-Reviewer: Zppix Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...WikimediaEvents[master]: Update relevance survey to 60s, and bump schema rev id
EBernhardson has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/370531 )
Change subject: Update relevance survey to 60s, and bump schema rev id
..
Update relevance survey to 60s, and bump schema rev id
* The survey was supposed to be presented after 60s, but was mistakenly
presented after 60ms. Fix that to hopefully reduce the noise in the
survey.
* The schema mistakenly had "i don't know" as an enum for the choice
parameter, when it should have been "unsure" to match the i18n keys.
Update schema with a new version that has the correct enum.
Bug: T171741
Change-Id: I8735678ed315134059d9a10fbe4ba44b761589e1
---
M extension.json
M modules/ext.wikimediaEvents.humanSearchRelevance.js
2 files changed, 2 insertions(+), 2 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikimediaEvents
refs/changes/31/370531/1
diff --git a/extension.json b/extension.json
index cd0ca67..22f3a14 100644
--- a/extension.json
+++ b/extension.json
@@ -154,7 +154,7 @@
"schema.HumanSearchRelevance": {
"class": "ResourceLoaderSchemaModule",
"schema": "HumanSearchRelevance",
- "revision": 17069968
+ "revision": 17073843
},
"ext.wikimediaEvents": {
"scripts": [
diff --git a/modules/ext.wikimediaEvents.humanSearchRelevance.js
b/modules/ext.wikimediaEvents.humanSearchRelevance.js
index 4410588..7ac 100644
--- a/modules/ext.wikimediaEvents.humanSearchRelevance.js
+++ b/modules/ext.wikimediaEvents.humanSearchRelevance.js
@@ -306,6 +306,6 @@
// TODO: We probably want to vary this 60s for some AB tests, to see if
the quality
// of human grades varies depending on how long we wait.
- setTimeout( askQuestion, 60 );
+ setTimeout( askQuestion, 6 );
}( mediaWiki, jQuery ) );
--
To view, visit https://gerrit.wikimedia.org/r/370531
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I8735678ed315134059d9a10fbe4ba44b761589e1
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikimediaEvents
Gerrit-Branch: master
Gerrit-Owner: EBernhardson
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: discovery-stats user should be a member of wikidev group
Gehel has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/370530 ) Change subject: discovery-stats user should be a member of wikidev group .. discovery-stats user should be a member of wikidev group Since Admin::Groupmembers seems to check only secondary groups, defining the primariy group of discovery-stats as wikidev should make things work as expected. Bug: T172740 Change-Id: I95e6f4f91a7b9969268efaa22f84eea38bcd7d52 --- M modules/statistics/manifests/discovery.pp 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/30/370530/1 diff --git a/modules/statistics/manifests/discovery.pp b/modules/statistics/manifests/discovery.pp index 94dec47..fcc5474 100644 --- a/modules/statistics/manifests/discovery.pp +++ b/modules/statistics/manifests/discovery.pp @@ -22,7 +22,7 @@ shell => '/bin/bash', managehome => false, system => true, -groups => $group, +gid=> $group, } # This file will render at -- To view, visit https://gerrit.wikimedia.org/r/370530 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I95e6f4f91a7b9969268efaa22f84eea38bcd7d52 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Gehel ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: tools-clush-*: move to python-2
Andrew Bogott has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/370522 ) Change subject: tools-clush-*: move to python-2 .. tools-clush-*: move to python-2 These had python3 in their #! line but don't seem to use any specific python3 features. These tools load openstack libraries which are not available for python3 in Liberty or in the normal Jessie repos. Change-Id: I6171a7bab5a708574c87de3dd7859769c152f8cd --- M modules/role/files/toollabs/clush/tools-clush-generator M modules/role/files/toollabs/clush/tools-clush-interpreter 2 files changed, 2 insertions(+), 2 deletions(-) Approvals: Andrew Bogott: Looks good to me, approved Rush: Looks good to me, but someone else must approve jenkins-bot: Verified diff --git a/modules/role/files/toollabs/clush/tools-clush-generator b/modules/role/files/toollabs/clush/tools-clush-generator index 1607855..0cabe16 100644 --- a/modules/role/files/toollabs/clush/tools-clush-generator +++ b/modules/role/files/toollabs/clush/tools-clush-generator @@ -1,4 +1,4 @@ -#!/usr/bin/python3 +#!/usr/bin/python """ Simple script that generates a YAML file classifying all instances on the tools project into groups based on the role they perform. diff --git a/modules/role/files/toollabs/clush/tools-clush-interpreter b/modules/role/files/toollabs/clush/tools-clush-interpreter index c2fb0a3..10018f3 100644 --- a/modules/role/files/toollabs/clush/tools-clush-interpreter +++ b/modules/role/files/toollabs/clush/tools-clush-interpreter @@ -1,4 +1,4 @@ -#!/usr/bin/python3 +#!/usr/bin/python import yaml import argparse -- To view, visit https://gerrit.wikimedia.org/r/370522 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I6171a7bab5a708574c87de3dd7859769c152f8cd Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Andrew Bogott Gerrit-Reviewer: Andrew Bogott Gerrit-Reviewer: Giuseppe Lavagetto Gerrit-Reviewer: Rush Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...MobileFrontend[master]: Hygiene: Stop using deprecated setWarning and dieUsage
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/369650 )
Change subject: Hygiene: Stop using deprecated setWarning and dieUsage
..
Hygiene: Stop using deprecated setWarning and dieUsage
Changes:
- removed setWarning() calls
- removed dieUsage() calls
- removed unused imports
- bump required MediaWiki version to 1.29 as addWarning is
available since 1.29
Bug: T166714
Change-Id: I10369458e51e3b2d4694fa241e9cc2e3b23d83ed
---
M extension.json
M includes/api/ApiMobileView.php
2 files changed, 13 insertions(+), 43 deletions(-)
Approvals:
jenkins-bot: Verified
Jdlrobson: Looks good to me, approved
diff --git a/extension.json b/extension.json
index 029eb2d..3807daf 100644
--- a/extension.json
+++ b/extension.json
@@ -18,7 +18,7 @@
"license-name": "GPL-2.0+",
"type": "other",
"requires": {
- "MediaWiki": ">= 1.27.0"
+ "MediaWiki": ">= 1.29.0"
},
"callback": "MobileFrontendHooks::onRegistration",
"ConfigRegistry": {
diff --git a/includes/api/ApiMobileView.php b/includes/api/ApiMobileView.php
index c4e357c..40d2b63 100644
--- a/includes/api/ApiMobileView.php
+++ b/includes/api/ApiMobileView.php
@@ -109,11 +109,8 @@
$this->mainPage = $this->isMainPage( $title );
if ( $this->mainPage && $this->noHeadings ) {
$this->noHeadings = false;
- if ( is_callable( [ $this, 'addWarning' ] ) ) {
- $this->addWarning(
'apiwarn-mobilefrontend-ignoringnoheadings', 'ignoringnoheadings' );
- } else {
- $this->setWarning( "``noheadings'' makes no
sense on the main page, ignoring" );
- }
+ $this->addWarning(
'apiwarn-mobilefrontend-ignoringnoheadings', 'ignoringnoheadings' );
+
}
if ( isset( $prop['normalizedtitle'] ) &&
$title->getPrefixedText() != $params['page'] ) {
$resultObj->addValue( null, $moduleName,
@@ -256,15 +253,11 @@
);
}
if ( count( $missingSections ) && isset( $prop['text'] ) ) {
- if ( is_callable( [ $this, 'addWarning' ] ) ) {
- $this->addWarning( [
-
'apiwarn-mobilefrontend-sectionsnotfound',
- Message::listParam( $missingSections ),
- count( $missingSections )
- ], 'sectionsnotfound' );
- } else {
- $this->setWarning( 'Section(s) ' . implode( ',
', $missingSections ) . ' not found' );
- }
+ $this->addWarning( [
+ 'apiwarn-mobilefrontend-sectionsnotfound',
+ Message::listParam( $missingSections ),
+ count( $missingSections )
+ ], 'sectionsnotfound' );
}
if ( $this->maxlen < 0 ) {
// There is more data available
@@ -295,21 +288,13 @@
protected function makeTitle( $name ) {
$title = Title::newFromText( $name );
if ( !$title ) {
- if ( is_callable( [ $this, 'dieWithError' ] ) ) {
- $this->dieWithError( [ 'apierror-invalidtitle',
wfEscapeWikiText( $name ) ] );
- } else {
- $this->dieUsageMsg( [ 'invalidtitle', $name ] );
- }
+ $this->dieWithError( [ 'apierror-invalidtitle',
wfEscapeWikiText( $name ) ] );
}
if ( $title->inNamespace( NS_FILE ) ) {
$this->file = $this->findFile( $title );
}
if ( !$title->exists() && !$this->file ) {
- if ( is_callable( [ $this, 'dieWithError' ] ) ) {
- $this->dieWithError( [ 'apierror-missingtitle'
] );
- } else {
- $this->dieUsageMsg( [ 'notanarticle' ] );
- }
+ $this->dieWithError( [ 'apierror-missingtitle' ] );
}
return $title;
}
@@ -585,11 +570,7 @@
if ( !$latest ) {
//
https://bugzilla.wikimedia.org/show_bug.cgi?id=53378
// Title::exists() above doesn't seem to always
catch recently deleted pages
- if ( is_callable( [ $this, 'dieWithError' ] ) )
{
- $this->dieWithError( [
'apierror-missingtitle' ] );
-
[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Make frwiki main page take up the full screen
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/357637 )
Change subject: Make frwiki main page take up the full screen
..
Make frwiki main page take up the full screen
Adds a @media query from frwiki's Common.css that prevents content from
being split into right and left panes when the screen width is <= 981px.
Change-Id: I6839c14c9ceb9ea24b40887b404b2dfa41463ad8
Depends-On: I94589150c9ca3b77cc6ed62a8b825aa82ecd4c7e
Bug: T167307
---
M app/src/main/assets/styles.css
1 file changed, 16 insertions(+), 5 deletions(-)
Approvals:
Dbrant: Looks good to me, approved
jenkins-bot: Verified
diff --git a/app/src/main/assets/styles.css b/app/src/main/assets/styles.css
index 597a9a9..30ccd83 100644
--- a/app/src/main/assets/styles.css
+++ b/app/src/main/assets/styles.css
@@ -691,32 +691,32 @@
vertical-align: top;
display: inline-block;
}
-
+
ul.gallery,
li.gallerybox {
zoom: 1;
*display: inline;
}
-
+
ul.gallery {
margin: 2px;
padding: 2px;
display: block;
}
-
+
li.gallerycaption {
font-weight: bold;
text-align: center;
display: block;
word-wrap: break-word;
}
-
+
li.gallerybox div.thumb {
text-align: center;
border: 1px solid #ccc;
margin: 2px;
}
-
+
div.gallerytext {
overflow: hidden;
font-size: 94%;
@@ -1318,6 +1318,17 @@
overflow: hidden;
}
+@media screen and (max-width: 981px) {
+ .portail-gauche,
+ .portail-droite {
+float: none;
+width: auto !important;
+ }
+ .portail-gauche-inner {
+padding-right: 0;
+ }
+}
+
h2.section_heading {
padding: 20px 0 10px;
margin-bottom: 0;
--
To view, visit https://gerrit.wikimedia.org/r/357637
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I6839c14c9ceb9ea24b40887b404b2dfa41463ad8
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Mholloway
Gerrit-Reviewer: Brion VIBBER
Gerrit-Reviewer: Dbrant
Gerrit-Reviewer: Niedzielski
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: RCFilters: preserve invert parameter in saved queries
Sbisson has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/370526 )
Change subject: RCFilters: preserve invert parameter in saved queries
..
RCFilters: preserve invert parameter in saved queries
Bug: T172635
Change-Id: I9d8f6e2eccad8ea11a1fba8c4bbceccc1711fb75
---
M resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/26/370526/1
diff --git a/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
b/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
index 31effe1..0085bd6 100644
--- a/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
+++ b/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
@@ -826,7 +826,7 @@
* @return {Object} Minimal filters and highlights list
*/
mw.rcfilters.Controller.prototype._getMinimalFilterList = function (
valuesObject ) {
- var result = { filters: {}, highlights: {} },
+ var result = { filters: {}, highlights: {}, invert:
valuesObject.invert },
baseState = this._getBaseFilterState();
// XOR results
--
To view, visit https://gerrit.wikimedia.org/r/370526
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I9d8f6e2eccad8ea11a1fba8c4bbceccc1711fb75
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Sbisson
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Remove unneeded Parsoid styles
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/370116 )
Change subject: Remove unneeded Parsoid styles
..
Remove unneeded Parsoid styles
These appear no longer necessary due to upstream changes.
Depends-On: I25e22594c12b6ac4001cd6ef4731155cbaa03ab9
Change-Id: I5d6425e9e42fbfde1fc28c129d6a5a98ed527d62
---
M app/src/main/assets/preview.css
M app/src/main/assets/styles.css
2 files changed, 10 insertions(+), 42 deletions(-)
Approvals:
Dbrant: Looks good to me, approved
jenkins-bot: Verified
diff --git a/app/src/main/assets/preview.css b/app/src/main/assets/preview.css
index e1f419f..a66aaee 100644
--- a/app/src/main/assets/preview.css
+++ b/app/src/main/assets/preview.css
@@ -706,31 +706,31 @@
vertical-align: top;
display: inline-block;
}
-
+
ul.gallery,
li.gallerybox {
zoom: 1;
*display: inline;
}
-
+
ul.gallery {
margin: 2px;
padding: 2px;
display: block;
}
-
+
li.gallerycaption {
font-weight: bold;
text-align: center;
display: block;
word-wrap: break-word;
}
-
+
li.gallerybox div.thumb {
background-color: #fff;
border: 1px solid #ccc;
}
-
+
div.gallerytext {
overflow: hidden;
font-size: 10pt;
@@ -936,26 +936,10 @@
display: none;
}
-.content figure {
- max-width: 100%;
- -webkit-margin-before: 0 !important;
- -webkit-margin-after: 0 !important;
- -webkit-margin-start: 0 !important;
- -webkit-margin-end: 0 !important;
-}
.content figure img,
.content figure video {
margin: 0.6em auto 0.6em auto;
display: block;
- clear: both;
-}
-.content figcaption {
- margin: 0.5em 0 0;
- font-size: 0.8em;
- line-height: 1.5;
- padding: 0 !important;
- color: #555;
- width: auto !important;
}/* FIXME: Copied over from
http://en.wikipedia.org/w/index.php?title=MediaWiki:Mobile.css&oldid=609508028
This fixes some styling issues in the app, primarily hlists.
Eventually fix this by supporting loading Mobile.css in the app
diff --git a/app/src/main/assets/styles.css b/app/src/main/assets/styles.css
index efacc33..0b6c275 100644
--- a/app/src/main/assets/styles.css
+++ b/app/src/main/assets/styles.css
@@ -706,31 +706,31 @@
vertical-align: top;
display: inline-block;
}
-
+
ul.gallery,
li.gallerybox {
zoom: 1;
*display: inline;
}
-
+
ul.gallery {
margin: 2px;
padding: 2px;
display: block;
}
-
+
li.gallerycaption {
font-weight: bold;
text-align: center;
display: block;
word-wrap: break-word;
}
-
+
li.gallerybox div.thumb {
background-color: #fff;
border: 1px solid #ccc;
}
-
+
div.gallerytext {
overflow: hidden;
font-size: 10pt;
@@ -1329,26 +1329,10 @@
display: none;
}
-.content figure {
- max-width: 100%;
- -webkit-margin-before: 0 !important;
- -webkit-margin-after: 0 !important;
- -webkit-margin-start: 0 !important;
- -webkit-margin-end: 0 !important;
-}
.content figure img,
.content figure video {
margin: 0.6em auto 0.6em auto;
display: block;
- clear: both;
-}
-.content figcaption {
- margin: 0.5em 0 0;
- font-size: 0.8em;
- line-height: 1.5;
- padding: 0 !important;
- color: #555;
- width: auto !important;
}/**
* Style Parsoid HTML+RDFa output consistent with wikitext from PHP parser.
*/
--
To view, visit https://gerrit.wikimedia.org/r/370116
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I5d6425e9e42fbfde1fc28c129d6a5a98ed527d62
Gerrit-PatchSet: 3
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Mholloway
Gerrit-Reviewer: Brion VIBBER
Gerrit-Reviewer: Dbrant
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...UIFeedback[master]: Add missing qqq message documentation
Umherirrender has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/370525 ) Change subject: Add missing qqq message documentation .. Add missing qqq message documentation Removed three messages from en.json, because not found in code Removed one message from qqq.json, because not found a en.json key Change-Id: I657a511edcc599652ad1ad47a68567c8bdee5d55 --- M UIFeedback.php M i18n/en.json M i18n/qqq.json 3 files changed, 6 insertions(+), 7 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/UIFeedback refs/changes/25/370525/1 diff --git a/UIFeedback.php b/UIFeedback.php index 83eaebb..18ff1b8 100644 --- a/UIFeedback.php +++ b/UIFeedback.php @@ -77,8 +77,6 @@ 'ui-feedback-done-label', - 'ui-feedback-good-label', - 'ui-feedback-bad-label', 'ui-feedback-comment-label', 'ui-feedback-happened-label', @@ -103,7 +101,6 @@ 'ui-feedback-problem-send', 'ui-feedback-problem-reset', - 'ui-feedback-problem-close', 'ui-feedback-problem-cancel', 'ui-feedback-yes', diff --git a/i18n/en.json b/i18n/en.json index 0f027c0..140d14f 100644 --- a/i18n/en.json +++ b/i18n/en.json @@ -18,8 +18,6 @@ "ui-feedback-task-6": "search", "ui-feedback-task-7": "other:", "ui-feedback-done-label": "Were you able to complete your task?", - "ui-feedback-good-label": "What happened while you were editing?", - "ui-feedback-bad-label": "What behavior have you been expecting?", "ui-feedback-comment-label": "Please give us some more details:", "ui-feedback-happened-label": "Tell us what happened:", "ui-feedback-happened-1": "Something did not work as expected", @@ -42,7 +40,6 @@ "ui-feedback-no": "no", "ui-feedback-problem-reset": "reset", "ui-feedback-problem-send": "send", - "ui-feedback-problem-close": "close", "ui-feedback-problem-cancel": "cancel", "ui-feedback-highlight-label": "Click and drag an area to help us, to understand your feedback:", "ui-feedback-yellow": "Highlight areas that are relevant.", diff --git a/i18n/qqq.json b/i18n/qqq.json index 2ffb7fc..e5c3663 100644 --- a/i18n/qqq.json +++ b/i18n/qqq.json @@ -9,6 +9,7 @@ "ui-feedback-headline": "headline of the pop-up window showing the questionnaire", "ui-feedback-scr-headline": "headline of the pop-up window showing the screenshot method", "ui-feedback-task-label": "label of the following drop-down-list asking for which one of the functions provided by Wikidata the user was attending to do on the Website", + "ui-feedback-task-0": "element #0, the default entry", "ui-feedback-task-1": "element #1 saying the user wanted to add or edit an item", "ui-feedback-task-2": "element #2 saying the user wanted to add or edit the label", "ui-feedback-task-3": "element #3 saying the user wanted to add or edit the description", @@ -30,7 +31,11 @@ "ui-feedback-anonym-help": "tooltip of the label on its left telling the user is able to not give notice of the username, but in that case it is impossible to keep him updated on the reported issue", "ui-feedback-notify-label": "lable of the checkbox on it's left saying that the user is willing to get updates on the revision of his/ her reported issue", "ui-feedback-notify-help": "tooltip of the label on its left telling that the user will be informed on his/ her userpage as soon as somebody is working on the reported issue", + "ui-feedback-notify-sent": "notification to share feedback", "ui-feedback-notify-postedit": "notification after an edit in wikidata was made to share feedback", + "ui-feedback-notify-upload-sent": "notification after an upload was made to share feedback", + "ui-feedback-notify-upload-fail": "notification after an upload was failed to share feedback", + "ui-feedback-notify-upload-progress": "notification will an upload is in progress to share feedback", "ui-feedback-yes": "label of the left of two radio buttons saying 'yes' to approve", "ui-feedback-no": "label of the right of two label buttons saying 'no' to deny", "ui-feedback-problem-reset": "label of the left button at the bottom of the window to reset the form to its blank state", @@ -39,6 +44,7 @@ "ui-feedback-highlight-label": "challenge description of the two following radio buttons telling that the user can draw areas by click and drag to support the comprehensibility of the feedback report", "ui-feedback-yellow": "label of the radio button on its left to choose this one if the user wants to point out the interface elements referred to the report", "ui-feedback-black": "label of the radio button on its le
[MediaWiki-commits] [Gerrit] wikimedia...crm[deployment]: Merge branch 'master' into deployment
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/370521 ) Change subject: Merge branch 'master' into deployment .. Merge branch 'master' into deployment 130cb0bfd Set source fields correctly Change-Id: Ie69c1c9469e4e8a8841d0cad4e5a0e8de9a0e2b9 --- 0 files changed, 0 insertions(+), 0 deletions(-) Approvals: jenkins-bot: Verified Ejegg: Looks good to me, approved -- To view, visit https://gerrit.wikimedia.org/r/370521 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ie69c1c9469e4e8a8841d0cad4e5a0e8de9a0e2b9 Gerrit-PatchSet: 1 Gerrit-Project: wikimedia/fundraising/crm Gerrit-Branch: deployment Gerrit-Owner: Ejegg Gerrit-Reviewer: Ejegg Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...MobileApp[master]: Let frwiki main page take up the full screen on smaller screens
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/357636 )
Change subject: Let frwiki main page take up the full screen on smaller screens
..
Let frwiki main page take up the full screen on smaller screens
Adds a @media query from frwiki's Common.css that prevents content from
being split into right and left panes when the screen width is <= 981px.
Bug: T167307
Depends-On: Ib7f0bd15dd0a9255e1e5140907e800478b658b92
Change-Id: I94589150c9ca3b77cc6ed62a8b825aa82ecd4c7e
---
M extension.json
A styles/frwiki.less
2 files changed, 13 insertions(+), 0 deletions(-)
Approvals:
Dbrant: Looks good to me, approved
jenkins-bot: Verified
diff --git a/extension.json b/extension.json
index 6c9120a..d563140 100644
--- a/extension.json
+++ b/extension.json
@@ -24,6 +24,7 @@
"styles": [
"styles/disambig.less",
"styles/enwiki.less",
+ "styles/frwiki.less",
"styles/headers.less",
"styles/issues.less",
"styles/android/loading.less",
diff --git a/styles/frwiki.less b/styles/frwiki.less
new file mode 100644
index 000..980369c
--- /dev/null
+++ b/styles/frwiki.less
@@ -0,0 +1,12 @@
+// Copied from
https://fr.m.wikipedia.org/wiki/MediaWiki:Common.css&oldid=137958647
+// https://phabricator.wikimedia.org/T165307
+@media screen and ( max-width: 981px ) {
+ .portail-gauche,
+ .portail-droite {
+ float: none;
+ width: auto !important;
+ }
+ .portail-gauche-inner {
+ padding-right: 0;
+ }
+}
--
To view, visit https://gerrit.wikimedia.org/r/357636
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I94589150c9ca3b77cc6ed62a8b825aa82ecd4c7e
Gerrit-PatchSet: 5
Gerrit-Project: mediawiki/extensions/MobileApp
Gerrit-Branch: master
Gerrit-Owner: Mholloway
Gerrit-Reviewer: Dbrant
Gerrit-Reviewer: Fjalapeno
Gerrit-Reviewer: Mholloway
Gerrit-Reviewer: Mhurd
Gerrit-Reviewer: Niedzielski
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...MobileApp[master]: Remove unneeded Parsoid styles
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/370115 )
Change subject: Remove unneeded Parsoid styles
..
Remove unneeded Parsoid styles
These appear no longer necessary due to upstream changes.
Change-Id: I25e22594c12b6ac4001cd6ef4731155cbaa03ab9
---
M styles/android/parsoid.less
1 file changed, 0 insertions(+), 18 deletions(-)
Approvals:
Dbrant: Looks good to me, approved
jenkins-bot: Verified
diff --git a/styles/android/parsoid.less b/styles/android/parsoid.less
index e35b5e4..54284e6 100644
--- a/styles/android/parsoid.less
+++ b/styles/android/parsoid.less
@@ -1,25 +1,7 @@
-// Copied some styles from minerva with different selectors since Parsoid uses
different elements for thumbnails
-// see
../../MobileFrontend/resources/skins.minerva.content.styles/thumbnails.less
.content figure {
- max-width: 100%;
- -webkit-margin-before: 0 !important;
- -webkit-margin-after: 0 !important;
- -webkit-margin-start: 0 !important;
- -webkit-margin-end: 0 !important;
-
img,
video {
margin: 0.6em auto 0.6em auto;
display: block;
- clear: both;
}
-}
-
-.content figcaption {
- margin: 0.5em 0 0;
- font-size: 0.8em;
- line-height: 1.5;
- padding: 0 !important;
- color: #555;
- width: auto !important;
}
--
To view, visit https://gerrit.wikimedia.org/r/370115
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I25e22594c12b6ac4001cd6ef4731155cbaa03ab9
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/MobileApp
Gerrit-Branch: master
Gerrit-Owner: Mholloway
Gerrit-Reviewer: Dbrant
Gerrit-Reviewer: Fjalapeno
Gerrit-Reviewer: Mholloway
Gerrit-Reviewer: Mhurd
Gerrit-Reviewer: Niedzielski
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Split yes-no strings used in dialog box questions into separ...
Jcasariego has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/370524 )
Change subject: Split yes-no strings used in dialog box questions into separate
strings tags
..
Split yes-no strings used in dialog box questions into separate strings tags
Currently, the yes-no strings in the Android app are used to confirm the
following dialog box questions:
- "This saved page may be out of date, and must be refreshed for editing to be
enabled. Would you like to refresh the page?"
- "The page has been modified. Are you sure you want to exit without saving
your changes?"
- "This will delete all of your browsing history, and close any currently open
tabs. Are you sure?"
- "Are you sure you want to cancel downloading this compilation?"
- "Are you sure you want to close all tabs?"
- "Are you sure you want to clear your search history?"
- "This will delete any previously synced reading lists from remote storage.
Proceed?"
These are the places where new tags were created for the yes-no string.
Bug: T69628
Change-Id: I620d5646a03a0744feab552a8bf3ae04c73de1b3
---
M app/src/main/java/org/wikipedia/edit/EditHandler.java
M app/src/main/java/org/wikipedia/edit/EditSectionActivity.java
M app/src/main/java/org/wikipedia/history/HistoryFragment.java
M app/src/main/java/org/wikipedia/offline/CompilationDownloadControlView.java
M app/src/main/java/org/wikipedia/page/tabs/TabsProvider.java
M app/src/main/java/org/wikipedia/search/RecentSearchesFragment.java
M app/src/main/java/org/wikipedia/settings/SettingsPreferenceLoader.java
M app/src/main/res/values-qq/strings.xml
M app/src/main/res/values/strings.xml
9 files changed, 44 insertions(+), 19 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia
refs/changes/24/370524/1
diff --git a/app/src/main/java/org/wikipedia/edit/EditHandler.java
b/app/src/main/java/org/wikipedia/edit/EditHandler.java
index 203f456..ef0cef8 100644
--- a/app/src/main/java/org/wikipedia/edit/EditHandler.java
+++ b/app/src/main/java/org/wikipedia/edit/EditHandler.java
@@ -72,13 +72,13 @@
new AlertDialog.Builder(fragment.getActivity())
.setCancelable(false)
.setMessage(R.string.edit_saved_page_refresh)
-.setPositiveButton(android.R.string.yes, new
DialogInterface.OnClickListener() {
+
.setPositiveButton(R.string.edit_saved_page_refresh_yes, new
DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface
dialogInterface, int i) {
fragment.refreshPage();
}
})
-.setNegativeButton(android.R.string.no, new
DialogInterface.OnClickListener() {
+
.setNegativeButton(R.string.edit_saved_page_refresh_no, new
DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface
dialogInterface, int i) {
dialogInterface.dismiss();
diff --git a/app/src/main/java/org/wikipedia/edit/EditSectionActivity.java
b/app/src/main/java/org/wikipedia/edit/EditSectionActivity.java
index 01f2313..9e0edb1 100644
--- a/app/src/main/java/org/wikipedia/edit/EditSectionActivity.java
+++ b/app/src/main/java/org/wikipedia/edit/EditSectionActivity.java
@@ -718,14 +718,14 @@
if (sectionTextModified) {
AlertDialog.Builder alert = new AlertDialog.Builder(this);
alert.setMessage(getString(R.string.edit_abandon_confirm));
-alert.setPositiveButton(getString(R.string.yes), new
DialogInterface.OnClickListener() {
+
alert.setPositiveButton(getString(R.string.edit_abandon_confirm_yes), new
DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int id) {
dialog.dismiss();
finish();
}
});
-alert.setNegativeButton(getString(R.string.no), new
DialogInterface.OnClickListener() {
+
alert.setNegativeButton(getString(R.string.edit_abandon_confirm_no), new
DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int id) {
dialog.dismiss();
diff --git a/app/src/main/java/org/wikipedia/history/HistoryFragment.java
b/app/src/main/java/org/wikipedia/history/HistoryFragment.java
index 8d2fd26..083c83d 100644
--- a/app/src/main/java/org/wikipedia/history/HistoryFragment.java
+++ b/app/src/main/java/org/wikipedia/history/HistoryFragment.java
@@ -176,7 +176,7 @@
new AlertDialog.Builder(getContext())
.setTitle(R.string.dialog_title_clear_history)
[MediaWiki-commits] [Gerrit] labs...ZppixBot[master]: Add myself to contributers for ZppixBot
Reception123 has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/370523 ) Change subject: Add myself to contributers for ZppixBot .. Add myself to contributers for ZppixBot Change-Id: Ib95ca903bfb0dab1ed63b161ea69aefdc3273887 --- M public_html/contribs.php 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/labs/tools/ZppixBot refs/changes/23/370523/1 diff --git a/public_html/contribs.php b/public_html/contribs.php index 621f805..e3c0fcf 100644 --- a/public_html/contribs.php +++ b/public_html/contribs.php @@ -2,3 +2,4 @@ Zppix- Operator tom29739- Release version bot operator, developer SwisterTwister- Zppixbot web design, and friend. +Reception123 - Helps with new features -- To view, visit https://gerrit.wikimedia.org/r/370523 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib95ca903bfb0dab1ed63b161ea69aefdc3273887 Gerrit-PatchSet: 1 Gerrit-Project: labs/tools/ZppixBot Gerrit-Branch: master Gerrit-Owner: Reception123 ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] pywikibot/core[master]: add hiwikiversity to pywikibot
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/370473 ) Change subject: add hiwikiversity to pywikibot .. add hiwikiversity to pywikibot Bug: T172695 Change-Id: Ic038e5005a6ac5196b8a82ca55b803af9280b4ae --- M pywikibot/families/wikiversity_family.py 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Mpaa: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/families/wikiversity_family.py b/pywikibot/families/wikiversity_family.py index 4b3e8fc..24b85e2 100644 --- a/pywikibot/families/wikiversity_family.py +++ b/pywikibot/families/wikiversity_family.py @@ -23,7 +23,7 @@ """Constructor.""" self.languages_by_size = [ 'de', 'en', 'fr', 'ru', 'cs', 'it', 'beta', 'pt', 'es', 'ar', 'sv', -'fi', 'sl', 'el', 'ja', 'ko', +'fi', 'sl', 'el', 'ja', 'ko', 'hi', ] super(Family, self).__init__() -- To view, visit https://gerrit.wikimedia.org/r/370473 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ic038e5005a6ac5196b8a82ca55b803af9280b4ae Gerrit-PatchSet: 3 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Jayprakash12345 <0freerunn...@gmail.com> Gerrit-Reviewer: Framawiki Gerrit-Reviewer: Magul Gerrit-Reviewer: Mpaa Gerrit-Reviewer: Xqt Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: tools-clush-*: move to python-2
Andrew Bogott has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/370522 ) Change subject: tools-clush-*: move to python-2 .. tools-clush-*: move to python-2 These had python3 in their #! line but don't seem to use any specific python3 features. These tools load openstack libraries which are not available for python3 in Liberty or in the normal Jessie repos. Change-Id: I6171a7bab5a708574c87de3dd7859769c152f8cd --- M modules/role/files/toollabs/clush/tools-clush-generator M modules/role/files/toollabs/clush/tools-clush-interpreter 2 files changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/22/370522/1 diff --git a/modules/role/files/toollabs/clush/tools-clush-generator b/modules/role/files/toollabs/clush/tools-clush-generator index 1607855..0cabe16 100644 --- a/modules/role/files/toollabs/clush/tools-clush-generator +++ b/modules/role/files/toollabs/clush/tools-clush-generator @@ -1,4 +1,4 @@ -#!/usr/bin/python3 +#!/usr/bin/python """ Simple script that generates a YAML file classifying all instances on the tools project into groups based on the role they perform. diff --git a/modules/role/files/toollabs/clush/tools-clush-interpreter b/modules/role/files/toollabs/clush/tools-clush-interpreter index c2fb0a3..10018f3 100644 --- a/modules/role/files/toollabs/clush/tools-clush-interpreter +++ b/modules/role/files/toollabs/clush/tools-clush-interpreter @@ -1,4 +1,4 @@ -#!/usr/bin/python3 +#!/usr/bin/python import yaml import argparse -- To view, visit https://gerrit.wikimedia.org/r/370522 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I6171a7bab5a708574c87de3dd7859769c152f8cd Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Andrew Bogott ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] wikimedia...crm[deployment]: Merge branch 'master' into deployment
Ejegg has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/370521 ) Change subject: Merge branch 'master' into deployment .. Merge branch 'master' into deployment 130cb0bfd Set source fields correctly Change-Id: Ie69c1c9469e4e8a8841d0cad4e5a0e8de9a0e2b9 --- 0 files changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm refs/changes/21/370521/1 -- To view, visit https://gerrit.wikimedia.org/r/370521 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie69c1c9469e4e8a8841d0cad4e5a0e8de9a0e2b9 Gerrit-PatchSet: 1 Gerrit-Project: wikimedia/fundraising/crm Gerrit-Branch: deployment Gerrit-Owner: Ejegg ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] wikimedia...tools[master]: PayPal audit: check for existing recurring donations
Ejegg has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/370520 )
Change subject: PayPal audit: check for existing recurring donations
..
PayPal audit: check for existing recurring donations
Bug: T172723
Change-Id: I1009e554581a972251675701a3896d256f6d33f3
---
M audit/paypal/TrrFile.py
M audit/paypal/tests/test_trr_file.py
2 files changed, 23 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/tools
refs/changes/20/370520/1
diff --git a/audit/paypal/TrrFile.py b/audit/paypal/TrrFile.py
index 2b1e851..54b64e9 100644
--- a/audit/paypal/TrrFile.py
+++ b/audit/paypal/TrrFile.py
@@ -187,9 +187,10 @@
log.info("-Unknown\t{id}\t{date}\t(Type
{type})".format(id=out['gateway_txn_id'], date=out['date'], type=event_type))
return
-if queue == 'donations' and
self.crm.transaction_exists(gateway_txn_id=out['gateway_txn_id'],
gateway=out['gateway']):
-
log.info("-Duplicate\t{id}\t{date}\t{type}".format(id=out['gateway_txn_id'],
date=row['Transaction Initiation Date'], type=queue))
-return
+if queue == 'donations' or queue == 'recurring':
+if
self.crm.transaction_exists(gateway_txn_id=out['gateway_txn_id'],
gateway=out['gateway']):
+
log.info("-Duplicate\t{id}\t{date}\t{type}".format(id=out['gateway_txn_id'],
date=row['Transaction Initiation Date'], type=queue))
+return
if queue == 'refund' and
self.crm.transaction_refunded(gateway_txn_id=out['gateway_parent_id'],
gateway=out['gateway']):
log.info("-Duplicate\t{id}\t{date}\t{type}".format(id=out['gateway_txn_id'],
date=row['Transaction Initiation Date'], type=queue))
diff --git a/audit/paypal/tests/test_trr_file.py
b/audit/paypal/tests/test_trr_file.py
index 9b15ca8..35155d0 100644
--- a/audit/paypal/tests/test_trr_file.py
+++ b/audit/paypal/tests/test_trr_file.py
@@ -281,3 +281,22 @@
expected = {'last_name': 'Man', 'txn_type': 'subscr_payment',
'thankyou_date': 0, 'city': '', 'payment_method': '', 'gateway_status': 'S',
'currency': 'USD', 'postal_code': '', 'date': 1474743301, 'subscr_id':
'3GJH3GJ3334214812', 'gateway': 'paypal', 'state_province': '', 'gross': 0.1,
'first_name': 'Banana', 'fee': 0.55, 'gateway_txn_id': 'AS7D98AS7D9A8S7D9AS',
'country': '', 'payment_submethod': '', 'note': '', 'supplemental_address_1':
'', 'settled_date': 1474743301, 'email': 'pranks...@anonymous.net',
'street_address': '', 'contribution_tracking_id': '1234567', 'order_id':
'1234567'}
actual = args[0][1]
nose.tools.assert_equals(expected, actual)
+
+
+@patch("queue.redis_wrap.Redis")
+@patch("civicrm.civicrm.Civicrm")
+@patch("process.globals")
+def test_recurring(MockGlobals, MockCivicrm, MockRedis):
+'''
+Test that we don't send duplicate recurring messages
+'''
+MockCivicrm().transaction_exists.return_value = True
+
+row = get_recurring_row()
+parser = audit.paypal.TrrFile.TrrFile("dummy_path")
+
+parser.parse_line(row)
+
+# Did we send it?
+args = MockRedis().send.call_args
+nose.tools.assert_equals(None, args)
--
To view, visit https://gerrit.wikimedia.org/r/370520
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I1009e554581a972251675701a3896d256f6d33f3
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/tools
Gerrit-Branch: master
Gerrit-Owner: Ejegg
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: Phabricator: Install package heirloom-mailx for mail command
Paladox has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/370518 ) Change subject: Phabricator: Install package heirloom-mailx for mail command .. Phabricator: Install package heirloom-mailx for mail command this is required so we can do mail -r otherwise the -r command is unavailable. root@phabricator:/home/paladox# mail -r mail: option requires an argument -- r Usage: mail -eiIUdEFntBDNHRV~ -T FILE -u USER -h hops -r address -s SUBJECT -a FILE -q FILE -f FILE -A ACCOUNT -b USERS -c USERS -S OPTION users Change-Id: Icba46457863c82b3fe199aeb928be449a8836bc7 --- 0 files changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/18/370518/1 -- To view, visit https://gerrit.wikimedia.org/r/370518 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Icba46457863c82b3fe199aeb928be449a8836bc7 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Paladox Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...ScanSet[master]: Add missing qqq message documentation
Umherirrender has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/370517 )
Change subject: Add missing qqq message documentation
..
Add missing qqq message documentation
Change-Id: I45b079172d85ba4eb2537bfda8934170947e563b
---
M i18n/qqq.json
1 file changed, 11 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ScanSet
refs/changes/17/370517/1
diff --git a/i18n/qqq.json b/i18n/qqq.json
index dd207fa..76bae22 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -7,6 +7,15 @@
]
},
"scanset-desc": "{{desc}}",
- "scanset_next": "{{Identical|Next}}",
- "scanset_prev": "{{Identical|Prev}}"
+ "scanset_no_name": "Used as error message in the
-tag",
+ "scanset_invalid_name": "Used as error message in the
-tag",
+ "scanset_unrecognised_index_format": "Used as error message in the
-tag",
+ "scanset_opendir_error": "Used as error message in the
-tag",
+ "scanset_no_files": "Used as error message in the
-tag",
+ "scanset_no_volumes": "Used as error message in the
-tag",
+ "scanset_missing_index_file": "Used as error message in the
-tag",
+ "scanset_index_file_error": "Used as error message in the
-tag",
+ "scanset_invalid_volume": "Used as error message in the
-tag",
+ "scanset_next": "Used as next message in the
-tag\n{{Identical|Next}}",
+ "scanset_prev": "Used as previous message in the
-tag\n{{Identical|Prev}}"
}
--
To view, visit https://gerrit.wikimedia.org/r/370517
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I45b079172d85ba4eb2537bfda8934170947e563b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ScanSet
Gerrit-Branch: master
Gerrit-Owner: Umherirrender
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] wikimedia...SmashPig[master]: Update config documentation in README
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/369406 ) Change subject: Update config documentation in README .. Update config documentation in README Change-Id: If41c8005fffba97210bbc346cfc13dd62114b16e --- M README 1 file changed, 15 insertions(+), 4 deletions(-) Approvals: Mepps: Looks good to me, approved jenkins-bot: Verified diff --git a/README b/README index 3b23a55..5eb4492 100644 --- a/README +++ b/README @@ -1,15 +1,26 @@ +SmashPig payments library + This project uses Composer [https://getcomposer.org] to manage dependencies. Upon first install and any upgrade please run composer install. -Default configuration values are located in config/main.yaml. These are -overridden by values in /etc/smashpig/main.yaml, then by values in -~/.smashpig/main.yaml. +SmashPig uses two types of configuration files. + +Global configuration files define settings shared across all payment providers, +including database and queue settings. Default global configuration values are +located in config/main.yaml. These are overridden by values in +/etc/smashpig/main.yaml, then by values in ~/.smashpig/main.yaml. + +Provider configurations files contain settings which may differ between payment +providers, such as account credentials and HTTP request settings. Defaults are +in config/provider-defaults.yaml. They are overridden in a similar cascade by +the same file in /etc/smashpig and ~/.smashpig, then overridden by settings in +main.yaml in subdirectories named for the relevant payment processor. Command-line maintenance scripts have some common options: --help --memory-limit overrides the limit specified in php.ini --config-path specifies a top-priority override configuration file path ---config-node specifies which configuration node to use +--config-node specifies which processor-specific configuration to use -- 3rd Party Licences -- The favicon is licenced under CC Attribution. http://creativecommons.org/licenses/by/3.0/legalcode -- To view, visit https://gerrit.wikimedia.org/r/369406 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: If41c8005fffba97210bbc346cfc13dd62114b16e Gerrit-PatchSet: 2 Gerrit-Project: wikimedia/fundraising/SmashPig Gerrit-Branch: master Gerrit-Owner: Ejegg Gerrit-Reviewer: Mepps Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...WikimediaEvents[wmf/1.30.0-wmf.12]: Turn on CirrusSearch MLR AB test
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/370516 )
Change subject: Turn on CirrusSearch MLR AB test
..
Turn on CirrusSearch MLR AB test
Turn the test back on after deploying fixes:
* I4d1bfc8d818
* I85a881bada6
Bug: T171212
Change-Id: Ie4fd1b6c97ce6e75e41d8f3b88915f06a0f95806
---
M modules/ext.wikimediaEvents.searchSatisfaction.js
1 file changed, 3 insertions(+), 4 deletions(-)
Approvals:
EBernhardson: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/ext.wikimediaEvents.searchSatisfaction.js
b/modules/ext.wikimediaEvents.searchSatisfaction.js
index e5fbd09..6d16eed 100644
--- a/modules/ext.wikimediaEvents.searchSatisfaction.js
+++ b/modules/ext.wikimediaEvents.searchSatisfaction.js
@@ -118,8 +118,7 @@
// at the 1:2000 sampling. Sampling increased
to 1:500, so 56k sessions
// per day. Those 56k sessions will be split
15k to dashboards, and
// 7k per bucket, for ~50k per bucket in a week.
- // NOTE: Due to a bug we had to only ship the
1024 test. See T172464
- validBuckets = [], // [ 'control', 'ltr-1024',
'ltr-i-1024' ],
+ validBuckets = [ 'control', 'ltr-20',
'ltr-i-20', 'ltr-1024', 'ltr-i-1024', 'ltr-i-20-1024' ],
sampleSize = ( function () {
var dbName = mw.config.get( 'wgDBname'
),
// Provides a place to handle
wiki-specific sampling,
@@ -141,8 +140,8 @@
subTest: null
},
enwiki: {
- test: 2000,
- subTest: null
+ test: 500,
+ subTest: 0.75
},
enwiktionary: {
test: 40,
--
To view, visit https://gerrit.wikimedia.org/r/370516
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie4fd1b6c97ce6e75e41d8f3b88915f06a0f95806
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikimediaEvents
Gerrit-Branch: wmf/1.30.0-wmf.12
Gerrit-Owner: EBernhardson
Gerrit-Reviewer: EBernhardson
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Enable max token count for phrase rescore on zh lang wikis
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/370497 ) Change subject: Enable max token count for phrase rescore on zh lang wikis .. Enable max token count for phrase rescore on zh lang wikis Bug: T169498 Change-Id: Ia9d36d04400e010855e79750aa77262126187fc9 --- M tests/cirrusTest.php M wmf-config/CirrusSearch-common.php M wmf-config/InitialiseSettings.php 3 files changed, 12 insertions(+), 0 deletions(-) Approvals: EBernhardson: Looks good to me, approved jenkins-bot: Verified diff --git a/tests/cirrusTest.php b/tests/cirrusTest.php index 648eef4..646e0cb 100644 --- a/tests/cirrusTest.php +++ b/tests/cirrusTest.php @@ -243,6 +243,7 @@ 'wmgCirrusSearchSimilarityProfile' => 'wmf_defaults', 'wmgCirrusSearchRescoreProfile' => 'wsum_inclinks', 'wmgCirrusSearchFullTextQueryBuilderProfile' => 'perfield_builder', + 'wmgCirrusSearchMaxPhraseTokens' => 10, ], ], 'zh_min_nanwikisource' => [ 'zh_min_nanwikisource', 'wikisource', diff --git a/wmf-config/CirrusSearch-common.php b/wmf-config/CirrusSearch-common.php index b440d43..6215815 100644 --- a/wmf-config/CirrusSearch-common.php +++ b/wmf-config/CirrusSearch-common.php @@ -257,6 +257,9 @@ // Configure extra index settings set during index creation $wgCirrusSearchExtraIndexSettings = $wmgCirrusSearchExtraIndexSettings; +// Limit on the number of tokens we will run phrase rescores with +$wgCirrusSearchMaxPhraseTokens = $wmgCirrusSearchMaxPhraseTokens; + # Load per realm specific configuration, either: # - CirrusSearch-labs.php # - CirrusSearch-production.php diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index a84bf43..9a1425e 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -18385,6 +18385,14 @@ ], // @} end of wmgCirrusSearchRecycleCompletionSuggesterIndex +// Disable phrase rescore on zh queries with too many tokens. +// Bandaid for T169498, should be removed when a proper +// fix is determined +'wmgCirrusSearchMaxPhraseTokens' => [ + 'default' => 'null', + 'zh' => 10, +], + // Configure ICU Folding, 'default': controlled by cirrus // 'no': disable, 'yes': force 'wmgCirrusSearchUseIcuFolding' => [ -- To view, visit https://gerrit.wikimedia.org/r/370497 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ia9d36d04400e010855e79750aa77262126187fc9 Gerrit-PatchSet: 3 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: EBernhardson Gerrit-Reviewer: EBernhardson Gerrit-Reviewer: Florianschmidtwelzow Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...WikimediaEvents[wmf/1.30.0-wmf.12]: Turn on CirrusSearch MLR AB test
EBernhardson has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/370516 )
Change subject: Turn on CirrusSearch MLR AB test
..
Turn on CirrusSearch MLR AB test
Turn the test back on after deploying fixes:
* I4d1bfc8d818
* I85a881bada6
Bug: T171212
Change-Id: Ie4fd1b6c97ce6e75e41d8f3b88915f06a0f95806
---
M modules/ext.wikimediaEvents.searchSatisfaction.js
1 file changed, 3 insertions(+), 4 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikimediaEvents
refs/changes/16/370516/1
diff --git a/modules/ext.wikimediaEvents.searchSatisfaction.js
b/modules/ext.wikimediaEvents.searchSatisfaction.js
index e5fbd09..6d16eed 100644
--- a/modules/ext.wikimediaEvents.searchSatisfaction.js
+++ b/modules/ext.wikimediaEvents.searchSatisfaction.js
@@ -118,8 +118,7 @@
// at the 1:2000 sampling. Sampling increased
to 1:500, so 56k sessions
// per day. Those 56k sessions will be split
15k to dashboards, and
// 7k per bucket, for ~50k per bucket in a week.
- // NOTE: Due to a bug we had to only ship the
1024 test. See T172464
- validBuckets = [], // [ 'control', 'ltr-1024',
'ltr-i-1024' ],
+ validBuckets = [ 'control', 'ltr-20',
'ltr-i-20', 'ltr-1024', 'ltr-i-1024', 'ltr-i-20-1024' ],
sampleSize = ( function () {
var dbName = mw.config.get( 'wgDBname'
),
// Provides a place to handle
wiki-specific sampling,
@@ -141,8 +140,8 @@
subTest: null
},
enwiki: {
- test: 2000,
- subTest: null
+ test: 500,
+ subTest: 0.75
},
enwiktionary: {
test: 40,
--
To view, visit https://gerrit.wikimedia.org/r/370516
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie4fd1b6c97ce6e75e41d8f3b88915f06a0f95806
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikimediaEvents
Gerrit-Branch: wmf/1.30.0-wmf.12
Gerrit-Owner: EBernhardson
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: RCFilters: Add marker between old and new changes in enhance...
Sbisson has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/370515 )
Change subject: RCFilters: Add marker between old and new changes in enhanced
mode
..
RCFilters: Add marker between old and new changes in enhanced mode
For both "Live Update" and "View newest changes", add a marker
between old and new groups when changes are grouped by page.
Bug: T163426
Change-Id: I00947d05e9b6022604a2a6b94eec94f6ed747c96
---
M includes/changes/EnhancedChangesList.php
M includes/templates/EnhancedChangesListGroup.mustache
M
resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.ChangesListWrapperWidget.js
3 files changed, 60 insertions(+), 38 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/15/370515/1
diff --git a/includes/changes/EnhancedChangesList.php
b/includes/changes/EnhancedChangesList.php
index 55cb9ed..be488fe 100644
--- a/includes/changes/EnhancedChangesList.php
+++ b/includes/changes/EnhancedChangesList.php
@@ -341,6 +341,7 @@
'rev-deleted-event' => $revDeletedMsg,
'tableClasses' => $tableClasses,
'timestamp' => $block[0]->timestamp,
+ 'fullTimestamp' => $block[0]->getAttribute(
'rc_timestamp' ),
'users' => $usersList,
];
diff --git a/includes/templates/EnhancedChangesListGroup.mustache
b/includes/templates/EnhancedChangesListGroup.mustache
index 3a37c2e..931eb7a 100644
--- a/includes/templates/EnhancedChangesListGroup.mustache
+++ b/includes/templates/EnhancedChangesListGroup.mustache
@@ -1,4 +1,4 @@
-
+
diff --git
a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.ChangesListWrapperWidget.js
b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.ChangesListWrapperWidget.js
index 42fb5cc..7eab6cb 100644
---
a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.ChangesListWrapperWidget.js
+++
b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.ChangesListWrapperWidget.js
@@ -101,9 +101,6 @@
$message = $( '' )
.addClass(
'mw-rcfilters-ui-changesListWrapperWidget-results' ),
isEmpty = $changesListContent === 'NO_RESULTS',
- $lastSeen,
- $indicator,
- $newChanges = $( [] ),
// For enhanced mode, we have to load these modules,
which are
// not loaded for the 'regular' mode in the backend
loaderPromise = mw.user.options.get( 'usenewrc' ) ?
@@ -142,34 +139,7 @@
this.$element.empty().append(
$changesListContent );
if ( from ) {
- $lastSeen = null;
- this.$element.find( 'li[data-mw-ts]'
).each( function () {
- var $li = $( this ),
- ts = $li.data( 'mw-ts'
);
-
- if ( ts >= from ) {
- $newChanges =
$newChanges.add( $li );
- } else if ( $lastSeen === null
) {
- $lastSeen = $li;
- return false;
- }
- } );
-
- if ( $lastSeen ) {
- $indicator = $( '' )
- .addClass(
'mw-rcfilters-ui-changesListWrapperWidget-previousChangesIndicator' )
- .text( mw.message(
'rcfilters-previous-changes-label' ).text() );
-
- $indicator.on( 'click',
function () {
- $indicator.detach();
- } );
-
- $lastSeen.before( $indicator );
- }
-
- $newChanges
- .hide()
- .fadeIn( 1000 );
+ this.emphasizeNewChanges( from );
}
}
@@ -190,6 +160,52 @@
$( '.rcfilters-spinner' ).addClass(
'mw-rcfilters-ui-ready' );
widget.$element.addClass( 'mw-rcfilters-ui-ready' );
} );
+ };
+
+ /**
+* Emphasize the elements (or groups
[MediaWiki-commits] [Gerrit] mediawiki...WikimediaEvents[master]: Turn on CirrusSearch MLR AB test
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/370128 )
Change subject: Turn on CirrusSearch MLR AB test
..
Turn on CirrusSearch MLR AB test
Turn the test back on after deploying fixes:
* I4d1bfc8d818
* I85a881bada6
Bug: T171212
Change-Id: Ie4fd1b6c97ce6e75e41d8f3b88915f06a0f95806
---
M modules/ext.wikimediaEvents.searchSatisfaction.js
1 file changed, 3 insertions(+), 4 deletions(-)
Approvals:
EBernhardson: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/ext.wikimediaEvents.searchSatisfaction.js
b/modules/ext.wikimediaEvents.searchSatisfaction.js
index e5fbd09..6d16eed 100644
--- a/modules/ext.wikimediaEvents.searchSatisfaction.js
+++ b/modules/ext.wikimediaEvents.searchSatisfaction.js
@@ -118,8 +118,7 @@
// at the 1:2000 sampling. Sampling increased
to 1:500, so 56k sessions
// per day. Those 56k sessions will be split
15k to dashboards, and
// 7k per bucket, for ~50k per bucket in a week.
- // NOTE: Due to a bug we had to only ship the
1024 test. See T172464
- validBuckets = [], // [ 'control', 'ltr-1024',
'ltr-i-1024' ],
+ validBuckets = [ 'control', 'ltr-20',
'ltr-i-20', 'ltr-1024', 'ltr-i-1024', 'ltr-i-20-1024' ],
sampleSize = ( function () {
var dbName = mw.config.get( 'wgDBname'
),
// Provides a place to handle
wiki-specific sampling,
@@ -141,8 +140,8 @@
subTest: null
},
enwiki: {
- test: 2000,
- subTest: null
+ test: 500,
+ subTest: 0.75
},
enwiktionary: {
test: 40,
--
To view, visit https://gerrit.wikimedia.org/r/370128
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie4fd1b6c97ce6e75e41d8f3b88915f06a0f95806
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikimediaEvents
Gerrit-Branch: master
Gerrit-Owner: EBernhardson
Gerrit-Reviewer: EBernhardson
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Fix some PHPDoc type hints in DatabaseMysqli
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/368540 )
Change subject: Fix some PHPDoc type hints in DatabaseMysqli
..
Fix some PHPDoc type hints in DatabaseMysqli
Use `@param mysqli_result` instead of `@param mysqli`.
Change-Id: I7e759c740f51463c5eda884debc0e12655b2
---
M includes/libs/rdbms/database/DatabaseMysqli.php
1 file changed, 6 insertions(+), 5 deletions(-)
Approvals:
Aaron Schulz: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/libs/rdbms/database/DatabaseMysqli.php
b/includes/libs/rdbms/database/DatabaseMysqli.php
index fcd29c3..4d1b87b 100644
--- a/includes/libs/rdbms/database/DatabaseMysqli.php
+++ b/includes/libs/rdbms/database/DatabaseMysqli.php
@@ -23,6 +23,7 @@
namespace Wikimedia\Rdbms;
use mysqli;
+use mysqli_result;
use IP;
/**
@@ -190,7 +191,7 @@
}
/**
-* @param mysqli $res
+* @param mysqli_result $res
* @return bool
*/
protected function mysqlFreeResult( $res ) {
@@ -200,7 +201,7 @@
}
/**
-* @param mysqli $res
+* @param mysqli_result $res
* @return bool
*/
protected function mysqlFetchObject( $res ) {
@@ -213,7 +214,7 @@
}
/**
-* @param mysqli $res
+* @param mysqli_result $res
* @return bool
*/
protected function mysqlFetchArray( $res ) {
@@ -226,7 +227,7 @@
}
/**
-* @param mysqli $res
+* @param mysqli_result $res
* @return mixed
*/
protected function mysqlNumRows( $res ) {
@@ -287,7 +288,7 @@
}
/**
-* @param mysqli $res
+* @param mysqli_result $res
* @param int $row
* @return mixed
*/
--
To view, visit https://gerrit.wikimedia.org/r/368540
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I7e759c740f51463c5eda884debc0e12655b2
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Ricordisamoa
Gerrit-Reviewer: Aaron Schulz
Gerrit-Reviewer: Ricordisamoa
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Update CirrusSearch AB test rescore profiles
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/370127 ) Change subject: Update CirrusSearch AB test rescore profiles .. Update CirrusSearch AB test rescore profiles Setting the query_weight of the rescore profile to 0 causes pagination to be non deterministic, because we assign 0 to everything. Instead of assigning 0 give the rescore query a huge boost, and leave the original scores as they were. This needs I4d1bfc8d818 to be deployed first so ltr rescore is always positive. Bug: T171212 Change-Id: I85a881bada67b4cb776f8183aab8a3ca2fb7b9da --- M wmf-config/CirrusSearch-production.php 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: EBernhardson: Looks good to me, approved jenkins-bot: Verified DCausse: Looks good to me, but someone else must approve diff --git a/wmf-config/CirrusSearch-production.php b/wmf-config/CirrusSearch-production.php index eedc47f..286589a 100644 --- a/wmf-config/CirrusSearch-production.php +++ b/wmf-config/CirrusSearch-production.php @@ -130,8 +130,8 @@ ], [ 'window' => 20, - 'query_weight' => 0.0, - 'rescore_query_weight' => 1.0, + 'query_weight' => 1.0, + 'rescore_query_weight' => 1.0, 'score_mode' => 'total', 'type' => 'ltr', 'model' => 'enwiki_32153k_500t', -- To view, visit https://gerrit.wikimedia.org/r/370127 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I85a881bada67b4cb776f8183aab8a3ca2fb7b9da Gerrit-PatchSet: 2 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: EBernhardson Gerrit-Reviewer: DCausse Gerrit-Reviewer: EBernhardson Gerrit-Reviewer: Florianschmidtwelzow Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: beta: Add copyright info for Wikidata API
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/370455 )
Change subject: beta: Add copyright info for Wikidata API
..
beta: Add copyright info for Wikidata API
Bug: T112606
Change-Id: If6c33f0bbdb74689b7d35315dc977fe42fa0d77d
---
M wmf-config/Wikibase-labs.php
1 file changed, 6 insertions(+), 0 deletions(-)
Approvals:
EBernhardson: Looks good to me, approved
jenkins-bot: Verified
diff --git a/wmf-config/Wikibase-labs.php b/wmf-config/Wikibase-labs.php
index 4df0f4d..14bec34 100644
--- a/wmf-config/Wikibase-labs.php
+++ b/wmf-config/Wikibase-labs.php
@@ -38,6 +38,12 @@
'wiktionary',
'special'
];
+ // T112606
+ $wgRightsPage = 'Wikidata:Copyright';
+ $wgRightsText = 'All structured data from the main and property
namespace is available under ' .
+ 'the Creative Commons CC0 License; text in the other namespaces
is available under ' .
+ 'the Creative Commons Attribution-ShareAlike License;
additional terms may apply.';
+ $wgRightsUrl = 'creativecommons.org/licenses/by-sa/3.0';
}
if ( $wmgUseWikibaseClient ) {
--
To view, visit https://gerrit.wikimedia.org/r/370455
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: If6c33f0bbdb74689b7d35315dc977fe42fa0d77d
Gerrit-PatchSet: 2
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Ladsgroup
Gerrit-Reviewer: Aude
Gerrit-Reviewer: EBernhardson
Gerrit-Reviewer: Florianschmidtwelzow
Gerrit-Reviewer: Hoo man
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Enable wgMinervaEnableSiteNotice for kowiki
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/370363 ) Change subject: Enable wgMinervaEnableSiteNotice for kowiki .. Enable wgMinervaEnableSiteNotice for kowiki Fixes T172630, per community consensus. Bug: T172630 Change-Id: I57204eef89aadc4d8388ccafd7e6202d33b25500 --- M wmf-config/InitialiseSettings.php 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: MarcoAurelio: Looks good to me, but someone else must approve EBernhardson: Looks good to me, approved jenkins-bot: Verified diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index 896a39f..a84bf43 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -15560,6 +15560,7 @@ 'wgMinervaEnableSiteNotice' => [ 'default' => false, 'arwiki' => true, + 'kowiki' => true, // T172630 ], 'wgMinervaApplyKnownTemplateHacks' => [ -- To view, visit https://gerrit.wikimedia.org/r/370363 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I57204eef89aadc4d8388ccafd7e6202d33b25500 Gerrit-PatchSet: 4 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Revi Gerrit-Reviewer: EBernhardson Gerrit-Reviewer: Florianschmidtwelzow Gerrit-Reviewer: Ladsgroup Gerrit-Reviewer: MarcoAurelio Gerrit-Reviewer: Revi Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] translatewiki[master]: [Contribution Tracking] Messages have content now
Raimond Spekking has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/370514 ) Change subject: [Contribution Tracking] Messages have content now .. [Contribution Tracking] Messages have content now Change-Id: I0bb000bfa96816f02fec88398fd7fe59055ef785 --- M groups/MediaWiki/mediawiki-extensions.txt 1 file changed, 0 insertions(+), 3 deletions(-) Approvals: Raimond Spekking: Verified; Looks good to me, approved diff --git a/groups/MediaWiki/mediawiki-extensions.txt b/groups/MediaWiki/mediawiki-extensions.txt index a25511e..f996f81 100644 --- a/groups/MediaWiki/mediawiki-extensions.txt +++ b/groups/MediaWiki/mediawiki-extensions.txt @@ -768,9 +768,6 @@ Contribution Tracking aliasfile = ContributionTracking/ContributionTracking.alias.php -ignored = apihelp-contributiontracking-param-utm_source, apihelp-contributiontracking-param-utm_medium -ignored = apihelp-contributiontracking-param-utm_campaign, apihelp-contributiontracking-param-utm_key -ignored = apihelp-contributiontracking-param-owa_session, apihelp-contributiontracking-param-owa_ref Contributions List -- To view, visit https://gerrit.wikimedia.org/r/370514 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I0bb000bfa96816f02fec88398fd7fe59055ef785 Gerrit-PatchSet: 1 Gerrit-Project: translatewiki Gerrit-Branch: master Gerrit-Owner: Raimond Spekking Gerrit-Reviewer: Raimond Spekking ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] translatewiki[master]: [Contribution Tracking] Messages have content now
Raimond Spekking has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/370514 ) Change subject: [Contribution Tracking] Messages have content now .. [Contribution Tracking] Messages have content now Change-Id: I0bb000bfa96816f02fec88398fd7fe59055ef785 --- M groups/MediaWiki/mediawiki-extensions.txt 1 file changed, 0 insertions(+), 3 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/translatewiki refs/changes/14/370514/1 diff --git a/groups/MediaWiki/mediawiki-extensions.txt b/groups/MediaWiki/mediawiki-extensions.txt index a25511e..f996f81 100644 --- a/groups/MediaWiki/mediawiki-extensions.txt +++ b/groups/MediaWiki/mediawiki-extensions.txt @@ -768,9 +768,6 @@ Contribution Tracking aliasfile = ContributionTracking/ContributionTracking.alias.php -ignored = apihelp-contributiontracking-param-utm_source, apihelp-contributiontracking-param-utm_medium -ignored = apihelp-contributiontracking-param-utm_campaign, apihelp-contributiontracking-param-utm_key -ignored = apihelp-contributiontracking-param-owa_session, apihelp-contributiontracking-param-owa_ref Contributions List -- To view, visit https://gerrit.wikimedia.org/r/370514 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I0bb000bfa96816f02fec88398fd7fe59055ef785 Gerrit-PatchSet: 1 Gerrit-Project: translatewiki Gerrit-Branch: master Gerrit-Owner: Raimond Spekking ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Exclude files from Special:ShortPages on commons
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/369503 ) Change subject: Exclude files from Special:ShortPages on commons .. Exclude files from Special:ShortPages on commons Bug: T170687 Change-Id: I1183e1a1ad6bd9044dced484186ed6ee49bbc375 --- M wmf-config/InitialiseSettings.php 1 file changed, 6 insertions(+), 0 deletions(-) Approvals: EBernhardson: Looks good to me, approved jenkins-bot: Verified diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index cfe878f..896a39f 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -19370,6 +19370,12 @@ 'labtestwiki' => true, ], +'wgShortPagesNamespaceBlacklist' => [ + 'default' => [], + // T170687 + 'commons' => [ NS_FILE ], +], + // Temporarily enable until 1.30.0-wmf.12 rolls out -RK 'wgStructuredChangeFiltersEnableExperimentalViews' => [ 'default' => true, -- To view, visit https://gerrit.wikimedia.org/r/369503 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I1183e1a1ad6bd9044dced484186ed6ee49bbc375 Gerrit-PatchSet: 2 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Jdlrobson Gerrit-Reviewer: EBernhardson Gerrit-Reviewer: Florianschmidtwelzow Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...mobileapps[master]: Reflect template change
Jdlrobson has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/370513 )
Change subject: Reflect template change
..
Reflect template change
Link has changed
from Help:IPA/English
https://en.m.wikipedia.org/wiki/Special:MobileDiff/794002013
Change-Id: I91a840fa0d6e6fe5a57a235285dc4bbdf5297929
---
M
test/diff/results/page_formatted-enwiki-User%3ABSitzmann_(WMF)_MCS_Test_Frankenstein.json
M
test/diff/results/page_mobile-sections-enwiki-User%3ABSitzmann_(WMF)_MCS_Test_Frankenstein.json
2 files changed, 2 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/mobileapps
refs/changes/13/370513/1
diff --git
"a/test/diff/results/page_formatted-enwiki-User%3ABSitzmann_\050WMF\051_MCS_Test_Frankenstein.json"
"b/test/diff/results/page_formatted-enwiki-User%3ABSitzmann_\050WMF\051_MCS_Test_Frankenstein.json"
index d80bea7..a4339e7 100644
---
"a/test/diff/results/page_formatted-enwiki-User%3ABSitzmann_\050WMF\051_MCS_Test_Frankenstein.json"
+++
"b/test/diff/results/page_formatted-enwiki-User%3ABSitzmann_\050WMF\051_MCS_Test_Frankenstein.json"
@@ -36,7 +36,7 @@
},
{
"id": 3,
-"text": "\nKonjac (English:
/ˈkoʊnjæk/
KOHN-yak)\n\n",
+"text": "\nKonjac (English:
/ˈkoʊnjæk/
KOHN-yak)\n\n",
"toclevel": 1,
"line": "Pronunciation aids",
"anchor": "Pronunciation_aids"
diff --git
"a/test/diff/results/page_mobile-sections-enwiki-User%3ABSitzmann_\050WMF\051_MCS_Test_Frankenstein.json"
"b/test/diff/results/page_mobile-sections-enwiki-User%3ABSitzmann_\050WMF\051_MCS_Test_Frankenstein.json"
index 7676792..9484fba 100644
---
"a/test/diff/results/page_mobile-sections-enwiki-User%3ABSitzmann_\050WMF\051_MCS_Test_Frankenstein.json"
+++
"b/test/diff/results/page_mobile-sections-enwiki-User%3ABSitzmann_\050WMF\051_MCS_Test_Frankenstein.json"
@@ -190,7 +190,7 @@
},
{
"id": 3,
-"text": "\nKonjac (English: /ˈkoʊnjæk/
KOHN-yak)\n\n",
+"text": "\nKonjac (English: /ˈkoʊnjæk/
KOHN-yak)\n\n",
"toclevel": 1,
"line": "Pronunciation aids",
"anchor": "Pronunciation_aids"
--
To view, visit https://gerrit.wikimedia.org/r/370513
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I91a840fa0d6e6fe5a57a235285dc4bbdf5297929
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/mobileapps
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...MediaWikiAuth[master]: Add missing qqq message documentation
Umherirrender has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/370512 )
Change subject: Add missing qqq message documentation
..
Add missing qqq message documentation
Change-Id: I9814d5dfe1fdb2c8d47fc8270ef14cbb321ca924
---
M i18n/qqq.json
1 file changed, 7 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MediaWikiAuth
refs/changes/12/370512/1
diff --git a/i18n/qqq.json b/i18n/qqq.json
index ec21f3e..cba58ad 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -1,4 +1,10 @@
{
"@metadata": {},
- "mwa-desc":
"{{desc|name=MediaWikiAuth|url=https://www.mediawiki.org/wiki/Extension:MediaWikiAuth}}";
+ "mwa-desc":
"{{desc|name=MediaWikiAuth|url=https://www.mediawiki.org/wiki/Extension:MediaWikiAuth}}";,
+ "mwa-autocreate-blocked": "Used as error message for blocked user on
account creation",
+ "mwa-error-unknown": "Used as generic error message on account
creation",
+ "mwa-error-wrong-token": "Used as error message for wrong token on
account creation",
+ "mwa-must-be-imported": "Used as message on account creation",
+ "mwa-resetpass": "Used as error message for resetting password",
+ "mwa-wait": "Used as message to wait on account creation"
}
--
To view, visit https://gerrit.wikimedia.org/r/370512
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I9814d5dfe1fdb2c8d47fc8270ef14cbb321ca924
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MediaWikiAuth
Gerrit-Branch: master
Gerrit-Owner: Umherirrender
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: Some requests may have no client IP defined.
Smalyshev has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/370511 )
Change subject: Some requests may have no client IP defined.
..
Some requests may have no client IP defined.
Bug: T172713
Change-Id: I7f5a95e2a59e08166b19c490c58f2fa284eb8f5f
---
M modules/role/files/logstash/filter-syslog.conf
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/11/370511/1
diff --git a/modules/role/files/logstash/filter-syslog.conf
b/modules/role/files/logstash/filter-syslog.conf
index 120fb5f..c4cae09 100644
--- a/modules/role/files/logstash/filter-syslog.conf
+++ b/modules/role/files/logstash/filter-syslog.conf
@@ -146,7 +146,7 @@
grok {
match => [
"message",
-"^\[%{HTTPDATE:http_date}\] .%{WORD:http_method}
%{NOTSPACE:message} HTTP/%{NUMBER:httpversion}. %{NUMBER:status}
(?:%{NUMBER:response_size}|-) %{QS:referrer} %{QS:user_agent}
%{NUMBER:request_time} %{NUMBER:upstream_time} %{IP:clientip}
%{IP:remote_addr}$"
+"^\[%{HTTPDATE:http_date}\] .%{WORD:http_method}
%{NOTSPACE:message} HTTP/%{NUMBER:httpversion}. %{NUMBER:status}
(?:%{NUMBER:response_size}|-) %{QS:referrer} %{QS:user_agent}
%{NUMBER:request_time} %{NUMBER:upstream_time} (?:%{IP:clientip}|-)
%{IP:remote_addr}$"
]
overwrite => [ "message" ]
named_captures_only => true
--
To view, visit https://gerrit.wikimedia.org/r/370511
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I7f5a95e2a59e08166b19c490c58f2fa284eb8f5f
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Smalyshev
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Translate sitename for nl.wikinews
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/370313 ) Change subject: Translate sitename for nl.wikinews .. Translate sitename for nl.wikinews Bug: T172594 Change-Id: I1735529ca755d208e9cf1897ba4fa3e5b9f3d734 --- M wmf-config/InitialiseSettings.php 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: EBernhardson: Looks good to me, approved jenkins-bot: Verified diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index 9e27824..cfe878f 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -2279,6 +2279,7 @@ 'newiki' => 'विकिपीडिया', 'newikibooks' => 'विकिपुस्तक', // T124881 'nlwiktionary' => 'WikiWoordenboek', + 'nlwikinews' => 'Wikinieuws', // T172594 'noboard_chapterswikimedia' => 'Wikimedia Norway Internal Board', 'nostalgiawiki' => 'Wikipedia', 'nowikibooks' => 'Wikibøker', -- To view, visit https://gerrit.wikimedia.org/r/370313 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I1735529ca755d208e9cf1897ba4fa3e5b9f3d734 Gerrit-PatchSet: 2 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: MarcoAurelio Gerrit-Reviewer: EBernhardson Gerrit-Reviewer: Florianschmidtwelzow Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Grant 'autopatrol' to 'editor' in en.wikibooks
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/370311 ) Change subject: Grant 'autopatrol' to 'editor' in en.wikibooks .. Grant 'autopatrol' to 'editor' in en.wikibooks Bug: T172561 Change-Id: I6dd9a79f708571f44f37a5eeea92fa8472f078f8 --- M wmf-config/InitialiseSettings.php 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: EBernhardson: Looks good to me, approved jenkins-bot: Verified diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index bea92dc..9e27824 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -8271,6 +8271,7 @@ '+enwikibooks' => [ // 'rollbacker' => [ 'rollback' => true ], // 'patroller' => [ 'patrol' => true, 'autopatrol' => true ], + 'editor' => [ 'autopatrol' => true ], // T172561 'flood' => [ 'bot' => true ], 'uploader' => [ 'upload' => true, 'reupload' => true ], ], -- To view, visit https://gerrit.wikimedia.org/r/370311 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I6dd9a79f708571f44f37a5eeea92fa8472f078f8 Gerrit-PatchSet: 2 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: MarcoAurelio Gerrit-Reviewer: EBernhardson Gerrit-Reviewer: Florianschmidtwelzow Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...NewsBox[master]: Add missing qqq message documentation
Umherirrender has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/370510 )
Change subject: Add missing qqq message documentation
..
Add missing qqq message documentation
Change-Id: I80e57499b372e801eac0282638cfe17e94a7bc0d
---
M i18n/qqq.json
1 file changed, 5 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/NewsBox
refs/changes/10/370510/1
diff --git a/i18n/qqq.json b/i18n/qqq.json
index c6720e5..5e1b5de 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -1,4 +1,8 @@
{
"@metadata": {},
- "newsbox-desc":
"{{desc|name=NewsBox|url=https://www.mediawiki.org/wiki/Extension:NewsBox}}";
+ "newsbox-desc":
"{{desc|name=NewsBox|url=https://www.mediawiki.org/wiki/Extension:NewsBox}}";,
+ "newsbox-createwiki": "Used as link text for
http://www.shoutwiki.com/wiki/Special:CreateWiki in the sidebar",
+ "newsbox-forum": "Used as link text for {{msg-mw|newsbox-forum-url}} in
the sidebar",
+ "newsbox-homepage": "Used as link text to http://www.shoutwiki.com/ in
the sidebar",
+ "newsbox-title": "Used as title of the navigation in the sidebar"
}
--
To view, visit https://gerrit.wikimedia.org/r/370510
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I80e57499b372e801eac0282638cfe17e94a7bc0d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/NewsBox
Gerrit-Branch: master
Gerrit-Owner: Umherirrender
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: phabricator: open firewall holes only on active_server
Dzahn has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/370498 )
Change subject: phabricator: open firewall holes only on active_server
..
phabricator: open firewall holes only on active_server
Only open the ferm/firewall holes when on the active server,
if on the standby server, block access to http/https/smtp.
Keep the ssh between servers working.
This is, at least for now, to block access to the Apache on phab2001
to prevent cross-dc traffic, since it doesn't use a codfw db backend yet.
Bug: T137928
Change-Id: I3be7ae71db282d134e5ed0dc22d2edc721317abd
---
M modules/profile/manifests/phabricator/main.pp
1 file changed, 10 insertions(+), 4 deletions(-)
Approvals:
Paladox: Looks good to me, but someone else must approve
jenkins-bot: Verified
Dzahn: Looks good to me, approved
diff --git a/modules/profile/manifests/phabricator/main.pp
b/modules/profile/manifests/phabricator/main.pp
index 3e4c8bb..bb123c4 100644
--- a/modules/profile/manifests/phabricator/main.pp
+++ b/modules/profile/manifests/phabricator/main.pp
@@ -34,10 +34,12 @@
$logmail_ensure = 'present'
$dump_rsync_ensure = 'present'
$dump_enabled = true
+$ferm_ensure = 'present'
} else {
$logmail_ensure = 'absent'
$dump_rsync_ensure ='absent'
$dump_enabled = false
+$ferm_ensure = 'absent'
}
# todo: change the password for app_user
@@ -225,23 +227,27 @@
}
ferm::service { 'phabmain_http':
-proto => 'tcp',
-port => '80',
+ensure => $ferm_ensure,
+proto => 'tcp',
+port => '80',
}
ferm::service { 'phabmain_https':
-proto => 'tcp',
-port => '443',
+ensure => $ferm_ensure,
+proto => 'tcp',
+port => '443',
}
# receive mail from mail smarthosts
ferm::service { 'phabmain-smtp':
+ensure => $ferm_ensure,
port => '25',
proto => 'tcp',
srange => inline_template('(<%= @mail_smarthost.map{|x|
"@resolve(#{x})" }.join(" ") %>)'),
}
ferm::service { 'phabmain-smtp_ipv6':
+ensure => $ferm_ensure,
port => '25',
proto => 'tcp',
srange => inline_template('(<%= @mail_smarthost.map{|x|
"@resolve(#{x}, )" }.join(" ") %>)'),
--
To view, visit https://gerrit.wikimedia.org/r/370498
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I3be7ae71db282d134e5ed0dc22d2edc721317abd
Gerrit-PatchSet: 5
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn
Gerrit-Reviewer: 20after4
Gerrit-Reviewer: Dzahn
Gerrit-Reviewer: Paladox
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: Bumping HP RAID Icinga check timeout from 60 to 90s
Ayounsi has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/370505 )
Change subject: Bumping HP RAID Icinga check timeout from 60 to 90s
..
Bumping HP RAID Icinga check timeout from 60 to 90s
Bug: T172708
Change-Id: Ia045969b25af2cbe7e33c5c81edd07d121d8bff7
---
M modules/raid/manifests/init.pp
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
jenkins-bot: Verified
Ayounsi: Looks good to me, approved
Dzahn: Looks good to me, but someone else must approve
diff --git a/modules/raid/manifests/init.pp b/modules/raid/manifests/init.pp
index bfc7d99..e90cf45 100644
--- a/modules/raid/manifests/init.pp
+++ b/modules/raid/manifests/init.pp
@@ -98,7 +98,7 @@
nrpe::monitor_service { 'raid_hpssacli':
description=> 'HP RAID',
nrpe_command => '/usr/local/lib/nagios/plugins/check_hpssacli',
-timeout=> 60, # can take > 10s on servers with lots of
disks
+timeout=> 90, # can take > 10s on servers with lots of
disks
check_interval => $check_interval,
retry_interval => $retry_interval,
event_handler => "raid_handler!hpssacli!${::site}",
--
To view, visit https://gerrit.wikimedia.org/r/370505
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia045969b25af2cbe7e33c5c81edd07d121d8bff7
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ayounsi
Gerrit-Reviewer: Ayounsi
Gerrit-Reviewer: Dzahn
Gerrit-Reviewer: RobH
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Reflect[master]: Add missing qqq message documentation
Umherirrender has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/370509 )
Change subject: Add missing qqq message documentation
..
Add missing qqq message documentation
Change-Id: Id9829e91c9b20e4355792d5f268899a3d74c0fcc
---
M i18n/qqq.json
1 file changed, 4 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Reflect
refs/changes/09/370509/1
diff --git a/i18n/qqq.json b/i18n/qqq.json
index c67f9f8..9117228 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -5,6 +5,10 @@
]
},
"reflect-desc":
"{{desc|what=extension|name=Reflect|url=https://www.mediawiki.org/wiki/Extension:Reflect}}";,
+ "reflect-bulleted": "Used as email notification text",
+ "reflect-bulleted-subject": "Used as email notification subject",
+ "reflect-responded": "Used as email notification text",
+ "reflect-responded-subject": "Used as email notification subject",
"apihelp-reflectaction-description":
"{{doc-apihelp-description|reflectaction}}",
"apihelp-reflectaction-summary":
"{{doc-apihelp-summary|reflectaction}}",
"apihelp-reflectaction-param-reflectaction":
"{{doc-apihelp-param|reflectaction|reflectaction}}",
--
To view, visit https://gerrit.wikimedia.org/r/370509
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Id9829e91c9b20e4355792d5f268899a3d74c0fcc
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Reflect
Gerrit-Branch: master
Gerrit-Owner: Umherirrender
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...CreatePageUw[master]: Add missing qqq message documentation
Umherirrender has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/370508 )
Change subject: Add missing qqq message documentation
..
Add missing qqq message documentation
Change-Id: Ic1051997cf3201534fe39698cb5d0713de654769
---
M i18n/qqq.json
1 file changed, 5 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CreatePageUw
refs/changes/08/370508/1
diff --git a/i18n/qqq.json b/i18n/qqq.json
index 265269f..cc4420b 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -9,5 +9,9 @@
]
},
"createpage": "Name of special page [[Special:CreatePage]] in
[[Special:SpecialPages]] and its title.\n{{Identical|Createpage}}",
- "uwcreatepage-desc": "{{desc}}"
+ "uwcreatepage-desc": "{{desc}}",
+ "createpage-instructions": "Used as label on Special:CreatePage",
+ "createpage-titleexists": "Used as message on Special:CreatePage",
+ "createpage-tryagain": "Used as link text for an url on
Special:CreatePage",
+ "createpage-editexisting": "Used as link text for edit url on
Special:CreatePage"
}
--
To view, visit https://gerrit.wikimedia.org/r/370508
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic1051997cf3201534fe39698cb5d0713de654769
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CreatePageUw
Gerrit-Branch: master
Gerrit-Owner: Umherirrender
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/dns[master]: point m3-slave to same server as m3-master
Dzahn has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/370506 ) Change subject: point m3-slave to same server as m3-master .. point m3-slave to same server as m3-master per Jaime's comment on I821146a5d01382 point m3-slave to the same server as m3-master for now. to be reverted later Change-Id: I8fc6a75ce19154ceaf648c2b0e4c90d2ec763bd4 --- M templates/wmnet 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: jenkins-bot: Verified Jcrespo: Looks good to me, but someone else must approve Dzahn: Looks good to me, approved diff --git a/templates/wmnet b/templates/wmnet index c217a8e..507cfc9 100644 --- a/templates/wmnet +++ b/templates/wmnet @@ -46,7 +46,7 @@ m2-master 5M IN CNAMEdbproxy1002.eqiad.wmnet. m2-slave5M IN CNAMEdb2011.codfw.wmnet. m3-master 5M IN CNAMEdbproxy1003.eqiad.wmnet. -m3-slave5M IN CNAMEdb1048.eqiad.wmnet. +m3-slave5M IN CNAMEdbproxy1003.eqiad.wmnet. m4-master 5M IN CNAMEdbproxy1004.eqiad.wmnet. m5-master 5M IN CNAMEdb1009.eqiad.wmnet. m5-slave5M IN CNAMEdb2030.codfw.wmnet. -- To view, visit https://gerrit.wikimedia.org/r/370506 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I8fc6a75ce19154ceaf648c2b0e4c90d2ec763bd4 Gerrit-PatchSet: 2 Gerrit-Project: operations/dns Gerrit-Branch: master Gerrit-Owner: Dzahn Gerrit-Reviewer: Dzahn Gerrit-Reviewer: Jcrespo Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/dns[master]: point m3-slave to same server as m3-master
Dzahn has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/370506 ) Change subject: point m3-slave to same server as m3-master .. point m3-slave to same server as m3-master per Jaime's comment on I821146a5d01382 point m3-slave to the same server as m3-master for now. to be reverted later Change-Id: I8fc6a75ce19154ceaf648c2b0e4c90d2ec763bd4 --- M templates/wmnet 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/dns refs/changes/06/370506/1 diff --git a/templates/wmnet b/templates/wmnet index cadc69a..2895c9b 100644 --- a/templates/wmnet +++ b/templates/wmnet @@ -46,7 +46,7 @@ m2-master 5M IN CNAMEdbproxy1002.eqiad.wmnet. m2-slave5M IN CNAMEdb2011.codfw.wmnet. m3-master 5M IN CNAMEdbproxy1003.eqiad.wmnet. -m3-slave5M IN CNAMEdb1048.eqiad.wmnet. +m3-slave5M IN CNAMEdbproxy1003.eqiad.wmnet. m4-master 5M IN CNAMEdbproxy1004.eqiad.wmnet. m5-master 5M IN CNAMEdb1009.eqiad.wmnet. m5-slave5M IN CNAMEdb2030.codfw.wmnet. -- To view, visit https://gerrit.wikimedia.org/r/370506 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I8fc6a75ce19154ceaf648c2b0e4c90d2ec763bd4 Gerrit-PatchSet: 1 Gerrit-Project: operations/dns Gerrit-Branch: master Gerrit-Owner: Dzahn ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: Bumping HP RAID Icinga check timeout from 60 to 90s
Ayounsi has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/370505 )
Change subject: Bumping HP RAID Icinga check timeout from 60 to 90s
..
Bumping HP RAID Icinga check timeout from 60 to 90s
Bug: T172708
Change-Id: Ia045969b25af2cbe7e33c5c81edd07d121d8bff7
---
M modules/raid/manifests/init.pp
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/05/370505/1
diff --git a/modules/raid/manifests/init.pp b/modules/raid/manifests/init.pp
index bfc7d99..e90cf45 100644
--- a/modules/raid/manifests/init.pp
+++ b/modules/raid/manifests/init.pp
@@ -98,7 +98,7 @@
nrpe::monitor_service { 'raid_hpssacli':
description=> 'HP RAID',
nrpe_command => '/usr/local/lib/nagios/plugins/check_hpssacli',
-timeout=> 60, # can take > 10s on servers with lots of
disks
+timeout=> 90, # can take > 10s on servers with lots of
disks
check_interval => $check_interval,
retry_interval => $retry_interval,
event_handler => "raid_handler!hpssacli!${::site}",
--
To view, visit https://gerrit.wikimedia.org/r/370505
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia045969b25af2cbe7e33c5c81edd07d121d8bff7
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ayounsi
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: Redirect wikimedia.org/resources to meta
Dzahn has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/369970 )
Change subject: Redirect wikimedia.org/resources to meta
..
Redirect wikimedia.org/resources to meta
Bug: T172417
Change-Id: Ib883b8dce4fc3da399348a82155b506344cd2997
---
M modules/mediawiki/files/apache/sites/redirects.conf
M modules/mediawiki/files/apache/sites/redirects/redirects.dat
2 files changed, 5 insertions(+), 0 deletions(-)
Approvals:
Giuseppe Lavagetto: Looks good to me, but someone else must approve
jenkins-bot: Verified
Dzahn: Looks good to me, approved
diff --git a/modules/mediawiki/files/apache/sites/redirects.conf
b/modules/mediawiki/files/apache/sites/redirects.conf
index fc08c02..ace384a 100644
--- a/modules/mediawiki/files/apache/sites/redirects.conf
+++ b/modules/mediawiki/files/apache/sites/redirects.conf
@@ -410,6 +410,9 @@
# override svn.mediawiki.org/viewvc/pywikipedia
https://phabricator.wikimedia.org/diffusion/SVNP/
RewriteCond %{HTTP_HOST} =svn.mediawiki.org
RewriteRule ^/viewvc/pywikipedia$
https://phabricator.wikimedia.org/diffusion/SVNP/ [R=301,L,NE]
+ # override wikimedia.org/resources
//meta.wikimedia.org/wiki/Wikimedia_Resource_Center
+ RewriteCond %{HTTP_HOST} =wikimedia.org
+ RewriteRule ^/resources$
%{ENV:RW_PROTO}://meta.wikimedia.org/wiki/Wikimedia_Resource_Center [R=301,L,NE]
# Type: wildcardOverride
# override *wikipedie.cz/Experti_na_prirodu
//cs.wikipedia.org/wiki/Wikipedie:WikiProjekt_Chráněná_území/Experti_na_přírodu
diff --git a/modules/mediawiki/files/apache/sites/redirects/redirects.dat
b/modules/mediawiki/files/apache/sites/redirects/redirects.dat
index 7bb8360..18bc26e 100644
--- a/modules/mediawiki/files/apache/sites/redirects/redirects.dat
+++ b/modules/mediawiki/files/apache/sites/redirects/redirects.dat
@@ -465,3 +465,5 @@
# redirect 2030.wikimedia.org to meta (T158981)
funnel 2030.wikimedia.org
//meta.wikimedia.org/wiki/Strategy/Wikimedia_movement/2017
+# redirect wikimedia.org/resources to meta (T172417)
+override wikimedia.org/resources
//meta.wikimedia.org/wiki/Wikimedia_Resource_Center
--
To view, visit https://gerrit.wikimedia.org/r/369970
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib883b8dce4fc3da399348a82155b506344cd2997
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Reedy
Gerrit-Reviewer: Alex Monk
Gerrit-Reviewer: Dzahn
Gerrit-Reviewer: Giuseppe Lavagetto
Gerrit-Reviewer: Reedy
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Deprecate greys not part of WikimediaUI color palette any more
VolkerE has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/370503 ) Change subject: Deprecate greys not part of WikimediaUI color palette any more .. Deprecate greys not part of WikimediaUI color palette any more Deprecating greys, which are not part of WikimediaUI color palette any more. See https://wikimedia.github.io/WikimediaUI-Style-Guide/visual-style_icons.html for further information. Bug: T152025 Change-Id: Iaef72470c59665682f4a54d0b754d41a2678f146 --- M resources/src/mediawiki.less/mediawiki.ui/variables.less 1 file changed, 10 insertions(+), 7 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/03/370503/1 diff --git a/resources/src/mediawiki.less/mediawiki.ui/variables.less b/resources/src/mediawiki.less/mediawiki.ui/variables.less index d4937c6..8d1b4b8 100644 --- a/resources/src/mediawiki.less/mediawiki.ui/variables.less +++ b/resources/src/mediawiki.less/mediawiki.ui/variables.less @@ -1,20 +1,15 @@ // Colors for use in mediawiki.ui and elsewhere -// Although this defines many shades, be parsimonious in your own use of grays. Prefer -// colors already in use in MediaWiki. Prefer semantic color names such as "@colorText". +// Although this defines many shades, be parsimonious in your own use of grays. +// Prefer semantic color names such as `@colorText` below. @colorGray1: #000; // darkest @colorGray2: #222; @colorGray3: #333; @colorGray4: #444; @colorGray5: #54595d; -@colorGray6: #666; @colorGray7: #72777d; -@colorGray8: #888; -@colorGray9: #999; @colorGray10: #a2a9b1; -@colorGray11: #bbb; @colorGray12: #c8ccd1; -@colorGray13: #ddd; @colorGray14: #eaecf0; @colorGray15: #f8f9fa; // lightest @@ -65,3 +60,11 @@ // Form input sizes @checkboxSize: 2em; @radioSize: 2em; + +// Deprecated color variables from when WikimediaUI color palette wasn't around +// See https://wikimedia.github.io/WikimediaUI-Style-Guide/visual-style_colors.html +@colorGray6: #666; +@colorGray8: #888; +@colorGray9: #999; +@colorGray11: #bbb; +@colorGray13: #ddd; \ No newline at end of file -- To view, visit https://gerrit.wikimedia.org/r/370503 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iaef72470c59665682f4a54d0b754d41a2678f146 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: VolkerE ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
