[MediaWiki-commits] [Gerrit] operations...tools-webservice[master]: Sort backend provided types when displaying help

[BryanDavis (Code Review)]

BryanDavis has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/350364 )

Change subject: Sort backend provided types when displaying help
..

Sort backend provided types when displaying help

Change-Id: I0f23a221d65c184648b91bedbbdc912b6597270a
---
M debian/changelog
M scripts/webservice
2 files changed, 2 insertions(+), 1 deletion(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/operations/software/tools-webservice 
refs/changes/64/350364/1

diff --git a/debian/changelog b/debian/changelog
index 74fac67..317a84d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 toollabs-webservice (0.37) trusty; urgency=medium
 
   * Always cleanup manifest on stop
+  * Sort backend provided types when displaying help
 
  -- Bryan Davis   Wed, 25 Apr 2017 04:01:13 +
 
diff --git a/scripts/webservice b/scripts/webservice
index bcd599c..ae32246 100755
--- a/scripts/webservice
+++ b/scripts/webservice
@@ -122,7 +122,7 @@
 args.extra_args = tool.manifest.get('web::extra_args', None)
 
 if args.type not in acceptable_types:
-print("type must be one of ", ','.join(acceptable_types))
+print("type must be one of ", ','.join(sorted(acceptable_types)))
 sys.exit(1)
 
 if backend == 'gridengine':

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I0f23a221d65c184648b91bedbbdc912b6597270a
Gerrit-PatchSet: 1
Gerrit-Project: operations/software/tools-webservice
Gerrit-Branch: master
Gerrit-Owner: BryanDavis 

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

[MediaWiki-commits] [Gerrit] pywikibot/core[master]: wikisource_family.py: Add "pa" to languages_by_size

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/350222 )

Change subject: wikisource_family.py: Add "pa" to languages_by_size
..


wikisource_family.py: Add "pa" to languages_by_size

Not having "pa" code in languages_by_size was causing testLinkMethods to
fail on wikisource builds. See
https://travis-ci.org/wikimedia/pywikibot-core/builds/225614750 .

Bug: T163871
Change-Id: Ia2b30a1720a43f7fedc906f0182f098835ede464
---
M pywikibot/families/wikisource_family.py
1 file changed, 1 insertion(+), 0 deletions(-)

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



diff --git a/pywikibot/families/wikisource_family.py 
b/pywikibot/families/wikisource_family.py
index 5899971..2a9de25 100644
--- a/pywikibot/families/wikisource_family.py
+++ b/pywikibot/families/wikisource_family.py
@@ -37,6 +37,7 @@
 'az', 'hr', 'ta', 'nl', 'br', 'is', 'la', 'no', 'vec', 'eo', 'be',
 'tr', 'mk', 'et', 'yi', 'id', 'da', 'as', 'bg', 'li', 'mr', 'kn',
 'or', 'bs', 'sah', 'lt', 'gl', 'cy', 'sk', 'zh-min-nan', 'fo',
+'pa',
 ]
 
 super(Family, self).__init__()

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia2b30a1720a43f7fedc906f0182f098835ede464
Gerrit-PatchSet: 3
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: Dalba 
Gerrit-Reviewer: Magul 
Gerrit-Reviewer: Xqt 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: lift IP throttle for event at high school in Jesi, Italy

[Dzahn (Code Review)]

Dzahn has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/350363 )

Change subject: lift IP throttle for event at high school in Jesi,Italy
..

lift IP throttle for event at high school in Jesi,Italy

https://it.wikipedia.org/wiki/Utente:Camelia.boban/Formazione/Corsi/Istituto_Cuppari_di_Jesi

Bug: T163870
Change-Id: I2d468fc9a29b9f9adbbeb5de504b8f7bd588cf78
---
M wmf-config/throttle.php
1 file changed, 6 insertions(+), 6 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config 
refs/changes/63/350363/1

diff --git a/wmf-config/throttle.php b/wmf-config/throttle.php
index b8b374b..4eb896e 100644
--- a/wmf-config/throttle.php
+++ b/wmf-config/throttle.php
@@ -47,12 +47,12 @@
'value' => 30 // 25 expected
 ];
 
-$wmgThrottlingExceptions[] = [ // T163726
-   'from' => '2017-04-24T21:00 UTC',
-   'to' => '2017-04-24T23:00 UTC',
-   'IP' => '200.137.128.130',
-   'dbname' => [ 'ptwiki', 'wikidatawiki', 'commonswiki' ],
-   'value' => 50 // at least 20 expected
+$wmgThrottlingExceptions[] = [ // T163870
+   'from' => '2017-04-27T06:00 UTC',
+   'to' => '2017-04-27T15:00 UTC',
+   'IP' => '213.82.186.58',
+   'dbname' => [ 'itwiki' ],
+   'value' => 40 // 30 expected
 ];
 
 ## Add throttling definitions above.

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2d468fc9a29b9f9adbbeb5de504b8f7bd588cf78
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Dzahn 

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

[MediaWiki-commits] [Gerrit] mediawiki...cxserver[master]: Add Doteli (dty) language

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/350207 )

Change subject: Add Doteli (dty) language
..


Add Doteli (dty) language

Change-Id: Ibe5a434acfdcb17c1eb1ae0f9945ab4466b0e60f
---
M registry.wikimedia.yaml
M registry.yaml
2 files changed, 4 insertions(+), 0 deletions(-)

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



diff --git a/registry.wikimedia.yaml b/registry.wikimedia.yaml
index c724db5..d8292c9 100644
--- a/registry.wikimedia.yaml
+++ b/registry.wikimedia.yaml
@@ -54,6 +54,7 @@
   - de
   - diq
   - dsb
+  - dty
   - dv
   - dz
   - ee
@@ -339,6 +340,7 @@
   - de
   - diq
   - dsb
+  - dty
   - dv
   - dz
   - ee
diff --git a/registry.yaml b/registry.yaml
index f09b4cd..889433a 100644
--- a/registry.yaml
+++ b/registry.yaml
@@ -54,6 +54,7 @@
   - de
   - diq
   - dsb
+  - dty
   - dv
   - dz
   - ee
@@ -339,6 +340,7 @@
   - de
   - diq
   - dsb
+  - dty
   - dv
   - dz
   - ee

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ibe5a434acfdcb17c1eb1ae0f9945ab4466b0e60f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/cxserver
Gerrit-Branch: master
Gerrit-Owner: KartikMistry 
Gerrit-Reviewer: Santhosh 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations...tools-webservice[master]: Always cleanup manifest on stop

[BryanDavis (Code Review)]

BryanDavis has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/350362 )

Change subject: Always cleanup manifest on stop
..

Always cleanup manifest on stop

Cleanup service.manifest state when `webservice stop` is called even if
no service is currently running.

Bug: T163355
Change-Id: Id689c3559dfbda6d2285f53c3570d295bbb193ef
---
M debian/changelog
M scripts/webservice
2 files changed, 8 insertions(+), 3 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/operations/software/tools-webservice 
refs/changes/62/350362/1

diff --git a/debian/changelog b/debian/changelog
index d80d2e1..f606bf3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,11 @@
 toollabs-webservice (0.36) trusty; urgency=medium
 
+  * Always cleanup manifest on stop
+
+ -- Bryan Davis   Wed, 25 Apr 2017 04:01:13 +
+
+toollabs-webservice (0.36) trusty; urgency=medium
+
   * Remove support for Precise
   * PEP8 80ch line lenght limits
 
diff --git a/scripts/webservice b/scripts/webservice
index f79d43b..2775f12 100755
--- a/scripts/webservice
+++ b/scripts/webservice
@@ -144,9 +144,8 @@
 elif args.action == 'stop':
 if job.get_state() == Backend.STATE_STOPPED:
 print('Your webservice is not running')
-sys.exit()
-
-stop(job, 'Stopping webservice')
+else:
+stop(job, 'Stopping webservice')
 update_manifest(job, 'stop')
 
 elif args.action == 'restart':

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id689c3559dfbda6d2285f53c3570d295bbb193ef
Gerrit-PatchSet: 1
Gerrit-Project: operations/software/tools-webservice
Gerrit-Branch: master
Gerrit-Owner: BryanDavis 

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

[MediaWiki-commits] [Gerrit] translatewiki[master]: Fuel: remove from external projects

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/350002 )

Change subject: Fuel: remove from external projects
..


Fuel: remove from external projects

Repository does not exist anymore, gives errors during scripts.

Change-Id: Ie8afaf5961b3204edca7fcc5f7af8ee4a8f07b2d
---
M bin/EXTERNAL-PROJECTS
1 file changed, 0 insertions(+), 1 deletion(-)

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



diff --git a/bin/EXTERNAL-PROJECTS b/bin/EXTERNAL-PROJECTS
index fd7c3f9..0e364f7 100644
--- a/bin/EXTERNAL-PROJECTS
+++ b/bin/EXTERNAL-PROJECTS
@@ -10,7 +10,6 @@
 europeana
 freecol
 fudforum
-fuel
 gapfinder
 hivejs
 huggle

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie8afaf5961b3204edca7fcc5f7af8ee4a8f07b2d
Gerrit-PatchSet: 1
Gerrit-Project: translatewiki
Gerrit-Branch: master
Gerrit-Owner: Nikerabbit 
Gerrit-Reviewer: Santhosh 
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] wikimedia...crm[master]: Enable CiviCampaign.

[Eileen (Code Review)]

Eileen has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/350361 )

Change subject: Enable CiviCampaign.
..

Enable CiviCampaign.

Bug: T161758
Change-Id: Ie1d472ef4de3b3a45d9d74de11d66ea5a076253b
---
M sites/all/modules/wmf_civicrm/wmf_civicrm.install
1 file changed, 17 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/61/350361/1

diff --git a/sites/all/modules/wmf_civicrm/wmf_civicrm.install 
b/sites/all/modules/wmf_civicrm/wmf_civicrm.install
index 099d8c9..aa9bc71 100644
--- a/sites/all/modules/wmf_civicrm/wmf_civicrm.install
+++ b/sites/all/modules/wmf_civicrm/wmf_civicrm.install
@@ -64,6 +64,7 @@
 wmf_civicrm_update_7310();
 wmf_civicrm_update_7455();
 wmf_civicrm_update_7460();
+wmf_civicrm_update_7525();
 }
 
 /**
@@ -2977,3 +2978,19 @@
 }
   }
 }
+
+/**
+ * Enable CiviCampaign.
+ */
+function wmf_civicrm_update_7525() {
+  wmf_civicrm_bootstrap_civi();
+  $components = civicrm_api3('Setting', 'getvalue', array(
+'name' => "enable_components",
+  ));
+  if (isset($components['is_error'])) {
+// weirdness.
+unset($components['is_error']);
+  }
+  $components[] = 'CiviCampaign';
+  civicrm_api3('Setting', 'create', array('enable_components' => $components));
+}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie1d472ef4de3b3a45d9d74de11d66ea5a076253b
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: master
Gerrit-Owner: Eileen 

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

[MediaWiki-commits] [Gerrit] mediawiki/core[wmf/1.29.0-wmf.21]: Interwiki: Don't override interwiki map order

[Krinkle (Code Review)]

Krinkle has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/350360 )

Change subject: Interwiki: Don't override interwiki map order
..

Interwiki: Don't override interwiki map order

The ksort() here was causing the order to be enforced as
alphabetical instead of preserving the original order.

The order usually doesn't matter, except with regards to handling
of duplicates. Due to Parsoid normalising external links to interwiki
links, it has to do a reverse lookup. In doing so it has to decide
which one to prefer. It currently picks the first match from the
API request for meta=siteinfo=interwikimap, which didn't
match the defined order in the actual Interwiki map due to ksort()
being called in getAllPrefixes().

Sort in this function was originally introduced in 2010 with
commit 844e7c83e4 (2011; r92528; T21838), which is otherwise unrelated
and left no rationale.

The existing unit tests needed to be adjusted slightly as they
assumed alphabetical order. While it appeared they were also defined
in alphabetical order, this was merely the order of the variable
creation. The effective order is preserved within locals and globals,
but overall globals come before locals.

Also removed the duplicate test for Hash and CDB in InterwikiTest
that belongs in ClassicInterwikiLookupTest instead.

Bug: T145337
Change-Id: I7348748801cbdf16c6ceea5b0654fc174b79707e
(cherry picked from commit 0548f1902cb308c70541ff0f4ffb2feb24d03066)
---
M includes/interwiki/ClassicInterwikiLookup.php
M tests/phpunit/includes/interwiki/ClassicInterwikiLookupTest.php
M tests/phpunit/includes/interwiki/InterwikiTest.php
3 files changed, 51 insertions(+), 158 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/60/350360/1

diff --git a/includes/interwiki/ClassicInterwikiLookup.php 
b/includes/interwiki/ClassicInterwikiLookup.php
index 5226aa0..d9c0424 100644
--- a/includes/interwiki/ClassicInterwikiLookup.php
+++ b/includes/interwiki/ClassicInterwikiLookup.php
@@ -383,8 +383,6 @@
. $e->getMessage() );
}
 
-   ksort( $data );
-
return array_values( $data );
}
 
diff --git a/tests/phpunit/includes/interwiki/ClassicInterwikiLookupTest.php 
b/tests/phpunit/includes/interwiki/ClassicInterwikiLookupTest.php
index db6d002..48310a9 100644
--- a/tests/phpunit/includes/interwiki/ClassicInterwikiLookupTest.php
+++ b/tests/phpunit/includes/interwiki/ClassicInterwikiLookupTest.php
@@ -133,16 +133,16 @@
// NOTE: CDB setup is expensive, so we only do
//  it once and run all the tests in one go.
 
-   $dewiki = [
-   'iw_prefix' => 'de',
-   'iw_url' => 'http://de.wikipedia.org/wiki/',
-   'iw_local' => 1
-   ];
-
$zzwiki = [
'iw_prefix' => 'zz',
'iw_url' => 'http://zzwiki.org/wiki/',
'iw_local' => 0
+   ];
+
+   $dewiki = [
+   'iw_prefix' => 'de',
+   'iw_url' => 'http://de.wikipedia.org/wiki/',
+   'iw_local' => 1
];
 
$cdbFile = $this->populateCDB(
@@ -160,7 +160,7 @@
);
 
$this->assertEquals(
-   [ $dewiki, $zzwiki ],
+   [ $zzwiki, $dewiki ],
$lookup->getAllPrefixes(),
'getAllPrefixes()'
);
@@ -185,16 +185,15 @@
}
 
public function testArrayStorage() {
-   $dewiki = [
-   'iw_prefix' => 'de',
-   'iw_url' => 'http://de.wikipedia.org/wiki/',
-   'iw_local' => 1
-   ];
-
$zzwiki = [
'iw_prefix' => 'zz',
'iw_url' => 'http://zzwiki.org/wiki/',
'iw_local' => 0
+   ];
+   $dewiki = [
+   'iw_prefix' => 'de',
+   'iw_url' => 'http://de.wikipedia.org/wiki/',
+   'iw_local' => 1
];
 
$hash = $this->populateHash(
@@ -212,7 +211,7 @@
);
 
$this->assertEquals(
-   [ $dewiki, $zzwiki ],
+   [ $zzwiki, $dewiki ],
$lookup->getAllPrefixes(),
'getAllPrefixes()'
);
@@ -233,4 +232,42 @@
$this->assertSame( false, $interwiki->isLocal(), 'isLocal' );
}
 
+   public function testGetAllPrefixes() {
+   $zz = [
+   'iw_prefix' => 'zz',
+   'iw_url' => 'https://azz.example.org/',
+   'iw_local' 

[MediaWiki-commits] [Gerrit] wikimedia...crm[master]: Remove call to class_api in favour of civicrm_api3.

[Eileen (Code Review)]

Eileen has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/350359 )

Change subject: Remove call to class_api in favour of civicrm_api3.
..

Remove call to class_api in favour of civicrm_api3.

class_api is causing test failures when the updated mysqli driver tries to 
free memory

Change-Id: Ic723bc45be5f05f7fe9e287679f07d5163eafe6f
---
M sites/all/modules/wmf_civicrm/recurring.inc
M sites/all/modules/wmf_civicrm/wmf_civicrm.module
2 files changed, 18 insertions(+), 21 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/59/350359/1

diff --git a/sites/all/modules/wmf_civicrm/recurring.inc 
b/sites/all/modules/wmf_civicrm/recurring.inc
index 3e99e1f..b8f4b77 100644
--- a/sites/all/modules/wmf_civicrm/recurring.inc
+++ b/sites/all/modules/wmf_civicrm/recurring.inc
@@ -133,28 +133,25 @@
 $error_message = t('`contribution_recur_id` must be set and not 
empty.');
 throw new WmfException('IMPORT_SUBSCRIPTION', $error_message);
 }
-
-$api = civicrm_api_classapi();
-$update_params = array(
+try {
+  $result = civicrm_api3('Contribution', 'create', array(
 'id' => $contribution_id,
 'contribution_recur_id' => $contribution_recur_id,
-
-'version' => 3,
-);
-if ( !$api->Contribution->Create($update_params) ) {
-$error_message = t(
-'There was a problem linking the contribution [!contribution_id] 
to the recurring contribution [!contribution_recur_id]: !msg',
-array(
-'!contribution_id' => $contribution_id,
-'!contribution_recur_id' => $contribution_recur_id,
-'!msg' => $api->errorMsg(),
-)
-);
-throw new WmfException('IMPORT_SUBSCRIPTION', $error_message);
-} else {
-watchdog( 'wmf_civicrm', 'Successfully linked the contribution  
[!contribution_id] to the recurring contribution [!contribution_recur_id]', 
array( '!contribution_id' => $contribution_id, '!contribution_recur_id' => 
$contribution_recur_id ) );
-return true;
+  ));
 }
+catch (CiviCRM_API3_Exception $e) {
+  $error_message = t(
+'There was a problem linking the contribution [!contribution_id] to 
the recurring contribution [!contribution_recur_id]: !msg',
+array(
+  '!contribution_id' => $contribution_id,
+  '!contribution_recur_id' => $contribution_recur_id,
+  '!msg' => $e->getMessage(),
+)
+  );
+  throw new WmfException('IMPORT_SUBSCRIPTION', $error_message);
+}
+watchdog( 'wmf_civicrm', 'Successfully linked the contribution  
[!contribution_id] to the recurring contribution [!contribution_recur_id]', 
array( '!contribution_id' => $contribution_id, '!contribution_recur_id' => 
$contribution_recur_id ) );
+return true;
 }
 
 /**
diff --git a/sites/all/modules/wmf_civicrm/wmf_civicrm.module 
b/sites/all/modules/wmf_civicrm/wmf_civicrm.module
index ba78a5d..1f22ed3 100644
--- a/sites/all/modules/wmf_civicrm/wmf_civicrm.module
+++ b/sites/all/modules/wmf_civicrm/wmf_civicrm.module
@@ -1883,8 +1883,8 @@
 $msg['direct_mail_appeal'] = "Mediander";
 break;
 default:
-$values = civicrm_api_option_group( 
wmf_civicrm_get_direct_mail_field_option_name() );
-if ( !array_key_exists( $msg['utm_campaign'], $values ) ) {
+$directMailOptions = wmf_civicrm_get_options('Contribution', 
wmf_civicrm_get_custom_field_name('Appeal'));
+if ( !array_key_exists( $msg['utm_campaign'], 
$directMailOptions['values'] ) ) {
   
wmf_civicrm_ensure_option_value_exists(wmf_civicrm_get_direct_mail_field_option_name(),
 $msg['utm_campaign']);
 }
 $msg['direct_mail_appeal'] = $msg['utm_campaign'];

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic723bc45be5f05f7fe9e287679f07d5163eafe6f
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: master
Gerrit-Owner: Eileen 

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

[MediaWiki-commits] [Gerrit] wikimedia...crm[master]: Remove call to class_api in favour of civicrm_api3.

[Eileen (Code Review)]

Eileen has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/350358 )

Change subject: Remove call to class_api in favour of civicrm_api3.
..

Remove call to class_api in favour of civicrm_api3.

class_api is causing test failures when the updated mysqli driver tries to free 
memory

Change-Id: Ida8b80ab8590a1b720aab04acb389a62b1622389
---
M sites/all/modules/large_donation/tests/LargeDonationTest.php
M sites/all/modules/wmf_civicrm/recurring.inc
2 files changed, 10 insertions(+), 10 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/58/350358/1

diff --git a/sites/all/modules/large_donation/tests/LargeDonationTest.php 
b/sites/all/modules/large_donation/tests/LargeDonationTest.php
index 9fa7710..7cd9f3f 100644
--- a/sites/all/modules/large_donation/tests/LargeDonationTest.php
+++ b/sites/all/modules/large_donation/tests/LargeDonationTest.php
@@ -24,10 +24,10 @@
 ) )
 ->execute();
 
-$result = civicrm_api3( 'Contact', 'create', array(
+$result = $this->callAPISuccess('Contact', 'create', array(
 'contact_type' => 'Individual',
 'first_name' => 'Testes',
-) );
+));
 $this->contact_id = $result['id'];
 }
 
diff --git a/sites/all/modules/wmf_civicrm/recurring.inc 
b/sites/all/modules/wmf_civicrm/recurring.inc
index 3ef0611..3e99e1f 100644
--- a/sites/all/modules/wmf_civicrm/recurring.inc
+++ b/sites/all/modules/wmf_civicrm/recurring.inc
@@ -79,8 +79,7 @@
 $msg['cycle_day'] = wmf_civicrm_get_cycle_day( $msg['date'] );
 
 $next_sched_contribution = 
wmf_civicrm_get_next_sched_contribution_date_for_month( $msg );
-
-$api = civicrm_api_classapi();
+
 $insert_params = array(
 'contact_id' => $contact_id,
 'amount' => $msg[ 'original_gross' ],
@@ -96,14 +95,15 @@
 'cycle_day' => $msg[ 'cycle_day' ],
 'next_sched_contribution_date' => $next_sched_contribution,
 'trxn_id' => $gateway_subscr_id,
-
-'version' => 3,
 );
-$success = $api->ContributionRecur->Create( $insert_params );
-if ( !$success ) {
-throw new WmfException( 'IMPORT_SUBSCRIPTION', $api->errorMsg() );
+try {
+  $result = civicrm_api3('ContributionRecur', 'Create', $insert_params);
 }
-$contribution_recur_id = $api->id;
+catch (CiviCRM_API3_Exception $e) {
+  throw new WmfException( 'IMPORT_SUBSCRIPTION', $e->getMessage());
+}
+
+$contribution_recur_id = $result ['id'];
 
 if ( $contribution_record ) {
 // Link the contribution to the recurring payment

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ida8b80ab8590a1b720aab04acb389a62b1622389
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: master
Gerrit-Owner: Eileen 

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

[MediaWiki-commits] [Gerrit] wikimedia...crm[master]: Remove trailing whitespace

[Eileen (Code Review)]

Eileen has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/350357 )

Change subject: Remove trailing whitespace
..

Remove trailing whitespace

Change-Id: Idb0c4da19b6f44e247f0d0e83ec7a34971208c80
---
M sites/all/modules/wmf_civicrm/recurring.inc
1 file changed, 43 insertions(+), 43 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/57/350357/1

diff --git a/sites/all/modules/wmf_civicrm/recurring.inc 
b/sites/all/modules/wmf_civicrm/recurring.inc
index ac43125..3ef0611 100644
--- a/sites/all/modules/wmf_civicrm/recurring.inc
+++ b/sites/all/modules/wmf_civicrm/recurring.inc
@@ -2,10 +2,10 @@
 
 /**
  * Insert the recurring contribution record
- * 
+ *
  * @todo Determine the watchdog level for errors.
  * @todo Are the dates being set with the correct value?
- * 
+ *
  * @param array $msg
  * @param integer $contact_id
  * @param string $subscr_id
@@ -27,7 +27,7 @@
 );
 throw new WmfException( 'IMPORT_SUBSCRIPTION', $error_message );
   }
-
+
 // Allowed frequency_units
 $frequency_units = array( 'month' );
 if ( !in_array( $msg[ 'frequency_unit' ], $frequency_units ) ) {
@@ -59,7 +59,7 @@
 );
 throw new WmfException('IMPORT_SUBSCRIPTION', $error_message );
 }
-
+
 if ( !empty( $msg['subscr_id'] ) ) {
 $gateway_subscr_id = $msg['subscr_id'];
 } else {
@@ -75,9 +75,9 @@
 
 $gateway_subscr_id = $contribution_record['trxn_id'];
 }
-
+
 $msg['cycle_day'] = wmf_civicrm_get_cycle_day( $msg['date'] );
-
+
 $next_sched_contribution = 
wmf_civicrm_get_next_sched_contribution_date_for_month( $msg );
 
 $api = civicrm_api_classapi();
@@ -116,7 +116,7 @@
 
 /**
  * Link a recurring payment to the contribution record
- * 
+ *
  * @param integer $contribution_id
  * @param integer $contribution_recur_id
  */
@@ -127,7 +127,7 @@
 $error_message = t('`contribution_id` must be set and not empty.');
 throw new WmfException('IMPORT_SUBSCRIPTION', $error_message);
 }
-
+
 // contribution_recur_id must be set and not null or zero
 if ( empty( $contribution_recur_id ) ) {
 $error_message = t('`contribution_recur_id` must be set and not 
empty.');
@@ -171,15 +171,15 @@
  *  AND `civicrm_contribution_recur`.`failure_count` = 0
  *  AND `civicrm_contribution_recur`.`contribution_status_id` = 1
  * LIMIT 1
- * 
+ *
  * options:
  * - date   stringUses strtotime() to parse the date
  * - $limit integer   Number of records to pull. Default is 1.
- * 
+ *
  * TODO: other gateways than GC
  * @todo The field `civicrm_payment_processor`.`payment_processor_type` should 
be set.
  * @todo Implement $contributionStatus = 
CRM_Contribute_PseudoConstant::contributionStatus( null, 'name' );
- * 
+ *
  * @return array of contribution_recur objects
  */
 function wmf_civicrm_get_next_sched_contribution($limit = 1, $date = 'now', 
$run_missed_days = 0)
@@ -188,22 +188,22 @@
 date_default_timezone_set( "UTC" );
 
 $date = date('Y-m-d', strtotime($date));
-
+
 $start_day = $date . ' 00:00:00';
 $end_day = $date . ' 23:59:59';
-
+
 $start_day_stamp = strtotime($start_day);
 $end_day_stamp = strtotime($end_day);
-
+
 if ($run_missed_days > 0) {
 
 $decrement_date = '-' . $run_missed_days . ' day';
-
+
 $start_day = date('Y-m-d 00:00:00', strtotime($decrement_date, 
$start_day_stamp));
 }
 
 date_default_timezone_set( $oldTimezone );
-
+
 $contribution_status_id = civicrm_api_contribution_status('Completed');
 
 watchdog(
@@ -230,13 +230,13 @@
 ':end' => $end_day,
 ':status_id' => $contribution_status_id,
 ) );
-
+
 return $res->fetchAll();
 }
 
 /**
  * wmf_civicrm_get_next_sched_contribution_date_for_month
- * 
+ *
  * @param $record contribution_recur db record, containing at least:
  * frequency_interval, cycle_day
  * @param $nowstamp optional timestamp at which to perform the calculation, 
otherwise now()
@@ -246,7 +246,7 @@
 function wmf_civicrm_get_next_sched_contribution_date_for_month( $record, 
$nowstamp = null )
 {
 $triggered_for_date = wmf_civicrm_get_last_trigger_date( $record, 
$nowstamp );
-//$frequency_interval and $cycle_day will, at this point, have been found 
in $record. 
+//$frequency_interval and $cycle_day will, at this point, have been found 
in $record.
 $frequency_interval = (integer) $record['frequency_interval'];
 $cycle_day = $record['cycle_day'];
 
@@ -257,22 +257,22 @@
 $scheduled_date_stamp = wmf_civicrm_increment_date_to_target_day( 
$scheduled_date_stamp, 'month', $cycle_day );
 $added += 1;
 }
-
+
 return gmdate('Y-m-d H:i:s', $scheduled_date_stamp);
 }
 
 /**
- * Calculates the last date this payment should have been triggered for, 
- * regardless 

[MediaWiki-commits] [Gerrit] mediawiki...mobileapps[master]: Remove locutus dependency

[BearND (Code Review)]

BearND has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/350356 )

Change subject: Remove locutus dependency
..

Remove locutus dependency

encodeURIComponent should be sufficient to encode a title inside an
HTTP path.

Change-Id: I4a78ead30749432c37a76fd4f96cbc996a1eae91
---
M lib/pageviews.js
M package.json
2 files changed, 1 insertion(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/mobileapps 
refs/changes/56/350356/1

diff --git a/lib/pageviews.js b/lib/pageviews.js
index 01e87c5..f3d36b2 100644
--- a/lib/pageviews.js
+++ b/lib/pageviews.js
@@ -2,7 +2,6 @@
 
 const api = require('./api-util');
 const dateUtil = require('./dateUtil');
-const urlencode = require('locutus/php/url/urlencode');
 
 /**
  * @readonly
@@ -62,7 +61,7 @@
  * @return {!Promise} Daily pageviews on domain from platform for title 
from [start, end]
 */
 reqPage(domain, platform, agent, title, granularity, start, end) {
-const titleEncoded = urlencode(title);
+const titleEncoded = encodeURIComponent(title);
 const startStr = dateUtil.formatMMDD(start);
 const endStr = dateUtil.formatMMDD(end);
 // eslint-disable-next-line max-len
diff --git a/package.json b/package.json
index e03e1b2..ac6d4e9 100644
--- a/package.json
+++ b/package.json
@@ -49,7 +49,6 @@
 "escape-string-regexp": "^1.0.5",
 "express": "^4.14.0",
 "js-yaml": "^3.7.0",
-"locutus": "^2.0.5",
 "mediawiki-title": "^0.5.6",
 "preq": "^0.5.1",
 "service-runner": "^2.2.5",

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I4a78ead30749432c37a76fd4f96cbc996a1eae91
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] wikimedia...SmashPig[master]: WIP Move a couple easy staging helpers into SmashPig

[Ejegg (Code Review)]

Ejegg has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/350355 )

Change subject: WIP Move a couple easy staging helpers into SmashPig
..

WIP Move a couple easy staging helpers into SmashPig

These two don't use the GatewayAdapter param at all. For others we'll
have to get creative.

Bug: T163867
Change-Id: Ied0b4cd97de325a3a2550532414bafc14a686861
---
A PaymentData/Transformers/DonorLocale.php
A PaymentData/Transformers/IsoDate.php
A PaymentData/Transformers/StagingHelper.php
A PaymentData/Transformers/UnstagingHelper.php
4 files changed, 79 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/SmashPig 
refs/changes/55/350355/1

diff --git a/PaymentData/Transformers/DonorLocale.php 
b/PaymentData/Transformers/DonorLocale.php
new file mode 100644
index 000..3e417aa
--- /dev/null
+++ b/PaymentData/Transformers/DonorLocale.php
@@ -0,0 +1,23 @@
+https://gerrit.wikimedia.org/r/350355
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ied0b4cd97de325a3a2550532414bafc14a686861
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/SmashPig
Gerrit-Branch: master
Gerrit-Owner: Ejegg 

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

[MediaWiki-commits] [Gerrit] wikimedia...crm[master]: Lint json files from npm / grunt-jsonlint

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/350189 )

Change subject: Lint json files from npm / grunt-jsonlint
..


Lint json files from npm / grunt-jsonlint

Bug: T163781
Change-Id: I2945f2b05bc7e91812b8d578a37cf8dbbd69874f
---
M .gitignore
A Gruntfile.js
A package.json
3 files changed, 27 insertions(+), 0 deletions(-)

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



diff --git a/.gitignore b/.gitignore
index f0b5c7e..cecaed8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
+/node_modules/
 sites/default/*settings.php
 !sites/default/default.settings.php
 sites/default/files
diff --git a/Gruntfile.js b/Gruntfile.js
new file mode 100644
index 000..016dfed
--- /dev/null
+++ b/Gruntfile.js
@@ -0,0 +1,16 @@
+/*jshint node:true */
+module.exports = function ( grunt ) {
+   grunt.loadNpmTasks( 'grunt-jsonlint' );
+   grunt.initConfig( {
+   jsonlint: {
+   all: [
+   '**/*.json',
+   '!node_modules/**',
+   '!vendor/**'
+   ]
+   }
+   } );
+
+   grunt.registerTask( 'test', [ 'jsonlint' ] );
+   grunt.registerTask( 'default', 'test' );
+};
diff --git a/package.json b/package.json
new file mode 100644
index 000..8528003
--- /dev/null
+++ b/package.json
@@ -0,0 +1,10 @@
+{
+  "private": true,
+  "scripts": {
+"test": "grunt test"
+  },
+  "devDependencies": {
+"grunt": "1.0.1",
+"grunt-jsonlint": "1.1.0"
+  }
+}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I2945f2b05bc7e91812b8d578a37cf8dbbd69874f
Gerrit-PatchSet: 3
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: master
Gerrit-Owner: Hashar 
Gerrit-Reviewer: Awight 
Gerrit-Reviewer: Ejegg 
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] wikimedia...crm[master]: Fix adding Bijcard

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/350100 )

Change subject: Fix adding Bijcard
..


Fix adding Bijcard

Oops!

Change-Id: I2e9aa5174ad001f7e84819bb04c23d18d5508636
---
M sites/all/modules/wmf_civicrm/wmf_civicrm.install
1 file changed, 13 insertions(+), 11 deletions(-)

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



diff --git a/sites/all/modules/wmf_civicrm/wmf_civicrm.install 
b/sites/all/modules/wmf_civicrm/wmf_civicrm.install
index 099d8c9..8b4cb25 100644
--- a/sites/all/modules/wmf_civicrm/wmf_civicrm.install
+++ b/sites/all/modules/wmf_civicrm/wmf_civicrm.install
@@ -64,6 +64,7 @@
 wmf_civicrm_update_7310();
 wmf_civicrm_update_7455();
 wmf_civicrm_update_7460();
+wmf_civicrm_update_7521();
 }
 
 /**
@@ -2903,18 +2904,8 @@
   LIMIT 1
 ");
   }
-
-  /**
-   * Add Bijcard
-   */
-  function wmf_civicrm_update_7511() {
-$payment_instruments = array(
-  'Credit Card: Bijenkorf',
-);
-wmf_civicrm_bootstrap_civi();
-wmf_civicrm_create_option_values( 'payment_instrument', 
$payment_instruments );
-  }
 }
+
 /**
  * Backfill contribution_tracking associations for recurring donations
  *
@@ -2977,3 +2968,14 @@
 }
   }
 }
+
+/**
+ * Add Bijcard
+ */
+function wmf_civicrm_update_7521() {
+  $payment_instruments = array(
+'Credit Card: Bijenkorf',
+  );
+  wmf_civicrm_bootstrap_civi();
+  wmf_civicrm_create_option_values( 'payment_instrument', $payment_instruments 
);
+}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I2e9aa5174ad001f7e84819bb04c23d18d5508636
Gerrit-PatchSet: 2
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: master
Gerrit-Owner: Ejegg 
Gerrit-Reviewer: Eileen 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] wikimedia...crm[master]: Update CiviFixtures to use civicrm_api3.

[Ejegg (Code Review)]

Ejegg has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/350117 )

Change subject: Update CiviFixtures to use civicrm_api3.
..


Update CiviFixtures to use civicrm_api3.

After trying latest Civi I have been hitting problems with Message:

mysqli_free_result() [function.mysqli-free-result]: Couldn't fetch mysqli_result

After much distress I spotted a reference to suggest that cloning a DAO could 
cause it to be converted
to a serialized object rather than a true object. Replacing the class api calls 
with civicrm_api3 calls fixed this
locally for me. I have not fixed all references, only the ones in the test 
suite as they can be done & reviewed fairly
quickly since passing tests should mean they are correct. I will do the others 
in follow ups.

There is a required update to make this pass tests on the civi repo.

The PEAR globals is to move a enotice handling routine from being a civi hack 
to within our test suite.
I don't expect it would affect live code (when we revert the hack from our civi 
code base)

