[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Added the ability to find within page using ctrl-f or f3
Austinoneil has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/362610 )
Change subject: Added the ability to find within page using ctrl-f or f3
..
Added the ability to find within page using ctrl-f or f3
Change-Id: I8b5657f78333caf658c29d611b7de8ed0efecc1a
---
M app/src/main/assets/bundle.js
M app/src/main/java/org/wikipedia/page/PageFragment.java
2 files changed, 26 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia
refs/changes/10/362610/1
diff --git a/app/src/main/assets/bundle.js b/app/src/main/assets/bundle.js
index 2d2593f..287829d 100644
--- a/app/src/main/assets/bundle.js
+++ b/app/src/main/assets/bundle.js
@@ -52,6 +52,21 @@
}
}
+var KEYCODE_F = 70;
+var KEYCODE_F3 = 114;
+
+document.onkeydown = function() {
+if(event.ctrlKey) {
+if(event.keyCode === KEYCODE_F) {
+bridge.sendMessage('ctrlF', {});
+}
+}
+
+if(event.keyCode === KEYCODE_F3) {
+bridge.sendMessage('f3', {});
+}
+};
+
document.onclick = function() {
var sourceNode = null;
var curNode = event.target;
diff --git a/app/src/main/java/org/wikipedia/page/PageFragment.java
b/app/src/main/java/org/wikipedia/page/PageFragment.java
index c878f65..3b03177 100755
--- a/app/src/main/java/org/wikipedia/page/PageFragment.java
+++ b/app/src/main/java/org/wikipedia/page/PageFragment.java
@@ -1159,6 +1159,17 @@
}
}
});
+bridge.addListener("ctrlF", new CommunicationBridge.JSEventListener() {
+@Override public void onMessage(String messageType, JSONObject
messagePayload) {
+showFindInPage();
+}
+});
+bridge.addListener("f3", new CommunicationBridge.JSEventListener() {
+@Override
+public void onMessage(String messageType, JSONObject
messagePayload) {
+showFindInPage();
+}
+});
}
/**
--
To view, visit https://gerrit.wikimedia.org/r/362610
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I8b5657f78333caf658c29d611b7de8ed0efecc1a
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Austinoneil
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] wikidata...gui[master]: Show currently selected display type
Arsfiqball has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/362609 )
Change subject: Show currently selected display type
..
Show currently selected display type
Create method _setSelectedDisplayType
Remove repetition
Change-Id: I6bf2426c82aaf85a04a04fe9dca4831f6411cf4e
---
M wikibase/queryService/ui/ResultView.js
1 file changed, 13 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/wikidata/query/gui
refs/changes/09/362609/1
diff --git a/wikibase/queryService/ui/ResultView.js
b/wikibase/queryService/ui/ResultView.js
index d68ce86..92f467a 100644
--- a/wikibase/queryService/ui/ResultView.js
+++ b/wikibase/queryService/ui/ResultView.js
@@ -301,6 +301,8 @@
instance.setSparqlApi( self._sparqlApi );
if ( defaultBrowser === null || defaultBrowser === key
) {
+ self._setSelectedDisplayType(b);
+
defaultBrowser = instance;
}
b.object = instance;
@@ -344,6 +346,8 @@
b.$element.click( function() {
$( this ).closest( '.open'
).removeClass( 'open' );
+ self._setSelectedDisplayType(b);
+
$( '#query-result' ).html( '' );
self._drawResult( b.object );
self._selectedResultBrowser = key;
@@ -380,6 +384,15 @@
/**
* @private
*/
+ SELF.prototype._setSelectedDisplayType = function (b) {
+ $('#display-button').html(''
+ + b.label + '');
+ }
+
+ /**
+* @private
+*/
SELF.prototype._track = function( metricName, value, valueType ) {
this._trackingApi.track( TRACKING_NAMESPACE + metricName,
value, valueType );
};
--
To view, visit https://gerrit.wikimedia.org/r/362609
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I6bf2426c82aaf85a04a04fe9dca4831f6411cf4e
Gerrit-PatchSet: 1
Gerrit-Project: wikidata/query/gui
Gerrit-Branch: master
Gerrit-Owner: Arsfiqball
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Skin: Use WANObjectCache for sitenotice caching
Krinkle has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/362608 )
Change subject: Skin: Use WANObjectCache for sitenotice caching
..
Skin: Use WANObjectCache for sitenotice caching
* Move the md5() hash to the cache key, this makes it much safer
after a change happens by avoiding write competitions between different
servers and db slaves. It also allows an undo to re-use the existing
cache if it still exists.
In addition, it enables idiomatic use of getWithSetCallback given
that get and set are now logically separated.
* Avoid fragile re-use of variable names. Previously it read the
original $notice value at multiple points but also setting $notice
to $parsed after a certain point. Consistently use $parsed only.
(Ref T115890.)
Change-Id: I5488cc894ff1544e6c20b7d51a7a2adfc292c4ec
---
M includes/skins/Skin.php
1 file changed, 19 insertions(+), 21 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/08/362608/1
diff --git a/includes/skins/Skin.php b/includes/skins/Skin.php
index e9d2f07..a7f9df2 100644
--- a/includes/skins/Skin.php
+++ b/includes/skins/Skin.php
@@ -1506,29 +1506,27 @@
$notice = $msg->plain();
}
- $cache = wfGetCache( CACHE_ANYTHING );
- // Use the extra hash appender to let eg SSL variants
separately cache.
- $key = $cache->makeKey( $name . $wgRenderHashAppend );
- $cachedNotice = $cache->get( $key );
- if ( is_array( $cachedNotice ) ) {
- if ( md5( $notice ) == $cachedNotice['hash'] ) {
- $notice = $cachedNotice['html'];
- } else {
- $needParse = true;
+ $cache = ObjectCache::getMainWANInstance();
+ $parsed = $cache->getWithSetCallback(
+ // Use the extra hash appender to let eg SSL variants
separately cache
+ // Key is verified with md5 hash of unparsed wikitext
+ $cache->makeKey( $name, $wgRenderHashAppend, md5(
$notice ) ),
+ // TTL in seconds
+ 600,
+ function () {
+ return $this->getOutput()->parse( $notice );
}
- } else {
- $needParse = true;
- }
+ );
- if ( $needParse ) {
- $parsed = $this->getOutput()->parse( $notice );
- $cache->set( $key, [ 'html' => $parsed, 'hash' => md5(
$notice ) ], 600 );
- $notice = $parsed;
- }
-
- $notice = Html::rawElement( 'div', [ 'id' => 'localNotice',
- 'lang' => $wgContLang->getHtmlCode(), 'dir' =>
$wgContLang->getDir() ], $notice );
- return $notice;
+ return Html::rawElement(
+ 'div',
+ [
+ 'id' => 'localNotice',
+ 'lang' => $wgContLang->getHtmlCode(),
+ 'dir' => $wgContLang->getDir()
+ ],
+ $parsed
+ );
}
/**
--
To view, visit https://gerrit.wikimedia.org/r/362608
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I5488cc894ff1544e6c20b7d51a7a2adfc292c4ec
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Krinkle
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Wikibase[master]: Use LocalServerObjectCache service instead wfGetCache
Krinkle has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/362607 )
Change subject: Use LocalServerObjectCache service instead wfGetCache
..
Use LocalServerObjectCache service instead wfGetCache
Follows-up 16ae6e2c31.
Also remove use of the overly generic CACHE_ANYTHING, especially
conditional use (hard to debug). Using APC should work equally
fine in HHVM as Zend PHP. If the concern is whether APC is installed
by the user, one should use a fallback instead (if needed):
ObjectCache::getLocalServerInstance( /* fallback = */ 'hash' )
Change-Id: Iaf98e751b68e9cd431be61d3fa73271ecde30891
---
M lib/includes/Modules/SitesModule.php
M repo/tests/phpunit/includes/EditEntityTest.php
2 files changed, 8 insertions(+), 17 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/07/362607/1
diff --git a/lib/includes/Modules/SitesModule.php
b/lib/includes/Modules/SitesModule.php
index 87cd372..ff507f1 100644
--- a/lib/includes/Modules/SitesModule.php
+++ b/lib/includes/Modules/SitesModule.php
@@ -24,7 +24,7 @@
$this->worker = new SitesModuleWorker(
Settings::singleton(),
MediaWikiServices::getInstance()->getSiteStore(),
- wfGetCache( wfIsHHVM() ? CACHE_ACCEL : CACHE_ANYTHING )
+
MediaWikiServices::getInstance()->getLocalServerObjectCache()
);
}
diff --git a/repo/tests/phpunit/includes/EditEntityTest.php
b/repo/tests/phpunit/includes/EditEntityTest.php
index 62ca100..d181781 100644
--- a/repo/tests/phpunit/includes/EditEntityTest.php
+++ b/repo/tests/phpunit/includes/EditEntityTest.php
@@ -11,6 +11,7 @@
use Status;
use Title;
use User;
+use MediaWiki\MediaWikiServices;
use Wikibase\DataModel\Entity\EntityDocument;
use Wikibase\DataModel\Entity\EntityId;
use Wikibase\DataModel\Entity\Item;
@@ -646,17 +647,11 @@
);
// make sure we have a working cache
- $services = \MediaWiki\MediaWikiServices::getInstance();
- if ( method_exists( $services, 'getLocalClusterObjectCache' ) )
{
- $services->resetServiceForTesting(
'LocalClusterObjectCache' );
- $services->redefineService( 'LocalClusterObjectCache',
function () {
- return new \HashBagOStuff();
- } );
- } else {
- $this->setMwGlobals( 'wgMainCacheType', CACHE_ANYTHING
);
- // make sure we have a fresh cache
- ObjectCache::clear();
- }
+ $services = MediaWikiServices::getInstance();
+ $services->resetServiceForTesting( 'LocalClusterObjectCache' );
+ $services->redefineService( 'LocalClusterObjectCache', function
() {
+ return new \HashBagOStuff();
+ } );
$user = $this->getUser( 'UserForTestAttemptSaveRateLimit' );
$this->setUserGroups( $user, $groups );
@@ -688,11 +683,7 @@
}
// make sure nobody else has to work with our cache
- if ( method_exists( $services, 'getLocalClusterObjectCache' ) )
{
- $services->resetServiceForTesting(
'LocalClusterObjectCache' );
- } else {
- ObjectCache::clear();
- }
+ $services->resetServiceForTesting( 'LocalClusterObjectCache' );
}
public function provideIsTokenOk() {
--
To view, visit https://gerrit.wikimedia.org/r/362607
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iaf98e751b68e9cd431be61d3fa73271ecde30891
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Krinkle
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] performance/docroot[master]: Make metrics explanation work on small devices
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/362445 )
Change subject: Make metrics explanation work on small devices
..
Make metrics explanation work on small devices
Old version displayed the text in svg that makes it hard(er) to
fit in smaller viewports. Let us use plain HTML instead.
Bug: T169297
Change-Id: I95a6019a64e2ddf764463609b7799406c04c05c4
---
M public_html/coal.js
M public_html/index.html
M public_html/lib/overrides.css
M src/coal.js
M src/index.html
M src/lib/overrides.css
6 files changed, 36 insertions(+), 26 deletions(-)
Approvals:
Krinkle: Looks good to me, approved
jenkins-bot: Verified
diff --git a/public_html/coal.js b/public_html/coal.js
index c80824c..3aed5e1 100644
--- a/public_html/coal.js
+++ b/public_html/coal.js
@@ -22,14 +22,7 @@
( function () {
'use strict';
- var defaultPeriod = 'day',
- descriptions = {
- domInteractive: 'When the browser has parsed the main
HTML document.',
- loadEventEnd: 'When the load event fired in the browser
and the current document is complete.',
- responseStart: 'The time it takes for the client to
receive a response from the server (TTFB).',
- saveTiming: 'The time it takes to submit and save an
edit on an article.',
- firstPaint: 'The moment something is first painted on
the screen (currently only collected in Chrome and IE/Edge).'
- };
+ var defaultPeriod = 'day';
function identity( x ) {
return x;
@@ -68,9 +61,6 @@
MG.data_graphic( {
title: metric + ' – ' + median( values
) + ' ms',
- /* eslint-disable camelcase */
- x_label: metric + ': ' + descriptions[
metric ],
- /* eslint-enable camelcase */
target: this,
area: false,
data: points,
diff --git a/public_html/index.html b/public_html/index.html
index 8e0e94a..01de057 100644
--- a/public_html/index.html
+++ b/public_html/index.html
@@ -450,8 +450,14 @@
}
.mg-x-axis .label {
- font-size: 1.0rem;
- text-transform: none;
+font-size: 1.0rem;
+text-transform: none;
+font-weight: 400;
+}
+
+.perf-metrics-desc {
+ padding-right: 15px;
+ padding-left: 15px;
}
@@ -498,12 +504,18 @@
Past Month
Past Year
+
+ domInteractive: When the
browser has parsed the main HTML document.
+ firstPaint: The moment
something is first painted on the screen (currently only collected in Chrome
and IE/Edge).
+ loadEventEnd: When the
load event fired in the browser and the current document is complete.
+ responseStart: The time
it takes for the client to receive a response from the server (TTFB).
+ saveTiming: The time it
takes to submit and save an edit on an article.
diff --git a/public_html/lib/overrides.css b/public_html/lib/overrides.css
index 293091c..ffacac8 100644
--- a/public_html/lib/overrides.css
+++ b/public_html/lib/overrides.css
@@ -34,6 +34,12 @@
}
.mg-x-axis .label {
- font-size: 1.0rem;
- text-transform: none;
+font-size: 1.0rem;
+text-transform: none;
+font-weight: 400;
+}
+
+.perf-metrics-desc {
+ padding-right: 15px;
+ padding-left: 15px;
}
diff --git a/src/coal.js b/src/coal.js
index c80824c..3aed5e1 100644
--- a/src/coal.js
+++ b/src/coal.js
@@ -22,14 +22,7 @@
( function () {
'use strict';
- var defaultPeriod = 'day',
- descriptions = {
- domInteractive: 'When the browser has parsed the main
HTML document.',
- loadEventEnd: 'When the load event fired in the browser
and the current document is complete.',
- responseStart: 'The time it takes for the client to
receive a response from the server (TTFB).',
- saveTiming: 'The time it takes to submit and save an
edit on an article.',
- firstPaint: 'The moment something is first painted on
the screen (currently only collected in Chrome and IE/Edge).'
- };
+ var defaultPeriod = 'day';
function identity( x ) {
return x;
@@ -68,9 +61,6 @@
MG.data_graphic( {
title: metric + ' – ' + median( values
) + ' ms',
- /* eslint-disable camelcase */
- x_label: metric + ': ' + descriptions[
metric ],
- /* eslint-enable camelcase */
[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Add more units for conversion
Smalyshev has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/362606 )
Change subject: Add more units for conversion
..
Add more units for conversion
This covers all units having conversion to SI units up to now.
Bug: T168582
Change-Id: I814d6919d816f64247462830d7e4107c5b84093b
---
M wmf-config/unitConversionConfig.json
1 file changed, 2,589 insertions(+), 225 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config
refs/changes/06/362606/1
diff --git a/wmf-config/unitConversionConfig.json
b/wmf-config/unitConversionConfig.json
index 25f84a9..6f3b21e 100644
--- a/wmf-config/unitConversionConfig.json
+++ b/wmf-config/unitConversionConfig.json
@@ -1,15 +1,27 @@
{
-"Q11573": {
-"factor": "1",
+"Q531": {
+"factor": "9460730472580800",
"unit": "Q11573",
-"label": "metre",
+"label": "light-year",
"siLabel": "metre"
},
-"Q218593": {
-"factor": "0.0254",
+"Q573": {
+"factor": "86400",
+"unit": "Q11574",
+"label": "day",
+"siLabel": "second"
+},
+"Q1811": {
+"factor": "149597870691",
"unit": "Q11573",
-"label": "inch",
+"label": "astronomical unit",
"siLabel": "metre"
+},
+"Q2111": {
+"factor": "299792458",
+"unit": "Q182429",
+"label": "speed of light",
+"siLabel": "metre per second"
},
"Q3710": {
"factor": "0.3048",
@@ -17,95 +29,11 @@
"label": "foot",
"siLabel": "metre"
},
-"Q178674": {
-"factor": "0.1",
-"unit": "Q11573",
-"label": "nanometre",
-"siLabel": "metre"
-},
-"Q93318": {
-"factor": "1852",
-"unit": "Q11573",
-"label": "nautical mile",
-"siLabel": "metre"
-},
-"Q253276": {
-"factor": "1609.344",
-"unit": "Q11573",
-"label": "mile",
-"siLabel": "metre"
-},
-"Q174728": {
-"factor": "0.01",
-"unit": "Q11573",
-"label": "centimetre",
-"siLabel": "metre"
-},
-"Q174789": {
-"factor": "0.001",
-"unit": "Q11573",
-"label": "millimetre",
-"siLabel": "metre"
-},
-"Q531": {
-"factor": "9460730472580800",
-"unit": "Q11573",
-"label": "light-year",
-"siLabel": "metre"
-},
-"Q1811": {
-"factor": "149597870700",
-"unit": "Q11573",
-"label": "astronomical unit",
-"siLabel": "metre"
-},
-"Q828224": {
-"factor": "1000",
-"unit": "Q11573",
-"label": "kilometre",
-"siLabel": "metre"
-},
-"Q482798": {
-"factor": "0.9144",
-"unit": "Q11573",
-"label": "yard",
-"siLabel": "metre"
-},
-"Q25906460": {
-"factor": "0.01847",
-"unit": "Q11573",
-"label": "dactylos",
-"siLabel": "metre"
-},
-"Q613726": {
-"factor": "10",
-"unit": "Q11570",
-"label": "yottagram",
-"siLabel": "kilogram"
-},
-"Q100995": {
-"factor": "0.45359237",
-"unit": "Q11570",
-"label": "pound",
-"siLabel": "kilogram"
-},
-"Q483261": {
-"factor": "0.00166053904",
-"unit": "Q11570",
-"label": "atomic mass unit",
-"siLabel": "kilogram"
-},
-"Q191118": {
-"factor": "1000",
-"unit": "Q11570",
-"label": "tonne",
-"siLabel": "kilogram"
-},
-"Q180892": {
-"factor": "1988550",
-"unit": "Q11570",
-"label": "solar mass",
-"siLabel": "kilogram"
+"Q7727": {
+"factor": "60",
+"unit": "Q11574",
+"label": "minute",
+"siLabel": "second"
},
"Q11570": {
"factor": "1",
@@ -113,125 +41,11 @@
"label": "kilogram",
"siLabel": "kilogram"
},
-"Q41803": {
-"factor": "0.001",
-"unit": "Q11570",
-"label": "gram",
-"siLabel": "kilogram"
-},
-"Q857027": {
-"factor": "0.09290304",
-"unit": "Q25343",
-"label": "square foot",
-"siLabel": "square metre"
-},
-"Q81292": {
-"factor": "4046.8564224",
-"unit": "Q25343",
-"label": "acre",
-"siLabel": "square metre"
-},
-"Q25343": {
+"Q11573": {
"factor": "1",
-"unit": "Q25343",
-"label": "square metre",
-"siLabel": "square metre"
-},
-"Q21074767": {
-"factor": "1138100",
-"unit": "Q25343",
-"label": "square versta",
-"siLabel": "square metre"
-},
-"Q232291": {
-"factor": "2589988.110336",
-"unit": "Q25343",
-"label": "square
[MediaWiki-commits] [Gerrit] operations/puppet[production]: librenms: add php-net-ipv4 package also on stretch
Dzahn has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/362605 )
Change subject: librenms: add php-net-ipv4 package also on stretch
..
librenms: add php-net-ipv4 package also on stretch
This was missing. Now it has been imported to APT repo
for stretch as well. (from jessie)
Change-Id: I6318719e7317e5964ec301a7ac48d410822521fc
---
M modules/librenms/manifests/init.pp
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
jenkins-bot: Verified
Dzahn: Looks good to me, approved
diff --git a/modules/librenms/manifests/init.pp
b/modules/librenms/manifests/init.pp
index 66ab57b..58859fa 100644
--- a/modules/librenms/manifests/init.pp
+++ b/modules/librenms/manifests/init.pp
@@ -85,7 +85,6 @@
'php5-mysql',
'php5-snmp',
'php5-ldap',
-'php-net-ipv4',
]:
ensure => present,
}
@@ -94,6 +93,7 @@
package { [
'php-net-ipv6',
'php-pear',
+'php-net-ipv4',
'fping',
'graphviz',
'ipmitool',
--
To view, visit https://gerrit.wikimedia.org/r/362605
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I6318719e7317e5964ec301a7ac48d410822521fc
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn
Gerrit-Reviewer: Dzahn
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: librenms: add php-net-ipv4 package also on stretch
Dzahn has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/362605 )
Change subject: librenms: add php-net-ipv4 package also on stretch
..
librenms: add php-net-ipv4 package also on stretch
This was missing. Now it has been imported to APT repo
for stretch as well. (from jessie)
Change-Id: I6318719e7317e5964ec301a7ac48d410822521fc
---
M modules/librenms/manifests/init.pp
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/05/362605/1
diff --git a/modules/librenms/manifests/init.pp
b/modules/librenms/manifests/init.pp
index 66ab57b..58859fa 100644
--- a/modules/librenms/manifests/init.pp
+++ b/modules/librenms/manifests/init.pp
@@ -85,7 +85,6 @@
'php5-mysql',
'php5-snmp',
'php5-ldap',
-'php-net-ipv4',
]:
ensure => present,
}
@@ -94,6 +93,7 @@
package { [
'php-net-ipv6',
'php-pear',
+'php-net-ipv4',
'fping',
'graphviz',
'ipmitool',
--
To view, visit https://gerrit.wikimedia.org/r/362605
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I6318719e7317e5964ec301a7ac48d410822521fc
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Enable wgUsejQueryThree on the Beta Cluster
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/348120 ) Change subject: Enable wgUsejQueryThree on the Beta Cluster .. Enable wgUsejQueryThree on the Beta Cluster Bug: T124742 Change-Id: Ic886a06367803a027ea6346fde36462c0cb4671a --- M wmf-config/InitialiseSettings-labs.php M wmf-config/InitialiseSettings.php 2 files changed, 6 insertions(+), 1 deletion(-) Approvals: Krinkle: Looks good to me, approved jenkins-bot: Verified diff --git a/wmf-config/InitialiseSettings-labs.php b/wmf-config/InitialiseSettings-labs.php index 1bc5f31..b6cc81a 100644 --- a/wmf-config/InitialiseSettings-labs.php +++ b/wmf-config/InitialiseSettings-labs.php @@ -615,6 +615,11 @@ 'default' => [ 'DISPLAY' => ':99' ], ], + // Test jQuery 3 (T124742) + 'wgUsejQueryThree' => [ + 'default' => true, + ], + 'wgCognateReadOnly' => [ 'default' => false, ], diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index e1a524c..08424d5 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -14648,7 +14648,7 @@ // Whether to use jQuery 3.x or keep using the 1.x series. // Temporarily disabled during testing of the feature, 2017-04-13. 'wgUsejQueryThree' => [ - 'default' => false, + 'default' => false, // T124742 ], // Whether to use OOUI to render the buttons on EditPage.php -- To view, visit https://gerrit.wikimedia.org/r/348120 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ic886a06367803a027ea6346fde36462c0cb4671a Gerrit-PatchSet: 10 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Krinkle Gerrit-Reviewer: Florianschmidtwelzow Gerrit-Reviewer: Jforrester Gerrit-Reviewer: Krinkle Gerrit-Reviewer: Reedy Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...codesniffer[master]: Release 0.10.0
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/362604 )
Change subject: Release 0.10.0
..
Release 0.10.0
Change-Id: Ida95cfb5ac64e259b08400b5251d4b29d7a22c5f
---
M HISTORY.md
M README.md
2 files changed, 15 insertions(+), 1 deletion(-)
Approvals:
Legoktm: Looks good to me, approved
jenkins-bot: Verified
diff --git a/HISTORY.md b/HISTORY.md
index 7901d23..f9dd697 100644
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -1,5 +1,19 @@
# MediaWiki-Codesniffer release history #
+## 0.10.0 / 2017-07-01 ##
+* Add sniff to prevent against using PHP 7's Unicode escape syntax (Kunal
Mehta)
+* Add sniff to verify type-casts use the short form (bool, int) (Kunal Mehta)
+* Add sniff for `&$this` that causes warnings in PHP 7.1 (Kunal Mehta)
+* Clean up DbrQueryUsageSniff (Umherirrender)
+* Ensure all FunctionComment sniff codes are standard (Kunal Mehta)
+* Exclude common folders (Umherirrender)
+* Fix handling of nested parenthesis in ParenthesesAroundKeywordSniff (Kunal
Mehta)
+* IllegalSingleLineCommentSniff: Check return value of strrpos strictly (Kunal
Mehta)
+* Improve handling of multi-line class declarations (Kunal Mehta)
+* Include sniff warning/error codes in test output (Kunal Mehta)
+* Make DisallowEmptyLineFunctionsSniff apply to closures too (Kunal Mehta)
+* Use correct notation for UTF-8 (Umherirrender)
+
## 0.9.0 / 2017-06-19 ##
* Add sniff to enforce "function (" for closures (Kunal Mehta)
* Add usage of && in generic_pass (addshore)
diff --git a/README.md b/README.md
index c2d477b..1abc85d 100644
--- a/README.md
+++ b/README.md
@@ -15,7 +15,7 @@
```
{
"require-dev": {
- "mediawiki/mediawiki-codesniffer": "0.9.0"
+ "mediawiki/mediawiki-codesniffer": "0.10.0"
},
"scripts": {
"test": [
--
To view, visit https://gerrit.wikimedia.org/r/362604
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ida95cfb5ac64e259b08400b5251d4b29d7a22c5f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/tools/codesniffer
Gerrit-Branch: master
Gerrit-Owner: Legoktm
Gerrit-Reviewer: Legoktm
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: resourceloader: Minor documentation and coding style improve...
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/362603 )
Change subject: resourceloader: Minor documentation and coding style
improvements
..
resourceloader: Minor documentation and coding style improvements
Based on current non-voting codesniffer warnings.
Change-Id: I34cbc31eda3eaa519a71fe2c04122859f2f15914
---
M includes/resourceloader/ResourceLoaderClientHtml.php
M includes/resourceloader/ResourceLoaderFileModule.php
M includes/resourceloader/ResourceLoaderImage.php
M includes/resourceloader/ResourceLoaderSiteModule.php
M includes/resourceloader/ResourceLoaderUploadDialogModule.php
5 files changed, 14 insertions(+), 8 deletions(-)
Approvals:
Legoktm: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/resourceloader/ResourceLoaderClientHtml.php
b/includes/resourceloader/ResourceLoaderClientHtml.php
index ace8f41..197ac51 100644
--- a/includes/resourceloader/ResourceLoaderClientHtml.php
+++ b/includes/resourceloader/ResourceLoaderClientHtml.php
@@ -109,7 +109,7 @@
*
* See OutputPage::buildExemptModules() for use cases.
*
-* @param array $modules Module state keyed by module name
+* @param array $states Module state keyed by module name
*/
public function setExemptStates( array $states ) {
$this->exemptStates = $states;
@@ -370,7 +370,6 @@
sort( $modules );
if ( $mainContext->getDebug() && count( $modules ) > 1 ) {
-
$chunks = [];
// Recursively call us for every item
foreach ( $modules as $name ) {
diff --git a/includes/resourceloader/ResourceLoaderFileModule.php
b/includes/resourceloader/ResourceLoaderFileModule.php
index 725bc6a..79b8e79 100644
--- a/includes/resourceloader/ResourceLoaderFileModule.php
+++ b/includes/resourceloader/ResourceLoaderFileModule.php
@@ -980,18 +980,19 @@
$files = $compiler->AllParsedFiles();
$this->localFileRefs = array_merge( $this->localFileRefs,
$files );
+ // Cache for 24 hours (86400 seconds).
$cache->set( $cacheKey, [
'css' => $css,
'files' => $files,
'hash' => FileContentsHasher::getFileContentsHash(
$files ),
- ], 60 * 60 * 24 ); // 86400 seconds, or 24 hours.
+ ], 3600 * 24 );
return $css;
}
/**
* Takes named templates by the module and returns an array mapping.
-* @return array of templates mapping template alias to content
+* @return array Templates mapping template alias to content
* @throws MWException
*/
public function getTemplates() {
@@ -1022,7 +1023,8 @@
* the BOM character is not valid in the middle of a string.
* We already assume UTF-8 everywhere, so this should be safe.
*
-* @return string input minus the intial BOM char
+* @param string $input
+* @return string Input minus the intial BOM char
*/
protected function stripBom( $input ) {
if ( substr_compare( "\xef\xbb\xbf", $input, 0, 3 ) === 0 ) {
diff --git a/includes/resourceloader/ResourceLoaderImage.php
b/includes/resourceloader/ResourceLoaderImage.php
index 19d5471..072ae79 100644
--- a/includes/resourceloader/ResourceLoaderImage.php
+++ b/includes/resourceloader/ResourceLoaderImage.php
@@ -148,9 +148,8 @@
public function getExtension( $format = 'original' ) {
if ( $format === 'rasterized' && $this->extension === 'svg' ) {
return 'png';
- } else {
- return $this->extension;
}
+ return $this->extension;
}
/**
diff --git a/includes/resourceloader/ResourceLoaderSiteModule.php
b/includes/resourceloader/ResourceLoaderSiteModule.php
index 7401d58..08641b0 100644
--- a/includes/resourceloader/ResourceLoaderSiteModule.php
+++ b/includes/resourceloader/ResourceLoaderSiteModule.php
@@ -42,7 +42,7 @@
return $pages;
}
- /*
+ /**
* @return array
*/
public function getDependencies( ResourceLoaderContext $context = null
) {
diff --git a/includes/resourceloader/ResourceLoaderUploadDialogModule.php
b/includes/resourceloader/ResourceLoaderUploadDialogModule.php
index 52e2210..9377ed6 100644
--- a/includes/resourceloader/ResourceLoaderUploadDialogModule.php
+++ b/includes/resourceloader/ResourceLoaderUploadDialogModule.php
@@ -29,6 +29,9 @@
protected $targets = [ 'desktop', 'mobile' ];
+ /**
+* @return string JavaScript code
+*/
public function getScript( ResourceLoaderContext $context ) {
$config = $context
[MediaWiki-commits] [Gerrit] mediawiki...codesniffer[master]: Release 0.10.0
Legoktm has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/362604 )
Change subject: Release 0.10.0
..
Release 0.10.0
Change-Id: Ida95cfb5ac64e259b08400b5251d4b29d7a22c5f
---
M HISTORY.md
M README.md
2 files changed, 15 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/tools/codesniffer
refs/changes/04/362604/1
diff --git a/HISTORY.md b/HISTORY.md
index 7901d23..f9dd697 100644
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -1,5 +1,19 @@
# MediaWiki-Codesniffer release history #
+## 0.10.0 / 2017-07-01 ##
+* Add sniff to prevent against using PHP 7's Unicode escape syntax (Kunal
Mehta)
+* Add sniff to verify type-casts use the short form (bool, int) (Kunal Mehta)
+* Add sniff for `&$this` that causes warnings in PHP 7.1 (Kunal Mehta)
+* Clean up DbrQueryUsageSniff (Umherirrender)
+* Ensure all FunctionComment sniff codes are standard (Kunal Mehta)
+* Exclude common folders (Umherirrender)
+* Fix handling of nested parenthesis in ParenthesesAroundKeywordSniff (Kunal
Mehta)
+* IllegalSingleLineCommentSniff: Check return value of strrpos strictly (Kunal
Mehta)
+* Improve handling of multi-line class declarations (Kunal Mehta)
+* Include sniff warning/error codes in test output (Kunal Mehta)
+* Make DisallowEmptyLineFunctionsSniff apply to closures too (Kunal Mehta)
+* Use correct notation for UTF-8 (Umherirrender)
+
## 0.9.0 / 2017-06-19 ##
* Add sniff to enforce "function (" for closures (Kunal Mehta)
* Add usage of && in generic_pass (addshore)
diff --git a/README.md b/README.md
index c2d477b..1abc85d 100644
--- a/README.md
+++ b/README.md
@@ -15,7 +15,7 @@
```
{
"require-dev": {
- "mediawiki/mediawiki-codesniffer": "0.9.0"
+ "mediawiki/mediawiki-codesniffer": "0.10.0"
},
"scripts": {
"test": [
--
To view, visit https://gerrit.wikimedia.org/r/362604
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ida95cfb5ac64e259b08400b5251d4b29d7a22c5f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/tools/codesniffer
Gerrit-Branch: master
Gerrit-Owner: Legoktm
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Flow[master]: Force topics to be exported by UUID order
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/362177 )
Change subject: Force topics to be exported by UUID order
..
Force topics to be exported by UUID order
Bug: T164262
Change-Id: I3035314df21b48df47a120a18c818615a58546a0
---
M includes/Dump/Exporter.php
M includes/Search/Iterators/TopicIterator.php
2 files changed, 8 insertions(+), 1 deletion(-)
Approvals:
Catrope: Looks good to me, but someone else must approve
Mattflaschen: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/Dump/Exporter.php b/includes/Dump/Exporter.php
index 0f2bfd0..822d046 100644
--- a/includes/Dump/Exporter.php
+++ b/includes/Dump/Exporter.php
@@ -174,6 +174,7 @@
$headerIterator = Container::get(
'search.index.iterators.header' );
$topicIterator = Container::get(
'search.index.iterators.topic' );
+ $topicIterator->orderByUUID = true;
/** @var AbstractIterator $iterator */
foreach ( [ $headerIterator, $topicIterator ]
as $iterator ) {
$iterator->setPage(
$row->workflow_page_id );
diff --git a/includes/Search/Iterators/TopicIterator.php
b/includes/Search/Iterators/TopicIterator.php
index f15888b..22cc130 100644
--- a/includes/Search/Iterators/TopicIterator.php
+++ b/includes/Search/Iterators/TopicIterator.php
@@ -26,6 +26,7 @@
public function __construct( DbFactory $dbFactory, RootPostLoader
$rootPostLoader ) {
parent::__construct( $dbFactory );
$this->rootPostLoader = $rootPostLoader;
+ $this->orderByUUID = false;
}
/**
@@ -84,6 +85,11 @@
* {@inheritDoc}
*/
protected function query() {
+ if ( $this->orderByUUID ) {
+ $order = 'workflow_id ASC';
+ } else {
+ $order = 'workflow_last_update_timestamp ASC';
+ }
return $this->dbr->select(
[ 'flow_workflow' ],
// for root post (topic title), workflow_id is the same
as its rev_type_id
@@ -93,7 +99,7 @@
] + $this->conditions,
__METHOD__,
[
- 'ORDER BY' => 'workflow_last_update_timestamp
ASC',
+ 'ORDER BY' => $order,
]
);
}
--
To view, visit https://gerrit.wikimedia.org/r/362177
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I3035314df21b48df47a120a18c818615a58546a0
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: ArielGlenn
Gerrit-Reviewer: Catrope
Gerrit-Reviewer: Mattflaschen
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...codesniffer[master]: Ensure all FunctionComment sniff codes are standard
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/362602 )
Change subject: Ensure all FunctionComment sniff codes are standard
..
Ensure all FunctionComment sniff codes are standard
These were missing the category ("Commenting") as the second part of the
error code.
Change-Id: I020646e4e90aa4f430815f857ad74db1a11a7420
---
M MediaWiki/Sniffs/Commenting/FunctionCommentSniff.php
M MediaWiki/Tests/files/Commenting/commenting_function.php.expect
2 files changed, 4 insertions(+), 5 deletions(-)
Approvals:
Krinkle: Looks good to me, approved
jenkins-bot: Verified
diff --git a/MediaWiki/Sniffs/Commenting/FunctionCommentSniff.php
b/MediaWiki/Sniffs/Commenting/FunctionCommentSniff.php
index 8ae12c6..baaddee 100644
--- a/MediaWiki/Sniffs/Commenting/FunctionCommentSniff.php
+++ b/MediaWiki/Sniffs/Commenting/FunctionCommentSniff.php
@@ -107,8 +107,7 @@
$phpcsFile->addError(
'Missing function doc comment',
$stackPtr,
- "MediaWiki.FunctionComment.Missing.$visStr"
- // Note: because we include . in the code, we
need the "MediaWiki" standard prefix
+ "MissingDocumentation$visStr"
);
$phpcsFile->recordMetric( $stackPtr, 'Function has doc
comment', 'no' );
return;
diff --git a/MediaWiki/Tests/files/Commenting/commenting_function.php.expect
b/MediaWiki/Tests/files/Commenting/commenting_function.php.expect
index ca46d2e..317f2ce 100644
--- a/MediaWiki/Tests/files/Commenting/commenting_function.php.expect
+++ b/MediaWiki/Tests/files/Commenting/commenting_function.php.expect
@@ -1,11 +1,11 @@
5 | ERROR | [ ] Missing function doc comment
-| | (MediaWiki.FunctionComment.Missing.Public)
+| |
(MediaWiki.Commenting.FunctionComment.MissingDocumentationPublic)
9 | ERROR | [ ] Missing function doc comment
-| | (MediaWiki.FunctionComment.Missing.Public)
+| |
(MediaWiki.Commenting.FunctionComment.MissingDocumentationPublic)
16 | ERROR | [ ] Missing @return tag in function comment
| | (MediaWiki.Commenting.FunctionComment.MissingReturn)
22 | ERROR | [x] Expected 1 spaces after parameter name; 2 found
| | (MediaWiki.Commenting.FunctionComment.SpacingAfterParamName)
23 | ERROR | [x] Expected 1 spaces after parameter name; 3 found
| | (MediaWiki.Commenting.FunctionComment.SpacingAfterParamName)
-PHPCBF CAN FIX THE 2 MARKED SNIFF VIOLATIONS AUTOMATICALLY
\ No newline at end of file
+PHPCBF CAN FIX THE 2 MARKED SNIFF VIOLATIONS AUTOMATICALLY
--
To view, visit https://gerrit.wikimedia.org/r/362602
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I020646e4e90aa4f430815f857ad74db1a11a7420
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/tools/codesniffer
Gerrit-Branch: master
Gerrit-Owner: Legoktm
Gerrit-Reviewer: Krinkle
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: resourceloader: Minor documentation and coding style improve...
Krinkle has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/362603 )
Change subject: resourceloader: Minor documentation and coding style
improvements
..
resourceloader: Minor documentation and coding style improvements
Based on current non-voting codesniffer warnings.
Change-Id: I34cbc31eda3eaa519a71fe2c04122859f2f15914
---
M includes/resourceloader/ResourceLoaderClientHtml.php
M includes/resourceloader/ResourceLoaderFileModule.php
M includes/resourceloader/ResourceLoaderImage.php
M includes/resourceloader/ResourceLoaderSiteModule.php
M includes/resourceloader/ResourceLoaderUploadDialogModule.php
5 files changed, 14 insertions(+), 8 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/03/362603/1
diff --git a/includes/resourceloader/ResourceLoaderClientHtml.php
b/includes/resourceloader/ResourceLoaderClientHtml.php
index ace8f41..197ac51 100644
--- a/includes/resourceloader/ResourceLoaderClientHtml.php
+++ b/includes/resourceloader/ResourceLoaderClientHtml.php
@@ -109,7 +109,7 @@
*
* See OutputPage::buildExemptModules() for use cases.
*
-* @param array $modules Module state keyed by module name
+* @param array $states Module state keyed by module name
*/
public function setExemptStates( array $states ) {
$this->exemptStates = $states;
@@ -370,7 +370,6 @@
sort( $modules );
if ( $mainContext->getDebug() && count( $modules ) > 1 ) {
-
$chunks = [];
// Recursively call us for every item
foreach ( $modules as $name ) {
diff --git a/includes/resourceloader/ResourceLoaderFileModule.php
b/includes/resourceloader/ResourceLoaderFileModule.php
index 725bc6a..79b8e79 100644
--- a/includes/resourceloader/ResourceLoaderFileModule.php
+++ b/includes/resourceloader/ResourceLoaderFileModule.php
@@ -980,18 +980,19 @@
$files = $compiler->AllParsedFiles();
$this->localFileRefs = array_merge( $this->localFileRefs,
$files );
+ // Cache for 24 hours (86400 seconds).
$cache->set( $cacheKey, [
'css' => $css,
'files' => $files,
'hash' => FileContentsHasher::getFileContentsHash(
$files ),
- ], 60 * 60 * 24 ); // 86400 seconds, or 24 hours.
+ ], 3600 * 24 );
return $css;
}
/**
* Takes named templates by the module and returns an array mapping.
-* @return array of templates mapping template alias to content
+* @return array Templates mapping template alias to content
* @throws MWException
*/
public function getTemplates() {
@@ -1022,7 +1023,8 @@
* the BOM character is not valid in the middle of a string.
* We already assume UTF-8 everywhere, so this should be safe.
*
-* @return string input minus the intial BOM char
+* @param string $input
+* @return string Input minus the intial BOM char
*/
protected function stripBom( $input ) {
if ( substr_compare( "\xef\xbb\xbf", $input, 0, 3 ) === 0 ) {
diff --git a/includes/resourceloader/ResourceLoaderImage.php
b/includes/resourceloader/ResourceLoaderImage.php
index 19d5471..072ae79 100644
--- a/includes/resourceloader/ResourceLoaderImage.php
+++ b/includes/resourceloader/ResourceLoaderImage.php
@@ -148,9 +148,8 @@
public function getExtension( $format = 'original' ) {
if ( $format === 'rasterized' && $this->extension === 'svg' ) {
return 'png';
- } else {
- return $this->extension;
}
+ return $this->extension;
}
/**
diff --git a/includes/resourceloader/ResourceLoaderSiteModule.php
b/includes/resourceloader/ResourceLoaderSiteModule.php
index 7401d58..08641b0 100644
--- a/includes/resourceloader/ResourceLoaderSiteModule.php
+++ b/includes/resourceloader/ResourceLoaderSiteModule.php
@@ -42,7 +42,7 @@
return $pages;
}
- /*
+ /**
* @return array
*/
public function getDependencies( ResourceLoaderContext $context = null
) {
diff --git a/includes/resourceloader/ResourceLoaderUploadDialogModule.php
b/includes/resourceloader/ResourceLoaderUploadDialogModule.php
index 52e2210..9377ed6 100644
--- a/includes/resourceloader/ResourceLoaderUploadDialogModule.php
+++ b/includes/resourceloader/ResourceLoaderUploadDialogModule.php
@@ -29,6 +29,9 @@
protected $targets = [ 'desktop', 'mobile' ];
+ /**
+* @return string JavaScript code
+*/
public function getScript( ResourceLoaderContext $context ) {
$config = $context-
[MediaWiki-commits] [Gerrit] mediawiki...codesniffer[master]: Ensure all FunctionComment sniff codes are standard
Legoktm has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/362602 )
Change subject: Ensure all FunctionComment sniff codes are standard
..
Ensure all FunctionComment sniff codes are standard
These were missing the category ("Commenting") as the second part of the
error code.
Change-Id: I020646e4e90aa4f430815f857ad74db1a11a7420
---
M MediaWiki/Sniffs/Commenting/FunctionCommentSniff.php
M MediaWiki/Tests/files/Commenting/commenting_function.php.expect
2 files changed, 4 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/tools/codesniffer
refs/changes/02/362602/1
diff --git a/MediaWiki/Sniffs/Commenting/FunctionCommentSniff.php
b/MediaWiki/Sniffs/Commenting/FunctionCommentSniff.php
index 8ae12c6..157506f 100644
--- a/MediaWiki/Sniffs/Commenting/FunctionCommentSniff.php
+++ b/MediaWiki/Sniffs/Commenting/FunctionCommentSniff.php
@@ -107,7 +107,7 @@
$phpcsFile->addError(
'Missing function doc comment',
$stackPtr,
- "MediaWiki.FunctionComment.Missing.$visStr"
+ "MissingDocumentation$visStr"
// Note: because we include . in the code, we
need the "MediaWiki" standard prefix
);
$phpcsFile->recordMetric( $stackPtr, 'Function has doc
comment', 'no' );
diff --git a/MediaWiki/Tests/files/Commenting/commenting_function.php.expect
b/MediaWiki/Tests/files/Commenting/commenting_function.php.expect
index ca46d2e..317f2ce 100644
--- a/MediaWiki/Tests/files/Commenting/commenting_function.php.expect
+++ b/MediaWiki/Tests/files/Commenting/commenting_function.php.expect
@@ -1,11 +1,11 @@
5 | ERROR | [ ] Missing function doc comment
-| | (MediaWiki.FunctionComment.Missing.Public)
+| |
(MediaWiki.Commenting.FunctionComment.MissingDocumentationPublic)
9 | ERROR | [ ] Missing function doc comment
-| | (MediaWiki.FunctionComment.Missing.Public)
+| |
(MediaWiki.Commenting.FunctionComment.MissingDocumentationPublic)
16 | ERROR | [ ] Missing @return tag in function comment
| | (MediaWiki.Commenting.FunctionComment.MissingReturn)
22 | ERROR | [x] Expected 1 spaces after parameter name; 2 found
| | (MediaWiki.Commenting.FunctionComment.SpacingAfterParamName)
23 | ERROR | [x] Expected 1 spaces after parameter name; 3 found
| | (MediaWiki.Commenting.FunctionComment.SpacingAfterParamName)
-PHPCBF CAN FIX THE 2 MARKED SNIFF VIOLATIONS AUTOMATICALLY
\ No newline at end of file
+PHPCBF CAN FIX THE 2 MARKED SNIFF VIOLATIONS AUTOMATICALLY
--
To view, visit https://gerrit.wikimedia.org/r/362602
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I020646e4e90aa4f430815f857ad74db1a11a7420
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/tools/codesniffer
Gerrit-Branch: master
Gerrit-Owner: Legoktm
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Push lazy jobs when exceptions are handled by MWExceptionHan...
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/355476 )
Change subject: Push lazy jobs when exceptions are handled by MWExceptionHandler
..
Push lazy jobs when exceptions are handled by MWExceptionHandler
Remove the exit(1), which does not seem to be needed by any callers.
Doing so means that post-send updates can still happen, such as the
pushing of lazy jobs.
Better avoid showing exceptions in doPostOutputShutdown(), given
that an error may have already been shown. By the post-send part,
it's to late to show errors anyway.
Bug: T100085
Change-Id: Ib1c75323f222a0e02603d6415626a4b233e8e1c7
---
M includes/MediaWiki.php
M includes/exception/MWExceptionHandler.php
2 files changed, 14 insertions(+), 10 deletions(-)
Approvals:
Krinkle: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/MediaWiki.php b/includes/MediaWiki.php
index 19e827d..9fdc95a 100644
--- a/includes/MediaWiki.php
+++ b/includes/MediaWiki.php
@@ -545,7 +545,6 @@
print MWExceptionRenderer::getHTML( $e
);
exit;
}
-
}
MWExceptionHandler::handleException( $e );
@@ -720,21 +719,28 @@
* @since 1.26
*/
public function doPostOutputShutdown( $mode = 'normal' ) {
- $timing = $this->context->getTiming();
- $timing->mark( 'requestShutdown' );
+ // Perform the last synchronous operations...
+ try {
+ // Record backend request timing
+ $timing = $this->context->getTiming();
+ $timing->mark( 'requestShutdown' );
+ // Show visible profiling data if enabled (which cannot
be post-send)
+ Profiler::instance()->logDataPageOutputOnly();
+ } catch ( Exception $e ) {
+ // An error may already have been shown in run(), so
just log it to be safe
+ MWExceptionHandler::rollbackMasterChangesAndLog( $e );
+ }
- // Show visible profiling data if enabled (which cannot be
post-send)
- Profiler::instance()->logDataPageOutputOnly();
-
+ // Defer everything else if possible...
$callback = function () use ( $mode ) {
try {
$this->restInPeace( $mode );
} catch ( Exception $e ) {
- MWExceptionHandler::handleException( $e );
+ // If this is post-send, then displaying errors
can cause broken HTML
+
MWExceptionHandler::rollbackMasterChangesAndLog( $e );
}
};
- // Defer everything else...
if ( function_exists( 'register_postsend_function' ) ) {
// https://github.com/facebook/hhvm/issues/1230
register_postsend_function( $callback );
diff --git a/includes/exception/MWExceptionHandler.php
b/includes/exception/MWExceptionHandler.php
index ef81366..a2867a1 100644
--- a/includes/exception/MWExceptionHandler.php
+++ b/includes/exception/MWExceptionHandler.php
@@ -128,8 +128,6 @@
public static function handleException( $e ) {
self::rollbackMasterChangesAndLog( $e );
self::report( $e );
- // Exit value should be nonzero for the benefit of shell jobs
- exit( 1 );
}
/**
--
To view, visit https://gerrit.wikimedia.org/r/355476
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib1c75323f222a0e02603d6415626a4b233e8e1c7
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz
Gerrit-Reviewer: Aaron Schulz
Gerrit-Reviewer: Krinkle
Gerrit-Reviewer: Legoktm
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: servermon: Make sure /etc/gunicorn.d/ exists
Paladox has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/362601 ) Change subject: servermon: Make sure /etc/gunicorn.d/ exists .. servermon: Make sure /etc/gunicorn.d/ exists Reason why we need to do this is puppet fails to create /etc/gunicorn.d/servermon due to /etc/gunicorn.d/ not being there. Change-Id: I094f047587890553589804e266745effd8f28eb3 --- 0 files changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/01/362601/1 -- To view, visit https://gerrit.wikimedia.org/r/362601 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I094f047587890553589804e266745effd8f28eb3 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Paladox Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations...servermon[master]: Remove TEMPLATE_CONTEXT_PROCESSORS config
Paladox has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/362600 ) Change subject: Remove TEMPLATE_CONTEXT_PROCESSORS config .. Remove TEMPLATE_CONTEXT_PROCESSORS config Since django 1.10 it has been removed, see https://github.com/django/django/blob/5e8625ba643db118a44cb32e9e48bf431ef4da53/docs/releases/1.10.txt#L1277 Change-Id: I08ab36bb2108c2f00c660324e2522ba418f155a4 --- 0 files changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/software/servermon refs/changes/00/362600/1 -- To view, visit https://gerrit.wikimedia.org/r/362600 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I08ab36bb2108c2f00c660324e2522ba418f155a4 Gerrit-PatchSet: 1 Gerrit-Project: operations/software/servermon Gerrit-Branch: master Gerrit-Owner: Paladox ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/core[REL1_29]: Always log exceptions in rollbackMasterChangesAndLog()
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/362599 )
Change subject: Always log exceptions in rollbackMasterChangesAndLog()
..
Always log exceptions in rollbackMasterChangesAndLog()
MWExceptionHandler::rollbackMasterChangesAndLog() only logged exceptions
if there were already master changes. This is extremely problematic when
debugging, especially in situations like DeferredUpdates where they were
silently being swallowed.
This makes it log exceptions in all paths, erring on the side of logging
the same exception twice (theoretically it's possible I suppose) instead
of not at all.
Also make the method able to handle DBError exceptions, which most of
the callers seemed to be assuming. ApiMain was handling this explicitly.
Bug: T168347
Change-Id: I8739051f824a455ba669344184c3b11ac95cb561
---
M includes/api/ApiMain.php
M includes/exception/MWExceptionHandler.php
2 files changed, 20 insertions(+), 43 deletions(-)
Approvals:
Chad: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/api/ApiMain.php b/includes/api/ApiMain.php
index 00f976e..97873c8 100644
--- a/includes/api/ApiMain.php
+++ b/includes/api/ApiMain.php
@@ -580,22 +580,11 @@
// T65145: Rollback any open database transactions
if ( !( $e instanceof ApiUsageException || $e instanceof
UsageException ) ) {
// UsageExceptions are intentional, so don't rollback
if that's the case
- try {
-
MWExceptionHandler::rollbackMasterChangesAndLog( $e );
- } catch ( DBError $e2 ) {
- // Rollback threw an exception too. Log it, but
don't interrupt
- // our regularly scheduled exception handling.
- MWExceptionHandler::logException( $e2 );
- }
+ MWExceptionHandler::rollbackMasterChangesAndLog( $e );
}
// Allow extra cleanup and logging
Hooks::run( 'ApiMain::onException', [ $this, $e ] );
-
- // Log it
- if ( !( $e instanceof ApiUsageException || $e instanceof
UsageException ) ) {
- MWExceptionHandler::logException( $e );
- }
// Handle any kind of exception by outputting properly
formatted error message.
// If this fails, an unhandled exception should be thrown so
that global error
diff --git a/includes/exception/MWExceptionHandler.php
b/includes/exception/MWExceptionHandler.php
index 433274e..ef81366 100644
--- a/includes/exception/MWExceptionHandler.php
+++ b/includes/exception/MWExceptionHandler.php
@@ -83,29 +83,32 @@
}
/**
-* If there are any open database transactions, roll them back and log
-* the stack trace of the exception that should have been caught so the
-* transaction could be aborted properly.
+* Roll back any open database transactions and log the stack trace of
the exception
+*
+* This method is used to attempt to recover from exceptions
*
* @since 1.23
* @param Exception|Throwable $e
*/
public static function rollbackMasterChangesAndLog( $e ) {
$services = MediaWikiServices::getInstance();
- if ( $services->isServiceDisabled( 'DBLoadBalancerFactory' ) ) {
- return; // T147599
+ if ( !$services->isServiceDisabled( 'DBLoadBalancerFactory' ) )
{
+ // Rollback DBs to avoid transaction notices. This
might fail
+ // to rollback some databases due to connection issues
or exceptions.
+ // However, any sane DB driver will rollback implicitly
anyway.
+ try {
+
$services->getDBLoadBalancerFactory()->rollbackMasterChanges( __METHOD__ );
+ } catch ( DBError $e2 ) {
+ // If the DB is unreacheable, rollback() will
throw an error
+ // and the error report() method might need
messages from the DB,
+ // which would result in an exception loop. PHP
may escalate such
+ // errors to "Exception thrown without a stack
frame" fatals, but
+ // it's better to be explicit here.
+ self::logException( $e2,
self::CAUGHT_BY_HANDLER );
+ }
}
- $lbFactory = $services->getDBLoadBalancerFactory();
- if ( $lbFactory->hasMasterChanges() ) {
- $logger = LoggerFactory::getInstance( 'Bug56269' );
- $logger->warning(
-
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Always log exceptions in rollbackMasterChangesAndLog()
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/361780 )
Change subject: Always log exceptions in rollbackMasterChangesAndLog()
..
Always log exceptions in rollbackMasterChangesAndLog()
MWExceptionHandler::rollbackMasterChangesAndLog() only logged exceptions
if there were already master changes. This is extremely problematic when
debugging, especially in situations like DeferredUpdates where they were
silently being swallowed.
This makes it log exceptions in all paths, erring on the side of logging
the same exception twice (theoretically it's possible I suppose) instead
of not at all.
Also make the method able to handle DBError exceptions, which most of
the callers seemed to be assuming. ApiMain was handling this explicitly.
Bug: T168347
Change-Id: I8739051f824a455ba669344184c3b11ac95cb561
---
M includes/api/ApiMain.php
M includes/exception/MWExceptionHandler.php
2 files changed, 20 insertions(+), 43 deletions(-)
Approvals:
Krinkle: Looks good to me, but someone else must approve
Chad: Looks good to me, approved
Legoktm: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/includes/api/ApiMain.php b/includes/api/ApiMain.php
index 5cb7967..52f79ee 100644
--- a/includes/api/ApiMain.php
+++ b/includes/api/ApiMain.php
@@ -581,22 +581,11 @@
// T65145: Rollback any open database transactions
if ( !( $e instanceof ApiUsageException || $e instanceof
UsageException ) ) {
// UsageExceptions are intentional, so don't rollback
if that's the case
- try {
-
MWExceptionHandler::rollbackMasterChangesAndLog( $e );
- } catch ( DBError $e2 ) {
- // Rollback threw an exception too. Log it, but
don't interrupt
- // our regularly scheduled exception handling.
- MWExceptionHandler::logException( $e2 );
- }
+ MWExceptionHandler::rollbackMasterChangesAndLog( $e );
}
// Allow extra cleanup and logging
Hooks::run( 'ApiMain::onException', [ $this, $e ] );
-
- // Log it
- if ( !( $e instanceof ApiUsageException || $e instanceof
UsageException ) ) {
- MWExceptionHandler::logException( $e );
- }
// Handle any kind of exception by outputting properly
formatted error message.
// If this fails, an unhandled exception should be thrown so
that global error
diff --git a/includes/exception/MWExceptionHandler.php
b/includes/exception/MWExceptionHandler.php
index 433274e..ef81366 100644
--- a/includes/exception/MWExceptionHandler.php
+++ b/includes/exception/MWExceptionHandler.php
@@ -83,29 +83,32 @@
}
/**
-* If there are any open database transactions, roll them back and log
-* the stack trace of the exception that should have been caught so the
-* transaction could be aborted properly.
+* Roll back any open database transactions and log the stack trace of
the exception
+*
+* This method is used to attempt to recover from exceptions
*
* @since 1.23
* @param Exception|Throwable $e
*/
public static function rollbackMasterChangesAndLog( $e ) {
$services = MediaWikiServices::getInstance();
- if ( $services->isServiceDisabled( 'DBLoadBalancerFactory' ) ) {
- return; // T147599
+ if ( !$services->isServiceDisabled( 'DBLoadBalancerFactory' ) )
{
+ // Rollback DBs to avoid transaction notices. This
might fail
+ // to rollback some databases due to connection issues
or exceptions.
+ // However, any sane DB driver will rollback implicitly
anyway.
+ try {
+
$services->getDBLoadBalancerFactory()->rollbackMasterChanges( __METHOD__ );
+ } catch ( DBError $e2 ) {
+ // If the DB is unreacheable, rollback() will
throw an error
+ // and the error report() method might need
messages from the DB,
+ // which would result in an exception loop. PHP
may escalate such
+ // errors to "Exception thrown without a stack
frame" fatals, but
+ // it's better to be explicit here.
+ self::logException( $e2,
self::CAUGHT_BY_HANDLER );
+ }
}
- $lbFactory = $services->getDBLoadBalancerFactory();
- if ( $lbFactory->hasMasterChanges() ) {
-
[MediaWiki-commits] [Gerrit] mediawiki/core[REL1_29]: Always log exceptions in rollbackMasterChangesAndLog()
Chad has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/362599 )
Change subject: Always log exceptions in rollbackMasterChangesAndLog()
..
Always log exceptions in rollbackMasterChangesAndLog()
MWExceptionHandler::rollbackMasterChangesAndLog() only logged exceptions
if there were already master changes. This is extremely problematic when
debugging, especially in situations like DeferredUpdates where they were
silently being swallowed.
This makes it log exceptions in all paths, erring on the side of logging
the same exception twice (theoretically it's possible I suppose) instead
of not at all.
Also make the method able to handle DBError exceptions, which most of
the callers seemed to be assuming. ApiMain was handling this explicitly.
Bug: T168347
Change-Id: I8739051f824a455ba669344184c3b11ac95cb561
---
M includes/api/ApiMain.php
M includes/exception/MWExceptionHandler.php
2 files changed, 20 insertions(+), 43 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/99/362599/1
diff --git a/includes/api/ApiMain.php b/includes/api/ApiMain.php
index 00f976e..97873c8 100644
--- a/includes/api/ApiMain.php
+++ b/includes/api/ApiMain.php
@@ -580,22 +580,11 @@
// T65145: Rollback any open database transactions
if ( !( $e instanceof ApiUsageException || $e instanceof
UsageException ) ) {
// UsageExceptions are intentional, so don't rollback
if that's the case
- try {
-
MWExceptionHandler::rollbackMasterChangesAndLog( $e );
- } catch ( DBError $e2 ) {
- // Rollback threw an exception too. Log it, but
don't interrupt
- // our regularly scheduled exception handling.
- MWExceptionHandler::logException( $e2 );
- }
+ MWExceptionHandler::rollbackMasterChangesAndLog( $e );
}
// Allow extra cleanup and logging
Hooks::run( 'ApiMain::onException', [ $this, $e ] );
-
- // Log it
- if ( !( $e instanceof ApiUsageException || $e instanceof
UsageException ) ) {
- MWExceptionHandler::logException( $e );
- }
// Handle any kind of exception by outputting properly
formatted error message.
// If this fails, an unhandled exception should be thrown so
that global error
diff --git a/includes/exception/MWExceptionHandler.php
b/includes/exception/MWExceptionHandler.php
index 433274e..ef81366 100644
--- a/includes/exception/MWExceptionHandler.php
+++ b/includes/exception/MWExceptionHandler.php
@@ -83,29 +83,32 @@
}
/**
-* If there are any open database transactions, roll them back and log
-* the stack trace of the exception that should have been caught so the
-* transaction could be aborted properly.
+* Roll back any open database transactions and log the stack trace of
the exception
+*
+* This method is used to attempt to recover from exceptions
*
* @since 1.23
* @param Exception|Throwable $e
*/
public static function rollbackMasterChangesAndLog( $e ) {
$services = MediaWikiServices::getInstance();
- if ( $services->isServiceDisabled( 'DBLoadBalancerFactory' ) ) {
- return; // T147599
+ if ( !$services->isServiceDisabled( 'DBLoadBalancerFactory' ) )
{
+ // Rollback DBs to avoid transaction notices. This
might fail
+ // to rollback some databases due to connection issues
or exceptions.
+ // However, any sane DB driver will rollback implicitly
anyway.
+ try {
+
$services->getDBLoadBalancerFactory()->rollbackMasterChanges( __METHOD__ );
+ } catch ( DBError $e2 ) {
+ // If the DB is unreacheable, rollback() will
throw an error
+ // and the error report() method might need
messages from the DB,
+ // which would result in an exception loop. PHP
may escalate such
+ // errors to "Exception thrown without a stack
frame" fatals, but
+ // it's better to be explicit here.
+ self::logException( $e2,
self::CAUGHT_BY_HANDLER );
+ }
}
- $lbFactory = $services->getDBLoadBalancerFactory();
- if ( $lbFactory->hasMasterChanges() ) {
- $logger = LoggerFactory::getInstance( 'Bug56269' );
- $logger->warning(
-
[MediaWiki-commits] [Gerrit] operations/puppet[production]: servermon: add missing package python-mysqldb
Dzahn has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/362598 ) Change subject: servermon: add missing package python-mysqldb .. servermon: add missing package python-mysqldb python-mysqldb is installed on netmon1001 and needed by servermon but wasn't puppetized here yet it seems Bug: T159756 Change-Id: I45ac9f8eb305a21a5113241da04db50d2570e31a --- M modules/servermon/manifests/init.pp 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Paladox: Looks good to me, but someone else must approve jenkins-bot: Verified Dzahn: Looks good to me, approved diff --git a/modules/servermon/manifests/init.pp b/modules/servermon/manifests/init.pp index 5115487..36f7c84 100644 --- a/modules/servermon/manifests/init.pp +++ b/modules/servermon/manifests/init.pp @@ -68,6 +68,7 @@ 'python-ipy', 'gunicorn', 'python-ldap', +'python-mysqldb', ] require_package($packages) -- To view, visit https://gerrit.wikimedia.org/r/362598 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I45ac9f8eb305a21a5113241da04db50d2570e31a Gerrit-PatchSet: 3 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Dzahn Gerrit-Reviewer: Dzahn Gerrit-Reviewer: Paladox Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: netmon1002: disable Letsencrypt cert creation for migration
Dzahn has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/362126 ) Change subject: netmon1002: disable Letsencrypt cert creation for migration .. netmon1002: disable Letsencrypt cert creation for migration Change-Id: I6f659d5777db777b52cd48ee2247628575a1 --- A hieradata/hosts/netmon1002.yaml 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: jenkins-bot: Verified Dzahn: Looks good to me, approved diff --git a/hieradata/hosts/netmon1002.yaml b/hieradata/hosts/netmon1002.yaml new file mode 100644 index 000..370806d --- /dev/null +++ b/hieradata/hosts/netmon1002.yaml @@ -0,0 +1 @@ +do_acme: false -- To view, visit https://gerrit.wikimedia.org/r/362126 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I6f659d5777db777b52cd48ee2247628575a1 Gerrit-PatchSet: 2 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Dzahn Gerrit-Reviewer: Dzahn Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: servermon: add missing package python-mysqldb
Dzahn has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/362598 ) Change subject: servermon: add missing package python-mysqldb .. servermon: add missing package python-mysqldb python-mysqldb is installed on netmon1001 and needed by servermon but wasn't puppetized here yet it seems Bug: T159756 Change-Id: I45ac9f8eb305a21a5113241da04db50d2570e31a --- M modules/servermon/manifests/init.pp 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/98/362598/1 diff --git a/modules/servermon/manifests/init.pp b/modules/servermon/manifests/init.pp index 5115487..36f7c84 100644 --- a/modules/servermon/manifests/init.pp +++ b/modules/servermon/manifests/init.pp @@ -68,6 +68,7 @@ 'python-ipy', 'gunicorn', 'python-ldap', +'python-mysqldb', ] require_package($packages) -- To view, visit https://gerrit.wikimedia.org/r/362598 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I45ac9f8eb305a21a5113241da04db50d2570e31a Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Dzahn ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: netmon1002: add librenms role
Dzahn has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/362595 )
Change subject: netmon1002: add librenms role
..
netmon1002: add librenms role
After the previous fixes, now the librenms role
works on stretch on a test instance without puppet errors.
Adding it to netmon1002 now.
Bug: 159756
Change-Id: I729ba1427ea06da2310430c94b998ca780f56475
---
M manifests/site.pp
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
jenkins-bot: Verified
Dzahn: Looks good to me, approved
diff --git a/manifests/site.pp b/manifests/site.pp
index 6a13ec1..d6083da 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1748,7 +1748,7 @@
# network monitoring tool server - replacement server (T125020)
node 'netmon1002.wikimedia.org' {
# TODO: role(librenms, servermon::wmf)
-role(network::monitor, rancid, smokeping)
+role(network::monitor, librenms, rancid, smokeping)
interface::add_ip6_mapped { 'main': }
}
--
To view, visit https://gerrit.wikimedia.org/r/362595
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I729ba1427ea06da2310430c94b998ca780f56475
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn
Gerrit-Reviewer: Dzahn
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Limit thanks for new users at pl.wikipedia to 3 per day
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/362403 ) Change subject: Limit thanks for new users at pl.wikipedia to 3 per day .. Limit thanks for new users at pl.wikipedia to 3 per day This is temporary for a month and should be re-evaluated on 2017-08-01. Bug: T169268 Change-Id: I17f130ef9f5556855ec0465b5eacc077ac518639 --- M wmf-config/InitialiseSettings.php 1 file changed, 7 insertions(+), 0 deletions(-) Approvals: Legoktm: Looks good to me, approved jenkins-bot: Verified diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index 930322d..e1a524c 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -7548,6 +7548,13 @@ 'extendedmover' => [16, 60], // T138703 ], ], + '+plwiki' => [ + // Limit to 3 per day for new users (T169268) + // Re-evaluate on 2017-08-01 + 'thanks-notification' => [ + 'newbie' => [ 3, 86400 ], + ], + ], ], # @} end of wgRateLimits -- To view, visit https://gerrit.wikimedia.org/r/362403 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I17f130ef9f5556855ec0465b5eacc077ac518639 Gerrit-PatchSet: 5 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Urbanecm Gerrit-Reviewer: Dereckson Gerrit-Reviewer: Legoktm Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: keep 22 cirrusdump logs
ArielGlenn has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/362597 ) Change subject: keep 22 cirrusdump logs .. keep 22 cirrusdump logs with weekly runs, rotate 3 won't do what we want Change-Id: Idcd2098a3709770d788ddda9f5fbed475a913e9f --- M modules/snapshot/files/cron/logrotate.cirrusdump 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: ArielGlenn: Looks good to me, approved jenkins-bot: Verified diff --git a/modules/snapshot/files/cron/logrotate.cirrusdump b/modules/snapshot/files/cron/logrotate.cirrusdump index f84ac06..2198f30 100644 --- a/modules/snapshot/files/cron/logrotate.cirrusdump +++ b/modules/snapshot/files/cron/logrotate.cirrusdump @@ -6,6 +6,6 @@ compress delaycompress missingok -rotate 3 +maxage 22 nocreate } -- To view, visit https://gerrit.wikimedia.org/r/362597 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Idcd2098a3709770d788ddda9f5fbed475a913e9f Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: ArielGlenn Gerrit-Reviewer: ArielGlenn Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...TimedMediaHandler[master]: Remove thumbnail filtering method
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/362525 )
Change subject: Remove thumbnail filtering method
..
Remove thumbnail filtering method
This was not needed since 749013d20 as thumbnails are no longer
stored alongside transcodes (the later were moved elsewhere).
Change-Id: I84527bdfead2342d13a8d746cc877ff25f953380
---
M TimedMediaHandler_body.php
1 file changed, 0 insertions(+), 16 deletions(-)
Approvals:
Krinkle: Looks good to me, approved
jenkins-bot: Verified
diff --git a/TimedMediaHandler_body.php b/TimedMediaHandler_body.php
index 110378b..8c8fd13 100644
--- a/TimedMediaHandler_body.php
+++ b/TimedMediaHandler_body.php
@@ -475,20 +475,4 @@
return $wgLang->formatTimePeriod( $this->getLength(
$file ) );
}
}
-
- public function filterThumbnailPurgeList( &$files, $options ) {
- global $wgEnabledTranscodeSet, $wgEnabledAudioTranscodeSet;
-
- $transcodeSet = array_merge( $wgEnabledTranscodeSet,
$wgEnabledAudioTranscodeSet );
-
- // dont remove derivatives on normal purge
- foreach ( array_slice( $files, 1 ) as $key => $file ) {
- foreach ( $transcodeSet as $transcodeKey ) {
- if ( preg_match( '/' . preg_quote(
$transcodeKey ) . '$/', $file ) ) {
- unset( $files[$key] );
- break;
- }
- }
- }
- }
}
--
To view, visit https://gerrit.wikimedia.org/r/362525
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I84527bdfead2342d13a8d746cc877ff25f953380
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/TimedMediaHandler
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz
Gerrit-Reviewer: Krinkle
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: keep 22 cirrusdump logs
ArielGlenn has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/362597 ) Change subject: keep 22 cirrusdump logs .. keep 22 cirrusdump logs with weekly runs, rotate 3 won't do what we want Change-Id: Idcd2098a3709770d788ddda9f5fbed475a913e9f --- M modules/snapshot/files/cron/logrotate.cirrusdump 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/97/362597/1 diff --git a/modules/snapshot/files/cron/logrotate.cirrusdump b/modules/snapshot/files/cron/logrotate.cirrusdump index f84ac06..2198f30 100644 --- a/modules/snapshot/files/cron/logrotate.cirrusdump +++ b/modules/snapshot/files/cron/logrotate.cirrusdump @@ -6,6 +6,6 @@ compress delaycompress missingok -rotate 3 +maxage 22 nocreate } -- To view, visit https://gerrit.wikimedia.org/r/362597 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Idcd2098a3709770d788ddda9f5fbed475a913e9f Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: ArielGlenn ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Wikibase[master]: Allow to include units without usage
Smalyshev has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/362596 )
Change subject: Allow to include units without usage
..
Allow to include units without usage
Bug: T168585
Change-Id: I38a9ff5720a574c2d6e7a2237641a875745e95c8
---
M repo/maintenance/updateUnits.php
1 file changed, 15 insertions(+), 6 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/96/362596/1
diff --git a/repo/maintenance/updateUnits.php b/repo/maintenance/updateUnits.php
index dfd99b1..ad9ef11 100644
--- a/repo/maintenance/updateUnits.php
+++ b/repo/maintenance/updateUnits.php
@@ -59,6 +59,7 @@
$this->addOption( 'unit-class', 'Class for units.', false, true
);
$this->addOption( 'format', 'Output format "json" (default) or
"csv".', false, true );
$this->addOption( 'sparql', 'SPARQL endpoint URL.', false, true
);
+ $this->addOption( 'check-usage', 'Check whether unit is in
use?', false );
}
public function execute() {
@@ -67,10 +68,11 @@
1 );
}
$format = $this->getOption( 'format', 'json' );
+ $checkUsage = $this->hasOption( 'check-usage' );
$repo = WikibaseRepo::getDefaultInstance();
- $endPoint =
- $this->getOption( 'sparql',
$repo->getSettings()->getSetting( 'sparqlEndpoint' ) );
+ $endPoint = $this->getOption( 'sparql',
+ $repo->getSettings()->getSetting( 'sparqlEndpoint' ) );
if ( !$endPoint ) {
$this->error( 'SPARQL endpoint not defined', 1 );
}
@@ -87,11 +89,19 @@
// Get units usage stats. We don't care about units
// That have been used less than 10 times, for now
- $unitUsage = $this->getUnitUsage( 10 );
+ if ( $checkUsage ) {
+ $unitUsage = $this->getUnitUsage( 10 );
+ } else {
+ $unitUsage = null;
+ }
$baseUnits = $this->getBaseUnits( $filter );
$convertUnits = [];
$reconvert = [];
+
+ if ( $checkUsage ) {
+ $filter .= "FILTER EXISTS { [] wikibase:quantityUnit
?unit }\n";
+ }
$convertableUnits = $this->getConvertableUnits( $filter );
foreach ( $convertableUnits as $unit ) {
@@ -191,7 +201,7 @@
* @param string[] $unit Unit data
* @param string[] $convertUnits Already converted data
* @param array[] $baseUnits Base unit list
-* @param string[] $unitUsage Unit usage data
+* @param string[|null $unitUsage Unit usage data
* @param string[] &$reconvert Array collecting units that require
re-conversion later,
* due to their target unit not being base.
* @return string[]|null Produces conversion data for the unit or null
if not possible.
@@ -223,7 +233,7 @@
}
}
- if ( !isset( $baseUnits[$unit['unit']] ) && !isset(
$unitUsage[$unit['unit']] ) ) {
+ if ( $unitUsage && !isset( $baseUnits[$unit['unit']] ) &&
!isset( $unitUsage[$unit['unit']] ) ) {
$this->error( "Low usage unit {$unit['unit']},
skipping..." );
return null;
}
@@ -328,7 +338,6 @@
bd:serviceParam wikibase:language "en" .
}
# Enable this to select only units that are actually used
- FILTER EXISTS { [] wikibase:quantityUnit ?unit }
}
QUERY;
return $this->client->query( $unitsQuery );
--
To view, visit https://gerrit.wikimedia.org/r/362596
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I38a9ff5720a574c2d6e7a2237641a875745e95c8
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Smalyshev
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: netmon1002: add librenms role
Dzahn has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/362595 )
Change subject: netmon1002: add librenms role
..
netmon1002: add librenms role
After the previous fixes, now the librenms role
works on stretch on a test instance without puppet errors.
Adding it to netmon1002 now.
Bug: 159756
Change-Id: I729ba1427ea06da2310430c94b998ca780f56475
---
M manifests/site.pp
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/95/362595/1
diff --git a/manifests/site.pp b/manifests/site.pp
index 6a13ec1..d6083da 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1748,7 +1748,7 @@
# network monitoring tool server - replacement server (T125020)
node 'netmon1002.wikimedia.org' {
# TODO: role(librenms, servermon::wmf)
-role(network::monitor, rancid, smokeping)
+role(network::monitor, librenms, rancid, smokeping)
interface::add_ip6_mapped { 'main': }
}
--
To view, visit https://gerrit.wikimedia.org/r/362595
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I729ba1427ea06da2310430c94b998ca780f56475
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...CodeMirror[master]: Fixing SVG images for buttons
Kaldari has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/362594 ) Change subject: Fixing SVG images for buttons .. Fixing SVG images for buttons Older versions of MediaWiki apparently require SVGs to begin with an XML declaration. Change-Id: I149c3b2d0ecdc4d0cdfc4f793483c5c89f35b8fb --- M resources/images/cm-icon.svg M resources/images/cm-off.svg M resources/images/cm-on.svg M resources/images/old-cm-off.svg M resources/images/old-cm-on.svg 5 files changed, 5 insertions(+), 5 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CodeMirror refs/changes/94/362594/1 diff --git a/resources/images/cm-icon.svg b/resources/images/cm-icon.svg index a79d147..b8f5eb4 100644 --- a/resources/images/cm-icon.svg +++ b/resources/images/cm-icon.svg @@ -1 +1 @@ -http://www.w3.org/2000/svg"; xmlns:xlink="http://www.w3.org/1999/xlink"; width="24" height="24" viewBox="0 0 24 24"> \ No newline at end of file +http://www.w3.org/2000/svg"; xmlns:xlink="http://www.w3.org/1999/xlink"; width="24" height="24" viewBox="0 0 24 24"> \ No newline at end of file diff --git a/resources/images/cm-off.svg b/resources/images/cm-off.svg index bb1e542..171bc93 100644 --- a/resources/images/cm-off.svg +++ b/resources/images/cm-off.svg @@ -1 +1 @@ -http://www.w3.org/2000/svg"; xmlns:xlink="http://www.w3.org/1999/xlink"; version="1" width="22" height="22"> \ No newline at end of file +http://www.w3.org/2000/svg"; xmlns:xlink="http://www.w3.org/1999/xlink"; version="1" width="22" height="22"> \ No newline at end of file diff --git a/resources/images/cm-on.svg b/resources/images/cm-on.svg index 2be553c..ac3b4c7 100644 --- a/resources/images/cm-on.svg +++ b/resources/images/cm-on.svg @@ -1 +1 @@ -http://www.w3.org/2000/svg"; xmlns:xlink="http://www.w3.org/1999/xlink"; height="22" width="22" version="1"> \ No newline at end of file +http://www.w3.org/2000/svg"; xmlns:xlink="http://www.w3.org/1999/xlink"; height="22" width="22" version="1"> \ No newline at end of file diff --git a/resources/images/old-cm-off.svg b/resources/images/old-cm-off.svg index c00972b..696f716 100644 --- a/resources/images/old-cm-off.svg +++ b/resources/images/old-cm-off.svg @@ -1 +1 @@ -http://www.w3.org/2000/svg"; xmlns:xlink="http://www.w3.org/1999/xlink"; height="22" width="23"> \ No newline at end of file +http://www.w3.org/2000/svg"; xmlns:xlink="http://www.w3.org/1999/xlink"; height="22" width="23"> \ No newline at end of file diff --git a/resources/images/old-cm-on.svg b/resources/images/old-cm-on.svg index 145109f..672eb93 100644 --- a/resources/images/old-cm-on.svg +++ b/resources/images/old-cm-on.svg @@ -1 +1 @@ -http://www.w3.org/2000/svg"; xmlns:xlink="http://www.w3.org/1999/xlink"; height="22" width="23"> \ No newline at end of file +http://www.w3.org/2000/svg"; xmlns:xlink="http://www.w3.org/1999/xlink"; height="22" width="23"> \ No newline at end of file -- To view, visit https://gerrit.wikimedia.org/r/362594 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I149c3b2d0ecdc4d0cdfc4f793483c5c89f35b8fb Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/CodeMirror Gerrit-Branch: master Gerrit-Owner: Kaldari ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: ditch dateext and just use normal rotation for cirrusdump logs
ArielGlenn has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/362383 )
Change subject: ditch dateext and just use normal rotation for cirrusdump logs
..
ditch dateext and just use normal rotation for cirrusdump logs
Bug: T162688
Change-Id: I94d5a53784b7d29e4db631d7c22ed7fd7b0ccedc
---
M modules/snapshot/files/cron/logrotate.cirrusdump
1 file changed, 1 insertion(+), 2 deletions(-)
Approvals:
ArielGlenn: Looks good to me, approved
EBernhardson: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/modules/snapshot/files/cron/logrotate.cirrusdump
b/modules/snapshot/files/cron/logrotate.cirrusdump
index 489ab34..f84ac06 100644
--- a/modules/snapshot/files/cron/logrotate.cirrusdump
+++ b/modules/snapshot/files/cron/logrotate.cirrusdump
@@ -3,10 +3,9 @@
#
/var/log/cirrusdump/*.log {
daily
-dateext
compress
delaycompress
missingok
-maxage 22
+rotate 3
nocreate
}
--
To view, visit https://gerrit.wikimedia.org/r/362383
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I94d5a53784b7d29e4db631d7c22ed7fd7b0ccedc
Gerrit-PatchSet: 4
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: ArielGlenn
Gerrit-Reviewer: ArielGlenn
Gerrit-Reviewer: EBernhardson
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: librenms: add missing Apache headers module
Dzahn has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/362591 )
Change subject: librenms: add missing Apache headers module
..
librenms: add missing Apache headers module
This wasn't puppetized in the role (but worked on netmon1001
because another role uses it too) but is needed by the Apache
site config.
Leading to " Invalid command 'RequestHeader'" and Apache not starting
when using the role by itself.
Bug:T159756
Change-Id: Id15073b2fce7157ff9233afce676344e5d7ccffc
---
M modules/librenms/manifests/web.pp
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
jenkins-bot: Verified
Dzahn: Looks good to me, approved
diff --git a/modules/librenms/manifests/web.pp
b/modules/librenms/manifests/web.pp
index 5210ecc..4df630a 100644
--- a/modules/librenms/manifests/web.pp
+++ b/modules/librenms/manifests/web.pp
@@ -10,7 +10,7 @@
}
include ::apache::mod::rewrite
-
+include ::apache::mod::headers
include ::apache::mod::ssl
$ssl_settings = ssl_ciphersuite('apache', 'mid', true)
--
To view, visit https://gerrit.wikimedia.org/r/362591
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Id15073b2fce7157ff9233afce676344e5d7ccffc
Gerrit-PatchSet: 4
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn
Gerrit-Reviewer: Dzahn
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: librenms: ensure install_dir exists
Dzahn has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/362590 )
Change subject: librenms: ensure install_dir exists
..
librenms: ensure install_dir exists
When applying role on a new instance, currently seeing:
Error: Cannot create /srv/librenms/rrd; parent directory /srv/librenms does not
exist
Ensure the install_dir exists.
The owner/group/mode emulates the existing situation on netmon1001
so that it is not changed.
Bug:T159756
Change-Id: Iacb49925ee9e797d73a8f5f5ffada0f5ecebc72d
---
M modules/librenms/manifests/init.pp
1 file changed, 7 insertions(+), 0 deletions(-)
Approvals:
jenkins-bot: Verified
Dzahn: Looks good to me, approved
diff --git a/modules/librenms/manifests/init.pp
b/modules/librenms/manifests/init.pp
index e6fd056..66ab57b 100644
--- a/modules/librenms/manifests/init.pp
+++ b/modules/librenms/manifests/init.pp
@@ -32,6 +32,13 @@
managehome => false,
}
+file { '/srv/librenms':
+ensure => 'directory',
+owner => 'root',
+group => 'root',
+mode => '0755',
+}
+
file { "${install_dir}/config.php":
ensure => present,
owner => 'www-data',
--
To view, visit https://gerrit.wikimedia.org/r/362590
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iacb49925ee9e797d73a8f5f5ffada0f5ecebc72d
Gerrit-PatchSet: 5
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn
Gerrit-Reviewer: Dzahn
Gerrit-Reviewer: Paladox
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...codesniffer[master]: Sniff that the short type form is used in @return tags
Legoktm has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/362593 )
Change subject: Sniff that the short type form is used in @return tags
..
Sniff that the short type form is used in @return tags
Require that we use "int" and "bool" instead of their longer forms in
@return tags.
Bug: T145162
Change-Id: I2aa3ba28c11a85e688e2478135703ec08e1a5aae
---
M MediaWiki/Sniffs/Commenting/FunctionCommentSniff.php
M MediaWiki/Tests/files/Commenting/commenting_function.php
M MediaWiki/Tests/files/Commenting/commenting_function.php.expect
M MediaWiki/Tests/files/Commenting/commenting_function.php.fixed
M MediaWiki/Tests/files/generic_pass.php
5 files changed, 87 insertions(+), 5 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/tools/codesniffer
refs/changes/93/362593/1
diff --git a/MediaWiki/Sniffs/Commenting/FunctionCommentSniff.php
b/MediaWiki/Sniffs/Commenting/FunctionCommentSniff.php
index 8ae12c6..4d5865f 100644
--- a/MediaWiki/Sniffs/Commenting/FunctionCommentSniff.php
+++ b/MediaWiki/Sniffs/Commenting/FunctionCommentSniff.php
@@ -191,11 +191,38 @@
}
}
if ( $return !== null ) {
- $content = $tokens[( $return + 2 )]['content'];
- if ( empty( $content ) === true || $tokens[( $return +
2 )]['code'] !== T_DOC_COMMENT_STRING ) {
+ $retType = $return + 2;
+ $content = $tokens[$retType]['content'];
+ if ( empty( $content ) === true ||
$tokens[$retType]['code'] !== T_DOC_COMMENT_STRING ) {
$error = 'Return type missing for @return tag
in function comment';
$phpcsFile->addError( $error, $return,
'MissingReturnType' );
}
+ // The first word of the return type is the actual type
+ $exploded = explode( ' ', $content, 2 );
+ $first = $exploded[0];
+ if ( $first === 'boolean' ) {
+ $fix = $phpcsFile->addFixableError(
+ 'Short type of "bool" should be used
for @return tag',
+ $retType,
+ 'NotShortBoolReturn'
+ );
+ if ( $fix === true ) {
+ $phpcsFile->fixer->replaceToken(
+ $retType, 'bool ' . $exploded[1]
+ );
+ }
+ } elseif ( $first === 'integer' ) {
+ $fix = $phpcsFile->addFixableError(
+ 'Short type of "int" should be used for
@return tag',
+ $retType,
+ 'NotShortIntReturn'
+ );
+ if ( $fix === true ) {
+ $phpcsFile->fixer->replaceToken(
+ $retType, 'int ' . $exploded[1]
+ );
+ }
+ }
} else {
$error = 'Missing @return tag in function comment';
$phpcsFile->addError( $error,
$tokens[$commentStart]['comment_closer'], 'MissingReturn' );
diff --git a/MediaWiki/Tests/files/Commenting/commenting_function.php
b/MediaWiki/Tests/files/Commenting/commenting_function.php
index b532104..535b616 100644
--- a/MediaWiki/Tests/files/Commenting/commenting_function.php
+++ b/MediaWiki/Tests/files/Commenting/commenting_function.php
@@ -26,6 +26,22 @@
public function testSingleSpaces( $testVar, $t ) {
return $testVar;
}
+
+ /**
+* @param boolean $aBool A bool
+* @param integer $anInt An int
+* @return boolean And some text
+*/
+ public function testLongTypes( $aBool, $anInt ) {
+ return $aBool;
+ }
+
+ /**
+* @return integer More text
+*/
+ public function testIntReturn() {
+ return 0;
+ }
}
class TestPassedExamples {
@@ -74,6 +90,15 @@
public function __toString() {
return 'no documentation because obvious';
}
+
+ /**
+* @param bool $aBool A bool
+* @param int $anInt An int
+* @return bool
+*/
+ public function testLongTypes( $aBool, $anInt ) {
+ return $aBool;
+ }
}
class TestSimpleConstructor {
diff --git a/MediaWiki/Tests/files/Commenting/commenting_function.php.expect
b/MediaWiki/Tests/files/Commenting/commenting_function.php.expect
in
[MediaWiki-commits] [Gerrit] mediawiki...codesniffer[master]: Clean up DbrQueryUsageSniff
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/362423 )
Change subject: Clean up DbrQueryUsageSniff
..
Clean up DbrQueryUsageSniff
It is enough to register the main token needed for trigger of the sniff.
The variable and string before and after can be found without
registration.
Change-Id: I38127d3daf9ee111623a21a731d6e88f62d3e06d
---
M MediaWiki/Sniffs/Usage/DbrQueryUsageSniff.php
1 file changed, 11 insertions(+), 17 deletions(-)
Approvals:
Legoktm: Looks good to me, approved
jenkins-bot: Verified
diff --git a/MediaWiki/Sniffs/Usage/DbrQueryUsageSniff.php
b/MediaWiki/Sniffs/Usage/DbrQueryUsageSniff.php
index 3ba5374..d512777 100644
--- a/MediaWiki/Sniffs/Usage/DbrQueryUsageSniff.php
+++ b/MediaWiki/Sniffs/Usage/DbrQueryUsageSniff.php
@@ -15,11 +15,7 @@
* @return array
*/
public function register() {
- return [
- T_VARIABLE,
- T_OBJECT_OPERATOR,
- T_STRING
- ];
+ return [ T_OBJECT_OPERATOR ];
}
/**
@@ -29,20 +25,18 @@
*/
public function process( File $phpcsFile, $stackPtr ) {
$tokens = $phpcsFile->getTokens();
- $currToken = $tokens[$stackPtr];
- if ( $currToken['code'] === T_OBJECT_OPERATOR ) {
- $dbrPtr = $phpcsFile->findPrevious( T_VARIABLE,
$stackPtr );
- $methodPtr = $phpcsFile->findNext( T_STRING, $stackPtr
);
+ $dbrPtr = $phpcsFile->findPrevious( T_VARIABLE, $stackPtr );
+ $methodPtr = $phpcsFile->findNext( T_STRING, $stackPtr );
- if ( $tokens[$dbrPtr]['content'] === '$dbr'
- && $tokens[$methodPtr]['content'] === 'query' )
{
- $phpcsFile->addWarning(
- 'Call $dbr->select() wrapper instead of
$dbr->query()',
- $stackPtr,
- 'DbrQueryFound'
- );
- }
+ if ( $tokens[$dbrPtr]['content'] === '$dbr'
+ && $tokens[$methodPtr]['content'] === 'query'
+ ) {
+ $phpcsFile->addWarning(
+ 'Call $dbr->select() wrapper instead of
$dbr->query()',
+ $stackPtr,
+ 'DbrQueryFound'
+ );
}
}
}
--
To view, visit https://gerrit.wikimedia.org/r/362423
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I38127d3daf9ee111623a21a731d6e88f62d3e06d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/tools/codesniffer
Gerrit-Branch: master
Gerrit-Owner: Umherirrender
Gerrit-Reviewer: Legoktm
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: RCFilters: Trim spaces in saved query names
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/362436 )
Change subject: RCFilters: Trim spaces in saved query names
..
RCFilters: Trim spaces in saved query names
Make sure to trim the spaces before saving, and also to verify that
names that contain spaces-only are considered empty.
Also make sure that the same behavior is working when saved queries
are edited - but since the save query button may be disabled, make
sure that any blur event on the input gets us out of the edit mode
either after save or without saving (if the string is invalid)
Bug: T169273
Change-Id: I16da9fcde0bf6be2b854243d7facc80d2860e458
---
M
resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.SaveFiltersPopupButtonWidget.js
M
resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.SavedLinksListItemWidget.js
2 files changed, 38 insertions(+), 20 deletions(-)
Approvals:
Catrope: Looks good to me, approved
jenkins-bot: Verified
diff --git
a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.SaveFiltersPopupButtonWidget.js
b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.SaveFiltersPopupButtonWidget.js
index 62f7aee..dfb188d 100644
---
a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.SaveFiltersPopupButtonWidget.js
+++
b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.SaveFiltersPopupButtonWidget.js
@@ -105,6 +105,8 @@
* @param {string} value Input value
*/
mw.rcfilters.ui.SaveFiltersPopupButtonWidget.prototype.onInputChange =
function ( value ) {
+ value = value.trim();
+
this.applyButton.setDisabled( !value );
};
@@ -146,7 +148,7 @@
* Apply and add the new quick link
*/
mw.rcfilters.ui.SaveFiltersPopupButtonWidget.prototype.apply = function
() {
- var label = this.input.getValue();
+ var label = this.input.getValue().trim();
// This condition is more for sanity-check, since the
// apply button should be disabled if the label is empty
diff --git
a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.SavedLinksListItemWidget.js
b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.SavedLinksListItemWidget.js
index 7ce9b6a..b6b20ee 100644
---
a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.SavedLinksListItemWidget.js
+++
b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.SavedLinksListItemWidget.js
@@ -81,8 +81,11 @@
this.menu.connect( this, {
choose: 'onMenuChoose'
} );
- this.saveButton.connect( this, { click: 'onSaveButtonClick' } );
- this.editInput.connect( this, { enter: 'onEditInputEnter' } );
+ this.saveButton.connect( this, { click: 'save' } );
+ this.editInput.connect( this, {
+ change: 'onInputChange',
+ enter: 'save'
+ } );
this.editInput.$input.on( {
blur: this.onInputBlur.bind( this ),
keyup: this.onInputKeyup.bind( this )
@@ -205,22 +208,6 @@
};
/**
-* Respond to save button click
-*/
- mw.rcfilters.ui.SavedLinksListItemWidget.prototype.onSaveButtonClick =
function () {
- this.emit( 'edit', this.editInput.getValue() );
- this.toggleEdit( false );
- };
-
- /**
-* Respond to input enter event
-*/
- mw.rcfilters.ui.SavedLinksListItemWidget.prototype.onEditInputEnter =
function () {
- this.emit( 'edit', this.editInput.getValue() );
- this.toggleEdit( false );
- };
-
- /**
* Respond to input keyup event, this is the way to intercept 'escape'
key
*
* @param {jQuery.Event} e Event data
@@ -239,11 +226,40 @@
* Respond to blur event on the input
*/
mw.rcfilters.ui.SavedLinksListItemWidget.prototype.onInputBlur =
function () {
- this.emit( 'edit', this.editInput.getValue() );
+ this.save();
+
+ // Whether the save succeeded or not, the input-blur event
+ // means we need to cancel editing mode
this.toggleEdit( false );
};
/**
+* Respond to input change event
+*
+* @param {string} value Input value
+*/
+ mw.rcfilters.ui.SavedLinksListItemWidget.prototype.onInputChange =
function ( value ) {
+ value = value.trim();
+
+ this.saveButton.setDisabled( !value );
+ };
+
+ /**
+* Save the name of the query
+*
+* @param {string} [value] The value to save
+* @fires edit
+*/
+ mw.rcfilters.ui.SavedLinksListItemWidget.prototype.save = function () {
+ var value = this.editInput.get
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: RCFilters: Change tooltip messages for view buttons
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/362318 )
Change subject: RCFilters: Change tooltip messages for view buttons
..
RCFilters: Change tooltip messages for view buttons
Bug: T167384
Change-Id: I30ec6b8931539ccaad8d2d1a609d117f2a13767d
---
M languages/i18n/en.json
M languages/i18n/qqq.json
M resources/Resources.php
M resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterMenuHeaderWidget.js
M
resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterTagMultiselectWidget.js
5 files changed, 12 insertions(+), 3 deletions(-)
Approvals:
Catrope: Looks good to me, approved
jenkins-bot: Verified
diff --git a/languages/i18n/en.json b/languages/i18n/en.json
index 966439b..606203b 100644
--- a/languages/i18n/en.json
+++ b/languages/i18n/en.json
@@ -1443,6 +1443,9 @@
"rcfilters-tag-prefix-namespace-inverted": ":not $1",
"rcfilters-tag-prefix-tags": "#$1",
"rcfilters-view-tags": "Tagged edits",
+ "rcfilters-view-namespaces-tooltip": "Filter results by namespace",
+ "rcfilters-view-tags-tooltip": "Filter results using edit tags",
+ "rcfilters-view-return-to-default-tooltip": "Return to main filter
menu",
"rcnotefrom": "Below {{PLURAL:$5|is the change|are the changes}} since
$3, $4 (up to $1 shown).",
"rclistfromreset": "Reset date selection",
"rclistfrom": "Show new changes starting from $2, $3",
diff --git a/languages/i18n/qqq.json b/languages/i18n/qqq.json
index d03da1f..d4f5285 100644
--- a/languages/i18n/qqq.json
+++ b/languages/i18n/qqq.json
@@ -1633,6 +1633,9 @@
"rcfilters-tag-prefix-namespace-inverted": "Prefix for the namespace
inverted tags in [[Special:RecentChanges]]. Namespace tags use a colon (:) as
prefix. Please keep this format.\n\nParameters:\n* $1 - Filter name.",
"rcfilters-tag-prefix-tags": "Prefix for the edit tags in
[[Special:RecentChanges]]. Edit tags use a hash (#) as prefix. Please keep this
format.\n\nParameters:\n* $1 - Tag display name.",
"rcfilters-view-tags": "Title for the tags view in
[[Special:RecentChanges]]\n{{Identical|Tag}}",
+ "rcfilters-view-namespaces-tooltip": "Tooltip for the button that loads
the namespace view in [[Special:RecentChanges]]",
+ "rcfilters-view-tags-tooltip": "Tooltip for the button that loads the
tags view in [[Special:RecentChanges]]",
+ "rcfilters-view-return-to-default-tooltip": "Tooltip for the button
that returns to the default filter view in [[Special:RecentChanges]]",
"rcnotefrom": "This message is displayed at [[Special:RecentChanges]]
when viewing recentchanges from some specific time.\n\nThe corresponding
message is {{msg-mw|Rclistfrom}}.\n\nParameters:\n* $1 - the maximum number of
changes that are displayed\n* $2 - (Optional) a date and time\n* $3 - a date\n*
$4 - a time\n* $5 - Number of changes are displayed, for use with PLURAL",
"rclistfromreset": "Used on [[Special:RecentChanges]] to reset a
selection of a certain date range.",
"rclistfrom": "Used on [[Special:RecentChanges]]. Parameters:\n* $1 -
(Currently not use) date and time. The date and the time adds to the rclistfrom
description.\n* $2 - time. The time adds to the rclistfrom link description
(with split of date and time).\n* $3 - date. The date adds to the rclistfrom
link description (with split of date and time).\n\nThe corresponding message is
{{msg-mw|Rcnotefrom}}.",
diff --git a/resources/Resources.php b/resources/Resources.php
index ccfe970..5b44f7b 100644
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -1851,6 +1851,9 @@
'rcfilters-tag-prefix-namespace-inverted',
'rcfilters-tag-prefix-tags',
'rcfilters-view-tags',
+ 'rcfilters-view-namespaces-tooltip',
+ 'rcfilters-view-tags-tooltip',
+ 'rcfilters-view-return-to-default-tooltip',
'blanknamespace',
'namespaces',
'invert',
diff --git
a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterMenuHeaderWidget.js
b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterMenuHeaderWidget.js
index 0138884..d0ad8d5 100644
---
a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterMenuHeaderWidget.js
+++
b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterMenuHeaderWidget.js
@@ -29,7 +29,7 @@
this.backButton = new OO.ui.ButtonWidget( {
icon: 'previous',
framed: false,
- title: mw.msg( 'rcfilters-filterlist-title' ),
+ title: mw.msg(
'rcfilters-view-return-to-default-tooltip' ),
classes: [
'mw-rcfilters-ui-filterMenuHeaderWidget-backButton' ]
} );
[MediaWiki-commits] [Gerrit] operations/puppet[production]: cleanup the dump list commands template syntax
ArielGlenn has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/355151 ) Change subject: cleanup the dump list commands template syntax .. cleanup the dump list commands template syntax use some elsifs for a change, makes everything more readable Change-Id: I40d1bc9fefee7c0ed94a05ed9e85e665afae7572 --- M modules/snapshot/templates/dumps/dumpstages.erb 1 file changed, 9 insertions(+), 23 deletions(-) Approvals: ArielGlenn: Looks good to me, approved jenkins-bot: Verified diff --git a/modules/snapshot/templates/dumps/dumpstages.erb b/modules/snapshot/templates/dumps/dumpstages.erb index 73c2a02..3ac262f 100644 --- a/modules/snapshot/templates/dumps/dumpstages.erb +++ b/modules/snapshot/templates/dumps/dumpstages.erb @@ -10,19 +10,13 @@ <% if @stagestype == 'create_enwiki' %> # mark the start of the run for enwiki 1 1 continue none <%= @stages['enwiki']['firststage'] -%> --job createdirs --sleep 5 -<% end -%> - -<% if @stagestype == 'create_wikidatawiki' %> +<% elsif @stagestype == 'create_wikidatawiki' %> # mark the start of the run for wikidatawiki 1 1 continue none <%= @stages['wikidatawiki']['firststage'] -%> --job createdirs --sleep 5 -<% end -%> - -<% if @stagestype == 'create_small' %> +<% elsif @stagestype == 'create_small' %> # mark the start of the run for all small wikis 1 8 continue none <%= @stages['smallwikis']['firststage'] -%> --job createdirs --sleep 5 -<% end -%> - -<% if @stagestype == 'create_big' %> +<% elsif @stagestype == 'create_big' %> # mark the start of the run for all big wikis 1 8 continue none <%= @stages['bigwikis']['firststage'] %> --job createdirs --sleep 5 <% end -%> @@ -47,19 +41,16 @@ 1 max continue none <%= @stages['smallwikis']['rest'] -%> --job metacurrentdump # articles, recombine plus meta pages for big wikis 4 max continue none <%= @stages['bigwikis']['rest'] -%> --job metacurrentdump,metacurrentdumprecombine +<% end -%> <% if @stagestype == 'full' %> # all remaining jobs 1 max continue none <%= @stages['smallwikis']['rest'] %> 4 max continue none <%= @stages['bigwikis']['rest'] %> -<% end -%> - -<% if @stagestype == 'partial' %> +<% elsif @stagestype == 'partial' %> # all remaining jobs except for the history revs 1 max continue none <%= @stages['smallwikis']['rest'] %> <%= @stages['skipjob_args'] %> 4 max continue none <%= @stages['bigwikis']['rest'] %> <%= @stages['skipjob_args'] %> -<% end -%> - <% end -%> <% if @stagestype == 'full_enwiki' or @stagestype == 'partial_enwiki' %> @@ -73,17 +64,14 @@ # articles plus meta pages 27 1 continue none <%= @stages['enwiki']['rest'] -%> --job metacurrentdump,metacurrentdumprecombine +<% end -%> <% if @stagestype == 'full_enwiki' %> # all remaining jobs 27 1 continue none <%= @stages['enwiki']['rest'] %> -<% end -%> - -<% if @stagestype == 'partial_enwiki' %> +<% elsif @stagestype == 'partial_enwiki' %> # all remaining jobs except for the history revs 27 1 continue none <%= @stages['enwiki']['rest'] %> <%= @stages['skipjob_args'] %> -<% end -%> - <% end -%> <% if @stagestype == 'full_wikidatawiki' or @stagestype == 'partial_wikidatawiki' %> @@ -97,15 +85,13 @@ # articles plus meta pages 27 1 continue none <%= @stages['wikidatawiki']['rest'] -%> --job metacurrentdump,metacurrentdumprecombine +<% end -%> <% if @stagestype == 'full_wikidatawiki' %> # all remaining jobs 27 1 continue none <%= @stages['wikidatawiki']['rest'] %> -<% end -%> - -<% if @stagestype == 'partial_wikidatawiki' %> +<% elsif @stagestype == 'partial_wikidatawiki' %> # all remaining jobs except for the history revs 27 1 continue none <%= @stages['wikidatawiki']['rest'] %> <%= @stages['skipjob_args'] %> <% end -%> -<% end -%> -- To view, visit https://gerrit.wikimedia.org/r/355151 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I40d1bc9fefee7c0ed94a05ed9e85e665afae7572 Gerrit-PatchSet: 2 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: ArielGlenn Gerrit-Reviewer: ArielGlenn Gerrit-Reviewer: Giuseppe Lavagetto Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Set wgCategoryCollation to 'numeric' at he.wikisource
MarcoAurelio has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/362592 ) Change subject: Set wgCategoryCollation to 'numeric' at he.wikisource .. Set wgCategoryCollation to 'numeric' at he.wikisource Bug: T168321 Change-Id: Ib25d63aca9b3e7a178d3e28e7de6f2d60612f7fa --- M wmf-config/InitialiseSettings.php 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/92/362592/1 diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index 930322d..9e6e7dd 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -14776,6 +14776,7 @@ 'gdwiki' => 'uca-default', // T125315 'glwiki' => 'uca-gl-u-kn', // T149002 'hewiki' => 'numeric', // T146675 + 'hewikisource' => 'numeric', // T168321 'hrwiki' => 'uca-hr-u-kn', // T148749, T148682 'hsbwiki' => 'uca-hsb', // T90689 'huwiki' => 'uca-hu-u-kn', // T47596, T146675 -- To view, visit https://gerrit.wikimedia.org/r/362592 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib25d63aca9b3e7a178d3e28e7de6f2d60612f7fa Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: MarcoAurelio ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Allow search suggestions in skins operating in mobile mode
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/362534 ) Change subject: Allow search suggestions in skins operating in mobile mode .. Allow search suggestions in skins operating in mobile mode MobileFrontend silently removes this skin from the page. This is now made explicit and the module can be safely loaded in a mobile environment. This is used by both Timeless which although does not work perfectly on a mobile device it should be easy to fix with additional work. Change-Id: Iedea2872d14430db452cec7e758f20d854778414 Depends-On: Ic36e9792f9217f3fd37bbd1f5c66d894301363f0 --- M resources/Resources.php 1 file changed, 3 insertions(+), 0 deletions(-) Approvals: Krinkle: Looks good to me, approved jenkins-bot: Verified diff --git a/resources/Resources.php b/resources/Resources.php index dc05387..317181f 100644 --- a/resources/Resources.php +++ b/resources/Resources.php @@ -238,6 +238,7 @@ 'scripts' => 'resources/lib/jquery/jquery.fullscreen.js', ], 'jquery.getAttrs' => [ + 'targets' => [ 'desktop', 'mobile' ], 'scripts' => 'resources/src/jquery/jquery.getAttrs.js', 'targets' => [ 'desktop', 'mobile' ], ], @@ -325,6 +326,7 @@ 'scripts' => 'resources/lib/jquery/jquery.jStorage.js', ], 'jquery.suggestions' => [ + 'targets' => [ 'desktop', 'mobile' ], 'scripts' => 'resources/src/jquery/jquery.suggestions.js', 'styles' => 'resources/src/jquery/jquery.suggestions.css', 'dependencies' => 'jquery.highlightText', @@ -1182,6 +1184,7 @@ 'styles' => 'resources/src/mediawiki/mediawiki.pager.tablePager.less', ], 'mediawiki.searchSuggest' => [ + 'targets' => [ 'desktop', 'mobile' ], 'scripts' => 'resources/src/mediawiki/mediawiki.searchSuggest.js', 'styles' => 'resources/src/mediawiki/mediawiki.searchSuggest.css', 'messages' => [ -- To view, visit https://gerrit.wikimedia.org/r/362534 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iedea2872d14430db452cec7e758f20d854778414 Gerrit-PatchSet: 3 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Jdlrobson Gerrit-Reviewer: Bartosz Dziewoński Gerrit-Reviewer: Isarra Gerrit-Reviewer: Krinkle Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...MobileFrontend[master]: Wipe out default skin search modules
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/362526 ) Change subject: Wipe out default skin search modules .. Wipe out default skin search modules Otherwise jquery.suggestions will be loaded but the code not used. Change-Id: Ic36e9792f9217f3fd37bbd1f5c66d894301363f0 --- M includes/skins/SkinMinerva.php 1 file changed, 2 insertions(+), 0 deletions(-) Approvals: Krinkle: Looks good to me, approved jenkins-bot: Verified diff --git a/includes/skins/SkinMinerva.php b/includes/skins/SkinMinerva.php index 1a3e728..a7f8738 100644 --- a/includes/skins/SkinMinerva.php +++ b/includes/skins/SkinMinerva.php @@ -1308,6 +1308,8 @@ $modules['content'] = []; // dequeue default watch module (not needed, no watchstar in this skin) $modules['watch'] = []; + // disable default skin search modules + $modules['search'] = []; $modules['minerva'] = array_merge( $this->getContextSpecificModules(), -- To view, visit https://gerrit.wikimedia.org/r/362526 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ic36e9792f9217f3fd37bbd1f5c66d894301363f0 Gerrit-PatchSet: 4 Gerrit-Project: mediawiki/extensions/MobileFrontend Gerrit-Branch: master Gerrit-Owner: Jdlrobson Gerrit-Reviewer: Krinkle Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...MobileFrontend[master]: Simplify and document SkinMinerva::getDefaultModules()
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/362471 )
Change subject: Simplify and document SkinMinerva::getDefaultModules()
..
Simplify and document SkinMinerva::getDefaultModules()
* Put the two core-resets together and improve their comments
(loading watch.js wouldn't leak a watchstar, it's just an optimisation
to not load unused code).
* The keys in this array are mainly for core to communicate with skins,
and (in case of Minerva) for the skin to communicate with extensions
through the 'SkinMinervaDefaultModules' hook. These keys are otherwise
entirely arbitrary and ignored.
At the moment, extensions only try to change 'toggling' (in Flow).
Merge the other ones into 'minerva'.
* Flow also tries to unset 'talk', and Wikibase tries to unset 'editor',
but those keys don't exist (anymore).
Cleaned up in I6f247ea43 and I1e37571e29d.
Change-Id: I39a86aafecc42b22d817bb475eedae7f79fee799
---
M includes/skins/SkinMinerva.php
1 file changed, 12 insertions(+), 11 deletions(-)
Approvals:
jenkins-bot: Verified
Jdlrobson: Looks good to me, approved
diff --git a/includes/skins/SkinMinerva.php b/includes/skins/SkinMinerva.php
index beebfa5..1a3e728 100644
--- a/includes/skins/SkinMinerva.php
+++ b/includes/skins/SkinMinerva.php
@@ -1304,26 +1304,27 @@
*/
public function getDefaultModules() {
$modules = parent::getDefaultModules();
- // flush unnecessary modules
+ // dequeue default content modules (toc, sortable, collapsible,
etc.)
$modules['content'] = [];
-
- $modules['top'] = 'skins.minerva.scripts.top';
- // Define all the modules that should load on the mobile site
and their dependencies.
- // Do not add mobules here.
- $modules['stable'] = 'skins.minerva.scripts';
-
- // Doing this unconditionally, prevents the desktop watchstar
from ever leaking into mobile view.
+ // dequeue default watch module (not needed, no watchstar in
this skin)
$modules['watch'] = [];
- $modules['context'] = $this->getContextSpecificModules();
+ $modules['minerva'] = array_merge(
+ $this->getContextSpecificModules(),
+ [
+ 'skins.minerva.scripts.top',
+ 'skins.minerva.scripts',
+ 'mobile.site',
+ ]
+ );
if ( $this->getSkinOption( self::OPTION_TOGGLING ) ) {
+ // Extension can unload "toggling" modules via the hook
$modules['toggling'] = [ 'skins.minerva.toggling' ];
}
- $modules['site'] = 'mobile.site';
- // FIXME: Upstream?
Hooks::run( 'SkinMinervaDefaultModules', [ $this, &$modules ] );
+
return $modules;
}
--
To view, visit https://gerrit.wikimedia.org/r/362471
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I39a86aafecc42b22d817bb475eedae7f79fee799
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Krinkle
Gerrit-Reviewer: Jdlrobson
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: librenms: add missing Apache headers module
Dzahn has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/362591 )
Change subject: librenms: add missing Apache headers module
..
librenms: add missing Apache headers module
This wasn't puppetized in the role (but worked on netmon1001
because another role uses it too) but is needed by the Apache
site config.
Leading to " Invalid command 'RequestHeader'" and Apache not starting
when using the role by itself.
Change-Id: Id15073b2fce7157ff9233afce676344e5d7ccffc
---
M modules/librenms/manifests/web.pp
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/91/362591/1
diff --git a/modules/librenms/manifests/web.pp
b/modules/librenms/manifests/web.pp
index 5210ecc..4df630a 100644
--- a/modules/librenms/manifests/web.pp
+++ b/modules/librenms/manifests/web.pp
@@ -10,7 +10,7 @@
}
include ::apache::mod::rewrite
-
+include ::apache::mod::headers
include ::apache::mod::ssl
$ssl_settings = ssl_ciphersuite('apache', 'mid', true)
--
To view, visit https://gerrit.wikimedia.org/r/362591
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Id15073b2fce7157ff9233afce676344e5d7ccffc
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: improve names of dump command lists
ArielGlenn has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/355149 )
Change subject: improve names of dump command lists
..
improve names of dump command lists
since "nocreate" is redundant now, lose that in the name
since we run either partial or full runs, change "normal" to
"full" everywhere
Change-Id: I75bfc42c0d86f60ae0585a88fec9aa863d848e71
---
M modules/snapshot/manifests/dumps/stagesconf.pp
M modules/snapshot/manifests/dumps/stagesconfig.pp
M modules/snapshot/templates/dumps/dumpstages.erb
M modules/snapshot/templates/dumps/fulldumps.sh.erb
4 files changed, 28 insertions(+), 28 deletions(-)
Approvals:
ArielGlenn: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/snapshot/manifests/dumps/stagesconf.pp
b/modules/snapshot/manifests/dumps/stagesconf.pp
index 4e869bf..48b7ae5 100644
--- a/modules/snapshot/manifests/dumps/stagesconf.pp
+++ b/modules/snapshot/manifests/dumps/stagesconf.pp
@@ -1,5 +1,5 @@
define snapshot::dumps::stagesconf(
-$stagestype = 'normal_nocreate',
+$stagestype = 'full',
$stages = undef,
) {
diff --git a/modules/snapshot/manifests/dumps/stagesconfig.pp
b/modules/snapshot/manifests/dumps/stagesconfig.pp
index aca5254..9052faa 100644
--- a/modules/snapshot/manifests/dumps/stagesconfig.pp
+++ b/modules/snapshot/manifests/dumps/stagesconfig.pp
@@ -37,28 +37,28 @@
skipjob_args => "--skipjobs ${jobs_to_skip}",
}
-snapshot::dumps::stagesconf { 'stages_normal_nocreate':
-stagestype => 'normal_nocreate',
+snapshot::dumps::stagesconf { 'stages_full':
+stagestype => 'full',
stages => $stages,
}
-snapshot::dumps::stagesconf { 'stages_partial_nocreate':
-stagestype => 'partial_nocreate',
+snapshot::dumps::stagesconf { 'stages_partial':
+stagestype => 'partial',
stages => $stages,
}
-snapshot::dumps::stagesconf { 'stages_normal_nocreate_enwiki':
-stagestype => 'normal_nocreate_enwiki',
+snapshot::dumps::stagesconf { 'stages_full_enwiki':
+stagestype => 'full_enwiki',
stages => $stages,
}
-snapshot::dumps::stagesconf { 'stages_partial_nocreate_enwiki':
-stagestype => 'partial_nocreate_enwiki',
+snapshot::dumps::stagesconf { 'stages_partial_enwiki':
+stagestype => 'partial_enwiki',
stages => $stages,
}
-snapshot::dumps::stagesconf { 'stages_normal_nocreate_wikidatawiki':
-stagestype => 'normal_nocreate_wikidatawiki',
+snapshot::dumps::stagesconf { 'stages_full_wikidatawiki':
+stagestype => 'full_wikidatawiki',
stages => $stages,
}
-snapshot::dumps::stagesconf { 'stages_partial_nocreate_wikidatawiki':
-stagestype => 'partial_nocreate_wikidatawiki',
+snapshot::dumps::stagesconf { 'stages_partial_wikidatawiki':
+stagestype => 'partial_wikidatawiki',
stages => $stages,
}
snapshot::dumps::stagesconf { 'stages_create_smallwikis':
diff --git a/modules/snapshot/templates/dumps/dumpstages.erb
b/modules/snapshot/templates/dumps/dumpstages.erb
index 7ae5626..73c2a02 100644
--- a/modules/snapshot/templates/dumps/dumpstages.erb
+++ b/modules/snapshot/templates/dumps/dumpstages.erb
@@ -27,7 +27,7 @@
1 8 continue none <%= @stages['bigwikis']['firststage'] %> --job createdirs
--sleep 5
<% end -%>
-<% if @stagestype == 'normal_nocreate' or @stagestype == 'partial_nocreate' %>
+<% if @stagestype == 'full' or @stagestype == 'partial' %>
# stubs and then tables so inconsistencies between stubs and tables aren't too
huge
1 max continue none <%= @stages['smallwikis']['rest'] -%> --job xmlstubsdump;
<%= @stages['smallwikis']['rest'] %> --job tables
# stubs, recombines, tables for big wikis
@@ -48,13 +48,13 @@
# articles, recombine plus meta pages for big wikis
4 max continue none <%= @stages['bigwikis']['rest'] -%> --job
metacurrentdump,metacurrentdumprecombine
-<% if @stagestype == 'normal_nocreate' %>
+<% if @stagestype == 'full' %>
# all remaining jobs
1 max continue none <%= @stages['smallwikis']['rest'] %>
4 max continue none <%= @stages['bigwikis']['rest'] %>
<% end -%>
-<% if @stagestype == 'partial_nocreate' %>
+<% if @stagestype == 'partial' %>
# all remaining jobs except for the history revs
1 max continue none <%= @stages['smallwikis']['rest'] %> <%=
@stages['skipjob_args'] %>
4 max continue none <%= @stages['bigwikis']['rest'] %> <%=
@stages['skipjob_args'] %>
@@ -62,7 +62,7 @@
<% end -%>
-<% if @stagestype == 'normal_nocreate_enwiki' or @stagestype ==
'partial_nocreate_enwiki' %>
+<% if @stagestype == 'full_enwiki' or @stagestype == 'partial_enwiki' %>
# stubs, stubs recombine
27 1 continue none <%= @stages['enwiki']['rest'] -%> --job
xmlstubsdump,xmlstubsdumprecombine
# tables next so inconsistencies between stubs and tables aren't too huge
@@ -7
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: resourceloader: Allow mobile target by default on SkinModule
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/362459 )
Change subject: resourceloader: Allow mobile target by default on SkinModule
..
resourceloader: Allow mobile target by default on SkinModule
If a skin is using this class, it's likely to be pretty new.
The targets system was mostly created for older code.
Let's make this the default so skins don't need to do anything
additional to work on mobile.
This simple change makes the Timeless skin work on mobile
when MobileFrontend is installed: ?useformat=mobile&useskin=timeless
It looks beautiful :)
Change-Id: I2ab8a1a634bdc0b5b2084d227c7388b5382e93e8
---
M includes/resourceloader/ResourceLoaderSkinModule.php
1 file changed, 4 insertions(+), 0 deletions(-)
Approvals:
Krinkle: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/resourceloader/ResourceLoaderSkinModule.php
b/includes/resourceloader/ResourceLoaderSkinModule.php
index 5740925..1967a95 100644
--- a/includes/resourceloader/ResourceLoaderSkinModule.php
+++ b/includes/resourceloader/ResourceLoaderSkinModule.php
@@ -22,6 +22,10 @@
*/
class ResourceLoaderSkinModule extends ResourceLoaderFileModule {
+ /**
+* All skins are assumed to be compatible with mobile
+*/
+ public $targets = [ 'desktop', 'mobile' ];
/**
* @param ResourceLoaderContext $context
--
To view, visit https://gerrit.wikimedia.org/r/362459
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I2ab8a1a634bdc0b5b2084d227c7388b5382e93e8
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson
Gerrit-Reviewer: Bartosz Dziewoński
Gerrit-Reviewer: Isarra
Gerrit-Reviewer: Krinkle
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: librenms: ensure install_dir exists, add it as required reso...
Dzahn has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/362590 )
Change subject: librenms: ensure install_dir exists, add it as required resource
..
librenms: ensure install_dir exists, add it as required resource
When applying role on a new instance, currently seeing:
Error: Cannot create /srv/librenms/rrd; parent directory /srv/librenms does not
exist
Ensure the install_dir exists, add it as a required resource
for config and rrd dir.
Change-Id: Iacb49925ee9e797d73a8f5f5ffada0f5ecebc72d
---
M modules/librenms/manifests/init.pp
1 file changed, 9 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/90/362590/1
diff --git a/modules/librenms/manifests/init.pp
b/modules/librenms/manifests/init.pp
index e6fd056..c237c89 100644
--- a/modules/librenms/manifests/init.pp
+++ b/modules/librenms/manifests/init.pp
@@ -32,13 +32,20 @@
managehome => false,
}
+file { $install_dir:
+ensure => 'directory',
+owner => 'root',
+group => 'root',
+mode => '0755',
+}
+
file { "${install_dir}/config.php":
ensure => present,
owner => 'www-data',
group => 'librenms',
mode=> '0440',
content => template('librenms/config.php.erb'),
-require => Group['librenms'],
+require => [Group['librenms'], File[$install_dir]]
}
file { $rrd_dir:
@@ -46,7 +53,7 @@
mode=> '0775',
owner => 'www-data',
group => 'librenms',
-require => Group['librenms'],
+require => [Group['librenms'], File[$install_dir]]
}
logrotate::conf { 'librenms':
--
To view, visit https://gerrit.wikimedia.org/r/362590
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iacb49925ee9e797d73a8f5f5ffada0f5ecebc72d
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: remove some unused dump command lists
ArielGlenn has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/355148 )
Change subject: remove some unused dump command lists
..
remove some unused dump command lists
we always do the dump directory creations separate from running
the actual dumps, remove all command lists that lump those
together
additionally remove the command list that lumps all directory
creations together, we always split them up by wiki type
Change-Id: I11be74f6d159303a05c6a6a6cb3a3d4b00309a67
---
M modules/snapshot/manifests/dumps/stagesconf.pp
M modules/snapshot/manifests/dumps/stagesconfig.pp
M modules/snapshot/templates/dumps/dumpstages.erb
3 files changed, 12 insertions(+), 45 deletions(-)
Approvals:
ArielGlenn: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/snapshot/manifests/dumps/stagesconf.pp
b/modules/snapshot/manifests/dumps/stagesconf.pp
index d53587c..4e869bf 100644
--- a/modules/snapshot/manifests/dumps/stagesconf.pp
+++ b/modules/snapshot/manifests/dumps/stagesconf.pp
@@ -1,5 +1,5 @@
define snapshot::dumps::stagesconf(
-$stagestype = 'normal',
+$stagestype = 'normal_nocreate',
$stages = undef,
) {
diff --git a/modules/snapshot/manifests/dumps/stagesconfig.pp
b/modules/snapshot/manifests/dumps/stagesconfig.pp
index cb9f10b..aca5254 100644
--- a/modules/snapshot/manifests/dumps/stagesconfig.pp
+++ b/modules/snapshot/manifests/dumps/stagesconfig.pp
@@ -37,28 +37,12 @@
skipjob_args => "--skipjobs ${jobs_to_skip}",
}
-snapshot::dumps::stagesconf { 'stages_normal':
-stagestype => 'normal',
-stages => $stages,
-}
-snapshot::dumps::stagesconf { 'stages_partial':
-stagestype => 'partial',
-stages => $stages,
-}
snapshot::dumps::stagesconf { 'stages_normal_nocreate':
stagestype => 'normal_nocreate',
stages => $stages,
}
snapshot::dumps::stagesconf { 'stages_partial_nocreate':
stagestype => 'partial_nocreate',
-stages => $stages,
-}
-snapshot::dumps::stagesconf { 'stages_normal_enwiki':
-stagestype => 'normal_enwiki',
-stages => $stages,
-}
-snapshot::dumps::stagesconf { 'stages_partial_enwiki':
-stagestype => 'partial_enwiki',
stages => $stages,
}
snapshot::dumps::stagesconf { 'stages_normal_nocreate_enwiki':
@@ -69,24 +53,12 @@
stagestype => 'partial_nocreate_enwiki',
stages => $stages,
}
-snapshot::dumps::stagesconf { 'stages_normal_wikidatawiki':
-stagestype => 'normal_wikidatawiki',
-stages => $stages,
-}
-snapshot::dumps::stagesconf { 'stages_partial_wikidatawiki':
-stagestype => 'partial_wikidatawiki',
-stages => $stages,
-}
snapshot::dumps::stagesconf { 'stages_normal_nocreate_wikidatawiki':
stagestype => 'normal_nocreate_wikidatawiki',
stages => $stages,
}
snapshot::dumps::stagesconf { 'stages_partial_nocreate_wikidatawiki':
stagestype => 'partial_nocreate_wikidatawiki',
-stages => $stages,
-}
-snapshot::dumps::stagesconf { 'stages_create':
-stagestype => 'create',
stages => $stages,
}
snapshot::dumps::stagesconf { 'stages_create_smallwikis':
diff --git a/modules/snapshot/templates/dumps/dumpstages.erb
b/modules/snapshot/templates/dumps/dumpstages.erb
index d8d9e0c..7ae5626 100644
--- a/modules/snapshot/templates/dumps/dumpstages.erb
+++ b/modules/snapshot/templates/dumps/dumpstages.erb
@@ -7,19 +7,14 @@
# slots_used numcommands on_failure error_notify command
-<% if @stagestype == 'normal_enwiki' or @stagestype == 'partial_enwiki' or
@stagestype == 'create_enwiki' %>
+<% if @stagestype == 'create_enwiki' %>
# mark the start of the run for enwiki
1 1 continue none <%= @stages['enwiki']['firststage'] -%> --job createdirs
--sleep 5
<% end -%>
-<% if @stagestype == 'normal_wikidatawiki' or @stagestype ==
'partial_wikidatawiki' or @stagestype == 'create_wikidatawiki' %>
+<% if @stagestype == 'create_wikidatawiki' %>
# mark the start of the run for wikidatawiki
1 1 continue none <%= @stages['wikidatawiki']['firststage'] -%> --job
createdirs --sleep 5
-<% end -%>
-
-<% if @stagestype == 'normal' or @stagestype == 'partial' or @stagestype ==
'create' %>
-# mark the start of the run for all small, big wikis
-1 8 continue none <%= @stages['smallwikis']['firststage'] -%> --job createdirs
--sleep 5; <%= @stages['bigwikis']['firststage'] %> --job createdirs --sleep 5
<% end -%>
<% if @stagestype == 'create_small' %>
@@ -32,7 +27,7 @@
1 8 continue none <%= @stages['bigwikis']['firststage'] %> --job createdirs
--sleep 5
<% end -%>
-<% if @stagestype == 'normal' or @stagestype == 'partial' or @stagestype ==
'normal_nocreate' or @stagestype == 'partial_nocreate' %>
+<% if @stagestyp
[MediaWiki-commits] [Gerrit] operations/puppet[production]: Set up grafana dashboard monitoring for services
GWicke has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/362567 )
Change subject: Set up grafana dashboard monitoring for services
..
Set up grafana dashboard monitoring for services
Based on
https://github.com/wikimedia/puppet/commit/401973ab7f79fd4567749fe074ccce1d47446581.
Bug: T162765
Change-Id: I5738b379be523341ed5f3aedca1b237ba4ca63cf
---
A modules/icinga/manifests/monitor/services.pp
M modules/role/manifests/icinga.pp
2 files changed, 21 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/67/362567/1
diff --git a/modules/icinga/manifests/monitor/services.pp
b/modules/icinga/manifests/monitor/services.pp
new file mode 100644
index 000..af36181
--- /dev/null
+++ b/modules/icinga/manifests/monitor/services.pp
@@ -0,0 +1,20 @@
+# == Class: icinga::monitor::performance
+#
+# Monitor Performance
+class icinga::monitor::services {
+monitoring::grafana_alert { 'db/restbase':
+contact_group => 'team-services',
+}
+
+monitoring::grafana_alert { 'db/api-summary':
+contact_group => 'team-services',
+}
+
+monitoring::grafana_alert { 'db/services-alerts':
+contact_group => 'team-services',
+}
+
+monitoring::grafana_alert { 'db/eventbus':
+contact_group => 'team-services',
+}
+}
diff --git a/modules/role/manifests/icinga.pp b/modules/role/manifests/icinga.pp
index ead3a61..c87a027 100644
--- a/modules/role/manifests/icinga.pp
+++ b/modules/role/manifests/icinga.pp
@@ -22,6 +22,7 @@
include icinga::monitor::elasticsearch
include icinga::monitor::wdqs
include icinga::monitor::performance
+include icinga::monitor::services
include icinga::monitor::reading_web
include icinga::event_handlers::raid
--
To view, visit https://gerrit.wikimedia.org/r/362567
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I5738b379be523341ed5f3aedca1b237ba4ca63cf
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: GWicke
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Popups[master]: POC: Hack user preferences and trigger event on user prefs save
Pmiazga has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/362557 )
Change subject: POC: Hack user preferences and trigger event on user prefs save
..
POC: Hack user preferences and trigger event on user prefs save
Currently there is no possibility to detect changes on user
preferences save. This is a possible solution to log disabled|enabled
events on user preferences save.
Additionally we do not have possibility to retrieve all data for
the event like sessionToken, pageToken, previewCountBucket, etc.
Bug: T167365
Change-Id: I33947619fa03b2c6fa550c01981e1c4840df7b54
---
M extension.json
M includes/PopupsContext.php
A includes/UserPreferencesHook.php
3 files changed, 73 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Popups
refs/changes/57/362557/1
diff --git a/extension.json b/extension.json
index 61da6ee..11e543f 100644
--- a/extension.json
+++ b/extension.json
@@ -10,6 +10,7 @@
"type": "betafeatures",
"AutoloadClasses": {
"Popups\\PopupsHooks": "includes/PopupsHooks.php",
+ "Popups\\UserPreferencesHook":
"includes/UserPreferencesHook.php",
"Popups\\PopupsContext": "includes/PopupsContext.php",
"Popups\\PopupsGadgetsIntegration":
"includes/PopupsGadgetsIntegration.php"
},
@@ -27,7 +28,11 @@
"Popups\\PopupsHooks::onResourceLoaderGetConfigVars"
],
"GetPreferences": [
- "Popups\\PopupsHooks::onGetPreferences"
+ "Popups\\PopupsHooks::onGetPreferences",
+ "Popups\\UserPreferencesHook::onGetPreferences"
+ ],
+ "UserSaveSettings": [
+ "Popups\\UserPreferencesHook::onUserSaveSettings"
],
"UserGetDefaultOptions": [
"Popups\\PopupsHooks::onUserGetDefaultOptions"
diff --git a/includes/PopupsContext.php b/includes/PopupsContext.php
index c712bcd..69b50be 100644
--- a/includes/PopupsContext.php
+++ b/includes/PopupsContext.php
@@ -173,6 +173,20 @@
return $areMet;
}
+
+ public function logUserChangeOptionsEvent( $isEnabled ) {
+ $config = $this->getConfig();
+ $event = [
+ 'action' => $isEnabled == self::PREVIEWS_ENABLED ?
'enabled' : 'disabled',
+ 'isAnon' => false,
+ 'popupEnabled' => $isEnabled
+ ];
+ \EventLogging::logEvent(
+ 'event.Popups',
+ $config->get( 'EventLoggingSchemas' ),
+ $event
+ );
+ }
/**
* Get module logger
*
diff --git a/includes/UserPreferencesHook.php b/includes/UserPreferencesHook.php
new file mode 100644
index 000..1219e35
--- /dev/null
+++ b/includes/UserPreferencesHook.php
@@ -0,0 +1,53 @@
+http://www.gnu.org/licenses/>.
+ *
+ * @file
+ * @ingroup extensions
+ */
+namespace Popups;
+
+use User;
+use ExtensionRegistry;
+
+/**
+ * Hooks definitions for Popups extension
+ *
+ * @package Popups
+ */
+class UserPreferencesHook {
+ private static $oldState;
+
+ private static function getOptionValue( User $user ) {
+ return $user->getOption(
PopupsContext::PREVIEWS_OPTIN_PREFERENCE_NAME );
+ }
+
+ public static function onGetPreferences( User $user, array &$prefs ) {
+ self::$oldState = self::getOptionValue( $user );
+ }
+
+ public static function onUserSaveSettings( User $user ) {
+ if ( !ExtensionRegistry::getInstance()->isLoaded(
'EventLogging' ) ) {
+ return;
+ }
+ $newState = self::getOptionValue( $user );
+ if ( self::$oldState == PopupsContext::PREVIEWS_ENABLED
+&& $newState == PopupsContext::PREVIEWS_DISABLED ) {
+
PopupsContext::getInstance()->logUserChangeOptionsEvent( $newState );
+ }
+ }
+
+}
--
To view, visit https://gerrit.wikimedia.org/r/362557
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I33947619fa03b2c6fa550c01981e1c4840df7b54
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Popups
Gerrit-Branch: master
Gerrit-Owner: Pmiazga
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: librenms: move php5-ldap package to others, fix for stretch
Dzahn has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/362528 )
Change subject: librenms: move php5-ldap package to others, fix for stretch
..
librenms: move php5-ldap package to others, fix for stretch
Bug:T159756
Change-Id: I654a8ed4eb2503dbdb8edaa7fb09dc5c75f2d5d9
---
M modules/librenms/manifests/init.pp
M modules/role/manifests/librenms.pp
2 files changed, 2 insertions(+), 4 deletions(-)
Approvals:
Paladox: Looks good to me, but someone else must approve
jenkins-bot: Verified
Dzahn: Looks good to me, approved
diff --git a/modules/librenms/manifests/init.pp
b/modules/librenms/manifests/init.pp
index 9d313e3..e6fd056 100644
--- a/modules/librenms/manifests/init.pp
+++ b/modules/librenms/manifests/init.pp
@@ -63,6 +63,7 @@
'php-mcrypt',
'php-mysql',
'php-snmp',
+'php-ldap',
]:
ensure => present,
}
@@ -76,6 +77,7 @@
'php5-mcrypt',
'php5-mysql',
'php5-snmp',
+'php5-ldap',
'php-net-ipv4',
]:
ensure => present,
diff --git a/modules/role/manifests/librenms.pp
b/modules/role/manifests/librenms.pp
index 890f612..d394d20 100644
--- a/modules/role/manifests/librenms.pp
+++ b/modules/role/manifests/librenms.pp
@@ -15,10 +15,6 @@
before => Class['::librenms'],
}
-package { 'php5-ldap':
-ensure => present,
-}
-
$config = {
'title_image' =>
'//upload.wikimedia.org/wikipedia/commons/thumb/0/0c/Wikimedia_Foundation_logo_-_horizontal_%282012-2016%29.svg/140px-Wikimedia_Foundation_logo_-_horizontal_%282012-2016%29.svg.png',
--
To view, visit https://gerrit.wikimedia.org/r/362528
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I654a8ed4eb2503dbdb8edaa7fb09dc5c75f2d5d9
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn
Gerrit-Reviewer: Dzahn
Gerrit-Reviewer: Paladox
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Allow search suggestions in skins operating in mobile mode
Jdlrobson has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/362534 ) Change subject: Allow search suggestions in skins operating in mobile mode .. Allow search suggestions in skins operating in mobile mode MobileFrontend silently removes this skin from the page. This is now made explicit and the module can be safely loaded in a mobile environment. This is used by both Timeless which although does not work perfectly on a mobile device it should be easy to fix with additional work. Change-Id: Iedea2872d14430db452cec7e758f20d854778414 Depends-On: Ic36e9792f9217f3fd37bbd1f5c66d894301363f0 --- M resources/Resources.php 1 file changed, 4 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/34/362534/1 diff --git a/resources/Resources.php b/resources/Resources.php index dc05387..7c03307 100644 --- a/resources/Resources.php +++ b/resources/Resources.php @@ -238,6 +238,7 @@ 'scripts' => 'resources/lib/jquery/jquery.fullscreen.js', ], 'jquery.getAttrs' => [ + 'targets' => [ 'desktop', 'mobile' ], 'scripts' => 'resources/src/jquery/jquery.getAttrs.js', 'targets' => [ 'desktop', 'mobile' ], ], @@ -325,6 +326,7 @@ 'scripts' => 'resources/lib/jquery/jquery.jStorage.js', ], 'jquery.suggestions' => [ + 'targets' => [ 'desktop', 'mobile' ], 'scripts' => 'resources/src/jquery/jquery.suggestions.js', 'styles' => 'resources/src/jquery/jquery.suggestions.css', 'dependencies' => 'jquery.highlightText', @@ -496,6 +498,7 @@ 'group' => 'jquery.ui', ], 'jquery.ui.dialog' => [ + 'targets' => [ 'desktop', 'mobile' ], 'scripts' => 'resources/lib/jquery.ui/jquery.ui.dialog.js', 'dependencies' => [ 'jquery.ui.core', @@ -1182,6 +1185,7 @@ 'styles' => 'resources/src/mediawiki/mediawiki.pager.tablePager.less', ], 'mediawiki.searchSuggest' => [ + 'targets' => [ 'desktop', 'mobile' ], 'scripts' => 'resources/src/mediawiki/mediawiki.searchSuggest.js', 'styles' => 'resources/src/mediawiki/mediawiki.searchSuggest.css', 'messages' => [ -- To view, visit https://gerrit.wikimedia.org/r/362534 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iedea2872d14430db452cec7e758f20d854778414 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Jdlrobson ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: librenms: move php5-ldap package to others, fix for stretch
Dzahn has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/362528 )
Change subject: librenms: move php5-ldap package to others, fix for stretch
..
librenms: move php5-ldap package to others, fix for stretch
Change-Id: I654a8ed4eb2503dbdb8edaa7fb09dc5c75f2d5d9
---
M modules/librenms/manifests/init.pp
M modules/role/manifests/librenms.pp
2 files changed, 2 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/28/362528/1
diff --git a/modules/librenms/manifests/init.pp
b/modules/librenms/manifests/init.pp
index 9d313e3..e6fd056 100644
--- a/modules/librenms/manifests/init.pp
+++ b/modules/librenms/manifests/init.pp
@@ -63,6 +63,7 @@
'php-mcrypt',
'php-mysql',
'php-snmp',
+'php-ldap',
]:
ensure => present,
}
@@ -76,6 +77,7 @@
'php5-mcrypt',
'php5-mysql',
'php5-snmp',
+'php5-ldap',
'php-net-ipv4',
]:
ensure => present,
diff --git a/modules/role/manifests/librenms.pp
b/modules/role/manifests/librenms.pp
index 890f612..d394d20 100644
--- a/modules/role/manifests/librenms.pp
+++ b/modules/role/manifests/librenms.pp
@@ -15,10 +15,6 @@
before => Class['::librenms'],
}
-package { 'php5-ldap':
-ensure => present,
-}
-
$config = {
'title_image' =>
'//upload.wikimedia.org/wikipedia/commons/thumb/0/0c/Wikimedia_Foundation_logo_-_horizontal_%282012-2016%29.svg/140px-Wikimedia_Foundation_logo_-_horizontal_%282012-2016%29.svg.png',
--
To view, visit https://gerrit.wikimedia.org/r/362528
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I654a8ed4eb2503dbdb8edaa7fb09dc5c75f2d5d9
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...MobileFrontend[master]: Wipe out default skin search modules
Jdlrobson has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/362526 ) Change subject: Wipe out default skin search modules .. Wipe out default skin search modules Otherwise jquery.suggestions will be loaded but the code not used. Change-Id: Ic36e9792f9217f3fd37bbd1f5c66d894301363f0 --- M includes/skins/SkinMinerva.php 1 file changed, 3 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend refs/changes/26/362526/1 diff --git a/includes/skins/SkinMinerva.php b/includes/skins/SkinMinerva.php index beebfa5..7b60391 100644 --- a/includes/skins/SkinMinerva.php +++ b/includes/skins/SkinMinerva.php @@ -1322,6 +1322,9 @@ } $modules['site'] = 'mobile.site'; + // Disable the default skin search modules + $modules['search'] = []; + // FIXME: Upstream? Hooks::run( 'SkinMinervaDefaultModules', [ $this, &$modules ] ); return $modules; -- To view, visit https://gerrit.wikimedia.org/r/362526 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic36e9792f9217f3fd37bbd1f5c66d894301363f0 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/MobileFrontend Gerrit-Branch: master Gerrit-Owner: Jdlrobson ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...TimedMediaHandler[master]: Remove thumbnail filtering method
Aaron Schulz has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/362525 )
Change subject: Remove thumbnail filtering method
..
Remove thumbnail filtering method
This was not needed since 749013d20 as thumbnails are no longer
stored alongside transcodes (the later were moved elsewhere).
Change-Id: I84527bdfead2342d13a8d746cc877ff25f953380
---
M TimedMediaHandler_body.php
1 file changed, 0 insertions(+), 16 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/TimedMediaHandler
refs/changes/25/362525/1
diff --git a/TimedMediaHandler_body.php b/TimedMediaHandler_body.php
index 110378b..8c8fd13 100644
--- a/TimedMediaHandler_body.php
+++ b/TimedMediaHandler_body.php
@@ -475,20 +475,4 @@
return $wgLang->formatTimePeriod( $this->getLength(
$file ) );
}
}
-
- public function filterThumbnailPurgeList( &$files, $options ) {
- global $wgEnabledTranscodeSet, $wgEnabledAudioTranscodeSet;
-
- $transcodeSet = array_merge( $wgEnabledTranscodeSet,
$wgEnabledAudioTranscodeSet );
-
- // dont remove derivatives on normal purge
- foreach ( array_slice( $files, 1 ) as $key => $file ) {
- foreach ( $transcodeSet as $transcodeKey ) {
- if ( preg_match( '/' . preg_quote(
$transcodeKey ) . '$/', $file ) ) {
- unset( $files[$key] );
- break;
- }
- }
- }
- }
}
--
To view, visit https://gerrit.wikimedia.org/r/362525
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I84527bdfead2342d13a8d746cc877ff25f953380
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/TimedMediaHandler
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...MinervaNeue[master]: Avoid using Minerva name until it has been removed from Mobi...
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/362513 )
Change subject: Avoid using Minerva name until it has been removed from
MobileFrontend
..
Avoid using Minerva name until it has been removed from MobileFrontend
Without this desktop Minerva will throw a fatal exception.
This will be remedied later.
Change-Id: Iaa15dbb3180de95a7a79a5cac3909c9f0b98843b
---
M skin.json
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
jenkins-bot: Verified
Jdlrobson: Looks good to me, approved
diff --git a/skin.json b/skin.json
index 64a8a45..cdb5421 100644
--- a/skin.json
+++ b/skin.json
@@ -18,7 +18,7 @@
},
"ResourceModules": {},
"ValidSkinNames": {
- "minerva": "Minerva"
+ "minerva-neue": "MinervaNeue"
},
"author": [],
"config": {},
--
To view, visit https://gerrit.wikimedia.org/r/362513
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iaa15dbb3180de95a7a79a5cac3909c9f0b98843b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/MinervaNeue
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson
Gerrit-Reviewer: Jdlrobson
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...MinervaNeue[master]: Add migration script
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/356633 )
Change subject: Add migration script
..
Add migration script
Bug: T166744
Change-Id: I6466a72bc32916a7e3092b24e61961f8d422ed88
---
A scripts/README.txt
A scripts/migrate.py
2 files changed, 241 insertions(+), 0 deletions(-)
Approvals:
jenkins-bot: Verified
Jdlrobson: Looks good to me, approved
diff --git a/scripts/README.txt b/scripts/README.txt
new file mode 100644
index 000..04a844b
--- /dev/null
+++ b/scripts/README.txt
@@ -0,0 +1,6 @@
+Porting Minerva code from MobileFrontend to Minerva:
+* Make sure this repository is in your MediaWiki skins directory
+* Make sure MobileFrontend is installed in extensions/MobileFrontend in your
MediaWiki install
+* Create commits for both MobileFrontend and Minerva to handle the move.
+* Run:
+ > python3 scripts/migrate.python
diff --git a/scripts/migrate.py b/scripts/migrate.py
new file mode 100644
index 000..ca017f8
--- /dev/null
+++ b/scripts/migrate.py
@@ -0,0 +1,235 @@
+mfdir = '../../extensions/MobileFrontend'
+
+import json, shutil, os, subprocess, time
+from collections import OrderedDict
+import sys
+
+DRY_RUN = False
+f = open(mfdir +'/extension.json', 'r')
+mfExtensionData = json.load(f, object_pairs_hook=OrderedDict)
+f.close()
+f = open('skin.json', 'r')
+minervaSkinData = json.load(f, object_pairs_hook=OrderedDict)
+f.close()
+
+messages = [ 'mobile-frontend-placeholder', 'skinname-minerva',
+ 'mobile-frontend-talk-back-to-userpage',
+ 'mobile-frontend-talk-back-to-projectpage',
+ 'mobile-frontend-talk-back-to-filepage',
+ 'mobile-frontend-talk-back-to-page',
+ 'mobile-frontend-editor-edit',
+ 'mobile-frontend-user-newmessages',
+ 'mobile-frontend-main-menu-contributions',
+ 'mobile-frontend-main-menu-watchlist',
+ 'mobile-frontend-main-menu-settings',
+ 'mobile-frontend-home-button',
+ 'mobile-frontend-random-button',
+ 'mobile-frontend-main-menu-nearby',
+ 'mobile-frontend-main-menu-logout',
+ 'mobile-frontend-main-menu-login',
+ 'mobile-frontend-history',
+ 'mobile-frontend-user-page-member-since',
+ 'mobile-frontend-main-menu-button-tooltip',
+ 'mobile-frontend-language-article-heading',
+ 'mobile-frontend-pageaction-edit-tooltip',
+ 'mobile-frontend-language-article-heading',
+ 'mobile-frontend-user-page-talk',
+ 'mobile-frontend-user-page-contributions',
+ 'mobile-frontend-user-page-uploads'
+]
+
+def reset():
+# Do cleanup in preparation for patchsets it will make.
+subprocess.call(["git clean -fd"], shell=True)
+subprocess.call(["git stash && git clean -fd"], shell=True, cwd=mfdir)
+if not DRY_RUN:
+subprocess.call(["rm -rf includes && rm -rf resources && rm -rf
minerva.less && rm -rf i18n && rm -rf skinStyles && rm -rf tests/qunit && rm
-rf tests/phpunit"], shell=True)
+subprocess.call(["mkdir includes && mkdir includes/skins && mkdir
includes/models && mkdir resources && mkdir minerva.less && mkdir i18n && mkdir
skinStyles && mkdir tests/qunit && mkdir
tests/qunit/skins.minerva.notifications.badge && mkdir tests/phpunit/ && mkdir
tests/phpunit/skins"], shell=True)
+time.sleep(1)
+
+def saveJSON(path, data, sort_keys = False):
+if not DRY_RUN:
+with open(path, 'w') as outfile:
+json.dump(data, outfile, indent = "\t", ensure_ascii=False,
separators=(',', ': '), sort_keys=sort_keys)
+
+def clean( keys_to_remove, data_key ):
+# Remove the keys we added from MobileFrontend extension.json
+for key in keys_to_remove:
+try:
+del mfExtensionData[data_key][key]
+except KeyError:
+pass
+
+def steal_files_in_directory(dir):
+if not DRY_RUN:
+# steal templates etc from MobileFrontend
+for root, dirs, files in os.walk(mfdir + '/' + dir):
+for file in files:
+steal(root + '/' + file)
+
+def steal( path ):
+dest = path.replace(mfdir + '/', '' )
+origin = mfdir + '/' + path
+print('\tstealing %s from %s'%(dest, origin))
+try:
+if not DRY_RUN:
+shutil.move( origin, dest )
+except ( FileNotFoundError, shutil.Error ) as e:
+print (e)
+# probably done in initial steal steps
+pass
+
+def copy( path ):
+if not DRY_RUN:
+print('copying %s'%path)
+try:
+# ../ because we are in scripts folder
+shutil.copy( mfdir + '/' + path, path )
+except ( FileNotFoundError, shutil.Error ) as e:
+print (e)
+# probably done in initial steal steps
+pass
+
+def isOwnedByMinerva(key, value=""):
+return key.startswith("Minerva") or key.endswith("Minerva") or
key.startswith( 'skins.minerva' ) or \
+( type(value) == type('string') and "skins/" in value )
+
+# modulename, ResourceModules
+def migrateResourceModuleSkinStyles():
+mf = {}
+minerva
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Make file purging also purge old versions
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/362199 )
Change subject: Make file purging also purge old versions
..
Make file purging also purge old versions
Also fixes purging for repos with sha1 thumb URLs.
Bug: T169198
Change-Id: Ibb98ecce83d690cc46769644038b54e37aea0b0d
---
M includes/filerepo/file/LocalFile.php
M includes/page/WikiFilePage.php
2 files changed, 22 insertions(+), 6 deletions(-)
Approvals:
Krinkle: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/filerepo/file/LocalFile.php
b/includes/filerepo/file/LocalFile.php
index a412250..f71e1dc 100644
--- a/includes/filerepo/file/LocalFile.php
+++ b/includes/filerepo/file/LocalFile.php
@@ -1032,9 +1032,15 @@
$purgeList = [];
foreach ( $files as $file ) {
- # Check that the base file name is part of the thumb
name
+ if ( $this->repo->supportsSha1URLs() ) {
+ $reference = $this->getSha1();
+ } else {
+ $reference = $this->getName();
+ }
+
+ # Check that the reference (filename or sha1) is part
of the thumb name
# This is a basic sanity check to avoid erasing
unrelated directories
- if ( strpos( $file, $this->getName() ) !== false
+ if ( strpos( $file, $reference ) !== false
|| strpos( $file, "-thumbnail" ) !== false //
"short" thumb name
) {
$purgeList[] = "{$dir}/{$file}";
diff --git a/includes/page/WikiFilePage.php b/includes/page/WikiFilePage.php
index 66fadf5..972a397 100644
--- a/includes/page/WikiFilePage.php
+++ b/includes/page/WikiFilePage.php
@@ -170,21 +170,31 @@
*/
public function doPurge() {
$this->loadFile();
+
if ( $this->mFile->exists() ) {
wfDebug( 'ImagePage::doPurge purging ' .
$this->mFile->getName() . "\n" );
DeferredUpdates::addUpdate( new HTMLCacheUpdate(
$this->mTitle, 'imagelinks' ) );
- $this->mFile->purgeCache( [ 'forThumbRefresh' => true ]
);
} else {
wfDebug( 'ImagePage::doPurge no image for '
. $this->mFile->getName() . "; limiting purge
to cache only\n" );
- // even if the file supposedly doesn't exist, force any
cached information
- // to be updated (in case the cached information is
wrong)
- $this->mFile->purgeCache( [ 'forThumbRefresh' => true ]
);
}
+
+ // even if the file supposedly doesn't exist, force any cached
information
+ // to be updated (in case the cached information is wrong)
+
+ // Purge current version and its thumbnails
+ $this->mFile->purgeCache( [ 'forThumbRefresh' => true ] );
+
+ // Purge the old versions and their thumbnails
+ foreach ( $this->mFile->getHistory() as $oldFile ) {
+ $oldFile->purgeCache( [ 'forThumbRefresh' => true ] );
+ }
+
if ( $this->mRepo ) {
// Purge redirect cache
$this->mRepo->invalidateImageRedirect( $this->mTitle );
}
+
return parent::doPurge();
}
--
To view, visit https://gerrit.wikimedia.org/r/362199
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ibb98ecce83d690cc46769644038b54e37aea0b0d
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Gilles
Gerrit-Reviewer: Aaron Schulz
Gerrit-Reviewer: Filippo Giunchedi
Gerrit-Reviewer: Gilles
Gerrit-Reviewer: Krinkle
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...MinervaNeue[master]: Avoid using Minerva name until it has been removed from Mobi...
Jdlrobson has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/362513 )
Change subject: Avoid using Minerva name until it has been removed from
MobileFrontend
..
Avoid using Minerva name until it has been removed from MobileFrontend
Without this desktop Minerva will throw a fatal exception.
This will be remedied later.
Change-Id: Iaa15dbb3180de95a7a79a5cac3909c9f0b98843b
---
M skin.json
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/MinervaNeue
refs/changes/13/362513/1
diff --git a/skin.json b/skin.json
index 64a8a45..cdb5421 100644
--- a/skin.json
+++ b/skin.json
@@ -18,7 +18,7 @@
},
"ResourceModules": {},
"ValidSkinNames": {
- "minerva": "Minerva"
+ "minerva-neue": "MinervaNeue"
},
"author": [],
"config": {},
--
To view, visit https://gerrit.wikimedia.org/r/362513
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iaa15dbb3180de95a7a79a5cac3909c9f0b98843b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/MinervaNeue
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Add "H" as wgNamespaceAlias to NS_HELP for en.wikisource
MarcoAurelio has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/362508 ) Change subject: Add "H" as wgNamespaceAlias to NS_HELP for en.wikisource .. Add "H" as wgNamespaceAlias to NS_HELP for en.wikisource Bug: T167563 Change-Id: Ib3f4ba895ec7035779a9007395fa13bf082bb2a9 --- M wmf-config/InitialiseSettings.php 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/08/362508/1 diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index 930322d..ce5e3a3 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -3276,6 +3276,7 @@ '+enwikisource' => [ 'WS' => NS_PROJECT, // T44853 'WT' => NS_PROJECT_TALK, // T44853 + 'H' => NS_HELP, // T167563 ], '+enwikiversity' => [ 'WV' => NS_PROJECT, -- To view, visit https://gerrit.wikimedia.org/r/362508 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib3f4ba895ec7035779a9007395fa13bf082bb2a9 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: MarcoAurelio ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: treat wikidata just like enwiki for dumps
ArielGlenn has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/355100 )
Change subject: treat wikidata just like enwiki for dumps
..
treat wikidata just like enwiki for dumps
these config changes give it more parallel jobs and start it first
on its dedicated host during a dump run, just like the enwiki dump
set up the abstract dumps to run in batches like the stubs dumps,
and lower the number a little, so we are nicer to the servers too
Change-Id: I2026489388fdeb3483a3ea21ca4c21e5c20f0185
---
M hieradata/hosts/snapshot1005.yaml
M hieradata/hosts/snapshot1006.yaml
M modules/snapshot/manifests/dumps/configs.pp
M modules/snapshot/manifests/dumps/dblists.pp
M modules/snapshot/manifests/dumps/stagesconfig.pp
M modules/snapshot/templates/dumps/dumpstages.erb
M modules/snapshot/templates/dumps/fulldumps.sh.erb
7 files changed, 169 insertions(+), 63 deletions(-)
Approvals:
ArielGlenn: Looks good to me, approved
jenkins-bot: Verified
diff --git a/hieradata/hosts/snapshot1005.yaml
b/hieradata/hosts/snapshot1005.yaml
index 7370ec6..44bb8a2 100644
--- a/hieradata/hosts/snapshot1005.yaml
+++ b/hieradata/hosts/snapshot1005.yaml
@@ -1,4 +1,4 @@
-snapshot::dumps::runtype: hugewikis
+snapshot::dumps::runtype: enwiki
snapshot::dumps::maxjobs: 28
snapshot::dumps::monitor: false
snapshot::cron::misc: false
diff --git a/hieradata/hosts/snapshot1006.yaml
b/hieradata/hosts/snapshot1006.yaml
index 6027c4f..fa17665 100644
--- a/hieradata/hosts/snapshot1006.yaml
+++ b/hieradata/hosts/snapshot1006.yaml
@@ -1,4 +1,4 @@
-snapshot::dumps::runtype: regular
+snapshot::dumps::runtype: wikidatawiki
snapshot::dumps::maxjobs: 28
snapshot::dumps::monitor: false
snapshot::cron::misc: false
diff --git a/modules/snapshot/manifests/dumps/configs.pp
b/modules/snapshot/manifests/dumps/configs.pp
index afd4ee5..a6ffb47 100644
--- a/modules/snapshot/manifests/dumps/configs.pp
+++ b/modules/snapshot/manifests/dumps/configs.pp
@@ -8,6 +8,9 @@
$enchunkhistory1 =
'30303,58141,112065,152180,212624,327599,375779,522388,545343,710090,880349,1113575,1157158,1547206'
$enchunkhistory2 =
'1773248,2021218,2153807,2427469,2634193,2467421,2705827,2895677,3679790,3449365,4114387,4596259,6533612'
+$wikidatachunkhistory1 =
'235321,350222,430401,531179,581039,600373,762298,826545,947305,1076978,1098243,993874,1418919,2399950'
+$wikidatachunkhistory2 =
'2587436,951696,942913,837759,1568292,1293747,2018593,1461235,1797642,1487121,2012246,874850,1486799'
+
$config = {
smallwikis => {
dblist=> "${apachedir}/dblists/all.dblist",
@@ -83,15 +86,6 @@
chunksForAbstract => '4',
checkpointTime=> '720',
},
-wikidatawiki => {
-pagesPerChunkHistory => '2421529,4883997,8784997,8199134',
-pagesPerChunkAbstract => '580',
-chunksForAbstract => '4',
-checkpointTime=> '720',
-orderrevs => '1',
-minpages => '10',
-maxrevs => '2',
-},
zhwiki => {
pagesPerChunkHistory => '231819,564192,1300322,3112369',
pagesPerChunkAbstract => '130',
@@ -104,8 +98,30 @@
},
},
},
-hugewikis => {
-dblist => "${dblistsdir}/hugewikis.dblist",
+wikidatawiki => {
+dblist => "${dblistsdir}/wikidatawiki.dblist",
+skipdblist => "${dblistsdir}/skipnone.dblist",
+keep => '7',
+chunksEnabled=> '1',
+recombineHistory => '0',
+checkpointTime => '720',
+revsPerJob => '150',
+retryWait=> '30',
+maxRetries => '3',
+revsMargin => '100',
+wikis => {
+wikidatawiki => {
+jobsperbatch => 'xmlstubsdump=9,abstractsdump=9',
+pagesPerChunkHistory =>
"${wikidatachunkhistory1},${$wikidatachunkhistory2}",
+chunksForAbstract => 27,
+orderrevs => '1',
+minpages => '10',
+maxrevs => '2',
+},
+},
+},
+enwiki => {
+dblist => "${dblistsdir}/enwiki.dblist",
skipdblist => "${dblistsdir}/skipnone.dblist",
keep => '7',
chunksEnabled=> '1',
@@ -117,9 +133,10 @@
revsMargin => '100',
wikis => {
enwiki => {
-jobsperbatch => 'xmlstubsdump=14',
-
[MediaWiki-commits] [Gerrit] mediawiki...WikimediaEvents[master]: Add edit.newContentSize statsd metric
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/357661 )
Change subject: Add edit.newContentSize statsd metric
..
Add edit.newContentSize statsd metric
Also clean up the method docs and return value
Change-Id: I7f44cbdb1b691182ebbdb1508886bc5e4f2ee9d0
---
M WikimediaEventsHooks.php
1 file changed, 18 insertions(+), 6 deletions(-)
Approvals:
Krinkle: Looks good to me, approved
jenkins-bot: Verified
diff --git a/WikimediaEventsHooks.php b/WikimediaEventsHooks.php
index 295cee8..b5ee5dc 100644
--- a/WikimediaEventsHooks.php
+++ b/WikimediaEventsHooks.php
@@ -59,24 +59,38 @@
/**
* Log server-side event on successful page edit.
+*
+* Imported from EventLogging extension
+*
+* @param WikiPage $article
+* @param User $user
+* @param Content $content
+* @param string $summary
+* @param bool $isMinor
+* @param bool $isWatch
+* @param string $section
+* @param int $flags
* @see
https://www.mediawiki.org/wiki/Manual:Hooks/PageContentSaveComplete
* @see https://meta.wikimedia.org/wiki/Schema:PageContentSaveComplete
*/
- // Imported from EventLogging extension
- public static function onPageContentSaveComplete( $article, $user,
$content, $summary,
- $isMinor, $isWatch, $section, $flags, $revision, $status,
$baseRevId ) {
+ public static function onPageContentSaveComplete(
+ $article, $user, $content, $summary,
+ $isMinor, $isWatch, $section, $flags, $revision, $status,
$baseRevId
+ ) {
if ( !$revision ) {
return;
}
$stats =
MediaWikiServices::getInstance()->getStatsdDataFactory();
if ( PHP_SAPI !== 'cli' ) {
- DeferredUpdates::addCallableUpdate( function () use (
$stats ) {
+ $size = $content->getSize();
+ DeferredUpdates::addCallableUpdate( function () use (
$stats, $size ) {
$timing =
RequestContext::getMain()->getTiming();
$measure = $timing->measure(
'editResponseTime', 'requestStart', 'requestShutdown' );
if ( $measure !== false ) {
$stats->timing(
'timing.editResponseTime', $measure['duration'] * 1000 );
}
+ $stats->gauge( 'edit.newContentSize', $size );
} );
}
@@ -129,8 +143,6 @@
'isMobile' => $isMobile,
] );
}
-
- return true;
}
/**
--
To view, visit https://gerrit.wikimedia.org/r/357661
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I7f44cbdb1b691182ebbdb1508886bc5e4f2ee9d0
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/WikimediaEvents
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz
Gerrit-Reviewer: Aaron Schulz
Gerrit-Reviewer: Krinkle
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...DonationInterface[master]: Allow CUIT for Argentina
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/362468 ) Change subject: Allow CUIT for Argentina .. Allow CUIT for Argentina We'd only been accepting the 7-10 digit DNI numbers, but d*Local also accepts 11 digit CUIT numbers Change-Id: Ia02722b057d8985bbc004e07928a9a71243ede72 --- M gateway_common/FiscalNumber.php M tests/phpunit/DataValidatorTest.php 2 files changed, 3 insertions(+), 1 deletion(-) Approvals: Mepps: Looks good to me, approved jenkins-bot: Verified diff --git a/gateway_common/FiscalNumber.php b/gateway_common/FiscalNumber.php index e817775..05e4d57 100644 --- a/gateway_common/FiscalNumber.php +++ b/gateway_common/FiscalNumber.php @@ -10,10 +10,11 @@ protected static $key = 'fiscal_number'; protected static $countryRules = array( + // Argentina's DNI numbers have 7-10 digits and CUIT numbers have 11 'AR' => array( 'numeric' => true, 'min' => 7, - 'max' => 10, + 'max' => 11, ), 'BR' => array( 'numeric' => true, diff --git a/tests/phpunit/DataValidatorTest.php b/tests/phpunit/DataValidatorTest.php index d44f5bb..c02dfec 100644 --- a/tests/phpunit/DataValidatorTest.php +++ b/tests/phpunit/DataValidatorTest.php @@ -127,6 +127,7 @@ array( 'CO', '1234-5678-901', false ), array( 'AR', 'ABC12312', false ), array( 'AR', '12341234', true ), + array( 'AR', '12-34123412-1', true ), // 11 digit CUIT should pass array( 'AR', '1112223', true ), array( 'AR', '111222', false ), array( 'MX', '', true ), // Not required for MX -- To view, visit https://gerrit.wikimedia.org/r/362468 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ia02722b057d8985bbc004e07928a9a71243ede72 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/DonationInterface Gerrit-Branch: master Gerrit-Owner: Ejegg Gerrit-Reviewer: Mepps Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...MobileFrontend[master]: Simplify and document SkinMinerva::getDefaultModules()
Krinkle has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/362471 )
Change subject: Simplify and document SkinMinerva::getDefaultModules()
..
Simplify and document SkinMinerva::getDefaultModules()
* Put the two core-resets together and improve their comments
(loading watch.js wouldn't leak a watchstar, it's just an optimisation
to not load unused code).
* The keys in this array are mainly for core to communicate with skins,
and (in case of Minerva) for the skin to communicate with extensions
through the 'SkinMinervaDefaultModules' hook. These keys are otherwise
entirely arbitrary and ignored.
At the moment, extensions only try to change 'toggling' (in Flow).
Merge the other ones into 'minerva'.
* Flow also tries to unset 'talk', and Wikibase tries to unset 'editor',
but those keys don't exist (anymore).
Cleaned up in I6f247ea43 and I1e37571e29d.
Change-Id: I39a86aafecc42b22d817bb475eedae7f79fee799
---
M includes/skins/SkinMinerva.php
1 file changed, 12 insertions(+), 11 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend
refs/changes/71/362471/1
diff --git a/includes/skins/SkinMinerva.php b/includes/skins/SkinMinerva.php
index beebfa5..ab66564 100644
--- a/includes/skins/SkinMinerva.php
+++ b/includes/skins/SkinMinerva.php
@@ -1304,26 +1304,27 @@
*/
public function getDefaultModules() {
$modules = parent::getDefaultModules();
- // flush unnecessary modules
+ // dequeue default content modules (toc, sortable, collapsible,
etc.)
$modules['content'] = [];
-
- $modules['top'] = 'skins.minerva.scripts.top';
- // Define all the modules that should load on the mobile site
and their dependencies.
- // Do not add mobules here.
- $modules['stable'] = 'skins.minerva.scripts';
-
- // Doing this unconditionally, prevents the desktop watchstar
from ever leaking into mobile view.
+ // dequeue default watch module (not needed, no watchstar in
this skin)
$modules['watch'] = [];
- $modules['context'] = $this->getContextSpecificModules();
+ $modules['minerva'] = array_merge(
+ $this->getContextSpecificModules(),
+ [
+ 'skins.minerva.scripts.top',
+ 'skins.minerva.scripts',
+ 'mobile.site',
+ ],
+ );
if ( $this->getSkinOption( self::OPTION_TOGGLING ) ) {
+ // Extension can unload "toggling" modules via the hook
$modules['toggling'] = [ 'skins.minerva.toggling' ];
}
- $modules['site'] = 'mobile.site';
- // FIXME: Upstream?
Hooks::run( 'SkinMinervaDefaultModules', [ $this, &$modules ] );
+
return $modules;
}
--
To view, visit https://gerrit.wikimedia.org/r/362471
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I39a86aafecc42b22d817bb475eedae7f79fee799
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Krinkle
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Flow[master]: Remove no-op onSkinMinervaDefaultModules hook logic
Krinkle has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/362469 )
Change subject: Remove no-op onSkinMinervaDefaultModules hook logic
..
Remove no-op onSkinMinervaDefaultModules hook logic
There is no longer a 'talk' key in the array exposed by Minerva
in MobileFrontend.
Also remove fragile boolean returns (redundant since MW 1.20).
Change-Id: I6f247ea439b274cc5a1fa7189acf838da552c8f7
---
M Hooks.php
1 file changed, 0 insertions(+), 11 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Flow
refs/changes/69/362469/1
diff --git a/Hooks.php b/Hooks.php
index f139b26..8cf5bfb 100644
--- a/Hooks.php
+++ b/Hooks.php
@@ -675,7 +675,6 @@
*
* @param Skin $skin
* @param array $modules
-* @return bool
*/
public static function onSkinMinervaDefaultModules( Skin $skin, array
&$modules ) {
// Disable toggling on occupied talk pages in mobile
@@ -683,16 +682,6 @@
if ( $title->getContentModel() === CONTENT_MODEL_FLOW_BOARD ) {
$modules['toggling'] = [];
}
- // Turn off default mobile talk overlay for these pages
- if ( $title->canTalk() ) {
- $talkPage = $title->getTalkPage();
- if ( $talkPage->getContentModel() ===
CONTENT_MODEL_FLOW_BOARD ) {
- // TODO: Insert lightweight JavaScript that
opens flow via ajax
- $modules['talk'] = [];
- }
- }
-
- return true;
}
/**
--
To view, visit https://gerrit.wikimedia.org/r/362469
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I6f247ea439b274cc5a1fa7189acf838da552c8f7
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: Krinkle
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Wikibase[master]: Remove no-op onSkinMinervaDefaultModules hook handler
Krinkle has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/362470 )
Change subject: Remove no-op onSkinMinervaDefaultModules hook handler
..
Remove no-op onSkinMinervaDefaultModules hook handler
There is no longer an 'editor' key in the array exposed by Minerva
in MobileFrontend.
Change-Id: I1e37571e29d1d595d09a5170e816424454fe6966
---
M repo/Wikibase.hooks.php
M repo/Wikibase.php
2 files changed, 0 insertions(+), 18 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/70/362470/1
diff --git a/repo/Wikibase.hooks.php b/repo/Wikibase.hooks.php
index 8a54f82..7e68274 100644
--- a/repo/Wikibase.hooks.php
+++ b/repo/Wikibase.hooks.php
@@ -923,23 +923,6 @@
}
/**
-* Disable mobile editor for entity pages in Extension:MobileFrontend.
-* @see https://www.mediawiki.org/wiki/Extension:MobileFrontend
-*
-* @param Skin $skin
-* @param array &$modules associative array of resource loader modules
-*/
- public static function onSkinMinervaDefaultModules( Skin $skin, array
&$modules ) {
- $title = $skin->getTitle();
- $namespaceLookup =
WikibaseRepo::getDefaultInstance()->getEntityNamespaceLookup();
-
- // remove the editor module so that it does not get loaded on
entity pages
- if ( $title && $namespaceLookup->isEntityNamespace(
$title->getNamespace() ) ) {
- unset( $modules['editor'] );
- }
- }
-
- /**
* Register ResourceLoader modules with dynamic dependencies.
*
* @param ResourceLoader $resourceLoader
diff --git a/repo/Wikibase.php b/repo/Wikibase.php
index d8a0817..6d70d78 100644
--- a/repo/Wikibase.php
+++ b/repo/Wikibase.php
@@ -1001,7 +1001,6 @@
$wgHooks['ImportHandleRevisionXMLTag'][] =
'Wikibase\RepoHooks::onImportHandleRevisionXMLTag';
$wgHooks['BaseTemplateToolbox'][] =
'Wikibase\RepoHooks::onBaseTemplateToolbox';
$wgHooks['SkinTemplateBuildNavUrlsNav_urlsAfterPermalink'][] =
'Wikibase\RepoHooks::onSkinTemplateBuildNavUrlsNavUrlsAfterPermalink';
- $wgHooks['SkinMinervaDefaultModules'][] =
'Wikibase\RepoHooks::onSkinMinervaDefaultModules';
$wgHooks['ResourceLoaderRegisterModules'][] =
'Wikibase\RepoHooks::onResourceLoaderRegisterModules';
$wgHooks['BeforeDisplayNoArticleText'][] =
'Wikibase\ViewEntityAction::onBeforeDisplayNoArticleText';
$wgHooks['InfoAction'][] = '\Wikibase\RepoHooks::onInfoAction';
--
To view, visit https://gerrit.wikimedia.org/r/362470
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I1e37571e29d1d595d09a5170e816424454fe6966
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Krinkle
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...DonationInterface[master]: Allow CUIT for Argentina
Ejegg has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/362468 ) Change subject: Allow CUIT for Argentina .. Allow CUIT for Argentina We'd only been accepting the 7-10 digit DNI numbers, but d*Local also accepts 11 digit CUIT numbers Change-Id: Ia02722b057d8985bbc004e07928a9a71243ede72 --- M gateway_common/FiscalNumber.php M tests/phpunit/DataValidatorTest.php 2 files changed, 3 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/DonationInterface refs/changes/68/362468/1 diff --git a/gateway_common/FiscalNumber.php b/gateway_common/FiscalNumber.php index e817775..05e4d57 100644 --- a/gateway_common/FiscalNumber.php +++ b/gateway_common/FiscalNumber.php @@ -10,10 +10,11 @@ protected static $key = 'fiscal_number'; protected static $countryRules = array( + // Argentina's DNI numbers have 7-10 digits and CUIT numbers have 11 'AR' => array( 'numeric' => true, 'min' => 7, - 'max' => 10, + 'max' => 11, ), 'BR' => array( 'numeric' => true, diff --git a/tests/phpunit/DataValidatorTest.php b/tests/phpunit/DataValidatorTest.php index d44f5bb..c02dfec 100644 --- a/tests/phpunit/DataValidatorTest.php +++ b/tests/phpunit/DataValidatorTest.php @@ -127,6 +127,7 @@ array( 'CO', '1234-5678-901', false ), array( 'AR', 'ABC12312', false ), array( 'AR', '12341234', true ), + array( 'AR', '12-34123412-1', true ), // 11 digit CUIT should pass array( 'AR', '1112223', true ), array( 'AR', '111222', false ), array( 'MX', '', true ), // Not required for MX -- To view, visit https://gerrit.wikimedia.org/r/362468 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ia02722b057d8985bbc004e07928a9a71243ede72 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/DonationInterface Gerrit-Branch: master Gerrit-Owner: Ejegg ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Move wgBreakFrame client code from mediawiki.page.startup
Krinkle has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/362465 )
Change subject: Move wgBreakFrame client code from mediawiki.page.startup
..
Move wgBreakFrame client code from mediawiki.page.startup
Follows-up f7c324685195, which migrated this from legacy wikibits
to the 'mediawiki.page.ready', however it's better suited in
'mediawiki.page.startup' because that one loaded on all pages blindly
(used to be hardcoded in OutputPage, now part of 'core' group
in Skin::getDefaultModules).
mediawiki.page.ready on the other hand is primarily for enhancing
the page content, loaded in Skin::getDefaultModules in the 'content'
group, which extensions like MobileFrontend may override with an
alternate implementation. This means frame breaking is bypassed!
Change-Id: Ia7206fac5c4ec6ace87304cfaeef375916b94fcf
---
M resources/src/mediawiki/page/ready.js
M resources/src/mediawiki/page/startup.js
2 files changed, 9 insertions(+), 10 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/65/362465/1
diff --git a/resources/src/mediawiki/page/ready.js
b/resources/src/mediawiki/page/ready.js
index 1f6c8a6..e147664 100644
--- a/resources/src/mediawiki/page/ready.js
+++ b/resources/src/mediawiki/page/ready.js
@@ -1,14 +1,4 @@
( function ( mw, $ ) {
- // Break out of framesets
- if ( mw.config.get( 'wgBreakFrames' ) ) {
- // Note: In IE < 9 strict comparison to window is non-standard
(the standard didn't exist yet)
- // it works only comparing to window.self or window.window
(http://stackoverflow.com/q/4850978/319266)
- if ( window.top !== window.self ) {
- // Un-trap us from framesets
- window.top.location.href = location.href;
- }
- }
-
mw.hook( 'wikipage.content' ).add( function ( $content ) {
var $sortable, $collapsible;
diff --git a/resources/src/mediawiki/page/startup.js
b/resources/src/mediawiki/page/startup.js
index 49cfd8a..7514044 100644
--- a/resources/src/mediawiki/page/startup.js
+++ b/resources/src/mediawiki/page/startup.js
@@ -1,4 +1,13 @@
( function ( mw, $ ) {
+ // Break out of framesets
+ if ( mw.config.get( 'wgBreakFrames' ) ) {
+ // Note: In IE < 9 strict comparison to window is non-standard
(the standard didn't exist yet)
+ // it works only comparing to window.self or window.window
(http://stackoverflow.com/q/4850978/319266)
+ if ( window.top !== window.self ) {
+ // Un-trap us from framesets
+ window.top.location.href = location.href;
+ }
+ }
$( function () {
var $diff;
--
To view, visit https://gerrit.wikimedia.org/r/362465
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia7206fac5c4ec6ace87304cfaeef375916b94fcf
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Krinkle
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] wikidata...gui-deploy[production]: Merging from ced3ee96ab1aec44c0fd4d26be26e97ec4482cd3:
Smalyshev has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/362458 ) Change subject: Merging from ced3ee96ab1aec44c0fd4d26be26e97ec4482cd3: .. Merging from ced3ee96ab1aec44c0fd4d26be26e97ec4482cd3: Introduce editor fullscreen mode Change-Id: I84c81b3efecd7e3bd3092b3499012dae78f2ccaa --- R css/embed.style.min.269c72ab726ecfc5eee6.css R css/style.min.65100d5bd00ce761d18d.css M embed.html M i18n/ast.json M i18n/bn.json M i18n/bs.json M i18n/de.json M i18n/en.json M i18n/eo.json M i18n/es.json M i18n/eu.json M i18n/fr.json M i18n/gl.json M i18n/hans.json M i18n/hant.json M i18n/he.json M i18n/ia.json M i18n/it.json M i18n/ko.json M i18n/mk.json M i18n/pl.json M i18n/qqq.json M i18n/ru.json M i18n/sv.json M i18n/tarask.json M i18n/tcy.json M i18n/tl.json M i18n/uk.json M index.html R js/embed.vendor.min.638d47dc80b1428d9648.js A js/embed.wdqs.min.9916e27ca209b65f6e8d.js D js/embed.wdqs.min.a0d5865eca6eb92f57c8.js A js/vendor.min.52665918808d29a26b88.js D js/vendor.min.82607528a4511ced8802.js A js/wdqs.min.d3cbb0eb2d686ebfc15f.js D js/wdqs.min.ddb8e0b838614c715eee.js 36 files changed, 113 insertions(+), 109 deletions(-) Approvals: Smalyshev: Verified; Looks good to me, approved -- To view, visit https://gerrit.wikimedia.org/r/362458 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I84c81b3efecd7e3bd3092b3499012dae78f2ccaa Gerrit-PatchSet: 1 Gerrit-Project: wikidata/query/gui-deploy Gerrit-Branch: production Gerrit-Owner: Smalyshev Gerrit-Reviewer: Smalyshev ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...VisualEditor[master]: WIP: use Dialog for LanguageConverter instead of Inspector
C. Scott Ananian has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/362464 )
Change subject: WIP: use Dialog for LanguageConverter instead of Inspector
..
WIP: use Dialog for LanguageConverter instead of Inspector
Change-Id: Ida377d54c75dfe406a2a1d04465becc1fd94a65b
---
M extension.json
A modules/ve-mw/ui/dialogs/ve.ui.MWLanguageVariantDialog.js
2 files changed, 238 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor
refs/changes/64/362464/1
diff --git a/extension.json b/extension.json
index d5ce90e..358da8d 100644
--- a/extension.json
+++ b/extension.json
@@ -1927,7 +1927,8 @@
"scripts": [
"modules/ve-mw/dm/nodes/ve.dm.MWLanguageVariantNode.js",
"modules/ve-mw/ce/nodes/ve.ce.MWLanguageVariantNode.js",
-
"modules/ve-mw/ui/contextitems/ve.ui.MWLanguageVariantNodeContextItem.js"
+
"modules/ve-mw/ui/contextitems/ve.ui.MWLanguageVariantNodeContextItem.js",
+
"modules/ve-mw/ui/dialogs/ve.ui.MWLanguageVariantDialog.js"
],
"styles": [
"modules/ve-mw/ui/styles/contextitems/ve.ui.MWLanguageVariantNodeContextItem.css",
diff --git a/modules/ve-mw/ui/dialogs/ve.ui.MWLanguageVariantDialog.js
b/modules/ve-mw/ui/dialogs/ve.ui.MWLanguageVariantDialog.js
new file mode 100644
index 000..f099c8e
--- /dev/null
+++ b/modules/ve-mw/ui/dialogs/ve.ui.MWLanguageVariantDialog.js
@@ -0,0 +1,236 @@
+/*!
+ * VisualEditor user interface MWLanguageVariantDialog class.
+ *
+ * @copyright 2017 VisualEditor Team and others; see AUTHORS.txt
+ * @license The MIT License (MIT); see LICENSE.txt
+ */
+
+/**
+ * Dialog for editing MediaWiki LanguageConverter markup for language
+ * variants.
+ *
+ * @class
+ * @extends ve.ui.NodeDialog
+ *
+ * @constructor
+ * @param {Object} [config] Configuration options
+ */
+ve.ui.MWLanguageVariantDialog = function VeUiMWLanguageVariantDialog() {
+ // Parent constructor
+ ve.ui.MWLanguageVariantDialog.super.apply( this, arguments );
+
+ this.$element.addClass( 've-ui-mwLanguageVariantDialog' );
+};
+
+/* Inheritance */
+
+OO.inheritClass( ve.ui.MWLanguageVariantDialog, ve.ui.NodeDialog );
+
+/* Static properties */
+
+ve.ui.MWLanguageVariantDialog.static.name = 'mwLanguageVariant-disabled';
+
+ve.ui.MWLanguageVariantDialog.static.size = 'large';
+
+ve.ui.MWLanguageVariantDialog.static.title = OO.ui.deferMsg(
'visualeditor-mwlanguagevariantdialog-title' );
+
+ve.ui.MWLanguageVariantDialog.static.modelClasses = [
+ ve.dm.MWLanguageVariantBlockNode,
+ ve.dm.MWLanguageVariantInlineNode,
+ ve.dm.MWLanguageVariantHiddenNode
+];
+
+/* Methods */
+
+/**
+ * @inheritdoc
+ */
+ve.ui.MWLanguageVariantDialog.prototype.initialize = function () {
+ // Parent method
+ ve.ui.MWLanguageVariantDialog.super.prototype.initialize.call( this );
+
+ // Properties
+ this.panel = new OO.ui.PanelLayout( {
+ padded: true
+ } );
+ // Note that this overrides this.input from ve.ui.MWExtensionWindow
+ this.textTarget = ve.init.target.createTargetWidget( {
+ tools: ve.init.target.constructor.static.toolbarGroups,
+ includeCommands: this.constructor.static.includeCommands,
+ excludeCommands: this.constructor.static.excludeCommands,
+ importRules: this.constructor.static.getImportRules(),
+ inDialog: this.constructor.static.name,
+ placeholder: 'XXX Add some text here XXX'
+ } );
+ this.textTarget.connect( this, { resize: 'updateSize' } );
+
+ // Initialization
+ this.panel.$element.append( this.textTarget.$element );
+ this.$body.append( this.panel.$element );
+
+ this.$element.addClass( 've-ui-mwLanguageVariantDialog' );
+};
+
+ve.ui.MWLanguageVariantDialog.static.includeCommands = null;
+ve.ui.MWLanguageVariantDialog.static.excludeCommands = [
+ // No formatting
+ 'paragraph',
+ 'heading1',
+ 'heading2',
+ 'heading3',
+ 'heading4',
+ 'heading5',
+ 'heading6',
+ 'preformatted',
+ 'blockquote',
+ // TODO: Decide if tables tools should be allowed
+ 'tableCellHeader',
+ 'tableCellData',
+ // No structure
+ 'bullet',
+ 'bulletWrapOnce',
+ 'number',
+ 'numberWrapOnce',
+ 'indent',
+ 'outdent'
+];
+
+ve.ui.MWLanguageVariantDialog.static.getImportRules = function () {
+ return ve.extendObject(
+ ve.copy( ve.init.target.constructor.static.importRules ),
+ {
+ }
+ );
+};
+
+/**
+ * @inheritdoc
+ */
+ve.ui.MWLanguageVariantDialog.prototype.getReadyProcess =
[MediaWiki-commits] [Gerrit] mediawiki...Thanks[master]: Fix Thanks messages not say "received your thanks"
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/360785 )
Change subject: Fix Thanks messages not say "received your thanks"
..
Fix Thanks messages not say "received your thanks"
We don't know if they'll receive it, due to Echo preferences
being private.
Bug: T168589
Change-Id: I45375ea3fdc48128513c53c945e55578307633d4
---
M SpecialThanks.php
M i18n/en.json
M i18n/qqq.json
M modules/ext.thanks.mobilediff.js
4 files changed, 10 insertions(+), 9 deletions(-)
Approvals:
jenkins-bot: Verified
Mooeypoo: Looks good to me, approved
Objections:
Mattflaschen: There's a problem with this change, please improve
diff --git a/SpecialThanks.php b/SpecialThanks.php
index 9458304..99ec212 100644
--- a/SpecialThanks.php
+++ b/SpecialThanks.php
@@ -158,6 +158,7 @@
* Display a message to the user.
*/
public function onSuccess() {
+ $sender = $this->getUser();
$recipient = User::newFromName( $this->result['recipient'] );
$link = Linker::userLink( $recipient->getId(),
$recipient->getName() );
@@ -169,7 +170,7 @@
$this->getOutput()->addHTML( $this->msg( $msgKey )
->rawParams( $link )
- ->params( $recipient->getName() )->parse()
+ ->params( $recipient->getName(), $sender->getName()
)->parse()
);
}
diff --git a/i18n/en.json b/i18n/en.json
index 997b6e9..80d8501 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -23,7 +23,7 @@
"thanks-thank-tooltip-no": "{{GENDER:$1|Cancel}} the thank you
notification",
"thanks-thank-tooltip-yes": "{{GENDER:$1|Send}} the thank you
notification",
"thanks-confirmation2": "{{GENDER:$1|Send}} public thanks for this
edit?",
- "thanks-thanked-notice": "$1 received your thanks for
{{GENDER:$2|his|her|their}} edit.",
+ "thanks-thanked-notice": "{{GENDER:$3|You}} thanked $1 for
{{GENDER:$2|his|her|their}} edit.",
"thanks": "Send thanks",
"thanks-submit": "Send thanks",
"thanks-form-revid": "Revision ID for edit",
@@ -43,7 +43,7 @@
"notification-link-text-view-post": "View comment",
"thanks-error-invalidpostid": "Post ID is not valid.",
"flow-thanks-confirmation-special": "Do you want to publicly send
thanks for this comment?",
- "flow-thanks-thanked-notice": "$1 received your thanks for
{{GENDER:$2|his|her|their}} comment.",
+ "flow-thanks-thanked-notice": "{{GENDER:$3|You}} thanked $1 for
{{GENDER:$2|his|her|their}} comment.",
"notification-flow-thanks-post-link": "your comment",
"notification-header-flow-thank": "$1 {{GENDER:$2|thanked}}
{{GENDER:$5|you}} for your comment in \"$3\".",
"notification-compact-header-flow-thank": "$1 {{GENDER:$2|thanked}}
{{GENDER:$3|you}}.",
diff --git a/i18n/qqq.json b/i18n/qqq.json
index 05ddf80..cd33ba1 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -33,7 +33,7 @@
"thanks-thank-tooltip-no": "Tooltip that appears when a user hovers
over the \"No\" confirmation link (which cancels the thank action).
Parameters:\n* $1 - The user sending the thanks. Can be used for GENDER
support.",
"thanks-thank-tooltip-yes": "Tooltip that appears when a user hovers
over the \"Yes\" confirmation link (which confirms the thank action).
Parameters:\n* $1 - The user sending the thanks. Can be used for GENDER
support.",
"thanks-confirmation2": "A confirmation message to make sure the user
actually wants to send thanks to another user.\n\nParameters:\n* $1 - The user
sending the thanks. Can be used for GENDER.\nSee also:\n*
{{msg-mw|Thanks-confirmation-special}}",
- "thanks-thanked-notice": "{{doc-singularthey}}\nPop-up message that is
displayed after a user has thanked another user for their
edit.\n\nParameters:\n* $1 - the username of the user that was thanked\n* $2 -
the gender of the user that was thanked\nSee also:\n*
{{msg-mw|Flow-thanks-thanked-notice}}",
+ "thanks-thanked-notice": "{{doc-singularthey}}\nPop-up message that is
displayed after a user has thanked another user for their
edit.\n\nParameters:\n* $1 - the username of the user that was thanked\n* $2 -
the gender of the user that was thanked.\n* $3 - The user sending the thanks.
Can be used for GENDER support.\nSee also:\n*
{{msg-mw|Flow-thanks-thanked-notice}}",
"thanks": "{{doc-special|Thanks|unlisted=1}}\nThe special page contains
the form to thank for the edit.",
"thanks-submit": "The text of the submit button on the Special:Thanks
page. {{Identical|Send thanks}}",
"thanks-form-revid": "Label for form field where the user inputs the
revision ID.",
@@ -53,7 +53,7 @@
"notification-link-text-view-post": "Label for button that links to a
comment on a Flow board",
"thanks-error-invalidpostid": "E
[MediaWiki-commits] [Gerrit] mediawiki...citoid[master]: Fallback to crossRef for restricted URLs
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/360832 )
Change subject: Fallback to crossRef for restricted URLs
..
Fallback to crossRef for restricted URLs
Previously requests to restricted URLs would
immediately fail; in this change, if there
is a DOI present, we allow the request to
succeed if we are able to get the data
from the DOI from crossRef.
This is done by allowing the request to
proceed to lib/Scraper.js and just checking
that the hostIsAllowed there as well.
Bug: T165105
Change-Id: I811f48ddc021b8e4c32f82e5d9f16d079fe5003a
---
M lib/CitoidService.js
M lib/Scraper.js
M test/features/scraping/index.js
M test/features/scraping/zotero.js
4 files changed, 140 insertions(+), 102 deletions(-)
Approvals:
Mobrovac: Looks good to me, approved
jenkins-bot: Verified
diff --git a/lib/CitoidService.js b/lib/CitoidService.js
index ea310d2..3e234c7 100644
--- a/lib/CitoidService.js
+++ b/lib/CitoidService.js
@@ -291,14 +291,13 @@
})
// Rejection handler for unshorten
.catch(function (error){
-if (error instanceof AddressError ) {
-// Catching here results in a log message indicating
the error; not sure why.
-rejectWithError(error);
-}
-else {
-logger.log('debug/zotero', "No redirect detected.");
-return self.scrapeHTML(citation, cr);
-}
+logger.log('debug/zotero', error);
+return self.scrapeHTML(citation, cr).then(function(){
+if (citation.responseCode !== 200 && error instanceof
AddressError ){
+return rejectWithError(error);
+}
+return cr;
+});
});
}
diff --git a/lib/Scraper.js b/lib/Scraper.js
index c432b44..f40a138 100644
--- a/lib/Scraper.js
+++ b/lib/Scraper.js
@@ -5,18 +5,20 @@
*/
/*
- * Module dependencies
+ * Dependencies
*/
+var AddressError = require('./hostIsAllowed').AddressError;
var BBPromise = require('bluebird');
var cheerio = require('cheerio');
var contentType = require('content-type');
+var hostIsAllowed = require('./hostIsAllowed').hostIsAllowed;
var iconv = require('iconv-lite');
var parseAll = require('html-metadata').parseAll;
var urlParse = require('url');
var preq = require('preq');
/*
- * Local dependencies
+ * Translators
*/
var coins = require('./translators/coins.js');
var bp = require('./translators/bePress.js');
@@ -39,6 +41,7 @@
this.translator = translator;
this.userAgent = app.conf.userAgent;
+this.conf = app.conf;
userAgent = app.conf.userAgent;
defaultLogger = this.logger;
@@ -58,110 +61,123 @@
var citationObj = citation;
var chtml;
var logger = this.logger;
-var scraper = this;
+var self = this;
var acceptLanguage = cr.acceptLanguage;
var url = citation.url;
-var userAgent = scraper.userAgent;
+var userAgent = self.userAgent;
var citationPromise = citationFromCR(citationObj, cr); // Promise for
citation
-//cr.response.citations.push(citationObj);
+return hostIsAllowed(url, self.conf, self.logger, true)
+.then( function() {
-logger.log('debug/scraper', "Using native scraper on " + url);
-return preq({
-uri: url,
-followAllRedirects: true,
-jar: cr.jar, // Set cookie jar for request
-encoding: null, // returns page in Buffer object
-headers: {
-'Accept-Language': acceptLanguage,
-'User-Agent': userAgent
-}
-}).then(function(response){
-if (!response || response.status !== 200) {
-if (!response){
-logger.log('warn/scraper', "No response from resource server
at " + url);
-} else {
-logger.log('warn/scraper', "Status from resource server at " +
url +
-": " + response.status);
+logger.log('debug/scraper', "Using native scraper on " + url);
+return preq({
+uri: url,
+followAllRedirects: true,
+jar: cr.jar, // Set cookie jar for request
+encoding: null, // returns page in Buffer object
+headers: {
+'Accept-Language': acceptLanguage,
+'User-Agent': userAgent
}
-return citationPromise.then(function(citation){
-return build404(citationObj, cr);
-});
-} else {
-var str; // String from decoded Buffer object
-var defaultCT = 'utf-8'; // Default content-type
-var contentType = exports.contentTypeFromResponse(response);
-
-// Load html into cheerio object; if neccesa
[MediaWiki-commits] [Gerrit] operations/dumps[master]: batch abstract jobs and do abstracts and stubs in smaller qu...
ArielGlenn has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/362462 )
Change subject: batch abstract jobs and do abstracts and stubs in smaller
queries
..
batch abstract jobs and do abstracts and stubs in smaller queries
request fewer pages at once, allow abstract jobs to be batchable
and less than the standard number for the other dump steps, on large wikis
also fix a bug with dryrun reporting
Change-Id: I845f8b135dcb9de8e73123697311b7e1c623b6ce
---
M xmldumps-backup/dumps/runner.py
M xmldumps-backup/dumps/xmljobs.py
M xmldumps-backup/xmlabstracts.py
M xmldumps-backup/xmlstubs.py
4 files changed, 18 insertions(+), 10 deletions(-)
Approvals:
ArielGlenn: Looks good to me, approved
jenkins-bot: Verified
diff --git a/xmldumps-backup/dumps/runner.py b/xmldumps-backup/dumps/runner.py
index 4a46e02..012ed65 100644
--- a/xmldumps-backup/dumps/runner.py
+++ b/xmldumps-backup/dumps/runner.py
@@ -204,6 +204,7 @@
"Extracted page abstracts for
Yahoo",
self._get_partnum_todo("abstractsdump"),
self.wiki.db_name,
+
get_int_setting(self.jobsperbatch, "abstractsdump"),
self.filepart.get_pages_per_filepart_abstract())])
self.append_job_if_needed(RecombineAbstractDump(
@@ -636,7 +637,7 @@
"""
if self.dryrun:
self.pretty_print_commands(command_series_list)
-return 0
+return 0, None
else:
commands = CommandsInParallel(command_series_list,
callback_stderr=callback_stderr,
diff --git a/xmldumps-backup/dumps/xmljobs.py b/xmldumps-backup/dumps/xmljobs.py
index 588fcb4..2b28c46 100644
--- a/xmldumps-backup/dumps/xmljobs.py
+++ b/xmldumps-backup/dumps/xmljobs.py
@@ -209,8 +209,9 @@
class AbstractDump(Dump):
"""XML dump for Yahoo!'s Active Abstracts thingy"""
-def __init__(self, name, desc, partnum_todo, db_name, parts=False):
+def __init__(self, name, desc, partnum_todo, db_name, jobsperbatch=None,
parts=False):
self._partnum_todo = partnum_todo
+self.jobsperbatch = jobsperbatch
self._parts = parts
if self._parts:
self._parts_enabled = True
@@ -276,14 +277,20 @@
# choose the empty variant to pass to buildcommand, it will fill in
the rest if needed
output_dfnames = self.list_outfiles_for_build_command(runner.dump_dir)
dumpname0 = self.list_dumpnames()[0]
-for dfname in output_dfnames:
-if dfname.dumpname == dumpname0:
+wanted_dfnames = [dfname for dfname in output_dfnames if
dfname.dumpname == dumpname0]
+if self.jobsperbatch is not None:
+maxjobs = self.jobsperbatch
+else:
+maxjobs = len(wanted_dfnames)
+for batch in batcher(wanted_dfnames, maxjobs):
+commands = []
+for dfname in batch:
series = self.build_command(runner, dfname)
commands.append(series)
-error, broken = runner.run_command(commands,
callback_stderr=self.progress_callback,
- callback_stderr_arg=runner)
-if error:
-raise BackupError("error producing abstract dump")
+error, broken = runner.run_command(commands,
callback_stderr=self.progress_callback,
+ callback_stderr_arg=runner)
+if error:
+raise BackupError("error producing abstract dump")
# If the database name looks like it's marked as Chinese language,
# return a list including Simplified and Traditional versions, so
diff --git a/xmldumps-backup/xmlabstracts.py b/xmldumps-backup/xmlabstracts.py
index 18662d6..7f378d7 100644
--- a/xmldumps-backup/xmlabstracts.py
+++ b/xmldumps-backup/xmlabstracts.py
@@ -59,7 +59,7 @@
do_xml_stream(wikidb, outfiles, command, wikiconf,
start, end, dryrun, 'page_id', 'page',
- 2, 3, '\n')
+ 5000, 1, '\n')
# fixme must take a list of ouput files and a list of
diff --git a/xmldumps-backup/xmlstubs.py b/xmldumps-backup/xmlstubs.py
index 06a6485..47be3a7 100644
--- a/xmldumps-backup/xmlstubs.py
+++ b/xmldumps-backup/xmlstubs.py
@@ -135,7 +135,7 @@
do_xml_stream(wikidb, outfiles, command, wikiconf,
start, end, dryrun, 'page_id', 'page',
- 5000, 10, '\n', callback)
+ 5000, 2, '\n', callback)
def usage(message=None):
--
To view, visit https://gerrit.wikimedia.org/r/362462
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I845f8b135dcb9de8e73123697311b7e1c623b6ce
Gerrit-
[MediaWiki-commits] [Gerrit] operations/dumps[master]: batch abstract jobs and do abstracts and stubs in smaller qu...
ArielGlenn has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/362462 )
Change subject: batch abstract jobs and do abstracts and stubs in smaller
queries
..
batch abstract jobs and do abstracts and stubs in smaller queries
request fewer pages at once, allow abstract jobs to be batchable
and less than the standard number for the other dump steps, on large wikis
also fix a bug with dryrun reporting
Change-Id: I845f8b135dcb9de8e73123697311b7e1c623b6ce
---
M xmldumps-backup/dumps/runner.py
M xmldumps-backup/dumps/xmljobs.py
M xmldumps-backup/xmlabstracts.py
M xmldumps-backup/xmlstubs.py
4 files changed, 18 insertions(+), 10 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/dumps
refs/changes/62/362462/1
diff --git a/xmldumps-backup/dumps/runner.py b/xmldumps-backup/dumps/runner.py
index 4a46e02..012ed65 100644
--- a/xmldumps-backup/dumps/runner.py
+++ b/xmldumps-backup/dumps/runner.py
@@ -204,6 +204,7 @@
"Extracted page abstracts for
Yahoo",
self._get_partnum_todo("abstractsdump"),
self.wiki.db_name,
+
get_int_setting(self.jobsperbatch, "abstractsdump"),
self.filepart.get_pages_per_filepart_abstract())])
self.append_job_if_needed(RecombineAbstractDump(
@@ -636,7 +637,7 @@
"""
if self.dryrun:
self.pretty_print_commands(command_series_list)
-return 0
+return 0, None
else:
commands = CommandsInParallel(command_series_list,
callback_stderr=callback_stderr,
diff --git a/xmldumps-backup/dumps/xmljobs.py b/xmldumps-backup/dumps/xmljobs.py
index 588fcb4..2b28c46 100644
--- a/xmldumps-backup/dumps/xmljobs.py
+++ b/xmldumps-backup/dumps/xmljobs.py
@@ -209,8 +209,9 @@
class AbstractDump(Dump):
"""XML dump for Yahoo!'s Active Abstracts thingy"""
-def __init__(self, name, desc, partnum_todo, db_name, parts=False):
+def __init__(self, name, desc, partnum_todo, db_name, jobsperbatch=None,
parts=False):
self._partnum_todo = partnum_todo
+self.jobsperbatch = jobsperbatch
self._parts = parts
if self._parts:
self._parts_enabled = True
@@ -276,14 +277,20 @@
# choose the empty variant to pass to buildcommand, it will fill in
the rest if needed
output_dfnames = self.list_outfiles_for_build_command(runner.dump_dir)
dumpname0 = self.list_dumpnames()[0]
-for dfname in output_dfnames:
-if dfname.dumpname == dumpname0:
+wanted_dfnames = [dfname for dfname in output_dfnames if
dfname.dumpname == dumpname0]
+if self.jobsperbatch is not None:
+maxjobs = self.jobsperbatch
+else:
+maxjobs = len(wanted_dfnames)
+for batch in batcher(wanted_dfnames, maxjobs):
+commands = []
+for dfname in batch:
series = self.build_command(runner, dfname)
commands.append(series)
-error, broken = runner.run_command(commands,
callback_stderr=self.progress_callback,
- callback_stderr_arg=runner)
-if error:
-raise BackupError("error producing abstract dump")
+error, broken = runner.run_command(commands,
callback_stderr=self.progress_callback,
+ callback_stderr_arg=runner)
+if error:
+raise BackupError("error producing abstract dump")
# If the database name looks like it's marked as Chinese language,
# return a list including Simplified and Traditional versions, so
diff --git a/xmldumps-backup/xmlabstracts.py b/xmldumps-backup/xmlabstracts.py
index 18662d6..7f378d7 100644
--- a/xmldumps-backup/xmlabstracts.py
+++ b/xmldumps-backup/xmlabstracts.py
@@ -59,7 +59,7 @@
do_xml_stream(wikidb, outfiles, command, wikiconf,
start, end, dryrun, 'page_id', 'page',
- 2, 3, '\n')
+ 5000, 1, '\n')
# fixme must take a list of ouput files and a list of
diff --git a/xmldumps-backup/xmlstubs.py b/xmldumps-backup/xmlstubs.py
index 06a6485..47be3a7 100644
--- a/xmldumps-backup/xmlstubs.py
+++ b/xmldumps-backup/xmlstubs.py
@@ -135,7 +135,7 @@
do_xml_stream(wikidb, outfiles, command, wikiconf,
start, end, dryrun, 'page_id', 'page',
- 5000, 10, '\n', callback)
+ 5000, 2, '\n', callback)
def usage(message=None):
--
To view, visit https://gerrit.wikimedia.org/r/362462
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I845f8b135dcb9de8e73123697311b7e1c623b6ce
Ge
[MediaWiki-commits] [Gerrit] mediawiki...CodeMirror[master]: Add missing dependency
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/362460 ) Change subject: Add missing dependency .. Add missing dependency Bug: T165003 Change-Id: I77669035aa425230fe254e776fdb9a5cdd4715c7 --- M extension.json 1 file changed, 2 insertions(+), 1 deletion(-) Approvals: jenkins-bot: Verified Kaldari: Looks good to me, approved diff --git a/extension.json b/extension.json index db9d5af..e9fd787 100644 --- a/extension.json +++ b/extension.json @@ -29,7 +29,8 @@ "mediawiki.api", "mediawiki.api.options", "user.options", - "oojs-ui" + "oojs-ui", + "mediawiki.storage" ], "scripts": [ "ext.CodeMirror.js" -- To view, visit https://gerrit.wikimedia.org/r/362460 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I77669035aa425230fe254e776fdb9a5cdd4715c7 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/CodeMirror Gerrit-Branch: master Gerrit-Owner: Niharika29 Gerrit-Reviewer: Kaldari Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Timeless[master]: Make Timeless compatible with MobileFrontend
Jdlrobson has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/362461 )
Change subject: Make Timeless compatible with MobileFrontend
..
Make Timeless compatible with MobileFrontend
I'm giving you some attention on Extension:MobileFrontend page and
want to promote skins which look nice on mobile.
https://www.mediawiki.org/wiki/Extension:MobileFrontend#Setup_a_skin
The targets are needed to ensure code is loaded by the skin when
operating in mobile mode so currently that wiki page is lying.
Please let it be true :)
Change-Id: Ie9ba6beec172f7b499ae347652318fe54d258e39
---
M skin.json
1 file changed, 4 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/Timeless
refs/changes/61/362461/1
diff --git a/skin.json b/skin.json
index 5e38aa2..28c87d1 100644
--- a/skin.json
+++ b/skin.json
@@ -17,6 +17,7 @@
},
"ResourceModules": {
"skins.timeless": {
+ "targets": [ "desktop", "mobile" ],
"position": "top",
"class": "ResourceLoaderSkinModule",
"styles": {
@@ -51,18 +52,21 @@
"@NOTE": "Remember to also update variables.less if you
change the width cutoffs here. screen-misc.less and mobile.js may also need
updating."
},
"skins.timeless.misc": {
+ "targets": [ "desktop", "mobile" ],
"position": "top",
"styles": [
"resources/screen-misc.less"
]
},
"skins.timeless.js": {
+ "targets": [ "desktop", "mobile" ],
"position": "bottom",
"scripts": [
"resources/main.js"
]
},
"skins.timeless.mobile": {
+ "targets": [ "desktop", "mobile" ],
"position": "bottom",
"scripts": [
"resources/libraries/jquery.mobile.custom.js",
--
To view, visit https://gerrit.wikimedia.org/r/362461
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie9ba6beec172f7b499ae347652318fe54d258e39
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/Timeless
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations...toollabs-images[master]: Add libicu-dev to nodejs images
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/362457 )
Change subject: Add libicu-dev to nodejs images
..
Add libicu-dev to nodejs images
Bug: T169338
Change-Id: I19bfb1cdff65c8e96db4ca31eec63d76909d976a
---
M nodejs/base/Dockerfile.template
1 file changed, 5 insertions(+), 0 deletions(-)
Approvals:
BryanDavis: Looks good to me, approved
jenkins-bot: Verified
diff --git a/nodejs/base/Dockerfile.template b/nodejs/base/Dockerfile.template
index 87b39ee..98f45bd 100644
--- a/nodejs/base/Dockerfile.template
+++ b/nodejs/base/Dockerfile.template
@@ -2,9 +2,14 @@
# Name: docker-registry.tools.wmflabs.org/toollabs-nodejs
FROM {registry}/{image_prefix}-base
+# Includes *-dev packages needed for installing popular packages.
+# Each needs a ticket filed under T140110 and tracking here:
+# * T169338: libicu-dev
RUN apt-get update \
&& DEBIAN_FRONTEND=noninteractive \
apt-get install --yes \
+build-essential \
+libicu-dev \
nodejs-legacy \
npm \
&& apt-get clean \
--
To view, visit https://gerrit.wikimedia.org/r/362457
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I19bfb1cdff65c8e96db4ca31eec63d76909d976a
Gerrit-PatchSet: 1
Gerrit-Project: operations/docker-images/toollabs-images
Gerrit-Branch: master
Gerrit-Owner: BryanDavis
Gerrit-Reviewer: BryanDavis
Gerrit-Reviewer: Madhuvishy
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...CodeMirror[master]: Add missing dependency
Niharika29 has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/362460 ) Change subject: Add missing dependency .. Add missing dependency Bug: T165003 Change-Id: I77669035aa425230fe254e776fdb9a5cdd4715c7 --- M extension.json 1 file changed, 2 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CodeMirror refs/changes/60/362460/1 diff --git a/extension.json b/extension.json index db9d5af..e9fd787 100644 --- a/extension.json +++ b/extension.json @@ -29,7 +29,8 @@ "mediawiki.api", "mediawiki.api.options", "user.options", - "oojs-ui" + "oojs-ui", + "mediawiki.storage" ], "scripts": [ "ext.CodeMirror.js" -- To view, visit https://gerrit.wikimedia.org/r/362460 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I77669035aa425230fe254e776fdb9a5cdd4715c7 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/CodeMirror Gerrit-Branch: master Gerrit-Owner: Niharika29 ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: ResourceLoaderSkinModule should default to mobile and deskto...
Jdlrobson has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/362459 )
Change subject: ResourceLoaderSkinModule should default to mobile and desktop
target
..
ResourceLoaderSkinModule should default to mobile and desktop target
If a skin is using this, it's likely to be pretty new.
The targets system was mostly created for older code.
Let's make this the default so skins don't need to do anything
additional to work on mobile
This simple change makes the Timeless skin work on mobile
when MobileFrontend is installed: ?useformat=mobile&useskin=timeless
It looks beautiful :)
Change-Id: I2ab8a1a634bdc0b5b2084d227c7388b5382e93e8
---
M includes/resourceloader/ResourceLoaderSkinModule.php
1 file changed, 5 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/59/362459/1
diff --git a/includes/resourceloader/ResourceLoaderSkinModule.php
b/includes/resourceloader/ResourceLoaderSkinModule.php
index 5740925..1d0a333 100644
--- a/includes/resourceloader/ResourceLoaderSkinModule.php
+++ b/includes/resourceloader/ResourceLoaderSkinModule.php
@@ -22,6 +22,11 @@
*/
class ResourceLoaderSkinModule extends ResourceLoaderFileModule {
+ /**
+* All skins are assumed to be compatible with mobile
+* @inheritdoc
+*/
+ public $targets = [ "desktop", "mobile" ];
/**
* @param ResourceLoaderContext $context
--
To view, visit https://gerrit.wikimedia.org/r/362459
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I2ab8a1a634bdc0b5b2084d227c7388b5382e93e8
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] wikidata...rdf[master]: processing should stop on InterruptedException
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/362411 )
Change subject: processing should stop on InterruptedException
..
processing should stop on InterruptedException
InterruptedException was correctly catched, interrupt status was correctly
re-applied with Thread.currentThread().interrupt(), but execution was not
stopped.
Change-Id: I8fd73cbb677085257c30efb9931323cf4431a44c
---
M tools/src/main/java/org/wikidata/query/rdf/tool/Update.java
1 file changed, 1 insertion(+), 0 deletions(-)
Approvals:
Smalyshev: Looks good to me, approved
jenkins-bot: Verified
diff --git a/tools/src/main/java/org/wikidata/query/rdf/tool/Update.java
b/tools/src/main/java/org/wikidata/query/rdf/tool/Update.java
index 31459f3..c0e72a7 100644
--- a/tools/src/main/java/org/wikidata/query/rdf/tool/Update.java
+++ b/tools/src/main/java/org/wikidata/query/rdf/tool/Update.java
@@ -348,6 +348,7 @@
batch = nextBatch(batch);
} catch (InterruptedException e) {
Thread.currentThread().interrupt();
+break;
} catch (ExecutionException e) {
log.error("Syncing encountered a fatal exception", e);
break;
--
To view, visit https://gerrit.wikimedia.org/r/362411
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I8fd73cbb677085257c30efb9931323cf4431a44c
Gerrit-PatchSet: 1
Gerrit-Project: wikidata/query/rdf
Gerrit-Branch: master
Gerrit-Owner: Gehel
Gerrit-Reviewer: Gehel
Gerrit-Reviewer: Smalyshev
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] wikidata...gui-deploy[production]: Merging from ced3ee96ab1aec44c0fd4d26be26e97ec4482cd3:
Smalyshev has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/362458 ) Change subject: Merging from ced3ee96ab1aec44c0fd4d26be26e97ec4482cd3: .. Merging from ced3ee96ab1aec44c0fd4d26be26e97ec4482cd3: Introduce editor fullscreen mode Change-Id: I84c81b3efecd7e3bd3092b3499012dae78f2ccaa --- R css/embed.style.min.269c72ab726ecfc5eee6.css R css/style.min.65100d5bd00ce761d18d.css M embed.html M i18n/ast.json M i18n/bn.json M i18n/bs.json M i18n/de.json M i18n/en.json M i18n/eo.json M i18n/es.json M i18n/eu.json M i18n/fr.json M i18n/gl.json M i18n/hans.json M i18n/hant.json M i18n/he.json M i18n/ia.json M i18n/it.json M i18n/ko.json M i18n/mk.json M i18n/pl.json M i18n/qqq.json M i18n/ru.json M i18n/sv.json M i18n/tarask.json M i18n/tcy.json M i18n/tl.json M i18n/uk.json M index.html R js/embed.vendor.min.638d47dc80b1428d9648.js A js/embed.wdqs.min.9916e27ca209b65f6e8d.js D js/embed.wdqs.min.a0d5865eca6eb92f57c8.js A js/vendor.min.52665918808d29a26b88.js D js/vendor.min.82607528a4511ced8802.js A js/wdqs.min.d3cbb0eb2d686ebfc15f.js D js/wdqs.min.ddb8e0b838614c715eee.js 36 files changed, 113 insertions(+), 109 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/wikidata/query/gui-deploy refs/changes/58/362458/1 -- To view, visit https://gerrit.wikimedia.org/r/362458 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I84c81b3efecd7e3bd3092b3499012dae78f2ccaa Gerrit-PatchSet: 1 Gerrit-Project: wikidata/query/gui-deploy Gerrit-Branch: production Gerrit-Owner: Smalyshev ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] wikidata...rdf[master]: Filter failures to process changes
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/361837 )
Change subject: Filter failures to process changes
..
Filter failures to process changes
Make sure that changes that are in exception while they are enriched are not
processed further and do not stop other changes from being processed.
Change-Id: I961c3359104b144c5d5b8fbb3218af4cb8f97146
---
M tools/src/main/java/org/wikidata/query/rdf/tool/Update.java
1 file changed, 17 insertions(+), 10 deletions(-)
Approvals:
Smalyshev: Looks good to me, approved
jenkins-bot: Verified
diff --git a/tools/src/main/java/org/wikidata/query/rdf/tool/Update.java
b/tools/src/main/java/org/wikidata/query/rdf/tool/Update.java
index 0acf13b..31459f3 100644
--- a/tools/src/main/java/org/wikidata/query/rdf/tool/Update.java
+++ b/tools/src/main/java/org/wikidata/query/rdf/tool/Update.java
@@ -364,31 +364,38 @@
* changes
*/
private void handleChanges(Iterable changes) throws
InterruptedException, ExecutionException {
-List> tasks = new ArrayList<>();
Set trueChanges = getRevisionUpdates(changes);
long start = System.currentTimeMillis();
-for (final Change change : trueChanges) {
-tasks.add(executor.submit(() -> {
+
+List> futureChanges = new ArrayList<>();
+for (Change change : trueChanges) {
+futureChanges.add(executor.submit(() -> {
while (true) {
try {
handleChange(change);
-return;
+return change;
} catch (RetryableException e) {
log.warn("Retryable error syncing. Retrying.", e);
} catch (ContainedException e) {
log.warn("Contained error syncing. Giving up on " +
change.entityId(), e);
-return;
+throw e;
}
}
}));
}
-for (Future task : tasks) {
-task.get();
+List processedChanges = new ArrayList<>();
+for (Future f : futureChanges) {
+try {
+processedChanges.add(f.get());
+} catch (ExecutionException ignore) {
+// failure has already been logged
+}
}
-log.debug("Preparing update data took {} ms, have {} changes",
System.currentTimeMillis() - start, trueChanges.size());
-rdfRepository.syncFromChanges(trueChanges, verify);
-updateMeter.mark(trueChanges.size());
+
+log.debug("Preparing update data took {} ms, have {} changes",
System.currentTimeMillis() - start, processedChanges.size());
+rdfRepository.syncFromChanges(processedChanges, verify);
+updateMeter.mark(processedChanges.size());
}
/**
--
To view, visit https://gerrit.wikimedia.org/r/361837
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I961c3359104b144c5d5b8fbb3218af4cb8f97146
Gerrit-PatchSet: 4
Gerrit-Project: wikidata/query/rdf
Gerrit-Branch: master
Gerrit-Owner: Gehel
Gerrit-Reviewer: Gehel
Gerrit-Reviewer: Smalyshev
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations...toollabs-images[master]: Add libicu-dev to nodejs images
BryanDavis has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/362457 )
Change subject: Add libicu-dev to nodejs images
..
Add libicu-dev to nodejs images
Bug: T169338
Change-Id: I19bfb1cdff65c8e96db4ca31eec63d76909d976a
---
M nodejs/base/Dockerfile.template
1 file changed, 5 insertions(+), 0 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/operations/docker-images/toollabs-images
refs/changes/57/362457/1
diff --git a/nodejs/base/Dockerfile.template b/nodejs/base/Dockerfile.template
index 87b39ee..98f45bd 100644
--- a/nodejs/base/Dockerfile.template
+++ b/nodejs/base/Dockerfile.template
@@ -2,9 +2,14 @@
# Name: docker-registry.tools.wmflabs.org/toollabs-nodejs
FROM {registry}/{image_prefix}-base
+# Includes *-dev packages needed for installing popular packages.
+# Each needs a ticket filed under T140110 and tracking here:
+# * T169338: libicu-dev
RUN apt-get update \
&& DEBIAN_FRONTEND=noninteractive \
apt-get install --yes \
+build-essential \
+libicu-dev \
nodejs-legacy \
npm \
&& apt-get clean \
--
To view, visit https://gerrit.wikimedia.org/r/362457
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I19bfb1cdff65c8e96db4ca31eec63d76909d976a
Gerrit-PatchSet: 1
Gerrit-Project: operations/docker-images/toollabs-images
Gerrit-Branch: master
Gerrit-Owner: BryanDavis
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Vector[master]: Vector should operate in responsive mode when the mobile skin
Jdlrobson has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/362456 )
Change subject: Vector should operate in responsive mode when the mobile skin
..
Vector should operate in responsive mode when the mobile skin
With MobileFrontend installed applying
?useskin=vector&useformat=mobile will ensure that responsive vector
mode is invoked.
I'm keen to do this, as it would help to have more examples of skins
that are MobileFrontend aware as part of the work I am doing in
T166748
Change-Id: I81edd855a5e96400d1179fb10907fcc30ea43ef7
---
A Hooks.php
M SkinVector.php
M skin.json
3 files changed, 45 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/Vector
refs/changes/56/362456/1
diff --git a/Hooks.php b/Hooks.php
new file mode 100644
index 000..80458a4
--- /dev/null
+++ b/Hooks.php
@@ -0,0 +1,29 @@
+()
+ */
+
+class VectorHooks {
+ /**
+* BeforePageDisplayMobile hook handler
+*
+* Make Vector responsive when operating in mobile mode
(useformat=mobile)
+*
+* @see
https://www.mediawiki.org/wiki/Extension:MobileFrontend/BeforePageDisplayMobile
+* @param array &$lessVars Variables already added
+*/
+ public static function onBeforePageDisplayMobile( OutputPage $out, $sk
) {
+
+ // This makes Vector behave in responsive mode when
MobileFrontend is installed
+ if ( $sk instanceof SkinVector ) {
+ $sk->enableResponsiveMode();
+ }
+ }
+}
diff --git a/SkinVector.php b/SkinVector.php
index 8af200f..6da20d4 100644
--- a/SkinVector.php
+++ b/SkinVector.php
@@ -40,6 +40,15 @@
}
/**
+* Enables the responsive mode
+*/
+ public function enableResponsiveMode() {
+ $out = $this->getOutput();
+ $out->addMeta( 'viewport', 'width=device-width,
initial-scale=1' );
+ $out->addModuleStyles( 'skins.vector.styles.responsive' );
+ }
+
+ /**
* Initializes output page and sets up skin-specific parameters
* @param OutputPage $out Object to initialize
*/
@@ -47,8 +56,7 @@
parent::initPage( $out );
if ( $this->vectorConfig->get( 'VectorResponsive' ) ) {
- $out->addMeta( 'viewport', 'width=device-width,
initial-scale=1' );
- $out->addModuleStyles( 'skins.vector.styles.responsive'
);
+ $this->enableResponsiveMode();
}
$out->addModules( 'skins.vector.js' );
diff --git a/skin.json b/skin.json
index 6eba1ab..3f016a7 100644
--- a/skin.json
+++ b/skin.json
@@ -25,9 +25,15 @@
]
},
"AutoloadClasses": {
+ "VectorHooks": "Hooks.php",
"SkinVector": "SkinVector.php",
"VectorTemplate": "VectorTemplate.php"
},
+ "Hooks": {
+ "BeforePageDisplayMobile": [
+ "VectorHooks::onBeforePageDisplayMobile"
+ ]
+ },
"@note": "When modifying skins.vector.styles definition, make sure the
installer still works",
"ResourceModules": {
"skins.vector.styles": {
--
To view, visit https://gerrit.wikimedia.org/r/362456
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I81edd855a5e96400d1179fb10907fcc30ea43ef7
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/Vector
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] wikidata...rdf[master]: minor cleanup to updater
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/361076 )
Change subject: minor cleanup to updater
..
minor cleanup to updater
* addressed some potential concurrency issues
* reduce dependencies on Change.Batch
Change-Id: I60dbe2dbb7bbb399893e7e7bdc838c97215f642f
---
M tools/src/main/java/org/wikidata/query/rdf/tool/Update.java
M tools/src/main/java/org/wikidata/query/rdf/tool/rdf/RdfRepository.java
2 files changed, 91 insertions(+), 97 deletions(-)
Approvals:
Smalyshev: Looks good to me, approved
jenkins-bot: Verified
diff --git a/tools/src/main/java/org/wikidata/query/rdf/tool/Update.java
b/tools/src/main/java/org/wikidata/query/rdf/tool/Update.java
index 1c83d6d..0acf13b 100644
--- a/tools/src/main/java/org/wikidata/query/rdf/tool/Update.java
+++ b/tools/src/main/java/org/wikidata/query/rdf/tool/Update.java
@@ -1,9 +1,29 @@
package org.wikidata.query.rdf.tool;
-import static org.wikidata.query.rdf.tool.OptionsUtils.handleOptions;
-import static org.wikidata.query.rdf.tool.OptionsUtils.mungerFromOptions;
-import static
org.wikidata.query.rdf.tool.wikibase.WikibaseRepository.inputDateFormat;
-import static
org.wikidata.query.rdf.tool.wikibase.WikibaseRepository.outputDateFormat;
+import com.codahale.metrics.JmxReporter;
+import com.codahale.metrics.Meter;
+import com.codahale.metrics.MetricRegistry;
+import com.google.common.collect.ImmutableSetMultimap;
+import com.google.common.util.concurrent.ThreadFactoryBuilder;
+import com.lexicalscope.jewel.cli.Option;
+import org.apache.commons.lang3.time.DateUtils;
+import org.openrdf.model.Statement;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.wikidata.query.rdf.common.uri.WikibaseUris;
+import org.wikidata.query.rdf.tool.OptionsUtils.BasicOptions;
+import org.wikidata.query.rdf.tool.OptionsUtils.MungerOptions;
+import org.wikidata.query.rdf.tool.OptionsUtils.WikibaseOptions;
+import org.wikidata.query.rdf.tool.change.Change;
+import org.wikidata.query.rdf.tool.change.Change.Batch;
+import org.wikidata.query.rdf.tool.change.IdListChangeSource;
+import org.wikidata.query.rdf.tool.change.IdRangeChangeSource;
+import org.wikidata.query.rdf.tool.change.RecentChangesPoller;
+import org.wikidata.query.rdf.tool.exception.ContainedException;
+import org.wikidata.query.rdf.tool.exception.RetryableException;
+import org.wikidata.query.rdf.tool.rdf.Munger;
+import org.wikidata.query.rdf.tool.rdf.RdfRepository;
+import org.wikidata.query.rdf.tool.wikibase.WikibaseRepository;
import java.net.URI;
import java.net.URISyntaxException;
@@ -24,31 +44,10 @@
import java.util.concurrent.ThreadPoolExecutor;
import java.util.concurrent.TimeUnit;
-import org.apache.commons.lang3.time.DateUtils;
-import org.openrdf.model.Statement;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.wikidata.query.rdf.common.uri.WikibaseUris;
-import org.wikidata.query.rdf.tool.OptionsUtils.BasicOptions;
-import org.wikidata.query.rdf.tool.OptionsUtils.MungerOptions;
-import org.wikidata.query.rdf.tool.OptionsUtils.WikibaseOptions;
-import org.wikidata.query.rdf.tool.change.Change;
-import org.wikidata.query.rdf.tool.change.Change.Batch;
-import org.wikidata.query.rdf.tool.change.IdListChangeSource;
-import org.wikidata.query.rdf.tool.change.IdRangeChangeSource;
-import org.wikidata.query.rdf.tool.change.RecentChangesPoller;
-import org.wikidata.query.rdf.tool.exception.ContainedException;
-import org.wikidata.query.rdf.tool.exception.RetryableException;
-import org.wikidata.query.rdf.tool.rdf.Munger;
-import org.wikidata.query.rdf.tool.rdf.RdfRepository;
-import org.wikidata.query.rdf.tool.wikibase.WikibaseRepository;
-
-import com.codahale.metrics.JmxReporter;
-import com.codahale.metrics.Meter;
-import com.codahale.metrics.MetricRegistry;
-import com.google.common.collect.Multimap;
-import com.google.common.util.concurrent.ThreadFactoryBuilder;
-import com.lexicalscope.jewel.cli.Option;
+import static org.wikidata.query.rdf.tool.OptionsUtils.handleOptions;
+import static org.wikidata.query.rdf.tool.OptionsUtils.mungerFromOptions;
+import static
org.wikidata.query.rdf.tool.wikibase.WikibaseRepository.inputDateFormat;
+import static
org.wikidata.query.rdf.tool.wikibase.WikibaseRepository.outputDateFormat;
/**
* Update tool.
@@ -287,11 +286,11 @@
/**
* Map entity->values list from repository.
*/
-private Multimap repoValues;
+private volatile ImmutableSetMultimap repoValues;
/**
* Map entity->references list from repository.
*/
-private Multimap repoRefs;
+private volatile ImmutableSetMultimap repoRefs;
/**
* Should we verify updates?
*/
@@ -324,7 +323,7 @@
Date oldDate = null;
while (true) {
try {
-handleChanges(batch);
+handleChanges(batch.changes());
Date leftOffDate =
[MediaWiki-commits] [Gerrit] operations/puppet[production]: servermon: Add gunicorn.service systemd script
Paladox has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/362455 ) Change subject: servermon: Add gunicorn.service systemd script .. servermon: Add gunicorn.service systemd script Also migrate to base::service if using stretch or higher. Using gunicorn.service from http://docs.gunicorn.org/en/stable/deploy.html#systemd Change-Id: I8cc1256e1f6d0248204c10dfb71b0a8850f84bb7 --- 0 files changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/55/362455/1 -- To view, visit https://gerrit.wikimedia.org/r/362455 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I8cc1256e1f6d0248204c10dfb71b0a8850f84bb7 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Paladox Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...CodeMirror[master]: Fixes for Codemirror popup patch
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/362452 )
Change subject: Fixes for Codemirror popup patch
..
Fixes for Codemirror popup patch
Bug: T165003
Change-Id: I52e3cdb3afde242451e9cab68baecc1ab77868dc
---
M resources/ext.CodeMirror.js
1 file changed, 18 insertions(+), 24 deletions(-)
Approvals:
jenkins-bot: Verified
Kaldari: Looks good to me, approved
diff --git a/resources/ext.CodeMirror.js b/resources/ext.CodeMirror.js
index 62b6b5f..abf6a24 100644
--- a/resources/ext.CodeMirror.js
+++ b/resources/ext.CodeMirror.js
@@ -392,11 +392,11 @@
function addPopup() {
this.popuptext = '' +
'{ ' +
- mw.msg( 'codemirror-popup-syntax' ) + ' ' +
- mw.msg( 'codemirror-popup-highlighting' ) + ' }' +
- '' + mw.msg(
'codemirror-popup-desc' ) + '' +
- '' + mw.msg( 'codemirror-popup-btn-yes' ) + '' +
- '' + mw.msg( 'codemirror-popup-btn-no' ) + '' +
+ mw.message( 'codemirror-popup-syntax' ).escaped() +
' ' +
+ mw.message( 'codemirror-popup-highlighting' ).escaped()
+ ' }' +
+ '' + mw.message(
'codemirror-popup-desc' ).escaped() + '' +
+ '' + mw.message( 'codemirror-popup-btn-yes'
).escaped() + '' +
+ '' + mw.message( 'codemirror-popup-btn-no' ).escaped()
+ '' +
'';
popup = new OO.ui.PopupWidget( {
$content: $( this.popuptext ),
@@ -416,9 +416,7 @@
if ( $.inArray( mw.config.get( 'wgAction' ), [ 'edit', 'submit' ] ) !==
-1 ) {
if ( wikiEditorToolbarEnabled ) {
// Add our button
- if ( useCodeMirror ) {
- $( addCodeMirrorToWikiEditor );
- }
+ $( addCodeMirrorToWikiEditor );
} else {
// Load wikiEditor's toolbar and add our button
mw.loader.using( 'mediawiki.toolbar', function () {
@@ -436,24 +434,20 @@
updateToolbarButton();
// Is there already a local storage
entry?
// If so, we already showed them the
popup, don't show again
- popupStatus = localStorage.getItem(
'codemirror-try-popup' );
+ popupStatus = mw.storage.get(
'codemirror-try-popup' );
// If popup entry isn't in local
storage, lets show them the popup
if ( !popupStatus ) {
- try {
- localStorage.setItem(
'codemirror-try-popup', 1 );
- addPopup();
- $(
'.codemirror-popup-btn-yes' ).click( function () {
-
enableCodeMirror();
-
setCodeEditorPreference( true );
-
updateToolbarButton();
- popup.toggle(
false );
- } );
- $(
'.codemirror-popup-btn-no' ).click( function () {
- popup.toggle(
false );
- } );
- } catch ( e ) {
- // No local storage or
local storage full, don't show popup
- }
+ mw.storage.set(
'codemirror-try-popup', 1 );
+ addPopup();
+ $( '.codemirror-popup-btn-yes'
).click( function () {
+ enableCodeMirror();
+
setCodeEditorPreference( true );
+ updateToolbarButton();
+ popup.toggle( false );
+ } );
+ $( '.codemirror-popup-btn-no'
).click( function () {
+ popup.toggle( false );
+
[MediaWiki-commits] [Gerrit] operations/puppet[production]: librenms: use libapache2-mod-php7.0 if on stretch
Dzahn has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/362123 )
Change subject: librenms: use libapache2-mod-php7.0 if on stretch
..
librenms: use libapache2-mod-php7.0 if on stretch
The role currently fails on stretch because libapache2-mod-php5
doesn't exist anymore.
Since we don't directly require the package here but it comes
from using the Apache module, i added I8997c4693a9aa to add the
class over there.
So this requires the change above.
Bug: T159756
Change-Id: Id077bcb996f98c103491e14ae98eff8186f93a71
---
M modules/librenms/manifests/web.pp
1 file changed, 7 insertions(+), 1 deletion(-)
Approvals:
jenkins-bot: Verified
Dzahn: Looks good to me, approved
diff --git a/modules/librenms/manifests/web.pp
b/modules/librenms/manifests/web.pp
index 0fb7f60..5210ecc 100644
--- a/modules/librenms/manifests/web.pp
+++ b/modules/librenms/manifests/web.pp
@@ -2,7 +2,13 @@
$sitename,
$install_dir,
) {
-include ::apache::mod::php5
+
+if os_version('debian >= stretch') {
+include ::apache::mod::php7
+} else {
+include ::apache::mod::php5
+}
+
include ::apache::mod::rewrite
include ::apache::mod::ssl
--
To view, visit https://gerrit.wikimedia.org/r/362123
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Id077bcb996f98c103491e14ae98eff8186f93a71
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn
Gerrit-Reviewer: Alexandros Kosiaris
Gerrit-Reviewer: Dzahn
Gerrit-Reviewer: Faidon Liambotis
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Popups[master]: Enforce no top&bottom margins on lists on page previews
Pmiazga has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/362454 )
Change subject: Enforce no top&bottom margins on lists on page previews
..
Enforce no top&bottom margins on lists on page previews
Changes:
- set margin-top and margin-bottom to 0 on following elements:
ul, ol, li, dl, dd and dd
Bug: T168941
Change-Id: I80478de046d7944fde3c0de3f96f5c9dc4623c36
---
M resources/ext.popups/styles/ext.popups.core.less
1 file changed, 10 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Popups
refs/changes/54/362454/1
diff --git a/resources/ext.popups/styles/ext.popups.core.less
b/resources/ext.popups/styles/ext.popups.core.less
index 9cd36f0..b31a6ee 100644
--- a/resources/ext.popups/styles/ext.popups.core.less
+++ b/resources/ext.popups/styles/ext.popups.core.less
@@ -157,10 +157,19 @@
}
/* stylelint-enable
function-linear-gradient-no-nonstandard-direction */
+ // Make the text fit in exactly as many lines as we want.
p {
- // Make the text fit in exactly as many lines as we
want.
margin: 0;
}
+ ul,
+ ol,
+ li,
+ dl,
+ dd,
+ dt {
+ margin-top: 0;
+ margin-bottom: 0;
+ }
}
svg {
--
To view, visit https://gerrit.wikimedia.org/r/362454
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I80478de046d7944fde3c0de3f96f5c9dc4623c36
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Popups
Gerrit-Branch: master
Gerrit-Owner: Pmiazga
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: Config: Only update restbase if the revision content changed.
Ppchelko has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/362453 ) Change subject: Config: Only update restbase if the revision content changed. .. Config: Only update restbase if the revision content changed. DO NOT MERGE! WAITING FOR THE TRAIN TO DEPLOY! Change-Id: I8eab744a386200b12b1952f6d7df3faf92aad870 PR: https://github.com/wikimedia/change-propagation/pull/195 Depends-On: Ibd32ceb99bc650e3927c1bde28c05d0145fc205b --- M scap/templates/config.yaml.j2 1 file changed, 3 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/change-propagation/deploy refs/changes/53/362453/1 diff --git a/scap/templates/config.yaml.j2 b/scap/templates/config.yaml.j2 index 7ffa612..910e83b 100644 --- a/scap/templates/config.yaml.j2 +++ b/scap/templates/config.yaml.j2 @@ -184,6 +184,8 @@ status: - '5xx' - 404 # Sometimes occasional 404s happen because of the mysql replication lag, so retry +match: + rev_content_changed: true match_not: - meta: domain: /\.wikidata\.org$/ @@ -579,6 +581,7 @@ page_namespace: 0 # It's impossible to modify a comment in wikidata while editing the entity. comment: '/wbeditentity|wbsetdescription|undo/' + rev_content_changed: true exec: method: post uri: '/sys/links/wikidata_descriptions' -- To view, visit https://gerrit.wikimedia.org/r/362453 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I8eab744a386200b12b1952f6d7df3faf92aad870 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/services/change-propagation/deploy Gerrit-Branch: master Gerrit-Owner: Ppchelko ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: TidyDriverBase::validate throws an exception
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/362407 )
Change subject: TidyDriverBase::validate throws an exception
..
TidyDriverBase::validate throws an exception
Change-Id: I05e31c757ed92323ff905d993ac4d030b8aba1da
---
M includes/tidy/TidyDriverBase.php
1 file changed, 1 insertion(+), 0 deletions(-)
Approvals:
Legoktm: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/tidy/TidyDriverBase.php b/includes/tidy/TidyDriverBase.php
index d3f9d48..6e01894 100644
--- a/includes/tidy/TidyDriverBase.php
+++ b/includes/tidy/TidyDriverBase.php
@@ -24,6 +24,7 @@
*
* @param string $text
* @param string &$errorStr Return the error string
+* @throws \MWException
* @return bool Whether the HTML is valid
*/
public function validate( $text, &$errorStr ) {
--
To view, visit https://gerrit.wikimedia.org/r/362407
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I05e31c757ed92323ff905d993ac4d030b8aba1da
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Addshore
Gerrit-Reviewer: Legoktm
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Update phan issues & estimated counts
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/362406 ) Change subject: Update phan issues & estimated counts .. Update phan issues & estimated counts Since the last update there is a total of 550 less issues. 744 removed and 194 added in various places. (roughly) Change-Id: I0431773973c146e1492de72d869f6d33de4084e8 --- M tests/phan/config.php 1 file changed, 14 insertions(+), 14 deletions(-) Approvals: Legoktm: Looks good to me, approved jenkins-bot: Verified diff --git a/tests/phan/config.php b/tests/phan/config.php index 90acc39..8a82d74 100644 --- a/tests/phan/config.php +++ b/tests/phan/config.php @@ -299,17 +299,17 @@ 'suppress_issue_types' => [ // approximate error count: 8 "PhanDeprecatedClass", - // approximate error count: 441 + // approximate error count: 415 "PhanDeprecatedFunction", - // approximate error count: 24 + // approximate error count: 25 "PhanDeprecatedProperty", - // approximate error count: 12 + // approximate error count: 11 "PhanParamReqAfterOpt", - // approximate error count: 748 + // approximate error count: 888 "PhanParamSignatureMismatch", // approximate error count: 7 "PhanParamSignatureMismatchInternal", - // approximate error count: 308 + // approximate error count: 125 "PhanParamTooMany", // approximate error count: 3 "PhanParamTooManyInternal", @@ -317,29 +317,29 @@ "PhanRedefineFunctionInternal", // approximate error count: 2 "PhanTraitParentReference", - // approximate error count: 4 + // approximate error count: 3 "PhanTypeComparisonFromArray", // approximate error count: 3 "PhanTypeInvalidRightOperand", - // approximate error count: 563 + // approximate error count: 218 "PhanTypeMismatchArgument", - // approximate error count: 39 + // approximate error count: 13 "PhanTypeMismatchArgumentInternal", - // approximate error count: 16 + // approximate error count: 14 "PhanTypeMismatchForeach", - // approximate error count: 63 + // approximate error count: 56 "PhanTypeMismatchProperty", - // approximate error count: 95 + // approximate error count: 74 "PhanTypeMismatchReturn", // approximate error count: 11 "PhanTypeMissingReturn", // approximate error count: 5 "PhanTypeNonVarPassByRef", - // approximate error count: 27 + // approximate error count: 32 "PhanUndeclaredConstant", - // approximate error count: 185 + // approximate error count: 233 "PhanUndeclaredMethod", - // approximate error count: 1342 + // approximate error count: 1224 "PhanUndeclaredProperty", // approximate error count: 3 "PhanUndeclaredStaticMethod", -- To view, visit https://gerrit.wikimedia.org/r/362406 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I0431773973c146e1492de72d869f6d33de4084e8 Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Addshore Gerrit-Reviewer: Legoktm Gerrit-Reviewer: Thiemo Mättig (WMDE) Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...CodeMirror[master]: Fixes for Codemirror popup patch
Niharika29 has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/362452 )
Change subject: Fixes for Codemirror popup patch
..
Fixes for Codemirror popup patch
Bug: T165003
Change-Id: I52e3cdb3afde242451e9cab68baecc1ab77868dc
---
M resources/ext.CodeMirror.js
1 file changed, 18 insertions(+), 24 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CodeMirror
refs/changes/52/362452/1
diff --git a/resources/ext.CodeMirror.js b/resources/ext.CodeMirror.js
index 62b6b5f..56991fe 100644
--- a/resources/ext.CodeMirror.js
+++ b/resources/ext.CodeMirror.js
@@ -392,11 +392,11 @@
function addPopup() {
this.popuptext = '' +
'{ ' +
- mw.msg( 'codemirror-popup-syntax' ) + ' ' +
- mw.msg( 'codemirror-popup-highlighting' ) + ' }' +
- '' + mw.msg(
'codemirror-popup-desc' ) + '' +
- '' + mw.msg( 'codemirror-popup-btn-yes' ) + '' +
- '' + mw.msg( 'codemirror-popup-btn-no' ) + '' +
+ mw.message( 'codemirror-popup-syntax' ).escaped() +
' ' +
+ mw.message( 'codemirror-popup-highlighting' ).escaped()
+ ' }' +
+ '' + mw.message(
'codemirror-popup-desc' ).escaped() + '' +
+ '' + mw.message( 'codemirror-popup-btn-yes'
).escaped() + '' +
+ '' + mw.message( 'codemirror-popup-btn-no' ).escaped()
+ '' +
'';
popup = new OO.ui.PopupWidget( {
$content: $( this.popuptext ),
@@ -416,9 +416,7 @@
if ( $.inArray( mw.config.get( 'wgAction' ), [ 'edit', 'submit' ] ) !==
-1 ) {
if ( wikiEditorToolbarEnabled ) {
// Add our button
- if ( useCodeMirror ) {
- $( addCodeMirrorToWikiEditor );
- }
+ $( addCodeMirrorToWikiEditor );
} else {
// Load wikiEditor's toolbar and add our button
mw.loader.using( 'mediawiki.toolbar', function () {
@@ -436,24 +434,20 @@
updateToolbarButton();
// Is there already a local storage
entry?
// If so, we already showed them the
popup, don't show again
- popupStatus = localStorage.getItem(
'codemirror-try-popup' );
+ popupStatus = mw.storage.get(
'codemirror-try-popup' );
// If popup entry isn't in local
storage, lets show them the popup
if ( !popupStatus ) {
- try {
- localStorage.setItem(
'codemirror-try-popup', 1 );
- addPopup();
- $(
'.codemirror-popup-btn-yes' ).click( function () {
-
enableCodeMirror();
-
setCodeEditorPreference( true );
-
updateToolbarButton();
- popup.toggle(
false );
- } );
- $(
'.codemirror-popup-btn-no' ).click( function () {
- popup.toggle(
false );
- } );
- } catch ( e ) {
- // No local storage or
local storage full, don't show popup
- }
+ mw.storage.set(
'codemirror-try-popup', 1 );
+ addPopup();
+ $( '.codemirror-popup-btn-yes'
).click( function () {
+ enableCodeMirror();
+
setCodeEditorPreference( true );
+ updateToolbarButton();
+ popup.toggle( false );
+ });
+ $( '.codemirror-popup-btn-no'
).click( function () {
+ popup.toggle( false );
+
[MediaWiki-commits] [Gerrit] mediawiki...MinervaNeue[master]: Give MinervaNeue control of the minerva skin name
Jdlrobson has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/362451 )
Change subject: Give MinervaNeue control of the minerva skin name
..
Give MinervaNeue control of the minerva skin name
Change-Id: I7f004b43e11d88492b205a3584c29f72d26bad57
Depends-On: I985c4e3a88b59461d471945ccf74cd291db45a61
Bug: T166747
---
M skin.json
1 file changed, 2 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/MinervaNeue
refs/changes/51/362451/1
diff --git a/skin.json b/skin.json
index c7d0b93..725a45a 100644
--- a/skin.json
+++ b/skin.json
@@ -528,7 +528,8 @@
}
},
"ValidSkinNames": {
- "minerva-neue": "MinervaNeue"
+ "minerva-neue": "MinervaNeue",
+ "minerva": "Minerva"
},
"author": [],
"config": {
--
To view, visit https://gerrit.wikimedia.org/r/362451
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I7f004b43e11d88492b205a3584c29f72d26bad57
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/MinervaNeue
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Add ResourceLoaderModule::shouldEmbedModule()
Anomie has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/362450 )
Change subject: Add ResourceLoaderModule::shouldEmbedModule()
..
Add ResourceLoaderModule::shouldEmbedModule()
Rather than only the 'private' group triggering embedding, allow modules
to explicitly specify if they should be embedded.
The default is still to embed when the group is 'private', and the
'private' group is still special in that ResourceLoader::respond() will
still refuse to serve it from load.php.
Change-Id: Ib9a043c566822e278baecc15e87f9c5cebc2eb98
---
M includes/resourceloader/ResourceLoaderClientHtml.php
M includes/resourceloader/ResourceLoaderModule.php
M tests/phpunit/ResourceLoaderTestCase.php
M tests/phpunit/includes/resourceloader/ResourceLoaderClientHtmlTest.php
4 files changed, 84 insertions(+), 10 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/50/362450/1
diff --git a/includes/resourceloader/ResourceLoaderClientHtml.php
b/includes/resourceloader/ResourceLoaderClientHtml.php
index b8f2fa5..4733b1b 100644
--- a/includes/resourceloader/ResourceLoaderClientHtml.php
+++ b/includes/resourceloader/ResourceLoaderClientHtml.php
@@ -149,9 +149,7 @@
continue;
}
- $group = $module->getGroup();
-
- if ( $group === 'private' ) {
+ if ( $module->shouldEmbedModule( $this->context ) ) {
// Embed via mw.loader.implement per T36907.
$data['embed']['general'][] = $name;
// Avoid duplicate request from mw.loader
@@ -185,7 +183,7 @@
// Avoid needless request for empty module
$data['states'][$name] = 'ready';
} else {
- if ( $group === 'private' ) {
+ if ( $module->shouldEmbedModule( $this->context
) ) {
// Embed via style element
$data['embed']['styles'][] = $name;
// Avoid duplicate request from
mw.loader
@@ -392,25 +390,40 @@
foreach ( $sortedModules as $source => $groups ) {
foreach ( $groups as $group => $grpModules ) {
$context = self::makeContext( $mainContext,
$group, $only, $extraQuery );
- $context->setModules( array_keys( $grpModules )
);
- if ( $group === 'private' ) {
+ // Separate linked and embedded modules
+ $embedModules = [];
+ $linkModules = [];
+ foreach ( $grpModules as $name => $module ) {
+ if ( $module->shouldEmbedModule(
$context ) ) {
+ $embedModules[$name] = $module;
+ } else {
+ $linkModules[$name] = $module;
+ }
+ }
+
+ if ( $embedModules ) {
+ $context->setModules( array_keys(
$embedModules ) );
// Decide whether to use style or
script element
if ( $only ==
ResourceLoaderModule::TYPE_STYLES ) {
$chunks[] = Html::inlineStyle(
-
$rl->makeModuleResponse( $context, $grpModules )
+
$rl->makeModuleResponse( $context, $embedModules )
);
} else {
$chunks[] =
ResourceLoader::makeInlineScript(
-
$rl->makeModuleResponse( $context, $grpModules )
+
$rl->makeModuleResponse( $context, $embedModules )
);
}
+ }
+
+ if ( !$linkModules ) {
continue;
}
+ $context->setModules( array_keys( $linkModules
) );
// See if we have one or more raw modules
$isRaw = false;
- foreach ( $grpModules as $key => $module ) {
+ foreach
[MediaWiki-commits] [Gerrit] mediawiki...FileImporter[master]: Docs & Cleanup of namespaces
Addshore has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/362449 ) Change subject: Docs & Cleanup of namespaces .. Docs & Cleanup of namespaces - Add an explanations / walkthrough of the process to the Readme - Create a clear boundry between the classes / services used to talk to the remote mediawiki site for getting ImportDetails and the local site for actually doing the import. If this extension also gets other sources then these might live under src/Remote/SOURCENAME/* etc. Change-Id: I41082b359b6564ad5424ff6f4c98c209daebac38 --- M README.md M extension.json M src/Data/ImportDetails.php M src/Data/ImportPlan.php M src/Data/ImportRequest.php M src/Data/SourceUrl.php M src/Html/ChangeTitleForm.php M src/Html/DuplicateFilesPage.php M src/Html/ImportIdentityFormSnippet.php M src/Html/ImportPreviewPage.php M src/Html/ImportSuccessPage.php M src/Html/TextRevisionSnippet.php M src/Html/TitleConflictPage.php M src/Interfaces/DetailRetriever.php M src/Interfaces/ImportTitleChecker.php M src/Interfaces/SourceUrlChecker.php R src/Remote/MediaWiki/AnyMediaWikiFileUrlChecker.php R src/Remote/MediaWiki/ApiDetailRetriever.php R src/Remote/MediaWiki/HttpApiLookup.php R src/Remote/MediaWiki/RemoteApiImportTitleChecker.php R src/Remote/MediaWiki/SiteTableSiteLookup.php R src/Remote/MediaWiki/SiteTableSourceUrlChecker.php A src/Remote/MediaWiki/SiteWiring.php M src/ServiceWiring.php R src/Services/FileImporterUploadBase.php M src/Services/Importer.php M src/Services/SourceSite.php M src/Services/SourceSiteLocator.php M tests/phpunit/MediaWiki/FileImporterUploadBaseTest.php M tests/phpunit/MediaWiki/SiteTableSiteLookupTest.php M tests/phpunit/MediaWiki/SiteTableSourceUrlCheckerTest.php M tests/phpunit/SpecialImportFileIntegrationTest.php 32 files changed, 195 insertions(+), 110 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/FileImporter refs/changes/49/362449/2 diff --git a/README.md b/README.md index 5ef77fc..b7abe73 100644 --- a/README.md +++ b/README.md @@ -14,11 +14,27 @@ The default setting only allows files to be imported from sites that are in the sites table. Using the "FileImporterAnyMediaWikiSite" service here would allow you to import files from any site. + Process Walkthrough - Major TODOs - - - Special page design / UI layout - - Find a way to present possible problems to the user - - Present a diff of the changes made to a page when importing (if changes are made) - - Actually do the Import - - Decide on the need for the ImportTransformations object, as adjustments should mainly be configurable (seen above) maybe all that is needed here is a final version of the modified text? \ No newline at end of file +1) The user enters the extension on the special page, + either with a source URL as a URL parameter in the request, + or the user will be presented with an input field to enter the URL. +- The special page requires: + - the right as configured in wgFileImporterRequiredRight to operate. + - the rights required to be able to upload files. + - uploads to be enabled on the site. + - the user to not be blocked locally or globally. +2) When a SourceUrl is submitted to the special page the SourceSiteLocator service is used to find a SourceSite service which can handle the SourceUrl. + - SourceSite services are composed of various other services. + - Multiple SourceSite services can be enabled at once (see config above) and the default can also be removed. + - The SourceSiteLocator service is used to find a SourceSite service which can handle the SourceUrl of the ImportPlan. +4) An ImportPlan is then constructed using any requested modifications made by the user in an ImportRequest object + and the details retrieved from the SourceSite in an ImportDetails object. +5) The ImportPlan is then validated using the ImportPlanValidator which performs various checks such as: + - Checking if the target title is available on wiki + - Checking to see if the file already exists on wiki + - etc. +6) An ImportPreviewPage is then displayed to the user where they can make various changes. + These changes essentially change the ImportRequest object of the ImportPlan. +7) On import, after hash and token checks, the ImportPlan and current User are given to the Importer to import the file. + For Importer specifics please see the docs of the Importer class. \ No newline at end of file diff --git a/extension.json b/extension.json index a5fedab..8b0b701 100644 --- a/extension.json +++ b/extension.json @@ -44,6 +44,7 @@ "FileImporter\\Interfaces\\ImportTitleChecker": "src/Interfaces/ImportTitleChecker.php", "FileImporter\\Interfaces\\SourceUrlChecker": "src/Interfaces/SourceUrlChecker.php", "FileImporter\\Services\\DuplicateFileRevisionChecker": "src/Services/Dupli
[MediaWiki-commits] [Gerrit] operations/puppet[production]: apache: add class for mod_php with PHP 7.0 for stretch
Dzahn has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/362119 )
Change subject: apache: add class for mod_php with PHP 7.0 for stretch
..
apache: add class for mod_php with PHP 7.0 for stretch
For stretch compatibility, which comes with PHP 7,
add Apache module class for mod_php with 7, provided
by package libapache2-mod-php7.0 (note the .0 at the end).
My first usecase is making the librenms module work
on stretch on netmon1002 which relies on the libapache2-mod-php5
package which doesn't exist anymore now. (Id077bcb996f98c)
That URL to Apache docs that i removed is 404 and #httpd claims
it never existed because mod_php is a 3rd party module for them.
Bug: T159756
Change-Id: I8997c4693a9aaf314547a33494ca05dd97dee26b
---
M modules/apache/manifests/mod.pp
1 file changed, 4 insertions(+), 1 deletion(-)
Approvals:
Paladox: Looks good to me, but someone else must approve
jenkins-bot: Verified
Dzahn: Looks good to me, approved
diff --git a/modules/apache/manifests/mod.pp b/modules/apache/manifests/mod.pp
index 3769580..76d411e 100644
--- a/modules/apache/manifests/mod.pp
+++ b/modules/apache/manifests/mod.pp
@@ -130,9 +130,12 @@
# https://httpd.apache.org/docs/current/mod/mod_perl.html
class apache::mod::perl{ apache::mod_conf { 'perl': } <-
package { 'libapache2-mod-perl2': } }
-# https://httpd.apache.org/docs/current/mod/mod_php5.html
+# mod_php (PHP 5)
class apache::mod::php5{ apache::mod_conf { 'php5': } <-
package { 'libapache2-mod-php5': } }
+# mod_php (PHP 7)
+class apache::mod::php7{ apache::mod_conf { 'php7.0': } <-
package { 'libapache2-mod-php7.0':} }
+
# https://httpd.apache.org/docs/current/mod/mod_python.html
class apache::mod::python { apache::mod_conf { 'python': } <-
package { 'libapache2-mod-python':} }
--
To view, visit https://gerrit.wikimedia.org/r/362119
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I8997c4693a9aaf314547a33494ca05dd97dee26b
Gerrit-PatchSet: 6
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn
Gerrit-Reviewer: Alexandros Kosiaris
Gerrit-Reviewer: Dzahn
Gerrit-Reviewer: Filippo Giunchedi
Gerrit-Reviewer: Giuseppe Lavagetto
Gerrit-Reviewer: Muehlenhoff
Gerrit-Reviewer: Paladox
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: API: Split non-English description messages into summary + a...
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/359197 ) Change subject: API: Split non-English description messages into summary + additional text .. API: Split non-English description messages into summary + additional text Per request, automatically split non-English messages to avoid a lot of work for translatewiki. Change-Id: Ifb9928dfbc59028d0df65ff07e067aa17bcf0c2f --- M includes/api/i18n/ar.json M includes/api/i18n/ast.json M includes/api/i18n/awa.json M includes/api/i18n/azb.json M includes/api/i18n/ba.json M includes/api/i18n/be-tarask.json M includes/api/i18n/bg.json M includes/api/i18n/bgn.json M includes/api/i18n/bn.json M includes/api/i18n/br.json M includes/api/i18n/bs.json M includes/api/i18n/ca.json M includes/api/i18n/ce.json M includes/api/i18n/cs.json M includes/api/i18n/de.json M includes/api/i18n/diq.json M includes/api/i18n/el.json M includes/api/i18n/en-gb.json M includes/api/i18n/eo.json M includes/api/i18n/es.json M includes/api/i18n/et.json M includes/api/i18n/eu.json M includes/api/i18n/fa.json M includes/api/i18n/fi.json M includes/api/i18n/fo.json M includes/api/i18n/fr.json M includes/api/i18n/frc.json M includes/api/i18n/gl.json M includes/api/i18n/he.json M includes/api/i18n/hr.json M includes/api/i18n/hu.json M includes/api/i18n/ia.json M includes/api/i18n/id.json M includes/api/i18n/it.json M includes/api/i18n/ja.json M includes/api/i18n/ko.json M includes/api/i18n/ksh.json M includes/api/i18n/ku-latn.json M includes/api/i18n/ky.json M includes/api/i18n/lb.json M includes/api/i18n/lij.json M includes/api/i18n/lki.json M includes/api/i18n/lt.json M includes/api/i18n/lv.json M includes/api/i18n/mg.json M includes/api/i18n/mk.json M includes/api/i18n/mr.json M includes/api/i18n/ms.json M includes/api/i18n/nap.json M includes/api/i18n/nb.json M includes/api/i18n/ne.json M includes/api/i18n/nl.json M includes/api/i18n/oc.json M includes/api/i18n/olo.json M includes/api/i18n/or.json M includes/api/i18n/pl.json M includes/api/i18n/ps.json M includes/api/i18n/pt-br.json M includes/api/i18n/pt.json M includes/api/i18n/ro.json M includes/api/i18n/ru.json M includes/api/i18n/sd.json M includes/api/i18n/si.json M includes/api/i18n/sq.json M includes/api/i18n/sr-ec.json M includes/api/i18n/sr-el.json M includes/api/i18n/sv.json M includes/api/i18n/tcy.json M includes/api/i18n/te.json M includes/api/i18n/th.json M includes/api/i18n/tr.json M includes/api/i18n/udm.json M includes/api/i18n/uk.json M includes/api/i18n/vi.json M includes/api/i18n/zh-hant.json M includes/api/i18n/zu.json 76 files changed, 1,087 insertions(+), 790 deletions(-) Approvals: Legoktm: Looks good to me, approved jenkins-bot: Verified -- To view, visit https://gerrit.wikimedia.org/r/359197 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ifb9928dfbc59028d0df65ff07e067aa17bcf0c2f Gerrit-PatchSet: 3 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Anomie Gerrit-Reviewer: Amire80 Gerrit-Reviewer: Legoktm Gerrit-Reviewer: Siebrand Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
