[MediaWiki-commits] [Gerrit] fixed notice, produced fatal - change (mediawiki...BlueSpiceExtensions)
Tweichart has uploaded a new change for review.
https://gerrit.wikimedia.org/r/222995
Change subject: fixed notice, produced fatal
..
fixed notice, produced fatal
Change-Id: I33cba4c8a00e576c23dead72f6311c8e89e6b3b2
---
M Flexiskin/includes/FlexiskinApi.class.php
1 file changed, 1 insertion(+), 0 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceExtensions
refs/changes/95/222995/1
diff --git a/Flexiskin/includes/FlexiskinApi.class.php
b/Flexiskin/includes/FlexiskinApi.class.php
index 5ce90bc..a137a4b 100644
--- a/Flexiskin/includes/FlexiskinApi.class.php
+++ b/Flexiskin/includes/FlexiskinApi.class.php
@@ -32,6 +32,7 @@
if (!$oStatus-isGood()){
return array();
}
+ $aData = array ();
if ( $handle = opendir( $oStatus-getValue() ) ) {
while ( false !== ($entry = readdir( $handle )) ) {
if ( $entry != . $entry != .. ) {
--
To view, visit https://gerrit.wikimedia.org/r/222995
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I33cba4c8a00e576c23dead72f6311c8e89e6b3b2
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: master
Gerrit-Owner: Tweichart weich...@hallowelt.biz
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] editWarning: Declare dependency on user.options - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged. Change subject: editWarning: Declare dependency on user.options .. editWarning: Declare dependency on user.options Bug: T102564 Change-Id: Ia4bc7860e6783c1ff9d94a9097c4e19cd34d57f8 --- M resources/Resources.php 1 file changed, 2 insertions(+), 0 deletions(-) Approvals: Fomafix: Looks good to me, but someone else must approve Legoktm: Looks good to me, approved jenkins-bot: Verified diff --git a/resources/Resources.php b/resources/Resources.php index 2db3aff..b195211 100644 --- a/resources/Resources.php +++ b/resources/Resources.php @@ -1233,6 +1233,7 @@ 'jquery.textSelection', 'mediawiki.jqueryMsg', 'mediawiki.confirmCloseWindow', + 'user.options', ), 'messages' = array( 'editwarning-warning', @@ -1523,6 +1524,7 @@ 'mediawiki.Title', 'mediawiki.util', 'mediawiki.confirmCloseWindow', + 'user.options', ), ), 'mediawiki.special.userlogin.common.styles' = array( -- To view, visit https://gerrit.wikimedia.org/r/222979 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ia4bc7860e6783c1ff9d94a9097c4e19cd34d57f8 Gerrit-PatchSet: 3 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: TheDJ hartman.w...@gmail.com Gerrit-Reviewer: Bartosz Dziewoński matma@gmail.com Gerrit-Reviewer: Fomafix Gerrit-Reviewer: Jack Phoenix j...@countervandalism.net Gerrit-Reviewer: Krinkle krinklem...@gmail.com Gerrit-Reviewer: Legoktm legoktm.wikipe...@gmail.com Gerrit-Reviewer: Umherirrender umherirrender_de...@web.de Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] [FIX] Link: Use anchor in create_separated - change (pywikibot/core)
XZise has uploaded a new change for review. https://gerrit.wikimedia.org/r/223004 Change subject: [FIX] Link: Use anchor in create_separated .. [FIX] Link: Use anchor in create_separated The create_separated method in Link does use '_label' instead of the correct '_anchor' property. Change-Id: I4bb9faccff5683a99d8d1a801d01ca188482e526 --- M pywikibot/page.py 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core refs/changes/04/223004/1 diff --git a/pywikibot/page.py b/pywikibot/page.py index 25d2779..c9dbfd6 100644 --- a/pywikibot/page.py +++ b/pywikibot/page.py @@ -5076,9 +5076,9 @@ elif section is not None: link._section = None if label: -link._label = label +link._anchor = label elif label is not None: -link._label = '' +link._anchor = '' return link -- To view, visit https://gerrit.wikimedia.org/r/223004 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I4bb9faccff5683a99d8d1a801d01ca188482e526 Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: XZise commodorefabia...@gmx.de ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] [FIX] Link: Use anchor in create_separated - change (pywikibot/core)
jenkins-bot has submitted this change and it was merged. Change subject: [FIX] Link: Use anchor in create_separated .. [FIX] Link: Use anchor in create_separated The create_separated method in Link does use '_label' instead of the correct '_anchor' property. Change-Id: I4bb9faccff5683a99d8d1a801d01ca188482e526 --- M pywikibot/page.py 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: John Vandenberg: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/page.py b/pywikibot/page.py index 25d2779..c9dbfd6 100644 --- a/pywikibot/page.py +++ b/pywikibot/page.py @@ -5076,9 +5076,9 @@ elif section is not None: link._section = None if label: -link._label = label +link._anchor = label elif label is not None: -link._label = '' +link._anchor = '' return link -- To view, visit https://gerrit.wikimedia.org/r/223004 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I4bb9faccff5683a99d8d1a801d01ca188482e526 Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: XZise commodorefabia...@gmx.de Gerrit-Reviewer: John Vandenberg jay...@gmail.com Gerrit-Reviewer: Ladsgroup ladsgr...@gmail.com Gerrit-Reviewer: Merlijn van Deen valhall...@arctus.nl Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Use DataModel Deserializer in SetReferences - change (mediawiki...Wikibase)
Addshore has uploaded a new change for review.
https://gerrit.wikimedia.org/r/223010
Change subject: Use DataModel Deserializer in SetReferences
..
Use DataModel Deserializer in SetReferences
This removes a large method which no longer
needs to be here, and has had a TODO on it
for a long time to remove this code!
Change-Id: I281c043512bd6f3eccc7fa7e5922cdd654cfdad1
---
M repo/includes/api/SetReference.php
1 file changed, 21 insertions(+), 67 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/10/223010/1
diff --git a/repo/includes/api/SetReference.php
b/repo/includes/api/SetReference.php
index c9feaad..82041e4 100644
--- a/repo/includes/api/SetReference.php
+++ b/repo/includes/api/SetReference.php
@@ -4,14 +4,13 @@
use ApiBase;
use ApiMain;
-use InvalidArgumentException;
-use OutOfBoundsException;
+use DataValues\Deserializers\DataValueDeserializer;
use Wikibase\ChangeOp\ChangeOpReference;
use Wikibase\ChangeOp\StatementChangeOpFactory;
+use Wikibase\DataModel\DeserializerFactory;
use Wikibase\DataModel\Reference;
use Wikibase\DataModel\Snak\SnakList;
use Wikibase\DataModel\Statement\Statement;
-use Wikibase\Lib\Serializers\LibSerializerFactory;
use Wikibase\Repo\WikibaseRepo;
/**
@@ -36,6 +35,11 @@
private $errorReporter;
/**
+* @var DeserializerFactory
+*/
+ private $deserializerFactory;
+
+ /**
* @param ApiMain $mainModule
* @param string $moduleName
* @param string $modulePrefix
@@ -49,6 +53,10 @@
$this-statementChangeOpFactory =
$changeOpFactoryProvider-getStatementChangeOpFactory();
$this-errorReporter = $apiHelperFactory-getErrorReporter(
$this );
+ $this-deserializerFactory = new DeserializerFactory(
+ new DataValueDeserializer(),
+ $wikibaseRepo-getEntityIdParser()
+ );
}
/**
@@ -72,13 +80,6 @@
$claim = $this-modificationHelper-getStatementFromEntity(
$params['statement'], $entity );
- if ( ! ( $claim instanceof Statement ) ) {
- $this-errorReporter-dieError(
- 'The referenced claim is not a statement and
thus cannot have references',
- 'not-statement'
- );
- }
-
if ( isset( $params['reference'] ) ) {
$this-validateReferenceHash( $claim,
$params['reference'] );
}
@@ -89,20 +90,21 @@
$snaksOrder = array();
}
- $newReference = new Reference(
- $this-getSnaks(
- $this-getArrayFromParam( $params['snaks'] ),
- $snaksOrder
- )
- );
+ $deserializer =
$this-deserializerFactory-newSnakListDeserializer();
+ /** @var SnakList $snakList */
+ $snakList = $deserializer-deserialize(
$this-getArrayFromParam( $params['snaks'] ) );
+ $snakList-orderByProperty( $snaksOrder );
+
+ $newReference = new Reference( $snakList );
$changeOp = $this-getChangeOp( $newReference );
$this-modificationHelper-applyChangeOp( $changeOp, $entity,
$summary );
$status = $this-saveChanges( $entity, $summary );
- $this-getResultBuilder()-addRevisionIdFromStatusToResult(
$status, 'pageinfo' );
- $this-getResultBuilder()-markSuccess();
- $this-getResultBuilder()-addReference( $newReference );
+ $resultBuilder = $this-getResultBuilder();
+ $resultBuilder-addRevisionIdFromStatusToResult( $status,
'pageinfo' );
+ $resultBuilder-markSuccess();
+ $resultBuilder-addReference( $newReference );
}
/**
@@ -140,54 +142,6 @@
}
return $rawArray;
- }
-
- /**
-* @param array $rawSnaks array of snaks
-* @param array $snakOrder array of property ids the snaks are supposed
to be ordered by.
-*
-* @todo: Factor deserialization out of the API class.
-*
-* @return SnakList
-*/
- private function getSnaks( array $rawSnaks, array $snakOrder = array()
) {
- $snaks = new SnakList();
-
- $serializerFactory = new LibSerializerFactory();
- $snakUnserializer =
$serializerFactory-newUnserializerForClass( 'Wikibase\DataModel\Snak\Snak' );
-
- $snakOrder = ( count( $snakOrder ) 0 ) ? $snakOrder :
array_keys( $rawSnaks );
-
- try {
- foreach ( $snakOrder as $propertyId ) {
- if ( !is_array(
[MediaWiki-commits] [Gerrit] Use PROTO_CANONICAL for icon links in emails - change (mediawiki...Echo)
Legoktm has uploaded a new change for review. https://gerrit.wikimedia.org/r/223006 Change subject: Use PROTO_CANONICAL for icon links in emails .. Use PROTO_CANONICAL for icon links in emails We should not be using HTTP links for HTTPS-only sites. Bug: T104835 Change-Id: I7dadeb29a8c5562c48d5beb2dd33818152c9eb63 --- M includes/EmailFormatter.php 1 file changed, 1 insertion(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Echo refs/changes/06/223006/1 diff --git a/includes/EmailFormatter.php b/includes/EmailFormatter.php index 8fdb070..45b6a43 100644 --- a/includes/EmailFormatter.php +++ b/includes/EmailFormatter.php @@ -192,8 +192,7 @@ $iconUrl = $wgExtensionAssetsPath/$path; } - // Use http for image path, there is no need for https - return wfExpandUrl( $iconUrl, PROTO_HTTP ); + return wfExpandUrl( $iconUrl, PROTO_CANONICAL ); } /** -- To view, visit https://gerrit.wikimedia.org/r/223006 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I7dadeb29a8c5562c48d5beb2dd33818152c9eb63 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Echo Gerrit-Branch: master Gerrit-Owner: Legoktm legoktm.wikipe...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] [i18n] Provide disambredir message with twn - change (pywikibot/i18n)
Xqt has uploaded a new change for review.
https://gerrit.wikimedia.org/r/223007
Change subject: [i18n] Provide disambredir message with twn
..
[i18n] Provide disambredir message with twn
Change-Id: Ia7ff8995ce182aa660634255268b2578ab1bf5c3
---
A disambredir/ar.json
A disambredir/be-tarask.json
A disambredir/en.json
A disambredir/fa.json
A disambredir/he.json
A disambredir/ja.json
A disambredir/nl.json
A disambredir/pl.json
A disambredir/pt.json
A disambredir/qqq.json
A disambredir/ru.json
A disambredir/uk.json
A disambredir/zh.json
13 files changed, 78 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/pywikibot/i18n
refs/changes/07/223007/1
diff --git a/disambredir/ar.json b/disambredir/ar.json
new file mode 100644
index 000..50612b4
--- /dev/null
+++ b/disambredir/ar.json
@@ -0,0 +1,6 @@
+{
+@metadata: {
+authors: []
+},
+disambredir-msg: تغيير التحويلات في صفحة توضيح
+}
\ No newline at end of file
diff --git a/disambredir/be-tarask.json b/disambredir/be-tarask.json
new file mode 100644
index 000..ff2a969
--- /dev/null
+++ b/disambredir/be-tarask.json
@@ -0,0 +1,6 @@
+{
+@metadata: {
+authors: []
+},
+disambredir-msg: Замена перанакіраваньняў на старонку неадназначнасьцяў
+}
\ No newline at end of file
diff --git a/disambredir/en.json b/disambredir/en.json
new file mode 100644
index 000..48d479b
--- /dev/null
+++ b/disambredir/en.json
@@ -0,0 +1,6 @@
+{
+@metadata: {
+authors: []
+},
+disambredir-msg: Changing redirects on a disambiguation page
+}
\ No newline at end of file
diff --git a/disambredir/fa.json b/disambredir/fa.json
new file mode 100644
index 000..57c63b4
--- /dev/null
+++ b/disambredir/fa.json
@@ -0,0 +1,6 @@
+{
+@metadata: {
+authors: []
+},
+disambredir-msg: اصلاح تغییرمسیرها در یک صفحه ابهامزدایی
+}
\ No newline at end of file
diff --git a/disambredir/he.json b/disambredir/he.json
new file mode 100644
index 000..b1c5b0c
--- /dev/null
+++ b/disambredir/he.json
@@ -0,0 +1,6 @@
+{
+@metadata: {
+authors: []
+},
+disambredir-msg: משנה קישורים להפניות בדף פירושונים
+}
\ No newline at end of file
diff --git a/disambredir/ja.json b/disambredir/ja.json
new file mode 100644
index 000..0753550
--- /dev/null
+++ b/disambredir/ja.json
@@ -0,0 +1,6 @@
+{
+@metadata: {
+authors: []
+},
+disambredir-msg: ロボットによる: 曖昧さ回避ページのリダイレクト修正
+}
\ No newline at end of file
diff --git a/disambredir/nl.json b/disambredir/nl.json
new file mode 100644
index 000..cb0aea7
--- /dev/null
+++ b/disambredir/nl.json
@@ -0,0 +1,6 @@
+{
+@metadata: {
+authors: []
+},
+disambredir-msg: Verandering van redirects op een doorverwijspagina
+}
\ No newline at end of file
diff --git a/disambredir/pl.json b/disambredir/pl.json
new file mode 100644
index 000..d2fac60
--- /dev/null
+++ b/disambredir/pl.json
@@ -0,0 +1,6 @@
+{
+@metadata: {
+authors: []
+},
+disambredir-msg: Zmiana przekierowań na stronie ujednoznaczającej
+}
\ No newline at end of file
diff --git a/disambredir/pt.json b/disambredir/pt.json
new file mode 100644
index 000..1888f53
--- /dev/null
+++ b/disambredir/pt.json
@@ -0,0 +1,6 @@
+{
+@metadata: {
+authors: []
+},
+disambredir-msg: Arrumando redirects na página de desambiguação
+}
\ No newline at end of file
diff --git a/disambredir/qqq.json b/disambredir/qqq.json
new file mode 100644
index 000..0111c5a
--- /dev/null
+++ b/disambredir/qqq.json
@@ -0,0 +1,6 @@
+{
+@metadata: {
+authors: []
+},
+disambredir-msg: Edit summary for message disambredir of msg report
+}
\ No newline at end of file
diff --git a/disambredir/ru.json b/disambredir/ru.json
new file mode 100644
index 000..1378d74
--- /dev/null
+++ b/disambredir/ru.json
@@ -0,0 +1,6 @@
+{
+@metadata: {
+authors: []
+},
+disambredir-msg: Изменение перенаправлений на странице неоднозначности
+}
\ No newline at end of file
diff --git a/disambredir/uk.json b/disambredir/uk.json
new file mode 100644
index 000..6bf8b32
--- /dev/null
+++ b/disambredir/uk.json
@@ -0,0 +1,6 @@
+{
+@metadata: {
+authors: []
+},
+disambredir-msg: Зміна перенаправлень на сторінці багатозначності
+}
\ No newline at end of file
diff --git a/disambredir/zh.json b/disambredir/zh.json
new file mode 100644
index 000..4fda865
--- /dev/null
+++ b/disambredir/zh.json
@@ -0,0 +1,6 @@
+{
+@metadata: {
+authors: []
+},
+disambredir-msg: 機器人: 修改消歧義頁中的重定向連結
+}
\ No newline at end of file
--
To view, visit https://gerrit.wikimedia.org/r/223007
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia7ff8995ce182aa660634255268b2578ab1bf5c3
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/i18n
Gerrit-Branch: master
Gerrit-Owner: Xqt i...@gno.de
[MediaWiki-commits] [Gerrit] Enable PHPCS sniff Generic.Files.LineLength - change (mediawiki...Wikibase)
Thiemo Mättig (WMDE) has uploaded a new change for review.
https://gerrit.wikimedia.org/r/223008
Change subject: Enable PHPCS sniff Generic.Files.LineLength
..
Enable PHPCS sniff Generic.Files.LineLength
This patch enables a line length limit of 200 characters. My plan is
to decrease this in steps of 10 and upload individual small patches
that are easy to review.
Change-Id: I9022372f988690cfa1cffeb9f7315928b6d9b1cc
---
M lib/tests/phpunit/StringNormalizerTest.php
M phpcs.xml
M repo/includes/LinkedData/EntityDataSerializationService.php
M repo/includes/api/EditEntity.php
M repo/includes/api/RemoveReferences.php
M repo/includes/api/SetClaim.php
M repo/includes/api/SetClaimValue.php
M repo/includes/api/SetReference.php
M repo/tests/phpunit/includes/LinkedData/EntityDataTestProvider.php
M repo/tests/phpunit/includes/api/EditEntityTest.php
10 files changed, 112 insertions(+), 47 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/08/223008/1
diff --git a/lib/tests/phpunit/StringNormalizerTest.php
b/lib/tests/phpunit/StringNormalizerTest.php
index 3e82fb0..7e19e66 100644
--- a/lib/tests/phpunit/StringNormalizerTest.php
+++ b/lib/tests/phpunit/StringNormalizerTest.php
@@ -26,7 +26,6 @@
public function providerTrimBadChars() {
return array(
-
array( // #7: empty
,
@@ -96,22 +95,16 @@
/**
* @dataProvider providerCleanupToNFC
*/
- public function testCleanupToNFC( $src, $dst, $expected ) {
+ public function testCleanupToNFC( $string, $expected ) {
$normalizer = new StringNormalizer();
-
- if ($expected) {
- $this-assertEquals( $dst, $normalizer-cleanupToNFC(
$src ), String '$src' is not the same as the expected '$dst' );
- }
- else {
- $this-assertFalse( $dst === $normalizer-cleanupToNFC(
$src ), String '$src' ( . urlencode( $src ) . ) is the same as the expected
'$dst' ( . urlencode( $dst ) . ). This is unusual, but correct. );
- }
+ $this-assertSame( $expected, $normalizer-cleanupToNFC(
$string ) );
}
public function providerCleanupToNFC() {
return array(
- array( \xC3\x85land, 'Åland', true ),
- array( A\xCC\x8Aland, 'Åland', true ),
- array( \xE2\x84\xABngstrom (unit), 'Ångstrom (unit)',
false ),
+ array( \xC3\x85land, 'Åland' ),
+ array( A\xCC\x8Aland, 'Åland' ),
+ array( \xE2\x84\xABngstrom (unit), 'Ångstrom (unit)'
),
);
}
diff --git a/phpcs.xml b/phpcs.xml
index 19a2315..4d6c360 100644
--- a/phpcs.xml
+++ b/phpcs.xml
@@ -11,6 +11,13 @@
rule ref=Generic.Files.EndFileNewline /
rule ref=Generic.Files.InlineHTML /
rule ref=Generic.Files.LineEndings /
+ rule ref=Generic.Files.LineLength
+ properties
+ !-- FIXME: Should be decreased to 100, preferably in
steps of 10. --
+ property name=lineLimit value=200 /
+ property name=absoluteLineLimit value= /
+ /properties
+ /rule
rule ref=Generic.Files.OneInterfacePerFile /
rule ref=Generic.Files.OneTraitPerFile /
diff --git a/repo/includes/LinkedData/EntityDataSerializationService.php
b/repo/includes/LinkedData/EntityDataSerializationService.php
index e442670..ab79001 100644
--- a/repo/includes/LinkedData/EntityDataSerializationService.php
+++ b/repo/includes/LinkedData/EntityDataSerializationService.php
@@ -343,16 +343,28 @@
private function getFlavor( $flavorName ) {
switch( $flavorName ) {
case 'simple':
- return RdfProducer::PRODUCE_TRUTHY_STATEMENTS |
RdfProducer::PRODUCE_SITELINKS | RdfProducer::PRODUCE_VERSION_INFO;
+ return RdfProducer::PRODUCE_TRUTHY_STATEMENTS
+ | RdfProducer::PRODUCE_SITELINKS
+ | RdfProducer::PRODUCE_VERSION_INFO;
case 'full':
return RdfProducer::PRODUCE_ALL;
case 'dump':
- return RdfProducer::PRODUCE_ALL_STATEMENTS |
RdfProducer::PRODUCE_TRUTHY_STATEMENTS | RdfProducer::PRODUCE_QUALIFIERS |
RdfProducer::PRODUCE_REFERENCES | RdfProducer::PRODUCE_SITELINKS |
RdfProducer::PRODUCE_FULL_VALUES;
+ return RdfProducer::PRODUCE_ALL_STATEMENTS
+ | RdfProducer::PRODUCE_TRUTHY_STATEMENTS
+ |
[MediaWiki-commits] [Gerrit] Add SpecialBlankPageTest - change (mediawiki/core)
Addshore has uploaded a new change for review.
https://gerrit.wikimedia.org/r/223009
Change subject: Add SpecialBlankPageTest
..
Add SpecialBlankPageTest
This uses SpecialPageTestBase and is proof
that said class works as expected
Change-Id: Ibbf3fdcb172d7c1c71491d27b534faa65fd9be63
---
A tests/phpunit/includes/specials/SpecialBlankPageTest.php
1 file changed, 23 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/09/223009/1
diff --git a/tests/phpunit/includes/specials/SpecialBlankPageTest.php
b/tests/phpunit/includes/specials/SpecialBlankPageTest.php
new file mode 100644
index 000..e99f0fc
--- /dev/null
+++ b/tests/phpunit/includes/specials/SpecialBlankPageTest.php
@@ -0,0 +1,23 @@
+?php
+
+/**
+ * @licence GNU GPL v2+
+ * @author Adam Shorland
+ */
+class SpecialBlankPageTest extends SpecialPageTestBase {
+
+ /**
+* Returns a new instance of the special page under test.
+*
+* @return SpecialPage
+*/
+ protected function newSpecialPage() {
+ return new SpecialBlankpage();
+ }
+
+ public function testHasWikiMsg() {
+ list( $html, ) = $this-executeSpecialPage();
+ $this-assertContains( wfMessage( 'intentionallyblankpage'
)-text(), $html );
+ }
+
+}
--
To view, visit https://gerrit.wikimedia.org/r/223009
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibbf3fdcb172d7c1c71491d27b534faa65fd9be63
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Addshore addshorew...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] build: Configure banana-checker and jsonlint - change (mediawiki...BlueSpiceSkin)
Tweichart has uploaded a new change for review.
https://gerrit.wikimedia.org/r/222996
Change subject: build: Configure banana-checker and jsonlint
..
build: Configure banana-checker and jsonlint
Change-Id: If98871314cb52679e5fd75d375fe0b8c156bcd86
(cherry picked from commit df4b4866e849071bc89cb380f0ebfe9864cf01ec)
---
M .gitignore
A Gruntfile.js
A package.json
3 files changed, 33 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/BlueSpiceSkin
refs/changes/96/222996/1
diff --git a/.gitignore b/.gitignore
index 75a89f4..9b344da 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
*~
*.kate-swp
.*.swp
+node_modules/
diff --git a/Gruntfile.js b/Gruntfile.js
new file mode 100644
index 000..9c56558
--- /dev/null
+++ b/Gruntfile.js
@@ -0,0 +1,20 @@
+/*jshint node:true */
+module.exports = function ( grunt ) {
+ grunt.loadNpmTasks( 'grunt-banana-checker' );
+ grunt.loadNpmTasks( 'grunt-jsonlint' );
+
+ grunt.initConfig( {
+ banana: {
+ all: 'i18n/'
+ },
+ jsonlint: {
+ all: [
+ '**/*.json',
+ '!node_modules/**'
+ ]
+ }
+ } );
+
+ grunt.registerTask( 'test', [ 'jsonlint', 'banana' ] );
+ grunt.registerTask( 'default', 'test' );
+};
diff --git a/package.json b/package.json
new file mode 100644
index 000..76e8a82
--- /dev/null
+++ b/package.json
@@ -0,0 +1,12 @@
+{
+ private: true,
+ scripts: {
+test: grunt test
+ },
+ devDependencies: {
+grunt: 0.4.5,
+grunt-cli: 0.1.13,
+grunt-banana-checker: 0.2.2,
+grunt-jsonlint: 1.0.4
+ }
+}
--
To view, visit https://gerrit.wikimedia.org/r/222996
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: If98871314cb52679e5fd75d375fe0b8c156bcd86
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/BlueSpiceSkin
Gerrit-Branch: REL1_23
Gerrit-Owner: Tweichart weich...@hallowelt.biz
Gerrit-Reviewer: Legoktm legoktm.wikipe...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] added missing dependency - change (mediawiki...BlueSpiceSkin)
jenkins-bot has submitted this change and it was merged. Change subject: added missing dependency .. added missing dependency Change-Id: I59f139c0b1de2007a3f5900999380060ba922b18 --- M BlueSpiceSkin.php 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Tweichart: Looks good to me, approved jenkins-bot: Verified diff --git a/BlueSpiceSkin.php b/BlueSpiceSkin.php index 79f4642..e351032 100644 --- a/BlueSpiceSkin.php +++ b/BlueSpiceSkin.php @@ -61,6 +61,7 @@ 'dependencies' = array( 'mediawiki.jqueryMsg', 'jquery.ui.tabs', + 'jquery.cookie' ), ) + $aResourceModuleTemplate; -- To view, visit https://gerrit.wikimedia.org/r/222997 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I59f139c0b1de2007a3f5900999380060ba922b18 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/skins/BlueSpiceSkin Gerrit-Branch: REL1_23 Gerrit-Owner: Tweichart weich...@hallowelt.biz Gerrit-Reviewer: Tweichart weich...@hallowelt.biz Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Lineardoc: Do not skip tags with empty content but with attr... - change (mediawiki...cxserver)
jenkins-bot has submitted this change and it was merged.
Change subject: Lineardoc: Do not skip tags with empty content but with
attributes
..
Lineardoc: Do not skip tags with empty content but with attributes
Those attributes are important and sometimes contain information for
parsoid to work with references or templates.
Added tests to verify lineardoc is not eating up empty tags
While fixing this, another bug noticed. isReference method in
Utils.js was not considering references in sup tag. This was causing
the links inside sup treated as usual page titles. Fixed that too
so that the tests pass.
Bug: T104539
Change-Id: I4cca925cb35a00fa27fd31380fae90e1c4c2767f
---
M lineardoc/Builder.js
M lineardoc/Parser.js
M lineardoc/Utils.js
M tests/lineardoc/LinearDoc.test.js
A tests/lineardoc/data/test3-result.xhtml
A tests/lineardoc/data/test3-result.xml
A tests/lineardoc/data/test3.xhtml
M tests/segmentation/data/result-19.html
M tests/segmentation/data/result-22.html
9 files changed, 97 insertions(+), 9 deletions(-)
Approvals:
Nikerabbit: Looks good to me, approved
jenkins-bot: Verified
diff --git a/lineardoc/Builder.js b/lineardoc/Builder.js
index 15f806c..8874681 100644
--- a/lineardoc/Builder.js
+++ b/lineardoc/Builder.js
@@ -58,7 +58,14 @@
'Mismatched inline tags: open=' + ( tag tag.name ) +
', close=' + tagName
);
}
- if ( tag.name !== 'span' || !tag.attributes[ 'data-mw' ] ) {
+
+ if ( !Object.keys( tag.attributes ).length ) {
+ // Skip tags which have attributes, content or both from
further check to
+ // see if we want to keep inline content. Else we assume that,
if this tag has
+ // whitespace or empty content, it is ok to remove it from
resulting document.
+ // But if it has attributes, we make sure that there are inline
content blocks to
+ // avoid them missing in resulting document.
+ // See T104539
return tag;
}
// Check for empty/whitespace-only data span. Replace as inline content
diff --git a/lineardoc/Parser.js b/lineardoc/Parser.js
index d541cc3..d734f70 100644
--- a/lineardoc/Parser.js
+++ b/lineardoc/Parser.js
@@ -86,9 +86,9 @@
this.builder.popBlockTag( 'div' );
}
} else if ( isAnn this.builder.parent !== null ) {
- // In a sub document: should be a span that closes a reference
- if ( tagName !== 'span' ) {
- throw new Error( 'Expected close reference span, got '
+ tagName + '' );
+ // In a sub document: should be a span or sup that closes a
reference
+ if ( tagName !== 'span' tagName !== 'sup' ) {
+ throw new Error( 'Expected close reference - span or
sup tags, got ' + tagName + '' );
}
this.builder.finishTextBlock();
this.builder.parent.addInlineContent( this.builder.doc );
diff --git a/lineardoc/Utils.js b/lineardoc/Utils.js
index 239dfd2..aff8d60 100644
--- a/lineardoc/Utils.js
+++ b/lineardoc/Utils.js
@@ -141,9 +141,11 @@
*/
function isReference( tag ) {
if ( tag.name === 'span' tag.attributes.typeof ===
'mw:Extension/ref' ) {
+ // See
https://www.mediawiki.org/wiki/Parsoid/MediaWiki_DOM_spec#Ref_and_References
return true;
- } else if ( tag.name === 'span' tag.attributes.class === 'reference'
) {
- // TODO: This is in the tests, but is it correct behaviour?
+ } else if ( tag.name === 'sup' tag.attributes.class === 'reference'
) {
+ // See cite_reference_link message of Cite extension
+ // https://www.mediawiki.org/wiki/Extension:Cite
return true;
}
return false;
diff --git a/tests/lineardoc/LinearDoc.test.js
b/tests/lineardoc/LinearDoc.test.js
index 745fb36..13a1007 100644
--- a/tests/lineardoc/LinearDoc.test.js
+++ b/tests/lineardoc/LinearDoc.test.js
@@ -6,7 +6,7 @@
QUnit.test( 'LinearDoc tests', function ( assert ) {
var parser, testXhtmlFile, resultXmlFile, resultXhtmlFile, testXhtml,
resultXml,
resultXhtml, i,
- numTests = 2;
+ numTests = 3;
QUnit.expect( 2 * numTests );
for ( i = 1; i = numTests; i++ ) {
testXhtmlFile = __dirname + '/data/test' + i + '.xhtml';
diff --git a/tests/lineardoc/data/test3-result.xhtml
b/tests/lineardoc/data/test3-result.xhtml
new file mode 100644
index 000..d6ac7fa
--- /dev/null
+++ b/tests/lineardoc/data/test3-result.xhtml
@@ -0,0 +1,14 @@
+html
+head
+meta charset=UTF-8 /
+titletest/title
+/head
+body
+ol
+li about=#cite_note-5 id=cite_note-5
+a href=#cite_ref-5 rel=mw:referencedByspan class=mw-linkback-text↑
/span/aa href=#cite_ref-5 rel=mw:referencedBy/a
+span
[MediaWiki-commits] [Gerrit] Update cxserver to 9e3f1c8 - change (mediawiki...deploy)
KartikMistry has uploaded a new change for review. https://gerrit.wikimedia.org/r/222998 Change subject: Update cxserver to 9e3f1c8 .. Update cxserver to 9e3f1c8 Changes: * 9e3f1c8 Lineardoc: Do not skip tags with empty content but with attributes Change-Id: I1253bee4121848927703818394167d20f7086c4c --- M src 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/cxserver/deploy refs/changes/98/222998/1 diff --git a/src b/src index 0d21a80..9e3f1c8 16 --- a/src +++ b/src -Subproject commit 0d21a808f7ab6b82086171af927467c1b9460626 +Subproject commit 9e3f1c86b33b3f1d060c47636d1663c58f38a2d4 -- To view, visit https://gerrit.wikimedia.org/r/222998 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I1253bee4121848927703818394167d20f7086c4c Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/services/cxserver/deploy Gerrit-Branch: master Gerrit-Owner: KartikMistry kartik.mis...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add php code sniffer to metrolook - change (mediawiki...Metrolook)
jenkins-bot has submitted this change and it was merged.
Change subject: Add php code sniffer to metrolook
..
Add php code sniffer to metrolook
Add some new options please see changelog.
Fixes some collapisblenav problems.
follow-up: https://gerrit.wikimedia.org/r/#/c/221178/
Change-Id: I39f503970f9ee9aeb07fa6777a7948281f02565c
---
M CHANGELOG.md
M MetrolookTemplate.php
M README.md
M SkinMetrolook.php
M SkinMetrolookHooks.php
M components/mobile.less
M components/navigation.less
M components/tablet.less
M composer.json
M screen-hd.less
M skin.json
11 files changed, 529 insertions(+), 193 deletions(-)
Approvals:
Hashar: Looks good to me, approved
jenkins-bot: Verified
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 57b06a0..1f0ac45 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,21 @@
* New metrolook.search.js that holds search js that was in metrolook.js.
+New options
+
+$wgMetrolookSiteNameText
+
+and
+
+$wgMetrolookSiteText
+
+To use it please do the following
+
+$wgMetrolookSiteNameText = false;
+
+$wgMetrolookSiteText = 'Enter text here';
+
+
Bug Fixes
===
diff --git a/MetrolookTemplate.php b/MetrolookTemplate.php
index 9fa9d08..a469c93 100644
--- a/MetrolookTemplate.php
+++ b/MetrolookTemplate.php
@@ -171,11 +171,17 @@
a href=#mw-head?php
$this-msg( 'jumptonavigation' )
?/a?php $this-msg(
'comma-separator' ) ?
- ?php if ( $this-config-get(
'MetrolookSearchBar' ) ): ?
- a href=#p-search?php $this-msg(
'jumptosearch' ) ?/a
- ?php else: ?
- a href=#p-searchSearch?php
$this-msg( 'jumptosearch' ) ?/a
- ?php endif; ?
+ ?php
+ if ( $this-config-get(
'MetrolookSearchBar' ) ) {
+ ?
+ a href=#p-search?php
$this-msg( 'jumptosearch' ) ?/a
+ ?php
+ } else {
+ ?
+ a href=#p-searchSearch?php
$this-msg( 'jumptosearch' ) ?/a
+ ?php
+ }
+ ?
/div
?php
$this-html( 'bodycontent' );
@@ -251,11 +257,23 @@
span
id=username-text?php echo $userNameTop ?/span
span
class=username-space style=word-spacing: 4px; /span
span id=userIcon20
- img
class=userIcon20 style=position:relative;top:0.3em; src=?php echo
htmlspecialchars( $this-getSkin()-getSkinStylePath( 'images/Transparent.gif'
) ) ? /
+ img
+
class=userIcon20
+
style=position:relative;top:0.3em;
+ src=?php
+ echo
htmlspecialchars( $this-getSkin()-getSkinStylePath( 'images/Transparent.gif'
) )
+ ?
+ /
/span
span
style=word-spacing:4px; /span
span id=userIcon40
- img
class=userIcon40 style=position:relative;top:0.4em; src=?php echo
htmlspecialchars( $this-getSkin()-getSkinStylePath( 'images/Transparent.gif'
) ) ? /
+ img
+
class=userIcon40
+
style=position:relative;top:0.4em;
+ src=?php
+ echo
htmlspecialchars( $this-getSkin()-getSkinStylePath( 'images/Transparent.gif'
) )
+ ?
+ /
[MediaWiki-commits] [Gerrit] removed saferedit extension - change (mediawiki...BlueSpiceExtensions)
Tweichart has uploaded a new change for review.
https://gerrit.wikimedia.org/r/222994
Change subject: removed saferedit extension
..
removed saferedit extension
Change-Id: Idc630d07b08d40cb9e41133f0f4ecaf981b176f3
---
M BlueSpiceExtensions.php.template
D SaferEdit/SaferEdit.class.php
D SaferEdit/SaferEdit.setup.php
D SaferEdit/db/mysql/SaferEdit.patch.se_page_namespace.index.sql
D SaferEdit/db/mysql/SaferEdit.patch.se_page_title.index.sql
D SaferEdit/db/mysql/SaferEdit.sql
D SaferEdit/db/oracle/SaferEdit.oci.sql
D SaferEdit/db/oracle/SaferEdit.patch.se_page_namespace.index.oci.sql
D SaferEdit/db/oracle/SaferEdit.patch.se_page_title.index.oci.sql
D SaferEdit/db/postgres/SaferEdit.patch.se_page_namespace.index.pg.sql
D SaferEdit/db/postgres/SaferEdit.patch.se_page_title.index.pg.sql
D SaferEdit/db/postgres/SaferEdit.pg.sql
D SaferEdit/i18n/br.json
D SaferEdit/i18n/de-formal.json
D SaferEdit/i18n/de.json
D SaferEdit/i18n/en.json
D SaferEdit/i18n/es.json
D SaferEdit/i18n/fa.json
D SaferEdit/i18n/fr.json
D SaferEdit/i18n/gl.json
D SaferEdit/i18n/he.json
D SaferEdit/i18n/it.json
D SaferEdit/i18n/ja.json
D SaferEdit/i18n/ksh.json
D SaferEdit/i18n/lb.json
D SaferEdit/i18n/mk.json
D SaferEdit/i18n/nl.json
D SaferEdit/i18n/pt.json
D SaferEdit/i18n/qqq.json
D SaferEdit/i18n/ru.json
D SaferEdit/i18n/sl.json
D SaferEdit/i18n/sv.json
D SaferEdit/i18n/uk.json
D SaferEdit/i18n/zh-hans.json
D SaferEdit/i18n/zh-hant.json
D SaferEdit/languages/SaferEdit.i18n.php
D SaferEdit/resources/bluespice.SaferEdit.editmode.js
D SaferEdit/resources/bluespice.SaferEdit.general.js
D SaferEdit/resources/images/bs-infobar-editing-orange.png
D SaferEdit/resources/images/bs-saferedit-error.png
D SaferEdit/resources/images/bs-saferedit.png
M StateBar/StateBar.class.php
42 files changed, 0 insertions(+), 1,736 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceExtensions
refs/changes/94/222994/1
diff --git a/BlueSpiceExtensions.php.template b/BlueSpiceExtensions.php.template
index 9db77ba..84459fb 100644
--- a/BlueSpiceExtensions.php.template
+++ b/BlueSpiceExtensions.php.template
@@ -49,7 +49,6 @@
require_once( __DIR__./PageTemplates/PageTemplates.setup.php );
require_once( __DIR__./ResponsibleEditors/ResponsibleEditors.setup.php );
require_once( __DIR__./Review/Review.setup.php );
-#require_once( __DIR__./SaferEdit/SaferEdit.setup.php );
require_once( __DIR__./Statistics/Statistics.setup.php );
require_once( __DIR__./Avatars/Avatars.setup.php );
require_once( __DIR__./Readers/Readers.setup.php );
diff --git a/SaferEdit/SaferEdit.class.php b/SaferEdit/SaferEdit.class.php
deleted file mode 100644
index bf0bcd1..000
--- a/SaferEdit/SaferEdit.class.php
+++ /dev/null
@@ -1,571 +0,0 @@
-?php
-/**
- * SaferEdit extension for BlueSpice
- *
- * Intermediate saving of wiki edits.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * This file is part of BlueSpice for MediaWiki
- * For further information visit http://www.blue-spice.org
- *
- * @author Markus Glaser gla...@hallowelt.biz
- * @version2.23.1
- * @packageBlueSpice_Extensions
- * @subpackage SaferEdit
- * @copyright Copyright (C) 2011 Hallo Welt! - Medienwerkstatt GmbH, All
rights reserved.
- * @licensehttp://www.gnu.org/copyleft/gpl.html GNU Public License v2 or
later
- * @filesource
- */
-
-/**
- * Base class for SaferEdit extension
- * @package BlueSpice_Extensions
- * @subpackage SaferEdit
- */
-class SaferEdit extends BsExtensionMW {
-
- private $aIntermediateEditsForCurrentTitle = null;
- /**
-* Constructor of SaferEdit class
-*/
- public function __construct() {
- wfProfileIn( 'BS::'.__METHOD__ );
-
- // Base settings
- $this-mExtensionFile = __FILE__;
- $this-mExtensionType = EXTTYPE::VARIABLE;
- $this-mInfo = array(
- EXTINFO::NAME= 'SaferEdit',
- EXTINFO::DESCRIPTION = 'bs-saferedit-desc',
- EXTINFO::AUTHOR = 'Markus Glaser',
- EXTINFO::VERSION = 'default',
- EXTINFO::STATUS = 'default',
- EXTINFO::PACKAGE =
[MediaWiki-commits] [Gerrit] build: Configure banana-checker and jsonlint - change (mediawiki...BlueSpiceSkin)
jenkins-bot has submitted this change and it was merged.
Change subject: build: Configure banana-checker and jsonlint
..
build: Configure banana-checker and jsonlint
Change-Id: If98871314cb52679e5fd75d375fe0b8c156bcd86
(cherry picked from commit df4b4866e849071bc89cb380f0ebfe9864cf01ec)
---
M .gitignore
A Gruntfile.js
A package.json
3 files changed, 33 insertions(+), 0 deletions(-)
Approvals:
Tweichart: Looks good to me, approved
jenkins-bot: Verified
diff --git a/.gitignore b/.gitignore
index 75a89f4..9b344da 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
*~
*.kate-swp
.*.swp
+node_modules/
diff --git a/Gruntfile.js b/Gruntfile.js
new file mode 100644
index 000..9c56558
--- /dev/null
+++ b/Gruntfile.js
@@ -0,0 +1,20 @@
+/*jshint node:true */
+module.exports = function ( grunt ) {
+ grunt.loadNpmTasks( 'grunt-banana-checker' );
+ grunt.loadNpmTasks( 'grunt-jsonlint' );
+
+ grunt.initConfig( {
+ banana: {
+ all: 'i18n/'
+ },
+ jsonlint: {
+ all: [
+ '**/*.json',
+ '!node_modules/**'
+ ]
+ }
+ } );
+
+ grunt.registerTask( 'test', [ 'jsonlint', 'banana' ] );
+ grunt.registerTask( 'default', 'test' );
+};
diff --git a/package.json b/package.json
new file mode 100644
index 000..76e8a82
--- /dev/null
+++ b/package.json
@@ -0,0 +1,12 @@
+{
+ private: true,
+ scripts: {
+test: grunt test
+ },
+ devDependencies: {
+grunt: 0.4.5,
+grunt-cli: 0.1.13,
+grunt-banana-checker: 0.2.2,
+grunt-jsonlint: 1.0.4
+ }
+}
--
To view, visit https://gerrit.wikimedia.org/r/222996
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: If98871314cb52679e5fd75d375fe0b8c156bcd86
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/BlueSpiceSkin
Gerrit-Branch: REL1_23
Gerrit-Owner: Tweichart weich...@hallowelt.biz
Gerrit-Reviewer: Legoktm legoktm.wikipe...@gmail.com
Gerrit-Reviewer: Tweichart weich...@hallowelt.biz
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Hygience: Use strtr() instead of str_replace() for character... - change (mediawiki/core)
Krinkle has uploaded a new change for review.
https://gerrit.wikimedia.org/r/223002
Change subject: Hygience: Use strtr() instead of str_replace() for character
swapping
..
Hygience: Use strtr() instead of str_replace() for character swapping
strtr() is marginally faster as it runs through the string only
once. A better fit for one-for-one character translation.
The strtr() function also supports an associative array as second
parameter for entire string replacements. This, too, has the same
performance and predictable behaviour (starts with the longest key).
Whereas str_replace is for more aggressive needs where you want
multiple passes until there are no further matches.
The associative array form is arguably also easier to understand
and harder to mess up since the needle/replacement pairs are
explicitly connected instead of two separate arrays.
Also:
* Use getFormattedNsText instead of strtr( getNsText, .. ) which
reduces duplication of this fact through a more semantic intent.
Change-Id: Ie23e4210a5b6908dd79eebc8a2b931d12fe31af6
---
M includes/Export.php
M includes/GlobalFunctions.php
M includes/Linker.php
M includes/Title.php
M includes/api/ApiQueryAllUsers.php
M includes/cache/LinkBatch.php
M includes/cache/LocalisationCache.php
M includes/filerepo/LocalRepo.php
M includes/resourceloader/ResourceLoaderModule.php
M languages/Language.php
10 files changed, 29 insertions(+), 35 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/02/223002/1
diff --git a/includes/Export.php b/includes/Export.php
index 0d55d7d..adab21c 100644
--- a/includes/Export.php
+++ b/includes/Export.php
@@ -874,7 +874,7 @@
}
global $wgContLang;
- $prefix = str_replace( '_', ' ', $wgContLang-getNsText(
$title-getNamespace() ) );
+ $prefix = $wgContLang-getFormattedNsText(
$title-getNamespace() );
if ( $prefix !== '' ) {
$prefix .= ':';
diff --git a/includes/GlobalFunctions.php b/includes/GlobalFunctions.php
index 97042fd..3014070 100644
--- a/includes/GlobalFunctions.php
+++ b/includes/GlobalFunctions.php
@@ -3505,8 +3505,7 @@
$prefix = $wgCachePrefix === false ? wfWikiID() : $wgCachePrefix;
$args = func_get_args();
$key = $prefix . ':' . implode( ':', $args );
- $key = str_replace( ' ', '_', $key );
- return $key;
+ return strtr( $key, ' ', '_' );
}
/**
@@ -3527,7 +3526,7 @@
} else {
$key = $db . ':' . implode( ':', $args );
}
- return str_replace( ' ', '_', $key );
+ return strtr( $key, ' ', '_' );
}
/**
@@ -3544,8 +3543,7 @@
function wfGlobalCacheKey( /*...*/ ) {
$args = func_get_args();
$key = 'global:' . implode( ':', $args );
- $key = str_replace( ' ', '_', $key );
- return $key;
+ return strtr( $key, ' ', '_' );
}
/**
diff --git a/includes/Linker.php b/includes/Linker.php
index 4a1aa87..bb65cdf 100644
--- a/includes/Linker.php
+++ b/includes/Linker.php
@@ -77,7 +77,7 @@
wfDeprecated( __METHOD__, '1.25' );
$title = urldecode( $title );
- $title = str_replace( '_', ' ', $title );
+ $title = strtr( $title, '_', ' ' );
return self::getLinkAttributesInternal( $title, $class );
}
@@ -1414,10 +1414,9 @@
# fix up urlencoded title texts (copied from
Parser::replaceInternalLinks)
if ( strpos( $match[1], '%' ) !== false ) {
- $match[1] = str_replace(
- array( '', '' ),
- array( 'lt;', 'gt;' ),
- rawurldecode( $match[1] )
+ $match[1] = strtr(
+ rawurldecode( $match[1] ),
+ array( '' = 'lt;', '' =
'gt;' )
);
}
diff --git a/includes/Title.php b/includes/Title.php
index 9c8ed47..e8024ed 100644
--- a/includes/Title.php
+++ b/includes/Title.php
@@ -313,7 +313,7 @@
$filteredText = Sanitizer::decodeCharReferencesAndNormalize(
$text );
$t = new Title();
- $t-mDbkeyform = str_replace( ' ', '_', $filteredText );
+ $t-mDbkeyform = strtr( $filteredText, ' ', '_' );
$t-mDefaultNamespace = intval( $defaultNamespace );
$t-secureAndSplit();
@@ -345,10 +345,10 @@
# but some URLs used it as a space replacement and they still
come
# from some external search tools.
if ( strpos( self::legalChars(), '+' ) === false ) {
-
[MediaWiki-commits] [Gerrit] mw-teardown: Only cp LocalSettings if it exists - change (integration/jenkins)
Krinkle has uploaded a new change for review.
https://gerrit.wikimedia.org/r/223003
Change subject: mw-teardown: Only cp LocalSettings if it exists
..
mw-teardown: Only cp LocalSettings if it exists
If the job failed early during the installer, then this will not
yet exist. In that case, we want to make sure that we still
archive log/ files for inspection, and still clean up tmp dir.
Change-Id: I4cc816e0ba253add9eab2363b3e4c0830826c4cc
---
M bin/mw-teardown.sh
1 file changed, 3 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/integration/jenkins
refs/changes/03/223003/1
diff --git a/bin/mw-teardown.sh b/bin/mw-teardown.sh
index a9e4c2f..957c653 100755
--- a/bin/mw-teardown.sh
+++ b/bin/mw-teardown.sh
@@ -4,4 +4,6 @@
. /srv/deployment/integration/slave-scripts/bin/mw-set-env.sh
# Copy LocalSettings to /log so that archive-log-dir collects it
-cp ${MW_INSTALL_PATH}/LocalSettings.php $LOG_DIR
+if [ -e ${MW_INSTALL_PATH}/LocalSettings.php ]; then
+ cp ${MW_INSTALL_PATH}/LocalSettings.php $LOG_DIR
+fi
--
To view, visit https://gerrit.wikimedia.org/r/223003
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I4cc816e0ba253add9eab2363b3e4c0830826c4cc
Gerrit-PatchSet: 1
Gerrit-Project: integration/jenkins
Gerrit-Branch: master
Gerrit-Owner: Krinkle krinklem...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Count API module instantiations and Hook runs - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged.
Change subject: Count API module instantiations and Hook runs
..
Count API module instantiations and Hook runs
We previously had counts for hooks and modules as a side-effect of having them
profiled. We removed the profiling for performance reasons, which left us
without counts also. But the performance of counters is not a concern, and
their signal value not insubstantial. So introduce them here.
Fix getModulePath() to not crash while we're at it.
Change-Id: Ic04daf475b936b942833362c7a979dde671b3ef4
---
M includes/Hooks.php
M includes/api/ApiMain.php
2 files changed, 3 insertions(+), 0 deletions(-)
Approvals:
Gergő Tisza: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/Hooks.php b/includes/Hooks.php
index 036d65c..28c54d2 100644
--- a/includes/Hooks.php
+++ b/includes/Hooks.php
@@ -135,6 +135,7 @@
* returning null) is equivalent to returning true.
*/
public static function run( $event, array $args = array(),
$deprecatedVersion = null ) {
+ RequestContext::getMain()-getStats()-increment( 'hooks.' .
$event );
foreach ( self::getHandlers( $event ) as $hook ) {
// Turn non-array values into an array. (Can't use
casting because of objects.)
if ( !is_array( $hook ) ) {
diff --git a/includes/api/ApiMain.php b/includes/api/ApiMain.php
index f2059d7..fec750f 100644
--- a/includes/api/ApiMain.php
+++ b/includes/api/ApiMain.php
@@ -404,6 +404,8 @@
} else {
$this-executeActionWithErrorHandling();
}
+ $this-getContext()-getStats()-increment(
+ 'api.modules.' . strtr(
$this-getModule()-getModulePath(), '+', '.' ) );
}
/**
--
To view, visit https://gerrit.wikimedia.org/r/24
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ic04daf475b936b942833362c7a979dde671b3ef4
Gerrit-PatchSet: 8
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Ori.livneh o...@wikimedia.org
Gerrit-Reviewer: Anomie bjor...@wikimedia.org
Gerrit-Reviewer: BryanDavis bda...@wikimedia.org
Gerrit-Reviewer: Gergő Tisza gti...@wikimedia.org
Gerrit-Reviewer: Ori.livneh o...@wikimedia.org
Gerrit-Reviewer: Parent5446 tylerro...@gmail.com
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] added missing dependency - change (mediawiki...BlueSpiceSkin)
Tweichart has uploaded a new change for review. https://gerrit.wikimedia.org/r/222997 Change subject: added missing dependency .. added missing dependency Change-Id: I59f139c0b1de2007a3f5900999380060ba922b18 --- M BlueSpiceSkin.php 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/BlueSpiceSkin refs/changes/97/222997/1 diff --git a/BlueSpiceSkin.php b/BlueSpiceSkin.php index 79f4642..e351032 100644 --- a/BlueSpiceSkin.php +++ b/BlueSpiceSkin.php @@ -61,6 +61,7 @@ 'dependencies' = array( 'mediawiki.jqueryMsg', 'jquery.ui.tabs', + 'jquery.cookie' ), ) + $aResourceModuleTemplate; -- To view, visit https://gerrit.wikimedia.org/r/222997 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I59f139c0b1de2007a3f5900999380060ba922b18 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/skins/BlueSpiceSkin Gerrit-Branch: REL1_23 Gerrit-Owner: Tweichart weich...@hallowelt.biz ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update cxserver to 9e3f1c8 - change (mediawiki...deploy)
jenkins-bot has submitted this change and it was merged. Change subject: Update cxserver to 9e3f1c8 .. Update cxserver to 9e3f1c8 Changes: * 9e3f1c8 Lineardoc: Do not skip tags with empty content but with attributes Change-Id: I1253bee4121848927703818394167d20f7086c4c --- M src 1 file changed, 0 insertions(+), 0 deletions(-) Approvals: KartikMistry: Looks good to me, approved jenkins-bot: Verified diff --git a/src b/src index 0d21a80..9e3f1c8 16 --- a/src +++ b/src -Subproject commit 0d21a808f7ab6b82086171af927467c1b9460626 +Subproject commit 9e3f1c86b33b3f1d060c47636d1663c58f38a2d4 -- To view, visit https://gerrit.wikimedia.org/r/222998 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I1253bee4121848927703818394167d20f7086c4c Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/services/cxserver/deploy Gerrit-Branch: master Gerrit-Owner: KartikMistry kartik.mis...@gmail.com Gerrit-Reviewer: KartikMistry kartik.mis...@gmail.com Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Use libav instead of ffmpeg on Jessie - change (operations/puppet)
Hashar has uploaded a new change for review.
https://gerrit.wikimedia.org/r/222999
Change subject: Use libav instead of ffmpeg on Jessie
..
Use libav instead of ffmpeg on Jessie
The contint slaves includes mediawiki::multimedia::packages which fails
on Jessie because ffmpeg is not included in Debian Jessie. Turns out we
already had a condition to install libav on Trusty.
Change the conditional to get libav installed on Jessie just like on
Trusty.
Bug: T95002
Bug: T103335
Change-Id: I0a9863d4b9e1c050bf04fbcc9f4135141c38258b
---
M modules/mediawiki/manifests/packages/multimedia.pp
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/99/222999/1
diff --git a/modules/mediawiki/manifests/packages/multimedia.pp
b/modules/mediawiki/manifests/packages/multimedia.pp
index 973e6c9..746415a 100644
--- a/modules/mediawiki/manifests/packages/multimedia.pp
+++ b/modules/mediawiki/manifests/packages/multimedia.pp
@@ -3,7 +3,7 @@
# Provisions packages used by MediaWiki for image and video processing.
#
class mediawiki::packages::multimedia {
-if os_version('ubuntu = trusty') {
+if os_version('ubuntu = trusty || debian = jessie') {
$libav_package = 'libav-tools'
} else {
$libav_package = 'ffmpeg'
--
To view, visit https://gerrit.wikimedia.org/r/222999
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I0a9863d4b9e1c050bf04fbcc9f4135141c38258b
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Hashar has...@free.fr
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] hhvm: enable apc items expiration on the canary appservers - change (operations/puppet)
Giuseppe Lavagetto has uploaded a new change for review. https://gerrit.wikimedia.org/r/223000 Change subject: hhvm: enable apc items expiration on the canary appservers .. hhvm: enable apc items expiration on the canary appservers As stated on the HHVM wiki, purging of expired APC items is disabled by default, probably for performance. We keep HHVM running for a long time so if/when we set a lot of APC variables we need to expunge them once they're expired. For now enabling this on the canary appservers with all the defaults, we will have time to tweak the parameters. Bug: T104769 Change-Id: I46865de82809c5bbf2feb46f9d5b1b7f5922838d --- M hieradata/role/common/mediawiki/canary_appserver.yaml 1 file changed, 4 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/00/223000/1 diff --git a/hieradata/role/common/mediawiki/canary_appserver.yaml b/hieradata/role/common/mediawiki/canary_appserver.yaml index bc1d7bf..542cd0c 100644 --- a/hieradata/role/common/mediawiki/canary_appserver.yaml +++ b/hieradata/role/common/mediawiki/canary_appserver.yaml @@ -20,3 +20,7 @@ server: light_process_count: 5 light_process_file_prefix: /tmp/hhvm + apc: +expire_on_sets: true +purge_frequency: 4096 +purge_rate: -1 -- To view, visit https://gerrit.wikimedia.org/r/223000 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I46865de82809c5bbf2feb46f9d5b1b7f5922838d Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Giuseppe Lavagetto glavage...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mw-teardown: Only cp LocalSettings if it exists - change (integration/jenkins)
jenkins-bot has submitted this change and it was merged.
Change subject: mw-teardown: Only cp LocalSettings if it exists
..
mw-teardown: Only cp LocalSettings if it exists
If the job failed early during the installer, then this will not
yet exist. In that case, we want to make sure that we still
archive log/ files for inspection, and still clean up tmp dir.
Change-Id: I4cc816e0ba253add9eab2363b3e4c0830826c4cc
---
M bin/mw-teardown.sh
1 file changed, 3 insertions(+), 1 deletion(-)
Approvals:
Krinkle: Looks good to me, approved
jenkins-bot: Verified
diff --git a/bin/mw-teardown.sh b/bin/mw-teardown.sh
index a9e4c2f..957c653 100755
--- a/bin/mw-teardown.sh
+++ b/bin/mw-teardown.sh
@@ -4,4 +4,6 @@
. /srv/deployment/integration/slave-scripts/bin/mw-set-env.sh
# Copy LocalSettings to /log so that archive-log-dir collects it
-cp ${MW_INSTALL_PATH}/LocalSettings.php $LOG_DIR
+if [ -e ${MW_INSTALL_PATH}/LocalSettings.php ]; then
+ cp ${MW_INSTALL_PATH}/LocalSettings.php $LOG_DIR
+fi
--
To view, visit https://gerrit.wikimedia.org/r/223003
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I4cc816e0ba253add9eab2363b3e4c0830826c4cc
Gerrit-PatchSet: 1
Gerrit-Project: integration/jenkins
Gerrit-Branch: master
Gerrit-Owner: Krinkle krinklem...@gmail.com
Gerrit-Reviewer: Krinkle krinklem...@gmail.com
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] varnish: Update default varnish error page - change (operations/puppet)
Krinkle has uploaded a new change for review.
https://gerrit.wikimedia.org/r/223012
Change subject: varnish: Update default varnish error page
..
varnish: Update default varnish error page
Bring more in line with other error pages. Minimal markup,
and using branding that doesn't violate our own guidelines.
Based on:
* operations-mediawiki-config.git:/404.html
Example at https://bits.wikimedia.org/404.html.
* operations-mediawiki-config.git:/docroot/default/index.html
Example at http://unknown.beta.wmflabs.org.
Example varnish Error at
https://test.wikipedia.org/Special:RecordImpression?campaign=wm2015register
Preview of new version at
http://codepen.io/Krinkle/debug/domOQK#errorpage
Also:
* Simplified the non-javascript version of the Try again link
by using href= instead of trying to form a self-reference url
manually (which failed in some respects due to insufficient encoding
for complex urls).
Change-Id: Ie026eb132839cd7b387a4cd938f4cdfa08ddfc58
---
M templates/varnish/errorpage.inc.vcl.erb
1 file changed, 21 insertions(+), 88 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/12/223012/1
diff --git a/templates/varnish/errorpage.inc.vcl.erb
b/templates/varnish/errorpage.inc.vcl.erb
index 586d31c..3358663 100644
--- a/templates/varnish/errorpage.inc.vcl.erb
+++ b/templates/varnish/errorpage.inc.vcl.erb
@@ -9,100 +9,33 @@
set obj.http.Content-Type = text/html; charset=utf-8;
synthetic {
!DOCTYPE html
-html xmlns=http://www.w3.org/1999/xhtml; xml:lang=en lang=en
-head
+html lang=en
titleWikimedia Error/title
-meta name=author content=Mark Ryan/
-meta name=copyright content=(c) 2005-2007 Mark Ryan and others. Text
licensed under the GNU Free Documentation License.
http://www.gnu.org/licenses/fdl.txt/
-
-style type=text/css!--
-body {
-background-color: #dbe5df;
-font: 100% Gill Sans MT, Gill Sans, Trebuchet MS, Helvetica, sans-serif;
-margin: 0px;
-}
-.TechnicalStuff {
-font-size: 0.8em;
-font-style: italic;
-text-align: center;
-padding-bottom: 0.8em;
-}
-.Lines {
-width: 100%;
-height: 1px;
-overflow: hidden;
-font-size: 0.5px;
-}
-.ContentArea {
-background-color: white;
-padding: 0.8em 10% 0 10%;
-font-size: 1.0em;
-}
-a:hover {
-color: red;
-}
-h1, h2 {
-margin: 0px;
-font-size: 1.0em;
-}
-h2 {
-background: #9fbfd8;
-font-size: 1.2em;
-font-weight: bold;
-text-align: center;
-}
-h1 {
-background: #dbe5df;
-font: bold 1.5em Gill Sans MT, Gill Sans, Helvetica, Humanist, sans-serif;
-text-transform: uppercase;
-text-align: center;
-width: 100%;
-padding-top:0.8em;
-}
---
+style
+* { margin: 0; padding: 0; }
+body { background: #fff; font: 14px/1.6 sans-serif; color: #333; }
+.content { margin: 7% auto 0; padding: 2em 1em 1em; max-width: 560px; }
+.footer { clear: both; margin-top: 14%; border-top: 1px solid #e5e5e5;
padding: 2em 0; background: #f9f9f9; font-size: 0.8em; text-align: center; }
+img { float: left; margin: 0 2em 2em 0; }
+a img { border: 0; }
+h1 { margin-top: 1em; font-size: 1.2em; }
+p { margin: 0.7em 0 1em 0; }
+a { color: #0645AD; text-decoration: none; }
+a:hover { text-decoration: underline; }
+em { font-style: normal; color: #777; }
/style
-script/*![CDATA[*/
- function lines(s) {
- var c = s.split(' ');
- for (var i = 0; i c.length; i++) {
- document.write('div class=Lines
style=background-color:#' + c[i] + ';/div');
- }
- }
-//]]/script
-/head
-
-body link=#24442E text=#00 vlink=#24442E alink=#FF
-h1Wikimedia Foundation/h1
-scriptlines('ccd4cf bdc3bf adb1af 9ea09f dbe5df');/script
-
-h2Error/h2
-
-scriptlines('8f8f8f acacac c6c6c6 dbdbdb eaeaea f4f4f4');/script
-
-!-- BEGIN CONTENT AREA --
-div class=ContentArea
-
-div id=en lang=en
-pOur servers are currently experiencing a technical problem. This is
probably temporary and should be fixed soon. Please a href=} +
regsuball(req.url, {[`]}, ) + { onclick=window.location.reload(false);
return falsetry again/a in a few minutes./p
-hr noshade=noshade size=1px width=80% /
-div class=TechnicalStuff
-If you report this error to the Wikimedia System Administrators, please
include the details below.br/
+div class=content role=main
+a href=//www.wikimedia.orgimg
src=//www.wikimedia.org/static/images/wmf.png
srcset=//www.wikimedia.org/static/images/wmf-2x.png 2x alt=Wikimedia
width=135 height=135/a
+h1Error/h1
+pOur servers are currently experiencing a technical problem. This is
probably temporary and should be fixed soon.brPlease a href=
onclick=window.location.reload(false); return falsetry again/a in a few
minutes./p
/div
-div class=TechnicalStuff
-bdo dir=ltr
+div class=footer
+pIf you report this error to the Wikimedia System Administrators, please
include the details below./p
+em
Request: } + req.request + http://; + req.http.host + regsuball(req.url,
, %3C) + , from + client.ip + via
[MediaWiki-commits] [Gerrit] Enable WikibaseQuality and WikibaseQualityConstraints on wik... - change (operations/mediawiki-config)
jenkins-bot has submitted this change and it was merged. Change subject: Enable WikibaseQuality and WikibaseQualityConstraints on wikidata .. Enable WikibaseQuality and WikibaseQualityConstraints on wikidata Bug: T99351 Bug: T99354 Change-Id: Id844d225247f73ce49d87fc1faa8ddcc44803f41 --- M wmf-config/InitialiseSettings-labs.php M wmf-config/InitialiseSettings.php 2 files changed, 1 insertion(+), 5 deletions(-) Approvals: Hoo man: Looks good to me, approved JanZerebecki: Looks good to me, but someone else must approve jenkins-bot: Verified diff --git a/wmf-config/InitialiseSettings-labs.php b/wmf-config/InitialiseSettings-labs.php index 3298df5..d8a6a2f 100644 --- a/wmf-config/InitialiseSettings-labs.php +++ b/wmf-config/InitialiseSettings-labs.php @@ -1118,9 +1118,5 @@ 'private' = false, ), - 'wmgUseWikibaseQuality' = array( - 'default' = true, - ), - ); } # wmflLabsSettings() diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index a2ef0c9..a5af4a7 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -15025,7 +15025,7 @@ 'wmgUseWikibaseQuality' = array( 'default' = false, - 'testwikidatawiki' = true, + 'wikidata' = true, ), 'wmgUseTemplateSandbox' = array( -- To view, visit https://gerrit.wikimedia.org/r/223011 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Id844d225247f73ce49d87fc1faa8ddcc44803f41 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Hoo man h...@online.de Gerrit-Reviewer: Hoo man h...@online.de Gerrit-Reviewer: JanZerebecki jan.wikime...@zerebecki.de Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] labstore: Fix stupid typo - change (operations/puppet)
Yuvipanda has uploaded a new change for review. https://gerrit.wikimedia.org/r/223013 Change subject: labstore: Fix stupid typo .. labstore: Fix stupid typo GrumblGrumbl python-jedi autocomplete Change-Id: I64e68a5ba22a69218e48721b9f2a39886025f9f8 --- M modules/labstore/files/nfs-project-exports-daemon 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/13/223013/1 diff --git a/modules/labstore/files/nfs-project-exports-daemon b/modules/labstore/files/nfs-project-exports-daemon index 998e8ca..de7f057 100755 --- a/modules/labstore/files/nfs-project-exports-daemon +++ b/modules/labstore/files/nfs-project-exports-daemon @@ -196,6 +196,6 @@ while True: projects = get_projects_with_nfs(args.projects_config_path) sync_exports_files(projects, args.exports_d_path) -if not args._dry_run: +if not args.dry_run: exportfs() time.sleep(60) -- To view, visit https://gerrit.wikimedia.org/r/223013 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I64e68a5ba22a69218e48721b9f2a39886025f9f8 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Yuvipanda yuvipa...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] fixed notice, produced fatal - change (mediawiki...BlueSpiceExtensions)
jenkins-bot has submitted this change and it was merged.
Change subject: fixed notice, produced fatal
..
fixed notice, produced fatal
Change-Id: I33cba4c8a00e576c23dead72f6311c8e89e6b3b2
---
M Flexiskin/includes/FlexiskinApi.class.php
1 file changed, 1 insertion(+), 0 deletions(-)
Approvals:
Robert Vogel: Looks good to me, approved
jenkins-bot: Verified
diff --git a/Flexiskin/includes/FlexiskinApi.class.php
b/Flexiskin/includes/FlexiskinApi.class.php
index 5ce90bc..a137a4b 100644
--- a/Flexiskin/includes/FlexiskinApi.class.php
+++ b/Flexiskin/includes/FlexiskinApi.class.php
@@ -32,6 +32,7 @@
if (!$oStatus-isGood()){
return array();
}
+ $aData = array ();
if ( $handle = opendir( $oStatus-getValue() ) ) {
while ( false !== ($entry = readdir( $handle )) ) {
if ( $entry != . $entry != .. ) {
--
To view, visit https://gerrit.wikimedia.org/r/222995
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I33cba4c8a00e576c23dead72f6311c8e89e6b3b2
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: master
Gerrit-Owner: Tweichart weich...@hallowelt.biz
Gerrit-Reviewer: Mglaser gla...@hallowelt.biz
Gerrit-Reviewer: Pwirth wi...@hallowelt.biz
Gerrit-Reviewer: Robert Vogel vo...@hallowelt.biz
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Set PHPCS' LineLength sniff to 170 characters - change (mediawiki...Wikibase)
Thiemo Mättig (WMDE) has uploaded a new change for review.
https://gerrit.wikimedia.org/r/223016
Change subject: Set PHPCS' LineLength sniff to 170 characters
..
Set PHPCS' LineLength sniff to 170 characters
This patch decreases the line length from 200 to 170 characters and
fixes all code that exceeds this limit.
I'm also doing a little bit of additional fixes in closely related
code, most notably:
* Add the missing space at the end of some array() calls.
* Fix the only class that breaks the NotCamelCaps rule.
* Add an exception for the Scribunto_LuaWikibase... classes.
Change-Id: I5f5a81b2db4f9f464ff9f34195bcefc870417f33
---
M client/WikibaseClient.i18n.magic.php
M phpcs.xml
M repo/includes/api/CreateClaim.php
M repo/maintenance/importProperties.php
M repo/tests/phpunit/includes/Diff/ClaimDifferenceVisualizerTest.php
M repo/tests/phpunit/includes/api/EditEntityTest.php
M repo/tests/phpunit/includes/api/SetSiteLinkTest.php
M repo/tests/phpunit/includes/rdf/ComplexValueRdfBuilderTest.php
M view/tests/phpunit/SiteLinksViewTest.php
9 files changed, 606 insertions(+), 163 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/16/223016/1
diff --git a/client/WikibaseClient.i18n.magic.php
b/client/WikibaseClient.i18n.magic.php
index ddfb492..ac62caf 100644
--- a/client/WikibaseClient.i18n.magic.php
+++ b/client/WikibaseClient.i18n.magic.php
@@ -85,7 +85,11 @@
/** Hindi (हिन्दी) */
$magicWords['hi'] = array(
- 'noexternallanglinks' = array( 0, 'कोई_अंतरविकी_कड़ियाँ_नहीं',
'कोई_अंतरविकि_कड़ियाँ_नहीं' ),
+ 'noexternallanglinks' = array(
+ 0,
+ 'कोई_अंतरविकी_कड़ियाँ_नहीं',
+ 'कोई_अंतरविकि_कड़ियाँ_नहीं'
+ ),
'property' = array( 0, 'गुण' ),
);
diff --git a/phpcs.xml b/phpcs.xml
index 4d6c360..e08e01b 100644
--- a/phpcs.xml
+++ b/phpcs.xml
@@ -14,7 +14,7 @@
rule ref=Generic.Files.LineLength
properties
!-- FIXME: Should be decreased to 100, preferably in
steps of 10. --
- property name=lineLimit value=200 /
+ property name=lineLimit value=170 /
property name=absoluteLineLimit value= /
/properties
/rule
@@ -53,10 +53,9 @@
rule ref=PSR2.ControlStructures.ElseIfDeclaration /
rule ref=PSR2.Methods.MethodDeclaration /
- !-- TODO: Enable Squiz sniffs. --
- !-- FIXME: This indicates an error in the Wikibase codebase that
should be fixed. --
rule ref=Squiz.Classes.ValidClassName.NotCamelCaps
- severity0/severity
+ !-- FIXME: This indicates an error in the Wikibase codebase
that should be fixed. --
+
exclude-patternDataAccess*Scribunto*Scribunto_LuaWikibase*Library/exclude-pattern
/rule
rule ref=Squiz.ControlStructures.ControlSignature /
!-- FIXME: This indicates an error in the Wikibase codebase that
should be fixed. --
diff --git a/repo/includes/api/CreateClaim.php
b/repo/includes/api/CreateClaim.php
index f8f4421..87515be 100644
--- a/repo/includes/api/CreateClaim.php
+++ b/repo/includes/api/CreateClaim.php
@@ -158,9 +158,12 @@
='apihelp-wbcreateclaim-example-1',
'action=wbcreateclaimentity=Q42property=P9002snaktype=valuevalue=itsastring'
= 'apihelp-wbcreateclaim-example-2',
-
'action=wbcreateclaimentity=Q42property=P9003snaktype=valuevalue={entity-type:item,numeric-id:1}'
+
'action=wbcreateclaimentity=Q42property=P9003snaktype=valuevalue='
+ . '{entity-type:item,numeric-id:1}'
= 'apihelp-wbcreateclaim-example-3',
-
'action=wbcreateclaimentity=Q42property=P9004snaktype=valuevalue={latitude:40.748433,longitude:-73.985656,globe:http://www.wikidata.org/entity/Q2,precision:0.01}'
+
'action=wbcreateclaimentity=Q42property=P9004snaktype=valuevalue='
+ .
'{latitude:40.748433,longitude:-73.985656,'
+ .
'globe:http://www.wikidata.org/entity/Q2,precision:0.01}'
= 'apihelp-wbcreateclaim-example-4',
);
}
diff --git a/repo/maintenance/importProperties.php
b/repo/maintenance/importProperties.php
index 28f010c..d2ed96a 100644
--- a/repo/maintenance/importProperties.php
+++ b/repo/maintenance/importProperties.php
@@ -1,5 +1,10 @@
?php
+namespace Wikibase;
+
+use Exception;
+use Maintenance;
+use User;
use Wikibase\DataModel\Entity\Property;
use Wikibase\Lib\Store\EntityStore;
use Wikibase\Repo\WikibaseRepo;
@@ -24,7 +29,7 @@
require_once $basePath . '/maintenance/Maintenance.php';
-class importProperties extends
[MediaWiki-commits] [Gerrit] labstore: Fix stupid typo - change (operations/puppet)
Yuvipanda has submitted this change and it was merged. Change subject: labstore: Fix stupid typo .. labstore: Fix stupid typo GrumblGrumbl python-jedi autocomplete Change-Id: I64e68a5ba22a69218e48721b9f2a39886025f9f8 --- M modules/labstore/files/nfs-project-exports-daemon 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Yuvipanda: Verified; Looks good to me, approved diff --git a/modules/labstore/files/nfs-project-exports-daemon b/modules/labstore/files/nfs-project-exports-daemon index 998e8ca..de7f057 100755 --- a/modules/labstore/files/nfs-project-exports-daemon +++ b/modules/labstore/files/nfs-project-exports-daemon @@ -196,6 +196,6 @@ while True: projects = get_projects_with_nfs(args.projects_config_path) sync_exports_files(projects, args.exports_d_path) -if not args._dry_run: +if not args.dry_run: exportfs() time.sleep(60) -- To view, visit https://gerrit.wikimedia.org/r/223013 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I64e68a5ba22a69218e48721b9f2a39886025f9f8 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Yuvipanda yuvipa...@gmail.com Gerrit-Reviewer: Yuvipanda yuvipa...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Toolbar: Let's remove a speedup loop... - change (mediawiki...WikiEditor)
TheDJ has uploaded a new change for review.
https://gerrit.wikimedia.org/r/223017
Change subject: Toolbar: Let's remove a speedup loop...
..
Toolbar: Let's remove a speedup loop...
Change-Id: I3e965dda1c48195d7c11f1d7f23a09dd8447cfc7
---
M modules/jquery.wikiEditor.toolbar.js
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikiEditor
refs/changes/17/223017/1
diff --git a/modules/jquery.wikiEditor.toolbar.js
b/modules/jquery.wikiEditor.toolbar.js
index 60d15ad..0717b59 100644
--- a/modules/jquery.wikiEditor.toolbar.js
+++ b/modules/jquery.wikiEditor.toolbar.js
@@ -636,7 +636,7 @@
$section.trigger( 'loadSection' );
animate( $that
);
$that.removeClass( 'loading' );
- }, 1000 );
+ } );
} else {
animate( $( this ) );
$( this ).addClass(
'current' );
--
To view, visit https://gerrit.wikimedia.org/r/223017
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I3e965dda1c48195d7c11f1d7f23a09dd8447cfc7
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikiEditor
Gerrit-Branch: master
Gerrit-Owner: TheDJ hartman.w...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Enable WikibaseQuality and WikibaseQualityConstraints on wik... - change (operations/mediawiki-config)
Hoo man has uploaded a new change for review. https://gerrit.wikimedia.org/r/223011 Change subject: Enable WikibaseQuality and WikibaseQualityConstraints on wikidata .. Enable WikibaseQuality and WikibaseQualityConstraints on wikidata Bug: T99351 Bug: T99354 Change-Id: Id844d225247f73ce49d87fc1faa8ddcc44803f41 --- M wmf-config/InitialiseSettings-labs.php M wmf-config/InitialiseSettings.php 2 files changed, 1 insertion(+), 5 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/11/223011/1 diff --git a/wmf-config/InitialiseSettings-labs.php b/wmf-config/InitialiseSettings-labs.php index 3298df5..d8a6a2f 100644 --- a/wmf-config/InitialiseSettings-labs.php +++ b/wmf-config/InitialiseSettings-labs.php @@ -1118,9 +1118,5 @@ 'private' = false, ), - 'wmgUseWikibaseQuality' = array( - 'default' = true, - ), - ); } # wmflLabsSettings() diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index a2ef0c9..a5af4a7 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -15025,7 +15025,7 @@ 'wmgUseWikibaseQuality' = array( 'default' = false, - 'testwikidatawiki' = true, + 'wikidata' = true, ), 'wmgUseTemplateSandbox' = array( -- To view, visit https://gerrit.wikimedia.org/r/223011 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id844d225247f73ce49d87fc1faa8ddcc44803f41 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Hoo man h...@online.de ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update WikibaseQuality and WikibaseQualityConstraint - change (mediawiki...Wikidata)
jenkins-bot has submitted this change and it was merged.
Change subject: Update WikibaseQuality and WikibaseQualityConstraint
..
Update WikibaseQuality and WikibaseQualityConstraint
Change-Id: I07699e7c701e471995443aaa3710e9e4b2874ccd
---
M extensions/Constraints/i18n/en.json
M extensions/Constraints/i18n/qqq.json
M
extensions/Constraints/includes/ConstraintCheck/Checker/DiffWithinRangeChecker.php
M extensions/Constraints/includes/ConstraintCheck/Checker/FormatChecker.php
M extensions/Constraints/includes/ConstraintCheck/Checker/RangeChecker.php
M extensions/Constraints/includes/ConstraintCheck/Checker/UniqueValueChecker.php
M extensions/Constraints/includes/ConstraintCheck/Result/CheckResult.php
M extensions/Constraints/includes/ConstraintRepository.php
M extensions/Constraints/maintenance/UpdateTable.php
M extensions/Constraints/specials/SpecialConstraintReport.php
M extensions/Constraints/sql/create_wbqc_constraints.sql
M extensions/Quality/WikibaseQuality.php
M extensions/Quality/WikibaseQualityHooks.php
D extensions/Quality/sql/create_wbq_evaluation.sql
D extensions/Quality/sql/create_wbq_violations.sql
M vendor/composer/ClassLoader.php
M vendor/composer/autoload_classmap.php
M vendor/composer/installed.json
18 files changed, 154 insertions(+), 171 deletions(-)
Approvals:
Hoo man: Looks good to me, approved
jenkins-bot: Verified
diff --git a/extensions/Constraints/i18n/en.json
b/extensions/Constraints/i18n/en.json
index 0bc8341..b555edd 100644
--- a/extensions/Constraints/i18n/en.json
+++ b/extensions/Constraints/i18n/en.json
@@ -3,6 +3,7 @@
authors: BP2014N1
},
wbqc-constraintreport: Constraint report,
+ wbqc-desc: Checks constraints on both items and properties and
displays the results on a special page,
wbqc-constraintreport-explanation-part-one: This special page
performs constraint checks on every entity you want. The entities are fetched
from the live system so every constraint violation you fix there will be
instantly removed from this list.,
wbqc-constraintreport-explanation-part-two: The constraints are
parsed from the property talk pages once a week, so if you add/delete/modify a
constraint it might take up to a week until this gets taken into account by
this constraint report. There is currently work in progress to migrate the
constraints to statements on properties, enabling this special page to do
live-checks.,
wbqc-constraintreport-form-section: Check constraints for entity,
@@ -31,6 +32,7 @@
wbqc-violation-message-not-yet-implemented: For technical reasons,
the check for the constraint \$1\ has not yet been implemented.,
+ wbqc-violation-message-security-reason: For security reasons, it is
not possible to check the \$1\ constraint at the moment. We are working on a
solution.,
wbqc-violation-message-value-needed: Properties with constraint
\$1\ need to have a value.,
wbqc-violation-message-value-needed-of-type: Properties with
constraint \$1\ need to have values of type \$2\.,
wbqc-violation-message-parameter-needed: Properties with constraint
\$1\ need a parameter \$2\.,
diff --git a/extensions/Constraints/i18n/qqq.json
b/extensions/Constraints/i18n/qqq.json
index a9bb93f..1c3d09a 100644
--- a/extensions/Constraints/i18n/qqq.json
+++ b/extensions/Constraints/i18n/qqq.json
@@ -6,6 +6,7 @@
]
},
wbqc-constraintreport: {{doc-special|ConstraintReport}},
+ wbqc-desc: {{desc|name=Wikibase Quality
Constraints|url=https://www.mediawiki.org/wiki/Extension:WikibaseQualityConstraints}};,
wbqc-constraintreport-explanation-part-one: Explanation (part one),
what this special page does and how it gets its data.,
wbqc-constraintreport-explanation-part-two: Explanation (part two),
what this special page does and how it gets its data.,
wbqc-constraintreport-form-section: Header of the section of the
entity id form.,
@@ -31,6 +32,7 @@
wbqc-violations-group: Type of violations this extension
finds.\n{{Identical|Constraint}},
wbqc-violation-message: Generic message to tell that there was a
violation.,
wbqc-violation-message-not-yet-implemented: Message for when a check
is yet to be implemented. Not actually a violation, more of a todo.,
+ wbqc-violation-message-security-reason: Message for when a check is
not possible due to security reasons. Not actually a violation, more of a
todo.,
wbqc-violation-message-value-needed: Message for when a property
needs a value (rather than no or some value), but hasn't.,
wbqc-violation-message-value-needed-of-type: Message for when a
property needs a value of a specific type (like string or wikibase-entityid),
but it doesn't.,
wbqc-violation-message-parameter-needed: Message for when a
constraint needs a specific parameter, but it's missing.,
diff
[MediaWiki-commits] [Gerrit] labstore: Minor code cleanup of the exports daemon - change (operations/puppet)
Yuvipanda has submitted this change and it was merged.
Change subject: labstore: Minor code cleanup of the exports daemon
..
labstore: Minor code cleanup of the exports daemon
Change-Id: I5f39013beaceee39d2a05fdc1ed43ac92e5ad79e
---
M modules/labstore/files/nfs-project-exports-daemon
1 file changed, 21 insertions(+), 12 deletions(-)
Approvals:
Yuvipanda: Verified; Looks good to me, approved
diff --git a/modules/labstore/files/nfs-project-exports-daemon
b/modules/labstore/files/nfs-project-exports-daemon
index 47901df..998e8ca 100755
--- a/modules/labstore/files/nfs-project-exports-daemon
+++ b/modules/labstore/files/nfs-project-exports-daemon
@@ -122,23 +122,21 @@
logging.info('Fetched config for project %s, with %s instances',
name, len(project.instance_ips))
-return projects
-
-
-def manage_exports(exports_d_base, projects_config_path):
-
-Collects projets that need exports, and then do the exports
-
-projects = get_projects_with_nfs(projects_config_path)
-logging.info(Found %s projects requiring private mounts, len(projects))
-
# Validate that there are no duplicate gids
-gids = [project.gid for project in projects]
+gids = [p.gid for p in projects]
if len(set(gids)) != len(gids):
# OMG DUPLICATES
logging.error('Duplicate GIDs found in project config, aborting')
sys.exit(1)
+logging.info(Found %s projects requiring private mounts, len(projects))
+return projects
+
+
+def sync_exports_files(projects, exports_d_base):
+
+Generate exports files for syncfs
+
for project in projects:
logging.debug('Writing exports file for %s', project.name)
path = os.path.join(exports_d_base, '%s.exports' % project.name)
@@ -147,6 +145,9 @@
logging.info('Wrote exports file for %s', project.name)
logging.debug('Attempting to exportfs')
+
+
+def exportfs():
try:
subprocess.check_call([
'/usr/bin/sudo',
@@ -173,6 +174,11 @@
help='Turn on debug logging',
action='store_true'
)
+argparser.add_argument(
+'--dry-run',
+help='Do a dry run, do not call exportfs',
+action='store_true'
+)
args = argparser.parse_args()
@@ -188,5 +194,8 @@
logging.info('Daemon starting')
while True:
-manage_exports(args.exports_d_path, args.projects_config_path)
+projects = get_projects_with_nfs(args.projects_config_path)
+sync_exports_files(projects, args.exports_d_path)
+if not args._dry_run:
+exportfs()
time.sleep(60)
--
To view, visit https://gerrit.wikimedia.org/r/222690
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I5f39013beaceee39d2a05fdc1ed43ac92e5ad79e
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Yuvipanda yuvipa...@gmail.com
Gerrit-Reviewer: Yuvipanda yuvipa...@gmail.com
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] build: Move config to phpcs.xml and require php 5.3.3 - change (mediawiki...Vector)
Krinkle has uploaded a new change for review.
https://gerrit.wikimedia.org/r/223014
Change subject: build: Move config to phpcs.xml and require php 5.3.3
..
build: Move config to phpcs.xml and require php 5.3.3
* Reformat without all the spurious spaces.
* Update php requirement to 5.3.3 to match MediaWiki core and
other Wikimedia libraries.
* Update php-parallel-lint to v0.9.
* Move phpcs config to a separate file.
Change-Id: I30895c87dd082dfae0a1b95237d5619ae89fa6fe
---
M composer.json
A phpcs.xml
2 files changed, 24 insertions(+), 17 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/Vector
refs/changes/14/223014/1
diff --git a/composer.json b/composer.json
index 0a8b5df..ab93dc0 100644
--- a/composer.json
+++ b/composer.json
@@ -1,45 +1,45 @@
{
- name : mediawiki/vector-skin,
- type : mediawiki-skin,
+ name: mediawiki/vector-skin,
+ type: mediawiki-skin,
description: Modern version of the MonoBook skin,
- keywords : [
+ keywords: [
wiki,
MediaWiki,
skin
],
- homepage : https://www.mediawiki.org/wiki/Skin:Vector;,
- license: GPL-2.0+,
- authors: [
+ homepage: https://www.mediawiki.org/wiki/Skin:Vector;,
+ license: GPL-2.0+,
+ authors: [
{
- name : Trevor Parscal
+ name: Trevor Parscal
},
{
- name : Roan Kattouw
+ name: Roan Kattouw
}
],
- support: {
- wiki : https://www.mediawiki.org/wiki/Skin:Vector;,
- forum : https://www.mediawiki.org/wiki/Skin_talk:Vector;,
+ support: {
+ wiki: https://www.mediawiki.org/wiki/Skin:Vector;,
+ forum: https://www.mediawiki.org/wiki/Skin_talk:Vector;,
source:
https://git.wikimedia.org/summary/mediawiki%2Fskins%2FVector;,
- irc : irc://irc.freenode.org/mediawiki
+ irc: irc://irc.freenode.org/mediawiki
},
- require: {
- php: =5.3.2,
+ require: {
+ php: =5.3.3,
composer/installers: 1.0.12
},
- extra : {
+ extra: {
branch-alias: {
dev-master: 1.x-dev
}
},
require-dev: {
- jakub-onderka/php-parallel-lint: 0.8.*,
+ jakub-onderka/php-parallel-lint: 0.9.*,
mediawiki/mediawiki-codesniffer: 0.3.0
},
scripts: {
test: [
parallel-lint . --exclude vendor,
- phpcs
--standard=vendor/mediawiki/mediawiki-codesniffer/MediaWiki
--extensions=php,php5,inc --ignore=vendor -p .
+ phpcs -p
]
}
diff --git a/phpcs.xml b/phpcs.xml
new file mode 100644
index 000..cb19440
--- /dev/null
+++ b/phpcs.xml
@@ -0,0 +1,7 @@
+?xml version=1.0?
+ruleset
+ rule ref=vendor/mediawiki/mediawiki-codesniffer/MediaWiki/
+ file./file
+ arg name=extensions value=php/
+ exclude-patternvendor/exclude-pattern
+/ruleset
--
To view, visit https://gerrit.wikimedia.org/r/223014
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I30895c87dd082dfae0a1b95237d5619ae89fa6fe
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/Vector
Gerrit-Branch: master
Gerrit-Owner: Krinkle krinklem...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] changed selector for better match, was overwritten in mw 1.24 - change (mediawiki...BlueSpiceExtensions)
jenkins-bot has submitted this change and it was merged.
Change subject: changed selector for better match, was overwritten in mw 1.24
..
changed selector for better match, was overwritten in mw 1.24
Change-Id: I3e68e0d1b353c1754849f2a1ee729dd8278944df
---
M ExtendedEditBar/resources/bluespice.extendedEditBar.css
1 file changed, 9 insertions(+), 9 deletions(-)
Approvals:
Robert Vogel: Looks good to me, approved
jenkins-bot: Verified
diff --git a/ExtendedEditBar/resources/bluespice.extendedEditBar.css
b/ExtendedEditBar/resources/bluespice.extendedEditBar.css
index 724723d..9a311b0 100644
--- a/ExtendedEditBar/resources/bluespice.extendedEditBar.css
+++ b/ExtendedEditBar/resources/bluespice.extendedEditBar.css
@@ -31,47 +31,47 @@
border: 1px solid #cfcfcf
}
-#mw-editbutton-bold {
+#bs-extendededitbar #mw-editbutton-bold {
/*@embed*/
background-image: url(images/button_format-bold.png);
}
-#mw-editbutton-italic {
+#bs-extendededitbar #mw-editbutton-italic {
/*@embed*/
background-image: url(images/button_format-italic.png);
}
-#mw-editbutton-headline {
+#bs-extendededitbar #mw-editbutton-headline {
/*@embed*/
background-image: url(images/button_format-h2.png);
}
-#mw-editbutton-link {
+#bs-extendededitbar #mw-editbutton-link {
/*@embed*/
background-image: url(images/button_internal-link.png);
}
-#mw-editbutton-extlink {
+#bs-extendededitbar #mw-editbutton-extlink {
/*@embed*/
background-image: url(images/button_external-link.png);
}
-#mw-editbutton-strike {
+#bs-extendededitbar #mw-editbutton-strike {
/*@embed*/
background-image: url(images/button_format-struck.png);
}
-#mw-editbutton-image {
+#bs-extendededitbar #mw-editbutton-image {
/*@embed*/
background-image: url(images/button_filelink.png);
}
-#mw-editbutton-media {
+#bs-extendededitbar #mw-editbutton-media {
/*@embed*/
background-image: url(images/button_medialink.png);
}
-#mw-editbutton-signature {
+#bs-extendededitbar #mw-editbutton-signature {
/*@embed*/
background-image: url(images/button_signatur.png);
}
--
To view, visit https://gerrit.wikimedia.org/r/222546
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I3e68e0d1b353c1754849f2a1ee729dd8278944df
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: master
Gerrit-Owner: Tweichart weich...@hallowelt.biz
Gerrit-Reviewer: Mglaser gla...@hallowelt.biz
Gerrit-Reviewer: Pwirth wi...@hallowelt.biz
Gerrit-Reviewer: Robert Vogel vo...@hallowelt.biz
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] changed selector for better match, was overwritten in mw 1.24 - change (mediawiki...BlueSpiceExtensions)
Robert Vogel has uploaded a new change for review.
https://gerrit.wikimedia.org/r/223015
Change subject: changed selector for better match, was overwritten in mw 1.24
..
changed selector for better match, was overwritten in mw 1.24
Change-Id: I3e68e0d1b353c1754849f2a1ee729dd8278944df
---
M ExtendedEditBar/resources/bluespice.extendedEditBar.css
1 file changed, 9 insertions(+), 9 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceExtensions
refs/changes/15/223015/1
diff --git a/ExtendedEditBar/resources/bluespice.extendedEditBar.css
b/ExtendedEditBar/resources/bluespice.extendedEditBar.css
index 724723d..9a311b0 100644
--- a/ExtendedEditBar/resources/bluespice.extendedEditBar.css
+++ b/ExtendedEditBar/resources/bluespice.extendedEditBar.css
@@ -31,47 +31,47 @@
border: 1px solid #cfcfcf
}
-#mw-editbutton-bold {
+#bs-extendededitbar #mw-editbutton-bold {
/*@embed*/
background-image: url(images/button_format-bold.png);
}
-#mw-editbutton-italic {
+#bs-extendededitbar #mw-editbutton-italic {
/*@embed*/
background-image: url(images/button_format-italic.png);
}
-#mw-editbutton-headline {
+#bs-extendededitbar #mw-editbutton-headline {
/*@embed*/
background-image: url(images/button_format-h2.png);
}
-#mw-editbutton-link {
+#bs-extendededitbar #mw-editbutton-link {
/*@embed*/
background-image: url(images/button_internal-link.png);
}
-#mw-editbutton-extlink {
+#bs-extendededitbar #mw-editbutton-extlink {
/*@embed*/
background-image: url(images/button_external-link.png);
}
-#mw-editbutton-strike {
+#bs-extendededitbar #mw-editbutton-strike {
/*@embed*/
background-image: url(images/button_format-struck.png);
}
-#mw-editbutton-image {
+#bs-extendededitbar #mw-editbutton-image {
/*@embed*/
background-image: url(images/button_filelink.png);
}
-#mw-editbutton-media {
+#bs-extendededitbar #mw-editbutton-media {
/*@embed*/
background-image: url(images/button_medialink.png);
}
-#mw-editbutton-signature {
+#bs-extendededitbar #mw-editbutton-signature {
/*@embed*/
background-image: url(images/button_signatur.png);
}
--
To view, visit https://gerrit.wikimedia.org/r/223015
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I3e68e0d1b353c1754849f2a1ee729dd8278944df
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: REL1_23
Gerrit-Owner: Robert Vogel vo...@hallowelt.biz
Gerrit-Reviewer: Tweichart weich...@hallowelt.biz
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Make search API output very similar to view-topiclist - change (mediawiki...Flow)
Matthias Mullie has uploaded a new change for review.
https://gerrit.wikimedia.org/r/223018
Change subject: Make search API output very similar to view-topiclist
..
Make search API output very similar to view-topiclist
Bug: T104582
Change-Id: Iae898b64e2da157549073741c1d89c61224c2f16
---
M autoload.php
M container.php
M includes/Api/ApiFlowSearch.php
D includes/Formatter/SearchQuery.php
M includes/Formatter/TopicListFormatter.php
5 files changed, 39 insertions(+), 99 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Flow
refs/changes/18/223018/1
diff --git a/autoload.php b/autoload.php
index d330e1c..d8d410c 100644
--- a/autoload.php
+++ b/autoload.php
@@ -153,7 +153,6 @@
'Flow\\Formatter\\RevisionUndoViewFormatter' = __DIR__ .
'/includes/Formatter/RevisionUndoViewFormatter.php',
'Flow\\Formatter\\RevisionViewFormatter' = __DIR__ .
'/includes/Formatter/RevisionViewFormatter.php',
'Flow\\Formatter\\RevisionViewQuery' = __DIR__ .
'/includes/Formatter/RevisionViewQuery.php',
- 'Flow\\Formatter\\SearchQuery' = __DIR__ .
'/includes/Formatter/SearchQuery.php',
'Flow\\Formatter\\SinglePostQuery' = __DIR__ .
'/includes/Formatter/SinglePostQuery.php',
'Flow\\Formatter\\TocTopicListFormatter' = __DIR__ .
'/includes/Formatter/TocTopicListFormatter.php',
'Flow\\Formatter\\TopicFormatter' = __DIR__ .
'/includes/Formatter/TopicFormatter.php',
diff --git a/container.php b/container.php
index ffb4d33..eb7f1b3 100644
--- a/container.php
+++ b/container.php
@@ -1005,12 +1005,6 @@
$c['formatter.revision']
);
};
-$c['query.search'] = function( $c ) {
- return new Flow\Formatter\SearchQuery(
- $c['storage'],
- $c['repository.tree']
- );
-};
$c['searchindex.updaters'] = function( $c ) {
// permissions for anon user
$anonPermissions = new Flow\RevisionActionPermissions(
$c['flow_actions'], new User );
diff --git a/includes/Api/ApiFlowSearch.php b/includes/Api/ApiFlowSearch.php
index a8c569e..01a84d8 100644
--- a/includes/Api/ApiFlowSearch.php
+++ b/includes/Api/ApiFlowSearch.php
@@ -5,8 +5,9 @@
use ApiBase;
use Flow\Container;
use Flow\Exception\InvalidDataException;
-use Flow\Formatter\RevisionFormatter;
-use Flow\Formatter\SearchQuery;
+use Flow\Formatter\TopicListFormatter;
+use Flow\Formatter\TopicListQuery;
+use Flow\Model\UUID;
use Flow\Search\Connection;
use Flow\Search\SearchEngine;
use Flow\TalkpageManager;
@@ -15,18 +16,12 @@
class ApiFlowSearch extends ApiFlowBaseGet {
/**
-* @var SearchQuery
-*/
- protected $query;
-
- /**
* @var SearchEngine
*/
protected $searchEngine;
public function __construct( $api, $modName ) {
parent::__construct( $api, $modName, 'q' );
- $this-query = Container::get( 'query.search' );
$this-searchEngine = new SearchEngine();
}
@@ -65,22 +60,43 @@
// result can be null, if nothing was found
$results = $result === null ? array() : $result-getResults();
- $rows = $this-query-getResults( $results );
- $results = array(
+ $topicIds = array();
+ foreach ( $results as $topic ) {
+ $topicIds[] = UUID::create( $topic-getId() );
+ }
+
+ // output similar to view-topiclist
+ $results = $this-formatApi( $topicIds );
+ // search-specific output
+ $results += array(
'total' = $result-getTotalHits(),
'rows' = array(),
);
- /** @var RevisionFormatter $formatter */
- $formatter = Container::get( 'formatter.revision' );
- foreach ( $rows as $row ) {
- $results['rows'][] = $formatter-formatApi( $row,
$this-getContext() );
- }
-
$this-getResult()-addValue( null, $this-getModuleName(),
$results );
}
/**
+* Given an array of topic UUIDs, we'll use TopicListQuery
TopicListFormatter
+* to return API output very similar to ApiFlowViewTopicList.
+*
+* @param array $topicIds
+* @return array
+*/
+ protected function formatApi( array $topicIds ) {
+ /** @var TopicListQuery $query */
+ $query = Container::get( 'query.topiclist' );
+ $found = $query-getResults( $topicIds );
+
+ $storage = Container::get( 'storage' );
+ $workflows = $storage-getMulti( 'Workflow', $topicIds );
+
+ /** @var TopicListFormatter $serializer */
+ $serializer = Container::get( 'formatter.topiclist' );
+ return $serializer-buildResult( $workflows,
[MediaWiki-commits] [Gerrit] [WIP] labstore: Consolidate NFS exporting into daemon - change (operations/puppet)
Yuvipanda has uploaded a new change for review.
https://gerrit.wikimedia.org/r/223020
Change subject: [WIP] labstore: Consolidate NFS exporting into daemon
..
[WIP] labstore: Consolidate NFS exporting into daemon
Change-Id: Ib5d55e784daa603812a97815b4ef44d9906eb2a1
---
R modules/labstore/files/nfs-exports-daemon
A modules/labstore/files/nfs-mounts.yaml
D modules/labstore/files/projects-nfs-config.yaml
M modules/labstore/lib/puppet/parser/functions/mount_nfs_volume.rb
M modules/labstore/manifests/fileserver/exports/private.pp
A modules/labstore/templates/initscripts/nfs-exports.systemd.erb
D modules/labstore/templates/initscripts/nfs-project-exports.systemd.erb
7 files changed, 321 insertions(+), 305 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/20/223020/1
diff --git a/modules/labstore/files/nfs-project-exports-daemon
b/modules/labstore/files/nfs-exports-daemon
similarity index 86%
rename from modules/labstore/files/nfs-project-exports-daemon
rename to modules/labstore/files/nfs-exports-daemon
index de7f057..6bcc779 100755
--- a/modules/labstore/files/nfs-project-exports-daemon
+++ b/modules/labstore/files/nfs-exports-daemon
@@ -94,19 +94,16 @@
return ips
-def get_projects_with_nfs(config_file_path):
+def get_public_exports(mounts_config):
+return mounts_config['public']
+
+
+def get_projects_with_nfs(mounts_config):
Returns list of populated Project objects that need NFS exports
-try:
-with open(config_file_path) as f:
-projects_config = yaml.load(f)
-except:
-logging.exception('Could not load projects config file from %s',
config_file_path)
-sys.exit(1)
-
projects = []
-for name, config in projects_config.items():
+for name, config in mounts_config['private'].items():
logging.debug('Fetching config for project %s', name)
if 'mounts' in config:
mounts = [k for k, v in config['mounts'].items()
@@ -133,10 +130,19 @@
return projects
-def sync_exports_files(projects, exports_d_base):
+def sync_exports_files(mounts_config, exports_d_base):
Generate exports files for syncfs
+public_exports = get_public_exports(mounts_config)
+for name, content in public_exports.items():
+logging.debug('Writing exports file for public export %s', name)
+path = os.path.join(exports_d_base, 'public_%s.exports' % name)
+with open(path, 'w') as f:
+f.write(content)
+logging.info('Wrote exports file for public export %s', name)
+
+projects = get_projects_with_nfs(mounts_config)
for project in projects:
logging.debug('Writing exports file for %s', project.name)
path = os.path.join(exports_d_base, '%s.exports' % project.name)
@@ -194,7 +200,13 @@
logging.info('Daemon starting')
while True:
-projects = get_projects_with_nfs(args.projects_config_path)
+try:
+with open(args.config_file_path) as f:
+config = yaml.load(f)
+except:
+logging.exception('Could not load projects config file from %s',
config_file_path)
+sys.exit(1)
+projects = get_projects_with_nfs(config)
sync_exports_files(projects, args.exports_d_path)
if not args.dry_run:
exportfs()
diff --git a/modules/labstore/files/nfs-mounts.yaml
b/modules/labstore/files/nfs-mounts.yaml
new file mode 100644
index 000..8a61380
--- /dev/null
+++ b/modules/labstore/files/nfs-mounts.yaml
@@ -0,0 +1,284 @@
+public:
+ scratch: '/exp/scratch *(rw,sec=sys,sync,no_subtree_check,root_squash)'
+ root: '/exp *(ro,fsid=0,sec=sys,sync,subtree_check,root_squash,nocrossmnt)'
+private:
+ account-creation-assistance:
+gid: 50088
+mounts:
+ project: true
+ analytics:
+gid: 50090
+mounts:
+ project: true
+ bots:
+gid: 50064
+mounts:
+ dumps: true
+ home: true
+ project: true
+ scratch: true
+ catgraph:
+gid: 50588
+mounts:
+ dumps: true
+ home: true
+ project: true
+ scratch: true
+ cephtest:
+gid: 52557
+mounts:
+ dumps: true
+ home: true
+ project: true
+ scratch: true
+ contributors:
+gid: 50408
+mounts:
+ dumps: true
+ home: true
+ project: true
+ scratch: true
+ cvn:
+gid: 50116
+mounts:
+ project: true
+ wikidata-query:
+gid: 52354
+mounts:
+ home: true
+ cvresearch:
+gid: 50118
+mounts:
+ dumps: true
+ home: true
+ project: true
+ scratch: true
+ deployment-prep:
+gid: 50120
+mounts:
+ project: true
+ dumps:
+gid: 50124
+mounts:
+ dumps: true
+ home: true
+ project: true
+ scratch: true
+ dwl:
+gid: 50815
+mounts:
+ dumps: true
+ home: true
+ project: true
+
[MediaWiki-commits] [Gerrit] contint: authdns::lint on light Jessie slave - change (operations/puppet)
Faidon Liambotis has submitted this change and it was merged. Change subject: contint: authdns::lint on light Jessie slave .. contint: authdns::lint on light Jessie slave DNS servers migrated to Jessie, we need to switch operations-dns-lint to Jessie. Include authdns::lint on the light slaves. Bug: T98003 Bug: T98737 Change-Id: I8aab9f7905efc0d771de402ee817819f18bc7006 --- M manifests/role/ci.pp 1 file changed, 3 insertions(+), 0 deletions(-) Approvals: Hashar: Looks good to me, but someone else must approve Faidon Liambotis: Looks good to me, approved jenkins-bot: Verified diff --git a/manifests/role/ci.pp b/manifests/role/ci.pp index 323eb21..5d130c1 100644 --- a/manifests/role/ci.pp +++ b/manifests/role/ci.pp @@ -501,6 +501,9 @@ include contint::slave-scripts include role::ci::slave::labs::common +# Production DNS migrated to Jessie T98003 +include authdns::lint + } # == Class role::ci::publisher::labs -- To view, visit https://gerrit.wikimedia.org/r/217467 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I8aab9f7905efc0d771de402ee817819f18bc7006 Gerrit-PatchSet: 4 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Hashar has...@free.fr Gerrit-Reviewer: BBlack bbl...@wikimedia.org Gerrit-Reviewer: Faidon Liambotis fai...@wikimedia.org Gerrit-Reviewer: Hashar has...@free.fr Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] contint: do not install zuul on light slaves - change (operations/puppet)
Faidon Liambotis has submitted this change and it was merged.
Change subject: contint: do not install zuul on light slaves
..
contint: do not install zuul on light slaves
There is no zuul package for Jessie yet thus applying
role::ci::slave::labs::light fails puppet.
Move the zuul install out of the common class to the more specific
classes.
Bug: T94836
Change-Id: I849fa59683f09a99e2a5a5cd058bf9e60faeadce
---
M manifests/role/ci.pp
1 file changed, 3 insertions(+), 1 deletion(-)
Approvals:
Hashar: Looks good to me, but someone else must approve
Faidon Liambotis: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/role/ci.pp b/manifests/role/ci.pp
index 5d130c1..7d53d0a 100644
--- a/manifests/role/ci.pp
+++ b/manifests/role/ci.pp
@@ -248,7 +248,6 @@
# Jenkins slaves need to access beta cluster for the browsertests
include contint::firewall::labs
-include role::zuul::install
if $::site == 'eqiad' {
# Does not come with /dev/vdb, we need to mount it using lvm
@@ -349,6 +348,7 @@
}
include role::ci::slave::labs::common
+include role::zuul::install
include contint::browsers
}
@@ -360,6 +360,7 @@
}
include role::ci::slave::labs::common
+include role::zuul::install
# We are in labs context, so use /mnt (== /dev/vdb)
# Never EVER think about using GlusterFS.
@@ -470,6 +471,7 @@
}
include role::ci::slave::labs::common
+include role::zuul::install
include role::ci::slave::localbrowser
--
To view, visit https://gerrit.wikimedia.org/r/217476
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I849fa59683f09a99e2a5a5cd058bf9e60faeadce
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Hashar has...@free.fr
Gerrit-Reviewer: BBlack bbl...@wikimedia.org
Gerrit-Reviewer: Faidon Liambotis fai...@wikimedia.org
Gerrit-Reviewer: Hashar has...@free.fr
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove Gerrit replication to lanthanum.eqiad.wmnet - change (operations/puppet)
Faidon Liambotis has submitted this change and it was merged.
Change subject: Remove Gerrit replication to lanthanum.eqiad.wmnet
..
Remove Gerrit replication to lanthanum.eqiad.wmnet
The host should no more run any slave, and definitely does not run any
job still relying on the Gerrit replication.
Remove Gerrit replication to lanthanum.eqiad.wmnet.
Bug: T86658
Bug: T86661
Change-Id: I63727298916faaded2b5e38c737eb50479669345
---
M manifests/role/gerrit.pp
1 file changed, 0 insertions(+), 1 deletion(-)
Approvals:
QChris: Looks good to me, but someone else must approve
Faidon Liambotis: Verified; Looks good to me, approved
diff --git a/manifests/role/gerrit.pp b/manifests/role/gerrit.pp
index 81c8429..fc177ac 100644
--- a/manifests/role/gerrit.pp
+++ b/manifests/role/gerrit.pp
@@ -84,7 +84,6 @@
#
# lint:ignore:single_quote_string_with_variables
'gerritsl...@gallium.wikimedia.org:/srv/ssd/gerrit/${name}.git',
-
'gerritslave@lanthanum.eqiad.wmnet:/srv/ssd/gerrit/${name}.git',
# lint:endignore
],
'threads' = '4',
--
To view, visit https://gerrit.wikimedia.org/r/222595
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I63727298916faaded2b5e38c737eb50479669345
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Hashar has...@free.fr
Gerrit-Reviewer: Alexandros Kosiaris akosia...@wikimedia.org
Gerrit-Reviewer: ArielGlenn ar...@wikimedia.org
Gerrit-Reviewer: Chad ch...@wikimedia.org
Gerrit-Reviewer: Faidon Liambotis fai...@wikimedia.org
Gerrit-Reviewer: Filippo Giunchedi fgiunch...@wikimedia.org
Gerrit-Reviewer: Giuseppe Lavagetto glavage...@wikimedia.org
Gerrit-Reviewer: Mark Bergsma m...@wikimedia.org
Gerrit-Reviewer: QChris christ...@quelltextlich.at
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] [FIX] Replace with Link if all or only target selected - change (pywikibot/core)
jenkins-bot has submitted this change and it was merged.
Change subject: [FIX] Replace with Link if all or only target selected
..
[FIX] Replace with Link if all or only target selected
The options 'Change link target' and 'Change complete link' previously returned
just a string as a shortcut. But with ad2cf8aa if a callback returns a string
it's inserted directly.
It adds the option to replace the target and the section but not the label and
to replace everything to disambredir.
It also changes the default title behaviour in replace_link that it's using
also the section like a link in MW would behave. If the replacement is
Link('Foo#Bar') it's interpreted as [[Foo#Bar]] so that the title is Foo#Bar.
Bug: T104805
Change-Id: Ic6f3d1dd0d2e56a639ebf74e89834cf02d7b224a
---
M pywikibot/bot.py
M pywikibot/textlib.py
M scripts/disambredir.py
M tests/disambredir_tests.py
M tests/link_tests.py
M tests/textlib_tests.py
6 files changed, 111 insertions(+), 28 deletions(-)
Approvals:
John Vandenberg: Looks good to me, approved
jenkins-bot: Verified
diff --git a/pywikibot/bot.py b/pywikibot/bot.py
index 57e8ec0..2f85289 100644
--- a/pywikibot/bot.py
+++ b/pywikibot/bot.py
@@ -751,19 +751,34 @@
A choice returning a mix of the link new and current link.
-def __init__(self, option, shortcut, replacer, section):
+def __init__(self, option, shortcut, replacer, replace_section,
+ replace_label):
Constructor.
super(LinkChoice, self).__init__(option, shortcut, replacer)
-self._section = section
+self._section = replace_section
+self._label = replace_label
def handle(self):
Handle by either applying the new section or label.
+kwargs = {}
if self._section:
-kwargs = {'section': self.replacer._new.section,
- 'label': self.replacer.current_link.anchor}
+kwargs['section'] = self.replacer._new.section
else:
-kwargs = {'section': self.replacer.current_link.section,
- 'label': self.replacer._new.anchor}
+kwargs['section'] = self.replacer.current_link.section
+if self._label:
+if self.replacer._new.anchor is None:
+kwargs['label'] = self.replacer._new.canonical_title()
+if self.replacer._new.section:
+kwargs['label'] += '#' + self.replacer._new.section
+else:
+kwargs['label'] = self.replacer._new.anchor
+else:
+if self.replacer.current_link.anchor is None:
+kwargs['label'] = self.replacer.current_groups['title']
+if self.replacer.current_groups['section']:
+kwargs['label'] += '#' +
self.replacer.current_groups['section']
+else:
+kwargs['label'] = self.replacer.current_link.anchor
return pywikibot.Link.create_separated(
self.replacer._new.canonical_title(), self.replacer._new.site,
**kwargs)
@@ -862,14 +877,14 @@
]
if self._new:
self._own_choices += [
-('replace', StaticChoice('Change link target', 't',
- self._new.canonical_title())),
+('replace', LinkChoice('Change link target', 't', self,
+ False, False)),
('replace_section', LinkChoice('Change link target and
section',
- 's', self, True)),
+ 's', self, True, False)),
('replace_label', LinkChoice('Change link target and label',
- 'l', self, False)),
-('replace_all', StaticChoice('Change complete link', 'c',
- self._new)),
+ 'l', self, False, True)),
+('replace_all', LinkChoice('Change complete link', 'c', self,
+ True, True)),
]
self.additional_choices = []
diff --git a/pywikibot/textlib.py b/pywikibot/textlib.py
index 32b38e7..9984f0f 100644
--- a/pywikibot/textlib.py
+++ b/pywikibot/textlib.py
@@ -514,6 +514,12 @@
'a sequence, a Link or a basestring but '
'is {0}'.format(type(replacement)))
+def title_section(l):
+title = l.title
+if l.section:
+title += '#' + l.section
+return title
+
if isinstance(replace, collections.Sequence):
if len(replace) != 2:
raise ValueError('When used as a sequence, the replace '
@@ -634,20 +640,16 @@
if is_link:
# Use link's label
link_text = replacement.anchor
-if link_text
[MediaWiki-commits] [Gerrit] Remove broken wikis from battlestarwiki family - change (pywikibot/core)
John Vandenberg has uploaded a new change for review. https://gerrit.wikimedia.org/r/223019 Change subject: Remove broken wikis from battlestarwiki family .. Remove broken wikis from battlestarwiki family Moving these languages from langs to interwiki_removals will cause anyone using Pywikibot to remove any interlanguage links to these languages when they appear on English and German Battlestarwiki. However as these sites have been down for a while, and their User:Interwiki_Bot hasnt been active for many years, and there are no bot edits in the last month on the English site. Bug: T103470 Change-Id: Icd54ef6bda2544fb0134a0e7e8267c6ada45cc1c --- M pywikibot/families/battlestarwiki_family.py 1 file changed, 3 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core refs/changes/19/223019/1 diff --git a/pywikibot/families/battlestarwiki_family.py b/pywikibot/families/battlestarwiki_family.py index 954dfe3..549c085 100644 --- a/pywikibot/families/battlestarwiki_family.py +++ b/pywikibot/families/battlestarwiki_family.py @@ -15,7 +15,9 @@ name = 'battlestarwiki' -languages_by_size = ['en', 'de', 'fr', 'zh', 'es', 'ms', 'tr', 'simple'] +languages_by_size = ['en', 'de'] + +interwiki_removals = ['fr', 'zh', 'es', 'ms', 'tr', 'simple'] langs = dict([(lang, '%s.battlestarwiki.org' % lang) for lang in languages_by_size]) -- To view, visit https://gerrit.wikimedia.org/r/223019 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Icd54ef6bda2544fb0134a0e7e8267c6ada45cc1c Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: John Vandenberg jay...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] upload: add pdf as an allowed file type - change (pywikibot/core)
Matanya has uploaded a new change for review. https://gerrit.wikimedia.org/r/223021 Change subject: upload: add pdf as an allowed file type .. upload: add pdf as an allowed file type Change-Id: I9cc6d692818700ab807c12efdd862101260e8d30 --- M scripts/upload.py 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core refs/changes/21/223021/1 diff --git a/scripts/upload.py b/scripts/upload.py index b7ea3fa..702e34d 100755 --- a/scripts/upload.py +++ b/scripts/upload.py @@ -227,7 +227,7 @@ allowed_formats = (u'gif', u'jpg', u'jpeg', u'mid', u'midi', u'ogg', u'png', u'svg', u'xcf', u'djvu', u'ogv', u'oga', u'tif', u'tiff', u'webm', - u'flac', u'wav') + u'flac', u'wav', u'pdf') # ask until it's valid first_check = True while True: -- To view, visit https://gerrit.wikimedia.org/r/223021 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I9cc6d692818700ab807c12efdd862101260e8d30 Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Matanya mata...@foss.co.il ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Only show one Older edit and one Newer edit link - change (mediawiki...Flow)
jenkins-bot has submitted this change and it was merged.
Change subject: Only show one Older edit and one Newer edit link
..
Only show one Older edit and one Newer edit link
We were showing both links on both sides. Instead, only
show the Older link on the left and the Newer link
on the right.
Change-Id: I85b306dab82097fd44383e2e5ea1b008b9f5964e
---
M handlebars/compiled/flow_revision_diff_header.handlebars.php
M handlebars/flow_revision_diff_header.handlebars
2 files changed, 7 insertions(+), 5 deletions(-)
Approvals:
Matthias Mullie: Looks good to me, approved
jenkins-bot: Verified
diff --git a/handlebars/compiled/flow_revision_diff_header.handlebars.php
b/handlebars/compiled/flow_revision_diff_header.handlebars.php
index a33f98e..7931324 100644
--- a/handlebars/compiled/flow_revision_diff_header.handlebars.php
+++ b/handlebars/compiled/flow_revision_diff_header.handlebars.php
@@ -38,8 +38,6 @@
/a
'.((LCRun3::ifvar($cx, ((isset($in['new']) is_array($in)) ? $in['new'] :
null))) ? ''.((LCRun3::ifvar($cx, ((isset($in['revision']['actions']['undo'])
is_array($in['revision']['actions'])) ? $in['revision']['actions']['undo'] :
null))) ? '('.htmlentities((string)((isset($in['noop']) is_array($in)) ?
$in['noop'] : null), ENT_QUOTES, 'UTF-8').'a class=mw-ui-anchor mw-ui-quiet
href='.htmlentities((string)((isset($in['revision']['actions']['undo']['url'])
is_array($in['revision']['actions']['undo'])) ?
$in['revision']['actions']['undo']['url'] : null), ENT_QUOTES,
'UTF-8').''.htmlentities((string)((isset($in['revision']['actions']['undo']['title'])
is_array($in['revision']['actions']['undo'])) ?
$in['revision']['actions']['undo']['title'] : null), ENT_QUOTES,
'UTF-8').'/a'.htmlentities((string)((isset($in['noop']) is_array($in)) ?
$in['noop'] : null), ENT_QUOTES, 'UTF-8').')' : '').'' : '').'/div
-'.((LCRun3::ifvar($cx, ((isset($in['links']['previous'])
is_array($in['links'])) ? $in['links']['previous'] : null))) ? ' diva
href='.htmlentities((string)((isset($in['links']['previous'])
is_array($in['links'])) ? $in['links']['previous'] : null), ENT_QUOTES,
'UTF-8').''.LCRun3::ch($cx, 'l10n',
array(array('flow-previous-diff'),array()), 'encq').'/a/div
-' : '').''.((LCRun3::ifvar($cx, ((isset($in['links']['next'])
is_array($in['links'])) ? $in['links']['next'] : null))) ? ' diva
href='.htmlentities((string)((isset($in['links']['next'])
is_array($in['links'])) ? $in['links']['next'] : null), ENT_QUOTES,
'UTF-8').''.LCRun3::ch($cx, 'l10n', array(array('flow-next-diff'),array()),
'encq').'/a/div
-' : '').''.LCRun3::p($cx, 'flow_patrol_diff', array(array($in),array())).'';
+'.((LCRun3::ifvar($cx, ((isset($in['links']['previous'])
is_array($in['links'])) ? $in['links']['previous'] : null))) ?
''.((!LCRun3::ifvar($cx, ((isset($in['new']) is_array($in)) ? $in['new'] :
null))) ? 'diva
href='.htmlentities((string)((isset($in['links']['previous'])
is_array($in['links'])) ? $in['links']['previous'] : null), ENT_QUOTES,
'UTF-8').''.LCRun3::ch($cx, 'l10n',
array(array('flow-previous-diff'),array()), 'encq').'/a/div' : '').'' :
'').''.((LCRun3::ifvar($cx, ((isset($in['links']['next'])
is_array($in['links'])) ? $in['links']['next'] : null))) ?
''.((LCRun3::ifvar($cx, ((isset($in['new']) is_array($in)) ? $in['new'] :
null))) ? 'diva href='.htmlentities((string)((isset($in['links']['next'])
is_array($in['links'])) ? $in['links']['next'] : null), ENT_QUOTES,
'UTF-8').''.LCRun3::ch($cx, 'l10n', array(array('flow-next-diff'),array()),
'encq').'/a/div' : '').'' : '').''.LCRun3::p($cx, 'flow_patrol_diff',
array(array($in),array())).'';
}
?
\ No newline at end of file
diff --git a/handlebars/flow_revision_diff_header.handlebars
b/handlebars/flow_revision_diff_header.handlebars
index df3e9d8..10a148e 100644
--- a/handlebars/flow_revision_diff_header.handlebars
+++ b/handlebars/flow_revision_diff_header.handlebars
@@ -17,9 +17,13 @@
{{~/if~}}
/div
{{#if links.previous}}
- diva href={{links.previous}}{{l10n
flow-previous-diff}}/a/div
+ {{~#unless new~}}
+ diva href={{links.previous}}{{l10n
flow-previous-diff}}/a/div
+ {{~/unless~}}
{{/if}}
{{#if links.next}}
- diva href={{links.next}}{{l10n flow-next-diff}}/a/div
+ {{~#if new~}}
+ diva href={{links.next}}{{l10n
flow-next-diff}}/a/div
+ {{~/if~}}
{{/if}}
{{ flow_patrol_diff}}
\ No newline at end of file
--
To view, visit https://gerrit.wikimedia.org/r/222356
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I85b306dab82097fd44383e2e5ea1b008b9f5964e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: Catrope roan.katt...@gmail.com
Gerrit-Reviewer: Matthias Mullie mmul...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
[MediaWiki-commits] [Gerrit] Index more than just deepest level of replies - change (mediawiki...Flow)
Matthias Mullie has uploaded a new change for review.
https://gerrit.wikimedia.org/r/223022
Change subject: Index more than just deepest level of replies
..
Index more than just deepest level of replies
Bug: T104851
Change-Id: Iaec58a4d09cb2ceb2095dfff63fc63ae769d6de7
---
M includes/Search/TopicUpdater.php
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Flow
refs/changes/22/223022/1
diff --git a/includes/Search/TopicUpdater.php b/includes/Search/TopicUpdater.php
index e39fbc6..0bc1e6d 100644
--- a/includes/Search/TopicUpdater.php
+++ b/includes/Search/TopicUpdater.php
@@ -206,7 +206,7 @@
if ( $revision instanceof PostRevision ) {
// get data from all child posts too
foreach ( $revision-getChildren() as $child ) {
- $data = array_merge( $this-getRevisionsData(
$child ) );
+ $data = array_merge( $data,
$this-getRevisionsData( $child ) );
}
}
--
To view, visit https://gerrit.wikimedia.org/r/223022
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iaec58a4d09cb2ceb2095dfff63fc63ae769d6de7
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: Matthias Mullie mmul...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] wip - change (oojs/ui)
Prtksxna has uploaded a new change for review.
https://gerrit.wikimedia.org/r/223023
Change subject: wip
..
wip
Change-Id: Ia90fb400d26da529e6364d86f971cf3759f7ca4f
---
M src/dialogs/MessageDialog.js
1 file changed, 6 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/23/223023/1
diff --git a/src/dialogs/MessageDialog.js b/src/dialogs/MessageDialog.js
index 1b0d075..c88f379 100644
--- a/src/dialogs/MessageDialog.js
+++ b/src/dialogs/MessageDialog.js
@@ -270,6 +270,7 @@
special = this.actions.getSpecial();
others = this.actions.getOthers();
+
if ( special.safe ) {
this.$actions.append( special.safe.$element );
special.safe.toggleFramed( false );
@@ -283,6 +284,11 @@
}
if ( special.primary ) {
this.$actions.append( special.primary.$element );
+ console.log( special.primary );
+ console.log( special.primary.$tabIndexed );
+ console.log( special.primary.$button );
+ console.log( special.primary.$element );
+ special.primary.$tabIndexed[ 0 ].focus();
special.primary.toggleFramed( false );
}
--
To view, visit https://gerrit.wikimedia.org/r/223023
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia90fb400d26da529e6364d86f971cf3759f7ca4f
Gerrit-PatchSet: 1
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: Prtksxna psax...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Use max-width for descriptions instead of width: 50% - change (mediawiki...WikibaseQualityConstraints)
Thiemo Mättig (WMDE) has uploaded a new change for review.
https://gerrit.wikimedia.org/r/223024
Change subject: Use max-width for descriptions instead of width: 50%
..
Use max-width for descriptions instead of width: 50%
What 50% actually means: If you are on a smartphone with a screen
that's 240px wide, the description will be limited to 120px.
Change-Id: I7d3d7bff70ab0cefc7d37e4d883881ac6baa7410
---
M modules/SpecialConstraintReportPage.css
1 file changed, 1 insertion(+), 1 deletion(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikibaseQualityConstraints
refs/changes/24/223024/1
diff --git a/modules/SpecialConstraintReportPage.css
b/modules/SpecialConstraintReportPage.css
index 183e6aa..5332cc6 100644
--- a/modules/SpecialConstraintReportPage.css
+++ b/modules/SpecialConstraintReportPage.css
@@ -20,7 +20,7 @@
/* Explanation infobox */
.wbqc-explanation {
-width: 50%;
+ max-width: 65em; /* similar to .wikibase-entityview */
}
/* Statuses */
--
To view, visit https://gerrit.wikimedia.org/r/223024
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I7d3d7bff70ab0cefc7d37e4d883881ac6baa7410
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikibaseQualityConstraints
Gerrit-Branch: master
Gerrit-Owner: Thiemo Mättig (WMDE) thiemo.maet...@wikimedia.de
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update documentation for isDisambig method - change (pywikibot/core)
jenkins-bot has submitted this change and it was merged. Change subject: Update documentation for isDisambig method .. Update documentation for isDisambig method Change-Id: Ib1a8afba5e934790d48bccd44ab2c1e3edd85619 --- M pywikibot/page.py 1 file changed, 9 insertions(+), 9 deletions(-) Approvals: John Vandenberg: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/page.py b/pywikibot/page.py index 25d2779..4cb242a 100644 --- a/pywikibot/page.py +++ b/pywikibot/page.py @@ -772,17 +772,17 @@ def isDisambig(self): Return True if this is a disambiguation page, False otherwise. -Relies on the presence of specific templates, identified in -the Family file or on a wiki page, to identify disambiguation -pages. +By default, it uses the the Disambiguator extension's result. The +identification relies on the presense of the __DISAMBIG__ magic word +which may also be transcluded. -By default, loads a list of template names from the Family file; -if the value in the Family file is None no entry was made, looks for +If the Disambiguator extension isn't activated for the given site, +the identification relies on the presence of specific templates. +First load a list of template names from the Family file; +if the value in the Family file is None or no entry was made, look for the list on [[MediaWiki:Disambiguationspage]]. If this page does not -exist, take the MediaWiki message. - -'Template:Disambig' is always assumed to be default, and will be -appended regardless of its existence. +exist, take the MediaWiki message. 'Template:Disambig' is always +assumed to be default, and will be appended regardless of its existence. @rtype: bool -- To view, visit https://gerrit.wikimedia.org/r/221362 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ib1a8afba5e934790d48bccd44ab2c1e3edd85619 Gerrit-PatchSet: 5 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Xqt i...@gno.de Gerrit-Reviewer: John Vandenberg jay...@gmail.com Gerrit-Reviewer: Ladsgroup ladsgr...@gmail.com Gerrit-Reviewer: Legoktm legoktm.wikipe...@gmail.com Gerrit-Reviewer: Merlijn van Deen valhall...@arctus.nl Gerrit-Reviewer: Ricordisamoa ricordisa...@openmailbox.org Gerrit-Reviewer: Russell Blau russb...@imapmail.org Gerrit-Reviewer: XZise commodorefabia...@gmx.de Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] contint: role::ci::slave::labs::light - change (operations/puppet)
Faidon Liambotis has submitted this change and it was merged.
Change subject: contint: role::ci::slave::labs::light
..
contint: role::ci::slave::labs::light
A light CI labs slave intended to be used for Jessie. We can't yet make
them full CI slaves since puppet does not pass (T94836) but this class
will let us migrate some specific jobs.
Bug: T94836
Change-Id: Ic356b0b694216b1edac627b1462989a858db400a
---
M manifests/role/ci.pp
1 file changed, 20 insertions(+), 0 deletions(-)
Approvals:
Hashar: Looks good to me, but someone else must approve
Faidon Liambotis: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/role/ci.pp b/manifests/role/ci.pp
index ac9172f..323eb21 100644
--- a/manifests/role/ci.pp
+++ b/manifests/role/ci.pp
@@ -482,6 +482,26 @@
}
+# == Class role::ci::slave::labs::light
+#
+# Transient role that setup a slave labs for Jessie. Regular slaves include
+# mediawiki::packages and over cmaterials which are not yet ready on Jessie
+# (tracking task is https://phabricator.wikimedia.org/T94836).
+#
+# Let us migrate some jobs to Jessie since production is moving toward it.
+#
+class role::ci::slave::labs::light {
+
+requires_realm('labs')
+
+system::role { 'role::ci::slave::labs::light':
+description = 'CI *LIGHT* Jenkins slave on labs' }
+
+# Trebuchet replacement on labs
+include contint::slave-scripts
+include role::ci::slave::labs::common
+
+}
# == Class role::ci::publisher::labs
#
--
To view, visit https://gerrit.wikimedia.org/r/217466
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ic356b0b694216b1edac627b1462989a858db400a
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Hashar has...@free.fr
Gerrit-Reviewer: BBlack bbl...@wikimedia.org
Gerrit-Reviewer: Faidon Liambotis fai...@wikimedia.org
Gerrit-Reviewer: Hashar has...@free.fr
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] [i18n] provide de summary - change (pywikibot/core)
Xqt has uploaded a new change for review.
https://gerrit.wikimedia.org/r/223026
Change subject: [i18n] provide de summary
..
[i18n] provide de summary
Change-Id: Ic620b94ba4c87e9d1504e930203847aff64df980
---
M scripts/disambredir.py
1 file changed, 1 insertion(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core
refs/changes/26/223026/1
diff --git a/scripts/disambredir.py b/scripts/disambredir.py
index 0789afc..b9adf36 100755
--- a/scripts/disambredir.py
+++ b/scripts/disambredir.py
@@ -27,6 +27,7 @@
msg = {
'ar': u'تغيير التحويلات في صفحة توضيح',
'be-x-old': u'Замена перанакіраваньняў на старонку неадназначнасьцяў',
+'de': u'Löse Weiterleitungen einer Begriffsklärungsseite auf',
'en': u'Changing redirects on a disambiguation page',
'he': u'משנה קישורים להפניות בדף פירושונים',
'fa': u'اصلاح تغییرمسیرها در یک صفحه ابهامزدایی',
--
To view, visit https://gerrit.wikimedia.org/r/223026
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic620b94ba4c87e9d1504e930203847aff64df980
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: Xqt i...@gno.de
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Toolbar: Let's remove a speedup loop... - change (mediawiki...WikiEditor)
jenkins-bot has submitted this change and it was merged.
Change subject: Toolbar: Let's remove a speedup loop...
..
Toolbar: Let's remove a speedup loop...
Change-Id: I3e965dda1c48195d7c11f1d7f23a09dd8447cfc7
---
M modules/jquery.wikiEditor.toolbar.js
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Krinkle: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/jquery.wikiEditor.toolbar.js
b/modules/jquery.wikiEditor.toolbar.js
index 60d15ad..0717b59 100644
--- a/modules/jquery.wikiEditor.toolbar.js
+++ b/modules/jquery.wikiEditor.toolbar.js
@@ -636,7 +636,7 @@
$section.trigger( 'loadSection' );
animate( $that
);
$that.removeClass( 'loading' );
- }, 1000 );
+ } );
} else {
animate( $( this ) );
$( this ).addClass(
'current' );
--
To view, visit https://gerrit.wikimedia.org/r/223017
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I3e965dda1c48195d7c11f1d7f23a09dd8447cfc7
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikiEditor
Gerrit-Branch: master
Gerrit-Owner: TheDJ hartman.w...@gmail.com
Gerrit-Reviewer: Bartosz Dziewoński matma@gmail.com
Gerrit-Reviewer: Jforrester jforres...@wikimedia.org
Gerrit-Reviewer: Krinkle krinklem...@gmail.com
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] New API: UserStore - change (mediawiki...BlueSpiceFoundation)
Robert Vogel has uploaded a new change for review.
https://gerrit.wikimedia.org/r/223027
Change subject: New API: UserStore
..
New API: UserStore
This is the first draft of the new UserStore api. It is going to replace
the BsCommonAJAXInterface::getUserStoreData implementation
Change-Id: I6895a12a059513f58ee00a1be89d3c1b4436d95f
---
M BlueSpiceFoundation.php
M includes/AutoLoader.php
A includes/api/BSApiUserStore.php
M resources/bluespice.extjs/BS/model/User.js
4 files changed, 51 insertions(+), 1 deletion(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceFoundation
refs/changes/27/223027/1
diff --git a/BlueSpiceFoundation.php b/BlueSpiceFoundation.php
index 1248ff0..ef2f7c5 100644
--- a/BlueSpiceFoundation.php
+++ b/BlueSpiceFoundation.php
@@ -66,6 +66,7 @@
$wgAjaxExportList[] = 'BsCore::ajaxBSPing';
$wgAPIModules['bs-filebackend-store'] = 'BSApiFileBackendStore';
+$wgAPIModules['bs-user-store'] = 'BSApiUserStore';
//I18N MW1.23+
$wgMessagesDirs['BlueSpice'] = __DIR__ . '/i18n/core';
diff --git a/includes/AutoLoader.php b/includes/AutoLoader.php
index 99d11e9..89604a1 100644
--- a/includes/AutoLoader.php
+++ b/includes/AutoLoader.php
@@ -56,6 +56,7 @@
$GLOBALS['wgAutoloadClasses']['BSApiTasksBase'] =
__DIR__./api/BSApiTasksBase.php;
$GLOBALS['wgAutoloadClasses']['BSApiExtJSStoreBase'] =
__DIR__./api/BSApiExtJSStoreBase.php;
$GLOBALS['wgAutoloadClasses']['BSApiFileBackendStore'] =
__DIR__./api/BSApiFileBackendStore.php;
+$GLOBALS['wgAutoloadClasses']['BSApiUserStore'] =
__DIR__./api/BSApiUserStore.php;
//adapter
$GLOBALS['wgAutoloadClasses']['BsExtensionMW'] =
__DIR__./ExtensionMW.class.php;
diff --git a/includes/api/BSApiUserStore.php b/includes/api/BSApiUserStore.php
new file mode 100644
index 000..e8875e2
--- /dev/null
+++ b/includes/api/BSApiUserStore.php
@@ -0,0 +1,42 @@
+?php
+
+class BSApiUserStore extends BSApiExtJSStoreBase {
+
+ protected function makeData($sQuery = '') {
+ $dbr = $this-getDB();
+
+ $aGroups = array();
+ $groupsRes = $dbr-select( 'user_groups', '*' );
+ foreach( $groupsRes as $row ) {
+ if( !isset( $aGroups[$row-ug_user] ) ) {
+ $aGroups[$row-ug_user] = array();
+ }
+ $aGroups[$row-ug_user][] = $row-ug_group;
+ }
+
+ //TODO: It would be very cool to have the permissions as a
filterable
+ //field. Unfortunately this requires some context information
from the
+ //client. I.e. The page/namespace for which the permissions
should be
+ //calculated. This would also be very expensive and a potential
+ //security issue.
+
+ $aData = array();
+ $userRes = $dbr-select( 'user', '*' );
+ foreach( $userRes as $row ) {
+ $aData[] = (object)array(
+ 'user_id' = $row-user_id,
+ 'user_name' = $row-user_name,
+ 'user_real_name' = $row-user_real_name,
+ 'user_registration' = $row-user_registration,
+ 'user_editcount' = $row-user_editcount,
+ 'groups' = isset( $aGroups[$row-user_id] ) ?
$aGroups[$row-user_id] : array(),
+
+ //legacy fields
+ 'display_name' = $row-user_real_name == null
? $row-user_name : $row-user_real_name,
+ 'page_prefixed_text' = Title::makeTitle(
NS_USER, $row-user_name )-getPrefixedText()
+ );
+ }
+
+ return $aData;
+ }
+}
\ No newline at end of file
diff --git a/resources/bluespice.extjs/BS/model/User.js
b/resources/bluespice.extjs/BS/model/User.js
index bb219c4..e164b0d 100644
--- a/resources/bluespice.extjs/BS/model/User.js
+++ b/resources/bluespice.extjs/BS/model/User.js
@@ -4,7 +4,13 @@
fields: [
{ name: 'user_id', type: 'int' },
{ name: 'user_name', type: 'string' },
+ { name: 'user_real_name', type: 'string' },
+ { name: 'user_registration', type: 'date', defaultValue:
'1970010100', dateFormat: 'YmdHis' },
+ { name: 'user_editcount', type: 'int' },
+ { name: 'groups', type: 'array', defaultValue: [] },
+
+ //legacy fields
{ name: 'display_name', type: 'string' },
- { name: 'page_prefixed_text', type: 'string' },
+ { name: 'page_prefixed_text', type: 'string' }
]
});
--
To view, visit https://gerrit.wikimedia.org/r/223027
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id:
[MediaWiki-commits] [Gerrit] Hygiene: Remove useless parent layout in featured page widget - change (apps...wikipedia)
jenkins-bot has submitted this change and it was merged. Change subject: Hygiene: Remove useless parent layout in featured page widget .. Hygiene: Remove useless parent layout in featured page widget Lint warning: ../../res/layout/widget_featured_page.xml:25: This LinearLayout layout or its FrameLayout parent is useless; transfer the background attribute to the other view Change-Id: Idc1f5c0864b1340b11735d059d21dfc35923379f --- M wikipedia/res/layout/widget_featured_page.xml 1 file changed, 23 insertions(+), 27 deletions(-) Approvals: Dbrant: Looks good to me, approved jenkins-bot: Verified diff --git a/wikipedia/res/layout/widget_featured_page.xml b/wikipedia/res/layout/widget_featured_page.xml index 10952ce..fc3085f 100644 --- a/wikipedia/res/layout/widget_featured_page.xml +++ b/wikipedia/res/layout/widget_featured_page.xml @@ -16,37 +16,33 @@ android:src=@drawable/about_logo android:contentDescription=@null android:layout_gravity=center_vertical/ -FrameLayout +LinearLayout android:layout_width=match_parent android:layout_height=match_parent android:paddingLeft=16dp android:paddingRight=16dp -android:background=@drawable/widget_shape_inner -LinearLayout +android:gravity=center_vertical +android:background=@drawable/widget_shape_inner +android:orientation=vertical +TextView android:layout_width=match_parent android:layout_height=wrap_content -android:layout_gravity=center_vertical -android:orientation=vertical -TextView -android:layout_width=match_parent -android:layout_height=wrap_content -style=@style/RtlAwareTextView -android:layout_marginBottom=2dp -android:text=@string/widget_title_featured_page -android:ellipsize=end -android:textColor=@color/widget_title_text -/ -TextView -android:id=@+id/widget_content_text -android:layout_width=match_parent -android:layout_height=wrap_content -style=@style/RtlAwareTextView -android:textAppearance=?android:attr/textAppearanceMedium -android:textColor=@color/widget_content_text -android:maxLines=2 -android:ellipsize=end -tools:text=Sample content -/ -/LinearLayout -/FrameLayout +style=@style/RtlAwareTextView +android:layout_marginBottom=2dp +android:text=@string/widget_title_featured_page +android:ellipsize=end +android:textColor=@color/widget_title_text +/ +TextView +android:id=@+id/widget_content_text +android:layout_width=match_parent +android:layout_height=wrap_content +style=@style/RtlAwareTextView +android:textAppearance=?android:attr/textAppearanceMedium +android:textColor=@color/widget_content_text +android:maxLines=2 +android:ellipsize=end +tools:text=Sample content +/ +/LinearLayout /LinearLayout \ No newline at end of file -- To view, visit https://gerrit.wikimedia.org/r/222870 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Idc1f5c0864b1340b11735d059d21dfc35923379f Gerrit-PatchSet: 2 Gerrit-Project: apps/android/wikipedia Gerrit-Branch: master Gerrit-Owner: BearND bsitzm...@wikimedia.org Gerrit-Reviewer: Dbrant dbr...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] labstore: Consolidate NFS exporting into daemon - change (operations/puppet)
Yuvipanda has submitted this change and it was merged.
Change subject: labstore: Consolidate NFS exporting into daemon
..
labstore: Consolidate NFS exporting into daemon
- Rename nfs-projects-daemon to nfs-exports-daemon
- Handles public *and* private exports
- Simplify puppet setup to reflect new reality
Change-Id: Ib5d55e784daa603812a97815b4ef44d9906eb2a1
---
R modules/labstore/files/nfs-exports-daemon
A modules/labstore/files/nfs-mounts.yaml
D modules/labstore/files/projects-nfs-config.yaml
M modules/labstore/lib/puppet/parser/functions/mount_nfs_volume.rb
M modules/labstore/manifests/fileserver.pp
M modules/labstore/manifests/fileserver/exports.pp
D modules/labstore/manifests/fileserver/exports/private.pp
D modules/labstore/manifests/fileserver/exports/public.pp
A modules/labstore/templates/initscripts/nfs-exports.systemd.erb
D modules/labstore/templates/initscripts/nfs-project-exports.systemd.erb
10 files changed, 363 insertions(+), 384 deletions(-)
Approvals:
Yuvipanda: Verified; Looks good to me, approved
diff --git a/modules/labstore/files/nfs-project-exports-daemon
b/modules/labstore/files/nfs-exports-daemon
similarity index 84%
rename from modules/labstore/files/nfs-project-exports-daemon
rename to modules/labstore/files/nfs-exports-daemon
index de7f057..82c380f 100755
--- a/modules/labstore/files/nfs-project-exports-daemon
+++ b/modules/labstore/files/nfs-exports-daemon
@@ -94,19 +94,16 @@
return ips
-def get_projects_with_nfs(config_file_path):
+def get_public_exports(mounts_config):
+return mounts_config['public']
+
+
+def get_projects_with_nfs(mounts_config):
Returns list of populated Project objects that need NFS exports
-try:
-with open(config_file_path) as f:
-projects_config = yaml.load(f)
-except:
-logging.exception('Could not load projects config file from %s',
config_file_path)
-sys.exit(1)
-
projects = []
-for name, config in projects_config.items():
+for name, config in mounts_config['private'].items():
logging.debug('Fetching config for project %s', name)
if 'mounts' in config:
mounts = [k for k, v in config['mounts'].items()
@@ -133,10 +130,19 @@
return projects
-def sync_exports_files(projects, exports_d_base):
+def sync_exports_files(mounts_config, exports_d_base):
Generate exports files for syncfs
+public_exports = get_public_exports(mounts_config)
+for name, content in public_exports.items():
+logging.debug('Writing exports file for public export %s', name)
+path = os.path.join(exports_d_base, 'public_%s.exports' % name)
+with open(path, 'w') as f:
+f.write(content)
+logging.info('Wrote exports file for public export %s', name)
+
+projects = get_projects_with_nfs(mounts_config)
for project in projects:
logging.debug('Writing exports file for %s', project.name)
path = os.path.join(exports_d_base, '%s.exports' % project.name)
@@ -144,10 +150,9 @@
f.write(project.get_exports())
logging.info('Wrote exports file for %s', project.name)
-logging.debug('Attempting to exportfs')
-
def exportfs():
+logging.debug('Attempting to exportfs')
try:
subprocess.check_call([
'/usr/bin/sudo',
@@ -166,8 +171,8 @@
help='Dir to write exports files to',
)
argparser.add_argument(
-'--projects-config-path',
-help='Path to YAML file with list of projects to enable NFS for',
+'--config-path',
+help='Path to YAML file containing config of which exports to
maintain',
)
argparser.add_argument(
'--debug',
@@ -194,8 +199,13 @@
logging.info('Daemon starting')
while True:
-projects = get_projects_with_nfs(args.projects_config_path)
-sync_exports_files(projects, args.exports_d_path)
+try:
+with open(args.config_path) as f:
+config = yaml.load(f)
+except:
+logging.exception('Could not load projects config file from %s',
args.config_path)
+sys.exit(1)
+sync_exports_files(config, args.exports_d_path)
if not args.dry_run:
exportfs()
time.sleep(60)
diff --git a/modules/labstore/files/nfs-mounts.yaml
b/modules/labstore/files/nfs-mounts.yaml
new file mode 100644
index 000..8a61380
--- /dev/null
+++ b/modules/labstore/files/nfs-mounts.yaml
@@ -0,0 +1,284 @@
+public:
+ scratch: '/exp/scratch *(rw,sec=sys,sync,no_subtree_check,root_squash)'
+ root: '/exp *(ro,fsid=0,sec=sys,sync,subtree_check,root_squash,nocrossmnt)'
+private:
+ account-creation-assistance:
+gid: 50088
+mounts:
+ project: true
+ analytics:
+gid: 50090
+mounts:
+ project: true
+ bots:
+gid: 50064
+mounts:
+ dumps: true
+ home: true
+
[MediaWiki-commits] [Gerrit] Hygiene: Remove unused icons - change (apps...wikipedia)
jenkins-bot has submitted this change and it was merged. Change subject: Hygiene: Remove unused icons .. Hygiene: Remove unused icons Lint warning: UnusedResources Change-Id: I276ee6f8e1dfc23484a47e4c66529a52fafc6064 --- D icon-svgs/24/ic_expand_less.noflip.svg D icon-svgs/24/ic_expand_more.noflip.svg D wikipedia/res/drawable-hdpi/close.png D wikipedia/res/drawable-hdpi/ic_expand_less.png D wikipedia/res/drawable-hdpi/ic_expand_more.png D wikipedia/res/drawable-ldpi/close.png D wikipedia/res/drawable-ldpi/ic_expand_less.png D wikipedia/res/drawable-ldpi/ic_expand_more.png D wikipedia/res/drawable-mdpi/close.png D wikipedia/res/drawable-mdpi/ic_expand_less.png D wikipedia/res/drawable-mdpi/ic_expand_more.png D wikipedia/res/drawable-xhdpi/close.png D wikipedia/res/drawable-xhdpi/ic_expand_less.png D wikipedia/res/drawable-xhdpi/ic_expand_more.png D wikipedia/res/drawable-xxhdpi/close.png D wikipedia/res/drawable-xxhdpi/ic_expand_less.png D wikipedia/res/drawable-xxhdpi/ic_expand_more.png 17 files changed, 0 insertions(+), 4 deletions(-) Approvals: Dbrant: Looks good to me, approved Niedzielski: Looks good to me, but someone else must approve jenkins-bot: Verified diff --git a/icon-svgs/24/ic_expand_less.noflip.svg b/icon-svgs/24/ic_expand_less.noflip.svg deleted file mode 100644 index 599719e..000 --- a/icon-svgs/24/ic_expand_less.noflip.svg +++ /dev/null @@ -1,3 +0,0 @@ -svg xmlns=http://www.w3.org/2000/svg; width=24 height=24 viewBox=0 0 24 24 -path d=M12 8l-6 6 1.41 1.41L12 10.83l4.59 4.58L18 14z style=fill:#33;fill-opacity:0.6/ -/svg \ No newline at end of file diff --git a/icon-svgs/24/ic_expand_more.noflip.svg b/icon-svgs/24/ic_expand_more.noflip.svg deleted file mode 100644 index cd8264a..000 --- a/icon-svgs/24/ic_expand_more.noflip.svg +++ /dev/null @@ -1 +0,0 @@ -svg xmlns=http://www.w3.org/2000/svg; width=24 height=24 viewBox=0 0 24 24path d=M16.59 8.59L12 13.17 7.41 8.59 6 10l6 6 6-6z style=fill:#33;fill-opacity:0.6//svg \ No newline at end of file diff --git a/wikipedia/res/drawable-hdpi/close.png b/wikipedia/res/drawable-hdpi/close.png deleted file mode 100644 index e10691c..000 --- a/wikipedia/res/drawable-hdpi/close.png +++ /dev/null Binary files differ diff --git a/wikipedia/res/drawable-hdpi/ic_expand_less.png b/wikipedia/res/drawable-hdpi/ic_expand_less.png deleted file mode 100644 index 6d0f707..000 --- a/wikipedia/res/drawable-hdpi/ic_expand_less.png +++ /dev/null Binary files differ diff --git a/wikipedia/res/drawable-hdpi/ic_expand_more.png b/wikipedia/res/drawable-hdpi/ic_expand_more.png deleted file mode 100644 index 90f821a..000 --- a/wikipedia/res/drawable-hdpi/ic_expand_more.png +++ /dev/null Binary files differ diff --git a/wikipedia/res/drawable-ldpi/close.png b/wikipedia/res/drawable-ldpi/close.png deleted file mode 100644 index 23d7f2c..000 --- a/wikipedia/res/drawable-ldpi/close.png +++ /dev/null Binary files differ diff --git a/wikipedia/res/drawable-ldpi/ic_expand_less.png b/wikipedia/res/drawable-ldpi/ic_expand_less.png deleted file mode 100644 index bc917f7..000 --- a/wikipedia/res/drawable-ldpi/ic_expand_less.png +++ /dev/null Binary files differ diff --git a/wikipedia/res/drawable-ldpi/ic_expand_more.png b/wikipedia/res/drawable-ldpi/ic_expand_more.png deleted file mode 100644 index 0b38897..000 --- a/wikipedia/res/drawable-ldpi/ic_expand_more.png +++ /dev/null Binary files differ diff --git a/wikipedia/res/drawable-mdpi/close.png b/wikipedia/res/drawable-mdpi/close.png deleted file mode 100644 index 3c10a6e..000 --- a/wikipedia/res/drawable-mdpi/close.png +++ /dev/null Binary files differ diff --git a/wikipedia/res/drawable-mdpi/ic_expand_less.png b/wikipedia/res/drawable-mdpi/ic_expand_less.png deleted file mode 100644 index beb64d7..000 --- a/wikipedia/res/drawable-mdpi/ic_expand_less.png +++ /dev/null Binary files differ diff --git a/wikipedia/res/drawable-mdpi/ic_expand_more.png b/wikipedia/res/drawable-mdpi/ic_expand_more.png deleted file mode 100644 index 80185e7..000 --- a/wikipedia/res/drawable-mdpi/ic_expand_more.png +++ /dev/null Binary files differ diff --git a/wikipedia/res/drawable-xhdpi/close.png b/wikipedia/res/drawable-xhdpi/close.png deleted file mode 100644 index 738822a..000 --- a/wikipedia/res/drawable-xhdpi/close.png +++ /dev/null Binary files differ diff --git a/wikipedia/res/drawable-xhdpi/ic_expand_less.png b/wikipedia/res/drawable-xhdpi/ic_expand_less.png deleted file mode 100644 index a07185a..000 --- a/wikipedia/res/drawable-xhdpi/ic_expand_less.png +++ /dev/null Binary files differ diff --git a/wikipedia/res/drawable-xhdpi/ic_expand_more.png b/wikipedia/res/drawable-xhdpi/ic_expand_more.png deleted file mode 100644 index a7bed28..000 --- a/wikipedia/res/drawable-xhdpi/ic_expand_more.png +++ /dev/null Binary files differ diff --git a/wikipedia/res/drawable-xxhdpi/close.png
[MediaWiki-commits] [Gerrit] Hygiene: Stop exporting ContentProviders - change (apps...wikipedia)
jenkins-bot has submitted this change and it was merged.
Change subject: Hygiene: Stop exporting ContentProviders
..
Hygiene: Stop exporting ContentProviders
Lint flagged that. And we don't really need to export our content providers.
Change-Id: I67b44e2c52479328fd5b173ce0cca53ee5a496cb
---
M wikipedia/AndroidManifest.xml
1 file changed, 5 insertions(+), 0 deletions(-)
Approvals:
Dbrant: Looks good to me, approved
Niedzielski: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/wikipedia/AndroidManifest.xml b/wikipedia/AndroidManifest.xml
index 77741a5..2e5e809 100644
--- a/wikipedia/AndroidManifest.xml
+++ b/wikipedia/AndroidManifest.xml
@@ -130,26 +130,31 @@
provider
android:authorities=${applicationId}.history
android:name=.history.HistoryEntryContentProvider
+android:exported=false
/
provider
android:authorities=${applicationId}.editsummaries
android:name=.editing.summaries.EditSummaryContentProvider
+android:exported=false
/
provider
android:authorities=${applicationId}.pageimages
android:name=.pageimages.PageImageContentProvider
+android:exported=false
/
provider
android:authorities=${applicationId}.recentsearches
android:name=.search.RecentSearchContentProvider
+android:exported=false
/
provider
android:authorities=${applicationId}.savedpages
android:name=.savedpages.SavedPageContentProvider
+android:exported=false
/
receiver
--
To view, visit https://gerrit.wikimedia.org/r/222866
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I67b44e2c52479328fd5b173ce0cca53ee5a496cb
Gerrit-PatchSet: 2
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: BearND bsitzm...@wikimedia.org
Gerrit-Reviewer: Brion VIBBER br...@wikimedia.org
Gerrit-Reviewer: Dbrant dbr...@wikimedia.org
Gerrit-Reviewer: Mholloway mhollo...@wikimedia.org
Gerrit-Reviewer: Niedzielski sniedziel...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] labstore: Remove NFS from puppet3-diffs project - change (operations/puppet)
Yuvipanda has submitted this change and it was merged. Change subject: labstore: Remove NFS from puppet3-diffs project .. labstore: Remove NFS from puppet3-diffs project Bug: T103760 Change-Id: I58ae88b23098487db9a5067259a3b4d8793d5614 --- M modules/labstore/files/nfs-mounts.yaml 1 file changed, 0 insertions(+), 7 deletions(-) Approvals: Yuvipanda: Verified; Looks good to me, approved diff --git a/modules/labstore/files/nfs-mounts.yaml b/modules/labstore/files/nfs-mounts.yaml index 446485c..a96bf67 100644 --- a/modules/labstore/files/nfs-mounts.yaml +++ b/modules/labstore/files/nfs-mounts.yaml @@ -151,13 +151,6 @@ home: true project: true scratch: true - puppet3-diffs: -gid: 51904 -mounts: - dumps: true - home: true - project: true - scratch: true quarry: gid: 52243 mounts: -- To view, visit https://gerrit.wikimedia.org/r/223148 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I58ae88b23098487db9a5067259a3b4d8793d5614 Gerrit-PatchSet: 2 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Yuvipanda yuvipa...@gmail.com Gerrit-Reviewer: Yuvipanda yuvipa...@gmail.com Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] uwsgi: Do not setup nrpe monitor in labs - change (operations/puppet)
Yuvipanda has submitted this change and it was merged.
Change subject: uwsgi: Do not setup nrpe monitor in labs
..
uwsgi: Do not setup nrpe monitor in labs
Change-Id: Ia257354914892516dbf184c58a48a9c66ffe7dd2
---
M hieradata/labs.yaml
M modules/uwsgi/manifests/init.pp
2 files changed, 7 insertions(+), 4 deletions(-)
Approvals:
Yuvipanda: Verified; Looks good to me, approved
jenkins-bot: Verified
diff --git a/hieradata/labs.yaml b/hieradata/labs.yaml
index 3f77fa6..9736342 100644
--- a/hieradata/labs.yaml
+++ b/hieradata/labs.yaml
@@ -8,6 +8,7 @@
elasticsearch::recover_after_nodes: 1
ganglia_class: old
has_ganglia: false
+has_nrpe: false
archiva::proxy::ssl_enabled: false
archiva::proxy::certificate_name: ssl-cert-snakeoil
statsite::instance::graphite_host: 'labmon1001.eqiad.wmnet'
diff --git a/modules/uwsgi/manifests/init.pp b/modules/uwsgi/manifests/init.pp
index 658c620..4b6ae57 100644
--- a/modules/uwsgi/manifests/init.pp
+++ b/modules/uwsgi/manifests/init.pp
@@ -54,9 +54,11 @@
require = File['/sbin/uwsgictl'],
}
-nrpe::monitor_service { 'uwsgi':
-description = 'uWSGI web apps',
-nrpe_command = '/sbin/uwsgictl check',
-require = Service['uwsgi'],
+if hiera('has_nrpe', true) {
+nrpe::monitor_service { 'uwsgi':
+description = 'uWSGI web apps',
+nrpe_command = '/sbin/uwsgictl check',
+require = Service['uwsgi'],
+}
}
}
--
To view, visit https://gerrit.wikimedia.org/r/223153
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia257354914892516dbf184c58a48a9c66ffe7dd2
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Yuvipanda yuvipa...@gmail.com
Gerrit-Reviewer: Yuvipanda yuvipa...@gmail.com
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Build demos as part of `grunt build` too - change (oojs/ui)
jenkins-bot has submitted this change and it was merged. Change subject: Build demos as part of `grunt build` too .. Build demos as part of `grunt build` too Bug: T104696 Change-Id: I3d5201d020f8dba639eb2694015b14de96fde149 --- M Gruntfile.js 1 file changed, 4 insertions(+), 1 deletion(-) Approvals: Catrope: Looks good to me, approved jenkins-bot: Verified diff --git a/Gruntfile.js b/Gruntfile.js index 5d546bf..324a714 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -405,7 +405,10 @@ ] ); grunt.registerTask( 'build-i18n', [ 'copy:i18n' ] ); grunt.registerTask( 'build-tests', [ 'exec:rubyTestSuiteGenerator', 'exec:phpGenerateJSPHPForKarma' ] ); - grunt.registerTask( 'build', [ 'clean:build', 'fileExists', 'typos', 'build-code', 'build-styling', 'build-i18n', 'build-tests', 'clean:tmp' ] ); + grunt.registerTask( 'build', [ + 'clean:build', 'fileExists', 'typos', 'build-code', 'build-styling', 'build-i18n', + 'build-tests', 'clean:tmp', 'demos' + ] ); grunt.registerTask( 'git-build', [ 'pre-git-build', 'build' ] ); -- To view, visit https://gerrit.wikimedia.org/r/223151 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I3d5201d020f8dba639eb2694015b14de96fde149 Gerrit-PatchSet: 1 Gerrit-Project: oojs/ui Gerrit-Branch: master Gerrit-Owner: Legoktm legoktm.wikipe...@gmail.com Gerrit-Reviewer: Bartosz Dziewoński matma@gmail.com Gerrit-Reviewer: Catrope roan.katt...@gmail.com Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Allow hooks to abort lines in EnhancedRC - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged.
Change subject: Allow hooks to abort lines in EnhancedRC
..
Allow hooks to abort lines in EnhancedRC
Bug: T104564
Change-Id: I4a2f97d83f38071984d571773a6b09b6b6643d6d
---
M docs/hooks.txt
M includes/changes/EnhancedChangesList.php
2 files changed, 12 insertions(+), 2 deletions(-)
Approvals:
Legoktm: Looks good to me, approved
jenkins-bot: Verified
diff --git a/docs/hooks.txt b/docs/hooks.txt
index 92bc95a..23df983 100644
--- a/docs/hooks.txt
+++ b/docs/hooks.txt
@@ -1300,12 +1300,14 @@
'EnhancedChangesList::getLogText': to alter, remove or add to the links of a
group of changes in EnhancedChangesList.
+Hook subscribers can return false to omit this line from recentchanges.
$changesList: EnhancedChangesList object
$links: The links that were generated by EnhancedChangesList
$block: The RecentChanges objects in that block
'EnhancedChangesListModifyLineData': to alter data used to build
a grouped recent change inner line in EnhancedChangesList.
+Hook subscribers can return false to omit this line from recentchanges.
$changesList: EnhancedChangesList object
$data: An array with all the components that will be joined in order to
create the line
$block: An array of RecentChange objects in that block
diff --git a/includes/changes/EnhancedChangesList.php
b/includes/changes/EnhancedChangesList.php
index fe7deb6..9635c17 100644
--- a/includes/changes/EnhancedChangesList.php
+++ b/includes/changes/EnhancedChangesList.php
@@ -378,8 +378,12 @@
$data['tags'] = $this-getTags( $rcObj, $classes );
// give the hook a chance to modify the data
- Hooks::run( 'EnhancedChangesListModifyLineData',
+ $success = Hooks::run(
'EnhancedChangesListModifyLineData',
array( $this, $data, $block, $rcObj ) );
+ if ( !$success ) {
+ // skip entry if hook aborted it
+ continue;
+ }
$line = 'tr' . $trClass . 'td/tdtd
class=mw-enhanced-rc';
if ( isset( $data['recentChangesFlags'] ) ) {
@@ -599,8 +603,12 @@
$data['watchingUsers'] = $this-numberofWatchingusers(
$rcObj-numberofWatchingusers );
// give the hook a chance to modify the data
- Hooks::run( 'EnhancedChangesListModifyBlockLineData',
+ $success = Hooks::run( 'EnhancedChangesListModifyBlockLineData',
array( $this, $data, $rcObj ) );
+ if ( !$success ) {
+ // skip entry if hook aborted it
+ return '';
+ }
$line = Html::openElement( 'table', array( 'class' = $classes
) ) .
Html::openElement( 'tr' );
--
To view, visit https://gerrit.wikimedia.org/r/85
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I4a2f97d83f38071984d571773a6b09b6b6643d6d
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Matthias Mullie mmul...@wikimedia.org
Gerrit-Reviewer: Catrope roan.katt...@gmail.com
Gerrit-Reviewer: Legoktm legoktm.wikipe...@gmail.com
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] ores: Vim has its problems, I must admit - change (operations/puppet)
Yuvipanda has submitted this change and it was merged.
Change subject: ores: Vim has its problems, I must admit
..
ores: Vim has its problems, I must admit
Change-Id: I76e22f8f8e547f3a4db159cd440f0e05529b43b5
---
M manifests/role/labsores.pp
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Yuvipanda: Verified; Looks good to me, approved
diff --git a/manifests/role/labsores.pp b/manifests/role/labsores.pp
index d955b5e..c7c443d 100644
--- a/manifests/role/labsores.pp
+++ b/manifests/role/labsores.pp
@@ -34,7 +34,7 @@
include ::ores::web
include ::ores::worker
-w
+
class { '::ores::lb':
realservers = [ 'localhost:8080' ],
cache = false,
--
To view, visit https://gerrit.wikimedia.org/r/223160
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I76e22f8f8e547f3a4db159cd440f0e05529b43b5
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Yuvipanda yuvipa...@gmail.com
Gerrit-Reviewer: Yuvipanda yuvipa...@gmail.com
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] celery: Make celery::worker a define rather than a class - change (operations/puppet)
Yuvipanda has uploaded a new change for review.
https://gerrit.wikimedia.org/r/223162
Change subject: celery: Make celery::worker a define rather than a class
..
celery: Make celery::worker a define rather than a class
Change-Id: I13b188cad343babcfa63b4f7da00cb20a44a6924
---
M modules/celery/manifests/worker.pp
1 file changed, 2 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/62/223162/1
diff --git a/modules/celery/manifests/worker.pp
b/modules/celery/manifests/worker.pp
index 360c7bf..c7cdc14 100644
--- a/modules/celery/manifests/worker.pp
+++ b/modules/celery/manifests/worker.pp
@@ -1,11 +1,11 @@
-class celery::worker(
+define celery::worker(
$app,
$working_dir,
$user,
$group,
$celery_bin_path = '/usr/bin/celery',
) {
-base::service_unit { 'celery':
+base::service_unit { celery-${title}:
systemd = true,
}
}
--
To view, visit https://gerrit.wikimedia.org/r/223162
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I13b188cad343babcfa63b4f7da00cb20a44a6924
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Yuvipanda yuvipa...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add mw.Upload for easy tracking of uploads - change (mediawiki/core)
MarkTraceur has uploaded a new change for review.
https://gerrit.wikimedia.org/r/223163
Change subject: Add mw.Upload for easy tracking of uploads
..
Add mw.Upload for easy tracking of uploads
This class will be used in an mw-ooui upload widget, as well
as several other places, to create a simpler upload pipeline.
Bug: T103413
Change-Id: Ifbfa626421b1b55ecaa522c5e5ef1f7ea45c6527
---
M resources/Resources.php
A resources/src/mediawiki/mediawiki.Upload.js
2 files changed, 261 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/63/223163/1
diff --git a/resources/Resources.php b/resources/Resources.php
index b0c840a..f3c9940 100644
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -1058,6 +1058,12 @@
),
'targets' = array( 'desktop', 'mobile' ),
),
+ 'mediawiki.Upload' = array(
+ 'scripts' = 'resources/src/mediawiki/mediawiki.Upload.js',
+ 'dependencies' = array(
+ 'mediawiki.api.upload',
+ ),
+ ),
'mediawiki.toc' = array(
'scripts' = 'resources/src/mediawiki/mediawiki.toc.js',
'dependencies' = 'mediawiki.cookie',
diff --git a/resources/src/mediawiki/mediawiki.Upload.js
b/resources/src/mediawiki/mediawiki.Upload.js
new file mode 100644
index 000..9d8f1b7
--- /dev/null
+++ b/resources/src/mediawiki/mediawiki.Upload.js
@@ -0,0 +1,255 @@
+( function ( mw ) {
+ var UP;
+
+ /**
+* @class mw.Upload
+*
+* Used to represent an upload in progress on the frontend.
+* Most of the functionality is implemented in mw.Api.plugin.upload,
+* but this model class will tie it together as well as let you perform
+* actions in a logical way.
+*
+* @constructor
+* @param {Object} apiconfig Passed to the constructor of mw.Api.
+*/
+ function Upload( apiconfig ) {
+ this.api = new mw.Api( apiconfig );
+
+ this.watchlist = false;
+ this.text = '';
+ this.comment = '';
+ this.filename = null;
+ this.file = null;
+ this.state = Upload.NEW;
+ }
+
+ UP = Upload.prototype;
+
+ /**
+* @enum mw.Upload.State
+* State of uploads represented in simple terms.
+*/
+ Upload.State = {
+ /** Upload not yet started */
+ NEW: 0,
+
+ /** Upload finished, but there was a warning */
+ WARNING: 1,
+
+ /** Upload finished, but there was an error */
+ ERROR: 2,
+
+ /** Upload in progress */
+ UPLOADING: 3,
+
+ /** Upload finished, but not published, call #finishStashUpload
*/
+ STASHED: 4,
+
+ /** Upload finished and published */
+ UPLOADED: 5
+ };
+
+ /**
+* Set the text of the file page, to be created on file upload.
+* @param {string} text
+*/
+ UP.setText = function ( text ) {
+ this.text = text;
+ };
+
+ /**
+* Set the filename, to be finalized on upload.
+* @param {string} filename
+*/
+ UP.setFilename = function ( filename ) {
+ this.filename = filename;
+ };
+
+ /**
+* Sets the filename based on the filename as it was on the upload.
+*/
+ UP.setFilenameFromFile = function () {
+ if ( this.file.nodeType this.file.nodeType ===
this.file.ELEMENT_NODE ) {
+ // File input element, use getBasename to cut out the
path
+ this.setFilename( this.getBasename( this.file.value ) );
+ } else if ( this.file.name this.file.lastModified ) {
+ // HTML5 FileAPI File object, but use getBasename to be
safe
+ this.setFilename( this.getBasename( this.file.name ) );
+ }
+ };
+
+ /**
+* Set the file to be uploaded.
+* @param {HTMLInputElement|File} file
+*/
+ UP.setFile = function ( file ) {
+ this.file = file;
+ };
+
+ /**
+* Set whether the file should be watchlisted after upload.
+* @param {boolean} watchlist
+*/
+ UP.setWatchlist = function ( watchlist ) {
+ this.watchlist = watchlist;
+ };
+
+ /**
+* Set the edit comment for the upload.
+* @param {string} comment
+*/
+ UP.setComment = function ( comment ) {
+ this.comment = comment;
+ };
+
+ /**
+* Get the text of the file page, to be created on file upload.
+* @return {string}
+*/
+ UP.getText = function () {
+ return
[MediaWiki-commits] [Gerrit] access: add DCausse shell account - change (operations/puppet)
RobH has submitted this change and it was merged. Change subject: access: add DCausse shell account .. access: add DCausse shell account bug: T104222 Change-Id: I419e2508c262423bab84b504215bb960d2cc6ad6 --- M modules/admin/data/data.yaml 1 file changed, 8 insertions(+), 0 deletions(-) Approvals: RobH: Looks good to me, approved jenkins-bot: Verified diff --git a/modules/admin/data/data.yaml b/modules/admin/data/data.yaml index e77c5e4..6d182e8 100644 --- a/modules/admin/data/data.yaml +++ b/modules/admin/data/data.yaml @@ -1465,3 +1465,11 @@ realname: Darian Anthony Patrick ssh_keys: [ssh-rsa B3NzaC1yc2EDAQABAAABAQC3dtG8+VT7ldgcssl6OFgWbZThbShLay2LufVhVCmXEyOzoBGV3miwhyN1WGodp7aJ53txKPMDeakcyS9NtGL17avwJ/BccQrqxK8htqHvNJJOvvH8wrVSQpa0VwZ4MdGQXs+EJ9rTfb4ZWbi9uhg5DVSe/l6aeUR0w70rBvRjJS4XudJo71tvM8nqcYbusutkeJN97LLPBPCKq6mrhu1p80Lc3ZK3IYnyHceDxYDyfvbWVBfNDKEbRD64ogDvaG3tmMF1Fl0AL6Bujf1MOxlm8iykbog5kCFh74gECJ6B4OBLQ6i/sZ4U4uJa2Ucj4BRR7B8xX6RFGcfS03+m7KFN dpatrick_prod] uid: 12203 + dcausse: +ensure: present +gid: 500 +name: dcausse +realname: David Causse +ssh_keys: [ssh-rsa B3NzaC1yc2EDAQABAAABAQC95t2F3S61Za6Y+mZUs4abK95cXm9FedpnUJe2ii3byeFG5QPL9E8+zcZ70o2Mt0NjM5Nitla/Tb+U2BRjk3/YmWEkZxd9crUFRi3IVHjKhEOYhLSSjb2NJdNyWUoUgkQ8DspVDotsnIupdLuHY0Dyh+O4dFI7xnRKIUShm/B//BDCu03PXR4ikYkmtR/+LeKbMh3qSGgvfgv/G4hIiKjyiQt7Md+ROW0YqMp6yAtqIJ+2in1hU3mxy47vfVOFTcL5nNLOLoxJGVSsm0ancVbzrkqruk1o/iFxuz9AzxnX8EAozaNUH7PP3/ybD7ocK7v4SiYpibT2epWPkORgUV7h dcausse_prod@dizzy] +uid: 12338 + -- To view, visit https://gerrit.wikimedia.org/r/221967 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I419e2508c262423bab84b504215bb960d2cc6ad6 Gerrit-PatchSet: 2 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Matanya mata...@foss.co.il Gerrit-Reviewer: Alexandros Kosiaris akosia...@wikimedia.org Gerrit-Reviewer: DCausse dcau...@wikimedia.org Gerrit-Reviewer: Dzahn dz...@wikimedia.org Gerrit-Reviewer: Faidon Liambotis fai...@wikimedia.org Gerrit-Reviewer: RobH r...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] celery: Specify template_name for systemd unit explicitly - change (operations/puppet)
Yuvipanda has uploaded a new change for review.
https://gerrit.wikimedia.org/r/223164
Change subject: celery: Specify template_name for systemd unit explicitly
..
celery: Specify template_name for systemd unit explicitly
Change-Id: I8c42c7a446f5f807af560ddd780c113160713067
---
M modules/celery/manifests/worker.pp
1 file changed, 2 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/64/223164/1
diff --git a/modules/celery/manifests/worker.pp
b/modules/celery/manifests/worker.pp
index c7cdc14..50b3f22 100644
--- a/modules/celery/manifests/worker.pp
+++ b/modules/celery/manifests/worker.pp
@@ -6,6 +6,7 @@
$celery_bin_path = '/usr/bin/celery',
) {
base::service_unit { celery-${title}:
-systemd = true,
+template_name = 'celery',
+systemd = true,
}
}
--
To view, visit https://gerrit.wikimedia.org/r/223164
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I8c42c7a446f5f807af560ddd780c113160713067
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Yuvipanda yuvipa...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] IE8: Use .parent instead of .super - change (mediawiki...Flow)
jenkins-bot has submitted this change and it was merged.
Change subject: IE8: Use .parent instead of .super
..
IE8: Use .parent instead of .super
Change-Id: I1cef39e69b494013fdb9e594938582f5c0469e73
---
M modules/flow/ui/widgets/mw.flow.ui.NavigationWidget.js
M modules/flow/ui/widgets/mw.flow.ui.ReorderTopicsWidget.js
M modules/flow/ui/widgets/mw.flow.ui.ToCWidget.js
M modules/flow/ui/widgets/mw.flow.ui.TopicMenuSelectWidget.js
4 files changed, 6 insertions(+), 6 deletions(-)
Approvals:
Catrope: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/flow/ui/widgets/mw.flow.ui.NavigationWidget.js
b/modules/flow/ui/widgets/mw.flow.ui.NavigationWidget.js
index 07670e2..56589cf 100644
--- a/modules/flow/ui/widgets/mw.flow.ui.NavigationWidget.js
+++ b/modules/flow/ui/widgets/mw.flow.ui.NavigationWidget.js
@@ -14,7 +14,7 @@
config = config || {};
// Parent constructor
- mw.flow.ui.NavigationWidget.super.call( this, config );
+ mw.flow.ui.NavigationWidget.parent.call( this, config );
this.board = board;
diff --git a/modules/flow/ui/widgets/mw.flow.ui.ReorderTopicsWidget.js
b/modules/flow/ui/widgets/mw.flow.ui.ReorderTopicsWidget.js
index 472dbdb..6e226a1 100644
--- a/modules/flow/ui/widgets/mw.flow.ui.ReorderTopicsWidget.js
+++ b/modules/flow/ui/widgets/mw.flow.ui.ReorderTopicsWidget.js
@@ -12,7 +12,7 @@
config = config || {};
// Parent constructor
- mw.flow.ui.ReorderTopicsWidget.super.call( this, config );
+ mw.flow.ui.ReorderTopicsWidget.parent.call( this, config );
this.board = board;
diff --git a/modules/flow/ui/widgets/mw.flow.ui.ToCWidget.js
b/modules/flow/ui/widgets/mw.flow.ui.ToCWidget.js
index 05aa883..4616c08 100644
--- a/modules/flow/ui/widgets/mw.flow.ui.ToCWidget.js
+++ b/modules/flow/ui/widgets/mw.flow.ui.ToCWidget.js
@@ -14,7 +14,7 @@
config = config || {};
// Parent constructor
- mw.flow.ui.ToCWidget.super.call( this, config );
+ mw.flow.ui.ToCWidget.parent.call( this, config );
this.board = board;
this.originalButtonLabel = mw.msg(
'flow-board-header-browse-topics-link' );
diff --git a/modules/flow/ui/widgets/mw.flow.ui.TopicMenuSelectWidget.js
b/modules/flow/ui/widgets/mw.flow.ui.TopicMenuSelectWidget.js
index 351e227..c364d85 100644
--- a/modules/flow/ui/widgets/mw.flow.ui.TopicMenuSelectWidget.js
+++ b/modules/flow/ui/widgets/mw.flow.ui.TopicMenuSelectWidget.js
@@ -14,7 +14,7 @@
config = config || {};
// Parent constructor
- mw.flow.ui.TopicMenuSelectWidget.super.call( this, config );
+ mw.flow.ui.TopicMenuSelectWidget.parent.call( this, config );
// Properties
this.board = model;
@@ -244,7 +244,7 @@
}
// Parent call
- mw.flow.ui.TopicMenuSelectWidget.super.prototype.addItems.call(
this, items, index );
+
mw.flow.ui.TopicMenuSelectWidget.parent.prototype.addItems.call( this, items,
index );
};
/**
@@ -262,7 +262,7 @@
}
// Parent call
-
mw.flow.ui.TopicMenuSelectWidget.super.prototype.removeItems.call( this, items
);
+
mw.flow.ui.TopicMenuSelectWidget.parent.prototype.removeItems.call( this, items
);
};
}( jQuery ) );
--
To view, visit https://gerrit.wikimedia.org/r/223157
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I1cef39e69b494013fdb9e594938582f5c0469e73
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: Sbisson sbis...@wikimedia.org
Gerrit-Reviewer: Catrope roan.katt...@gmail.com
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] [WIP] switch to core's server-side HTML templating - change (mediawiki...Blueprint)
Spage has uploaded a new change for review.
https://gerrit.wikimedia.org/r/223165
Change subject: [WIP] switch to core's server-side HTML templating
..
[WIP] switch to core's server-side HTML templating
Copy template setup from
https://www.mediawiki.org/wiki/Manual:HTML_templates
into BlueprintSkinTemplate, Also the 'debughtml' from
vendor/werdnum/mediawiki-lightncandy-skin/AbstractLightNCandyTemplate.php
werdnum lightncandy wrappers aren't needed, so no more composer.
But: PHP HTML templating does not properly support partials (T97188), so
{{sidebar}}
doesn't resolve:
LightnCandy::resolvePartial checking if file_exists
/home/spage/projects/core/skins/Blueprint/src/../templates/sidebar.tmpl
Error: Can not find partial file for 'sidebar', you should set correct
basedir and fileext in options
Bug: T104672
Change-Id: I450c799382f6c596fd0c82b482a765b24322e7dd
---
D composer.json
D composer.lock
M src/BlueprintSkinTemplate.php
R templates/Skin.mustache
D templates/Skin.php
R templates/sidebar.mustache
6 files changed, 11 insertions(+), 432 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/Blueprint
refs/changes/65/223165/1
diff --git a/composer.json b/composer.json
deleted file mode 100644
index 6e5ef43..000
--- a/composer.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-require: {
-werdnum/simple-lightncandy: ~0.1-dev,
-werdnum/mediawiki-lightncandy-skin: ~0.1-dev
-}
-}
diff --git a/composer.lock b/composer.lock
deleted file mode 100644
index 99205d2..000
--- a/composer.lock
+++ /dev/null
@@ -1,128 +0,0 @@
-{
-_readme: [
-This file locks the dependencies of your project to a known state,
-Read more about it at
http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file;,
-This file is @generated automatically
-],
-hash: e72751453fd65e861864cc13d8e197db,
-packages: [
-{
-name: werdnum/mediawiki-lightncandy-skin,
-version: 0.1.x-dev,
-source: {
-type: git,
-url:
https://github.com/werdnum/mediawiki-lightncandyskin.git;,
-reference: 79ddf899dee8fea78cc4888dec6f2328bb0ef21d
-},
-dist: {
-type: zip,
-url:
https://api.github.com/repos/werdnum/mediawiki-lightncandyskin/zipball/79ddf899dee8fea78cc4888dec6f2328bb0ef21d;,
-reference: 79ddf899dee8fea78cc4888dec6f2328bb0ef21d,
-shasum:
-},
-type: library,
-autoload: {
-classmap: [
-AbstractLightNCandyTemplate.php
-]
-},
-notification-url: https://packagist.org/downloads/;,
-license: [
-GPL
-],
-authors: [
-{
-name: Andrew Garrett,
-email: agarr...@wikimedia.org
-}
-],
-description: Simple library for creating LightnCandy based
skins for MediaWiki.,
-time: 2015-01-14 12:06:59
-},
-{
-name: werdnum/simple-lightncandy,
-version: 0.4.0,
-source: {
-type: git,
-url: https://github.com/werdnum/simple-lightncandy.git;,
-reference: 3f9ce07c4ac3e7391b4dabf5bb0a107f361cd626
-},
-dist: {
-type: zip,
-url:
https://api.github.com/repos/werdnum/simple-lightncandy/zipball/3f9ce07c4ac3e7391b4dabf5bb0a107f361cd626;,
-reference: 3f9ce07c4ac3e7391b4dabf5bb0a107f361cd626,
-shasum:
-},
-require: {
-zordius/lightncandy: ~0.18
-},
-type: library,
-autoload: {
-classmap: [
-SimpleLightNCandy.php
-]
-},
-notification-url: https://packagist.org/downloads/;,
-description: No-nonsense templating with lightncandy,
-time: 2015-04-06 10:24:18
-},
-{
-name: zordius/lightncandy,
-version: v0.20,
-source: {
-type: git,
-url: https://github.com/zordius/lightncandy.git;,
-reference: 257355494db7edb4738471fa7f2b247a2c4d8719
-},
-dist: {
-type: zip,
-url:
https://api.github.com/repos/zordius/lightncandy/zipball/257355494db7edb4738471fa7f2b247a2c4d8719;,
-reference: 257355494db7edb4738471fa7f2b247a2c4d8719,
-shasum:
-},
-require: {
-php: =5.3.0
-},
-require-dev: {
-phpunit/phpunit: 4.0.17
-},
-type:
[MediaWiki-commits] [Gerrit] Add tool tip UI components for onboarding - change (apps...wikipedia)
jenkins-bot has submitted this change and it was merged. Change subject: Add tool tip UI components for onboarding .. Add tool tip UI components for onboarding - Integrate Onboarding v1.0.3 for tool tips. - Add Wikipedia app styling to tool tips. - Add (disabled) code to display tool tips. Bug: T89985 Change-Id: I97e9565b4a5af4eaaa3176a59bf6c2ec4a98182e --- A art/social-network-logos/facebook/FB-fLogo-online-broadcast.ai A art/social-network-logos/g+/eps/g+icon_white.eps A art/social-network-logos/twitter/eps/TwitterLogo_white.eps A art/tool-tips/gimp/tool_tip_arrow_down.xcf A art/tool-tips/gimp/tool_tip_arrow_up.xcf A wikipedia/assets/licenses/Onboarding M wikipedia/build.gradle A wikipedia/res/drawable-hdpi/facebook_logo.png A wikipedia/res/drawable-hdpi/plus_logo.png A wikipedia/res/drawable-hdpi/tool_tip_arrow_down.png A wikipedia/res/drawable-hdpi/tool_tip_arrow_up.png A wikipedia/res/drawable-hdpi/twitter_logo.png A wikipedia/res/drawable-ldpi/facebook_logo.png A wikipedia/res/drawable-ldpi/plus_logo.png A wikipedia/res/drawable-ldpi/tool_tip_arrow_down.png A wikipedia/res/drawable-ldpi/tool_tip_arrow_up.png A wikipedia/res/drawable-ldpi/twitter_logo.png A wikipedia/res/drawable-mdpi/facebook_logo.png A wikipedia/res/drawable-mdpi/plus_logo.png A wikipedia/res/drawable-mdpi/tool_tip_arrow_down.png A wikipedia/res/drawable-mdpi/tool_tip_arrow_up.png A wikipedia/res/drawable-mdpi/twitter_logo.png A wikipedia/res/drawable-xhdpi/facebook_logo.png A wikipedia/res/drawable-xhdpi/plus_logo.png A wikipedia/res/drawable-xhdpi/tool_tip_arrow_down.png A wikipedia/res/drawable-xhdpi/tool_tip_arrow_up.png A wikipedia/res/drawable-xhdpi/twitter_logo.png A wikipedia/res/drawable-xxhdpi/facebook_logo.png A wikipedia/res/drawable-xxhdpi/plus_logo.png A wikipedia/res/drawable-xxhdpi/tool_tip_arrow_down.png A wikipedia/res/drawable-xxhdpi/tool_tip_arrow_up.png A wikipedia/res/drawable-xxhdpi/twitter_logo.png A wikipedia/res/drawable-xxxhdpi/facebook_logo.png A wikipedia/res/drawable-xxxhdpi/plus_logo.png A wikipedia/res/drawable-xxxhdpi/tool_tip_arrow_down.png A wikipedia/res/drawable-xxxhdpi/tool_tip_arrow_up.png A wikipedia/res/drawable-xxxhdpi/twitter_logo.png M wikipedia/res/layout/fragment_page.xml A wikipedia/res/layout/inflate_tool_tip_select_text.xml A wikipedia/res/layout/inflate_tool_tip_share.xml A wikipedia/res/layout/tooltip.xml M wikipedia/res/values-qq/strings.xml M wikipedia/res/values/credits.xml M wikipedia/res/values/dimens.xml A wikipedia/res/values/ids.xml M wikipedia/res/values/strings.xml M wikipedia/src/main/java/org/wikipedia/Utils.java A wikipedia/src/main/java/org/wikipedia/drawable/ExposedPorterDuffColorFilter.java A wikipedia/src/main/java/org/wikipedia/drawable/ExposedPorterDuffColorFilterDrawableProperty.java M wikipedia/src/main/java/org/wikipedia/page/PageActivity.java M wikipedia/src/main/java/org/wikipedia/page/PageViewFragmentInternal.java M wikipedia/src/main/java/org/wikipedia/page/snippet/ShareHandler.java A wikipedia/src/main/java/org/wikipedia/tooltip/ToolTipContainerView.java A wikipedia/src/main/java/org/wikipedia/tooltip/ToolTipUtil.java M wikipedia/src/main/java/org/wikipedia/util/ActivityUtil.java M wikipedia/src/main/java/org/wikipedia/views/ViewUtil.java 56 files changed, 2,327 insertions(+), 11 deletions(-) Approvals: BearND: Looks good to me, approved jenkins-bot: Verified -- To view, visit https://gerrit.wikimedia.org/r/222193 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I97e9565b4a5af4eaaa3176a59bf6c2ec4a98182e Gerrit-PatchSet: 11 Gerrit-Project: apps/android/wikipedia Gerrit-Branch: master Gerrit-Owner: Niedzielski sniedziel...@wikimedia.org Gerrit-Reviewer: BearND bsitzm...@wikimedia.org Gerrit-Reviewer: Brion VIBBER br...@wikimedia.org Gerrit-Reviewer: Dbrant dbr...@wikimedia.org Gerrit-Reviewer: Mholloway mhollo...@wikimedia.org Gerrit-Reviewer: Niedzielski sniedziel...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Skin itself should not be border box - change (mediawiki...MobileFrontend)
Jdlrobson has uploaded a new change for review.
https://gerrit.wikimedia.org/r/223176
Change subject: Skin itself should not be border box
..
Skin itself should not be border box
The skin contains various elements which are generated by other
things such as oojs ui and HTML generated from templates written by
editors. Thus limit view-border-box to the things that are in our
control.
Since this patch keeps causing us problems, please at minimum let's have
two reviewers (+1 and +2) before merging.
Bug: T86366
Change-Id: If5fe280e8d4424893cfaee9b1033fa77857287a2
---
M includes/skins/history.mustache
M minerva.less/minerva.variables.less
M resources/mobile.mainMenu/menu.mustache
M resources/mobile.startup/Skin.js
M resources/skins.minerva.tablet.beta.styles/common.less
M resources/skins.minerva.tablet.beta.styles/ui.less
M resources/skins.minerva.tablet.styles/common.less
7 files changed, 8 insertions(+), 18 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend
refs/changes/76/223176/1
diff --git a/includes/skins/history.mustache b/includes/skins/history.mustache
index 0a4a892..47cc874 100644
--- a/includes/skins/history.mustache
+++ b/includes/skins/history.mustache
@@ -1,5 +1,5 @@
{{! FIXME: Remove .pre-content when the last modified bar in beta is promoted
to stable }}
-{{^isMainPage}}div class=last-modified-bar pre-content
post-content{{/isMainPage}}
+{{^isMainPage}}div class=last-modified-bar view-border-box pre-content
post-content{{/isMainPage}}
div id=mw-mf-last-modified class=truncated-text
a href={{link}}
data-user-name={{username}}
diff --git a/minerva.less/minerva.variables.less
b/minerva.less/minerva.variables.less
index d9f15cb..2b89c0b 100644
--- a/minerva.less/minerva.variables.less
+++ b/minerva.less/minerva.variables.less
@@ -80,7 +80,8 @@
// custom tablet styling
@contentPaddingTablet: 3.35em;
-@contentMaxWidthTablet: 1000px;
+// note since content is not view border box we have to include padding.
+@contentMaxWidthTablet: 62.5em - ( 2 * @contentPaddingTablet );
// calculated values
@secondaryNavWidth: @headerElementHeight;
diff --git a/resources/mobile.mainMenu/menu.mustache
b/resources/mobile.mainMenu/menu.mustache
index bb4a4bd..a513420 100644
--- a/resources/mobile.mainMenu/menu.mustache
+++ b/resources/mobile.mainMenu/menu.mustache
@@ -1,4 +1,4 @@
-div class=menu
+div class=menu view-border-box
ul
{{#discovery}}
li class={{class}}
diff --git a/resources/mobile.startup/Skin.js b/resources/mobile.startup/Skin.js
index 7e83529..b846c70 100644
--- a/resources/mobile.startup/Skin.js
+++ b/resources/mobile.startup/Skin.js
@@ -13,6 +13,7 @@
* @uses Page
*/
Skin = View.extend( {
+ isBorderBox: false,
/**
* @inheritdoc
* @cfg {Object} defaults Default options hash.
diff --git a/resources/skins.minerva.tablet.beta.styles/common.less
b/resources/skins.minerva.tablet.beta.styles/common.less
index bd19be9..3467001 100644
--- a/resources/skins.minerva.tablet.beta.styles/common.less
+++ b/resources/skins.minerva.tablet.beta.styles/common.less
@@ -28,20 +28,6 @@
margin-right: auto;
max-width: @contentMaxWidthTablet;
}
-
- // FIXME: Zero should use banner-container class or better -
append to banner-container
- #mw-mf-page-center .mw-mf-banner,
- .banner-container,
- .header,
- .pre-content,
- .post-content,
- .content-unstyled,
- .content-header,
- .overlay-header,
- .overlay-content {
- padding-left: @contentPaddingTablet;
- padding-right: @contentPaddingTablet;
- }
}
.alpha,
diff --git a/resources/skins.minerva.tablet.beta.styles/ui.less
b/resources/skins.minerva.tablet.beta.styles/ui.less
index 467126c..c2f3b82 100644
--- a/resources/skins.minerva.tablet.beta.styles/ui.less
+++ b/resources/skins.minerva.tablet.beta.styles/ui.less
@@ -4,6 +4,8 @@
@media all and (min-width: @wgMFDeviceWidthTablet) {
.last-modified-bar.post-content {
background-color: transparent;
+ padding-left: 0;
+ padding-right: 0;
font-size: 1em;
.active {
background-color: transparent;
diff --git a/resources/skins.minerva.tablet.styles/common.less
b/resources/skins.minerva.tablet.styles/common.less
index 52dab43..b028c70 100644
--- a/resources/skins.minerva.tablet.styles/common.less
+++ b/resources/skins.minerva.tablet.styles/common.less
@@ -54,7 +54,7 @@
}
.content {
- padding: 1.6em
[MediaWiki-commits] [Gerrit] access: Grant dcausse root on the search cluster - change (operations/puppet)
RobH has submitted this change and it was merged. Change subject: access: Grant dcausse root on the search cluster .. access: Grant dcausse root on the search cluster bug: T104222 Change-Id: Icbc10021d24205401edec20641ecad43c106d988 --- M modules/admin/data/data.yaml 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: RobH: Looks good to me, approved jenkins-bot: Verified diff --git a/modules/admin/data/data.yaml b/modules/admin/data/data.yaml index 6d182e8..0e4afca 100644 --- a/modules/admin/data/data.yaml +++ b/modules/admin/data/data.yaml @@ -80,7 +80,7 @@ elasticsearch-roots: gid: 709 description: manage elasticsearch nodes -members: [manybubbles, demon, jdouglas, ebernhardson] +members: [manybubbles, demon, jdouglas, ebernhardson, dcausse] privileges: ['ALL = (ALL) NOPASSWD: ALL'] dataset-admins: gid: 710 -- To view, visit https://gerrit.wikimedia.org/r/221968 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Icbc10021d24205401edec20641ecad43c106d988 Gerrit-PatchSet: 4 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Matanya mata...@foss.co.il Gerrit-Reviewer: Alexandros Kosiaris akosia...@wikimedia.org Gerrit-Reviewer: DCausse dcau...@wikimedia.org Gerrit-Reviewer: Dzahn dz...@wikimedia.org Gerrit-Reviewer: Faidon Liambotis fai...@wikimedia.org Gerrit-Reviewer: Matanya mata...@foss.co.il Gerrit-Reviewer: RobH r...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Reclaim lanthanum: remove related puppet conf - change (operations/puppet)
Hashar has uploaded a new change for review.
https://gerrit.wikimedia.org/r/223175
Change subject: Reclaim lanthanum: remove related puppet conf
..
Reclaim lanthanum: remove related puppet conf
The machine is no more used by CI. It can be reclaimed.
Remove left over configuration snippets.
Remove classes from node in site.pp, leaving `::standard` and installer
stuff.
DNS clean up is https://gerrit.wikimedia.org/r/#/c/223167/
Bug: T86658
Change-Id: Ib1e6df7a1e7cef7821248eb5f7890828f6fdc85d
---
M manifests/network.pp
M manifests/site.pp
2 files changed, 1 insertion(+), 17 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/75/223175/1
diff --git a/manifests/network.pp b/manifests/network.pp
index 23bcc20..d16b0de 100644
--- a/manifests/network.pp
+++ b/manifests/network.pp
@@ -299,7 +299,6 @@
$contint_zuul_merger_hosts = {
'production' = [
'208.80.154.135', # gallium.wikimedia.org
-'10.64.0.161', # lanthanum.eqiad.wmnet
],
'labs' = [
'127.0.0.1',
diff --git a/manifests/site.pp b/manifests/site.pp
index e4c9e9e..6c96880 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1297,24 +1297,9 @@
role labs::nfs::fileserver
}
+# Used to be a CI slaves (T86658)
node 'lanthanum.eqiad.wmnet' {
-
include standard
-include role::ci::slave
-# lanthanum received a SSD drive just like gallium (T82587) mount it
-file { '/srv/ssd':
-ensure = 'directory',
-owner = 'root',
-group = 'root',
-}
-mount { '/srv/ssd':
-ensure = 'mounted',
-device = '/dev/sdb1',
-fstype = 'xfs',
-options = 'noatime,nodiratime,nobarrier,logbufs=8',
-require = File['/srv/ssd'],
-}
-
}
node 'lead.wikimedia.org' {
--
To view, visit https://gerrit.wikimedia.org/r/223175
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib1e6df7a1e7cef7821248eb5f7890828f6fdc85d
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Hashar has...@free.fr
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add .super to typos list - change (mediawiki...Flow)
Catrope has uploaded a new change for review.
https://gerrit.wikimedia.org/r/223180
Change subject: Add .super to typos list
..
Add .super to typos list
Change-Id: Ie6ce171ce808b15a2f45e938fb1e010701d3bfed
---
M build/typos.json
1 file changed, 2 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Flow
refs/changes/80/223180/1
diff --git a/build/typos.json b/build/typos.json
index 5916d77..f54ce28 100644
--- a/build/typos.json
+++ b/build/typos.json
@@ -1,6 +1,7 @@
{
caseSensitive: [
- [ @returns, @return ]
+ [ @returns, @return ],
+ [ \\.super, .parent ]
],
caseInsensitive: [
[ paralell, parallel ],
--
To view, visit https://gerrit.wikimedia.org/r/223180
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie6ce171ce808b15a2f45e938fb1e010701d3bfed
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: Catrope roan.katt...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix missing message in Skin.js license generation - change (mediawiki...MobileFrontend)
jenkins-bot has submitted this change and it was merged. Change subject: Fix missing message in Skin.js license generation .. Fix missing message in Skin.js license generation mobile-frontend-editor-terms-link is used in Skin.js, but is loaded in other modules only. Fix it by loading it in Skin.js module only. Bug: T104754 Change-Id: I1234137330632392f7843aaf600a5d5dcaeeeb30 --- M includes/Resources.php 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Jdlrobson: Looks good to me, approved jenkins-bot: Verified Objections: Phuedx: There's a problem with this change, please improve diff --git a/includes/Resources.php b/includes/Resources.php index f5ebd24..d92732a 100644 --- a/includes/Resources.php +++ b/includes/Resources.php @@ -516,6 +516,8 @@ // icons.js 'mobile-frontend-loading-message', 'mobile-frontend-console-recruit', + // Skin.js + 'mobile-frontend-editor-terms-link', ), 'styles' = array( 'resources/mobile.startup/panel.less', @@ -663,7 +665,6 @@ 'mobile-frontend-editor-keep-editing', 'mobile-frontend-editor-licensing', 'mobile-frontend-editor-licensing-with-terms', - 'mobile-frontend-editor-terms-link', 'mobile-frontend-editor-placeholder', 'mobile-frontend-editor-placeholder-new-page', 'mobile-frontend-editor-summary', @@ -814,7 +815,6 @@ 'mobile-frontend-editor-cancel-confirm', 'mobile-frontend-editor-error', 'mobile-frontend-editor-error-conflict', - 'mobile-frontend-editor-terms-link', ), ), -- To view, visit https://gerrit.wikimedia.org/r/222730 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I1234137330632392f7843aaf600a5d5dcaeeeb30 Gerrit-PatchSet: 3 Gerrit-Project: mediawiki/extensions/MobileFrontend Gerrit-Branch: master Gerrit-Owner: Florianschmidtwelzow florian.schmidt.wel...@t-online.de Gerrit-Reviewer: BarryTheBrowserTestBot jdlrobson+ba...@gmail.com Gerrit-Reviewer: Florianschmidtwelzow florian.schmidt.wel...@t-online.de Gerrit-Reviewer: Jdlrobson jrob...@wikimedia.org Gerrit-Reviewer: Phuedx g...@samsmith.io Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Change 1 to 0 to work around an edge case when the user-supp... - change (mediawiki...RandomImageByCategory)
Jack Phoenix has uploaded a new change for review.
https://gerrit.wikimedia.org/r/223182
Change subject: Change 1 to 0 to work around an edge case when the
user-supplied category or categories contain only one image so that we display
that instead of nothing
..
Change 1 to 0 to work around an edge case when the user-supplied category or
categories contain only one image so that we display that instead of nothing
Dev sites and/or brand new wikis don't necessarily have a lot of files
yet, so this is necessary, and I don't think it'll have any adverse
effects on bigger wikis.
Also bumped version number to 1.1, removed now obsolete MEDIAWIKI check
and function-level profiling.
Change-Id: Icd9c073267c14f1f6eb0b281eb393e6485f91c42
---
M RandomImageByCategory.php
1 file changed, 4 insertions(+), 12 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/RandomImageByCategory
refs/changes/82/223182/1
diff --git a/RandomImageByCategory.php b/RandomImageByCategory.php
index b1c0423..afc2124 100644
--- a/RandomImageByCategory.php
+++ b/RandomImageByCategory.php
@@ -9,19 +9,15 @@
* @author Aaron Wright aaron.wri...@gmail.com
* @author David Pean david.p...@gmail.com
* @author Jack Phoenix j...@countervandalism.net
- * @version 1.0
- * @link http://www.mediawiki.org/wiki/Extension:RandomImageByCategory
Documentation
+ * @version 1.1
+ * @link https://www.mediawiki.org/wiki/Extension:RandomImageByCategory
Documentation
* @license http://www.gnu.org/copyleft/gpl.html GNU General Public License
2.0 or later
*/
-
-if ( !defined( 'MEDIAWIKI' ) ) {
- die( Not a valid entry point.\n );
-}
// Extension credits that will show up on Special:Version
$wgExtensionCredits['parserhook'][] = array(
'name' = 'RandomImageByCategory',
- 'version' = '1.0',
+ 'version' = '1.1',
'author' = array( 'Aaron Wright', 'David Pean', 'Jack Phoenix' ),
'description' = 'Displays a random image from a given category',
'url' =
'https://www.mediawiki.org/wiki/Extension:RandomImageByCategory',
@@ -36,8 +32,6 @@
function getRandomImage( $input, $args, $parser ) {
global $wgMemc;
-
- wfProfileIn( __METHOD__ );
$parser-disableCache();
@@ -102,7 +96,7 @@
$random_image = '';
$thumbnail = '';
- if( count( $image_list ) 1 ) {
+ if( count( $image_list ) 0 ) {
$random_image = $image_list[ array_rand( $image_list, 1 ) ];
}
@@ -113,8 +107,6 @@
$thumb_image = $render_image-transform( array( 'width' =
$width ) );
$thumbnail = a href=\ . htmlspecialchars(
$image_title-getFullURL() ) . \{$thumb_image-toHtml()}/a;
}
-
- wfProfileOut( __METHOD__ );
return $thumbnail;
}
--
To view, visit https://gerrit.wikimedia.org/r/223182
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Icd9c073267c14f1f6eb0b281eb393e6485f91c42
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/RandomImageByCategory
Gerrit-Branch: master
Gerrit-Owner: Jack Phoenix j...@countervandalism.net
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Use Parsoid's new Cite HTML and CSS - change (mediawiki...VisualEditor)
jenkins-bot has submitted this change and it was merged. Change subject: Use Parsoid's new Cite HTML and CSS .. Use Parsoid's new Cite HTML and CSS Starting with I21fbbd3247bf7801e5ef9bd5312f95777f4dd6ef, Parsoid will emit a new HTML for its Cite extension, which enables CSS styling. In I487095df8a7c4241a14f7b4480360f6774130bec the new module 'ext.cite.style' is added to the Cite extension to style this new HTML format. This patch * Loads the ext.cite.style module if the Cite extension is present. * Uses the new HTML format for the internal structure of reference and reference list nodes, so they are correctly styled. Backwards compatibility: Only new HTML is used internally in VE, so as long as ext.cite.style can be loaded the new styles will be used. It does not depend on which format Parsoid returns, so this patch only depends on the Cite extension patch, not on the Parsoid one. Note: The only way I've found of adding a ext.cite.style dependency only if Cite is present is to register the whole ext.visualEditor.mwreference module in the onResourceLoaderRegisterModules hook. Maybe someone can point to a better way? Bug: T86782 Change-Id: Ibf333a502d64d2ed6e029221458b7c606554e414 --- M VisualEditor.hooks.php M extension.json M modules/ve-mw/ce/nodes/ve.ce.MWReferenceNode.js M modules/ve-mw/ce/nodes/ve.ce.MWReferencesListNode.js M modules/ve-mw/dm/nodes/ve.dm.MWReferenceNode.js 5 files changed, 154 insertions(+), 65 deletions(-) Approvals: Jforrester: Looks good to me, approved jenkins-bot: Verified diff --git a/VisualEditor.hooks.php b/VisualEditor.hooks.php index 6113d9b..abf4d17 100644 --- a/VisualEditor.hooks.php +++ b/VisualEditor.hooks.php @@ -460,6 +460,71 @@ } $resourceLoader-register( $addModules ); + + // Register ext.visualEditor.mwreference here, as it depends on the new + // Cite CSS style module ext.cite.style only if the Cite extension is + // present. + // This is a temporary hack, once the Cite extension uses the new CSS + // for everything (and it takes care of loading ext.cite.style itself), + // it can be removed from here and put back in extension.json. + $mwreferenceModule = $veResourceTemplate + array( + 'scripts' = array( + 'modules/ve-mw/ui/widgets/ve.ui.MWReferenceGroupInputWidget.js', + 'modules/ve-mw/ui/widgets/ve.ui.MWReferenceSearchWidget.js', + 'modules/ve-mw/ui/widgets/ve.ui.MWReferenceResultWidget.js', + + 'modules/ve-mw/ui/commands/ve.ui.MWUseExistingReferenceCommand.js', + + 'modules/ve-mw/ui/dialogs/ve.ui.MWCitationDialog.js', + 'modules/ve-mw/ui/dialogs/ve.ui.MWReferencesListDialog.js', + 'modules/ve-mw/ui/dialogs/ve.ui.MWReferenceDialog.js', + + 'modules/ve-mw/ui/widgets/ve.ui.MWReferenceSourceSelectWidget.js', + + 'modules/ve-mw/ui/tools/ve.ui.MWReferenceDialogTool.js', + 'modules/ve-mw/ui/tools/ve.ui.MWCitationDialogTool.js', + + 'modules/ve-mw/ui/contextitems/ve.ui.MWReferenceContextItem.js', + 'modules/ve-mw/ui/contextitems/ve.ui.MWReferencesListContextItem.js', + 'modules/ve-mw/ui/contextitems/ve.ui.MWCitationContextItem.js', + 'modules/ve-mw/ui/actions/ve.ui.MWCitationAction.js', + ), + 'styles' = array( + 'modules/ve-mw/ui/styles/widgets/ve.ui.MWReferenceGroupInputWidget.css', + 'modules/ve-mw/ui/styles/widgets/ve.ui.MWReferenceResultWidget.css', + 'modules/ve-mw/ui/styles/widgets/ve.ui.MWReferenceSearchWidget.css', + ), + 'dependencies' = array( + 'ext.visualEditor.mwreference.core', + 'ext.visualEditor.mwtransclusion', + 'ext.visualEditor.mediawiki' + ), + 'messages' = array( + 'visualeditor-dialog-reference-editing-reused', + 'visualeditor-dialog-reference-options-group-label', + 'visualeditor-dialog-reference-options-group-placeholder', + 'visualeditor-dialog-reference-options-name-label', + 'visualeditor-dialog-reference-options-section', + 'visualeditor-dialog-reference-title', +
[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: cfb3789..7a33613 - change (mediawiki/extensions)
Jenkins-mwext-sync has submitted this change and it was merged. Change subject: Syncronize VisualEditor: cfb3789..7a33613 .. Syncronize VisualEditor: cfb3789..7a33613 Change-Id: If8defdfea8c7d6c4d322c84b0a7759865794e631 --- M VisualEditor 1 file changed, 0 insertions(+), 0 deletions(-) Approvals: Jenkins-mwext-sync: Verified; Looks good to me, approved diff --git a/VisualEditor b/VisualEditor index cfb3789..7a33613 16 --- a/VisualEditor +++ b/VisualEditor -Subproject commit cfb378930f0f249abb66ee9c9aedff0841b72592 +Subproject commit 7a33613d23a0b0ea54f65df177fcbe8c6d719027 -- To view, visit https://gerrit.wikimedia.org/r/223183 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: If8defdfea8c7d6c4d322c84b0a7759865794e631 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions Gerrit-Branch: master Gerrit-Owner: Jenkins-mwext-sync jenkins-...@wikimedia.org Gerrit-Reviewer: Jenkins-mwext-sync jenkins-...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] beta: Replace deployment-logstash1 with deployment-logstash2 - change (operations/puppet)
BryanDavis has uploaded a new change for review.
https://gerrit.wikimedia.org/r/223184
Change subject: beta: Replace deployment-logstash1 with deployment-logstash2
..
beta: Replace deployment-logstash1 with deployment-logstash2
Bug: T101541
Change-Id: Iffc3e62439d6bbccf7f5e215c1bfb56eab6f33c0
---
M hieradata/labs/deployment-prep/common.yaml
M hieradata/labs/restbase/common.yaml
M manifests/role/beta.pp
M manifests/role/logging.pp
M modules/base/manifests/remote_syslog.pp
5 files changed, 10 insertions(+), 10 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/84/223184/1
diff --git a/hieradata/labs/deployment-prep/common.yaml
b/hieradata/labs/deployment-prep/common.yaml
index cc9e801..81b95a2 100644
--- a/hieradata/labs/deployment-prep/common.yaml
+++ b/hieradata/labs/deployment-prep/common.yaml
@@ -1,16 +1,16 @@
---
base::remote_syslog::enable: true
-base::remote_syslog::central_host: deployment-logstash1.eqiad.wmflabs:10514
+base::remote_syslog::central_host:
deployment-logstash2.deployment-prep.eqiad.wmflabs:10514
ocg::temp_dir: /mnt/tmpfs
ocg::redis_host: deployment-redis01.eqiad.wmflabs
ocg::statsd_host: labmon1001.eqiad.wmnet
-ocg::graylog_host: deployment-logstash1.eqiad.wmflabs
+ocg::graylog_host: deployment-logstash2.deployment-prep.eqiad.wmflabs
ocg::redis_password: '%{::passwords::redis::main_password}'
has_lvs: false
puppetmaster::scripts::keep_reports_minutes: 360
#service::configuration::http_proxy:
service::configuration::statsd_host: labmon1001.eqiad.wmnet
-service::configuration::logstash_host:
deployment-logstash1.deployment-prep.eqiad.wmflabs
+service::configuration::logstash_host:
deployment-logstash2.deployment-prep.eqiad.wmflabs
citoid::zotero_host: deployment-zotero01.deployment-prep.eqiad.wmflabs
citoid::zotero_port: 1969
graphoid::domains:
@@ -66,11 +66,11 @@
restbase::config_template: restbase/config.labs.yaml.erb
restbase::parsoid_uri:
http://deployment-parsoid05.deployment-prep.eqiad.wmflabs:8000
restbase::statsd_host: labmon1001.eqiad.wmnet
-restbase::logstash_host: deployment-logstash1.deployment-prep.eqiad.wmflabs
+restbase::logstash_host: deployment-logstash2.deployment-prep.eqiad.wmflabs
restbase::cassandra_defaultConsistency: localQuorum
restbase::graphoid_host_port:
http://deployment-sca01.deployment-prep.eqiad.wmflabs:19000
mediawiki::log_aggregator: deployment-fluorine.eqiad.wmflabs:8420
-mediawiki::forward_syslog: deployment-logstash1.eqiad.wmflabs:10514
+mediawiki::forward_syslog:
deployment-logstash2.deployment-prep.eqiad.wmflabs:10514
mediawiki_memcached_servers:
- 10.68.16.14:11211:1
- 10.68.16.15:11211:1
@@ -87,7 +87,7 @@
role::cxserver::cxserver_port: 8080
misc::syslog-server::basepath: /data/project/syslog
cxserver::log_dir: /var/log/cxserver
-cxserver::logstash_host: deployment-logstash1.deployment-prep.eqiad.wmflabs
+cxserver::logstash_host: deployment-logstash2.deployment-prep.eqiad.wmflabs
cxserver::apertium: http://apertium-beta.wmflabs.org
cxserver::proxy:
http://deployment-urldownloader.deployment-prep.eqiad.wmflabs:8080
cxserver::yandex_url: 'https://translate.yandex.net'
diff --git a/hieradata/labs/restbase/common.yaml
b/hieradata/labs/restbase/common.yaml
index 7c69d4a..e66265f 100644
--- a/hieradata/labs/restbase/common.yaml
+++ b/hieradata/labs/restbase/common.yaml
@@ -1,4 +1,4 @@
seeds:
- localhost
logstash_port: 12201
-logstash_host: deployment-logstash1.eqiad.wmflabs
+logstash_host: deployment-logstash2.deployment-prep.eqiad.wmflabs
diff --git a/manifests/role/beta.pp b/manifests/role/beta.pp
index 8ff5b39..acfd21e 100644
--- a/manifests/role/beta.pp
+++ b/manifests/role/beta.pp
@@ -43,7 +43,7 @@
# Add nice things to the beta puppetmaster.
class role::beta::puppetmaster {
class { 'puppetmaster::logstash':
-logstash_host = 'deployment-logstash1.eqiad.wmflabs',
+logstash_host = 'deployment-logstash2.deployment-prep.eqiad.wmflabs',
logstash_port = 5229,
}
}
diff --git a/manifests/role/logging.pp b/manifests/role/logging.pp
index 332a6f7..a300910 100644
--- a/manifests/role/logging.pp
+++ b/manifests/role/logging.pp
@@ -66,7 +66,7 @@
# TODO: Find a way to use multicast that doesn't cause duplicate
# messages to be stored in logstash. This is a SPOF.
production = 'logstash1001.eqiad.wmnet',
-labs = 'deployment-logstash1.eqiad.wmflabs',
+labs = 'deployment-logstash2.deployment-prep.eqiad.wmflabs',
}
$logstash_port = 8324
diff --git a/modules/base/manifests/remote_syslog.pp
b/modules/base/manifests/remote_syslog.pp
index b3f6ff8..587f8d4 100644
--- a/modules/base/manifests/remote_syslog.pp
+++ b/modules/base/manifests/remote_syslog.pp
@@ -9,7 +9,7 @@
#
# [*central_host*]
# Host (and optional port) to forward syslog events to.
-# (e.g. syslog.eqiad.wmnet or
[MediaWiki-commits] [Gerrit] Smooth gradients in Lead Image and Gallery. - change (apps...wikipedia)
jenkins-bot has submitted this change and it was merged. Change subject: Smooth gradients in Lead Image and Gallery. .. Smooth gradients in Lead Image and Gallery. When viewed on top of especially light images, the gradients that we display on top of the Lead Image, as well as the Gallery images, can have a noticeably abrupt end, because these gradients are linear. This patch modifies the gradients to follow a cubic function, so that the gradient trails off more smoothly than a linear function. I've also removed the corresponding unused XML gradient drawables. Bug: T104808 Change-Id: Ic66637ea649ea7945d9ffe688c5d03b20f47810d --- D wikipedia/res/drawable/gallery_toolbar_shape.xml D wikipedia/res/drawable/lead_title_gradient.xml D wikipedia/res/drawable/toolbar_lead_gradient.xml M wikipedia/res/layout/activity_gallery.xml M wikipedia/res/layout/activity_page.xml M wikipedia/res/values/colors.xml M wikipedia/src/main/java/org/wikipedia/page/PageActivity.java M wikipedia/src/main/java/org/wikipedia/page/gallery/GalleryActivity.java M wikipedia/src/main/java/org/wikipedia/page/leadimages/LeadImagesHandler.java A wikipedia/src/main/java/org/wikipedia/util/GradientUtil.java A wikipedia/src/main/java/org/wikipedia/util/MathUtil.java M wikipedia/src/main/java/org/wikipedia/views/ViewUtil.java 12 files changed, 138 insertions(+), 34 deletions(-) Approvals: BearND: Looks good to me, approved Niedzielski: Looks good to me, but someone else must approve jenkins-bot: Verified diff --git a/wikipedia/res/drawable/gallery_toolbar_shape.xml b/wikipedia/res/drawable/gallery_toolbar_shape.xml deleted file mode 100644 index f822213..000 --- a/wikipedia/res/drawable/gallery_toolbar_shape.xml +++ /dev/null @@ -1,8 +0,0 @@ -?xml version=1.0 encoding=utf-8? -shape xmlns:android=http://schemas.android.com/apk/res/android; -android:shape=rectangle -gradient -android:startColor=#b800 -android:endColor=# -android:angle=270/ -/shape \ No newline at end of file diff --git a/wikipedia/res/drawable/lead_title_gradient.xml b/wikipedia/res/drawable/lead_title_gradient.xml deleted file mode 100644 index 4366dbe..000 --- a/wikipedia/res/drawable/lead_title_gradient.xml +++ /dev/null @@ -1,8 +0,0 @@ -?xml version=1.0 encoding=utf-8? -shape xmlns:android=http://schemas.android.com/apk/res/android; -android:shape=rectangle -gradient -android:startColor=#b800 -android:endColor=# -android:angle=90/ -/shape \ No newline at end of file diff --git a/wikipedia/res/drawable/toolbar_lead_gradient.xml b/wikipedia/res/drawable/toolbar_lead_gradient.xml deleted file mode 100644 index 0441981..000 --- a/wikipedia/res/drawable/toolbar_lead_gradient.xml +++ /dev/null @@ -1,8 +0,0 @@ -?xml version=1.0 encoding=utf-8? -shape xmlns:android=http://schemas.android.com/apk/res/android; -android:shape=rectangle -gradient -android:startColor=#6000 -android:endColor=# -android:angle=270/ -/shape \ No newline at end of file diff --git a/wikipedia/res/layout/activity_gallery.xml b/wikipedia/res/layout/activity_gallery.xml index 49dca67..d87599a 100644 --- a/wikipedia/res/layout/activity_gallery.xml +++ b/wikipedia/res/layout/activity_gallery.xml @@ -19,8 +19,7 @@ android.support.v7.widget.Toolbar android:id=@+id/gallery_toolbar android:layout_width=match_parent -android:layout_height=72dp -android:background=@drawable/gallery_toolbar_shape +android:layout_height=80dp /android.support.v7.widget.Toolbar ProgressBar android:id=@+id/gallery_progressbar @@ -38,8 +37,7 @@ android:layout_gravity=bottom android:orientation=vertical android:paddingBottom=32dp -android:paddingTop=64dp -android:background=@drawable/lead_title_gradient +android:paddingTop=64dp TextView android:id=@+id/gallery_description_text android:layout_width=match_parent diff --git a/wikipedia/res/layout/activity_page.xml b/wikipedia/res/layout/activity_page.xml index 37273b3..7e9f29f 100644 --- a/wikipedia/res/layout/activity_page.xml +++ b/wikipedia/res/layout/activity_page.xml @@ -46,12 +46,11 @@ FrameLayout android:id=@+id/main_toolbar_container android:layout_width=match_parent -android:layout_height=72dp +android:layout_height=80dp LinearLayout android:id=@+id/main_toolbar_gradient android:layout_width=match_parent android:layout_height=match_parent -android:background=@drawable/toolbar_lead_gradient android:orientation=vertical /LinearLayout LinearLayout diff --git a/wikipedia/res/values/colors.xml
[MediaWiki-commits] [Gerrit] ores: worker role to do celery processing - change (operations/puppet)
Yuvipanda has submitted this change and it was merged.
Change subject: ores: worker role to do celery processing
..
ores: worker role to do celery processing
Change-Id: Ia8dd63709cb8aaf097881bc7f825683cf1b51ae4
---
M manifests/role/labsores.pp
M modules/celery/manifests/worker.pp
A modules/ores/manifests/worker.pp
3 files changed, 21 insertions(+), 1 deletion(-)
Approvals:
Yuvipanda: Verified; Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/role/labsores.pp b/manifests/role/labsores.pp
index 881c542..0fb8fa7 100644
--- a/manifests/role/labsores.pp
+++ b/manifests/role/labsores.pp
@@ -32,6 +32,10 @@
branch = 'staging',
}
+class { '::ores::worker':
+branch = 'staging',
+}
+
class { '::ores::lb':
realservers = [ 'localhost:8080' ],
cache = false,
diff --git a/modules/celery/manifests/worker.pp
b/modules/celery/manifests/worker.pp
index 0cf523f..360c7bf 100644
--- a/modules/celery/manifests/worker.pp
+++ b/modules/celery/manifests/worker.pp
@@ -3,7 +3,7 @@
$working_dir,
$user,
$group,
-$celery_bin_path = '/usr/bin/celery'
+$celery_bin_path = '/usr/bin/celery',
) {
base::service_unit { 'celery':
systemd = true,
diff --git a/modules/ores/manifests/worker.pp b/modules/ores/manifests/worker.pp
new file mode 100644
index 000..10913b2
--- /dev/null
+++ b/modules/ores/manifests/worker.pp
@@ -0,0 +1,16 @@
+class ores::worker(
+$branch = 'deploy',
+) {
+
+class { 'ores::base':
+branch = $branch,
+}
+
+celery::worker { 'ores-worker':
+app = 'ores_celery.application',
+working_dir = $ores::base::config_path,
+user= 'www-data',
+group = 'www-data',
+celery_bin_path = ${ores::base::venve_path}/bin/celery,
+}
+}
--
To view, visit https://gerrit.wikimedia.org/r/222919
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia8dd63709cb8aaf097881bc7f825683cf1b51ae4
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Yuvipanda yuvipa...@gmail.com
Gerrit-Reviewer: Yuvipanda yuvipa...@gmail.com
Gerrit-Reviewer: coren mpellet...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] API: Avoid caching when prop=infointestactions=... is used - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged.
Change subject: API: Avoid caching when prop=infointestactions=... is used
..
API: Avoid caching when prop=infointestactions=... is used
Whether the actions pass or not depends on the current user, including
the results of several hooks and whether the current user is blocked.
Also, we can clean up the test for public inprops slightly.
Change-Id: I7e2610dd609c52711355b640778f795520a4ff8c
---
M includes/api/ApiQueryInfo.php
1 file changed, 9 insertions(+), 6 deletions(-)
Approvals:
Legoktm: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/api/ApiQueryInfo.php b/includes/api/ApiQueryInfo.php
index eee5dae..c45e0ef 100644
--- a/includes/api/ApiQueryInfo.php
+++ b/includes/api/ApiQueryInfo.php
@@ -799,6 +799,7 @@
}
public function getCacheMode( $params ) {
+ // Other props depend on something about the current user
$publicProps = array(
'protection',
'talkid',
@@ -807,13 +808,15 @@
'preload',
'displaytitle',
);
- if ( !is_null( $params['prop'] ) ) {
- foreach ( $params['prop'] as $prop ) {
- if ( !in_array( $prop, $publicProps ) ) {
- return 'private';
- }
- }
+ if ( array_diff( (array)$params['prop'], $publicProps ) ) {
+ return 'private';
}
+
+ // testactions also depends on the current user
+ if ( $params['testactions'] ) {
+ return 'private';
+ }
+
if ( !is_null( $params['token'] ) ) {
return 'private';
}
--
To view, visit https://gerrit.wikimedia.org/r/223047
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I7e2610dd609c52711355b640778f795520a4ff8c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Anomie bjor...@wikimedia.org
Gerrit-Reviewer: Gergő Tisza gti...@wikimedia.org
Gerrit-Reviewer: Legoktm legoktm.wikipe...@gmail.com
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Build demos as part of `grunt build` too - change (oojs/ui)
Legoktm has uploaded a new change for review. https://gerrit.wikimedia.org/r/223151 Change subject: Build demos as part of `grunt build` too .. Build demos as part of `grunt build` too Bug: T104696 Change-Id: I3d5201d020f8dba639eb2694015b14de96fde149 --- M Gruntfile.js 1 file changed, 4 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/51/223151/1 diff --git a/Gruntfile.js b/Gruntfile.js index 5d546bf..324a714 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -405,7 +405,10 @@ ] ); grunt.registerTask( 'build-i18n', [ 'copy:i18n' ] ); grunt.registerTask( 'build-tests', [ 'exec:rubyTestSuiteGenerator', 'exec:phpGenerateJSPHPForKarma' ] ); - grunt.registerTask( 'build', [ 'clean:build', 'fileExists', 'typos', 'build-code', 'build-styling', 'build-i18n', 'build-tests', 'clean:tmp' ] ); + grunt.registerTask( 'build', [ + 'clean:build', 'fileExists', 'typos', 'build-code', 'build-styling', 'build-i18n', + 'build-tests', 'clean:tmp', 'demos' + ] ); grunt.registerTask( 'git-build', [ 'pre-git-build', 'build' ] ); -- To view, visit https://gerrit.wikimedia.org/r/223151 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I3d5201d020f8dba639eb2694015b14de96fde149 Gerrit-PatchSet: 1 Gerrit-Project: oojs/ui Gerrit-Branch: master Gerrit-Owner: Legoktm legoktm.wikipe...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] celery: Specify template_name for systemd unit explicitly - change (operations/puppet)
Yuvipanda has submitted this change and it was merged.
Change subject: celery: Specify template_name for systemd unit explicitly
..
celery: Specify template_name for systemd unit explicitly
Change-Id: I8c42c7a446f5f807af560ddd780c113160713067
---
M modules/celery/manifests/worker.pp
1 file changed, 2 insertions(+), 1 deletion(-)
Approvals:
Yuvipanda: Verified; Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/celery/manifests/worker.pp
b/modules/celery/manifests/worker.pp
index c7cdc14..50b3f22 100644
--- a/modules/celery/manifests/worker.pp
+++ b/modules/celery/manifests/worker.pp
@@ -6,6 +6,7 @@
$celery_bin_path = '/usr/bin/celery',
) {
base::service_unit { celery-${title}:
-systemd = true,
+template_name = 'celery',
+systemd = true,
}
}
--
To view, visit https://gerrit.wikimedia.org/r/223164
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I8c42c7a446f5f807af560ddd780c113160713067
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Yuvipanda yuvipa...@gmail.com
Gerrit-Reviewer: Yuvipanda yuvipa...@gmail.com
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Cleanup test annotations - change (mediawiki...CirrusSearch)
Manybubbles has uploaded a new change for review. https://gerrit.wikimedia.org/r/223166 Change subject: Cleanup test annotations .. Cleanup test annotations Change-Id: Ib01417a441f9d9e862b7eb0f10740252881cdc29 --- M tests/browser/features/more_like_this_options.feature 1 file changed, 2 insertions(+), 6 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CirrusSearch refs/changes/66/223166/1 diff --git a/tests/browser/features/more_like_this_options.feature b/tests/browser/features/more_like_this_options.feature index 1a9f345..fc1f618 100644 --- a/tests/browser/features/more_like_this_options.feature +++ b/tests/browser/features/more_like_this_options.feature @@ -1,9 +1,9 @@ -@clean @phantomjs +@clean @phantomjs @setup_main Feature: More like this queries with custom settings Background: Given I am at a random page - @setup_main @setup_namespaces + @setup_namespaces Scenario: Searching for morelike:page with the title field and filtering with the word length When I set More Like This Options to title field, word length to 3 and I search for morelike:More Like Me 1 Then More Like Me 2 is in the search results @@ -14,7 +14,6 @@ But More Like Me 1 is not in the search results And ChangeMe is not in the search results - @setup_main Scenario: Searching for morelike:page with the title field and filtering with the percent terms to match When I set More Like This Options to title field, percent terms to match to 0.7 and I search for morelike:More Like Me 1 Then More Like Me 2 is in the search results @@ -25,17 +24,14 @@ But More Like Me 1 is not in the search results And ChangeMe is not in the search results - @setup_main Scenario: Searching for morelike:page with the title field and bad settings give no results When I set More Like This Options to bad settings and I search for morelike:More Like Me 1 Then there are no search results - @setup_main Scenario: Searching for morelike:page with the title field and settings with poor precision When I set More Like This Options to title field, word length to 1 and I search for morelike:More Like Me 1 Then ChangeMe is in the search results - @setup_main Scenario: Searching for morelike:page with the all field works even if cirrusMtlUseFields is set to yes When I set More Like This Options to all field, word length to 4 and I search for morelike:More Like Me 1 Then More Like Me 2 is in the search results -- To view, visit https://gerrit.wikimedia.org/r/223166 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib01417a441f9d9e862b7eb0f10740252881cdc29 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/CirrusSearch Gerrit-Branch: master Gerrit-Owner: Manybubbles never...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] access: grant David Causse deployment rights - change (operations/puppet)
RobH has submitted this change and it was merged. Change subject: access: grant David Causse deployment rights .. access: grant David Causse deployment rights bug: T104546 Change-Id: I04666b5ddbe894c0be3a205e9be63aeba281e07c --- M modules/admin/data/data.yaml 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: RobH: Looks good to me, approved jenkins-bot: Verified diff --git a/modules/admin/data/data.yaml b/modules/admin/data/data.yaml index 0e4afca..b7af765 100644 --- a/modules/admin/data/data.yaml +++ b/modules/admin/data/data.yaml @@ -47,7 +47,7 @@ maxsem, mattflaschen, marktraceur, milimetric, mlitn, andyrussg, nikerabbit, reedy, rmoen, robla, spage, ssastry, tomasz, yurik, tgr, phuedx, bsimmers, ejegg, twentyafterfour, legoktm, catrope, krenair, - mobrovac, nuria, thcipriani, joal, eevans, mforns, dpatrick] + mobrovac, nuria, thcipriani, joal, eevans, mforns, dpatrick, dcausse] privileges: ['ALL = (www-data,apache,mwdeploy,l10nupdate) NOPASSWD: ALL', 'ALL = NOPASSWD: /sbin/restart hhvm', 'ALL = NOPASSWD: /sbin/start hhvm', -- To view, visit https://gerrit.wikimedia.org/r/55 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I04666b5ddbe894c0be3a205e9be63aeba281e07c Gerrit-PatchSet: 2 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Matanya mata...@foss.co.il Gerrit-Reviewer: Alexandros Kosiaris akosia...@wikimedia.org Gerrit-Reviewer: DCausse dcau...@wikimedia.org Gerrit-Reviewer: Dzahn dz...@wikimedia.org Gerrit-Reviewer: Faidon Liambotis fai...@wikimedia.org Gerrit-Reviewer: RobH r...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add () for function call - change (mediawiki...CirrusSearch)
Manybubbles has uploaded a new change for review.
https://gerrit.wikimedia.org/r/223177
Change subject: Add () for function call
..
Add () for function call
Change-Id: I3e8fd2227c6c9af9f5bb1f475bb2d9a313562893
---
M includes/Hooks.php
1 file changed, 2 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CirrusSearch
refs/changes/77/223177/1
diff --git a/includes/Hooks.php b/includes/Hooks.php
index d22573d..59895fe 100644
--- a/includes/Hooks.php
+++ b/includes/Hooks.php
@@ -165,12 +165,12 @@
$wgCirrusSearchMoreLikeThisFields;
$source = wfMessage( 'cirrussearch-morelikethis-settings'
)-inContentLanguage();
- if( $source $source-isDisabled ) {
+ if ( $source $source-isDisabled() ) {
return;
}
$lines = Util::parseSettingsInMessage( $source-plain() );
- foreach( $lines as $line ) {
+ foreach ( $lines as $line ) {
list( $k, $v ) = explode( ':', $line, 2 );
switch( $k ) {
case 'min_doc_freq':
--
To view, visit https://gerrit.wikimedia.org/r/223177
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I3e8fd2227c6c9af9f5bb1f475bb2d9a313562893
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CirrusSearch
Gerrit-Branch: master
Gerrit-Owner: Manybubbles never...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] labs: Make it possible for AbuseFilters to block anywhere - change (operations/mediawiki-config)
Alex Monk has uploaded a new change for review.
https://gerrit.wikimedia.org/r/223179
Change subject: labs: Make it possible for AbuseFilters to block anywhere
..
labs: Make it possible for AbuseFilters to block anywhere
Bug: T103060
Change-Id: I488d12530c1dd3966d48b1aa4b44023293fb0d21
---
M wmf-config/abusefilter.php
1 file changed, 9 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config
refs/changes/79/223179/1
diff --git a/wmf-config/abusefilter.php b/wmf-config/abusefilter.php
index 26547a3..385e830 100644
--- a/wmf-config/abusefilter.php
+++ b/wmf-config/abusefilter.php
@@ -383,3 +383,12 @@
break;
// Please add new wikis in their correct place in alphabetical order!
}
+
+if ( $wmfRealm === 'labs' ) {
+ // T103060
+ if ( !in_array( 'block', $wgAbuseFilterAvailableActions ) ) {
+ $wgAbuseFilterAvailableActions[] = 'block';
+ }
+ $wgAbuseFilterBlockDuration = 'indefinite';
+ $wgAbuseFilterAnonBlockDuration = '48 hours';
+}
\ No newline at end of file
--
To view, visit https://gerrit.wikimedia.org/r/223179
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I488d12530c1dd3966d48b1aa4b44023293fb0d21
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Alex Monk kren...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] New button styles for the Apex theme - change (oojs/ui)
Isarra has uploaded a new change for review.
https://gerrit.wikimedia.org/r/223181
Change subject: New button styles for the Apex theme
..
New button styles for the Apex theme
Bolder colours and smoother gradients with subtle shadows for added
buttoniness. Also trying to clean up the variables a bit.
Unfortunately I have no idea how to actually apply styles for active,
hover, and focussed states for the progressive etc variants, but they'd
work the same as for the base button.
Bug: T100300
Change-Id: I98e4cc6437e4107fc02da40bdd2c81006148f89a
---
M src/styles/common.less
M src/themes/apex/common.less
M src/themes/apex/elements.less
3 files changed, 71 insertions(+), 69 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/81/223181/1
diff --git a/src/styles/common.less b/src/styles/common.less
old mode 100644
new mode 100755
index 16c2df0..3f7ab8a
--- a/src/styles/common.less
+++ b/src/styles/common.less
@@ -67,14 +67,14 @@
box-sizing: @type;
}
-.oo-ui-vertical-gradient( @start: #EEE, @stop: #FFF ) {
+.oo-ui-vertical-gradient( @start: #EEE, @stop: #FFF, @start-pos: 0%,
@stop-pos: 100% ) {
background: mix(@start, @stop, 50%);
filter: e(%(progid:DXImageTransform.Microsoft.gradient(GradientType=0,
startColorstr='%d', endColorstr='%d'), @start, @stop));
- background-image: -webkit-gradient(linear, right top, right bottom,
color-stop(0%, @start), color-stop(100%, @stop));
- background-image: -webkit-linear-gradient( top, @start 0%, @stop
100%);
- background-image:-moz-linear-gradient( top, @start 0%, @stop
100%);
- background-image: -o-linear-gradient( top, @start 0%, @stop
100%);
- background-image: linear-gradient(to bottom, @start 0%, @stop
100%);
+ background-image: -webkit-gradient(linear, right top, right bottom,
color-stop(@start-pos, @start), color-stop(@stop-pos, @stop));
+ background-image: -webkit-linear-gradient( top, @start @start-pos,
@stop @stop-pos);
+ background-image: -moz-linear-gradient( top, @start @start-pos, @stop
1@stop-pos);
+ background-image: -o-linear-gradient( top, @start @start-pos, @stop
@stop-pos);
+ background-image: linear-gradient(to bottom, @start @start-pos, @stop
@stop-pos);
}
.oo-ui-unselectable() {
diff --git a/src/themes/apex/common.less b/src/themes/apex/common.less
old mode 100644
new mode 100755
index 74dd3a3..ed062be
--- a/src/themes/apex/common.less
+++ b/src/themes/apex/common.less
@@ -3,19 +3,26 @@
// Theme variables
-@progressive: #087ecc;
-@constructive: #76ab36;
-@destructive: #d45353;
+@base: #333;
+@progressive: #06a;
+@constructive: #082;
+@destructive: #b11;
-@progressive-gradient-start: #eaf4fa;
-@progressive-gradient-end: #b0d9ee;
-@progressive-border: #a6cee1;
-@progressive-border-selected: #9dc2d4;
+@base-gradient-start: #fff;
+@base-gradient-end: #ddd;
+@base-border: #aaa;
-@constructive-gradient-start: #f0fbe1;
-@constructive-gradient-end: #c3e59a;
-@constructive-border: #b8d892;
-@constructive-border-selected: #adcb89;
+@progressive-gradient-start: #48e;
+@progressive-gradient-end: #36b;
+@progressive-border: #468;
+
+@constructive-gradient-start: #3c8;
+@constructive-gradient-end: #295;
+@constructive-border: #294;
+
+@destructive-gradient-start: #d44;
+@destructive-gradient-end: #a22;
+@destructive-border: #944;
@oo-ui-default-image-path: 'themes/apex/images';
diff --git a/src/themes/apex/elements.less b/src/themes/apex/elements.less
old mode 100644
new mode 100755
index 7d14391..1f33278
--- a/src/themes/apex/elements.less
+++ b/src/themes/apex/elements.less
@@ -4,7 +4,7 @@
.theme-oo-ui-buttonElement () {
.oo-ui-buttonElement-button {
- color: #333;
+ color: @base;
}
.oo-ui-iconElement .oo-ui-buttonElement-button {
@@ -49,7 +49,7 @@
}
.oo-ui-labelElement-label {
- color: #333;
+ color: @base;
}
}
@@ -64,12 +64,7 @@
// Support input/ from ButtonInputWidget
input.oo-ui-buttonElement-button {
padding-left: 0.25em;
- color: #333;
-
- :hover,
- :focus {
- color: #000;
- }
+ color: @base;
}
.oo-ui-flaggedElement {
@@ -99,16 +94,17 @@
-framed {
.oo-ui-buttonElement-button {
margin: 0.1em 0;
- padding: 0.2em 0.8em;
+ padding: 0 0.8em;
border-radius: 0.3em;
- text-shadow: 0 1px 1px rgba(255, 255, 255, 0.5);
-
[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: cfb3789..7a33613 - change (mediawiki/extensions)
Jenkins-mwext-sync has uploaded a new change for review. https://gerrit.wikimedia.org/r/223183 Change subject: Syncronize VisualEditor: cfb3789..7a33613 .. Syncronize VisualEditor: cfb3789..7a33613 Change-Id: If8defdfea8c7d6c4d322c84b0a7759865794e631 --- M VisualEditor 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions refs/changes/83/223183/1 diff --git a/VisualEditor b/VisualEditor index cfb3789..7a33613 16 --- a/VisualEditor +++ b/VisualEditor -Subproject commit cfb378930f0f249abb66ee9c9aedff0841b72592 +Subproject commit 7a33613d23a0b0ea54f65df177fcbe8c6d719027 -- To view, visit https://gerrit.wikimedia.org/r/223183 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If8defdfea8c7d6c4d322c84b0a7759865794e631 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions Gerrit-Branch: master Gerrit-Owner: Jenkins-mwext-sync jenkins-...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add agrgegation across projects - change (analytics/aggregator)
Mforns has uploaded a new change for review. https://gerrit.wikimedia.org/r/223031 Change subject: Add agrgegation across projects .. Add agrgegation across projects With this change, a new file 'all.csv' will be created for the raw_daily data as well as for each additional aggregator (daily, weekly_rescaled, etc.). This file will contain an aggregation across all projects. Bug: T95339 Change-Id: Ieee012e60d2286e450779cabf253d6a1f11578b4 --- M aggregator/projectcounts.py M aggregator/util.py A tests/test_projectcounts/fixtures/2014-11-3projects-for-aggregation/2014/2014-11/projectcounts-20141101-01 A tests/test_projectcounts/fixtures/2014-11-3projects-for-aggregation/2014/2014-11/projectcounts-20141101-02 A tests/test_projectcounts/fixtures/2014-11-3projects-for-aggregation/2014/2014-11/projectcounts-20141101-03 A tests/test_projectcounts/fixtures/2014-11-3projects-for-aggregation/2014/2014-11/projectcounts-20141101-04 A tests/test_projectcounts/fixtures/2014-11-3projects-for-aggregation/2014/2014-11/projectcounts-20141101-05 A tests/test_projectcounts/fixtures/2014-11-3projects-for-aggregation/2014/2014-11/projectcounts-20141101-06 A tests/test_projectcounts/fixtures/2014-11-3projects-for-aggregation/2014/2014-11/projectcounts-20141101-07 A tests/test_projectcounts/fixtures/2014-11-3projects-for-aggregation/2014/2014-11/projectcounts-20141101-08 A tests/test_projectcounts/fixtures/2014-11-3projects-for-aggregation/2014/2014-11/projectcounts-20141101-09 A tests/test_projectcounts/fixtures/2014-11-3projects-for-aggregation/2014/2014-11/projectcounts-20141101-10 A tests/test_projectcounts/fixtures/2014-11-3projects-for-aggregation/2014/2014-11/projectcounts-20141101-11 A tests/test_projectcounts/fixtures/2014-11-3projects-for-aggregation/2014/2014-11/projectcounts-20141101-12 A tests/test_projectcounts/fixtures/2014-11-3projects-for-aggregation/2014/2014-11/projectcounts-20141101-13 A tests/test_projectcounts/fixtures/2014-11-3projects-for-aggregation/2014/2014-11/projectcounts-20141101-14 A tests/test_projectcounts/fixtures/2014-11-3projects-for-aggregation/2014/2014-11/projectcounts-20141101-15 A tests/test_projectcounts/fixtures/2014-11-3projects-for-aggregation/2014/2014-11/projectcounts-20141101-16 A tests/test_projectcounts/fixtures/2014-11-3projects-for-aggregation/2014/2014-11/projectcounts-20141101-17 A tests/test_projectcounts/fixtures/2014-11-3projects-for-aggregation/2014/2014-11/projectcounts-20141101-18 A tests/test_projectcounts/fixtures/2014-11-3projects-for-aggregation/2014/2014-11/projectcounts-20141101-19 A tests/test_projectcounts/fixtures/2014-11-3projects-for-aggregation/2014/2014-11/projectcounts-20141101-20 A tests/test_projectcounts/fixtures/2014-11-3projects-for-aggregation/2014/2014-11/projectcounts-20141101-21 A tests/test_projectcounts/fixtures/2014-11-3projects-for-aggregation/2014/2014-11/projectcounts-20141101-22 A tests/test_projectcounts/fixtures/2014-11-3projects-for-aggregation/2014/2014-11/projectcounts-20141101-23 A tests/test_projectcounts/fixtures/2014-11-3projects-for-aggregation/2014/2014-11/projectcounts-20141102-00 A tests/test_projectcounts/fixtures/2014-11-3projects-for-aggregation/2014/2014-11/projectcounts-20141102-01 A tests/test_projectcounts/fixtures/2014-11-3projects-for-aggregation/2014/2014-11/projectcounts-20141102-02 A tests/test_projectcounts/fixtures/2014-11-3projects-for-aggregation/2014/2014-11/projectcounts-20141102-03 A tests/test_projectcounts/fixtures/2014-11-3projects-for-aggregation/2014/2014-11/projectcounts-20141102-04 A tests/test_projectcounts/fixtures/2014-11-3projects-for-aggregation/2014/2014-11/projectcounts-20141102-05 A tests/test_projectcounts/fixtures/2014-11-3projects-for-aggregation/2014/2014-11/projectcounts-20141102-06 A tests/test_projectcounts/fixtures/2014-11-3projects-for-aggregation/2014/2014-11/projectcounts-20141102-07 A tests/test_projectcounts/fixtures/2014-11-3projects-for-aggregation/2014/2014-11/projectcounts-20141102-08 A tests/test_projectcounts/fixtures/2014-11-3projects-for-aggregation/2014/2014-11/projectcounts-20141102-09 A tests/test_projectcounts/fixtures/2014-11-3projects-for-aggregation/2014/2014-11/projectcounts-20141102-10 A tests/test_projectcounts/fixtures/2014-11-3projects-for-aggregation/2014/2014-11/projectcounts-20141102-11 A tests/test_projectcounts/fixtures/2014-11-3projects-for-aggregation/2014/2014-11/projectcounts-20141102-12 A tests/test_projectcounts/fixtures/2014-11-3projects-for-aggregation/2014/2014-11/projectcounts-20141102-13 A tests/test_projectcounts/fixtures/2014-11-3projects-for-aggregation/2014/2014-11/projectcounts-20141102-14 A
[MediaWiki-commits] [Gerrit] Add length cutoff for text snippets sent over JS bridge - change (apps...wikipedia)
jenkins-bot has submitted this change and it was merged.
Change subject: Add length cutoff for text snippets sent over JS bridge
..
Add length cutoff for text snippets sent over JS bridge
Currently, if a user selects a very large text block and attempts to share it,
the share action will fail and/or hang or crash the app.
Example: Visit article Victor Rousseau Emanuel, select all text, and attempt
to share the selection.
This patch truncates the selection sent over the JS bridge at 250 characters
(which appears to be approximately the max that the share-a-fact card can
display)
in order to eliminate out-of-memory issues.
Bug: T104527
Change-Id: I371a8df1261ca945b3ed32e9eaacaabb74ae43f5
---
M wikipedia/assets/bundle.js
M www/js/sections.js
2 files changed, 6 insertions(+), 0 deletions(-)
Approvals:
BearND: Looks good to me, approved
Niedzielski: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/wikipedia/assets/bundle.js b/wikipedia/assets/bundle.js
index b559cdd..878ddd8 100644
--- a/wikipedia/assets/bundle.js
+++ b/wikipedia/assets/bundle.js
@@ -425,6 +425,9 @@
if (text.length 2) {
text = getLeadParagraph();
}
+if (text.length 250) {
+text = text.substring(0, 249);
+}
bridge.sendMessage( onGetTextSelection, { purpose : payload.purpose,
text : text } );
});
diff --git a/www/js/sections.js b/www/js/sections.js
index 4635576..b86af3b 100644
--- a/www/js/sections.js
+++ b/www/js/sections.js
@@ -45,6 +45,9 @@
if (text.length 2) {
text = getLeadParagraph();
}
+if (text.length 250) {
+text = text.substring(0, 249);
+}
bridge.sendMessage( onGetTextSelection, { purpose : payload.purpose,
text : text } );
});
--
To view, visit https://gerrit.wikimedia.org/r/223037
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I371a8df1261ca945b3ed32e9eaacaabb74ae43f5
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Mholloway mhollo...@wikimedia.org
Gerrit-Reviewer: BearND bsitzm...@wikimedia.org
Gerrit-Reviewer: Brion VIBBER br...@wikimedia.org
Gerrit-Reviewer: Dbrant dbr...@wikimedia.org
Gerrit-Reviewer: Niedzielski sniedziel...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] added year into logging - change (operations...adminbot)
Elee has uploaded a new change for review. https://gerrit.wikimedia.org/r/223046 Change subject: added year into logging .. added year into logging Change-Id: Ia1a8bddfa60fc50d95cfbc2227ca395b8b68f7c4 --- M adminlog.py 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/debs/adminbot refs/changes/46/223046/1 diff --git a/adminlog.py b/adminlog.py index 240c778..2e89a4e 100644 --- a/adminlog.py +++ b/adminlog.py @@ -43,7 +43,7 @@ if months[now.month - 1] != month or now.day != int(day): lines.insert(0, ) lines.insert(0, logline) - lines.insert(0, %s %s %d %s % (header, months[now.month - 1], + lines.insert(0, %s %s %d %s % (header, now.year, months[now.month - 1], now.day, header)) else: lines.insert(position, logline) -- To view, visit https://gerrit.wikimedia.org/r/223046 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ia1a8bddfa60fc50d95cfbc2227ca395b8b68f7c4 Gerrit-PatchSet: 1 Gerrit-Project: operations/debs/adminbot Gerrit-Branch: master Gerrit-Owner: Elee e...@mit.edu ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] fixing classname typo Change-Id: I7f9056ca321027284aeb47ad7b... - change (mediawiki...Blueprint)
VolkerE has uploaded a new change for review. https://gerrit.wikimedia.org/r/223050 Change subject: fixing classname typo Change-Id: I7f9056ca321027284aeb47ad7b583c19e6cf6667 .. fixing classname typo Change-Id: I7f9056ca321027284aeb47ad7b583c19e6cf6667 --- M templates/Skin.template 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/Blueprint refs/changes/50/223050/1 diff --git a/templates/Skin.template b/templates/Skin.template index 65d334e..bf62a20 100755 --- a/templates/Skin.template +++ b/templates/Skin.template @@ -5,7 +5,7 @@ /div nav class=navbar navbar-fixed-top - div class=contaner-fluid + div class=container-fluid div class=navbar-header ul class=nav navbar-nav navbar-head lia href=javascript:void(0) id=toc-toggle/a/li -- To view, visit https://gerrit.wikimedia.org/r/223050 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I7f9056ca321027284aeb47ad7b583c19e6cf6667 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/skins/Blueprint Gerrit-Branch: master Gerrit-Owner: VolkerE ve...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove the 100 kB code size limit for highlighting - change (mediawiki...SyntaxHighlight_GeSHi)
Bartosz Dziewoński has uploaded a new change for review.
https://gerrit.wikimedia.org/r/223053
Change subject: Remove the 100 kB code size limit for highlighting
..
Remove the 100 kB code size limit for highlighting
See T104109#1430472 for some unscientific measurements. Pygments is,
at worst, approximately two times slower than GeSHi, and since we
managed without this limit with GeSHi for years, I think Pygments is
also not slow enough to require it.
The code size remains constrained by the 2 MB page size limit enforced
by MediaWiki ($wgMaxArticleSize).
Bug: T104109
Change-Id: I5b5be591abd146f095d3d191ffa666f4e8830f91
---
M SyntaxHighlight_GeSHi.class.php
M i18n/en.json
M i18n/qqq.json
3 files changed, 2 insertions(+), 14 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/SyntaxHighlight_GeSHi
refs/changes/53/223053/1
diff --git a/SyntaxHighlight_GeSHi.class.php b/SyntaxHighlight_GeSHi.class.php
index e1f18e6..6f01c37 100644
--- a/SyntaxHighlight_GeSHi.class.php
+++ b/SyntaxHighlight_GeSHi.class.php
@@ -23,9 +23,6 @@
/** @var const The maximum number of lines that may be selected for
highlighting. **/
const HIGHLIGHT_MAX_LINES = 1000;
- /** @var const Maximum input size for the highlighter (100 kB). **/
- const HIGHLIGHT_MAX_BYTES = 102400;
-
/** @var const CSS class for syntax-highlighted code. **/
const HIGHLIGHT_CSS_CLASS = 'mw-highlight';
@@ -205,13 +202,6 @@
$lexer = self::getLexer( $lang );
if ( $lexer === null $lang !== null ) {
$status-warning(
'syntaxhighlight-error-unknown-language', $lang );
- }
-
- $length = strlen( $code );
- if ( strlen( $code ) self::HIGHLIGHT_MAX_BYTES ) {
- $status-warning(
'syntaxhighlight-error-exceeds-size-limit',
- $length, self::HIGHLIGHT_MAX_BYTES );
- $lexer = null;
}
if ( wfShellExecDisabled() !== false ) {
diff --git a/i18n/en.json b/i18n/en.json
index 515634e..e8dcfa6 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -12,6 +12,5 @@
syntaxhighlight-visualeditor-mwsyntaxhighlightinspector-language:
Language,
syntaxhighlight-visualeditor-mwsyntaxhighlightinspector-title: Code
block,
syntaxhighlight-error-pygments-invocation-failure: Failed to invoke
Pygments,
-syntaxhighlight-error-unknown-language: Unknown language \$1\,
-syntaxhighlight-error-exceeds-size-limit: Code size of $1
{{PLURAL:$1|bytes}} exceeds allowed maximum of $2 {{PLURAL:$2|bytes}}
+syntaxhighlight-error-unknown-language: Unknown language \$1\
}
diff --git a/i18n/qqq.json b/i18n/qqq.json
index 2eeb6c0..4c56f53 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -17,6 +17,5 @@
syntaxhighlight-visualeditor-mwsyntaxhighlightinspector-language:
Label for the language field\n{{Identical|Language}},
syntaxhighlight-visualeditor-mwsyntaxhighlightinspector-title: Title
for the VisualEditor syntax highlighter inspector, above the text area for the
code,
syntaxhighlight-error-pygments-invocation-failure: Error message
shown when the syntax highlighting library failed with an unspecified error,
- syntaxhighlight-error-unknown-language: Error message shown when the
programming language name was not recognized by the syntax highlighting
library. Parameters:\n* $1 - the language name,
- syntaxhighlight-error-exceeds-size-limit: Error message shown when
the block of code to be highlighted exceeds the size limit. Parameters:\n* $1 -
the size of the code block, in bytes\n* $2 - the maximum size allowed.
+ syntaxhighlight-error-unknown-language: Error message shown when the
programming language name was not recognized by the syntax highlighting
library. Parameters:\n* $1 - the language name
}
--
To view, visit https://gerrit.wikimedia.org/r/223053
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I5b5be591abd146f095d3d191ffa666f4e8830f91
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SyntaxHighlight_GeSHi
Gerrit-Branch: master
Gerrit-Owner: Bartosz Dziewoński matma@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove i18n shim - change (mediawiki...UniversalLanguageSelector)
jenkins-bot has submitted this change and it was merged.
Change subject: Remove i18n shim
..
Remove i18n shim
Change-Id: Iab92a7f170d1bdbb0caf4047c9f0b38023526820
---
D UniversalLanguageSelector.i18n.php
M UniversalLanguageSelector.php
2 files changed, 0 insertions(+), 37 deletions(-)
Approvals:
Paladox: Looks good to me, but someone else must approve
Umherirrender: Looks good to me, approved
jenkins-bot: Verified
diff --git a/UniversalLanguageSelector.i18n.php
b/UniversalLanguageSelector.i18n.php
deleted file mode 100644
index 12624a9..000
--- a/UniversalLanguageSelector.i18n.php
+++ /dev/null
@@ -1,35 +0,0 @@
-?php
-/**
- * This is a backwards-compatibility shim, generated by:
- *
https://git.wikimedia.org/blob/mediawiki%2Fcore.git/HEAD/maintenance%2FgenerateJsonI18n.php
- *
- * Beginning with MediaWiki 1.23, translation strings are stored in json files,
- * and the EXTENSION.i18n.php file only exists to provide compatibility with
- * older releases of MediaWiki. For more information about this migration, see:
- * https://www.mediawiki.org/wiki/Requests_for_comment/Localisation_format
- *
- * This shim maintains compatibility back to MediaWiki 1.17.
- */
-$messages = array();
-if ( !function_exists( 'wfJsonI18nShim29b26b9f5d64bcef' ) ) {
- function wfJsonI18nShim29b26b9f5d64bcef( $cache, $code, $cachedData ) {
- $codeSequence = array_merge( array( $code ),
$cachedData['fallbackSequence'] );
- foreach ( $codeSequence as $csCode ) {
- $fileName = dirname( __FILE__ ) . /i18n/$csCode.json;
- if ( is_readable( $fileName ) ) {
- $data = FormatJson::decode( file_get_contents(
$fileName ), true );
- foreach ( array_keys( $data ) as $key ) {
- if ( $key === '' || $key[0] === '@' ) {
- unset( $data[$key] );
- }
- }
- $cachedData['messages'] = array_merge( $data,
$cachedData['messages'] );
- }
-
- $cachedData['deps'][] = new FileDependency( $fileName );
- }
- return true;
- }
-
- $GLOBALS['wgHooks']['LocalisationCacheRecache'][] =
'wfJsonI18nShim29b26b9f5d64bcef';
-}
diff --git a/UniversalLanguageSelector.php b/UniversalLanguageSelector.php
index 59c64f5..d18c1ab 100644
--- a/UniversalLanguageSelector.php
+++ b/UniversalLanguageSelector.php
@@ -184,8 +184,6 @@
// Internationalization
$GLOBALS['wgMessagesDirs']['UniversalLanguageSelector'] = __DIR__ . '/i18n';
-$GLOBALS['wgExtensionMessagesFiles']['UniversalLanguageSelector'] =
- __DIR__ . '/UniversalLanguageSelector.i18n.php';
// Register auto load for the page class
$GLOBALS['wgAutoloadClasses'] += array(
--
To view, visit https://gerrit.wikimedia.org/r/67
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iab92a7f170d1bdbb0caf4047c9f0b38023526820
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/UniversalLanguageSelector
Gerrit-Branch: master
Gerrit-Owner: Nikerabbit niklas.laxst...@gmail.com
Gerrit-Reviewer: KartikMistry kartik.mis...@gmail.com
Gerrit-Reviewer: Nikerabbit niklas.laxst...@gmail.com
Gerrit-Reviewer: Paladox thomasmulhall...@yahoo.com
Gerrit-Reviewer: Santhosh santhosh.thottin...@gmail.com
Gerrit-Reviewer: Siebrand siebr...@kitano.nl
Gerrit-Reviewer: Umherirrender umherirrender_de...@web.de
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Re-apply Add PHP error logging to Sentry extension - change (mediawiki...Sentry)
jenkins-bot has submitted this change and it was merged.
Change subject: Re-apply Add PHP error logging to Sentry extension
..
Re-apply Add PHP error logging to Sentry extension
This re-applies commit bad0a30696330fea11521db0bacc784f53bf7288,
which broke beta due to relying on a composer library not added to
mediawiki/vendor, but I1f2179bd61fff3b794a8c4fdcb5e2f45324e12bb
should have taken care of that.
(This reverts cbf7c77208dddfd5bee852565b478e77d889ecbd.)
Bug: T85188
Bug: T101252
Change-Id: I5fe94f746a95bcb9dd5b3a63e634cdd5dd5e83ec
---
M .gitignore
M Sentry.php
M SentryHooks.php
A composer.json
4 files changed, 45 insertions(+), 1 deletion(-)
Approvals:
BryanDavis: Looks good to me, approved
Paladox: Looks good to me, but someone else must approve
Hashar: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/.gitignore b/.gitignore
index 3c3629e..e32f354 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,4 @@
-node_modules
+node_modules/
+vendor/
+composer.lock
+
diff --git a/Sentry.php b/Sentry.php
index f80f939..607ffdc 100644
--- a/Sentry.php
+++ b/Sentry.php
@@ -31,6 +31,8 @@
$wgHooks['BeforePageDisplay'][] = 'SentryHooks::onBeforePageDisplay';
$wgHooks['UnitTestsList'][] = 'SentryHooks::onUnitTestsList';
$wgHooks['ResourceLoaderTestModules'][] =
'SentryHooks::onResourceLoaderTestModules';
+$wgHooks['LogException'][] = 'SentryHooks::onLogException';
+SentryHooks::onRegistration();
/**
* Sentry DSN (http://raven.readthedocs.org/en/latest/config/#the-sentry-dsn)
@@ -52,3 +54,9 @@
*/
$wgSentryLogOnError = true;
+/**
+ * Log PHP errors automatically.
+ * @var bool
+ */
+$wgSentryLogPhpErrors = true;
+
diff --git a/SentryHooks.php b/SentryHooks.php
index c653f8a..d8b8031 100644
--- a/SentryHooks.php
+++ b/SentryHooks.php
@@ -56,4 +56,24 @@
}
return substr( $dsn, 0, $colon_pos ) . substr( $dsn, $at_pos );
}
+
+ public static function onRegistration() {
+ if ( file_exists( __DIR__ . '/vendor/autoload.php' ) ) {
+ require_once( __DIR__ . '/vendor/autoload.php' );
+ }
+ }
+
+ public static function onLogException( Exception $e ) {
+ global $wgSentryDsn, $wgSentryLogPhpErrors;
+
+ if ( !$wgSentryLogPhpErrors ) {
+ return true;
+ }
+
+ $client = new Raven_Client( $wgSentryDsn );
+ $client-captureException( $e );
+
+ return true;
+ }
}
+
diff --git a/composer.json b/composer.json
new file mode 100644
index 000..4cb5c4a
--- /dev/null
+++ b/composer.json
@@ -0,0 +1,13 @@
+{
+ name: mediawiki/sentry,
+ type: mediawiki-extension,
+ description: Send MediaWiki errors to Sentry, a realtime,
platform-agnostic error logging and aggregation platform,
+ keywords: [MediaWiki, Sentry, error logging],
+ homepage: https://www.mediawiki.org/wiki/Extension:Sentry;,
+ license : MIT,
+
+ require: {
+ composer/installers: =1.0.1,
+ raven/raven: 0.12.0
+ }
+}
--
To view, visit https://gerrit.wikimedia.org/r/216753
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I5fe94f746a95bcb9dd5b3a63e634cdd5dd5e83ec
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/extensions/Sentry
Gerrit-Branch: master
Gerrit-Owner: Gergő Tisza gti...@wikimedia.org
Gerrit-Reviewer: BryanDavis bda...@wikimedia.org
Gerrit-Reviewer: Gilles gdu...@wikimedia.org
Gerrit-Reviewer: Hashar has...@free.fr
Gerrit-Reviewer: Legoktm legoktm.wikipe...@gmail.com
Gerrit-Reviewer: Paladox thomasmulhall...@yahoo.com
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] WikidataPageBanner allow custom Wikidata Banner - change (mediawiki...WikidataPageBanner)
Sumit has uploaded a new change for review.
https://gerrit.wikimedia.org/r/223065
Change subject: WikidataPageBanner allow custom Wikidata Banner
..
WikidataPageBanner allow custom Wikidata Banner
If {{PAGEBANNER}} provides an invalid bannername, it should attempt to load a
Wikidata Banner there itself.
Bug: T104886
Change-Id: Ifa58bbb631d968d61c7bad52d7e327dcec54df2b
---
M includes/WikidataPageBanner.hooks.php
M tests/phpunit/BannerTest.php
2 files changed, 6 insertions(+), 2 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikidataPageBanner
refs/changes/65/223065/1
diff --git a/includes/WikidataPageBanner.hooks.php
b/includes/WikidataPageBanner.hooks.php
index 1f32fb9..45380c8 100644
--- a/includes/WikidataPageBanner.hooks.php
+++ b/includes/WikidataPageBanner.hooks.php
@@ -121,7 +121,11 @@
$banner = static::getBannerHtml( $bannername,
$paramsForBannerTemplate );
// if given banner does not exist, return
if ( $banner === null ) {
- return array( '', 'noparse' = true, 'isHTML'
= true );
+ $bannername = static::getWikidataBanner( $title
);
+ $banner = static::getBannerHtml( $bannername,
$paramsForBannerTemplate );
+ if ( $banner === null ) {
+ return array( '', 'noparse' = true,
'isHTML' = true );
+ }
}
// Set 'articlebanner' property for future reference
$parser-getOutput()-setProperty( 'articlebanner',
$banner );
diff --git a/tests/phpunit/BannerTest.php b/tests/phpunit/BannerTest.php
index 2a3832c..53951a9 100644
--- a/tests/phpunit/BannerTest.php
+++ b/tests/phpunit/BannerTest.php
@@ -43,7 +43,7 @@
protected $testPagesForCustomBanner = array(
array( 'PageWithCustomBanner', NS_MAIN, Banner ),
array( 'PageInTalkNamespace', NS_TALK, '' ),
- array( 'NoBanner', NS_MAIN, '' )
+ array( 'NoBanner', NS_MAIN, Banner )
);
/**
--
To view, visit https://gerrit.wikimedia.org/r/223065
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ifa58bbb631d968d61c7bad52d7e327dcec54df2b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikidataPageBanner
Gerrit-Branch: master
Gerrit-Owner: Sumit asthana.sumi...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Follow-up 0ca48d8: Actually load jquery.i18n.emitter.bidi.js... - change (VisualEditor/VisualEditor)
Jforrester has uploaded a new change for review. https://gerrit.wikimedia.org/r/223066 Change subject: Follow-up 0ca48d8: Actually load jquery.i18n.emitter.bidi.js too .. Follow-up 0ca48d8: Actually load jquery.i18n.emitter.bidi.js too Change-Id: Ib5aebafadeb5ab5a6ad36291e17c96bf423f24ba --- M build/modules.json M demos/ve/desktop.html M demos/ve/mobile.html M tests/index.html 4 files changed, 4 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/VisualEditor/VisualEditor refs/changes/66/223066/1 diff --git a/build/modules.json b/build/modules.json index ff6437f..9cf2102 100644 --- a/build/modules.json +++ b/build/modules.json @@ -81,6 +81,7 @@ lib/jquery.i18n/src/jquery.i18n.messagestore.js, lib/jquery.i18n/src/jquery.i18n.parser.js, lib/jquery.i18n/src/jquery.i18n.emitter.js, + lib/jquery.i18n/src/jquery.i18n.emitter.bidi.js, lib/jquery.i18n/src/jquery.i18n.language.js, lib/jquery.i18n/src/jquery.i18n.fallbacks.js, lib/jquery.i18n/src/languages/bs.js, diff --git a/demos/ve/desktop.html b/demos/ve/desktop.html index 3d72adf..f72ba9f 100644 --- a/demos/ve/desktop.html +++ b/demos/ve/desktop.html @@ -104,6 +104,7 @@ script src=../../lib/jquery.i18n/src/jquery.i18n.messagestore.js/script script src=../../lib/jquery.i18n/src/jquery.i18n.parser.js/script script src=../../lib/jquery.i18n/src/jquery.i18n.emitter.js/script + script src=../../lib/jquery.i18n/src/jquery.i18n.emitter.bidi.js/script script src=../../lib/jquery.i18n/src/jquery.i18n.language.js/script script src=../../lib/jquery.i18n/src/jquery.i18n.fallbacks.js/script script src=../../lib/jquery.i18n/src/languages/bs.js/script diff --git a/demos/ve/mobile.html b/demos/ve/mobile.html index 1b22432..bae25e4 100644 --- a/demos/ve/mobile.html +++ b/demos/ve/mobile.html @@ -105,6 +105,7 @@ script src=../../lib/jquery.i18n/src/jquery.i18n.messagestore.js/script script src=../../lib/jquery.i18n/src/jquery.i18n.parser.js/script script src=../../lib/jquery.i18n/src/jquery.i18n.emitter.js/script + script src=../../lib/jquery.i18n/src/jquery.i18n.emitter.bidi.js/script script src=../../lib/jquery.i18n/src/jquery.i18n.language.js/script script src=../../lib/jquery.i18n/src/jquery.i18n.fallbacks.js/script script src=../../lib/jquery.i18n/src/languages/bs.js/script diff --git a/tests/index.html b/tests/index.html index 9dbac1a..2b656c4 100644 --- a/tests/index.html +++ b/tests/index.html @@ -36,6 +36,7 @@ script src=../lib/jquery.i18n/src/jquery.i18n.messagestore.js/script script src=../lib/jquery.i18n/src/jquery.i18n.parser.js/script script src=../lib/jquery.i18n/src/jquery.i18n.emitter.js/script + script src=../lib/jquery.i18n/src/jquery.i18n.emitter.bidi.js/script script src=../lib/jquery.i18n/src/jquery.i18n.language.js/script script src=../lib/jquery.i18n/src/jquery.i18n.fallbacks.js/script script src=../lib/jquery.i18n/src/languages/bs.js/script -- To view, visit https://gerrit.wikimedia.org/r/223066 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib5aebafadeb5ab5a6ad36291e17c96bf423f24ba Gerrit-PatchSet: 1 Gerrit-Project: VisualEditor/VisualEditor Gerrit-Branch: master Gerrit-Owner: Jforrester jforres...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Reverted change e426421 - change (mediawiki...Cargo)
Yaron Koren has submitted this change and it was merged.
Change subject: Reverted change e426421
..
Reverted change e426421
Change-Id: I6bd2ff7978236f82175bef3e1e224bdba3f99c0c
---
M CargoSQLQuery.php
1 file changed, 4 insertions(+), 4 deletions(-)
Approvals:
Yaron Koren: Checked; Looks good to me, approved
diff --git a/CargoSQLQuery.php b/CargoSQLQuery.php
index 8107322..99bb070 100644
--- a/CargoSQLQuery.php
+++ b/CargoSQLQuery.php
@@ -916,10 +916,10 @@
if ( $this-mHavingStr != '' ) {
$selectOptions['HAVING'] = $this-mHavingStr;
}
- // For some reason, we need to put quotes around the ORDER By
- // value specifically, so that non-ASCII characters are
- // handled correctly.
- $selectOptions['ORDER BY'] = '' . $this-mOrderByStr . '';
+ // @TODO - need handling of non-ASCII characters in field
+ // names, which for some reason cause problems in ORDER BY
+ // specifically.
+ $selectOptions['ORDER BY'] = $orderByStr;
$selectOptions['LIMIT'] = $this-mQueryLimit;
// Aliases need to be surrounded by quotes when we actually
--
To view, visit https://gerrit.wikimedia.org/r/223069
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I6bd2ff7978236f82175bef3e1e224bdba3f99c0c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Cargo
Gerrit-Branch: master
Gerrit-Owner: Yaron Koren yaro...@gmail.com
Gerrit-Reviewer: Yaron Koren yaro...@gmail.com
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