Change-Id: I9530ad61020cde1b5a2e3bbe12d48c3ee968ff38
---
M sites/all/modules/offline2civicrm/tests/ContributionConversionTest.php
M sites/all/modules/wmf_audit/tests/AdyenAuditTest.php
M sites/all/modules/wmf_audit/tests/AmazonAuditTest.php
M sites/all/modules/wmf_audit/tests/AstroPayAuditTest.php
M sites/all/modules/wmf_civicrm/tests/includes/CiviFixtures.php
M sites/all/modules/wmf_civicrm/tests/phpunit/ImportMessageTest.php
M sites/all/modules/wmf_civicrm/tests/phpunit/PhoneImportTest.php
M sites/all/modules/wmf_civicrm/tests/phpunit/RelationshipTest.php
M sites/all/modules/wmf_civicrm/tests/phpunit/SoftCreditTest.php
M sites/all/modules/wmf_common/tests/includes/BaseWmfDrupalPhpUnitTestCase.php
M sites/all/modules/wmf_common/tests/phpunit/WmfTransactionTest.php
M sites/all/modules/wmf_communication/tests/Job.test
12 files changed, 75 insertions(+), 150 deletions(-)

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



diff --git 
a/sites/all/modules/offline2civicrm/tests/ContributionConversionTest.php 
b/sites/all/modules/offline2civicrm/tests/ContributionConversionTest.php
index da00108..d6a91a0 100644
--- a/sites/all/modules/offline2civicrm/tests/ContributionConversionTest.php
+++ b/sites/all/modules/offline2civicrm/tests/ContributionConversionTest.php
@@ -55,14 +55,8 @@
 
 $contributions = wmf_civicrm_get_contributions_from_gateway_id( 
$this->transaction->gateway, $this->transaction->gateway_txn_id );
 
-$api = civicrm_api_classapi();
-$api->ContributionRecur->Get( array(
-'id' => $contributions[0]['contribution_recur_id'],
-
-'version' => 3,
-) );
-$contribution_recur = $api->values[0];
-$this->assertNotNull( $contribution_recur->cancel_date,
+$contribution_recur = 
$this->callAPISuccessGetSingle('ContributionRecur', array('id' => 
$contributions[0]['contribution_recur_id']));
+$this->assertNotNull( $contribution_recur['cancel_date'],
 "Marked as cancelled" );
 }
 }
diff --git a/sites/all/modules/wmf_audit/tests/AdyenAuditTest.php 
b/sites/all/modules/wmf_audit/tests/AdyenAuditTest.php
index f33f89c..ada30de 100644
--- a/sites/all/modules/wmf_audit/tests/AdyenAuditTest.php
+++ b/sites/all/modules/wmf_audit/tests/AdyenAuditTest.php
@@ -80,17 +80,11 @@
}
 
public function tearDown() {
-   $api = civicrm_api_classapi();
foreach( $this->contribution_ids as $id ) {
-   $api->Contribution->Delete( array(
-   'id' => $id,
-   'version' => 3,
-   ) );
+  $this->callAPISuccess('Contribution', 'delete', array('id' => $id));
}
-   $api->Contact->Delete( array(
-   'id' => $this->contact_id,
-   'version' => 3,
-   ) );
+
+$this->callAPISuccess('Contact', 'delete', array('id' => 
$this->contact_id));
parent::tearDown();
}
 
diff --git a/sites/all/modules/wmf_audit/tests/AmazonAuditTest.php 
b/sites/all/modules/wmf_audit/tests/AmazonAuditTest.php
index 44f8626..9b90bb5 100644
--- a/sites/all/modules/wmf_audit/tests/AmazonAuditTest.php
+++ b/sites/all/modules/wmf_audit/tests/AmazonAuditTest.php
@@ -66,15 +66,8 @@
}
 
public function tearDown() {
-   $api = civicrm_api_classapi();
-   $api->Contribution->Delete( array(
-   'id' => $this->contribution_id,
-   'version' => 3,
-   ) );
-   $api->Contact->Delete( array(
-   'id' => $this->contact_id,
-   'version' => 3,
-   ) );
+$this->callAPISuccess('Contribution', 'delete', array('id' => 
$this->contribution_id));
+

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Interwiki: Don't override interwiki map order

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/350281 )

Change subject: Interwiki: Don't override interwiki map order
..


Interwiki: Don't override interwiki map order

The ksort() here was causing the order to be enforced as
alphabetical instead of preserving the original order.

The order usually doesn't matter, except with regards to handling
of duplicates. Due to Parsoid normalising external links to interwiki
links, it has to do a reverse lookup. In doing so it has to decide
which one to prefer. It currently picks the first match from the
API request for meta=siteinfo=interwikimap, which didn't
match the defined order in the actual Interwiki map due to ksort()
being called in getAllPrefixes().

Sort in this function was originally introduced in 2010 with
commit 844e7c83e4 (2011; r92528; T21838), which is otherwise unrelated
and left no rationale.

The existing unit tests needed to be adjusted slightly as they
assumed alphabetical order. While it appeared they were also defined
in alphabetical order, this was merely the order of the variable
creation. The effective order is preserved within locals and globals,
but overall globals come before locals.

Also removed the duplicate test for Hash and CDB in InterwikiTest
that belongs in ClassicInterwikiLookupTest instead.

Bug: T145337
Change-Id: I7348748801cbdf16c6ceea5b0654fc174b79707e
---
M includes/interwiki/ClassicInterwikiLookup.php
M tests/phpunit/includes/interwiki/ClassicInterwikiLookupTest.php
M tests/phpunit/includes/interwiki/InterwikiTest.php
3 files changed, 51 insertions(+), 158 deletions(-)

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



diff --git a/includes/interwiki/ClassicInterwikiLookup.php 
b/includes/interwiki/ClassicInterwikiLookup.php
index 5226aa0..d9c0424 100644
--- a/includes/interwiki/ClassicInterwikiLookup.php
+++ b/includes/interwiki/ClassicInterwikiLookup.php
@@ -383,8 +383,6 @@
. $e->getMessage() );
}
 
-   ksort( $data );
-
return array_values( $data );
}
 
diff --git a/tests/phpunit/includes/interwiki/ClassicInterwikiLookupTest.php 
b/tests/phpunit/includes/interwiki/ClassicInterwikiLookupTest.php
index db6d002..48310a9 100644
--- a/tests/phpunit/includes/interwiki/ClassicInterwikiLookupTest.php
+++ b/tests/phpunit/includes/interwiki/ClassicInterwikiLookupTest.php
@@ -133,16 +133,16 @@
// NOTE: CDB setup is expensive, so we only do
//  it once and run all the tests in one go.
 
-   $dewiki = [
-   'iw_prefix' => 'de',
-   'iw_url' => 'http://de.wikipedia.org/wiki/',
-   'iw_local' => 1
-   ];
-
$zzwiki = [
'iw_prefix' => 'zz',
'iw_url' => 'http://zzwiki.org/wiki/',
'iw_local' => 0
+   ];
+
+   $dewiki = [
+   'iw_prefix' => 'de',
+   'iw_url' => 'http://de.wikipedia.org/wiki/',
+   'iw_local' => 1
];
 
$cdbFile = $this->populateCDB(
@@ -160,7 +160,7 @@
);
 
$this->assertEquals(
-   [ $dewiki, $zzwiki ],
+   [ $zzwiki, $dewiki ],
$lookup->getAllPrefixes(),
'getAllPrefixes()'
);
@@ -185,16 +185,15 @@
}
 
public function testArrayStorage() {
-   $dewiki = [
-   'iw_prefix' => 'de',
-   'iw_url' => 'http://de.wikipedia.org/wiki/',
-   'iw_local' => 1
-   ];
-
$zzwiki = [
'iw_prefix' => 'zz',
'iw_url' => 'http://zzwiki.org/wiki/',
'iw_local' => 0
+   ];
+   $dewiki = [
+   'iw_prefix' => 'de',
+   'iw_url' => 'http://de.wikipedia.org/wiki/',
+   'iw_local' => 1
];
 
$hash = $this->populateHash(
@@ -212,7 +211,7 @@
);
 
$this->assertEquals(
-   [ $dewiki, $zzwiki ],
+   [ $zzwiki, $dewiki ],
$lookup->getAllPrefixes(),
'getAllPrefixes()'
);
@@ -233,4 +232,42 @@
$this->assertSame( false, $interwiki->isLocal(), 'isLocal' );
}
 
+   public function testGetAllPrefixes() {
+   $zz = [
+   'iw_prefix' => 'zz',
+   'iw_url' => 'https://azz.example.org/',
+   'iw_local' => 1
+   ];
+   $de = [
+  

[MediaWiki-commits] [Gerrit] mediawiki...VisualEditor[master]: Update VE core submodule to master (00f0a0bf8)

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/350003 )

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


Update VE core submodule to master (00f0a0bf8)

New changes:
04c3aa3aa [BREAKING CHANGE] Remove deprecated TransactionBuilder aliases

Change-Id: I38affac50ff2f2394c6f304451bda61f7f5db3d5
---
M lib/ve
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/lib/ve b/lib/ve
index 7b49403..00f0a0b 16
--- a/lib/ve
+++ b/lib/ve
@@ -1 +1 @@
-Subproject commit 7b494035e6a13474089109a4d09389ed6b513d2b
+Subproject commit 00f0a0bf8b5c6984952588b82215350422bf52c6

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I38affac50ff2f2394c6f304451bda61f7f5db3d5
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Jforrester 
Gerrit-Reviewer: VolkerE 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Update OOjs UI to v0.21.2

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/350354 )

Change subject: Update OOjs UI to v0.21.2
..


Update OOjs UI to v0.21.2

Release notes:
 
https://phabricator.wikimedia.org/diffusion/GOJU/browse/master/History.md;v0.21.2

Change-Id: Id7cae80a4f3d84ea5d50003f2409537b307c0c58
---
M composer.json
M resources/lib/oojs-ui/i18n/sr-ec.json
M resources/lib/oojs-ui/oojs-ui-apex.js
M resources/lib/oojs-ui/oojs-ui-core-apex.css
M resources/lib/oojs-ui/oojs-ui-core-mediawiki.css
M resources/lib/oojs-ui/oojs-ui-core.js
M resources/lib/oojs-ui/oojs-ui-mediawiki.js
M resources/lib/oojs-ui/oojs-ui-toolbars-apex.css
M resources/lib/oojs-ui/oojs-ui-toolbars-mediawiki.css
M resources/lib/oojs-ui/oojs-ui-toolbars.js
M resources/lib/oojs-ui/oojs-ui-widgets-apex.css
M resources/lib/oojs-ui/oojs-ui-widgets-mediawiki.css
M resources/lib/oojs-ui/oojs-ui-widgets.js
M resources/lib/oojs-ui/oojs-ui-windows-apex.css
M resources/lib/oojs-ui/oojs-ui-windows-mediawiki.css
M resources/lib/oojs-ui/oojs-ui-windows.js
16 files changed, 257 insertions(+), 185 deletions(-)

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



diff --git a/composer.json b/composer.json
index be8ce15..ed42b60 100644
--- a/composer.json
+++ b/composer.json
@@ -25,7 +25,7 @@
"ext-xml": "*",
"liuggio/statsd-php-client": "1.0.18",
"mediawiki/at-ease": "1.1.0",
-   "oojs/oojs-ui": "0.21.1",
+   "oojs/oojs-ui": "0.21.2",
"oyejorge/less.php": "1.7.0.14",
"php": ">=5.5.9",
"psr/log": "1.0.2",
diff --git a/resources/lib/oojs-ui/i18n/sr-ec.json 
b/resources/lib/oojs-ui/i18n/sr-ec.json
index 9d3b926..87b7c2b 100644
--- a/resources/lib/oojs-ui/i18n/sr-ec.json
+++ b/resources/lib/oojs-ui/i18n/sr-ec.json
@@ -4,11 +4,12 @@
"Milicevic01",
"Nikola Smolenski",
"Милан Јелисавчић",
-   "Zoranzoki21"
+   "Zoranzoki21",
+   "Obsuser"
]
},
-   "ooui-outline-control-move-down": "Премести ставку на доле",
-   "ooui-outline-control-move-up": "Премести ставку на горе",
+   "ooui-outline-control-move-down": "Премести ставку надоле",
+   "ooui-outline-control-move-up": "Премести ставку нагоре",
"ooui-outline-control-remove": "Уклони ставку",
"ooui-toolbar-more": "Више",
"ooui-toolgroup-expand": "Више",
diff --git a/resources/lib/oojs-ui/oojs-ui-apex.js 
b/resources/lib/oojs-ui/oojs-ui-apex.js
index ef48f5b..bb0f603 100644
--- a/resources/lib/oojs-ui/oojs-ui-apex.js
+++ b/resources/lib/oojs-ui/oojs-ui-apex.js
@@ -1,12 +1,12 @@
 /*!
- * OOjs UI v0.21.1
+ * OOjs UI v0.21.2
  * https://www.mediawiki.org/wiki/OOjs_UI
  *
  * Copyright 2011–2017 OOjs UI Team and other contributors.
  * Released under the MIT license
  * http://oojs.mit-license.org
  *
- * Date: 2017-04-18T23:32:49Z
+ * Date: 2017-04-26T01:05:10Z
  */
 ( function ( OO ) {
 
diff --git a/resources/lib/oojs-ui/oojs-ui-core-apex.css 
b/resources/lib/oojs-ui/oojs-ui-core-apex.css
index 29b0874..cecff46 100644
--- a/resources/lib/oojs-ui/oojs-ui-core-apex.css
+++ b/resources/lib/oojs-ui/oojs-ui-core-apex.css
@@ -1,12 +1,12 @@
 /*!
- * OOjs UI v0.21.1
+ * OOjs UI v0.21.2
  * https://www.mediawiki.org/wiki/OOjs_UI
  *
  * Copyright 2011–2017 OOjs UI Team and other contributors.
  * Released under the MIT license
  * http://oojs.mit-license.org
  *
- * Date: 2017-04-18T23:32:54Z
+ * Date: 2017-04-26T01:05:15Z
  */
 .oo-ui-element-hidden {
   display: none !important;
@@ -1332,6 +1332,9 @@
   margin-right: 0;
 }
 .oo-ui-progressBarWidget {
+  -webkit-box-sizing: border-box;
+  -moz-box-sizing: border-box;
+  box-sizing: border-box;
   max-width: 50em;
   background-color: #fff;
   border: 1px solid #ccc;
diff --git a/resources/lib/oojs-ui/oojs-ui-core-mediawiki.css 
b/resources/lib/oojs-ui/oojs-ui-core-mediawiki.css
index a994e00..393ff59 100644
--- a/resources/lib/oojs-ui/oojs-ui-core-mediawiki.css
+++ b/resources/lib/oojs-ui/oojs-ui-core-mediawiki.css
@@ -1,12 +1,12 @@
 /*!
- * OOjs UI v0.21.1
+ * OOjs UI v0.21.2
  * https://www.mediawiki.org/wiki/OOjs_UI
  *
  * Copyright 2011–2017 OOjs UI Team and other contributors.
  * Released under the MIT license
  * http://oojs.mit-license.org
  *
- * Date: 2017-04-18T23:32:54Z
+ * Date: 2017-04-26T01:05:15Z
  */
 .oo-ui-element-hidden {
   display: none !important;
@@ -209,11 +209,13 @@
   opacity: 0.51;
 }
 .oo-ui-buttonElement-framed > .oo-ui-buttonElement-button {
-  min-height: 2.5em;
   border-radius: 2px;
-  padding: 0.625em 0.9375em 0.546875em;
+  padding-left: 0.9375em;
+  padding-right: 0.9375em;
 }
 .oo-ui-buttonElement-framed.oo-ui-iconElement > .oo-ui-buttonElement-button {
+  padding-top: 2.34375em;
+  padding-bottom: 0;
   

[MediaWiki-commits] [Gerrit] mediawiki/vendor[master]: Update OOjs UI to v0.21.2

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/350351 )

Change subject: Update OOjs UI to v0.21.2
..


Update OOjs UI to v0.21.2

Release notes:
 
https://phabricator.wikimedia.org/diffusion/GOJU/browse/master/History.md;v0.21.2

Change-Id: Id7cae80a4f3d84ea5d50003f2409537b307c0c58
---
M composer.json
M composer.lock
M composer/installed.json
M oojs/oojs-ui/History.md
M oojs/oojs-ui/demos/pages/widgets.js
M oojs/oojs-ui/demos/pages/widgets.php
M oojs/oojs-ui/i18n/sr-ec.json
M oojs/oojs-ui/package.json
8 files changed, 118 insertions(+), 43 deletions(-)

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



diff --git a/composer.json b/composer.json
index 25b488c..3487f5d 100644
--- a/composer.json
+++ b/composer.json
@@ -44,7 +44,7 @@
"mediawiki/at-ease": "1.1.0",
"monolog/monolog": "1.22.1",
"nmred/kafka-php": "0.1.5",
-   "oojs/oojs-ui": "0.21.1",
+   "oojs/oojs-ui": "0.21.2",
"oyejorge/less.php": "1.7.0.14",
"pear/console_getopt": "1.4.1",
"pear/mail": "1.3.0",
diff --git a/composer.lock b/composer.lock
index f2416a4..9bf1907 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
 "Read more about it at 
https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file;,
 "This file is @generated automatically"
 ],
-"content-hash": "0504cf9f775f597b7227cc031c0faee2",
+"content-hash": "5e9b8ed80416591510aab12e330bfdd1",
 "packages": [
 {
 "name": "composer/semver",
@@ -466,16 +466,16 @@
 },
 {
 "name": "oojs/oojs-ui",
-"version": "v0.21.1",
+"version": "v0.21.2",
 "source": {
 "type": "git",
 "url": "https://github.com/wikimedia/oojs-ui.git;,
-"reference": "59965a94e168c23d9dbb154d8a63f6a1abc7f537"
+"reference": "c8e485edc3da2a47fc225f0ff794405f1ef90c01"
 },
 "dist": {
 "type": "zip",
-"url": 
"https://api.github.com/repos/wikimedia/oojs-ui/zipball/59965a94e168c23d9dbb154d8a63f6a1abc7f537;,
-"reference": "59965a94e168c23d9dbb154d8a63f6a1abc7f537",
+"url": 
"https://api.github.com/repos/wikimedia/oojs-ui/zipball/c8e485edc3da2a47fc225f0ff794405f1ef90c01;,
+"reference": "c8e485edc3da2a47fc225f0ff794405f1ef90c01",
 "shasum": ""
 },
 "require": {
@@ -541,7 +541,7 @@
 ],
 "description": "Provides library of common widgets, layouts, and 
windows.",
 "homepage": "https://www.mediawiki.org/wiki/OOjs_UI;,
-"time": "2017-04-18T23:06:13+00:00"
+"time": "2017-04-26T00:45:31+00:00"
 },
 {
 "name": "oyejorge/less.php",
diff --git a/composer/installed.json b/composer/installed.json
index d1b6acd..db6fd2b 100644
--- a/composer/installed.json
+++ b/composer/installed.json
@@ -2112,17 +2112,17 @@
 },
 {
 "name": "oojs/oojs-ui",
-"version": "v0.21.1",
-"version_normalized": "0.21.1.0",
+"version": "v0.21.2",
+"version_normalized": "0.21.2.0",
 "source": {
 "type": "git",
 "url": "https://github.com/wikimedia/oojs-ui.git;,
-"reference": "59965a94e168c23d9dbb154d8a63f6a1abc7f537"
+"reference": "c8e485edc3da2a47fc225f0ff794405f1ef90c01"
 },
 "dist": {
 "type": "zip",
-"url": 
"https://api.github.com/repos/wikimedia/oojs-ui/zipball/59965a94e168c23d9dbb154d8a63f6a1abc7f537;,
-"reference": "59965a94e168c23d9dbb154d8a63f6a1abc7f537",
+"url": 
"https://api.github.com/repos/wikimedia/oojs-ui/zipball/c8e485edc3da2a47fc225f0ff794405f1ef90c01;,
+"reference": "c8e485edc3da2a47fc225f0ff794405f1ef90c01",
 "shasum": ""
 },
 "require": {
@@ -2134,7 +2134,7 @@
 "mediawiki/mediawiki-codesniffer": "0.6.0",
 "phpunit/phpunit": "4.8.21"
 },
-"time": "2017-04-18T23:06:13+00:00",
+"time": "2017-04-26T00:45:31+00:00",
 "type": "library",
 "installation-source": "dist",
 "autoload": {
diff --git a/oojs/oojs-ui/History.md b/oojs/oojs-ui/History.md
index f6e9955..7aab2c8 100644
--- a/oojs/oojs-ui/History.md
+++ b/oojs/oojs-ui/History.md
@@ -1,4 +1,30 @@
 # OOjs UI Release History
+## v0.21.2 / 2017-04-25
+### Features
+* Element: New method `#getElementId` (Bartosz Dziewoński)
+* NumberInputWidget: Remake as an actual TextInputWidget child (Moriel 
Schottlender)
+
+### Styles
+* ProgressBarWidget: Switch to `box-sizing: border-box` (Volker E)
+* TabOptionWidget: Cleanup & align paddings/position to 

[MediaWiki-commits] [Gerrit] wikimedia...crm[master]: Minor tweak to prevent e-notice during test.

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/350108 )

Change subject: Minor tweak to prevent e-notice during test.
..


Minor tweak to prevent e-notice during test.

An edge case regression in latest Civi is causing this to need to be set to 
prevent an enotice.

On live this is not relevant

Change-Id: I24123246d02aa412a794a62f3092faccb77ad1c0
---
M sites/all/modules/offline2civicrm/tests/BenevityTest.php
1 file changed, 1 insertion(+), 0 deletions(-)

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



diff --git a/sites/all/modules/offline2civicrm/tests/BenevityTest.php 
b/sites/all/modules/offline2civicrm/tests/BenevityTest.php
index 718d7fb..faec0ce 100644
--- a/sites/all/modules/offline2civicrm/tests/BenevityTest.php
+++ b/sites/all/modules/offline2civicrm/tests/BenevityTest.php
@@ -33,6 +33,7 @@
 \Civi::$statics = array();
 $countries = $this->callAPISuccess('Country', 'get', array());
 $this->callAPISuccess('Setting', 'create', array('countryLimit' => 
array_keys($countries['values'])));
+$this->callAPISuccess('Setting', 'create', array('provinceLimit' => 
array()));
 
   }
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I24123246d02aa412a794a62f3092faccb77ad1c0
Gerrit-PatchSet: 2
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: master
Gerrit-Owner: Eileen 
Gerrit-Reviewer: Ejegg 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Update OOjs UI to v0.21.2

[VolkerE (Code Review)]

VolkerE has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/350354 )

Change subject: Update OOjs UI to v0.21.2
..

Update OOjs UI to v0.21.2

Release notes:
 
https://phabricator.wikimedia.org/diffusion/GOJU/browse/master/History.md;v0.21.2

Change-Id: Id7cae80a4f3d84ea5d50003f2409537b307c0c58
---
M composer.json
M resources/lib/oojs-ui/i18n/sr-ec.json
M resources/lib/oojs-ui/oojs-ui-apex.js
M resources/lib/oojs-ui/oojs-ui-core-apex.css
M resources/lib/oojs-ui/oojs-ui-core-mediawiki.css
M resources/lib/oojs-ui/oojs-ui-core.js
M resources/lib/oojs-ui/oojs-ui-mediawiki.js
M resources/lib/oojs-ui/oojs-ui-toolbars-apex.css
M resources/lib/oojs-ui/oojs-ui-toolbars-mediawiki.css
M resources/lib/oojs-ui/oojs-ui-toolbars.js
M resources/lib/oojs-ui/oojs-ui-widgets-apex.css
M resources/lib/oojs-ui/oojs-ui-widgets-mediawiki.css
M resources/lib/oojs-ui/oojs-ui-widgets.js
M resources/lib/oojs-ui/oojs-ui-windows-apex.css
M resources/lib/oojs-ui/oojs-ui-windows-mediawiki.css
M resources/lib/oojs-ui/oojs-ui-windows.js
16 files changed, 257 insertions(+), 185 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/54/350354/1

diff --git a/composer.json b/composer.json
index be8ce15..ed42b60 100644
--- a/composer.json
+++ b/composer.json
@@ -25,7 +25,7 @@
"ext-xml": "*",
"liuggio/statsd-php-client": "1.0.18",
"mediawiki/at-ease": "1.1.0",
-   "oojs/oojs-ui": "0.21.1",
+   "oojs/oojs-ui": "0.21.2",
"oyejorge/less.php": "1.7.0.14",
"php": ">=5.5.9",
"psr/log": "1.0.2",
diff --git a/resources/lib/oojs-ui/i18n/sr-ec.json 
b/resources/lib/oojs-ui/i18n/sr-ec.json
index 9d3b926..87b7c2b 100644
--- a/resources/lib/oojs-ui/i18n/sr-ec.json
+++ b/resources/lib/oojs-ui/i18n/sr-ec.json
@@ -4,11 +4,12 @@
"Milicevic01",
"Nikola Smolenski",
"Милан Јелисавчић",
-   "Zoranzoki21"
+   "Zoranzoki21",
+   "Obsuser"
]
},
-   "ooui-outline-control-move-down": "Премести ставку на доле",
-   "ooui-outline-control-move-up": "Премести ставку на горе",
+   "ooui-outline-control-move-down": "Премести ставку надоле",
+   "ooui-outline-control-move-up": "Премести ставку нагоре",
"ooui-outline-control-remove": "Уклони ставку",
"ooui-toolbar-more": "Више",
"ooui-toolgroup-expand": "Више",
diff --git a/resources/lib/oojs-ui/oojs-ui-apex.js 
b/resources/lib/oojs-ui/oojs-ui-apex.js
index ef48f5b..bb0f603 100644
--- a/resources/lib/oojs-ui/oojs-ui-apex.js
+++ b/resources/lib/oojs-ui/oojs-ui-apex.js
@@ -1,12 +1,12 @@
 /*!
- * OOjs UI v0.21.1
+ * OOjs UI v0.21.2
  * https://www.mediawiki.org/wiki/OOjs_UI
  *
  * Copyright 2011–2017 OOjs UI Team and other contributors.
  * Released under the MIT license
  * http://oojs.mit-license.org
  *
- * Date: 2017-04-18T23:32:49Z
+ * Date: 2017-04-26T01:05:10Z
  */
 ( function ( OO ) {
 
diff --git a/resources/lib/oojs-ui/oojs-ui-core-apex.css 
b/resources/lib/oojs-ui/oojs-ui-core-apex.css
index 29b0874..cecff46 100644
--- a/resources/lib/oojs-ui/oojs-ui-core-apex.css
+++ b/resources/lib/oojs-ui/oojs-ui-core-apex.css
@@ -1,12 +1,12 @@
 /*!
- * OOjs UI v0.21.1
+ * OOjs UI v0.21.2
  * https://www.mediawiki.org/wiki/OOjs_UI
  *
  * Copyright 2011–2017 OOjs UI Team and other contributors.
  * Released under the MIT license
  * http://oojs.mit-license.org
  *
- * Date: 2017-04-18T23:32:54Z
+ * Date: 2017-04-26T01:05:15Z
  */
 .oo-ui-element-hidden {
   display: none !important;
@@ -1332,6 +1332,9 @@
   margin-right: 0;
 }
 .oo-ui-progressBarWidget {
+  -webkit-box-sizing: border-box;
+  -moz-box-sizing: border-box;
+  box-sizing: border-box;
   max-width: 50em;
   background-color: #fff;
   border: 1px solid #ccc;
diff --git a/resources/lib/oojs-ui/oojs-ui-core-mediawiki.css 
b/resources/lib/oojs-ui/oojs-ui-core-mediawiki.css
index a994e00..393ff59 100644
--- a/resources/lib/oojs-ui/oojs-ui-core-mediawiki.css
+++ b/resources/lib/oojs-ui/oojs-ui-core-mediawiki.css
@@ -1,12 +1,12 @@
 /*!
- * OOjs UI v0.21.1
+ * OOjs UI v0.21.2
  * https://www.mediawiki.org/wiki/OOjs_UI
  *
  * Copyright 2011–2017 OOjs UI Team and other contributors.
  * Released under the MIT license
  * http://oojs.mit-license.org
  *
- * Date: 2017-04-18T23:32:54Z
+ * Date: 2017-04-26T01:05:15Z
  */
 .oo-ui-element-hidden {
   display: none !important;
@@ -209,11 +209,13 @@
   opacity: 0.51;
 }
 .oo-ui-buttonElement-framed > .oo-ui-buttonElement-button {
-  min-height: 2.5em;
   border-radius: 2px;
-  padding: 0.625em 0.9375em 0.546875em;
+  padding-left: 0.9375em;
+  padding-right: 0.9375em;
 }
 .oo-ui-buttonElement-framed.oo-ui-iconElement > .oo-ui-buttonElement-button {
+  padding-top: 2.34375em;
+  padding-bottom: 0;
   

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: maintenance/resources/update-oojs-ui: Copy across map files ...

[Jforrester (Code Review)]

Jforrester has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/350352 )

Change subject: maintenance/resources/update-oojs-ui: Copy across map files for 
debug mode
..

maintenance/resources/update-oojs-ui: Copy across map files for debug mode

Change-Id: I0ae3762991d4bc039208ff768671030b51453308
---
M maintenance/resources/update-oojs-ui.sh
1 file changed, 5 insertions(+), 5 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/52/350352/1

diff --git a/maintenance/resources/update-oojs-ui.sh 
b/maintenance/resources/update-oojs-ui.sh
index dbce7a7..516038d 100755
--- a/maintenance/resources/update-oojs-ui.sh
+++ b/maintenance/resources/update-oojs-ui.sh
@@ -44,15 +44,15 @@
 mkdir -p "$REPO_DIR/$TARGET_DIR/images"
 mkdir -p "$REPO_DIR/$TARGET_DIR/themes/mediawiki/images"
 mkdir -p "$REPO_DIR/$TARGET_DIR/themes/apex/images"
-cp ./node_modules/oojs-ui/dist/oojs-ui-core.js "$REPO_DIR/$TARGET_DIR"
+cp ./node_modules/oojs-ui/dist/oojs-ui-core.js{,.map} "$REPO_DIR/$TARGET_DIR"
 cp ./node_modules/oojs-ui/dist/oojs-ui-core-{mediawiki,apex}.css 
"$REPO_DIR/$TARGET_DIR"
-cp ./node_modules/oojs-ui/dist/oojs-ui-widgets.js "$REPO_DIR/$TARGET_DIR"
+cp ./node_modules/oojs-ui/dist/oojs-ui-widgets.js{,.map} 
"$REPO_DIR/$TARGET_DIR"
 cp ./node_modules/oojs-ui/dist/oojs-ui-widgets-{mediawiki,apex}.css 
"$REPO_DIR/$TARGET_DIR"
-cp ./node_modules/oojs-ui/dist/oojs-ui-toolbars.js "$REPO_DIR/$TARGET_DIR"
+cp ./node_modules/oojs-ui/dist/oojs-ui-toolbars.js{,.map} 
"$REPO_DIR/$TARGET_DIR"
 cp ./node_modules/oojs-ui/dist/oojs-ui-toolbars-{mediawiki,apex}.css 
"$REPO_DIR/$TARGET_DIR"
-cp ./node_modules/oojs-ui/dist/oojs-ui-windows.js "$REPO_DIR/$TARGET_DIR"
+cp ./node_modules/oojs-ui/dist/oojs-ui-windows.js{,.map} 
"$REPO_DIR/$TARGET_DIR"
 cp ./node_modules/oojs-ui/dist/oojs-ui-windows-{mediawiki,apex}.css 
"$REPO_DIR/$TARGET_DIR"
-cp ./node_modules/oojs-ui/dist/oojs-ui-{mediawiki,apex}.js 
"$REPO_DIR/$TARGET_DIR"
+cp ./node_modules/oojs-ui/dist/oojs-ui-{mediawiki,apex}.js{,.map} 
"$REPO_DIR/$TARGET_DIR"
 cp -R ./node_modules/oojs-ui/dist/i18n "$REPO_DIR/$TARGET_DIR"
 cp -R ./node_modules/oojs-ui/dist/images "$REPO_DIR/$TARGET_DIR"
 cp -R ./node_modules/oojs-ui/dist/themes/mediawiki/images 
"$REPO_DIR/$TARGET_DIR/themes/mediawiki"

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I0ae3762991d4bc039208ff768671030b51453308
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
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] mediawiki/vendor[master]: Update OOjs UI to v0.21.2

[VolkerE (Code Review)]

VolkerE has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/350351 )

Change subject: Update OOjs UI to v0.21.2
..

Update OOjs UI to v0.21.2

Release notes:
 
https://phabricator.wikimedia.org/diffusion/GOJU/browse/master/History.md;v0.21.2

Change-Id: Id7cae80a4f3d84ea5d50003f2409537b307c0c58
---
M composer.json
M composer.lock
M composer/installed.json
M oojs/oojs-ui/History.md
M oojs/oojs-ui/demos/pages/widgets.js
M oojs/oojs-ui/demos/pages/widgets.php
M oojs/oojs-ui/i18n/sr-ec.json
M oojs/oojs-ui/package.json
8 files changed, 118 insertions(+), 43 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vendor 
refs/changes/51/350351/1

diff --git a/composer.json b/composer.json
index 25b488c..3487f5d 100644
--- a/composer.json
+++ b/composer.json
@@ -44,7 +44,7 @@
"mediawiki/at-ease": "1.1.0",
"monolog/monolog": "1.22.1",
"nmred/kafka-php": "0.1.5",
-   "oojs/oojs-ui": "0.21.1",
+   "oojs/oojs-ui": "0.21.2",
"oyejorge/less.php": "1.7.0.14",
"pear/console_getopt": "1.4.1",
"pear/mail": "1.3.0",
diff --git a/composer.lock b/composer.lock
index f2416a4..9bf1907 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
 "Read more about it at 
https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file;,
 "This file is @generated automatically"
 ],
