date:20151116

[MediaWiki-commits] [Gerrit] Drop ComplexValueRdfBuilderTest and SimpleValueRdfBuilderTest. - change (mediawiki...Wikibase)

2015-11-16 Thread Daniel Kinzler (Code Review)

Daniel Kinzler has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/253330

Change subject: Drop ComplexValueRdfBuilderTest and SimpleValueRdfBuilderTest.
..

Drop ComplexValueRdfBuilderTest and SimpleValueRdfBuilderTest.

ComplexValueRdfBuilder and SimpleValueRdfBuilder are gone, we kept the tests
around to ensure a smooth transition. Now they can go.

Change-Id: Iae9d54cea6a7c1520dc011563db51277412541cc
---
D repo/tests/phpunit/includes/rdf/ComplexValueRdfBuilderTest.php
D repo/tests/phpunit/includes/rdf/SimpleValueRdfBuilderTest.php
2 files changed, 0 insertions(+), 751 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase 
refs/changes/30/253330/1

diff --git a/repo/tests/phpunit/includes/rdf/ComplexValueRdfBuilderTest.php 
b/repo/tests/phpunit/includes/rdf/ComplexValueRdfBuilderTest.php
deleted file mode 100644
index e909e55..000
--- a/repo/tests/phpunit/includes/rdf/ComplexValueRdfBuilderTest.php
+++ /dev/null
@@ -1,472 +0,0 @@
-testData === null ) {
-   $this->testData = new RdfBuilderTestData(
-   __DIR__ . "/../../data/rdf",
-   __DIR__ . 
"/../../data/rdf/ComplexValueRdfBuilder"
-   );
-   }
-
-   return $this->testData;
-   }
-
-   /**
-* @param EntityId[] &$mentioned receives the IDs of any mentioned 
entities.
-* @param DedupeBag|null $bag A list of value hashes that should be 
considered "already seen".
-*
-* @return ValueSnakRdfBuilder
-*/
-   private function newBuilder( array &$mentioned = array(), DedupeBag 
$bag = null ) {
-   $mentionTracker = $this->getMock( 
'Wikibase\Rdf\EntityMentionListener' );
-   $mentionTracker->expects( $this->any() )
-   ->method( 'entityReferenceMentioned' )
-   ->will( $this->returnCallback( function( EntityId $id ) 
use ( &$mentioned ) {
-   $key = $id->getSerialization();
-   $mentioned[$key] = $id;
-   } ) );
-
-   $valueWriter = $this->getTestData()->getNTriplesWriter();
-
-   $valueSnakRdfBuilderFactory = 
WikibaseRepo::getDefaultInstance()->getValueSnakRdfBuilderFactory();
-
-   $builder = 
$valueSnakRdfBuilderFactory->getComplexValueSnakRdfBuilder(
-   $this->getTestData()->getVocabulary(),
-   $valueWriter,
-   $mentionTracker,
-   $bag ?: new HashDedupeBag()
-   );
-
-   // HACK: glue on the value writer as a public field, so we can 
evaluate it later.
-   $builder->test_value_writer = $valueWriter;
-
-   return $builder;
-   }
-
-   /**
-* Extract text test data from RDF builder
-*
-* @param RdfWriter $writer
-*
-* @return string[] ntriples lines, sorted
-*/
-   private function getDataFromWriter( RdfWriter $writer ) {
-   $ntriples = $writer->drain();
-
-   if ( $ntriples === '' ) {
-   return array();
-   }
-
-   $lines = explode( "\n", trim( $ntriples ) );
-   sort( $lines );
-   return $lines;
-   }
-
-   private function assertTriplesEqual( array $expectedTriples, RdfWriter 
$writer, $message = '' ) {
-   $actualTripels = $this->getDataFromWriter( $writer );
-   sort( $expectedTriples );
-   sort( $actualTripels );
-
-   // Note: comparing $expected and $actual directly would show 
triples
-   // that are present in both but shifted in position. That makes 
the output
-   // hard to read. Calculating the $missing and $extra sets helps.
-   $extra = array_diff( $actualTripels, $expectedTriples );
-   $missing = array_diff( $expectedTriples, $actualTripels );
-
-   // Cute: $missing and $extra can be equal only if they are 
empty.
-   // Comparing them here directly looks a bit odd in code, but 
produces meaningful
-   // output, especially if the input was sorted.
-   $this->assertEquals( $missing, $extra, $message );
-   }
-
-   public function provideAddValue() {
-   // NOTE: data types must match 
$this->getTestData()->getMockRepository();
-
-   return array(
-   'wikibase-entityid' => array(
-   new PropertyId( 'P2' ),
-   'wikibase-item',
-   new EntityIdValue( new ItemId( 'Q42' ) ),
-   array(
-   '

[MediaWiki-commits] [Gerrit] Bump src to 3a6f3b9e for deploy - change (mediawiki...deploy)

2015-11-16 Thread Subramanya Sastry (Code Review)

Subramanya Sastry has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/253338

Change subject: Bump src to 3a6f3b9e for deploy
..

Bump src to 3a6f3b9e for deploy

Change-Id: I8a9c9d1de28e52c00dce3124e076d15a02db51e3
---
M src
1 file changed, 0 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/parsoid/deploy 
refs/changes/38/253338/1

diff --git a/src b/src
index 392e25e..3a6f3b9 16
--- a/src
+++ b/src
-Subproject commit 392e25ebec2b0838ae1c3bfcea8120ba42e15b64
+Subproject commit 3a6f3b9ebaff36ef41b3f11ec36db4dea416a776

-- 
To view, visit https://gerrit.wikimedia.org/r/253338
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I8a9c9d1de28e52c00dce3124e076d15a02db51e3
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/parsoid/deploy
Gerrit-Branch: master
Gerrit-Owner: Subramanya Sastry 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] terbium: move back all cronjobs - change (operations/puppet)

2015-11-16 Thread Giuseppe Lavagetto (Code Review)

Giuseppe Lavagetto has submitted this change and it was merged.

Change subject: terbium: move back all cronjobs
..


terbium: move back all cronjobs

Change-Id: Icc687d756a79d6509ddee0c57049cac08c6bafbe
---
M hieradata/hosts/mw1152.yaml
M hieradata/hosts/terbium.yaml
2 files changed, 18 insertions(+), 18 deletions(-)

Approvals:
  Giuseppe Lavagetto: Verified; Looks good to me, approved



diff --git a/hieradata/hosts/mw1152.yaml b/hieradata/hosts/mw1152.yaml
index 341f891..8075bc5 100644
--- a/hieradata/hosts/mw1152.yaml
+++ b/hieradata/hosts/mw1152.yaml
@@ -15,15 +15,15 @@
 mediawiki::maintenance::parsercachepurging::ensure: absent
 mediawiki::maintenance::cleanup_upload_stash::ensure: absent
 mediawiki::maintenance::tor_exit_node::ensure: absent
-mediawiki::maintenance::update_flaggedrev_stats::ensure: present
-mediawiki::maintenance::refreshlinks::ensure: present
-mediawiki::maintenance::update_special_pages::ensure: present
-mediawiki::maintenance::update_article_count::ensure: present
-mediawiki::maintenance::purge_abusefilter::ensure: present
-mediawiki::maintenance::purge_checkuser::ensure: present
-mediawiki::maintenance::purge_securepoll::ensure: present
-mediawiki::maintenance::jobqueue_stats::ensure: present
-mediawiki::maintenance::updatequerypages::ensure: present
+mediawiki::maintenance::update_flaggedrev_stats::ensure: absent
+mediawiki::maintenance::refreshlinks::ensure: absent
+mediawiki::maintenance::update_special_pages::ensure: absent
+mediawiki::maintenance::update_article_count::ensure: absent
+mediawiki::maintenance::purge_abusefilter::ensure: absent
+mediawiki::maintenance::purge_checkuser::ensure: absent
+mediawiki::maintenance::purge_securepoll::ensure: absent
+mediawiki::maintenance::jobqueue_stats::ensure: absent
+mediawiki::maintenance::updatequerypages::ensure: absent
 tendril::maintenance::ensure: absent
 hhvm::extra::cli:
   hhvm:
diff --git a/hieradata/hosts/terbium.yaml b/hieradata/hosts/terbium.yaml
index 0454111..7793a21 100644
--- a/hieradata/hosts/terbium.yaml
+++ b/hieradata/hosts/terbium.yaml
@@ -15,15 +15,15 @@
 mediawiki::maintenance::parsercachepurging::ensure: present
 mediawiki::maintenance::cleanup_upload_stash::ensure: present
 mediawiki::maintenance::tor_exit_node::ensure: present
-mediawiki::maintenance::update_flaggedrev_stats::ensure: absent
-mediawiki::maintenance::refreshlinks::ensure: absent
-mediawiki::maintenance::update_special_pages::ensure: absent
-mediawiki::maintenance::update_article_count::ensure: absent
-mediawiki::maintenance::purge_abusefilter::ensure: absent
-mediawiki::maintenance::purge_checkuser::ensure: absent
-mediawiki::maintenance::purge_securepoll::ensure: absent
-mediawiki::maintenance::jobqueue_stats::ensure: absent
-mediawiki::maintenance::updatequerypages::ensure: absent
+mediawiki::maintenance::update_flaggedrev_stats::ensure: present
+mediawiki::maintenance::refreshlinks::ensure: present
+mediawiki::maintenance::update_special_pages::ensure: present
+mediawiki::maintenance::update_article_count::ensure: present
+mediawiki::maintenance::purge_abusefilter::ensure: present
+mediawiki::maintenance::purge_checkuser::ensure: present
+mediawiki::maintenance::purge_securepoll::ensure: present
+mediawiki::maintenance::jobqueue_stats::ensure: present
+mediawiki::maintenance::updatequerypages::ensure: present
 tendril::maintenance::ensure: present
 hhvm::extra::cli:
   hhvm:

-- 
To view, visit https://gerrit.wikimedia.org/r/253340
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Icc687d756a79d6509ddee0c57049cac08c6bafbe
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto 
Gerrit-Reviewer: Giuseppe Lavagetto 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Disable first QuickSurveys survey - change (operations/mediawiki-config)

2015-11-16 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged.

Change subject: Disable first QuickSurveys survey
..


Disable first QuickSurveys survey

Disable survey but leave QuickSurveys deployed on enwiki.

Bug: T118525
Change-Id: I502ac8a3f4d5075d27c248c7951266bd33a87e50
---
M wmf-config/InitialiseSettings.php
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Thcipriani: Looks good to me, approved
  Bmansurov: Looks good to me, but someone else must approve
  jenkins-bot: Verified



diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index 5b837b5..d04d81d 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -15799,7 +15799,7 @@
"name" => "reader-segmentation-1",
"type" => "external",
"schema" => "QuickSurveysResponses",
-   "enabled" => true,
+   "enabled" => false,
"description" => "reader-segmentation-1-description",
"link" => "reader-segmentation-1-link",
"question" => "reader-segmentation-1-message",

-- 
To view, visit https://gerrit.wikimedia.org/r/253038
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I502ac8a3f4d5075d27c248c7951266bd33a87e50
Gerrit-PatchSet: 2
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Jhobs 
Gerrit-Reviewer: Bmansurov 
Gerrit-Reviewer: Chad 
Gerrit-Reviewer: Florianschmidtwelzow 
Gerrit-Reviewer: Thcipriani 
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 users with 'newsletter-manage' right to add/remove pub... - change (mediawiki...Newsletter)

2015-11-16 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged.

Change subject: Allow users with 'newsletter-manage' right to add/remove 
publishers
..


Allow users with 'newsletter-manage' right to add/remove publishers

* This removes 'newsletter-addpublisher' right as well
* Also make ext.newslettermanage.js only remove the row if API request was done.
* Some minor fixes to newslettermanageapi

Bug: T110327
Bug: T114145
Change-Id: I8ab9e504e055ea08d5398f187acc034b6572645f
---
M extension.json
M i18n/en.json
M i18n/qqq.json
M includes/api/ApiNewsletterManage.php
M includes/specials/SpecialNewsletterManage.php
M includes/specials/pagers/NewsletterManageTablePager.php
M modules/ext.newslettermanage.js
7 files changed, 67 insertions(+), 39 deletions(-)

Approvals:
  Addshore: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/extension.json b/extension.json
index 4f81e65..b52eaf8 100644
--- a/extension.json
+++ b/extension.json
@@ -10,11 +10,11 @@
"license-name": "GPL-2.0",
"type": "other",
"AvailableRights": [
-   "newsletter-addpublisher"
+   "newsletter-manage"
],
"GroupPermissions": {
"sysop": {
-   "newsletter-addpublisher": true
+   "newsletter-manage": true
}
},
"SpecialPages": {
diff --git a/i18n/en.json b/i18n/en.json
index 4a76da3..94be3de 100755
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -96,8 +96,8 @@
"newsletter-manage-header-action": "Action",
"newsletter-publisher-radiobutton-label": "Publisher",
"newsletter-dropdown-default-message": "Please select one",
-   "right-newsletter-addpublisher": "Give publisher rights to users",
-   "action-newsletter-addpublisher": "give publisher rights to users",
+   "right-newsletter-manage": "Add or remove publishers from newsletters",
+   "action-newsletter-manage": "manage newsletters.",
"newsletters-summary": "This page allows you to browse through a list 
of all newsletters on this wiki and allows users to subscribe to or unsubscribe 
from them. You can also choose your newsletter subscription options through the 
 [[Special:Preferences#mw-prefsection-echo|preferences]] interface.",
"apihelp-newslettersubscribe-description": "Subscribe to or unsubscribe 
from a newsletter.",
"apihelp-newslettersubscribe-param-id": "ID of the newsletter for which 
the subscription should be changed.",
diff --git a/i18n/qqq.json b/i18n/qqq.json
index 6e9aeea..863e0f4 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -100,8 +100,8 @@
"newsletter-manage-header-action": "{{Identical|Action}}",
"newsletter-publisher-radiobutton-label": "Label of radio button in 
'Permissions' column in [[Special:ManageNewsletter]] which is checked if the 
user is a publisher of the newsletter\n{{Identical|Publisher}}",
"newsletter-dropdown-default-message": "Default option of drop down 
menus to select newsletters in [[Special:ManageNewsletter]].\n\nSee also:\n* 
{{msg-mw|Newsletter-name}} (label of the field)",
-   "right-newsletter-addpublisher": 
"{{doc-right|newsletter-addpublisher}}",
-   "action-newsletter-addpublisher": 
"{{doc-action|newsletter-addpublisher}}",
+   "right-newsletter-manage": "{{doc-right|newsletter-manage}}",
+   "action-newsletter-manage": "{{doc-action|newsletter-manage}}",
"newsletters-summary": "Introductory message shown on top of 
[[Special:Newsletters]]. Do not translate the anchor of Special:Preferences 
link. (\"#mw-prefsection-echo\" part).",
"apihelp-newslettersubscribe-description": 
"{{doc-apihelp-description|newslettersubscribe}}",
"apihelp-newslettersubscribe-param-id": 
"{{doc-apihelp-param|newslettersubscribe|id}}",
diff --git a/includes/api/ApiNewsletterManage.php 
b/includes/api/ApiNewsletterManage.php
index 67cf8cc..6206535 100644
--- a/includes/api/ApiNewsletterManage.php
+++ b/includes/api/ApiNewsletterManage.php
@@ -5,50 +5,76 @@
  *
  * @license GNU GPL v2+
  * @author Tina Johnson
+ *
+ * @todo Rename this module to newslettermanage
+ * @todo Add i18n
  */
 class ApiNewsletterManage extends ApiBase {
 
public function execute() {
-
$user = $this->getUser();
-   if ( !$user->isLoggedIn() ) {
-   $this->dieUsage( 'You must be logged-in to interact 
with newsletters', 'notloggedin' );
+
+   $params = $this->extractRequestParams();
+   $newsletter = Newsletter::newFromID( $params['id'] );
+
+   if ( !$newsletter ) {
+   $this->dieUsage( 'Newsletter does not exist', 
'notfound' );
}
 
-   if ( !$user->isAllowed( 'newsletter-addpublisher' ) ) {
-   $this->dieUsage( 'You do not have the necessary rights 
to interact with the newsletter',

[MediaWiki-commits] [Gerrit] Adding .gitignore and .gitreview - change (eventlogging)

2015-11-16 Thread Ottomata (Code Review)

Ottomata has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/253336

Change subject: Adding .gitignore and .gitreview
..

Adding .gitignore and .gitreview

Change-Id: Ib245b03e231fe0ace600d1471a80b041340bbfbb
---
A .gitignore
A .gitreview
2 files changed, 24 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/eventlogging 
refs/changes/36/253336/1

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000..61f11c1
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,18 @@
+*.egg
+*.egg-info
+*.kate-swp
+*.pyc
+*~
+.*.swp
+.pylintrc
+.svn
+.tox
+Makefile
+__pycache__
+build
+dist
+env
+.coverage
+tests/suite.php
+.deploy
+node_modules/
diff --git a/.gitreview b/.gitreview
new file mode 100644
index 000..13ed367
--- /dev/null
+++ b/.gitreview
@@ -0,0 +1,6 @@
+[gerrit]
+host=gerrit.wikimedia.org
+port=29418
+project=eventlogging.git
+defaultbranch=master
+defaultrebase=0

-- 
To view, visit https://gerrit.wikimedia.org/r/253336
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib245b03e231fe0ace600d1471a80b041340bbfbb
Gerrit-PatchSet: 1
Gerrit-Project: eventlogging
Gerrit-Branch: master
Gerrit-Owner: Ottomata 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Adding .gitignore and .gitreview - change (eventlogging)

2015-11-16 Thread Ottomata (Code Review)

Ottomata has submitted this change and it was merged.

Change subject: Adding .gitignore and .gitreview
..


Adding .gitignore and .gitreview

Change-Id: Ib245b03e231fe0ace600d1471a80b041340bbfbb
---
A .gitignore
A .gitreview
2 files changed, 24 insertions(+), 0 deletions(-)

Approvals:
  Ottomata: Verified; Looks good to me, approved



diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000..61f11c1
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,18 @@
+*.egg
+*.egg-info
+*.kate-swp
+*.pyc
+*~
+.*.swp
+.pylintrc
+.svn
+.tox
+Makefile
+__pycache__
+build
+dist
+env
+.coverage
+tests/suite.php
+.deploy
+node_modules/
diff --git a/.gitreview b/.gitreview
new file mode 100644
index 000..13ed367
--- /dev/null
+++ b/.gitreview
@@ -0,0 +1,6 @@
+[gerrit]
+host=gerrit.wikimedia.org
+port=29418
+project=eventlogging.git
+defaultbranch=master
+defaultrebase=0

-- 
To view, visit https://gerrit.wikimedia.org/r/253336
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib245b03e231fe0ace600d1471a80b041340bbfbb
Gerrit-PatchSet: 1
Gerrit-Project: eventlogging
Gerrit-Branch: master
Gerrit-Owner: Ottomata 
Gerrit-Reviewer: Ottomata 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] purging: do not VCL-filter on domain regex - change (operations/puppet)

2015-11-16 Thread BBlack (Code Review)

BBlack has submitted this change and it was merged.

Change subject: purging: do not VCL-filter on domain regex
..


purging: do not VCL-filter on domain regex

... because we're now splitting the multicast addresses
themselves, which is far more efficient.

Needs to wait on deploy of mediawiki config change: I8799f7b30

Bug: T116752
Change-Id: I2d2078e7240f16040ecee0fc65059955a0f8d13d
---
M hieradata/labs.yaml
M modules/role/manifests/cache/base.pp
M modules/role/manifests/cache/maps.pp
M modules/role/manifests/cache/misc.pp
M modules/role/manifests/cache/mobile.pp
M modules/role/manifests/cache/parsoid.pp
M modules/role/manifests/cache/text.pp
M modules/role/manifests/cache/upload.pp
M modules/varnish/templates/vcl/wikimedia.vcl.erb
9 files changed, 2 insertions(+), 15 deletions(-)

Approvals:
  BBlack: Verified; Looks good to me, approved
  jenkins-bot: Verified



diff --git a/hieradata/labs.yaml b/hieradata/labs.yaml
index ba6a672..5804b08 100644
--- a/hieradata/labs.yaml
+++ b/hieradata/labs.yaml
@@ -36,8 +36,6 @@
 eqiad:
   - '127.0.0.1'
 role::cache::base::zero_site: 'http://zero.wikimedia.beta.wmflabs.org'
-role::cache::base::purge_host_only_upload_re: '^upload\.beta\.wmflabs\.org$'
-role::cache::base::purge_host_not_upload_re: '^(?!upload\.beta\.wmflabs\.org)'
 role::cache::base::static_host: 'deployment.wikimedia.beta.wmflabs.org'
 role::cache::base::upload_domain: 'upload.beta.wmflabs.org'
 role::cache::base::bits_domain: 'bits.beta.wmflabs.org'
diff --git a/modules/role/manifests/cache/base.pp 
b/modules/role/manifests/cache/base.pp
index 824ff7d..10284c4 100644
--- a/modules/role/manifests/cache/base.pp
+++ b/modules/role/manifests/cache/base.pp
@@ -1,7 +1,5 @@
 class role::cache::base(
 $zero_site = 'https://zero.wikimedia.org',
-$purge_host_only_upload_re = '^upload\.wikimedia\.org$',
-$purge_host_not_upload_re = '^(?!upload\.wikimedia\.org)',
 $static_host = 'www.wikimedia.org',
 $upload_domain = 'upload.wikimedia.org',
 $bits_domain = 'bits.wikimedia.org',
diff --git a/modules/role/manifests/cache/maps.pp 
b/modules/role/manifests/cache/maps.pp
index 4317bd9..357bf50 100644
--- a/modules/role/manifests/cache/maps.pp
+++ b/modules/role/manifests/cache/maps.pp
@@ -38,7 +38,6 @@
 
 $common_vcl_config = {
 'cache4xx' => '1m',
-'purge_host_regex' => $::role::cache::base::purge_host_not_upload_re,
 'do_gzip'  => true,
 }
 
diff --git a/modules/role/manifests/cache/misc.pp 
b/modules/role/manifests/cache/misc.pp
index ffa2da0..3d68ae8 100644
--- a/modules/role/manifests/cache/misc.pp
+++ b/modules/role/manifests/cache/misc.pp
@@ -27,7 +27,6 @@
 'layer'=> 'frontend',
 'do_gzip'  => true,
 'allowed_methods'  => '^(GET|DELETE|HEAD|POST|PURGE|PUT)$',
-'purge_host_regex' => 
$::role::cache::base::purge_host_not_upload_re,
 },
 directors   => {
 'analytics1001' => { # Hadoop Yarn ResourceManager GUI
diff --git a/modules/role/manifests/cache/mobile.pp 
b/modules/role/manifests/cache/mobile.pp
index 9aa6413..0079d28 100644
--- a/modules/role/manifests/cache/mobile.pp
+++ b/modules/role/manifests/cache/mobile.pp
@@ -78,7 +78,6 @@
 
 $common_vcl_config = {
 'cache4xx'   => '1m',
-'purge_host_regex'   => $::role::cache::base::purge_host_not_upload_re,
 'static_host'=> $::role::cache::base::static_host,
 'bits_domain'=> $::role::cache::base::bits_domain,
 'top_domain' => $::role::cache::base::top_domain,
diff --git a/modules/role/manifests/cache/parsoid.pp 
b/modules/role/manifests/cache/parsoid.pp
index bc227c0..0d47b27 100644
--- a/modules/role/manifests/cache/parsoid.pp
+++ b/modules/role/manifests/cache/parsoid.pp
@@ -20,7 +20,6 @@
 include role::cache::ssl::unified
 
 $common_vcl_config = {
-'purge_host_regex' => $::role::cache::base::purge_host_not_upload_re,
 }
 
 $be_vcl_config = merge($common_vcl_config, {
diff --git a/modules/role/manifests/cache/text.pp 
b/modules/role/manifests/cache/text.pp
index 9c08acc..f0e28ad 100644
--- a/modules/role/manifests/cache/text.pp
+++ b/modules/role/manifests/cache/text.pp
@@ -78,7 +78,6 @@
 
 $common_vcl_config = {
 'cache4xx'   => '1m',
-'purge_host_regex'   => $::role::cache::base::purge_host_not_upload_re,
 'static_host'=> $::role::cache::base::static_host,
 'bits_domain'=> $::role::cache::base::bits_domain,
 'top_domain' => $::role::cache::base::top_domain,
diff --git a/modules/role/manifests/cache/upload.pp 
b/modules/role/manifests/cache/upload.pp
index bd95520..3a7965b 100644
--- a/modules/role/manifests/cache/upload.pp
+++ b/modules/role/manifests/cache/upload.pp
@@ -49,7 +49,6 @@
 
 $common_vcl_config = {
 'cache4xx'

[MediaWiki-commits] [Gerrit] WIP: labs openldap role - change (operations/puppet)

2015-11-16 Thread Muehlenhoff (Code Review)

Muehlenhoff has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/253347

Change subject: WIP: labs openldap role
..

WIP: labs openldap role

Needs additional changes

Change-Id: I9f4c97be1e9aab9f6acbcff0550c497b3746bf12
---
M modules/role/manifests/openldap/corp.pp
1 file changed, 36 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/47/253347/1

diff --git a/modules/role/manifests/openldap/corp.pp 
b/modules/role/manifests/openldap/corp.pp
index 063222a..841658f 100644
--- a/modules/role/manifests/openldap/corp.pp
+++ b/modules/role/manifests/openldap/corp.pp
@@ -41,3 +41,39 @@
 critical  => true,
 }
 }
+
+class role::openldap::labs {
+include passwords::openldap::labs
+include base::firewall
+
+system::role { 'role::openldap::labs':
+description => 'LDAP servers for labs (based on OpenLDAP)'
+}
+
+# Certificate needs to be readable by slapd
+sslcert::certificate { "ldap-labs.${::site}.wikimedia.org":
+group => 'openldap',
+}
+
+class { '::openldap':
+server_id   => 1, 
+suffix  => 'dc=wikimedia,dc=org',
+datadir => '/var/lib/ldap/labs',
+ca  => '/etc/ssl/certs/ca-certificates.crt',
+certificate => 
"/etc/ssl/localcerts/ldap-labs.${::site}.wikimedia.org.crt",
+key => 
"/etc/ssl/private/ldap-labs.${::site}.wikimedia.org.key",
+}
+
+ferm::service { 'corp_ldap':
+proto  => 'tcp',
+port   => '389',
+srange => '(($INTERNAL @resolve(ldap-eqiad.wikimedia.org) 
@resolve(ldap-codfw.wikimedia.org)))',
+# TODO: Replace by assigned hostnames until the DNS aliases are flipped
+}
+
+monitoring::service { 'labs_ldap_check':
+description   => 'Labs LDAP ',
+check_command => 'check_ldap!dc=wikimedia,dc=org',
+critical  => true,
+}
+}

-- 
To view, visit https://gerrit.wikimedia.org/r/253347
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9f4c97be1e9aab9f6acbcff0550c497b3746bf12
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Muehlenhoff 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Some further finetuning to server groups - change (operations/puppet)

2015-11-16 Thread Muehlenhoff (Code Review)

Muehlenhoff has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/253348

Change subject: Some further finetuning to server groups
..

Some further finetuning to server groups

Change-Id: I09adb5258b31ed5c5528c68d3b8102e2f773f8f7
---
M modules/debdeploy/templates/debdeploy.erb
1 file changed, 3 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/48/253348/1

diff --git a/modules/debdeploy/templates/debdeploy.erb 
b/modules/debdeploy/templates/debdeploy.erb
index fb2d115..e2a76f0 100644
--- a/modules/debdeploy/templates/debdeploy.erb
+++ b/modules/debdeploy/templates/debdeploy.erb
@@ -9,10 +9,10 @@
 misc-external-services = debdeploy-tor:standard, debdeploy-etherpad:standard, 
debdeploy-lists:standard, debdeploy-planet:standard, debdeploy-otrs:standard, 
debdeploy-ipv6relay:standard, debdeploy-people:standard, 
debdeploy-mysql-analytics:standard, debdeploy-nova-api:standard, 
debdeploy-impala:standard
 misc-monitoring = debdeploy-grafana:standard, debdeploy-syslog:standard, 
debdeploy-ganglia:standard, debdeploy-graphite:standard, 
debdeploy-labmon:standard, debdeploy-icinga:standard
 misc-virt = debdeploy-nova-control:standard, debdeploy-horizon:standard, 
debdeploy-nova-manager:standard, debdeploy-nova-api:standard, 
debdeploy-labsdns:standard, debdeploy-nodepool:standard
-misc-analytics = debdeploy-kafkatee:standard, debdeploy-hue:standard, 
debdeploy-xenon:standard, debdeploy-mysql-analytics:standard, 
debdeploy-impala:standard, debdeploy-spark-worker:standard
+misc-analytics = debdeploy-kafkatee:standard, debdeploy-hue:standard, 
debdeploy-xenon:standard, debdeploy-mysql-analytics:standard, 
debdeploy-impala:standard, debdeploy-spark-worker:standard, 
debdeploy-stat:standard, debdeploy-stat:canary
 all-analytics = debdeploy-kafkatee:standard, debdeploy-hue:standard, 
debdeploy-xenon:standard, debdeploy-mysql-analytics:standard, 
debdeploy-impala:standard, debdeploy-spark-worker:standard, 
debdeploy-hadoop-worker:standard, debdeploy-hadoop-master:standard, 
debdeploy-hadoop-standby:standard, debdeploy-hadoop-worker:canary
 misc-others = debdeploy-spare:standard, debdeploy-testsystem:standard, 
debdeploy-labsnfs:standard
-misc-devel = debdeploy-bugzilla:standard, debdeploy-ci:standard, 
debdeploy-gitblit:standard, debdeploy-releases:standard, debdeploy-ve:standard, 
debdeploy-irc:standard, debdeploy-phabricator:standard, 
debdeploy-gerrit:standard, debdeploy-archiva:standard, 
debdeploy-rcstream:standard, debdeploy-eventlogging:standard
+misc-devel = debdeploy-bugzilla:standard, debdeploy-ci:standard, 
debdeploy-gitblit:standard, debdeploy-releases:standard, debdeploy-ve:standard, 
debdeploy-irc:standard, debdeploy-phabricator:standard, 
debdeploy-gerrit:standard, debdeploy-archiva:standard, 
debdeploy-rcstream:standard, debdeploy-eventlogging:standard, 
debdeploy-deployment:standard
 misc-ops = debdeploy-packagebuild:standard, debdeploy-racktables:standard, 
debdeploy-db-maintenance:standard, debdeploy-pmacct:standard, 
debdeploy-installserver:standard, debdeploy-librenms:standard, 
debdeploy-backup-storage:standard, debdeploy-ipsec-test:standard, 
debdeploy-tftpserver:standard
 deployment-servers = debdeploy-deployment:standard
 hadoop-worker = debdeploy-hadoop-worker:standard, 
debdeploy-hadoop-worker:canary
@@ -45,7 +45,7 @@
 dns-auth-canary = debdeploy-authdns:canary
 dns-rec = debdeploy-dnsrecursor:standard, debdeploy-dnsrecursor:canary
 dns-rec-canary = debdeploy-dnsrecursor:canary
-stat = debdeploy-stat:standard, debdeploy-kafka:canary
+stat = debdeploy-stat:standard, debdeploy-stat:canary
 kafka-canary = debdeploy-kafka:canary
 kafka = debdeploy-kafka:standard, debdeploy-kafka:canary
 elastic-canary = debdeploy-elastic:canary

-- 
To view, visit https://gerrit.wikimedia.org/r/253348
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I09adb5258b31ed5c5528c68d3b8102e2f773f8f7
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Muehlenhoff 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Add announce page to Special:Newsletter - change (mediawiki...Newsletter)

2015-11-16 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged.

Change subject: Add announce page to Special:Newsletter
..


Add announce page to Special:Newsletter

Bug: T117230
Change-Id: I3801c5ad3a66214d45bbd58258c97690aaebdacd
---
M i18n/en.json
M i18n/qqq.json
M includes/specials/SpecialNewsletter.php
3 files changed, 169 insertions(+), 0 deletions(-)

Approvals:
  Addshore: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/i18n/en.json b/i18n/en.json
index 50fef3f..3d50e69 100755
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -47,6 +47,16 @@
"newsletter-manage-button": "Manage",
"newsletter-unsubscribe-button": "Unsubscribe",
"newsletter-subscribe-button": "Subscribe",
+   "newsletter-announce-button": "Announce",
+   "newsletter-announce-nopermission": "You are not a publisher for this 
newsletter.",
+   "newsletter-announce": "Announce a new issue of \"$1\"",
+   "newsletter-announce-submit": "Announce",
+   "newsletter-announce-issuetitle": "Page title of the issue",
+   "newsletter-announce-summary": "Summary of this issue",
+   "newsletter-announce-success": "A new issue of \"$1\" has been 
announced to $2 {{PLURAL:$2|subscriber|subscribers}}.",
+   "newsletter-announce-invalid-page": "Please enter a valid title for the 
issue page.",
+   "newsletter-announce-nonexistent-page": "The provided issue page does 
not exist. Please enter an existing page.",
+   "newsletter-announce-failure": "A new issue could not be announced. 
Please try again.",
"newsletter-delete": "Delete newsletter",
"newsletter-delete-nopermission": "You do not have the permission to 
delete this newsletter.",
"newsletter-delete-text": "This interface can be used to delete the 
\"$1\" newsletter. Please confirm that you intend to do this. This 
action cannot be undone.",
diff --git a/i18n/qqq.json b/i18n/qqq.json
index 8da29c5..8c84305 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -51,6 +51,16 @@
"newsletter-manage-button": "Label for \"Manage\" button shown on 
Special:Newsletter/. Links to Special:Newsletter//manage. Only shown if 
the current user has permissions to manage the newsletter. Manage actions 
include adding publishers, removing publishers and announcing new issues.",
"newsletter-unsubscribe-button": "Label for \"Unsubscribe\" button 
shown on Special:Newsletter/. Links to Special:Newsletter//unsubscribe. 
Shown only for logged-in users and if the user is currently subscribed to the 
newsletter.\n{{Identical|Unsubscribe}}",
"newsletter-subscribe-button": "Label for \"Subscribe\" button shown on 
Special:Newsletter/. Links to Special:Newsletter//unsubscribe. Shown 
only for logged-in users and if the user is currently not subscribed to the 
newsletter.",
+   "newsletter-announce-button": "Label of \"Announce\" button shown on 
Special:Newsletter/id. ",
+   "newsletter-announce-nopermission": "Error message shown on 
Special:Newsletter/id/announce if the user is not a publisher.",
+   "newsletter-announce": "Title of Special:Newsletter/id/announce. $1 is 
the name of the newsletter.",
+   "newsletter-announce-submit": "Label of submit button shown on 
Special:Newsletter/id/announce",
+   "newsletter-announce-issuetitle": "Label of issue page title shown on 
Special:Newsletter/id/announce",
+   "newsletter-announce-summary": "Label of summary field shown on 
Special:Newsletter/id/announce",
+   "newsletter-announce-success": "Success message shown on 
Special:Newsletter/id/announce.\n\nParameters:\n* $1 - Name of the 
newsletter\n* $2 - Subscriber count for this newsletter.",
+   "newsletter-announce-invalid-page": "Error message shown on 
Special:Newsletter/id/announce if an invalid title was entered into issue page 
field.",
+   "newsletter-announce-nonexistent-page": "Error message shown on 
Special:Newsletter/id/announce if the issue page does not exist.",
+   "newsletter-announce-failure": "Error message shown on 
Special:Newsletter/id/announce if a new issue could not be announced.",
"newsletter-delete": "Header message shown on 
Special:Newsletter//delete.\n\nSee also:\n* 
{{msg-mw|newsletter-view}}\n*{{msg-mw|newsletter-subscribe}}",
"newsletter-delete-nopermission": "Error message shown on 
Special:Newsletter//delete if the current user does not have the permission 
to delete the newsletter.",
"newsletter-delete-text": "Introductory message shown on 
Special:Newsletter//delete.\n\nParameters:\n* $1 - Name of the newsletter 
for the specified id.",
diff --git a/includes/specials/SpecialNewsletter.php 
b/includes/specials/SpecialNewsletter.php
index c121a3d..7543fb9 100644
--- a/includes/specials/SpecialNewsletter.php
+++ b/includes/specials/SpecialNewsletter.php
@@ -11,6 +11,7 @@
const NEWSLETTER_SUBSCRIBE = 'subscribe';
const

[MediaWiki-commits] [Gerrit] terbium: start moving back cronjobs - change (operations/puppet)

2015-11-16 Thread Giuseppe Lavagetto (Code Review)

Giuseppe Lavagetto has submitted this change and it was merged.

Change subject: terbium: start moving back cronjobs
..


terbium: start moving back cronjobs

Change-Id: I74f3b9ab131aa123de7fb90073ea290a87d5cbb4
---
M hieradata/hosts/mw1152.yaml
M hieradata/hosts/terbium.yaml
2 files changed, 24 insertions(+), 17 deletions(-)

Approvals:
  Giuseppe Lavagetto: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/hieradata/hosts/mw1152.yaml b/hieradata/hosts/mw1152.yaml
index b727045..341f891 100644
--- a/hieradata/hosts/mw1152.yaml
+++ b/hieradata/hosts/mw1152.yaml
@@ -7,14 +7,14 @@
   - eqiad.wmnet
   - esams.wikimedia.org
   - codfw.wmnet
-mediawiki::maintenance::pagetriage::ensure: present
-mediawiki::maintenance::translationnotifications::ensure: present
-mediawiki::maintenance::updatetranslationstats::ensure: present
-mediawiki::maintenance::wikidata::ensure: present
-mediawiki::maintenance::echo_mail_batch::ensure: present
-mediawiki::maintenance::parsercachepurging::ensure: present
-mediawiki::maintenance::cleanup_upload_stash::ensure: present
-mediawiki::maintenance::tor_exit_node::ensure: present
+mediawiki::maintenance::pagetriage::ensure: absent
+mediawiki::maintenance::translationnotifications::ensure: absent
+mediawiki::maintenance::updatetranslationstats::ensure: absent
+mediawiki::maintenance::wikidata::ensure: absent
+mediawiki::maintenance::echo_mail_batch::ensure: absent
+mediawiki::maintenance::parsercachepurging::ensure: absent
+mediawiki::maintenance::cleanup_upload_stash::ensure: absent
+mediawiki::maintenance::tor_exit_node::ensure: absent
 mediawiki::maintenance::update_flaggedrev_stats::ensure: present
 mediawiki::maintenance::refreshlinks::ensure: present
 mediawiki::maintenance::update_special_pages::ensure: present
@@ -24,6 +24,7 @@
 mediawiki::maintenance::purge_securepoll::ensure: present
 mediawiki::maintenance::jobqueue_stats::ensure: present
 mediawiki::maintenance::updatequerypages::ensure: present
+tendril::maintenance::ensure: absent
 hhvm::extra::cli:
   hhvm:
 server:
diff --git a/hieradata/hosts/terbium.yaml b/hieradata/hosts/terbium.yaml
index 3a7f17f..0454111 100644
--- a/hieradata/hosts/terbium.yaml
+++ b/hieradata/hosts/terbium.yaml
@@ -7,14 +7,14 @@
   - eqiad.wmnet
   - esams.wikimedia.org
   - codfw.wmnet
-mediawiki::maintenance::pagetriage::ensure: absent
-mediawiki::maintenance::translationnotifications::ensure: absent
-mediawiki::maintenance::updatetranslationstats::ensure: absent
-mediawiki::maintenance::wikidata::ensure: absent
-mediawiki::maintenance::echo_mail_batch::ensure: absent
-mediawiki::maintenance::parsercachepurging::ensure: absent
-mediawiki::maintenance::cleanup_upload_stash::ensure: absent
-mediawiki::maintenance::tor_exit_node::ensure: absent
+mediawiki::maintenance::pagetriage::ensure: present
+mediawiki::maintenance::translationnotifications::ensure: present
+mediawiki::maintenance::updatetranslationstats::ensure: present
+mediawiki::maintenance::wikidata::ensure: present
+mediawiki::maintenance::echo_mail_batch::ensure: present
+mediawiki::maintenance::parsercachepurging::ensure: present
+mediawiki::maintenance::cleanup_upload_stash::ensure: present
+mediawiki::maintenance::tor_exit_node::ensure: present
 mediawiki::maintenance::update_flaggedrev_stats::ensure: absent
 mediawiki::maintenance::refreshlinks::ensure: absent
 mediawiki::maintenance::update_special_pages::ensure: absent
@@ -24,4 +24,10 @@
 mediawiki::maintenance::purge_securepoll::ensure: absent
 mediawiki::maintenance::jobqueue_stats::ensure: absent
 mediawiki::maintenance::updatequerypages::ensure: absent
-tendril::maintenance::ensure: absent
+tendril::maintenance::ensure: present
+hhvm::extra::cli:
+  hhvm:
+server:
+  # Limit number of child processes running at once
+  # Also, use light processes, that are more efficient
+  light_process_count: 2

-- 
To view, visit https://gerrit.wikimedia.org/r/253329
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I74f3b9ab131aa123de7fb90073ea290a87d5cbb4
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto 
Gerrit-Reviewer: Giuseppe Lavagetto 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] terbium: move back all cronjobs - change (operations/puppet)

2015-11-16 Thread Giuseppe Lavagetto (Code Review)

Giuseppe Lavagetto has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/253340

Change subject: terbium: move back all cronjobs
..

terbium: move back all cronjobs

Change-Id: Icc687d756a79d6509ddee0c57049cac08c6bafbe
---
M hieradata/hosts/mw1152.yaml
M hieradata/hosts/terbium.yaml
2 files changed, 18 insertions(+), 18 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/40/253340/1

diff --git a/hieradata/hosts/mw1152.yaml b/hieradata/hosts/mw1152.yaml
index 341f891..8075bc5 100644
--- a/hieradata/hosts/mw1152.yaml
+++ b/hieradata/hosts/mw1152.yaml
@@ -15,15 +15,15 @@
 mediawiki::maintenance::parsercachepurging::ensure: absent
 mediawiki::maintenance::cleanup_upload_stash::ensure: absent
 mediawiki::maintenance::tor_exit_node::ensure: absent
-mediawiki::maintenance::update_flaggedrev_stats::ensure: present
-mediawiki::maintenance::refreshlinks::ensure: present
-mediawiki::maintenance::update_special_pages::ensure: present
-mediawiki::maintenance::update_article_count::ensure: present
-mediawiki::maintenance::purge_abusefilter::ensure: present
-mediawiki::maintenance::purge_checkuser::ensure: present
-mediawiki::maintenance::purge_securepoll::ensure: present
-mediawiki::maintenance::jobqueue_stats::ensure: present
-mediawiki::maintenance::updatequerypages::ensure: present
+mediawiki::maintenance::update_flaggedrev_stats::ensure: absent
+mediawiki::maintenance::refreshlinks::ensure: absent
+mediawiki::maintenance::update_special_pages::ensure: absent
+mediawiki::maintenance::update_article_count::ensure: absent
+mediawiki::maintenance::purge_abusefilter::ensure: absent
+mediawiki::maintenance::purge_checkuser::ensure: absent
+mediawiki::maintenance::purge_securepoll::ensure: absent
+mediawiki::maintenance::jobqueue_stats::ensure: absent
+mediawiki::maintenance::updatequerypages::ensure: absent
 tendril::maintenance::ensure: absent
 hhvm::extra::cli:
   hhvm:
diff --git a/hieradata/hosts/terbium.yaml b/hieradata/hosts/terbium.yaml
index 0454111..7793a21 100644
--- a/hieradata/hosts/terbium.yaml
+++ b/hieradata/hosts/terbium.yaml
@@ -15,15 +15,15 @@
 mediawiki::maintenance::parsercachepurging::ensure: present
 mediawiki::maintenance::cleanup_upload_stash::ensure: present
 mediawiki::maintenance::tor_exit_node::ensure: present
-mediawiki::maintenance::update_flaggedrev_stats::ensure: absent
-mediawiki::maintenance::refreshlinks::ensure: absent
-mediawiki::maintenance::update_special_pages::ensure: absent
-mediawiki::maintenance::update_article_count::ensure: absent
-mediawiki::maintenance::purge_abusefilter::ensure: absent
-mediawiki::maintenance::purge_checkuser::ensure: absent
-mediawiki::maintenance::purge_securepoll::ensure: absent
-mediawiki::maintenance::jobqueue_stats::ensure: absent
-mediawiki::maintenance::updatequerypages::ensure: absent
+mediawiki::maintenance::update_flaggedrev_stats::ensure: present
+mediawiki::maintenance::refreshlinks::ensure: present
+mediawiki::maintenance::update_special_pages::ensure: present
+mediawiki::maintenance::update_article_count::ensure: present
+mediawiki::maintenance::purge_abusefilter::ensure: present
+mediawiki::maintenance::purge_checkuser::ensure: present
+mediawiki::maintenance::purge_securepoll::ensure: present
+mediawiki::maintenance::jobqueue_stats::ensure: present
+mediawiki::maintenance::updatequerypages::ensure: present
 tendril::maintenance::ensure: present
 hhvm::extra::cli:
   hhvm:

-- 
To view, visit https://gerrit.wikimedia.org/r/253340
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Icc687d756a79d6509ddee0c57049cac08c6bafbe
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Run Ruby jobs using Rake - change (integration/config)

2015-11-16 Thread Zfilipin (Code Review)

Zfilipin has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/253343

Change subject: Run Ruby jobs using Rake
..

Run Ruby jobs using Rake

Bug: T114860
Change-Id: I41c4755d05ef07f93b7acf319bf0ecb452f3722c
Depends-On: I83d16759597a90ee9a082eb4029fedca7af10a31
---
M zuul/layout.yaml
1 file changed, 3 insertions(+), 5 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/43/253343/1

diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index b9005e6..5454105 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -2003,7 +2003,7 @@
   - mediawiki-core-jslint
   - mediawiki-core-phplint
   - php-composer-package-validate
-  - ruby2.0lint
+  - rake-jessie
 test:
   - mediawiki-core-phpcs
   - mediawiki-core-jsduck
@@ -2012,9 +2012,8 @@
   - mediawiki-phpunit-hhvm
   #- mediawiki-phpunit-zend (disabled, slow, Icac172b16)
   - mediawiki-core-qunit
-  - mediawiki-core-bundle-rubocop
   - php-composer-package-validate
-  - ruby2.0lint
+  - rake-jessie
 zend:
   # Comment "check zend" to manually run this
   - mediawiki-phpunit-zend
@@ -2028,9 +2027,8 @@
   - mediawiki-phpunit-hhvm-composer
   - mediawiki-phpunit-zend
   - mediawiki-core-qunit
-  - mediawiki-core-bundle-rubocop
   - php-composer-package-validate
-  - ruby2.0lint
+  - rake-jessie
 postmerge:
   - mediawiki-core-jsduck-publish
   - mediawiki-core-doxygen-publish

-- 
To view, visit https://gerrit.wikimedia.org/r/253343
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I41c4755d05ef07f93b7acf319bf0ecb452f3722c
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Zfilipin 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Move scap-specific items out of mediawiki class - change (operations/puppet)

2015-11-16 Thread Giuseppe Lavagetto (Code Review)

Giuseppe Lavagetto has submitted this change and it was merged.

Change subject: Move scap-specific items out of mediawiki class
..


Move scap-specific items out of mediawiki class

Remove scap-python dependencies from the mediawiki module. Create a main
scap class containing all python dependencies and scap package
installation. Add a scap::target class that includes a ferm rule that
allows for scap deployments.

Bug: T116606
Change-Id: I3ffe759730cc934a9282be91383d9dbd19a6b275
---
M manifests/role/db.pp
M manifests/role/mediawiki.pp
M modules/mediawiki/manifests/scap.pp
M modules/role/manifests/deployment/mediawiki.pp
M modules/role/manifests/deployment/server.pp
A modules/role/manifests/scap/target.pp
A modules/scap/manifests/init.pp
7 files changed, 39 insertions(+), 26 deletions(-)

Approvals:
  Giuseppe Lavagetto: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/manifests/role/db.pp b/manifests/role/db.pp
index db93664..8cc717c 100644
--- a/manifests/role/db.pp
+++ b/manifests/role/db.pp
@@ -98,9 +98,7 @@
 }
 
 class role::labsdb::manager {
-package { ['python-mysqldb', 'python-yaml']:
-ensure => present,
-}
+require_package(['python-mysqldb', 'python-yaml'])
 
 file { '/usr/local/sbin/skrillex.py':
 owner  => 'root',
diff --git a/manifests/role/mediawiki.pp b/manifests/role/mediawiki.pp
index 36c2aae..150a08a 100644
--- a/manifests/role/mediawiki.pp
+++ b/manifests/role/mediawiki.pp
@@ -38,6 +38,8 @@
 desc   => 'Allow incoming SSH for pybal health checks',
 }
 
+include role::scap::target
+
 monitoring::service { 'mediawiki-installation DSH group':
 description   => 'mediawiki-installation DSH group',
 check_command => 'check_dsh_groups!mediawiki-installation',
@@ -80,12 +82,6 @@
 proto   => 'tcp',
 notrack => true,
 port=> 'http',
-}
-
-# allow ssh from deployment hosts
-ferm::rule { 'deployment-ssh':
-ensure => present,
-rule   => 'proto tcp dport ssh saddr $DEPLOYMENT_HOSTS ACCEPT;',
 }
 
 # If a service check happens to run while we are performing a
diff --git a/modules/mediawiki/manifests/scap.pp 
b/modules/mediawiki/manifests/scap.pp
index 7a90e8c..6a61609 100644
--- a/modules/mediawiki/manifests/scap.pp
+++ b/modules/mediawiki/manifests/scap.pp
@@ -7,24 +7,13 @@
 # contains a copy of MediaWiki.
 #
 class mediawiki::scap {
+include ::scap
 include ::mediawiki::users
 
 $mediawiki_deployment_dir = '/srv/mediawiki'
 $mediawiki_staging_dir= '/srv/mediawiki-staging'
 $scap_bin_dir = '/srv/deployment/scap/scap/bin'
 $mediawiki_web_user   = $::mediawiki::users::web
-
-require_package('python-psutil')
-require_package('python-netifaces')
-
-# 'scap' is the command-line tool we use to push MediaWiki changes
-# to the webapp servers. The name stands for 'sync-common-all-php'.
-
-package { 'scap':
-ensure   => latest,
-provider => 'trebuchet',
-}
-
 
 # /srv/mediawiki is the root path of the MediaWiki deployment tree.
 
diff --git a/modules/role/manifests/deployment/mediawiki.pp 
b/modules/role/manifests/deployment/mediawiki.pp
index 3cf2195..977edd5 100644
--- a/modules/role/manifests/deployment/mediawiki.pp
+++ b/modules/role/manifests/deployment/mediawiki.pp
@@ -10,6 +10,7 @@
 include mediawiki
 include ::mediawiki::nutcracker
 include scap::master
+include role::scap::target
 
 if $::realm != 'labs' {
 include deployment::wikitech
diff --git a/modules/role/manifests/deployment/server.pp 
b/modules/role/manifests/deployment/server.pp
index 2b4b4af..4b87837 100644
--- a/modules/role/manifests/deployment/server.pp
+++ b/modules/role/manifests/deployment/server.pp
@@ -58,11 +58,6 @@
 srange => "(${deployable_networks_ferm})",
 }
 
-# T115075
-ferm::rule { 'deployment-ssh':
-ensure => present,
-rule   => 'proto tcp dport ssh saddr $DEPLOYMENT_HOSTS ACCEPT;',
-}
 ### End firewall rules
 
 #T83854
diff --git a/modules/role/manifests/scap/target.pp 
b/modules/role/manifests/scap/target.pp
new file mode 100644
index 000..cf1cdd9
--- /dev/null
+++ b/modules/role/manifests/scap/target.pp
@@ -0,0 +1,11 @@
+# = class: role::scap::master
+#
+# Sets up a scap target, i.e. any host to which scap will deploy
+
+class role::scap::target {
+# allow ssh from deployment hosts
+ferm::rule { 'deployment-ssh':
+ensure => present,
+rule   => 'proto tcp dport ssh saddr $DEPLOYMENT_HOSTS ACCEPT;',
+}
+}
diff --git a/modules/scap/manifests/init.pp b/modules/scap/manifests/init.pp
new file mode 100644
index 000..c119b37
--- /dev/null
+++ b/modules/scap/manifests/init.pp
@@ -0,0 +1,23 @@
+# == Class scap
+#
+# Common role for scap masters and targets
+
+class scap {
+# Using trebuchet provider

[MediaWiki-commits] [Gerrit] Retain daily.* graphite metrics for longer (25y) - change (operations/puppet)

2015-11-16 Thread Filippo Giunchedi (Code Review)

Filippo Giunchedi has submitted this change and it was merged.

Change subject: Retain daily.* graphite metrics for longer (25y)
..


Retain daily.* graphite metrics for longer (25y)

Each metric here will use less data points than the
first 7 days worth of points of the default retention
period.

These metrics do not yet exist but they will be at:
 - daily.wikidata.social.facebook.likes
 - daily.wikidata.entityusage.enwiki.S
for example.

Note: This should be merged and deployed before
any data is added to the metrics as if data is added before
the metrics will use the default schema and this can not
be changed easily afaik.

 - Less than 100 static metrics (social counts, data counts).
 - entityusage = number of wikibase clients(624) * 5 = 3120
 - wbgetclaims usage = max 2000 (one per property) although
 data will not exist for every property every day.
 Guessing less than 100 points per day based on current use

(A drop in the ocean consider what is there)

Bug: T117402
Change-Id: I7c8a7e4989a8034183ef5cbe3e426ac8a2a8a7e3
---
M manifests/role/graphite.pp
1 file changed, 6 insertions(+), 0 deletions(-)

Approvals:
  Filippo Giunchedi: Verified; Looks good to me, approved
  JanZerebecki: Looks good to me, but someone else must approve
  jenkins-bot: Verified



diff --git a/manifests/role/graphite.pp b/manifests/role/graphite.pp
index 368535d..2c4af45 100644
--- a/manifests/role/graphite.pp
+++ b/manifests/role/graphite.pp
@@ -35,7 +35,13 @@
 $carbon_storage_dir = $storage_dir
 
 class { '::graphite':
+# First match wins with storage schemas
 storage_schemas => {
+# Retain daily metrics for 25 years
+'daily' => {
+pattern=> '^daily\..*',
+retentions => '1d:25y',
+},
 # Retain aggregated data at a one-minute resolution for one week; 
at
 # five-minute resolution for two weeks; at 15-minute resolution for
 # one month; and at one-hour resolution for one year.

-- 
To view, visit https://gerrit.wikimedia.org/r/247866
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I7c8a7e4989a8034183ef5cbe3e426ac8a2a8a7e3
Gerrit-PatchSet: 8
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Addshore 
Gerrit-Reviewer: Addshore 
Gerrit-Reviewer: Aude 
Gerrit-Reviewer: Christopher Johnson (WMDE) 
Gerrit-Reviewer: Filippo Giunchedi 
Gerrit-Reviewer: Hoo man 
Gerrit-Reviewer: JanZerebecki 
Gerrit-Reviewer: Lydia Pintscher 
Gerrit-Reviewer: Milimetric 
Gerrit-Reviewer: Ori.livneh 
Gerrit-Reviewer: Ottomata 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Add missing test cases to WikibaseRepoTest - change (mediawiki...Wikibase)

2015-11-16 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged.

Change subject: Add missing test cases to WikibaseRepoTest
..


Add missing test cases to WikibaseRepoTest

This adds two sets of test cases for the two methods that do support
a $reset = 'reset' parameter.

Change-Id: I81bdfbdce988ffe0dba9d0f352086f1c255f3b64
---
M repo/tests/phpunit/includes/WikibaseRepoTest.php
1 file changed, 30 insertions(+), 1 deletion(-)

Approvals:
  Hoo man: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/repo/tests/phpunit/includes/WikibaseRepoTest.php 
b/repo/tests/phpunit/includes/WikibaseRepoTest.php
index b8b83cd..75ce7f3 100644
--- a/repo/tests/phpunit/includes/WikibaseRepoTest.php
+++ b/repo/tests/phpunit/includes/WikibaseRepoTest.php
@@ -3,6 +3,7 @@
 namespace Wikibase\Tests\Repo;
 
 use Language;
+use MediaWikiTestCase;
 use Wikibase\Lib\DataTypeDefinitions;
 use Wikibase\Repo\WikibaseRepo;
 use Wikibase\SettingsArray;
@@ -19,7 +20,35 @@
  * @author Jeroen De Dauw < jeroended...@gmail.com >
  * @author Daniel Kinzler
  */
-class WikibaseRepoTest extends \MediaWikiTestCase {
+class WikibaseRepoTest extends MediaWikiTestCase {
+
+   public function testGetDefaultValidatorBuilders_noReset() {
+   $first = 
$this->getWikibaseRepo()->getDefaultValidatorBuilders();
+   $this->assertInstanceOf( 'Wikibase\Repo\ValidatorBuilders', 
$first );
+
+   $second = 
$this->getWikibaseRepo()->getDefaultValidatorBuilders();
+   $this->assertSame( $first, $second );
+   }
+
+   public function testGetDefaultValidatorBuilders_withReset() {
+   $first = 
$this->getWikibaseRepo()->getDefaultValidatorBuilders();
+   $second = 
$this->getWikibaseRepo()->getDefaultValidatorBuilders( 'reset' );
+   $this->assertNotSame( $first, $second );
+   }
+
+   public function testGetDefaultFormatterBuilders_noReset() {
+   $first = 
$this->getWikibaseRepo()->getDefaultFormatterBuilders();
+   $this->assertInstanceOf( 
'Wikibase\Lib\WikibaseValueFormatterBuilders', $first );
+
+   $second = 
$this->getWikibaseRepo()->getDefaultFormatterBuilders();
+   $this->assertSame( $first, $second );
+   }
+
+   public function testGetDefaultFormatterBuilders_withReset() {
+   $first = 
$this->getWikibaseRepo()->getDefaultFormatterBuilders();
+   $second = 
$this->getWikibaseRepo()->getDefaultFormatterBuilders( 'reset' );
+   $this->assertNotSame( $first, $second );
+   }
 
public function testGetDataTypeFactoryReturnType() {
$returnValue = $this->getWikibaseRepo()->getDataTypeFactory();

-- 
To view, visit https://gerrit.wikimedia.org/r/253314
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I81bdfbdce988ffe0dba9d0f352086f1c255f3b64
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Thiemo Mättig (WMDE) 
Gerrit-Reviewer: Daniel Kinzler 
Gerrit-Reviewer: Hoo man 
Gerrit-Reviewer: Jeroen De Dauw 
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 newsletter-create right - change (mediawiki...Newsletter)

2015-11-16 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged.

Change subject: Add newsletter-create right
..


Add newsletter-create right

This right is given to autoconfirmed users by default.

Bug: T110327
Change-Id: If55018a1810c232056ffe549899f4c4e0d5c3c25
---
M extension.json
M i18n/en.json
M i18n/qqq.json
M includes/specials/SpecialNewsletterCreate.php
4 files changed, 10 insertions(+), 2 deletions(-)

Approvals:
  Addshore: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/extension.json b/extension.json
index b52eaf8..8883075 100644
--- a/extension.json
+++ b/extension.json
@@ -10,9 +10,13 @@
"license-name": "GPL-2.0",
"type": "other",
"AvailableRights": [
+   "newsletter-create",
"newsletter-manage"
],
"GroupPermissions": {
+   "autoconfirmed": {
+   "newsletter-create": true
+   },
"sysop": {
"newsletter-manage": true
}
diff --git a/i18n/en.json b/i18n/en.json
index 94be3de..4e1161d 100755
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -96,8 +96,10 @@
"newsletter-manage-header-action": "Action",
"newsletter-publisher-radiobutton-label": "Publisher",
"newsletter-dropdown-default-message": "Please select one",
+   "right-newsletter-create": "Create newsletters",
+   "action-newsletter-create": "create newsletters",
"right-newsletter-manage": "Add or remove publishers from newsletters",
-   "action-newsletter-manage": "manage newsletters.",
+   "action-newsletter-manage": "manage newsletters",
"newsletters-summary": "This page allows you to browse through a list 
of all newsletters on this wiki and allows users to subscribe to or unsubscribe 
from them. You can also choose your newsletter subscription options through the 
 [[Special:Preferences#mw-prefsection-echo|preferences]] interface.",
"apihelp-newslettersubscribe-description": "Subscribe to or unsubscribe 
from a newsletter.",
"apihelp-newslettersubscribe-param-id": "ID of the newsletter for which 
the subscription should be changed.",
diff --git a/i18n/qqq.json b/i18n/qqq.json
index 863e0f4..f4dae71 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -100,6 +100,8 @@
"newsletter-manage-header-action": "{{Identical|Action}}",
"newsletter-publisher-radiobutton-label": "Label of radio button in 
'Permissions' column in [[Special:ManageNewsletter]] which is checked if the 
user is a publisher of the newsletter\n{{Identical|Publisher}}",
"newsletter-dropdown-default-message": "Default option of drop down 
menus to select newsletters in [[Special:ManageNewsletter]].\n\nSee also:\n* 
{{msg-mw|Newsletter-name}} (label of the field)",
+   "right-newsletter-create": "{{doc-right|newsletter-create}}",
+   "action-newsletter-create": "{{doc-action|newsletter-create}}",
"right-newsletter-manage": "{{doc-right|newsletter-manage}}",
"action-newsletter-manage": "{{doc-action|newsletter-manage}}",
"newsletters-summary": "Introductory message shown on top of 
[[Special:Newsletters]]. Do not translate the anchor of Special:Preferences 
link. (\"#mw-prefsection-echo\" part).",
diff --git a/includes/specials/SpecialNewsletterCreate.php 
b/includes/specials/SpecialNewsletterCreate.php
index 5e91b71..ddbce76 100644
--- a/includes/specials/SpecialNewsletterCreate.php
+++ b/includes/specials/SpecialNewsletterCreate.php
@@ -10,7 +10,7 @@
 
 
public function __construct() {
-   parent::__construct( 'NewsletterCreate' );
+   parent::__construct( 'NewsletterCreate', 'newsletter-create' );
}
 
public function execute( $par ) {

-- 
To view, visit https://gerrit.wikimedia.org/r/252913
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: If55018a1810c232056ffe549899f4c4e0d5c3c25
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Newsletter
Gerrit-Branch: master
Gerrit-Owner: Glaisher 
Gerrit-Reviewer: Addshore 
Gerrit-Reviewer: Siebrand 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Improve Special:CreateNewsletter - change (mediawiki...Newsletter)

2015-11-16 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged.

Change subject: Improve Special:CreateNewsletter
..


Improve Special:CreateNewsletter

* Add introductory message
* Remove legend as it's not necessary here because all the form
   elements are related to each other.
* Change title to "Create newsletter" as it's more accurate and consistent
   with other special page names.

Change-Id: I2c6669a7a6ab5d86648616ff7d543a24347fd60b
---
M i18n/en.json
M i18n/qqq.json
M includes/specials/SpecialNewsletterCreate.php
3 files changed, 3 insertions(+), 5 deletions(-)

Approvals:
  Addshore: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/i18n/en.json b/i18n/en.json
index ff83756..e18ec3b 100755
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -7,7 +7,8 @@
]
},
"newsletter-extension-desc": "Enables users to publish and subscribe to 
newsletters",
-   "newslettercreate": "Create newsletters",
+   "newslettercreate": "Create newsletter",
+   "newslettercreate-text": "This page allows you to create a new 
newsletter. You will be added as a publisher and subscribed to the newsletter 
on its creation.",
"newslettermanage": "Manage newsletters",
"newsletter-name": "Name of newsletter",
"newsletter-desc": "Description",
@@ -18,7 +19,6 @@
"newsletter-required-fields-error": "Required fields are empty",
"newsletter-exist-error": "A newsletter with the same name already 
exists. Try again with another name",
"newsletter-addpublisherform-addpublisher-section": "Add publishers",
-   "newsletter-create-section": "Create newsletter",
"newsletter-create-submit": "Create newsletter",
"newsletter-create-confirmation": "A new newsletter has been 
successfully created. You can manage newsletters through 
[[Special:ManageNewsletter]].",
"newsletter-create-mainpage-error": "Invalid newsletter main page 
entered. Please try again.",
diff --git a/i18n/qqq.json b/i18n/qqq.json
index 518915a..f2528fd 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -11,7 +11,7 @@
]
},
"newsletter-extension-desc": "Description of the extension",
-   "newslettercreate": "Name of special page which creates newsletters as 
seen in URLs and links",
+   "newslettercreate": "Name of [[Special:CreateNewsletter]]. This is used 
as the header on this page and shown in links to the page.",
"newslettermanage": "Name of special page which announces issues as 
seen in URLs and links",
"newsletter-name": "Label of the field which takes the name of 
newsletter as input in [[Special:ManageNewsletter]] and 
[[Special:CreateNewsletter]]",
"newsletter-desc": "Label of the field which takes a short description 
of newsletter as input in 
[[Special:CreateNewsletter]]\n{{Identical|Description}}",
@@ -22,7 +22,6 @@
"newsletter-required-fields-error": "Error message to be displayed when 
required fields are empty in [[Special:ManageNewsletter]]",
"newsletter-exist-error": "Error message to be displayed in 
[[Special:CreateNewsletter]] when trying to create a newsletter with same name 
as an existing newsletter",
"newsletter-addpublisherform-addpublisher-section": "Header of section 
in [[Special:ManageNewsletter]] which adds publishers",
-   "newsletter-create-section": "Section header of 
[[Special:CreateNewsletter]]",
"newsletter-create-submit": "Label of submit button on 
[[Special:CreateNewsletter]]",
"newsletter-create-confirmation": "Confirmation message displayed after 
creation of a newsletter",
"newsletter-create-mainpage-error": "Error message shown on 
[[Special:CreateNewsletter]] if the page entered on main page field does not 
exist.",
diff --git a/includes/specials/SpecialNewsletterCreate.php 
b/includes/specials/SpecialNewsletterCreate.php
index ddbce76..8994823 100644
--- a/includes/specials/SpecialNewsletterCreate.php
+++ b/includes/specials/SpecialNewsletterCreate.php
@@ -24,7 +24,6 @@
 */
protected function alterForm( HTMLForm $form ) {
$form->setSubmitTextMsg( 'newsletter-create-submit' );
-   $form->setWrapperLegendMsg( 'newsletter-create-section' );
}
 
/**

-- 
To view, visit https://gerrit.wikimedia.org/r/252710
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I2c6669a7a6ab5d86648616ff7d543a24347fd60b
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Newsletter
Gerrit-Branch: master
Gerrit-Owner: Glaisher 
Gerrit-Reviewer: 01tonythomas <01tonytho...@gmail.com>
Gerrit-Reviewer: Addshore 
Gerrit-Reviewer: Siebrand 
Gerrit-Reviewer: Tinaj1234 
Gerrit-Reviewer: jenkins-bot <>

___

[MediaWiki-commits] [Gerrit] Revert "Add resp.http.X-Client-IP -> webrequest:client_ip" - change (operations/puppet)

2015-11-16 Thread BBlack (Code Review)

BBlack has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/253331

Change subject: Revert "Add resp.http.X-Client-IP -> webrequest:client_ip"
..

Revert "Add resp.http.X-Client-IP -> webrequest:client_ip"

This reverts commit 9943435cfe02c94fcc7f314f274054652e5a8ed0.

Change-Id: Ic10511c829d2aea85b0898aab5200fdc5e70de52
---
M modules/role/manifests/cache/kafka/webrequest.pp
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/31/253331/1

diff --git a/modules/role/manifests/cache/kafka/webrequest.pp 
b/modules/role/manifests/cache/kafka/webrequest.pp
index 7ace8bc..39bc41f 100644
--- a/modules/role/manifests/cache/kafka/webrequest.pp
+++ b/modules/role/manifests/cache/kafka/webrequest.pp
@@ -23,7 +23,7 @@
 # Note: fake_tag tricks varnishkafka into allowing hardcoded string 
into a JSON field.
 # Hardcoding the $fqdn into hostname rather than using %l to account 
for
 # possible slip ups where varnish only writes the short hostname for 
%l.
-format   => "%{fake_tag0@hostname?${::fqdn}}x 
%{@sequence!num?0}n %{%FT%T@dt}t 
%{Varnish:time_firstbyte@time_firstbyte!num?0.0}x %{@ip}h 
%{Varnish:handling@cache_status}x %{@http_status}s %{@response_size!num?0}b 
%{@http_method}m %{Host@uri_host}i %{@uri_path}U %{@uri_query}q 
%{Content-Type@content_type}o %{Referer@referer}i 
%{X-Forwarded-For@x_forwarded_for}i %{User-Agent@user_agent}i 
%{Accept-Language@accept_language}i %{X-Analytics@x_analytics}o %{Range@range}i 
%{X-Cache@x_cache}o %{X-Client-IP@client_ip}o",
+format   => "%{fake_tag0@hostname?${::fqdn}}x 
%{@sequence!num?0}n %{%FT%T@dt}t 
%{Varnish:time_firstbyte@time_firstbyte!num?0.0}x %{@ip}h 
%{Varnish:handling@cache_status}x %{@http_status}s %{@response_size!num?0}b 
%{@http_method}m %{Host@uri_host}i %{@uri_path}U %{@uri_query}q 
%{Content-Type@content_type}o %{Referer@referer}i 
%{X-Forwarded-For@x_forwarded_for}i %{User-Agent@user_agent}i 
%{Accept-Language@accept_language}i %{X-Analytics@x_analytics}o %{Range@range}i 
%{X-Cache@x_cache}o",
 message_send_max_retries => 3,
 # At ~6000 msgs per second, 50 messages is over 1 minute
 # of buffering, which should be more than enough.

-- 
To view, visit https://gerrit.wikimedia.org/r/253331
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic10511c829d2aea85b0898aab5200fdc5e70de52
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BBlack 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Revert "Add resp.http.X-Client-IP -> webrequest:client_ip" - change (operations/puppet)

2015-11-16 Thread BBlack (Code Review)

BBlack has submitted this change and it was merged.

Change subject: Revert "Add resp.http.X-Client-IP -> webrequest:client_ip"
..


Revert "Add resp.http.X-Client-IP -> webrequest:client_ip"

This reverts commit 9943435cfe02c94fcc7f314f274054652e5a8ed0.

Change-Id: Ic10511c829d2aea85b0898aab5200fdc5e70de52
---
M modules/role/manifests/cache/kafka/webrequest.pp
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  BBlack: Verified; Looks good to me, approved



diff --git a/modules/role/manifests/cache/kafka/webrequest.pp 
b/modules/role/manifests/cache/kafka/webrequest.pp
index 7ace8bc..39bc41f 100644
--- a/modules/role/manifests/cache/kafka/webrequest.pp
+++ b/modules/role/manifests/cache/kafka/webrequest.pp
@@ -23,7 +23,7 @@
 # Note: fake_tag tricks varnishkafka into allowing hardcoded string 
into a JSON field.
 # Hardcoding the $fqdn into hostname rather than using %l to account 
for
 # possible slip ups where varnish only writes the short hostname for 
%l.
-format   => "%{fake_tag0@hostname?${::fqdn}}x 
%{@sequence!num?0}n %{%FT%T@dt}t 
%{Varnish:time_firstbyte@time_firstbyte!num?0.0}x %{@ip}h 
%{Varnish:handling@cache_status}x %{@http_status}s %{@response_size!num?0}b 
%{@http_method}m %{Host@uri_host}i %{@uri_path}U %{@uri_query}q 
%{Content-Type@content_type}o %{Referer@referer}i 
%{X-Forwarded-For@x_forwarded_for}i %{User-Agent@user_agent}i 
%{Accept-Language@accept_language}i %{X-Analytics@x_analytics}o %{Range@range}i 
%{X-Cache@x_cache}o %{X-Client-IP@client_ip}o",
+format   => "%{fake_tag0@hostname?${::fqdn}}x 
%{@sequence!num?0}n %{%FT%T@dt}t 
%{Varnish:time_firstbyte@time_firstbyte!num?0.0}x %{@ip}h 
%{Varnish:handling@cache_status}x %{@http_status}s %{@response_size!num?0}b 
%{@http_method}m %{Host@uri_host}i %{@uri_path}U %{@uri_query}q 
%{Content-Type@content_type}o %{Referer@referer}i 
%{X-Forwarded-For@x_forwarded_for}i %{User-Agent@user_agent}i 
%{Accept-Language@accept_language}i %{X-Analytics@x_analytics}o %{Range@range}i 
%{X-Cache@x_cache}o",
 message_send_max_retries => 3,
 # At ~6000 msgs per second, 50 messages is over 1 minute
 # of buffering, which should be more than enough.

-- 
To view, visit https://gerrit.wikimedia.org/r/253331
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic10511c829d2aea85b0898aab5200fdc5e70de52
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BBlack 
Gerrit-Reviewer: BBlack 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Move SpecialAboutTopic to includes - change (mediawiki...ArticlePlaceholder)

2015-11-16 Thread WMDE

Thiemo Mättig (WMDE) has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/253334

Change subject: Move SpecialAboutTopic to includes
..

Move SpecialAboutTopic to includes

I suggest to avoid having a "Specials" folder for now. There are only
one or two files in every folder.

PSR-4 compatibility (where namespaces must perfectly match directory
names) can easily be restored later, if needed.

Change-Id: Ie465a0b69e07c108cb1ff2a69ec8507ed72653eb
---
R includes/SpecialAboutTopic.php
R tests/phpunit/includes/SpecialAboutTopicTest.php
2 files changed, 1 insertion(+), 1 deletion(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ArticlePlaceholder 
refs/changes/34/253334/1

diff --git a/Specials/SpecialAboutTopic.php b/includes/SpecialAboutTopic.php
similarity index 100%
rename from Specials/SpecialAboutTopic.php
rename to includes/SpecialAboutTopic.php
diff --git a/tests/phpunit/Specials/SpecialAboutTopicTest.php 
b/tests/phpunit/includes/SpecialAboutTopicTest.php
similarity index 96%
rename from tests/phpunit/Specials/SpecialAboutTopicTest.php
rename to tests/phpunit/includes/SpecialAboutTopicTest.php
index e52d7b6..feb220b 100644
--- a/tests/phpunit/Specials/SpecialAboutTopicTest.php
+++ b/tests/phpunit/includes/SpecialAboutTopicTest.php
@@ -1,6 +1,6 @@
 https://gerrit.wikimedia.org/r/253334
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie465a0b69e07c108cb1ff2a69ec8507ed72653eb
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ArticlePlaceholder
Gerrit-Branch: master
Gerrit-Owner: Thiemo Mättig (WMDE) 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] EventLogging processor as a service via HTTP - change (eventlogging)

2015-11-16 Thread Ottomata (Code Review)

Ottomata has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/253339

Change subject: EventLogging processor as a service via HTTP
..

EventLogging processor as a service via HTTP

Bug: T114443

Usage:

  cd EventLogging/server
  export PYTHONPATH=.
  python bin/eventlogging-service 
kafka:///kafka-event-bus.services.eqiad.wmflabs:9092?async=False

Then
  # POST an event with meta data subobject
  curl -H 'Content-Type: application/json' -X POST 
http://localhost:8085/v1/events -d @EditMetaTestRecord.json

  # OR POST an event with EventCapsule (old style) meta data
  curl -H 'Content-Type: application/json' -X POST 
http://localhost:8085/v1/events -d @EditRecord.json

  # GET topic config
  curl -X GET http://localhost:8085/v1/topics

  # GET schema for a topic
  curl -X GET http://localhost:8085/v1/topics/mediawiki_EditMetaTest

  # GET latest schema by name
  curl -X GET http://localhost:8085/v1/schemas/EditMetaTest

  # GET a remote schema by scid
  curl -X GET http://localhost:8085/v1/schemas/Search/14361785

Changes:
- Tornado async HTTP endpoint for producing events and getting schemas by name
- Can load schemas from local files
- Schema cache reloading supported via SIGHUP
- JSON Schema validators for schemas now cached
- Draft 4 JSON Schema now supported via $schema
- Supports unversioned schemas, defaulting to latest revision
- Supports validation by latest revision of schema by special revision of 0
- schema_cache now multi-level dict to allow easier lookup by just schema name
- New meta schema subobject for events not using EventCapsule
- topic and key now formatted with .format rather than interpolated with %s
- handler and stream dependencies have been moved into methods, which allows
  use of eventlogging code without having all dependencies installed

TODO:
- Resolve JSON $refs?  Would be nice to make meta schema DRYer
- fix etcd ip hasher tests (what happened here?)
- remove local config/schemas and *Record.json files before merging

Change-Id: I1a0d00d76afdde3c1b6d0ef4c15f6c918304321b
---
A EditMetaTestRecord.json
A EditRecord.json
M bin/eventlogging-devserver
R bin/eventlogging-load-tester
M bin/eventlogging-reporter
A bin/eventlogging-service
A config/schemas/jsonschema/Echo/Echo.7731316.json
A config/schemas/jsonschema/EditMetaTest/EditMetaTest.yaml
A config/topics.yaml
M eventlogging/__init__.py
M eventlogging/compat.py
M eventlogging/factory.py
M eventlogging/handlers.py
M eventlogging/jrm.py
M eventlogging/parse.py
M eventlogging/schema.py
A eventlogging/service.py
M eventlogging/streams.py
A eventlogging/topic.py
M eventlogging/utils.py
M requirements.txt
M setup.py
M tests/__init__.py
M tests/fixtures.py
M tests/test_crypto.py
M tests/test_schema.py
A tests/test_service.py
A tests/test_topic.py
M tests/test_utils.py
M tox.ini
30 files changed, 1,991 insertions(+), 348 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/eventlogging 
refs/changes/39/253339/1

diff --git a/EditMetaTestRecord.json b/EditMetaTestRecord.json
new file mode 100644
index 000..711847d
--- /dev/null
+++ b/EditMetaTestRecord.json
@@ -0,0 +1 @@
+{"user_id":"Ottomata","title":"nonyayeah","user_text":"otto","page_id":123,"namespace":0,"summary":"ididit","base_revision":455,"meta":{"topic":"mediawiki_EditMetaTest","domain":"woohoo.org","request_id":"12345678-1234-5678-1234-567812345678","id":"12345678-1234-5678-1234-567812345678","uri":"http://woohoo.org/nonyayeah;,
 "dt":"2015-10-30T00:00:00" },"save_time":"2015-10-30T00:00:00","revision":456}
\ No newline at end of file
diff --git a/EditRecord.json b/EditRecord.json
new file mode 100644
index 000..5191b09
--- /dev/null
+++ b/EditRecord.json
@@ -0,0 +1 @@
+{"topic":"mediawiki_Edit","clientIp":"5e8f95331474f90693fa563e2aa472848a860af7","event":{"action":"ready","action.ready.timing":0,"editingSessionId":"0c008a8ee2f17a1ad5833156b38209f6","editor":"wikitext","integration":"page","mediawiki.version":"1.27.0-wmf.2","page.id":0,"page.ns":0,"page.revid":0,"page.title":"\u0414\u0438\u043e\u043c\u0435\u0434_(\u0433\u0440\u0430\u043c\u043c\u0430\u0442\u0438\u043a)","platform":"desktop","user.class":"IP","user.editCount":0,"user.id":0,"version":1},"recvFrom":"cp3040.esams.wmnet","revision":13457736,"schema":"Edit","seqId":20380146,"timestamp":1445442531,"userAgent":"\"Mozilla/5.0(WindowsNT6.1;rv:41.0)Gecko/20100101Firefox/41.0\"","uuid":"98f80637d7385fc88468b5203417b9f1","webHost":"ru.wikipedia.org","wiki":"ruwiki"}
\ No newline at end of file
diff --git a/bin/eventlogging-devserver b/bin/eventlogging-devserver
index d36b107..48d57e5 100755
--- a/bin/eventlogging-devserver
+++ b/bin/eventlogging-devserver
@@ -116,7 +116,7 @@
 return None, [err]
 
 try:
-scid = event['schema'], event['revision']
+scid = eventlogging.scid_from_event(event)
 except KeyError as err:
 return event, [err]
 
diff --git a/tests/test_load.py

[MediaWiki-commits] [Gerrit] upload purging: do not listen on text/mobile addr - change (operations/puppet)

2015-11-16 Thread BBlack (Code Review)

BBlack has submitted this change and it was merged.

Change subject: upload purging: do not listen on text/mobile addr
..


upload purging: do not listen on text/mobile addr

Needs to wait on deploy of mediawiki config change: I8799f7b30

Bug: T116752
Change-Id: If4f0dcf0e4be4f39f9b95247eddc3454b000f5da
---
M modules/role/manifests/cache/upload.pp
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  BBlack: Verified; Looks good to me, approved



diff --git a/modules/role/manifests/cache/upload.pp 
b/modules/role/manifests/cache/upload.pp
index ef26c28..bd95520 100644
--- a/modules/role/manifests/cache/upload.pp
+++ b/modules/role/manifests/cache/upload.pp
@@ -4,7 +4,7 @@
 }
 
 class { 'varnish::htcppurger':
-mc_addrs => [ '239.128.0.112', '239.128.0.113' ],
+mc_addrs => [ '239.128.0.113' ],
 }
 
 include role::cache::2layer

-- 
To view, visit https://gerrit.wikimedia.org/r/249128
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: If4f0dcf0e4be4f39f9b95247eddc3454b000f5da
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BBlack 
Gerrit-Reviewer: BBlack 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] terbium: start moving back cronjobs - change (operations/puppet)

2015-11-16 Thread Giuseppe Lavagetto (Code Review)

Giuseppe Lavagetto has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/253329

Change subject: terbium: start moving back cronjobs
..

terbium: start moving back cronjobs

Change-Id: I74f3b9ab131aa123de7fb90073ea290a87d5cbb4
---
M hieradata/hosts/mw1152.yaml
M hieradata/hosts/terbium.yaml
2 files changed, 24 insertions(+), 17 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/29/253329/1

diff --git a/hieradata/hosts/mw1152.yaml b/hieradata/hosts/mw1152.yaml
index b727045..341f891 100644
--- a/hieradata/hosts/mw1152.yaml
+++ b/hieradata/hosts/mw1152.yaml
@@ -7,14 +7,14 @@
   - eqiad.wmnet
   - esams.wikimedia.org
   - codfw.wmnet
-mediawiki::maintenance::pagetriage::ensure: present
-mediawiki::maintenance::translationnotifications::ensure: present
-mediawiki::maintenance::updatetranslationstats::ensure: present
-mediawiki::maintenance::wikidata::ensure: present
-mediawiki::maintenance::echo_mail_batch::ensure: present
-mediawiki::maintenance::parsercachepurging::ensure: present
-mediawiki::maintenance::cleanup_upload_stash::ensure: present
-mediawiki::maintenance::tor_exit_node::ensure: present
+mediawiki::maintenance::pagetriage::ensure: absent
+mediawiki::maintenance::translationnotifications::ensure: absent
+mediawiki::maintenance::updatetranslationstats::ensure: absent
+mediawiki::maintenance::wikidata::ensure: absent
+mediawiki::maintenance::echo_mail_batch::ensure: absent
+mediawiki::maintenance::parsercachepurging::ensure: absent
+mediawiki::maintenance::cleanup_upload_stash::ensure: absent
+mediawiki::maintenance::tor_exit_node::ensure: absent
 mediawiki::maintenance::update_flaggedrev_stats::ensure: present
 mediawiki::maintenance::refreshlinks::ensure: present
 mediawiki::maintenance::update_special_pages::ensure: present
@@ -24,6 +24,7 @@
 mediawiki::maintenance::purge_securepoll::ensure: present
 mediawiki::maintenance::jobqueue_stats::ensure: present
 mediawiki::maintenance::updatequerypages::ensure: present
+tendril::maintenance::ensure: absent
 hhvm::extra::cli:
   hhvm:
 server:
diff --git a/hieradata/hosts/terbium.yaml b/hieradata/hosts/terbium.yaml
index 3a7f17f..0454111 100644
--- a/hieradata/hosts/terbium.yaml
+++ b/hieradata/hosts/terbium.yaml
@@ -7,14 +7,14 @@
   - eqiad.wmnet
   - esams.wikimedia.org
   - codfw.wmnet
-mediawiki::maintenance::pagetriage::ensure: absent
-mediawiki::maintenance::translationnotifications::ensure: absent
-mediawiki::maintenance::updatetranslationstats::ensure: absent
-mediawiki::maintenance::wikidata::ensure: absent
-mediawiki::maintenance::echo_mail_batch::ensure: absent
-mediawiki::maintenance::parsercachepurging::ensure: absent
-mediawiki::maintenance::cleanup_upload_stash::ensure: absent
-mediawiki::maintenance::tor_exit_node::ensure: absent
+mediawiki::maintenance::pagetriage::ensure: present
+mediawiki::maintenance::translationnotifications::ensure: present
+mediawiki::maintenance::updatetranslationstats::ensure: present
+mediawiki::maintenance::wikidata::ensure: present
+mediawiki::maintenance::echo_mail_batch::ensure: present
+mediawiki::maintenance::parsercachepurging::ensure: present
+mediawiki::maintenance::cleanup_upload_stash::ensure: present
+mediawiki::maintenance::tor_exit_node::ensure: present
 mediawiki::maintenance::update_flaggedrev_stats::ensure: absent
 mediawiki::maintenance::refreshlinks::ensure: absent
 mediawiki::maintenance::update_special_pages::ensure: absent
@@ -24,4 +24,10 @@
 mediawiki::maintenance::purge_securepoll::ensure: absent
 mediawiki::maintenance::jobqueue_stats::ensure: absent
 mediawiki::maintenance::updatequerypages::ensure: absent
-tendril::maintenance::ensure: absent
+tendril::maintenance::ensure: present
+hhvm::extra::cli:
+  hhvm:
+server:
+  # Limit number of child processes running at once
+  # Also, use light processes, that are more efficient
+  light_process_count: 2

-- 
To view, visit https://gerrit.wikimedia.org/r/253329
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I74f3b9ab131aa123de7fb90073ea290a87d5cbb4
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Add 'newsletter-delete' right - change (mediawiki...Newsletter)

2015-11-16 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged.

Change subject: Add 'newsletter-delete' right
..


Add 'newsletter-delete' right

After this change, users with 'newsletter-delete' right are allowed
to delete newsletters in addition to publishers. This right is assigned
to sysops by default and allows them to be global deleters of newsletters.

Bug: T110327
Change-Id: I344a74d22348748dab28bed1fbdc837d608e6a20
---
M extension.json
M i18n/en.json
M i18n/qqq.json
M includes/Newsletter.php
M includes/specials/SpecialNewsletter.php
5 files changed, 24 insertions(+), 10 deletions(-)

Approvals:
  Addshore: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/extension.json b/extension.json
index 8883075..19df561 100644
--- a/extension.json
+++ b/extension.json
@@ -11,6 +11,7 @@
"type": "other",
"AvailableRights": [
"newsletter-create",
+   "newsletter-delete",
"newsletter-manage"
],
"GroupPermissions": {
@@ -18,6 +19,7 @@
"newsletter-create": true
},
"sysop": {
+   "newsletter-delete": true,
"newsletter-manage": true
}
},
diff --git a/i18n/en.json b/i18n/en.json
index 4e1161d..ff83756 100755
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -54,7 +54,6 @@
"newsletter-announce-nonexistent-page": "The provided issue page does 
not exist. Please enter an existing page.",
"newsletter-announce-failure": "A new issue could not be announced. 
Please try again.",
"newsletter-delete": "Delete newsletter",
-   "newsletter-delete-nopermission": "You do not have the permission to 
delete this newsletter.",
"newsletter-delete-text": "This interface can be used to delete the 
\"$1\" newsletter. Please confirm that you intend to do this. This 
action cannot be undone.",
"newsletter-deletenewsletter-button": "Delete this newsletter",
"newsletter-delete-success": "Newsletter #$1 has been deleted.",
@@ -98,6 +97,8 @@
"newsletter-dropdown-default-message": "Please select one",
"right-newsletter-create": "Create newsletters",
"action-newsletter-create": "create newsletters",
+   "right-newsletter-delete": "Delete newsletters",
+   "action-newsletter-delete": "delete newsletters",
"right-newsletter-manage": "Add or remove publishers from newsletters",
"action-newsletter-manage": "manage newsletters",
"newsletters-summary": "This page allows you to browse through a list 
of all newsletters on this wiki and allows users to subscribe to or unsubscribe 
from them. You can also choose your newsletter subscription options through the 
 [[Special:Preferences#mw-prefsection-echo|preferences]] interface.",
diff --git a/i18n/qqq.json b/i18n/qqq.json
index f4dae71..518915a 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -58,7 +58,6 @@
"newsletter-announce-nonexistent-page": "Error message shown on 
Special:Newsletter/id/announce if the issue page does not exist.",
"newsletter-announce-failure": "Error message shown on 
Special:Newsletter/id/announce if a new issue could not be announced.",
"newsletter-delete": "Header message shown on 
Special:Newsletter//delete.\n\nSee also:\n* 
{{msg-mw|newsletter-view}}\n*{{msg-mw|newsletter-subscribe}}",
-   "newsletter-delete-nopermission": "Error message shown on 
Special:Newsletter//delete if the current user does not have the permission 
to delete the newsletter.",
"newsletter-delete-text": "Introductory message shown on 
Special:Newsletter//delete.\n\nParameters:\n* $1 - Name of the newsletter 
for the specified id.",
"newsletter-deletenewsletter-button": "Label for button shown on 
Special:Newsletter//delete. Deletes the newsletter when clicked on.",
"newsletter-delete-success": "Success message shown on 
Special:Newsletter//delete when the newsletter has been 
deleted.\n\nParameters:\n* $1 - Newsletter ID",
@@ -102,6 +101,8 @@
"newsletter-dropdown-default-message": "Default option of drop down 
menus to select newsletters in [[Special:ManageNewsletter]].\n\nSee also:\n* 
{{msg-mw|Newsletter-name}} (label of the field)",
"right-newsletter-create": "{{doc-right|newsletter-create}}",
"action-newsletter-create": "{{doc-action|newsletter-create}}",
+   "right-newsletter-delete": "{{doc-right|newsletter-delete}}",
+   "action-newsletter-delete": "{{doc-action|newsletter-delete}}",
"right-newsletter-manage": "{{doc-right|newsletter-manage}}",
"action-newsletter-manage": "{{doc-action|newsletter-manage}}",
"newsletters-summary": "Introductory message shown on top of 
[[Special:Newsletters]]. Do not translate the anchor of Special:Preferences 
link. (\"#mw-prefsection-echo\" part).",
diff --git

[MediaWiki-commits] [Gerrit] ApiFeedWatchlist: Set messages for param-per-value too when ... - change (mediawiki/core)

2015-11-16 Thread Anomie (Code Review)

Anomie has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/253332

Change subject: ApiFeedWatchlist: Set messages for param-per-value too when 
copying from ApiQueryWatchlist
..

ApiFeedWatchlist: Set messages for param-per-value too when copying from 
ApiQueryWatchlist

Bug: T118675
Change-Id: I9244a177716d4bbe8c011fd7c374e125552ea531
---
M includes/api/ApiFeedWatchlist.php
1 file changed, 7 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/32/253332/1

diff --git a/includes/api/ApiFeedWatchlist.php 
b/includes/api/ApiFeedWatchlist.php
index e8afcb6..77a3a21 100644
--- a/includes/api/ApiFeedWatchlist.php
+++ b/includes/api/ApiFeedWatchlist.php
@@ -265,6 +265,13 @@
if ( !isset( $p[ApiBase::PARAM_HELP_MSG] ) ) {
$p[ApiBase::PARAM_HELP_MSG] = 
"apihelp-query+watchlist-param-$from";
}
+   if ( is_array( $p[ApiBase::PARAM_TYPE] ) && 
isset( $p[ApiBase::PARAM_HELP_MSG_PER_VALUE] ) ) {
+   foreach ( $p[ApiBase::PARAM_TYPE] as $v 
) {
+   if ( !isset( 
$p[ApiBase::PARAM_HELP_MSG_PER_VALUE][$v] ) ) {
+   
$p[ApiBase::PARAM_HELP_MSG_PER_VALUE][$v] = 
"apihelp-query+watchlist-paramvalue-$from-$v";
+   }
+   }
+   }
$ret[$to] = $p;
}
} else {

-- 
To view, visit https://gerrit.wikimedia.org/r/253332
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9244a177716d4bbe8c011fd7c374e125552ea531
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Anomie 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] analytics VCL: fix missing semicolon - change (operations/puppet)

2015-11-16 Thread BBlack (Code Review)

BBlack has submitted this change and it was merged.

Change subject: analytics VCL: fix missing semicolon
..


analytics VCL: fix missing semicolon

Change-Id: I5b233938897a153f33781e2599e4c826fd7d3c38
---
M templates/varnish/analytics.inc.vcl.erb
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  BBlack: Verified; Looks good to me, approved



diff --git a/templates/varnish/analytics.inc.vcl.erb 
b/templates/varnish/analytics.inc.vcl.erb
index bf5a58c..bc7488f 100644
--- a/templates/varnish/analytics.inc.vcl.erb
+++ b/templates/varnish/analytics.inc.vcl.erb
@@ -198,5 +198,5 @@
 
 // Put XCIP into resp headers for webrequest logging purposes independent
 // of the X-Analytics fields:
-set resp.http.X-Client-IP = req.http.X-Client-IP
+set resp.http.X-Client-IP = req.http.X-Client-IP;
 }

-- 
To view, visit https://gerrit.wikimedia.org/r/253335
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I5b233938897a153f33781e2599e4c826fd7d3c38
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BBlack 
Gerrit-Reviewer: BBlack 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] analytics VCL: fix missing semicolon - change (operations/puppet)

2015-11-16 Thread BBlack (Code Review)

BBlack has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/253335

Change subject: analytics VCL: fix missing semicolon
..

analytics VCL: fix missing semicolon

Change-Id: I5b233938897a153f33781e2599e4c826fd7d3c38
---
M templates/varnish/analytics.inc.vcl.erb
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/35/253335/1

diff --git a/templates/varnish/analytics.inc.vcl.erb 
b/templates/varnish/analytics.inc.vcl.erb
index bf5a58c..bc7488f 100644
--- a/templates/varnish/analytics.inc.vcl.erb
+++ b/templates/varnish/analytics.inc.vcl.erb
@@ -198,5 +198,5 @@
 
 // Put XCIP into resp headers for webrequest logging purposes independent
 // of the X-Analytics fields:
-set resp.http.X-Client-IP = req.http.X-Client-IP
+set resp.http.X-Client-IP = req.http.X-Client-IP;
 }

-- 
To view, visit https://gerrit.wikimedia.org/r/253335
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I5b233938897a153f33781e2599e4c826fd7d3c38
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BBlack 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Extract LinksUpdateHookHandler to separate file - change (mediawiki...PageImages)

2015-11-16 Thread WMDE

Thiemo Mättig (WMDE) has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/253337

Change subject: Extract LinksUpdateHookHandler to separate file
..

Extract LinksUpdateHookHandler to separate file

Change-Id: I5ffe6fdf4e57135e6f3b32636c80f22be758607c
---
M PageImages.php
A includes/LinksUpdateHookHandler.php
M includes/PageImages.php
3 files changed, 256 insertions(+), 198 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/PageImages 
refs/changes/37/253337/1

diff --git a/PageImages.php b/PageImages.php
index 3d6fb74..7c9df3e 100644
--- a/PageImages.php
+++ b/PageImages.php
@@ -16,12 +16,14 @@
 
 $wgAutoloadClasses['ApiQueryPageImages'] = __DIR__ . 
'/includes/ApiQueryPageImages.php';
 $wgAutoloadClasses['PageImages'] = __DIR__ . '/includes/PageImages.php';
+$wgAutoloadClasses['PageImages\Hooks\LinksUpdateHookHandler']
+   = __DIR__ . '/includes/LinksUpdateHookHandler.php';
 
 $wgMessagesDirs['PageImages'] = __DIR__ . '/i18n';
 $wgExtensionMessagesFiles['PageImages'] = __DIR__ . "/PageImages.i18n.php";
 
 $wgHooks['ParserMakeImageParams'][] = 'PageImages::onParserMakeImageParams';
-$wgHooks['LinksUpdate'][] = 'PageImages::onLinksUpdate';
+$wgHooks['LinksUpdate'][] = 
'PageImages\Hooks\LinksUpdateHookHandler::onLinksUpdate';
 $wgHooks['OpenSearchXml'][] = 'PageImages::onApiOpenSearchSuggest';
 $wgHooks['ApiOpenSearchSuggest'][] = 'PageImages::onApiOpenSearchSuggest';
 $wgHooks['InfoAction'][] = 'PageImages::onInfoAction';
diff --git a/includes/LinksUpdateHookHandler.php 
b/includes/LinksUpdateHookHandler.php
new file mode 100644
index 000..7d5ccea
--- /dev/null
+++ b/includes/LinksUpdateHookHandler.php
@@ -0,0 +1,253 @@
+https://www.mediawiki.org/wiki/Manual:Hooks/LinksUpdate
+*
+* @param LinksUpdate $linksUpdate
+*
+* @return bool
+*/
+   public static function onLinksUpdate( LinksUpdate $linksUpdate ) {
+   $handler = new self();
+   return $handler->doLinksUpdate( $linksUpdate );
+   }
+
+   /**
+* @param LinksUpdate $linksUpdate
+*
+* @return bool Always true.
+*/
+   public function doLinksUpdate( LinksUpdate $linksUpdate ) {
+   $images = $linksUpdate->getParserOutput()->getExtensionData( 
'pageImages' );
+
+   if ( $images === null ) {
+   return true;
+   }
+
+   $scores = array();
+   $counter = 0;
+
+   foreach ( $images as $image ) {
+   $fileName = $image['filename'];
+
+   if ( !isset( $scores[$fileName] ) ) {
+   $scores[$fileName] = -1;
+   }
+
+   $scores[$fileName] = max( $scores[$fileName], 
$this->getScore( $image, $counter++ ) );
+   }
+
+   $image = false;
+
+   foreach ( $scores as $name => $score ) {
+   if ( $score > 0 && ( !$image || $score > 
$scores[$image] ) ) {
+   $image = $name;
+   }
+   }
+
+   if ( $image ) {
+   $linksUpdate->mProperties[PageImages::PROP_NAME] = 
$image;
+   }
+
+   return true;
+   }
+
+   /**
+* Returns score for image, the more the better, if it is less than 
zero,
+* the image shouldn't be used for anything
+*
+* @param array $image Associative array describing an image
+* @param int $position Image order on page
+*
+* @return int
+*/
+   private function getScore( array $image, $position ) {
+   global $wgPageImagesScores;
+
+   if ( isset( $image['handler'] ) ) {
+   // Standalone image
+   $score = $this->scoreFromTable( 
$image['handler']['width'], $wgPageImagesScores['width'] );
+   } else {
+   // From gallery
+   $score = $this->scoreFromTable( $image['fullwidth'], 
$wgPageImagesScores['galleryImageWidth'] );
+   }
+
+   if ( isset( $wgPageImagesScores['position'][$position] ) ) {
+   $score += $wgPageImagesScores['position'][$position];
+   }
+
+   $ratio = intval( $this->getRatio( $image ) * 10 );
+   $score += $this->scoreFromTable( $ratio, 
$wgPageImagesScores['ratio'] );
+
+   $blacklist = $this->getBlacklist();
+   if ( isset( $blacklist[$image['filename']] ) ) {
+   $score = -1000;
+   }
+
+   return $score;
+   }
+
+   /**
+* Returns score based on table of ranges
+*
+* @param int $value
+* @param int[] $scores
+*
+* @return int
+*/
+

[MediaWiki-commits] [Gerrit] salt: Move the role manifests into role module - change (operations/puppet)

2015-11-16 Thread Alexandros Kosiaris (Code Review)

Alexandros Kosiaris has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/253342

Change subject: salt: Move the role manifests into role module
..

salt: Move the role manifests into role module

Create the, rather badly named, salt role hierarchy classes manifest
files in the role module. This will unblock Id1d3cfaa01

Change-Id: I92c44cf77ab342e5b61a1320f5999277d8085fee
---
D manifests/role/salt.pp
A modules/role/manifests/salt/masters/labs.pp
A modules/role/manifests/salt/masters/labs/project_master.pp
A modules/role/manifests/salt/masters/production.pp
A modules/role/manifests/salt/minions.pp
5 files changed, 119 insertions(+), 122 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/42/253342/1

diff --git a/manifests/role/salt.pp b/manifests/role/salt.pp
deleted file mode 100644
index 1e277fb..000
--- a/manifests/role/salt.pp
+++ /dev/null
@@ -1,122 +0,0 @@
-class role::salt::masters::production {
-
-$salt_state_roots= { 'base'=>['/srv/salt']}
-$salt_file_roots = { 'base'=>['/srv/salt']}
-$salt_pillar_roots   = { 'base'=>['/srv/pillars']}
-$salt_module_roots   = { 'base'=>['/srv/salt/_modules']}
-$salt_returner_roots = { 'base'=>['/srv/salt/_returners']}
-
-class { 'salt::master':
-salt_runner_dirs=> ['/srv/runners'],
-salt_peer_run   => {
-'tin.eqiad.wmnet'  => ['deploy.*'],
-'mira.codfw.wmnet' => ['deploy.*'],
-},
-salt_file_roots => $salt_file_roots,
-salt_pillar_roots   => $salt_pillar_roots,
-salt_worker_threads => '30',
-salt_state_roots=> $salt_state_roots,
-salt_module_roots   => $salt_module_roots,
-salt_returner_roots => $salt_returner_roots,
-}
-
-}
-
-# A salt master that manages all labs minions
-class role::salt::masters::labs {
-
-$puppet_master = hiera('labs_puppet_master')
-
-$salt_state_roots= { 'base' =>['/srv/salt']}
-$salt_file_roots = { 'base' =>['/srv/salt']}
-$salt_pillar_roots   = { 'base' =>['/srv/pillars']}
-$salt_module_roots   = { 'base' =>['/srv/salt/_modules']}
-$salt_returner_roots = { 'base' =>['/srv/salt/_returners']}
-
-class { 'salt::master':
-salt_runner_dirs=> ['/srv/runners'],
-salt_file_roots => $salt_file_roots,
-salt_pillar_roots   => $salt_pillar_roots,
-salt_worker_threads => '50',
-salt_state_roots=> $salt_state_roots,
-salt_module_roots   => $salt_module_roots,
-salt_returner_roots => $salt_returner_roots,
-salt_auto_accept=> true,
-}
-
-class { 'salt::reactors':
-salt_reactor_options => { 'puppet_server' => $puppet_master },
-}
-
-
-if ! defined(Class['puppetmaster::certmanager']) {
-include role::labs::openstack::nova::config
-$novaconfig = $role::labs::openstack::nova::config::novaconfig
-
-class { 'puppetmaster::certmanager':
-remote_cert_cleaner => $novaconfig['designate_hostname'],
-}
-}
-}
-
-# A salt master manages minions within a project
-class role::salt::masters::labs::project_master {
-
-$salt_state_roots= { 'base'=>['/srv/salt']}
-$salt_file_roots = { 'base'=>['/srv/salt']}
-$salt_pillar_roots   = { 'base'=>['/srv/pillars']}
-$salt_module_roots   = { 'base'=>['/srv/salt/_modules']}
-$salt_returner_roots = { 'base'=>['/srv/salt/_returners']}
-
-class { 'salt::master':
-salt_runner_dirs=> ['/srv/runners'],
-# For simplicity of test/dev we trust all of labs
-# to run deploy module calls, but rely on security groups
-# to secure this.
-salt_peer_run   => {
-'.*.eqiad.wmflabs' => ['deploy.*'],
-},
-salt_file_roots => $salt_file_roots,
-salt_pillar_roots   => $salt_pillar_roots,
-salt_worker_threads => '10',
-salt_state_roots=> $salt_state_roots,
-salt_module_roots   => $salt_module_roots,
-salt_returner_roots => $salt_returner_roots,
-salt_auto_accept=> true,
-}
-
-}
-
-class role::salt::minions(
-$salt_master = $::salt_master_override,
-$salt_finger = $::salt_master_finger_override,
-$salt_master_key = $::salt_master_key,
-) {
-if $::realm == 'labs' {
-$labs_master = hiera('puppetmaster')
-
-$labs_finger   = 'c5:b1:35:45:3e:0a:19:70:aa:5f:3a:cf:bf:a0:61:dd'
-$master= pick($salt_master, $labs_master)
-$master_finger = pick($salt_finger, $labs_finger)
-
-salt::grain { 'labsproject':
-value => $::labsproject,
-}
-} else {
-$master = ['palladium.eqiad.wmnet', 'neodymium.eqiad.wmnet']
-$master_finger = 'f6:1d:a7:1f:7e:12:10:40:75:d5:73:af:0c:be:7d:7c'
-}
-$client_id = $::fqdn
-
-

[MediaWiki-commits] [Gerrit] Remove announce form from Special:ManageNewsletter - change (mediawiki...Newsletter)

2015-11-16 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged.

Change subject: Remove announce form from Special:ManageNewsletter
..


Remove announce form from Special:ManageNewsletter

Depends on I3801c5ad3a66214d45bbd

Bug: T117230
Change-Id: Icf8483e918c8289c985b160f04c6d9225f6c57dd
---
M i18n/en.json
M i18n/qqq.json
M includes/specials/SpecialNewsletterManage.php
3 files changed, 0 insertions(+), 111 deletions(-)

Approvals:
  Addshore: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/i18n/en.json b/i18n/en.json
index 3d50e69..fd052b9 100755
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -12,20 +12,16 @@
"newsletter-name": "Name of newsletter",
"newsletter-desc": "Description",
"newsletter-title": "Title of Main Page",
-   "newsletter-issue-title": "Title of issue's main page",
"newsletter-publisher-username": "Username",
-   "newsletter-issuepage-not-found-error": "The newsletter issue page 
cannot be found. Please try again",
"newsletter-invalid-username-error": "Invalid username",
"newsletter-unconfirmed-email-error": "The provided username does not 
have a confirmed email address!",
"newsletter-required-fields-error": "Required fields are empty",
"newsletter-exist-error": "A newsletter with the same name already 
exists. Try again with another name",
-   "newsletter-announceissueform-announceissue-section": "Announce new 
issue",
"newsletter-addpublisherform-addpublisher-section": "Add publishers",
"newsletter-create-section": "Create newsletter",
"newsletter-create-submit": "Create newsletter",
"newsletter-create-confirmation": "A new newsletter has been 
successfully created. You can manage newsletters through 
[[Special:ManageNewsletter]].",
"newsletter-create-mainpage-error": "Invalid newsletter main page 
entered. Please try again.",
-   "newsletter-issue-announce-confirmation": "Good job! You just announced 
a new issue of your newsletter.",
"newsletter-subtitlelinks-list": "List of newsletters",
"newsletter-subtitlelinks-create": "Create a new newsletter",
"newsletter-subtitlelinks-manage": "Manage newsletter",
diff --git a/i18n/qqq.json b/i18n/qqq.json
index 8c84305..f7add0a 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -16,20 +16,16 @@
"newsletter-name": "Label of the field which takes the name of 
newsletter as input in [[Special:ManageNewsletter]] and 
[[Special:CreateNewsletter]]",
"newsletter-desc": "Label of the field which takes a short description 
of newsletter as input in 
[[Special:CreateNewsletter]]\n{{Identical|Description}}",
"newsletter-title": "Label of the field which takes the title of Main 
Page of newsletter as input in [[Special:CreateNewsletter]]",
-   "newsletter-issue-title": "Label of the field which takes the title of 
the issue as input in [[Special:ManageNewsletter]]",
"newsletter-publisher-username": "Label of the field which takes the 
username of the publisher to be added as input in 
[[Special:ManageNewsletter]]\n{{Identical|Username}}",
-   "newsletter-issuepage-not-found-error": "Error message to be displayed 
when newsletter issue page cannot be found while adding new issue in 
[[Special:ManageNewsletter]]",
"newsletter-invalid-username-error": "Error message to be displayed 
when invalid username given as input in 
[[Special:ManageNewsletter]]\n{{Identical|Invalid username}}",
"newsletter-unconfirmed-email-error": "Error message to be displayed in 
[[Special:ManageNewsletter]] when the username of the publisher to be added 
does not have a confirmed email address",
"newsletter-required-fields-error": "Error message to be displayed when 
required fields are empty in [[Special:ManageNewsletter]]",
"newsletter-exist-error": "Error message to be displayed in 
[[Special:CreateNewsletter]] when trying to create a newsletter with same name 
as an existing newsletter",
-   "newsletter-announceissueform-announceissue-section": "Header of 
section in [[Special:ManageNewsletter]] which announces issues",
"newsletter-addpublisherform-addpublisher-section": "Header of section 
in [[Special:ManageNewsletter]] which adds publishers",
"newsletter-create-section": "Section header of 
[[Special:CreateNewsletter]]",
"newsletter-create-submit": "Label of submit button on 
[[Special:CreateNewsletter]]",
"newsletter-create-confirmation": "Confirmation message displayed after 
creation of a newsletter",
"newsletter-create-mainpage-error": "Error message shown on 
[[Special:CreateNewsletter]] if the page entered on main page field does not 
exist.",
-   "newsletter-issue-announce-confirmation": "Confirmation message 
displayed after announcing a new issue",
"newsletter-subtitlelinks-list": "Label for link to 
[[Special:Newsletters]]

[MediaWiki-commits] [Gerrit] Add alias file - change (mediawiki...ConventionExtension)

2015-11-16 Thread Paladox (Code Review)

Paladox has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/253344

Change subject: Add alias file
..

Add alias file

Add an alias file for the special pages because without this file errors
will be shown.

Change-Id: I4b3d937390088839ef491c3dff274d5c9a037a79
---
A ConventionExtension.alias.php
M ConventionExtension.php
2 files changed, 18 insertions(+), 0 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ConventionExtension 
refs/changes/44/253344/1

diff --git a/ConventionExtension.alias.php b/ConventionExtension.alias.php
new file mode 100644
index 000..6bc1f30
--- /dev/null
+++ b/ConventionExtension.alias.php
@@ -0,0 +1,17 @@
+ array( 'ConferenceSetup' ),
+   'Dashboard' => array( 'Dashboard' ),
+   'AuthorRegister' => array( 'AuthorRegister' ),
+);
\ No newline at end of file
diff --git a/ConventionExtension.php b/ConventionExtension.php
index 01c464e..4ab3d84 100644
--- a/ConventionExtension.php
+++ b/ConventionExtension.php
@@ -113,6 +113,7 @@
 /* message files */
 $wgMessagesDirs['ConventionExtension'] = __DIR__ . '/i18n';
 $wgExtensionMessagesFiles['ConventionExtension'] = $wgCurrentDir . 
'ConventionExtension.i18n.php';
+$wgExtensionMessagesFiles['ConventionExtensionAlias'] = __DIR__ . 
'/ConventionExtension.alias.php';
 $wgExtensionMessagesFiles['ConventionExtensionMagic'] = $wgCurrentDir . 
'ConventionExtension.i18n.magic.php';
 
 /* resource modules */

-- 
To view, visit https://gerrit.wikimedia.org/r/253344
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I4b3d937390088839ef491c3dff274d5c9a037a79
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ConventionExtension
Gerrit-Branch: master
Gerrit-Owner: Paladox 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Move functions to hooks file - change (mediawiki...ConventionExtension)

2015-11-16 Thread Paladox (Code Review)

Paladox has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/253345

Change subject: Move functions to hooks file
..

Move functions to hooks file

Change-Id: I6c219cbe7358bffa4cc6c516301fdf1769030571
---
M ConferenceHooks.php
M ConventionExtension.php
2 files changed, 12 insertions(+), 6 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ConventionExtension 
refs/changes/45/253345/1

diff --git a/ConferenceHooks.php b/ConferenceHooks.php
index f1a2633..59c5694 100644
--- a/ConferenceHooks.php
+++ b/ConferenceHooks.php
@@ -243,4 +243,15 @@
$customVariableIds[] = 'conf-description';
return true;
}
+
+   /**
+* UnitTestsList hook handler
+* @param array $files
+* @return bool
+*/
+   public static function onRegisterUnitTests( array &$files ) {
+   $testDir = __DIR__ . '/tests/';
+   $files = array_merge( $files, glob( 
"$testDir/*Test.php" ) );
+   return true;
+   }
 }
\ No newline at end of file
diff --git a/ConventionExtension.php b/ConventionExtension.php
index 01c464e..af5df45 100644
--- a/ConventionExtension.php
+++ b/ConventionExtension.php
@@ -181,13 +181,8 @@
 $wgHooks['ParserFirstCallInit'][]='ConferenceHooks::onParserFirstCallInit';
 $wgHooks['ParserGetVariableValueSwitch'][] = 
'ConferenceHooks::assignMagicWords';
 $wgHooks['MagicWordwgVariableIDs'][] = 'ConferenceHooks::declareMagicIds';
-$wgHooks['UnitTestsList'][] = 'registerUnitTests';
-function registerUnitTests( &$files ) {
+$wgHooks['UnitTestsList'][] = 'ConferenceHooks::onRegisterUnitTests';
 
-global $wgCurrentDir;
-$files[] = $wgCurrentDir . 'tests/ConferenceTest.php';
-return true;
-}
 /* this array will eventually be removed, CLDR (extension) will be used 
instead*/
 $wgCountries = array("Unspecified",
"Afghanistan",

-- 
To view, visit https://gerrit.wikimedia.org/r/253345
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6c219cbe7358bffa4cc6c516301fdf1769030571
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ConventionExtension
Gerrit-Branch: master
Gerrit-Owner: Paladox 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Add filters to customize the search of newsletters - change (mediawiki...Newsletter)

2015-11-16 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged.

Change subject: Add filters to customize the search of newsletters
..


Add filters to customize the search of newsletters

Adds a form to Special:Newsletters which lets the user select
all the newsletters for which the user is subscribed to or select
all the newsletters for which the current user is not subscribed to

To-be done
* Better db query

Bug: T107557
Change-Id: I78529be036ec58646dab14d6e638356b110f696f
---
M i18n/en.json
M i18n/qqq.json
M includes/specials/SpecialNewsletters.php
M includes/specials/pagers/NewsletterTablePager.php
4 files changed, 89 insertions(+), 6 deletions(-)

Approvals:
  Addshore: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/i18n/en.json b/i18n/en.json
index 50fef3f..1b8ee0d 100755
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -73,6 +73,7 @@
"newsletter-available-newsletters-field-label": "Available newsletters",
"newsletter-subscribed-newsletters-field-label": "Subscribed 
newsletters",
"newsletter-none-found": "No newsletters exist. You can create a new 
newsletter through [[Special:CreateNewsletter]].",
+   "newsletter-list-search-none-found": "No newsletters match your query.",
"echo-category-title-newsletter": "Newsletters",
"echo-pref-tooltip-newsletter": "Notify me when any of the newsletters 
to which I have subscribed to announces a new issue.",
"newsletter-notification-title": "$1 has announced an issue",
@@ -96,5 +97,11 @@
"apihelp-newslettersubscribe-param-id": "ID of the newsletter for which 
the subscription should be changed.",
"apihelp-newslettersubscribe-param-do": "Action to do. Should be either 
subscribe or unsubscribe.",
"apihelp-newslettersubscribe-example-1": "Subscribe to newsletter with 
id 1.",
-   "apihelp-newslettersubscribe-example-2": "Unsubscribe from newsletter 
with id 2."
+   "apihelp-newslettersubscribe-example-2": "Unsubscribe from newsletter 
with id 2.",
+   "newsletter-list-table": "Filter table by: ",
+   "newsletter-list-section":  "Search for newsletters",
+   "newsletter-list-option-all": "All newsletters",
+   "newsletter-list-option-subscribed": "Newsletters I am subscribed to",
+   "newsletter-list-option-unsubscribed": "Newsletters I am not subscribed 
to",
+   "newsletter-list-go-button": "Go"
 }
diff --git a/i18n/qqq.json b/i18n/qqq.json
index 8da29c5..e00bfb4 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -77,6 +77,7 @@
"newsletter-available-newsletters-field-label": "Label of HTML form 
field which lists all available newsletters in wiki",
"newsletter-subscribed-newsletters-field-label": "Label of HTML form 
field which lists all newsletters to which user is subscribed to.",
"newsletter-none-found": "Error message shown on 
[[Special:Newsletters]] and [[Special:ManageNewsletter]] if no newsletters were 
found on the wiki.",
+   "newsletter-list-search-none-found": "Error message shown on 
[[Special:Newsletters]] if no newsletters found after user searches the table 
using filters",
"echo-category-title-newsletter": "Title of the notification category 
used by Newsletter 
extension.\n{{Related|Echo-category-title}}\n{{Identical|Newsletter}}",
"echo-pref-tooltip-newsletter": "Short description of the newsletter 
notification category.\n{{Related|Echo-pref-tooltip}}",
"newsletter-notification-title": "Used as a Echo notification message",
@@ -100,5 +101,11 @@
"apihelp-newslettersubscribe-param-id": 
"{{doc-apihelp-param|newslettersubscribe|id}}",
"apihelp-newslettersubscribe-param-do": 
"{{doc-apihelp-param|newslettersubscribe|do}}",
"apihelp-newslettersubscribe-example-1": 
"{{doc-apihelp-example|newslettersubscribe}}",
-   "apihelp-newslettersubscribe-example-2": 
"{{doc-apihelp-example|newslettersubscribe}}"
+   "apihelp-newslettersubscribe-example-2": 
"{{doc-apihelp-example|newslettersubscribe}}",
+   "newsletter-list-table": "Label of the drop down menu in 
[[Special:Newsletters]], the options of which can be used to customize the 
search of newsletters",
+   "newsletter-list-section":  "Section header of HTML form in 
[[Special:Newsletters]] used to search for newsletters",
+   "newsletter-list-option-all": "Option of the drop down menu in 
[[Special:Newsletters]] to display all newsletters",
+   "newsletter-list-option-subscribed": "Option of the drop down menu in 
[[Special:Newsletters]] to display those newsletters to which the logged in 
user is subscribed to",
+   "newsletter-list-option-unsubscribed": "Option of the drop down menu in 
[[Special:Newsletters]] to display those newsletters to which the logged in 
user is not subscribed to",
+   "newsletter-list-go-button": "Label of the submit button of the HTML 
form in [[Special:Newsletters]]"
 }
diff --git

[MediaWiki-commits] [Gerrit] Remove unused imports from repo - change (mediawiki...Wikibase)

2015-11-16 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged.

Change subject: Remove unused imports from repo
..


Remove unused imports from repo

As usual found with my nifty regex
(?s)\buse\b\s*(?:\b\w+\\)*(\b\w+\b)\s*;(?!.*\b\1\b)

Change-Id: I6abdfcfc06c89ad3558951cb8952f8f45ca85c43
---
M repo/includes/rdf/ComplexValueRdfBuilder.php
M repo/includes/rdf/SnakRdfBuilder.php
M repo/includes/rdf/ValueSnakRdfBuilder.php
M repo/includes/rdf/ValueSnakRdfBuilderFactory.php
M repo/tests/phpunit/includes/rdf/TruthyStatementsRdfBuilderTest.php
M repo/tests/phpunit/includes/specials/SpecialEntityDataTest.php
6 files changed, 0 insertions(+), 8 deletions(-)

Approvals:
  Hoo man: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/repo/includes/rdf/ComplexValueRdfBuilder.php 
b/repo/includes/rdf/ComplexValueRdfBuilder.php
index 381f9ec..55a835d 100644
--- a/repo/includes/rdf/ComplexValueRdfBuilder.php
+++ b/repo/includes/rdf/ComplexValueRdfBuilder.php
@@ -3,7 +3,6 @@
 namespace Wikibase\Rdf;
 
 use DataValues\DataValue;
-use Wikibase\DataModel\Services\Lookup\PropertyDataTypeLookup;
 use Wikibase\DataModel\Snak\PropertyValueSnak;
 use Wikimedia\Purtle\RdfWriter;
 
diff --git a/repo/includes/rdf/SnakRdfBuilder.php 
b/repo/includes/rdf/SnakRdfBuilder.php
index e346cbc..2b86fe1 100644
--- a/repo/includes/rdf/SnakRdfBuilder.php
+++ b/repo/includes/rdf/SnakRdfBuilder.php
@@ -2,9 +2,7 @@
 
 namespace Wikibase\Rdf;
 
-use DataValues\DataValue;
 use InvalidArgumentException;
-use Wikibase\DataModel\Entity\PropertyId;
 use Wikibase\DataModel\Services\Lookup\PropertyDataTypeLookup;
 use Wikibase\DataModel\Services\Lookup\PropertyDataTypeLookupException;
 use Wikibase\DataModel\Snak\PropertyValueSnak;
diff --git a/repo/includes/rdf/ValueSnakRdfBuilder.php 
b/repo/includes/rdf/ValueSnakRdfBuilder.php
index b17f2d7..38404a4 100644
--- a/repo/includes/rdf/ValueSnakRdfBuilder.php
+++ b/repo/includes/rdf/ValueSnakRdfBuilder.php
@@ -2,7 +2,6 @@
 
 namespace Wikibase\Rdf;
 
-use DataValues\DataValue;
 use Wikibase\DataModel\Snak\PropertyValueSnak;
 use Wikimedia\Purtle\RdfWriter;
 
diff --git a/repo/includes/rdf/ValueSnakRdfBuilderFactory.php 
b/repo/includes/rdf/ValueSnakRdfBuilderFactory.php
index acc8d5d..cafd85f 100644
--- a/repo/includes/rdf/ValueSnakRdfBuilderFactory.php
+++ b/repo/includes/rdf/ValueSnakRdfBuilderFactory.php
@@ -2,7 +2,6 @@
 
 namespace Wikibase\Rdf;
 
-use DataValues\DataValue;
 use Wikimedia\Assert\Assert;
 use Wikimedia\Purtle\RdfWriter;
 
diff --git a/repo/tests/phpunit/includes/rdf/TruthyStatementsRdfBuilderTest.php 
b/repo/tests/phpunit/includes/rdf/TruthyStatementsRdfBuilderTest.php
index b58f0ea..e7bebeb 100644
--- a/repo/tests/phpunit/includes/rdf/TruthyStatementsRdfBuilderTest.php
+++ b/repo/tests/phpunit/includes/rdf/TruthyStatementsRdfBuilderTest.php
@@ -2,7 +2,6 @@
 
 namespace Wikibase\Test\Rdf;
 
-use Wikibase\Rdf\ValueSnakRdfBuilderFactory;
 use Wikibase\Rdf\NullDedupeBag;
 use Wikibase\Rdf\NullEntityMentionListener;
 use Wikibase\Rdf\SnakRdfBuilder;
diff --git a/repo/tests/phpunit/includes/specials/SpecialEntityDataTest.php 
b/repo/tests/phpunit/includes/specials/SpecialEntityDataTest.php
index 70179fb..31e2e0c 100644
--- a/repo/tests/phpunit/includes/specials/SpecialEntityDataTest.php
+++ b/repo/tests/phpunit/includes/specials/SpecialEntityDataTest.php
@@ -13,8 +13,6 @@
 use Wikibase\DataModel\Entity\EntityId;
 use Wikibase\DataModel\SerializerFactory;
 use Wikibase\DataModel\Entity\BasicEntityIdParser;
-use Wikibase\Rdf\ComplexValueRdfBuilder;
-use Wikibase\Rdf\RdfVocabulary;
 use Wikibase\Repo\LinkedData\EntityDataFormatProvider;
 use Wikibase\Repo\LinkedData\EntityDataRequestHandler;
 use Wikibase\Repo\LinkedData\EntityDataSerializationService;

-- 
To view, visit https://gerrit.wikimedia.org/r/253312
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I6abdfcfc06c89ad3558951cb8952f8f45ca85c43
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Thiemo Mättig (WMDE) 
Gerrit-Reviewer: Addshore 
Gerrit-Reviewer: Aude 
Gerrit-Reviewer: Daniel Kinzler 
Gerrit-Reviewer: Hoo man 
Gerrit-Reviewer: Jeroen De Dauw 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Split SearchEntities foreach block into separate method - change (mediawiki...Wikibase)

2015-11-16 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged.

Change subject: Split SearchEntities foreach block into separate method
..


Split SearchEntities foreach block into separate method

Change-Id: I60c4b2a97411ba350bd79fc809b1374c3a90ab64
---
M repo/includes/api/SearchEntities.php
1 file changed, 63 insertions(+), 42 deletions(-)

Approvals:
  Jonas Kress (WMDE): Looks good to me, approved
  jenkins-bot: Verified



diff --git a/repo/includes/api/SearchEntities.php 
b/repo/includes/api/SearchEntities.php
index 498394e..14ee638 100644
--- a/repo/includes/api/SearchEntities.php
+++ b/repo/includes/api/SearchEntities.php
@@ -122,48 +122,66 @@
);
 
$entries = array();
+
foreach ( $searchResults as $match ) {
-   //TODO: use EntityInfoBuilder, EntityInfoTermLookup
-   $title = $this->titleLookup->getTitleForId( 
$match->getEntityId() );
-   $entry = array(
-   'id' => 
$match->getEntityId()->getSerialization(),
-   'concepturi' => $this->conceptBaseUri . 
$match->getEntityId()->getSerialization(),
-   'url' => $title->getFullUrl(),
-   'title' => $title->getPrefixedText(),
-   'pageid' => $title->getArticleID()
-   );
-   $displayLabel = $match->getDisplayLabel();
-   if ( !is_null( $displayLabel ) ) {
-   $entry['label'] = $displayLabel->getText();
-   }
-   $displayDescription = $match->getDisplayDescription();
-   if ( !is_null( $displayDescription ) ) {
-   $entry['description'] = 
$displayDescription->getText();
-   }
-   $entry['match']['type'] = $match->getMatchedTermType();
-
-   //Special handling for 'entityId's as these are not 
actually Term objects
-   if ( $entry['match']['type'] === 'entityId' ) {
-   $entry['match']['text'] = $entry['id'];
-   $entry['aliases'] = array( $entry['id'] );
-   } else {
-   $matchedTerm = $match->getMatchedTerm();
-   $matchedTermText = $matchedTerm->getText();
-   $entry['match']['language'] = 
$matchedTerm->getLanguageCode();
-   $entry['match']['text'] = $matchedTermText;
-
-   /**
-* Add matched terms to the aliases key in the 
result to give some context for the matched Term
-* if the matched term is different to the 
alias.
-* XXX: This appears odd but is used in the UI 
/ Entity suggesters
-*/
-   if ( !array_key_exists( 'label', $entry ) || 
$matchedTermText != $entry['label'] ) {
-   $entry['aliases'] = array( 
$matchedTerm->getText() );
-   }
-   }
-   $entries[] = $entry;
+   $entries[] = $this->buildTermSearchMatchEntry( $match );
}
+
return $entries;
+   }
+
+   /**
+* @param TermSearchResult $match
+*
+* @return array
+*/
+   private function buildTermSearchMatchEntry( $match ) {
+   // TODO: use EntityInfoBuilder, EntityInfoTermLookup
+   $title = $this->titleLookup->getTitleForId( 
$match->getEntityId() );
+
+   $entry = array(
+   'id' => $match->getEntityId()->getSerialization(),
+   'concepturi' => $this->conceptBaseUri . 
$match->getEntityId()->getSerialization(),
+   'url' => $title->getFullUrl(),
+   'title' => $title->getPrefixedText(),
+   'pageid' => $title->getArticleID()
+   );
+
+   $displayLabel = $match->getDisplayLabel();
+
+   if ( !is_null( $displayLabel ) ) {
+   $entry['label'] = $displayLabel->getText();
+   }
+
+   $displayDescription = $match->getDisplayDescription();
+
+   if ( !is_null( $displayDescription ) ) {
+   $entry['description'] = $displayDescription->getText();
+   }
+
+   $entry['match']['type'] = $match->getMatchedTermType();
+
+   // Special handling for 'entityId's as these are not actually 
Term objects
+   if ( $entry['match']['type'] === 'entityId' ) {
+

[MediaWiki-commits] [Gerrit] wgHTCPRouting: use separate address for upload - change (operations/mediawiki-config)

2015-11-16 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged.

Change subject: wgHTCPRouting: use separate address for upload
..


wgHTCPRouting: use separate address for upload

This depends on the full deployment of I003dee670c first!

Bug: T116752
Change-Id: I8799f7b30a0a5711755e81338f48c4a4d5b7b522
---
M wmf-config/squid.php
1 file changed, 5 insertions(+), 1 deletion(-)

Approvals:
  Thcipriani: Looks good to me, approved
  Hashar: Looks good to me, but someone else must approve
  BBlack: Looks good to me, but someone else must approve
  jenkins-bot: Verified



diff --git a/wmf-config/squid.php b/wmf-config/squid.php
index 7f13361..087404f 100644
--- a/wmf-config/squid.php
+++ b/wmf-config/squid.php
@@ -1,10 +1,14 @@
  array(
+   'host' => '239.128.0.113',
+   'port' => 4827
+   ),
'' => array(
'host' => '239.128.0.112',
'port' => 4827
-   )
+   ),
 );
 $wgHTCPMulticastTTL = 8;
 

-- 
To view, visit https://gerrit.wikimedia.org/r/249121
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I8799f7b30a0a5711755e81338f48c4a4d5b7b522
Gerrit-PatchSet: 6
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: BBlack 
Gerrit-Reviewer: BBlack 
Gerrit-Reviewer: Chad 
Gerrit-Reviewer: Faidon Liambotis 
Gerrit-Reviewer: Hashar 
Gerrit-Reviewer: Thcipriani 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Expose more data through API - change (mediawiki...Echo)

2015-11-16 Thread Matthias Mullie (Code Review)

Matthias Mullie has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/253341

Change subject: Expose more data through API
..

Expose more data through API

Instead of relying on the frontend to render, this enables the frontend
to do it.

The API will now accept a new format: 'model', which is basically the
presentation model's data in json format.

Some of the render code is currently only in the backend (e.g. get icon
path from icon type) so other api formats will stay available. At some
point, however, we may be able to kill those.

Bug: T115418
Change-Id: Ibc3ad54c94d6ea9bf751f3927cf69e1d062f4780
---
M autoload.php
M includes/DataOutputFormatter.php
M includes/api/ApiEchoNotifications.php
A includes/formatters/EchoModelFormatter.php
M includes/formatters/EventPresentationModel.php
5 files changed, 38 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Echo 
refs/changes/41/253341/1

diff --git a/autoload.php b/autoload.php
index 681690a..a6fbcca 100644
--- a/autoload.php
+++ b/autoload.php
@@ -59,6 +59,7 @@
'EchoLocalCache' => __DIR__ . '/includes/cache/LocalCache.php',
'EchoMentionFormatter' => __DIR__ . 
'/includes/formatters/MentionFormatter.php',
'EchoMentionPresentationModel' => __DIR__ . 
'/includes/formatters/MentionPresentationModel.php',
+   'EchoModelFormatter' => __DIR__ . 
'/includes/formatters/EchoModelFormatter.php',
'EchoMultipleIterator' => __DIR__ . 
'/includes/iterator/MultipleIterator.php',
'EchoNotRecursiveIterator' => __DIR__ . 
'/includes/iterator/NotRecursiveIterator.php',
'EchoNotification' => __DIR__ . '/includes/model/Notification.php',
diff --git a/includes/DataOutputFormatter.php b/includes/DataOutputFormatter.php
index e508274..3855d56 100644
--- a/includes/DataOutputFormatter.php
+++ b/includes/DataOutputFormatter.php
@@ -9,7 +9,8 @@
 * @var array type => class
 */
protected static $formatters = array(
-   'flyout' => 'EchoFlyoutFormatter'
+   'flyout' => 'EchoFlyoutFormatter',
+   'model' => 'EchoModelFormatter',
);
 
/**
@@ -100,7 +101,7 @@
 
// This is only meant for unread notifications, if a 
notification has a target
// page, then it shouldn't be auto marked as read unless the 
user visits
-   // the target page or a user marks it as read manully ( coming 
soon )
+   // the target page or a user marks it as read manually ( coming 
soon )
$output['targetpages'] = array();
if ( $notification->getTargetPages() ) {
foreach ( $notification->getTargetPages() as 
$targetPage ) {
diff --git a/includes/api/ApiEchoNotifications.php 
b/includes/api/ApiEchoNotifications.php
index e1f4e83..acef4ea 100644
--- a/includes/api/ApiEchoNotifications.php
+++ b/includes/api/ApiEchoNotifications.php
@@ -220,6 +220,7 @@
'text',
'flyout',
'html',
+   'model',
),
),
'limit' => array(
diff --git a/includes/formatters/EchoModelFormatter.php 
b/includes/formatters/EchoModelFormatter.php
new file mode 100644
index 000..cf2cd5b
--- /dev/null
+++ b/includes/formatters/EchoModelFormatter.php
@@ -0,0 +1,15 @@
+ $this->getHeaderMessage()->parse(),
+   'body' => $this->getBodyMessage() ? 
$this->getBodyMessage()->parse() : '',
+   'timestamp' => $this->getTimestamp(),
+   'icon' => $this->getIconType(),
+   'links' => array(
+   'primary' => $this->getPrimaryLink() ?: array(),
+   'secondary' => $this->getSecondaryLinks(),
+   ),
+   );
+   }
 }

-- 
To view, visit https://gerrit.wikimedia.org/r/253341
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibc3ad54c94d6ea9bf751f3927cf69e1d062f4780
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Echo
Gerrit-Branch: master
Gerrit-Owner: Matthias Mullie 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] RuboCop: fixed Style/StringLiterals offense - change (operations/puppet)

2015-11-16 Thread Zfilipin (Code Review)

Zfilipin has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/253351

Change subject: RuboCop: fixed Style/StringLiterals offense
..

RuboCop: fixed Style/StringLiterals offense

See:
https://github.com/bbatsov/ruby-style-guide#consistent-string-literals

Bug: T112651
Change-Id: I4fdfebe794981f94b843a7b4aca198a99528e12f
---
M .rubocop_todo.yml
M Rakefile
M modules/apt/lib/facter/apt.rb
M modules/bacula/spec/defines/fileset_spec.rb
M modules/base/files/monitoring/check_puppetrun
M modules/base/lib/facter/initsystem.rb
M modules/base/lib/facter/labsproject.rb
M modules/base/lib/facter/physicalcorecount.rb
M modules/base/spec/functions/pick_initscript_spec.rb
M modules/base/spec/spec_helper.rb
M modules/ganeti/lib/facter/ganeti.rb
M modules/ganglia/lib/puppet/parser/functions/ganglia_aggregator_config.rb
M modules/ganglia/lib/puppet/parser/functions/suffix.rb
M modules/git/spec/defines/user_spec.rb
M modules/librenms/lib/puppet/parser/functions/phpdump.rb
M modules/nrpe/spec/defines/monitor_service_spec.rb
M modules/puppetmaster/files/puppetstoredconfigclean.rb
M modules/service/Rakefile
M modules/strongswan/spec/functions/ipresolve_spec.rb
M modules/wmflib/lib/hiera/backend/mwyaml_backend.rb
M modules/wmflib/lib/hiera/backend/nuyaml_backend.rb
M modules/wmflib/lib/hiera/backend/proxy_backend.rb
M modules/wmflib/lib/hiera/backend/role_backend.rb
M modules/wmflib/lib/hiera/mwcache.rb
M modules/wmflib/lib/puppet/parser/functions/ordered_yaml.rb
M modules/wmflib/lib/puppet/parser/functions/os_version.rb
M modules/wmflib/lib/puppet/parser/functions/ssl_ciphersuite.rb
M modules/wmflib/spec/functions/role_spec.rb
M modules/wmflib/spec/hiera/proxy_backend_spec.rb
M modules/wmflib/spec/hiera/role_backend_spec.rb
M utils/expanderb.rb
M utils/hiera_lookup
32 files changed, 151 insertions(+), 157 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/51/253351/1

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 392497e..ebe694c 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -420,12 +420,6 @@
 - 'modules/puppetmaster/files/puppetstoredconfigclean.rb'
 - 'utils/expanderb.rb'
 
-# Offense count: 153
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles.
-Style/StringLiterals:
-  Enabled: false
-
 # Offense count: 116
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyleForMultiline, SupportedStyles.
diff --git a/Rakefile b/Rakefile
index 2d2c6a6..d86ecc5 100644
--- a/Rakefile
+++ b/Rakefile
@@ -34,7 +34,7 @@
 require'puppet/util/colors'
 include Puppet::Util::Colors
 rescue LoadError
-puts "Cant load puppet/util/colors .. no color for you!"
+puts 'Cant load puppet/util/colors .. no color for you!'
 end
 end
 
@@ -60,9 +60,9 @@
 ---[Available rake tasks]--"
 
 # Show our tasks list.
-system "rake -T"
+system 'rake -T'
 
-puts "---"
+puts '---'
 puts "
 Examples:
 
@@ -82,35 +82,35 @@
 system('puppet-lint .')
 end
 
-desc "Build documentation"
+desc 'Build documentation'
 task :doc do
 doc_cmd = [
-"puppet doc",
-"--mode rdoc",
-"--all",  # build all references
-"--manifestdir manifests",
-"--modulepath modules",
+'puppet doc',
+'--mode rdoc',
+'--all',  # build all references
+'--manifestdir manifests',
+'--modulepath modules',
 ].join(' ')
 puts "Running #{doc_cmd}"
 system(doc_cmd)
 end
 
-desc "Lint puppet files"
+desc 'Lint puppet files'
 task :lint => :run_puppet_lint
 
-desc "Validate puppet syntax (default: manifests/site.pp)"
+desc 'Validate puppet syntax (default: manifests/site.pp)'
 task :validate, [:files ] do |_t, args|
 
 success = true
 
 if args.files
-puts console_color(:info, "Validating " + args.files.inspect)
+puts console_color(:info, 'Validating ' + args.files.inspect)
 ok = puppet_parser_validate args.files
 else
 ok = puppet_parser_validate 'manifests/site.pp'
 success &&= ok
 
-Dir.glob("modules/*").each do |dir|
+Dir.glob('modules/*').each do |dir|
 puts console_color(:info, "Validating manifests in '#{dir}'")
 ok = puppet_parser_validate Dir.glob("#{dir}/**/*.pp")
 success &&= ok
@@ -118,7 +118,7 @@
 end
 
 if success
-puts "[OK] " + console_color(:info,  "files looks fine!")
+puts '[OK] ' + console_color(:info,  'files looks fine!')
 else
 raise console_color(:alert, "puppet failed to validate files (exit: 
#{res.exitstatus}")
 end
@@ -130,14 +130,14 @@
 sh "puppet parser validate #{manifests}"
 end
 
-desc "Run spec

[MediaWiki-commits] [Gerrit] RuboCop: fixed Style/Tab offense - change (operations/puppet)

2015-11-16 Thread Zfilipin (Code Review)

Zfilipin has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/253350

Change subject: RuboCop: fixed Style/Tab offense
..

RuboCop: fixed Style/Tab offense

See https://github.com/bbatsov/ruby-style-guide#spaces-indentation

Bug: T112651
Change-Id: Ic6f1ac891b4cc38408a16b8b3521d939a1c5c5e2
---
M .rubocop_todo.yml
M modules/apt/lib/facter/apt.rb
M modules/git/spec/defines/user_spec.rb
M utils/expanderb.rb
4 files changed, 49 insertions(+), 57 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/50/253350/1

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index d7ea563..392497e 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -426,14 +426,6 @@
 Style/StringLiterals:
   Enabled: false
 
-# Offense count: 49
-# Cop supports --auto-correct.
-Style/Tab:
-  Exclude:
-- 'modules/apt/lib/facter/apt.rb'
-- 'modules/git/spec/defines/user_spec.rb'
-- 'utils/expanderb.rb'
-
 # Offense count: 116
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyleForMultiline, SupportedStyles.
diff --git a/modules/apt/lib/facter/apt.rb b/modules/apt/lib/facter/apt.rb
index c86eb16..9cea99f 100644
--- a/modules/apt/lib/facter/apt.rb
+++ b/modules/apt/lib/facter/apt.rb
@@ -1,6 +1,6 @@
 Facter.add("package_updates") do
-   confine :operatingsystem => %w{Debian Ubuntu}
-   setcode do
-   %x{/usr/local/bin/apt2xml 2>/dev/null}.chomp
-   end
+  confine :operatingsystem => %w{Debian Ubuntu}
+  setcode do
+%x{/usr/local/bin/apt2xml 2>/dev/null}.chomp
+  end
 end
diff --git a/modules/git/spec/defines/user_spec.rb 
b/modules/git/spec/defines/user_spec.rb
index 468ffba..1bdd2fa 100644
--- a/modules/git/spec/defines/user_spec.rb
+++ b/modules/git/spec/defines/user_spec.rb
@@ -8,23 +8,23 @@
 
 describe 'git::userconfig', :type => :define do
 
-   let(:title) { 'gitconfig' }
+  let(:title) { 'gitconfig' }
 
-   context "Setting up user name and email" do
-   let(:params) { {
-   :homedir => '/tmp/foo',
-   :settings => {
-   'user' => {
-   'name' => 'Antoine Musso',
-   'email' => 'has...@free.fr',
-   }
-   } }
-   }
-   it { should contain_file('/tmp/foo/.gitconfig') \
-   .with_content(/[user]\n/) \
-   .with_content(/name = Antoine Musso\n/) \
-   .with_content(/email = has...@free.fr\n/)
-   }
-   end
+  context "Setting up user name and email" do
+let(:params) { {
+  :homedir => '/tmp/foo',
+  :settings => {
+  'user' => {
+'name' => 'Antoine Musso',
+'email' => 'has...@free.fr',
+  }
+} }
+}
+it { should contain_file('/tmp/foo/.gitconfig') \
+  .with_content(/[user]\n/) \
+  .with_content(/name = Antoine Musso\n/) \
+  .with_content(/email = has...@free.fr\n/)
+}
+  end
 
 end
diff --git a/utils/expanderb.rb b/utils/expanderb.rb
index 503d356..3911f9a 100755
--- a/utils/expanderb.rb
+++ b/utils/expanderb.rb
@@ -19,54 +19,54 @@
 # Parsing the options
 optparse = OptionParser.new do |opts|
 
-   opts.banner = "Usage: expanderb.rb -f FILENAME [key=val [key2=val]]"
+  opts.banner = "Usage: expanderb.rb -f FILENAME [key=val [key2=val]]"
 
-   opts.on( '-f', '--filename FILENAME', 'ERB filename to expand') do |f|
-   $filename = f
-   end
+  opts.on( '-f', '--filename FILENAME', 'ERB filename to expand') do |f|
+$filename = f
+  end
 
-   opts.on_tail( '-h', '--help', 'Show this message' ) do
-   puts opts
-   exit
-   end
+  opts.on_tail( '-h', '--help', 'Show this message' ) do
+puts opts
+exit
+  end
 end
 
 # Parse command line options.
 begin
-   # -f is mandatory
-   optparse.parse!
-   if $filename.nil?
-   puts "You must specify an ERB filename."
-   puts optparse
-   exit
-   end
+  # -f is mandatory
+  optparse.parse!
+  if $filename.nil?
+ puts "You must specify an ERB filename."
+puts optparse
+exit
+  end
 rescue
-   # Catch all
-   puts $!.to_s
-   puts optparse
-   exit
+  # Catch all
+  puts $!.to_s
+  puts optparse
+  exit
 end
 
 template_values = {}
 ARGV.each do |val|
-   key, value = val.split( '=' )
-   template_values[key] = value
+  key, value = val.split( '=' )
+  template_values[key] = value
 end
 p template_values
 
 
 
 def render_erb(template, locals)
-   # Make sure we can render templates with -%> closing tags.
-   # Note that this does not actually remove newlines after -%>, it just
-   # avoids a syntax error.
-   ERB.new(template, nil, 
'%<>-').result(OpenStruct.new(locals).instance_eval { binding })
+  # Make sure we can

[MediaWiki-commits] [Gerrit] RuboCop: fixed Style/TrailingBlankLines offense - change (operations/puppet)

2015-11-16 Thread Zfilipin (Code Review)

Zfilipin has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/253349

Change subject: RuboCop: fixed Style/TrailingBlankLines offense
..

RuboCop: fixed Style/TrailingBlankLines offense

Bug: T112651
Change-Id: Ib46d40dcf8ae173f48151a8f162801a8ea32a29f
---
M .rubocop_todo.yml
M modules/base/lib/facter/labsproject.rb
2 files changed, 0 insertions(+), 8 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/49/253349/1

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index d29e4c0..d7ea563 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -434,13 +434,6 @@
 - 'modules/git/spec/defines/user_spec.rb'
 - 'utils/expanderb.rb'
 
-# Offense count: 1
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles.
-Style/TrailingBlankLines:
-  Exclude:
-- 'modules/base/lib/facter/labsproject.rb'
-
 # Offense count: 116
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyleForMultiline, SupportedStyles.
diff --git a/modules/base/lib/facter/labsproject.rb 
b/modules/base/lib/facter/labsproject.rb
index f5c70a5..8358144 100644
--- a/modules/base/lib/facter/labsproject.rb
+++ b/modules/base/lib/facter/labsproject.rb
@@ -16,4 +16,3 @@
 end
   end
 end
-

-- 
To view, visit https://gerrit.wikimedia.org/r/253349
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib46d40dcf8ae173f48151a8f162801a8ea32a29f
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Zfilipin 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Add support for composer/npm - change (mediawiki...Maintenance)

2015-11-16 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged.

Change subject: Add support for composer/npm
..


Add support for composer/npm

Adjust .gitignore

Change-Id: I361a8f503e80db4713b42a8a91cd4c0048192676
---
M .gitignore
A .jscsrc
A .jshintignore
A .jshintrc
A Gruntfile.js
A composer.json
A package.json
7 files changed, 90 insertions(+), 1 deletion(-)

Approvals:
  Hashar: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/.gitignore b/.gitignore
index 98b092a..f9037de 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,6 @@
-.svn
+/composer.lock
+/node_modules/
+/vendor/
 *~
 *.kate-swp
 .*.swp
diff --git a/.jscsrc b/.jscsrc
new file mode 100644
index 000..9d22e3f
--- /dev/null
+++ b/.jscsrc
@@ -0,0 +1,3 @@
+{
+   "preset": "wikimedia"
+}
diff --git a/.jshintignore b/.jshintignore
new file mode 100644
index 000..022b988
--- /dev/null
+++ b/.jshintignore
@@ -0,0 +1,2 @@
+node_modules
+vendor
diff --git a/.jshintrc b/.jshintrc
new file mode 100644
index 000..66e3d48
--- /dev/null
+++ b/.jshintrc
@@ -0,0 +1,24 @@
+{
+   // Enforcing
+   "bitwise": true,
+   "eqeqeq": true,
+   "freeze": true,
+   "latedef": true,
+   "noarg": true,
+   "nonew": true,
+   "undef": true,
+   "unused": true,
+   "strict": false,
+
+   // Relaxing
+   "es5": false,
+
+   // Environment
+   "browser": true,
+   "jquery": true,
+
+   "globals": {
+   "mediaWiki": false,
+   "OO": false
+   }
+}
diff --git a/Gruntfile.js b/Gruntfile.js
new file mode 100644
index 000..9ff580c
--- /dev/null
+++ b/Gruntfile.js
@@ -0,0 +1,35 @@
+/*jshint node:true */
+module.exports = function ( grunt ) {
+   grunt.loadNpmTasks( 'grunt-contrib-jshint' );
+   grunt.loadNpmTasks( 'grunt-jsonlint' );
+   /*grunt.loadNpmTasks( 'grunt-banana-checker' );*/
+   grunt.loadNpmTasks( 'grunt-jscs' );
+
+   grunt.initConfig( {
+   jshint: {
+   options: {
+   jshintrc: true
+   },
+   all: [
+   '**/*.js',
+   '!node_modules/**'
+   ]
+   },
+   jscs: {
+   src: '<%= jshint.all %>'
+   },
+   /* banana: {
+   all: 'i18n/'
+   },
+   */
+   jsonlint: {
+   all: [
+   '**/*.json',
+   '!node_modules/**'
+   ]
+   }
+   } );
+
+   grunt.registerTask( 'test', [ 'jshint', 'jscs', 'jsonlint' /*'banana'*/ 
] );
+   grunt.registerTask( 'default', 'test' );
+};
diff --git a/composer.json b/composer.json
new file mode 100644
index 000..62cc3bd
--- /dev/null
+++ b/composer.json
@@ -0,0 +1,11 @@
+{
+   "require-dev": {
+   "jakub-onderka/php-parallel-lint": "0.9"
+   },
+   "scripts": {
+   "test": [
+   "parallel-lint . --exclude vendor"
+   ]
+   }
+
+}
diff --git a/package.json b/package.json
new file mode 100644
index 000..55ef33b
--- /dev/null
+++ b/package.json
@@ -0,0 +1,12 @@
+{
+  "scripts": {
+"test": "grunt test"
+  },
+  "devDependencies": {
+"grunt": "0.4.5",
+"grunt-cli": "0.1.13",
+"grunt-contrib-jshint": "0.11.3",
+"grunt-jscs": "2.3.0",
+"grunt-jsonlint": "1.0.6"
+  }
+}

-- 
To view, visit https://gerrit.wikimedia.org/r/225225
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I361a8f503e80db4713b42a8a91cd4c0048192676
Gerrit-PatchSet: 13
Gerrit-Project: mediawiki/extensions/Maintenance
Gerrit-Branch: master
Gerrit-Owner: Paladox 
Gerrit-Reviewer: Hashar 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: Paladox 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Remove support for Wikidata build from build script. - change (mediawiki...Wikibase)

2015-11-16 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged.

Change subject: Remove support for Wikidata build from build script.
..


Remove support for Wikidata build from build script.

It is not used for that purpose anymore. Testing of the Wikidata build works on
the Wikimedia Jenkins without a special setup script.

Change-Id: Ic4602b2962d2368aae9fd970a9480cc82cf8d0e0
---
M build/jenkins/mw-apply-wb-settings.sh
1 file changed, 7 insertions(+), 15 deletions(-)

Approvals:
  Aude: Looks good to me, approved
  Thiemo Mättig (WMDE): Looks good to me, but someone else must approve
  jenkins-bot: Verified



diff --git a/build/jenkins/mw-apply-wb-settings.sh 
b/build/jenkins/mw-apply-wb-settings.sh
index d01ba59..a3bd0aa 100755
--- a/build/jenkins/mw-apply-wb-settings.sh
+++ b/build/jenkins/mw-apply-wb-settings.sh
@@ -15,6 +15,11 @@
esac
 done
 
+if [ $BUILD = true ]; then
+  echo "-b true is not supported by this script anymore."
+  exit 1
+fi
+
 function apply_client_settings {
   echo "client"
   echo '$wgEnableWikibaseRepo = false;' >> LocalSettings.php
@@ -23,13 +28,7 @@
   echo '$wgWikimediaJenkinsCI = true;' >> LocalSettings.php
   echo '$wmgUseWikibaseRepo = false;' >> LocalSettings.php
   echo '$wmgUseWikibaseClient = true;' >> LocalSettings.php
-  if [ $BUILD = true ]
-  then
-echo 'require_once __DIR__ . "/extensions/Wikidata/Wikidata.php";' >> 
LocalSettings.php
-echo 'require_once __DIR__ . 
"/extensions/Wikidata/extensions/Wikibase/client/ExampleSettings.php";' >> 
LocalSettings.php
-  else
-echo 'require_once __DIR__ . "/extensions/Wikibase/Wikibase.php";' >> 
LocalSettings.php
-  fi
+  echo 'require_once __DIR__ . "/extensions/Wikibase/Wikibase.php";' >> 
LocalSettings.php
 }
 
 function apply_repo_settings {
@@ -39,14 +38,7 @@
   echo '$wgWikimediaJenkinsCI = true;' >> LocalSettings.php
   echo '$wmgUseWikibaseRepo = true;' >> LocalSettings.php
   echo '$wmgUseWikibaseClient = true;' >> LocalSettings.php
-  if [ $BUILD = true ]
-  then
-echo 'require_once __DIR__ . "/extensions/Wikidata/Wikidata.php";' >> 
LocalSettings.php
-echo 'require_once __DIR__ . 
"/extensions/Wikidata/extensions/Wikibase/repo/ExampleSettings.php";' >> 
LocalSettings.php
-echo 'require_once __DIR__ . 
"/extensions/Wikidata/extensions/Wikibase/client/ExampleSettings.php";' >> 
LocalSettings.php
-  else
-echo 'require_once __DIR__ . "/extensions/Wikibase/Wikibase.php";' >> 
LocalSettings.php
-  fi
+  echo 'require_once __DIR__ . "/extensions/Wikibase/Wikibase.php";' >> 
LocalSettings.php
 }
 
 cd $WORKSPACE/src

-- 
To view, visit https://gerrit.wikimedia.org/r/252449
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic4602b2962d2368aae9fd970a9480cc82cf8d0e0
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: JanZerebecki 
Gerrit-Reviewer: Aude 
Gerrit-Reviewer: Hoo man 
Gerrit-Reviewer: JanZerebecki 
Gerrit-Reviewer: Thiemo Mättig (WMDE) 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Migrate huggle to gitclupdate - change (translatewiki)

2015-11-16 Thread Nikerabbit (Code Review)

Nikerabbit has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/253326

Change subject: Migrate huggle to gitclupdate
..

Migrate huggle to gitclupdate

Change-Id: I5ea975c4222ec32532c592e93c1f6b3a1b55cc32
---
M bin/repocreate
M bin/repoupdate
2 files changed, 1 insertion(+), 6 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/translatewiki 
refs/changes/26/253326/1

diff --git a/bin/repocreate b/bin/repocreate
index 6c9f700..93afad1 100755
--- a/bin/repocreate
+++ b/bin/repocreate
@@ -62,11 +62,6 @@
checkVar 'REPO_FUEL'
git clone "$REPO_FUEL" $PROJECT
 
-elif [ "$PROJECT" = "huggle" ]
-then
-   checkVar 'REPO_HUGGLE'
-   git clone "$REPO_HUGGLE" $PROJECT
-
 elif [ "$PROJECT" = "ihris" ]
 then
checkVar 'REPO_IHRIS_MODULES'
diff --git a/bin/repoupdate b/bin/repoupdate
index 39eda6e..747640a 100755
--- a/bin/repoupdate
+++ b/bin/repoupdate
@@ -52,7 +52,6 @@
 europeana \
 freecol \
 fuel \
-huggle \
 intuition \
 jquery.uls \
 kiwix \
@@ -75,6 +74,7 @@
 GITCLUPDATE="\
 crosswatch \
 entryscape \
+huggle \
 int-orphantalk \
 wikiedudashboard \
 wikipedia-android \

-- 
To view, visit https://gerrit.wikimedia.org/r/253326
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I5ea975c4222ec32532c592e93c1f6b3a1b55cc32
Gerrit-PatchSet: 1
Gerrit-Project: translatewiki
Gerrit-Branch: master
Gerrit-Owner: Nikerabbit 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] pybal: fix config dict types - change (operations...pybal)

2015-11-16 Thread Giuseppe Lavagetto (Code Review)

Giuseppe Lavagetto has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/253325

Change subject: pybal: fix config dict types
..

pybal: fix config dict types

Change-Id: Ib203f50617c640d0983c43936091f594a79e629b
---
M pybal/pybal.py
1 file changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/debs/pybal 
refs/changes/25/253325/1

diff --git a/pybal/pybal.py b/pybal/pybal.py
index d5a89d5..9c08cbc 100755
--- a/pybal/pybal.py
+++ b/pybal/pybal.py
@@ -626,9 +626,9 @@
 bgpannouncement = BGPFailover(configdict)
 
 # Run the web server for instrumentation
-if configdict.get('instrumentation', False):
+if configdict.getboolean('instrumentation', False):
 from twisted.web.server import Site
-port = configdict.get('instrumentation_port', 9090)
+port = configdict.getint('instrumentation_port', 9090)
 factory = Site(instrumentation.ServerRoot())
 reactor.listenTCP(port, factory)
 

-- 
To view, visit https://gerrit.wikimedia.org/r/253325
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib203f50617c640d0983c43936091f594a79e629b
Gerrit-PatchSet: 1
Gerrit-Project: operations/debs/pybal
Gerrit-Branch: master
Gerrit-Owner: Giuseppe Lavagetto 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Split SearchEntities foreach block into separate method - change (mediawiki...Wikibase)

2015-11-16 Thread Aude (Code Review)

Aude has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/253317

Change subject: Split SearchEntities foreach block into separate method
..

Split SearchEntities foreach block into separate method

Change-Id: I60c4b2a97411ba350bd79fc809b1374c3a90ab64
---
M repo/includes/api/SearchEntities.php
1 file changed, 63 insertions(+), 42 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase 
refs/changes/17/253317/1

diff --git a/repo/includes/api/SearchEntities.php 
b/repo/includes/api/SearchEntities.php
index 498394e..14ee638 100644
--- a/repo/includes/api/SearchEntities.php
+++ b/repo/includes/api/SearchEntities.php
@@ -122,48 +122,66 @@
);
 
$entries = array();
+
foreach ( $searchResults as $match ) {
-   //TODO: use EntityInfoBuilder, EntityInfoTermLookup
-   $title = $this->titleLookup->getTitleForId( 
$match->getEntityId() );
-   $entry = array(
-   'id' => 
$match->getEntityId()->getSerialization(),
-   'concepturi' => $this->conceptBaseUri . 
$match->getEntityId()->getSerialization(),
-   'url' => $title->getFullUrl(),
-   'title' => $title->getPrefixedText(),
-   'pageid' => $title->getArticleID()
-   );
-   $displayLabel = $match->getDisplayLabel();
-   if ( !is_null( $displayLabel ) ) {
-   $entry['label'] = $displayLabel->getText();
-   }
-   $displayDescription = $match->getDisplayDescription();
-   if ( !is_null( $displayDescription ) ) {
-   $entry['description'] = 
$displayDescription->getText();
-   }
-   $entry['match']['type'] = $match->getMatchedTermType();
-
-   //Special handling for 'entityId's as these are not 
actually Term objects
-   if ( $entry['match']['type'] === 'entityId' ) {
-   $entry['match']['text'] = $entry['id'];
-   $entry['aliases'] = array( $entry['id'] );
-   } else {
-   $matchedTerm = $match->getMatchedTerm();
-   $matchedTermText = $matchedTerm->getText();
-   $entry['match']['language'] = 
$matchedTerm->getLanguageCode();
-   $entry['match']['text'] = $matchedTermText;
-
-   /**
-* Add matched terms to the aliases key in the 
result to give some context for the matched Term
-* if the matched term is different to the 
alias.
-* XXX: This appears odd but is used in the UI 
/ Entity suggesters
-*/
-   if ( !array_key_exists( 'label', $entry ) || 
$matchedTermText != $entry['label'] ) {
-   $entry['aliases'] = array( 
$matchedTerm->getText() );
-   }
-   }
-   $entries[] = $entry;
+   $entries[] = $this->buildTermSearchMatchEntry( $match );
}
+
return $entries;
+   }
+
+   /**
+* @param TermSearchResult $match
+*
+* @return array
+*/
+   private function buildTermSearchMatchEntry( $match ) {
+   // TODO: use EntityInfoBuilder, EntityInfoTermLookup
+   $title = $this->titleLookup->getTitleForId( 
$match->getEntityId() );
+
+   $entry = array(
+   'id' => $match->getEntityId()->getSerialization(),
+   'concepturi' => $this->conceptBaseUri . 
$match->getEntityId()->getSerialization(),
+   'url' => $title->getFullUrl(),
+   'title' => $title->getPrefixedText(),
+   'pageid' => $title->getArticleID()
+   );
+
+   $displayLabel = $match->getDisplayLabel();
+
+   if ( !is_null( $displayLabel ) ) {
+   $entry['label'] = $displayLabel->getText();
+   }
+
+   $displayDescription = $match->getDisplayDescription();
+
+   if ( !is_null( $displayDescription ) ) {
+   $entry['description'] = $displayDescription->getText();
+   }
+
+   $entry['match']['type'] = $match->getMatchedTermType();
+
+   // Special handling for 'entityId's as these are not actually 
Term objects
+   if ( $entry['match']['type'] === 'entityId' ) {

[MediaWiki-commits] [Gerrit] Remove unused TermIndex from EntitySearchHelper - change (mediawiki...Wikibase)

2015-11-16 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged.

Change subject: Remove unused TermIndex from EntitySearchHelper
..


Remove unused TermIndex from EntitySearchHelper

Change-Id: I0b28a19211777d3128bc505b5b2edc9bd3ba99fb
---
M repo/includes/api/EntitySearchHelper.php
M repo/includes/api/SearchEntities.php
M repo/tests/phpunit/includes/api/EntitySearchHelperTest.php
3 files changed, 0 insertions(+), 16 deletions(-)

Approvals:
  Daniel Kinzler: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/repo/includes/api/EntitySearchHelper.php 
b/repo/includes/api/EntitySearchHelper.php
index 5d5a9d9..066c31f 100644
--- a/repo/includes/api/EntitySearchHelper.php
+++ b/repo/includes/api/EntitySearchHelper.php
@@ -11,7 +11,6 @@
 use Wikibase\Lib\Store\EntityTitleLookup;
 use Wikibase\Lib\Interactors\TermIndexSearchInteractor;
 use Wikibase\Lib\Interactors\TermSearchResult;
-use Wikibase\TermIndex;
 use Wikibase\TermIndexEntry;
 
 /**
@@ -38,11 +37,6 @@
private $termIndexSearchInteractor;
 
/**
-* @var TermIndex
-*/
-   private $termIndex;
-
-   /**
 * @var LabelDescriptionLookup
 */
private $labelDescriptionLookup;
@@ -51,13 +45,11 @@
EntityTitleLookup $titleLookup,
EntityIdParser $idParser,
TermIndexSearchInteractor $termIndexSearchInteractor,
-   TermIndex $termIndex,
LabelDescriptionLookup $labelDescriptionLookup
) {
$this->titleLookup = $titleLookup;
$this->idParser = $idParser;
$this->termIndexSearchInteractor = $termIndexSearchInteractor;
-   $this->termIndex = $termIndex;
$this->labelDescriptionLookup = $labelDescriptionLookup;
}
 
diff --git a/repo/includes/api/SearchEntities.php 
b/repo/includes/api/SearchEntities.php
index 2ee1f35..498394e 100644
--- a/repo/includes/api/SearchEntities.php
+++ b/repo/includes/api/SearchEntities.php
@@ -63,7 +63,6 @@
$repo->getEntityTitleLookup(),
$repo->getEntityIdParser(),
$repo->newTermSearchInteractor( 
$this->getLanguage()->getCode() ),
-   $repo->getStore()->getTermIndex(),
new LanguageFallbackLabelDescriptionLookup(
$repo->getTermLookup(),
$repo->getLanguageFallbackChainFactory()
diff --git a/repo/tests/phpunit/includes/api/EntitySearchHelperTest.php 
b/repo/tests/phpunit/includes/api/EntitySearchHelperTest.php
index 02b8716..e3c1402 100644
--- a/repo/tests/phpunit/includes/api/EntitySearchHelperTest.php
+++ b/repo/tests/phpunit/includes/api/EntitySearchHelperTest.php
@@ -102,18 +102,11 @@
return $mock;
}
 
-   private function getMockTermIndex() {
-   return new MockTermIndex(
-   array()
-   );
-   }
-
private function newEntitySearchHelper( TermIndexSearchInteractor 
$searchInteractor ) {
return new EntitySearchHelper(
$this->getMockTitleLookup(),
new BasicEntityIdParser(),
$searchInteractor,
-   $this->getMockTermIndex(),
$this->getMockLabelDescriptionLookup()
);
}

-- 
To view, visit https://gerrit.wikimedia.org/r/253315
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I0b28a19211777d3128bc505b5b2edc9bd3ba99fb
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Aude 
Gerrit-Reviewer: Addshore 
Gerrit-Reviewer: Bene 
Gerrit-Reviewer: Daniel Kinzler 
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: rsync server to hold jobs caches - change (operations/puppet)

2015-11-16 Thread Hashar (Code Review)

Hashar has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/253322

Change subject: contint: rsync server to hold jobs caches
..

contint: rsync server to hold jobs caches

Bug: T116017
Change-Id: Ie374ba31ecd4d90aa82af11cd2b04f78367bc903
---
M manifests/role/ci.pp
1 file changed, 28 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/22/253322/1

diff --git a/manifests/role/ci.pp b/manifests/role/ci.pp
index 3b7bc22..fb429c4 100644
--- a/manifests/role/ci.pp
+++ b/manifests/role/ci.pp
@@ -436,6 +436,34 @@
 
 }
 
+# == Class role::ci::cache-rsync
+#
+# rsync server to store cache related material from CI jobs.
+class role::ci::cache-rsync {
+requires_realm( 'labs' )
+
+include role::labs::lvm::srv
+include rsync::server
+
+file { '/srv/caches':
+ensure => directory,
+owner  => 'root',
+group  => 'root',
+mode=> '0775',
+require => Class['role::labs::lvm::srv'],
+}
+
+rsync::server::module { 'caches':
+path  => '/srv/caches',
+read_only => 'no',
+require   => [
+File['/srv/caches'],
+Class['role::labs::lvm::srv'],
+],
+}
+
+}
+
 # == Class role::ci::publisher::labs
 #
 # Intermediary rsync hosts in labs to let Jenkins slave publish their results

-- 
To view, visit https://gerrit.wikimedia.org/r/253322
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie374ba31ecd4d90aa82af11cd2b04f78367bc903
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Hashar 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] [DNM] add browsertest to be run by jenkins - change (mediawiki...Wikibase)

2015-11-16 Thread JanZerebecki (Code Review)

JanZerebecki has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/253324

Change subject: [DNM] add browsertest to be run by jenkins
..

[DNM] add browsertest to be run by jenkins

copied from WikidataBrowserTests.git

Change-Id: If4e1a88adca38ea7c719dc1398c71f0747f4b7e4
---
A tests/browser/Gemfile
A tests/browser/Gemfile.lock
A tests/browser/config/config.yml.sample
A tests/browser/config/config_ci.yml
A tests/browser/config/cucumber.yml.parallel
A tests/browser/environments.yml
A tests/browser/features/item_smoke.feature
7 files changed, 285 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase 
refs/changes/24/253324/1

diff --git a/tests/browser/Gemfile b/tests/browser/Gemfile
new file mode 100644
index 000..7ee7f08
--- /dev/null
+++ b/tests/browser/Gemfile
@@ -0,0 +1,11 @@
+# ruby=ruby-2.1.1
+# ruby-gemset=Wikibase
+
+source 'https://rubygems.org'
+
+gem 'activesupport'
+gem 'mediawiki_api-wikidata', '~> 0.2.0'
+gem 'mediawiki_selenium', '~> 1.6.2'
+gem 'parallel_tests'
+gem 'require_all'
+gem 'rubocop', require: false
diff --git a/tests/browser/Gemfile.lock b/tests/browser/Gemfile.lock
new file mode 100644
index 000..9fdee44
--- /dev/null
+++ b/tests/browser/Gemfile.lock
@@ -0,0 +1,131 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+activesupport (4.2.4)
+  i18n (~> 0.7)
+  json (~> 1.7, >= 1.7.7)
+  minitest (~> 5.1)
+  thread_safe (~> 0.3, >= 0.3.4)
+  tzinfo (~> 1.1)
+ast (2.1.0)
+astrolabe (1.3.1)
+  parser (~> 2.2)
+builder (3.2.2)
+childprocess (0.5.7)
+  ffi (~> 1.0, >= 1.0.11)
+cucumber (1.3.20)
+  builder (>= 2.1.2)
+  diff-lcs (>= 1.1.3)
+  gherkin (~> 2.12)
+  multi_json (>= 1.7.5, < 2.0)
+  multi_test (>= 0.1.2)
+data_magic (0.21)
+  faker (>= 1.1.2)
+  yml_reader (>= 0.4)
+diff-lcs (1.2.5)
+domain_name (0.5.25)
+  unf (>= 0.0.5, < 1.0.0)
+faker (1.5.0)
+  i18n (~> 0.5)
+faraday (0.9.2)
+  multipart-post (>= 1.2, < 3)
+faraday-cookie_jar (0.0.6)
+  faraday (>= 0.7.4)
+  http-cookie (~> 1.0.0)
+ffi (1.9.10)
+ffi (1.9.10-x86-mingw32)
+gherkin (2.12.2)
+  multi_json (~> 1.3)
+gherkin (2.12.2-x86-mingw32)
+  multi_json (~> 1.3)
+headless (2.2.0)
+http-cookie (1.0.2)
+  domain_name (~> 0.5)
+i18n (0.7.0)
+json (1.8.3)
+mediawiki_api (0.5.0)
+  faraday (~> 0.9, >= 0.9.0)
+  faraday-cookie_jar (~> 0.0, >= 0.0.6)
+mediawiki_api-wikidata (0.2)
+  mediawiki_api (~> 0.5.0)
+mediawiki_selenium (1.6.2)
+  cucumber (~> 1.3, >= 1.3.20)
+  headless (~> 2.0, >= 2.1.0)
+  json (~> 1.8, >= 1.8.1)
+  mediawiki_api (~> 0.5, >= 0.5.0)
+  page-object (~> 1.0)
+  rest-client (~> 1.6, >= 1.6.7)
+  rspec-core (~> 2.14, >= 2.14.4)
+  rspec-expectations (~> 2.14, >= 2.14.4)
+  syntax (~> 1.2, >= 1.2.0)
+  thor (~> 0.19, >= 0.19.1)
+mime-types (2.6.2)
+minitest (5.8.2)
+multi_json (1.11.2)
+multi_test (0.1.2)
+multipart-post (2.0.0)
+netrc (0.11.0)
+page-object (1.1.0)
+  page_navigation (>= 0.9)
+  selenium-webdriver (>= 2.44.0)
+  watir-webdriver (>= 0.6.11)
+page_navigation (0.9)
+  data_magic (>= 0.14)
+parallel (1.6.1)
+parallel_tests (1.9.0)
+  parallel
+parser (2.2.3.0)
+  ast (>= 1.1, < 3.0)
+powerpack (0.1.1)
+rainbow (2.0.0)
+require_all (1.3.3)
+rest-client (1.8.0)
+  http-cookie (>= 1.0.2, < 2.0)
+  mime-types (>= 1.16, < 3.0)
+  netrc (~> 0.7)
+rest-client (1.8.0-x86-mingw32)
+  ffi (~> 1.9)
+  http-cookie (>= 1.0.2, < 2.0)
+  mime-types (>= 1.16, < 3.0)
+  netrc (~> 0.7)
+rspec-core (2.99.2)
+rspec-expectations (2.99.2)
+  diff-lcs (>= 1.1.3, < 2.0)
+rubocop (0.34.2)
+  astrolabe (~> 1.3)
+  parser (>= 2.2.2.5, < 3.0)
+  powerpack (~> 0.1)
+  rainbow (>= 1.99.1, < 3.0)
+  ruby-progressbar (~> 1.4)
+ruby-progressbar (1.7.5)
+rubyzip (1.1.7)
+selenium-webdriver (2.48.1)
+  childprocess (~> 0.5)
+  multi_json (~> 1.0)
+  rubyzip (~> 1.0)
+  websocket (~> 1.0)
+syntax (1.2.0)
+thor (0.19.1)
+thread_safe (0.3.5)
+tzinfo (1.2.2)
+  thread_safe (~> 0.1)
+unf (0.1.4)
+  unf_ext
+unf_ext (0.0.7.1)
+unf_ext (0.0.7.1-x86-mingw32)
+watir-webdriver (0.9.1)
+  selenium-webdriver (>= 2.46.2)
+websocket (1.2.2)
+yml_reader (0.5)
+
+PLATFORMS
+  ruby
+  x86-mingw32
+
+DEPENDENCIES
+  activesupport
+  mediawiki_api-wikidata (~> 0.2.0)
+  mediawiki_selenium (~> 1.6.2)
+  parallel_tests
+  require_all
+  rubocop
diff --git a/tests/browser/config/config.yml.sample 
b/tests/browser/config/config.yml.sample
new file mode 100644
index 000..4fce284
--- /dev/null
+++ b/tests/browser/config/config.yml.sample
@@ -0,0 +1,34

[MediaWiki-commits] [Gerrit] graphite: add metric tapping - change (operations/puppet)

2015-11-16 Thread Filippo Giunchedi (Code Review)

Filippo Giunchedi has submitted this change and it was merged.

Change subject: graphite: add metric tapping
..


graphite: add metric tapping

one of the advantages of carbon-c-relay is to be able to tap or route metrics
around, thus provide basic support for doing both.

Change-Id: I0cc11f17337790bde0af225cc1621a633d9054e0
---
M modules/graphite/manifests/carbon_c_relay.pp
M modules/graphite/manifests/init.pp
M modules/graphite/templates/frontend-relay.conf.erb
3 files changed, 26 insertions(+), 1 deletion(-)

Approvals:
  Ori.livneh: Looks good to me, but someone else must approve
  Filippo Giunchedi: Verified; Looks good to me, approved



diff --git a/modules/graphite/manifests/carbon_c_relay.pp 
b/modules/graphite/manifests/carbon_c_relay.pp
index a32a5e5..55baf63 100644
--- a/modules/graphite/manifests/carbon_c_relay.pp
+++ b/modules/graphite/manifests/carbon_c_relay.pp
@@ -7,7 +7,11 @@
 # * local-relay: takes metrics on port 1903 and forwards to all configured
 # carbon-cache processes on the local machine ('carbon-cache' list in config)
 # * frontend-relay: listen on standard port 2003 and mirror metrics to all
-# configured backends ('backends' list in config)
+# configured backends ('backends' list in config).
+#
+# The frontend also supports metric tapping ('teeing' data inline) and
+# metric routing (no duplication) to specific clusters. Respectively via
+# 'cluster_tap' and 'cluster_routes' maps c_relay_settings.
 #
 class graphite::carbon_c_relay( $c_relay_settings ) {
 package { 'carbon-c-relay':
diff --git a/modules/graphite/manifests/init.pp 
b/modules/graphite/manifests/init.pp
index c9b36f1..f95aff0 100644
--- a/modules/graphite/manifests/init.pp
+++ b/modules/graphite/manifests/init.pp
@@ -44,6 +44,8 @@
 'backends' => [
 'localhost:1903',
 ],
+'cluster_tap' => {},
+'cluster_routes' => {},
 }
 
 class { '::graphite::carbon_c_relay':
diff --git a/modules/graphite/templates/frontend-relay.conf.erb 
b/modules/graphite/templates/frontend-relay.conf.erb
index 2f95734..59ef7de 100644
--- a/modules/graphite/templates/frontend-relay.conf.erb
+++ b/modules/graphite/templates/frontend-relay.conf.erb
@@ -5,6 +5,25 @@
   <% end -%>
   ;
 
+
+<% @c_relay_settings['cluster_tap'].each do |tap| -%>
+# duplicate (tap) this metric to <%= tap[1] %>
+match <%= tap[0] %>
+  send to <%= tap[1] %>
+  ;
+
+<% end -%>
+
+<% @c_relay_settings['cluster_routes'].each do |route| -%>
+# route this metric to <%= route[1] %>, don't send to backends
+match <%= route[0] %>
+  send to <%= route[1] %>
+  stop
+  ;
+
+<% end -%>
+
+# catch-all, send to backends if it made this far
 match *
   send to backends
   ;

-- 
To view, visit https://gerrit.wikimedia.org/r/243906
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I0cc11f17337790bde0af225cc1621a633d9054e0
Gerrit-PatchSet: 6
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Filippo Giunchedi 
Gerrit-Reviewer: Chasemp 
Gerrit-Reviewer: Filippo Giunchedi 
Gerrit-Reviewer: Ori.livneh 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Make RelatedArticles soft-depend on Cards - change (mediawiki...RelatedArticles)

2015-11-16 Thread Bmansurov (Code Review)

Bmansurov has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/253318

Change subject: Make RelatedArticles soft-depend on Cards
..

Make RelatedArticles soft-depend on Cards

RelatedArticles tries to load the 'ext.cards' module and if
it succeeds it continues with showing the related articles
on the page.

Dependency: I6661527175eb889cec4193b18fa18207f332b4fc
Bug: T117108
Change-Id: I33936a3e9cd5d1f0296e48fd1c2bba77fff4e466
---
M extension.json
M includes/ReadMoreHooks.php
M resources/ext.relatedArticles.readMore.bootstrap/index.js
R resources/ext.relatedArticles.readMore.gateway/RelatedPagesGateway.js
D resources/ext.relatedArticles.readMore.minerva/index.js
R resources/ext.relatedArticles.readMore/eventLogging.js
A resources/ext.relatedArticles.readMore/index.js
R resources/ext.relatedArticles.readMore/readMore.less
R tests/qunit/ext.relatedArticles.readMore.gateway/test_RelatedPagesGateway.js
9 files changed, 79 insertions(+), 101 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/RelatedArticles 
refs/changes/18/253318/1

diff --git a/extension.json b/extension.json
index ebea57c..8057b88 100644
--- a/extension.json
+++ b/extension.json
@@ -63,9 +63,9 @@
},
"manifest_version": 1,
"ResourceModules": {
-   "ext.relatedArticles.readMore": {
+   "ext.relatedArticles.readMore.gateway": {
"scripts": [
-   
"resources/ext.relatedArticles.readMore/RelatedPagesGateway.js"
+   
"resources/ext.relatedArticles.readMore.gateway/RelatedPagesGateway.js"
],
"dependencies": [
"oojs"
@@ -81,7 +81,7 @@
],
"dependencies": [
"mediawiki.api",
-   "ext.relatedArticles.readMore"
+   "ext.relatedArticles.readMore.gateway"
],
"targets": [
"mobile",
diff --git a/includes/ReadMoreHooks.php b/includes/ReadMoreHooks.php
index c823342..c537b00 100644
--- a/includes/ReadMoreHooks.php
+++ b/includes/ReadMoreHooks.php
@@ -23,12 +23,12 @@
'targets' => array( 'desktop', 'mobile' ),
);
 
-   $modules['qunit']['ext.relatedArticles.readMore.tests'] = 
$boilerplate + array(
+   $modules['qunit']['ext.relatedArticles.readMore.gateway.tests'] 
= $boilerplate + array(
'scripts' => array(
-   
'ext.relatedArticles.readMore/test_RelatedPagesGateway.js',
+   
'ext.relatedArticles.readMore.gateway/test_RelatedPagesGateway.js',
),
'dependencies' => array(
-   'ext.relatedArticles.readMore',
+   'ext.relatedArticles.readMore.gateway',
),
);
return true;
@@ -84,7 +84,7 @@
 
if (
$showReadMore &&
-   get_class( $skin ) === 'SkinMinervaBeta' &&
+   get_class( $skin ) !== 'SkinMinerva' &&
$title->inNamespace( NS_MAIN ) &&
!$title->isMainPage()
) {
@@ -131,7 +131,7 @@
}
 
/**
-* Register the "ext.relatedArticles.readMore.minerva" module.
+* Register the "ext.relatedArticles.readMore" module.
 * Optionally update the dependencies and scripts if EventLogging is 
installed.
 *
 * @see 
https://www.mediawiki.org/wiki/Manual:Hooks/ResourceLoaderRegisterModules
@@ -144,21 +144,21 @@
"mediawiki.user"
);
$scripts = array(
-   
"resources/ext.relatedArticles.readMore.minerva/index.js"
+   "resources/ext.relatedArticles.readMore/index.js"
);
 
if ( class_exists( 'EventLogging' ) ) {
$dependencies[] = "ext.eventLogging.Schema";
-   $scripts[] = 
"resources/ext.relatedArticles.readMore.minerva/eventLogging.js";
+   $scripts[] = 
"resources/ext.relatedArticles.readMore/eventLogging.js";
}
 
$resourceLoader->register(
-   "ext.relatedArticles.readMore.minerva",
+   "ext.relatedArticles.readMore",
array(
"dependencies" => $dependencies,
"scripts" => $scripts,
"styles" => array(
-

[MediaWiki-commits] [Gerrit] lvs100[1-6]: dhcp -> jessie - change (operations/puppet)

2015-11-16 Thread BBlack (Code Review)

BBlack has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/253319

Change subject: lvs100[1-6]: dhcp -> jessie
..

lvs100[1-6]: dhcp -> jessie

Change-Id: I0278ffcfb42fa1b42b25724a3648976eec55a639
---
M modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
1 file changed, 12 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/19/253319/1

diff --git a/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200 
b/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
index 80e6a6a..0e6cd08 100644
--- a/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
+++ b/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
@@ -2783,31 +2783,43 @@
 host lvs1001 {
hardware ethernet 18:03:73:f0:89:69;
fixed-address lvs1001.wikimedia.org;
+   option pxelinux.pathprefix "jessie-installer/";
+   filename "jessie-installer/debian-installer/amd64/pxelinux.0";
 }
 
 host lvs1002 {
hardware ethernet 18:03:73:f0:8e:dc;
fixed-address lvs1002.wikimedia.org;
+   option pxelinux.pathprefix "jessie-installer/";
+   filename "jessie-installer/debian-installer/amd64/pxelinux.0";
 }
 
 host lvs1003 {
hardware ethernet 18:03:73:f0:8b:07;
fixed-address lvs1003.wikimedia.org;
+   option pxelinux.pathprefix "jessie-installer/";
+   filename "jessie-installer/debian-installer/amd64/pxelinux.0";
 }
 
 host lvs1004 {
hardware ethernet 18:03:73:f0:8c:30;
fixed-address lvs1004.wikimedia.org;
+   option pxelinux.pathprefix "jessie-installer/";
+   filename "jessie-installer/debian-installer/amd64/pxelinux.0";
 }
 
 host lvs1005 {
hardware ethernet 18:03:73:f0:8e:28;
fixed-address lvs1005.wikimedia.org;
+   option pxelinux.pathprefix "jessie-installer/";
+   filename "jessie-installer/debian-installer/amd64/pxelinux.0";
 }
 
 host lvs1006 {
hardware ethernet 18:03:73:f0:8a:77;
fixed-address lvs1006.wikimedia.org;
+   option pxelinux.pathprefix "jessie-installer/";
+   filename "jessie-installer/debian-installer/amd64/pxelinux.0";
 }
 
 host lvs1007 {

-- 
To view, visit https://gerrit.wikimedia.org/r/253319
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I0278ffcfb42fa1b42b25724a3648976eec55a639
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BBlack 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] lvs100[1-6]: dhcp -> jessie - change (operations/puppet)

2015-11-16 Thread BBlack (Code Review)

BBlack has submitted this change and it was merged.

Change subject: lvs100[1-6]: dhcp -> jessie
..


lvs100[1-6]: dhcp -> jessie

Change-Id: I0278ffcfb42fa1b42b25724a3648976eec55a639
---
M modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
1 file changed, 12 insertions(+), 0 deletions(-)

Approvals:
  BBlack: Verified; Looks good to me, approved



diff --git a/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200 
b/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
index 80e6a6a..0e6cd08 100644
--- a/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
+++ b/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
@@ -2783,31 +2783,43 @@
 host lvs1001 {
hardware ethernet 18:03:73:f0:89:69;
fixed-address lvs1001.wikimedia.org;
+   option pxelinux.pathprefix "jessie-installer/";
+   filename "jessie-installer/debian-installer/amd64/pxelinux.0";
 }
 
 host lvs1002 {
hardware ethernet 18:03:73:f0:8e:dc;
fixed-address lvs1002.wikimedia.org;
+   option pxelinux.pathprefix "jessie-installer/";
+   filename "jessie-installer/debian-installer/amd64/pxelinux.0";
 }
 
 host lvs1003 {
hardware ethernet 18:03:73:f0:8b:07;
fixed-address lvs1003.wikimedia.org;
+   option pxelinux.pathprefix "jessie-installer/";
+   filename "jessie-installer/debian-installer/amd64/pxelinux.0";
 }
 
 host lvs1004 {
hardware ethernet 18:03:73:f0:8c:30;
fixed-address lvs1004.wikimedia.org;
+   option pxelinux.pathprefix "jessie-installer/";
+   filename "jessie-installer/debian-installer/amd64/pxelinux.0";
 }
 
 host lvs1005 {
hardware ethernet 18:03:73:f0:8e:28;
fixed-address lvs1005.wikimedia.org;
+   option pxelinux.pathprefix "jessie-installer/";
+   filename "jessie-installer/debian-installer/amd64/pxelinux.0";
 }
 
 host lvs1006 {
hardware ethernet 18:03:73:f0:8a:77;
fixed-address lvs1006.wikimedia.org;
+   option pxelinux.pathprefix "jessie-installer/";
+   filename "jessie-installer/debian-installer/amd64/pxelinux.0";
 }
 
 host lvs1007 {

-- 
To view, visit https://gerrit.wikimedia.org/r/253319
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I0278ffcfb42fa1b42b25724a3648976eec55a639
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BBlack 
Gerrit-Reviewer: BBlack 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Add missing and fix wrong @license tags - change (mediawiki...PageImages)

2015-11-16 Thread WMDE

Thiemo Mättig (WMDE) has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/253327

Change subject: Add missing and fix wrong @license tags
..

Add missing and fix wrong @license tags

Change-Id: I07f77735bb0050e2e59491d3c045b11705f3a08f
---
M includes/ApiQueryPageImages.php
M includes/PageImages.php
M maintenance/initImageData.php
M tests/phpunit/ApiQueryPageImagesTest.php
M tests/phpunit/PageImagesTest.php
5 files changed, 31 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/PageImages 
refs/changes/27/253327/1

diff --git a/includes/ApiQueryPageImages.php b/includes/ApiQueryPageImages.php
index 12b8c49..714a060 100644
--- a/includes/ApiQueryPageImages.php
+++ b/includes/ApiQueryPageImages.php
@@ -1,9 +1,18 @@
 https://www.mediawiki.org/wiki/Extension:PageImages#API
+ *
+ * @see https://www.mediawiki.org/wiki/Extension:PageImages#API
+ *
+ * @license WTFPL 2.0
+ * @author MaxSem
+ * @author Ryan Kaldari
+ * @author Yuvi Panda
+ * @author Sam Smith
  */
 class ApiQueryPageImages extends ApiQueryBase {
+
public function __construct( $query, $moduleName ) {
parent::__construct( $query, $moduleName, 'pi' );
}
diff --git a/includes/PageImages.php b/includes/PageImages.php
index 4e16f52..be76aad 100644
--- a/includes/PageImages.php
+++ b/includes/PageImages.php
@@ -1,6 +1,13 @@
  $title->getArticleID(), 
'pp_propname' => self::PROP_NAME ),
__METHOD__
);
+
$file = false;
+
if ( $name ) {
$file = wfFindFile( $name );
}
+
return $file;
}
 
@@ -280,6 +290,7 @@
 *
 * @param int[] $pageIds
 * @param int $size
+*
 * @return array[]
 */
private static function getImages( array $pageIds, $size = 0 ) {
@@ -290,12 +301,15 @@
'pageids' => implode( '|', $pageIds ),
'pilimit' => 'max',
);
+
if ( $size ) {
$request['piprop'] = 'thumbnail';
$request['pithumbsize'] = $size;
}
+
$api = new ApiMain( new FauxRequest( $request ) );
$api->execute();
+
if ( defined( 'ApiResult::META_CONTENT' ) ) {
return (array)$api->getResult()->getResultData( array( 
'query', 'pages' ),
array( 'Strip' => 'base' ) );
diff --git a/maintenance/initImageData.php b/maintenance/initImageData.php
index a0882dc..5776dd4 100644
--- a/maintenance/initImageData.php
+++ b/maintenance/initImageData.php
@@ -6,6 +6,10 @@
 }
 require_once( "$IP/maintenance/Maintenance.php" );
 
+/**
+ * @license WTFPL 2.0
+ * @author MaxSem
+ */
 class InitImageData extends Maintenance {
const BATCH_SIZE = 100;
 
diff --git a/tests/phpunit/ApiQueryPageImagesTest.php 
b/tests/phpunit/ApiQueryPageImagesTest.php
index e2434e1..b2fbfe9 100644
--- a/tests/phpunit/ApiQueryPageImagesTest.php
+++ b/tests/phpunit/ApiQueryPageImagesTest.php
@@ -45,7 +45,8 @@
  *
  * @group PageImages
  *
- * @licence GNU GPL v2+
+ * @license WTFPL 2.0
+ * @author Sam Smith
  * @author Thiemo Mättig
  */
 class ApiQueryPageImagesTest extends PHPUnit_Framework_TestCase {
diff --git a/tests/phpunit/PageImagesTest.php b/tests/phpunit/PageImagesTest.php
index e2b8df6..6efb247 100644
--- a/tests/phpunit/PageImagesTest.php
+++ b/tests/phpunit/PageImagesTest.php
@@ -13,7 +13,7 @@
  * @group PageImages
  * @group Database
  *
- * @licence GNU GPL v2+
+ * @license WTFPL 2.0
  * @author Thiemo Mättig
  */
 class PageImagesTest extends MediaWikiTestCase {

-- 
To view, visit https://gerrit.wikimedia.org/r/253327
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I07f77735bb0050e2e59491d3c045b11705f3a08f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/PageImages
Gerrit-Branch: master
Gerrit-Owner: Thiemo Mättig (WMDE) 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] adding mobrovac to analytics-privatedata-users - change (operations/puppet)

2015-11-16 Thread Andrew Bogott (Code Review)

Andrew Bogott has submitted this change and it was merged.

Change subject: adding mobrovac to analytics-privatedata-users
..


adding mobrovac to analytics-privatedata-users

adding per request

DO NOT MERGE UNTIL 2015-11-16, per three day waiting period 
for access additions

Bug:T118399
Change-Id: I6cf71274f53a8708a23cb002ef0c877e385ae662
---
M modules/admin/data/data.yaml
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Andrew Bogott: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/modules/admin/data/data.yaml b/modules/admin/data/data.yaml
index 0c599f1..6071a3f 100644
--- a/modules/admin/data/data.yaml
+++ b/modules/admin/data/data.yaml
@@ -232,7 +232,7 @@
   joal, jamesur, akosiaris, jhobs, lpintscher, jkatz, madhuvishy, 
gpaumier,
   andyrussg, niedzielski, maxsem, hoo, daniel, tbayer, krinkle, 
tgr,
   csteipp, smalyshev, ebernhardson, addshore, jminor, chedasaurus, 
neilpquinn-wmf,
-  vbaranetsky, dcausse, bd808, tjones]
+  vbaranetsky, dcausse, bd808, tjones, mobrovac]
   analytics-admins:
 gid: 732
 description: Admin access to analytics cluster.

-- 
To view, visit https://gerrit.wikimedia.org/r/252738
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I6cf71274f53a8708a23cb002ef0c877e385ae662
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: RobH 
Gerrit-Reviewer: Andrew Bogott 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Add missing and fix wrong @license tags - change (mediawiki...PageImages)

2015-11-16 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged.

Change subject: Add missing and fix wrong @license tags
..


Add missing and fix wrong @license tags

Change-Id: I07f77735bb0050e2e59491d3c045b11705f3a08f
---
M includes/ApiQueryPageImages.php
M includes/PageImages.php
M maintenance/initImageData.php
M tests/phpunit/ApiQueryPageImagesTest.php
M tests/phpunit/PageImagesTest.php
5 files changed, 31 insertions(+), 3 deletions(-)

Approvals:
  Addshore: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/includes/ApiQueryPageImages.php b/includes/ApiQueryPageImages.php
index 12b8c49..714a060 100644
--- a/includes/ApiQueryPageImages.php
+++ b/includes/ApiQueryPageImages.php
@@ -1,9 +1,18 @@
 https://www.mediawiki.org/wiki/Extension:PageImages#API
+ *
+ * @see https://www.mediawiki.org/wiki/Extension:PageImages#API
+ *
+ * @license WTFPL 2.0
+ * @author MaxSem
+ * @author Ryan Kaldari
+ * @author Yuvi Panda
+ * @author Sam Smith
  */
 class ApiQueryPageImages extends ApiQueryBase {
+
public function __construct( $query, $moduleName ) {
parent::__construct( $query, $moduleName, 'pi' );
}
diff --git a/includes/PageImages.php b/includes/PageImages.php
index 4e16f52..be76aad 100644
--- a/includes/PageImages.php
+++ b/includes/PageImages.php
@@ -1,6 +1,13 @@
  $title->getArticleID(), 
'pp_propname' => self::PROP_NAME ),
__METHOD__
);
+
$file = false;
+
if ( $name ) {
$file = wfFindFile( $name );
}
+
return $file;
}
 
@@ -280,6 +290,7 @@
 *
 * @param int[] $pageIds
 * @param int $size
+*
 * @return array[]
 */
private static function getImages( array $pageIds, $size = 0 ) {
@@ -290,12 +301,15 @@
'pageids' => implode( '|', $pageIds ),
'pilimit' => 'max',
);
+
if ( $size ) {
$request['piprop'] = 'thumbnail';
$request['pithumbsize'] = $size;
}
+
$api = new ApiMain( new FauxRequest( $request ) );
$api->execute();
+
if ( defined( 'ApiResult::META_CONTENT' ) ) {
return (array)$api->getResult()->getResultData( array( 
'query', 'pages' ),
array( 'Strip' => 'base' ) );
diff --git a/maintenance/initImageData.php b/maintenance/initImageData.php
index a0882dc..5776dd4 100644
--- a/maintenance/initImageData.php
+++ b/maintenance/initImageData.php
@@ -6,6 +6,10 @@
 }
 require_once( "$IP/maintenance/Maintenance.php" );
 
+/**
+ * @license WTFPL 2.0
+ * @author MaxSem
+ */
 class InitImageData extends Maintenance {
const BATCH_SIZE = 100;
 
diff --git a/tests/phpunit/ApiQueryPageImagesTest.php 
b/tests/phpunit/ApiQueryPageImagesTest.php
index e2434e1..b2fbfe9 100644
--- a/tests/phpunit/ApiQueryPageImagesTest.php
+++ b/tests/phpunit/ApiQueryPageImagesTest.php
@@ -45,7 +45,8 @@
  *
  * @group PageImages
  *
- * @licence GNU GPL v2+
+ * @license WTFPL 2.0
+ * @author Sam Smith
  * @author Thiemo Mättig
  */
 class ApiQueryPageImagesTest extends PHPUnit_Framework_TestCase {
diff --git a/tests/phpunit/PageImagesTest.php b/tests/phpunit/PageImagesTest.php
index e2b8df6..6efb247 100644
--- a/tests/phpunit/PageImagesTest.php
+++ b/tests/phpunit/PageImagesTest.php
@@ -13,7 +13,7 @@
  * @group PageImages
  * @group Database
  *
- * @licence GNU GPL v2+
+ * @license WTFPL 2.0
  * @author Thiemo Mättig
  */
 class PageImagesTest extends MediaWikiTestCase {

-- 
To view, visit https://gerrit.wikimedia.org/r/253327
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I07f77735bb0050e2e59491d3c045b11705f3a08f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/PageImages
Gerrit-Branch: master
Gerrit-Owner: Thiemo Mättig (WMDE) 
Gerrit-Reviewer: Addshore 
Gerrit-Reviewer: Hoo man 
Gerrit-Reviewer: MaxSem 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Add resp.http.X-Client-IP -> webrequest:client_ip - change (operations/puppet)

2015-11-16 Thread BBlack (Code Review)

BBlack has submitted this change and it was merged.

Change subject: Add resp.http.X-Client-IP -> webrequest:client_ip
..


Add resp.http.X-Client-IP -> webrequest:client_ip

Bug: T118557
Change-Id: I50d04b776cb7661af06562d204e6d8e979fd0944
---
M modules/role/manifests/cache/kafka/webrequest.pp
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  BBlack: Verified; Looks good to me, approved



diff --git a/modules/role/manifests/cache/kafka/webrequest.pp 
b/modules/role/manifests/cache/kafka/webrequest.pp
index 39bc41f..7ace8bc 100644
--- a/modules/role/manifests/cache/kafka/webrequest.pp
+++ b/modules/role/manifests/cache/kafka/webrequest.pp
@@ -23,7 +23,7 @@
 # Note: fake_tag tricks varnishkafka into allowing hardcoded string 
into a JSON field.
 # Hardcoding the $fqdn into hostname rather than using %l to account 
for
 # possible slip ups where varnish only writes the short hostname for 
%l.
-format   => "%{fake_tag0@hostname?${::fqdn}}x 
%{@sequence!num?0}n %{%FT%T@dt}t 
%{Varnish:time_firstbyte@time_firstbyte!num?0.0}x %{@ip}h 
%{Varnish:handling@cache_status}x %{@http_status}s %{@response_size!num?0}b 
%{@http_method}m %{Host@uri_host}i %{@uri_path}U %{@uri_query}q 
%{Content-Type@content_type}o %{Referer@referer}i 
%{X-Forwarded-For@x_forwarded_for}i %{User-Agent@user_agent}i 
%{Accept-Language@accept_language}i %{X-Analytics@x_analytics}o %{Range@range}i 
%{X-Cache@x_cache}o",
+format   => "%{fake_tag0@hostname?${::fqdn}}x 
%{@sequence!num?0}n %{%FT%T@dt}t 
%{Varnish:time_firstbyte@time_firstbyte!num?0.0}x %{@ip}h 
%{Varnish:handling@cache_status}x %{@http_status}s %{@response_size!num?0}b 
%{@http_method}m %{Host@uri_host}i %{@uri_path}U %{@uri_query}q 
%{Content-Type@content_type}o %{Referer@referer}i 
%{X-Forwarded-For@x_forwarded_for}i %{User-Agent@user_agent}i 
%{Accept-Language@accept_language}i %{X-Analytics@x_analytics}o %{Range@range}i 
%{X-Cache@x_cache}o %{X-Client-IP@client_ip}o",
 message_send_max_retries => 3,
 # At ~6000 msgs per second, 50 messages is over 1 minute
 # of buffering, which should be more than enough.

-- 
To view, visit https://gerrit.wikimedia.org/r/252928
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I50d04b776cb7661af06562d204e6d8e979fd0944
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BBlack 
Gerrit-Reviewer: BBlack 
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 subnet for ulsfo-eqiad Giglinx link - change (operations/dns)

2015-11-16 Thread Faidon Liambotis (Code Review)

Faidon Liambotis has submitted this change and it was merged.

Change subject: Remove subnet for ulsfo-eqiad Giglinx link
..


Remove subnet for ulsfo-eqiad Giglinx link

Bug: T118170
Change-Id: I44548f86b34a1c1d4452e7b07321aa4fcbd760d5
---
M templates/155.80.208.in-addr.arpa
M templates/3.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
2 files changed, 1 insertion(+), 7 deletions(-)

Approvals:
  Faidon Liambotis: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/templates/155.80.208.in-addr.arpa 
b/templates/155.80.208.in-addr.arpa
index d3362c8..f72fafc 100644
--- a/templates/155.80.208.in-addr.arpa
+++ b/templates/155.80.208.in-addr.arpa
@@ -42,10 +42,6 @@
 36  1H IN PTR   xe-5-2-2.cr2-eqiad.wikimedia.org.
 37  1H IN PTR   xe-0-0-3.cr1-ulsfo.wikimedia.org.
 
-;208.80.155.38/31 cr2-ulsfo <-> cr1-eqiad
-
-38  1H IN PTR   xe-4-2-1.cr1-eqiad.wikimedia.org.
-39  1H IN PTR   xe-1-2-0.cr2-ulsfo.wikimedia.org.
 
 ;208.80.155.64/28 sandbox1-b-eqiad subnet
 65  1H IN PTR   vrrp-gw-1202.wikimedia.org.
diff --git a/templates/3.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa 
b/templates/3.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
index 7653021..1b17356 100644
--- a/templates/3.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
+++ b/templates/3.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
@@ -95,11 +95,9 @@
 
 $ORIGIN 3.0.e.f.{{ zonename }}.
 
-; cr2-ulsfo <--> cr1-eqiad (2620:0:863:fe04::/64)
+; unallocated (2620:0:863:fe04::/64)
 
 $ORIGIN 4.0.e.f.{{ zonename }}.
-1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0 1H IN PTR   xe-4-2-1.cr1-eqiad.wikimedia.org.
-2.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0 1H IN PTR   xe-1-2-0.cr2-ulsfo.wikimedia.org.
 
 ; cr1-ulsfo <--> mr1-ulsfo (2620:0:863:fe05::/64)
 

-- 
To view, visit https://gerrit.wikimedia.org/r/251955
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I44548f86b34a1c1d4452e7b07321aa4fcbd760d5
Gerrit-PatchSet: 2
Gerrit-Project: operations/dns
Gerrit-Branch: master
Gerrit-Owner: Faidon Liambotis 
Gerrit-Reviewer: Faidon Liambotis 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Fix uncaught exception in Special:ItemDisambiguation - change (mediawiki...Wikibase)

2015-11-16 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged.

Change subject: Fix uncaught exception in Special:ItemDisambiguation
..


Fix uncaught exception in Special:ItemDisambiguation

The exception happens with some invalid language codes,
such as "" though "omg" is considered "valid".

This makes validation of the language code happen before
doing search.  If the language code is invalid, then show
an error message with formatting that this an error.

Also, make use of ContentLanguages to decouple
the code from the Language class. WikibaseContentLanguages
handles stuff like $wgExtraLanguageNames.

Bug: T118556
Change-Id: I1c1d73acff9d55d326ac6f65b3be40103ed87e56
---
M repo/includes/specials/SpecialItemDisambiguation.php
M repo/tests/phpunit/includes/specials/SpecialItemDisambiguationTest.php
2 files changed, 188 insertions(+), 61 deletions(-)

Approvals:
  Daniel Kinzler: Checked; Looks good to me, approved
  jenkins-bot: Verified



diff --git a/repo/includes/specials/SpecialItemDisambiguation.php 
b/repo/includes/specials/SpecialItemDisambiguation.php
index a52e03f..ea9cc3a 100644
--- a/repo/includes/specials/SpecialItemDisambiguation.php
+++ b/repo/includes/specials/SpecialItemDisambiguation.php
@@ -4,11 +4,13 @@
 
 use HTMLForm;
 use Html;
-use Language;
+use WebRequest;
 use Wikibase\ItemDisambiguation;
+use Wikibase\Lib\ContentLanguages;
 use Wikibase\Lib\LanguageNameLookup;
 use Wikibase\Lib\Interactors\TermIndexSearchInteractor;
 use Wikibase\Lib\Interactors\TermSearchResult;
+use Wikibase\Lib\WikibaseContentLanguages;
 use Wikibase\Repo\WikibaseRepo;
 use Wikibase\TermIndexEntry;
 
@@ -36,6 +38,11 @@
private $searchInteractor = null;
 
/**
+* @var ContentLanguages
+*/
+   private $contentLanguages;
+
+   /**
 * @var int
 */
private $limit;
@@ -47,7 +54,11 @@
 */
public function __construct() {
parent::__construct( 'ItemDisambiguation', '', true );
-   //@todo: make this configurable
+
+   // @todo inject this
+   $this->contentLanguages = new WikibaseContentLanguages();
+
+   // @todo make this configurable
$this->limit = 100;
}
 
@@ -57,13 +68,16 @@
 *
 * @param ItemDisambiguation $itemDisambiguation
 * @param TermIndexSearchInteractor|null $searchInteractor
+* @param ContentLanguages $contentLanguages
 */
public function initServices(
ItemDisambiguation $itemDisambiguation,
-   TermIndexSearchInteractor $searchInteractor
+   TermIndexSearchInteractor $searchInteractor,
+   ContentLanguages $contentLanguages
) {
$this->itemDisambiguation = $itemDisambiguation;
$this->searchInteractor = $searchInteractor;
+   $this->contentLanguages = $contentLanguages;
}
 
/**
@@ -73,8 +87,9 @@
 */
private function getSearchInteractor( $displayLanguageCode ) {
if ( $this->searchInteractor === null ) {
-   $interactor = 
WikibaseRepo::getDefaultInstance()->newTermSearchInteractor( 
$displayLanguageCode );
-   $this->searchInteractor = $interactor;
+   $this->searchInteractor = 
WikibaseRepo::getDefaultInstance()->newTermSearchInteractor(
+   $displayLanguageCode
+   );
}
return $this->searchInteractor;
}
@@ -104,44 +119,98 @@
public function execute( $subPage ) {
parent::execute( $subPage );
 
-   // Setup
$request = $this->getRequest();
-   $parts = $subPage === '' ? array() : explode( '/', $subPage, 2 
);
-   $languageCode = $request->getVal( 'language', isset( $parts[0] 
) ? $parts[0] : '' );
-   if ( $languageCode === '' ) {
-   $languageCode = $this->getLanguage()->getCode();
-   }
+   $subPageParts = $subPage === '' ? array() : explode( '/', 
$subPage, 2 );
 
-   if ( $request->getCheck( 'label' ) ) {
-   $label = $request->getText( 'label' );
-   } else {
-   $label = isset( $parts[1] ) ? str_replace( '_', ' ', 
$parts[1] ) : '';
-   }
+   $languageCode = $this->extractLanguageCode( $request, 
$subPageParts );
+   $label = $this->extractLabel( $request, $subPageParts );
 
$this->switchForm( $languageCode, $label );
 
// Display the result set
if ( isset( $languageCode ) && isset( $label ) && $label !== '' 
) {
-   $searchInteractor = $this->getSearchInteractor( 
$this->getLanguage()->getCode() );
-

[MediaWiki-commits] [Gerrit] add X-Client-IP to response headers for vk to consume - change (operations/puppet)

2015-11-16 Thread BBlack (Code Review)

BBlack has submitted this change and it was merged.

Change subject: add X-Client-IP to response headers for vk to consume
..


add X-Client-IP to response headers for vk to consume

Bug: T118557
Change-Id: I0984fbd27c1fca6cb8ff0d030d11f2ab2e1f312a
---
M templates/varnish/analytics.inc.vcl.erb
1 file changed, 4 insertions(+), 0 deletions(-)

Approvals:
  BBlack: Verified; Looks good to me, approved



diff --git a/templates/varnish/analytics.inc.vcl.erb 
b/templates/varnish/analytics.inc.vcl.erb
index aedf729..bf5a58c 100644
--- a/templates/varnish/analytics.inc.vcl.erb
+++ b/templates/varnish/analytics.inc.vcl.erb
@@ -195,4 +195,8 @@
 } else {
 set resp.http.X-Analytics = regsub(resp.http.X-Analytics, "^;", "");
 }
+
+// Put XCIP into resp headers for webrequest logging purposes independent
+// of the X-Analytics fields:
+set resp.http.X-Client-IP = req.http.X-Client-IP
 }

-- 
To view, visit https://gerrit.wikimedia.org/r/252427
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I0984fbd27c1fca6cb8ff0d030d11f2ab2e1f312a
Gerrit-PatchSet: 6
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BBlack 
Gerrit-Reviewer: BBlack 
Gerrit-Reviewer: Faidon Liambotis 
Gerrit-Reviewer: Joal 
Gerrit-Reviewer: Ottomata 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] [Maintenance] Update Jenkins tests - change (integration/config)

2015-11-16 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged.

Change subject: [Maintenance] Update Jenkins tests
..


[Maintenance] Update Jenkins tests

Adds composer-test and npm tests.

Adds jshint and jsonlint to check: for non-whitelisted users.

Remove jslint test now run in jshint and npm tests.

Source-change: https://gerrit.wikimedia.org/r/#/c/225225/

Change-Id: I74a31fa4d4c0178ed547b933db1484cedc4e3e23
---
M jjb/mediawiki-extensions.yaml
M zuul/layout.yaml
2 files changed, 5 insertions(+), 4 deletions(-)

Approvals:
  Hashar: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/jjb/mediawiki-extensions.yaml b/jjb/mediawiki-extensions.yaml
index 2c4d95c..7bd5dd5 100644
--- a/jjb/mediawiki-extensions.yaml
+++ b/jjb/mediawiki-extensions.yaml
@@ -803,7 +803,6 @@
   - mwext-LoopFunctions
   - mwext-Loops
   - mwext-MagicNoCache
-  - mwext-Maintenance
   - mwext-Maps
   - mwext-MarkAsHelpful
   - mwext-MassEditRegex
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index ac3dacc..b9005e6 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -1026,8 +1026,6 @@
 voting: false
   - name: mwext-MagicNoCache-jslint
 voting: false
-  - name: mwext-Maintenance-jslint
-voting: false
   - name: mwext-Maps-jslint
 voting: false
   - name: mwext-MassEditRegex-jslint
@@ -5167,8 +5165,12 @@
 
   - name: mediawiki/extensions/Maintenance
 template:
-  - name: extension-jslint
+  - name: composer-test
   - name: extension-unittests-generic
+  - name: npm
+check:
+  - jsonlint
+  - jshint
 
   - name: mediawiki/extensions/MaintenanceShell
 template:

-- 
To view, visit https://gerrit.wikimedia.org/r/225222
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I74a31fa4d4c0178ed547b933db1484cedc4e3e23
Gerrit-PatchSet: 13
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Paladox 
Gerrit-Reviewer: Hashar 
Gerrit-Reviewer: Paladox 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Rewrite and more test cases for ClaimDiffer - change (mediawiki...Wikibase)

2015-11-16 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged.

Change subject: Rewrite and more test cases for ClaimDiffer
..


Rewrite and more test cases for ClaimDiffer

The main goal of this rewrite is to avoid instantiating empty
StatementList and referenceList objects that are just not needed.

I found that there was not a single test with null one one side,
which is critical for created and deleted entities.

This also reduces code duplication.

Change-Id: Ib52933468fac3f017512bbdeb9dc6bdd0a7ca737
---
M repo/includes/Diff/ClaimDiffer.php
M repo/tests/phpunit/includes/Diff/ClaimDifferTest.php
2 files changed, 115 insertions(+), 53 deletions(-)

Approvals:
  Daniel Kinzler: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/repo/includes/Diff/ClaimDiffer.php 
b/repo/includes/Diff/ClaimDiffer.php
index a354389..6a93956 100644
--- a/repo/includes/Diff/ClaimDiffer.php
+++ b/repo/includes/Diff/ClaimDiffer.php
@@ -5,8 +5,6 @@
 use Diff\Differ\Differ;
 use Diff\DiffOp\Diff\Diff;
 use Diff\DiffOp\DiffOpChange;
-use Wikibase\DataModel\ReferenceList;
-use Wikibase\DataModel\Snak\SnakList;
 use Wikibase\DataModel\Statement\Statement;
 
 /**
@@ -17,6 +15,7 @@
  * @licence GNU GPL v2+
  * @author Tobias Gritschacher < tobias.gritschac...@wikimedia.de >
  * @author Adam Shorland
+ * @author Thiemo Mättig
  */
 class ClaimDiffer {
 
@@ -36,19 +35,17 @@
 *
 * @return ClaimDifference
 */
-   public function diffClaims( $oldStatement, $newStatement ) {
-   $mainSnakChange = $this->diffMainSnaks( $oldStatement, 
$newStatement );
-   $qualifierChanges = $this->diffQualifiers( $oldStatement, 
$newStatement );
-
-   if ( $oldStatement instanceof Statement || $newStatement 
instanceof Statement ) {
-   $rankChange = $this->diffRank( $oldStatement, 
$newStatement );
-   $referenceChanges = $this->diffReferences( 
$oldStatement, $newStatement );
-   } else {
-   $rankChange = null;
-   $referenceChanges = null;
+   public function diffClaims( Statement $oldStatement = null, Statement 
$newStatement = null ) {
+   if ( $oldStatement === $newStatement ) {
+   return new ClaimDifference();
}
 
-   return new ClaimDifference( $mainSnakChange, $qualifierChanges, 
$referenceChanges, $rankChange );
+   return new ClaimDifference(
+   $this->diffMainSnaks( $oldStatement, $newStatement ),
+   $this->diffQualifiers( $oldStatement, $newStatement ),
+   $this->diffReferences( $oldStatement, $newStatement ),
+   $this->diffRanks( $oldStatement, $newStatement )
+   );
}
 
/**
@@ -57,20 +54,18 @@
 *
 * @return DiffOpChange|null
 */
-   private function diffMainSnaks( Statement $oldStatement = null, 
Statement $newStatement = null ) {
-   $oldStatementMainSnak = $oldStatement === null ? null : 
$oldStatement->getMainSnak();
-   $newStatementMainSnak = $newStatement === null ? null : 
$newStatement->getMainSnak();
+   private function diffMainSnaks(
+   Statement $oldStatement = null,
+   Statement $newStatement = null
+   ) {
+   $oldSnak = $oldStatement === null ? null : 
$oldStatement->getMainSnak();
+   $newSnak = $newStatement === null ? null : 
$newStatement->getMainSnak();
 
-   if ( $oldStatementMainSnak === null && $newStatementMainSnak 
=== null ) {
+   if ( $oldSnak !== null && $oldSnak->equals( $newSnak ) ) {
return null;
}
 
-   if ( ( $oldStatementMainSnak === null && $newStatementMainSnak 
!== null )
-   || !$oldStatementMainSnak->equals( 
$newStatementMainSnak ) ) {
-   return new DiffOpChange( $oldStatementMainSnak, 
$newStatementMainSnak );
-   }
-
-   return null;
+   return new DiffOpChange( $oldSnak, $newSnak );
}
 
/**
@@ -79,20 +74,29 @@
 *
 * @return Diff
 */
-   private function diffQualifiers( Statement $oldStatement = null, 
Statement $newStatement = null ) {
-   $oldQualifiers = $oldStatement === null ? new SnakList() : 
$oldStatement->getQualifiers();
-   $newQualifiers = $newStatement === null ? new SnakList() : 
$newStatement->getQualifiers();
-
-   if ( !$oldQualifiers->equals( $newQualifiers ) ) {
-   $diffOps = $this->listDiffer->doDiff(
-   iterator_to_array( $oldQualifiers ),
-   iterator_to_array( $newQualifiers )
-   );
-
-   return new Diff(

[MediaWiki-commits] [Gerrit] Make a group of OmegaWiki special pages. - change (mediawiki...WikiLexicalData)

2015-11-16 Thread Purodha (Code Review)

Purodha has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/253323

Change subject: Make a group of OmegaWiki special pages.
..

Make a group of OmegaWiki special pages.

Along the way some typos and bugs in the special pages
were fixed.

Change-Id: Ia4eb6a8c5556fba1d859dba89553c4376341520a
---
M App.php
M OmegaWiki/SpecialAddCollection.php
M OmegaWiki/SpecialConceptMapping.php
M OmegaWiki/SpecialCopy.php
M OmegaWiki/SpecialImportLangNames.php
M OmegaWiki/SpecialNeedsTranslation.php
M OmegaWiki/SpecialPopupEditor.php
M OmegaWiki/SpecialSelect.php
M OmegaWiki/SpecialSuggest.php
M OmegaWiki/SpecialTransaction.php
M SpecialLanguages.php
A WikiLexicalData.i18n.alias.php
M i18n/lexicaldata/en.json
M i18n/lexicaldata/qqq.json
M includes/setup/OWSpecials.php
M includes/specials/SpecialDatasearch.php
M includes/specials/SpecialExportTSV.php
M includes/specials/SpecialImportTSV.php
M includes/specials/SpecialOWAddFromExternalAPI.php
M includes/specials/SpecialOWDownloads.php
M includes/specials/SpecialOWStatistics.php
21 files changed, 92 insertions(+), 24 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikiLexicalData 
refs/changes/23/253323/1

diff --git a/App.php b/App.php
index 03294fb..3e286e9 100644
--- a/App.php
+++ b/App.php
@@ -40,6 +40,7 @@
 );
 
 $wgMessagesDirs['LexicalData'] = __DIR__ . '/i18n/lexicaldata';
+$wgExtensionMessagesFiles['WikiLexicalDataTextAlias'] = __DIR__ . 
'/WikiLexicalData.i18n.alias.php' ;
 $wgExtensionMessagesFiles['LexicalData'] = $dir . 'Wikidata.i18n.php';
 
 // Resource modules
diff --git a/OmegaWiki/SpecialAddCollection.php 
b/OmegaWiki/SpecialAddCollection.php
index 029d204..4a0ab67 100644
--- a/OmegaWiki/SpecialAddCollection.php
+++ b/OmegaWiki/SpecialAddCollection.php
@@ -64,7 +64,7 @@
}
 
protected function getGroupName() {
-   return 'other';
+   return 'omegawiki'; // message 
'specialpages-group-omegawiki'
}
 }
 
diff --git a/OmegaWiki/SpecialConceptMapping.php 
b/OmegaWiki/SpecialConceptMapping.php
index e70203b..f320508 100644
--- a/OmegaWiki/SpecialConceptMapping.php
+++ b/OmegaWiki/SpecialConceptMapping.php
@@ -190,7 +190,7 @@
}
 
protected function getGroupName() {
-   return 'other';
+   return 'omegawiki'; // message 
'specialpages-group-omegawiki'
}
 }
 
diff --git a/OmegaWiki/SpecialCopy.php b/OmegaWiki/SpecialCopy.php
index 8b4f976..c1bd4f9 100644
--- a/OmegaWiki/SpecialCopy.php
+++ b/OmegaWiki/SpecialCopy.php
@@ -160,6 +160,9 @@
# }
 
return true; # seems everything went ok.
+   }
 
+   protected function getGroupName() {
+   return 'omegawiki'; // message 
'specialpages-group-omegawiki'
}
 }
diff --git a/OmegaWiki/SpecialImportLangNames.php 
b/OmegaWiki/SpecialImportLangNames.php
index 569d2d2..2b99ec9 100644
--- a/OmegaWiki/SpecialImportLangNames.php
+++ b/OmegaWiki/SpecialImportLangNames.php
@@ -16,7 +16,7 @@
// These operations should always be on the community database.
$dbr = wfGetDB( DB_SLAVE );
$dbw = wfGetDB( DB_MASTER );
-   $dc = "uw";
+   $dc = wdGetDataSetContext();
$output = $this->getOutput();
 
$output->setPageTitle( wfMessage( 'importlangnames_title' 
)->text() );
@@ -25,7 +25,6 @@
$output->addHTML( wfMessage( 
'importlangnames_not_allowed' )->text() );
return false;
}
-
/* Get defined meaning IDs and ISO codes for languages in 
collection. */
// wgIso639_3CollectionId is normally defined in 
LocalSettings.php
$lang_res = $dbr->select(
@@ -38,11 +37,9 @@
);
$editable = '';
$first = true;
-
foreach ( $lang_res as $lang_row ) {
$iso_code = $lang_row->internal_member_id;
$dm_id = $lang_row->member_mid;
-
/*  Get the language ID for the current language. */
$lang_id = getLanguageIdForIso639_3( $iso_code ) ;
 
@@ -113,6 +110,6 @@
}
 
protected function getGroupName() {
-   return 'other';
+   return 'omegawiki'; // message 
'specialpages-group-omegawiki'
}
 }
diff --git a/OmegaWiki/SpecialNeedsTranslation.php 
b/OmegaWiki/SpecialNeedsTranslation.php
index 4c5dd76..3975469 100644
--- a/OmegaWiki/SpecialNeedsTranslation.php
+++ b/OmegaWiki/SpecialNeedsTranslation.php
@@ -196,8 +196,6 @@
}
 
protected function getGroupName() {
-   return 'maintenance';
+   return 'omegawiki'; // message 
'specialpages-group-omegawiki'
}
 }
-
-
diff --git a/OmegaWiki/SpecialPopupEditor.php

[MediaWiki-commits] [Gerrit] Add missing arrayalize/objectify tests to EntityChangeTest - change (mediawiki...Wikibase)

2015-11-16 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged.

Change subject: Add missing arrayalize/objectify tests to EntityChangeTest
..


Add missing arrayalize/objectify tests to EntityChangeTest

This also covers code in the abstract base class.

More methods in these two classes are uncovered, but I did not wanted
to make this patch to complicated.

Change-Id: I6a8ab6be1bd50ba70226a8d19f017137c1b19272
---
M lib/tests/phpunit/changes/EntityChangeTest.php
1 file changed, 40 insertions(+), 0 deletions(-)

Approvals:
  Daniel Kinzler: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/lib/tests/phpunit/changes/EntityChangeTest.php 
b/lib/tests/phpunit/changes/EntityChangeTest.php
index 2aa8bd9..ce8ca1c 100644
--- a/lib/tests/phpunit/changes/EntityChangeTest.php
+++ b/lib/tests/phpunit/changes/EntityChangeTest.php
@@ -9,6 +9,8 @@
 use Wikibase\DataModel\Entity\EntityId;
 use Wikibase\DataModel\Entity\Item;
 use Wikibase\DataModel\Entity\ItemId;
+use Wikibase\DataModel\Snak\PropertyNoValueSnak;
+use Wikibase\DataModel\Statement\Statement;
 use Wikibase\EntityChange;
 use Wikibase\ItemContent;
 
@@ -290,4 +292,42 @@
$this->assertEquals( $timestamp, $change->getTime() );
}
 
+   public function testArrayalizeObjects() {
+   $statement = new Statement( new PropertyNoValueSnak( 1 ) );
+   $expected = array(
+   'mainsnak' => array(
+   'snaktype' => 'novalue',
+   'property' => 'P1',
+   'hash' => 
'2d7ef41c913ec99eb249645e154e77670090db68',
+   ),
+   'type' => 'statement',
+   'rank' => 'normal',
+   '_claimclass_' => 
'Wikibase\DataModel\Statement\Statement',
+   );
+
+   $change = new EntityChange();
+
+   if ( !defined( 'WB_VERSION' ) ) {
+   $this->setExpectedException( 'RuntimeException' );
+   }
+
+   $array = $change->arrayalizeObjects( $statement );
+   $this->assertSame( $expected, $array );
+   }
+
+   public function testObjectifyArrays() {
+   $data = array(
+   'mainsnak' => array(
+   'snaktype' => 'novalue',
+   'property' => 'P1',
+   ),
+   'type' => 'statement',
+   '_claimclass_' => 
'Wikibase\DataModel\Statement\Statement',
+   );
+
+   $change = new EntityChange();
+   $statement = $change->objectifyArrays( $data );
+   $this->assertInstanceOf( 
'Wikibase\DataModel\Statement\Statement', $statement );
+   }
+
 }

-- 
To view, visit https://gerrit.wikimedia.org/r/252900
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I6a8ab6be1bd50ba70226a8d19f017137c1b19272
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Thiemo Mättig (WMDE) 
Gerrit-Reviewer: Addshore 
Gerrit-Reviewer: Daniel Kinzler 
Gerrit-Reviewer: Hoo man 
Gerrit-Reviewer: Jeroen De Dauw 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Sanitize/escape thumbnail URLs - change (mediawiki...Cards)

2015-11-16 Thread Phuedx (Code Review)

Phuedx has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/253328

Change subject: Sanitize/escape thumbnail URLs
..

Sanitize/escape thumbnail URLs

Changes:
* Ignore thumbnail URLs that don't begin with http[s]://
* Escape the thumbnail URL with CSS#escape, providing a polyfill for
  those browsers that don't support it [0]
* Quote the thumbnail URL in the CSS url() "function", e.g.
  url( 'http://foo.bar/baz.jpg' )

[0] 
https://developer.mozilla.org/en-US/docs/Web/API/CSS/escape#Browser_compatibility

Bug: T118553
Change-Id: I21e210c96dd7be58aafc090f6b57ee6982f8bacf
---
M extension.json
M includes/Cards.hooks.php
A lib/CSS.escape/LICENSE-MIT.txt
A lib/CSS.escape/css.escape.js
M resources/CardView.js
M resources/CardsGateway.js
M resources/card.hogan
A tests/qunit/CardsGateway.js
8 files changed, 271 insertions(+), 6 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Cards 
refs/changes/28/253328/1

diff --git a/extension.json b/extension.json
index 6e3789b..ca1cc1e 100644
--- a/extension.json
+++ b/extension.json
@@ -34,7 +34,8 @@
"dependencies": [
"oojs",
"mediawiki.Title",
-   "mediawiki.template.hogan"
+   "mediawiki.template.hogan",
+   "ext.cards.lib"
],
"scripts": [
"resources/init.js",
@@ -50,6 +51,15 @@
"card.hogan": "resources/card.hogan",
"cards.hogan": "resources/cards.hogan"
}
+   },
+   "ext.cards.lib": {
+   "targets": [
+   "mobile"
+   ],
+   "group": "other",
+   "scripts": [
+   "lib/CSS.escape/css.escape.js"
+   ]
}
},
"manifest_version": 1
diff --git a/includes/Cards.hooks.php b/includes/Cards.hooks.php
index 1431d8e..cc7600c 100644
--- a/includes/Cards.hooks.php
+++ b/includes/Cards.hooks.php
@@ -33,7 +33,8 @@
'ext.cards'
),
'scripts' => array(
-   'CardModel.js'
+   'CardModel.js',
+   'CardsGateway.js',
)
) + $resourceFileModulePaths;
 
diff --git a/lib/CSS.escape/LICENSE-MIT.txt b/lib/CSS.escape/LICENSE-MIT.txt
new file mode 100644
index 000..a41e0a7
--- /dev/null
+++ b/lib/CSS.escape/LICENSE-MIT.txt
@@ -0,0 +1,20 @@
+Copyright Mathias Bynens 
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/lib/CSS.escape/css.escape.js b/lib/CSS.escape/css.escape.js
new file mode 100644
index 000..e35cd3a
--- /dev/null
+++ b/lib/CSS.escape/css.escape.js
@@ -0,0 +1,95 @@
+/*! https://mths.be/cssescape v1.1.0 by @mathias | MIT license */
+;(function(root) {
+
+   if (!root.CSS) {
+   root.CSS = {};
+   }
+
+   var CSS = root.CSS;
+
+   var InvalidCharacterError = function(message) {
+   this.message = message;
+   };
+   InvalidCharacterError.prototype = new Error;
+   InvalidCharacterError.prototype.name = 'InvalidCharacterError';
+
+   if (!CSS.escape) {
+   // https://drafts.csswg.org/cssom/#serialize-an-identifier
+   CSS.escape = function(value) {
+   var string = String(value);
+   var length = string.length;
+   var index = -1;
+   var codeUnit;
+   var result = '';
+   var firstCodeUnit = string.charCodeAt(0);
+

[MediaWiki-commits] [Gerrit] ApiFeedWatchlist: Set messages for param-per-value too when ... - change (mediawiki/core)

2015-11-16 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged.

Change subject: ApiFeedWatchlist: Set messages for param-per-value too when 
copying from ApiQueryWatchlist
..


ApiFeedWatchlist: Set messages for param-per-value too when copying from 
ApiQueryWatchlist

Bug: T118675
Change-Id: I9244a177716d4bbe8c011fd7c374e125552ea531
---
M includes/api/ApiFeedWatchlist.php
1 file changed, 7 insertions(+), 0 deletions(-)

Approvals:
  Legoktm: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/includes/api/ApiFeedWatchlist.php 
b/includes/api/ApiFeedWatchlist.php
index e8afcb6..77a3a21 100644
--- a/includes/api/ApiFeedWatchlist.php
+++ b/includes/api/ApiFeedWatchlist.php
@@ -265,6 +265,13 @@
if ( !isset( $p[ApiBase::PARAM_HELP_MSG] ) ) {
$p[ApiBase::PARAM_HELP_MSG] = 
"apihelp-query+watchlist-param-$from";
}
+   if ( is_array( $p[ApiBase::PARAM_TYPE] ) && 
isset( $p[ApiBase::PARAM_HELP_MSG_PER_VALUE] ) ) {
+   foreach ( $p[ApiBase::PARAM_TYPE] as $v 
) {
+   if ( !isset( 
$p[ApiBase::PARAM_HELP_MSG_PER_VALUE][$v] ) ) {
+   
$p[ApiBase::PARAM_HELP_MSG_PER_VALUE][$v] = 
"apihelp-query+watchlist-paramvalue-$from-$v";
+   }
+   }
+   }
$ret[$to] = $p;
}
} else {

-- 
To view, visit https://gerrit.wikimedia.org/r/253332
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I9244a177716d4bbe8c011fd7c374e125552ea531
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Anomie 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Gulp task to fetch from Meta - change (wikimedia/portals)

2015-11-16 Thread JGirault (Code Review)

JGirault has submitted this change and it was merged.

Change subject: Gulp task to fetch from Meta
..


Gulp task to fetch from Meta

Added task to fetch a portal from Meta, as a stopgap for sister portals.

This change introduces a dependency on gulp-downloader.

Change-Id: I35efbfab5586395f5f4ba4b49dec336ac8c94647
---
M gulpfile.js
M package.json
2 files changed, 17 insertions(+), 0 deletions(-)

Approvals:
  JGirault: Verified; Looks good to me, approved



diff --git a/gulpfile.js b/gulpfile.js
index 6bb0210..d06ccee 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -30,6 +30,7 @@
console.log( '| gulp optimize-images --portal wikipedia.org - run 
imagemin on image directory   |' );
console.log( '| gulp lint --portal wikipedia.org- run 
jslint on JS files on portal  |' );
console.log( '| gulp --portal wikipedia.org - run all 
of the above on the specified portal page |' );
+   console.log( '| gulp fetch-meta --portal wikipedia.org  - overwrite 
the portal page with source from Meta   |' );
console.log( 
'+-+'
 );
console.log();
 } );
@@ -61,3 +62,18 @@
 } );
 
 gulp.task( 'default', [ 'lint', 'inline-assets', 'optimize-images' ] );
+
+gulp.task( 'fetch-meta', function () {
+   if ( portalParam === 'wikipedia.org' ) {
+   console.log( 'Cannot override ' + portalParam + ' portal using 
fetch-meta.' );
+   process.exit( 1 );
+   return;
+   }
+   plugins.downloader( {
+   fileName: 'index.html',
+   request: {
+   url: 
'https://meta.wikimedia.org/w/index.php?title=Www.' + portalParam + 
'_template=raw'
+   }
+   } )
+   .pipe( gulp.dest( prodDir ) );
+} );
diff --git a/package.json b/package.json
index f74db3e..76aae2b 100644
--- a/package.json
+++ b/package.json
@@ -2,6 +2,7 @@
   "dependencies": {},
   "devDependencies": {
 "gulp": "^3.9.0",
+"gulp-downloader": "^1.0.4",
 "gulp-imagemin": "^2.3.0",
 "gulp-inline": "^0.1.0",
 "gulp-jscs": "^3.0.2",

-- 
To view, visit https://gerrit.wikimedia.org/r/252910
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I35efbfab5586395f5f4ba4b49dec336ac8c94647
Gerrit-PatchSet: 2
Gerrit-Project: wikimedia/portals
Gerrit-Branch: master
Gerrit-Owner: Mxn 
Gerrit-Reviewer: JGirault 
Gerrit-Reviewer: MaxSem 
Gerrit-Reviewer: Mxn 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Add type hint to PagedTiffHandler so tests will pass - change (mediawiki...PagedTiffHandler)

2015-11-16 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged.

Change subject: Add type hint to PagedTiffHandler so tests will pass
..


Add type hint to PagedTiffHandler so tests will pass

Change-Id: I1c386599345ae6c4d5c6441b44603b57f098
---
M PagedTiffHandler_body.php
1 file changed, 2 insertions(+), 2 deletions(-)

Approvals:
  TheDJ: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/PagedTiffHandler_body.php b/PagedTiffHandler_body.php
index 0c0867b..082eadd 100644
--- a/PagedTiffHandler_body.php
+++ b/PagedTiffHandler_body.php
@@ -426,7 +426,7 @@
/**
 * Returns the number of available pages/embedded files
 */
-   function pageCount( $image ) {
+   function pageCount( File $image ) {
$data = $this->getMetaArray( $image );
if ( $this->isMetadataError( $data ) ) {
return 1;
@@ -709,7 +709,7 @@
 * expanded in the future.
 * Returns false if unknown or if the document is not multi-page.
 */
-   function getPageDimensions( $image, $page ) {
+   function getPageDimensions( File $image, $page ) {
// makeImageLink2 (Linker.php) sets $page to false if no page 
parameter
// is set in wiki code
$page = $this->adjustPage( $image, $page );

-- 
To view, visit https://gerrit.wikimedia.org/r/253281
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I1c386599345ae6c4d5c6441b44603b57f098
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/PagedTiffHandler
Gerrit-Branch: master
Gerrit-Owner: Brian Wolff 
Gerrit-Reviewer: Addshore 
Gerrit-Reviewer: TheDJ 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Rename 'newslettermanageapi' to 'newslettermanage' - change (mediawiki...Newsletter)

2015-11-16 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged.

Change subject: Rename 'newslettermanageapi' to 'newslettermanage'
..


Rename 'newslettermanageapi' to 'newslettermanage'

Change-Id: I9c4ab3e8359128c1617de2f064331d89b88892dd
---
M extension.json
M includes/api/ApiNewsletterManage.php
M modules/ext.newslettermanage.js
3 files changed, 2 insertions(+), 3 deletions(-)

Approvals:
  01tonythomas: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/extension.json b/extension.json
index 19df561..6a83a20 100644
--- a/extension.json
+++ b/extension.json
@@ -31,7 +31,7 @@
},
"APIModules": {
"newslettersubscribe": "ApiNewsletterSubscribe",
-   "newslettermanageapi": "ApiNewsletterManage"
+   "newslettermanage": "ApiNewsletterManage"
},
"MessagesDirs": {
"Newsletter": [
diff --git a/includes/api/ApiNewsletterManage.php 
b/includes/api/ApiNewsletterManage.php
index 6206535..06a009f 100644
--- a/includes/api/ApiNewsletterManage.php
+++ b/includes/api/ApiNewsletterManage.php
@@ -6,7 +6,6 @@
  * @license GNU GPL v2+
  * @author Tina Johnson
  *
- * @todo Rename this module to newslettermanage
  * @todo Add i18n
  */
 class ApiNewsletterManage extends ApiBase {
diff --git a/modules/ext.newslettermanage.js b/modules/ext.newslettermanage.js
index 76c8bb5..1321a83 100644
--- a/modules/ext.newslettermanage.js
+++ b/modules/ext.newslettermanage.js
@@ -11,7 +11,7 @@
var $that = $( this );
 
api.postWithToken( 'edit', {
-   action: 'newslettermanageapi',
+   action: 'newslettermanage',
publisher: publisherId,
id: remNewsletterId,
do: 'removepublisher'

-- 
To view, visit https://gerrit.wikimedia.org/r/253353
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I9c4ab3e8359128c1617de2f064331d89b88892dd
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/Newsletter
Gerrit-Branch: master
Gerrit-Owner: Glaisher 
Gerrit-Reviewer: 01tonythomas <01tonytho...@gmail.com>
Gerrit-Reviewer: Addshore 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Improved file documenation as well as license added - change (mediawiki...NoBogusUserpages)

2015-11-16 Thread Kghbln (Code Review)

Kghbln has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/253358

Change subject: Improved file documenation as well as license added
..

Improved file documenation as well as license added

* Improved file documentation
* Added COPYING
* Added license information
* Swichted to semver

Change-Id: I9a41599ce6db78224a4e9c923b4012a2efe93933
---
A COPYING
M NoBogusUserpages.class.php
M NoBogusUserpages.php
M extension.json
4 files changed, 368 insertions(+), 37 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/NoBogusUserpages 
refs/changes/58/253358/1

diff --git a/COPYING b/COPYING
new file mode 100644
index 000..d159169
--- /dev/null
+++ b/COPYING
@@ -0,0 +1,339 @@
+GNU GENERAL PUBLIC LICENSE
+   Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Lesser General Public License instead.)  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
+
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term "modification".)  Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+  1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any

[MediaWiki-commits] [Gerrit] Unstub $wgLang before passing it to DiscussionParser::getTex... - change (mediawiki...Echo)

2015-11-16 Thread Legoktm (Code Review)

Legoktm has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/253362

Change subject: Unstub $wgLang before passing it to 
DiscussionParser::getTextSnippet()
..

Unstub $wgLang before passing it to DiscussionParser::getTextSnippet()

getTextSnippet() has a `Language` type hint that will fatal if $wgLang
is a StubUserLang object, so make sure we unstub it if nothing else
already has.

Bug: T118542
Change-Id: I847680074fbbf95bbe3b6002151d2a18c45ebe6e
---
M includes/DiscussionParser.php
1 file changed, 2 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Echo 
refs/changes/62/253362/1

diff --git a/includes/DiscussionParser.php b/includes/DiscussionParser.php
index ececc02..cad7506 100644
--- a/includes/DiscussionParser.php
+++ b/includes/DiscussionParser.php
@@ -86,6 +86,8 @@
$header = $snippet = '';
$found = false;
 
+   StubObject::unstub( $wgLang );
+
foreach ( $interpretation as $action ) {
switch ( $action['type'] ) {
case 'add-comment':

-- 
To view, visit https://gerrit.wikimedia.org/r/253362
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I847680074fbbf95bbe3b6002151d2a18c45ebe6e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Echo
Gerrit-Branch: master
Gerrit-Owner: Legoktm 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] EventLogging processor as a service via HTTP - change (eventlogging)

2015-11-16 Thread Ori.livneh (Code Review)

Ori.livneh has submitted this change and it was merged.

Change subject: EventLogging processor as a service via HTTP
..


EventLogging processor as a service via HTTP

Bug: T114443

Usage:

  cd EventLogging/server
  export PYTHONPATH=.
  export SCHEMA_REPO_PATH=./tests/fixtures/config/schemas/jsonschema
  python bin/eventlogging-service --topic-config 
./tests/fixtures/config/topics.yaml 
kafka:///kafka-event-bus.services.eqiad.wmflabs:9092?async=False

Then
  # POST an event with meta data subobject
  curl -H 'Content-Type: application/json' -X POST 
http://localhost:8085/v1/events -d @./tests/fixtures/EditMetaTestRecord.json

  # OR POST an event with EventCapsule (old style) meta data
  curl -H 'Content-Type: application/json' -X POST 
http://localhost:8085/v1/events -d @./tests/fixtures/EditRecord.json

  # GET topic config
  curl -X GET http://localhost:8085/v1/topics

  # GET schema for a topic
  curl -X GET http://localhost:8085/v1/topics/mediawiki_EditMetaTest

  # GET latest schema by name
  curl -X GET http://localhost:8085/v1/schemas/EditMetaTest

  # GET a remote schema by scid
  curl -X GET http://localhost:8085/v1/schemas/Search/14361785

Changes:
- Tornado async HTTP endpoint for producing events and getting schemas by name
- Can load schemas from local files
- Schema cache reloading supported via SIGHUP
- JSON Schema validators for schemas now cached
- Draft 4 JSON Schema now supported via $schema
- Supports unversioned schemas, defaulting to latest revision
- Supports validation by latest revision of schema by special revision of 0
- schema_cache now multi-level dict to allow easier lookup by just schema name
- New meta schema subobject for events not using EventCapsule
- topic and key now formatted with .format rather than interpolated with %s
- handler and stream dependencies have been moved into methods, which allows
  use of eventlogging code without having all dependencies installed

TODO:
- Resolve JSON $refs?  Would be nice to make meta schema DRYer
- fix etcd ip hasher tests (what happened here?)

Change-Id: I1a0d00d76afdde3c1b6d0ef4c15f6c918304321b
---
M bin/eventlogging-devserver
R bin/eventlogging-load-tester
M bin/eventlogging-reporter
A bin/eventlogging-service
M eventlogging/__init__.py
M eventlogging/compat.py
M eventlogging/factory.py
M eventlogging/handlers.py
M eventlogging/jrm.py
M eventlogging/parse.py
M eventlogging/schema.py
A eventlogging/service.py
M eventlogging/streams.py
A eventlogging/topic.py
M eventlogging/utils.py
M requirements.txt
M setup.py
M tests/__init__.py
M tests/fixtures.py
A tests/fixtures/EditMetaTestRecord.json
A tests/fixtures/EditRecord.json
A tests/fixtures/config/schemas/jsonschema/Echo/Echo.7731316.json
A tests/fixtures/config/schemas/jsonschema/EditMetaTest/EditMetaTest.yaml
A tests/fixtures/config/topics.yaml
M tests/test_crypto.py
M tests/test_schema.py
A tests/test_service.py
A tests/test_topic.py
M tests/test_utils.py
M tox.ini
30 files changed, 1,991 insertions(+), 348 deletions(-)

Approvals:
  Ori.livneh: Verified; Looks good to me, approved



diff --git a/bin/eventlogging-devserver b/bin/eventlogging-devserver
index d36b107..48d57e5 100755
--- a/bin/eventlogging-devserver
+++ b/bin/eventlogging-devserver
@@ -116,7 +116,7 @@
 return None, [err]
 
 try:
-scid = event['schema'], event['revision']
+scid = eventlogging.scid_from_event(event)
 except KeyError as err:
 return event, [err]
 
diff --git a/tests/test_load.py b/bin/eventlogging-load-tester
similarity index 96%
rename from tests/test_load.py
rename to bin/eventlogging-load-tester
index 34cb436..7390575 100644
--- a/tests/test_load.py
+++ b/bin/eventlogging-load-tester
@@ -39,8 +39,8 @@
 func, args, kargs = self.tasks.get()
 try:
 func(*args, **kargs)
-except Exception, e:
-print 'Worker error: %s.' % e
+except Exception as e:
+print('Worker error: %s.' % e)
 self.tasks.task_done()
 
 
@@ -198,11 +198,11 @@
 
 
 def main():
-print 'Initializing...'
+print('Initializing...')
 sleep_interval, generators, optional_values, endpoint = get_arguments()
 capsule_schema = get_schema('EventCapsule', CAPSULE_REVISION)
 pool = ThreadPool(POOL_SIZE)
-print 'Sending events...'
+print('Sending events...')
 count = 0
 try:
 while True:
@@ -215,7 +215,7 @@
 time_to_sleep = max(sleep_interval - (t2 - t1), 0)
 time.sleep(time_to_sleep)
 except KeyboardInterrupt:
-print '\n%d events sent, exiting.' % count
+print('\n%d events sent, exiting.' % count)
 
 
 if __name__ == '__main__':
diff --git a/bin/eventlogging-reporter b/bin/eventlogging-reporter
index 033db06..644a50d 100755
--- a/bin/eventlogging-reporter
+++ b/bin/eventlogging-reporter
@@ -85,8 +85,9 @@
 
 
 def iter_pubs(config_dir):
-

[MediaWiki-commits] [Gerrit] Prevent FOUC of #toc in main content - change (mediawiki...Blueprint)

2015-11-16 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged.

Change subject: Prevent FOUC of #toc in main content
..


Prevent FOUC of #toc in main content

The ToC is detached and appended to `#sidebar` in toc.js.
In order not to have a FOUC we're hiding it from JS-enabled browsers
by using `.client-js` class.
Also fixing false indenting of ToC list items and simplifying CSS/Less
selectors.

Bug: T118113
Change-Id: Ia5e7a6268f56e8641c4207fe4c26d3933cf6dabc
---
M resources/master.less
1 file changed, 25 insertions(+), 18 deletions(-)

Approvals:
  VolkerE: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/resources/master.less b/resources/master.less
index b0bd724..396b2f9 100644
--- a/resources/master.less
+++ b/resources/master.less
@@ -82,38 +82,43 @@
display: none;
 }
 
-#content {
+
+/**
+ * General Modules Classes
+ */
+/* IMESelector - Input Keyboard Tool */
+.imeselector-toggle {
+   box-shadow: @bxsh-popup;
+}
+
+
+/**
+ * Document Structure
+ */
+.container {
margin-top: 50px;
padding-top: 1.25em;
-
-   & .mw-indicators {
+   padding-left: 22px; // 32px minus 10px margin added in menu.js
+}
+   .mw-indicators {
float: right;
/* Ensure that this is displayed on top of .mw-body-content and 
clickable */
position: relative;
z-index: 1;
}
 
-   & .mw-indicator {
+   .mw-indicator {
display: inline-block;
}
-}
 
-#content.container {
-   padding-left: 22px; // 32px minus 10px margin added in menu.js
-}
+   .client-js .container .toc {
+   display: none;
+   }
 
 .example_container {
background-color: @bgc-code;
margin: 2em 0;
padding: 1em;
-}
-
-/*
- * General Modules Classes
- */
-/* IMESelector - Input Keyboard Tool */
-.imeselector-toggle {
-   box-shadow: @bxsh-popup;
 }
 
 /* Sidebar Offscreen Navigation */
@@ -150,6 +155,10 @@
padding: 0 50px;
font-size: 16px;
line-height: 16px;
+
+   & ul {
+   padding-left: 0;
+   }
 
& .tocnumber {
display: inline-block;
@@ -304,7 +313,6 @@
border-left: 1px solid #eee;
}
 }
-/* Navbar */
 
 #toc-toggle {
background-color: @bgc-contrast;
@@ -322,7 +330,6 @@
 }
 
 
-/* MediaWiki Stuff */
 @media screen {
#contentSub, 
#siteSub {

-- 
To view, visit https://gerrit.wikimedia.org/r/252894
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia5e7a6268f56e8641c4207fe4c26d3933cf6dabc
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/skins/Blueprint
Gerrit-Branch: master
Gerrit-Owner: VolkerE 
Gerrit-Reviewer: Pastakhov 
Gerrit-Reviewer: Prtksxna 
Gerrit-Reviewer: Spage 
Gerrit-Reviewer: VolkerE 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Add help messages to newslettermanage API - change (mediawiki...Newsletter)

2015-11-16 Thread Glaisher (Code Review)

Glaisher has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/253354

Change subject: Add help messages to newslettermanage API
..

Add help messages to newslettermanage API

Change-Id: I5659d4e76cf21e90536cbd90399b9d377b813df2
---
M i18n/en.json
M i18n/qqq.json
M includes/api/ApiNewsletterManage.php
M includes/api/ApiNewsletterSubscribe.php
4 files changed, 25 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Newsletter 
refs/changes/54/253354/1

diff --git a/i18n/en.json b/i18n/en.json
index e18ec3b..71d23d7 100755
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -107,6 +107,12 @@
"apihelp-newslettersubscribe-param-do": "Action to do. Should be either 
subscribe or unsubscribe.",
"apihelp-newslettersubscribe-example-1": "Subscribe to newsletter with 
id 1.",
"apihelp-newslettersubscribe-example-2": "Unsubscribe from newsletter 
with id 2.",
+   "apihelp-newslettermanage-description": "Manage a newsletter.",
+   "apihelp-newslettermanage-param-id": "ID of the newsletter to manage.",
+   "apihelp-newslettermanage-param-do": "Action to do. Should be either 
addpublisher or removepublisher.",
+   "apihelp-newslettermanage-param-publisher": "User ID of the publisher 
to manage.",
+   "apihelp-newslettermanage-example-1": "Add a publisher with a user id 
of 3 to newsletter with id 1.",
+   "apihelp-newslettermanage-example-2": "Remove publisher with a user id 
of 5 from newsletter with id 2.",
"newsletter-list-table": "Filter table by: ",
"newsletter-list-section":  "Search for newsletters",
"newsletter-list-option-all": "All newsletters",
diff --git a/i18n/qqq.json b/i18n/qqq.json
index f2528fd..13220fc 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -110,6 +110,12 @@
"apihelp-newslettersubscribe-param-do": 
"{{doc-apihelp-param|newslettersubscribe|do}}",
"apihelp-newslettersubscribe-example-1": 
"{{doc-apihelp-example|newslettersubscribe}}",
"apihelp-newslettersubscribe-example-2": 
"{{doc-apihelp-example|newslettersubscribe}}",
+   "apihelp-newslettermanage-description": 
"{{doc-apihelp-description|newslettermanage}}",
+   "apihelp-newslettermanage-param-id": 
{{doc-apihelp-param|newslettermanage|id}}",
+   "apihelp-newslettermanage-param-do": 
{{doc-apihelp-param|newslettermanage|do}}",
+   "apihelp-newslettermanage-param-publisher": 
{{doc-apihelp-param|newslettermanage|publisher}}",
+   "apihelp-newslettermanage-example-1": 
"{{doc-apihelp-example|newslettermanage}}",
+   "apihelp-newslettermanage-example-2": 
"{{doc-apihelp-example|newslettermanage}}",
"newsletter-list-table": "Label of the drop down menu in 
[[Special:Newsletters]], the options of which can be used to customize the 
search of newsletters",
"newsletter-list-section":  "Section header of HTML form in 
[[Special:Newsletters]] used to search for newsletters",
"newsletter-list-option-all": "Option of the drop down menu in 
[[Special:Newsletters]] to display all newsletters",
diff --git a/includes/api/ApiNewsletterManage.php 
b/includes/api/ApiNewsletterManage.php
index 06a009f..a4a9ed4 100644
--- a/includes/api/ApiNewsletterManage.php
+++ b/includes/api/ApiNewsletterManage.php
@@ -70,6 +70,18 @@
);
}
 
+   /**
+* @see ApiBase::getExamplesMessages()
+*/
+   protected function getExamplesMessages() {
+   return array(
+   
'action=newslettermanage=1=addpublisher=3'
+   => 'apihelp-newslettermanage-example-1',
+   
'action=newslettermanage=2=removepublisher=5'
+   => 'apihelp-newslettermanage-example-2',
+   );
+   }
+
public function isWriteMode() {
return true;
}
diff --git a/includes/api/ApiNewsletterSubscribe.php 
b/includes/api/ApiNewsletterSubscribe.php
index 8bf05a2..b144a3d 100644
--- a/includes/api/ApiNewsletterSubscribe.php
+++ b/includes/api/ApiNewsletterSubscribe.php
@@ -64,6 +64,7 @@
=> 'apihelp-newslettersubscribe-example-2',
);
}
+
public function isWriteMode() {
return true;
}

-- 
To view, visit https://gerrit.wikimedia.org/r/253354
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I5659d4e76cf21e90536cbd90399b9d377b813df2
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Newsletter
Gerrit-Branch: master
Gerrit-Owner: Glaisher 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Allow same perms to tileratorui as tilerator - change (operations/puppet)

2015-11-16 Thread Alexandros Kosiaris (Code Review)

Alexandros Kosiaris has submitted this change and it was merged.

Change subject: Allow same perms to tileratorui as tilerator
..


Allow same perms to tileratorui as tilerator

Bug: T112914
Change-Id: I3b1f558884886791f6409030ef8adccacb2efc6d
---
M modules/admin/data/data.yaml
1 file changed, 6 insertions(+), 1 deletion(-)

Approvals:
  Alexandros Kosiaris: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/modules/admin/data/data.yaml b/modules/admin/data/data.yaml
index 6071a3f..2c08b48 100644
--- a/modules/admin/data/data.yaml
+++ b/modules/admin/data/data.yaml
@@ -383,7 +383,12 @@
  'ALL = NOPASSWD: /bin/systemctl mask tilerator.service',
  'ALL = NOPASSWD: /bin/systemctl unmask tilerator.service',
  'ALL = (tilerator) NOPASSWD: ALL',
- 'ALL = NOPASSWD: /bin/journalctl -u tilerator *']
+ 'ALL = NOPASSWD: /bin/journalctl -u tilerator *',
+ 'ALL = NOPASSWD: /usr/sbin/service tileratorui *',
+ 'ALL = NOPASSWD: /bin/systemctl mask tileratorui.service',
+ 'ALL = NOPASSWD: /bin/systemctl unmask tileratorui.service',
+ 'ALL = (tileratorui) NOPASSWD: ALL',
+ 'ALL = NOPASSWD: /bin/journalctl -u tileratorui *']
   mobileapps-admin:
 description: Group of mobileapps admins
 gid: 759

-- 
To view, visit https://gerrit.wikimedia.org/r/249501
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I3b1f558884886791f6409030ef8adccacb2efc6d
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Yurik 
Gerrit-Reviewer: Alexandros Kosiaris 
Gerrit-Reviewer: Dzahn 
Gerrit-Reviewer: Yurik 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Synchronized portals with Meta - change (wikimedia/portals)

2015-11-16 Thread JGirault (Code Review)

JGirault has submitted this change and it was merged.

Change subject: Synchronized portals with Meta
..


Synchronized portals with Meta

wikipedia.org 14642966 (manual)
wikibooks.org 14624475
wikinews.org 14624464
wikiquote.org 14624471
wikiversity.org 14624472
wiktionary.org 14642978
Gadget-wm-portal.css 14624344

Change-Id: I51bca4dc9d55781f55ddea0f8b4133fa0447e9a7
---
M dev/wikipedia.org/assets/css/wm-portal.css
M dev/wikipedia.org/index.html
M prod/wikibooks.org/index.html
M prod/wikinews.org/index.html
M prod/wikipedia.org/index.html
M prod/wikiquote.org/index.html
M prod/wikiversity.org/index.html
M prod/wiktionary.org/index.html
8 files changed, 30 insertions(+), 29 deletions(-)

Approvals:
  JGirault: Verified; Looks good to me, approved



diff --git a/dev/wikipedia.org/assets/css/wm-portal.css 
b/dev/wikipedia.org/assets/css/wm-portal.css
index f5544f8..7150664 100644
--- a/dev/wikipedia.org/assets/css/wm-portal.css
+++ b/dev/wikipedia.org/assets/css/wm-portal.css
@@ -82,6 +82,7 @@
 position: absolute;
 background-position: center center;
 background-repeat: no-repeat;
+background-size: 200px auto;
 left: 0;
 top: 0;
 width: 100%;
diff --git a/dev/wikipedia.org/index.html b/dev/wikipedia.org/index.html
index 752289f..da269e0 100644
--- a/dev/wikipedia.org/index.html
+++ b/dev/wikipedia.org/index.html
@@ -35,7 +35,7 @@
 
 English
 The Free Encyclopedia
-5 007 000+ articles
+5 010 000+ articles
 
 
 
@@ -49,35 +49,35 @@
 
 Русский
 Свободная энциклопедия
-1 266 000+ статей
+1 267 000+ статей
 
 
 
 
 Deutsch
 Die freie Enzyklopädie
-1 874 000+ Artikel
+1 875 000+ Artikel
 
 
 
 
 日本語
 フリー百科事典
-990 000+ 記事
+991 000+ 記事
 
 
 
 
 Français
 L’encyclopédie libre
-1 694 000+ articles
+1 696 000+ articles
 
 
 
 
 Italiano
 L’enciclopedia libera
-1 234 000+ voci
+1 235 000+ voci
 
 
 
diff --git a/prod/wikibooks.org/index.html b/prod/wikibooks.org/index.html
index c2480c8..61725cd 100644
--- a/prod/wikibooks.org/index.html
+++ b/prod/wikibooks.org/index.html
@@ -1,7 +1,7 @@
 
 
 
-
+
 
 Wikibooks
 
@@ -12,7 +12,7 @@
 
 
 
-.central-featured-logo{background-image:url(//upload.wikimedia.org/wikipedia/meta/4/48/Wikibooks-logo_1x.png)}@media(-webkit-min-device-pixel-ratio:1.5),(min--moz-device-pixel-ratio:1.5),(-o-min-device-pixel-ratio:3/2),(min-resolution:1.5dppx),(min-resolution:144dpi){.central-featured-logo{background-image:url(//upload.wikimedia.org/wikipedia/meta/7/76/Wikibooks-logo_1.5x.png);background-size:200px
 
auto}}@media(-webkit-min-device-pixel-ratio:2),(min--moz-device-pixel-ratio:2),(-o-min-device-pixel-ratio:2),(min-resolution:2dppx),(min-resolution:192dpi){.central-featured-logo{background-image:url(//upload.wikimedia.org/wikipedia/meta/6/6d/Wikibooks-logo_2x.png);background-size:200px
 auto}}
+.central-featured-logo{background-image:url(//upload.wikimedia.org/wikipedia/meta/4/48/Wikibooks-logo_1x.png)}@media(-webkit-min-device-pixel-ratio:1.5),(min--moz-device-pixel-ratio:1.5),(-o-min-device-pixel-ratio:3/2),(min-resolution:1.5dppx),(min-resolution:144dpi){.central-featured-logo{background-image:url(//upload.wikimedia.org/wikipedia/meta/7/76/Wikibooks-logo_1.5x.png)}}@media(-webkit-min-device-pixel-ratio:2),(min--moz-device-pixel-ratio:2),(-o-min-device-pixel-ratio:2),(min-resolution:2dppx),(min-resolution:192dpi){.central-featured-logo{background-image:url(//upload.wikimedia.org/wikipedia/meta/6/6d/Wikibooks-logo_2x.png)}}
 
 
+
 
 Wikinews
 
@@ -12,7 +12,7 @@
 
 
 
-.central-featured-logo{background-image:url(//upload.wikimedia.org/wikipedia/meta/e/e4/Wikinews-logo_1x.png)}@media(-webkit-min-device-pixel-ratio:1.5),(min--moz-device-pixel-ratio:1.5),(-o-min-device-pixel-ratio:3/2),(min-resolution:1.5dppx),(min-resolution:144dpi){.central-featured-logo{background-image:url(//upload.wikimedia.org/wikipedia/meta/a/a5/Wikinews-logo_1.5x.png);background-size:240px
 
auto}}@media(-webkit-min-device-pixel-ratio:2),(min--moz-device-pixel-ratio:2),(-o-min-device-pixel-ratio:2),(min-resolution:2dppx),(min-resolution:192dpi){.central-featured-logo{background-image:url(//upload.wikimedia.org/wikipedia/meta/3/3f/Wikinews-logo_2x.png);background-size:240px
 auto}}
+.central-featured-logo{background-image:url(//upload.wikimedia.org/wikipedia/meta/e/e4/Wikinews-logo_1x.png)}@media
 not all and (max-width:480px){.central-featured-logo{background-size:240px 
auto}}@media(-webkit-min-device-pixel-ratio:1.5),(min--moz-device-pixel-ratio:1.5),(-o-min-device-pixel-ratio:3/2),(min-resolution:1.5dppx),(min-resolution:144dpi){.central-featured-logo{background-image:url(//upload.wikimedia.org/wikipedia/meta/a/a5/Wikinews-logo_1.5x.png)}}@media(-webkit-min-device-pixel-ratio:2),(min--moz-device-pixel-ratio:2),(-o-min-device-pixel-ratio:2),(min-resolution:2dppx),(min-resolution:192dpi){.central-featured-logo{background-image:url(//upload.wikimedia.org/wikipedia/meta/3/3f/Wikinews-logo_2x.png)}}
 
 
@@ -51,35 +51,35 @@

[MediaWiki-commits] [Gerrit] Set up CI for eventlogging (python) repo - change (integration/config)

2015-11-16 Thread Ottomata (Code Review)

Ottomata has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/253359

Change subject: Set up CI for eventlogging (python) repo
..

Set up CI for eventlogging (python) repo

Bug: T118761
Change-Id: Ifd351d23d353ef98cf0521ae6f7bae2723793c3b
---
M zuul/layout.yaml
1 file changed, 29 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/59/253359/1

diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index b9005e6..0a2a1d9 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -3620,11 +3620,37 @@
 postmerge:
   - mwext-EventLogging-jsduck-publish
 
-  - name: mediawiki/extensions/ExpandTemplates
+  - name: mediawiki/extensions/EventLogging
 template:
+  - name: extension-gate
   - name: jshint
-  - name: jsonlint
-  - name: extension-unittests-generic
+  - name: extension-unittests
+  - name: extension-qunit-generic
+  - name: npm
+check:
+  - jsonlint
+test:
+  - tox-flake8
+  - tox-flake8-bin
+  - tox-py27-jessie
+gate-and-submit:
+  - tox-flake8
+  - tox-flake8-bin
+  - tox-py27-jessie
+
+  - name: eventlogging
+check:
+  - jsonlint
+test:
+  - tox-flake8
+  - tox-flake8-bin
+  - tox-py27-jessie
+  - tox-py34-jessie
+gate-and-submit:
+  - tox-flake8
+  - tox-flake8-bin
+  - tox-py27-jessie
+  - tox-py34-jessie
 
   - name: mediawiki/extensions/ExtensionDistributor
 template:

-- 
To view, visit https://gerrit.wikimedia.org/r/253359
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ifd351d23d353ef98cf0521ae6f7bae2723793c3b
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Ottomata 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Added license information and furhter tweaks - change (mediawiki...MinimumNameLength)

2015-11-16 Thread Kghbln (Code Review)

Kghbln has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/253361

Change subject: Added license information and furhter tweaks
..

Added license information and furhter tweaks

* Added license information
* Minor tweaks

Change-Id: I7f34ce2f1ec0d283ca1af723f0a496abb8d92f7b
---
M MinimumNameLength.php
1 file changed, 3 insertions(+), 1 deletion(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MinimumNameLength 
refs/changes/61/253361/1

diff --git a/MinimumNameLength.php b/MinimumNameLength.php
index 1d160e1..d6e006c 100644
--- a/MinimumNameLength.php
+++ b/MinimumNameLength.php
@@ -9,6 +9,7 @@
  *
  * @file
  * @ingroup Extensions
+ * @package MediaWiki
  *
  * @author Rob Church (Robchurch) 
  * @author Karsten Hoffmeyer (Kghbln) 
@@ -18,7 +19,7 @@
 
 // Ensure that the script cannot be executed outside of MediaWiki
 if ( !defined( 'MEDIAWIKI' ) ) {
-die( 'This is an extension to MediaWiki. It cannot be run standalone.\n' );
+die( 'This is an extension to MediaWiki and cannot be run standalone.' );
 }
 
 // Display extension's information on "Special:Version"
@@ -33,6 +34,7 @@
),
'descriptionmsg' => 'minimumnamelength-desc',
'url' => 'https://www.mediawiki.org/wiki/Extension:Minimum_Name_Length',
+   'license-name' => 'BSD-2-Clause'
 );
 
 // Minimum username length to enforce

-- 
To view, visit https://gerrit.wikimedia.org/r/253361
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I7f34ce2f1ec0d283ca1af723f0a496abb8d92f7b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MinimumNameLength
Gerrit-Branch: master
Gerrit-Owner: Kghbln 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Added license information and furhter tweaks - change (mediawiki...MinimumNameLength)

2015-11-16 Thread Kghbln (Code Review)

Kghbln has submitted this change and it was merged.

Change subject: Added license information and furhter tweaks
..


Added license information and furhter tweaks

* Added license information
* Minor tweaks

Change-Id: I7f34ce2f1ec0d283ca1af723f0a496abb8d92f7b
---
M MinimumNameLength.php
1 file changed, 3 insertions(+), 1 deletion(-)

Approvals:
  Kghbln: Verified; Looks good to me, approved



diff --git a/MinimumNameLength.php b/MinimumNameLength.php
index 1d160e1..d6e006c 100644
--- a/MinimumNameLength.php
+++ b/MinimumNameLength.php
@@ -9,6 +9,7 @@
  *
  * @file
  * @ingroup Extensions
+ * @package MediaWiki
  *
  * @author Rob Church (Robchurch) 
  * @author Karsten Hoffmeyer (Kghbln) 
@@ -18,7 +19,7 @@
 
 // Ensure that the script cannot be executed outside of MediaWiki
 if ( !defined( 'MEDIAWIKI' ) ) {
-die( 'This is an extension to MediaWiki. It cannot be run standalone.\n' );
+die( 'This is an extension to MediaWiki and cannot be run standalone.' );
 }
 
 // Display extension's information on "Special:Version"
@@ -33,6 +34,7 @@
),
'descriptionmsg' => 'minimumnamelength-desc',
'url' => 'https://www.mediawiki.org/wiki/Extension:Minimum_Name_Length',
+   'license-name' => 'BSD-2-Clause'
 );
 
 // Minimum username length to enforce

-- 
To view, visit https://gerrit.wikimedia.org/r/253361
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I7f34ce2f1ec0d283ca1af723f0a496abb8d92f7b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MinimumNameLength
Gerrit-Branch: master
Gerrit-Owner: Kghbln 
Gerrit-Reviewer: Kghbln 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Show "Manage" button to all users who can manage newsletters - change (mediawiki...Newsletter)

2015-11-16 Thread Glaisher (Code Review)

Glaisher has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/253352

Change subject: Show "Manage" button to all users who can manage newsletters
..

Show "Manage" button to all users who can manage newsletters

Change-Id: Ida4732673ebfc970e6d81b8794830bc9cef1e2b5
---
M includes/Newsletter.php
M includes/specials/SpecialNewsletter.php
2 files changed, 13 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Newsletter 
refs/changes/52/253352/1

diff --git a/includes/Newsletter.php b/includes/Newsletter.php
index aaf07e0..d09935d 100644
--- a/includes/Newsletter.php
+++ b/includes/Newsletter.php
@@ -207,4 +207,14 @@
return $this->isPublisher( $user ) || $user->isAllowed( 
'newsletter-delete' );
}
 
+   /**
+* Check whether the user is allowed to manage the newsletter.
+*
+* @param User $user
+*
+* @return bool
+*/
+   public function canManage( User $user ) {
+   return $this->isPublisher( $user ) || $user->isAllowed( 
'newsletter-manage' );
+   }
 }
diff --git a/includes/specials/SpecialNewsletter.php 
b/includes/specials/SpecialNewsletter.php
index cb484d3..a68c4b1 100644
--- a/includes/specials/SpecialNewsletter.php
+++ b/includes/specials/SpecialNewsletter.php
@@ -191,7 +191,7 @@
);
}
 
-   if ( $this->newsletter->isPublisher( $user ) ) {
+   if ( $this->newsletter->canManage( $user ) ) {
// @todo show this to all users who can manage, not 
just publishers
$buttons[] = new OOUI\ButtonWidget(
array(
@@ -201,7 +201,9 @@
'href' => SpecialPage::getTitleFor( 
'NewsletterManage' )->getFullURL()
)
);
+   }
 
+   if ( $this->newsletter->isPublisher( $user ) ) {
$buttons[] = new OOUI\ButtonWidget(
array(
'label' => $this->msg( 
'newsletter-announce-button' )->escaped(),

-- 
To view, visit https://gerrit.wikimedia.org/r/253352
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ida4732673ebfc970e6d81b8794830bc9cef1e2b5
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Newsletter
Gerrit-Branch: master
Gerrit-Owner: Glaisher 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] dynamicproxy: Move to redis::instance - change (operations/puppet)

2015-11-16 Thread Yuvipanda (Code Review)

Yuvipanda has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/253360

Change subject: dynamicproxy: Move to redis::instance
..

dynamicproxy: Move to redis::instance

Change-Id: Ib48b0bac2ddf08dafec290bbc24cfc951591a4e3
---
M modules/dynamicproxy/manifests/init.pp
1 file changed, 11 insertions(+), 6 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/60/253360/1

diff --git a/modules/dynamicproxy/manifests/init.pp 
b/modules/dynamicproxy/manifests/init.pp
index cb263de..2731b3f 100644
--- a/modules/dynamicproxy/manifests/init.pp
+++ b/modules/dynamicproxy/manifests/init.pp
@@ -39,12 +39,17 @@
 
 $resolver = join($::nameservers, ' ')
 
-class { '::redis::legacy':
-persist   => 'aof',
-dir   => '/var/lib/redis',
-maxmemory => $redis_maxmemory,
-redis_replication => $redis_replication,
-expose=> false,
+if $redis_replication and $redis_replication[$::hostname] {
+$slaveof = $redis_replication[$::hostname]
+}
+
+redis::instance { '6379':
+settings   => {
+appendonly => 'yes',
+maxmemory  => $redis_maxmemory,
+slaveof=> $slaveof,
+dir=> '/var/lib/redis',
+}
 }
 
 # The redis module intentionally does not restart the redis

-- 
To view, visit https://gerrit.wikimedia.org/r/253360
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib48b0bac2ddf08dafec290bbc24cfc951591a4e3
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Yuvipanda 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Unstub $wgLang before passing it to DiscussionParser::getTex... - change (mediawiki...Echo)

2015-11-16 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged.

Change subject: Unstub $wgLang before passing it to 
DiscussionParser::getTextSnippet()
..


Unstub $wgLang before passing it to DiscussionParser::getTextSnippet()

getTextSnippet() has a `Language` type hint that will fatal if $wgLang
is a StubUserLang object, so make sure we unstub it if nothing else
already has.

Bug: T118542
Change-Id: I847680074fbbf95bbe3b6002151d2a18c45ebe6e
---
M includes/DiscussionParser.php
1 file changed, 2 insertions(+), 0 deletions(-)

Approvals:
  Catrope: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/includes/DiscussionParser.php b/includes/DiscussionParser.php
index ececc02..cad7506 100644
--- a/includes/DiscussionParser.php
+++ b/includes/DiscussionParser.php
@@ -86,6 +86,8 @@
$header = $snippet = '';
$found = false;
 
+   StubObject::unstub( $wgLang );
+
foreach ( $interpretation as $action ) {
switch ( $action['type'] ) {
case 'add-comment':

-- 
To view, visit https://gerrit.wikimedia.org/r/253362
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I847680074fbbf95bbe3b6002151d2a18c45ebe6e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Echo
Gerrit-Branch: master
Gerrit-Owner: Legoktm 
Gerrit-Reviewer: Addshore 
Gerrit-Reviewer: Catrope 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] dynamicproxy: Don't try to restart redis when config changes - change (operations/puppet)

2015-11-16 Thread Yuvipanda (Code Review)

Yuvipanda has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/253364

Change subject: dynamicproxy: Don't try to restart redis when config changes
..

dynamicproxy: Don't try to restart redis when config changes

Is a stateful service, should be done manually

Change-Id: I6a0e60bf3ddeb2a7dea67b040f134080584d98f9
---
M modules/dynamicproxy/manifests/init.pp
1 file changed, 1 insertion(+), 6 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/64/253364/1

diff --git a/modules/dynamicproxy/manifests/init.pp 
b/modules/dynamicproxy/manifests/init.pp
index 2731b3f..da74ff0 100644
--- a/modules/dynamicproxy/manifests/init.pp
+++ b/modules/dynamicproxy/manifests/init.pp
@@ -49,13 +49,8 @@
 maxmemory  => $redis_maxmemory,
 slaveof=> $slaveof,
 dir=> '/var/lib/redis',
-}
+},
 }
-
-# The redis module intentionally does not restart the redis
-# service if the configuration changes, so we have to do this
-# explicitly here.
-File['/etc/redis/redis.conf'] ~> Service['redis-server']
 
 class { 'nginx':
 variant => 'extras',

-- 
To view, visit https://gerrit.wikimedia.org/r/253364
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6a0e60bf3ddeb2a7dea67b040f134080584d98f9
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Yuvipanda 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Range offsets: Special case when adjacent to a nail - change (VisualEditor/VisualEditor)

2015-11-16 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged.

Change subject: Range offsets: Special case when adjacent to a nail
..


Range offsets: Special case when adjacent to a nail

Bug: T118623
Change-Id: Icbc5f4d046c12d0b49524389fbe00711db5a2645
---
M src/ce/ve.ce.Surface.js
1 file changed, 12 insertions(+), 6 deletions(-)

Approvals:
  Divec: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/src/ce/ve.ce.Surface.js b/src/ce/ve.ce.Surface.js
index 919e63a..b8b3881 100644
--- a/src/ce/ve.ce.Surface.js
+++ b/src/ce/ve.ce.Surface.js
@@ -373,14 +373,20 @@
  */
 ve.ce.Surface.prototype.getNodeClientRectFromRange = function ( range ) {
var rect, side, x, adjacentNode, unicornRect,
-   node = range.endContainer;
+   node = range.endContainer,
+   offset = range.endOffset,
+   leftNode = offset > 0 && node.childNodes[ offset - 1 ];
 
-   while ( node && node.nodeType !== Node.ELEMENT_NODE ) {
-   node = node.parentNode;
-   }
+   if ( leftNode && leftNode.nodeType === Node.ELEMENT_NODE && 
leftNode.classList.contains( 've-ce-nail' ) ) {
+   node = leftNode;
+   } else {
+   while ( node && node.nodeType !== Node.ELEMENT_NODE ) {
+   node = node.parentNode;
+   }
 
-   if ( !node ) {
-   return null;
+   if ( !node ) {
+   return null;
+   }
}
 
// When possible, pretend the cursor is the left/right border of the 
node

-- 
To view, visit https://gerrit.wikimedia.org/r/253278
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Icbc5f4d046c12d0b49524389fbe00711db5a2645
Gerrit-PatchSet: 1
Gerrit-Project: VisualEditor/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders 
Gerrit-Reviewer: DLynch 
Gerrit-Reviewer: Divec 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] etherpad: Add an autorestarter - change (operations/puppet)

2015-11-16 Thread Yuvipanda (Code Review)

Yuvipanda has submitted this change and it was merged.

Change subject: etherpad: Add an autorestarter
..


etherpad: Add an autorestarter

Until we come up with a real solution to etherpad scaling. Currently
everytime it goes down someone first complains on IRC and then
someone else restarts it, which isn't that good of a workflow

Change-Id: I8d8323f077169b9549ef0afc1edb11374c354597
---
M manifests/role/etherpad.pp
A modules/etherpad/files/monitrc
A modules/etherpad/manifests/autorestarter.pp
3 files changed, 34 insertions(+), 0 deletions(-)

Approvals:
  Yuvipanda: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/manifests/role/etherpad.pp b/manifests/role/etherpad.pp
index 55b784c..37b56e8 100644
--- a/manifests/role/etherpad.pp
+++ b/manifests/role/etherpad.pp
@@ -57,6 +57,9 @@
 check_command => 'check_http_url!etherpad.wikimedia.org!/',
 }
 
+# Autorestart because etherpad sucks
+include ::etherpad::autorestarter
+
 ferm::service { 'etherpad_http':
 proto => 'tcp',
 port  => 'http',
diff --git a/modules/etherpad/files/monitrc b/modules/etherpad/files/monitrc
new file mode 100644
index 000..9166acf
--- /dev/null
+++ b/modules/etherpad/files/monitrc
@@ -0,0 +1,11 @@
+# THIS FILE IS MANAGED BY PUPPET
+
+check host etherpad with address 127.0.0.1
+start "/usr/sbin/service etherpad-lite start"
+stop "/usr/sbin/service etherpad-lite stop"
+if failed
+port 9001
+protocol HTTP
+request /
+with timeout 2 seconds
+then restart
diff --git a/modules/etherpad/manifests/autorestarter.pp 
b/modules/etherpad/manifests/autorestarter.pp
new file mode 100644
index 000..713359e
--- /dev/null
+++ b/modules/etherpad/manifests/autorestarter.pp
@@ -0,0 +1,20 @@
+# = class: etherpad::autorestarter
+#
+# Sets up a monit instance to restart etherpad if it is down
+# This is a temporary (HAHA!) Hack to prevent people from having
+# to manually ping an operations person to restart etherpad
+class etherpad::autorestarter {
+package { 'monit':
+ensure => present,
+}
+
+service { 'monit':
+ensure  => running,
+require => Package['monit'],
+}
+
+file { '/etc/monit/conf.d/etherpad':
+source => 'puppet:///modules/etherpad/monitrc',
+notify => Service['monit'],
+}
+}

-- 
To view, visit https://gerrit.wikimedia.org/r/253048
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I8d8323f077169b9549ef0afc1edb11374c354597
Gerrit-PatchSet: 6
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Yuvipanda 
Gerrit-Reviewer: Alexandros Kosiaris 
Gerrit-Reviewer: Giuseppe Lavagetto 
Gerrit-Reviewer: Jcrespo 
Gerrit-Reviewer: Ori.livneh 
Gerrit-Reviewer: Yuvipanda 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] dynamicproxy: Move to redis::instance - change (operations/puppet)

2015-11-16 Thread Yuvipanda (Code Review)

Yuvipanda has submitted this change and it was merged.

Change subject: dynamicproxy: Move to redis::instance
..


dynamicproxy: Move to redis::instance

Change-Id: Ib48b0bac2ddf08dafec290bbc24cfc951591a4e3
---
M modules/dynamicproxy/manifests/init.pp
1 file changed, 11 insertions(+), 6 deletions(-)

Approvals:
  Ori.livneh: Looks good to me, but someone else must approve
  Yuvipanda: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/modules/dynamicproxy/manifests/init.pp 
b/modules/dynamicproxy/manifests/init.pp
index cb263de..2731b3f 100644
--- a/modules/dynamicproxy/manifests/init.pp
+++ b/modules/dynamicproxy/manifests/init.pp
@@ -39,12 +39,17 @@
 
 $resolver = join($::nameservers, ' ')
 
-class { '::redis::legacy':
-persist   => 'aof',
-dir   => '/var/lib/redis',
-maxmemory => $redis_maxmemory,
-redis_replication => $redis_replication,
-expose=> false,
+if $redis_replication and $redis_replication[$::hostname] {
+$slaveof = $redis_replication[$::hostname]
+}
+
+redis::instance { '6379':
+settings   => {
+appendonly => 'yes',
+maxmemory  => $redis_maxmemory,
+slaveof=> $slaveof,
+dir=> '/var/lib/redis',
+}
 }
 
 # The redis module intentionally does not restart the redis

-- 
To view, visit https://gerrit.wikimedia.org/r/253360
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib48b0bac2ddf08dafec290bbc24cfc951591a4e3
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Yuvipanda 
Gerrit-Reviewer: Ori.livneh 
Gerrit-Reviewer: Yuvipanda 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Test: - change (mediawiki...Gadgets)

2015-11-16 Thread Paladox (Code Review)

Paladox has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/253356

Change subject: Test:
..

Test:

Change-Id: I66c752034dca4535aac9fbe0d4454ea4ec5ab848
---
M Gadgets.alias.php
A SpecialGadgets2.php
A api/ApiQueryGadgetPages.php
M extension.json
A modules/ext.gadgets.api.js
A modules/ext.gadgets.gadgetmanager.css
A modules/ext.gadgets.gadgetmanager.js
A modules/ext.gadgets.init.js
A modules/ext.gadgets.preferences.css
A modules/ext.gadgets.preferences.js
A modules/ext.gadgets.specialgadgets.prejs.css
A modules/ext.gadgets.specialgadgets.tabs.js
A modules/images/close.png
A modules/images/edit-faded.png
A modules/images/edit.png
A modules/images/input-error.png
A modules/images/input-loading.gif
A modules/images/input-ok.png
A modules/jquery.createPropCloud.js
19 files changed, 2,300 insertions(+), 7 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Gadgets 
refs/changes/56/253356/1

diff --git a/Gadgets.alias.php b/Gadgets.alias.php
index c63de80..c9579c2 100644
--- a/Gadgets.alias.php
+++ b/Gadgets.alias.php
@@ -12,6 +12,7 @@
 /** English (English) */
 $specialPageAliases['en'] = array(
'Gadgets' => array( 'Gadgets' ),
+   'Gadgets2' => array( 'Gadgets2' ),
'GadgetUsage' => array( 'GadgetUsage' ),
 );
 
diff --git a/SpecialGadgets2.php b/SpecialGadgets2.php
new file mode 100644
index 000..0c455eb
--- /dev/null
+++ b/SpecialGadgets2.php
@@ -0,0 +1,515 @@
+ null,
+   'action' => 'view',
+   );
+
+   private $par;
+
+   /**
+* @var GadgetRepo
+*/
+   private $repo;
+
+   public function __construct() {
+   parent::__construct( 'Gadgets2' );
+   }
+
+   /**
+* Main execution function.
+* @todo: Add canonical links to  to avoid indexing of link 
variations and stuff like
+* [[Special:Gadgets/id/export/bablabla]]. Those should either redirect 
and/or have a canonical
+* link in the  ($out->addLink).
+* @param $par String: Parameters passed to the page.
+*/
+   public function execute( $par ) {
+   $this->par = $par;
+   $this->repo = GadgetRepo::singleton();
+   $out = $this->getOutput();
+   $out->disallowUserJs();
+   $out->addModuleStyles( 'ext.gadgets.specialgadgets.prejs' );
+   $out->addModules( 'ext.gadgets.specialgadgets.tabs' );
+
+   // Map title parts to query string
+   if ( is_string( $par ) ) {
+   $parts = explode( '/', $par, 3 );
+   $this->params['gadget'] = $parts[0];
+   if ( isset( $parts[1] ) ) {
+   $this->params['action'] = $parts[1];
+   }
+   }
+
+   // Parameters (overrides title parts)
+   $this->params['gadget'] = $this->getRequest()->getVal( 
'gadget', $this->params['gadget'] );
+   $this->params['action'] = $this->getRequest()->getVal( 
'action', $this->params['action'] );
+
+   // Get instance of Gadget
+   $gadget = false;
+   if ( !is_null( $this->params['gadget'] ) ) {
+   try {
+   $gadget = $this->repo->getGadget( 
$this->params['gadget'] );
+   } catch ( InvalidArgumentException $e ) {
+   $out->showErrorPage( 'error', 
'gadgets-not-found', array( $this->params['gadget'] ) );
+   return;
+   }
+   }
+
+   // Handle the the query
+   switch( $this->params['action'] ) {
+   case 'view':
+   if ( $gadget ) {
+   $this->showSingleGadget( $gadget );
+   } else {
+   $this->showAllGadgets();
+   }
+   break;
+   case 'export':
+   if ( $gadget ) {
+   $this->showExportForm( $gadget );
+   } else {
+   $out->showErrorPage( 'error', 
'gadgets-nosuchaction' );
+   }
+   break;
+   default:
+   $out->showErrorPage( 'error', 
'gadgets-nosuchaction' );
+   break;
+   }
+   }
+
+   /**
+* Returns one ..
+* for the given Gadget object.
+*
+* @param Gadget $gadget
+* @return string HTML
+*/
+   protected function getGadgetHtml( Gadget $gadget ) {
+   global $wgContLang;
+   $user = $this->getUser();
+

[MediaWiki-commits] [Gerrit] Improved file documenation as well as license added - change (mediawiki...NoBogusUserpages)

2015-11-16 Thread Kghbln (Code Review)

Kghbln has submitted this change and it was merged.

Change subject: Improved file documenation as well as license added
..


Improved file documenation as well as license added

* Improved file documentation
* Added COPYING
* Added license information
* Swichted to semver

Change-Id: I9a41599ce6db78224a4e9c923b4012a2efe93933
---
A COPYING
M NoBogusUserpages.class.php
M NoBogusUserpages.php
M extension.json
4 files changed, 368 insertions(+), 37 deletions(-)

Approvals:
  Kghbln: Verified; Looks good to me, approved
  jenkins-bot: Checked



diff --git a/COPYING b/COPYING
new file mode 100644
index 000..d159169
--- /dev/null
+++ b/COPYING
@@ -0,0 +1,339 @@
+GNU GENERAL PUBLIC LICENSE
+   Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Lesser General Public License instead.)  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
+
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term "modification".)  Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+  1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately

[MediaWiki-commits] [Gerrit] Update VE core submodule to master (3549158) - change (mediawiki...VisualEditor)

2015-11-16 Thread Jforrester (Code Review)

Jforrester has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/253363

Change subject: Update VE core submodule to master (3549158)
..

Update VE core submodule to master (3549158)

New changes:
fbb2b2e Localisation updates from https://translatewiki.net.
933f979 mailmap: Remove unused alias for ttij...@wikimedia.org
72ce0e6 Better faking of onselectionchange
0d550d9 Paste sanitization: Treat  breaks as node splits
966b0a1 Localisation updates from https://translatewiki.net.
414cebb ContentAction: Add 'collapseToEnd' option to 'insert'
60de784 demos: Fix 'TypeError: ve.demo.target not a function' in 
desktop-dist.html
71f272e Localisation updates from https://translatewiki.net.
60376d2 RangeFix: Update from 0.1.1 to 0.1.2
2470042 Localisation updates from https://translatewiki.net.
7b1cdda Range offsets: Special case when adjacent to a nail
7ecde6c Add ve.ui.AnnotationContextItem

Change-Id: Iaab4cb7f9d4ec9d7120f42350fd613458c996c85
---
M .jsduck/eg-iframe.html
M extension.json
M lib/ve
3 files changed, 2 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor 
refs/changes/63/253363/1

diff --git a/.jsduck/eg-iframe.html b/.jsduck/eg-iframe.html
index bca337f..da9eea8 100644
--- a/.jsduck/eg-iframe.html
+++ b/.jsduck/eg-iframe.html
@@ -333,6 +333,7 @@



+   



diff --git a/extension.json b/extension.json
index 7ef959a..af25d9c 100644
--- a/extension.json
+++ b/extension.json
@@ -700,6 +700,7 @@
"lib/ve/src/ui/actions/ve.ui.TableAction.js",
"lib/ve/src/ui/actions/ve.ui.WindowAction.js",

"lib/ve/src/ui/contextitems/ve.ui.LinearContextItem.js",
+   
"lib/ve/src/ui/contextitems/ve.ui.AnnotationContextItem.js",

"lib/ve/src/ui/contextitems/ve.ui.TableContextItem.js",

"lib/ve/src/ui/contextitems/ve.ui.AlienContextItem.js",

"lib/ve/src/ui/contextitems/ve.ui.AlignableContextItem.js",
diff --git a/lib/ve b/lib/ve
index 77d786a..3549158 16
--- a/lib/ve
+++ b/lib/ve
-Subproject commit 77d786ab643c63599f39881ef9af9a7a363e443f
+Subproject commit 354915853dd7055f856d6fa660146609274c97c8

-- 
To view, visit https://gerrit.wikimedia.org/r/253363
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iaab4cb7f9d4ec9d7120f42350fd613458c996c85
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Jforrester 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] salt: add motd comment about keys on 2 servers - change (operations/puppet)

2015-11-16 Thread Dzahn (Code Review)

Dzahn has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/253365

Change subject: salt: add motd comment about keys on 2 servers
..

salt: add motd comment about keys on 2 servers

Adding Ariel's recent email to the ops list to the
motd of salt masters, because i expect we forget this otherwise.

Change-Id: I2f2eb4928f5489eaac8826e53d8db8fe9ec8874d
---
M manifests/role/salt.pp
1 file changed, 5 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/65/253365/1

diff --git a/manifests/role/salt.pp b/manifests/role/salt.pp
index bc2f822..f73caf1 100644
--- a/manifests/role/salt.pp
+++ b/manifests/role/salt.pp
@@ -20,6 +20,11 @@
 salt_returner_roots => $salt_returner_roots,
 }
 
+motd::script { 'salt-master-motd':
+ensure  => present,
+content => "#!/bin/sh\necho '\n! due to a salt bug you have to 
accept/delete salt keys on 2 servers !\nplease remember to make changes on both 
palladium and neodymium\n'",
+}
+
 }
 
 # A salt master that manages all labs minions

-- 
To view, visit https://gerrit.wikimedia.org/r/253365
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2f2eb4928f5489eaac8826e53d8db8fe9ec8874d
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] dynamicproxy: Don't try to restart redis when config changes - change (operations/puppet)

2015-11-16 Thread Yuvipanda (Code Review)

Yuvipanda has submitted this change and it was merged.

Change subject: dynamicproxy: Don't try to restart redis when config changes
..


dynamicproxy: Don't try to restart redis when config changes

Is a stateful service, should be done manually

Change-Id: I6a0e60bf3ddeb2a7dea67b040f134080584d98f9
---
M modules/dynamicproxy/manifests/init.pp
1 file changed, 1 insertion(+), 6 deletions(-)

Approvals:
  Yuvipanda: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/modules/dynamicproxy/manifests/init.pp 
b/modules/dynamicproxy/manifests/init.pp
index 2731b3f..da74ff0 100644
--- a/modules/dynamicproxy/manifests/init.pp
+++ b/modules/dynamicproxy/manifests/init.pp
@@ -49,13 +49,8 @@
 maxmemory  => $redis_maxmemory,
 slaveof=> $slaveof,
 dir=> '/var/lib/redis',
-}
+},
 }
-
-# The redis module intentionally does not restart the redis
-# service if the configuration changes, so we have to do this
-# explicitly here.
-File['/etc/redis/redis.conf'] ~> Service['redis-server']
 
 class { 'nginx':
 variant => 'extras',

-- 
To view, visit https://gerrit.wikimedia.org/r/253364
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I6a0e60bf3ddeb2a7dea67b040f134080584d98f9
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Yuvipanda 
Gerrit-Reviewer: Yuvipanda 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Rename 'newslettermanageapi' to 'newslettermanage' - change (mediawiki...Newsletter)

2015-11-16 Thread Glaisher (Code Review)

Glaisher has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/253353

Change subject: Rename 'newslettermanageapi' to 'newslettermanage'
..

Rename 'newslettermanageapi' to 'newslettermanage'

Change-Id: I9c4ab3e8359128c1617de2f064331d89b88892dd
---
M extension.json
M includes/api/ApiNewsletterManage.php
2 files changed, 1 insertion(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Newsletter 
refs/changes/53/253353/1

diff --git a/extension.json b/extension.json
index 19df561..6a83a20 100644
--- a/extension.json
+++ b/extension.json
@@ -31,7 +31,7 @@
},
"APIModules": {
"newslettersubscribe": "ApiNewsletterSubscribe",
-   "newslettermanageapi": "ApiNewsletterManage"
+   "newslettermanage": "ApiNewsletterManage"
},
"MessagesDirs": {
"Newsletter": [
diff --git a/includes/api/ApiNewsletterManage.php 
b/includes/api/ApiNewsletterManage.php
index 6206535..06a009f 100644
--- a/includes/api/ApiNewsletterManage.php
+++ b/includes/api/ApiNewsletterManage.php
@@ -6,7 +6,6 @@
  * @license GNU GPL v2+
  * @author Tina Johnson
  *
- * @todo Rename this module to newslettermanage
  * @todo Add i18n
  */
 class ApiNewsletterManage extends ApiBase {

-- 
To view, visit https://gerrit.wikimedia.org/r/253353
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9c4ab3e8359128c1617de2f064331d89b88892dd
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Newsletter
Gerrit-Branch: master
Gerrit-Owner: Glaisher 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Ustring: Let gcodepoint work with moderately long strings - change (mediawiki...Scribunto)

2015-11-16 Thread Anomie (Code Review)

Anomie has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/253355

Change subject: Ustring: Let gcodepoint work with moderately long strings
..

Ustring: Let gcodepoint work with moderately long strings

For the PHP implementation, return the codepoints as a table instead of
multiple return values that get table-ified in Lua, to avoid hitting
too-many-values stack limits.

For the pure-Lua version, inline most of ustring.codepoint instead of
calling it to avoid what's effectively "{ unpack( stuff ) }".

Bug: T118687
Change-Id: I105f388cc23ab55d4124739700ef89d5354b7dbc
---
M engines/LuaCommon/UstringLibrary.php
M engines/LuaCommon/lualib/mw.ustring.lua
M engines/LuaCommon/lualib/ustring/ustring.lua
M tests/engines/LuaCommon/UstringLibraryTests.lua
4 files changed, 76 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Scribunto 
refs/changes/55/253355/1

diff --git a/engines/LuaCommon/UstringLibrary.php 
b/engines/LuaCommon/UstringLibrary.php
index bef0761..934bcf6 100644
--- a/engines/LuaCommon/UstringLibrary.php
+++ b/engines/LuaCommon/UstringLibrary.php
@@ -57,6 +57,7 @@
'isutf8' => array( $this, 'ustringIsUtf8' ),
'byteoffset' => array( $this, 
'ustringByteoffset' ),
'codepoint' => array( $this, 'ustringCodepoint' 
),
+   'gcodepoint_init' => array( $this, 
'ustringGcodepointInit' ),
'toNFC' => array( $this, 'ustringToNFC' ),
'toNFD' => array( $this, 'ustringToNFD' ),
'char' => array( $this, 'ustringChar' ),
@@ -157,6 +158,10 @@
return unpack( 'N*', mb_convert_encoding( $s, 'UTF-32BE', 
'UTF-8' ) );
}
 
+   public function ustringGcodepointInit( $s, $i = 1, $j = null ) {
+   return array( $this->ustringCodepoint( $s, $i, $j ) );
+   }
+
public function ustringToNFC( $s ) {
$this->checkString( 'toNFC', $s, false );
if ( !$this->checkEncoding( $s ) ) {
diff --git a/engines/LuaCommon/lualib/mw.ustring.lua 
b/engines/LuaCommon/lualib/mw.ustring.lua
index d4375a4..33e5e39 100644
--- a/engines/LuaCommon/lualib/mw.ustring.lua
+++ b/engines/LuaCommon/lualib/mw.ustring.lua
@@ -23,6 +23,17 @@
end, nil, nil
 end
 
+local gcodepoint_init = nil
+local function php_gcodepoint( s, i, j )
+   checkType( 'gcodepoint', 1, s, 'string' )
+   checkType( 'gcodepoint', 2, i, 'number', true )
+   checkType( 'gcodepoint', 3, j, 'number', true )
+   local cp = gcodepoint_init( s, i, j or -1 )
+   return function ()
+   return table.remove( cp, 1 )
+   end
+end
+
 function ustring.setupInterface( opt )
-- Boilerplate
ustring.setupInterface = nil
@@ -40,6 +51,13 @@
mw_interface.gmatch_init = nil
mw_interface.gmatch_callback = nil
 
+   -- codepoint and gcodepoint
+   if mw_interface.gcodepoint_init then
+   gcodepoint_init = mw_interface.gcodepoint_init
+   ustring.gcodepoint = php_gcodepoint
+   end
+   mw_interface.gcodepoint_init = nil
+
-- Replace pure-lua implementation with php callbacks
local nargs = {
char = 0,
diff --git a/engines/LuaCommon/lualib/ustring/ustring.lua 
b/engines/LuaCommon/lualib/ustring/ustring.lua
index c390feb..3e16386 100644
--- a/engines/LuaCommon/lualib/ustring/ustring.lua
+++ b/engines/LuaCommon/lualib/ustring/ustring.lua
@@ -268,9 +268,32 @@
checkString( 'gcodepoint', s )
checkType( 'gcodepoint', 2, i, 'number', true )
checkType( 'gcodepoint', 3, j, 'number', true )
-   local cp = { ustring.codepoint( s, i or 1, j or -1 ) }
+   local cps = utf8_explode( s )
+   if cps == nil then
+   error( "bad argument #1 for 'gcodepoint' (string is not 
UTF-8)", 2 )
+   end
+   i = i or 1
+   if i < 0 then
+   i = cps.len + i + 1
+   end
+   j = j or -1
+   if j < 0 then
+   j = cps.len + j + 1
+   end
+   if j < i then
+   return function ()
+   return nil
+   end
+   end
+   i = math.max( 1, math.min( i, cps.len + 1 ) )
+   j = math.max( 1, math.min( j, cps.len + 1 ) )
return function ()
-   return table.remove( cp, 1 )
+   if i <= j then
+   local ret = cps.codepoints[i]
+   i = i + 1
+   return ret
+   end
+   return nil
end
 end
 
diff --git a/tests/engines/LuaCommon/UstringLibraryTests.lua 
b/tests/engines/LuaCommon/UstringLibraryTests.lua
index a8ea076..729eabd 100644
--- a/tests/engines/LuaCommon/UstringLibraryTests.lua
+++

[MediaWiki-commits] [Gerrit] Hide IPA transformations - change (mediawiki...mobileapps)

2015-11-16 Thread BearND (Code Review)

BearND has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/253357

Change subject: Hide IPA transformations
..

Hide IPA transformations

Part of offloading DOM transformations

Ran into issues with the ipa_button div on the client side.
Had to change it to a span so that the paragraph flowed correctly
and didn't suddenly start a new line.

Bug: T118203
Change-Id: I7c79548c9ea8c9cdc22551dfdc77f8455a514f8c
---
A lib/transformations/hideIPA.js
M lib/transforms.js
2 files changed, 55 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/mobileapps 
refs/changes/57/253357/1

diff --git a/lib/transformations/hideIPA.js b/lib/transformations/hideIPA.js
new file mode 100644
index 000..ca5114b
--- /dev/null
+++ b/lib/transformations/hideIPA.js
@@ -0,0 +1,53 @@
+/**
+ * DOM transformation shared with app. Let's keep this in sync with the app.
+ * Last sync: Android repo 601c663 www/js/transforms/hideIPA.js
+ *
+ * The main change from the original Android app file is to use
+ * content.createElement() instead of document.createElement().
+ * Had to change the ipa_button element from a div to a span since the
+ * div caused layout flow issues on the client side.
+ */
+
+'use strict';
+
+function hideIPA(content) {
+
+
+var spans = content.querySelectorAll( "span.IPA" );
+for (var i = 0; i < spans.length; i++) {
+var parentSpan = spans[i].parentNode;
+if (parentSpan === null) {
+continue;
+}
+var doTransform = false;
+// case 1: we have a sequence of IPA spans contained in a parent 
"nowrap" span
+if (parentSpan.tagName === "SPAN" && 
spans[i].classList.contains('nopopups')) {
+doTransform = true;
+}
+if (parentSpan.style.display === 'none') {
+doTransform = false;
+}
+if (!doTransform) {
+continue;
+}
+
+//we have a new IPA span!
+
+var containerSpan = content.createElement( 'span' );
+parentSpan.parentNode.insertBefore(containerSpan, parentSpan);
+parentSpan.parentNode.removeChild(parentSpan);
+
+//create and add the button
+var buttonDiv = content.createElement( 'span' );
+buttonDiv.classList.add('ipa_button');
+containerSpan.appendChild(buttonDiv);
+containerSpan.appendChild(parentSpan);
+
+//set initial visibility
+parentSpan.style.display = 'none';
+}
+}
+
+module.exports = {
+   hideIPA: hideIPA
+};
diff --git a/lib/transforms.js b/lib/transforms.js
index d27d8eb..988a311 100644
--- a/lib/transforms.js
+++ b/lib/transforms.js
@@ -10,6 +10,7 @@
 var relocateFirstParagraph = 
require('./transformations/relocateFirstParagraph');
 var anchorPopUpMediaTransforms = 
require('./transformations/anchorPopUpMediaTransforms');
 var hideRedLinks = require('./transformations/hideRedLinks');
+var hideIPA = require('./transformations/hideIPA');
 var setMathFormulaImageMaxWidth = 
require('./transformations/setMathFormulaImageMaxWidth');
 
 var NodeType =
@@ -222,6 +223,7 @@
 
 anchorPopUpMediaTransforms.fixVideoAnchor(doc);
 hideRedLinks.hideRedLinks(doc);
+hideIPA.hideIPA(doc);
 setMathFormulaImageMaxWidth.setMathFormulaImageMaxWidth(doc);
 }
 

-- 
To view, visit https://gerrit.wikimedia.org/r/253357
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I7c79548c9ea8c9cdc22551dfdc77f8455a514f8c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/mobileapps
Gerrit-Branch: master
Gerrit-Owner: BearND 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Allow a TitleInputWidget user to decide, if an empty value s... - change (mediawiki/core)

2015-11-16 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged.

Change subject: Allow a TitleInputWidget user to decide, if an empty value 
should be validated
..


Allow a TitleInputWidget user to decide, if an empty value should be validated

For some use cases an empty value is valid, too, or at least, it's not a reason 
to
mark the form input red. Special:Search, e.g.. This change implements a new 
config
for MediaWiki\Widgets\TitleInputWidget, validate, which allows a user of this
widget to decide, if the value of the input type should be validated (empty -> 
flagged
red).

Extra points:
 * Fix php notice errors for previously added configuration
 * Added doc for previously added configuration

Bug: T106946
Change-Id: I732a2f56a2375d8c708e3b295996187ee209f1a6
---
M includes/widget/TitleInputWidget.php
M resources/src/mediawiki.widgets/mw.widgets.TitleWidget.js
2 files changed, 14 insertions(+), 1 deletion(-)

Approvals:
  Bartosz Dziewoński: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/includes/widget/TitleInputWidget.php 
b/includes/widget/TitleInputWidget.php
index 25030b1..8226148 100644
--- a/includes/widget/TitleInputWidget.php
+++ b/includes/widget/TitleInputWidget.php
@@ -15,6 +15,8 @@
protected $namespace = null;
protected $relative = null;
protected $suggestions = null;
+   protected $highlightFirst = null;
+   protected $validate = null;
 
/**
 * @param array $config Configuration options
@@ -22,6 +24,9 @@
 * @param bool|null $config['relative'] If a namespace is set,
 *  return a title relative to it (default: true)
 * @param bool|null $config['suggestions'] Display search suggestions 
(default: true)
+* @param bool|null $config['highlightFirst'] Automatically highlight
+*  the first result (default: true)
+* @param bool|null $config['validate'] Whether the input must be a 
valid title (default: true)
 */
public function __construct( array $config = array() ) {
// Parent constructor
@@ -41,6 +46,9 @@
}
if ( isset( $config['highlightFirst'] ) ) {
$this->highlightFirst = $config['highlightFirst'];
+   }
+   if ( isset( $config['validate'] ) ) {
+   $this->validate = $config['validate'];
}
 
// Initialization
@@ -64,6 +72,9 @@
if ( $this->highlightFirst !== null ) {
$config['highlightFirst'] = $this->highlightFirst;
}
+   if ( $this->validate !== null ) {
+   $config['validate'] = $this->validate;
+   }
return parent::getConfig( $config );
}
 }
diff --git a/resources/src/mediawiki.widgets/mw.widgets.TitleWidget.js 
b/resources/src/mediawiki.widgets/mw.widgets.TitleWidget.js
index 67f3e01..84732aa 100644
--- a/resources/src/mediawiki.widgets/mw.widgets.TitleWidget.js
+++ b/resources/src/mediawiki.widgets/mw.widgets.TitleWidget.js
@@ -23,6 +23,7 @@
 * @cfg {boolean} [showRedlink] Show red link to exact match if it 
doesn't exist
 * @cfg {boolean} [showImages] Show page images
 * @cfg {boolean} [showDescriptions] Show page descriptions
+* @cfg {boolean} [validate=true] Whether the input must be a valid 
title
 * @cfg {Object} [cache] Result cache which implements a 'set' method, 
taking keyed values as an argument
 */
mw.widgets.TitleWidget = function MwWidgetsTitleWidget( config ) {
@@ -44,6 +45,7 @@
this.showRedlink = !!config.showRedlink;
this.showImages = !!config.showImages;
this.showDescriptions = !!config.showDescriptions;
+   this.validate = config.validate !== undefined ? config.validate 
: true;
this.cache = config.cache;
 
// Initialization
@@ -285,7 +287,7 @@
 * @return {boolean} The query is valid
 */
mw.widgets.TitleWidget.prototype.isQueryValid = function () {
-   return !!this.getTitle();
+   return this.validate ? !!this.getTitle() : true;
};
 
 }( jQuery, mediaWiki ) );

-- 
To view, visit https://gerrit.wikimedia.org/r/252717
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I732a2f56a2375d8c708e3b295996187ee209f1a6
Gerrit-PatchSet: 5
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Florianschmidtwelzow 
Gerrit-Reviewer: Bartosz Dziewoński 
Gerrit-Reviewer: Edokter 
Gerrit-Reviewer: Florianschmidtwelzow 
Gerrit-Reviewer: Jack Phoenix 
Gerrit-Reviewer: jenkins-bot <>

[MediaWiki-commits] [Gerrit] Add ve.ui.AnnotationContextItem - change (VisualEditor/VisualEditor)

2015-11-16 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged.

Change subject: Add ve.ui.AnnotationContextItem
..


Add ve.ui.AnnotationContextItem

Some context items appear on annotations. For them, pressing "delete"
is ambiguous, because it might mean to delete the annotation and it
might mean to delete the annotation-plus-content. So, create a new
ContextItem abstract class which can be inherited from, to enable
a "clear annotations" button in the context popup.

Implement it on Link and Language contextitems.

Remove the 'remove' action fron AnnotationInspector, since it's now
superfluous.

(Also, we currently restrict isDeletable to only be true for aliens.)

Bug: T98272
Change-Id: I3b1b553d2e148e2a50df897b8bc5b29412bdbca7
---
M build/modules.json
M demos/ve/desktop.html
M demos/ve/mobile.html
A src/ui/contextitems/ve.ui.AnnotationContextItem.js
M src/ui/contextitems/ve.ui.LanguageContextItem.js
M src/ui/contextitems/ve.ui.LinkContextItem.js
M src/ui/inspectors/ve.ui.AnnotationInspector.js
M tests/index.html
8 files changed, 91 insertions(+), 21 deletions(-)

Approvals:
  Jforrester: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/build/modules.json b/build/modules.json
index 7b7b8b2..73e51db 100644
--- a/build/modules.json
+++ b/build/modules.json
@@ -393,6 +393,7 @@
"src/ui/ve.ui.ContextItem.js",
"src/ui/ve.ui.ContextItemFactory.js",
"src/ui/contextitems/ve.ui.LinearContextItem.js",
+   "src/ui/contextitems/ve.ui.AnnotationContextItem.js",
"src/ui/contextitems/ve.ui.TableContextItem.js",
"src/ui/contextitems/ve.ui.AlienContextItem.js",
"src/ui/contextitems/ve.ui.AlignableContextItem.js",
diff --git a/demos/ve/desktop.html b/demos/ve/desktop.html
index c8426b5..8084f68 100644
--- a/demos/ve/desktop.html
+++ b/demos/ve/desktop.html
@@ -354,6 +354,7 @@



+   



diff --git a/demos/ve/mobile.html b/demos/ve/mobile.html
index 725926e..b918049 100644
--- a/demos/ve/mobile.html
+++ b/demos/ve/mobile.html
@@ -356,6 +356,7 @@



+   



diff --git a/src/ui/contextitems/ve.ui.AnnotationContextItem.js 
b/src/ui/contextitems/ve.ui.AnnotationContextItem.js
new file mode 100644
index 000..3b0d13c
--- /dev/null
+++ b/src/ui/contextitems/ve.ui.AnnotationContextItem.js
@@ -0,0 +1,82 @@
+/*!
+ * VisualEditor AnnotationContextItem class.
+ *
+ * @copyright 2011-2015 VisualEditor Team and others; see 
http://ve.mit-license.org
+ */
+
+/**
+ * Context item for an annotation.
+ *
+ * @class
+ * @abstract
+ * @extends ve.ui.LinearContextItem
+ *
+ * @param {ve.ui.Context} context Context item is in
+ * @param {ve.dm.Model} model Model item is related to
+ * @param {Object} config Configuration options
+ */
+ve.ui.AnnotationContextItem = function VeUiAnnotationontextItem( context, 
model, config ) {
+   // Parent constructor
+   ve.ui.AnnotationContextItem.super.call( this, context, model, config );
+
+   // Initialization
+   this.$element.addClass( 've-ui-annotationContextItem' );
+
+   if ( !this.context.isMobile() ) {
+   this.clearButton = new OO.ui.ButtonWidget( {
+   title: this.constructor.static.clearMsg,
+   icon: this.constructor.static.clearIcon,
+   flags: [ 'destructive' ]
+   } );
+   } else {
+   this.clearButton = new OO.ui.ButtonWidget( {
+   framed: false,
+   icon: this.constructor.static.clearIcon,
+   flags: [ 'destructive' ]
+   } );
+   }
+   if ( this.isClearable() ) {
+   this.actionButtons.addItems( [ this.clearButton ], 0 );
+   }
+   this.clearButton.connect( this, { click: 'onClearButtonClick' } );
+};
+
+/* Inheritance */
+
+OO.inheritClass( ve.ui.AnnotationContextItem, ve.ui.LinearContextItem );
+
+/* Static Properties */
+
+ve.ui.AnnotationContextItem.static.clearable = true;
+ve.ui.AnnotationContextItem.static.clearIcon = 'cancel';
+ve.ui.AnnotationContextItem.static.clearMsg = OO.ui.deferMsg( 
'visualeditor-clearbutton-tooltip' );
+
+/* Methods */
+
+/**
+ * Check if item is clearable.
+ *
+ * @return {boolean} Item is clearable
+ */
+ve.ui.AnnotationContextItem.prototype.isClearable = function () {
+   return this.constructor.static.clearable;
+};
+
+/**
+ * Handle clear button click events.
+ *
+ * @localdoc Removes any modelClasses annotations from the current fragment
+ *
+ * @protected
+ */
+ve.ui.AnnotationContextItem.prototype.onClearButtonClick = function () {
+   var i, len,
+

[MediaWiki-commits] [Gerrit] Show "Manage" button to all users who can manage newsletters - change (mediawiki...Newsletter)

2015-11-16 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged.

Change subject: Show "Manage" button to all users who can manage newsletters
..


Show "Manage" button to all users who can manage newsletters

Change-Id: Ida4732673ebfc970e6d81b8794830bc9cef1e2b5
---
M includes/Newsletter.php
M includes/specials/SpecialNewsletter.php
2 files changed, 13 insertions(+), 2 deletions(-)

Approvals:
  01tonythomas: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/includes/Newsletter.php b/includes/Newsletter.php
index aaf07e0..d09935d 100644
--- a/includes/Newsletter.php
+++ b/includes/Newsletter.php
@@ -207,4 +207,14 @@
return $this->isPublisher( $user ) || $user->isAllowed( 
'newsletter-delete' );
}
 
+   /**
+* Check whether the user is allowed to manage the newsletter.
+*
+* @param User $user
+*
+* @return bool
+*/
+   public function canManage( User $user ) {
+   return $this->isPublisher( $user ) || $user->isAllowed( 
'newsletter-manage' );
+   }
 }
diff --git a/includes/specials/SpecialNewsletter.php 
b/includes/specials/SpecialNewsletter.php
index cb484d3..360b724 100644
--- a/includes/specials/SpecialNewsletter.php
+++ b/includes/specials/SpecialNewsletter.php
@@ -191,8 +191,7 @@
);
}
 
-   if ( $this->newsletter->isPublisher( $user ) ) {
-   // @todo show this to all users who can manage, not 
just publishers
+   if ( $this->newsletter->canManage( $user ) ) {
$buttons[] = new OOUI\ButtonWidget(
array(
'label' => $this->msg( 
'newsletter-manage-button' )->escaped(),
@@ -201,7 +200,9 @@
'href' => SpecialPage::getTitleFor( 
'NewsletterManage' )->getFullURL()
)
);
+   }
 
+   if ( $this->newsletter->isPublisher( $user ) ) {
$buttons[] = new OOUI\ButtonWidget(
array(
'label' => $this->msg( 
'newsletter-announce-button' )->escaped(),

-- 
To view, visit https://gerrit.wikimedia.org/r/253352
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ida4732673ebfc970e6d81b8794830bc9cef1e2b5
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Newsletter
Gerrit-Branch: master
Gerrit-Owner: Glaisher 
Gerrit-Reviewer: 01tonythomas <01tonytho...@gmail.com>
Gerrit-Reviewer: Addshore 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Bump src to 3a6f3b9e for deploy - change (mediawiki...deploy)

2015-11-16 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged.

Change subject: Bump src to 3a6f3b9e for deploy
..


Bump src to 3a6f3b9e for deploy

Change-Id: I8a9c9d1de28e52c00dce3124e076d15a02db51e3
---
M src
1 file changed, 0 insertions(+), 0 deletions(-)

Approvals:
  Arlolra: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/src b/src
index 392e25e..3a6f3b9 16
--- a/src
+++ b/src
-Subproject commit 392e25ebec2b0838ae1c3bfcea8120ba42e15b64
+Subproject commit 3a6f3b9ebaff36ef41b3f11ec36db4dea416a776

-- 
To view, visit https://gerrit.wikimedia.org/r/253338
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I8a9c9d1de28e52c00dce3124e076d15a02db51e3
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/parsoid/deploy
Gerrit-Branch: master
Gerrit-Owner: Subramanya Sastry 
Gerrit-Reviewer: Arlolra 
Gerrit-Reviewer: Cscott 
Gerrit-Reviewer: Subramanya Sastry 
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 Make math dialog with clickable list of formula fragments - change (mediawiki...Math)

2015-11-16 Thread Tchanders (Code Review)

Tchanders has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/253374

Change subject: WIP Make math dialog with clickable list of formula fragments
..

WIP Make math dialog with clickable list of formula fragments

The main components are:
- a menu of formula fragment buttons
- a text input into which LaTeX commands are inserted on
clicking the buttons
- a preview of the formula

The deviations from the draft design (wider menu, smaller
buttons, dialog is 'larger' instead of 'large') are so
that more buttons can be seen at once.

Needs more work:
- the menu headings
- the list of formula fragments, which will eventually
be more comprehensive
- user research on how to group/order the fragments

Bug: T114163
Change-Id: I96d4b72f2e49ad3f43a2e5c71f0d348fdfb35503
---
M .jshintrc
A MathDataModule.php
M extension.json
M i18n/en.json
M i18n/qqq.json
M modules/ve-math/symbols.json
A modules/ve-math/ve.ui.MWMathDialog.css
A modules/ve-math/ve.ui.MWMathDialog.js
M modules/ve-math/ve.ui.MWMathInspector.js
A modules/ve-math/ve.ui.MWMathPage.js
10 files changed, 1,268 insertions(+), 396 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Math 
refs/changes/74/253374/1

diff --git a/.jshintrc b/.jshintrc
index b0a9b23..64e1703 100644
--- a/.jshintrc
+++ b/.jshintrc
@@ -20,6 +20,7 @@
"globals": {
"mediaWiki": false,
"OO": false,
-   "ve": false
+   "ve": false,
+   "mw": false
}
 }
diff --git a/MathDataModule.php b/MathDataModule.php
new file mode 100644
index 000..ddb8cfb
--- /dev/null
+++ b/MathDataModule.php
@@ -0,0 +1,38 @@
+ $this->getScript( $context ),
+   );
+   return $summary;
+   }
+}
diff --git a/extension.json b/extension.json
index 83dcddf..28c98c4 100644
--- a/extension.json
+++ b/extension.json
@@ -12,6 +12,7 @@
"callback": "MathHooks::registerExtension",
"type": "parserhook",
"AutoloadClasses": {
+   "MathDataModule": "MathDataModule.php",
"MathHooks": "Math.hooks.php",
"MathRenderer": "MathRenderer.php",
"MathTexvc": "MathTexvc.php",
@@ -138,29 +139,56 @@
"scripts": [
"ve-math/ve.dm.MWMathNode.js",
"ve-math/ve.ce.MWMathNode.js",
-   "ve-math/ve.ui.MWMathInspector.js",
+   "ve-math/ve.ui.MWMathDialog.js",
+   "ve-math/ve.ui.MWMathPage.js",
"ve-math/ve.ui.MWMathInspectorTool.js"
],
"styles": [
"ve-math/ve.ce.MWMathNode.css",
"ve-math/ve.ui.MWMathIcons.css",
-   "ve-math/ve.ui.MWMathInspector.css"
+   "ve-math/ve.ui.MWMathInspector.css",
+   "ve-math/ve.ui.MWMathDialog.css"
],
"dependencies": [
"ext.visualEditor.mwcore"
],
"messages": [
+   "math-visualeditor-mwmathdialog-title",
"math-visualeditor-mwmathinspector-display",

"math-visualeditor-mwmathinspector-display-block",

"math-visualeditor-mwmathinspector-display-default",

"math-visualeditor-mwmathinspector-display-inline",
"math-visualeditor-mwmathinspector-id",
-   "math-visualeditor-mwmathinspector-title"
+   "math-visualeditor-mwmathinspector-title",
+   "math-visualeditor-symbol-group-accents",
+   "math-visualeditor-symbol-group-arrows",
+   "math-visualeditor-symbol-group-derivatives",
+   "math-visualeditor-symbol-group-functions",
+   "math-visualeditor-symbol-group-geometry",
+   "math-visualeditor-symbol-group-logic",
+   "math-visualeditor-symbol-group-modular",
+   "math-visualeditor-symbol-group-operators",
+   "math-visualeditor-symbol-group-relations",
+   "math-visualeditor-symbol-group-root",
+   "math-visualeditor-symbol-group-sets",
+   "math-visualeditor-symbol-group-special",
+   "math-visualeditor-symbol-group-unsorted"
],
"targets": [

1 2 3 4 5 >

1 - 100 of 405 matches

Mail list logo