[MediaWiki-commits] [Gerrit] Allow automatic cmdline mode with wikipedia:en - change (pywikibot/core)
jenkins-bot has submitted this change and it was merged.
Change subject: Allow automatic cmdline mode with wikipedia:en
..
Allow automatic cmdline mode with wikipedia:en
2b07db2 allowed command line arguments for -family and -lang
to put generate_user_files into automatic generation mode.
However it didnt detect when -family:wikipedia -lang:en
was used, as this was the default before arguments were parsed.
Change-Id: I34fc2c0553e742bb487baef59142e5ddee6051e6
---
M generate_user_files.py
1 file changed, 4 insertions(+), 3 deletions(-)
Approvals:
John Vandenberg: Looks good to me, but someone else must approve
XZise: Looks good to me, approved
jenkins-bot: Verified
diff --git a/generate_user_files.py b/generate_user_files.py
index 7c99c11..8abd8c5 100755
--- a/generate_user_files.py
+++ b/generate_user_files.py
@@ -341,9 +341,6 @@
@type args: list of unicode
global base_dir
-# Force default
-if config.family == 'wikipedia' and config.mylang == 'language':
-config.mylang = 'en'
default_args = (config.family, config.mylang, None)
@@ -361,6 +358,10 @@
else:
force = False
+# Force default
+if config.family == 'wikipedia' and config.mylang == 'language':
+args = ('wikipedia', 'en', username)
+
while not force or config.verbose_output:
pywikibot.output(u'\nYour default user directory is %s' % base_dir)
if pywikibot.input_yn(Do you want to use that directory?,
--
To view, visit https://gerrit.wikimedia.org/r/209017
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I34fc2c0553e742bb487baef59142e5ddee6051e6
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: John Vandenberg jay...@gmail.com
Gerrit-Reviewer: John Vandenberg jay...@gmail.com
Gerrit-Reviewer: Ladsgroup ladsgr...@gmail.com
Gerrit-Reviewer: Merlijn van Deen valhall...@arctus.nl
Gerrit-Reviewer: XZise commodorefabia...@gmx.de
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Change EventLogging endpoint to /beacon/event - change (operations/mediawiki-config)
Ori.livneh has uploaded a new change for review.
https://gerrit.wikimedia.org/r/209178
Change subject: Change EventLogging endpoint to /beacon/event
..
Change EventLogging endpoint to /beacon/event
Change-Id: I019944f4276cf2c4944da6c45d171438b87ec415
---
M wmf-config/CommonSettings.php
1 file changed, 2 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config
refs/changes/78/209178/1
diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index 0acadfa..cf11d4c 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -2632,11 +2632,11 @@
// test2wiki has its own Schema: NS.
$wgEventLoggingDBname = 'test2wiki';
$wgEventLoggingSchemaApiUri =
'http://test2.wikipedia.org/w/api.php';
- $wgEventLoggingBaseUri = //{$wmfHostnames['bits']}/dummy.gif;
+ $wgEventLoggingBaseUri = //{$wmgAssetsHost}/beacon/dummy;
$wgEventLoggingFile =
udp://$wmfUdp2logDest/EventLogging-$wgDBname;
} else {
// All other wikis reference metawiki.
- $wgEventLoggingBaseUri = //{$wmfHostnames['bits']}/event.gif;
+ $wgEventLoggingBaseUri = //{$wmgAssetsHost}/beacon/event;
$wgEventLoggingDBname = 'metawiki';
$wgEventLoggingFile = 'udp://10.64.32.167:8421/EventLogging';
// eventlog1001.eqiad.wmnet
$wgEventLoggingSchemaApiUri =
'http://meta.wikimedia.org/w/api.php';
--
To view, visit https://gerrit.wikimedia.org/r/209178
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I019944f4276cf2c4944da6c45d171438b87ec415
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Ori.livneh o...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Bundle some example links with the local paymentwiki - change (mediawiki/vagrant)
jenkins-bot has submitted this change and it was merged.
Change subject: Bundle some example links with the local paymentwiki
..
Bundle some example links with the local paymentwiki
Change-Id: I2720b79ef3ba7267d377b2cfb7271c0aa33af555
---
A puppet/modules/payments/files/Main_Page.wiki
M puppet/modules/payments/manifests/init.pp
2 files changed, 15 insertions(+), 2 deletions(-)
Approvals:
20after4: Looks good to me, approved
jenkins-bot: Verified
Objections:
Awight: There's a problem with this change, please improve
diff --git a/puppet/modules/payments/files/Main_Page.wiki
b/puppet/modules/payments/files/Main_Page.wiki
new file mode 100644
index 000..c844ec2
--- /dev/null
+++ b/puppet/modules/payments/files/Main_Page.wiki
@@ -0,0 +1,10 @@
+See the [https://www.mediawiki.org/wiki/Extension:DonationInterface help page]
of the DonationInterface extension for more information.
+
+*
[{{fullurl:Special:GlobalCollectGateway|appeal=JimmyQuoteffname=cc-vmadrecurring=uselang=enlanguage=encurrency=EURcountry=USamount=2.01}}
GlobalCollect in the US, English, EUR]
+*
[{{fullurl:Special:GlobalCollectGateway|appeal=JimmyQuoteffname=cc-vmadrecurring=1uselang=enlanguage=encurrency=EURcountry=USamount=2.01}}
GlobalCollect recurring in the US, English, EUR]
+*
[{{fullurl:Special:GlobalCollectGateway|appeal=JimmyQuoteffname=cc-vmadrecurring=uselang=enlanguage=encurrency=ILScountry=ILamount=20.01}}
GlobalCollect in IL, English]
+*
[{{fullurl:Special:GlobalCollectGateway|appeal=JimmyQuoteffname=cc-vmadrecurring=uselang=helanguage=hecurrency=ILScountry=ILamount=20.01}}
GlobalCollect in IL, Hebrew]
+
+== Errors ==
+*
[{{fullurl:Special:GlobalCollectGateway|appeal=JimmyQuoteffname=cc-vmadrecurring=uselang=enlanguage=encurrency=USDcountry=USamount=.01}}
Donation amount too low (GlobalCollect)]
+*
[{{fullurl:Special:PayPalGateway|appeal=JimmyQuoteffname=paypalrecurring=uselang=enlanguage=encurrency=INRcountry=USamount=200.01}}
Correcting currency (PayPal)]
diff --git a/puppet/modules/payments/manifests/init.pp
b/puppet/modules/payments/manifests/init.pp
index 8c99ef7..fd2f68b 100644
--- a/puppet/modules/payments/manifests/init.pp
+++ b/puppet/modules/payments/manifests/init.pp
@@ -35,13 +35,16 @@
require = [
Git::Clone['mediawiki-core-fr'],
Mediawiki::Wiki[$::mediawiki::wiki_name],
-]
+],
}
mediawiki::extension { 'payments:FundraisingEmailUnsubscribe':
entrypoint = 'FundraiserUnsubscribe.php',
-# FIXME: don't require: wgTwigPath = ${::twig::dir}/current/lib/Twig,
}
mediawiki::extension { 'payments:ParserFunctions': }
+
+ mediawiki::import_text { 'payments:Main_Page':
+ source = 'puppet:///modules/payments/Main_Page.wiki',
+ }
}
--
To view, visit https://gerrit.wikimedia.org/r/208838
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I2720b79ef3ba7267d377b2cfb7271c0aa33af555
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: Awight awi...@wikimedia.org
Gerrit-Reviewer: 20after4 mmod...@wikimedia.org
Gerrit-Reviewer: AndyRussG andrew.green...@gmail.com
Gerrit-Reviewer: Awight awi...@wikimedia.org
Gerrit-Reviewer: BryanDavis bda...@wikimedia.org
Gerrit-Reviewer: Ejegg eeggles...@wikimedia.org
Gerrit-Reviewer: Katie Horn kh...@wikimedia.org
Gerrit-Reviewer: Ori.livneh o...@wikimedia.org
Gerrit-Reviewer: Ssmith ssm...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Correct CRM vhost name - change (mediawiki/vagrant)
jenkins-bot has submitted this change and it was merged.
Change subject: Correct CRM vhost name
..
Correct CRM vhost name
Change-Id: If0c6a50a7725c44c15d10030dd98d3c2b954bf83
---
M puppet/hieradata/common.yaml
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
20after4: Looks good to me, approved
jenkins-bot: Verified
diff --git a/puppet/hieradata/common.yaml b/puppet/hieradata/common.yaml
index 8f8b8dd..7e5d530 100644
--- a/puppet/hieradata/common.yaml
+++ b/puppet/hieradata/common.yaml
@@ -18,7 +18,7 @@
cdh::oozie::server::heapsize: 64
crm::dir: %{hiera('mwv::services_dir')}/org.wikimedia.civicrm
-crm::site_name: crm.dev
+crm::site_name: crm.local.wmftest.net
crm::drupal_db: drupal
crm::civicrm_db: civicrm
crm::db_user: root
--
To view, visit https://gerrit.wikimedia.org/r/208736
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: If0c6a50a7725c44c15d10030dd98d3c2b954bf83
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: Awight awi...@wikimedia.org
Gerrit-Reviewer: 20after4 mmod...@wikimedia.org
Gerrit-Reviewer: AndyRussG andrew.green...@gmail.com
Gerrit-Reviewer: Awight awi...@wikimedia.org
Gerrit-Reviewer: Ejegg eeggles...@wikimedia.org
Gerrit-Reviewer: Katie Horn kh...@wikimedia.org
Gerrit-Reviewer: Ori.livneh o...@wikimedia.org
Gerrit-Reviewer: Ssmith ssm...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] support geoiplookup target on all enabled clusters - change (operations/puppet)
BBlack has submitted this change and it was merged.
Change subject: support geoiplookup target on all enabled clusters
..
support geoiplookup target on all enabled clusters
This enables support for both the /geoiplookup path and the geoiplookup.wm.o
hostname on all clusters with the enable_geoiplookup attribute. Previously
this only existed on bits.wm.o, but this brings it to the text/mobile
endpoints as well.
Change-Id: I8c90977e4937838451c6b09bacb5667cafe44ae9
---
M modules/varnish/templates/vcl/wikimedia.vcl.erb
1 file changed, 17 insertions(+), 0 deletions(-)
Approvals:
BBlack: Verified; Looks good to me, approved
diff --git a/modules/varnish/templates/vcl/wikimedia.vcl.erb
b/modules/varnish/templates/vcl/wikimedia.vcl.erb
index 5512c91..da555eb 100644
--- a/modules/varnish/templates/vcl/wikimedia.vcl.erb
+++ b/modules/varnish/templates/vcl/wikimedia.vcl.erb
@@ -306,6 +306,12 @@
error 204;
}
+% if @cluster_options.fetch(enable_geoiplookup, false) -%
+ if (req.url == /geoiplookup || req.http.host ==
geoiplookup.wikimedia.org) {
+ error 666 geoiplookup;
+ }
+% end -%
+
/* Function vcl_recv in %= @vcl %.inc.vcl will be appended here */
}
@@ -399,6 +405,17 @@
if (obj.status == 204 req.request == PURGE) {
set obj.http.Connection = keep-alive;
}
+
+% if @cluster_options.fetch(enable_geoiplookup, false) -%
+ // Support geoiplookup
+ if (obj.status == 666) {
+ call geoip_lookup;
+ set obj.status = 200;
+ set obj.http.Connection = keep-alive;
+ return (deliver);
+ }
+% end -%
+
/* Function vcl_error in %= @vcl %.inc.vcl will be appended here */
}
--
To view, visit https://gerrit.wikimedia.org/r/209173
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I8c90977e4937838451c6b09bacb5667cafe44ae9
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BBlack bbl...@wikimedia.org
Gerrit-Reviewer: BBlack bbl...@wikimedia.org
Gerrit-Reviewer: Ori.livneh o...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] graphite: split alerts role - change (operations/puppet)
Filippo Giunchedi has submitted this change and it was merged.
Change subject: graphite: split alerts role
..
graphite: split alerts role
Bug: T97754
Change-Id: Ie6cc01b44e467be3ef4d88ec2825d20d42ab5906
---
M manifests/role/graphite.pp
M manifests/site.pp
2 files changed, 9 insertions(+), 0 deletions(-)
Approvals:
Filippo Giunchedi: Verified; Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/role/graphite.pp b/manifests/role/graphite.pp
index 831a960..0b8f864 100644
--- a/manifests/role/graphite.pp
+++ b/manifests/role/graphite.pp
@@ -230,7 +230,15 @@
include role::backup::host
backup::set {'var-lib-carbon-whisper': }
+}
+# == Class: role::graphite::production::alerts
+#
+# Install icinga alerts on graphite metrics.
+# NOTE to be included only from one host, icinga will generate different alerts
+# for all hosts that include this class.
+#
+class role::graphite::production::alerts {
include ::mediawiki::monitoring::graphite
include ::eventlogging::monitoring::graphite
include ::swift::monitoring::graphite
diff --git a/manifests/site.pp b/manifests/site.pp
index 3e7027a..47a7bda 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1122,6 +1122,7 @@
include role::statsdlb
include role::gdash
include role::performance
+include role::graphite::production::alerts
}
# graphite test machine, currently with SSD caching + spinning disks
--
To view, visit https://gerrit.wikimedia.org/r/208083
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie6cc01b44e467be3ef4d88ec2825d20d42ab5906
Gerrit-PatchSet: 4
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Filippo Giunchedi fgiunch...@wikimedia.org
Gerrit-Reviewer: Alexandros Kosiaris akosia...@wikimedia.org
Gerrit-Reviewer: Faidon Liambotis fai...@wikimedia.org
Gerrit-Reviewer: Filippo Giunchedi fgiunch...@wikimedia.org
Gerrit-Reviewer: Giuseppe Lavagetto glavage...@wikimedia.org
Gerrit-Reviewer: Ori.livneh o...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Don't disable images whilst opting into beta - change (mediawiki...MobileFrontend)
Jdlrobson has uploaded a new change for review.
https://gerrit.wikimedia.org/r/209192
Change subject: Don't disable images whilst opting into beta
..
Don't disable images whilst opting into beta
Far too mean to be trolling like this.
Bug: T98187
Change-Id: Ifef83b8fa369f19f9a9d6eb4ab2164271104f8ea
---
M includes/specials/SpecialMobileOptions.php
1 file changed, 6 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend
refs/changes/92/209192/1
diff --git a/includes/specials/SpecialMobileOptions.php
b/includes/specials/SpecialMobileOptions.php
index 183c03a..f382761 100644
--- a/includes/specials/SpecialMobileOptions.php
+++ b/includes/specials/SpecialMobileOptions.php
@@ -269,11 +269,13 @@
}
$context-setMobileMode( $group );
$imagesDisabled = !$request-getBool( 'enableImages' );
- if ( $context-imagesDisabled() !== $imagesDisabled ) {
- // Only record when the state has changed
- $schemaData['images'] = $imagesDisabled ? off : on;
+ if ( $request-getVal( 'enableImages' ) !== null ) {
+ if ( $context-imagesDisabled() !== $imagesDisabled ) {
+ // Only record when the state has changed
+ $schemaData['images'] = $imagesDisabled ? off
: on;
+ }
+ $context-setDisableImagesCookie( $imagesDisabled );
}
- $context-setDisableImagesCookie( $imagesDisabled );
$returnToTitle = Title::newFromText( $request-getText(
'returnto' ) );
if ( $returnToTitle ) {
--
To view, visit https://gerrit.wikimedia.org/r/209192
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ifef83b8fa369f19f9a9d6eb4ab2164271104f8ea
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson jrob...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Restrict default styling to panels in #content area - change (mediawiki...MobileFrontend)
Jdlrobson has uploaded a new change for review.
https://gerrit.wikimedia.org/r/209194
Change subject: Restrict default styling to panels in #content area
..
Restrict default styling to panels in #content area
This rule is having nasty side effects in overlays
e.g. Gather edit screen, mobile editor
So restrict this to #content.
Bug: T98188
Change-Id: I1a4b82f859ec9a1c3c1001fd84574267f294412e
---
M resources/mobile.startup/panel.less
1 file changed, 8 insertions(+), 11 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend
refs/changes/94/209194/1
diff --git a/resources/mobile.startup/panel.less
b/resources/mobile.startup/panel.less
index a122654..ace20fe 100644
--- a/resources/mobile.startup/panel.less
+++ b/resources/mobile.startup/panel.less
@@ -2,19 +2,16 @@
@import minerva.variables;
// FIXME: Wikigrok uses the same styling for the .wikigrok class. Let's
consolidate.
-.panel {
- clear: both;
- margin-top: 1em;
- text-align: center;
-
- .content {
- padding: 1em @contentMargin;
- margin: 0;
- }
-}
-
#content {
.panel {
background-color: @grayLightest;
+ clear: both;
+ margin-top: 1em;
+ text-align: center;
+
+ .content {
+ padding: 1em @contentMargin;
+ margin: 0;
+ }
}
}
--
To view, visit https://gerrit.wikimedia.org/r/209194
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I1a4b82f859ec9a1c3c1001fd84574267f294412e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson jrob...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Adopted travis scripts to new composer file. - change (mediawiki...WikidataQuality)
Soeren.oldag has uploaded a new change for review.
https://gerrit.wikimedia.org/r/209196
Change subject: Adopted travis scripts to new composer file.
..
Adopted travis scripts to new composer file.
Change-Id: I3e7360e82051469f1b8262530ed3c03049b65b56
---
M build/travis/after_script.sh
M build/travis/before_script.sh
A build/travis/composer.local.json
M build/travis/script.sh
M composer.json
5 files changed, 32 insertions(+), 36 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikidataQuality
refs/changes/96/209196/1
diff --git a/build/travis/after_script.sh b/build/travis/after_script.sh
index 60a8ebe..ae2368b 100644
--- a/build/travis/after_script.sh
+++ b/build/travis/after_script.sh
@@ -1,7 +1,7 @@
#! /bin/bash
-cd ../wiki/extensions/WikidataQuality
+cd ../wiki
+wikiDirectory=$(pwd)
-ls build/logs
-
-php vendor/bin/coveralls -v
+cd extensions/Quality
+php $wikiDirectory/vendor/bin/coveralls -v
\ No newline at end of file
diff --git a/build/travis/before_script.sh b/build/travis/before_script.sh
index 4882eb8..5545fb0 100644
--- a/build/travis/before_script.sh
+++ b/build/travis/before_script.sh
@@ -3,6 +3,7 @@
set -x
originalDirectory=$(pwd)
+rm -rf .git/shallow
composer self-update
@@ -14,12 +15,6 @@
rm master.tar.gz
mv mediawiki-master wiki
-# checkout wikibase
-wget
https://github.com/wikimedia/mediawiki-extensions-Wikibase/archive/master.tar.gz
-tar -zxf master.tar.gz
-rm master.tar.gz
-mv mediawiki-extensions-Wikibase-master wiki/extensions/Wikibase
-
cd wiki
if [ $DBTYPE == mysql ]
@@ -27,20 +22,13 @@
mysql -e 'CREATE DATABASE its_a_mw;'
fi
-composer install --no-dev
+composer install
+
php maintenance/install.php --dbtype $DBTYPE --dbuser root --dbname its_a_mw
--dbpath $(pwd) --pass nyan TravisWiki admin
-cd extensions
-
-cp -r $originalDirectory WikidataQuality
-
-cd WikidataQuality
-composer install --dev --no-interaction --prefer-source
-
-cd ../Wikibase
-composer install --prefer-source
-
-cd ../..
+cp $originalDirectory/build/travis/composer.local.json composer.local.json
+sed -i.bak s:\$originalDirectory:$originalDirectory:g composer.local.json
+composer update
echo 'error_reporting(E_ALL| E_STRICT);' LocalSettings.php
echo 'ini_set(display_errors, 1);' LocalSettings.php
@@ -48,11 +36,8 @@
echo '$wgDevelopmentWarnings = true;' LocalSettings.php
echo '$wgLanguageCode = en;' LocalSettings.php
-echo define( 'WB_EXPERIMENTAL_FEATURES', true ); LocalSettings.php
-echo 'require_once __DIR__ . /extensions/Wikibase/repo/Wikibase.php;'
LocalSettings.php
-echo 'require_once __DIR__ . /extensions/Wikibase/repo/ExampleSettings.php;'
LocalSettings.php
-echo 'require_once __DIR__ .
/extensions/Wikibase/client/WikibaseClient.php;' LocalSettings.php
-echo 'require_once __DIR__ .
/extensions/WikidataQuality/WikidataQuality.php;' LocalSettings.php
-echo '$wgWBClientSettings[siteGlobalID] = enwiki;' LocalSettings.php
+echo '$wgEnableWikibaseRepo = true;' LocalSettings.php
+echo '$wgEnableWikibaseClient = false;' LocalSettings.php
+echo 'require_once $IP/extensions/Wikibase/repo/ExampleSettings.php;'
LocalSettings.php
-php maintenance/update.php --quick
+php maintenance/update.php --quick
\ No newline at end of file
diff --git a/build/travis/composer.local.json b/build/travis/composer.local.json
new file mode 100644
index 000..fd937ca
--- /dev/null
+++ b/build/travis/composer.local.json
@@ -0,0 +1,15 @@
+{
+ repositories: [
+ {
+ type: git,
+ url: $originalDirectory
+ }
+ ],
+ require: {
+ wikibase/quality: master-dev,
+ wikibase/wikibase: @dev
+ },
+ require-dev: {
+ satooshi/php-coveralls: master-dev
+ }
+}
\ No newline at end of file
diff --git a/build/travis/script.sh b/build/travis/script.sh
index 4f78065..ee3b220 100644
--- a/build/travis/script.sh
+++ b/build/travis/script.sh
@@ -3,7 +3,4 @@
set -x
cd ../wiki/tests/phpunit
-php phpunit.php -c ../../extensions/WikidataQuality/phpunit.xml.dist
-
-# cd ../wiki/extensions/WikidataQuality
-# php vendor/bin/phpunit -c phpunit.xml.dist
\ No newline at end of file
+php phpunit.php -c ../../extensions/Quality/phpunit.xml.dist
\ No newline at end of file
diff --git a/composer.json b/composer.json
index b047cd7..7536ec7 100644
--- a/composer.json
+++ b/composer.json
@@ -21,12 +21,12 @@
serialization/serialization: 3.*,=3.2.1
},
require-dev: {
- phpunit/phpunit: ~4.5,
- satooshi/php-coveralls: dev-master
+ phpunit/phpunit: ~4.5
},
autoload: {
psr-4: {
WikidataQuality\\: includes/,
+ WikidataQuality\\Api\\: api/,
WikidataQuality\\Specials\\: specials/,
[MediaWiki-commits] [Gerrit] Fix tab widget disabled styles - change (oojs/ui)
Esanders has uploaded a new change for review.
https://gerrit.wikimedia.org/r/209184
Change subject: Fix tab widget disabled styles
..
Fix tab widget disabled styles
Bonus: Add hover styles for Apex
Bug: T98197
Change-Id: I96d28bbc348780c4c1601887d6cf0be0dffb4e64
---
M demos/pages/dialogs.js
M src/themes/apex/widgets.less
M src/themes/mediawiki/widgets.less
3 files changed, 23 insertions(+), 6 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/84/209184/1
diff --git a/demos/pages/dialogs.js b/demos/pages/dialogs.js
index 67f2ffc..6e9da3f 100644
--- a/demos/pages/dialogs.js
+++ b/demos/pages/dialogs.js
@@ -321,6 +321,8 @@
this.indexLayout.addCards( this.cards );
this.$body.append( this.indexLayout.$element );
+
+ this.indexLayout.getTabs().getItemFromData( 'fourth'
).setDisabled( true );
};
IndexedDialog.prototype.getActionProcess = function ( action ) {
if ( action ) {
diff --git a/src/themes/apex/widgets.less b/src/themes/apex/widgets.less
index d868635..f415b6d 100644
--- a/src/themes/apex/widgets.less
+++ b/src/themes/apex/widgets.less
@@ -545,8 +545,21 @@
background-color: transparent;
}
+ .oo-ui-widget-enabled {
+ :hover {
+ background-color: rgba(255, 255, 255, 0.2);
+ border-color: #ddd;
+ }
+
+ :active {
+ background-color: #fff;
+ border-color: #ddd;
+ }
+ }
+
.oo-ui-selectWidget-pressed .oo-ui-optionWidget-selected,
- .oo-ui-selectWidget-depressed .oo-ui-optionWidget-selected {
+ .oo-ui-selectWidget-depressed .oo-ui-optionWidget-selected,
+ .oo-ui-optionWidget-selected:hover {
background-color: #fff;
border-color: #ddd;
}
diff --git a/src/themes/mediawiki/widgets.less
b/src/themes/mediawiki/widgets.less
index 755f422..7245cd3 100644
--- a/src/themes/mediawiki/widgets.less
+++ b/src/themes/mediawiki/widgets.less
@@ -717,12 +717,14 @@
color: #666;
font-weight: bold;
- :hover {
- background-color: rgba(255, 255, 255, 0.3);
- }
+ .oo-ui-widget-enabled {
+ :hover {
+ background-color: rgba(255, 255, 255, 0.3);
+ }
- :active {
- background-color: rgba(255, 255, 255, 0.8);
+ :active {
+ background-color: rgba(255, 255, 255, 0.8);
+ }
}
.oo-ui-indicatorElement .oo-ui-labelElement-label {
--
To view, visit https://gerrit.wikimedia.org/r/209184
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I96d28bbc348780c4c1601887d6cf0be0dffb4e64
Gerrit-PatchSet: 1
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: Esanders esand...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] [FIX] http_tests: Reset version number - change (pywikibot/core)
XZise has uploaded a new change for review.
https://gerrit.wikimedia.org/r/209185
Change subject: [FIX] http_tests: Reset version number
..
[FIX] http_tests: Reset version number
After 65450196 has been implemented it changed the version number to an
invalid value which worked for the test but not for subsequent tests.
This is caching the old value and restoring it after the tests.
Change-Id: I9523f715b930194eff347ed5a9abb8b95226f965
---
M tests/http_tests.py
1 file changed, 11 insertions(+), 7 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core
refs/changes/85/209185/1
diff --git a/tests/http_tests.py b/tests/http_tests.py
index a42557b..f3255fd 100644
--- a/tests/http_tests.py
+++ b/tests/http_tests.py
@@ -330,13 +330,17 @@
self.assertEqual('%E2%81%82', http.user_agent_username(u'⁂'))
def test_version(self):
-pywikibot.version.cache = None
-http.user_agent(format_string='version does not appear')
-self.assertIsNone(pywikibot.version.cache)
-pywikibot.version.cache = {'rev': 'dummy'}
-self.assertEqual(http.user_agent(format_string='{version} does
appear'),
- 'dummy does appear')
-self.assertIsNotNone(pywikibot.version.cache)
+old_cache = pywikibot.version.cache
+try:
+pywikibot.version.cache = None
+http.user_agent(format_string='version does not appear')
+self.assertIsNone(pywikibot.version.cache)
+pywikibot.version.cache = {'rev': 'dummy'}
+self.assertEqual(http.user_agent(format_string='{version} does
appear'),
+ 'dummy does appear')
+self.assertIsNotNone(pywikibot.version.cache)
+finally:
+pywikibot.version.cache = old_cache
class DefaultUserAgentTestCase(TestCase):
--
To view, visit https://gerrit.wikimedia.org/r/209185
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I9523f715b930194eff347ed5a9abb8b95226f965
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: XZise commodorefabia...@gmx.de
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add ii18n for status partial compliance - change (mediawiki...WikidataQuality)
Dominic.sauer has uploaded a new change for review.
https://gerrit.wikimedia.org/r/209187
Change subject: Add ii18n for status partial compliance
..
Add ii18n for status partial compliance
Change-Id: Ib036f36c1aa3495bdf3f940d7bef3d2da7b1de8e
---
M i18n/de.json
M i18n/en.json
M i18n/qqq.json
3 files changed, 4 insertions(+), 1 deletion(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikidataQuality
refs/changes/87/209187/1
diff --git a/i18n/de.json b/i18n/de.json
index 4ac58bd..79162a4 100755
--- a/i18n/de.json
+++ b/i18n/de.json
@@ -13,6 +13,7 @@
wikidataquality-checkresult-result-headline: Ergebnis für $1,
wikidataquality-checkresult-result-table-header-status: Status,
wikidataquality-checkresult-status-compliance: Übereinstimmung,
+ wikidataquality-checkresult-status-partial-compliance: Teilweise
Übereinstimmung,
wikidataquality-checkresult-status-violation: Nichtübereinstimmung,
wikidataquality-checkresult-status-exception: Ausnahme,
wikidataquality-checkresult-status-references-missing: Fehlende
Bezüge,
diff --git a/i18n/en.json b/i18n/en.json
old mode 100644
new mode 100755
index c104b27..22e666f
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -11,6 +11,7 @@
wikidataquality-checkresult-result-headline: Result for $1,
wikidataquality-checkresult-result-table-header-status: Status,
wikidataquality-checkresult-status-compliance: Compliance,
+ wikidataquality-checkresult-status-partial-compliance: Partial
compliance,
wikidataquality-checkresult-status-violation: Violation,
wikidataquality-checkresult-status-exception: Exception,
wikidataquality-checkresult-status-references-missing: Missing
references,
diff --git a/i18n/qqq.json b/i18n/qqq.json
old mode 100644
new mode 100755
index f228162..10e572c
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -15,7 +15,8 @@
wikidataquality-checkresult-not-existent-entity: Error message that
appears when the entered entity does not exist.,
wikidataquality-checkresult-result-headline: Headline that appears
above the results. Has one parameter, that is the label of the entity, that was
checked.,
wikidataquality-checkresult-result-table-header-status: Header of
the column that shows the result of the constraint
check.\n{{Identical|Status}},
- wikidataquality-checkresult-status-compliance: Status for claims
that comply with the check.,
+ wikidataquality-checkresult-status-compliance: Status for claims
that comply completely with the check.,
+ wikidataquality-checkresult-status-partial-compliance: Status for
claims that comply partially with the check.,
wikidataquality-checkresult-status-violation: Status claims that are
violated in any way.,
wikidataquality-checkresult-status-exception: Status claims that are
violated, but marked as an exception.\n{{Identical|Exception}},
wikidataquality-checkresult-status-references-missing: Status for
claims for which references are missing.,
--
To view, visit https://gerrit.wikimedia.org/r/209187
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib036f36c1aa3495bdf3f940d7bef3d2da7b1de8e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikidataQuality
Gerrit-Branch: v1
Gerrit-Owner: Dominic.sauer dominic.sa...@yahoo.de
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] i18n: Update i18n message to link to collection - change (mediawiki...Gather)
jenkins-bot has submitted this change and it was merged. Change subject: i18n: Update i18n message to link to collection .. i18n: Update i18n message to link to collection Bug: T97177 Change-Id: I51d9eb29cf8a43bb63612f6d4306d725d6923db3 --- M i18n/en.json 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Jhernandez: Looks good to me, approved jenkins-bot: Verified diff --git a/i18n/en.json b/i18n/en.json index 4431aae..2d993ae 100644 --- a/i18n/en.json +++ b/i18n/en.json @@ -90,10 +90,10 @@ gather-private: Private, gather-public: Public, gather-hidden: Hidden, - gather-moderation-hidden: Your collection $1 was hidden. This means that you are the only one who can see it. Collections are hidden if they go against our [[Project:Gather/Moderation_Criteria|moderation criteria]]. You can contest this [[Project:Gather/User_Feedback|here]]., + gather-moderation-hidden: [[$1|Your collection]] was hidden. This means that you are the only one who can see it. Collections are hidden if they go against our [[Project:Gather/Moderation_Criteria|moderation criteria]]. You can contest this [[Project:Gather/User_Feedback|here]]., gather-moderation-hidden-email-subject:Your collection $1 was hidden., gather-moderation-hidden-email-body: Your collection $1 was hidden. This means that you are the only one who can see it. Collections are hidden if they go against our moderation criteria:\nhttps://en.wikipedia.org/wiki/Wikipedia:Gather/Moderation_Criteria\n\nYou can contest this on the following page:\nhttps://en.wikipedia.org/wiki/Wikipedia:Gather/User_Feedback;, - gather-moderation-unhidden: Your collection $1 was unhidden. This means that it can be viewed publicly again. , + gather-moderation-unhidden: [[$1|Your collection]] was unhidden. This means that it can be viewed publicly again. , gather-moderation-unhidden-email-subject: Your collection $1 was unhidden., gather-moderation-unhidden-email-body: Your collection $1 was unhidden. This means that it can be viewed publicly again., echo-category-title-gather: Gather, -- To view, visit https://gerrit.wikimedia.org/r/207658 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I51d9eb29cf8a43bb63612f6d4306d725d6923db3 Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/extensions/Gather Gerrit-Branch: master Gerrit-Owner: Jdlrobson jrob...@wikimedia.org Gerrit-Reviewer: Jhernandez jhernan...@wikimedia.org Gerrit-Reviewer: Siebrand siebr...@kitano.nl Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] New Wikidata Build - 2015-05-06T10:00:01+0000 - change (mediawiki...Wikidata)
WikidataBuilder has uploaded a new change for review.
https://gerrit.wikimedia.org/r/209193
Change subject: New Wikidata Build - 2015-05-06T10:00:01+
..
New Wikidata Build - 2015-05-06T10:00:01+
Change-Id: If8761ebc2a1e3fd7beb3fc55beb5e5a75453a2aa
---
M composer.lock
M extensions/Wikibase/client/i18n/an.json
M extensions/Wikibase/client/i18n/os.json
M extensions/Wikibase/client/i18n/scn.json
M extensions/Wikibase/client/i18n/ta.json
M extensions/Wikibase/client/i18n/tr.json
M extensions/Wikibase/client/includes/Usage/Sql/UsageTableUpdater.php
M extensions/Wikibase/client/resources/Resources.php
M
extensions/Wikibase/client/tests/phpunit/includes/Changes/AffectedPagesFinderTest.php
M
extensions/Wikibase/client/tests/phpunit/includes/DataAccess/Scribunto/EntityAccessorTest.php
M
extensions/Wikibase/client/tests/phpunit/includes/SiteLinkCommentCreatorTest.php
M extensions/Wikibase/docs/options.wiki
A extensions/Wikibase/lib/i18n/os.json
M extensions/Wikibase/lib/i18n/scn.json
M extensions/Wikibase/lib/includes/parsers/DispatchingValueParser.php
A extensions/Wikibase/lib/includes/store/EntityRedirectLookup.php
M extensions/Wikibase/lib/includes/store/sql/SqlEntityInfoBuilder.php
M extensions/Wikibase/lib/includes/store/sql/TermSqlIndex.php
M extensions/Wikibase/lib/includes/store/sql/WikiPageEntityMetaDataLookup.php
M extensions/Wikibase/lib/maintenance/populateSitesTable.php
M
extensions/Wikibase/lib/tests/phpunit/store/PrefetchingWikiPageEntityMetaDataAccessorTest.php
M extensions/Wikibase/lib/tests/phpunit/store/TermIndexTest.php
M extensions/Wikibase/repo/config/Wikibase.default.php
M extensions/Wikibase/repo/i18n/be-tarask.json
M extensions/Wikibase/repo/i18n/et.json
M extensions/Wikibase/repo/i18n/os.json
M extensions/Wikibase/repo/i18n/scn.json
M extensions/Wikibase/repo/includes/api/ApiErrorReporter.php
M extensions/Wikibase/repo/includes/specials/SpecialGoToLinkedPage.php
M extensions/Wikibase/repo/includes/store/EntityPerPage.php
M extensions/Wikibase/repo/includes/store/Store.php
M extensions/Wikibase/repo/includes/store/sql/EntityPerPageTable.php
M extensions/Wikibase/repo/includes/store/sql/SqlStore.php
M extensions/Wikibase/repo/resources/Resources.php
M
extensions/Wikibase/repo/tests/phpunit/includes/Hooks/OutputPageJsConfigHookHandlerTest.php
M
extensions/Wikibase/repo/tests/phpunit/includes/specials/SpecialGoToLinkedPageTest.php
M
extensions/Wikibase/repo/tests/phpunit/includes/specials/SpecialSetSiteLinkTest.php
M
extensions/Wikibase/repo/tests/phpunit/includes/store/sql/EntityPerPageTableTest.php
M
extensions/Wikibase/repo/tests/phpunit/includes/store/sql/TermSearchKeyBuilderTest.php
M extensions/Wikibase/repo/tests/phpunit/includes/store/sql/TermSqlIndexTest.php
M extensions/Wikibase/view/resources/jquery/wikibase/resources.php
M extensions/Wikibase/view/resources/jquery/wikibase/toolbar/resources.php
M extensions/Wikibase/view/resources/templates.php
M extensions/Wikibase/view/resources/wikibase/resources.php
M vendor/composer/autoload_classmap.php
M vendor/composer/installed.json
46 files changed, 275 insertions(+), 102 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikidata
refs/changes/93/209193/1
diff --git a/composer.lock b/composer.lock
index 65784aa..51bf0a0 100644
--- a/composer.lock
+++ b/composer.lock
@@ -1213,12 +1213,12 @@
source: {
type: git,
url:
https://github.com/wikimedia/mediawiki-extensions-Wikibase.git;,
-reference: 59fe3a6237e25b2236bc4975ac8d56017a61ebc1
+reference: 867a1dd3615c4af24fe992ffea8460268e64c22b
},
dist: {
type: zip,
-url:
https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/59fe3a6237e25b2236bc4975ac8d56017a61ebc1;,
-reference: 59fe3a6237e25b2236bc4975ac8d56017a61ebc1,
+url:
https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/867a1dd3615c4af24fe992ffea8460268e64c22b;,
+reference: 867a1dd3615c4af24fe992ffea8460268e64c22b,
shasum:
},
require: {
@@ -1286,7 +1286,7 @@
wikibaserepo,
wikidata
],
-time: 2015-05-04 22:05:18
+time: 2015-05-06 02:22:58
},
{
name: wikibase/wikimedia-badges,
diff --git a/extensions/Wikibase/client/i18n/an.json
b/extensions/Wikibase/client/i18n/an.json
index 8ae59e2..0631f52 100644
--- a/extensions/Wikibase/client/i18n/an.json
+++ b/extensions/Wikibase/client/i18n/an.json
@@ -4,5 +4,6 @@
Carlos Cristia
]
},
+ wikibase-rc-hide-wikidata-show: Amostrar,
wikibase-rc-wikibase-edit-letter: D
}
diff --git a/extensions/Wikibase/client/i18n/os.json
[MediaWiki-commits] [Gerrit] allow different logging methods for the eval job - change (mediawiki...WikidataQualityConstraints)
Andreasburmeister has uploaded a new change for review.
https://gerrit.wikimedia.org/r/209197
Change subject: allow different logging methods for the eval job
..
allow different logging methods for the eval job
also fixed issue with formatting of values on special page
Change-Id: I498110c84b557f7c4edc7349156d13e29e00b36a
---
M includes/CheckForConstraintViolationsJob.php
M specials/SpecialConstraintReport.php
M tests/phpunit/CheckForConstraintViolationsJobTest.php
M tests/phpunit/Specials/SpecialConstraintReportTest.php
4 files changed, 34 insertions(+), 50 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikidataQualityConstraints
refs/changes/97/209197/1
diff --git a/includes/CheckForConstraintViolationsJob.php
b/includes/CheckForConstraintViolationsJob.php
index 19fbf1f..2464101 100644
--- a/includes/CheckForConstraintViolationsJob.php
+++ b/includes/CheckForConstraintViolationsJob.php
@@ -14,6 +14,26 @@
class CheckForConstraintViolationsJob extends Job {
+ private $defaultLoggingMethod;
+
+ private $loggingMethod;
+
+ public function setLoggingMethod( $class, $loggingMethod ) {
+ $this-loggingMethod = array( $class, $loggingMethod );
+ }
+
+ public function resetLoggingMethod( ) {
+ $this-loggingMethod = $this-defaultLoggingMethod;
+ }
+
+ private function defaultLoggingMethod( $logEntry ) {
+ wfDebugLog( 'wdqa_evaluation', $logEntry );
+ }
+
+ private function writeLog( $logEntry ) {
+ call_user_func( $this-loggingMethod, $logEntry );
+ }
+
public static function newInsertNow( Entity $entity, $checkTimestamp,
$results ) {
// The Job class wants a Title object for some reason. Supply a
dummy.
$dummyTitle = Title::newFromText(
CheckForConstraintViolationsJob, NS_SPECIAL );
@@ -44,6 +64,9 @@
public function __construct( Title $title, $params ) {
parent::__construct( 'checkForConstraintViolations', $title,
$params );
+
+ $this-defaultLoggingMethod = array( $this,
'defaultLoggingMethod' );
+ $this-loggingMethod = $this-defaultLoggingMethod;
}
public function run() {
@@ -67,7 +90,7 @@
'result_summary' = $this-buildResultSummary( $results
)
);
- wfDebugLog( 'wdqa_evaluation', json_encode( $accumulator ) );
+ $this-writeLog( json_encode( $accumulator ) );
}
private function buildResultSummary( $results ) {
diff --git a/specials/SpecialConstraintReport.php
b/specials/SpecialConstraintReport.php
index 1c81115..2e59c50 100755
--- a/specials/SpecialConstraintReport.php
+++ b/specials/SpecialConstraintReport.php
@@ -146,7 +146,7 @@
// Claim column
$property =
$this-entityIdHtmlLinkFormatter-formatEntityId( $result-getPropertyId() );
- if ( $result-getMainSnakType() !== 'value' ) {
+ if ( $result-getMainSnakType() === 'value' ) {
$value = $this-formatValue(
$result-getDataValue() );
} else {
$value = $result-getMainSnakType();
@@ -299,14 +299,11 @@
}
protected function doEvaluation( $entity, $results ) {
- //TODO: Push (deferred) job(s) in queue
$checkTimeStamp = wfTimestamp( TS_MW );
$jobs = array ();
$jobs[ ] = CheckForConstraintViolationsJob::newInsertNow(
$entity, $checkTimeStamp, $results );
$jobs[ ] = CheckForConstraintViolationsJob::newInsertDeferred(
$entity, $checkTimeStamp, 10 );
- $jobs[ 0 ]-run();
- $jobs[ 1 ]-run();
JobQueueGroup::singleton()-push( $jobs );
}
diff --git a/tests/phpunit/CheckForConstraintViolationsJobTest.php
b/tests/phpunit/CheckForConstraintViolationsJobTest.php
index 3d659bd..b261b0e 100644
--- a/tests/phpunit/CheckForConstraintViolationsJobTest.php
+++ b/tests/phpunit/CheckForConstraintViolationsJobTest.php
@@ -30,8 +30,7 @@
private $checkTimestamp;
private $constraintName;
private $results;
- private $testLogFileName;
- private $oldLogFileName;
+ private $logEntry;
protected function setUp() {
parent::setUp();
@@ -54,25 +53,10 @@
$results[] = new CheckResult( $statement,
$this-constraintName, array (), 'some other status' );
$results[] = new CheckResult( $statement,
$this-constraintName, array (), 'yet another one' );
$this-results = $results;
-
- $this-testLogFileName =
'/var/log/mediawiki/test_wdqa_evaluation.log';
- if( file_exists( $this-testLogFileName ) ) {
-
[MediaWiki-commits] [Gerrit] Hygiene: Remove config rules from jscs where in preset - change (mediawiki...MobileFrontend)
Jdlrobson has uploaded a new change for review.
https://gerrit.wikimedia.org/r/209183
Change subject: Hygiene: Remove config rules from jscs where in preset
..
Hygiene: Remove config rules from jscs where in preset
These rules are all specified in the preset @
https://github.com/jscs-dev/node-jscs/blob/master/presets/wikimedia.json
Change-Id: I002e19c6e9f7ba8a8bcd24ee1a761750f3b074ff
---
M .jscsrc
1 file changed, 0 insertions(+), 7 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend
refs/changes/83/209183/1
diff --git a/.jscsrc b/.jscsrc
index 85a..3cba22d 100644
--- a/.jscsrc
+++ b/.jscsrc
@@ -1,21 +1,14 @@
{
preset: wikimedia,
- requireMultipleVarDecl: onevar,
- requireLineBreakAfterVariableAssignment: true,
- disallowOperatorBeforeLineBreak: [.],
- requireBlocksOnNewline: true,
- requireLineFeedAtFileEnd: true,
requirePaddingNewLinesInObjects: true,
disallowDanglingUnderscores: null,
- requireSpacesInsideParentheses: all,
disallowImplicitTypeConversion: [numeric, boolean, binary, string],
validateJSDoc: {
checkParamNames: true,
requireParamTypes: true,
checkRedundantParams: true
},
- validateIndentation: \t,
excludeFiles: [javascripts/externals/**/*.js, javascripts/README.md],
additionalRules: [
node_modules/jscs-jsdoc/lib/rules/*.js
--
To view, visit https://gerrit.wikimedia.org/r/209183
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I002e19c6e9f7ba8a8bcd24ee1a761750f3b074ff
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson jrob...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] role::cache: decommission statsite - change (operations/puppet)
Filippo Giunchedi has uploaded a new change for review.
https://gerrit.wikimedia.org/r/209188
Change subject: role::cache: decommission statsite
..
role::cache: decommission statsite
logster traffic hits statsd.eqiad.wmnet already thus a local statsite instance
is not needed anymore.
Bug: T95687
Change-Id: I948bfb69978a17dcbf40e7ba33a7449303dcb6b2
---
M modules/role/manifests/cache/statsd.pp
1 file changed, 1 insertion(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/88/209188/1
diff --git a/modules/role/manifests/cache/statsd.pp
b/modules/role/manifests/cache/statsd.pp
index 06f20d3..26e41d2 100644
--- a/modules/role/manifests/cache/statsd.pp
+++ b/modules/role/manifests/cache/statsd.pp
@@ -2,6 +2,5 @@
# Installs a local statsd instance for aggregating and serializing
# stats before sending them off to a remote statsd instance.
class role::cache::statsd {
-class { '::txstatsd::decommission': }
-include role::statsite
+class { '::statsite::decommission': }
}
--
To view, visit https://gerrit.wikimedia.org/r/209188
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I948bfb69978a17dcbf40e7ba33a7449303dcb6b2
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Filippo Giunchedi fgiunch...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Until seentime is recorded, we should treat notifications as... - change (mediawiki...Echo)
Matthias Mullie has uploaded a new change for review.
https://gerrit.wikimedia.org/r/209189
Change subject: Until seentime is recorded, we should treat notifications as
unseen
..
Until seentime is recorded, we should treat notifications as unseen
Since we didn't use to save seen time, it is unreliable at first.
I decided to just show them as read then, since we couldn't know
if they had or hadn't been read.
However, it would make more sense to keep them unread until we first
save the time a notifiation is seen: it is in line with the current
behavior (where the badge just stays red, always)
Also fixed a problem where I meant to .get a value but had .set
instead. It wasn't noticable because that function is currently
only called when things have just been seen, so even though it
was wrong, it produced a good result.
Bug: T94634
Change-Id: I7ee447249527feb3914c76cfffd673bbda062b75
---
M Hooks.php
M modules/overlay/ext.echo.overlay.js
2 files changed, 3 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Echo
refs/changes/89/209189/1
diff --git a/Hooks.php b/Hooks.php
index cea3ebf..75864e8 100644
--- a/Hooks.php
+++ b/Hooks.php
@@ -654,8 +654,7 @@
if (
$notificationCount == 0 || // no unread
notifications
$notificationTimestamp === false || // should
already always be false if count === 0
- $seenTime === null || // seenTime hasn't yet
been recorded, don't rely on it
- $notificationTimestamp-getTimestamp( TS_MW )
= $seenTime // all notifications have already been seen
+ ( $seenTime !== null
$notificationTimestamp-getTimestamp( TS_MW ) = $seenTime ) // all
notifications have already been seen
) {
$linkClasses = array(
'mw-echo-notifications-badge' );
} else {
diff --git a/modules/overlay/ext.echo.overlay.js
b/modules/overlay/ext.echo.overlay.js
index cdc18a8..ecb0a5e 100644
--- a/modules/overlay/ext.echo.overlay.js
+++ b/modules/overlay/ext.echo.overlay.js
@@ -257,13 +257,13 @@
updateBadgeColor: function () {
var $badge = mw.echo.getBadge(),
count = this.notificationCount.unreadRaw,
- seenTime = mw.user.options.set(
'echo-seen-time' ),
+ seenTime = mw.user.options.get(
'echo-seen-time' ),
seen = true;
// figure out if unread notifications in all tabs have
already been seen
$.each( this.tabs, function ( key, tab ) {
var time = tab.getLastUnreadNotificationTime();
- seen = seen ( time === false || time
seenTime );
+ seen = seen ( time === false || ( seenTime
!== null time seenTime ) );
} );
if ( !seen count !== '0' count !== 0 ) {
--
To view, visit https://gerrit.wikimedia.org/r/209189
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I7ee447249527feb3914c76cfffd673bbda062b75
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Echo
Gerrit-Branch: master
Gerrit-Owner: Matthias Mullie mmul...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add status for partial compliance. CompareResult has now a s... - change (mediawiki...WikidataQualityExternalValidation)
Soeren.oldag has submitted this change and it was merged.
Change subject: Add status for partial compliance. CompareResult has now a
status (returned by comparer) instead of a mismatch boolean.
..
Add status for partial compliance. CompareResult has now a status (returned by
comparer) instead of a mismatch boolean.
Change-Id: I29aada30641e6539a1306f7062537a2e3c75c812
---
M includes/CrossCheck/Comparer/EntityIdValueComparer.php
M includes/CrossCheck/Comparer/GlobeCoordinateValueComparer.php
M includes/CrossCheck/Comparer/MonolingualTextValueComparer.php
M includes/CrossCheck/Comparer/MultilingualTextValueComparer.php
M includes/CrossCheck/Comparer/QuantityValueComparer.php
M includes/CrossCheck/Comparer/StringComparer.php
M includes/CrossCheck/Comparer/StringValueComparer.php
M includes/CrossCheck/Comparer/TimeValueComparer.php
M includes/CrossCheck/Result/CompareResult.php
M includes/CrossCheck/Result/CrossCheckResult.php
M includes/CrossCheck/Result/CrossCheckResultList.php
M includes/Serializer/CompareResultSerializer.php
M tests/phpunit/CheckForCrossCheckViolationsJobTest.php
M tests/phpunit/CrossCheck/Comparer/EntityIdValueComparerTest.php
M tests/phpunit/CrossCheck/Comparer/GlobeCoordinateValueComparerTest.php
M tests/phpunit/CrossCheck/Comparer/MonolingualTextValueComparerTest.php
M tests/phpunit/CrossCheck/Comparer/MultilingualTextValueComparerTest.php
M tests/phpunit/CrossCheck/Comparer/QuantityValueComparerTest.php
M tests/phpunit/CrossCheck/Comparer/StringComparerTest.php
M tests/phpunit/CrossCheck/Comparer/StringValueComparerTest.php
M tests/phpunit/CrossCheck/Comparer/TimeValueComparerTest.php
M tests/phpunit/CrossCheck/Result/CompareResultTest.php
M tests/phpunit/CrossCheck/Result/CrossCheckResultListTest.php
M tests/phpunit/CrossCheck/Result/CrossCheckResultTest.php
M tests/phpunit/Serializer/CompareResultSerializerTest.php
M tests/phpunit/Serializer/SerializerFactoryTest.php
26 files changed, 202 insertions(+), 135 deletions(-)
Approvals:
Soeren.oldag: Verified; Looks good to me, approved
diff --git a/includes/CrossCheck/Comparer/EntityIdValueComparer.php
b/includes/CrossCheck/Comparer/EntityIdValueComparer.php
index fdff06a..0f5eda7 100755
--- a/includes/CrossCheck/Comparer/EntityIdValueComparer.php
+++ b/includes/CrossCheck/Comparer/EntityIdValueComparer.php
@@ -46,6 +46,7 @@
* @param DataValue $localValue
* @param array $externalValues
* @param DumpMetaInformation $dumpMetaInformation
+ * @throws InvalidArgumentException
* @return CompareResult
*/
public function compare( DataValue $localValue, array $externalValues,
DumpMetaInformation $dumpMetaInformation ) {
@@ -58,10 +59,10 @@
$terms = $this-getTerms( $entityId, $language );
if ( !empty( $terms ) ) {
-$match = $this-stringComparer-compareArrays( $terms,
$externalValues );
+$status = $this-stringComparer-compareArrays( $terms,
$externalValues );
$externalValues = $this-parseExternalValues( $externalValues,
$dumpMetaInformation );
-return new CompareResult( $localValue, $externalValues, !$match );
+return new CompareResult( $localValue, $externalValues, $status );
}
}
diff --git a/includes/CrossCheck/Comparer/GlobeCoordinateValueComparer.php
b/includes/CrossCheck/Comparer/GlobeCoordinateValueComparer.php
old mode 100644
new mode 100755
index 952316a..d973fea
--- a/includes/CrossCheck/Comparer/GlobeCoordinateValueComparer.php
+++ b/includes/CrossCheck/Comparer/GlobeCoordinateValueComparer.php
@@ -26,6 +26,7 @@
* @param DataValue $localValue
* @param array $externalValues
* @param DumpMetaInformation $dumpMetaInformation
+ * @throws InvalidArgumentException
* @return CompareResult
*/
public function compare( DataValue $localValue, array $externalValues,
DumpMetaInformation $dumpMetaInformation ) {
@@ -38,16 +39,16 @@
$externalValues = $this-parseExternalValues( $externalValues,
$dumpMetaInformation );
-$dataMismatch = true;
+$status = CompareResult::STATUS_MISMATCH;
foreach ( $externalValues as $externalValue ) {
$formattedExternalValue = $globeFormatter-format( $externalValue
);
if ( $formattedLocalValue === $formattedExternalValue ) {
-$dataMismatch = false;
+$status = CompareResult::STATUS_COMPLIANCE;
break;
}
}
-return new CompareResult( $localValue, $externalValues, $dataMismatch
);
+return new CompareResult( $localValue, $externalValues, $status );
}
/**
diff --git a/includes/CrossCheck/Comparer/MonolingualTextValueComparer.php
b/includes/CrossCheck/Comparer/MonolingualTextValueComparer.php
index b01990f..c39f0db 100755
--- a/includes/CrossCheck/Comparer/MonolingualTextValueComparer.php
+++
[MediaWiki-commits] [Gerrit] Hygiene: Watchstar and watchlist - resources folder - change (mediawiki...MobileFrontend)
Jdlrobson has uploaded a new change for review. https://gerrit.wikimedia.org/r/209186 Change subject: Hygiene: Watchstar and watchlist - resources folder .. Hygiene: Watchstar and watchlist - resources folder Change-Id: I464615b6605c202eefe57370e0eab8dfb150ca7a --- M includes/Resources.php R resources/mobile.watchlist/WatchList.js R resources/mobile.watchlist/WatchListApi.js R resources/mobile.watchstar.init/init.js R resources/mobile.watchstar/Watchstar.js R resources/mobile.watchstar/WatchstarApi.js R resources/mobile.watchstar/watchstar.less R tests/qunit/mobile.watchlist/test_WatchList.js R tests/qunit/mobile.watchlist/test_WatchListApi.js R tests/qunit/mobile.watchstar/test_Watchstar.js R tests/qunit/mobile.watchstar/test_WatchstarApi.js 11 files changed, 6 insertions(+), 6 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend refs/changes/86/209186/1 diff --git a/includes/Resources.php b/includes/Resources.php index 9e19c33..8af935f 100644 --- a/includes/Resources.php +++ b/includes/Resources.php @@ -295,8 +295,8 @@ 'mobile.pagelist.scripts', ), 'scripts' = array( - 'javascripts/modules/watchlist/WatchListApi.js', - 'javascripts/modules/watchlist/WatchList.js', + 'resources/mobile.watchlist/WatchListApi.js', + 'resources/mobile.watchlist/WatchList.js', ), 'messages' = array( 'mobile-frontend-watchlist-modified', @@ -1021,11 +1021,11 @@ 'mobile.loggingSchemas', ), 'scripts' = array( - 'javascripts/modules/watchstar/WatchstarApi.js', - 'javascripts/modules/watchstar/Watchstar.js', + 'resources/mobile.watchstar/WatchstarApi.js', + 'resources/mobile.watchstar/Watchstar.js', ), 'styles' = array( - 'less/modules/watchstar.less', + 'resources/mobile.watchstar/watchstar.less', ), 'messages' = array( 'watchthispage', @@ -1043,7 +1043,7 @@ 'mobile.watchstar', ), 'scripts' = array( - 'javascripts/modules/watchstar/init.js', + 'resources/mobile.watchstar.init/init.js', ), 'messages' = array( 'watchthispage', diff --git a/javascripts/modules/watchlist/WatchList.js b/resources/mobile.watchlist/WatchList.js similarity index 100% rename from javascripts/modules/watchlist/WatchList.js rename to resources/mobile.watchlist/WatchList.js diff --git a/javascripts/modules/watchlist/WatchListApi.js b/resources/mobile.watchlist/WatchListApi.js similarity index 100% rename from javascripts/modules/watchlist/WatchListApi.js rename to resources/mobile.watchlist/WatchListApi.js diff --git a/javascripts/modules/watchstar/init.js b/resources/mobile.watchstar.init/init.js similarity index 100% rename from javascripts/modules/watchstar/init.js rename to resources/mobile.watchstar.init/init.js diff --git a/javascripts/modules/watchstar/Watchstar.js b/resources/mobile.watchstar/Watchstar.js similarity index 100% rename from javascripts/modules/watchstar/Watchstar.js rename to resources/mobile.watchstar/Watchstar.js diff --git a/javascripts/modules/watchstar/WatchstarApi.js b/resources/mobile.watchstar/WatchstarApi.js similarity index 100% rename from javascripts/modules/watchstar/WatchstarApi.js rename to resources/mobile.watchstar/WatchstarApi.js diff --git a/less/modules/watchstar.less b/resources/mobile.watchstar/watchstar.less similarity index 100% rename from less/modules/watchstar.less rename to resources/mobile.watchstar/watchstar.less diff --git a/tests/qunit/modules/watchlist/test_WatchList.js b/tests/qunit/mobile.watchlist/test_WatchList.js similarity index 100% rename from tests/qunit/modules/watchlist/test_WatchList.js rename to tests/qunit/mobile.watchlist/test_WatchList.js diff --git a/tests/qunit/modules/watchlist/test_WatchListApi.js b/tests/qunit/mobile.watchlist/test_WatchListApi.js similarity index 100% rename from tests/qunit/modules/watchlist/test_WatchListApi.js rename to tests/qunit/mobile.watchlist/test_WatchListApi.js diff --git a/tests/qunit/modules/watchstar/test_Watchstar.js b/tests/qunit/mobile.watchstar/test_Watchstar.js similarity index 100% rename from tests/qunit/modules/watchstar/test_Watchstar.js rename to tests/qunit/mobile.watchstar/test_Watchstar.js diff --git a/tests/qunit/modules/watchstar/test_WatchstarApi.js b/tests/qunit/mobile.watchstar/test_WatchstarApi.js similarity index 100% rename from tests/qunit/modules/watchstar/test_WatchstarApi.js
[MediaWiki-commits] [Gerrit] statsite: decommission class - change (operations/puppet)
Filippo Giunchedi has submitted this change and it was merged.
Change subject: statsite: decommission class
..
statsite: decommission class
Bug: T95687
Change-Id: Ic2ff480a28fa4825864454a73daa9cabd524e3ec
---
A modules/statsite/manifests/decommission.pp
1 file changed, 53 insertions(+), 0 deletions(-)
Approvals:
Filippo Giunchedi: Verified; Looks good to me, approved
diff --git a/modules/statsite/manifests/decommission.pp
b/modules/statsite/manifests/decommission.pp
new file mode 100644
index 000..8a75e06
--- /dev/null
+++ b/modules/statsite/manifests/decommission.pp
@@ -0,0 +1,53 @@
+# == Class: statsite::decommission
+#
+# Decommission statsite
+
+class statsite::decommission {
+package { 'statsite':
+ensure = purged,
+}
+
+if os_version('ubuntu = precise') {
+file { '/etc/statsite':
+ensure = absent,
+recurse = true,
+purge = true,
+force = true,
+}
+
+file { '/sbin/statsitectl':
+ensure = absent,
+}
+
+file { '/etc/init/statsite':
+ensure = absent,
+recurse = true,
+purge = true,
+force = true,
+}
+
+file { '/etc/init/statsite.override':
+ensure = absent,
+}
+
+service { 'statsite':
+ensure = 'stopped',
+provider = 'base',
+restart = '/sbin/statsitectl restart',
+start= '/sbin/statsitectl start',
+status = '/sbin/statsitectl status',
+stop = '/sbin/statsitectl stop',
+before = [ Package['statsite'],
+ File['/sbin/statsitectl'],
+ File['/etc/statsite'],
+ File['/etc/init/statsite'] ],
+}
+}
+
+if os_version('debian = jessie') {
+service { 'statsite':
+ensure = 'stopped',
+before = Package['statsite'],
+}
+}
+}
--
To view, visit https://gerrit.wikimedia.org/r/208635
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ic2ff480a28fa4825864454a73daa9cabd524e3ec
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Filippo Giunchedi fgiunch...@wikimedia.org
Gerrit-Reviewer: Alexandros Kosiaris akosia...@wikimedia.org
Gerrit-Reviewer: Filippo Giunchedi fgiunch...@wikimedia.org
Gerrit-Reviewer: Giuseppe Lavagetto glavage...@wikimedia.org
Gerrit-Reviewer: Ottomata o...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] [wip] MediaWiki Theme: dropDownWidget: Implement new design - change (oojs/ui)
Prtksxna has uploaded a new change for review.
https://gerrit.wikimedia.org/r/209190
Change subject: [wip] MediaWiki Theme: dropDownWidget: Implement new design
..
[wip] MediaWiki Theme: dropDownWidget: Implement new design
Design spec at https://phabricator.wikimedia.org/M54
Change-Id: If2aab1fa584cd84d538ad8084634f98196149216
---
M src/themes/mediawiki/widgets.less
1 file changed, 23 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/90/209190/1
diff --git a/src/themes/mediawiki/widgets.less
b/src/themes/mediawiki/widgets.less
index 755f422..3dc52fa 100644
--- a/src/themes/mediawiki/widgets.less
+++ b/src/themes/mediawiki/widgets.less
@@ -111,7 +111,8 @@
-handle {
height: 2.5em;
border: 1px solid #ccc;
- border-radius: 0.1em;
+ border-radius: @border-radius;
+ overflow: hidden;
.oo-ui-indicatorElement-indicator {
right: 0;
@@ -122,8 +123,13 @@
}
.oo-ui-labelElement-label {
- line-height: 2.5em;
- margin: 0 1em;
+ display: block;
+ line-height: 2.4em;
+ padding: 0 1em;
+ background: #fff;
+ // TODO: Use calculation and correct selector
+ margin-right: 2.3em !important;
+ border-right: 1px solid #ccc;
}
.oo-ui-indicatorElement-indicator {
@@ -141,8 +147,22 @@
}
}
+ .oo-ui-menuSelectWidget {
+ // TODO: Get rid of magic number
+ margin-top: -3px;
+ }
+
+
:hover .oo-ui-dropdownWidget-handle {
border-color: #aaa;
+ background: #ccc;
+ }
+
+ .oo-ui-dropdownWidget-handle:focus {
+ outline: none;
+ border-color: #669BFF;
+ background: #aaa;
+ border-radius: @border-radius @border-radius 0 0;
}
.oo-ui-widget-disabled {
--
To view, visit https://gerrit.wikimedia.org/r/209190
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: If2aab1fa584cd84d538ad8084634f98196149216
Gerrit-PatchSet: 1
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: Prtksxna psax...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Browse Design review - change (mediawiki...MobileFrontend)
Phuedx has uploaded a new change for review.
https://gerrit.wikimedia.org/r/209191
Change subject: Browse Design review
..
Browse Design review
* Use the sans-serif font for the Tags section header
* Give the Tags section a 24 px bottom margin
* Give each tag a 24 px right margin
Bug: T98300
Change-Id: I40828c47d5814faa216c3f14e80a0dc4344d4d01
---
M less/browse/tags.less
M templates/browse/tags.mustache
2 files changed, 29 insertions(+), 23 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend
refs/changes/91/209191/1
diff --git a/less/browse/tags.less b/less/browse/tags.less
index 1f69812..ecf93ec 100644
--- a/less/browse/tags.less
+++ b/less/browse/tags.less
@@ -1,27 +1,33 @@
@import minerva.variables;
-.browse-tags {
- list-style: none;
+// .content h4 is added to the output after .browse-tags h4
+aside.browse-tags {
+ clear: both;
+ margin-bottom: .5em;
- .browse-tag {
- display: inline-block;
- margin-right: 1em;
- background-color: @grayLightest;
- color: @grayMediumDark;
- padding: 0 .75em;
- border-radius: .2em;
-
- a,
- a:visited {
- color: @grayMediumDark;
- }
-
- :last-child {
- margin-right: 0;
- }
+ h4 {
+ font-family: @fontFamily;
}
}
-aside {
- clear: both;
-}
\ No newline at end of file
+.browse-tags-list {
+ list-style: none;
+}
+
+.browse-tag {
+ display: inline-block;
+ margin-right: 1.5em;
+ background-color: @grayLightest;
+ color: @grayMediumDark;
+ padding: 0 .75em;
+ border-radius: .2em;
+
+ a,
+ a:visited {
+ color: @grayMediumDark;
+ }
+
+ :last-child {
+ margin-right: 0;
+ }
+}
diff --git a/templates/browse/tags.mustache b/templates/browse/tags.mustache
index cb59caa..0467a9b 100644
--- a/templates/browse/tags.mustache
+++ b/templates/browse/tags.mustache
@@ -1,6 +1,6 @@
-aside
+aside class=browse-tags
h4{{headerMsg}}/h4
- ul class=browse-tags
+ ul class=browse-tags-list
{{#tags}}
li class=browse-taga href={{link}}{{msg}}/a/li
{{/tags}}
--
To view, visit https://gerrit.wikimedia.org/r/209191
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I40828c47d5814faa216c3f14e80a0dc4344d4d01
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Phuedx g...@samsmith.io
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Enable Special:SearchTranslations - change (mediawiki...Translate)
Phoenix303 has uploaded a new change for review. https://gerrit.wikimedia.org/r/209195 Change subject: Enable Special:SearchTranslations .. Enable Special:SearchTranslations Add ttmserver for ElasticSearch. Bug: T98304 Change-Id: Ia8a0aec9d05b5ce1ac652ef78c4a1fb21175b496 --- M Translate.php 1 file changed, 5 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Translate refs/changes/95/209195/1 diff --git a/Translate.php b/Translate.php index 6a36797..756a71e 100644 --- a/Translate.php +++ b/Translate.php @@ -299,6 +299,11 @@ 'type' = 'ttmserver', 'public' = false, ); +$GLOBALS['wgTranslateTranslationServices']['TTMServer'] = array( + 'class' = 'ElasticSearchTTMServer', + 'cutoff' = 0.75, + 'type' = 'ttmserver' +); $GLOBALS['wgTranslateTranslationServices']['Microsoft'] = array( 'url' = 'http://api.microsofttranslator.com/V2/Http.svc/Translate', 'key' = null, -- To view, visit https://gerrit.wikimedia.org/r/209195 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ia8a0aec9d05b5ce1ac652ef78c4a1fb21175b496 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Translate Gerrit-Branch: master Gerrit-Owner: Phoenix303 divyalife...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Adopted travis scripts to new composer file. - change (mediawiki...WikidataQuality)
Soeren.oldag has submitted this change and it was merged.
Change subject: Adopted travis scripts to new composer file.
..
Adopted travis scripts to new composer file.
Change-Id: I3e7360e82051469f1b8262530ed3c03049b65b56
---
M build/travis/after_script.sh
M build/travis/before_script.sh
A build/travis/composer.local.json
M build/travis/script.sh
M composer.json
5 files changed, 32 insertions(+), 35 deletions(-)
Approvals:
Soeren.oldag: Checked; Looks good to me, approved
diff --git a/build/travis/after_script.sh b/build/travis/after_script.sh
index 60a8ebe..ae2368b 100644
--- a/build/travis/after_script.sh
+++ b/build/travis/after_script.sh
@@ -1,7 +1,7 @@
#! /bin/bash
-cd ../wiki/extensions/WikidataQuality
+cd ../wiki
+wikiDirectory=$(pwd)
-ls build/logs
-
-php vendor/bin/coveralls -v
+cd extensions/Quality
+php $wikiDirectory/vendor/bin/coveralls -v
\ No newline at end of file
diff --git a/build/travis/before_script.sh b/build/travis/before_script.sh
index 4882eb8..5545fb0 100644
--- a/build/travis/before_script.sh
+++ b/build/travis/before_script.sh
@@ -3,6 +3,7 @@
set -x
originalDirectory=$(pwd)
+rm -rf .git/shallow
composer self-update
@@ -14,12 +15,6 @@
rm master.tar.gz
mv mediawiki-master wiki
-# checkout wikibase
-wget
https://github.com/wikimedia/mediawiki-extensions-Wikibase/archive/master.tar.gz
-tar -zxf master.tar.gz
-rm master.tar.gz
-mv mediawiki-extensions-Wikibase-master wiki/extensions/Wikibase
-
cd wiki
if [ $DBTYPE == mysql ]
@@ -27,20 +22,13 @@
mysql -e 'CREATE DATABASE its_a_mw;'
fi
-composer install --no-dev
+composer install
+
php maintenance/install.php --dbtype $DBTYPE --dbuser root --dbname its_a_mw
--dbpath $(pwd) --pass nyan TravisWiki admin
-cd extensions
-
-cp -r $originalDirectory WikidataQuality
-
-cd WikidataQuality
-composer install --dev --no-interaction --prefer-source
-
-cd ../Wikibase
-composer install --prefer-source
-
-cd ../..
+cp $originalDirectory/build/travis/composer.local.json composer.local.json
+sed -i.bak s:\$originalDirectory:$originalDirectory:g composer.local.json
+composer update
echo 'error_reporting(E_ALL| E_STRICT);' LocalSettings.php
echo 'ini_set(display_errors, 1);' LocalSettings.php
@@ -48,11 +36,8 @@
echo '$wgDevelopmentWarnings = true;' LocalSettings.php
echo '$wgLanguageCode = en;' LocalSettings.php
-echo define( 'WB_EXPERIMENTAL_FEATURES', true ); LocalSettings.php
-echo 'require_once __DIR__ . /extensions/Wikibase/repo/Wikibase.php;'
LocalSettings.php
-echo 'require_once __DIR__ . /extensions/Wikibase/repo/ExampleSettings.php;'
LocalSettings.php
-echo 'require_once __DIR__ .
/extensions/Wikibase/client/WikibaseClient.php;' LocalSettings.php
-echo 'require_once __DIR__ .
/extensions/WikidataQuality/WikidataQuality.php;' LocalSettings.php
-echo '$wgWBClientSettings[siteGlobalID] = enwiki;' LocalSettings.php
+echo '$wgEnableWikibaseRepo = true;' LocalSettings.php
+echo '$wgEnableWikibaseClient = false;' LocalSettings.php
+echo 'require_once $IP/extensions/Wikibase/repo/ExampleSettings.php;'
LocalSettings.php
-php maintenance/update.php --quick
+php maintenance/update.php --quick
\ No newline at end of file
diff --git a/build/travis/composer.local.json b/build/travis/composer.local.json
new file mode 100644
index 000..fd937ca
--- /dev/null
+++ b/build/travis/composer.local.json
@@ -0,0 +1,15 @@
+{
+ repositories: [
+ {
+ type: git,
+ url: $originalDirectory
+ }
+ ],
+ require: {
+ wikibase/quality: master-dev,
+ wikibase/wikibase: @dev
+ },
+ require-dev: {
+ satooshi/php-coveralls: master-dev
+ }
+}
\ No newline at end of file
diff --git a/build/travis/script.sh b/build/travis/script.sh
index 4f78065..ee3b220 100644
--- a/build/travis/script.sh
+++ b/build/travis/script.sh
@@ -3,7 +3,4 @@
set -x
cd ../wiki/tests/phpunit
-php phpunit.php -c ../../extensions/WikidataQuality/phpunit.xml.dist
-
-# cd ../wiki/extensions/WikidataQuality
-# php vendor/bin/phpunit -c phpunit.xml.dist
\ No newline at end of file
+php phpunit.php -c ../../extensions/Quality/phpunit.xml.dist
\ No newline at end of file
diff --git a/composer.json b/composer.json
index b047cd7..bd7fe8e 100644
--- a/composer.json
+++ b/composer.json
@@ -21,12 +21,12 @@
serialization/serialization: 3.*,=3.2.1
},
require-dev: {
- phpunit/phpunit: ~4.5,
- satooshi/php-coveralls: dev-master
+ phpunit/phpunit: ~4.5
},
autoload: {
psr-4: {
WikidataQuality\\: includes/,
+ WikidataQuality\\Api\\: api/,
WikidataQuality\\Specials\\: specials/,
WikidataQuality\\Tests\\: tests/phpunit/
},
--
To
[MediaWiki-commits] [Gerrit] Redesign CiteFromIdInspector - change (mediawiki...Citoid)
Esanders has uploaded a new change for review.
https://gerrit.wikimedia.org/r/209198
Change subject: Redesign CiteFromIdInspector
..
Redesign CiteFromIdInspector
Bug: T97390
Change-Id: I92d38e00eaa77e1bd78599ce0b9bcd5e0a2ae4e2
---
M i18n/en.json
M i18n/qqq.json
M modules/ve.ui.CiteFromIdInspector.css
M modules/ve.ui.CiteFromIdInspector.js
4 files changed, 189 insertions(+), 86 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Citoid
refs/changes/98/209198/1
diff --git a/i18n/en.json b/i18n/en.json
index 147942c..8e0b4d7 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -11,8 +11,6 @@
citoid-citeFromIDDialog-search-placeholder: e.g.
http://www.example.com;,
citoid-citeFromIDDialog-search-progress: Searching, please wait...,
citoid-citeFromIDDialog-title: Add a citation,
- citoid-citeFromIDDialog-use-general-dialog-button: full citation
dialog,
- citoid-citeFromIDDialog-use-general-dialog-message: Or use the $1 to
fill in the details yourself.,
citoid-citeFromIDDialog-use-general-error-message: We couldn't make
a citation for you. You can make one by using the $1.,
citoid-citeFromIDTool-title: Cite,
citoid-desc: Provides access points between the citoid service and
MediaWiki,
diff --git a/i18n/qqq.json b/i18n/qqq.json
index 5120f4d..ca5ec9b 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -16,8 +16,6 @@
citoid-citeFromIDDialog-search-placeholder: Placeholder for the
URL/DOI search field.,
citoid-citeFromIDDialog-search-progress: Message for when the search
is in progress,
citoid-citeFromIDDialog-title: The title displayed on the dialog,
- citoid-citeFromIDDialog-use-general-dialog-button: Label for the
user to click to use the full citation tool.,
- citoid-citeFromIDDialog-use-general-dialog-message: Label for the
user to use the full citation tool.\n* $1 – the link to open the citation
dialog; link label:
{{msg-mw|citoid-citeFromIDDialog-use-general-dialog-button}},
citoid-citeFromIDDialog-use-general-error-message: Label notifying
the user there was a problem creating their reference, and offering to use the
full citation tool.\n* $1 – link to open the citation dialog; link label:
{{msg-mw|citoid-citeFromIDDialog-use-general-dialog-button}},
citoid-citeFromIDTool-title: Label for the button to add a citation
in the toolbar\n{{Identical|Cite}},
citoid-desc:
{{desc|name=Citoid|url=https://www.mediawiki.org/wiki/Citoid}};,
diff --git a/modules/ve.ui.CiteFromIdInspector.css
b/modules/ve.ui.CiteFromIdInspector.css
index acaef50..845a64b 100644
--- a/modules/ve.ui.CiteFromIdInspector.css
+++ b/modules/ve.ui.CiteFromIdInspector.css
@@ -1,3 +1,20 @@
+/*!
+ * VisualEditor UserInterface CiteFromId styles.
+ */
+
+.ve-ui-citeFromIdInspector-form {
+ margin: 0;
+}
+
+.citoid-citeFromIDDialog-panel-auto,
+.citoid-citeFromIDDialog-panel-manual {
+ margin: 0.75em;
+}
+
+.ve-ui-citeFromIdInspector-search {
+ min-height: 20em;
+}
+
.ve-ui-citeFromIdInspector-preview + .ve-ui-citeFromIdInspector-preview {
border-top: 1px solid #cc;
}
@@ -42,15 +59,15 @@
float: right;
}
-.ve-ui-citeFromIdInspector-clickable a {
- font-weight: bold;
-}
-
-.ve-ui-citeFromIdInspector-dialog-link {
- display: inline-block;
- margin: 1.5em 0 1em 0;
-}
-
.ve-ui-citeFromIdInspector-dialog-error {
display: inline-block;
}
+
+.ve-ui-citeFromIdInspector-sourceSelect .oo-ui-optionWidget {
+ -moz-box-sizing: border-box;
+ -webkit-box-sizing: border-box;
+ box-sizing: border-box;
+ display: inline-block;
+ width: 50%;
+ margin: 0.5em 0;
+}
diff --git a/modules/ve.ui.CiteFromIdInspector.js
b/modules/ve.ui.CiteFromIdInspector.js
index 481033a..6c5e10c 100644
--- a/modules/ve.ui.CiteFromIdInspector.js
+++ b/modules/ve.ui.CiteFromIdInspector.js
@@ -6,12 +6,9 @@
* @constructor
* @param {Object} [config] Configuration options
*/
-
ve.ui.CiteFromIdInspector = function VeUiCiteFromIdInspector( config ) {
// Parent constructor
ve.ui.CiteFromIdInspector.super.call( this, config );
-
- config = config || {};
this.referenceModel = null;
this.doneStaging = false;
@@ -21,12 +18,14 @@
this.lookupPromise = null;
this.service = null;
this.inDialog = '';
+ this.currentModePanel = null;
+ this.currentAutoProcessPanel = null;
- this.$element
- .addClass( 've-ui-citeFromIdInspector' );
+ this.$element.addClass( 've-ui-citeFromIdInspector' );
};
/* Inheritance */
+
OO.inheritClass( ve.ui.CiteFromIdInspector, ve.ui.FragmentInspector );
/* Static properties */
@@ -91,31 +90,62 @@
}
} );
- this.panels = new OO.ui.StackLayout( {
+ this.modeSelect = new OO.ui.TabSelectWidget( {
+
[MediaWiki-commits] [Gerrit] Update GlobalCssJs on labs to not use bits - change (operations/mediawiki-config)
jenkins-bot has submitted this change and it was merged. Change subject: Update GlobalCssJs on labs to not use bits .. Update GlobalCssJs on labs to not use bits Change-Id: Iaec9d2c3aa35c8e47237440f967c243f3a80abfc --- M wmf-config/CommonSettings-labs.php 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Ori.livneh: Looks good to me, approved Legoktm: Looks good to me, but someone else must approve jenkins-bot: Verified diff --git a/wmf-config/CommonSettings-labs.php b/wmf-config/CommonSettings-labs.php index abdc80c..f665ba4 100644 --- a/wmf-config/CommonSettings-labs.php +++ b/wmf-config/CommonSettings-labs.php @@ -135,7 +135,7 @@ // Load from betalabs metawiki $wgResourceLoaderSources['metawiki'] = array( 'apiScript' = '//meta.wikimedia.beta.wmflabs.org/w/api.php', - 'loadScript' = '//bits.beta.wmflabs.org/meta.wikimedia.beta.wmflabs.org/load.php', + 'loadScript' = '//meta.wikimedia.beta.wmflabs.org/w/load.php', ); } -- To view, visit https://gerrit.wikimedia.org/r/209180 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iaec9d2c3aa35c8e47237440f967c243f3a80abfc Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Ori.livneh o...@wikimedia.org Gerrit-Reviewer: Legoktm legoktm.wikipe...@gmail.com Gerrit-Reviewer: Ori.livneh o...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update geoiplookup URL endpoint for I8c90977e4 - change (mediawiki...UniversalLanguageSelector)
Ori.livneh has uploaded a new change for review.
https://gerrit.wikimedia.org/r/209182
Change subject: Update geoiplookup URL endpoint for I8c90977e4
..
Update geoiplookup URL endpoint for I8c90977e4
Bits is slated to be decomissioned. Change I8c90977e4 ensures the /geoiplookup
endpoint remains accessible by serving it from all domains. This patch updates
ULS for that.
Change-Id: I4dc1b135af4ab8a5dcac77e73de5c8c9276bfb52
---
M UniversalLanguageSelector.hooks.php
1 file changed, 1 insertion(+), 1 deletion(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/UniversalLanguageSelector
refs/changes/82/209182/1
diff --git a/UniversalLanguageSelector.hooks.php
b/UniversalLanguageSelector.hooks.php
index e368e3e..490f7f4 100644
--- a/UniversalLanguageSelector.hooks.php
+++ b/UniversalLanguageSelector.hooks.php
@@ -77,7 +77,7 @@
if ( is_string( $wgULSGeoService ) ) {
$out-addModules( 'ext.uls.geoclient' );
} elseif ( $wgULSGeoService === true ) {
- $out-addScript( 'script
src=//bits.wikimedia.org/geoiplookup/script' );
+ $out-addScript( 'script src=/geoiplookup/script'
);
}
if ( self::isToolbarEnabled( $out-getUser() ) ) {
--
To view, visit https://gerrit.wikimedia.org/r/209182
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I4dc1b135af4ab8a5dcac77e73de5c8c9276bfb52
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/UniversalLanguageSelector
Gerrit-Branch: master
Gerrit-Owner: Ori.livneh o...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] EventLogging varnish log tailers: make '.gif' suffix optional - change (operations/puppet)
Ori.livneh has submitted this change and it was merged.
Change subject: EventLogging varnish log tailers: make '.gif' suffix optional
..
EventLogging varnish log tailers: make '.gif' suffix optional
Since we're migrating the EventLogging end-point off of bits and nesting it
under /beacon, we may as well perform the other outstanding clean-up task,
which is to drop the '.gif' suffix, which was never really needed.
Change-Id: Ie482863e00e3245cffec2c44c0be6a5b1848f759
---
M modules/role/manifests/cache/kafka/eventlogging.pp
M modules/role/manifests/cache/logging/eventlistener.pp
2 files changed, 2 insertions(+), 2 deletions(-)
Approvals:
Ori.livneh: Looks good to me, approved
BBlack: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/modules/role/manifests/cache/kafka/eventlogging.pp
b/modules/role/manifests/cache/kafka/eventlogging.pp
index 849a445..7959365 100644
--- a/modules/role/manifests/cache/kafka/eventlogging.pp
+++ b/modules/role/manifests/cache/kafka/eventlogging.pp
@@ -11,7 +11,7 @@
topic = 'eventlogging-client-side',
varnish_name = $varnish_name,
varnish_svc_name = $varnish_svc_name,
-varnish_opts = { 'm' = 'RxURL:^/beacon/event\.gif\?.' },
+varnish_opts = { 'm' = 'RxURL:^/beacon/event(\.gif)?\?.' },
topic_request_required_acks = '-1',
}
}
diff --git a/modules/role/manifests/cache/logging/eventlistener.pp
b/modules/role/manifests/cache/logging/eventlistener.pp
index decf642..98136d7 100644
--- a/modules/role/manifests/cache/logging/eventlistener.pp
+++ b/modules/role/manifests/cache/logging/eventlistener.pp
@@ -8,7 +8,7 @@
listener_address = $event_listener,
port = '8422',
instance_name= $instance_name,
-cli_args = '-m RxURL:^/(beacon/)?event\.gif\?. -D',
+cli_args = '-m RxURL:^/(beacon/)?event(\.gif)?\?. -D',
log_fmt = '%q\t%l\t%n\t%t\t%h\t%{User-agent}i',
monitor = false,
}
--
To view, visit https://gerrit.wikimedia.org/r/209175
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie482863e00e3245cffec2c44c0be6a5b1848f759
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ori.livneh o...@wikimedia.org
Gerrit-Reviewer: BBlack bbl...@wikimedia.org
Gerrit-Reviewer: Ori.livneh o...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] transparency: make it HTTPS only and enable HSTS - change (operations/puppet)
BBlack has submitted this change and it was merged.
Change subject: transparency: make it HTTPS only and enable HSTS
..
transparency: make it HTTPS only and enable HSTS
Make https://transparency.wikimedia.org/ HTTPS only, and enable
HSTS with max-age=7 days. I also deleted the unused 404 code.
Bug: T40516
Change-Id: I14f5cf359c9754c3f7359827b34859aa41d5ac76
---
M manifests/role/transparency.pp
M templates/apache/sites/transparency.wikimedia.org.erb
2 files changed, 6 insertions(+), 6 deletions(-)
Approvals:
BBlack: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/role/transparency.pp b/manifests/role/transparency.pp
index 77dd7f3..9b177b9 100644
--- a/manifests/role/transparency.pp
+++ b/manifests/role/transparency.pp
@@ -6,6 +6,7 @@
class role::transparency {
include ::apache
include ::apache::mod::rewrite
+include ::apache::mod::headers
$repo_dir = '/srv/org/wikimedia/TransparencyReport'
$docroot = ${repo_dir}/build
diff --git a/templates/apache/sites/transparency.wikimedia.org.erb
b/templates/apache/sites/transparency.wikimedia.org.erb
index 82f9393..44abf7c 100644
--- a/templates/apache/sites/transparency.wikimedia.org.erb
+++ b/templates/apache/sites/transparency.wikimedia.org.erb
@@ -1,5 +1,5 @@
# vim:ft=apache: ts=4 sw=4
-# Apache configuration for http://transparency.wikimedia.org
+# Apache configuration for https://transparency.wikimedia.org
# This file is managed by Puppet.
VirtualHost *:80
ServerName transparency.wikimedia.org
@@ -15,10 +15,9 @@
allow from all
/Directory
-# Serve 404s for all requests until the launch, at 2014-Aug-06 08:30 UTC.
-# This code can be removed any time after that. --OL
RewriteEngine on
-RewriteCond %{ENV:REDIRECT_STATUS} !=404
-RewriteCond %{TIME} %= Time.utc(2014, 'Aug', 6, 8,
30).strftime('%Y%m%d%H%M%S') %
-RewriteRule .* - [L,R=404]
+RewriteCond %{HTTP:X-Forwarded-Proto} !https
+RewriteRule ^/(.*)$ https://%{HTTP_HOST}%{REQUEST_URI}
[R=301,E=ProtoRedirect]
+Header always merge Vary X-Forwarded-Proto env=ProtoRedirect
+Header always set Strict-Transport-Security max-age=604800
/VirtualHost
--
To view, visit https://gerrit.wikimedia.org/r/199517
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I14f5cf359c9754c3f7359827b34859aa41d5ac76
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Chmarkine chmark...@hotmail.com
Gerrit-Reviewer: BBlack bbl...@wikimedia.org
Gerrit-Reviewer: JanZerebecki jan.wikime...@zerebecki.de
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] nova: install ::mediawiki::cgroup - change (operations/puppet)
Filippo Giunchedi has submitted this change and it was merged.
Change subject: nova: install ::mediawiki::cgroup
..
nova: install ::mediawiki::cgroup
mediawiki needs cgroups for limit.sh to work
Bug: T92712
Change-Id: I6b68d1685954b5c828d432a7dfc3a70e3e08e3fa
---
M manifests/role/nova.pp
1 file changed, 1 insertion(+), 0 deletions(-)
Approvals:
Filippo Giunchedi: Verified; Looks good to me, approved
diff --git a/manifests/role/nova.pp b/manifests/role/nova.pp
index 30ca21f..8255d06 100644
--- a/manifests/role/nova.pp
+++ b/manifests/role/nova.pp
@@ -339,6 +339,7 @@
include ::nutcracker::monitoring
include ::mediawiki::packages::php5
+include ::mediawiki::cgroup
include ::scap::scripts
class { '::nutcracker':
--
To view, visit https://gerrit.wikimedia.org/r/205553
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I6b68d1685954b5c828d432a7dfc3a70e3e08e3fa
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Filippo Giunchedi fgiunch...@wikimedia.org
Gerrit-Reviewer: Alex Monk kren...@gmail.com
Gerrit-Reviewer: Andrew Bogott abog...@wikimedia.org
Gerrit-Reviewer: Filippo Giunchedi fgiunch...@wikimedia.org
Gerrit-Reviewer: Krinkle krinklem...@gmail.com
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] [WIP] Use bunyan logging so that we can log to logstash by g... - change (mediawiki...cxserver)
Santhosh has uploaded a new change for review.
https://gerrit.wikimedia.org/r/209177
Change subject: [WIP] Use bunyan logging so that we can log to logstash by
gelf-stream
..
[WIP] Use bunyan logging so that we can log to logstash by gelf-stream
Change-Id: If4cea7fe90d72dedd6420fb0a6d8721b4b7598c3
---
M config.defaults.js
M package.json
M routes/v1.js
M utils/Logger.js
4 files changed, 45 insertions(+), 38 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/cxserver
refs/changes/77/209177/1
diff --git a/config.defaults.js b/config.defaults.js
index 7655532..5656b54 100644
--- a/config.defaults.js
+++ b/config.defaults.js
@@ -4,8 +4,21 @@
// CX Server port
port: 8080,
proxy: null,
- // Log directory
- logDir: 'log',
+ logging: {
+ name: 'cxserver',
+ streams: [
+ {
+ //Use gelf-stream - logstash
+ type: 'gelf',
+ host: 'logstash1003.eqiad.wmnet',
+ port: 12201,
+ },
+ {
+ level: 'debug',
+ stream: process.stdout // log INFO and above to
stdout
+ }
+ ]
+ },
// Accept requests from the given domains. * for all domains.
allowCORS: '*',
// Parsoid API URL
diff --git a/package.json b/package.json
index 9fa4737..fe2b285 100644
--- a/package.json
+++ b/package.json
@@ -22,7 +22,11 @@
sax: 0.6.0,
winston: *,
html-entities: 1.0.10,
- yargs: ~1.3.1
+ yargs: ~1.3.1,
+ bluebird: ~2.2.2,
+ bunyan: ^1.3.3,
+ extend: ^1.3.0,
+ gelf-stream: ^0.2.4
},
devDependencies: {
assert: 1.1.1,
diff --git a/routes/v1.js b/routes/v1.js
index 5429c37..f782c7b 100644
--- a/routes/v1.js
+++ b/routes/v1.js
@@ -11,20 +11,18 @@
PageLoader = require( __dirname +
'/../pageloader/PageLoader.js' ).PageLoader,
pageloader = new PageLoader( title, sourceLanguage );
- logger.profile( 'Fetch page' );
pageloader.load().then(
function ( response ) {
var segmenter, segmentedContent;
try {
- logger.profile( 'Fetch page', {
+ logger.debug( 'Fetch page', {
title: title,
sourceLanguage: sourceLanguage
} );
- logger.profile( 'Segment page' );
segmenter = new CXSegmenter( response.body,
sourceLanguage );
segmenter.segment();
segmentedContent =
segmenter.getSegmentedContent();
- logger.profile( 'Segment page', {
+ logger.debug( 'Segment page', {
title: title,
sourceLanguage: sourceLanguage
} );
@@ -104,7 +102,6 @@
sourceHtmlChunks.push( '/div' );
sourceHtml = sourceHtmlChunks.join( '' );
- logger.profile( 'MT' );
mtClient.translate( from, to, sourceHtml ).then(
function ( data ) {
// Prevent XSS by sending json with
@@ -119,7 +116,7 @@
.replace( //g, '\\u003E' );
res.type( 'application/json' );
res.send( json );
- logger.profile( 'MT', {
+ logger.debug( 'MT', {
from: from,
to: to
} );
@@ -151,11 +148,10 @@
dictClients = require( __dirname + '/../dictionary/' );
dictClient = dictClients[ provider ];
- logger.profile( 'Dictionary lookup' );
dictClient.getTranslations( word, from, to ).then(
function ( data ) {
res.send( data );
- logger.profile( 'Dictionary lookup', {
+ logger.debug( 'Dictionary lookup', {
word: word,
from: from,
to: to
diff --git a/utils/Logger.js b/utils/Logger.js
index 3a9b9c9..decf1c7 100644
--- a/utils/Logger.js
+++ b/utils/Logger.js
@@ -1,34 +1,28 @@
-var winston = require( 'winston' ),
- fs = require( 'fs' ),
+var bunyan =
[MediaWiki-commits] [Gerrit] (Bug: T97411) Refresh the control file and change the versio... - change (operations...linux)
Muehlenhoff has uploaded a new change for review. https://gerrit.wikimedia.org/r/209181 Change subject: (Bug: T97411) Refresh the control file and change the version scheme; we forked off the last 3.19 Debian upload (3.19.3) and all further updates will be folded in via the stable patchsets. .. (Bug: T97411) Refresh the control file and change the version scheme; we forked off the last 3.19 Debian upload (3.19.3) and all further updates will be folded in via the stable patchsets. Change-Id: Idbd509e1d118b788838bc8b989b5a0e04fd4568a --- M debian/changelog M debian/control.md5sum M debian/rules.gen 3 files changed, 247 insertions(+), 247 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/debs/linux refs/changes/81/209181/1 -- To view, visit https://gerrit.wikimedia.org/r/209181 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Idbd509e1d118b788838bc8b989b5a0e04fd4568a Gerrit-PatchSet: 1 Gerrit-Project: operations/debs/linux Gerrit-Branch: master Gerrit-Owner: Muehlenhoff mmuhlenh...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update GlobalCssJs on labs to not use bits - change (operations/mediawiki-config)
Ori.livneh has uploaded a new change for review. https://gerrit.wikimedia.org/r/209180 Change subject: Update GlobalCssJs on labs to not use bits .. Update GlobalCssJs on labs to not use bits Change-Id: Iaec9d2c3aa35c8e47237440f967c243f3a80abfc --- M wmf-config/CommonSettings-labs.php 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/80/209180/1 diff --git a/wmf-config/CommonSettings-labs.php b/wmf-config/CommonSettings-labs.php index abdc80c..f665ba4 100644 --- a/wmf-config/CommonSettings-labs.php +++ b/wmf-config/CommonSettings-labs.php @@ -135,7 +135,7 @@ // Load from betalabs metawiki $wgResourceLoaderSources['metawiki'] = array( 'apiScript' = '//meta.wikimedia.beta.wmflabs.org/w/api.php', - 'loadScript' = '//bits.beta.wmflabs.org/meta.wikimedia.beta.wmflabs.org/load.php', + 'loadScript' = '//meta.wikimedia.beta.wmflabs.org/w/load.php', ); } -- To view, visit https://gerrit.wikimedia.org/r/209180 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iaec9d2c3aa35c8e47237440f967c243f3a80abfc Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Ori.livneh o...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Disable DonationInterface test mode - change (mediawiki/vagrant)
20after4 has submitted this change and it was merged. Change subject: Disable DonationInterface test mode .. Disable DonationInterface test mode It breaks things. Change-Id: I6bf221bd8284a8240681f62c3242d61a7a9a5022 TODO: Create mock gateways during the Lyon hackathon. --- M puppet/modules/payments/manifests/donation_interface.pp 1 file changed, 3 insertions(+), 1 deletion(-) Approvals: BryanDavis: Looks good to me, but someone else must approve 20after4: Looks good to me, approved jenkins-bot: Verified diff --git a/puppet/modules/payments/manifests/donation_interface.pp b/puppet/modules/payments/manifests/donation_interface.pp index c9b1280..835b020 100644 --- a/puppet/modules/payments/manifests/donation_interface.pp +++ b/puppet/modules/payments/manifests/donation_interface.pp @@ -18,7 +18,9 @@ wgDonationInterfaceEnablePaypal= true, wgDonationInterfaceEnableQueue = true, wgDonationInterfaceEnableStomp = true, - wgDonationInterfaceTestMode= true, + + # FIXME: Causes failure to run GlobalCollect, cos donation.api.php will rely on a test class. + wgDonationInterfaceTestMode= false, # TODO: the following cruft is brought to u by a forward reference snafu. # Better if DonationInterfaceFormSettings would use relative paths? -- To view, visit https://gerrit.wikimedia.org/r/208855 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I6bf221bd8284a8240681f62c3242d61a7a9a5022 Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/vagrant Gerrit-Branch: master Gerrit-Owner: Awight awi...@wikimedia.org Gerrit-Reviewer: 20after4 mmod...@wikimedia.org Gerrit-Reviewer: AndyRussG andrew.green...@gmail.com Gerrit-Reviewer: Awight awi...@wikimedia.org Gerrit-Reviewer: BryanDavis bda...@wikimedia.org Gerrit-Reviewer: Ejegg eeggles...@wikimedia.org Gerrit-Reviewer: Katie Horn kh...@wikimedia.org Gerrit-Reviewer: Ori.livneh o...@wikimedia.org Gerrit-Reviewer: Ssmith ssm...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add DonationQueue config - change (mediawiki/vagrant)
20after4 has submitted this change and it was merged.
Change subject: Add DonationQueue config
..
Add DonationQueue config
This is for testing new DonationQueue code.
Change-Id: If47e22ec50f7929b55d8a980b38d574ebd6b07fb
---
M puppet/modules/payments/manifests/donation_interface.pp
1 file changed, 19 insertions(+), 0 deletions(-)
Approvals:
20after4: Looks good to me, approved
jenkins-bot: Verified
diff --git a/puppet/modules/payments/manifests/donation_interface.pp
b/puppet/modules/payments/manifests/donation_interface.pp
index 835b020..a37215e 100644
--- a/puppet/modules/payments/manifests/donation_interface.pp
+++ b/puppet/modules/payments/manifests/donation_interface.pp
@@ -50,7 +50,26 @@
wgStompServer = 'tcp://localhost:61613',
+ wgDonationInterfaceMemcacheHost= 'localhost',
+
wgDonationInterfaceUseSyslog = true,
+
+ wgDonationInterfaceDefaultQueueServer = {
+'type' = 'PHPQueue\Backend\Stomp',
+'uri'= 'tcp://localhost:61613',
+# 30 days, in seconds
+'expiry' = '2592000',
+'persistent' = 1
+ },
+
+ wgDonationInterfaceQueues = {
+'limbo' = {
+ 'type'= 'PHPQueue\Backend\Memcache',
+ 'servers' = [
+'localhost'
+ ],
+},
+ },
},
needs_update = true,
require = [
--
To view, visit https://gerrit.wikimedia.org/r/208856
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: If47e22ec50f7929b55d8a980b38d574ebd6b07fb
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: Awight awi...@wikimedia.org
Gerrit-Reviewer: 20after4 mmod...@wikimedia.org
Gerrit-Reviewer: AndyRussG andrew.green...@gmail.com
Gerrit-Reviewer: Awight awi...@wikimedia.org
Gerrit-Reviewer: Ejegg eeggles...@wikimedia.org
Gerrit-Reviewer: Katie Horn kh...@wikimedia.org
Gerrit-Reviewer: Ori.livneh o...@wikimedia.org
Gerrit-Reviewer: Ssmith ssm...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Explicitly define module position - change (mediawiki...CologneBlue)
jenkins-bot has submitted this change and it was merged.
Change subject: Explicitly define module position
..
Explicitly define module position
Style modules currently added through addModuleStyles default
to being in the head (top position). This is an unhealthy default,
since only critical styles that are needed at pageload should be
in the head. In order to be able to switch the default to bottom,
existing module positions have to be defined explicitly.
Bug: T97410
Change-Id: I3103b2285c6ac3e9410ee9b62ca4c400db0a2227
---
M skin.json
1 file changed, 1 insertion(+), 0 deletions(-)
Approvals:
Bartosz Dziewoński: Looks good to me, approved
jenkins-bot: Verified
diff --git a/skin.json b/skin.json
index 1aa0390..620c2f4 100644
--- a/skin.json
+++ b/skin.json
@@ -19,6 +19,7 @@
},
ResourceModules: {
skins.cologneblue: {
+ position: top,
styles: {
resources/screen.css: {
media: screen
--
To view, visit https://gerrit.wikimedia.org/r/208983
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I3103b2285c6ac3e9410ee9b62ca4c400db0a2227
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/CologneBlue
Gerrit-Branch: master
Gerrit-Owner: Gilles gdu...@wikimedia.org
Gerrit-Reviewer: Bartosz Dziewoński matma@gmail.com
Gerrit-Reviewer: Legoktm legoktm.wikipe...@gmail.com
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Explicitly define module position - change (mediawiki...Modern)
jenkins-bot has submitted this change and it was merged.
Change subject: Explicitly define module position
..
Explicitly define module position
Style modules currently added through addModuleStyles default
to being in the head (top position). This is an unhealthy default,
since only critical styles that are needed at pageload should be
in the head. In order to be able to switch the default to bottom,
existing module positions have to be defined explicitly.
Bug: T97410
Change-Id: I05048fd3864ec918d365e5c7cbd68dcec78d4ea3
---
M skin.json
1 file changed, 1 insertion(+), 0 deletions(-)
Approvals:
Bartosz Dziewoński: Looks good to me, approved
jenkins-bot: Verified
diff --git a/skin.json b/skin.json
index 98ba815..10e562c 100644
--- a/skin.json
+++ b/skin.json
@@ -19,6 +19,7 @@
},
ResourceModules: {
skins.modern: {
+ position: top,
styles: {
resources/main.css: {
media: screen
--
To view, visit https://gerrit.wikimedia.org/r/208984
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I05048fd3864ec918d365e5c7cbd68dcec78d4ea3
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/Modern
Gerrit-Branch: master
Gerrit-Owner: Gilles gdu...@wikimedia.org
Gerrit-Reviewer: Bartosz Dziewoński matma@gmail.com
Gerrit-Reviewer: Legoktm legoktm.wikipe...@gmail.com
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] [bugfix] Fix ISBN formating - change (pywikibot/core)
jenkins-bot has submitted this change and it was merged. Change subject: [bugfix] Fix ISBN formating .. [bugfix] Fix ISBN formating bug: T97887 Change-Id: Ic407c51db3aa2d974f3d8d403f56e28d69c84663 --- M scripts/isbn.py 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: XZise: Looks good to me, approved jenkins-bot: Verified diff --git a/scripts/isbn.py b/scripts/isbn.py index 1ddbe2e..4040642 100755 --- a/scripts/isbn.py +++ b/scripts/isbn.py @@ -1211,7 +1211,7 @@ # Determine the publisher for (start, end) in publisherRanges: length = len(start) # NOTE: start and end always have equal length -if rest[:length] start and rest[:length] = end: +if rest[:length] = start and rest[:length] = end: result += rest[:length] + '-' rest = rest[length:] break -- To view, visit https://gerrit.wikimedia.org/r/208376 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ic407c51db3aa2d974f3d8d403f56e28d69c84663 Gerrit-PatchSet: 6 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Xqt i...@gno.de Gerrit-Reviewer: John Vandenberg jay...@gmail.com Gerrit-Reviewer: Ladsgroup ladsgr...@gmail.com Gerrit-Reviewer: Merlijn van Deen valhall...@arctus.nl Gerrit-Reviewer: XZise commodorefabia...@gmx.de Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Allow ios users to close the main menu - change (mediawiki...MobileFrontend)
jenkins-bot has submitted this change and it was merged.
Change subject: Allow ios users to close the main menu
..
Allow ios users to close the main menu
Bug: T97621
Change-Id: I2b8d16e5ccf9df44ab779512c14d7ce32e0c4b9e
---
M resources/mobile.startup/Skin.js
1 file changed, 4 insertions(+), 3 deletions(-)
Approvals:
Kaldari: Looks good to me, approved
jenkins-bot: Verified
diff --git a/resources/mobile.startup/Skin.js b/resources/mobile.startup/Skin.js
index 0ec4ca5..1849160 100644
--- a/resources/mobile.startup/Skin.js
+++ b/resources/mobile.startup/Skin.js
@@ -29,9 +29,7 @@
/**
* @inheritdoc
*/
- events: {
- 'click #mw-mf-page-center': '_onPageCenterClick'
- },
+ events: {},
/**
* Close navigation if content tapped
@@ -136,6 +134,9 @@
* Fired when appearance of skin changes.
*/
this.emit( 'changed' );
+ // FIXME: Move back into events when T98200 resolved
+ this.$( '#mw-mf-page-center' ).on( 'click',
+ $.proxy( this, '_onPageCenterClick' ) );
},
/**
--
To view, visit https://gerrit.wikimedia.org/r/209047
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I2b8d16e5ccf9df44ab779512c14d7ce32e0c4b9e
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson jrob...@wikimedia.org
Gerrit-Reviewer: Kaldari rkald...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Change EventLogging endpoint to /beacon/event - change (operations/mediawiki-config)
jenkins-bot has submitted this change and it was merged.
Change subject: Change EventLogging endpoint to /beacon/event
..
Change EventLogging endpoint to /beacon/event
Change-Id: I019944f4276cf2c4944da6c45d171438b87ec415
---
M wmf-config/CommonSettings.php
1 file changed, 2 insertions(+), 2 deletions(-)
Approvals:
Ori.livneh: Looks good to me, approved
jenkins-bot: Verified
diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index 0acadfa..cf11d4c 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -2632,11 +2632,11 @@
// test2wiki has its own Schema: NS.
$wgEventLoggingDBname = 'test2wiki';
$wgEventLoggingSchemaApiUri =
'http://test2.wikipedia.org/w/api.php';
- $wgEventLoggingBaseUri = //{$wmfHostnames['bits']}/dummy.gif;
+ $wgEventLoggingBaseUri = //{$wmgAssetsHost}/beacon/dummy;
$wgEventLoggingFile =
udp://$wmfUdp2logDest/EventLogging-$wgDBname;
} else {
// All other wikis reference metawiki.
- $wgEventLoggingBaseUri = //{$wmfHostnames['bits']}/event.gif;
+ $wgEventLoggingBaseUri = //{$wmgAssetsHost}/beacon/event;
$wgEventLoggingDBname = 'metawiki';
$wgEventLoggingFile = 'udp://10.64.32.167:8421/EventLogging';
// eventlog1001.eqiad.wmnet
$wgEventLoggingSchemaApiUri =
'http://meta.wikimedia.org/w/api.php';
--
To view, visit https://gerrit.wikimedia.org/r/209178
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I019944f4276cf2c4944da6c45d171438b87ec415
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Ori.livneh o...@wikimedia.org
Gerrit-Reviewer: Ori.livneh o...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] EventLogging log tailers: simplify regexes - change (operations/puppet)
Ori.livneh has uploaded a new change for review.
https://gerrit.wikimedia.org/r/209179
Change subject: EventLogging log tailers: simplify regexes
..
EventLogging log tailers: simplify regexes
With I019944f42 in place, the only path being logged to is /beacon/event, so we
can make the regex less accomodating.
Change-Id: I30d19ac6060bf27d2b51eb36e0e9975a92974de3
---
M modules/role/manifests/cache/kafka/eventlogging.pp
M modules/role/manifests/cache/logging/eventlistener.pp
2 files changed, 2 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/79/209179/1
diff --git a/modules/role/manifests/cache/kafka/eventlogging.pp
b/modules/role/manifests/cache/kafka/eventlogging.pp
index 7959365..a7405ab 100644
--- a/modules/role/manifests/cache/kafka/eventlogging.pp
+++ b/modules/role/manifests/cache/kafka/eventlogging.pp
@@ -11,7 +11,7 @@
topic = 'eventlogging-client-side',
varnish_name = $varnish_name,
varnish_svc_name = $varnish_svc_name,
-varnish_opts = { 'm' = 'RxURL:^/beacon/event(\.gif)?\?.' },
+varnish_opts = { 'm' = 'RxURL:^/beacon/event\?.' },
topic_request_required_acks = '-1',
}
}
diff --git a/modules/role/manifests/cache/logging/eventlistener.pp
b/modules/role/manifests/cache/logging/eventlistener.pp
index 98136d7..249dd12 100644
--- a/modules/role/manifests/cache/logging/eventlistener.pp
+++ b/modules/role/manifests/cache/logging/eventlistener.pp
@@ -8,7 +8,7 @@
listener_address = $event_listener,
port = '8422',
instance_name= $instance_name,
-cli_args = '-m RxURL:^/(beacon/)?event(\.gif)?\?. -D',
+cli_args = '-m RxURL:^/beacon/event\?. -D',
log_fmt = '%q\t%l\t%n\t%t\t%h\t%{User-agent}i',
monitor = false,
}
--
To view, visit https://gerrit.wikimedia.org/r/209179
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I30d19ac6060bf27d2b51eb36e0e9975a92974de3
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ori.livneh o...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Forward ActiveMQ admin UI port - change (mediawiki/vagrant)
20after4 has submitted this change and it was merged. Change subject: Forward ActiveMQ admin UI port .. Forward ActiveMQ admin UI port Change-Id: Id25af06db398e1a49cef6f70f39bbf5e324d049a --- M puppet/modules/role/settings/fundraising.yaml 1 file changed, 4 insertions(+), 0 deletions(-) Approvals: 20after4: Looks good to me, approved jenkins-bot: Verified diff --git a/puppet/modules/role/settings/fundraising.yaml b/puppet/modules/role/settings/fundraising.yaml index 6897157..70a9263 100644 --- a/puppet/modules/role/settings/fundraising.yaml +++ b/puppet/modules/role/settings/fundraising.yaml @@ -1 +1,5 @@ vagrant_ram: 512 + +# ActiveMQ admin UI +forward_ports: + 8161: 8161 -- To view, visit https://gerrit.wikimedia.org/r/208861 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Id25af06db398e1a49cef6f70f39bbf5e324d049a Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/vagrant Gerrit-Branch: master Gerrit-Owner: Awight awi...@wikimedia.org Gerrit-Reviewer: 20after4 mmod...@wikimedia.org Gerrit-Reviewer: AndyRussG andrew.green...@gmail.com Gerrit-Reviewer: Awight awi...@wikimedia.org Gerrit-Reviewer: BryanDavis bda...@wikimedia.org Gerrit-Reviewer: Ejegg eeggles...@wikimedia.org Gerrit-Reviewer: Katie Horn kh...@wikimedia.org Gerrit-Reviewer: Ori.livneh o...@wikimedia.org Gerrit-Reviewer: Ssmith ssm...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add status mapping for partial compliance and add/extend tes... - change (mediawiki...WikidataQualityExternalValidation)
Dominic.sauer has uploaded a new change for review.
https://gerrit.wikimedia.org/r/209200
Change subject: Add status mapping for partial compliance and add/extend tests
for partial compliance
..
Add status mapping for partial compliance and add/extend tests for partial
compliance
Change-Id: I538611b55b2ed3c3a26b84a3f16c7fe3a9be700b
---
M specials/SpecialCrossCheck.php
M tests/phpunit/CrossCheck/CrossCheckerTest.php
M tests/phpunit/CrossCheck/Result/CrossCheckResultTest.php
M tests/phpunit/Serializer/CompareResultSerializerTest.php
M tests/phpunit/Specials/SpecialCrossCheckTest.php
5 files changed, 107 insertions(+), 4 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikidataQualityExternalValidation
refs/changes/00/209200/1
diff --git a/specials/SpecialCrossCheck.php b/specials/SpecialCrossCheck.php
index 29d8f05..ccd4ec0 100755
--- a/specials/SpecialCrossCheck.php
+++ b/specials/SpecialCrossCheck.php
@@ -149,6 +149,7 @@
protected function getStatusMapping() {
return array(
CrossCheckResult::STATUS_COMPLIANCE = 'success',
+CrossCheckResult::STATUS_PARTIAL_COMPLIANCE = 'partial-success',
CrossCheckResult::STATUS_REFERENCES_MISSING = 'warning',
CrossCheckResult::STATUS_DATA_MISMATCH = 'error'
);
diff --git a/tests/phpunit/CrossCheck/CrossCheckerTest.php
b/tests/phpunit/CrossCheck/CrossCheckerTest.php
index f2a4507..d581061 100755
--- a/tests/phpunit/CrossCheck/CrossCheckerTest.php
+++ b/tests/phpunit/CrossCheck/CrossCheckerTest.php
@@ -185,7 +185,6 @@
* Test cases for testCrossCheckStatements
*/
public function crossCheckStatementsDataProvider() {
-$statementsQ1 = $this-items['Q1']-getStatements()-toArray();
return array(
// Cross-check all statements of Q1
diff --git a/tests/phpunit/CrossCheck/Result/CrossCheckResultTest.php
b/tests/phpunit/CrossCheck/Result/CrossCheckResultTest.php
index a82176f..6f23ceb 100755
--- a/tests/phpunit/CrossCheck/Result/CrossCheckResultTest.php
+++ b/tests/phpunit/CrossCheck/Result/CrossCheckResultTest.php
@@ -19,7 +19,7 @@
class CrossCheckResultTest extends \MediaWikiTestCase
{
-public function testConstructValidArguments( )
+public function testConstructValidArguments()
{
// Create test data
@@ -149,7 +149,7 @@
)
),
array(
-CrossCheckResult::STATUS_COMPLIANCE,
+CrossCheckResult::STATUS_PARTIAL_COMPLIANCE,
new CrossCheckResult(
new PropertyId( 'P42' ),
'Q42$fccafc70-07a0-4e82-807f-288a4b21c13c',
@@ -160,7 +160,7 @@
)
),
array(
-CrossCheckResult::STATUS_COMPLIANCE,
+CrossCheckResult::STATUS_PARTIAL_COMPLIANCE,
new CrossCheckResult(
new PropertyId( 'P42' ),
'Q42$fccafc70-07a0-4e82-807f-288a4b21c13c',
diff --git a/tests/phpunit/Serializer/CompareResultSerializerTest.php
b/tests/phpunit/Serializer/CompareResultSerializerTest.php
index 2093590..1eb0e0e 100755
--- a/tests/phpunit/Serializer/CompareResultSerializerTest.php
+++ b/tests/phpunit/Serializer/CompareResultSerializerTest.php
@@ -36,6 +36,24 @@
),
CompareResult::STATUS_MISMATCH
)
+),
+array(
+new CompareResult(
+$this-getDataValueMock(),
+array(
+$this-getDataValueMock()
+),
+CompareResult::STATUS_COMPLIANCE
+)
+),
+array(
+new CompareResult(
+$this-getDataValueMock(),
+array(
+$this-getDataValueMock()
+),
+CompareResult::STATUS_PARTIAL_COMPLIANCE
+)
)
);
}
@@ -92,6 +110,24 @@
'localValue' = 'foobar',
'externalValues' = array(
'foobar',
+'foobar'
+),
+'result' = CompareResult::STATUS_PARTIAL_COMPLIANCE
+),
+new CompareResult(
+$this-getDataValueMock(),
+array(
+$this-getDataValueMock(),
+$this-getDataValueMock()
+),
+CompareResult::STATUS_PARTIAL_COMPLIANCE
+)
+),
+array(
+array(
+'localValue' = 'foobar',
+'externalValues' = array(
+'foobar',
'_element' = 'dataValue'
[MediaWiki-commits] [Gerrit] Restrict default styling to panels in #content area - change (mediawiki...MobileFrontend)
jenkins-bot has submitted this change and it was merged.
Change subject: Restrict default styling to panels in #content area
..
Restrict default styling to panels in #content area
This rule is having nasty side effects in overlays
e.g. Gather edit screen, mobile editor
So restrict this to #content.
Bug: T98188
Change-Id: I1a4b82f859ec9a1c3c1001fd84574267f294412e
---
M resources/mobile.startup/panel.less
1 file changed, 8 insertions(+), 11 deletions(-)
Approvals:
Jhernandez: Looks good to me, approved
jenkins-bot: Verified
diff --git a/resources/mobile.startup/panel.less
b/resources/mobile.startup/panel.less
index a122654..ace20fe 100644
--- a/resources/mobile.startup/panel.less
+++ b/resources/mobile.startup/panel.less
@@ -2,19 +2,16 @@
@import minerva.variables;
// FIXME: Wikigrok uses the same styling for the .wikigrok class. Let's
consolidate.
-.panel {
- clear: both;
- margin-top: 1em;
- text-align: center;
-
- .content {
- padding: 1em @contentMargin;
- margin: 0;
- }
-}
-
#content {
.panel {
background-color: @grayLightest;
+ clear: both;
+ margin-top: 1em;
+ text-align: center;
+
+ .content {
+ padding: 1em @contentMargin;
+ margin: 0;
+ }
}
}
--
To view, visit https://gerrit.wikimedia.org/r/209194
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I1a4b82f859ec9a1c3c1001fd84574267f294412e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson jrob...@wikimedia.org
Gerrit-Reviewer: Jhernandez jhernan...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] rhodium: precise as installation distro - change (operations/puppet)
Alexandros Kosiaris has uploaded a new change for review.
https://gerrit.wikimedia.org/r/209201
Change subject: rhodium: precise as installation distro
..
rhodium: precise as installation distro
rhodium is a new puppetmaster. Right now we need ruby1.8, see T98129 for
more information, for puppetmasters which means precise
Change-Id: I62f55df968c30cf7a0e154ddbf0bf0a5a1c727c9
---
M modules/install-server/files/dhcpd/linux-host-entries.ttyS1-115200
1 file changed, 2 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/01/209201/1
diff --git a/modules/install-server/files/dhcpd/linux-host-entries.ttyS1-115200
b/modules/install-server/files/dhcpd/linux-host-entries.ttyS1-115200
index 5b76a5c..0e70080 100644
--- a/modules/install-server/files/dhcpd/linux-host-entries.ttyS1-115200
+++ b/modules/install-server/files/dhcpd/linux-host-entries.ttyS1-115200
@@ -5703,8 +5703,8 @@
host rhodium {
hardware ethernet 18:03:73:f1:56:d2;
fixed-address rhodium.eqiad.wmnet;
- option pxelinux.pathprefix jessie-installer/;
- filename jessie-installer/debian-installer/amd64/pxelinux.0;
+ option pxelinux.pathprefix precise-installer/;
+ filename precise-installer/ubuntu-installer/amd64/pxelinux.0;
}
--
To view, visit https://gerrit.wikimedia.org/r/209201
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I62f55df968c30cf7a0e154ddbf0bf0a5a1c727c9
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alexandros Kosiaris akosia...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update SMW for I45676904 - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged. Change subject: Update SMW for I45676904 .. Update SMW for I45676904 Bug: T98284 Change-Id: I269a391ee23ebe4e776bb449aa6f7cddfad59280 --- M extensions/SemanticMediaWiki 1 file changed, 0 insertions(+), 0 deletions(-) Approvals: Alex Monk: Looks good to me, approved jenkins-bot: Verified diff --git a/extensions/SemanticMediaWiki b/extensions/SemanticMediaWiki index 8bc21b2..fe26107 16 --- a/extensions/SemanticMediaWiki +++ b/extensions/SemanticMediaWiki -Subproject commit 8bc21b2a590c6b8742b9291619a8c7d9e80fbf43 +Subproject commit fe261079e43003f0f67be71ec210e7c699f5dcd4 -- To view, visit https://gerrit.wikimedia.org/r/209212 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I269a391ee23ebe4e776bb449aa6f7cddfad59280 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: wmf/1.26wmf4 Gerrit-Owner: Alex Monk kren...@gmail.com Gerrit-Reviewer: Alex Monk kren...@gmail.com Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Until seentime is recorded, we should treat notifications as... - change (mediawiki...Echo)
jenkins-bot has submitted this change and it was merged.
Change subject: Until seentime is recorded, we should treat notifications as
unseen
..
Until seentime is recorded, we should treat notifications as unseen
Since we didn't use to save seen time, it is unreliable at first.
I decided to just show them as read then, since we couldn't know
if they had or hadn't been read.
However, it would make more sense to keep them unread until we first
save the time a notifiation is seen: it is in line with the current
behavior (where the badge just stays red, always)
Also fixed a problem where I meant to .get a value but had .set
instead. It wasn't noticable because that function is currently
only called when things have just been seen, so even though it
was wrong, it produced a good result.
Bug: T94634
Change-Id: I7ee447249527feb3914c76cfffd673bbda062b75
---
M Hooks.php
M modules/overlay/ext.echo.overlay.js
2 files changed, 3 insertions(+), 4 deletions(-)
Approvals:
Sbisson: Looks good to me, approved
jenkins-bot: Verified
diff --git a/Hooks.php b/Hooks.php
index cea3ebf..75864e8 100644
--- a/Hooks.php
+++ b/Hooks.php
@@ -654,8 +654,7 @@
if (
$notificationCount == 0 || // no unread
notifications
$notificationTimestamp === false || // should
already always be false if count === 0
- $seenTime === null || // seenTime hasn't yet
been recorded, don't rely on it
- $notificationTimestamp-getTimestamp( TS_MW )
= $seenTime // all notifications have already been seen
+ ( $seenTime !== null
$notificationTimestamp-getTimestamp( TS_MW ) = $seenTime ) // all
notifications have already been seen
) {
$linkClasses = array(
'mw-echo-notifications-badge' );
} else {
diff --git a/modules/overlay/ext.echo.overlay.js
b/modules/overlay/ext.echo.overlay.js
index cdc18a8..ecb0a5e 100644
--- a/modules/overlay/ext.echo.overlay.js
+++ b/modules/overlay/ext.echo.overlay.js
@@ -257,13 +257,13 @@
updateBadgeColor: function () {
var $badge = mw.echo.getBadge(),
count = this.notificationCount.unreadRaw,
- seenTime = mw.user.options.set(
'echo-seen-time' ),
+ seenTime = mw.user.options.get(
'echo-seen-time' ),
seen = true;
// figure out if unread notifications in all tabs have
already been seen
$.each( this.tabs, function ( key, tab ) {
var time = tab.getLastUnreadNotificationTime();
- seen = seen ( time === false || time
seenTime );
+ seen = seen ( time === false || ( seenTime
!== null time seenTime ) );
} );
if ( !seen count !== '0' count !== 0 ) {
--
To view, visit https://gerrit.wikimedia.org/r/209189
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I7ee447249527feb3914c76cfffd673bbda062b75
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Echo
Gerrit-Branch: master
Gerrit-Owner: Matthias Mullie mmul...@wikimedia.org
Gerrit-Reviewer: Sbisson sbis...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Only reload page after CollectionEditOverlay if page is spec... - change (mediawiki...Gather)
Jhernandez has uploaded a new change for review.
https://gerrit.wikimedia.org/r/209199
Change subject: Only reload page after CollectionEditOverlay if page is special.
..
Only reload page after CollectionEditOverlay if page is special.
No need to reload on article pages (causes loosing CTA's).
Bug: T98299
Change-Id: I7f54e21de4ec14d12493d0de86170fe8548aa74c
---
M resources/ext.gather.collection.editor/CollectionEditOverlay.js
M resources/ext.gather.routes/routes.js
2 files changed, 10 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Gather
refs/changes/99/209199/1
diff --git a/resources/ext.gather.collection.editor/CollectionEditOverlay.js
b/resources/ext.gather.collection.editor/CollectionEditOverlay.js
index a420196..e925a5d 100644
--- a/resources/ext.gather.collection.editor/CollectionEditOverlay.js
+++ b/resources/ext.gather.collection.editor/CollectionEditOverlay.js
@@ -41,11 +41,12 @@
additionalClassNames: 'cancel',
label: mw.msg( 'mobile-frontend-overlay-close' )
} ).options,
+ collection: null,
+ reloadOnSave: false,
confirmExitMessage: mw.msg(
'gather-edit-collection-confirm' ),
editSuccessMsg: mw.msg(
'gather-update-collection-success' ),
editFailedError: mw.msg(
'gather-edit-collection-failed-error' ),
unknownCollectionError: mw.msg(
'gather-error-unknown-collection' ),
- collection: null,
heading: mw.msg( 'gather-edit-collection-heading' ),
nameLabel: mw.msg( 'gather-edit-collection-label-name'
),
descriptionLabel: mw.msg(
'gather-edit-collection-label-description' ),
@@ -202,9 +203,12 @@
* @private
*/
_reloadCollection: function () {
+ var self = this;
window.setTimeout( function () {
router.navigate( '/' );
- window.location.reload();
+ if ( self.options.reloadOnSave ) {
+ window.location.reload();
+ }
}, 100 );
},
/**
diff --git a/resources/ext.gather.routes/routes.js
b/resources/ext.gather.routes/routes.js
index 65e4d66..a8f5b2e 100644
--- a/resources/ext.gather.routes/routes.js
+++ b/resources/ext.gather.routes/routes.js
@@ -12,10 +12,12 @@
if ( collection ) {
if ( action === 'edit' ) {
mw.loader.using(
'ext.gather.collection.editor' ).done( function () {
- var CollectionEditOverlay =
M.require( 'ext.gather.collection.edit/CollectionEditOverlay' );
+ var CollectionEditOverlay =
M.require( 'ext.gather.collection.edit/CollectionEditOverlay' ),
+ isSpecialPage =
mw.config.get( 'wgNamespaceNumber' ) === mw.config.get( 'wgNamespaceIds'
).special;
d.resolve(
new
CollectionEditOverlay( {
- collection:
collection
+ collection:
collection,
+ reloadOnSave:
isSpecialPage
} )
);
} );
--
To view, visit https://gerrit.wikimedia.org/r/209199
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I7f54e21de4ec14d12493d0de86170fe8548aa74c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Gather
Gerrit-Branch: master
Gerrit-Owner: Jhernandez jhernan...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] rhodium: precise as installation distro - change (operations/puppet)
Alexandros Kosiaris has submitted this change and it was merged.
Change subject: rhodium: precise as installation distro
..
rhodium: precise as installation distro
rhodium is a new puppetmaster. Right now we need ruby1.8, see T98129 for
more information, for puppetmasters which means precise
Change-Id: I62f55df968c30cf7a0e154ddbf0bf0a5a1c727c9
---
M modules/install-server/files/dhcpd/linux-host-entries.ttyS1-115200
1 file changed, 2 insertions(+), 2 deletions(-)
Approvals:
Alexandros Kosiaris: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/install-server/files/dhcpd/linux-host-entries.ttyS1-115200
b/modules/install-server/files/dhcpd/linux-host-entries.ttyS1-115200
index 5b76a5c..0e70080 100644
--- a/modules/install-server/files/dhcpd/linux-host-entries.ttyS1-115200
+++ b/modules/install-server/files/dhcpd/linux-host-entries.ttyS1-115200
@@ -5703,8 +5703,8 @@
host rhodium {
hardware ethernet 18:03:73:f1:56:d2;
fixed-address rhodium.eqiad.wmnet;
- option pxelinux.pathprefix jessie-installer/;
- filename jessie-installer/debian-installer/amd64/pxelinux.0;
+ option pxelinux.pathprefix precise-installer/;
+ filename precise-installer/ubuntu-installer/amd64/pxelinux.0;
}
--
To view, visit https://gerrit.wikimedia.org/r/209201
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I62f55df968c30cf7a0e154ddbf0bf0a5a1c727c9
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alexandros Kosiaris akosia...@wikimedia.org
Gerrit-Reviewer: Alexandros Kosiaris akosia...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] CX: Add languages for CX deployment on 20150507 - change (operations/puppet)
KartikMistry has uploaded a new change for review. https://gerrit.wikimedia.org/r/209202 Change subject: CX: Add languages for CX deployment on 20150507 .. CX: Add languages for CX deployment on 20150507 * Abkhazian (ab) * Albanian (sq) * Armenian (hy) * Aromanian (roa-rup) * Avar (av) * Azerbaijani (az) * rimean-Tatar (crh) * Gagauz (gag) * Ladino (lad) * Kabardian (kbd) * Karachay-Balkar (krc) * Karakalpak (kaa) * Maltese (mt) * Mirandese (mwl) * Ossetian (os) * Romani (rmy) * Turkish (tr) Bug: T97888 Bug: T97967 Bug: T97966 Bug: T97969 Change-Id: Ia319781205a2644c4304870c0c7983e0303d69e9 --- M hieradata/common/cxserver.yaml 1 file changed, 33 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/02/209202/1 diff --git a/hieradata/common/cxserver.yaml b/hieradata/common/cxserver.yaml index 907c3f7..f59da3f 100644 --- a/hieradata/common/cxserver.yaml +++ b/hieradata/common/cxserver.yaml @@ -1,14 +1,18 @@ registry: source: +- 'ab' - 'af' - 'ak' - 'an' - 'ast' +- 'av' +- 'az' - 'ba' - 'bg' - 'bm' - 'ca' - 'ceb' +- 'crh' - 'cs' - 'cv' - 'da' @@ -21,39 +25,51 @@ - 'de' - 'ff' - 'fr' +- 'gag' - 'gl' - 'gu' +- 'hy' - 'id' - 'it' +- 'kaa' +- 'kbd' - 'kg' - 'ki' - 'kk' - 'kn' - 'koi' +- 'krc' - 'kv' - 'ky' - 'kz' +- 'lad' - 'lez' - 'lg' - 'min' - 'mk' - 'ms' +- 'mt' +- 'mwl' - 'nl' - 'nn' - 'no' - 'ny' - 'oc' - 'om' +- 'os' - 'pa' - 'pl' - 'pt' +- 'rmy' - 'rn' +- 'roa-rup' - 'ru' - 'sah' - 'sg' - 'sh' - 'simple' - 'sl' +- 'sq' - 'ss' - 'st' - 'sv' @@ -73,15 +89,19 @@ - 'xh' - 'zu' target: +- 'ab' - 'af' - 'ak' - 'an' - 'ast' +- 'av' +- 'az' - 'ba' - 'bg' - 'bm' - 'ca' - 'cv' +- 'crh' - 'cs' - 'da' - 'ee' @@ -91,39 +111,52 @@ - 'eu' - 'ff' - 'fr' +- 'gag' - 'gl' - 'gu' +- 'hy' - 'id' +- 'kaa' +- 'kbd' - 'kg' - 'ki' - 'kk' - 'kn' - 'koi' +- 'krc' - 'kv' - 'ky' +- 'lad' - 'lez' - 'lg' - 'min' - 'mk' - 'ms' +- 'mt' +- 'mwl' - 'nn' - 'no' - 'ny' - 'oc' - 'om' +- 'os' - 'pa' - 'pt' +- 'rmy' - 'rn' +- 'roa-rup' - 'sah' - 'sg' - 'sh' - 'simple' - 'sl' +- 'sq' - 'ss' - 'st' - 'sv' - 'ti' - 'tn' +- 'tr' - 'ts' - 'tt' - 'tum' -- To view, visit https://gerrit.wikimedia.org/r/209202 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ia319781205a2644c4304870c0c7983e0303d69e9 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: KartikMistry kartik.mis...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix Special:Properties - change (mediawiki...SemanticMediaWiki)
Alex Monk has uploaded a new change for review.
https://gerrit.wikimedia.org/r/209208
Change subject: Fix Special:Properties
..
Fix Special:Properties
This was calling a function removed in I26d8dec1
Bug: T98284
Change-Id: I456769046f93926a2be885ab59bb8f3d7cf732ab
---
M specials/QueryPages/SMW_QueryPage.php
1 file changed, 7 insertions(+), 3 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/SemanticMediaWiki
refs/changes/08/209208/1
diff --git a/specials/QueryPages/SMW_QueryPage.php
b/specials/QueryPages/SMW_QueryPage.php
index faa8147..66761b5 100644
--- a/specials/QueryPages/SMW_QueryPage.php
+++ b/specials/QueryPages/SMW_QueryPage.php
@@ -73,9 +73,13 @@
// often disable 'next' link when we reach the end
$atend = $num $limit;
- $sl = wfViewPrevNext( $offset, $limit ,
- $wgContLang-specialPage( $sname ),
- wfArrayToCGI( $this-linkParameters() ), $atend );
+ $sl = $wgContLang-viewPrevNext(
+ Title::newFromText( $wgContLang-specialPage( $sname )
),
+ $offset,
+ $limit,
+ $this-linkParameters(),
+ $atend
+ );
$wgOut-addHTML( br /{$sl}/p\n );
if ( $num 0 ) {
--
To view, visit https://gerrit.wikimedia.org/r/209208
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I456769046f93926a2be885ab59bb8f3d7cf732ab
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SemanticMediaWiki
Gerrit-Branch: master
Gerrit-Owner: Alex Monk kren...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix Special:Properties - change (mediawiki...SemanticMediaWiki)
Alex Monk has uploaded a new change for review.
https://gerrit.wikimedia.org/r/209209
Change subject: Fix Special:Properties
..
Fix Special:Properties
This was calling a function removed in I26d8dec1
Bug: T98284
Change-Id: I456769046f93926a2be885ab59bb8f3d7cf732ab
---
M specials/QueryPages/SMW_QueryPage.php
1 file changed, 7 insertions(+), 3 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/SemanticMediaWiki
refs/changes/09/209209/1
diff --git a/specials/QueryPages/SMW_QueryPage.php
b/specials/QueryPages/SMW_QueryPage.php
index faa8147..66761b5 100644
--- a/specials/QueryPages/SMW_QueryPage.php
+++ b/specials/QueryPages/SMW_QueryPage.php
@@ -73,9 +73,13 @@
// often disable 'next' link when we reach the end
$atend = $num $limit;
- $sl = wfViewPrevNext( $offset, $limit ,
- $wgContLang-specialPage( $sname ),
- wfArrayToCGI( $this-linkParameters() ), $atend );
+ $sl = $wgContLang-viewPrevNext(
+ Title::newFromText( $wgContLang-specialPage( $sname )
),
+ $offset,
+ $limit,
+ $this-linkParameters(),
+ $atend
+ );
$wgOut-addHTML( br /{$sl}/p\n );
if ( $num 0 ) {
--
To view, visit https://gerrit.wikimedia.org/r/209209
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I456769046f93926a2be885ab59bb8f3d7cf732ab
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SemanticMediaWiki
Gerrit-Branch: 1.8.x
Gerrit-Owner: Alex Monk kren...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Show loading screen while the collection editor loads - change (mediawiki...Gather)
jenkins-bot has submitted this change and it was merged.
Change subject: Show loading screen while the collection editor loads
..
Show loading screen while the collection editor loads
Bug: T98025
Change-Id: Ie3ed3afcb9ef0af7b4611cd4a938da42206023ba
---
M resources/ext.gather.routes/routes.js
1 file changed, 4 insertions(+), 2 deletions(-)
Approvals:
Jdlrobson: Looks good to me, approved
jenkins-bot: Verified
diff --git a/resources/ext.gather.routes/routes.js
b/resources/ext.gather.routes/routes.js
index 65e4d66..9ac42ea 100644
--- a/resources/ext.gather.routes/routes.js
+++ b/resources/ext.gather.routes/routes.js
@@ -2,7 +2,8 @@
var CollectionsApi = M.require( 'ext.gather.api/CollectionsApi' ),
toast = M.require( 'toast' ),
- overlayManager = M.require( 'overlayManager' );
+ overlayManager = M.require( 'overlayManager' ),
+ loader = M.require( 'loader' );
overlayManager.add( /^\/collection\/(.*)\/(.*)$/, function ( action, id
) {
var d = $.Deferred(),
@@ -11,8 +12,9 @@
api.getCollection( id ).done( function ( collection ) {
if ( collection ) {
if ( action === 'edit' ) {
- mw.loader.using(
'ext.gather.collection.editor' ).done( function () {
+ loader.loadModule(
'ext.gather.collection.editor', true ).done( function ( loadingOverlay ) {
var CollectionEditOverlay =
M.require( 'ext.gather.collection.edit/CollectionEditOverlay' );
+ loadingOverlay.hide();
d.resolve(
new
CollectionEditOverlay( {
collection:
collection
--
To view, visit https://gerrit.wikimedia.org/r/209203
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie3ed3afcb9ef0af7b4611cd4a938da42206023ba
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Gather
Gerrit-Branch: master
Gerrit-Owner: Jhernandez jhernan...@wikimedia.org
Gerrit-Reviewer: Jdlrobson jrob...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Special pages now contain the lines they used to inherit - change (mediawiki...WikidataQualityExternalValidation)
Jonaskeutel has uploaded a new change for review.
https://gerrit.wikimedia.org/r/209211
Change subject: Special pages now contain the lines they used to inherit
..
Special pages now contain the lines they used to inherit
Change-Id: I601c334f8faaa4651db6f21ba6f1ebaba4eeb27f
---
M WikidataQualityExternalValidation.php
A modules/SpecialExternalValidationPage.css
M specials/SpecialCrossCheck.php
M specials/SpecialExternalDbs.php
4 files changed, 589 insertions(+), 12 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikidataQualityExternalValidation
refs/changes/11/209211/1
diff --git a/WikidataQualityExternalValidation.php
b/WikidataQualityExternalValidation.php
index e9caee9..12b5426 100644
--- a/WikidataQualityExternalValidation.php
+++ b/WikidataQualityExternalValidation.php
@@ -41,6 +41,13 @@
// Define API modules
$GLOBALS['wgAPIModules']['wdqacrosscheck'] =
'WikidataQuality\ExternalValidation\Api\CrossCheck';
+ // Define modules
+ $GLOBALS['wgResourceModules']['SpecialExternalValidationPage'] = array (
+ 'styles' = '/modules/SpecialExternalValidationPage.css',
+ 'localBasePath' = __DIR__,
+ 'remoteExtPath' = 'WikidataQualityExternalValidation'
+ );
+
// Define database table names
define( 'DUMP_DATA_TABLE', 'wdqa_external_data' );
define( 'DUMP_META_TABLE', 'wdqa_dump_information' );
diff --git a/modules/SpecialExternalValidationPage.css
b/modules/SpecialExternalValidationPage.css
new file mode 100644
index 000..d628c9c
--- /dev/null
+++ b/modules/SpecialExternalValidationPage.css
@@ -0,0 +1,83 @@
+/* Entity id form */
+.wbq-checkresult-form {
+margin-top: 10px;
+margin-bottom: 20px;
+}
+
+.wbq-checkresult-form-entity-id {
+width: 120px;
+}
+
+.wbq-checkresult-form-submit {
+margin-left: 5px;
+}
+
+/* Notices */
+.wbq-checkresult-notice {
+font-style: italic;
+}
+
+.wbq-checkresult-notice-error {
+font-weight: bold;
+color: #BA;
+}
+
+/* Statuses */
+.wbq-status {
+font-weight: bold;
+}
+
+.wbq-status-success {
+color: #008000;
+}
+
+.wbq-status-partial-success {
+color: #6CB500;
+}
+
+.wbq-status-warning {
+color: #E6B800;
+}
+
+.wbq-status-error {
+color: #BA;
+}
+
+.wbq-status-unknown {
+color: #404040;
+}
+
+/* Tooltip */
+.wbq-tooltip-indicator:before {
+content: '[?]';
+color: #CCC;
+font-weight: 600;
+}
+
+[tooltip]:before {
+/* needed - do not touch */
+content: attr(tooltip);
+position: absolute;
+opacity: 0;
+
+/* customizable */
+transition: all 0.20s ease;
+padding: 5px;
+border: 1px solid #AAA;
+border-radius: 5px;
+box-shadow: 2px 2px 1px #CCC;
+}
+
+[tooltip]:hover:before {
+/* needed - do not touch */
+opacity: 1;
+
+/* customizable */
+background: #F2F2F2;
+margin-top: -35px;
+margin-left: -5px;
+}
+
+[tooltip]:not([tooltip-persistent]):before {
+pointer-events: none;
+}
\ No newline at end of file
diff --git a/specials/SpecialCrossCheck.php b/specials/SpecialCrossCheck.php
index ccd4ec0..12f6bc5 100755
--- a/specials/SpecialCrossCheck.php
+++ b/specials/SpecialCrossCheck.php
@@ -2,13 +2,28 @@
namespace WikidataQuality\ExternalValidation\Specials;
+use SpecialPage;
+use ValueFormatters\FormatterOptions;
+use Wikibase\Lib\EntityIdLabelFormatter;
+use Wikibase\Lib\EntityIdHtmlLinkFormatter;
+use Wikibase\Lib\EntityIdLinkFormatter;
+use Wikibase\Lib\HtmlUrlFormatter;
+use Wikibase\Lib\LanguageNameLookup;
+use Wikibase\Lib\SnakFormatter;
+use Wikibase\Lib\Store\LanguageLabelDescriptionLookup;
+use Wikibase\Repo\WikibaseRepo;
use Html;
use JobQueueGroup;
use Linker;
use Traversable;
use Wikibase\DataModel\Entity\Entity;
use Wikibase\DataModel\Entity\EntityId;
-use Wikibase\Repo\WikibaseRepo;
+use DataValues\DataValue;
+use Doctrine\Instantiator\Exception\InvalidArgumentException;
+use Doctrine\Instantiator\Exception\UnexpectedValueException;
+use Wikibase\DataModel\Entity\EntityIdParsingException;
+use Countable;
+use Wikibase\DataModel\Entity\EntityIdValue;
use WikidataQuality\ExternalValidation\CheckForCrossCheckViolationsJob;
use
WikidataQuality\ExternalValidation\CrossCheck\Comparer\DataValueComparerFactory;
use WikidataQuality\ExternalValidation\CrossCheck\CrossChecker;
@@ -18,18 +33,88 @@
use
WikidataQuality\ExternalValidation\DumpMetaInformation\DumpMetaInformationLookup;
use WikidataQuality\Html\HtmlTable;
use WikidataQuality\Html\HtmlTableHeader;
-use WikidataQuality\Specials\SpecialCheckResultPage;
-class SpecialCrossCheck extends SpecialCheckResultPage {
+class SpecialCrossCheck extends SpecialPage {
/**
* @var CrossCheckInteractor
*/
private $crossCheckInteractor;
-public function __construct() {
-parent::__construct( 'CrossCheck' );
+/**
+ * @var
[MediaWiki-commits] [Gerrit] Remove unused ganglia.wikimedia.org.erb template - change (operations/puppet)
Alexandros Kosiaris has uploaded a new change for review. https://gerrit.wikimedia.org/r/209204 Change subject: Remove unused ganglia.wikimedia.org.erb template .. Remove unused ganglia.wikimedia.org.erb template This is no longer used, remove Change-Id: Ia87df1972f662411f2ae7e431f757b0728c5135c --- D templates/apache/sites/ganglia.wikimedia.org.erb 1 file changed, 0 insertions(+), 53 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/04/209204/1 diff --git a/templates/apache/sites/ganglia.wikimedia.org.erb b/templates/apache/sites/ganglia.wikimedia.org.erb deleted file mode 100644 index ac9d900..000 --- a/templates/apache/sites/ganglia.wikimedia.org.erb +++ /dev/null @@ -1,53 +0,0 @@ -VirtualHost *:80 -ServerName %= @ganglia_servername % -ServerAlias %= @ganglia_serveralias % -DocumentRoot /var/www -ServerAdmin n...@wikimedia.org - -Directory /var/www -Options FollowSymLinks -AllowOverride None -% if @is_trusty % -Require all granted -% else % -Order allow,deny -Allow from all -% end % -/Directory - -Alias /latest %= @ganglia_webdir % - -RedirectMatch ^/$ http://%= @ganglia_servername %/latest -ErrorLog /var/log/apache2/ganglia.wikimedia.org-error.log -LogLevel warn -/VirtualHost -% if @ganglia_ssl_cert % -VirtualHost *:443 -ServerName %= @ganglia_servername % -ServerAlias %= @ganglia_serveralias % -DocumentRoot /var/www -ServerAdmin n...@wikimedia.org - -SSLEngine on -SSLCertificateFile %= @ganglia_ssl_cert % -SSLCertificateKeyFile %= @ganglia_ssl_key % -%= @ssl_settings.join(\n) % - -Directory /var/www -Options FollowSymLinks -AllowOverride None -% if @is_trusty % -Require all granted -% else % -Order allow,deny -Allow from all -% end % -/Directory - -Alias /latest %= @ganglia_webdir % - -RedirectMatch ^/$ https://%= @ganglia_servername %/latest -ErrorLog /var/log/apache2/ganglia.wikimedia.org-error.log -LogLevel warn -/VirtualHost -% end % -- To view, visit https://gerrit.wikimedia.org/r/209204 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ia87df1972f662411f2ae7e431f757b0728c5135c Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Alexandros Kosiaris akosia...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Show loading screen while the collection editor loads - change (mediawiki...Gather)
Jhernandez has uploaded a new change for review.
https://gerrit.wikimedia.org/r/209203
Change subject: Show loading screen while the collection editor loads
..
Show loading screen while the collection editor loads
Bug: T98025
Change-Id: Ie3ed3afcb9ef0af7b4611cd4a938da42206023ba
---
M resources/ext.gather.routes/routes.js
1 file changed, 4 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Gather
refs/changes/03/209203/1
diff --git a/resources/ext.gather.routes/routes.js
b/resources/ext.gather.routes/routes.js
index 65e4d66..9ac42ea 100644
--- a/resources/ext.gather.routes/routes.js
+++ b/resources/ext.gather.routes/routes.js
@@ -2,7 +2,8 @@
var CollectionsApi = M.require( 'ext.gather.api/CollectionsApi' ),
toast = M.require( 'toast' ),
- overlayManager = M.require( 'overlayManager' );
+ overlayManager = M.require( 'overlayManager' ),
+ loader = M.require( 'loader' );
overlayManager.add( /^\/collection\/(.*)\/(.*)$/, function ( action, id
) {
var d = $.Deferred(),
@@ -11,8 +12,9 @@
api.getCollection( id ).done( function ( collection ) {
if ( collection ) {
if ( action === 'edit' ) {
- mw.loader.using(
'ext.gather.collection.editor' ).done( function () {
+ loader.loadModule(
'ext.gather.collection.editor', true ).done( function ( loadingOverlay ) {
var CollectionEditOverlay =
M.require( 'ext.gather.collection.edit/CollectionEditOverlay' );
+ loadingOverlay.hide();
d.resolve(
new
CollectionEditOverlay( {
collection:
collection
--
To view, visit https://gerrit.wikimedia.org/r/209203
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie3ed3afcb9ef0af7b4611cd4a938da42206023ba
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Gather
Gerrit-Branch: master
Gerrit-Owner: Jhernandez jhernan...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] ganglia.wikimedia.org: Specify position of access log - change (operations/puppet)
Alexandros Kosiaris has uploaded a new change for review. https://gerrit.wikimedia.org/r/209205 Change subject: ganglia.wikimedia.org: Specify position of access log .. ganglia.wikimedia.org: Specify position of access log Follow the ganglia.wikimedia.org-error.log pattern for access log as well for simplicity Change-Id: Ib425268e5b3683fc0c6b4052958ee8af9f5978f3 --- M modules/ganglia_new/templates/ganglia.wikimedia.org.erb 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/05/209205/1 diff --git a/modules/ganglia_new/templates/ganglia.wikimedia.org.erb b/modules/ganglia_new/templates/ganglia.wikimedia.org.erb index 66849bd..4093da4 100644 --- a/modules/ganglia_new/templates/ganglia.wikimedia.org.erb +++ b/modules/ganglia_new/templates/ganglia.wikimedia.org.erb @@ -13,6 +13,7 @@ Alias /latest %= @ganglia_webdir % RedirectMatch ^/$ http://%= @ganglia_servername %/latest +CustomLog /var/log/apache2/ganglia.wikimedia.org-access.log combined ErrorLog /var/log/apache2/ganglia.wikimedia.org-error.log LogLevel warn /VirtualHost @@ -37,6 +38,7 @@ Alias /latest %= @ganglia_webdir % RedirectMatch ^/$ https://%= @ganglia_servername %/latest +CustomLog /var/log/apache2/ganglia.wikimedia.org-access.log combined ErrorLog /var/log/apache2/ganglia.wikimedia.org-error.log LogLevel warn /VirtualHost -- To view, visit https://gerrit.wikimedia.org/r/209205 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib425268e5b3683fc0c6b4052958ee8af9f5978f3 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Alexandros Kosiaris akosia...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] varnish: quick fix for mobile redirect outage - change (operations/puppet)
Faidon Liambotis has uploaded a new change for review.
https://gerrit.wikimedia.org/r/209206
Change subject: varnish: quick fix for mobile redirect outage
..
varnish: quick fix for mobile redirect outage
Commit 4eb918924cbadb98d0e0e144e97d35376abfbbb8 added geoiplookup to all
clusters, via wikimedia.vcl. It did that by the usual vcl_error hackery,
and by using error code 666.
Unfortunately, this is the same error code we use for the mobile
redirect, which means that now instead of a mobile redirect we are
emitting geoiplookups(!). This was noticed by users who were puzzled at
the geoiplookup JSON.
Switch to 668 (which seems unused from a git grep) as a quick hack until
we can think of a better, proper fix that avoids these sort of
collisions.
Bug: T98309
Change-Id: I366b7e86102a0dbac416b127cbb3fff23e4ad923
---
M modules/varnish/templates/vcl/wikimedia.vcl.erb
1 file changed, 2 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/06/209206/1
diff --git a/modules/varnish/templates/vcl/wikimedia.vcl.erb
b/modules/varnish/templates/vcl/wikimedia.vcl.erb
index da555eb..fa3780a 100644
--- a/modules/varnish/templates/vcl/wikimedia.vcl.erb
+++ b/modules/varnish/templates/vcl/wikimedia.vcl.erb
@@ -308,7 +308,7 @@
% if @cluster_options.fetch(enable_geoiplookup, false) -%
if (req.url == /geoiplookup || req.http.host ==
geoiplookup.wikimedia.org) {
- error 666 geoiplookup;
+ error 668 geoiplookup;
}
% end -%
@@ -408,7 +408,7 @@
% if @cluster_options.fetch(enable_geoiplookup, false) -%
// Support geoiplookup
- if (obj.status == 666) {
+ if (obj.status == 668) {
call geoip_lookup;
set obj.status = 200;
set obj.http.Connection = keep-alive;
--
To view, visit https://gerrit.wikimedia.org/r/209206
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I366b7e86102a0dbac416b127cbb3fff23e4ad923
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon Liambotis fai...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] ganglia.wikimedia.org: Specify position of access log - change (operations/puppet)
Alexandros Kosiaris has submitted this change and it was merged. Change subject: ganglia.wikimedia.org: Specify position of access log .. ganglia.wikimedia.org: Specify position of access log Follow the ganglia.wikimedia.org-error.log pattern for access log as well for simplicity Change-Id: Ib425268e5b3683fc0c6b4052958ee8af9f5978f3 --- M modules/ganglia_new/templates/ganglia.wikimedia.org.erb 1 file changed, 2 insertions(+), 0 deletions(-) Approvals: Alexandros Kosiaris: Looks good to me, approved jenkins-bot: Verified diff --git a/modules/ganglia_new/templates/ganglia.wikimedia.org.erb b/modules/ganglia_new/templates/ganglia.wikimedia.org.erb index 66849bd..4093da4 100644 --- a/modules/ganglia_new/templates/ganglia.wikimedia.org.erb +++ b/modules/ganglia_new/templates/ganglia.wikimedia.org.erb @@ -13,6 +13,7 @@ Alias /latest %= @ganglia_webdir % RedirectMatch ^/$ http://%= @ganglia_servername %/latest +CustomLog /var/log/apache2/ganglia.wikimedia.org-access.log combined ErrorLog /var/log/apache2/ganglia.wikimedia.org-error.log LogLevel warn /VirtualHost @@ -37,6 +38,7 @@ Alias /latest %= @ganglia_webdir % RedirectMatch ^/$ https://%= @ganglia_servername %/latest +CustomLog /var/log/apache2/ganglia.wikimedia.org-access.log combined ErrorLog /var/log/apache2/ganglia.wikimedia.org-error.log LogLevel warn /VirtualHost -- To view, visit https://gerrit.wikimedia.org/r/209205 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ib425268e5b3683fc0c6b4052958ee8af9f5978f3 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Alexandros Kosiaris akosia...@wikimedia.org Gerrit-Reviewer: Alexandros Kosiaris akosia...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Make uses wikitext link open in new tab - change (mediawiki...Flow)
jenkins-bot has submitted this change and it was merged.
Change subject: Make uses wikitext link open in new tab
..
Make uses wikitext link open in new tab
Bug: T97434
Change-Id: I48b00ede0c0aba4ecba42071bf25e811f8c06951
---
M modules/editor/editors/ext.flow.editors.none.js
1 file changed, 9 insertions(+), 3 deletions(-)
Approvals:
Matthias Mullie: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/editor/editors/ext.flow.editors.none.js
b/modules/editor/editors/ext.flow.editors.none.js
index ac86a2e..7ec8357 100644
--- a/modules/editor/editors/ext.flow.editors.none.js
+++ b/modules/editor/editors/ext.flow.editors.none.js
@@ -141,7 +141,7 @@
};
mw.flow.editors.none.prototype.attachControls = function () {
- var $preview, $controls, templateArgs,
+ var $preview, $usesWikitext, $controls, templateArgs,
board = mw.flow.getPrototypeMethod( 'board',
'getInstanceByElement' )( this.$node );
if ( mw.flow.editors.visualeditor.static.isSupported() ) {
@@ -151,10 +151,16 @@
'data-flow-target': ' form textarea'
} ).text( mw.message(
'flow-wikitext-editor-help-preview-the-result' ).text() );
+ $usesWikitext = $( 'div' )
+ .html( mw.message(
'flow-wikitext-editor-help-uses-wikitext' ).parse() )
+ .find( 'a' )
+ .attr( 'target', '_blank' )
+ .end();
+
templateArgs = {
enable_switcher: true,
help_text: mw.message(
'flow-wikitext-editor-help-and-preview' ).params( [
- mw.message(
'flow-wikitext-editor-help-uses-wikitext' ).parse(),
+ $usesWikitext.html(),
$preview[0].outerHTML
] ).parse()
};
@@ -163,7 +169,7 @@
templateArgs = {
enable_switcher: false,
help_text: mw.message(
'flow-wikitext-editor-help' ).params( [
- mw.message(
'flow-wikitext-editor-help-uses-wikitext' ).parse()
+ $usesWikitext.html()
] ).parse()
};
}
--
To view, visit https://gerrit.wikimedia.org/r/208845
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I48b00ede0c0aba4ecba42071bf25e811f8c06951
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: Catrope roan.katt...@gmail.com
Gerrit-Reviewer: Mattflaschen mflasc...@wikimedia.org
Gerrit-Reviewer: Matthias Mullie mmul...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Only reload page after CollectionEditOverlay if page is spec... - change (mediawiki...Gather)
jenkins-bot has submitted this change and it was merged.
Change subject: Only reload page after CollectionEditOverlay if page is special.
..
Only reload page after CollectionEditOverlay if page is special.
No need to reload on article pages (causes loosing CTA's).
Bug: T98299
Change-Id: I7f54e21de4ec14d12493d0de86170fe8548aa74c
---
M resources/ext.gather.collection.editor/CollectionEditOverlay.js
M resources/ext.gather.routes/routes.js
2 files changed, 10 insertions(+), 4 deletions(-)
Approvals:
Jdlrobson: Looks good to me, approved
jenkins-bot: Verified
diff --git a/resources/ext.gather.collection.editor/CollectionEditOverlay.js
b/resources/ext.gather.collection.editor/CollectionEditOverlay.js
index a420196..e925a5d 100644
--- a/resources/ext.gather.collection.editor/CollectionEditOverlay.js
+++ b/resources/ext.gather.collection.editor/CollectionEditOverlay.js
@@ -41,11 +41,12 @@
additionalClassNames: 'cancel',
label: mw.msg( 'mobile-frontend-overlay-close' )
} ).options,
+ collection: null,
+ reloadOnSave: false,
confirmExitMessage: mw.msg(
'gather-edit-collection-confirm' ),
editSuccessMsg: mw.msg(
'gather-update-collection-success' ),
editFailedError: mw.msg(
'gather-edit-collection-failed-error' ),
unknownCollectionError: mw.msg(
'gather-error-unknown-collection' ),
- collection: null,
heading: mw.msg( 'gather-edit-collection-heading' ),
nameLabel: mw.msg( 'gather-edit-collection-label-name'
),
descriptionLabel: mw.msg(
'gather-edit-collection-label-description' ),
@@ -202,9 +203,12 @@
* @private
*/
_reloadCollection: function () {
+ var self = this;
window.setTimeout( function () {
router.navigate( '/' );
- window.location.reload();
+ if ( self.options.reloadOnSave ) {
+ window.location.reload();
+ }
}, 100 );
},
/**
diff --git a/resources/ext.gather.routes/routes.js
b/resources/ext.gather.routes/routes.js
index 9ac42ea..8811b2b 100644
--- a/resources/ext.gather.routes/routes.js
+++ b/resources/ext.gather.routes/routes.js
@@ -13,11 +13,13 @@
if ( collection ) {
if ( action === 'edit' ) {
loader.loadModule(
'ext.gather.collection.editor', true ).done( function ( loadingOverlay ) {
- var CollectionEditOverlay =
M.require( 'ext.gather.collection.edit/CollectionEditOverlay' );
+ var CollectionEditOverlay =
M.require( 'ext.gather.collection.edit/CollectionEditOverlay' ),
+ isSpecialPage =
mw.config.get( 'wgNamespaceNumber' ) === mw.config.get( 'wgNamespaceIds'
).special;
loadingOverlay.hide();
d.resolve(
new
CollectionEditOverlay( {
- collection:
collection
+ collection:
collection,
+ reloadOnSave:
isSpecialPage
} )
);
} );
--
To view, visit https://gerrit.wikimedia.org/r/209199
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I7f54e21de4ec14d12493d0de86170fe8548aa74c
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/Gather
Gerrit-Branch: master
Gerrit-Owner: Jhernandez jhernan...@wikimedia.org
Gerrit-Reviewer: Jdlrobson jrob...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] special page now has explanation text - change (mediawiki...WikidataQualityConstraints)
Jonaskeutel has uploaded a new change for review.
https://gerrit.wikimedia.org/r/209213
Change subject: special page now has explanation text
..
special page now has explanation text
the layout is work in progress and will be finalized after Lydia saw it
Change-Id: I2e8a4260f8d912ccb8f6a9fdc13ff217239297ac
---
M WikidataQualityConstraints.php
M i18n/en.json
M i18n/qqq.json
A modules/SpecialConstraintReportPage.css
M specials/SpecialConstraintReport.php
5 files changed, 525 insertions(+), 8 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikidataQualityConstraints
refs/changes/13/209213/1
diff --git a/WikidataQualityConstraints.php b/WikidataQualityConstraints.php
index d7e1095..e7ccc58 100644
--- a/WikidataQualityConstraints.php
+++ b/WikidataQualityConstraints.php
@@ -37,6 +37,13 @@
// Initialize special pages
$GLOBALS['wgSpecialPages']['ConstraintReport'] =
'WikidataQuality\ConstraintReport\Specials\SpecialConstraintReport';
+ // Define modules
+ $GLOBALS['wgResourceModules']['SpecialConstraintReportPage'] = array (
+ 'styles' = '/modules/SpecialConstraintReportPage.css',
+ 'localBasePath' = __DIR__,
+ 'remoteExtPath' = 'WikidataQualityConstraints'
+ );
+
// Define database table names
define( 'CONSTRAINT_TABLE', 'wdqa_constraints' );
diff --git a/i18n/en.json b/i18n/en.json
index e33e49e..c14e30a 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -3,6 +3,9 @@
authors: BP2014N1
},
wikidataquality-constraintreport: Constraint report,
+ wikidataquality-constraintreport-explanation-part-one: This special page
performs constraints checks on every entity you want. The entities are fetched
from the live system so every constraint violation you fix there will be
instantly removed from this list.,
+ wikidataquality-constraintreport-explanation-part-two: The constraints
are parsed from the property talk pages once a week, so if you
add/delete/modify a constraint it might take up to a week until this gets taken
into account by this constraint report. There is currently work in progress to
migrate the constraints to statements on properties, enabling this special page
to do live-checks.,
+ wikidataquality-constraintreport-explanation-heading: Explanation,
wikidataquality-constraintreport-instructions: Enter an entity ID and let
it be checked against the constraints.,
wikidataquality-constraintreport-instructions-example: Try any ID,
ideally an item ID, and look at the results.,
wikidataquality-constraintreport-empty-result: There are no constraint
defined on this entity.,
diff --git a/i18n/qqq.json b/i18n/qqq.json
index 66c31a0..73ee18a 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -8,6 +8,9 @@
]
},
wikidataquality-constraintreport: {{doc-special|ConstraintReport}},
+ wikidataquality-constraintreport-explanation-heading: Heading for
the explanation box.,
+wikidataquality-constraintreport-explanation-part-one: Explanation
(part one), what this special page does and how it gets its data.,
+wikidataquality-constraintreport-explanation-part-one: Explanation
(part two), what this special page does and how it gets its data.,
wikidataquality-constraintreport-instructions: Instructions for
starting a check against the constraints.,
wikidataquality-constraintreport-instructions-example: Example, what
to enter to get good results for constraint reports.,
wikidataquality-constraintreport-empty-result: Message that appears,
when there are no constraints defined for the given entity.,
diff --git a/modules/SpecialConstraintReportPage.css
b/modules/SpecialConstraintReportPage.css
new file mode 100644
index 000..b244643
--- /dev/null
+++ b/modules/SpecialConstraintReportPage.css
@@ -0,0 +1,93 @@
+/* Entity id form */
+.wbq-checkresult-form {
+margin-top: 10px;
+margin-bottom: 20px;
+}
+
+.wbq-checkresult-form-entity-id {
+width: 120px;
+}
+
+.wbq-checkresult-form-submit {
+margin-left: 5px;
+}
+
+/* Notices */
+.wbq-checkresult-notice {
+font-style: italic;
+}
+
+.wbq-checkresult-notice-error {
+font-weight: bold;
+color: #BA;
+}
+
+/* Explanation infobox */
+.wbq-explanation {
+width: 25%;
+float: right;
+padding: 1em;
+padding-top: 0;
+border: 1px solid black;
+margin-left: 1em;
+}
+
+/* Statuses */
+.wbq-status {
+font-weight: bold;
+}
+
+.wbq-status-success {
+color: #008000;
+}
+
+.wbq-status-partial-success {
+color: #6CB500;
+}
+
+.wbq-status-warning {
+color: #E6B800;
+}
+
+.wbq-status-error {
+color: #BA;
+}
+
+.wbq-status-unknown {
+color: #404040;
+}
+
+/* Tooltip */
+.wbq-tooltip-indicator:before {
+content: '[?]';
+color: #CCC;
+font-weight: 600;
+}
+
+[tooltip]:before {
+/* needed - do not touch */
+
[MediaWiki-commits] [Gerrit] Don't disable images whilst opting into beta - change (mediawiki...MobileFrontend)
jenkins-bot has submitted this change and it was merged.
Change subject: Don't disable images whilst opting into beta
..
Don't disable images whilst opting into beta
Far too mean to be trolling like this.
Bug: T98187
Change-Id: Ifef83b8fa369f19f9a9d6eb4ab2164271104f8ea
---
M includes/specials/SpecialMobileOptions.php
1 file changed, 6 insertions(+), 4 deletions(-)
Approvals:
Jhernandez: Looks good to me, approved
Florianschmidtwelzow: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/includes/specials/SpecialMobileOptions.php
b/includes/specials/SpecialMobileOptions.php
index 183c03a..f382761 100644
--- a/includes/specials/SpecialMobileOptions.php
+++ b/includes/specials/SpecialMobileOptions.php
@@ -269,11 +269,13 @@
}
$context-setMobileMode( $group );
$imagesDisabled = !$request-getBool( 'enableImages' );
- if ( $context-imagesDisabled() !== $imagesDisabled ) {
- // Only record when the state has changed
- $schemaData['images'] = $imagesDisabled ? off : on;
+ if ( $request-getVal( 'enableImages' ) !== null ) {
+ if ( $context-imagesDisabled() !== $imagesDisabled ) {
+ // Only record when the state has changed
+ $schemaData['images'] = $imagesDisabled ? off
: on;
+ }
+ $context-setDisableImagesCookie( $imagesDisabled );
}
- $context-setDisableImagesCookie( $imagesDisabled );
$returnToTitle = Title::newFromText( $request-getText(
'returnto' ) );
if ( $returnToTitle ) {
--
To view, visit https://gerrit.wikimedia.org/r/209192
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ifef83b8fa369f19f9a9d6eb4ab2164271104f8ea
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson jrob...@wikimedia.org
Gerrit-Reviewer: Florianschmidtwelzow florian.schmidt.wel...@t-online.de
Gerrit-Reviewer: Jhernandez jhernan...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add status mapping for partial compliance and add/extend tes... - change (mediawiki...WikidataQualityExternalValidation)
Soeren.oldag has submitted this change and it was merged.
Change subject: Add status mapping for partial compliance and add/extend tests
for partial compliance
..
Add status mapping for partial compliance and add/extend tests for partial
compliance
Change-Id: I538611b55b2ed3c3a26b84a3f16c7fe3a9be700b
---
M specials/SpecialCrossCheck.php
M tests/phpunit/CrossCheck/CrossCheckerTest.php
M tests/phpunit/CrossCheck/Result/CrossCheckResultTest.php
M tests/phpunit/Serializer/CompareResultSerializerTest.php
M tests/phpunit/Specials/SpecialCrossCheckTest.php
5 files changed, 107 insertions(+), 4 deletions(-)
Approvals:
Soeren.oldag: Verified; Looks good to me, approved
diff --git a/specials/SpecialCrossCheck.php b/specials/SpecialCrossCheck.php
index 29d8f05..ccd4ec0 100755
--- a/specials/SpecialCrossCheck.php
+++ b/specials/SpecialCrossCheck.php
@@ -149,6 +149,7 @@
protected function getStatusMapping() {
return array(
CrossCheckResult::STATUS_COMPLIANCE = 'success',
+CrossCheckResult::STATUS_PARTIAL_COMPLIANCE = 'partial-success',
CrossCheckResult::STATUS_REFERENCES_MISSING = 'warning',
CrossCheckResult::STATUS_DATA_MISMATCH = 'error'
);
diff --git a/tests/phpunit/CrossCheck/CrossCheckerTest.php
b/tests/phpunit/CrossCheck/CrossCheckerTest.php
index f2a4507..d581061 100755
--- a/tests/phpunit/CrossCheck/CrossCheckerTest.php
+++ b/tests/phpunit/CrossCheck/CrossCheckerTest.php
@@ -185,7 +185,6 @@
* Test cases for testCrossCheckStatements
*/
public function crossCheckStatementsDataProvider() {
-$statementsQ1 = $this-items['Q1']-getStatements()-toArray();
return array(
// Cross-check all statements of Q1
diff --git a/tests/phpunit/CrossCheck/Result/CrossCheckResultTest.php
b/tests/phpunit/CrossCheck/Result/CrossCheckResultTest.php
index a82176f..6f23ceb 100755
--- a/tests/phpunit/CrossCheck/Result/CrossCheckResultTest.php
+++ b/tests/phpunit/CrossCheck/Result/CrossCheckResultTest.php
@@ -19,7 +19,7 @@
class CrossCheckResultTest extends \MediaWikiTestCase
{
-public function testConstructValidArguments( )
+public function testConstructValidArguments()
{
// Create test data
@@ -149,7 +149,7 @@
)
),
array(
-CrossCheckResult::STATUS_COMPLIANCE,
+CrossCheckResult::STATUS_PARTIAL_COMPLIANCE,
new CrossCheckResult(
new PropertyId( 'P42' ),
'Q42$fccafc70-07a0-4e82-807f-288a4b21c13c',
@@ -160,7 +160,7 @@
)
),
array(
-CrossCheckResult::STATUS_COMPLIANCE,
+CrossCheckResult::STATUS_PARTIAL_COMPLIANCE,
new CrossCheckResult(
new PropertyId( 'P42' ),
'Q42$fccafc70-07a0-4e82-807f-288a4b21c13c',
diff --git a/tests/phpunit/Serializer/CompareResultSerializerTest.php
b/tests/phpunit/Serializer/CompareResultSerializerTest.php
index 2093590..1eb0e0e 100755
--- a/tests/phpunit/Serializer/CompareResultSerializerTest.php
+++ b/tests/phpunit/Serializer/CompareResultSerializerTest.php
@@ -36,6 +36,24 @@
),
CompareResult::STATUS_MISMATCH
)
+),
+array(
+new CompareResult(
+$this-getDataValueMock(),
+array(
+$this-getDataValueMock()
+),
+CompareResult::STATUS_COMPLIANCE
+)
+),
+array(
+new CompareResult(
+$this-getDataValueMock(),
+array(
+$this-getDataValueMock()
+),
+CompareResult::STATUS_PARTIAL_COMPLIANCE
+)
)
);
}
@@ -92,6 +110,24 @@
'localValue' = 'foobar',
'externalValues' = array(
'foobar',
+'foobar'
+),
+'result' = CompareResult::STATUS_PARTIAL_COMPLIANCE
+),
+new CompareResult(
+$this-getDataValueMock(),
+array(
+$this-getDataValueMock(),
+$this-getDataValueMock()
+),
+CompareResult::STATUS_PARTIAL_COMPLIANCE
+)
+),
+array(
+array(
+'localValue' = 'foobar',
+'externalValues' = array(
+'foobar',
'_element' = 'dataValue'
),
'result' = CompareResult::STATUS_MISMATCH
@@ -128,6
[MediaWiki-commits] [Gerrit] Add ii18n for status partial compliance - change (mediawiki...WikidataQuality)
Soeren.oldag has submitted this change and it was merged.
Change subject: Add ii18n for status partial compliance
..
Add ii18n for status partial compliance
Change-Id: Ib036f36c1aa3495bdf3f940d7bef3d2da7b1de8e
---
M i18n/de.json
M i18n/en.json
M i18n/qqq.json
3 files changed, 4 insertions(+), 1 deletion(-)
Approvals:
Soeren.oldag: Checked; Looks good to me, approved
diff --git a/i18n/de.json b/i18n/de.json
index 4ac58bd..79162a4 100755
--- a/i18n/de.json
+++ b/i18n/de.json
@@ -13,6 +13,7 @@
wikidataquality-checkresult-result-headline: Ergebnis für $1,
wikidataquality-checkresult-result-table-header-status: Status,
wikidataquality-checkresult-status-compliance: Übereinstimmung,
+ wikidataquality-checkresult-status-partial-compliance: Teilweise
Übereinstimmung,
wikidataquality-checkresult-status-violation: Nichtübereinstimmung,
wikidataquality-checkresult-status-exception: Ausnahme,
wikidataquality-checkresult-status-references-missing: Fehlende
Bezüge,
diff --git a/i18n/en.json b/i18n/en.json
old mode 100644
new mode 100755
index c104b27..22e666f
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -11,6 +11,7 @@
wikidataquality-checkresult-result-headline: Result for $1,
wikidataquality-checkresult-result-table-header-status: Status,
wikidataquality-checkresult-status-compliance: Compliance,
+ wikidataquality-checkresult-status-partial-compliance: Partial
compliance,
wikidataquality-checkresult-status-violation: Violation,
wikidataquality-checkresult-status-exception: Exception,
wikidataquality-checkresult-status-references-missing: Missing
references,
diff --git a/i18n/qqq.json b/i18n/qqq.json
old mode 100644
new mode 100755
index f228162..10e572c
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -15,7 +15,8 @@
wikidataquality-checkresult-not-existent-entity: Error message that
appears when the entered entity does not exist.,
wikidataquality-checkresult-result-headline: Headline that appears
above the results. Has one parameter, that is the label of the entity, that was
checked.,
wikidataquality-checkresult-result-table-header-status: Header of
the column that shows the result of the constraint
check.\n{{Identical|Status}},
- wikidataquality-checkresult-status-compliance: Status for claims
that comply with the check.,
+ wikidataquality-checkresult-status-compliance: Status for claims
that comply completely with the check.,
+ wikidataquality-checkresult-status-partial-compliance: Status for
claims that comply partially with the check.,
wikidataquality-checkresult-status-violation: Status claims that are
violated in any way.,
wikidataquality-checkresult-status-exception: Status claims that are
violated, but marked as an exception.\n{{Identical|Exception}},
wikidataquality-checkresult-status-references-missing: Status for
claims for which references are missing.,
--
To view, visit https://gerrit.wikimedia.org/r/209187
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib036f36c1aa3495bdf3f940d7bef3d2da7b1de8e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikidataQuality
Gerrit-Branch: v1
Gerrit-Owner: Dominic.sauer dominic.sa...@yahoo.de
Gerrit-Reviewer: Siebrand siebr...@kitano.nl
Gerrit-Reviewer: Soeren.oldag soeren_ol...@freenet.de
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] varnish: quick fix for mobile redirect outage - change (operations/puppet)
Faidon Liambotis has submitted this change and it was merged.
Change subject: varnish: quick fix for mobile redirect outage
..
varnish: quick fix for mobile redirect outage
Commit 4eb918924cbadb98d0e0e144e97d35376abfbbb8 added geoiplookup to all
clusters, via wikimedia.vcl. It did that by the usual vcl_error hackery,
and by using error code 666.
Unfortunately, this is the same error code we use for the mobile
redirect, which means that now instead of a mobile redirect we are
emitting geoiplookups(!). This was noticed by users who were puzzled at
the geoiplookup JSON.
Switch to 668 (which seems unused from a git grep) as a quick hack until
we can think of a better, proper fix that avoids these sort of
collisions.
Bug: T98309
Change-Id: I366b7e86102a0dbac416b127cbb3fff23e4ad923
---
M modules/varnish/templates/vcl/wikimedia.vcl.erb
1 file changed, 2 insertions(+), 2 deletions(-)
Approvals:
Faidon Liambotis: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/varnish/templates/vcl/wikimedia.vcl.erb
b/modules/varnish/templates/vcl/wikimedia.vcl.erb
index da555eb..fa3780a 100644
--- a/modules/varnish/templates/vcl/wikimedia.vcl.erb
+++ b/modules/varnish/templates/vcl/wikimedia.vcl.erb
@@ -308,7 +308,7 @@
% if @cluster_options.fetch(enable_geoiplookup, false) -%
if (req.url == /geoiplookup || req.http.host ==
geoiplookup.wikimedia.org) {
- error 666 geoiplookup;
+ error 668 geoiplookup;
}
% end -%
@@ -408,7 +408,7 @@
% if @cluster_options.fetch(enable_geoiplookup, false) -%
// Support geoiplookup
- if (obj.status == 666) {
+ if (obj.status == 668) {
call geoip_lookup;
set obj.status = 200;
set obj.http.Connection = keep-alive;
--
To view, visit https://gerrit.wikimedia.org/r/209206
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I366b7e86102a0dbac416b127cbb3fff23e4ad923
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon Liambotis fai...@wikimedia.org
Gerrit-Reviewer: Faidon Liambotis fai...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove unused ganglia.wikimedia.org.erb template - change (operations/puppet)
Alexandros Kosiaris has submitted this change and it was merged. Change subject: Remove unused ganglia.wikimedia.org.erb template .. Remove unused ganglia.wikimedia.org.erb template This is no longer used, remove Change-Id: Ia87df1972f662411f2ae7e431f757b0728c5135c --- D templates/apache/sites/ganglia.wikimedia.org.erb 1 file changed, 0 insertions(+), 53 deletions(-) Approvals: Alexandros Kosiaris: Looks good to me, approved jenkins-bot: Verified diff --git a/templates/apache/sites/ganglia.wikimedia.org.erb b/templates/apache/sites/ganglia.wikimedia.org.erb deleted file mode 100644 index ac9d900..000 --- a/templates/apache/sites/ganglia.wikimedia.org.erb +++ /dev/null @@ -1,53 +0,0 @@ -VirtualHost *:80 -ServerName %= @ganglia_servername % -ServerAlias %= @ganglia_serveralias % -DocumentRoot /var/www -ServerAdmin n...@wikimedia.org - -Directory /var/www -Options FollowSymLinks -AllowOverride None -% if @is_trusty % -Require all granted -% else % -Order allow,deny -Allow from all -% end % -/Directory - -Alias /latest %= @ganglia_webdir % - -RedirectMatch ^/$ http://%= @ganglia_servername %/latest -ErrorLog /var/log/apache2/ganglia.wikimedia.org-error.log -LogLevel warn -/VirtualHost -% if @ganglia_ssl_cert % -VirtualHost *:443 -ServerName %= @ganglia_servername % -ServerAlias %= @ganglia_serveralias % -DocumentRoot /var/www -ServerAdmin n...@wikimedia.org - -SSLEngine on -SSLCertificateFile %= @ganglia_ssl_cert % -SSLCertificateKeyFile %= @ganglia_ssl_key % -%= @ssl_settings.join(\n) % - -Directory /var/www -Options FollowSymLinks -AllowOverride None -% if @is_trusty % -Require all granted -% else % -Order allow,deny -Allow from all -% end % -/Directory - -Alias /latest %= @ganglia_webdir % - -RedirectMatch ^/$ https://%= @ganglia_servername %/latest -ErrorLog /var/log/apache2/ganglia.wikimedia.org-error.log -LogLevel warn -/VirtualHost -% end % -- To view, visit https://gerrit.wikimedia.org/r/209204 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ia87df1972f662411f2ae7e431f757b0728c5135c Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Alexandros Kosiaris akosia...@wikimedia.org Gerrit-Reviewer: Alexandros Kosiaris akosia...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] CX: Enable ContentTranslation for Wikis scheduled on 20150507 - change (operations/mediawiki-config)
KartikMistry has uploaded a new change for review. https://gerrit.wikimedia.org/r/209207 Change subject: CX: Enable ContentTranslation for Wikis scheduled on 20150507 .. CX: Enable ContentTranslation for Wikis scheduled on 20150507 * Abkhazian (ab) * Albanian (sq) * Armenian (hy) * Aromanian (roa-rup) * Avar (av) * Azerbaijani (az) * rimean-Tatar (crh) * Gagauz (gag) * Ladino (lad) * Kabardian (kbd) * Karachay-Balkar (krc) * Karakalpak (kaa) * Maltese (mt) * Mirandese (mwl) * Ossetian (os) * Romani (rmy) * Turkish (tr) Bug: T97888 Bug: T97967 Bug: T97966 Bug: T97969 Change-Id: I6b337252317c825897f718a82d31f35251a6939c --- M wmf-config/InitialiseSettings.php 1 file changed, 17 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/07/209207/1 diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index 7602aae..955bf72 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -14587,14 +14587,18 @@ 'wmgUseContentTranslation' = array( 'default' = false, + 'abwiki' = true, 'afwiki' = true, 'anwiki' = true, 'akwiki' = true, 'astwiki' = true, + 'avwiki' = true, + 'azwiki' = true, 'bawiki' = true, 'bgwiki' = true, 'bmwiki' = true, 'cawiki' = true, + 'crhwiki' = true, 'cswiki' = true, 'cvwiki' = true, 'dawiki' = true, @@ -14605,39 +14609,52 @@ 'euwiki' = true, 'ffwiki' = true, 'frwiki' = true, + 'gagwiki' = true, 'glwiki' = true, 'guwiki' = true, + 'hywiki' = true, 'idwiki' = true, + 'kaawiki' = true, + 'kbdwiki' = true, 'kgwiki' = true, 'kiwiki' = true, 'kkwiki' = true, 'knwiki' = true, 'koiwiki' = true, + 'krcwiki' = true, 'kvwiki' = true, 'kywiki' = true, + 'ladwiki' = true, 'lezwiki' = true, 'lgwiki' = true, 'minwiki' = true, 'mkwiki' = true, 'mswiki' = true, + 'mtwiki' = true, + 'mwlwiki' = true, 'nnwiki' = true, 'nowiki' = true, 'nywiki' = true, 'ocwiki' = true, 'omwiki' = true, + 'oswiki' = true, 'pawiki' = true, 'ptwiki' = true, + 'rmywiki' = true, + 'roa-rupwiki' = true, 'rnwiki' = true, 'sahwiki' = true, 'sgwiki' = true, 'shwiki' = true, 'simplewiki' = true, 'slwiki' = true, + 'sqwiki' = true, 'sswiki' = true, 'stwiki' = true, 'svwiki' = true, 'tiwiki' = true, 'tnwiki' = true, + 'trwiki' = true, 'tswiki' = true, 'ttwiki' = true, 'tumwiki' = true, -- To view, visit https://gerrit.wikimedia.org/r/209207 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I6b337252317c825897f718a82d31f35251a6939c Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: KartikMistry kartik.mis...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Explicitly define module position - change (mediawiki...UniversalLanguageSelector)
jenkins-bot has submitted this change and it was merged. Change subject: Explicitly define module position .. Explicitly define module position Style modules currently added through addModuleStyles default to being in the head (top position). This is an unhealthy default, since only critical styles that are needed at pageload should be in the head. In order to be able to switch the default to bottom, existing module positions have to be defined explicitly. Bug: T97410 Change-Id: I209f93a49ddd0aa143348c0238849a121856dce1 --- M Resources.php 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Nikerabbit: Looks good to me, approved jenkins-bot: Verified diff --git a/Resources.php b/Resources.php index 4e0a8cf..0d05f64 100644 --- a/Resources.php +++ b/Resources.php @@ -271,6 +271,7 @@ ) + $resourcePaths; $wgResourceModules['jquery.uls.grid'] = array( + 'position' = 'top', 'styles' = 'lib/jquery.uls/css/jquery.uls.grid.css', ) + $resourcePaths; -- To view, visit https://gerrit.wikimedia.org/r/208977 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I209f93a49ddd0aa143348c0238849a121856dce1 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/UniversalLanguageSelector Gerrit-Branch: master Gerrit-Owner: Gilles gdu...@wikimedia.org Gerrit-Reviewer: Nikerabbit niklas.laxst...@gmail.com Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Re-add future toast to show when page reloads after editing ... - change (mediawiki...Gather)
Jhernandez has uploaded a new change for review.
https://gerrit.wikimedia.org/r/209210
Change subject: Re-add future toast to show when page reloads after editing
collection
..
Re-add future toast to show when page reloads after editing collection
Not sure why it disappeared from the code, but we need it.
Bug: T98027
Change-Id: Ia27eb2339c7219348cf49c3a6ace583c1e13a74d
---
M resources/ext.gather.collection.editor/CollectionEditOverlay.js
1 file changed, 6 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Gather
refs/changes/10/209210/1
diff --git a/resources/ext.gather.collection.editor/CollectionEditOverlay.js
b/resources/ext.gather.collection.editor/CollectionEditOverlay.js
index e925a5d..fdb2800 100644
--- a/resources/ext.gather.collection.editor/CollectionEditOverlay.js
+++ b/resources/ext.gather.collection.editor/CollectionEditOverlay.js
@@ -2,6 +2,7 @@
var CollectionEditOverlay,
toast = M.require( 'toast' ),
+ futureToast = M.require( 'ext.gather.alerts/futureToasts' ),
CollectionsApi = M.require( 'ext.gather.api/CollectionsApi' ),
CollectionSearchPanel = M.require(
'ext.gather.page.search/CollectionSearchPanel' ),
Overlay = M.require( 'Overlay' ),
@@ -222,6 +223,11 @@
} else if ( this.searchPanel.hasChanges() ) {
this.$( '.save' ).prop( 'disabled', true );
this.searchPanel.saveChanges().done( function
() {
+ if ( self.options.reloadOnSave ) {
+ futureToast.add(
self.options.editSuccessMsg, 'toast' );
+ } else {
+ toast.show(
self.options.editSuccessMsg, 'toast' );
+ }
self._reloadCollection();
} );
} else {
--
To view, visit https://gerrit.wikimedia.org/r/209210
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia27eb2339c7219348cf49c3a6ace583c1e13a74d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Gather
Gerrit-Branch: master
Gerrit-Owner: Jhernandez jhernan...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix Special:Properties - change (mediawiki...SemanticMediaWiki)
jenkins-bot has submitted this change and it was merged.
Change subject: Fix Special:Properties
..
Fix Special:Properties
This was calling a function removed in I26d8dec1
Bug: T98284
Change-Id: I456769046f93926a2be885ab59bb8f3d7cf732ab
---
M specials/QueryPages/SMW_QueryPage.php
1 file changed, 7 insertions(+), 3 deletions(-)
Approvals:
Alex Monk: Looks good to me, approved
jenkins-bot: Verified
diff --git a/specials/QueryPages/SMW_QueryPage.php
b/specials/QueryPages/SMW_QueryPage.php
index faa8147..29b1f0e 100644
--- a/specials/QueryPages/SMW_QueryPage.php
+++ b/specials/QueryPages/SMW_QueryPage.php
@@ -73,9 +73,13 @@
// often disable 'next' link when we reach the end
$atend = $num $limit;
- $sl = wfViewPrevNext( $offset, $limit ,
- $wgContLang-specialPage( $sname ),
- wfArrayToCGI( $this-linkParameters() ), $atend );
+ $sl = $this-getLanguage()-viewPrevNext(
+ $this-getTitleFor( $this-getName() ),
+ $offset,
+ $limit,
+ $this-linkParameters(),
+ $atend
+ );
$wgOut-addHTML( br /{$sl}/p\n );
if ( $num 0 ) {
--
To view, visit https://gerrit.wikimedia.org/r/209209
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I456769046f93926a2be885ab59bb8f3d7cf732ab
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/SemanticMediaWiki
Gerrit-Branch: 1.8.x
Gerrit-Owner: Alex Monk kren...@gmail.com
Gerrit-Reviewer: Alex Monk kren...@gmail.com
Gerrit-Reviewer: BryanDavis bda...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] New Wikidata Build - 2015-05-06T10:00:01+0000 - change (mediawiki...Wikidata)
jenkins-bot has submitted this change and it was merged.
Change subject: New Wikidata Build - 2015-05-06T10:00:01+
..
New Wikidata Build - 2015-05-06T10:00:01+
Change-Id: If8761ebc2a1e3fd7beb3fc55beb5e5a75453a2aa
---
M composer.lock
M extensions/Wikibase/client/i18n/an.json
M extensions/Wikibase/client/i18n/os.json
M extensions/Wikibase/client/i18n/scn.json
M extensions/Wikibase/client/i18n/ta.json
M extensions/Wikibase/client/i18n/tr.json
M extensions/Wikibase/client/includes/Usage/Sql/UsageTableUpdater.php
M extensions/Wikibase/client/resources/Resources.php
M
extensions/Wikibase/client/tests/phpunit/includes/Changes/AffectedPagesFinderTest.php
M
extensions/Wikibase/client/tests/phpunit/includes/DataAccess/Scribunto/EntityAccessorTest.php
M
extensions/Wikibase/client/tests/phpunit/includes/SiteLinkCommentCreatorTest.php
M extensions/Wikibase/docs/options.wiki
A extensions/Wikibase/lib/i18n/os.json
M extensions/Wikibase/lib/i18n/scn.json
M extensions/Wikibase/lib/includes/parsers/DispatchingValueParser.php
A extensions/Wikibase/lib/includes/store/EntityRedirectLookup.php
M extensions/Wikibase/lib/includes/store/sql/SqlEntityInfoBuilder.php
M extensions/Wikibase/lib/includes/store/sql/TermSqlIndex.php
M extensions/Wikibase/lib/includes/store/sql/WikiPageEntityMetaDataLookup.php
M extensions/Wikibase/lib/maintenance/populateSitesTable.php
M
extensions/Wikibase/lib/tests/phpunit/store/PrefetchingWikiPageEntityMetaDataAccessorTest.php
M extensions/Wikibase/lib/tests/phpunit/store/TermIndexTest.php
M extensions/Wikibase/repo/config/Wikibase.default.php
M extensions/Wikibase/repo/i18n/be-tarask.json
M extensions/Wikibase/repo/i18n/et.json
M extensions/Wikibase/repo/i18n/os.json
M extensions/Wikibase/repo/i18n/scn.json
M extensions/Wikibase/repo/includes/api/ApiErrorReporter.php
M extensions/Wikibase/repo/includes/specials/SpecialGoToLinkedPage.php
M extensions/Wikibase/repo/includes/store/EntityPerPage.php
M extensions/Wikibase/repo/includes/store/Store.php
M extensions/Wikibase/repo/includes/store/sql/EntityPerPageTable.php
M extensions/Wikibase/repo/includes/store/sql/SqlStore.php
M extensions/Wikibase/repo/resources/Resources.php
M
extensions/Wikibase/repo/tests/phpunit/includes/Hooks/OutputPageJsConfigHookHandlerTest.php
M
extensions/Wikibase/repo/tests/phpunit/includes/specials/SpecialGoToLinkedPageTest.php
M
extensions/Wikibase/repo/tests/phpunit/includes/specials/SpecialSetSiteLinkTest.php
M
extensions/Wikibase/repo/tests/phpunit/includes/store/sql/EntityPerPageTableTest.php
M
extensions/Wikibase/repo/tests/phpunit/includes/store/sql/TermSearchKeyBuilderTest.php
M extensions/Wikibase/repo/tests/phpunit/includes/store/sql/TermSqlIndexTest.php
M extensions/Wikibase/view/resources/jquery/wikibase/resources.php
M extensions/Wikibase/view/resources/jquery/wikibase/toolbar/resources.php
M extensions/Wikibase/view/resources/templates.php
M extensions/Wikibase/view/resources/wikibase/resources.php
M vendor/composer/autoload_classmap.php
M vendor/composer/installed.json
46 files changed, 275 insertions(+), 102 deletions(-)
Approvals:
JanZerebecki: Looks good to me, approved
jenkins-bot: Verified
diff --git a/composer.lock b/composer.lock
index 65784aa..51bf0a0 100644
--- a/composer.lock
+++ b/composer.lock
@@ -1213,12 +1213,12 @@
source: {
type: git,
url:
https://github.com/wikimedia/mediawiki-extensions-Wikibase.git;,
-reference: 59fe3a6237e25b2236bc4975ac8d56017a61ebc1
+reference: 867a1dd3615c4af24fe992ffea8460268e64c22b
},
dist: {
type: zip,
-url:
https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/59fe3a6237e25b2236bc4975ac8d56017a61ebc1;,
-reference: 59fe3a6237e25b2236bc4975ac8d56017a61ebc1,
+url:
https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/867a1dd3615c4af24fe992ffea8460268e64c22b;,
+reference: 867a1dd3615c4af24fe992ffea8460268e64c22b,
shasum:
},
require: {
@@ -1286,7 +1286,7 @@
wikibaserepo,
wikidata
],
-time: 2015-05-04 22:05:18
+time: 2015-05-06 02:22:58
},
{
name: wikibase/wikimedia-badges,
diff --git a/extensions/Wikibase/client/i18n/an.json
b/extensions/Wikibase/client/i18n/an.json
index 8ae59e2..0631f52 100644
--- a/extensions/Wikibase/client/i18n/an.json
+++ b/extensions/Wikibase/client/i18n/an.json
@@ -4,5 +4,6 @@
Carlos Cristia
]
},
+ wikibase-rc-hide-wikidata-show: Amostrar,
wikibase-rc-wikibase-edit-letter: D
}
diff --git a/extensions/Wikibase/client/i18n/os.json
b/extensions/Wikibase/client/i18n/os.json
index 1aa1191..a1149ed 100644
---
[MediaWiki-commits] [Gerrit] Language fallback for badge labels in SpecialSetSiteLink - change (mediawiki...Wikibase)
jenkins-bot has submitted this change and it was merged.
Change subject: Language fallback for badge labels in SpecialSetSiteLink
..
Language fallback for badge labels in SpecialSetSiteLink
Change-Id: Ideba18e9afee7321bcb16600aa595a949ccbbb0b
---
M repo/includes/specials/SpecialSetSiteLink.php
M repo/tests/phpunit/includes/specials/SpecialSetSiteLinkTest.php
2 files changed, 60 insertions(+), 39 deletions(-)
Approvals:
Addshore: Looks good to me, approved
jenkins-bot: Verified
diff --git a/repo/includes/specials/SpecialSetSiteLink.php
b/repo/includes/specials/SpecialSetSiteLink.php
index b8c6188..57ccd83 100644
--- a/repo/includes/specials/SpecialSetSiteLink.php
+++ b/repo/includes/specials/SpecialSetSiteLink.php
@@ -6,13 +6,14 @@
use InvalidArgumentException;
use OutOfBoundsException;
use Status;
-use UserInputException;
use Wikibase\ChangeOp\ChangeOpException;
use Wikibase\ChangeOp\SiteLinkChangeOpFactory;
use Wikibase\DataModel\Entity\Entity;
-use Wikibase\DataModel\Entity\EntityId;
use Wikibase\DataModel\Entity\Item;
use Wikibase\DataModel\Entity\ItemId;
+use Wikibase\LanguageFallbackChainFactory;
+use Wikibase\Lib\Store\LanguageFallbackLabelDescriptionLookup;
+use Wikibase\Lib\Store\TermLookup;
use Wikibase\Repo\SiteLinkTargetProvider;
use Wikibase\Repo\WikibaseRepo;
use Wikibase\Summary;
@@ -68,6 +69,16 @@
private $siteLinkTargetProvider;
/**
+* @var TermLookup
+*/
+ private $termLookup;
+
+ /**
+* @var LanguageFallbackChainFactory
+*/
+ private $fallbackChainFactory;
+
+ /**
* @since 0.4
*/
public function __construct() {
@@ -84,6 +95,9 @@
$this-siteStore,
$settings-getSetting( 'specialSiteLinkGroups' )
);
+
+ $this-fallbackChainFactory =
$wikibaseRepo-getLanguageFallbackChainFactory();
+ $this-termLookup = $wikibaseRepo-getTermLookup();
}
/**
@@ -293,12 +307,23 @@
private function getHtmlForBadges() {
$options = '';
+ $fallbackChain = $this-fallbackChainFactory-newFromLanguage(
+ $this-getLanguage(),
+ LanguageFallbackChainFactory::FALLBACK_SELF
+ |
LanguageFallbackChainFactory::FALLBACK_VARIANTS
+ | LanguageFallbackChainFactory::FALLBACK_OTHERS
+ );
+
+ $labelLookup = new LanguageFallbackLabelDescriptionLookup(
$this-termLookup, $fallbackChain );
+
foreach ( $this-badgeItems as $badgeId = $value ) {
$name = 'badge-' . $badgeId;
- $title = $this-getTitleForBadge( new ItemId( $badgeId
) );
- if ( $title === null ) {
- continue;
+ try {
+ $term = $labelLookup-getLabel( new ItemId(
$badgeId ) );
+ $label = $term-getText();
+ } catch ( OutOfBoundsException $ex ) {
+ $label = $badgeId;
}
$options .= Html::rawElement(
@@ -318,37 +343,12 @@
array(
'for' = $name
),
- $title
+ $label
)
);
}
return $options;
- }
-
- /**
-* Returns the title for the given badge id.
-* @todo use TermLookup when we have one
-*
-* @param EntityId $badgeId
-* @return string|null
-*/
- private function getTitleForBadge( EntityId $badgeId ) {
- try {
- $entity = $this-loadEntity( $badgeId )-getEntity();
- $languageCode = $this-getLanguage()-getCode();
-
- $labels = $entity-getFingerprint()-getLabels();
- if ( $labels-hasTermForLanguage( $languageCode ) ) {
- return $labels-getByLanguage( $languageCode
)-getText();
- } else {
- return $badgeId-getSerialization();
- }
- } catch ( UserInputException $ex ) {
- // log a warning because this indicates a wrong
configuration
- wfLogWarning( 'Error fetching title for badge: ' .
$ex-getMessage() );
- return null;
- }
}
/**
diff --git a/repo/tests/phpunit/includes/specials/SpecialSetSiteLinkTest.php
[MediaWiki-commits] [Gerrit] Add setAlignment to PopupWidget - change (oojs/ui)
jenkins-bot has submitted this change and it was merged.
Change subject: Add setAlignment to PopupWidget
..
Add setAlignment to PopupWidget
Bug: T98236
Change-Id: I6bafeab6d56f328786f3712ebf6aa8748d35918c
---
M src/widgets/PopupWidget.js
1 file changed, 24 insertions(+), 6 deletions(-)
Approvals:
Esanders: Looks good to me, approved
jenkins-bot: Verified
diff --git a/src/widgets/PopupWidget.js b/src/widgets/PopupWidget.js
index 48bc5c4..0b1f4ca 100644
--- a/src/widgets/PopupWidget.js
+++ b/src/widgets/PopupWidget.js
@@ -74,12 +74,7 @@
this.anchor = null;
this.width = config.width !== undefined ? config.width : 320;
this.height = config.height !== undefined ? config.height : null;
- // Validate alignment and transform deprecated values
- if ( [ 'left', 'right', 'force-left', 'force-right', 'backwards',
'forwards', 'center' ].indexOf( config.align ) -1 ) {
- this.align = { left: 'force-right', right: 'force-left' }[
config.align ] || config.align;
- } else {
- this.align = 'center';
- }
+ this.setAlignment( config.align );
this.closeButton = new OO.ui.ButtonWidget( { framed: false, icon:
'close' } );
this.onMouseDownHandler = this.onMouseDown.bind( this );
this.onDocumentKeyDownHandler = this.onDocumentKeyDown.bind( this );
@@ -375,3 +370,26 @@
return this;
};
+
+/**
+ * Set popup alignment
+ * @param {string} align Alignment of the popup, `center`, `force-left`,
`force-right`,
+ * `backwards` or `forwards`.
+ */
+OO.ui.PopupWidget.prototype.setAlignment = function ( align ) {
+ // Validate alignment and transform deprecated values
+ if ( [ 'left', 'right', 'force-left', 'force-right', 'backwards',
'forwards', 'center' ].indexOf( align ) -1 ) {
+ this.align = { left: 'force-right', right: 'force-left' }[
align ] || align;
+ } else {
+ this.align = 'center';
+ }
+};
+
+/**
+ * Get popup alignment
+ * @return {string} align Alignment of the popup, `center`, `force-left`,
`force-right`,
+ * `backwards` or `forwards`.
+ */
+OO.ui.PopupWidget.prototype.getAlignment = function () {
+ return this.align;
+};
--
To view, visit https://gerrit.wikimedia.org/r/209140
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I6bafeab6d56f328786f3712ebf6aa8748d35918c
Gerrit-PatchSet: 1
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: Mooeypoo mor...@gmail.com
Gerrit-Reviewer: Esanders esand...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update SMW for I45676904 - change (mediawiki/core)
Alex Monk has uploaded a new change for review. https://gerrit.wikimedia.org/r/209212 Change subject: Update SMW for I45676904 .. Update SMW for I45676904 Bug: T98284 Change-Id: I269a391ee23ebe4e776bb449aa6f7cddfad59280 --- M extensions/SemanticMediaWiki 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/12/209212/1 diff --git a/extensions/SemanticMediaWiki b/extensions/SemanticMediaWiki index 8bc21b2..fe26107 16 --- a/extensions/SemanticMediaWiki +++ b/extensions/SemanticMediaWiki -Subproject commit 8bc21b2a590c6b8742b9291619a8c7d9e80fbf43 +Subproject commit fe261079e43003f0f67be71ec210e7c699f5dcd4 -- To view, visit https://gerrit.wikimedia.org/r/209212 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I269a391ee23ebe4e776bb449aa6f7cddfad59280 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: wmf/1.26wmf4 Gerrit-Owner: Alex Monk kren...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Assign role::puppetmaster::backend to rhodium - change (operations/puppet)
Alexandros Kosiaris has uploaded a new change for review.
https://gerrit.wikimedia.org/r/209215
Change subject: Assign role::puppetmaster::backend to rhodium
..
Assign role::puppetmaster::backend to rhodium
Bug: T98173
Change-Id: I86b7d16d0a0c2a9a29fe432332c0d26f3e26b1dc
---
M manifests/site.pp
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/15/209215/1
diff --git a/manifests/site.pp b/manifests/site.pp
index 47a7bda..21c19f6 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -2195,7 +2195,7 @@
}
}
-node 'strontium.eqiad.wmnet' {
+node /^(strontium|rhodium).eqiad.wmnet/ {
include standard
include role::puppetmaster::backend
}
--
To view, visit https://gerrit.wikimedia.org/r/209215
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I86b7d16d0a0c2a9a29fe432332c0d26f3e26b1dc
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alexandros Kosiaris akosia...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Special pages now contain the lines they used to inherit - change (mediawiki...WikidataQualityExternalValidation)
Dominic.sauer has submitted this change and it was merged.
Change subject: Special pages now contain the lines they used to inherit
..
Special pages now contain the lines they used to inherit
Change-Id: I601c334f8faaa4651db6f21ba6f1ebaba4eeb27f
---
M WikidataQualityExternalValidation.php
A modules/SpecialExternalValidationPage.css
M specials/SpecialCrossCheck.php
M specials/SpecialExternalDbs.php
4 files changed, 589 insertions(+), 12 deletions(-)
Approvals:
Dominic.sauer: Verified; Looks good to me, approved
diff --git a/WikidataQualityExternalValidation.php
b/WikidataQualityExternalValidation.php
index e9caee9..12b5426 100644
--- a/WikidataQualityExternalValidation.php
+++ b/WikidataQualityExternalValidation.php
@@ -41,6 +41,13 @@
// Define API modules
$GLOBALS['wgAPIModules']['wdqacrosscheck'] =
'WikidataQuality\ExternalValidation\Api\CrossCheck';
+ // Define modules
+ $GLOBALS['wgResourceModules']['SpecialExternalValidationPage'] = array (
+ 'styles' = '/modules/SpecialExternalValidationPage.css',
+ 'localBasePath' = __DIR__,
+ 'remoteExtPath' = 'WikidataQualityExternalValidation'
+ );
+
// Define database table names
define( 'DUMP_DATA_TABLE', 'wdqa_external_data' );
define( 'DUMP_META_TABLE', 'wdqa_dump_information' );
diff --git a/modules/SpecialExternalValidationPage.css
b/modules/SpecialExternalValidationPage.css
new file mode 100644
index 000..d628c9c
--- /dev/null
+++ b/modules/SpecialExternalValidationPage.css
@@ -0,0 +1,83 @@
+/* Entity id form */
+.wbq-checkresult-form {
+margin-top: 10px;
+margin-bottom: 20px;
+}
+
+.wbq-checkresult-form-entity-id {
+width: 120px;
+}
+
+.wbq-checkresult-form-submit {
+margin-left: 5px;
+}
+
+/* Notices */
+.wbq-checkresult-notice {
+font-style: italic;
+}
+
+.wbq-checkresult-notice-error {
+font-weight: bold;
+color: #BA;
+}
+
+/* Statuses */
+.wbq-status {
+font-weight: bold;
+}
+
+.wbq-status-success {
+color: #008000;
+}
+
+.wbq-status-partial-success {
+color: #6CB500;
+}
+
+.wbq-status-warning {
+color: #E6B800;
+}
+
+.wbq-status-error {
+color: #BA;
+}
+
+.wbq-status-unknown {
+color: #404040;
+}
+
+/* Tooltip */
+.wbq-tooltip-indicator:before {
+content: '[?]';
+color: #CCC;
+font-weight: 600;
+}
+
+[tooltip]:before {
+/* needed - do not touch */
+content: attr(tooltip);
+position: absolute;
+opacity: 0;
+
+/* customizable */
+transition: all 0.20s ease;
+padding: 5px;
+border: 1px solid #AAA;
+border-radius: 5px;
+box-shadow: 2px 2px 1px #CCC;
+}
+
+[tooltip]:hover:before {
+/* needed - do not touch */
+opacity: 1;
+
+/* customizable */
+background: #F2F2F2;
+margin-top: -35px;
+margin-left: -5px;
+}
+
+[tooltip]:not([tooltip-persistent]):before {
+pointer-events: none;
+}
\ No newline at end of file
diff --git a/specials/SpecialCrossCheck.php b/specials/SpecialCrossCheck.php
index ccd4ec0..12f6bc5 100755
--- a/specials/SpecialCrossCheck.php
+++ b/specials/SpecialCrossCheck.php
@@ -2,13 +2,28 @@
namespace WikidataQuality\ExternalValidation\Specials;
+use SpecialPage;
+use ValueFormatters\FormatterOptions;
+use Wikibase\Lib\EntityIdLabelFormatter;
+use Wikibase\Lib\EntityIdHtmlLinkFormatter;
+use Wikibase\Lib\EntityIdLinkFormatter;
+use Wikibase\Lib\HtmlUrlFormatter;
+use Wikibase\Lib\LanguageNameLookup;
+use Wikibase\Lib\SnakFormatter;
+use Wikibase\Lib\Store\LanguageLabelDescriptionLookup;
+use Wikibase\Repo\WikibaseRepo;
use Html;
use JobQueueGroup;
use Linker;
use Traversable;
use Wikibase\DataModel\Entity\Entity;
use Wikibase\DataModel\Entity\EntityId;
-use Wikibase\Repo\WikibaseRepo;
+use DataValues\DataValue;
+use Doctrine\Instantiator\Exception\InvalidArgumentException;
+use Doctrine\Instantiator\Exception\UnexpectedValueException;
+use Wikibase\DataModel\Entity\EntityIdParsingException;
+use Countable;
+use Wikibase\DataModel\Entity\EntityIdValue;
use WikidataQuality\ExternalValidation\CheckForCrossCheckViolationsJob;
use
WikidataQuality\ExternalValidation\CrossCheck\Comparer\DataValueComparerFactory;
use WikidataQuality\ExternalValidation\CrossCheck\CrossChecker;
@@ -18,18 +33,88 @@
use
WikidataQuality\ExternalValidation\DumpMetaInformation\DumpMetaInformationLookup;
use WikidataQuality\Html\HtmlTable;
use WikidataQuality\Html\HtmlTableHeader;
-use WikidataQuality\Specials\SpecialCheckResultPage;
-class SpecialCrossCheck extends SpecialCheckResultPage {
+class SpecialCrossCheck extends SpecialPage {
/**
* @var CrossCheckInteractor
*/
private $crossCheckInteractor;
-public function __construct() {
-parent::__construct( 'CrossCheck' );
+/**
+ * @var \Wikibase\DataModel\Entity\EntityIdParser
+ */
+protected $entityIdParser;
+
+/**
+ * @var
[MediaWiki-commits] [Gerrit] Remove bold from result titles so that query highlighting works - change (mediawiki...VisualEditor)
jenkins-bot has submitted this change and it was merged.
Change subject: Remove bold from result titles so that query highlighting works
..
Remove bold from result titles so that query highlighting works
Change-Id: I2ee03604ff000bbf9504236b4b3cf1120e1e100c
---
M modules/ve-mw/ui/styles/widgets/ve.ui.MWInternalLinkMenuOptionWidget.css
1 file changed, 0 insertions(+), 1 deletion(-)
Approvals:
Jforrester: Looks good to me, approved
jenkins-bot: Verified
diff --git
a/modules/ve-mw/ui/styles/widgets/ve.ui.MWInternalLinkMenuOptionWidget.css
b/modules/ve-mw/ui/styles/widgets/ve.ui.MWInternalLinkMenuOptionWidget.css
index e240f10..3dfa5d5 100644
--- a/modules/ve-mw/ui/styles/widgets/ve.ui.MWInternalLinkMenuOptionWidget.css
+++ b/modules/ve-mw/ui/styles/widgets/ve.ui.MWInternalLinkMenuOptionWidget.css
@@ -42,7 +42,6 @@
.ve-ui-mwLinkTargetInputWidget-menu-withDescriptions
.ve-ui-mwInternalLinkMenuOptionWidget .oo-ui-labelElement-label {
line-height: 1.5em;
- font-weight: bold;
}
.ve-ui-mwLinkTargetInputWidget-menu-withDescriptions
.ve-ui-mwInternalLinkMenuOptionWidget-description {
--
To view, visit https://gerrit.wikimedia.org/r/209022
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I2ee03604ff000bbf9504236b4b3cf1120e1e100c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders esand...@wikimedia.org
Gerrit-Reviewer: Esanders esand...@wikimedia.org
Gerrit-Reviewer: Jforrester jforres...@wikimedia.org
Gerrit-Reviewer: Nirzar npangar...@wikimedia.org
Gerrit-Reviewer: SuchetaG sucheta.ghos...@gmail.com
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: 17cac5a..79fd08b - change (mediawiki/extensions)
Jenkins-mwext-sync has submitted this change and it was merged. Change subject: Syncronize VisualEditor: 17cac5a..79fd08b .. Syncronize VisualEditor: 17cac5a..79fd08b Change-Id: Ia8e7c25d28b01b79c65254463f78372d782f60d9 --- M VisualEditor 1 file changed, 0 insertions(+), 0 deletions(-) Approvals: Jenkins-mwext-sync: Verified; Looks good to me, approved diff --git a/VisualEditor b/VisualEditor index 17cac5a..79fd08b 16 --- a/VisualEditor +++ b/VisualEditor -Subproject commit 17cac5ae77b00ad50b75547440d20cc35d73292b +Subproject commit 79fd08b1d6c4f8d49b87e2a2003995d0f4cd6abe -- To view, visit https://gerrit.wikimedia.org/r/209222 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ia8e7c25d28b01b79c65254463f78372d782f60d9 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions Gerrit-Branch: master Gerrit-Owner: Jenkins-mwext-sync jenkins-...@wikimedia.org Gerrit-Reviewer: Jenkins-mwext-sync jenkins-...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] repool db1021 - change (operations/mediawiki-config)
jenkins-bot has submitted this change and it was merged. Change subject: repool db1021 .. repool db1021 Change-Id: I22117c2455b5bc246e313078c740a2e069b54d8b --- M wmf-config/db-eqiad.php 1 file changed, 3 insertions(+), 4 deletions(-) Approvals: Springle: Looks good to me, approved jenkins-bot: Verified diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php index 4c9637a..f5fccf8 100755 --- a/wmf-config/db-eqiad.php +++ b/wmf-config/db-eqiad.php @@ -101,9 +101,9 @@ 'db1024' = 0, # 1.4TB 64GB 'db1018' = 0, # 1.4TB 64GB, snapshot, dump, vslow 'db1036' = 0, # 1.4TB 64GB, watchlist, recentchanges, contributions, logpager - # T89801 mce errors 'db1054' = 200, # 2.8TB 96GB, api + 'db1021' = 100, # 1.4TB 64GB, api 'db1060' = 200, # 2.8TB 96GB, api - 'db1063' = 500, # 2.8TB 128GB + 'db1063' = 400, # 2.8TB 128GB 'db1067' = 500, # 2.8TB 160GB ), /* s3 */ 'DEFAULT' = array( @@ -127,7 +127,6 @@ 'db1058' = 0, # 2.8TB 96GB 'db1045' = 0, # 1.4TB 64GB, vslow, dump 'db1026' = 0, # 1.4TB 64GB, watchlist, recentchanges, contributions, logpager - # upgrade 'db1021' = 400, # 1.4TB 64GB, traffic sampling 'db1049' = 0, # 1.4TB 64GB, api 'db1070' = 500, # 2.8TB 160GB 'db1071' = 500, # 2.8TB 160GB @@ -201,7 +200,7 @@ 'db1018' = 1, ), 'api' = array( - # T89801 mce errors 'db1054' = 1, + 'db1021' = 1, 'db1060' = 1, ), 'watchlist' = array( -- To view, visit https://gerrit.wikimedia.org/r/209221 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I22117c2455b5bc246e313078c740a2e069b54d8b Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Springle sprin...@wikimedia.org Gerrit-Reviewer: Springle sprin...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add wikidataquality-checkresult-status-references-stated to ... - change (mediawiki...WikidataQuality)
Dominic.sauer has uploaded a new change for review.
https://gerrit.wikimedia.org/r/209223
Change subject: Add wikidataquality-checkresult-status-references-stated to i18n
..
Add wikidataquality-checkresult-status-references-stated to i18n
Change-Id: I2bd15549c95d5eea654d22e6205e302fc166d23c
---
M i18n/en.json
M i18n/qqq.json
M includes/Html/HtmlTable.php
3 files changed, 3 insertions(+), 1 deletion(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikidataQuality
refs/changes/23/209223/1
diff --git a/i18n/en.json b/i18n/en.json
index 22e666f..b1af971 100755
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -15,5 +15,6 @@
wikidataquality-checkresult-status-violation: Violation,
wikidataquality-checkresult-status-exception: Exception,
wikidataquality-checkresult-status-references-missing: Missing
references,
+ wikidataquality-checkresult-status-references-stated: References stated,
wikidataquality-checkresult-status-todo: Todo
}
diff --git a/i18n/qqq.json b/i18n/qqq.json
index 10e572c..7d7fca4 100755
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -20,5 +20,6 @@
wikidataquality-checkresult-status-violation: Status claims that are
violated in any way.,
wikidataquality-checkresult-status-exception: Status claims that are
violated, but marked as an exception.\n{{Identical|Exception}},
wikidataquality-checkresult-status-references-missing: Status for
claims for which references are missing.,
+ wikidataquality-checkresult-status-references-stated: Status for
claims for which references are stated.,
wikidataquality-checkresult-status-todo: Status for claims which
cannot be checked yet due to a missing implementation.
}
diff --git a/includes/Html/HtmlTable.php b/includes/Html/HtmlTable.php
old mode 100644
new mode 100755
index badf488..7b40f89
--- a/includes/Html/HtmlTable.php
+++ b/includes/Html/HtmlTable.php
@@ -49,7 +49,7 @@
private function addHeader( $header ) {
if ( is_string( $header ) ) {
$this-headers[] = new HtmlTableHeader( $header );
- } else if ( $header instanceof HtmlTableHeader ) {
+ } elseif ( $header instanceof HtmlTableHeader ) {
$this-headers[] = $header;
if ( $header-getIsSortable() ) {
--
To view, visit https://gerrit.wikimedia.org/r/209223
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I2bd15549c95d5eea654d22e6205e302fc166d23c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikidataQuality
Gerrit-Branch: v1
Gerrit-Owner: Dominic.sauer dominic.sa...@yahoo.de
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] phab stage tags for upgrade - change (operations/puppet)
Rush has submitted this change and it was merged.
Change subject: phab stage tags for upgrade
..
phab stage tags for upgrade
ref T89830
Change-Id: I0db5b2db97cff18698219fce928799a128cbbda8
---
M manifests/role/phabricator.pp
1 file changed, 13 insertions(+), 9 deletions(-)
Approvals:
Rush: Verified; Looks good to me, approved
Negative24: Looks good to me, but someone else must approve
diff --git a/manifests/role/phabricator.pp b/manifests/role/phabricator.pp
index cf29038..4cbe057 100644
--- a/manifests/role/phabricator.pp
+++ b/manifests/role/phabricator.pp
@@ -33,7 +33,7 @@
include role::phabricator::config
include phabricator::monitoring
-$current_tag = 'release/2015-02-18/1'
+$current_tag = 'release/2015-05-06/1'
$domain = 'phabricator.wikimedia.org'
$altdom = 'phab.wmfusercontent.org'
$mysql_host = 'm3-master.eqiad.wmnet'
@@ -44,13 +44,15 @@
mysql_admin_user = $role::phabricator::config::mysql_adminuser,
mysql_admin_pass = $role::phabricator::config::mysql_adminpass,
auth_type= 'dual',
-sprint_tag = 'release/2015-02-18',
-security_tag = 'release/2015-01-13/1',
+sprint_tag = 'release/2015-05-06',
+security_tag = 'release/2015-05-06/1',
libraries= ['/srv/phab/libext/Sprint/src',
'/srv/phab/libext/security/src'],
-extension_tag= 'HEAD',
+extension_tag= 'release/2015-05-06/1',
extensions = [ 'MediaWikiUserpageCustomField.php',
- 'LDAPUserpageCustomField.php'],
+ 'LDAPUserpageCustomField.php',
+ 'PhabricatorMediaWikiAuthProvider.php',
+ 'PhutilMediaWikiAuthAdapter.php'],
settings = {
'storage.upload-size-limit' = '10M',
'darkconsole.enabled'= false,
@@ -162,18 +164,20 @@
# pass not sensitive but has to match phab and db
$mysqlpass = 'labspass'
-$current_tag = 'release/2015-02-18/1'
+$current_tag = 'release/2015-05-06/1'
class { '::phabricator':
git_tag = $current_tag,
lock_file = '/var/run/phab_repo_lock',
auth_type = 'local',
-sprint_tag= 'release/2015-02-18',
+sprint_tag= 'release/2015-05-06',
libraries = {
'sprint' = '/srv/phab/libext/Sprint/src',
},
-extension_tag = 'HEAD',
+extension_tag = 'release/2015-05-06/1',
extensions= [ 'MediaWikiUserpageCustomField.php',
- 'LDAPUserpageCustomField.php'],
+ 'LDAPUserpageCustomField.php',
+ 'PhabricatorMediaWikiAuthProvider.php',
+ 'PhutilMediaWikiAuthAdapter.php'],
settings = {
'darkconsole.enabled' = true,
'phabricator.base-uri'=
https://${::hostname}.wmflabs.org;,
--
To view, visit https://gerrit.wikimedia.org/r/205723
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I0db5b2db97cff18698219fce928799a128cbbda8
Gerrit-PatchSet: 5
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Rush r...@wikimedia.org
Gerrit-Reviewer: 20after4 mmod...@wikimedia.org
Gerrit-Reviewer: Negative24 jamison.loftho...@gmail.com
Gerrit-Reviewer: Rush r...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Generate Gather lists from static Browse lists - change (mediawiki...MobileFrontend)
Phuedx has uploaded a new change for review.
https://gerrit.wikimedia.org/r/209224
Change subject: Generate Gather lists from static Browse lists
..
Generate Gather lists from static Browse lists
* Update the MobileFrontend\Browse\TagService#getTags method to work
with a map of tag to set of titles
* Add the TagService#getTitlesForTag method to support the
TopicTags special page
Bug: T95446
Change-Id: Ibaf077073f1d3ef66fe13398328a79dc907c1cfd
---
M includes/browse/TagService.php
M includes/specials/browse/SpecialTopicTag.php
M tests/phpunit/browse/TagServiceTest.php
3 files changed, 93 insertions(+), 63 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend
refs/changes/24/209224/1
diff --git a/includes/browse/TagService.php b/includes/browse/TagService.php
index 5ec26be..849df4a 100644
--- a/includes/browse/TagService.php
+++ b/includes/browse/TagService.php
@@ -10,12 +10,12 @@
class TagService
{
/**
-* @var array A map of category name to tag name
+* @var array A map of tag name to the set of matching titles
*/
private $tags;
/**
-* @param array $tags A map of category name to tag name
+* @param array $tags A map of tag name to the set of matching titles
*/
public function __construct( array $tags ) {
$this-tags = $tags;
@@ -34,8 +34,30 @@
return array();
}
- $associatedTags = array_intersect_key( $this-tags,
$title-getParentCategories() );
+ $result = array();
- return array_values( $associatedTags );
+ // FIXME: This is only good enough when `$this-tags`
+ // `wgMFBrowseTags` is small.
+ foreach ( $this-tags as $tag = $titles ) {
+ if ( in_array( $title-getText(), $titles ) ) {
+ $result[] = $tag;
+ }
+ }
+
+ return $result;
+ }
+
+ /**
+* Gets the titles associated with the tag.
+*
+* @param string $tag
+* @return Title[]|boolean False if the tag doesn't exist
+*/
+ public function getTitlesForTag( $tag ) {
+ if ( !isset( $this-tags[$tag] ) ) {
+ return false;
+ }
+
+ return array_map( array( 'Title', 'newFromText' ),
$this-tags[$tag] );
}
}
diff --git a/includes/specials/browse/SpecialTopicTag.php
b/includes/specials/browse/SpecialTopicTag.php
index e732634..6316f1f 100644
--- a/includes/specials/browse/SpecialTopicTag.php
+++ b/includes/specials/browse/SpecialTopicTag.php
@@ -2,6 +2,7 @@
use Gather\models;
use Gather\views;
+use MobileFrontend\Browse\TagService;
/**
* Class SpecialTopicTag
@@ -37,8 +38,10 @@
}
$tagName = str_replace( '_', ' ', $subPage );
- $categoryName = array_search( $tagName, $mfConfig-get(
'MFBrowseTags' ) );
- if ( $categoryName == false ) {
+ $titles = $this-getTagService()
+ -getTitlesForTag( $tagName );
+
+ if ( !$titles ) {
$this-renderError( array( 'unknownTag' = true ) );
return;
}
@@ -61,40 +64,34 @@
' .collection-cards { padding-top: 1em; }'
);
- // get pages that belong to the category
- $categoryPages = $this-getCategoryPages( $categoryName );
- if ( $categoryPages ) {
- $collectionItems = array();
- $pageIds = array();
- foreach ( $categoryPages as $page ) {
- array_push( $pageIds, $page['pageid'] );
- }
- // get page images and extracts
- $pages = $this-getPages( $pageIds );
- if ( $pages ) {
- foreach ( $pages as $page ) {
- if ( !$page['title'] ) {
- continue;
- }
- $title = Title::newFromText(
$page['title'] );
- $image = false;
- if ( isset( $page['pageimage'] ) ) {
- $image = wfFindFile(
$page['pageimage'] );
- }
- $extract = '';
- if ( isset( $page['extract']['*'] ) ) {
- $extract =
$page['extract']['*'];
- }
-
[MediaWiki-commits] [Gerrit] Rename virt1010 to labvirt1009 - change (operations/dns)
Andrew Bogott has uploaded a new change for review. https://gerrit.wikimedia.org/r/209219 Change subject: Rename virt1010 to labvirt1009 .. Rename virt1010 to labvirt1009 Change-Id: I29d4e021b1bb797c6781d64e2d2cdec46c37d210 --- M templates/10.in-addr.arpa M templates/wmnet 2 files changed, 4 insertions(+), 4 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/dns refs/changes/19/209219/1 diff --git a/templates/10.in-addr.arpa b/templates/10.in-addr.arpa index 12c32cd..2286415 100644 --- a/templates/10.in-addr.arpa +++ b/templates/10.in-addr.arpa @@ -690,7 +690,7 @@ 11 1H IN PTR virt1008.eqiad.wmnet. 13 1H IN PTR labnet1001.eqiad.wmnet. 14 1H IN PTR virt1009.eqiad.wmnet. -15 1H IN PTR virt1010.eqiad.wmnet. +15 1H IN PTR labvirt1009.eqiad.wmnet. 16 1H IN PTR labvirt1007.eqiad.wmnet. 17 1H IN PTR labvirt1008.eqiad.wmnet. 18 1H IN PTR labnodepool1001.eqiad.wmnet. @@ -2075,7 +2075,7 @@ 225 1H IN PTR wmf4594.mgmt.eqiad.wmnet. 225 1H IN PTR americium.mgmt.eqiad.wmnet. 226 1H IN PTR bismuth.mgmt.eqiad.wmnet. -227 1H IN PTR virt1010.mgmt.eqiad.wmnet. +227 1H IN PTR labvirt1009.mgmt.eqiad.wmnet. 228 1H IN PTR labvirt1007.mgmt.eqiad.wmnet. 229 1H IN PTR labvirt1008.mgmt.eqiad.wmnet. 230 1H IN PTR labvirt1001.mgmt.eqiad.wmnet. diff --git a/templates/wmnet b/templates/wmnet index 9303aa2..9274fc3 100644 --- a/templates/wmnet +++ b/templates/wmnet @@ -724,7 +724,7 @@ virt10071H IN A10.64.20.10 virt10081H IN A10.64.20.11 virt10091H IN A10.64.20.14 -virt10101H IN A10.64.20.15 +labvirt1009 1H IN A10.64.20.15 labvirt1007 1H IN A10.64.20.16 labvirt1008 1H IN A10.64.20.17 wtp1001 1H IN A10.64.32.78 @@ -960,7 +960,7 @@ analytics1007 1H IN A10.65.3.77 WMF3461 1H IN A10.65.3.78 virt10091H IN A10.65.3.78 -virt10101H IN A10.65.3.227 +labvirt1009 1H IN A10.65.3.227 labvirt1007 1H IN A10.65.3.228 labvirt1008 1H IN A10.65.3.229 WMF3462 1H IN A10.65.3.79 -- To view, visit https://gerrit.wikimedia.org/r/209219 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I29d4e021b1bb797c6781d64e2d2cdec46c37d210 Gerrit-PatchSet: 1 Gerrit-Project: operations/dns Gerrit-Branch: master Gerrit-Owner: Andrew Bogott abog...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Rename virt1010 to labvirt1009 - change (operations/puppet)
Andrew Bogott has uploaded a new change for review.
https://gerrit.wikimedia.org/r/209220
Change subject: Rename virt1010 to labvirt1009
..
Rename virt1010 to labvirt1009
This is the last of the HPs to be renamed. This patch
also removes the site.pp and hiera definition for the old
names.
Change-Id: I3d54aaea62036d79e5e45e0d5b0151eafb8ce0cb
---
D hieradata/hosts/virt1010.yaml
D hieradata/hosts/virt1011.yaml
M manifests/site.pp
M modules/install-server/files/dhcpd/linux-host-entries.ttyS1-115200
4 files changed, 5 insertions(+), 20 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/20/209220/1
diff --git a/hieradata/hosts/virt1010.yaml b/hieradata/hosts/virt1010.yaml
deleted file mode 100644
index 0f97ce9..000
--- a/hieradata/hosts/virt1010.yaml
+++ /dev/null
@@ -1 +0,0 @@
-role::nova::compute::instance_dev: /dev/sdb1
diff --git a/hieradata/hosts/virt1011.yaml b/hieradata/hosts/virt1011.yaml
deleted file mode 100644
index 0f97ce9..000
--- a/hieradata/hosts/virt1011.yaml
+++ /dev/null
@@ -1 +0,0 @@
-role::nova::compute::instance_dev: /dev/sdb1
diff --git a/manifests/site.pp b/manifests/site.pp
index 21c19f6..b7443a5 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -2407,17 +2407,6 @@
}
}
-node /^virt101[0-2].eqiad.wmnet/ {
-$use_neutron = false
-openstack::nova::partition{ '/dev/sdb': }
-role nova::compute
-include standard
-
-if $use_neutron == true {
-include role::neutron::computenode
-}
-}
-
node /^labvirt100[0-9].eqiad.wmnet/ {
$use_neutron = false
openstack::nova::partition{ '/dev/sdb': }
diff --git a/modules/install-server/files/dhcpd/linux-host-entries.ttyS1-115200
b/modules/install-server/files/dhcpd/linux-host-entries.ttyS1-115200
index 0e70080..46726a8 100644
--- a/modules/install-server/files/dhcpd/linux-host-entries.ttyS1-115200
+++ b/modules/install-server/files/dhcpd/linux-host-entries.ttyS1-115200
@@ -2458,6 +2458,11 @@
fixed-address labvirt1008.eqiad.wmnet;
}
+host labvirt1009 {
+ hardware ethernet 40:a8:f0:38:06:40;
+ fixed-address labvirt1009.eqiad.wmnet;
+}
+
host lanthanum {
hardware ethernet 90:B1:1C:00:A2:67;
fixed-address lanthanum.eqiad.wmnet;
@@ -5831,13 +5836,6 @@
host virt1000 {
hardware ethernet 18:03:73:f5:2c:2b;
fixed-address virt1000.wikimedia.org;
-}
-
-host virt1010 {
- hardware ethernet 40:a8:f0:38:06:40;
- fixed-address virt1010.eqiad.wmnet;
- option pxelinux.pathprefix precise-installer/;
- filename precise-installer/ubuntu-installer/amd64/pxelinux.0;
}
host wtp1001 {
--
To view, visit https://gerrit.wikimedia.org/r/209220
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I3d54aaea62036d79e5e45e0d5b0151eafb8ce0cb
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott abog...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] icinga: unify swift alerts - change (operations/puppet)
Filippo Giunchedi has uploaded a new change for review.
https://gerrit.wikimedia.org/r/209217
Change subject: icinga: unify swift alerts
..
icinga: unify swift alerts
Change-Id: Id56a129aa5d509df041c751f8feb16caad1bcd1f
---
M manifests/role/graphite.pp
M manifests/swift.pp
M modules/swift_new/manifests/monitoring/graphite.pp
3 files changed, 8 insertions(+), 33 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/17/209217/2
diff --git a/manifests/role/graphite.pp b/manifests/role/graphite.pp
index 831a960..57d5ae8 100644
--- a/manifests/role/graphite.pp
+++ b/manifests/role/graphite.pp
@@ -233,9 +233,8 @@
include ::mediawiki::monitoring::graphite
include ::eventlogging::monitoring::graphite
-include ::swift::monitoring::graphite
-include ::swift_new::monitoring::graphite
include ::graphite::monitoring::graphite
+swift_new::monitoring::graphite { ['eqiad-prod', 'codfw-prod']: }
# Monitor production 5xx rates
monitoring::graphite_threshold { 'reqstats_5xx':
diff --git a/manifests/swift.pp b/manifests/swift.pp
index 9afe6f9..9e3c36b 100644
--- a/manifests/swift.pp
+++ b/manifests/swift.pp
@@ -192,28 +192,6 @@
}
}
-class swift::monitoring::graphite {
-monitoring::graphite_threshold { 'swift_eqiad-prod_dispersion_object':
-description = 'swift eqiad-prod object availability',
-metric =
'keepLastValue(swift.eqiad-prod.dispersion.object.pct_found)',
-from= '1hours',
-warning = 95,
-critical= 90,
-under = true,
-nagios_critical = false
-}
-
-monitoring::graphite_threshold { 'swift_eqiad-prod_dispersion_container':
-description = 'swift eqiad-prod container availability',
-metric =
'keepLastValue(swift.eqiad-prod.dispersion.container.pct_found)',
-from= '30min',
-warning = 92,
-critical= 88,
-under = true,
-nagios_critical = false
-}
-}
-
class swift::storage {
Class['swift::base'] - Class['swift::storage']
diff --git a/modules/swift_new/manifests/monitoring/graphite.pp
b/modules/swift_new/manifests/monitoring/graphite.pp
index da6a15c..f2738ea 100644
--- a/modules/swift_new/manifests/monitoring/graphite.pp
+++ b/modules/swift_new/manifests/monitoring/graphite.pp
@@ -1,9 +1,7 @@
-class swift_new::monitoring::graphite (
-$swift_cluster = $::swift_new::params::swift_cluster,
-) {
-monitoring::graphite_threshold {
swift_${swift_cluster}_dispersion_object:
-description = swift ${swift_cluster} object availability,
-metric =
keepLastValue(swift.${swift_cluster}.dispersion.object.pct_found),
+class swift_new::monitoring::graphite {
+monitoring::graphite_threshold { swift_${name}_dispersion_object:
+description = swift ${name} object availability,
+metric =
keepLastValue(swift.${name}.dispersion.object.pct_found),
from= '1hours',
warning = 95,
critical= 90,
@@ -11,9 +9,9 @@
nagios_critical = false,
}
-monitoring::graphite_threshold {
swift_${swift_cluster_dispersion_container}:
-description = swift ${swift_cluster} container availability,
-metric =
keepLastValue(swift.${swift_cluster}.dispersion.container.pct_found),
+monitoring::graphite_threshold { swift_${name}_dispersion_container:
+description = swift ${name} container availability,
+metric =
keepLastValue(swift.${name}.dispersion.container.pct_found),
from= '30min',
warning = 92,
critical= 88,
--
To view, visit https://gerrit.wikimedia.org/r/209217
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Id56a129aa5d509df041c751f8feb16caad1bcd1f
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Filippo Giunchedi fgiunch...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Rename virt1010 to labvirt1009 - change (operations/dns)
Andrew Bogott has submitted this change and it was merged. Change subject: Rename virt1010 to labvirt1009 .. Rename virt1010 to labvirt1009 Change-Id: I29d4e021b1bb797c6781d64e2d2cdec46c37d210 --- M templates/10.in-addr.arpa M templates/wmnet 2 files changed, 4 insertions(+), 4 deletions(-) Approvals: Andrew Bogott: Looks good to me, approved jenkins-bot: Verified diff --git a/templates/10.in-addr.arpa b/templates/10.in-addr.arpa index 12c32cd..2286415 100644 --- a/templates/10.in-addr.arpa +++ b/templates/10.in-addr.arpa @@ -690,7 +690,7 @@ 11 1H IN PTR virt1008.eqiad.wmnet. 13 1H IN PTR labnet1001.eqiad.wmnet. 14 1H IN PTR virt1009.eqiad.wmnet. -15 1H IN PTR virt1010.eqiad.wmnet. +15 1H IN PTR labvirt1009.eqiad.wmnet. 16 1H IN PTR labvirt1007.eqiad.wmnet. 17 1H IN PTR labvirt1008.eqiad.wmnet. 18 1H IN PTR labnodepool1001.eqiad.wmnet. @@ -2075,7 +2075,7 @@ 225 1H IN PTR wmf4594.mgmt.eqiad.wmnet. 225 1H IN PTR americium.mgmt.eqiad.wmnet. 226 1H IN PTR bismuth.mgmt.eqiad.wmnet. -227 1H IN PTR virt1010.mgmt.eqiad.wmnet. +227 1H IN PTR labvirt1009.mgmt.eqiad.wmnet. 228 1H IN PTR labvirt1007.mgmt.eqiad.wmnet. 229 1H IN PTR labvirt1008.mgmt.eqiad.wmnet. 230 1H IN PTR labvirt1001.mgmt.eqiad.wmnet. diff --git a/templates/wmnet b/templates/wmnet index 9303aa2..9274fc3 100644 --- a/templates/wmnet +++ b/templates/wmnet @@ -724,7 +724,7 @@ virt10071H IN A10.64.20.10 virt10081H IN A10.64.20.11 virt10091H IN A10.64.20.14 -virt10101H IN A10.64.20.15 +labvirt1009 1H IN A10.64.20.15 labvirt1007 1H IN A10.64.20.16 labvirt1008 1H IN A10.64.20.17 wtp1001 1H IN A10.64.32.78 @@ -960,7 +960,7 @@ analytics1007 1H IN A10.65.3.77 WMF3461 1H IN A10.65.3.78 virt10091H IN A10.65.3.78 -virt10101H IN A10.65.3.227 +labvirt1009 1H IN A10.65.3.227 labvirt1007 1H IN A10.65.3.228 labvirt1008 1H IN A10.65.3.229 WMF3462 1H IN A10.65.3.79 -- To view, visit https://gerrit.wikimedia.org/r/209219 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I29d4e021b1bb797c6781d64e2d2cdec46c37d210 Gerrit-PatchSet: 1 Gerrit-Project: operations/dns Gerrit-Branch: master Gerrit-Owner: Andrew Bogott abog...@wikimedia.org Gerrit-Reviewer: Andrew Bogott abog...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] repool db1021 - change (operations/mediawiki-config)
Springle has uploaded a new change for review. https://gerrit.wikimedia.org/r/209221 Change subject: repool db1021 .. repool db1021 Change-Id: I22117c2455b5bc246e313078c740a2e069b54d8b --- M wmf-config/db-eqiad.php 1 file changed, 3 insertions(+), 4 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/21/209221/1 diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php index 4c9637a..f5fccf8 100755 --- a/wmf-config/db-eqiad.php +++ b/wmf-config/db-eqiad.php @@ -101,9 +101,9 @@ 'db1024' = 0, # 1.4TB 64GB 'db1018' = 0, # 1.4TB 64GB, snapshot, dump, vslow 'db1036' = 0, # 1.4TB 64GB, watchlist, recentchanges, contributions, logpager - # T89801 mce errors 'db1054' = 200, # 2.8TB 96GB, api + 'db1021' = 100, # 1.4TB 64GB, api 'db1060' = 200, # 2.8TB 96GB, api - 'db1063' = 500, # 2.8TB 128GB + 'db1063' = 400, # 2.8TB 128GB 'db1067' = 500, # 2.8TB 160GB ), /* s3 */ 'DEFAULT' = array( @@ -127,7 +127,6 @@ 'db1058' = 0, # 2.8TB 96GB 'db1045' = 0, # 1.4TB 64GB, vslow, dump 'db1026' = 0, # 1.4TB 64GB, watchlist, recentchanges, contributions, logpager - # upgrade 'db1021' = 400, # 1.4TB 64GB, traffic sampling 'db1049' = 0, # 1.4TB 64GB, api 'db1070' = 500, # 2.8TB 160GB 'db1071' = 500, # 2.8TB 160GB @@ -201,7 +200,7 @@ 'db1018' = 1, ), 'api' = array( - # T89801 mce errors 'db1054' = 1, + 'db1021' = 1, 'db1060' = 1, ), 'watchlist' = array( -- To view, visit https://gerrit.wikimedia.org/r/209221 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I22117c2455b5bc246e313078c740a2e069b54d8b Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Springle sprin...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: 17cac5a..79fd08b - change (mediawiki/extensions)
Jenkins-mwext-sync has uploaded a new change for review. https://gerrit.wikimedia.org/r/209222 Change subject: Syncronize VisualEditor: 17cac5a..79fd08b .. Syncronize VisualEditor: 17cac5a..79fd08b Change-Id: Ia8e7c25d28b01b79c65254463f78372d782f60d9 --- M VisualEditor 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions refs/changes/22/209222/1 diff --git a/VisualEditor b/VisualEditor index 17cac5a..79fd08b 16 --- a/VisualEditor +++ b/VisualEditor -Subproject commit 17cac5ae77b00ad50b75547440d20cc35d73292b +Subproject commit 79fd08b1d6c4f8d49b87e2a2003995d0f4cd6abe -- To view, visit https://gerrit.wikimedia.org/r/209222 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ia8e7c25d28b01b79c65254463f78372d782f60d9 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions Gerrit-Branch: master Gerrit-Owner: Jenkins-mwext-sync jenkins-...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] special page now has explanation text - change (mediawiki...WikidataQualityConstraints)
Dominic.sauer has submitted this change and it was merged.
Change subject: special page now has explanation text
..
special page now has explanation text
the layout is work in progress and will be finalized after Lydia saw it
Change-Id: I2e8a4260f8d912ccb8f6a9fdc13ff217239297ac
---
M WikidataQualityConstraints.php
M i18n/en.json
M i18n/qqq.json
A modules/SpecialConstraintReportPage.css
M specials/SpecialConstraintReport.php
5 files changed, 525 insertions(+), 8 deletions(-)
Approvals:
Dominic.sauer: Verified; Looks good to me, approved
diff --git a/WikidataQualityConstraints.php b/WikidataQualityConstraints.php
index d7e1095..e7ccc58 100644
--- a/WikidataQualityConstraints.php
+++ b/WikidataQualityConstraints.php
@@ -37,6 +37,13 @@
// Initialize special pages
$GLOBALS['wgSpecialPages']['ConstraintReport'] =
'WikidataQuality\ConstraintReport\Specials\SpecialConstraintReport';
+ // Define modules
+ $GLOBALS['wgResourceModules']['SpecialConstraintReportPage'] = array (
+ 'styles' = '/modules/SpecialConstraintReportPage.css',
+ 'localBasePath' = __DIR__,
+ 'remoteExtPath' = 'WikidataQualityConstraints'
+ );
+
// Define database table names
define( 'CONSTRAINT_TABLE', 'wdqa_constraints' );
diff --git a/i18n/en.json b/i18n/en.json
index e33e49e..c14e30a 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -3,6 +3,9 @@
authors: BP2014N1
},
wikidataquality-constraintreport: Constraint report,
+ wikidataquality-constraintreport-explanation-part-one: This special page
performs constraints checks on every entity you want. The entities are fetched
from the live system so every constraint violation you fix there will be
instantly removed from this list.,
+ wikidataquality-constraintreport-explanation-part-two: The constraints
are parsed from the property talk pages once a week, so if you
add/delete/modify a constraint it might take up to a week until this gets taken
into account by this constraint report. There is currently work in progress to
migrate the constraints to statements on properties, enabling this special page
to do live-checks.,
+ wikidataquality-constraintreport-explanation-heading: Explanation,
wikidataquality-constraintreport-instructions: Enter an entity ID and let
it be checked against the constraints.,
wikidataquality-constraintreport-instructions-example: Try any ID,
ideally an item ID, and look at the results.,
wikidataquality-constraintreport-empty-result: There are no constraint
defined on this entity.,
diff --git a/i18n/qqq.json b/i18n/qqq.json
index 66c31a0..73ee18a 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -8,6 +8,9 @@
]
},
wikidataquality-constraintreport: {{doc-special|ConstraintReport}},
+ wikidataquality-constraintreport-explanation-heading: Heading for
the explanation box.,
+wikidataquality-constraintreport-explanation-part-one: Explanation
(part one), what this special page does and how it gets its data.,
+wikidataquality-constraintreport-explanation-part-one: Explanation
(part two), what this special page does and how it gets its data.,
wikidataquality-constraintreport-instructions: Instructions for
starting a check against the constraints.,
wikidataquality-constraintreport-instructions-example: Example, what
to enter to get good results for constraint reports.,
wikidataquality-constraintreport-empty-result: Message that appears,
when there are no constraints defined for the given entity.,
diff --git a/modules/SpecialConstraintReportPage.css
b/modules/SpecialConstraintReportPage.css
new file mode 100644
index 000..b244643
--- /dev/null
+++ b/modules/SpecialConstraintReportPage.css
@@ -0,0 +1,93 @@
+/* Entity id form */
+.wbq-checkresult-form {
+margin-top: 10px;
+margin-bottom: 20px;
+}
+
+.wbq-checkresult-form-entity-id {
+width: 120px;
+}
+
+.wbq-checkresult-form-submit {
+margin-left: 5px;
+}
+
+/* Notices */
+.wbq-checkresult-notice {
+font-style: italic;
+}
+
+.wbq-checkresult-notice-error {
+font-weight: bold;
+color: #BA;
+}
+
+/* Explanation infobox */
+.wbq-explanation {
+width: 25%;
+float: right;
+padding: 1em;
+padding-top: 0;
+border: 1px solid black;
+margin-left: 1em;
+}
+
+/* Statuses */
+.wbq-status {
+font-weight: bold;
+}
+
+.wbq-status-success {
+color: #008000;
+}
+
+.wbq-status-partial-success {
+color: #6CB500;
+}
+
+.wbq-status-warning {
+color: #E6B800;
+}
+
+.wbq-status-error {
+color: #BA;
+}
+
+.wbq-status-unknown {
+color: #404040;
+}
+
+/* Tooltip */
+.wbq-tooltip-indicator:before {
+content: '[?]';
+color: #CCC;
+font-weight: 600;
+}
+
+[tooltip]:before {
+/* needed - do not touch */
+content: attr(tooltip);
+position: absolute;
+opacity: 0;
+
+/*
[MediaWiki-commits] [Gerrit] Re-enable images for our users. - change (mediawiki...MobileFrontend)
Jdlrobson has uploaded a new change for review.
https://gerrit.wikimedia.org/r/209225
Change subject: Re-enable images for our users.
..
Re-enable images for our users.
Any user who opted into beta via our new panel would have also
lost images. This temporary fix turns them back on.
It also has the temporary knock on effect of disallowing images for our
beta users. We can turn this off later once we've measured the impact.
Change-Id: I4c9db46422f59836388134cfdccd1ad5afcf272b
---
M resources/mobile.betaoptin/init.js
1 file changed, 12 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend
refs/changes/25/209225/1
diff --git a/resources/mobile.betaoptin/init.js
b/resources/mobile.betaoptin/init.js
index c9c23ad..3b21696 100644
--- a/resources/mobile.betaoptin/init.js
+++ b/resources/mobile.betaoptin/init.js
@@ -11,9 +11,20 @@
token = mw.user.generateRandomSessionId();
settings.save( 'mobile-betaoptin-token', token );
}
+
+ inStable = !context.isBetaGroupMember();
+ // Correct all those poor souls who already opted in to beta
via panel
+ // and lost their images next time they view a page.
+ // FIXME: Remove this in 30 days.
+ if ( !inStable mw.config.get( 'wgImagesDisabled' ) ) {
+ $.post( mw.util.getUrl( 'Special:MobileOptions' ), {
+ token: mw.user.tokens.get( 'editToken' ),
+ enableImages: true
+ } );
+ }
+
// a single character has 36 possibilities so this is 2/36 5.6%
chance (a-z and 0-9)
// 3% chance of this happening
- inStable = !context.isBetaGroupMember();
inSample = $.inArray( token.charAt( 0 ), [ '3', '2' ] ) !== -1;
if ( inStable ( inSample || mw.util.getParamValue( 'debug' )
) ) {
new BetaOptinPanel()
--
To view, visit https://gerrit.wikimedia.org/r/209225
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I4c9db46422f59836388134cfdccd1ad5afcf272b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson jrob...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Puppetize HA YARN ResourceManager for Hadoop - change (operations/puppet)
Ottomata has submitted this change and it was merged.
Change subject: Puppetize HA YARN ResourceManager for Hadoop
..
Puppetize HA YARN ResourceManager for Hadoop
Change-Id: I6c1803c2699dc398d56be779e3d82ad4753926f4
---
M manifests/role/analytics/hadoop.pp
M modules/cdh
2 files changed, 21 insertions(+), 0 deletions(-)
Approvals:
Ottomata: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/role/analytics/hadoop.pp
b/manifests/role/analytics/hadoop.pp
index bc0c0fb..aca55ac 100644
--- a/manifests/role/analytics/hadoop.pp
+++ b/manifests/role/analytics/hadoop.pp
@@ -13,6 +13,12 @@
# $hadoop_namenodes - Comma separated list of FQDNs that should be NameNodes
# for this cluster. The first entry in the list
# is assumed to be the preferred primary NameNode.
Required.
+# This list will also be used as $resourcemanager_hosts.
+# If hiera('zookeeper_hosts') is set, and this list has
more
+# than one entry, and $journalnode_hosts is also set,
then
+# HA YARN ResourceManager will be configured.
+# TODO: Change the name of this variable to
hadoop_masters
+# When we make this work better with hiera.
#
# $journalnode_hosts - Comma separated list of FQDNs that should be
JournalNodes
# for this cluster. Optional. If not specified, HA
will not be configured.
@@ -61,6 +67,9 @@
# This needs to be set in order to use Impala
$dfs_datanode_hdfs_blocks_metadata_enabled = true
+# Look up zookeeper_hosts from hiera.
+$zookeeper_hosts = keys(hiera('zookeeper_hosts', undef))
+
# Configs specific to Production.
if $::realm == 'production' {
# This is the logical name of the Analytics Hadoop cluster.
@@ -70,6 +79,7 @@
'analytics1001.eqiad.wmnet',
'analytics1002.eqiad.wmnet',
]
+$resourcemanager_hosts = $namenode_hosts
# JournalNodes are colocated on worker DataNodes.
$journalnode_hosts= [
@@ -222,6 +232,7 @@
undef = [$::fqdn],
default = split($::hadoop_namenodes, ','),
}
+$resourcemanager_hosts = $namenode_hosts
$journalnode_hosts = $::hadoop_journalnodes ? {
undef = undef,
@@ -301,6 +312,8 @@
cluster_name = $cluster_name,
namenode_hosts = $namenode_hosts,
journalnode_hosts= $journalnode_hosts,
+resourcemanager_hosts= $resourcemanager_hosts,
+zookeeper_hosts = $zookeeper_hosts,
datanode_mounts = $datanode_mounts,
dfs_name_dir = [$hadoop_name_directory],
dfs_journalnode_edits_dir= $hadoop_journal_directory,
@@ -613,6 +626,14 @@
critical = 'true',
}
}
+
+
+# If this is a resourcemanager host is set, then go ahead
+# and include a resourcemanager on all standby nodes as well
+# as the master node.
+if $::fqdn in $resourcemanager_hosts {
+include cdh::hadoop::resourcemanager
+}
}
diff --git a/modules/cdh b/modules/cdh
index c69732f..3d00a40 16
--- a/modules/cdh
+++ b/modules/cdh
-Subproject commit c69732fbd3fd561fc910efe79d0168b9366a7d21
+Subproject commit 3d00a4004177e0afd4a123ed365e7a930269a31c
--
To view, visit https://gerrit.wikimedia.org/r/209021
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I6c1803c2699dc398d56be779e3d82ad4753926f4
Gerrit-PatchSet: 5
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ottomata o...@wikimedia.org
Gerrit-Reviewer: Ottomata o...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Next try for running travis. - change (mediawiki...WikidataQuality)
Soeren.oldag has uploaded a new change for review.
https://gerrit.wikimedia.org/r/209227
Change subject: Next try for running travis.
..
Next try for running travis.
Change-Id: Ib3c21dbe3bd1dc990d9faf143325f615e4d1cd36
---
M WikidataQuality.php
M build/travis/after_script.sh
M build/travis/before_script.sh
D build/travis/composer.local.json
M build/travis/script.sh
M composer.json
6 files changed, 15 insertions(+), 37 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikidataQuality
refs/changes/27/209227/1
diff --git a/WikidataQuality.php b/WikidataQuality.php
index bec172e..c7a3fa8 100644
--- a/WikidataQuality.php
+++ b/WikidataQuality.php
@@ -8,11 +8,6 @@
exit( 1 );
}
-// Enable autoload
-if ( file_exists( __DIR__ . '/vendor/autoload.php' ) ) {
- require_once __DIR__ . '/vendor/autoload.php';
-}
-
call_user_func( function() {
// Set credits
$GLOBALS['wgExtensionCredits']['specialpage'][] = array (
diff --git a/build/travis/after_script.sh b/build/travis/after_script.sh
index ae2368b..f297d5a 100644
--- a/build/travis/after_script.sh
+++ b/build/travis/after_script.sh
@@ -1,7 +1,7 @@
#! /bin/bash
-cd ../wiki
-wikiDirectory=$(pwd)
+cd ../wiki/extensions/WikibaseQuality
-cd extensions/Quality
-php $wikiDirectory/vendor/bin/coveralls -v
\ No newline at end of file
+ls build/logs
+
+php vendor/bin/coveralls -v
\ No newline at end of file
diff --git a/build/travis/before_script.sh b/build/travis/before_script.sh
index 5545fb0..d867cda 100644
--- a/build/travis/before_script.sh
+++ b/build/travis/before_script.sh
@@ -1,9 +1,6 @@
-#! /bin/bash
-
set -x
originalDirectory=$(pwd)
-rm -rf .git/shallow
composer self-update
@@ -23,21 +20,21 @@
fi
composer install
-
php maintenance/install.php --dbtype $DBTYPE --dbuser root --dbname its_a_mw
--dbpath $(pwd) --pass nyan TravisWiki admin
-cp $originalDirectory/build/travis/composer.local.json composer.local.json
-sed -i.bak s:\$originalDirectory:$originalDirectory:g composer.local.json
-composer update
+cd extensions
+cp -r $originalDirectory WikibaseQuality
+cd WikibaseQuality
+composer install
+cd ../..
echo 'error_reporting(E_ALL| E_STRICT);' LocalSettings.php
echo 'ini_set(display_errors, 1);' LocalSettings.php
echo '$wgShowExceptionDetails = true;' LocalSettings.php
echo '$wgDevelopmentWarnings = true;' LocalSettings.php
-echo '$wgLanguageCode = en;' LocalSettings.php
+echo putenv( 'MW_INSTALL_PATH=$(pwd)' ); LocalSettings.php
-echo '$wgEnableWikibaseRepo = true;' LocalSettings.php
-echo '$wgEnableWikibaseClient = false;' LocalSettings.php
-echo 'require_once $IP/extensions/Wikibase/repo/ExampleSettings.php;'
LocalSettings.php
+echo require_once( __DIR__ .
'/extensions/WikibaseQuality/vendor/autoload.php' ); LocalSettings.php
+echo require_once( __DIR__ .
'/extensions/WikibaseQuality/extensions/Wikibase/repo/ExampleSettings.php' );
LocalSettings.php
php maintenance/update.php --quick
\ No newline at end of file
diff --git a/build/travis/composer.local.json b/build/travis/composer.local.json
deleted file mode 100644
index fd937ca..000
--- a/build/travis/composer.local.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
- repositories: [
- {
- type: git,
- url: $originalDirectory
- }
- ],
- require: {
- wikibase/quality: master-dev,
- wikibase/wikibase: @dev
- },
- require-dev: {
- satooshi/php-coveralls: master-dev
- }
-}
\ No newline at end of file
diff --git a/build/travis/script.sh b/build/travis/script.sh
index ee3b220..b37ec05 100644
--- a/build/travis/script.sh
+++ b/build/travis/script.sh
@@ -3,4 +3,4 @@
set -x
cd ../wiki/tests/phpunit
-php phpunit.php -c ../../extensions/Quality/phpunit.xml.dist
\ No newline at end of file
+php phpunit.php -c ../../extensions/WikibaseQuality/phpunit.xml.dist
\ No newline at end of file
diff --git a/composer.json b/composer.json
index bd7fe8e..d8525cf 100644
--- a/composer.json
+++ b/composer.json
@@ -21,7 +21,8 @@
serialization/serialization: 3.*,=3.2.1
},
require-dev: {
- phpunit/phpunit: ~4.5
+ phpunit/phpunit: ~4.5,
+ satooshi/php-coveralls: master-dev
},
autoload: {
psr-4: {
--
To view, visit https://gerrit.wikimedia.org/r/209227
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib3c21dbe3bd1dc990d9faf143325f615e4d1cd36
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikidataQuality
Gerrit-Branch: v1
Gerrit-Owner: Soeren.oldag soeren_ol...@freenet.de
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
[MediaWiki-commits] [Gerrit] phab: security outbound try as explicit array - change (operations/puppet)
Rush has submitted this change and it was merged. Change subject: phab: security outbound try as explicit array .. phab: security outbound try as explicit array Change-Id: I25b238303a94cb14da1e0d16aefa48e684e0288b --- M modules/phabricator/data/fixed_settings.yaml 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Rush: Looks good to me, approved jenkins-bot: Verified diff --git a/modules/phabricator/data/fixed_settings.yaml b/modules/phabricator/data/fixed_settings.yaml index c32f12d..1f7a10a 100644 --- a/modules/phabricator/data/fixed_settings.yaml +++ b/modules/phabricator/data/fixed_settings.yaml @@ -168,7 +168,7 @@ phpmailer.smtp-port: '25' # Do not try to call out for external resouces such as avatars -security.outbound-blacklist: '0.0.0.0/0' +security.outbound-blacklist: ['0.0.0.0/0'] translation.override: 'Execute Query': 'Search' -- To view, visit https://gerrit.wikimedia.org/r/209231 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I25b238303a94cb14da1e0d16aefa48e684e0288b Gerrit-PatchSet: 2 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Rush r...@wikimedia.org Gerrit-Reviewer: Rush r...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Convert go feature to api tests - change (mediawiki...CirrusSearch)
jenkins-bot has submitted this change and it was merged. Change subject: Convert go feature to api tests .. Convert go feature to api tests This also requires the nearmatch api changes to core in I7153262. Change-Id: Ie0a6e8b3b95b56dc9457fc9efe290950d3837a8b --- R tests/browser/features/go_api.feature A tests/browser/features/go_browser.feature M tests/browser/features/prefix_search_api.feature M tests/browser/features/step_definitions/search_steps.rb 4 files changed, 42 insertions(+), 34 deletions(-) Approvals: Manybubbles: Looks good to me, approved jenkins-bot: Verified diff --git a/tests/browser/features/go.feature b/tests/browser/features/go_api.feature similarity index 61% rename from tests/browser/features/go.feature rename to tests/browser/features/go_api.feature index 75d16b7..51f3ffb 100644 --- a/tests/browser/features/go.feature +++ b/tests/browser/features/go_api.feature @@ -1,41 +1,36 @@ -@clean @go @phantomjs +@clean @go @api Feature: Go Search Scenario: I can go to a page with mixed capital and lower case name by the name all lower cased -When I go search for mixedcapsandlowercase -Then I am on a page titled MixedCapsAndLowerCase +When I get api near matches for mixedcapsandlowercase +Then MixedCapsAndLowerCase is the first api search result Scenario: I can go to a page with mixed capital and lower case name by the name with totally wrong case cased -When I go search for miXEdcapsandlowercASe -Then I am on a page titled MixedCapsAndLowerCase +When I get api near matches for miXEdcapsandlowercASe +Then MixedCapsAndLowerCase is the first api search result Scenario: I can go to a page with an accented character without the accent -When I go search for africa -Then I am on a page titled África +When I get api near matches for africa +Then África is the first api search result @accented_namespace Scenario: I can go to a page in a namespace with an accented character without the accent -When I go search for mo:test -Then I am on a page titled Mó:Test +When I get api near matches for mo:test +Then Mó:Test is the first api search result @accented_namespace Scenario: When I go to a page with the namespace specified twice I end up on the search results page -When I go search for file:mo:test -Then I am on a page titled Search results +When I get api near matches for file:mo:test +Then there are no api search results @from_core Scenario: I can go to a page with mixed capital and lower case name by the name all lower cased and quoted -When I go search for mixedcapsandlowercase -Then I am on a page titled MixedCapsAndLowerCase - - @from_core - Scenario: I can go to a user's page whether it is there or not -When I go search for User:DoesntExist -Then I am on a page titled User:DoesntExist +When I get api near matches for mixedcapsandlowercase +Then MixedCapsAndLowerCase is the first api search result @options Scenario Outline: When I near match just one page I go to that page -When I go search for term Nearmatchflattentest -Then I am on a page titled title Nearmatchflattentest +When I get api near matches for term Nearmatchflattentest +Then title Nearmatchflattentest is the first api search result Examples: | term | title | | soñ onlyaccent | Soñ Onlyaccent | @@ -45,8 +40,8 @@ @options Scenario Outline: When I near match more than one page but one is exact (case, modulo case, or converted to title case) I go to that page -When I go search for term Nearmatchflattentest -Then I am on a page titled title Nearmatchflattentest +When I get api near matches for term Nearmatchflattentest +Then title Nearmatchflattentest is the first api search result Examples: | term | title | | son| son | @@ -63,17 +58,17 @@ | SON Titlecase | Son Titlecase | | soñ twoaccents | Soñ Twoaccents | | són twoaccents | Són Twoaccents | -| bach | Johann Sebastian Bach | -| koan | Kōan| -| son redirect | Soñ Redirect| +| bach | Bach| +| koan | Koan| +| son redirect | Son Redirect| | Son Redirectnotbetter | Són Redirectnotbetter | -| Søn Redirectnoncompete | Blah Redirectnoncompete | -| Soñ Redirectnoncompete | Blah Redirectnoncompete | +| Søn Redirectnoncompete | Søn Redirectnoncompete | +| Soñ Redirectnoncompete | Soñ Redirectnoncompete | @options Scenario Outline: When I near match more than one page but none of them are exact then I go to the search results page -When I go search for term Nearmatchflattentest -Then I am on a page titled Search results +When I get api near matches for term
[MediaWiki-commits] [Gerrit] phab: metamta.maniphest.reply-handler-domain obsolete option - change (operations/puppet)
Rush has submitted this change and it was merged.
Change subject: phab: metamta.maniphest.reply-handler-domain obsolete option
..
phab: metamta.maniphest.reply-handler-domain obsolete option
Change-Id: I2d7f52802a62adb1237aae4097a02b36ae27b21f
---
M manifests/role/phabricator.pp
1 file changed, 0 insertions(+), 1 deletion(-)
Approvals:
Rush: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/role/phabricator.pp b/manifests/role/phabricator.pp
index 3ed8605..58f28f0 100644
--- a/manifests/role/phabricator.pp
+++ b/manifests/role/phabricator.pp
@@ -64,7 +64,6 @@
'phpmailer.smtp-host'= inline_template('%=
@mail_smarthost.join(;) %'),
'metamta.default-address'= no-reply@${domain},
'metamta.domain' = $domain,
-'metamta.maniphest.reply-handler-domain' = $domain,
'metamta.maniphest.public-create-email' = task@${domain},
'metamta.reply-handler-domain' = $domain,
'repository.default-local-path' = '/srv/phab/repos',
--
To view, visit https://gerrit.wikimedia.org/r/209232
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I2d7f52802a62adb1237aae4097a02b36ae27b21f
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Rush r...@wikimedia.org
Gerrit-Reviewer: Rush r...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Configure YARN HA ResourceManager - change (operations...cdh)
Ottomata has submitted this change and it was merged.
Change subject: Configure YARN HA ResourceManager
..
Configure YARN HA ResourceManager
Change-Id: I614968e8892392bfa1f0cf6e579a1f79d931682a
---
M README.md
M TODO.md
M manifests/hadoop.pp
M manifests/hadoop/defaults.pp
M manifests/hadoop/master.pp
M manifests/hadoop/resourcemanager.pp
M templates/hadoop/yarn-site.xml.erb
7 files changed, 228 insertions(+), 32 deletions(-)
Approvals:
Ottomata: Verified; Looks good to me, approved
jenkins-bot: Verified
diff --git a/README.md b/README.md
index e8a1060..cd1ac8b 100644
--- a/README.md
+++ b/README.md
@@ -111,7 +111,9 @@
and set up the NodeManager. If using MRv1, this will install and set up the
TaskTracker.
-## High Availability NameNode
+## High Availability
+
+### High Availibility NameNode
For detailed documentation, see the
[CDH5 High Availability
Guide](http://www.cloudera.com/content/cloudera-content/cloudera-docs/CDH5/latest/CDH5-High-Availability-Guide/cdh5hag_hdfs_ha_config.html).
@@ -202,7 +204,7 @@
3. StandBy NameNodes
4. Worker nodes (DataNodes)
-### Adding High Availability to a running cluster
+ Adding High Availability NameNode to a running cluster
Go through all of the same steps as described in the above section. Once all
of your puppet manifests have been applied (JournalNodes running, NameNodes
running and
@@ -259,6 +261,74 @@
with dot ('.') characters replaced with dashes ('-'). E.g.
```namenode1-domain-org```.
+### High Availability YARN ResourceManager
+To configure automatic failover for the ResourceManager, you'll need a running
+zookeeper cluster. If both $resourcemanager_hosts (which defaults to the
value you
+provide for $namenode_hosts) has multiple hosts set and $zookeeper_hosts is
set, then yarn-site.xml
+will be configured to use HA ResourceManager.
+
+This module does not support running HA ResourceManager without also running
+HA NameNodes. Your primary NameNode and primary ResourceManager must be
configured
+to run on the same host via the inclusion of the ```cdh::hadoop::master```
class.
+Make sure that the first host listed in $namenode_hosts and in
$resoucemanager_hosts
+is this primary node (namenode1.domain.org in the following example).
+
+```puppet
+class my::hadoop {
+class { 'cdh::hadoop':
+cluster_name= 'mycluster',
+zookeeper_hosts = [
+'zk1.domain.org:2181',
+'zk2.domain.org:2181',
+'zk3.domain.org:2181'
+],
+namenode_hosts = [
+'namenode1.domain.org',
+'namenode2.domain.org
+],
+journalnode_hosts = [
+'datanode1.domain.org',
+'datanode2.domain.org',
+'datanode3.domain.org'
+],
+datanode_mounts= [
+'/var/lib/hadoop/data/a',
+'/var/lib/hadoop/data/b',
+'/var/lib/hadoop/data/c'
+],
+dfs_name_dir = ['/var/lib/hadoop/name', '/mnt/hadoop_name'],
+}
+}
+
+```
+
+Note the differences from the non-HA RM setup:
+
+- zookeeper_hosts has been provided. This list of hosts will be used for auto
failover of the RM.
+- On your standby ResourceManagers, explicitly include
```cdh::hadoop::resourcemanager```.
+
+``` puppet
+class my::hadoop::master inherits my::hadoop {
+include cdh::hadoop::master
+}
+class my::hadoop::standby inherits my::hadoop {
+include cdh::hadoop::namenode::standby
+include cdh::hadoop::resourcemanager
+}
+
+node 'namenode1.domain.org' {
+include my::hadoop::master
+}
+
+node 'namenode2.domain.org' {
+include my::hadoop::standby
+}
+```
+
+ Adding High Availability YARN ResourceManager to a running cluster
+Apply the above puppetization to your nodes, and then restart all YARN
services (ResouceManagers and NodeManagers).
+
+
# Hive
## Hive Clients
@@ -266,7 +336,7 @@
```puppet
class { 'cdh::hive':
metastore_host = 'hive-metastore-node.domain.org',
- zookeeper_hosts = ['zk1.domain.org', 'zk2.domain.org'],
+ zookeeper_hosts = ['zk1.domain.org', 'zk2.domain.org', 'zk3.domain.org'],
jdbc_password = $secret_password,
}
```
diff --git a/TODO.md b/TODO.md
index 4ad9c00..72acfb0 100644
--- a/TODO.md
+++ b/TODO.md
@@ -12,9 +12,9 @@
- Make hadoop-metrics2.properties more configurable.
- Support HA automatic failover.
- HA NameNode Fencing support.
-- YARN HA
- Create one variable for namenode address independent of nameservice_id and
primary_namenode_host_
- Spark History Server?
+- Impala documentation
## Zookeeper
diff --git a/manifests/hadoop.pp b/manifests/hadoop.pp
index d22fe21..e6fd118 100644
--- a/manifests/hadoop.pp
+++ b/manifests/hadoop.pp
@@ -31,6 +31,15 @@
# $datanode_mounts- Array of JBOD mount points. Hadoop datanode
and
# mapreduce/yarn directories will be here.
# $dfs_data_path
[MediaWiki-commits] [Gerrit] [LinkTarget] Register extension - change (translatewiki)
Raimond Spekking has uploaded a new change for review. https://gerrit.wikimedia.org/r/209226 Change subject: [LinkTarget] Register extension .. [LinkTarget] Register extension Change-Id: Ifd94b369fa70e5bb179042006d2f7fd81a7913ac --- M groups/MediaWiki/mediawiki-extensions.txt 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/translatewiki refs/changes/26/209226/1 diff --git a/groups/MediaWiki/mediawiki-extensions.txt b/groups/MediaWiki/mediawiki-extensions.txt index 679f842..d79951a 100644 --- a/groups/MediaWiki/mediawiki-extensions.txt +++ b/groups/MediaWiki/mediawiki-extensions.txt @@ -1238,6 +1238,8 @@ # Fork of Link Suggest, message keys unchanged # Link Suggest 2 +Link Target + Liquid Threads aliasfile = LiquidThreads/i18n/Lqt.alias.php magicfile = LiquidThreads/i18n/LiquidThreads.magic.php -- To view, visit https://gerrit.wikimedia.org/r/209226 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ifd94b369fa70e5bb179042006d2f7fd81a7913ac Gerrit-PatchSet: 1 Gerrit-Project: translatewiki Gerrit-Branch: master Gerrit-Owner: Raimond Spekking raimond.spekk...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Next try for running travis. - change (mediawiki...WikidataQuality)
Soeren.oldag has submitted this change and it was merged.
Change subject: Next try for running travis.
..
Next try for running travis.
Change-Id: Ib3c21dbe3bd1dc990d9faf143325f615e4d1cd36
---
M WikidataQuality.php
M build/travis/after_script.sh
M build/travis/before_script.sh
D build/travis/composer.local.json
M build/travis/script.sh
M composer.json
6 files changed, 15 insertions(+), 37 deletions(-)
Approvals:
Soeren.oldag: Verified; Looks good to me, approved
jenkins-bot: Verified
diff --git a/WikidataQuality.php b/WikidataQuality.php
index bec172e..c7a3fa8 100644
--- a/WikidataQuality.php
+++ b/WikidataQuality.php
@@ -8,11 +8,6 @@
exit( 1 );
}
-// Enable autoload
-if ( file_exists( __DIR__ . '/vendor/autoload.php' ) ) {
- require_once __DIR__ . '/vendor/autoload.php';
-}
-
call_user_func( function() {
// Set credits
$GLOBALS['wgExtensionCredits']['specialpage'][] = array (
diff --git a/build/travis/after_script.sh b/build/travis/after_script.sh
index ae2368b..f297d5a 100644
--- a/build/travis/after_script.sh
+++ b/build/travis/after_script.sh
@@ -1,7 +1,7 @@
#! /bin/bash
-cd ../wiki
-wikiDirectory=$(pwd)
+cd ../wiki/extensions/WikibaseQuality
-cd extensions/Quality
-php $wikiDirectory/vendor/bin/coveralls -v
\ No newline at end of file
+ls build/logs
+
+php vendor/bin/coveralls -v
\ No newline at end of file
diff --git a/build/travis/before_script.sh b/build/travis/before_script.sh
index 5545fb0..d867cda 100644
--- a/build/travis/before_script.sh
+++ b/build/travis/before_script.sh
@@ -1,9 +1,6 @@
-#! /bin/bash
-
set -x
originalDirectory=$(pwd)
-rm -rf .git/shallow
composer self-update
@@ -23,21 +20,21 @@
fi
composer install
-
php maintenance/install.php --dbtype $DBTYPE --dbuser root --dbname its_a_mw
--dbpath $(pwd) --pass nyan TravisWiki admin
-cp $originalDirectory/build/travis/composer.local.json composer.local.json
-sed -i.bak s:\$originalDirectory:$originalDirectory:g composer.local.json
-composer update
+cd extensions
+cp -r $originalDirectory WikibaseQuality
+cd WikibaseQuality
+composer install
+cd ../..
echo 'error_reporting(E_ALL| E_STRICT);' LocalSettings.php
echo 'ini_set(display_errors, 1);' LocalSettings.php
echo '$wgShowExceptionDetails = true;' LocalSettings.php
echo '$wgDevelopmentWarnings = true;' LocalSettings.php
-echo '$wgLanguageCode = en;' LocalSettings.php
+echo putenv( 'MW_INSTALL_PATH=$(pwd)' ); LocalSettings.php
-echo '$wgEnableWikibaseRepo = true;' LocalSettings.php
-echo '$wgEnableWikibaseClient = false;' LocalSettings.php
-echo 'require_once $IP/extensions/Wikibase/repo/ExampleSettings.php;'
LocalSettings.php
+echo require_once( __DIR__ .
'/extensions/WikibaseQuality/vendor/autoload.php' ); LocalSettings.php
+echo require_once( __DIR__ .
'/extensions/WikibaseQuality/extensions/Wikibase/repo/ExampleSettings.php' );
LocalSettings.php
php maintenance/update.php --quick
\ No newline at end of file
diff --git a/build/travis/composer.local.json b/build/travis/composer.local.json
deleted file mode 100644
index fd937ca..000
--- a/build/travis/composer.local.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
- repositories: [
- {
- type: git,
- url: $originalDirectory
- }
- ],
- require: {
- wikibase/quality: master-dev,
- wikibase/wikibase: @dev
- },
- require-dev: {
- satooshi/php-coveralls: master-dev
- }
-}
\ No newline at end of file
diff --git a/build/travis/script.sh b/build/travis/script.sh
index ee3b220..b37ec05 100644
--- a/build/travis/script.sh
+++ b/build/travis/script.sh
@@ -3,4 +3,4 @@
set -x
cd ../wiki/tests/phpunit
-php phpunit.php -c ../../extensions/Quality/phpunit.xml.dist
\ No newline at end of file
+php phpunit.php -c ../../extensions/WikibaseQuality/phpunit.xml.dist
\ No newline at end of file
diff --git a/composer.json b/composer.json
index bd7fe8e..d8525cf 100644
--- a/composer.json
+++ b/composer.json
@@ -21,7 +21,8 @@
serialization/serialization: 3.*,=3.2.1
},
require-dev: {
- phpunit/phpunit: ~4.5
+ phpunit/phpunit: ~4.5,
+ satooshi/php-coveralls: master-dev
},
autoload: {
psr-4: {
--
To view, visit https://gerrit.wikimedia.org/r/209227
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib3c21dbe3bd1dc990d9faf143325f615e4d1cd36
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikidataQuality
Gerrit-Branch: v1
Gerrit-Owner: Soeren.oldag soeren_ol...@freenet.de
Gerrit-Reviewer: Soeren.oldag soeren_ol...@freenet.de
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