-"content-hash": "0504cf9f775f597b7227cc031c0faee2",
+"content-hash": "5e9b8ed80416591510aab12e330bfdd1",
 "packages": [
 {
 "name": "composer/semver",
@@ -466,16 +466,16 @@
 },
 {
 "name": "oojs/oojs-ui",
-"version": "v0.21.1",
+"version": "v0.21.2",
 "source": {
 "type": "git",
 "url": "https://github.com/wikimedia/oojs-ui.git;,
-"reference": "59965a94e168c23d9dbb154d8a63f6a1abc7f537"
+"reference": "c8e485edc3da2a47fc225f0ff794405f1ef90c01"
 },
 "dist": {
 "type": "zip",
-"url": 
"https://api.github.com/repos/wikimedia/oojs-ui/zipball/59965a94e168c23d9dbb154d8a63f6a1abc7f537;,
-"reference": "59965a94e168c23d9dbb154d8a63f6a1abc7f537",
+"url": 
"https://api.github.com/repos/wikimedia/oojs-ui/zipball/c8e485edc3da2a47fc225f0ff794405f1ef90c01;,
+"reference": "c8e485edc3da2a47fc225f0ff794405f1ef90c01",
 "shasum": ""
 },
 "require": {
@@ -541,7 +541,7 @@
 ],
 "description": "Provides library of common widgets, layouts, and 
windows.",
 "homepage": "https://www.mediawiki.org/wiki/OOjs_UI;,
-"time": "2017-04-18T23:06:13+00:00"
+"time": "2017-04-26T00:45:31+00:00"
 },
 {
 "name": "oyejorge/less.php",
diff --git a/composer/installed.json b/composer/installed.json
index d1b6acd..db6fd2b 100644
--- a/composer/installed.json
+++ b/composer/installed.json
@@ -2112,17 +2112,17 @@
 },
 {
 "name": "oojs/oojs-ui",
-"version": "v0.21.1",
-"version_normalized": "0.21.1.0",
+"version": "v0.21.2",
+"version_normalized": "0.21.2.0",
 "source": {
 "type": "git",
 "url": "https://github.com/wikimedia/oojs-ui.git;,
-"reference": "59965a94e168c23d9dbb154d8a63f6a1abc7f537"
+"reference": "c8e485edc3da2a47fc225f0ff794405f1ef90c01"
 },
 "dist": {
 "type": "zip",
-"url": 
"https://api.github.com/repos/wikimedia/oojs-ui/zipball/59965a94e168c23d9dbb154d8a63f6a1abc7f537;,
-"reference": "59965a94e168c23d9dbb154d8a63f6a1abc7f537",
+"url": 
"https://api.github.com/repos/wikimedia/oojs-ui/zipball/c8e485edc3da2a47fc225f0ff794405f1ef90c01;,
+"reference": "c8e485edc3da2a47fc225f0ff794405f1ef90c01",
 "shasum": ""
 },
 "require": {
@@ -2134,7 +2134,7 @@
 "mediawiki/mediawiki-codesniffer": "0.6.0",
 "phpunit/phpunit": "4.8.21"
 },
-"time": "2017-04-18T23:06:13+00:00",
+"time": "2017-04-26T00:45:31+00:00",
 "type": "library",
 "installation-source": "dist",
 "autoload": {
diff --git a/oojs/oojs-ui/History.md b/oojs/oojs-ui/History.md
index f6e9955..7aab2c8 100644
--- a/oojs/oojs-ui/History.md
+++ b/oojs/oojs-ui/History.md
@@ -1,4 +1,30 @@
 # OOjs UI Release History
+## v0.21.2 / 2017-04-25
+### Features
+* Element: New method `#getElementId` (Bartosz Dziewoński)
+* NumberInputWidget: Remake as an actual TextInputWidget child (Moriel 
Schottlender)
+
+### Styles
+* ProgressBarWidget: Switch to `box-sizing: border-box` (Volker E)
+* TabOptionWidget: Cleanup & align paddings/position to dialog 

[MediaWiki-commits] [Gerrit] oojs/ui[master]: Tag v0.21.2

[VolkerE (Code Review)]

VolkerE has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/350337 )

Change subject: Tag v0.21.2
..


Tag v0.21.2

Change-Id: Id69eec80375a7abc6ddcba4eb8c450a7c7bbc8b9
---
M History.md
M package.json
2 files changed, 27 insertions(+), 1 deletion(-)

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



diff --git a/History.md b/History.md
index f6e9955..7aab2c8 100644
--- a/History.md
+++ b/History.md
@@ -1,4 +1,30 @@
 # OOjs UI Release History
+## v0.21.2 / 2017-04-25
+### Features
+* Element: New method `#getElementId` (Bartosz Dziewoński)
+* NumberInputWidget: Remake as an actual TextInputWidget child (Moriel 
Schottlender)
+
+### Styles
+* ProgressBarWidget: Switch to `box-sizing: border-box` (Volker E)
+* TabOptionWidget: Cleanup & align paddings/position to dialog environment 
(Volker E)
+* MediaWiki theme: Decrease selector specificity and fix invalid appearance 
(Volker E)
+* MediaWiki theme: Fix IE 7 oversized buttons (Volker E)
+* MediaWiki theme: Improve SearchWidget design (Volker E)
+
+### Code
+* Do not use `role=menu`/`menuitem` for MenuSelectWidget/MenuOptionWidget 
(Bartosz Dziewoński)
+* PopupTagMultiselectWidget: Update popup position on resize (Prateek Saxena)
+* ProcessDialog: Display error messages on top of footer action buttons 
(Bartosz Dziewoński)
+* SelectWidget/MenuSelectWidget: Maintain `aria-activedescendant` attribute on 
focus owner (Bartosz Dziewoński)
+* Set ARIA `role=combobox` on DropdownWidget and LookupElement too (Bartosz 
Dziewoński)
+* Set `aria-owns` for everything with a dropdown list (ARIA `role=combobox`) 
(Bartosz Dziewoński)
+* Follow-up d22d23311: Don't reference OO.ui.ToolGroup blindly (James D. 
Forrester)
+* build: Bump grunt-stylelint, bring in stylelint explicitly (James D. 
Forrester)
+* demos: Add some more examples with 'accessKey' (Bartosz Dziewoński)
+* docs: Document Window#$overlay property (Bartosz Dziewoński)
+* tests: Drop unnecessary hints to qunit about the number of tests (James D. 
Forrester)
+
+
 ## v0.21.1 / 2017-04-18
 ### Styles
 * PopupWidget: Do not leave space for anchor if there's no anchor (Bartosz 
Dziewoński)
diff --git a/package.json b/package.json
index 38850ec..d0a7478 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "oojs-ui",
-  "version": "0.21.1",
+  "version": "0.21.2",
   "description": "User interface classes built on the OOjs framework.",
   "keywords": [
 "oojs-plugin",

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Id69eec80375a7abc6ddcba4eb8c450a7c7bbc8b9
Gerrit-PatchSet: 1
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: VolkerE 
Gerrit-Reviewer: Jforrester 
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] wikimedia...twig[master]: Blank deprecated repo

[Ejegg (Code Review)]

Ejegg has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/350349 )

Change subject: Blank deprecated repo
..

Blank deprecated repo

Change-Id: I7455b95d27ffd1f58bacc376a34774c23f4bdbf4
---
D 1.13.0/AUTHORS
D 1.13.0/CHANGELOG
D 1.13.0/LICENSE
D 1.13.0/README.markdown
D 1.13.0/lib/Twig/Autoloader.php
D 1.13.0/lib/Twig/Compiler.php
D 1.13.0/lib/Twig/CompilerInterface.php
D 1.13.0/lib/Twig/Environment.php
D 1.13.0/lib/Twig/Error.php
D 1.13.0/lib/Twig/Error/Loader.php
D 1.13.0/lib/Twig/Error/Runtime.php
D 1.13.0/lib/Twig/Error/Syntax.php
D 1.13.0/lib/Twig/ExistsLoaderInterface.php
D 1.13.0/lib/Twig/ExpressionParser.php
D 1.13.0/lib/Twig/Extension.php
D 1.13.0/lib/Twig/Extension/Core.php
D 1.13.0/lib/Twig/Extension/Debug.php
D 1.13.0/lib/Twig/Extension/Escaper.php
D 1.13.0/lib/Twig/Extension/Optimizer.php
D 1.13.0/lib/Twig/Extension/Sandbox.php
D 1.13.0/lib/Twig/Extension/Staging.php
D 1.13.0/lib/Twig/Extension/StringLoader.php
D 1.13.0/lib/Twig/ExtensionInterface.php
D 1.13.0/lib/Twig/Filter.php
D 1.13.0/lib/Twig/Filter/Function.php
D 1.13.0/lib/Twig/Filter/Method.php
D 1.13.0/lib/Twig/Filter/Node.php
D 1.13.0/lib/Twig/FilterCallableInterface.php
D 1.13.0/lib/Twig/FilterInterface.php
D 1.13.0/lib/Twig/Function.php
D 1.13.0/lib/Twig/Function/Function.php
D 1.13.0/lib/Twig/Function/Method.php
D 1.13.0/lib/Twig/Function/Node.php
D 1.13.0/lib/Twig/FunctionCallableInterface.php
D 1.13.0/lib/Twig/FunctionInterface.php
D 1.13.0/lib/Twig/Lexer.php
D 1.13.0/lib/Twig/LexerInterface.php
D 1.13.0/lib/Twig/Loader/Array.php
D 1.13.0/lib/Twig/Loader/Chain.php
D 1.13.0/lib/Twig/Loader/Filesystem.php
D 1.13.0/lib/Twig/Loader/String.php
D 1.13.0/lib/Twig/LoaderInterface.php
D 1.13.0/lib/Twig/Markup.php
D 1.13.0/lib/Twig/Node.php
D 1.13.0/lib/Twig/Node/AutoEscape.php
D 1.13.0/lib/Twig/Node/Block.php
D 1.13.0/lib/Twig/Node/BlockReference.php
D 1.13.0/lib/Twig/Node/Body.php
D 1.13.0/lib/Twig/Node/Do.php
D 1.13.0/lib/Twig/Node/Embed.php
D 1.13.0/lib/Twig/Node/Expression.php
D 1.13.0/lib/Twig/Node/Expression/Array.php
D 1.13.0/lib/Twig/Node/Expression/AssignName.php
D 1.13.0/lib/Twig/Node/Expression/Binary.php
D 1.13.0/lib/Twig/Node/Expression/Binary/Add.php
D 1.13.0/lib/Twig/Node/Expression/Binary/And.php
D 1.13.0/lib/Twig/Node/Expression/Binary/BitwiseAnd.php
D 1.13.0/lib/Twig/Node/Expression/Binary/BitwiseOr.php
D 1.13.0/lib/Twig/Node/Expression/Binary/BitwiseXor.php
D 1.13.0/lib/Twig/Node/Expression/Binary/Concat.php
D 1.13.0/lib/Twig/Node/Expression/Binary/Div.php
D 1.13.0/lib/Twig/Node/Expression/Binary/Equal.php
D 1.13.0/lib/Twig/Node/Expression/Binary/FloorDiv.php
D 1.13.0/lib/Twig/Node/Expression/Binary/Greater.php
D 1.13.0/lib/Twig/Node/Expression/Binary/GreaterEqual.php
D 1.13.0/lib/Twig/Node/Expression/Binary/In.php
D 1.13.0/lib/Twig/Node/Expression/Binary/Less.php
D 1.13.0/lib/Twig/Node/Expression/Binary/LessEqual.php
D 1.13.0/lib/Twig/Node/Expression/Binary/Mod.php
D 1.13.0/lib/Twig/Node/Expression/Binary/Mul.php
D 1.13.0/lib/Twig/Node/Expression/Binary/NotEqual.php
D 1.13.0/lib/Twig/Node/Expression/Binary/NotIn.php
D 1.13.0/lib/Twig/Node/Expression/Binary/Or.php
D 1.13.0/lib/Twig/Node/Expression/Binary/Power.php
D 1.13.0/lib/Twig/Node/Expression/Binary/Range.php
D 1.13.0/lib/Twig/Node/Expression/Binary/Sub.php
D 1.13.0/lib/Twig/Node/Expression/BlockReference.php
D 1.13.0/lib/Twig/Node/Expression/Call.php
D 1.13.0/lib/Twig/Node/Expression/Conditional.php
D 1.13.0/lib/Twig/Node/Expression/Constant.php
D 1.13.0/lib/Twig/Node/Expression/ExtensionReference.php
D 1.13.0/lib/Twig/Node/Expression/Filter.php
D 1.13.0/lib/Twig/Node/Expression/Filter/Default.php
D 1.13.0/lib/Twig/Node/Expression/Function.php
D 1.13.0/lib/Twig/Node/Expression/GetAttr.php
D 1.13.0/lib/Twig/Node/Expression/MethodCall.php
D 1.13.0/lib/Twig/Node/Expression/Name.php
D 1.13.0/lib/Twig/Node/Expression/Parent.php
D 1.13.0/lib/Twig/Node/Expression/TempName.php
D 1.13.0/lib/Twig/Node/Expression/Test.php
D 1.13.0/lib/Twig/Node/Expression/Test/Constant.php
D 1.13.0/lib/Twig/Node/Expression/Test/Defined.php
D 1.13.0/lib/Twig/Node/Expression/Test/Divisibleby.php
D 1.13.0/lib/Twig/Node/Expression/Test/Even.php
D 1.13.0/lib/Twig/Node/Expression/Test/Null.php
D 1.13.0/lib/Twig/Node/Expression/Test/Odd.php
D 1.13.0/lib/Twig/Node/Expression/Test/Sameas.php
D 1.13.0/lib/Twig/Node/Expression/Unary.php
D 1.13.0/lib/Twig/Node/Expression/Unary/Neg.php
D 1.13.0/lib/Twig/Node/Expression/Unary/Not.php
D 1.13.0/lib/Twig/Node/Expression/Unary/Pos.php
D 1.13.0/lib/Twig/Node/Flush.php
D 1.13.0/lib/Twig/Node/For.php
D 1.13.0/lib/Twig/Node/ForLoop.php
D 1.13.0/lib/Twig/Node/If.php
D 1.13.0/lib/Twig/Node/Import.php
D 1.13.0/lib/Twig/Node/Include.php
D 1.13.0/lib/Twig/Node/Macro.php
D 1.13.0/lib/Twig/Node/Module.php
D 1.13.0/lib/Twig/Node/Print.php
D 1.13.0/lib/Twig/Node/Sandbox.php
D 1.13.0/lib/Twig/Node/SandboxedModule.php
D 1.13.0/lib/Twig/Node/SandboxedPrint.php
D 

[MediaWiki-commits] [Gerrit] wikimedia...totten[master]: Blank deprecated repo

[Ejegg (Code Review)]

Ejegg has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/350347 )

Change subject: Blank deprecated repo
..

Blank deprecated repo

Change-Id: Ifd6144af9c33bcb0fb45eb8ff9a50d33369b1d93
---
D .gitreview
1 file changed, 0 insertions(+), 6 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/civicrm-buildkit/vendor/totten
 refs/changes/47/350347/1

diff --git a/.gitreview b/.gitreview
deleted file mode 100644
index 7a87759..000
--- a/.gitreview
+++ /dev/null
@@ -1,6 +0,0 @@
-[gerrit]
-host=gerrit.wikimedia.org
-port=29418
-project=wikimedia/fundraising/civicrm-buildkit/vendor/totten.git
-defaultbranch=master
-defaultrebase=0

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ifd6144af9c33bcb0fb45eb8ff9a50d33369b1d93
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/civicrm-buildkit/vendor/totten
Gerrit-Branch: master
Gerrit-Owner: Ejegg 

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

[MediaWiki-commits] [Gerrit] wikimedia...stomp[master]: Blank deprecated repo

[Ejegg (Code Review)]

Ejegg has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/350346 )

Change subject: Blank deprecated repo
..

Blank deprecated repo

Change-Id: I2d38b440d492c76413e986817da797dbb34bd672
---
D Stomp.php
D Stomp/Exception.php
D Stomp/Frame.php
D Stomp/Message.php
D Stomp/Message/Bytes.php
D Stomp/Message/Map.php
6 files changed, 0 insertions(+), 889 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/stomp 
refs/changes/46/350346/1

diff --git a/Stomp.php b/Stomp.php
deleted file mode 100644
index c6beb1e..000
--- a/Stomp.php
+++ /dev/null
@@ -1,611 +0,0 @@
-http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/* vim: set expandtab tabstop=3 shiftwidth=3: */
-
-define( 'STOMP_MAX_RECONNECT_ATTEMPTS', 3 );
-
-require_once 'Stomp/Frame.php';
-
-/**
- * A Stomp Connection
- *
- *
- * @package Stomp
- * @author Hiram Chirino 
- * @author Dejan Bosanac 
- * @author Michael Caplan 
- * @version $Revision: 43 $
- */
-class Stomp
-{
-/**
- * Perform request synchronously
- *
- * @var boolean
- */
-public $sync = false;
-
-/**
- * Default prefetch size
- *
- * @var int
- */
-   public $prefetchSize = 1;
-
-   /**
- * Client id used for durable subscriptions
- *
- * @var string
- */
-   public $clientId = null;
-
-protected $_brokerUri = null;
-protected $_socket = null;
-protected $_hosts = array();
-protected $_params = array();
-protected $_subscriptions = array();
-protected $_defaultPort = 61613;
-protected $_currentHost = - 1;
-protected $_attempts = 10;
-protected $_username = '';
-protected $_password = '';
-protected $_sessionId;
-protected $_read_timeout_seconds = 60;
-protected $_read_timeout_milliseconds = 0;
-
-/**
- * Constructor
- *
- * @param string $brokerUri Broker URL
- * @throws Stomp_Exception
- */
-public function __construct ( $brokerUri )
-{
-$this->_brokerUri = $brokerUri;
-$this->_init();
-}
-/**
- * Initialize connection
- *
- * @throws Stomp_Exception
- */
-protected function _init ()
-{
-$pattern = 
"|^(([a-zA-Z]+)://)+\(*([a-zA-Z0-9\.:/i,-]+)\)*\??([a-zA-Z0-9=]*)$|i";
-if ( preg_match( $pattern, $this->_brokerUri, $regs ) ) {
-$scheme = $regs[2];
-$hosts = $regs[3];
-$params = $regs[4];
-if ( $scheme != "failover" ) {
-$this->_processUrl( $this->_brokerUri );
-} else {
-$urls = explode( ",", $hosts );
-foreach ( $urls as $url ) {
-$this->_processUrl( $url );
-}
-}
-if ( $params != null ) {
-parse_str( $params, $this->_params );
-}
-} else {
-require_once 'Stomp/Exception.php';
-throw new Stomp_Exception( "Bad Broker URL {$this->_brokerUri}" );
-}
-}
-/**
- * Process broker URL
- *
- * @param string $url Broker URL
- * @throws Stomp_Exception
- * @return boolean
- */
-protected function _processUrl ( $url )
-{
-$parsed = parse_url( $url );
-if ( $parsed ) {
-   $parsed['port'] = isset( $parsed['port'] ) ? $parsed['port'] : 
null;
-array_push( $this->_hosts, array( $parsed['host'] , 
$parsed['port'] , $parsed['scheme'] ) );
-} else {
-require_once 'Stomp/Exception.php';
-throw new Stomp_Exception( "Bad Broker URL $url" );
-}
-}
-/**
- * Make socket connection to the server
- *
- * @throws Stomp_Exception
- */
-protected function _makeConnection ()
-{
-if ( count( $this->_hosts ) == 0 ) {
-require_once 'Stomp/Exception.php';
-throw new Stomp_Exception( "No broker defined" );
-}
-
-// force disconnect, if previous established connection exists
-$this->disconnect();
-
-$i = $this->_currentHost;
-$att = 0;
-$connected = false;
-while ( ! $connected && $att ++ < $this->_attempts ) {
-if ( isset( $this->_params['randomize'] ) && 
$this->_params['randomize'] == 'true' ) {
-$i = rand( 0, count( $this->_hosts ) - 1 );
-} else {
-$i = ( $i + 1 ) % count( $this->_hosts );
-}
-$broker = $this->_hosts[$i];
-$host = 

[MediaWiki-commits] [Gerrit] wikimedia...phpmailer[master]: Blank deprecated repo

[Ejegg (Code Review)]

Ejegg has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/350345 )

Change subject: Blank deprecated repo
..

Blank deprecated repo

Change-Id: I4c1583c5d1f3fe92b461ac25ead4c7e747cda2e8
---
D LICENSE
D README.md
D changelog.md
D class.phpmailer.php
D class.pop3.php
D class.smtp.php
D composer.json
D docs/Callback_function_notes.txt
D docs/DomainKeys_notes.txt
D docs/Note_for_SMTP_debugging.txt
D docs/extending.html
D docs/faq.html
D docs/generatedocs.sh
D docs/pop3_article.txt
D docs/use_gmail.txt
D examples/contents.html
D examples/images/phpmailer.gif
D examples/images/phpmailer_mini.gif
D examples/index.html
D examples/test_db_smtp_basic.php
D examples/test_mail_advanced.php
D examples/test_mail_basic.php
D examples/test_pop_before_smtp_advanced.php
D examples/test_pop_before_smtp_basic.php
D examples/test_sendmail_advanced.php
D examples/test_sendmail_basic.php
D examples/test_smtp_advanced.php
D examples/test_smtp_advanced_no_auth.php
D examples/test_smtp_basic.php
D examples/test_smtp_basic_no_auth.php
D examples/test_smtp_gmail_advanced.php
D examples/test_smtp_gmail_basic.php
D extras/class.html2text.php
D extras/htmlfilter.php
D extras/ntlm_sasl_client.php
D language/phpmailer.lang-ar.php
D language/phpmailer.lang-br.php
D language/phpmailer.lang-ca.php
D language/phpmailer.lang-ch.php
D language/phpmailer.lang-cz.php
D language/phpmailer.lang-de.php
D language/phpmailer.lang-dk.php
D language/phpmailer.lang-eo.php
D language/phpmailer.lang-es.php
D language/phpmailer.lang-et.php
D language/phpmailer.lang-fi.php
D language/phpmailer.lang-fo.php
D language/phpmailer.lang-fr.php
D language/phpmailer.lang-he.php
D language/phpmailer.lang-hu.php
D language/phpmailer.lang-it.php
D language/phpmailer.lang-ja.php
D language/phpmailer.lang-nl.php
D language/phpmailer.lang-no.php
D language/phpmailer.lang-pl.php
D language/phpmailer.lang-ro.php
D language/phpmailer.lang-ru.php
D language/phpmailer.lang-se.php
D language/phpmailer.lang-sk.php
D language/phpmailer.lang-tr.php
D language/phpmailer.lang-zh.php
D language/phpmailer.lang-zh_cn.php
D test/contents.html
D test/fakesendmail.sh
D test/phpmailerLangTest.php
D test/phpmailerTest.php
D test/test.png
D test/test_callback.php
D test/testbootstrap-dist.php
D test/testemail.php
D test_script/LGPLv3.txt
D test_script/contents.html
D test_script/images/aikido.gif
D test_script/images/bkgrnd.gif
D test_script/images/phpmailer.gif
D test_script/index.php
D test_script/scripts/clipboard.swf
D test_script/scripts/shBrushBash.js
D test_script/scripts/shBrushCSharp.js
D test_script/scripts/shBrushCpp.js
D test_script/scripts/shBrushCss.js
D test_script/scripts/shBrushDelphi.js
D test_script/scripts/shBrushDiff.js
D test_script/scripts/shBrushGroovy.js
D test_script/scripts/shBrushJScript.js
D test_script/scripts/shBrushJava.js
D test_script/scripts/shBrushPerl.js
D test_script/scripts/shBrushPhp.js
D test_script/scripts/shBrushPlain.js
D test_script/scripts/shBrushPython.js
D test_script/scripts/shBrushRuby.js
D test_script/scripts/shBrushScala.js
D test_script/scripts/shBrushSql.js
D test_script/scripts/shBrushVb.js
D test_script/scripts/shBrushXml.js
D test_script/scripts/shCore.js
D test_script/scripts/shLegacy.js
D test_script/src/shCore.js
D test_script/src/shLegacy.js
D test_script/styles/help.png
D test_script/styles/magnifier.png
D test_script/styles/page_white_code.png
D test_script/styles/page_white_copy.png
D test_script/styles/printer.png
D test_script/styles/shCore.css
D test_script/styles/shThemeDefault.css
D test_script/styles/shThemeDjango.css
D test_script/styles/shThemeEmacs.css
D test_script/styles/shThemeFadeToGrey.css
D test_script/styles/shThemeMidnight.css
D test_script/styles/shThemeRDark.css
D test_script/styles/wrapping.png
D test_script/test.html
113 files changed, 0 insertions(+), 16,238 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/phpmailer 
refs/changes/45/350345/1


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I4c1583c5d1f3fe92b461ac25ead4c7e747cda2e8
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/phpmailer
Gerrit-Branch: master
Gerrit-Owner: Ejegg 

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

[MediaWiki-commits] [Gerrit] wikimedia...civicrm-drupal[master]: Blank deprecated repo

[Ejegg (Code Review)]

Ejegg has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/350340 )

Change subject: Blank deprecated repo
..

Blank deprecated repo

Change-Id: Id8043867dc67bdd953157ee23589df113a46d542
---
D civicrm.config.php.drupal
D civicrm.info
D civicrm.install
D civicrm.module
D civicrm_user.inc
D civitest.module.sample
D drush/civicrm.drush.inc
D modules/civicrm_contact_ref/civicrm_contact_ref.feeds.inc
D modules/civicrm_contact_ref/civicrm_contact_ref.info
D modules/civicrm_contact_ref/civicrm_contact_ref.install
D modules/civicrm_contact_ref/civicrm_contact_ref.module
D modules/civicrm_engage/CustomGroupData.xml
D modules/civicrm_engage/Engage/Report/Form/CallList.php
D modules/civicrm_engage/Engage/Report/Form/List.php
D modules/civicrm_engage/Engage/Report/Form/WalkList.php
D modules/civicrm_engage/Voter.us.xml
D modules/civicrm_engage/civicrm_engage.admin.inc
D modules/civicrm_engage/civicrm_engage.info
D modules/civicrm_engage/civicrm_engage.install
D modules/civicrm_engage/civicrm_engage.module
D modules/civicrm_engage/migrate/README.txt
D modules/civicrm_engage/migrate/custom_data.sql
D modules/civicrm_engage/migrate/custom_groups_fields.sql
D modules/civicrm_engage/migrate/custom_tables.sql
D modules/civicrm_engage/migrate/profiles.sql
D modules/civicrm_engage/templates/CRM/Contact/Form/Edit/Demographics.tpl
D modules/civicrm_engage/templates/CRM/Contact/Form/Inline/Demographics.tpl
D modules/civicrm_engage/templates/CRM/Contact/Page/Inline/Demographics.tpl
D modules/civicrm_engage/templates/CRM/Contact/Page/View/Demographics.tpl
D modules/civicrm_engage/templates/Engage/Report/Form/CallList.tpl
D modules/civicrm_engage/templates/Engage/Report/Form/WalkList.tpl
D modules/civicrm_group_roles/civicrm_group_roles.info
D modules/civicrm_group_roles/civicrm_group_roles.install
D modules/civicrm_group_roles/civicrm_group_roles.module
D modules/civicrm_group_roles/readme.txt
D modules/civicrm_member_roles/CHANGELOG.txt
D modules/civicrm_member_roles/LICENSE.txt
D modules/civicrm_member_roles/README.txt
D modules/civicrm_member_roles/civicrm_member_roles.drush.inc
D modules/civicrm_member_roles/civicrm_member_roles.info
D modules/civicrm_member_roles/civicrm_member_roles.install
D modules/civicrm_member_roles/civicrm_member_roles.module
D modules/civicrm_og_sync/civicrm_og_sync.info
D modules/civicrm_og_sync/civicrm_og_sync.module
D modules/civicrm_rules/civicrm_rules.contact-eval.inc
D modules/civicrm_rules/civicrm_rules.event-eval.inc
D modules/civicrm_rules/civicrm_rules.info
D modules/civicrm_rules/civicrm_rules.mailing-eval.inc
D modules/civicrm_rules/civicrm_rules.module
D modules/civicrm_rules/civicrm_rules.participant-eval.inc
D modules/civicrm_rules/civicrm_rules.rules.inc
D modules/civicrm_rules/civicrm_rules_action.inc
D modules/civicrm_rules/civicrm_rules_admin_form.inc
D modules/civicrm_rules/civicrm_rules_condition.inc
D modules/civicrm_rules/civicrm_rules_entity.inc
D modules/civicrm_rules/civicrm_rules_event.inc
D modules/civicrm_rules/civicrm_rules_utils.inc
D modules/civicrm_rules/email_rules_export.txt
D modules/civicrmtheme/civicrmtheme.info
D modules/civicrmtheme/civicrmtheme.install
D modules/civicrmtheme/civicrmtheme.module
D modules/views/civicrm.views.inc
D modules/views/civicrm.views_default.inc
D modules/views/civicrm/civicrm_handler_field.inc
D modules/views/civicrm/civicrm_handler_field_activity.inc
D modules/views/civicrm/civicrm_handler_field_address.inc
D modules/views/civicrm/civicrm_handler_field_component.inc
D modules/views/civicrm/civicrm_handler_field_contact_image.inc
D modules/views/civicrm/civicrm_handler_field_contact_link.inc
D modules/views/civicrm/civicrm_handler_field_country.inc
D modules/views/civicrm/civicrm_handler_field_county.inc
D modules/views/civicrm/civicrm_handler_field_custom.inc
D modules/views/civicrm/civicrm_handler_field_custom_file.inc
D modules/views/civicrm/civicrm_handler_field_datetime.inc
D modules/views/civicrm/civicrm_handler_field_drupalid.inc
D modules/views/civicrm/civicrm_handler_field_email.inc
D modules/views/civicrm/civicrm_handler_field_encounter_medium.inc
D modules/views/civicrm/civicrm_handler_field_event.inc
D modules/views/civicrm/civicrm_handler_field_event_link.inc
D modules/views/civicrm/civicrm_handler_field_file.inc
D modules/views/civicrm/civicrm_handler_field_link.inc
D modules/views/civicrm/civicrm_handler_field_link_activity.inc
D modules/views/civicrm/civicrm_handler_field_link_contact.inc
D modules/views/civicrm/civicrm_handler_field_link_contribution.inc
D modules/views/civicrm/civicrm_handler_field_link_delete.inc
D modules/views/civicrm/civicrm_handler_field_link_edit.inc
D modules/views/civicrm/civicrm_handler_field_link_event.inc
D modules/views/civicrm/civicrm_handler_field_link_participant.inc
D modules/views/civicrm/civicrm_handler_field_link_pcp.inc
D modules/views/civicrm/civicrm_handler_field_link_relationship.inc
D 

[MediaWiki-commits] [Gerrit] wikimedia...civicrm-buildkit[master]: Blank deprecated repo

[Ejegg (Code Review)]

Ejegg has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/350338 )

Change subject: Blank deprecated repo
..

Blank deprecated repo

Change-Id: I11c9aa4ba08431622db4fa5409ef52a86b0e24e8
---
D README.md
D UPGRADE.md
D app/civicrm.settings.d/100-mail.php
D app/civicrm.settings.d/200-ext-repo.php.ex
D app/civicrm.settings.d/210-ext-repo.php
D app/civicrm.settings.d/README.txt
D app/civicrm.settings.d/pre.d/050-accept-dsn-cookie.php
D app/civitest.settings.d/pre.d/100-paratest-dsn.php
D app/config/README.md
D app/config/caches.sh
D app/config/dist/download.sh
D app/config/dist/install.sh
D app/config/dist/uninstall.sh
D app/config/doctrine/download.sh
D app/config/doctrine/drush.make.tmpl
D app/config/doctrine/install.sh
D app/config/doctrine/uninstall.sh
D app/config/drupal-clean/download.sh
D app/config/drupal-clean/drush.make.tmpl
D app/config/drupal-clean/install-theme.php
D app/config/drupal-clean/install.sh
D app/config/drupal-clean/uninstall.sh
D app/config/drupal-clean42/download.sh
D app/config/drupal-clean42/drush.make.tmpl
D app/config/drupal-clean42/install-theme.php
D app/config/drupal-clean42/install.sh
D app/config/drupal-clean42/uninstall.sh
D app/config/drupal-demo/civicrm-logo-fat.png
D app/config/drupal-demo/download.sh
D app/config/drupal-demo/drush.make.tmpl
D app/config/drupal-demo/install-dashboard.php
D app/config/drupal-demo/install-login-destination.php
D app/config/drupal-demo/install-theme.php
D app/config/drupal-demo/install-welcome.php
D app/config/drupal-demo/install.sh
D app/config/drupal-demo/uninstall.sh
D app/config/empty/download.sh
D app/config/empty/install.sh
D app/config/empty/uninstall.sh
D app/config/example/download.sh
D app/config/example/install.sh
D app/config/example/uninstall.sh
D app/config/extdir/download.sh
D app/config/extdir/install.sh
D app/config/extdir/uninstall.sh
D app/config/hrdemo/download.sh
D app/config/hrdemo/drush.make.tmpl
D app/config/hrdemo/install-login-destination.php
D app/config/hrdemo/install-welcome.php
D app/config/hrdemo/install.sh
D app/config/hrdemo/uninstall.sh
D app/config/joomla-demo/cli-install.php
D app/config/joomla-demo/download.sh
D app/config/joomla-demo/install.sh
D app/config/joomla-demo/uninstall.sh
D app/config/starterkit/civicrm.settings.php.template
D app/config/starterkit/download.sh
D app/config/starterkit/install.sh
D app/config/starterkit/uninstall.sh
D app/config/symfony/download.sh
D app/config/symfony/drush.make.tmpl
D app/config/symfony/install.sh
D app/config/symfony/uninstall.sh
D app/config/wmff/buildkit-changes.diff
D app/config/wmff/download.sh
D app/config/wmff/drupal.settings.d/50-wmff.php
D app/config/wmff/drupal.settings.d/60-donationinterface.php
D app/config/wmff/install-theme.php
D app/config/wmff/install.sh
D app/config/wmff/uninstall.sh
D app/config/wp-demo/civicrm-wordpress.xml
D app/config/wp-demo/download.sh
D app/config/wp-demo/install.sh
D app/config/wp-demo/uninstall.sh
D app/config/wp-demo/wp-cli.yml
D app/drupal.settings.d/100-error_level.php.ex
D app/drupal.settings.d/README.txt
D app/drupal.settings.d/post.d/050-accept-dsn-cookie.php
D app/wp-config.d/200-fs-method.php
D app/wp-config.d/README.txt
D bin/civi-download-tools
D bin/civibuild
D bin/cividist
D bin/find-symlink-tree-orphans
D bin/givi
D bin/mkpasswd.php
D bin/mktemp.php
D bin/phpunit-each
D bin/phpunit-xml-cleanup
D bin/pidlockfile.php
D bin/regmv
D bin/timeout.php
D composer.json
D composer.lock
D src/civibuild.aliases.sh
D src/civibuild.compute-defaults.sh
D src/civibuild.defaults.sh
D src/civibuild.lib.sh
D src/civibuild.settings.php
D src/civicrm.settings.php
D src/drush/perm.php
D src/views/show-index.php
D vagrant/README.md
D vagrant/precise32-shared/Vagrantfile
D vagrant/precise32-shared/bootstrap.sh
D vagrant/precise32-standalone/Vagrantfile
D vagrant/precise32-standalone/bootstrap.sh
107 files changed, 0 insertions(+), 10,074 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/civicrm-buildkit 
refs/changes/38/350338/1


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I11c9aa4ba08431622db4fa5409ef52a86b0e24e8
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/civicrm-buildkit
Gerrit-Branch: master
Gerrit-Owner: Ejegg 

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

[MediaWiki-commits] [Gerrit] wikimedia...crm[master]: Submodule update

[Eileen (Code Review)]

Eileen has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/350336 )

Change subject: Submodule update
..


Submodule update

49b0a0f Fix test error

Change-Id: I87064875bdd5753595dd78024f60788cb4ba2e93
---
M civicrm
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/civicrm b/civicrm
index abcc6c3..49b0a0f 16
--- a/civicrm
+++ b/civicrm
@@ -1 +1 @@
-Subproject commit abcc6c35855bb22d0e3bdccf4ddc79e88c890c5e
+Subproject commit 49b0a0f5326429fb90f36db94d2379a1cd8e9009

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I87064875bdd5753595dd78024f60788cb4ba2e93
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: master
Gerrit-Owner: Eileen 
Gerrit-Reviewer: Eileen 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] oojs/ui[master]: Tag v0.21.2

[VolkerE (Code Review)]

VolkerE has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/350337 )

Change subject: Tag v0.21.2
..

Tag v0.21.2

Change-Id: Id69eec80375a7abc6ddcba4eb8c450a7c7bbc8b9
---
M History.md
M package.json
2 files changed, 27 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/37/350337/1

diff --git a/History.md b/History.md
index f6e9955..7aab2c8 100644
--- a/History.md
+++ b/History.md
@@ -1,4 +1,30 @@
 # OOjs UI Release History
+## v0.21.2 / 2017-04-25
+### Features
+* Element: New method `#getElementId` (Bartosz Dziewoński)
+* NumberInputWidget: Remake as an actual TextInputWidget child (Moriel 
Schottlender)
+
+### Styles
+* ProgressBarWidget: Switch to `box-sizing: border-box` (Volker E)
+* TabOptionWidget: Cleanup & align paddings/position to dialog environment 
(Volker E)
+* MediaWiki theme: Decrease selector specificity and fix invalid appearance 
(Volker E)
+* MediaWiki theme: Fix IE 7 oversized buttons (Volker E)
+* MediaWiki theme: Improve SearchWidget design (Volker E)
+
+### Code
+* Do not use `role=menu`/`menuitem` for MenuSelectWidget/MenuOptionWidget 
(Bartosz Dziewoński)
+* PopupTagMultiselectWidget: Update popup position on resize (Prateek Saxena)
+* ProcessDialog: Display error messages on top of footer action buttons 
(Bartosz Dziewoński)
+* SelectWidget/MenuSelectWidget: Maintain `aria-activedescendant` attribute on 
focus owner (Bartosz Dziewoński)
+* Set ARIA `role=combobox` on DropdownWidget and LookupElement too (Bartosz 
Dziewoński)
+* Set `aria-owns` for everything with a dropdown list (ARIA `role=combobox`) 
(Bartosz Dziewoński)
+* Follow-up d22d23311: Don't reference OO.ui.ToolGroup blindly (James D. 
Forrester)
+* build: Bump grunt-stylelint, bring in stylelint explicitly (James D. 
Forrester)
+* demos: Add some more examples with 'accessKey' (Bartosz Dziewoński)
+* docs: Document Window#$overlay property (Bartosz Dziewoński)
+* tests: Drop unnecessary hints to qunit about the number of tests (James D. 
Forrester)
+
+
 ## v0.21.1 / 2017-04-18
 ### Styles
 * PopupWidget: Do not leave space for anchor if there's no anchor (Bartosz 
Dziewoński)
diff --git a/package.json b/package.json
index 38850ec..d0a7478 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "oojs-ui",
-  "version": "0.21.1",
+  "version": "0.21.2",
   "description": "User interface classes built on the OOjs framework.",
   "keywords": [
 "oojs-plugin",

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id69eec80375a7abc6ddcba4eb8c450a7c7bbc8b9
Gerrit-PatchSet: 1
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: VolkerE 

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

[MediaWiki-commits] [Gerrit] wikimedia...crm[master]: Submodule update

[Eileen (Code Review)]

Eileen has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/350336 )

Change subject: Submodule update
..

Submodule update

49b0a0f Fix test error

Change-Id: I87064875bdd5753595dd78024f60788cb4ba2e93
---
M civicrm
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/36/350336/1

diff --git a/civicrm b/civicrm
index abcc6c3..49b0a0f 16
--- a/civicrm
+++ b/civicrm
@@ -1 +1 @@
-Subproject commit abcc6c35855bb22d0e3bdccf4ddc79e88c890c5e
+Subproject commit 49b0a0f5326429fb90f36db94d2379a1cd8e9009

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I87064875bdd5753595dd78024f60788cb4ba2e93
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: master
Gerrit-Owner: Eileen 

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

[MediaWiki-commits] [Gerrit] mediawiki...ORES[master]: Follow-up c047cd54d69ed: rename oresDamagingPref values back

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/350316 )

Change subject: Follow-up c047cd54d69ed: rename oresDamagingPref values back
..


Follow-up c047cd54d69ed: rename oresDamagingPref values back

Dealing with renamed preference values is going to be annoying,
especially in the config setting the default values. For now,
it's easier to unbreak things by renaming the preference values
back to hard/soft/softest and remapping them internally.

Bug: T160575
Change-Id: I228a636abea77548af16a830a8882b3327edc175
---
M extension.json
M includes/Hooks.php
2 files changed, 11 insertions(+), 10 deletions(-)

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



diff --git a/extension.json b/extension.json
index b83636f..757ad26 100644
--- a/extension.json
+++ b/extension.json
@@ -161,7 +161,7 @@
},
"DefaultUserOptions": {
"ores-damaging-flag-rc": false,
-   "oresDamagingPref": "likelybad",
+   "oresDamagingPref": "soft",
"oresHighlight": false,
"oresRCHideNonDamaging": false,
"oresWatchlistHideNonDamaging": false
diff --git a/includes/Hooks.php b/includes/Hooks.php
index 859f7f6..bd6384e 100644
--- a/includes/Hooks.php
+++ b/includes/Hooks.php
@@ -30,6 +30,12 @@
 use Xml;
 
 class Hooks {
+   // The oresDamagingPref preference uses these names for historical 
reasons
+   protected static $damagingPrefMap = [
+   'hard' => 'maybebad',
+   'soft' => 'likelybad',
+   'softest' => 'verylikelybad',
+   ];
 
/**
 * @param DatabaseUpdater $updater
@@ -637,13 +643,8 @@
public static function getThreshold( $type, User $user ) {
if ( $type === 'damaging' ) {
$pref = $user->getOption( 'oresDamagingPref' );
-   $compatMap = [
-   'hard' => 'maybebad',
-   'soft' => 'likelybad',
-   'softest' => 'verylikelybad',
-   ];
-   if ( isset( $compatMap[ $pref ] ) ) {
-   $pref = $compatMap[ $pref ];
+   if ( isset( self::$damagingPrefMap[ $pref ] ) ) {
+   $pref = self::$damagingPrefMap[ $pref ];
}
$thresholds = self::getDamagingThresholds();
if ( isset( $thresholds[ $pref ] ) ) {
@@ -670,10 +671,10 @@
 
$options = [];
$damagingThresholds = self::getDamagingThresholds();
-   foreach ( [ 'maybebad', 'likelybad', 'verylikelybad' ] as 
$level ) {
+   foreach ( self::$damagingPrefMap as $prefName => $level ) {
if ( isset( $damagingThresholds[ $level ] ) ) {
$text = \wfMessage( 'ores-damaging-' . $level 
)->text();
-   $options[ $text ] = $level;
+   $options[ $text ] = $prefName;
}
}
$oresSection = $wgOresExtensionStatus === 'beta' ? 'rc/ores' : 
'watchlist/ores';

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I228a636abea77548af16a830a8882b3327edc175
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/ORES
Gerrit-Branch: master
Gerrit-Owner: Catrope 
Gerrit-Reviewer: Catrope 
Gerrit-Reviewer: Mattflaschen 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] oojs/ui[master]: ProgressBarWidget: Switch to `border-box`

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/350309 )

Change subject: ProgressBarWidget: Switch to `border-box`
..


ProgressBarWidget: Switch to `border-box`

Bug: T163835
Change-Id: I5a293e90aab936bd799c503283b864e105d02535
---
M src/styles/widgets/ProgressBarWidget.less
1 file changed, 2 insertions(+), 0 deletions(-)

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



diff --git a/src/styles/widgets/ProgressBarWidget.less 
b/src/styles/widgets/ProgressBarWidget.less
index 82993fc..6231368 100644
--- a/src/styles/widgets/ProgressBarWidget.less
+++ b/src/styles/widgets/ProgressBarWidget.less
@@ -1,5 +1,7 @@
 @import '../common';
 
 .oo-ui-progressBarWidget {
+   .oo-ui-box-sizing( border-box );
+
.theme-oo-ui-progressBarWidget();
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I5a293e90aab936bd799c503283b864e105d02535
Gerrit-PatchSet: 2
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: VolkerE 
Gerrit-Reviewer: Bartosz Dziewoński 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: Krinkle 
Gerrit-Reviewer: VolkerE 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...ORES[master]: Follow-up 2b68933208: use variables

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/350008 )

Change subject: Follow-up 2b68933208: use variables
..


Follow-up 2b68933208: use variables

Make the code a bit less repetitive.

Change-Id: I5e551116ffec1a8e1f6410b0a584376d189b19fb
---
M includes/Hooks.php
1 file changed, 7 insertions(+), 5 deletions(-)

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



diff --git a/includes/Hooks.php b/includes/Hooks.php
index 859f7f6..0393990 100644
--- a/includes/Hooks.php
+++ b/includes/Hooks.php
@@ -831,16 +831,18 @@
 */
private static function isDamagingFlagEnabled( IContextSource $context 
) {
global $wgOresExtensionStatus;
+   $isRCPage = self::isRCPage( $context );
+   $user = $context->getUser();
return $wgOresExtensionStatus === 'beta' ||
(
-   self::isRCPage( $context ) &&
-   $context->getUser()->getBoolOption( 
'ores-damaging-flag-rc' ) &&
+   $isRCPage &&
+   $user->getBoolOption( 'ores-damaging-flag-rc' ) 
&&
// If rcenhancedfilters is enabled, the 
ores-damaging-flag-rc preference is hidden,
// but it doesn't behave as if it's false; see 
HACK comment in onGetPreferences
-   !$context->getUser()->getBoolOption( 
'rcenhancedfilters' )
+   !$user->getBoolOption( 'rcenhancedfilters' )
) || (
-   !self::isRCPage( $context ) &&
-   $context->getUser()->getBoolOption( 
'oresHighlight' )
+   !$isRCPage &&
+   $user->getBoolOption( 'oresHighlight' )
);
}
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I5e551116ffec1a8e1f6410b0a584376d189b19fb
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/ORES
Gerrit-Branch: master
Gerrit-Owner: Catrope 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] wikimedia...civicrm[master]: Fix test error.

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/350118 )

Change subject: Fix test error.
..


Fix test error.

This incorrect prefix was causing api fails in weird cases in the test suite. 
They
were not causing test failures until I made some other changes but were uncool.

Note that I have a cunning plan to remove this hack altogether

Change-Id: I08bee8712cefe8e928950b72457fe1917fc7e7a7
---
M packages/DB/common.php
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/packages/DB/common.php b/packages/DB/common.php
index abbee0f..fe9a4f3 100644
--- a/packages/DB/common.php
+++ b/packages/DB/common.php
@@ -1162,7 +1162,7 @@
 else {
 global $user;
 if (empty($user)) {
-$prefix = 'phpunit-test';
+$prefix = '';
 }
 else {
 $prefix = "/* https://civicrm.wikimedia.org/user/{$user->uid} 
*/ ";

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I08bee8712cefe8e928950b72457fe1917fc7e7a7
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm/civicrm
Gerrit-Branch: master
Gerrit-Owner: Eileen 
Gerrit-Reviewer: Ejegg 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...BounceHandler[master]: Explicitly specify 'section' => 'alert' for unsubscribe noti...

[Jforrester (Code Review)]

Jforrester has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/293770 )

Change subject: Explicitly specify 'section' => 'alert' for unsubscribe 
notification
..


Explicitly specify 'section' => 'alert' for unsubscribe notification

Change-Id: I134e730eecce040665915abc6e3b681719517a1d
---
M BounceHandlerHooks.php
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Legoktm: Looks good to me, approved
  Jforrester: Verified; Looks good to me, approved



diff --git a/BounceHandlerHooks.php b/BounceHandlerHooks.php
index 89a6cf8..3976953 100644
--- a/BounceHandlerHooks.php
+++ b/BounceHandlerHooks.php
@@ -120,7 +120,7 @@
),
'formatter-class' => 'EchoBounceHandlerFormatter',
'category' => 'system',
-
+   'section' => 'alert',
//We cannot have additional Echo emails being sent 
after a user is un-subscribed
'notify-type-availability' => array( 'email' => false ),
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I134e730eecce040665915abc6e3b681719517a1d
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/BounceHandler
Gerrit-Branch: master
Gerrit-Owner: Catrope 
Gerrit-Reviewer: 01tonythomas <01tonytho...@gmail.com>
Gerrit-Reviewer: Catrope 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: Sbisson 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...ORES[master]: Revert "Localisation updates from https://translatewiki.net."

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/350335 )

Change subject: Revert "Localisation updates from https://translatewiki.net.;
..


Revert "Localisation updates from https://translatewiki.net.;

Broke CI by removing messages from qqq.json.

This reverts commit ebdd6aafff5d0bdcbc43c371e7950212c18eec64.

Change-Id: Ieaf415e082cbb09453a56ceb6b12d9f1a15fa571
---
M i18n/es.json
M i18n/fr.json
M i18n/ja.json
M i18n/qqq.json
4 files changed, 12 insertions(+), 15 deletions(-)

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



diff --git a/i18n/es.json b/i18n/es.json
index 94516bb..4b4f8d1 100644
--- a/i18n/es.json
+++ b/i18n/es.json
@@ -3,8 +3,7 @@
"authors": [
"Macofe",
"Yllelder",
-   "Julián L",
-   "Luzcaru"
+   "Julián L"
]
},
"ores-beta-feature-description": "ORES es una herramienta basada en 
inteligencia artificial que resalta ediciones probablemente dañinas en cambios 
recientes y lista de seguimiento.",
@@ -18,7 +17,6 @@
"ores-help-damaging-pref": "Este umbral determina la sensibilidad de 
ORES cuando se marcan las ediciones que requieren revisión",
"ores-hide-nondamaging-filter": "Ocultar las ediciones probablemente 
buenas",
"ores-pref-damaging": "Sensibilidad de ORES",
-   "ores-pref-damaging-flag": "Resalte probables ediciones con problemas 
con colores y una \"{{int:ores-letra-dañino}}\" si \"necesita revisión\" (para 
fijar el nivel al que se marcan las ediciones, use la 
\n\"{{int:ores-pref-dañino}}\" en la configuración de  preferencias de la Lista 
de Seguimiento)",
"ores-rcfilters-whats-this-link-text": "Más información",
"ores-rcfilters-damaging-whats-this-header": "Acerca de las 
predicciones de calidad de las contribuciones",
"ores-rcfilters-goodfaith-whats-this-header": "Acerca de las 
predicciones de intención de los usuarios",
diff --git a/i18n/fr.json b/i18n/fr.json
index 55193d7..513f1bb 100644
--- a/i18n/fr.json
+++ b/i18n/fr.json
@@ -28,14 +28,14 @@
"ores-rcfilters-damaging-whats-this-header": "À propos des prédictions 
de qualité de la contribution",
"ores-rcfilters-damaging-whats-this-body": "Ces prévisions sont faites 
par un service d’apprentissage par machine entraîné sur un large ensemble de 
modifications réalisées par des éditeurs humains. Des filtres plus restrictifs 
ou plus précis trouveraient moins de faux positifs, mais passeraient à côté de 
leurs cibles. Des filtres moins précis trouveront plus de cibles, mais 
également plus de faux positifs.",
"ores-rcfilters-damaging-conflicts-logactions": "Les prédictions de 
qualité de la contribution ne sont pas disponibles pour certains types de 
modification, donc ce filtre est en conflit avec {{PLURAL:$2|le filtre de Type 
de modification suivant|les filtres de Type de modification suivants}} : $1",
-   "ores-rcfilters-damaging-likelygood-label": "Très vraisemblablement 
bonnes",
-   "ores-rcfilters-damaging-likelygood-desc": "Filtre précis pour trouver 
presque toutes les modifications sans problèmes.",
+   "ores-rcfilters-damaging-likelygood-label": "Très vraisemblablement 
bonne",
+   "ores-rcfilters-damaging-likelygood-desc": "Très exacte pour trouver 
presque toutes les modifications sans problème.",
"ores-rcfilters-damaging-maybebad-label": "Peut avoir des problèmes",
"ores-rcfilters-damaging-maybebad-desc": "Trouve les modifications les 
plus imparfaites ou dommageables, mais avec une faible exactitude.",
"ores-rcfilters-damaging-likelybad-label": "Susceptible d’avoir des 
problèmes",
"ores-rcfilters-damaging-likelybad-desc": "Avec une précision moyenne, 
trouve plus de modifications à problème que le filtre « Très probable », mais 
moins que « Pourrait ».",
"ores-rcfilters-damaging-verylikelybad-label": "Fortement susceptible 
d’avoir des problèmes",
-   "ores-rcfilters-damaging-verylikelybad-desc": "Très précis pour trouver 
les modifications imparfaites ou dommageables les plus flagrantes.",
+   "ores-rcfilters-damaging-verylikelybad-desc": "Très précis pour trouver 
les plus flagrantes des modifications imparfaites ou dommageables.",
"ores-rcfilters-goodfaith-title": "Prédictions des intentions de 
l’utilisateur",
"ores-rcfilters-goodfaith-whats-this-header": "À propos des prédictions 
d’intention de l’utilisateur",
"ores-rcfilters-goodfaith-whats-this-body": "Ces prédictions sur la 
bonne foi des utilisateurs sont faites par un service d’apprentissage 
automatique entraîné sur un grand ensemble de modifications préalablement 
notées par des éditeurs humains. Des filtres plus stricts et plus précis 
trouvent peu de faux positifs, mais peuvent manquer 

[MediaWiki-commits] [Gerrit] mediawiki...Flow[wmf/1.29.0-wmf.21]: Follow-up c1beac48: fix JS error when clicking reply link

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/350334 )

Change subject: Follow-up c1beac48: fix JS error when clicking reply link
..


Follow-up c1beac48: fix JS error when clicking reply link

The constructor called this.initializeEditor() before
this.$editorContainer was set, which caused a JS error
in non-expandable mode.

Fix this by moving the code that deals with this stuff
all the way to the bottom of the constructor, so that everything
is definitely in good shape when initializeEditor() is called.

Bug: T163749
Change-Id: I4cb4e60aa859214a718b13e825d4a0a998e118f2
(cherry picked from commit cbc44c24bf362f5d8042aac1a86f9f79e5a2188c)
---
M modules/flow/ui/widgets/mw.flow.ui.ReplyWidget.js
1 file changed, 14 insertions(+), 15 deletions(-)

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



diff --git a/modules/flow/ui/widgets/mw.flow.ui.ReplyWidget.js 
b/modules/flow/ui/widgets/mw.flow.ui.ReplyWidget.js
index ffebbd8..75ed555 100644
--- a/modules/flow/ui/widgets/mw.flow.ui.ReplyWidget.js
+++ b/modules/flow/ui/widgets/mw.flow.ui.ReplyWidget.js
@@ -26,21 +26,6 @@
// Parent constructor
mw.flow.ui.ReplyWidget.parent.call( this, config );
 
-   if ( this.expandable ) {
-   this.triggerInput = new OO.ui.TextInputWidget( {
-   multiline: false,
-   classes: [ 'flow-ui-replyWidget-trigger-input' 
],
-   placeholder: config.placeholder
-   } );
-   this.triggerInput.$element.on( 'focusin', 
this.onTriggerFocusIn.bind( this ) );
-   this.$element.append( this.triggerInput.$element );
-   } else {
-   // Only initialize the editor if we are not in 
'expandable' mode
-   // Otherwise, the editor is lazy-loaded
-   this.initializeEditor();
-   this.editor.toggle( true );
-   }
-
this.api = new mw.flow.dm.APIHandler();
 
this.anonWarning = new mw.flow.ui.AnonWarningWidget( {
@@ -78,6 +63,20 @@
this.$editorContainer
);
 
+   if ( this.expandable ) {
+   this.triggerInput = new OO.ui.TextInputWidget( {
+   multiline: false,
+   classes: [ 'flow-ui-replyWidget-trigger-input' 
],
+   placeholder: config.placeholder
+   } );
+   this.triggerInput.$element.on( 'focusin', 
this.onTriggerFocusIn.bind( this ) );
+   this.$element.append( this.triggerInput.$element );
+   } else {
+   // Only initialize the editor if we are not in 
'expandable' mode
+   // Otherwise, the editor is lazy-loaded
+   this.initializeEditor();
+   this.editor.toggle( true );
+   }
};
 
/* Initialization */

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I4cb4e60aa859214a718b13e825d4a0a998e118f2
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: wmf/1.29.0-wmf.21
Gerrit-Owner: Catrope 
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] mediawiki...ORES[master]: Revert "Localisation updates from https://translatewiki.net."

[Catrope (Code Review)]

Hello L10n-bot,

I'd like you to do a code review.  Please visit

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

to review the following change.


Change subject: Revert "Localisation updates from https://translatewiki.net.;
..

Revert "Localisation updates from https://translatewiki.net.;

Broke CI by removing messages from qqq.json.

This reverts commit ebdd6aafff5d0bdcbc43c371e7950212c18eec64.

Change-Id: Ieaf415e082cbb09453a56ceb6b12d9f1a15fa571
---
M i18n/es.json
M i18n/fr.json
M i18n/ja.json
M i18n/qqq.json
4 files changed, 12 insertions(+), 15 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ORES 
refs/changes/35/350335/1

diff --git a/i18n/es.json b/i18n/es.json
index 94516bb..4b4f8d1 100644
--- a/i18n/es.json
+++ b/i18n/es.json
@@ -3,8 +3,7 @@
"authors": [
"Macofe",
"Yllelder",
-   "Julián L",
-   "Luzcaru"
+   "Julián L"
]
},
"ores-beta-feature-description": "ORES es una herramienta basada en 
inteligencia artificial que resalta ediciones probablemente dañinas en cambios 
recientes y lista de seguimiento.",
@@ -18,7 +17,6 @@
"ores-help-damaging-pref": "Este umbral determina la sensibilidad de 
ORES cuando se marcan las ediciones que requieren revisión",
"ores-hide-nondamaging-filter": "Ocultar las ediciones probablemente 
buenas",
"ores-pref-damaging": "Sensibilidad de ORES",
-   "ores-pref-damaging-flag": "Resalte probables ediciones con problemas 
con colores y una \"{{int:ores-letra-dañino}}\" si \"necesita revisión\" (para 
fijar el nivel al que se marcan las ediciones, use la 
\n\"{{int:ores-pref-dañino}}\" en la configuración de  preferencias de la Lista 
de Seguimiento)",
"ores-rcfilters-whats-this-link-text": "Más información",
"ores-rcfilters-damaging-whats-this-header": "Acerca de las 
predicciones de calidad de las contribuciones",
"ores-rcfilters-goodfaith-whats-this-header": "Acerca de las 
predicciones de intención de los usuarios",
diff --git a/i18n/fr.json b/i18n/fr.json
index 55193d7..513f1bb 100644
--- a/i18n/fr.json
+++ b/i18n/fr.json
@@ -28,14 +28,14 @@
"ores-rcfilters-damaging-whats-this-header": "À propos des prédictions 
de qualité de la contribution",
"ores-rcfilters-damaging-whats-this-body": "Ces prévisions sont faites 
par un service d’apprentissage par machine entraîné sur un large ensemble de 
modifications réalisées par des éditeurs humains. Des filtres plus restrictifs 
ou plus précis trouveraient moins de faux positifs, mais passeraient à côté de 
leurs cibles. Des filtres moins précis trouveront plus de cibles, mais 
également plus de faux positifs.",
"ores-rcfilters-damaging-conflicts-logactions": "Les prédictions de 
qualité de la contribution ne sont pas disponibles pour certains types de 
modification, donc ce filtre est en conflit avec {{PLURAL:$2|le filtre de Type 
de modification suivant|les filtres de Type de modification suivants}} : $1",
-   "ores-rcfilters-damaging-likelygood-label": "Très vraisemblablement 
bonnes",
-   "ores-rcfilters-damaging-likelygood-desc": "Filtre précis pour trouver 
presque toutes les modifications sans problèmes.",
+   "ores-rcfilters-damaging-likelygood-label": "Très vraisemblablement 
bonne",
+   "ores-rcfilters-damaging-likelygood-desc": "Très exacte pour trouver 
presque toutes les modifications sans problème.",
"ores-rcfilters-damaging-maybebad-label": "Peut avoir des problèmes",
"ores-rcfilters-damaging-maybebad-desc": "Trouve les modifications les 
plus imparfaites ou dommageables, mais avec une faible exactitude.",
"ores-rcfilters-damaging-likelybad-label": "Susceptible d’avoir des 
problèmes",
"ores-rcfilters-damaging-likelybad-desc": "Avec une précision moyenne, 
trouve plus de modifications à problème que le filtre « Très probable », mais 
moins que « Pourrait ».",
"ores-rcfilters-damaging-verylikelybad-label": "Fortement susceptible 
d’avoir des problèmes",
-   "ores-rcfilters-damaging-verylikelybad-desc": "Très précis pour trouver 
les modifications imparfaites ou dommageables les plus flagrantes.",
+   "ores-rcfilters-damaging-verylikelybad-desc": "Très précis pour trouver 
les plus flagrantes des modifications imparfaites ou dommageables.",
"ores-rcfilters-goodfaith-title": "Prédictions des intentions de 
l’utilisateur",
"ores-rcfilters-goodfaith-whats-this-header": "À propos des prédictions 
d’intention de l’utilisateur",
"ores-rcfilters-goodfaith-whats-this-body": "Ces prédictions sur la 
bonne foi des utilisateurs sont faites par un service d’apprentissage 
automatique entraîné sur un grand ensemble de modifications préalablement 
notées par des éditeurs humains. Des filtres plus stricts et plus 

[MediaWiki-commits] [Gerrit] mediawiki...Flow[wmf/1.29.0-wmf.21]: Follow-up c1beac48: fix JS error when clicking reply link

[Catrope (Code Review)]

Catrope has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/350334 )

Change subject: Follow-up c1beac48: fix JS error when clicking reply link
..

Follow-up c1beac48: fix JS error when clicking reply link

The constructor called this.initializeEditor() before
this.$editorContainer was set, which caused a JS error
in non-expandable mode.

Fix this by moving the code that deals with this stuff
all the way to the bottom of the constructor, so that everything
is definitely in good shape when initializeEditor() is called.

Bug: T163749
Change-Id: I4cb4e60aa859214a718b13e825d4a0a998e118f2
(cherry picked from commit cbc44c24bf362f5d8042aac1a86f9f79e5a2188c)
---
M modules/flow/ui/widgets/mw.flow.ui.ReplyWidget.js
1 file changed, 14 insertions(+), 15 deletions(-)


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

diff --git a/modules/flow/ui/widgets/mw.flow.ui.ReplyWidget.js 
b/modules/flow/ui/widgets/mw.flow.ui.ReplyWidget.js
index ffebbd8..75ed555 100644
--- a/modules/flow/ui/widgets/mw.flow.ui.ReplyWidget.js
+++ b/modules/flow/ui/widgets/mw.flow.ui.ReplyWidget.js
@@ -26,21 +26,6 @@
// Parent constructor
mw.flow.ui.ReplyWidget.parent.call( this, config );
 
-   if ( this.expandable ) {
-   this.triggerInput = new OO.ui.TextInputWidget( {
-   multiline: false,
-   classes: [ 'flow-ui-replyWidget-trigger-input' 
],
-   placeholder: config.placeholder
-   } );
-   this.triggerInput.$element.on( 'focusin', 
this.onTriggerFocusIn.bind( this ) );
-   this.$element.append( this.triggerInput.$element );
-   } else {
-   // Only initialize the editor if we are not in 
'expandable' mode
-   // Otherwise, the editor is lazy-loaded
-   this.initializeEditor();
-   this.editor.toggle( true );
-   }
-
this.api = new mw.flow.dm.APIHandler();
 
this.anonWarning = new mw.flow.ui.AnonWarningWidget( {
@@ -78,6 +63,20 @@
this.$editorContainer
);
 
+   if ( this.expandable ) {
+   this.triggerInput = new OO.ui.TextInputWidget( {
+   multiline: false,
+   classes: [ 'flow-ui-replyWidget-trigger-input' 
],
+   placeholder: config.placeholder
+   } );
+   this.triggerInput.$element.on( 'focusin', 
this.onTriggerFocusIn.bind( this ) );
+   this.$element.append( this.triggerInput.$element );
+   } else {
+   // Only initialize the editor if we are not in 
'expandable' mode
+   // Otherwise, the editor is lazy-loaded
+   this.initializeEditor();
+   this.editor.toggle( true );
+   }
};
 
/* Initialization */

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I4cb4e60aa859214a718b13e825d4a0a998e118f2
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: wmf/1.29.0-wmf.21
Gerrit-Owner: Catrope 

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

[MediaWiki-commits] [Gerrit] mediawiki...Flow[master]: Follow-up c1beac48: fix JS error when clicking reply link

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/350331 )

Change subject: Follow-up c1beac48: fix JS error when clicking reply link
..


Follow-up c1beac48: fix JS error when clicking reply link

The constructor called this.initializeEditor() before
this.$editorContainer was set, which caused a JS error
in non-expandable mode.

Fix this by moving the code that deals with this stuff
all the way to the bottom of the constructor, so that everything
is definitely in good shape when initializeEditor() is called.

Bug: T163749
Change-Id: I4cb4e60aa859214a718b13e825d4a0a998e118f2
---
M modules/flow/ui/widgets/mw.flow.ui.ReplyWidget.js
1 file changed, 14 insertions(+), 15 deletions(-)

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



diff --git a/modules/flow/ui/widgets/mw.flow.ui.ReplyWidget.js 
b/modules/flow/ui/widgets/mw.flow.ui.ReplyWidget.js
index ffebbd8..75ed555 100644
--- a/modules/flow/ui/widgets/mw.flow.ui.ReplyWidget.js
+++ b/modules/flow/ui/widgets/mw.flow.ui.ReplyWidget.js
@@ -26,21 +26,6 @@
// Parent constructor
mw.flow.ui.ReplyWidget.parent.call( this, config );
 
-   if ( this.expandable ) {
-   this.triggerInput = new OO.ui.TextInputWidget( {
-   multiline: false,
-   classes: [ 'flow-ui-replyWidget-trigger-input' 
],
-   placeholder: config.placeholder
-   } );
-   this.triggerInput.$element.on( 'focusin', 
this.onTriggerFocusIn.bind( this ) );
-   this.$element.append( this.triggerInput.$element );
-   } else {
-   // Only initialize the editor if we are not in 
'expandable' mode
-   // Otherwise, the editor is lazy-loaded
-   this.initializeEditor();
-   this.editor.toggle( true );
-   }
-
this.api = new mw.flow.dm.APIHandler();
 
this.anonWarning = new mw.flow.ui.AnonWarningWidget( {
@@ -78,6 +63,20 @@
this.$editorContainer
);
 
+   if ( this.expandable ) {
+   this.triggerInput = new OO.ui.TextInputWidget( {
+   multiline: false,
+   classes: [ 'flow-ui-replyWidget-trigger-input' 
],
+   placeholder: config.placeholder
+   } );
+   this.triggerInput.$element.on( 'focusin', 
this.onTriggerFocusIn.bind( this ) );
+   this.$element.append( this.triggerInput.$element );
+   } else {
+   // Only initialize the editor if we are not in 
'expandable' mode
+   // Otherwise, the editor is lazy-loaded
+   this.initializeEditor();
+   this.editor.toggle( true );
+   }
};
 
/* Initialization */

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I4cb4e60aa859214a718b13e825d4a0a998e118f2
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: Catrope 
Gerrit-Reviewer: Mooeypoo 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] search/MjoLniR[master]: [WIP] First stab at cross validation

[EBernhardson (Code Review)]

EBernhardson has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/350333 )

Change subject: [WIP] First stab at cross validation
..

[WIP] First stab at cross validation

Some code for splitting an input dataframe into pieces for
cross validation. Not complete, but might work.

TODO:
* Lots of stuff
* Can this share code with mjolnir.sampling? The high level concept
  is the same and stratified sampling might be desirable here as well.
  It might also be not necessary here as well.

Change-Id: I7da9f3ec4a1354d6c7fb02eb98d2770740a8e4df
---
A mjolnir/training/cross_validation.py
1 file changed, 100 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/search/MjoLniR 
refs/changes/33/350333/1

diff --git a/mjolnir/training/cross_validation.py 
b/mjolnir/training/cross_validation.py
new file mode 100644
index 000..9bdb562
--- /dev/null
+++ b/mjolnir/training/cross_validation.py
@@ -0,0 +1,100 @@
+"""
+Support for making test/train or k-fold splits
+"""
+
+from collections import defaultdict
+import mjolnir.spark
+from pyspark.sql import functions as F
+
+
+def split(df, splits, output_column='fold', num_partitions=100):
+"""Assign splits to a dataframe of search results
+
+Individual hits from the same normalized query are not independent,
+they should have large overlaps in result sets and relevance labels,
+so the splitting happens at the normalized query level.
+
+Although the splitting is happening at the normalized query level, the
+split percentage is still with respect to the number of rows assigned to
+each split, not the number of normalized queries. This additionally ensures
+that the split is equal per wiki, meaning an 80/20 split will result in
+an 80/20 split for each wiki.
+
+Parameters
+--
+df : pyspark.sql.DataFrame
+Input data frame containing (wikiid, norm_query) columns. If this is
+expensive to compute it should be cached, as it will be used twice.
+splits: list
+List of percentages, summing to 1, to split the input dataframe
+into.
+output_column : str, optional
+Name of the new column indicating the split
+num_partitions : int, optional
+Sets the number of partitions to split with. Each partition needs
+to be some minimum size for averages to work out to an evenly split
+final set. (Default: 100)
+
+Returns
+---
+pyspark.sql.DataFrame
+Input dataframe with split indices assigned to a new column
+"""
+# General sanity check on provided splits. We could attempt
+# to normalize instead of fail, but this is good enough.
+assert abs(1 - sum(splits)) < 0.01
+
+mjolnir.spark.assert_columns(df, ['norm_query'])
+
+def split_partition(rows):
+# Current number of items per split
+split_counts = defaultdict(lambda: [0] * len(splits))
+# starting at 1 prevents div by zero. Using a float allows later
+# division to work as expected.
+processed = defaultdict(lambda: 1.)
+for row in rows:
+# Assign row to first available split that has less than
+# the desired weight
+for i, percent in enumerate(splits):
+if split_counts[row.wikiid][i] / processed[row.wikiid] < 
percent:
+split_counts[row.wikiid][i] += row.weight
+yield (row.wikiid, row.norm_query, i)
+break
+# If no split found assign to first split
+else:
+split_counts[row.wikiid][0] += row.weight
+yield (row.wikiid, row.norm_query, 0)
+processed[row.wikiid] += row.weight
+
+df_splits = (
+df
+.groupBy('wikiid', 'norm_query')
+.agg(F.count(F.lit(1)).alias('weight'))
+# Could we guess the correct number of partitions instead? I'm not
+# sure though how it should be decided, and would require taking
+# an extra pass over the data.
+.coalesce(num_partitions)
+.mapPartitions(split_partition)
+.toDF(['wikiid', 'norm_query', output_column]))
+
+return df.join(df_splits, how='inner', on=['wikiid', 'norm_query'])
+
+
+def group_k_fold(df, num_folds, num_partitions=100, output_column='fold'):
+"""
+Generates group k-fold splits. The fold a row belongs to is
+assigned to the column identified by the output_column parameter.
+
+Parameters
+--
+df : pyspark.sql.DataFrame
+num_folds : int
+test_folds : int, optional
+vali_folds : int, optional
+num_partitions : int, optional
+
+Yields
+--
+dict
+"""
+return split(df, [1. / num_folds] * num_folds, output_column, 
num_partitions).cache()

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

[MediaWiki-commits] [Gerrit] search/MjoLniR[master]: [WIP] train/evaluate models with xgboost4j-spark

[EBernhardson (Code Review)]

EBernhardson has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/350332 )

Change subject: [WIP] train/evaluate models with xgboost4j-spark
..

[WIP] train/evaluate models with xgboost4j-spark

This is far from perfect, it rather avoids the integration of
xgboost4j-spark with spark.ml, as that doesn't (currently) support
ranking tasks. A PR is being worked on for spark 2.3 but it still
needs some work.

This accomplishes the following:
* Convert a dataframe resulting from feature collection into format
  expected by xgboost
* Train a model with arbitrary parameters and return the model
* Evaluate the model against a dataframe using NDCG@k

TODO:
* Dump the resulting model, parse into a tree and offer it for export
* Setup cross-validation
* Setup test/train splits

Not doable (yet):
* xgboost4j-spark doesn't support weights on rows. This is supported
  in xgboost4j, so it might be possible to work up an upstream patch
  if someone feels like diving into scala.

Change-Id: Ia749b85e1626c3aaa3b1c006d06d2d0720443d8f
---
M bootstrap-vm.sh
A mjolnir/training/xgboost.py
2 files changed, 207 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/search/MjoLniR 
refs/changes/32/350332/1

diff --git a/bootstrap-vm.sh b/bootstrap-vm.sh
index dd8f202..6453983 100644
--- a/bootstrap-vm.sh
+++ b/bootstrap-vm.sh
@@ -21,7 +21,12 @@
 apt-get install -q -y -o Dpkg::Options::="--force-confdef" -o 
Dpkg::Options::="--force-confold" \
 spark-python \
 openjdk-7-jre-headless \
-python-virtualenv
+python-virtualenv \
+git-core \
+build-essential \
+libopenblas-dev \
+gfortran
+
 
 # findspark needs a SPARK_HOME to setup pyspark
 cat >/etc/profile.d/spark.sh  0:
+yield index, count
+count = 1
+yield index, count
+
+
+def cols_to_vector(df, num_partitions):
+"""Preprocessing for dataframes passed into xgboost
+
+Prepares a dataframe for use in xgboost training or evaluation.
+
+TODO: It seems like Vectors.dense should be handled by feature collection
+phase, but then we lose the name of the features. It's possible to attach
+metadata to a schema, but that is lost if the column is modified in any
+way. Might be reasonable though?
+
+Parameters
+--
+df : pyspark.sql.DataFrame
+num_partitions : int
+
+Returns:
+pyspark.sql.DataFrame
+"""
+features = [f for f in df.columns if f[:8] == 'feature_']
+features_notnan = [~F.isnan(F.col(f)) for f in features]
+nan_condition = reduce(lambda x, y: x & y, features_notnan)
+return (
+df
+.where(nan_condition)
+.rdd.repartition(num_partitions)
+# TODO: Can we use DataFrame.repartition and 

[MediaWiki-commits] [Gerrit] mediawiki...Flow[master]: Follow-up c1beac48: fix JS error when clicking reply link

[Catrope (Code Review)]

Catrope has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/350331 )

Change subject: Follow-up c1beac48: fix JS error when clicking reply link
..

Follow-up c1beac48: fix JS error when clicking reply link

The constructor called this.initializeEditor() before
this.$editorContainer was set, which caused a JS error
in non-expandable mode.

Fix this by moving the code that deals with this stuff
all the way to the bottom of the constructor, so that everything
is definitely in good shape when initializeEditor() is called.

Bug: T163749
Change-Id: I4cb4e60aa859214a718b13e825d4a0a998e118f2
---
M modules/flow/ui/widgets/mw.flow.ui.ReplyWidget.js
1 file changed, 14 insertions(+), 15 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Flow 
refs/changes/31/350331/1

diff --git a/modules/flow/ui/widgets/mw.flow.ui.ReplyWidget.js 
b/modules/flow/ui/widgets/mw.flow.ui.ReplyWidget.js
index ffebbd8..75ed555 100644
--- a/modules/flow/ui/widgets/mw.flow.ui.ReplyWidget.js
+++ b/modules/flow/ui/widgets/mw.flow.ui.ReplyWidget.js
@@ -26,21 +26,6 @@
// Parent constructor
mw.flow.ui.ReplyWidget.parent.call( this, config );
 
-   if ( this.expandable ) {
-   this.triggerInput = new OO.ui.TextInputWidget( {
-   multiline: false,
-   classes: [ 'flow-ui-replyWidget-trigger-input' 
],
-   placeholder: config.placeholder
-   } );
-   this.triggerInput.$element.on( 'focusin', 
this.onTriggerFocusIn.bind( this ) );
-   this.$element.append( this.triggerInput.$element );
-   } else {
-   // Only initialize the editor if we are not in 
'expandable' mode
-   // Otherwise, the editor is lazy-loaded
-   this.initializeEditor();
-   this.editor.toggle( true );
-   }
-
this.api = new mw.flow.dm.APIHandler();
 
this.anonWarning = new mw.flow.ui.AnonWarningWidget( {
@@ -78,6 +63,20 @@
this.$editorContainer
);
 
+   if ( this.expandable ) {
+   this.triggerInput = new OO.ui.TextInputWidget( {
+   multiline: false,
+   classes: [ 'flow-ui-replyWidget-trigger-input' 
],
+   placeholder: config.placeholder
+   } );
+   this.triggerInput.$element.on( 'focusin', 
this.onTriggerFocusIn.bind( this ) );
+   this.$element.append( this.triggerInput.$element );
+   } else {
+   // Only initialize the editor if we are not in 
'expandable' mode
+   // Otherwise, the editor is lazy-loaded
+   this.initializeEditor();
+   this.editor.toggle( true );
+   }
};
 
/* Initialization */

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I4cb4e60aa859214a718b13e825d4a0a998e118f2
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: Catrope 

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

[MediaWiki-commits] [Gerrit] mediawiki...MobileFrontend[master]: Move paragraph and immediate list element before infobox

[Pmiazga (Code Review)]

Pmiazga has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/350330 )

Change subject: Move paragraph and immediate list element before infobox
..

Move paragraph and immediate list element before infobox

Changes:
 - if list (ol or ul element) is an immediate first paragraph
sibling move with paragraph before table.infobox element

Reason for not using pure xpath query:
It is possible to query immediate following ol/ul element with
xPath query: following-sibling::*[position()=1][name()='ol' or name()='ul']
but this approach is 20% slower than getting first sibling and
verifing the tagName.
Testing scenario:
5 rounds - call MobileFormatter::filterContent() 1 million times
xPath only = ~181 seconds each round
xPath + tagName = ~138 seconds each round
CPU: i7-4800MQ@2.7GHz

Bug: T149852
Change-Id: I35c910f4ec11d2abb31092e6bb26caaa18cefe20
---
M includes/MobileFormatter.php
M tests/phpunit/MobileFormatterTest.php
2 files changed, 33 insertions(+), 2 deletions(-)


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

diff --git a/includes/MobileFormatter.php b/includes/MobileFormatter.php
index a4603a6..bc21c07 100644
--- a/includes/MobileFormatter.php
+++ b/includes/MobileFormatter.php
@@ -226,6 +226,9 @@
 *   - the paragraph contains text content, e.g. no ;
 *   - the paragraph doesn't contain coordinates, i.e. span#coordinates.
 *
+* Additionally if paragraph immediate sibling is a list (ol or ul 
element), the list
+* is also moved along with paragraph above infobox.
+*
 * Note that the first paragraph is not moved before hatnotes, or mbox 
or other
 * elements that are not infoboxes.
 *
@@ -253,7 +256,21 @@
}
}
if ( $firstP ) {
-   $leadSectionBody->insertBefore( $firstP, 
$infoboxAndParagraphs->item( 0 ) );
+   $listElementAfterParagraph = null;
+   $where = $infoboxAndParagraphs->item( 0 );
+
+   $elementAfterParagraphQuery = $xPath->query( 
'following-sibling::*[1]', $firstP );
+   if ( $elementAfterParagraphQuery->length > 0 ) {
+   $elem = 
$elementAfterParagraphQuery->item( 0 );
+   if ( $elem->tagName === 'ol' || 
$elem->tagName === 'ul' ) {
+   $listElementAfterParagraph = 
$elem;
+   }
+   }
+
+   $leadSectionBody->insertBefore( $firstP, $where 
);
+   if ( $listElementAfterParagraph !== null ) {
+   $leadSectionBody->insertBefore( 
$listElementAfterParagraph, $where );
+   }
}
}
/**
diff --git a/tests/phpunit/MobileFormatterTest.php 
b/tests/phpunit/MobileFormatterTest.php
index c7a3169..2349713 100644
--- a/tests/phpunit/MobileFormatterTest.php
+++ b/tests/phpunit/MobileFormatterTest.php
@@ -583,7 +583,20 @@
 
$enableSections, false, false, false, true,
],
+   [
+   // infobox, a paragraph, list element
+   // @see 
https://phabricator.wikimedia.org/T149852
+   'infobox' .
+   'paragraph' .
+   'item 1item 2',
 
+   $this->makeSectionHtml(
+   0,
+   'paragraphitem 
1item 2' .
+   'infobox'
+   ),
+   $enableSections, false, false, false, true,
+   ],
[
// 2 hat-notes, ambox, 2 infoboxes, 2 
paragraphs, another section
'hatnote' .
@@ -593,6 +606,7 @@
'infobox 2' .
'paragraph 1' .
'paragraph 2' .
+   'item'.
'Heading 1' .
'paragraph 3',
 
@@ -604,7 +618,7 @@
'paragraph 1' .
'infobox 1' .
'infobox 2' .
-   'paragraph 2'
+   'paragraph 
2item'
) .
$this->makeSectionHeading( 'h2', 

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: RCFilters UI: Create base classes for shared objects

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/350268 )

Change subject: RCFilters UI: Create base classes for shared objects
..


RCFilters UI: Create base classes for shared objects

Preparing for adding other types of items than filters (namespaces,
users, tags, etc) this commit creates base classes for the model
and relevant widgets and extends Filter* from them.

Bug: T159942
Bug: T163521
Change-Id: I61c88a1f14a3ca9d91aa831187eda156468a6591
---
M resources/Resources.php
M resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FilterItem.js
A resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.ItemModel.js
M 
resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.FilterMenuOptionWidget.less
R 
resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.FloatingMenuSelectWidget.less
A 
resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.ItemMenuOptionWidget.less
R resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.TagItemWidget.less
M resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterMenuOptionWidget.js
M resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterTagItemWidget.js
M 
resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterTagMultiselectWidget.js
R 
resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FloatingMenuSelectWidget.js
A resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.ItemMenuOptionWidget.js
A resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.TagItemWidget.js
13 files changed, 678 insertions(+), 513 deletions(-)

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



diff --git a/resources/Resources.php b/resources/Resources.php
index 715cdb8..1721de8 100644
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -1742,6 +1742,7 @@
'mediawiki.rcfilters.filters.dm' => [
'scripts' => [
'resources/src/mediawiki.rcfilters/mw.rcfilters.js',
+   
'resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.ItemModel.js',

'resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FilterItem.js',

'resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FilterGroup.js',

'resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FiltersViewModel.js',
@@ -1757,11 +1758,13 @@
'scripts' => [

'resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.CheckboxInputWidget.js',

'resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterTagMultiselectWidget.js',
+   
'resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.ItemMenuOptionWidget.js',

'resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterMenuOptionWidget.js',

'resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterMenuSectionOptionWidget.js',
+   
'resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.TagItemWidget.js',

'resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterTagItemWidget.js',

'resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterMenuHeaderWidget.js',
-   
'resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterFloatingMenuSelectWidget.js',
+   
'resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FloatingMenuSelectWidget.js',

'resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterWrapperWidget.js',

'resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.ChangesListWrapperWidget.js',

'resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FormWrapperWidget.js',
@@ -1776,11 +1779,12 @@

'resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.less',

'resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.Overlay.less',

'resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.FilterTagMultiselectWidget.less',
+   
'resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.ItemMenuOptionWidget.less',

'resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.FilterMenuOptionWidget.less',

'resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.FilterMenuSectionOptionWidget.less',
-   
'resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.FilterTagItemWidget.less',
+   
'resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.TagItemWidget.less',

'resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.FilterMenuHeaderWidget.less',
-   
'resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.FilterFloatingMenuSelectWidget.less',
+   

[MediaWiki-commits] [Gerrit] mediawiki...MobileFrontend[master]: Move paragraph and immediate list element before infobox

[Pmiazga (Code Review)]

Pmiazga has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/350329 )

Change subject: Move paragraph and immediate list element before infobox
..

Move paragraph and immediate list element before infobox

Changes:
 - if list (ol or ul element) is an immediate first paragraph
sibling move with paragraph before table.infobox element

Reason for not using pure xpath query:
It is possible to query immediate following ol/ul element with
xPath query: following-sibling::*[position()=1][name()='ol' or name()='ul']
but this approach is 20% slower than getting first sibling and
verifing the tagName.
Testing scenario:
5 rounds - call MobileFormatter::filterContent() 1 million times
xPath only = ~181 seconds each round
xPath + tagName = ~138 seconds each round
CPU: i7-4800MQ@2.7GHz

Bug: T149852
Change-Id: I4257dbdf05cdb99634bdbda0f25ddde05e7cb9c5
---
M includes/MobileFormatter.php
M tests/phpunit/MobileFormatterTest.php
2 files changed, 36 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend 
refs/changes/29/350329/1

diff --git a/includes/MobileFormatter.php b/includes/MobileFormatter.php
index a4603a6..cb66b87 100644
--- a/includes/MobileFormatter.php
+++ b/includes/MobileFormatter.php
@@ -229,6 +229,9 @@
 * Note that the first paragraph is not moved before hatnotes, or mbox 
or other
 * elements that are not infoboxes.
 *
+* Additionally if paragraph immediate sibling is a list (ol or ul 
element), the list
+* is also moved along with paragraph above infobox.
+*
 * @param DOMElement $leadSectionBody
 * @param DOMDocument $doc Document to which the section belongs
 */
@@ -252,8 +255,23 @@
break;
}
}
+
if ( $firstP ) {
-   $leadSectionBody->insertBefore( $firstP, 
$infoboxAndParagraphs->item( 0 ) );
+   $listElementAfterParagraph = null;
+   $where = $infoboxAndParagraphs->item( 0 );
+
+   $elementAfterParagraphQuery = $xPath->query( 
'following-sibling::*[1]', $firstP );
+   if ( $elementAfterParagraphQuery->length > 0 ) {
+   $elem = 
$elementAfterParagraphQuery->item( 0 );
+   if ( $elem->tagName === 'ol' || 
$elem->tagName === 'ul' ) {
+   $listElementAfterParagraph = 
$elem;
+   }
+   }
+
+   $leadSectionBody->insertBefore( $firstP, $where 
);
+   if ( $listElementAfterParagraph !== null ) {
+   $leadSectionBody->insertBefore( 
$listElementAfterParagraph, $where );
+   }
}
}
/**
diff --git a/tests/phpunit/MobileFormatterTest.php 
b/tests/phpunit/MobileFormatterTest.php
index c7a3169..bece1bd 100644
--- a/tests/phpunit/MobileFormatterTest.php
+++ b/tests/phpunit/MobileFormatterTest.php
@@ -585,6 +585,20 @@
],
 
[
+   // infobox, a paragraph, list element
+   // @see 
https://phabricator.wikimedia.org/T149852
+   'infobox' .
+   'paragraph' .
+   'item 1item 2',
+
+   $this->makeSectionHtml(
+   0,
+   'paragraphitem 
1item 2' .
+   'infobox'
+   ),
+   $enableSections, false, false, false, true,
+   ],
+   [
// 2 hat-notes, ambox, 2 infoboxes, 2 
paragraphs, another section
'hatnote' .
'hatnote' .
@@ -593,6 +607,7 @@
'infobox 2' .
'paragraph 1' .
'paragraph 2' .
+   'item'.
'Heading 1' .
'paragraph 3',
 
@@ -604,7 +619,7 @@
'paragraph 1' .
'infobox 1' .
'infobox 2' .
-   'paragraph 2'
+   'paragraph 
2item'
) .
$this->makeSectionHeading( 'h2', 

[MediaWiki-commits] [Gerrit] operations/puppet[production]: admins: quiddity in WMF group but missing in LDAP user list

[Dzahn (Code Review)]

Dzahn has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/350328 )

Change subject: admins: quiddity in WMF group but missing in LDAP user list
..

admins: quiddity in WMF group but missing in LDAP user list

The account validation script /usr/local/bin/cross-validate-accounts
that is running on maintenance server(s) said:

"quiddity present in privileged LDAP group (wmf),but not present in data.yaml"

This is fixing that by adding quiddity.

Somebody must have added him without leaving a paper trail.

Change-Id: I44025915b6b6fb13bfdf0afd98e689b2f33adcd5
---
M modules/admin/data/data.yaml
1 file changed, 4 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/28/350328/1

diff --git a/modules/admin/data/data.yaml b/modules/admin/data/data.yaml
index 91c7df1..4eb6606 100644
--- a/modules/admin/data/data.yaml
+++ b/modules/admin/data/data.yaml
@@ -2575,6 +2575,10 @@
 ensure: present
 realname: Quim Gil
 email: q...@wikimedia.org
+  quiddity:
+ensure: present
+realname: Nick Wilson
+email: nwil...@wikimedia.org
   raqstallman:
 ensure: present
 realname: Rachel Stallman

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: openldap::mgmt: only run account-validation script in $::mw_...

[Dzahn (Code Review)]

Dzahn has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/350327 )

Change subject: openldap::mgmt: only run account-validation script in 
$::mw_primary
..


openldap::mgmt: only run account-validation script in $::mw_primary

openldap::management was previously included only on terbium, but not on wasat.

Since I59853e79fe909e25 terbium and wasat are identical and both include this 
role.

To avoid running the cron in both DCs and creating duplicate notifications
about it, use the $::mw_primary variable to ensure it is only running
in the currently active DC.

This is exactly like it is also done for existing mw maintenance crons.

Change-Id: Ibcccb37e37007688fa26e515cfd710f35e2f013e
---
M modules/role/manifests/openldap/management.pp
1 file changed, 6 insertions(+), 0 deletions(-)

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



diff --git a/modules/role/manifests/openldap/management.pp 
b/modules/role/manifests/openldap/management.pp
index 309f02c..7ce3d77 100644
--- a/modules/role/manifests/openldap/management.pp
+++ b/modules/role/manifests/openldap/management.pp
@@ -38,7 +38,13 @@
 system => true,
 }
 
+$ensure = $::mw_primary ? {
+$::site => 'present',
+default => 'absent',
+}
+
 cron { 'daily_account_consistency_check':
+ensure  => $ensure,
 require => [ File['/usr/local/bin/cross-validate-accounts'], 
User['accountcheck']] ,
 command => '/usr/local/bin/cross-validate-accounts',
 user=> 'accountcheck',

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ibcccb37e37007688fa26e515cfd710f35e2f013e
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn 
Gerrit-Reviewer: Dzahn 
Gerrit-Reviewer: Muehlenhoff 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] oojs/ui[master]: SelectWidget/MenuSelectWidget: Maintain `aria-activedescenda...

[VolkerE (Code Review)]

VolkerE has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/349135 )

Change subject: SelectWidget/MenuSelectWidget: Maintain `aria-activedescendant` 
attribute on focus owner
..


SelectWidget/MenuSelectWidget: Maintain `aria-activedescendant` attribute on 
focus owner

Our SelectWidget does not allow individual OptionWidgets to have
focus. Instead, it keeps track internally of which of the options
really is active (e.g. which option arrow navigation is relative to,
or which option will be selected if the user presses the enter key).
This makes some implementation details a bit easier.

However, it means we have to somehow inform assistive technology about
the currently active option, since they can't guess it from the focus.
This is done by setting `aria-activedescendant` on the DOM element
which actually has focus (the focus owner).

This is made a little more complicated because the SelectWidget can
stand on its own (e.g. RadioSelectWidget), in which case it is the
focus owner itself, or it can be a part of a larger widget (e.g.
MenuSelectWidget/DropdownInputWidget), in which case the focus owner
is usually somewhere else.

As a bonus, SelectWidget will now move focus to the focus owner when
one of its options is focussed. The only situation where this makes a
difference is when a MenuOptionWidget is focussed through its accesskey.

Bug: T149654
Change-Id: Ie993345e44ddb43dfbe2bebe0e12fd2bd9f5812e
---
M src/widgets/MenuSelectWidget.js
M src/widgets/SelectWidget.js
M tests/QUnit.assert.equalDomElement.js
3 files changed, 44 insertions(+), 10 deletions(-)

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



diff --git a/src/widgets/MenuSelectWidget.js b/src/widgets/MenuSelectWidget.js
index de8d457..8533f96 100644
--- a/src/widgets/MenuSelectWidget.js
+++ b/src/widgets/MenuSelectWidget.js
@@ -65,6 +65,9 @@
 
// Initialization
this.$element.addClass( 'oo-ui-menuSelectWidget' );
+   if ( config.widget ) {
+   this.setFocusOwner( config.widget.$tabIndexed );
+   }
 
// Initially hidden - using #toggle may cause errors if subclasses 
override toggle with methods
// that reference properties not initialized at that time of parent 
class construction
@@ -320,6 +323,7 @@
this.toggleClipping( true );
 
if ( this.getSelectedItem() ) {
+   this.$focusOwner.attr( 'aria-activedescendant', 
this.getSelectedItem().getElementId() );
this.getSelectedItem().scrollElementIntoView( { 
duration: 0 } );
}
 
@@ -328,6 +332,7 @@
this.getElementDocument().addEventListener( 
'mousedown', this.onDocumentMouseDownHandler, true );
}
} else {
+   this.$focusOwner.removeAttr( 'aria-activedescendant' );
this.unbindKeyDownListener();
this.unbindKeyPressListener();
this.getElementDocument().removeEventListener( 
'mousedown', this.onDocumentMouseDownHandler, true );
diff --git a/src/widgets/SelectWidget.js b/src/widgets/SelectWidget.js
index 444a63e..46bc3ac 100644
--- a/src/widgets/SelectWidget.js
+++ b/src/widgets/SelectWidget.js
@@ -77,6 +77,7 @@
this.$element
.addClass( 'oo-ui-selectWidget oo-ui-selectWidget-depressed' )
.attr( 'role', 'listbox' );
+   this.setFocusOwner( this.$element );
if ( Array.isArray( config.items ) ) {
this.addItems( config.items );
}
@@ -169,7 +170,7 @@
}
 
if ( event.target !== this.$element[ 0 ] ) {
-   this.$element.focus();
+   this.$focusOwner.focus();
}
 };
 
@@ -583,6 +584,11 @@
}
}
if ( changed ) {
+   if ( item ) {
+   this.$focusOwner.attr( 'aria-activedescendant', 
item.getElementId() );
+   } else {
+   this.$focusOwner.removeAttr( 'aria-activedescendant' );
+   }
this.emit( 'highlight', item );
}
 
@@ -681,6 +687,13 @@
}
}
if ( changed ) {
+   if ( item && !item.constructor.static.highlightable ) {
+   if ( item ) {
+   this.$focusOwner.attr( 'aria-activedescendant', 
item.getElementId() );
+   } else {
+   this.$focusOwner.removeAttr( 
'aria-activedescendant' );
+   }
+   }
this.emit( 'select', item );
}
 
@@ -856,3 +869,15 @@
 
return this;
 };
+
+/**
+ * Set the DOM element which has focus while the user is interacting with this 
SelectWidget.
+ *
+ * Currently this is just used to 

[MediaWiki-commits] [Gerrit] operations/puppet[production]: openldap::mgmt: only run account-validation script in $::mw_...

[Dzahn (Code Review)]

Dzahn has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/350327 )

Change subject: openldap::mgmt: only run account-validation script in 
$::mw_primary
..

openldap::mgmt: only run account-validation script in $::mw_primary

openldap::management was previously included only on terbium, but not on wasat.

Since I59853e79fe909e25 terbium and wasat are identical and both include this 
role.

To avoid running the cron in both DCs and creating duplicate notifications
about it, use the $::mw_primary variable to ensure it is only running
in the currently active DC.

This is exactly like it is also done for existing mw maintenance crons.

Change-Id: Ibcccb37e37007688fa26e515cfd710f35e2f013e
---
M modules/role/manifests/openldap/management.pp
1 file changed, 6 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/27/350327/1

diff --git a/modules/role/manifests/openldap/management.pp 
b/modules/role/manifests/openldap/management.pp
index 309f02c..7ce3d77 100644
--- a/modules/role/manifests/openldap/management.pp
+++ b/modules/role/manifests/openldap/management.pp
@@ -38,7 +38,13 @@
 system => true,
 }
 
+$ensure = $::mw_primary ? {
+$::site => 'present',
+default => 'absent',
+}
+
 cron { 'daily_account_consistency_check':
+ensure  => $ensure,
 require => [ File['/usr/local/bin/cross-validate-accounts'], 
User['accountcheck']] ,
 command => '/usr/local/bin/cross-validate-accounts',
 user=> 'accountcheck',

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...wikihiero[master]: build: Bump various devDependencies to latest

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/349356 )

Change subject: build: Bump various devDependencies to latest
..


build: Bump various devDependencies to latest

 grunt-banana-checker  0.5.0  →  0.6.0
 grunt-jsonlint1.0.7  →  1.1.0

Change-Id: I86cfba1b4d3d8dc30df824126fbfc64ee478d9af
---
M package.json
1 file changed, 2 insertions(+), 2 deletions(-)

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



diff --git a/package.json b/package.json
index baa0c7d..44de5c4 100644
--- a/package.json
+++ b/package.json
@@ -9,10 +9,10 @@
"devDependencies": {
"eslint-config-wikimedia": "0.3.0",
"grunt": "1.0.1",
-   "grunt-banana-checker": "0.5.0",
+   "grunt-banana-checker": "0.6.0",
"grunt-contrib-watch": "1.0.0",
"grunt-eslint": "19.0.0",
-   "grunt-jsonlint": "1.0.7",
+   "grunt-jsonlint": "1.1.0",
"grunt-stylelint": "0.7.0",
"stylelint-config-wikimedia": "0.4.1"
}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I86cfba1b4d3d8dc30df824126fbfc64ee478d9af
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/wikihiero
Gerrit-Branch: master
Gerrit-Owner: Jforrester 
Gerrit-Reviewer: VolkerE 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...parsoid[master]: Remove advanced PDoc usage from the jsapi

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/348111 )

Change subject: Remove advanced PDoc usage from the jsapi
..


Remove advanced PDoc usage from the jsapi

 * This now lives here: https://github.com/wikimedia/parsoid-jsapi

Change-Id: I03c089c68e8a9639b9ca775dd74fed75b25db5c4
---
M .jsduck/categories.json
M .jsduck/guides.json
M README.md
D guides/jsapi/README.md
M jsduck.json
M lib/index.js
D lib/jsapi.js
M tests/mocha/jsapi.js
8 files changed, 9 insertions(+), 2,066 deletions(-)

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



diff --git a/.jsduck/categories.json b/.jsduck/categories.json
index 2db1dfe..0925fd2 100644
--- a/.jsduck/categories.json
+++ b/.jsduck/categories.json
@@ -11,20 +11,7 @@
{
"name": "JavaScript Interface (experimental)",
"classes": [
-   "Parsoid",
-   "PComment",
-   "PDoc",
-   "PNodeList",
-   "PNode",
-   "PExtLink",
-   "PHeading",
-   "PHtmlEntity",
-   "PMedia",
-   "PTag",
-   "PTemplate",
-   "PTemplate.Parameter",
-   "PText",
-   "PWikiLink"
+   "Parsoid"
]
}
]
diff --git a/.jsduck/guides.json b/.jsduck/guides.json
index 964fcd2..098717a 100644
--- a/.jsduck/guides.json
+++ b/.jsduck/guides.json
@@ -19,12 +19,6 @@
"url": "../guides/apiuse",
"title": "Using Parsoid's HTTP API",
"description": "How to use Parsoid's HTTP API 
to parse and roundtrip wikitext."
-   },
-   {
-   "name": "jsapi",
-   "url": "../guides/jsapi",
-   "title": "Using Parsoid's JavaScript API",
-   "description": "How to use Parsoid's JavaScript 
API to parse and manipulate article content."
}
]
}
diff --git a/README.md b/README.md
index e448024..84e36a5 100644
--- a/README.md
+++ b/README.md
@@ -34,9 +34,14 @@
 
 Developer API documentation can be found at
 https://doc.wikimedia.org/Parsoid/master/
-and some helpful getting-started guides are at
+
+And some helpful getting-started guides are at
 https://doc.wikimedia.org/Parsoid/master/
 
+An example of a library that builds on Parsoid output to offer an API that
+mimic's mwparserfromhell in JavaScript can be found at,
+https://github.com/wikimedia/parsoid-jsapi
+
 License
 ---
 
diff --git a/guides/jsapi/README.md b/guides/jsapi/README.md
deleted file mode 100644
index 4df3b5a..000
--- a/guides/jsapi/README.md
+++ /dev/null
@@ -1,148 +0,0 @@
-Usage of the JavaScript API
-===
-
-This file describes usage of Parsoid as a standalone wikitext parsing
-package, in the spirit of [`mwparserfromhell`].  This is not the typical
-use case for Parsoid; it is more often used as a network service.
-See [the HTTP API guide](#!/guide/apiuse) or [Parsoid service] on the wiki
-for more details.
-
-These examples will use the [`prfun`] library and [ES6 generators] in
-order to fluently express asynchronous operations.  The library also
-exports vanilla [`Promise`]s if you wish to maintain compatibility
-with old versions of `node` at the cost of a little bit of readability.
-
-Since many methods in the API return [`Promise`]s, we've also provided
-a [`Promise`]-aware REPL, that will wait for a promise to be resolved
-before printing its value.  This can be started from the
-shell using:
-
-   node -e 'require("parsoid").repl()'
-
-Use `"./"` instead of `"parsoid"` if you are running this from a
-checked-out repository.  Code examples below which contain lines
-starting with `>` show sessions using this REPL.  (You may also
-wish to look in `tests/mocha/jsapi.js` for examples using a more
-traditional promise-chaining style.)
-
-Use of Parsoid as a wikitext parser is straightforward (where `text` is
-wikitext input):
-
-   #/usr/bin/node --harmony-generators
-   var Promise = require('prfun');
-   var Parsoid = require('parsoid');
-   
-   var main = Promise.async(function*() {
-   var text = "I love wikitext!";
-   var pdoc = yield Parsoid.parse(text, { pdoc: true });
- 

[MediaWiki-commits] [Gerrit] mediawiki...wikihiero[master]: build: Replace jshint and jscs with eslint

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/349355 )

Change subject: build: Replace jshint and jscs with eslint
..


build: Replace jshint and jscs with eslint

Bug: T118941
Change-Id: I4b73fb13f8f95f73714a6fc580e07ac320f937fc
---
A .eslintrc.json
D .jscsrc
D .jshintignore
D .jshintrc
M Gruntfile.js
D modules/ve-wikihiero/.jshintrc
M modules/ve-wikihiero/ve.ce.MWHieroNode.js
M modules/ve-wikihiero/ve.dm.MWHieroNode.js
M modules/ve-wikihiero/ve.ui.MWHieroInspector.js
M modules/ve-wikihiero/ve.ui.MWHieroInspectorTool.js
M package.json
11 files changed, 24 insertions(+), 92 deletions(-)

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



diff --git a/.eslintrc.json b/.eslintrc.json
new file mode 100644
index 000..56fb9cb
--- /dev/null
+++ b/.eslintrc.json
@@ -0,0 +1,16 @@
+{
+   "extends": "wikimedia",
+   "env": {
+   "browser": true,
+   "jquery": true,
+   "qunit": true
+   },
+   "globals": {
+   "mw": false,
+   "OO": false,
+   "ve": false
+   },
+   "rules": {
+   "dot-notation": [ "error", { "allowKeywords": true } ]
+   }
+}
diff --git a/.jscsrc b/.jscsrc
deleted file mode 100644
index 1959eea..000
--- a/.jscsrc
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-   "preset": "wikimedia",
-
-   "jsDoc": {
-   "checkAnnotations": {
-   "preset": "jsduck5",
-   "extra": {
-   "this": true,
-   "source": true,
-   "see": true
-   }
-   },
-   "checkTypes": "strictNativeCase",
-   "checkParamNames": true,
-   "checkRedundantAccess": true,
-   "checkRedundantReturns": true,
-   "requireNewlineAfterDescription": true,
-   "requireParamTypes": true,
-   "requireReturnTypes": true
-   }
-}
diff --git a/.jshintignore b/.jshintignore
deleted file mode 100644
index ea26ebd..000
--- a/.jshintignore
+++ /dev/null
@@ -1,2 +0,0 @@
-# Tooling
-node_modules/
diff --git a/.jshintrc b/.jshintrc
deleted file mode 100644
index 032d01b..000
--- a/.jshintrc
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-   // Enforcing
-   "bitwise": true,
-   "eqeqeq": true,
-   "freeze": true,
-   "latedef": true,
-   "noarg": true,
-   "nonew": true,
-   "undef": true,
-   "unused": true,
-   "strict": false,
-   "es3": true,
-
-   // Environment
-   "browser": true,
-   "jquery": true,
-
-   "globals": {
-   "mw": false
-   }
-}
diff --git a/Gruntfile.js b/Gruntfile.js
index c9c273f..c6b7934 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -1,35 +1,28 @@
-/*jshint node:true */
+/* eslint-env node */
 module.exports = function ( grunt ) {
var conf = grunt.file.readJSON( 'extension.json' );
 
grunt.loadNpmTasks( 'grunt-banana-checker' );
-   grunt.loadNpmTasks( 'grunt-contrib-jshint' );
grunt.loadNpmTasks( 'grunt-contrib-watch' );
-   grunt.loadNpmTasks( 'grunt-jscs' );
+   grunt.loadNpmTasks( 'grunt-eslint' );
grunt.loadNpmTasks( 'grunt-jsonlint' );
grunt.loadNpmTasks( 'grunt-stylelint' );
 
grunt.initConfig( {
-   jshint: {
-   options: {
-   jshintrc: true
-   },
+   eslint: {
all: [
'*.js',
'modules/*.js',
'modules/ve-wikihiero/**/*.js'
]
},
-   jscs: {
-   src: '<%= jshint.all %>'
-   },
stylelint: {
all: 'modules/**/*.css'
},
watch: {
files: [
-   '.{jscsrc,jshintignore,jshintrc,csslintrc}',
-   '<%= jshint.all %>',
+   '.eslintrc.json',
+   '<%= eslint.all %>',
'<%= stylelint.all %>'
],
tasks: 'lint'
@@ -43,7 +36,7 @@
}
} );
 
-   grunt.registerTask( 'lint', [ 'jshint', 'jscs', 'stylelint', 
'jsonlint', 'banana' ] );
+   grunt.registerTask( 'lint', [ 'eslint', 'stylelint', 'jsonlint', 
'banana' ] );
grunt.registerTask( 'test', 'lint' );
grunt.registerTask( 'default', 'test' );
 };
diff --git a/modules/ve-wikihiero/.jshintrc b/modules/ve-wikihiero/.jshintrc
deleted file mode 100644
index 0c2332e..000
--- a/modules/ve-wikihiero/.jshintrc
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-   // 

[MediaWiki-commits] [Gerrit] operations/puppet[production]: openldap::mgmt: turn cross-validate-accounts into template

[Dzahn (Code Review)]

Dzahn has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/350325 )

Change subject: openldap::mgmt: turn cross-validate-accounts into template
..


openldap::mgmt: turn cross-validate-accounts into template

cross-validate-accounts.py has a hardcoded "eqiad" in it.

It is used by openldap::management which was previously included
only on terbium, but not on wasat.

Since I59853e79fe909e25 terbium and wasat are identical and both
include this role.

A hardcoded "eqiad" on the codfw server didn't seem good, and ldap-codfw
exists, it is serpens.

So turning this file into a template to make the site flexible.

Change-Id: I67e2ddfd28e7e329bf90c75386b5a3fc32b7d50e
---
R modules/openldap/templates/cross-validate-accounts.py.erb
M modules/role/manifests/openldap/management.pp
2 files changed, 6 insertions(+), 6 deletions(-)

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



diff --git a/modules/openldap/files/cross-validate-accounts.py 
b/modules/openldap/templates/cross-validate-accounts.py.erb
similarity index 98%
rename from modules/openldap/files/cross-validate-accounts.py
rename to modules/openldap/templates/cross-validate-accounts.py.erb
index aac52ef..69fdd2d 100644
--- a/modules/openldap/files/cross-validate-accounts.py
+++ b/modules/openldap/templates/cross-validate-accounts.py.erb
@@ -14,7 +14,7 @@
 
 
 def get_ldap_group_members(group_name):
-ldap_conn = ldap.initialize('ldaps://ldap-labs.eqiad.wikimedia.org:636')
+ldap_conn = ldap.initialize('ldaps://ldap-labs.<%= @site 
%>.wikimedia.org:636')
 ldap_conn.protocol_version = ldap.VERSION3
 
 members = []
diff --git a/modules/role/manifests/openldap/management.pp 
b/modules/role/manifests/openldap/management.pp
index 61381c5..309f02c 100644
--- a/modules/role/manifests/openldap/management.pp
+++ b/modules/role/manifests/openldap/management.pp
@@ -18,11 +18,11 @@
 require_package('python-yaml', 'python-ldap', 'python-phabricator')
 
 file { '/usr/local/bin/cross-validate-accounts':
-ensure => present,
-source => 'puppet:///modules/openldap/cross-validate-accounts.py',
-mode   => '0555',
-owner  => 'root',
-group  => 'root',
+ensure  => present,
+content => template('openldap/cross-validate-accounts.py.erb'),
+mode=> '0555',
+owner   => 'root',
+group   => 'root',
 }
 
 file { '/usr/local/bin/offboard-user':

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

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

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

[MediaWiki-commits] [Gerrit] oojs/ui[master]: build: Bump grunt-stylelint, bring in stylelint explicitly

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/350324 )

Change subject: build: Bump grunt-stylelint, bring in stylelint explicitly
..


build: Bump grunt-stylelint, bring in stylelint explicitly

Change-Id: Ibd9316700019d382d464a491c0f8608efd89e4b3
---
M package.json
1 file changed, 2 insertions(+), 1 deletion(-)

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



diff --git a/package.json b/package.json
index 6ac8d60..38850ec 100644
--- a/package.json
+++ b/package.json
@@ -45,7 +45,7 @@
 "grunt-karma": "2.0.0",
 "grunt-promise-q": 
"git://github.com/jdforrester/grunt-promise-q.git#v0.1.1-wmf.1",
 "grunt-string-replace": "1.3.1",
-"grunt-stylelint": "0.7.0",
+"grunt-stylelint": "0.8.0",
 "grunt-svg2png": 
"git://github.com/jdforrester/grunt-svg2png.git#v0.2.7-wmf.1",
 "grunt-tyops": "0.1.0",
 "karma": "1.1.1",
@@ -55,6 +55,7 @@
 "karma-qunit": "1.1.0",
 "q": "1.4.1",
 "qunitjs": "1.22.0",
+"stylelint": "7.8.0",
 "stylelint-config-wikimedia": "0.4.1"
   }
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ibd9316700019d382d464a491c0f8608efd89e4b3
Gerrit-PatchSet: 1
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: Jforrester 
Gerrit-Reviewer: Krinkle 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...Collection[master]: build: Explicitly depend on eslint-config-wikimedia, don't j...

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/349363 )

Change subject: build: Explicitly depend on eslint-config-wikimedia, don't just 
hope it's there
..


build: Explicitly depend on eslint-config-wikimedia, don't just hope it's there

Change-Id: I95871f4180682e34c16f7e4fa1171380509816b5
---
M package.json
1 file changed, 1 insertion(+), 0 deletions(-)

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



diff --git a/package.json b/package.json
index 9234a6f..0e0a428 100644
--- a/package.json
+++ b/package.json
@@ -11,6 +11,7 @@
},
"license": "GPLv2",
"devDependencies": {
+   "eslint-config-wikimedia": "0.3.0",
"grunt": "1.0.1",
"grunt-banana-checker": "0.6.0",
"grunt-eslint": "19.0.0",

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I95871f4180682e34c16f7e4fa1171380509816b5
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Collection
Gerrit-Branch: master
Gerrit-Owner: Jforrester 
Gerrit-Reviewer: VolkerE 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...Collection[master]: build: Bump grunt-banana-checker devDependency to latest

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/349362 )

Change subject: build: Bump grunt-banana-checker devDependency to latest
..


build: Bump grunt-banana-checker devDependency to latest

Change-Id: Icf12ca1f85073caeae8c2594e87d590920689742
---
M package.json
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/package.json b/package.json
index 2730f5f..9234a6f 100644
--- a/package.json
+++ b/package.json
@@ -12,7 +12,7 @@
"license": "GPLv2",
"devDependencies": {
"grunt": "1.0.1",
-   "grunt-banana-checker": "0.5.0",
+   "grunt-banana-checker": "0.6.0",
"grunt-eslint": "19.0.0",
"grunt-jsonlint": "1.1.0",
"grunt-stylelint": "0.7.0",

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Icf12ca1f85073caeae8c2594e87d590920689742
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Collection
Gerrit-Branch: master
Gerrit-Owner: Jforrester 
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] oojs/ui[master]: Set `aria-owns` for everything with a dropdown list (ARIA `r...

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/349134 )

Change subject: Set `aria-owns` for everything with a dropdown list (ARIA 
`role=combobox`)
..


Set `aria-owns` for everything with a dropdown list (ARIA `role=combobox`)

Bug: T149654
Change-Id: I2d27bdbba408c31001e4db088148a3b454eb6e3a
---
M src/mixins/LookupElement.js
M src/widgets/CapsuleMultiselectWidget.js
M src/widgets/ComboBoxInputWidget.js
M src/widgets/DropdownWidget.js
M tests/QUnit.assert.equalDomElement.js
5 files changed, 11 insertions(+), 1 deletion(-)

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



diff --git a/src/mixins/LookupElement.js b/src/mixins/LookupElement.js
index a95d3eb..dd56bd7 100644
--- a/src/mixins/LookupElement.js
+++ b/src/mixins/LookupElement.js
@@ -61,6 +61,7 @@
// Initialization
this.$input.attr( {
role: 'combobox',
+   'aria-owns': this.lookupMenu.getElementId(),
'aria-autocomplete': 'list'
} );
this.$element.addClass( 'oo-ui-lookupElement' );
diff --git a/src/widgets/CapsuleMultiselectWidget.js 
b/src/widgets/CapsuleMultiselectWidget.js
index 805c2ed..cbcc37e 100644
--- a/src/widgets/CapsuleMultiselectWidget.js
+++ b/src/widgets/CapsuleMultiselectWidget.js
@@ -158,6 +158,7 @@
this.$input.prop( 'disabled', this.isDisabled() );
this.$input.attr( {
role: 'combobox',
+   'aria-owns': this.menu.getElementId(),
'aria-autocomplete': 'list'
} );
}
diff --git a/src/widgets/ComboBoxInputWidget.js 
b/src/widgets/ComboBoxInputWidget.js
index 5342854..440da2a 100644
--- a/src/widgets/ComboBoxInputWidget.js
+++ b/src/widgets/ComboBoxInputWidget.js
@@ -113,6 +113,7 @@
// Initialization
this.$input.attr( {
role: 'combobox',
+   'aria-owns': this.menu.getElementId(),
'aria-autocomplete': 'list'
} );
// Do not override options set via config.menu.items
diff --git a/src/widgets/DropdownWidget.js b/src/widgets/DropdownWidget.js
index b4fd091..1d2ff0e 100644
--- a/src/widgets/DropdownWidget.js
+++ b/src/widgets/DropdownWidget.js
@@ -95,6 +95,7 @@
.addClass( 'oo-ui-dropdownWidget-handle' )
.attr( {
role: 'combobox',
+   'aria-owns': this.menu.getElementId(),
'aria-autocomplete': 'list'
} )
.append( this.$icon, this.$label, this.$indicator );
diff --git a/tests/QUnit.assert.equalDomElement.js 
b/tests/QUnit.assert.equalDomElement.js
index 0fbd024..8d69f23 100644
--- a/tests/QUnit.assert.equalDomElement.js
+++ b/tests/QUnit.assert.equalDomElement.js
@@ -84,10 +84,16 @@
// Filter out acceptable differences between OOjs UI's PHP 
widgets and JS widgets
// Automatically generated IDs (Tag::generateElementId(), 
OO.ui.generateElementId())
if ( summary.attributes.id !== undefined && 
summary.attributes.id.match( /^(ooui-|oojsui-)/ ) ) {
+   // The 'id' might be missing on the JS side, while PHP 
always generates them for infusion.
delete summary.attributes.id;
}
+   // For other attributes using autogenerated ids, the value 
might differ, but the attribute
+   // should be either present in both PHP and JS, or missing in 
both PHP and JS.
if ( summary.attributes.for !== undefined && 
summary.attributes.for.match( /^(ooui-|oojsui-)/ ) ) {
-   delete summary.attributes.for;
+   summary.attributes.for = '(autogenerated)';
+   }
+   if ( summary.attributes[ 'aria-owns' ] !== undefined && 
summary.attributes[ 'aria-owns' ].match( /^(ooui-|oojsui-)/ ) ) {
+   summary.attributes[ 'aria-owns' ] = '(autogenerated)';
}
// Infusion data
if ( summary.attributes[ 'data-ooui' ] !== undefined ) {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I2d27bdbba408c31001e4db088148a3b454eb6e3a
Gerrit-PatchSet: 4
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: Bartosz Dziewoński 
Gerrit-Reviewer: VolkerE 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...WhoIsWatching[master]: Recover lost fix for redirect bug

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/350326 )

Change subject: Recover lost fix for redirect bug
..


Recover lost fix for redirect bug

Bug: T149250
Change-Id: I9060af0d1369c94e212329b7a2e4ef3ba6a94394
---
M i18n/en.json
M src/Hook.php
2 files changed, 7 insertions(+), 3 deletions(-)

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



diff --git a/i18n/en.json b/i18n/en.json
index 7e51951..f554ddb 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -12,7 +12,7 @@
"specialwhoiswatchingusage": "This special page cannot be used on its 
own.",
"specialwhoiswatchingaddusers": "Add users to watch the page",
"specialwhoiswatchingaddbtn": "Add selected users",
-   "whoiswatching_users_pageview": 
"[{{fullurl:Special:WhoIsWatching/{{FULLPAGENAMEE $1] watching 
{{PLURAL:$1|user|users}}",
+   "whoiswatching_users_pageview": "[{{fullurl:Special:WhoIsWatching/$2}} 
$1] watching {{PLURAL:$1|user|users}}",
"whoiswatching-not-possible-title": "Impossible page to watch",
"whoiswatching-not-possible": "It is not possible to watch the [[$1]] 
page.",
"whoiswatching-usage-title": "How to use this page",
diff --git a/src/Hook.php b/src/Hook.php
index fd13fc9..4fd62cf 100644
--- a/src/Hook.php
+++ b/src/Hook.php
@@ -36,6 +36,10 @@
$conf = new GlobalVarConfig( "whoiswatching_" );
$showIfZero = $conf->get( "showifzero" );
$title = $template->getTitle();
+   if ( $title->isRedirect() ) {
+   $article = Article::newFromID( $title->getArticleID() );
+   $title = $article->getRedirectTarget();
+   }
$user = $template->getUser();
$showWatchingUsers = $conf->get( "showwatchingusers" )
   || $user->isAllowed( 
'seepagewatchers' );
@@ -48,9 +52,9 @@
], __METHOD__ );
$watch = $dbr->fetchObject( $res );
if ( $watch->count > 0 || $showIfZero ) {
+   $lang = 
RequestContext::getMain()->getLanguage();
$msg = wfMessage( 
'whoiswatching_users_pageview',
-   
RequestContext::getMain()->getLanguage()->formatNum
- ( 
$watch->count )
+ 
$lang->formatNum( $watch->count ), $title
)->parse();
$tpl->set( 'numberofwatchingusers', $msg );
}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I9060af0d1369c94e212329b7a2e4ef3ba6a94394
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WhoIsWatching
Gerrit-Branch: master
Gerrit-Owner: MarkAHershberger 
Gerrit-Reviewer: MarkAHershberger 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Special:Block: Fix FOUC of bold 'mw-block-hideuser'

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/350284 )

Change subject: Special:Block: Fix FOUC of bold 'mw-block-hideuser'
..


Special:Block: Fix FOUC of bold 'mw-block-hideuser'

Loading Special:Block/ shows "Confirm block", but
this then becomes bold a second later. This is because the styles
are part of 'mediawiki.special.block' which also contains JavaScript
and is loaded with addModules().

Move the styles to mediawiki.special.css instead.

Change-Id: I1c47256227603a6cde36238fdd7e11205d9494ec
---
M resources/Resources.php
D resources/src/mediawiki.special/mediawiki.special.block.css
M resources/src/mediawiki.special/mediawiki.special.css
3 files changed, 8 insertions(+), 12 deletions(-)

Approvals:
  Krinkle: Looks good to me, approved
  Legoktm: Looks good to me, approved
  jenkins-bot: Verified
  Jforrester: Looks good to me, but someone else must approve



diff --git a/resources/Resources.php b/resources/Resources.php
index 715cdb8..ed048bf 100644
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -1896,7 +1896,6 @@
],
'mediawiki.special.block' => [
'scripts' => 
'resources/src/mediawiki.special/mediawiki.special.block.js',
-   'styles' => 
'resources/src/mediawiki.special/mediawiki.special.block.css',
'dependencies' => [
'mediawiki.util',
'mediawiki.htmlform',
diff --git a/resources/src/mediawiki.special/mediawiki.special.block.css 
b/resources/src/mediawiki.special/mediawiki.special.block.css
deleted file mode 100644
index ae557b4..000
--- a/resources/src/mediawiki.special/mediawiki.special.block.css
+++ /dev/null
@@ -1,11 +0,0 @@
-/*!
- * Styling for Special:Block
- */
-
-label[for='mw-input-wpConfirm'] {
-   font-weight: bold;
-}
-
-tr.mw-block-hideuser {
-   font-weight: bold;
-}
diff --git a/resources/src/mediawiki.special/mediawiki.special.css 
b/resources/src/mediawiki.special/mediawiki.special.css
index 354ee20..36dfee6 100644
--- a/resources/src/mediawiki.special/mediawiki.special.css
+++ b/resources/src/mediawiki.special/mediawiki.special.css
@@ -35,6 +35,14 @@
text-align: right;
 }
 
+label[for='mw-input-wpConfirm'] {
+   font-weight: bold;
+}
+
+tr.mw-block-hideuser {
+   font-weight: bold;
+}
+
 /* Special:BlockList */
 table.mw-blocklist span.mw-usertoollinks,
 span.mw-blocklist-actions {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I1c47256227603a6cde36238fdd7e11205d9494ec
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Krinkle 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: Krinkle 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...WhoIsWatching[master]: Recover lost fix for redirect bug

[MarkAHershberger (Code Review)]

MarkAHershberger has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/350326 )

Change subject: Recover lost fix for redirect bug
..

Recover lost fix for redirect bug

Bug: T149250
Change-Id: I9060af0d1369c94e212329b7a2e4ef3ba6a94394
---
M i18n/en.json
M src/Hook.php
2 files changed, 7 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WhoIsWatching 
refs/changes/26/350326/1

diff --git a/i18n/en.json b/i18n/en.json
index 7e51951..f554ddb 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -12,7 +12,7 @@
"specialwhoiswatchingusage": "This special page cannot be used on its 
own.",
"specialwhoiswatchingaddusers": "Add users to watch the page",
"specialwhoiswatchingaddbtn": "Add selected users",
-   "whoiswatching_users_pageview": 
"[{{fullurl:Special:WhoIsWatching/{{FULLPAGENAMEE $1] watching 
{{PLURAL:$1|user|users}}",
+   "whoiswatching_users_pageview": "[{{fullurl:Special:WhoIsWatching/$2}} 
$1] watching {{PLURAL:$1|user|users}}",
"whoiswatching-not-possible-title": "Impossible page to watch",
"whoiswatching-not-possible": "It is not possible to watch the [[$1]] 
page.",
"whoiswatching-usage-title": "How to use this page",
diff --git a/src/Hook.php b/src/Hook.php
index fd13fc9..4fd62cf 100644
--- a/src/Hook.php
+++ b/src/Hook.php
@@ -36,6 +36,10 @@
$conf = new GlobalVarConfig( "whoiswatching_" );
$showIfZero = $conf->get( "showifzero" );
$title = $template->getTitle();
+   if ( $title->isRedirect() ) {
+   $article = Article::newFromID( $title->getArticleID() );
+   $title = $article->getRedirectTarget();
+   }
$user = $template->getUser();
$showWatchingUsers = $conf->get( "showwatchingusers" )
   || $user->isAllowed( 
'seepagewatchers' );
@@ -48,9 +52,9 @@
], __METHOD__ );
$watch = $dbr->fetchObject( $res );
if ( $watch->count > 0 || $showIfZero ) {
+   $lang = 
RequestContext::getMain()->getLanguage();
$msg = wfMessage( 
'whoiswatching_users_pageview',
-   
RequestContext::getMain()->getLanguage()->formatNum
- ( 
$watch->count )
+ 
$lang->formatNum( $watch->count ), $title
)->parse();
$tpl->set( 'numberofwatchingusers', $msg );
}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9060af0d1369c94e212329b7a2e4ef3ba6a94394
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WhoIsWatching
Gerrit-Branch: master
Gerrit-Owner: MarkAHershberger 

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: openldap::mgmt: turn cross-validate-accounts into template

[Dzahn (Code Review)]

Dzahn has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/350325 )

Change subject: openldap::mgmt: turn cross-validate-accounts into template
..

openldap::mgmt: turn cross-validate-accounts into template

cross-validate-accounts.py has a hardcoded "eqiad" in it.

It is used by openldap::management which was previously included
only on terbium, but not on wasat.

Since I59853e79fe909e25 terbium and wasat are identical and both
include this role.

A hardcoded "eqiad" on the codfw server didn't seem good, and ldap-codfw
exists, it is serpens.

So turning this file into a template to make the site flexible.

Change-Id: I67e2ddfd28e7e329bf90c75386b5a3fc32b7d50e
---
R modules/openldap/templates/cross-validate-accounts.py.erb
M modules/role/manifests/openldap/management.pp
2 files changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/25/350325/1

diff --git a/modules/openldap/files/cross-validate-accounts.py 
b/modules/openldap/templates/cross-validate-accounts.py.erb
similarity index 98%
rename from modules/openldap/files/cross-validate-accounts.py
rename to modules/openldap/templates/cross-validate-accounts.py.erb
index aac52ef..69fdd2d 100644
--- a/modules/openldap/files/cross-validate-accounts.py
+++ b/modules/openldap/templates/cross-validate-accounts.py.erb
@@ -14,7 +14,7 @@
 
 
 def get_ldap_group_members(group_name):
-ldap_conn = ldap.initialize('ldaps://ldap-labs.eqiad.wikimedia.org:636')
+ldap_conn = ldap.initialize('ldaps://ldap-labs.<%= @site 
%>.wikimedia.org:636')
 ldap_conn.protocol_version = ldap.VERSION3
 
 members = []
diff --git a/modules/role/manifests/openldap/management.pp 
b/modules/role/manifests/openldap/management.pp
index 61381c5..2c550c8 100644
--- a/modules/role/manifests/openldap/management.pp
+++ b/modules/role/manifests/openldap/management.pp
@@ -19,7 +19,7 @@
 
 file { '/usr/local/bin/cross-validate-accounts':
 ensure => present,
-source => 'puppet:///modules/openldap/cross-validate-accounts.py',
+content => template('openldap/cross-validate-accounts.py.erb'),
 mode   => '0555',
 owner  => 'root',
 group  => 'root',

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I67e2ddfd28e7e329bf90c75386b5a3fc32b7d50e
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] oojs/ui[master]: build: Bump grunt-stylelint, bring in stylelint explicitly

[Jforrester (Code Review)]

Jforrester has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/350324 )

Change subject: build: Bump grunt-stylelint, bring in stylelint explicitly
..

build: Bump grunt-stylelint, bring in stylelint explicitly

Change-Id: Ibd9316700019d382d464a491c0f8608efd89e4b3
---
M package.json
1 file changed, 2 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/24/350324/1

diff --git a/package.json b/package.json
index 6ac8d60..38850ec 100644
--- a/package.json
+++ b/package.json
@@ -45,7 +45,7 @@
 "grunt-karma": "2.0.0",
 "grunt-promise-q": 
"git://github.com/jdforrester/grunt-promise-q.git#v0.1.1-wmf.1",
 "grunt-string-replace": "1.3.1",
-"grunt-stylelint": "0.7.0",
+"grunt-stylelint": "0.8.0",
 "grunt-svg2png": 
"git://github.com/jdforrester/grunt-svg2png.git#v0.2.7-wmf.1",
 "grunt-tyops": "0.1.0",
 "karma": "1.1.1",
@@ -55,6 +55,7 @@
 "karma-qunit": "1.1.0",
 "q": "1.4.1",
 "qunitjs": "1.22.0",
+"stylelint": "7.8.0",
 "stylelint-config-wikimedia": "0.4.1"
   }
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibd9316700019d382d464a491c0f8608efd89e4b3
Gerrit-PatchSet: 1
Gerrit-Project: oojs/ui
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] apps...wikipedia[master]: WIP: Add article-level actions to articles in a reading list.

[Dbrant (Code Review)]

Dbrant has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/350323 )

Change subject: WIP: Add article-level actions to articles in a reading list.
..

WIP: Add article-level actions to articles in a reading list.

Bug: T159720
Change-Id: Icae7f384e2ca61290dfb478029546abf3aa6ca98
---
M app/src/main/java/org/wikipedia/readinglist/AddToReadingListDialog.java
M app/src/main/java/org/wikipedia/readinglist/ReadingList.java
M app/src/main/java/org/wikipedia/readinglist/ReadingListFragment.java
A app/src/main/java/org/wikipedia/readinglist/ReadingListItemActionsDialog.java
A app/src/main/java/org/wikipedia/readinglist/ReadingListItemActionsView.java
M app/src/main/java/org/wikipedia/views/PageItemView.java
M app/src/main/res/layout/item_page_list_entry.xml
A app/src/main/res/layout/view_reading_list_page_actions.xml
M app/src/main/res/values-qq/strings.xml
M app/src/main/res/values/strings.xml
10 files changed, 451 insertions(+), 28 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia 
refs/changes/23/350323/1

diff --git 
a/app/src/main/java/org/wikipedia/readinglist/AddToReadingListDialog.java 
b/app/src/main/java/org/wikipedia/readinglist/AddToReadingListDialog.java
index 8acfe7e..8e42240 100644
--- a/app/src/main/java/org/wikipedia/readinglist/AddToReadingListDialog.java
+++ b/app/src/main/java/org/wikipedia/readinglist/AddToReadingListDialog.java
@@ -38,7 +38,8 @@
 LINK_PREVIEW_MENU(2),
 PAGE_OVERFLOW_MENU(3),
 FEED(4),
-NEWS_ACTIVITY(5);
+NEWS_ACTIVITY(5),
+READING_LIST_ACTIVITY(6);
 
 private static final EnumCodeMap MAP = new 
EnumCodeMap<>(InvokeSource.class);
 
diff --git a/app/src/main/java/org/wikipedia/readinglist/ReadingList.java 
b/app/src/main/java/org/wikipedia/readinglist/ReadingList.java
index d09799c..2632d98 100644
--- a/app/src/main/java/org/wikipedia/readinglist/ReadingList.java
+++ b/app/src/main/java/org/wikipedia/readinglist/ReadingList.java
@@ -2,6 +2,7 @@
 
 import android.database.Cursor;
 import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
 
 import org.apache.commons.lang3.Validate;
 import org.wikipedia.database.contract.ReadingListContract;
@@ -55,6 +56,13 @@
 return pages;
 }
 
+@Nullable public ReadingListPage get(int index) {
+if (index < 0 || index >= pages.size()) {
+return null;
+}
+return pages.get(index);
+}
+
 public void remove(@NonNull ReadingListPage page) {
 for (ReadingListPage p : pages) {
 if (p.key().equals(page.key())) {
diff --git 
a/app/src/main/java/org/wikipedia/readinglist/ReadingListFragment.java 
b/app/src/main/java/org/wikipedia/readinglist/ReadingListFragment.java
index ef23b56..110effc 100644
--- a/app/src/main/java/org/wikipedia/readinglist/ReadingListFragment.java
+++ b/app/src/main/java/org/wikipedia/readinglist/ReadingListFragment.java
@@ -31,6 +31,7 @@
 import org.wikipedia.history.HistoryEntry;
 import org.wikipedia.history.SearchActionModeCallback;
 import org.wikipedia.main.MainActivity;
+import org.wikipedia.page.ExclusiveBottomSheetPresenter;
 import org.wikipedia.page.PageActivity;
 import org.wikipedia.page.PageTitle;
 import org.wikipedia.readinglist.page.ReadingListPage;
@@ -41,6 +42,7 @@
 import org.wikipedia.settings.Prefs;
 import org.wikipedia.util.FeedbackUtil;
 import org.wikipedia.util.ResourceUtil;
+import org.wikipedia.util.ShareUtil;
 import org.wikipedia.views.DefaultViewHolder;
 import org.wikipedia.views.DrawableItemDecoration;
 import org.wikipedia.views.MultiSelectActionModeCallback;
@@ -60,7 +62,8 @@
 import static 
org.wikipedia.readinglist.ReadingListActivity.EXTRA_READING_LIST_TITLE;
 import static org.wikipedia.readinglist.ReadingLists.SORT_BY_NAME_ASC;
 
-public class ReadingListFragment extends Fragment implements 
ReadingListPageObserver.Listener {
+public class ReadingListFragment extends Fragment implements 
ReadingListPageObserver.Listener,
+ReadingListItemActionsDialog.Callback {
 @BindView(R.id.reading_list_toolbar) Toolbar toolbar;
 @BindView(R.id.reading_list_toolbar_container) CollapsingToolbarLayout 
toolBarLayout;
 @BindView(R.id.reading_list_app_bar) AppBarLayout appBarLayout;
@@ -84,6 +87,7 @@
 private ItemCallback itemCallback = new ItemCallback();
 private SearchCallback searchActionModeCallback = new SearchCallback();
 private MultiSelectActionModeCallback multiSelectActionModeCallback = new 
MultiSelectCallback();
+private ExclusiveBottomSheetPresenter bottomSheetPresenter = new 
ExclusiveBottomSheetPresenter();
 
 @NonNull private List displayedPages = new ArrayList<>();
 private String currentSearchQuery;
@@ -403,6 +407,17 @@
 }
 }
 
+private void deleteSinglePage(@Nullable ReadingListPage page) {
+if (readingList == null || page == null) {
+

[MediaWiki-commits] [Gerrit] oojs/ui[master]: Element: New method #getElementId

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/349133 )

Change subject: Element: New method #getElementId
..


Element: New method #getElementId

The method ensures that the element has an 'id' attribute, setting it
to an unique value if it's missing, and returns its value.

Use it to simplify some code in Dialog. Further usages:
* I2d27bdbba408c31001e4db088148a3b454eb6e3a
* Ie993345e44ddb43dfbe2bebe0e12fd2bd9f5812e

Change-Id: Ica44cb523efab239b44dc1080460147c54bdba36
---
M src/Dialog.js
M src/Element.js
2 files changed, 29 insertions(+), 9 deletions(-)

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



diff --git a/src/Dialog.js b/src/Dialog.js
index d6eead5..445f372 100644
--- a/src/Dialog.js
+++ b/src/Dialog.js
@@ -248,21 +248,15 @@
  * @inheritdoc
  */
 OO.ui.Dialog.prototype.initialize = function () {
-   var titleId;
-
// Parent method
OO.ui.Dialog.parent.prototype.initialize.call( this );
 
-   titleId = OO.ui.generateElementId();
-
// Properties
-   this.title = new OO.ui.LabelWidget( {
-   id: titleId
-   } );
+   this.title = new OO.ui.LabelWidget();
 
// Initialization
this.$content.addClass( 'oo-ui-dialog-content' );
-   this.$element.attr( 'aria-labelledby', titleId );
+   this.$element.attr( 'aria-labelledby', this.title.getElementId() );
this.setPendingElement( this.$head );
 };
 
diff --git a/src/Element.js b/src/Element.js
index fd597e9..2d13de7 100644
--- a/src/Element.js
+++ b/src/Element.js
@@ -28,6 +28,7 @@
 
// Properties
this.$ = $;
+   this.elementId = null;
this.visible = true;
this.data = config.data;
this.$element = config.$element ||
@@ -39,7 +40,7 @@
this.$element.addClass( config.classes.join( ' ' ) );
}
if ( config.id ) {
-   this.$element.attr( 'id', config.id );
+   this.setElementId( config.id );
}
if ( config.text ) {
this.$element.text( config.text );
@@ -820,6 +821,31 @@
 };
 
 /**
+ * Set the element has an 'id' attribute.
+ *
+ * @param {string} id
+ * @chainable
+ */
+OO.ui.Element.prototype.setElementId = function ( id ) {
+   this.elementId = id;
+   this.$element.attr( 'id', id );
+   return this;
+};
+
+/**
+ * Ensure that the element has an 'id' attribute, setting it to an unique 
value if it's missing,
+ * and return its value.
+ *
+ * @return {string}
+ */
+OO.ui.Element.prototype.getElementId = function () {
+   if ( this.elementId === null ) {
+   this.setElementId( OO.ui.generateElementId() );
+   }
+   return this.elementId;
+};
+
+/**
  * Check if element supports one or more methods.
  *
  * @param {string|string[]} methods Method or list of methods to check

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ica44cb523efab239b44dc1080460147c54bdba36
Gerrit-PatchSet: 2
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: Bartosz Dziewoński 
Gerrit-Reviewer: Bartosz Dziewoński 
Gerrit-Reviewer: Krinkle 
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] oojs/ui[master]: Set ARIA role=combobox on DropdownWidget and LookupElement too

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/349132 )

Change subject: Set ARIA role=combobox on DropdownWidget and LookupElement too
..


Set ARIA role=combobox on DropdownWidget and LookupElement too

ARIA's definition of 'combobox' is a lot wider than ours, it applies
to pretty much everything with a dropdown list of items.

Change-Id: I63273b2c6ca97f9463d451acb40e48a9a776374b
---
M src/mixins/LookupElement.js
M src/widgets/DropdownWidget.js
2 files changed, 8 insertions(+), 0 deletions(-)

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



diff --git a/src/mixins/LookupElement.js b/src/mixins/LookupElement.js
index 6834799..a95d3eb 100644
--- a/src/mixins/LookupElement.js
+++ b/src/mixins/LookupElement.js
@@ -59,6 +59,10 @@
} );
 
// Initialization
+   this.$input.attr( {
+   role: 'combobox',
+   'aria-autocomplete': 'list'
+   } );
this.$element.addClass( 'oo-ui-lookupElement' );
this.lookupMenu.$element.addClass( 'oo-ui-lookupElement-menu' );
this.$overlay.append( this.lookupMenu.$element );
diff --git a/src/widgets/DropdownWidget.js b/src/widgets/DropdownWidget.js
index 5d675dc..b4fd091 100644
--- a/src/widgets/DropdownWidget.js
+++ b/src/widgets/DropdownWidget.js
@@ -93,6 +93,10 @@
// Initialization
this.$handle
.addClass( 'oo-ui-dropdownWidget-handle' )
+   .attr( {
+   role: 'combobox',
+   'aria-autocomplete': 'list'
+   } )
.append( this.$icon, this.$label, this.$indicator );
this.$element
.addClass( 'oo-ui-dropdownWidget' )

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I63273b2c6ca97f9463d451acb40e48a9a776374b
Gerrit-PatchSet: 1
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: Bartosz Dziewoński 
Gerrit-Reviewer: Bartosz Dziewoński 
Gerrit-Reviewer: VolkerE 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...Timestamp[master]: Remove dead code in constructor for DateTime returning false

[Krinkle (Code Review)]

Krinkle has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/350322 )

Change subject: Remove dead code in constructor for DateTime returning false
..

Remove dead code in constructor for DateTime returning false

Constructing DateTime either returns the object or throws, it can't return
false. This looks like a left-over from when this returned date_create, which
returns false and exposes its error message through date_get_last_errors().

Change-Id: Ie0c873fe41fee519b3bbfa3026f2f45a2d9781f7
---
M src/ConvertibleTimestamp.php
1 file changed, 0 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/libs/Timestamp 
refs/changes/22/350322/1

diff --git a/src/ConvertibleTimestamp.php b/src/ConvertibleTimestamp.php
index 5ed934a..657c7e1 100644
--- a/src/ConvertibleTimestamp.php
+++ b/src/ConvertibleTimestamp.php
@@ -159,10 +159,6 @@
throw new TimestampException( __METHOD__ . ': Invalid 
timestamp format.', $e->getCode(), $e );
}
 
-   if ( $final === false ) {
-   throw new TimestampException( __METHOD__ . ': Invalid 
timestamp format.' );
-   }
-
$this->timestamp = $final;
}
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie0c873fe41fee519b3bbfa3026f2f45a2d9781f7
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/libs/Timestamp
Gerrit-Branch: master
Gerrit-Owner: Krinkle 

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: mediawiki::maintenance: convert to profile/role

[Dzahn (Code Review)]

Dzahn has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/342777 )

Change subject: mediawiki::maintenance: convert to profile/role
..


mediawiki::maintenance: convert to profile/role

Moving this role towards a role/profile structure to
follow current puppet code organization practices.

https://wikitech.wikimedia.org/wiki/Puppet_coding#Organization

This change also makes wasat identical to terbium, which
it should be, but was not before.

See puppet compiler change at:

http://puppet-compiler.wmflabs.org/6222/

terbium is unchanged, while wasat gets a couple new
resources it did not have before.

This is because it did not include "openldap::management".

Making them identical by combining them into a single node
section in site.pp to prevent them from becoming different
again in the future.

Change-Id: I59853e79fe909e2526b8f5480abe8c9af0bcc634
---
R hieradata/role/codfw/mediawiki_maintenance.yaml
R hieradata/role/common/mediawiki_maintenance.yaml
R hieradata/role/eqiad/mediawiki_maintenance.yaml
M manifests/site.pp
R modules/profile/manifests/mediawiki/maintenance.pp
A modules/role/manifests/mediawiki_maintenance.pp
6 files changed, 30 insertions(+), 26 deletions(-)

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



diff --git a/hieradata/role/codfw/mediawiki/maintenance.yaml 
b/hieradata/role/codfw/mediawiki_maintenance.yaml
similarity index 100%
rename from hieradata/role/codfw/mediawiki/maintenance.yaml
rename to hieradata/role/codfw/mediawiki_maintenance.yaml
diff --git a/hieradata/role/common/mediawiki/maintenance.yaml 
b/hieradata/role/common/mediawiki_maintenance.yaml
similarity index 100%
rename from hieradata/role/common/mediawiki/maintenance.yaml
rename to hieradata/role/common/mediawiki_maintenance.yaml
diff --git a/hieradata/role/eqiad/mediawiki/maintenance.yaml 
b/hieradata/role/eqiad/mediawiki_maintenance.yaml
similarity index 100%
rename from hieradata/role/eqiad/mediawiki/maintenance.yaml
rename to hieradata/role/eqiad/mediawiki_maintenance.yaml
diff --git a/manifests/site.pp b/manifests/site.pp
index 9567c843..aac28e6 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -2672,16 +2672,9 @@
 include ::standard
 }
 
-# https://wikitech.wikimedia.org/wiki/Terbium
-node 'terbium.eqiad.wmnet' {
-role(mariadb::maintenance, mediawiki::maintenance, openldap::management)
-include ::role::noc::site
-include ::ldap::role::client::labs
-include ::base::firewall
-
-interface::add_ip6_mapped { 'main':
-interface => 'eth0',
-}
+# mediawiki maintenance servers (https://wikitech.wikimedia.org/wiki/Terbium)
+node 'terbium.eqiad.wmnet', 'wasat.codfw.wmnet' {
+role('mediawiki_maintenance')
 }
 
 # Thumbor servers for MediaWiki image scaling
@@ -2725,18 +2718,6 @@
 node /^labvirt101[0-4].eqiad.wmnet/ {
 role(labs::openstack::nova::compute)
 include ::standard
-}
-
-# mediawiki maintenance server (like terbium)
-node 'wasat.codfw.wmnet' {
-role(mariadb::maintenance, mediawiki::maintenance)
-include ::role::noc::site
-include ::ldap::role::client::labs
-include ::base::firewall
-
-interface::add_ip6_mapped { 'main':
-interface => 'eth0',
-}
 }
 
 # Wikidata query service
diff --git a/modules/role/manifests/mediawiki/maintenance.pp 
b/modules/profile/manifests/mediawiki/maintenance.pp
similarity index 82%
rename from modules/role/manifests/mediawiki/maintenance.pp
rename to modules/profile/manifests/mediawiki/maintenance.pp
index 0c2d8b0..b3633fb 100644
--- a/modules/role/manifests/mediawiki/maintenance.pp
+++ b/modules/profile/manifests/mediawiki/maintenance.pp
@@ -1,9 +1,26 @@
-# mediawiki maintenance scripts
-class role::mediawiki::maintenance {
-include scap::scripts
-include role::mediawiki::common
+# mediawiki maintenance server
+class profile::mediawiki::maintenance {
 
+# Mediawiki
+include ::role::mediawiki::common
 include ::mediawiki::packages::php5
+
+# NOC - https://noc.wikimedia.org/
+include ::role::noc::site
+
+# Deployment
+include ::scap::scripts
+
+# MariaDB (Tendril)
+include ::role::mariadb::maintenance
+
+# LDAP
+include ::role::openldap::management
+include ::ldap::role::client::labs
+
+include ::base::firewall
+
+interface::add_ip6_mapped { 'main': interface => 'eth0', }
 
 file { $::mediawiki::scap::mediawiki_staging_dir:
 ensure => link,
@@ -14,6 +31,7 @@
 default => 'absent',
 }
 
+# Mediawiki maintenance scripts (cron jobs)
 class { 'mediawiki::maintenance::pagetriage': ensure => $ensure }
 class { 'mediawiki::maintenance::translationnotifications': ensure => 
$ensure }
 class { 'mediawiki::maintenance::updatetranslationstats': ensure => 
$ensure }
diff --git a/modules/role/manifests/mediawiki_maintenance.pp 
b/modules/role/manifests/mediawiki_maintenance.pp
new file mode 

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: group0 wikis to 1.29.0-wmf.21

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/350317 )

Change subject: group0 wikis to 1.29.0-wmf.21
..


group0 wikis to 1.29.0-wmf.21

Change-Id: Ie4920cf6a4ca68b3f88fd2be223d03e0d2ab8cf3
---
M php
M wikiversions.json
2 files changed, 7 insertions(+), 7 deletions(-)

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



diff --git a/php b/php
index e7f313c..36c381a 12
--- a/php
+++ b/php
@@ -1 +1 @@
-php-1.29.0-wmf.20
\ No newline at end of file
+php-1.29.0-wmf.21
\ No newline at end of file
diff --git a/wikiversions.json b/wikiversions.json
index 152621b..d59cb35 100644
--- a/wikiversions.json
+++ b/wikiversions.json
@@ -441,7 +441,7 @@
 "kywikiquote": "php-1.29.0-wmf.20",
 "kywiktionary": "php-1.29.0-wmf.20",
 "labswiki": "php-1.29.0-wmf.20",
-"labtestwiki": "php-1.29.0-wmf.20",
+"labtestwiki": "php-1.29.0-wmf.21",
 "ladwiki": "php-1.29.0-wmf.20",
 "lawiki": "php-1.29.0-wmf.20",
 "lawikibooks": "php-1.29.0-wmf.20",
@@ -482,7 +482,7 @@
 "maiwiki": "php-1.29.0-wmf.20",
 "map_bmswiki": "php-1.29.0-wmf.20",
 "mdfwiki": "php-1.29.0-wmf.20",
-"mediawikiwiki": "php-1.29.0-wmf.20",
+"mediawikiwiki": "php-1.29.0-wmf.21",
 "metawiki": "php-1.29.0-wmf.20",
 "mgwiki": "php-1.29.0-wmf.20",
 "mgwikibooks": "php-1.29.0-wmf.20",
@@ -754,9 +754,9 @@
 "tawiktionary": "php-1.29.0-wmf.20",
 "tcywiki": "php-1.29.0-wmf.20",
 "tenwiki": "php-1.29.0-wmf.20",
-"test2wiki": "php-1.29.0-wmf.20",
-"testwiki": "php-1.29.0-wmf.20",
-"testwikidatawiki": "php-1.29.0-wmf.20",
+"test2wiki": "php-1.29.0-wmf.21",
+"testwiki": "php-1.29.0-wmf.21",
+"testwikidatawiki": "php-1.29.0-wmf.21",
 "tetwiki": "php-1.29.0-wmf.20",
 "tewiki": "php-1.29.0-wmf.20",
 "tewikibooks": "php-1.29.0-wmf.20",
@@ -887,7 +887,7 @@
 "zawikiquote": "php-1.29.0-wmf.20",
 "zawiktionary": "php-1.29.0-wmf.20",
 "zeawiki": "php-1.29.0-wmf.20",
-"zerowiki": "php-1.29.0-wmf.20",
+"zerowiki": "php-1.29.0-wmf.21",
 "zh_classicalwiki": "php-1.29.0-wmf.20",
 "zh_min_nanwiki": "php-1.29.0-wmf.20",
 "zh_min_nanwikibooks": "php-1.29.0-wmf.20",

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie4920cf6a4ca68b3f88fd2be223d03e0d2ab8cf3
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: 20after4 
Gerrit-Reviewer: 20after4 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: group0 wikis to 1.29.0-wmf.21

[20after4 (Code Review)]

20after4 has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/350317 )

Change subject: group0 wikis to 1.29.0-wmf.21
..

group0 wikis to 1.29.0-wmf.21

Change-Id: Ie4920cf6a4ca68b3f88fd2be223d03e0d2ab8cf3
---
M php
M wikiversions.json
2 files changed, 7 insertions(+), 7 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config 
refs/changes/17/350317/1

diff --git a/php b/php
index e7f313c..36c381a 12
--- a/php
+++ b/php
@@ -1 +1 @@
-php-1.29.0-wmf.20
\ No newline at end of file
+php-1.29.0-wmf.21
\ No newline at end of file
diff --git a/wikiversions.json b/wikiversions.json
index 152621b..d59cb35 100644
--- a/wikiversions.json
+++ b/wikiversions.json
@@ -441,7 +441,7 @@
 "kywikiquote": "php-1.29.0-wmf.20",
 "kywiktionary": "php-1.29.0-wmf.20",
 "labswiki": "php-1.29.0-wmf.20",
-"labtestwiki": "php-1.29.0-wmf.20",
+"labtestwiki": "php-1.29.0-wmf.21",
 "ladwiki": "php-1.29.0-wmf.20",
 "lawiki": "php-1.29.0-wmf.20",
 "lawikibooks": "php-1.29.0-wmf.20",
@@ -482,7 +482,7 @@
 "maiwiki": "php-1.29.0-wmf.20",
 "map_bmswiki": "php-1.29.0-wmf.20",
 "mdfwiki": "php-1.29.0-wmf.20",
-"mediawikiwiki": "php-1.29.0-wmf.20",
+"mediawikiwiki": "php-1.29.0-wmf.21",
 "metawiki": "php-1.29.0-wmf.20",
 "mgwiki": "php-1.29.0-wmf.20",
 "mgwikibooks": "php-1.29.0-wmf.20",
@@ -754,9 +754,9 @@
 "tawiktionary": "php-1.29.0-wmf.20",
 "tcywiki": "php-1.29.0-wmf.20",
 "tenwiki": "php-1.29.0-wmf.20",
-"test2wiki": "php-1.29.0-wmf.20",
-"testwiki": "php-1.29.0-wmf.20",
-"testwikidatawiki": "php-1.29.0-wmf.20",
+"test2wiki": "php-1.29.0-wmf.21",
+"testwiki": "php-1.29.0-wmf.21",
+"testwikidatawiki": "php-1.29.0-wmf.21",
 "tetwiki": "php-1.29.0-wmf.20",
 "tewiki": "php-1.29.0-wmf.20",
 "tewikibooks": "php-1.29.0-wmf.20",
@@ -887,7 +887,7 @@
 "zawikiquote": "php-1.29.0-wmf.20",
 "zawiktionary": "php-1.29.0-wmf.20",
 "zeawiki": "php-1.29.0-wmf.20",
-"zerowiki": "php-1.29.0-wmf.20",
+"zerowiki": "php-1.29.0-wmf.21",
 "zh_classicalwiki": "php-1.29.0-wmf.20",
 "zh_min_nanwiki": "php-1.29.0-wmf.20",
 "zh_min_nanwikibooks": "php-1.29.0-wmf.20",

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie4920cf6a4ca68b3f88fd2be223d03e0d2ab8cf3
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: 20after4 
Gerrit-Reviewer: 20after4 

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

[MediaWiki-commits] [Gerrit] mediawiki...ORES[master]: Follow-up c047cd54d69ed: rename oresDamagingPref values back

[Catrope (Code Review)]

Catrope has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/350316 )

Change subject: Follow-up c047cd54d69ed: rename oresDamagingPref values back
..

Follow-up c047cd54d69ed: rename oresDamagingPref values back

Dealing with renamed preference values is going to be annoying,
especially in the config setting the default values. For now,
it's easier to unbreak things by renaming the preference values
back to hard/soft/softest and remapping them internally.

Bug: T160575
Change-Id: I228a636abea77548af16a830a8882b3327edc175
---
M extension.json
M includes/Hooks.php
2 files changed, 11 insertions(+), 10 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ORES 
refs/changes/16/350316/1

diff --git a/extension.json b/extension.json
index b83636f..a8fa853 100644
--- a/extension.json
+++ b/extension.json
@@ -161,7 +161,7 @@
},
"DefaultUserOptions": {
"ores-damaging-flag-rc": false,
-   "oresDamagingPref": "likelybad",
+   "oresDamagingPref": "hard",
"oresHighlight": false,
"oresRCHideNonDamaging": false,
"oresWatchlistHideNonDamaging": false
diff --git a/includes/Hooks.php b/includes/Hooks.php
index 859f7f6..bd6384e 100644
--- a/includes/Hooks.php
+++ b/includes/Hooks.php
@@ -30,6 +30,12 @@
 use Xml;
 
 class Hooks {
+   // The oresDamagingPref preference uses these names for historical 
reasons
+   protected static $damagingPrefMap = [
+   'hard' => 'maybebad',
+   'soft' => 'likelybad',
+   'softest' => 'verylikelybad',
+   ];
 
/**
 * @param DatabaseUpdater $updater
@@ -637,13 +643,8 @@
public static function getThreshold( $type, User $user ) {
if ( $type === 'damaging' ) {
$pref = $user->getOption( 'oresDamagingPref' );
-   $compatMap = [
-   'hard' => 'maybebad',
-   'soft' => 'likelybad',
-   'softest' => 'verylikelybad',
-   ];
-   if ( isset( $compatMap[ $pref ] ) ) {
-   $pref = $compatMap[ $pref ];
+   if ( isset( self::$damagingPrefMap[ $pref ] ) ) {
+   $pref = self::$damagingPrefMap[ $pref ];
}
$thresholds = self::getDamagingThresholds();
if ( isset( $thresholds[ $pref ] ) ) {
@@ -670,10 +671,10 @@
 
$options = [];
$damagingThresholds = self::getDamagingThresholds();
-   foreach ( [ 'maybebad', 'likelybad', 'verylikelybad' ] as 
$level ) {
+   foreach ( self::$damagingPrefMap as $prefName => $level ) {
if ( isset( $damagingThresholds[ $level ] ) ) {
$text = \wfMessage( 'ores-damaging-' . $level 
)->text();
-   $options[ $text ] = $level;
+   $options[ $text ] = $prefName;
}
}
$oresSection = $wgOresExtensionStatus === 'beta' ? 'rc/ores' : 
'watchlist/ores';

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I228a636abea77548af16a830a8882b3327edc175
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ORES
Gerrit-Branch: master
Gerrit-Owner: Catrope 

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Revert "openstack: Temporarily disable self service instance...

[Madhuvishy (Code Review)]

Madhuvishy has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/350315 )

Change subject: Revert "openstack: Temporarily disable self service instance 
creation and deletion on horizon"
..


Revert "openstack: Temporarily disable self service instance creation and 
deletion on horizon"

This reverts commit eb640c9101a37eb3e13a20d470c3f22a0e9e1a77.

Change-Id: I276475d6ba6ae3194f70dd7b51c57c08034b872d
---
M modules/openstack/files/mitaka/horizon/nova_policy.json
1 file changed, 2 insertions(+), 2 deletions(-)

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



diff --git a/modules/openstack/files/mitaka/horizon/nova_policy.json 
b/modules/openstack/files/mitaka/horizon/nova_policy.json
index 0d6dccf..30954cd 100644
--- a/modules/openstack/files/mitaka/horizon/nova_policy.json
+++ b/modules/openstack/files/mitaka/horizon/nova_policy.json
@@ -4,8 +4,8 @@
 "admin_or_projectadmin":  [["is_admin:True"], ["role:projectadmin"]],
 "default": [["rule:admin_or_projectadmin"]],
 
-"compute:create": "is_admin:True",
-"compute:delete": "is_admin:True",
+"compute:create": "rule:admin_or_projectadmin",
+"compute:delete": "rule:admin_or_projectadmin",
 "compute:create:attach_network": "role:admin",
 "compute:create:attach_volume": "role:admin",
 "compute:rebuild": "!",

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Revert "openstack: Temporarily disable self service instance...

[Madhuvishy (Code Review)]

Hello jenkins-bot,

I'd like you to do a code review.  Please visit

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

to review the following change.


Change subject: Revert "openstack: Temporarily disable self service instance 
creation and deletion on horizon"
..

Revert "openstack: Temporarily disable self service instance creation and 
deletion on horizon"

This reverts commit eb640c9101a37eb3e13a20d470c3f22a0e9e1a77.

Change-Id: I276475d6ba6ae3194f70dd7b51c57c08034b872d
---
M modules/openstack/files/mitaka/horizon/nova_policy.json
1 file changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/15/350315/1

diff --git a/modules/openstack/files/mitaka/horizon/nova_policy.json 
b/modules/openstack/files/mitaka/horizon/nova_policy.json
index 0d6dccf..30954cd 100644
--- a/modules/openstack/files/mitaka/horizon/nova_policy.json
+++ b/modules/openstack/files/mitaka/horizon/nova_policy.json
@@ -4,8 +4,8 @@
 "admin_or_projectadmin":  [["is_admin:True"], ["role:projectadmin"]],
 "default": [["rule:admin_or_projectadmin"]],
 
-"compute:create": "is_admin:True",
-"compute:delete": "is_admin:True",
+"compute:create": "rule:admin_or_projectadmin",
+"compute:delete": "rule:admin_or_projectadmin",
 "compute:create:attach_network": "role:admin",
 "compute:create:attach_volume": "role:admin",
 "compute:rebuild": "!",

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I276475d6ba6ae3194f70dd7b51c57c08034b872d
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Madhuvishy 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...parsoid[master]: Remove non-actionable warnings about stripped empty elements

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/350256 )

Change subject: Remove non-actionable warnings about stripped empty elements
..


Remove non-actionable warnings about stripped empty elements

* When we are ready to act on these, we can generate a lint category
  for these instead.

Change-Id: I97ad20ad23642daf09006677f1af792157b908e9
---
M lib/wt2html/pp/handlers/cleanup.js
1 file changed, 0 insertions(+), 3 deletions(-)

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



diff --git a/lib/wt2html/pp/handlers/cleanup.js 
b/lib/wt2html/pp/handlers/cleanup.js
index 8c35d8f..c1c56f4 100644
--- a/lib/wt2html/pp/handlers/cleanup.js
+++ b/lib/wt2html/pp/handlers/cleanup.js
@@ -51,9 +51,6 @@
if (!node.firstChild && node !== tplInfo.first &&
node.nodeName in {'TR': 1, 'LI': 1} && node.attributes.length 
=== 0
) {
-   env.log('warn/empty/' + node.nodeName.toLowerCase(),
-   'Template', DU.findEnclosingTemplateName(tplInfo),
-   'produces stripped empty elements');
var nextNode = node.nextSibling;
DU.deleteNode(node);
return nextNode;

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I97ad20ad23642daf09006677f1af792157b908e9
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/services/parsoid
Gerrit-Branch: master
Gerrit-Owner: Subramanya Sastry 
Gerrit-Reviewer: Arlolra 
Gerrit-Reviewer: C. Scott Ananian 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...parsoid[master]: Ignore nsp advisory for brace-expansion

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/350308 )

Change subject: Ignore nsp advisory for brace-expansion
..


Ignore nsp advisory for brace-expansion

 * It's a dep of an optional dep that we don't even install.

 * For now, at least, until new releases are available upstream.

Change-Id: Ib6afd492000ef47ed4aad57dae276e7175b18bec
---
A .nsprc
1 file changed, 5 insertions(+), 0 deletions(-)

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



diff --git a/.nsprc b/.nsprc
new file mode 100644
index 000..d0da284
--- /dev/null
+++ b/.nsprc
@@ -0,0 +1,5 @@
+{
+  "exceptions": [
+"https://nodesecurity.io/advisories/338;
+  ]
+}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib6afd492000ef47ed4aad57dae276e7175b18bec
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/parsoid
Gerrit-Branch: master
Gerrit-Owner: Arlolra 
Gerrit-Reviewer: C. Scott Ananian 
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] pywikibot/core[master]: Use raise ImportError instead of sys.exit(1) when requests i...

[Framawiki (Code Review)]

Framawiki has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/350314 )

Change subject: Use raise ImportError instead of sys.exit(1) when requests is 
not found
..

Use raise ImportError instead of sys.exit(1) when requests is not found

Bug: T76238
Change-Id: Iab6aa68c0022825e8ce0127f76d2df191a25917a
---
M pwb.py
1 file changed, 1 insertion(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core 
refs/changes/14/350314/1

diff --git a/pwb.py b/pwb.py
index ca7179f..9a6f764 100755
--- a/pwb.py
+++ b/pwb.py
@@ -161,9 +161,7 @@
 requests = None
 
 if not requests:
-print("Python module requests is required.")
-print("Try running 'pip install requests'.")
-sys.exit(1)
+raise ImportError("Python module 'requests' is required. Try running 'pip 
install requests'.")
 
 del requests
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iab6aa68c0022825e8ce0127f76d2df191a25917a
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: Framawiki 

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

[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: Add pa.wikisource.org

[Mobrovac (Code Review)]

Mobrovac has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/349967 )

Change subject: Add pa.wikisource.org
..


Add pa.wikisource.org

Bug: T149522
Change-Id: Ib390d7b29f9df617371141c7cf1157be99586d8f
---
M scap/vars.yaml
1 file changed, 1 insertion(+), 0 deletions(-)

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



diff --git a/scap/vars.yaml b/scap/vars.yaml
index 79ea858..7617e49 100644
--- a/scap/vars.yaml
+++ b/scap/vars.yaml
@@ -604,6 +604,7 @@
 nl.wikisource.org: default_project
 no.wikisource.org: default_project
 or.wikisource.org: default_project
+pa.wikisource.org: default_project
 pl.wikisource.org: default_project
 pt.wikisource.org: default_project
 ro.wikisource.org: default_project

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib390d7b29f9df617371141c7cf1157be99586d8f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/restbase/deploy
Gerrit-Branch: master
Gerrit-Owner: Dereckson 
Gerrit-Reviewer: Mobrovac 

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

[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: Add dty.wikipedia.org

[Mobrovac (Code Review)]

Mobrovac has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/349966 )

Change subject: Add dty.wikipedia.org
..


Add dty.wikipedia.org

Bug: T161529
Change-Id: I79d2c006df1139aa1ff6b23b34c2ee701716cd86
---
M scap/vars.yaml
1 file changed, 1 insertion(+), 0 deletions(-)

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



diff --git a/scap/vars.yaml b/scap/vars.yaml
index 79ea858..6d9a577 100644
--- a/scap/vars.yaml
+++ b/scap/vars.yaml
@@ -116,6 +116,7 @@
 de.wikipedia.org: default_project
 diq.wikipedia.org: default_project
 dsb.wikipedia.org: default_project
+dty.wikipedia.org: default_project
 dv.wikipedia.org: default_project
 dz.wikipedia.org: default_project
 ee.wikipedia.org: default_project

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I79d2c006df1139aa1ff6b23b34c2ee701716cd86
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/restbase/deploy
Gerrit-Branch: master
Gerrit-Owner: Dereckson 
Gerrit-Reviewer: Mobrovac 

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

[MediaWiki-commits] [Gerrit] mediawiki...VisualEditor[master]: Un-blacklist the lintid parameter

[Jforrester (Code Review)]

Jforrester has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/350313 )

Change subject: Un-blacklist the lintid parameter
..

Un-blacklist the lintid parameter

Depends-On: I59a7e0a3e8be32e4689cbf41c4904970902c4dff
Change-Id: Ie0e8d82db2dc3589c58a90a600ac0feb06159ed3
---
M VisualEditor.hooks.php
M modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js
2 files changed, 0 insertions(+), 2 deletions(-)


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

diff --git a/VisualEditor.hooks.php b/VisualEditor.hooks.php
index 6cf9256..18abf67 100644
--- a/VisualEditor.hooks.php
+++ b/VisualEditor.hooks.php
@@ -158,7 +158,6 @@
isset( $params['preload'] ) ||
isset( $params['preloadtitle'] ) ||
isset( $params['preloadparams'] ) ||
-   isset( $params['lintid'] ) ||
isset( $params['veswitched'] );
// Known-good parameters: edit, veaction, section
 
diff --git a/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js 
b/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js
index 9a2ae1e..716564f 100644
--- a/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js
+++ b/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js
@@ -873,7 +873,6 @@
uri.query.preload === undefined &&
uri.query.preloadtitle === undefined &&
uri.query.preloadparams === undefined &&
-   uri.query.lintid === undefined &&
uri.query.veswitched === undefined
// Known-good parameters: edit, veaction, 
section
// TODO: other params too? See identical list 
in VisualEditor.hooks.php)

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie0e8d82db2dc3589c58a90a600ac0feb06159ed3
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] mediawiki...Linter[master]: Support new wikitext editor for edit helper

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/342279 )

Change subject: Support new wikitext editor for edit helper
..


Support new wikitext editor for edit helper

Register a hook for when VE is finished initializing to select the error
section, just like the textbox-based editor.

Use the BeforePageDisplay hook so it runs on VE page loads too.

Bug: T160102
Change-Id: I59a7e0a3e8be32e4689cbf41c4904970902c4dff
---
M .jshintrc
M extension.json
M includes/Hooks.php
M modules/ext.linter.edit.js
4 files changed, 40 insertions(+), 11 deletions(-)

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



diff --git a/.jshintrc b/.jshintrc
index 66e3d48..fa96cd8 100644
--- a/.jshintrc
+++ b/.jshintrc
@@ -19,6 +19,7 @@
 
"globals": {
"mediaWiki": false,
+   "ve": false,
"OO": false
}
 }
diff --git a/extension.json b/extension.json
index 8931304..533253f 100644
--- a/extension.json
+++ b/extension.json
@@ -26,7 +26,7 @@
},
"Hooks": {
"LoadExtensionSchemaUpdates": 
"MediaWiki\\Linter\\Hooks::onLoadExtensionSchemaUpdates",
-   "EditFormInitialText": 
"MediaWiki\\Linter\\Hooks::onEditFormInitialText",
+   "BeforePageDisplay": 
"MediaWiki\\Linter\\Hooks::onBeforePageDisplay",
"APIQuerySiteInfoGeneralInfo": 
"MediaWiki\\Linter\\Hooks::onAPIQuerySiteInfoGeneralInfo",
"InfoAction": "MediaWiki\\Linter\\Hooks::onInfoAction",
"WikiPageDeletionUpdates": 
"MediaWiki\\Linter\\Hooks::onWikiPageDeletionUpdates"
diff --git a/includes/Hooks.php b/includes/Hooks.php
index 5626e1e..6498eeb 100644
--- a/includes/Hooks.php
+++ b/includes/Hooks.php
@@ -23,9 +23,9 @@
 use ApiQuerySiteInfo;
 use Content;
 use DatabaseUpdater;
-use EditPage;
 use IContextSource;
 use MWCallableUpdate;
+use OutputPage;
 use WikiPage;
 
 class Hooks {
@@ -38,21 +38,23 @@
}
 
/**
-* Hook: EditFormInitialText
+* Hook: BeforePageDisplay
 *
 * If there is a lintid parameter, look up that error in the database
 * and setup and output our client-side helpers
 *
-* @param EditPage $editPage
+* @param OutputPage &$out
 */
-   public static function onEditFormInitialText( EditPage $editPage ) {
-   $context = $editPage->getContext();
-   $request = $context->getRequest();
+   public static function onBeforePageDisplay( OutputPage &$out ) {
+   $request = $out->getRequest();
$lintId = $request->getInt( 'lintid' );
if ( !$lintId ) {
return;
}
-   $title = $editPage->getTitle();
+   $title = $out->getTitle();
+   if ( !$title ) {
+   return;
+   }
 
$lintError = ( new Database( $title->getArticleID() ) 
)->getFromId( $lintId );
if ( !$lintError ) {
@@ -60,7 +62,6 @@
return;
}
 
-   $out = $context->getOutput();
$out->addJsConfigVars( [
'wgLinterErrorCategory' => $lintError->category,
'wgLinterErrorLocation' => $lintError->location,
diff --git a/modules/ext.linter.edit.js b/modules/ext.linter.edit.js
index 5162219..fa13f98 100644
--- a/modules/ext.linter.edit.js
+++ b/modules/ext.linter.edit.js
@@ -1,8 +1,35 @@
 ( function ( mw, $ ) {
$( function () {
-   var location = mw.config.get( 'wgLinterErrorLocation' );
+   var location = mw.config.get( 'wgLinterErrorLocation' ),
+   $textbox = $( '#wpTextbox1' );
+
+   /**
+* Convert the normal offset for one that is usable
+* by VE's DOM that changes newlines into 
+*
+* @param {ve.ui.Surface} surface
+* @param {int} offset
+* @return {int}
+*/
+   function fixOffset( surface, offset ) {
+   return ( surface.getDom().slice( 0, offset ).match( 
/\n/g ) || [] ).length + 1 + offset;
+   }
+
if ( location ) {
-   $( '#wpTextbox1' ).focus().textSelection( 
'setSelection', { start: location[ 0 ], end: location[ 1 ] } );
+   if ( $textbox.length ) {
+   $textbox.focus().textSelection( 'setSelection', 
{ start: location[ 0 ], end: location[ 1 ] } );
+   }
+   // Register NWE code should it be loaded
+   // TODO: We should somehow force source mode if VE is 
opened
+   mw.hook( 've.activationComplete' ).add( function () {
+  

[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: Updates to ORES and new models from editquality.

[Halfak (Code Review)]

Halfak has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/350311 )

Change subject: Updates to ORES and new models from editquality.
..


Updates to ORES and new models from editquality.

Change-Id: Ibe6cb99e3d0a977ab66b554a935141440071fec9
---
M config/00-main.yaml
M submodules/editquality
M submodules/ores
M submodules/wikiclass
4 files changed, 13 insertions(+), 3 deletions(-)

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



diff --git a/config/00-main.yaml b/config/00-main.yaml
index 346d651..f6b082f 100644
--- a/config/00-main.yaml
+++ b/config/00-main.yaml
@@ -176,8 +176,14 @@
 extractor: fiwiki_api
 scorer_models:
   reverted: fiwiki_revert
+  damaging: fiwiki_damaging
+  goodfaith: fiwiki_goodfaith
 precache:
   reverted:
+"on": ["edit"]
+  damaging:
+"on": ["edit"]
+  goodfaith:
 "on": ["edit"]
   frwiki:
 extractor: frwiki_api
@@ -459,6 +465,10 @@
 model_file: 
submodules/editquality/models/fawiki.reverted.gradient_boosting.model
   fiwiki_revert:
 model_file: 
submodules/editquality/models/fiwiki.reverted.gradient_boosting.model
+  fiwiki_damaging:
+model_file: 
submodules/editquality/models/fiwiki.damaging.gradient_boosting.model
+  fiwiki_goodfaith:
+model_file: 
submodules/editquality/models/fiwiki.goodfaith.gradient_boosting.model
   frwiki_revert:
 model_file: 
submodules/editquality/models/frwiki.reverted.gradient_boosting.model
   frwiki_wp10:
diff --git a/submodules/editquality b/submodules/editquality
index 035a59c..d0c4071 16
--- a/submodules/editquality
+++ b/submodules/editquality
@@ -1 +1 @@
-Subproject commit 035a59c8e0febc02b321459caafdffaf8a3002a3
+Subproject commit d0c40715f1c8a951c7f98a196d8b5ab254750118
diff --git a/submodules/ores b/submodules/ores
index 93828f4..4af43ad 16
--- a/submodules/ores
+++ b/submodules/ores
@@ -1 +1 @@
-Subproject commit 93828f4303a8e051652396456ebab7e56eac996f
+Subproject commit 4af43ad78a5b68358b6025d422f1fde99c3aa9b0
diff --git a/submodules/wikiclass b/submodules/wikiclass
index 3ad9c1d..950f693 16
--- a/submodules/wikiclass
+++ b/submodules/wikiclass
@@ -1 +1 @@
-Subproject commit 3ad9c1d4c7eb9daff25bb2c9c57eb1f8cd04fcb5
+Subproject commit 950f693d789f8512e30f483f18e2d13483d13749

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ibe6cb99e3d0a977ab66b554a935141440071fec9
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/ores/deploy
Gerrit-Branch: master
Gerrit-Owner: Halfak 
Gerrit-Reviewer: Halfak 

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Enable BM25 for Chinese wikis

[Tjones (Code Review)]

Tjones has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/350312 )

Change subject: Enable BM25 for Chinese wikis
..

Enable BM25 for Chinese wikis

Enable BM25 scoring and other features, including phrase handling,
for Chinese wikis after new language analysis is complete

Bug: T163829
Change-Id: I2ef0dd2d3623c1b51819b5eb276d84c240cc4f34
Depends-On: I03fc83e389d17a4eaa69323e070f7e0c8491976d
---
M tests/cirrusTest.php
M wmf-config/InitialiseSettings.php
2 files changed, 3 insertions(+), 6 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config 
refs/changes/12/350312/1

diff --git a/tests/cirrusTest.php b/tests/cirrusTest.php
index eec305a..fbaf5df 100644
--- a/tests/cirrusTest.php
+++ b/tests/cirrusTest.php
@@ -263,9 +263,9 @@
return [
'zhwiki' => [ 'zhwiki', 'wiki',
[
-   'wmgCirrusSearchSimilarityProfile' => 
'default',
-   'wmgCirrusSearchRescoreProfile' => 
'classic',
-   
'wmgCirrusSearchFullTextQueryBuilderProfile' => 'default',
+   'wmgCirrusSearchSimilarityProfile' => 
'wmf_defaults',
+   'wmgCirrusSearchRescoreProfile' => 
'wsum_inclinks',
+   
'wmgCirrusSearchFullTextQueryBuilderProfile' => 'perfield_builder',
],
],
'zh_min_nanwikisource' => [ 'zh_min_nanwikisource', 
'wikisource',
diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index 4b9dcf9..eecd299 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -17323,7 +17323,6 @@
"my" => "default",
"th" => "default",
"wuu" => "default",
-   "zh" => "default",
"zh-classical" => "default", // should be deprecated in favor of lzh
"lzh" => "default", // zh-classical
"zh-yue" => "default", // should be deprecated in favor of yue
@@ -17353,7 +17352,6 @@
"my" => "classic",
"th" => "classic",
"wuu" => "classic",
-   "zh" => "classic",
"zh-classical" => "classic", // should be deprecated in favor of lzh
"lzh" => "classic", // zh-classical
"zh-yue" => "classic", // should be deprecated in favor of yue
@@ -17381,7 +17379,6 @@
"my" => "default",
"th" => "default",
"wuu" => "default",
-   "zh" => "default",
"zh-classical" => "default", // should be deprecated in favor of lzh
"lzh" => "default", // zh-classical
"zh-yue" => "default", // should be deprecated in favor of yue

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2ef0dd2d3623c1b51819b5eb276d84c240cc4f34
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Tjones 

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

[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: Updates to ORES and new models from editquality.

[Halfak (Code Review)]

Halfak has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/350311 )

Change subject: Updates to ORES and new models from editquality.
..

Updates to ORES and new models from editquality.

Change-Id: Ibe6cb99e3d0a977ab66b554a935141440071fec9
---
M config/00-main.yaml
M submodules/editquality
M submodules/ores
M submodules/wikiclass
4 files changed, 13 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/ores/deploy 
refs/changes/11/350311/1

diff --git a/config/00-main.yaml b/config/00-main.yaml
index 346d651..f6b082f 100644
--- a/config/00-main.yaml
+++ b/config/00-main.yaml
@@ -176,8 +176,14 @@
 extractor: fiwiki_api
 scorer_models:
   reverted: fiwiki_revert
+  damaging: fiwiki_damaging
+  goodfaith: fiwiki_goodfaith
 precache:
   reverted:
+"on": ["edit"]
+  damaging:
+"on": ["edit"]
+  goodfaith:
 "on": ["edit"]
   frwiki:
 extractor: frwiki_api
@@ -459,6 +465,10 @@
 model_file: 
submodules/editquality/models/fawiki.reverted.gradient_boosting.model
   fiwiki_revert:
 model_file: 
submodules/editquality/models/fiwiki.reverted.gradient_boosting.model
+  fiwiki_damaging:
+model_file: 
submodules/editquality/models/fiwiki.damaging.gradient_boosting.model
+  fiwiki_goodfaith:
+model_file: 
submodules/editquality/models/fiwiki.goodfaith.gradient_boosting.model
   frwiki_revert:
 model_file: 
submodules/editquality/models/frwiki.reverted.gradient_boosting.model
   frwiki_wp10:
diff --git a/submodules/editquality b/submodules/editquality
index 035a59c..d0c4071 16
--- a/submodules/editquality
+++ b/submodules/editquality
@@ -1 +1 @@
-Subproject commit 035a59c8e0febc02b321459caafdffaf8a3002a3
+Subproject commit d0c40715f1c8a951c7f98a196d8b5ab254750118
diff --git a/submodules/ores b/submodules/ores
index 93828f4..4af43ad 16
--- a/submodules/ores
+++ b/submodules/ores
@@ -1 +1 @@
-Subproject commit 93828f4303a8e051652396456ebab7e56eac996f
+Subproject commit 4af43ad78a5b68358b6025d422f1fde99c3aa9b0
diff --git a/submodules/wikiclass b/submodules/wikiclass
index 3ad9c1d..950f693 16
--- a/submodules/wikiclass
+++ b/submodules/wikiclass
@@ -1 +1 @@
-Subproject commit 3ad9c1d4c7eb9daff25bb2c9c57eb1f8cd04fcb5
+Subproject commit 950f693d789f8512e30f483f18e2d13483d13749

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibe6cb99e3d0a977ab66b554a935141440071fec9
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/ores/deploy
Gerrit-Branch: master
Gerrit-Owner: Halfak 

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

[MediaWiki-commits] [Gerrit] integration/config[master]: Remove the lint job from Parsoid

[Arlolra (Code Review)]

Arlolra has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/350310 )

Change subject: Remove the lint job from Parsoid
..

Remove the lint job from Parsoid

 * This is redundant with `npm test` and will probably take some
   coordinating once we switch to eslint.

Change-Id: I192827cc43f67dada1171b769b48fd2d86c5f3c9
---
M jjb/parsoidsvc.yaml
1 file changed, 0 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/10/350310/1

diff --git a/jjb/parsoidsvc.yaml b/jjb/parsoidsvc.yaml
index d238032..1f22611 100644
--- a/jjb/parsoidsvc.yaml
+++ b/jjb/parsoidsvc.yaml
@@ -179,8 +179,6 @@
  - source  # mediawiki/services/parsoid
  - deploy  # mediawiki/services/parsoid/deploy
 jobs:
-- '{name}-npm-run-{script}-node-6-jessie':
-script: 'lint'
 - 'parsoidsvc-{repository}-parse-tool-check-jessie'
 - 'parsoidsvc-{repository}-roundtrip-test-check-jessie'
 - 'parsoidsvc-{repository}-npm-node-6-jessie'

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

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

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

[MediaWiki-commits] [Gerrit] operations...nginx[wmf-1.11.10]: control: depend on libssl11-dev

[BBlack (Code Review)]

BBlack has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/348587 )

Change subject: control: depend on libssl11-dev
..


control: depend on libssl11-dev

This is how we're naming the OpenSSL-1.1 dev package locally at
WMF to avoid conflict with the deployed 1.0 packages.

Change-Id: I66994012e07c931035ee9f5c02df04f149030a53
---
M debian/control
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/debian/control b/debian/control
index 252ebd2..9ff681a 100644
--- a/debian/control
+++ b/debian/control
@@ -20,7 +20,7 @@
libpam0g-dev,
libpcre3-dev,
libperl-dev,
-   libssl-dev,
+   libssl11-dev,
libxslt1-dev,
po-debconf,
quilt,

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I66994012e07c931035ee9f5c02df04f149030a53
Gerrit-PatchSet: 2
Gerrit-Project: operations/software/nginx
Gerrit-Branch: wmf-1.11.10
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] operations...nginx[wmf-1.11.10]: nginx (1.11.10-1+wmf1) jessie-wikimedia; urgency=medium

[BBlack (Code Review)]

BBlack has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/348591 )

Change subject: nginx (1.11.10-1+wmf1) jessie-wikimedia; urgency=medium
..


nginx (1.11.10-1+wmf1) jessie-wikimedia; urgency=medium

* Rebased on debian experimental branch @ 1.11.10-1~exp2
* Added patch bringing upstream source to 1.11.13
* Forward-ported existing wmf-1.11.4 work onto 1.11.13:
  * WMF-specific debian/patches
* Cloudflare's Dynamic TLS Records
* Logging of TLS-negotiated ECDHE Curve
* Multiple certificate/file support for ssl_stapling_file
* Make OpenSSL "Version too low" log msgs non-critical
  * WMF-specific fixups to other debian files cherry-picked:
* Add/fix build patches to the echo and lua modules
* depend on wmf libssl11-dev for building
* create nginx-{full,light,extras}-dbg by hand

 -- Brandon Black   Tue, 25 Apr 2017 11:05:40 +

Change-Id: I601525009d09532672bb18a7d8a23ab5cdbcbf32
---
M debian/changelog
1 file changed, 17 insertions(+), 0 deletions(-)

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



diff --git a/debian/changelog b/debian/changelog
index 7465bc5..3ee85a7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,20 @@
+nginx (1.11.10-1+wmf1) jessie-wikimedia; urgency=medium
+
+* Rebased on debian experimental branch @ 1.11.10-1~exp2
+* Added patch bringing upstream source to 1.11.13
+* Forward-ported existing wmf-1.11.4 work onto 1.11.13:
+  * WMF-specific debian/patches
+* Cloudflare's Dynamic TLS Records
+* Logging of TLS-negotiated ECDHE Curve
+* Multiple certificate/file support for ssl_stapling_file
+* Make OpenSSL "Version too low" log msgs non-critical
+  * WMF-specific fixups to other debian files:
+* Add/fix build patches to the echo and lua modules
+* depend on wmf libssl11-dev for building
+* create nginx-{full,light,extras}-dbg by hand
+
+ -- Brandon Black   Tue, 25 Apr 2017 11:05:40 +
+
 nginx (1.11.10-1~exp2) UNRELEASED; urgency=medium
 
   * Configure build flags to work well with other arches and downstreams.

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I601525009d09532672bb18a7d8a23ab5cdbcbf32
Gerrit-PatchSet: 3
Gerrit-Project: operations/software/nginx
Gerrit-Branch: wmf-1.11.10
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] operations...nginx[wmf-1.11.10]: Create nginx-{full, light, extras}-dbg by hand.

[BBlack (Code Review)]

BBlack has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/348589 )

Change subject: Create nginx-{full,light,extras}-dbg by hand.
..


Create nginx-{full,light,extras}-dbg by hand.

Autogenerated -dbgsym packages are supported by debhelper
9.20151219 or greater, while Jessie ships 9.20150101.

Change-Id: I01266b7bccf9856add6780e2c71f9504a6977d4c
---
M debian/control
M debian/rules
2 files changed, 45 insertions(+), 1 deletion(-)

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



diff --git a/debian/control b/debian/control
index 9ff681a..7c9bab0 100644
--- a/debian/control
+++ b/debian/control
@@ -110,6 +110,20 @@
  THIRD PARTY MODULES: Auth PAM, DAV Ext, Echo, HTTP Substitutions, Upstream
  Fair Queue.
 
+Package: nginx-full-dbg
+Architecture: any
+Section: debug
+Priority: extra
+Depends: nginx-full (= ${binary:Version}), ${misc:Depends}
+Conflicts: nginx-extras-dbg, nginx-light-dbg
+Description: nginx web/proxy server (standard version) - debugging symbols
+ Nginx ("engine X") is a high-performance web and reverse proxy server
+ created by Igor Sysoev. It can be used both as a standalone web server
+ and as a proxy to reduce the load on back-end HTTP or mail servers.
+ .
+ This package provides debugging symbols for nginx-full, to assist in debugging
+ issues that you may find. It should not be required for normal operation.
+
 Package: nginx-light
 Architecture: any
 Priority: extra
@@ -137,6 +151,21 @@
  Pool, WebDAV, Upstream.
  .
  THIRD PARTY MODULES: Echo.
+
+Package: nginx-light-dbg
+Architecture: any
+Section: debug
+Priority: extra
+Depends: nginx-light (= ${binary:Version}), ${misc:Depends}
+Conflicts: nginx-extras-dbg, nginx-full-dbg
+Description: nginx web/proxy server (basic version) - debugging symbols
+ Nginx ("engine X") is a high-performance web and reverse proxy server
+ created by Igor Sysoev. It can be used both as a standalone web server
+ and as a proxy to reduce the load on back-end HTTP or mail servers.
+ .
+ This package provides debugging symbols for nginx-light, to assist in
+ debugging issues that you may find. It should not be required for normal
+ operation.
 
 Package: nginx-extras
 Architecture: any
@@ -190,6 +219,21 @@
  Headers More, Embedded Lua, HTTP Substitutions, Nchan, Upload Progress,
  Upstream Fair Queue.
 
+Package: nginx-extras-dbg
+Architecture: any
+Section: debug
+Priority: extra
+Depends: nginx-extras (= ${binary:Version}), ${misc:Depends}
+Conflicts: nginx-full-dbg, nginx-light-dbg
+Description: nginx web/proxy server (extended version) - debugging symbols
+ Nginx ("engine X") is a high-performance web and reverse proxy server
+ created by Igor Sysoev. It can be used both as a standalone web server
+ and as a proxy to reduce the load on back-end HTTP or mail servers.
+ .
+ This package provides debugging symbols for nginx-extras, to assist in
+ debugging issues that you may find. It should not be required for normal
+ operation.
+
 Package: libnginx-mod-http-geoip
 Architecture: any
 Depends: ${misc:Depends}, ${shlibs:Depends}
diff --git a/debian/rules b/debian/rules
index f223860..3dfff69 100755
--- a/debian/rules
+++ b/debian/rules
@@ -165,7 +165,7 @@
$(MAKE) -C $(BUILDDIR_$*) build
 
 strip.arch.%:
-   dh_strip --package=nginx-$(*) -O--dbgsym-migration='nginx-$(*)-dbg (<< 
1.10.1-3~)'
+   dh_strip --dbg-package=nginx-$(*)-dbg
 
 strip.mods.%:
dh_strip --package=libnginx-mod-$(*) -O--automatic-dbgsym

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I01266b7bccf9856add6780e2c71f9504a6977d4c
Gerrit-PatchSet: 2
Gerrit-Project: operations/software/nginx
Gerrit-Branch: wmf-1.11.10
Gerrit-Owner: BBlack 
Gerrit-Reviewer: BBlack 
Gerrit-Reviewer: Ema 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations...nginx[wmf-1.11.10]: Add nginx-echo 1.11.x fixup patch

[BBlack (Code Review)]

BBlack has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/350177 )

Change subject: Add nginx-echo 1.11.x fixup patch
..


Add nginx-echo 1.11.x fixup patch

Change-Id: Ic0465798a2df586f3bb3cf014175e9aabacde360
---
A debian/modules/patches/nginx-echo/nginx-1.11-fixup.patch
A debian/modules/patches/nginx-echo/series
2 files changed, 204 insertions(+), 0 deletions(-)

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



diff --git a/debian/modules/patches/nginx-echo/nginx-1.11-fixup.patch 
b/debian/modules/patches/nginx-echo/nginx-1.11-fixup.patch
new file mode 100644
index 000..61b92e2
--- /dev/null
+++ b/debian/modules/patches/nginx-echo/nginx-1.11-fixup.patch
@@ -0,0 +1,203 @@
+commit 7740e11558b530b66b469c657576f5280b7cdb1b
+Author: Andrei Belov 
+Date:   Wed Mar 22 08:43:30 2017 +0300
+
+feature: nginx 1.11.11+ can now build with this module.
+
+Note: nginx 1.11.11+ are still not an officially supported target yet.
+More work needed.
+
+Closes openresty/echo-nginx-module#64
+
+See also:
+http://hg.nginx.org/nginx/rev/e662cbf1b932
+
+Signed-off-by: Yichun Zhang (agentzh) 
+
+diff --git a/src/ngx_http_echo_module.c b/src/ngx_http_echo_module.c
+index ae70479..8d736d7 100644
+--- a/src/ngx_http_echo_module.c
 b/src/ngx_http_echo_module.c
+@@ -632,6 +632,9 @@ ngx_http_echo_echo_exec(ngx_conf_t *cf, ngx_command_t 
*cmd, void *conf)
+ static void *
+ ngx_http_echo_create_main_conf(ngx_conf_t *cf)
+ {
++#if nginx_version >= 1011011
++ngx_pool_cleanup_t   *cln;
++#endif
+ ngx_http_echo_main_conf_t*emcf;
+ 
+ emcf = ngx_pcalloc(cf->pool, sizeof(ngx_http_echo_main_conf_t));
+@@ -643,6 +646,16 @@ ngx_http_echo_create_main_conf(ngx_conf_t *cf)
+  *  hmcf->requires_filter = 0;
+  */
+ 
++#if nginx_version >= 1011011
++cln = ngx_pool_cleanup_add(cf->pool, 0);
++if (cln == NULL) {
++return NULL;
++}
++
++cln->data = emcf;
++cln->handler = ngx_http_echo_request_headers_cleanup;
++#endif
++
+ return emcf;
+ }
+ 
+diff --git a/src/ngx_http_echo_module.h b/src/ngx_http_echo_module.h
+index 2d212c3..ce0a305 100644
+--- a/src/ngx_http_echo_module.h
 b/src/ngx_http_echo_module.h
+@@ -92,6 +92,10 @@ typedef struct {
+ 
+ typedef struct {
+ ngx_int_t   requires_filter;
++#if nginx_version >= 1011011
++ngx_buf_t **busy_buf_ptrs;
++ngx_int_t   busy_buf_ptr_count;
++#endif
+ } ngx_http_echo_main_conf_t;
+ 
+ 
+diff --git a/src/ngx_http_echo_request_info.c 
b/src/ngx_http_echo_request_info.c
+index d28ec4d..7dd3683 100644
+--- a/src/ngx_http_echo_request_info.c
 b/src/ngx_http_echo_request_info.c
+@@ -17,6 +17,9 @@
+ 
+ 
+ static void ngx_http_echo_post_read_request_body(ngx_http_request_t *r);
++#if nginx_version >= 1011011
++void ngx_http_echo_request_headers_cleanup(void *data);
++#endif
+ 
+ 
+ ngx_int_t
+@@ -179,6 +182,11 @@ 
ngx_http_echo_client_request_headers_variable(ngx_http_request_t *r,
+ ngx_int_ti, j;
+ ngx_buf_t   *b, *first = NULL;
+ unsigned found;
++#if nginx_version >= 1011011
++ngx_buf_t  **bb;
++ngx_chain_t *cl;
++ngx_http_echo_main_conf_t   *emcf;
++#endif
+ ngx_connection_t*c;
+ ngx_http_request_t  *mr;
+ ngx_http_connection_t   *hc;
+@@ -195,6 +203,10 @@ 
ngx_http_echo_client_request_headers_variable(ngx_http_request_t *r,
+ }
+ #endif
+ 
++#if nginx_version >= 1011011
++emcf = ngx_http_get_module_main_conf(r, ngx_http_echo_module);
++#endif
++
+ size = 0;
+ b = c->buffer;
+ 
+@@ -215,8 +227,35 @@ 
ngx_http_echo_client_request_headers_variable(ngx_http_request_t *r,
+ 
+ if (hc->nbusy) {
+ b = NULL;
++
++#if nginx_version >= 1011011
++if (hc->nbusy > emcf->busy_buf_ptr_count) {
++if (emcf->busy_buf_ptrs) {
++ngx_free(emcf->busy_buf_ptrs);
++}
++
++emcf->busy_buf_ptrs = ngx_alloc(hc->nbusy * sizeof(ngx_buf_t *),
++r->connection->log);
++
++if (emcf->busy_buf_ptrs == NULL) {
++return NGX_ERROR;
++}
++
++emcf->busy_buf_ptr_count = hc->nbusy;
++}
++
++bb = emcf->busy_buf_ptrs;
++for (cl = hc->busy; cl; cl = cl->next) {
++*bb++ = cl->buf;
++}
++
++bb = emcf->busy_buf_ptrs;
++for (i = hc->nbusy; i > 0; i--) {
++b = bb[i - 1];
++#else
+ for (i = 0; i < hc->nbusy; i++) {
+ b = hc->busy[i];
++#endif
+ 
+ if (first == NULL) {
+ if (mr->request_line.data >= b->pos
+@@ -280,8 +319,15 @@ 
ngx_http_echo_client_request_headers_variable(ngx_http_request_t *r,
+ }
+ 
+

[MediaWiki-commits] [Gerrit] operations...nginx[wmf-1.11.10]: debian patches: forward-port WMF patches and quilt refresh

[BBlack (Code Review)]

BBlack has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/348586 )

Change subject: debian patches: forward-port WMF patches and quilt refresh
..


debian patches: forward-port WMF patches and quilt refresh

This forward-ports the WMF-specific debian patches from wmf-1.11.4
and quilt refreshes all patches.

Change-Id: Icf63c6b220cf9c33eb462eb109e1956fce3d3fb3
---
M debian/patches/0002-Make-sure-signature-stays-the-same-in-all-nginx-buil.patch
A debian/patches/0100-dynamic-tls-records.patch
A debian/patches/0500-ssl-curve.patch
A debian/patches/0600-stapling-multi-file.patch
A debian/patches/0660-version-too-low.patch
M debian/patches/series
6 files changed, 729 insertions(+), 3 deletions(-)

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



diff --git 
a/debian/patches/0002-Make-sure-signature-stays-the-same-in-all-nginx-buil.patch
 
b/debian/patches/0002-Make-sure-signature-stays-the-same-in-all-nginx-buil.patch
index 9cc3962..9e27e1a 100644
--- 
a/debian/patches/0002-Make-sure-signature-stays-the-same-in-all-nginx-buil.patch
+++ 
b/debian/patches/0002-Make-sure-signature-stays-the-same-in-all-nginx-buil.patch
@@ -13,11 +13,9 @@
  configure | 4 
  1 file changed, 4 insertions(+)
 
-diff --git a/configure b/configure
-index ceff15e..3816fa1 100755
 --- a/configure
 +++ b/configure
-@@ -58,6 +58,10 @@ if [ "$NGX_PLATFORM" != win32 ]; then
+@@ -58,6 +58,10 @@
  . auto/unix
  fi
  
diff --git a/debian/patches/0100-dynamic-tls-records.patch 
b/debian/patches/0100-dynamic-tls-records.patch
new file mode 100644
index 000..012239e
--- /dev/null
+++ b/debian/patches/0100-dynamic-tls-records.patch
@@ -0,0 +1,249 @@
+What we do now:
+We use a static record size of 4K. This gives a good balance of latency and
+throughput.
+
+Optimize latency:
+By initialy sending small (1 TCP segment) sized records, we are able to avoid
+HoL blocking of the first byte. This means TTFB is sometime lower by a whole
+RTT.
+
+Optimizing throughput:
+By sending increasingly larger records later in the connection, when HoL is not
+a problem, we reduce the overhead of TLS record (29 bytes per record with
+GCM/CHACHA-POLY).
+
+Logic:
+Start each connection with small records (1369 byte default, change with
+ssl_dyn_rec_size_lo). After a given number of records (40, change with
+ssl_dyn_rec_threshold) start sending larger records (4229, 
ssl_dyn_rec_size_hi).
+Eventually after the same number of records, start sending the largest records
+(ssl_buffer_size).
+In case the connection idles for a given amount of time (1s,
+ssl_dyn_rec_timeout), the process repeats itself (i.e. begin sending small
+records again).
+
+--- a/src/event/ngx_event_openssl.c
 b/src/event/ngx_event_openssl.c
+@@ -1165,6 +1165,7 @@
+ 
+ sc->buffer = ((flags & NGX_SSL_BUFFER) != 0);
+ sc->buffer_size = ssl->buffer_size;
++sc->dyn_rec = ssl->dyn_rec;
+ 
+ sc->session_ctx = ssl->ctx;
+ 
+@@ -1703,6 +1704,41 @@
+ 
+ for ( ;; ) {
+ 
++/* Dynamic record resizing:
++   We want the initial records to fit into one TCP segment
++   so we don't get TCP HoL blocking due to TCP Slow Start.
++   A connection always starts with small records, but after
++   a given amount of records sent, we make the records larger
++   to reduce header overhead.
++   After a connection has idled for a given timeout, begin
++   the process from the start. The actual parameters are
++   configurable. If dyn_rec_timeout is 0, we assume dyn_rec is off. */
++
++if (c->ssl->dyn_rec.timeout > 0 ) {
++
++if (ngx_current_msec - c->ssl->dyn_rec_last_write >
++c->ssl->dyn_rec.timeout)
++{
++buf->end = buf->start + c->ssl->dyn_rec.size_lo;
++c->ssl->dyn_rec_records_sent = 0;
++
++} else {
++if (c->ssl->dyn_rec_records_sent >
++c->ssl->dyn_rec.threshold * 2)
++{
++buf->end = buf->start + c->ssl->buffer_size;
++
++} else if (c->ssl->dyn_rec_records_sent >
++   c->ssl->dyn_rec.threshold)
++{
++buf->end = buf->start + c->ssl->dyn_rec.size_hi;
++
++} else {
++buf->end = buf->start + c->ssl->dyn_rec.size_lo;
++}
++}
++}
++
+ while (in && buf->last < buf->end && send < limit) {
+ if (in->buf->last_buf || in->buf->flush) {
+ flush = 1;
+@@ -1804,6 +1840,9 @@
+ 
+ if (n > 0) {
+ 
++c->ssl->dyn_rec_records_sent++;
++c->ssl->dyn_rec_last_write = ngx_current_msec;
++
+ if (c->ssl->saved_read_handler) {
+ 
+ c->read->handler = c->ssl->saved_read_handler;
+--- a/src/event/ngx_event_openssl.h
 

[MediaWiki-commits] [Gerrit] oojs/ui[master]: ProgressBarWidget: Switch to `border-box`

[VolkerE (Code Review)]

VolkerE has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/350309 )

Change subject: ProgressBarWidget: Switch to `border-box`
..

ProgressBarWidget: Switch to `border-box`

Bug: T163835
Change-Id: I5a293e90aab936bd799c503283b864e105d02535
---
M src/styles/widgets/ProgressBarWidget.less
1 file changed, 6 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/09/350309/1

diff --git a/src/styles/widgets/ProgressBarWidget.less 
b/src/styles/widgets/ProgressBarWidget.less
index 82993fc..a3a2567 100644
--- a/src/styles/widgets/ProgressBarWidget.less
+++ b/src/styles/widgets/ProgressBarWidget.less
@@ -1,5 +1,11 @@
 @import '../common';
 
 .oo-ui-progressBarWidget {
+   .oo-ui-box-sizing( border-box );
+
+   * {
+   .oo-ui-box-sizing( border-box );
+   }
+
.theme-oo-ui-progressBarWidget();
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I5a293e90aab936bd799c503283b864e105d02535
Gerrit-PatchSet: 1
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: VolkerE 

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

[MediaWiki-commits] [Gerrit] mediawiki...parsoid[master]: Ignore nsp advisory for brace-expansion

[Arlolra (Code Review)]

Arlolra has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/350308 )

Change subject: Ignore nsp advisory for brace-expansion
..

Ignore nsp advisory for brace-expansion

 * It's a dep of an optional dep that we don't even install.

 * For now, at least, until new releases are available upstream.

Change-Id: Ib6afd492000ef47ed4aad57dae276e7175b18bec
---
A .nsprc
1 file changed, 5 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/parsoid 
refs/changes/08/350308/1

diff --git a/.nsprc b/.nsprc
new file mode 100644
index 000..d0da284
--- /dev/null
+++ b/.nsprc
@@ -0,0 +1,5 @@
+{
+  "exceptions": [
+"https://nodesecurity.io/advisories/338;
+  ]
+}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib6afd492000ef47ed4aad57dae276e7175b18bec
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/parsoid
Gerrit-Branch: master
Gerrit-Owner: Arlolra 

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

[MediaWiki-commits] [Gerrit] oojs/ui[master]: themes: Field*Layout help position perfectly aligned

[VolkerE (Code Review)]

VolkerE has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/350307 )

Change subject: themes: Field*Layout help position perfectly aligned
..

themes: Field*Layout help position perfectly aligned

Foremost MediaWiki theme, making FieldLayout's and FieldSetLayout's
help PopupButtonWidget position perfectly aligned with label baseline
and vertically with widgets.
Also resetting Frameless ButtonWidget's sizes specifically for help
PopupButtonWidget.

Bug: T163094
Change-Id: I9da8b446d7d5dcaa3bd849b58e03247fe77ee889
---
M src/styles/layouts/FieldLayout.less
M src/themes/apex/layouts.less
M src/themes/mediawiki/common.less
M src/themes/mediawiki/layouts.less
4 files changed, 62 insertions(+), 21 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/07/350307/1

diff --git a/src/styles/layouts/FieldLayout.less 
b/src/styles/layouts/FieldLayout.less
index 5498835..0c30e5b 100644
--- a/src/styles/layouts/FieldLayout.less
+++ b/src/styles/layouts/FieldLayout.less
@@ -60,14 +60,5 @@
}
}
 
-   &.oo-ui-fieldLayout-align-top,
-   &.oo-ui-fieldLayout-align-inline {
-   .oo-ui-fieldLayout-help {
-   // HACK: The height of this ButtonWidget extends below 
the header line (with align: top),
-   // causing the field widget to be narrower than it 
should be. 0.3em chosen experimentally.
-   margin-top: -0.3em;
-   }
-   }
-
.theme-oo-ui-fieldLayout();
 }
diff --git a/src/themes/apex/layouts.less b/src/themes/apex/layouts.less
index d3afde0..bca523f 100644
--- a/src/themes/apex/layouts.less
+++ b/src/themes/apex/layouts.less
@@ -78,6 +78,15 @@
}
}
 
+   &.oo-ui-fieldLayout-align-top,
+   &.oo-ui-fieldLayout-align-inline {
+   .oo-ui-fieldLayout-help {
+   // HACK: This PopupButtonWidget's height extends below 
the header line (with align: top),
+   // causing the field widget to be narrower than it 
should be. 0.3em chosen experimentally.
+   margin-top: -0.3em;
+   }
+   }
+
> .oo-ui-popupButtonWidget {
.oo-ui-inline-spacing(0);
margin-top: 0.25em;
diff --git a/src/themes/mediawiki/common.less b/src/themes/mediawiki/common.less
index 83d4e58..ac3b05a 100644
--- a/src/themes/mediawiki/common.less
+++ b/src/themes/mediawiki/common.less
@@ -80,12 +80,13 @@
 @size-indicator: 12 / @oo-ui-font-size-browser / @oo-ui-font-size-default; // 
equals `0.9375em`≈`12px`
 @size-toggleswitch-grip-min: 16px;
 @size-dialog-bar-top: 44 / @oo-ui-font-size-browser / 
@oo-ui-font-size-default; // equals `3.4375em`≈`44px`
+@size-fieldlayout-help-icon: 22 / @oo-ui-font-size-browser / 
@oo-ui-font-size-default;
 
 @start-framed-icon-only: 7 / @oo-ui-font-size-browser / 
@oo-ui-font-size-default; // equals `0.547em`≈`7px`; HACK: We have to break 
with `@padding-start-input-text-icon` to perfectly center in 
`@min-width-button-default`
 @start-framed-indicator-only: 13 / @oo-ui-font-size-browser / 
@oo-ui-font-size-default; // equals `1.09375em`≈`14px`; `@size-indicator + 2 * 
@border-width-default`
 @start-framed-square-indicator-only: 9 / @oo-ui-font-size-browser / 
@oo-ui-font-size-default; // equals `0.703125em`≈`9px`
 @start-frameless: -@start-frameless-icon;
-@start-frameless-icon: 3 / @oo-ui-font-size-browser / @oo-ui-font-size-default;
+@start-frameless-icon: 3 / @oo-ui-font-size-browser / 
@oo-ui-font-size-default; // equals `0.234375em`≈`3px`
 
 @width-button-combo-widget: @min-width-button-combo-widget;
 
@@ -95,6 +96,8 @@
 @margin-dialog-bar-button-framed: 6 / @oo-ui-font-size-browser / 
@oo-ui-font-size-default; // equals `0.46875em`≈`6px`
 @margin-search: 12 / @oo-ui-font-size-browser / @oo-ui-font-size-default;
 @margin-taboption: @margin-dialog-bar-button-framed;
+@margin-top-fieldlayout-help: -( 6 / @oo-ui-font-size-browser / 
@oo-ui-font-size-default );
+@margin-top-fieldsetlayout-help: -( 6 / @oo-ui-font-size-browser / 
@oo-ui-font-size-default ) / 2;
 
 @border-default: @border-width-default solid @border-color-default;
 @border-disabled: @border-width-default solid @border-color-disabled;
diff --git a/src/themes/mediawiki/layouts.less 
b/src/themes/mediawiki/layouts.less
index 9f5ca11..ee23aa3 100644
--- a/src/themes/mediawiki/layouts.less
+++ b/src/themes/mediawiki/layouts.less
@@ -53,7 +53,7 @@
 
&.oo-ui-labelElement {
> .oo-ui-fieldLayout-body > .oo-ui-fieldLayout-header {
-   padding-bottom: 0.3125em; // equals `4px` at base 
`font-size: 12.8px`
+   padding-bottom: @padding-vertical-label;
 
> .oo-ui-labelElement-label {
line-height: @line-height-form-element;
@@ -74,14 +74,14 @@
 
 

[MediaWiki-commits] [Gerrit] operations...import-tools[master]: tabs to spaces, blame mutante.

[ArielGlenn (Code Review)]

ArielGlenn has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/350282 )

Change subject: tabs to spaces, blame mutante.
..


tabs to spaces, blame mutante.

Change-Id: If44a6524de3a06198b796dfb68ec041cf9e455c0
---
M xmlfileutils/base36.c
M xmlfileutils/filebuffers.c
M xmlfileutils/mwxml2sql.h
M xmlfileutils/mwxmlelts.c
M xmlfileutils/sql2txt.c
M xmlfileutils/sqlfilter.c
M xmlfileutils/sqlutils.c
M xmlfileutils/xmltags.c
8 files changed, 379 insertions(+), 379 deletions(-)

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



diff --git a/xmlfileutils/base36.c b/xmlfileutils/base36.c
index 089f499..3ec0fc8 100644
--- a/xmlfileutils/base36.c
+++ b/xmlfileutils/base36.c
@@ -22,7 +22,7 @@
   will be placed, one base-36 digit per int.  no checks
   are made as to the length being sufficient, this is the
   caller's responsibility, strlen(in)*24/5 +1 (length needed
- for base 32) should be enough
+  for base 32) should be enough
 
returns:
   number of base 36 digits in the result
@@ -47,11 +47,11 @@
 
 while (in_ind < in_len) {
   if (in_copy[in_ind] < 36) {
-   overflow = in_copy[in_ind++];
-   if (in_len == 1) {
- done++;
- break;
-   }
+overflow = in_copy[in_ind++];
+if (in_len == 1) {
+  done++;
+  break;
+}
   }
   digits = overflow << 24 | in_copy[in_ind++];
   temp[temp_ind++] = digits / 36;
@@ -147,9 +147,9 @@
   int_buf_lenlength of array of ints
   s  pre-allocated buffer into which the representation
  of the int array will be placed.  the string is
-the null-terminated. no check is made to determine
-that the buffer is large enough, that is the caller's
-responsibility, int_buf_len + 1 is enough.
+ the null-terminated. no check is made to determine
+ that the buffer is large enough, that is the caller's
+ responsibility, int_buf_len + 1 is enough.
 
this function converts an array of integers, each element representing
a base-36 value, into a character string representing the array
diff --git a/xmlfileutils/filebuffers.c b/xmlfileutils/filebuffers.c
index 650bf46..4a2d9e3 100644
--- a/xmlfileutils/filebuffers.c
+++ b/xmlfileutils/filebuffers.c
@@ -33,8 +33,8 @@
   if (!file_name) return(NULL);
   if ((start = strrchr(file_name, '.')) != NULL) {
 if (!strcmp(start, BZSUFFIX) ||
-   !strcmp(start, GZSUFFIX) ||
-   !strcmp(start, TXTSUFFIX)) {
+!strcmp(start, GZSUFFIX) ||
+!strcmp(start, TXTSUFFIX)) {
 }
 copy = (char *)malloc(start - file_name +1);
 if (!copy) {
@@ -73,16 +73,16 @@
   if (!file_name) return(NULL);
   if ((start = strrchr(file_name, '.')) != NULL) {
 if (!strcmp(start, BZSUFFIX) ||
-   !strcmp(start, GZSUFFIX) ||
-   !strcmp(start, TXTSUFFIX)) {
+!strcmp(start, GZSUFFIX) ||
+!strcmp(start, TXTSUFFIX)) {
   copy = (char *)malloc(file_name+strlen(file_name) - start +1);
   if (!copy) {
-   fprintf(stderr,"failed to get memory for output filename\n");
-   return(NULL);
+fprintf(stderr,"failed to get memory for output filename\n");
+return(NULL);
   }
   strcpy(copy, start);
   if (verbose > 1)
-   fprintf(stderr,"passed %s and returning suffix %s\n", file_name, copy);
+fprintf(stderr,"passed %s and returning suffix %s\n", file_name, copy);
   return(copy);
 }
   }
@@ -636,36 +636,36 @@
   outf->filetype = PLAINTEXT;
   outf->fd = fopen (outf->filename, "w");
   if (!outf->fd) {
-   fprintf(stderr,"failed to open file for write");
-   free_output_file(head);
-   return(NULL);
+fprintf(stderr,"failed to open file for write");
+free_output_file(head);
+return(NULL);
   }
 }
 else if (!strcmp(suffix,BZSUFFIX)) {
   outf->filetype = BZCOMPRESSED;
   outf->bz2fd = BZ2_bzopen(outf->filename, "w");
   if (!outf->bz2fd) {
-   fprintf(stderr,"failed to open bz2 file for write");
-   free_output_file(head);
-   return(NULL);
+fprintf(stderr,"failed to open bz2 file for write");
+free_output_file(head);
+return(NULL);
   }
 }
 else if (!strcmp(suffix, GZSUFFIX)) {
   outf->filetype = GZCOMPRESSED;
   outf->gzfd = gzopen(outf->filename, "w");
   if (!outf->gzfd) {
-   fprintf(stderr,"failed to open gz file for write");
-   free_output_file(head);
-   return(NULL);
+fprintf(stderr,"failed to open gz file for write");
+free_output_file(head);
+return(NULL);
   }
 }
 else {
   outf->filetype = PLAINTEXT;
   outf->fd = fopen (outf->filename, "w");
   

[MediaWiki-commits] [Gerrit] mediawiki/core[wmf/1.29.0-wmf.21]: Fix wgVersion

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/350293 )

Change subject: Fix wgVersion
..


Fix wgVersion

Change-Id: Ibaaade1fe3623bfb004335c80dd3370d0af49582
---
M includes/DefaultSettings.php
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index 9e08fa1..6b52950 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -75,7 +75,7 @@
  * MediaWiki version number
  * @since 1.2
  */
-$wgVersion = 'ew';
+$wgVersion = '1.29.0-wmf.21';
 
 /**
  * Name of the site. It must be changed in LocalSettings.php

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ibaaade1fe3623bfb004335c80dd3370d0af49582
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.29.0-wmf.21
Gerrit-Owner: 20after4 
Gerrit-Reviewer: 20after4 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki/core[wmf/1.29.0-wmf.21]: Fix wgVersion

[20after4 (Code Review)]

20after4 has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/350293 )

Change subject: Fix wgVersion
..

Fix wgVersion

Change-Id: Ibaaade1fe3623bfb004335c80dd3370d0af49582
---
M includes/DefaultSettings.php
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/93/350293/1

diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index 9e08fa1..6b52950 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -75,7 +75,7 @@
  * MediaWiki version number
  * @since 1.2
  */
-$wgVersion = 'ew';
+$wgVersion = '1.29.0-wmf.21';
 
 /**
  * Name of the site. It must be changed in LocalSettings.php

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibaaade1fe3623bfb004335c80dd3370d0af49582
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.29.0-wmf.21
Gerrit-Owner: 20after4 

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

[MediaWiki-commits] [Gerrit] mediawiki/core[wmf/1.29.0-wmf.21]: Fix .gitmodules (rename incorrectly named branch)

[20after4 (Code Review)]

20after4 has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/350273 )

Change subject: Fix .gitmodules (rename incorrectly named branch)
..


Fix .gitmodules (rename incorrectly named branch)

somehow the new branch got named wmf/ew, this has been fixed by
renaming to wmf/1.29.0-wmf.21 - now I just need to fix .gitmodules.

Change-Id: I5ca652526091e26947ac73134b7fc6567f7549a3
---
M .gitmodules
1 file changed, 165 insertions(+), 165 deletions(-)

Approvals:
  20after4: Verified; Looks good to me, approved



diff --git a/.gitmodules b/.gitmodules
index cd1f34d..0ea3fb9 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -25,660 +25,660 @@
 [submodule "extensions/AbuseFilter"]
path = extensions/AbuseFilter
url = https://gerrit.wikimedia.org/r/mediawiki/extensions/AbuseFilter
-   branch = wmf/ew
+   branch = wmf/1.29.0-wmf.21
 [submodule "extensions/AccountAudit"]
path = extensions/AccountAudit
url = https://gerrit.wikimedia.org/r/mediawiki/extensions/AccountAudit
-   branch = wmf/ew
+   branch = wmf/1.29.0-wmf.21
 [submodule "extensions/ActiveAbstract"]
path = extensions/ActiveAbstract
url = https://gerrit.wikimedia.org/r/mediawiki/extensions/ActiveAbstract
-   branch = wmf/ew
+   branch = wmf/1.29.0-wmf.21
 [submodule "extensions/AntiSpoof"]
path = extensions/AntiSpoof
url = https://gerrit.wikimedia.org/r/mediawiki/extensions/AntiSpoof
-   branch = wmf/ew
+   branch = wmf/1.29.0-wmf.21
 [submodule "extensions/ApiFeatureUsage"]
path = extensions/ApiFeatureUsage
url = 
https://gerrit.wikimedia.org/r/mediawiki/extensions/ApiFeatureUsage
-   branch = wmf/ew
+   branch = wmf/1.29.0-wmf.21
 [submodule "extensions/Babel"]
path = extensions/Babel
url = https://gerrit.wikimedia.org/r/mediawiki/extensions/Babel
-   branch = wmf/ew
+   branch = wmf/1.29.0-wmf.21
 [submodule "extensions/BetaFeatures"]
path = extensions/BetaFeatures
url = https://gerrit.wikimedia.org/r/mediawiki/extensions/BetaFeatures
-   branch = wmf/ew
+   branch = wmf/1.29.0-wmf.21
 [submodule "extensions/BounceHandler"]
path = extensions/BounceHandler
url = https://gerrit.wikimedia.org/r/mediawiki/extensions/BounceHandler
-   branch = wmf/ew
+   branch = wmf/1.29.0-wmf.21
 [submodule "extensions/Calendar"]
path = extensions/Calendar
url = https://gerrit.wikimedia.org/r/mediawiki/extensions/Calendar
-   branch = wmf/ew
+   branch = wmf/1.29.0-wmf.21
 [submodule "extensions/Campaigns"]
path = extensions/Campaigns
url = https://gerrit.wikimedia.org/r/mediawiki/extensions/Campaigns
-   branch = wmf/ew
+   branch = wmf/1.29.0-wmf.21
 [submodule "extensions/Capiunto"]
path = extensions/Capiunto
url = https://gerrit.wikimedia.org/r/mediawiki/extensions/Capiunto
-   branch = wmf/ew
+   branch = wmf/1.29.0-wmf.21
 [submodule "extensions/Cards"]
path = extensions/Cards
url = https://gerrit.wikimedia.org/r/mediawiki/extensions/Cards
-   branch = wmf/ew
+   branch = wmf/1.29.0-wmf.21
 [submodule "extensions/CategoryTree"]
path = extensions/CategoryTree
url = https://gerrit.wikimedia.org/r/mediawiki/extensions/CategoryTree
-   branch = wmf/ew
+   branch = wmf/1.29.0-wmf.21
 [submodule "extensions/CentralAuth"]
path = extensions/CentralAuth
url = https://gerrit.wikimedia.org/r/mediawiki/extensions/CentralAuth
-   branch = wmf/ew
+   branch = wmf/1.29.0-wmf.21
 [submodule "extensions/CharInsert"]
path = extensions/CharInsert
url = https://gerrit.wikimedia.org/r/mediawiki/extensions/CharInsert
-   branch = wmf/ew
+   branch = wmf/1.29.0-wmf.21
 [submodule "extensions/CheckUser"]
path = extensions/CheckUser
url = https://gerrit.wikimedia.org/r/mediawiki/extensions/CheckUser
-   branch = wmf/ew
+   branch = wmf/1.29.0-wmf.21
 [submodule "extensions/CirrusSearch"]
path = extensions/CirrusSearch
url = https://gerrit.wikimedia.org/r/mediawiki/extensions/CirrusSearch
-   branch = wmf/ew
+   branch = wmf/1.29.0-wmf.21
 [submodule "extensions/Cite"]
path = extensions/Cite
url = https://gerrit.wikimedia.org/r/mediawiki/extensions/Cite
-   branch = wmf/ew
+   branch = wmf/1.29.0-wmf.21
 [submodule "extensions/CiteThisPage"]
path = extensions/CiteThisPage
url = https://gerrit.wikimedia.org/r/mediawiki/extensions/CiteThisPage
-   branch = wmf/ew
+   branch = wmf/1.29.0-wmf.21
 [submodule "extensions/Citoid"]
path = extensions/Citoid
url = https://gerrit.wikimedia.org/r/mediawiki/extensions/Citoid
-   branch = wmf/ew
+   branch = wmf/1.29.0-wmf.21
 [submodule "extensions/cldr"]
path = extensions/cldr