[MediaWiki-commits] [Gerrit] cache: Normalise hostname for /w/skins, resources, extensions - change (operations/puppet)

[Krinkle (Code Review)]

Krinkle has uploaded a new change for review.

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

Change subject: cache: Normalise hostname for /w/skins,resources,extensions
..

cache: Normalise hostname for /w/skins,resources,extensions

These are the same for all wiki hosts since they're served from
a universal document root.

In anticipation of T99096, ignore requests without a hashed
query string as those may be subject to multiversion resolution
based on wiki hostname. Those with a hash, are processed in a
wiki-agonistic way.

Bug: T99096
Change-Id: I0c1b6116aed8474783915c0ad7818a4ce7c3eaff
---
M hieradata/labs.yaml
M modules/role/manifests/cache/base.pp
M modules/role/manifests/cache/mobile.pp
M modules/role/manifests/cache/text.pp
M templates/varnish/text-frontend.inc.vcl.erb
5 files changed, 11 insertions(+), 1 deletion(-)


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

diff --git a/hieradata/labs.yaml b/hieradata/labs.yaml
index f02b0f8..f2d256c 100644
--- a/hieradata/labs.yaml
+++ b/hieradata/labs.yaml
@@ -40,6 +40,7 @@
 role::cache::base::purge_host_only_upload_re: '^upload\.beta\.wmflabs\.org$'
 role::cache::base::purge_host_not_upload_re: '^(?!upload\.beta\.wmflabs\.org)'
 role::cache::base::static_host: 'deployment.wikimedia.beta.wmflabs.org'
+role::cache::base::static_wikihost: 'deployment.wikimedia.beta.wmflabs.org'
 role::cache::base::upload_domain: 'upload.beta.wmflabs.org'
 role::cache::base::bits_domain: 'bits.beta.wmflabs.org'
 role::cache::base::top_domain: 'beta.wmflabs.org'
diff --git a/modules/role/manifests/cache/base.pp 
b/modules/role/manifests/cache/base.pp
index ec76ef11..9e9eb4a 100644
--- a/modules/role/manifests/cache/base.pp
+++ b/modules/role/manifests/cache/base.pp
@@ -3,6 +3,7 @@
 $purge_host_only_upload_re = '^upload\.wikimedia\.org$',
 $purge_host_not_upload_re = '^(?!upload\.wikimedia\.org)',
 $static_host = 'www.wikimedia.org',
+$static_wikihost = 'commons.wikimedia.org',
 $upload_domain = 'upload.wikimedia.org',
 $bits_domain = 'bits.wikimedia.org',
 $top_domain = 'org'
diff --git a/modules/role/manifests/cache/mobile.pp 
b/modules/role/manifests/cache/mobile.pp
index 31b2c4e..022d73b 100644
--- a/modules/role/manifests/cache/mobile.pp
+++ b/modules/role/manifests/cache/mobile.pp
@@ -116,6 +116,7 @@
 'cache4xx'   => '1m',
 'purge_host_regex'   => $::role::cache::base::purge_host_not_upload_re,
 'static_host'=> $::role::cache::base::static_host,
+'static_wikihost'=> $::role::cache::base::static_wikihost,
 'bits_domain'=> $::role::cache::base::bits_domain,
 'top_domain' => $::role::cache::base::top_domain,
 'do_gzip'=> true,
diff --git a/modules/role/manifests/cache/text.pp 
b/modules/role/manifests/cache/text.pp
index 9e9cc17..1796229 100644
--- a/modules/role/manifests/cache/text.pp
+++ b/modules/role/manifests/cache/text.pp
@@ -119,6 +119,7 @@
 'cache4xx'   => '1m',
 'purge_host_regex'   => $::role::cache::base::purge_host_not_upload_re,
 'static_host'=> $::role::cache::base::static_host,
+'static_wikihost'=> $::role::cache::base::static_wikihost,
 'bits_domain'=> $::role::cache::base::bits_domain,
 'top_domain' => $::role::cache::base::top_domain,
 'do_gzip'=> true,
diff --git a/templates/varnish/text-frontend.inc.vcl.erb 
b/templates/varnish/text-frontend.inc.vcl.erb
index 71a8d71..59d3fc5 100644
--- a/templates/varnish/text-frontend.inc.vcl.erb
+++ b/templates/varnish/text-frontend.inc.vcl.erb
@@ -231,9 +231,15 @@
 
call mobile_redirect;
 
-   # normalize all /static to the same hostname for caching
+   # normalize all /static to the same generic hostname for caching
if (req.url ~ "^/static/") { set req.http.host = "<%= 
@vcl_config.fetch("static_host") %>"; }
 
+   # normalize all /w/static.php to the same wiki host for caching
+   # ignore urls without hash query as those are subject to multiversion
+   if (req.url ~ "^/w/(skins|resources|extensions)/.+\?[a-fA-F0-9]+$" ) {
+   set req.http.host = "<%= @vcl_config.fetch("static_wikihost") 
%>";
+   }
+
// Users that just logged out, should not get a 304 for their
// (locally cached) logged in pages.
if (req.http.If-Modified-Since && req.http.Cookie ~ "LoggedOut") {

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

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

___
MediaWiki-commits mailing list

[MediaWiki-commits] [Gerrit] Turn pdns loglevels WAY UP - change (operations/puppet)

[Andrew Bogott (Code Review)]

Andrew Bogott has uploaded a new change for review.

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

Change subject: Turn pdns loglevels WAY UP
..

Turn pdns loglevels WAY UP

Also log every single query.

Bug: T124680
Change-Id: Ia4e2c84f5489c482a8a3b1eeb2e2d649e9733ddc
---
M modules/labs_dns/templates/pdns.conf.erb
1 file changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/52/269152/1

diff --git a/modules/labs_dns/templates/pdns.conf.erb 
b/modules/labs_dns/templates/pdns.conf.erb
index 2f18d35..71d09e4 100644
--- a/modules/labs_dns/templates/pdns.conf.erb
+++ b/modules/labs_dns/templates/pdns.conf.erb
@@ -28,9 +28,9 @@
 setuid=pdns
 
 # Logging
-logging-facility=6
+logging-facility=9
 loglevel=6
-query-logging=no
+query-logging=yes
 log-dns-details=no
 
 # Backends to load

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia4e2c84f5489c482a8a3b1eeb2e2d649e9733ddc
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott 

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

[MediaWiki-commits] [Gerrit] Fix escaping for Special:EnableFlow page name - change (mediawiki...Flow)

[jenkins-bot (Code Review)]

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

Change subject: Fix escaping for Special:EnableFlow page name
..


Fix escaping for Special:EnableFlow page name

I noticed this issue when I pasted a URL into the page name field
accidentally.

We can't use plaintextParam, because then the parser can't see the
real page name.  It needs to for red link detection.

Change-Id: I9d0a55f843278b5ec7269d0e7e8240b15d0a2c75
---
M includes/Specials/SpecialEnableFlow.php
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/includes/Specials/SpecialEnableFlow.php 
b/includes/Specials/SpecialEnableFlow.php
index 364d907..079d82a 100644
--- a/includes/Specials/SpecialEnableFlow.php
+++ b/includes/Specials/SpecialEnableFlow.php
@@ -149,7 +149,7 @@
}
 
public function onSuccess() {
-   $confirmationMessage = $this->msg( 
'flow-special-enableflow-confirmation', $this->page )->parse();
+   $confirmationMessage = $this->msg( 
'flow-special-enableflow-confirmation', wfEscapeWikiText( $this->page ) 
)->parse();
$this->getOutput()->addHTML( $confirmationMessage );
}
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I9d0a55f843278b5ec7269d0e7e8240b15d0a2c75
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: Mattflaschen 
Gerrit-Reviewer: Hashar 
Gerrit-Reviewer: Mattflaschen 
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] Use strict array search for linker options. - change (mediawiki...Wikilog)

[jenkins-bot (Code Review)]

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

Change subject: Use strict array search for linker options.
..


Use strict array search for linker options.

This is in anticipation of gerrit change
I16b9d6c3044ae60d5a7fd340569c019ffc4b2a55 (and a good practice
anyway).

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

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



diff --git a/Wikilog.php b/Wikilog.php
index a57be21..7826a66 100644
--- a/Wikilog.php
+++ b/Wikilog.php
@@ -318,10 +318,10 @@
static function LinkBegin( $skin, $target, &$text, &$attribs, &$query,
&$options, &$ret )
{
-   if ( $target->isTalkPage() && !in_array( 'known', $options ) ) {
+   if ( $target->isTalkPage() && !in_array( 'known', $options, 
true ) ) {
$wi = self::getWikilogInfo( $target );
if ( $wi && $wi->isItem() && !$wi->getTrailing() && 
$wi->getItemTitle()->exists() ) {
-   if ( ( $i = array_search( 'broken', $options ) 
) !== false ) {
+   if ( ( $i = array_search( 'broken', $options, 
true ) ) !== false ) {
array_splice( $options, $i, 1 );
}
$options[] = 'known';

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Iaa5fa495299eaf30cee349c967a149f32072abf7
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikilog
Gerrit-Branch: master
Gerrit-Owner: Gergő Tisza 
Gerrit-Reviewer: Anomie 
Gerrit-Reviewer: BryanDavis 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Use strict array search for linker options. - change (mediawiki...HelpCommons)

[jenkins-bot (Code Review)]

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

Change subject: Use strict array search for linker options.
..


Use strict array search for linker options.

This is in anticipation of gerrit change
I16b9d6c3044ae60d5a7fd340569c019ffc4b2a55 (and a good practice
anyway).

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

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



diff --git a/HelpCommons.php b/HelpCommons.php
index a2169e4..8463f15 100644
--- a/HelpCommons.php
+++ b/HelpCommons.php
@@ -610,7 +610,7 @@
if ( !isset( 
$pageData['missing'] ) ) {
 
// remove "broken" 
assumption/override
-   $brokenKey = 
array_search( 'broken', $options );
+   $brokenKey = 
array_search( 'broken', $options, true );
if ( $brokenKey !== 
false ) {
unset( 
$options[$brokenKey] );
}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I797ba989b041d22f18e5acb5d21f869e2b5d10b7
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/HelpCommons
Gerrit-Branch: master
Gerrit-Owner: Gergő Tisza 
Gerrit-Reviewer: Anomie 
Gerrit-Reviewer: BryanDavis 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Use strict array search for linker options. - change (mediawiki...PureWikiDeletion)

[jenkins-bot (Code Review)]

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

Change subject: Use strict array search for linker options.
..


Use strict array search for linker options.

This is in anticipation of gerrit change
I16b9d6c3044ae60d5a7fd340569c019ffc4b2a55 (and a good practice
anyway).

Change-Id: I0da6534954cec3c6754402fe82f85235d3233db5
---
M PureWikiDeletion.hooks.php
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/PureWikiDeletion.hooks.php b/PureWikiDeletion.hooks.php
index fba528e..95ef45f 100644
--- a/PureWikiDeletion.hooks.php
+++ b/PureWikiDeletion.hooks.php
@@ -114,7 +114,7 @@
public static function PureWikiDeletionLink( $skin, $target, &$text, 
&$customAttribs, &$query, &$options, &$ret ) {
global $wgPureWikiDeletionBlankLinkStyle;
// If it's on the local wiki, then see if it's blanked
-   if ( in_array( 'known', $options ) ) {
+   if ( in_array( 'known', $options, true ) ) {
$dbr = wfGetDB( DB_SLAVE );
$blank_page_id = $target->getArticleID();
if ( $target->getNamespace() == NS_SPECIAL

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I0da6534954cec3c6754402fe82f85235d3233db5
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/PureWikiDeletion
Gerrit-Branch: master
Gerrit-Owner: Gergő Tisza 
Gerrit-Reviewer: Anomie 
Gerrit-Reviewer: BryanDavis 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Add $wgWBRepoSettings['sparqlEndpoint'] - change (operations/mediawiki-config)

[jenkins-bot (Code Review)]

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

Change subject: Add $wgWBRepoSettings['sparqlEndpoint']
..


Add $wgWBRepoSettings['sparqlEndpoint']

Bug: T125353
Change-Id: I2035c76ff75d76bc9924e97c64d603649c098aae
Depends-On: I037742cd87258a25e75c2a96b67759151f0baf3f
---
M wmf-config/Wikibase-production.php
1 file changed, 2 insertions(+), 0 deletions(-)

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



diff --git a/wmf-config/Wikibase-production.php 
b/wmf-config/Wikibase-production.php
index cce7bf1..ca429b8 100644
--- a/wmf-config/Wikibase-production.php
+++ b/wmf-config/Wikibase-production.php
@@ -29,6 +29,8 @@
} else {
$wgWBRepoSettings['disabledDataTypes'] = array( 'external-id' );
 
+   $wgWBRepoSettings['sparqlEndpoint'] = 
'https://query.wikidata.org/sparql';
+
$wgWBRepoSettings['formatterUrlProperty'] = 'P1630';
 
$wgWBRepoSettings['badgeItems'] = array(

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I2035c76ff75d76bc9924e97c64d603649c098aae
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Addshore 
Gerrit-Reviewer: Addshore 
Gerrit-Reviewer: Aude 
Gerrit-Reviewer: Chad 
Gerrit-Reviewer: Florianschmidtwelzow 
Gerrit-Reviewer: Hoo man 
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] Apertium: Move logs to /srv/log - change (operations/puppet)

[Dzahn (Code Review)]

Dzahn has submitted this change and it was merged.

Change subject: Apertium: Move logs to /srv/log
..


Apertium: Move logs to /srv/log

On SC(A|B), the /srv partition is much bigger than /, so move Apertium's
logs there.

Note: instead of hard-coding the path, this patch leverages the
configuration set for ::service::configuration (which for both SCA and
SCB is set to /srv/log).

Bug: T107900
Change-Id: I388f2392dd0d99b7a9e3252fec7575540d68937e
---
M modules/apertium/manifests/init.pp
1 file changed, 5 insertions(+), 3 deletions(-)

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



diff --git a/modules/apertium/manifests/init.pp 
b/modules/apertium/manifests/init.pp
index 02a509a..b400e2d 100644
--- a/modules/apertium/manifests/init.pp
+++ b/modules/apertium/manifests/init.pp
@@ -9,8 +9,6 @@
 # Number of APY instance processes to run
 # [*max_idle_seconds*]
 # Seconds to wait before shutdown idle process
-# [*log_dir*]
-# Place where Apertium-APY can put log files.
 # [*uid*]
 # The username apertium-apy will run with
 # [*gid*]
@@ -18,10 +16,14 @@
 class apertium(
 $num_of_processes = 1,
 $max_idle_seconds = 300,
-$log_dir = '/var/log/apertium',
 $uid = 'apertium',
 $gid = 'apertium',
 ) {
+
+include ::service::configuration
+
+$log_dir = "${::service::configuration::log_dir}/apertium"
+
 package { [
 'apertium',
 'apertium-af-nl',

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I388f2392dd0d99b7a9e3252fec7575540d68937e
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Mobrovac 
Gerrit-Reviewer: Alexandros Kosiaris 
Gerrit-Reviewer: Dzahn 
Gerrit-Reviewer: Filippo Giunchedi 
Gerrit-Reviewer: Giuseppe Lavagetto 
Gerrit-Reviewer: KartikMistry 
Gerrit-Reviewer: Mobrovac 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Namespaces configuration on mai.wikipedia - change (operations/mediawiki-config)

[jenkins-bot (Code Review)]

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

Change subject: Namespaces configuration on mai.wikipedia
..


Namespaces configuration on mai.wikipedia

New aliases:
  * 'वि': NS_PROJECT
  * 'वि_वा': NS_PROJECT_TALK
  * 'Wikipedia': NS_PROJECT
  * 'CA': NS_CATEGORY
  * 'CT': NS_CATEGORY_TALK
  * 'WP': NS_PROJECT
  * 'WT': NS_PROJECT_TALK
  * 'u': NS_USER
  * 'ut': NS_USER_TALK
  * 'प्र': NS_USER
  * 'प्र_वा': NS_USER_TALK
  * 'आ': NS_TEMPLATE
  * 'आ_वा': NS_TEMPLATE_TALK

Bug: T125801
Change-Id: I0a899b63fc4ba41ebed9ebd996d778c266c9eb82
---
M wmf-config/InitialiseSettings.php
1 file changed, 15 insertions(+), 0 deletions(-)

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



diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index b34d156..b2ad826 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -3278,6 +3278,21 @@
'WP' => NS_PROJECT, // T95106
'VP' => NS_PROJECT, // T95106
),
+   '+maiwiki' => array(
+   'वि' => NS_PROJECT,  // T125801
+   'वि_वा' => NS_PROJECT_TALK,  // T125801
+   'Wikipedia' => NS_PROJECT,   // T125801
+   'CA' => NS_CATEGORY, // T125801
+   'CT' => NS_CATEGORY_TALK,// T125801
+   'WP' => NS_PROJECT,  // T125801
+   'WT' => NS_PROJECT_TALK, // T125801
+   'u' => NS_USER,  // T125801
+   'ut' => NS_USER_TALK,// T125801
+   'प्र' => NS_USER,// T125801
+   'प्र_वा' => NS_USER_TALK,// T125801
+   'आ' => NS_TEMPLATE,  // T125801
+   'आ_वा' => NS_TEMPLATE_TALK,  // T125801
+   ),
'+metawiki' => array( // T31129
'R' => 202,
),

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I0a899b63fc4ba41ebed9ebd996d778c266c9eb82
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Dereckson 
Gerrit-Reviewer: Chad 
Gerrit-Reviewer: Florianschmidtwelzow 
Gerrit-Reviewer: Thcipriani 
Gerrit-Reviewer: Tulsi Bhagat 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Keep backward compatability This returns error on toJSON() i... - change (pywikibot/wikibase)

[Ladsgroup (Code Review)]

Ladsgroup has uploaded a new change for review.

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

Change subject: Keep backward compatability This returns error on toJSON() in 
P625 claim: 
https://www.wikidata.org/w/api.php?action=query=revisions=221842942=content
..

Keep backward compatability
This returns error on toJSON() in P625 claim:
https://www.wikidata.org/w/api.php?action=query=revisions=221842942=content

Reported at https://github.com/wiki-ai/revscoring/issues/239

Change-Id: I7174587e38332ce48f5ef08a3051869c10208f5e
---
M pywikibase/coordinate.py
1 file changed, 2 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/pywikibot/wikibase 
refs/changes/87/269087/1

diff --git a/pywikibase/coordinate.py b/pywikibase/coordinate.py
index 232a9d4..58705f0 100644
--- a/pywikibase/coordinate.py
+++ b/pywikibase/coordinate.py
@@ -107,7 +107,6 @@
 else:
 # Default to earth or should we use None here?
 globe = 'earth'
-
 return cls(data['latitude'], data['longitude'],
data['altitude'], data['precision'],
globe, site=site, entity=data['globe'])
@@ -135,6 +134,8 @@
 self._dim/(radius*math.cos(math.radians(self.lat
 """
 if not self._precision:
+if self._dim is None:
+return self._precision
 radius = 6378137  # TODO: Support other globes
 self._precision = math.degrees(
 self._dim / (radius * math.cos(math.radians(self.lat

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I7174587e38332ce48f5ef08a3051869c10208f5e
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/wikibase
Gerrit-Branch: master
Gerrit-Owner: Ladsgroup 

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

[MediaWiki-commits] [Gerrit] ExtJS/RL: wait for Ext.onReady - change (mediawiki...BlueSpiceFoundation)

[jenkins-bot (Code Review)]

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

Change subject: ExtJS/RL: wait for Ext.onReady
..


ExtJS/RL: wait for Ext.onReady

It seems that just wating for the CSS to be loaded is not sufficient.
Ext.onReady also waits for the framework to be fully initialized.

All extension code that creates Ext compnenents on page load should also
use the Ext.onReady wrapper.

Needs cherry-pick to master

Change-Id: I7f54a3d9735fe12fafb649f7f9f87667d9c7a432
---
M resources/bluespice.extjs/bluespice.extjs.js
1 file changed, 127 insertions(+), 126 deletions(-)

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



diff --git a/resources/bluespice.extjs/bluespice.extjs.js 
b/resources/bluespice.extjs/bluespice.extjs.js
index 643be88..72c676e 100755
--- a/resources/bluespice.extjs/bluespice.extjs.js
+++ b/resources/bluespice.extjs/bluespice.extjs.js
@@ -1,146 +1,147 @@
+//Wait for the CSS dependencies to be loaded or ExtJS wont have important
+//dimensions for calculating. mw.loader ignores CSS dependencies. See:
+//https://phabricator.wikimedia.org/T63852
+mw.loader.state( 'ext.bluespice.extjs', 'loading' );
+
 ( function ( mw, bs, $, d,undefined ) {
-   var basePath = mw.config.get("wgExtensionAssetsPath") + 
'/BlueSpiceFoundation/resources/bluespice.extjs';
+   Ext.onReady(function(){
+   var basePath = mw.config.get("wgExtensionAssetsPath") + 
'/BlueSpiceFoundation/resources/bluespice.extjs';
 
-   Ext.BLANK_IMAGE_URL = mw.config.get( "wgScriptPath" ) + 
"/extensions/BlueSpiceFoundation/resources/bluespice.extjs/images/s.gif";
-   Ext.Loader.setConfig({
-   enabled: true,
-   disableCaching: mw.config.get("debug")
-   });
-   Ext.Loader.setPath( 'BS', basePath + '/BS');
-   Ext.Loader.setPath( 'Ext.ux', basePath + '/Ext.ux');
-   var bsExtensionManagerAssetsPaths = mw.config.get( 
'bsExtensionManagerAssetsPaths' );
-   var extNamespace;
-   for( var extName in bsExtensionManagerAssetsPaths ) {
-   extNamespace = 'BS.' + extName;
-   Ext.Loader.setPath( extNamespace, 
bsExtensionManagerAssetsPaths[extName] + '/resources/' + extNamespace );
-   }
-
-   //This allows us to place elements with special data attributes
-   Ext.QuickTips.init();
-
-   //Allows to have stateful ExtJS components
-   Ext.state.Manager.setProvider(new Ext.state.CookieProvider({
-   expires: new Date(new Date().getTime() + (1000 * 60 * 60 * 24 * 
30))
-   }));
-
-   //Experimental feature. May be improved in the future
-   /*$('a.mw-userlink').each(function(){
-Ext.create('Ext.tip.ToolTip', {
-   title: $(this).data('bs-username'),
-   target: this,
-   anchor: 'right',
-   autoLoad: {
-   url: mw.util.wikiScript('api')
-   },
-   height: 200,
-   width: 200,
-   autoHide: false,
-   closable: true,
-   showDelay: 1000
-});
-   });*/
-
-   Ext.override(Ext.data.proxy.Server, {
-   buildRequest: function(){
-   this._lastRequest = this.callParent( arguments );
-   return this._lastRequest;
-   },
-   _lastRequest: null,
-   getLastRequest: function() {
-   return this._lastRequest;
+   Ext.BLANK_IMAGE_URL = mw.config.get( "wgScriptPath" ) + 
"/extensions/BlueSpiceFoundation/resources/bluespice.extjs/images/s.gif";
+   Ext.Loader.setConfig({
+   enabled: true,
+   disableCaching: mw.config.get("debug")
+   });
+   Ext.Loader.setPath( 'BS', basePath + '/BS');
+   Ext.Loader.setPath( 'Ext.ux', basePath + '/Ext.ux');
+   var bsExtensionManagerAssetsPaths = mw.config.get( 
'bsExtensionManagerAssetsPaths' );
+   var extNamespace;
+   for( var extName in bsExtensionManagerAssetsPaths ) {
+   extNamespace = 'BS.' + extName;
+   Ext.Loader.setPath( extNamespace, 
bsExtensionManagerAssetsPaths[extName] + '/resources/' + extNamespace );
}
-   });
 
-   //Be nice to older browsers
-   //HINT: 
http://stackoverflow.com/questions/2581302/globally-disable-ext-js-animations
-   if( Ext.isIE9m ) {
-   Ext.override(Ext.Window, {
-   animShow: function(){
-   this.afterShow();
+   //This allows us to place elements with special data attributes
+   Ext.QuickTips.init();
+
+   //Allows to have stateful ExtJS components
+   

[MediaWiki-commits] [Gerrit] ExtJS/RL: Fixes in manager components - change (mediawiki...BlueSpiceExtensions)

[Pwirth (Code Review)]

Pwirth has submitted this change and it was merged.

Change subject: ExtJS/RL: Fixes in manager components
..


ExtJS/RL: Fixes in manager components

There were some issues with ExtJS components that were created on page
load when in debug mode.

* all RL modules that create ExtJS components on document ready event not
  have a serverside dependency to 'ext.bluespice.extjs'
* on the client side the creation of ExtJS components on document ready
  time is now wrapped into Ext.onReady

Needs cherrypick to REL1_23

Change-Id: I327d5d6ce6a2c7381eb2923a74531a898d47ee68
---
M Dashboards/resources/bluespice.dashboards.adminDashboard.js
M Dashboards/resources/bluespice.dashboards.userDashboard.js
M ExtensionInfo/resources/bluespice.extensionInfo.js
M Flexiskin/Flexiskin.setup.php
M Flexiskin/resources/bluespice.flexiskin.js
M GroupManager/resources/bluespice.groupManager.js
M InterWikiLinks/InterWikiLinks.setup.php
M InterWikiLinks/resources/bluespice.interWikiLinks.js
M NamespaceManager/resources/bluespice.namespaceManager.js
M PageTemplates/resources/bluespice.pageTemplates.js
M PermissionManager/resources/bluespice.permissionManager.js
M Readers/resources/bluespice.readers.js
M Readers/resources/bluespice.readerspath.js
M ResponsibleEditors/resources/bluespice.responsibleEditors.manager.js
M Review/resources/bluespice.review.overview.js
M UserManager/resources/bluespice.userManager.js
16 files changed, 71 insertions(+), 40 deletions(-)

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



diff --git a/Dashboards/resources/bluespice.dashboards.adminDashboard.js 
b/Dashboards/resources/bluespice.dashboards.adminDashboard.js
index d8b9e12..fb8a0e2 100644
--- a/Dashboards/resources/bluespice.dashboards.adminDashboard.js
+++ b/Dashboards/resources/bluespice.dashboards.adminDashboard.js
@@ -1,4 +1,6 @@
-Ext.create( 'BS.Dashboards.DashboardPanel', {
-   renderTo: 'bs-dashboards-admindashboard',
-   portalConfig: mw.config.get('bsPortalConfig')
-});
\ No newline at end of file
+Ext.onReady( function(){
+   Ext.create( 'BS.Dashboards.DashboardPanel', {
+   renderTo: 'bs-dashboards-admindashboard',
+   portalConfig: mw.config.get('bsPortalConfig')
+   } );
+} );
\ No newline at end of file
diff --git a/Dashboards/resources/bluespice.dashboards.userDashboard.js 
b/Dashboards/resources/bluespice.dashboards.userDashboard.js
index 68334ca..e68f809 100644
--- a/Dashboards/resources/bluespice.dashboards.userDashboard.js
+++ b/Dashboards/resources/bluespice.dashboards.userDashboard.js
@@ -1,4 +1,6 @@
-Ext.create('BS.Dashboards.DashboardPanel', {
-   renderTo: 'bs-dashboards-userdashboard',
-   portalConfig: mw.config.get( 'bsPortalConfig' )
-});
\ No newline at end of file
+Ext.onReady( function(){
+   Ext.create('BS.Dashboards.DashboardPanel', {
+   renderTo: 'bs-dashboards-userdashboard',
+   portalConfig: mw.config.get( 'bsPortalConfig' )
+   } );
+} );
\ No newline at end of file
diff --git a/ExtensionInfo/resources/bluespice.extensionInfo.js 
b/ExtensionInfo/resources/bluespice.extensionInfo.js
index ef68a54..793b98a 100644
--- a/ExtensionInfo/resources/bluespice.extensionInfo.js
+++ b/ExtensionInfo/resources/bluespice.extensionInfo.js
@@ -12,6 +12,8 @@
 
 //Hint: http://dev.sencha.com/deploy/dev/examples/grid/grouping.html
 
-Ext.create( 'BS.ExtensionInfo.Panel', {
-   renderTo: 'bs-extensioninfo-grid'
-});
+Ext.onReady( function(){
+   Ext.create( 'BS.ExtensionInfo.Panel', {
+   renderTo: 'bs-extensioninfo-grid'
+   } );
+} );
\ No newline at end of file
diff --git a/Flexiskin/Flexiskin.setup.php b/Flexiskin/Flexiskin.setup.php
index ca05008..03687b2 100755
--- a/Flexiskin/Flexiskin.setup.php
+++ b/Flexiskin/Flexiskin.setup.php
@@ -27,6 +27,9 @@
'styles' => array(

'extensions/BlueSpiceExtensions/Flexiskin/resources/bluespice.flexiskin.css',
),
+   'dependencies' => array(
+   'ext.bluespice.extjs'
+   ),
'messages' => array(
'bs-flexiskin-labelname',
'bs-flexiskin-labeldesc',
diff --git a/Flexiskin/resources/bluespice.flexiskin.js 
b/Flexiskin/resources/bluespice.flexiskin.js
index edc604f..101df49 100644
--- a/Flexiskin/resources/bluespice.flexiskin.js
+++ b/Flexiskin/resources/bluespice.flexiskin.js
@@ -1,5 +1,5 @@
-mw.loader.using('ext.bluespice.extjs', function() {
-   Ext.create('BS.Flexiskin.Panel', {
+Ext.onReady( function() {
+   Ext.create( 'BS.Flexiskin.Panel', {
renderTo: 'bs-flexiskin-container'
-   });
-});
\ No newline at end of file
+   } );
+} );
\ No newline at end of file
diff --git a/GroupManager/resources/bluespice.groupManager.js 
b/GroupManager/resources/bluespice.groupManager.js
index 0813ba6..a42ec7e 100644
--- a/GroupManager/resources/bluespice.groupManager.js
+++ 

[MediaWiki-commits] [Gerrit] ExtJS/RL: Fixes in manager components - change (mediawiki...BlueSpiceExtensions)

[Pwirth (Code Review)]

Pwirth has uploaded a new change for review.

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

Change subject: ExtJS/RL: Fixes in manager components
..

ExtJS/RL: Fixes in manager components

There were some issues with ExtJS components that were created on page
load when in debug mode.

* all RL modules that create ExtJS components on document ready event not
  have a serverside dependency to 'ext.bluespice.extjs'
* on the client side the creation of ExtJS components on document ready
  time is now wrapped into Ext.onReady

Needs cherrypick to REL1_23

Change-Id: I327d5d6ce6a2c7381eb2923a74531a898d47ee68
(cherry picked from commit 06500d533fbe74674b1f64ad52e31fa764cb1521)
---
M Dashboards/resources/bluespice.dashboards.adminDashboard.js
M Dashboards/resources/bluespice.dashboards.userDashboard.js
M ExtensionInfo/resources/bluespice.extensionInfo.js
M Flexiskin/Flexiskin.setup.php
M Flexiskin/resources/bluespice.flexiskin.js
M GroupManager/resources/bluespice.groupManager.js
M InterWikiLinks/InterWikiLinks.setup.php
M InterWikiLinks/resources/bluespice.interWikiLinks.js
M NamespaceManager/resources/bluespice.namespaceManager.js
M PageTemplates/resources/bluespice.pageTemplates.js
M PermissionManager/resources/bluespice.permissionManager.js
M Readers/resources/bluespice.readers.js
M Readers/resources/bluespice.readerspath.js
M ResponsibleEditors/resources/bluespice.responsibleEditors.manager.js
M Review/resources/bluespice.review.overview.js
M UserManager/resources/bluespice.userManager.js
16 files changed, 71 insertions(+), 40 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceExtensions 
refs/changes/88/269088/1

diff --git a/Dashboards/resources/bluespice.dashboards.adminDashboard.js 
b/Dashboards/resources/bluespice.dashboards.adminDashboard.js
index d8b9e12..fb8a0e2 100644
--- a/Dashboards/resources/bluespice.dashboards.adminDashboard.js
+++ b/Dashboards/resources/bluespice.dashboards.adminDashboard.js
@@ -1,4 +1,6 @@
-Ext.create( 'BS.Dashboards.DashboardPanel', {
-   renderTo: 'bs-dashboards-admindashboard',
-   portalConfig: mw.config.get('bsPortalConfig')
-});
\ No newline at end of file
+Ext.onReady( function(){
+   Ext.create( 'BS.Dashboards.DashboardPanel', {
+   renderTo: 'bs-dashboards-admindashboard',
+   portalConfig: mw.config.get('bsPortalConfig')
+   } );
+} );
\ No newline at end of file
diff --git a/Dashboards/resources/bluespice.dashboards.userDashboard.js 
b/Dashboards/resources/bluespice.dashboards.userDashboard.js
index 68334ca..e68f809 100644
--- a/Dashboards/resources/bluespice.dashboards.userDashboard.js
+++ b/Dashboards/resources/bluespice.dashboards.userDashboard.js
@@ -1,4 +1,6 @@
-Ext.create('BS.Dashboards.DashboardPanel', {
-   renderTo: 'bs-dashboards-userdashboard',
-   portalConfig: mw.config.get( 'bsPortalConfig' )
-});
\ No newline at end of file
+Ext.onReady( function(){
+   Ext.create('BS.Dashboards.DashboardPanel', {
+   renderTo: 'bs-dashboards-userdashboard',
+   portalConfig: mw.config.get( 'bsPortalConfig' )
+   } );
+} );
\ No newline at end of file
diff --git a/ExtensionInfo/resources/bluespice.extensionInfo.js 
b/ExtensionInfo/resources/bluespice.extensionInfo.js
index ef68a54..793b98a 100644
--- a/ExtensionInfo/resources/bluespice.extensionInfo.js
+++ b/ExtensionInfo/resources/bluespice.extensionInfo.js
@@ -12,6 +12,8 @@
 
 //Hint: http://dev.sencha.com/deploy/dev/examples/grid/grouping.html
 
-Ext.create( 'BS.ExtensionInfo.Panel', {
-   renderTo: 'bs-extensioninfo-grid'
-});
+Ext.onReady( function(){
+   Ext.create( 'BS.ExtensionInfo.Panel', {
+   renderTo: 'bs-extensioninfo-grid'
+   } );
+} );
\ No newline at end of file
diff --git a/Flexiskin/Flexiskin.setup.php b/Flexiskin/Flexiskin.setup.php
index ca05008..03687b2 100644
--- a/Flexiskin/Flexiskin.setup.php
+++ b/Flexiskin/Flexiskin.setup.php
@@ -27,6 +27,9 @@
'styles' => array(

'extensions/BlueSpiceExtensions/Flexiskin/resources/bluespice.flexiskin.css',
),
+   'dependencies' => array(
+   'ext.bluespice.extjs'
+   ),
'messages' => array(
'bs-flexiskin-labelname',
'bs-flexiskin-labeldesc',
diff --git a/Flexiskin/resources/bluespice.flexiskin.js 
b/Flexiskin/resources/bluespice.flexiskin.js
index edc604f..101df49 100644
--- a/Flexiskin/resources/bluespice.flexiskin.js
+++ b/Flexiskin/resources/bluespice.flexiskin.js
@@ -1,5 +1,5 @@
-mw.loader.using('ext.bluespice.extjs', function() {
-   Ext.create('BS.Flexiskin.Panel', {
+Ext.onReady( function() {
+   Ext.create( 'BS.Flexiskin.Panel', {
renderTo: 'bs-flexiskin-container'
-   });
-});
\ No newline at end of file
+   } );
+} );
\ No newline at end of file
diff --git a/GroupManager/resources/bluespice.groupManager.js 

[MediaWiki-commits] [Gerrit] ExtJS/RL: Fixes in manager components - change (mediawiki...BlueSpiceExtensions)

[Pwirth (Code Review)]

Pwirth has submitted this change and it was merged.

Change subject: ExtJS/RL: Fixes in manager components
..


ExtJS/RL: Fixes in manager components

There were some issues with ExtJS components that were created on page
load when in debug mode.

* all RL modules that create ExtJS components on document ready event not
  have a serverside dependency to 'ext.bluespice.extjs'
* on the client side the creation of ExtJS components on document ready
  time is now wrapped into Ext.onReady

Needs cherrypick to REL1_23

Change-Id: I327d5d6ce6a2c7381eb2923a74531a898d47ee68
(cherry picked from commit 06500d533fbe74674b1f64ad52e31fa764cb1521)
---
M Dashboards/resources/bluespice.dashboards.adminDashboard.js
M Dashboards/resources/bluespice.dashboards.userDashboard.js
M ExtensionInfo/resources/bluespice.extensionInfo.js
M Flexiskin/Flexiskin.setup.php
M Flexiskin/resources/bluespice.flexiskin.js
M GroupManager/resources/bluespice.groupManager.js
M InterWikiLinks/InterWikiLinks.setup.php
M InterWikiLinks/resources/bluespice.interWikiLinks.js
M NamespaceManager/resources/bluespice.namespaceManager.js
M PageTemplates/resources/bluespice.pageTemplates.js
M PermissionManager/resources/bluespice.permissionManager.js
M Readers/resources/bluespice.readers.js
M Readers/resources/bluespice.readerspath.js
M ResponsibleEditors/resources/bluespice.responsibleEditors.manager.js
M Review/resources/bluespice.review.overview.js
M UserManager/resources/bluespice.userManager.js
16 files changed, 71 insertions(+), 40 deletions(-)

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



diff --git a/Dashboards/resources/bluespice.dashboards.adminDashboard.js 
b/Dashboards/resources/bluespice.dashboards.adminDashboard.js
index d8b9e12..fb8a0e2 100644
--- a/Dashboards/resources/bluespice.dashboards.adminDashboard.js
+++ b/Dashboards/resources/bluespice.dashboards.adminDashboard.js
@@ -1,4 +1,6 @@
-Ext.create( 'BS.Dashboards.DashboardPanel', {
-   renderTo: 'bs-dashboards-admindashboard',
-   portalConfig: mw.config.get('bsPortalConfig')
-});
\ No newline at end of file
+Ext.onReady( function(){
+   Ext.create( 'BS.Dashboards.DashboardPanel', {
+   renderTo: 'bs-dashboards-admindashboard',
+   portalConfig: mw.config.get('bsPortalConfig')
+   } );
+} );
\ No newline at end of file
diff --git a/Dashboards/resources/bluespice.dashboards.userDashboard.js 
b/Dashboards/resources/bluespice.dashboards.userDashboard.js
index 68334ca..e68f809 100644
--- a/Dashboards/resources/bluespice.dashboards.userDashboard.js
+++ b/Dashboards/resources/bluespice.dashboards.userDashboard.js
@@ -1,4 +1,6 @@
-Ext.create('BS.Dashboards.DashboardPanel', {
-   renderTo: 'bs-dashboards-userdashboard',
-   portalConfig: mw.config.get( 'bsPortalConfig' )
-});
\ No newline at end of file
+Ext.onReady( function(){
+   Ext.create('BS.Dashboards.DashboardPanel', {
+   renderTo: 'bs-dashboards-userdashboard',
+   portalConfig: mw.config.get( 'bsPortalConfig' )
+   } );
+} );
\ No newline at end of file
diff --git a/ExtensionInfo/resources/bluespice.extensionInfo.js 
b/ExtensionInfo/resources/bluespice.extensionInfo.js
index ef68a54..793b98a 100644
--- a/ExtensionInfo/resources/bluespice.extensionInfo.js
+++ b/ExtensionInfo/resources/bluespice.extensionInfo.js
@@ -12,6 +12,8 @@
 
 //Hint: http://dev.sencha.com/deploy/dev/examples/grid/grouping.html
 
-Ext.create( 'BS.ExtensionInfo.Panel', {
-   renderTo: 'bs-extensioninfo-grid'
-});
+Ext.onReady( function(){
+   Ext.create( 'BS.ExtensionInfo.Panel', {
+   renderTo: 'bs-extensioninfo-grid'
+   } );
+} );
\ No newline at end of file
diff --git a/Flexiskin/Flexiskin.setup.php b/Flexiskin/Flexiskin.setup.php
index ca05008..03687b2 100644
--- a/Flexiskin/Flexiskin.setup.php
+++ b/Flexiskin/Flexiskin.setup.php
@@ -27,6 +27,9 @@
'styles' => array(

'extensions/BlueSpiceExtensions/Flexiskin/resources/bluespice.flexiskin.css',
),
+   'dependencies' => array(
+   'ext.bluespice.extjs'
+   ),
'messages' => array(
'bs-flexiskin-labelname',
'bs-flexiskin-labeldesc',
diff --git a/Flexiskin/resources/bluespice.flexiskin.js 
b/Flexiskin/resources/bluespice.flexiskin.js
index edc604f..101df49 100644
--- a/Flexiskin/resources/bluespice.flexiskin.js
+++ b/Flexiskin/resources/bluespice.flexiskin.js
@@ -1,5 +1,5 @@
-mw.loader.using('ext.bluespice.extjs', function() {
-   Ext.create('BS.Flexiskin.Panel', {
+Ext.onReady( function() {
+   Ext.create( 'BS.Flexiskin.Panel', {
renderTo: 'bs-flexiskin-container'
-   });
-});
\ No newline at end of file
+   } );
+} );
\ No newline at end of file
diff --git a/GroupManager/resources/bluespice.groupManager.js 
b/GroupManager/resources/bluespice.groupManager.js
index 0813ba6..a42ec7e 100644
--- 

[MediaWiki-commits] [Gerrit] Fix jshint errors, Also run npm and composer tests - change (mediawiki...SemanticForms)

[Yaron Koren (Code Review)]

Yaron Koren has submitted this change and it was merged.

Change subject: Fix jshint errors, Also run npm and composer tests
..


Fix jshint errors, Also run npm and composer tests

Add support for running npm and composer tests.

Running jshint, jsonlint tests through npm.

Running phplint through composer test.

This patches includes big and minor changes such as formatting, fixing the 
configs that were undefined.

These changes are done in order for the tests to pass.

Bumped mw version required to 1.27.

Change-Id: I5e01223da5a882591e8028a8bb608a07ac543dfd
---
M .gitignore
M .jshintignore
M .jshintrc
A Gruntfile.js
M SemanticForms.php
M composer.json
M extension.json
M includes/SF_Utils.php
M libs/SF_CreateClass.js
M libs/SF_CreateForm.js
M libs/SF_CreateProperty.js
M libs/SF_CreateTemplate.js
M libs/SF_PageSchemas.js
M libs/SF_dynatree.js
M libs/SF_imagePreview.js
M libs/SF_popupform.js
M libs/SF_wikieditor.js
M libs/SemanticForms.js
M libs/ext.sf.js
M libs/ext.sf.select2.base.js
M libs/ext.sf.select2.combobox.js
M libs/ext.sf.select2.tokens.js
A package.json
23 files changed, 1,017 insertions(+), 928 deletions(-)

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



diff --git a/.gitignore b/.gitignore
index a901587..f5a6251 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,3 @@
-.svn
 *~
 *.kate-swp
 .*.swp
@@ -7,5 +6,6 @@
 composer.phar
 
 .idea/
+node_modules/
 vendor/
-extensions/
\ No newline at end of file
+extensions/
diff --git a/.jshintignore b/.jshintignore
index a93e887..10f6214 100644
--- a/.jshintignore
+++ b/.jshintignore
@@ -1 +1,7 @@
-libs
+libs/jquery.browser.js
+libs/jquery.dynatree.js
+libs/jquery.fancybox.js
+libs/select2.js
+libs/SF_maps.js
+node_modules/
+vendor/
diff --git a/.jshintrc b/.jshintrc
index 80b00ba..795e82d 100644
--- a/.jshintrc
+++ b/.jshintrc
@@ -1,14 +1,4 @@
 {
-   "predef": [
-   "mediaWiki",
-   "jQuery",
-   "semanticforms",
-   "mw",
-   "$",
-   "sf",
-   "ext"
-   ],
-
"bitwise": true,
"camelcase": false,
"curly": true,
@@ -32,10 +22,20 @@
"multistr": true,
 
"browser": true,
+   "jquery": true,
 
"nomen": false,
"onevar": false,
 
"scripturl": false,
-   "supernew": false
+   "supernew": false,
+
+   "globals": {
+   "mediaWiki": false,
+   "semanticforms": false,
+   "sf": false,
+   "ext": false,
+   "google": true,
+   "OpenLayers": true
+   }
 }
diff --git a/Gruntfile.js b/Gruntfile.js
new file mode 100644
index 000..c679ec7
--- /dev/null
+++ b/Gruntfile.js
@@ -0,0 +1,36 @@
+/*jshint node:true */
+module.exports = function ( grunt ) {
+   grunt.loadNpmTasks( 'grunt-contrib-jshint' );
+   grunt.loadNpmTasks( 'grunt-jsonlint' );
+   // grunt.loadNpmTasks( 'grunt-banana-checker' );
+
+   grunt.initConfig( {
+   jshint: {
+   options: {
+   jshintrc: true
+   },
+   all: [
+   '**/*.js',
+   '!node_modules/**',
+   '!libs/OpenLayers/**',
+   '!libs/jquery.browser.js',
+   '!libs/jquery.dynatree.js',
+   '!libs/jquery.fancybox.js',
+   '!libs/select2.js',
+   '!libs/SF_maps.js'
+   ]
+   },
+   // banana: {
+   // all: 'i18n/'
+   // },
+   jsonlint: {
+   all: [
+   '**/*.json',
+   '!node_modules/**'
+   ]
+   }
+   } );
+
+   grunt.registerTask( 'test', [ 'jshint', 'jsonlint' /* 'banana' */ ] );
+   grunt.registerTask( 'default', 'test' );
+};
diff --git a/SemanticForms.php b/SemanticForms.php
index 06521e3..9f2ddc5 100644
--- a/SemanticForms.php
+++ b/SemanticForms.php
@@ -41,9 +41,9 @@
 // In some versions of MW 1.25, there's a bug in which global variables
 // set in LocalSettings.php do not override the settings in
 // extension.json. For simplicity's sake, don't load extensions unless we're
-// at version 1.26 or higher.
+// at version 1.27 or higher.
 //if ( function_exists( 'wfLoadExtension' ) ) {
-if ( version_compare( $GLOBALS['wgVersion'], '1.26c', '>' ) ) {
+if ( version_compare( $GLOBALS['wgVersion'], '1.27c', '>' ) ) {
if ( function_exists( 'wfLoadExtension' ) ) {
wfLoadExtension( 'SemanticForms' );
// Keep i18n globals so mergeMessageFileList.php doesn't break
@@ -363,9 +363,6 @@

[MediaWiki-commits] [Gerrit] Rephrase notifications - change (mediawiki...OpenStackManager)

[Sbisson (Code Review)]

Sbisson has uploaded a new change for review.

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

Change subject: Rephrase notifications
..

Rephrase notifications

Bug: T125691
Change-Id: I610f5260887c327cc3e84d08f3ad2adbc6dcbe9f
---
M EchoOpenStackManagerPresentationModel.php
M i18n/en.json
M i18n/qqq.json
3 files changed, 10 insertions(+), 9 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/OpenStackManager 
refs/changes/51/269151/1

diff --git a/EchoOpenStackManagerPresentationModel.php 
b/EchoOpenStackManagerPresentationModel.php
index 6fa25ed..46377e3 100644
--- a/EchoOpenStackManagerPresentationModel.php
+++ b/EchoOpenStackManagerPresentationModel.php
@@ -41,7 +41,8 @@
 
return $msg->params(
$this->getTruncatedTitleText( $this->event->getTitle() 
),
-   $this->event->getExtraParam( 'instanceName' )
+   $this->event->getExtraParam( 'instanceName' ),
+   $this->getViewingUserForGender()
);
}
 }
diff --git a/i18n/en.json b/i18n/en.json
index 32fbb8c..ced48e7 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -410,10 +410,10 @@
"notification-osm-instance-reboot-completed-email-body-batch": "$1 
{{GENDER:$1|rebooted}} instance \"$3\" in project [[$2]]",
"notification-osm-projectmember-added-email-subject": "You were added 
to a project on {{SITENAME}}",
"notification-osm-projectmember-added-email-body-batch": "$1 
{{GENDER:$1|added}} you to project [[$2]]",
-   "notification-header-osm-instance-build-completed": "$1 
{{GENDER:$2|built}} instance \"$4\" in project $3",
-   "notification-header-osm-instance-reboot-completed": "$1 
{{GENDER:$2|rebooted}} instance \"$4\" in project $3",
-   "notification-header-osm-instance-deleted": "$1 {{GENDER:$2|deleted}} 
instance \"$4\" in project $3",
-   "notification-header-osm-projectmembers-add": "$1 {{GENDER:$2|added}} 
you to project $3",
+   "notification-header-osm-instance-build-completed": "Instance \"$4\" 
built in project '''$3'''.",
+   "notification-header-osm-instance-reboot-completed": "Instance \"$4\" 
was rebooted in project '''$3'''.",
+   "notification-header-osm-instance-deleted": "Instance \"$4\" was 
deleted in project '''$3'''.",
+   "notification-header-osm-projectmembers-add": "{{GENDER:$5|You}} were 
added to project '''$3'''.",
"echo-notification-goto-project": "View project",
"echo-category-title-osm-instance-deleted": "Instance deletion (where 
you are project admin)",
"echo-category-title-osm-instance-build-completed": "Instance build 
(where you are project admin)",
diff --git a/i18n/qqq.json b/i18n/qqq.json
index 4ff2be2..70659c9 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -433,10 +433,10 @@
"notification-osm-instance-reboot-completed-email-body-batch": "Email 
notification for instance reboot completion.\nParameters:\n* $1 - agent\n* $2 - 
project\n* $3 - instance",
"notification-osm-projectmember-added-email-subject": "Email subject 
for the new project membership notification.",
"notification-osm-projectmember-added-email-body-batch": "Email 
notification for new project membership.\n* $1 - agent\n* $2 - project",
-   "notification-header-osm-instance-build-completed": "Header text for a 
notification when an instance has finished building. Parameters:\n* $1 is that 
user's name (not suitable for GENDER).\n* $2 is the user's name for use in 
GENDER.\n* $3 is the project name.\n* $4 is the instance name.",
-   "notification-header-osm-instance-reboot-completed": "Header text for a 
notification when an instance has finished rebooting. Parameters:\n* $1 is that 
user's name (not suitable for GENDER).\n* $2 is the user's name for use in 
GENDER.\n* $3 is the project name.\n* $4 is the instance name.",
-   "notification-header-osm-instance-deleted": "Header text for a 
notification when an instance is deleted. Parameters:\n* $1 is that user's name 
(not suitable for GENDER).\n* $2 is the user's name for use in GENDER.\n* $3 is 
the project name.\n* $4 is the instance name.",
-   "notification-header-osm-projectmembers-add": "Header text for a 
notification when a user is added to a project. Parameters:\n* $1 is that 
user's name (not suitable for GENDER).\n* $2 is the user's name for use in 
GENDER.\n* $3 is the project name.\n* $4 is the instance name.",
+   "notification-header-osm-instance-build-completed": "Header text for a 
notification when an instance has finished building. Parameters:\n* $1 is that 
user's name (not suitable for GENDER).\n* $2 is the user's name for use in 
GENDER.\n* $3 is the project name.\n* $4 is the instance name.\n* $5 - name of 
the user viewing the notification, can be used for GENDER",
+   "notification-header-osm-instance-reboot-completed": "Header text for a 

[MediaWiki-commits] [Gerrit] Fix possible crash when laying out tab list. - change (apps...wikipedia)

[jenkins-bot (Code Review)]

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

Change subject: Fix possible crash when laying out tab list.
..


Fix possible crash when laying out tab list.

Whenever we add or remove items in the list of tabs, we're required to
notify the tab list adapter, otherwise it can misbehave.

Bug: T126224
Change-Id: Iebb2b28b6e35f4ab56b267f1ca8b2cb62bd5b3eb
---
M app/src/main/java/org/wikipedia/page/PageFragment.java
1 file changed, 9 insertions(+), 9 deletions(-)

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



diff --git a/app/src/main/java/org/wikipedia/page/PageFragment.java 
b/app/src/main/java/org/wikipedia/page/PageFragment.java
index 6b215f3..d6b3abf 100755
--- a/app/src/main/java/org/wikipedia/page/PageFragment.java
+++ b/app/src/main/java/org/wikipedia/page/PageFragment.java
@@ -436,6 +436,7 @@
 if (position != tabList.size() - 1) {
 Tab tab = tabList.remove(position);
 tabList.add(tab);
+tabsProvider.invalidate();
 pageLoadStrategy.updateCurrentBackStackItem();
 pageLoadStrategy.setBackStack(tab.getBackStack());
 pageLoadStrategy.loadFromBackStack();
@@ -462,18 +463,15 @@
 }
 tabList.remove(position);
 tabFunnel.logClose(tabList.size(), position);
-if (position < tabList.size()) {
-// if it's not the topmost tab, then just delete it and update 
the tab list...
-tabsProvider.invalidate();
-} else if (tabList.size() > 0) {
-tabsProvider.invalidate();
-// but if it's the topmost tab, then load the topmost page in 
the next tab.
-pageLoadStrategy.setBackStack(getCurrentTab().getBackStack());
-pageLoadStrategy.loadFromBackStack();
-} else {
+tabsProvider.invalidate();
+if (tabList.size() == 0) {
 tabFunnel.logCancel(tabList.size());
 // and if the last tab was closed, then finish the activity!
 getActivity().finish();
+} else if (position == tabList.size()) {
+// if it's the topmost tab, then load the topmost page in the 
next tab.
+pageLoadStrategy.setBackStack(getCurrentTab().getBackStack());
+pageLoadStrategy.loadFromBackStack();
 }
 }
 };
@@ -948,6 +946,7 @@
 }
 // put this tab in the requested position
 tabList.add(position, tab);
+tabsProvider.invalidate();
 // add the requested page to its backstack
 tab.getBackStack().add(new PageBackStackItem(title, entry));
 } else {
@@ -1080,6 +1079,7 @@
 if (tabList.size() > 1) {
 // if we're at the end of the current tab's backstack, then pop 
the current tab.
 tabList.remove(tabList.size() - 1);
+tabsProvider.invalidate();
 }
 return false;
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Iebb2b28b6e35f4ab56b267f1ca8b2cb62bd5b3eb
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Dbrant 
Gerrit-Reviewer: BearND 
Gerrit-Reviewer: Brion VIBBER 
Gerrit-Reviewer: Mholloway 
Gerrit-Reviewer: Niedzielski 
Gerrit-Reviewer: Sniedzielski 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Don't request pageprops for mobile search/nearby on wikidata - change (operations/mediawiki-config)

[jenkins-bot (Code Review)]

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

Change subject: Don't request pageprops for mobile search/nearby on wikidata
..


Don't request pageprops for mobile search/nearby on wikidata

If we include pageprops but don't specify which ones we want,
then we get them all, including displaytitle.

afaik, removing for wikidata it is unproblematic.

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

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



diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index 3d9e893..15fa949 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -13585,7 +13585,7 @@
 'wmgMFQueryPropModules' => array(
// workaround for T125672
'default' => array( 'pageprops' ),
-   'wikidata' => array( 'pageprops', 'pageterms' ),
+   'wikidata' => array( 'pageterms' ),
 ),
 'wmgMFSearchAPIParams' => array(
// workaround for T125672, though also fixes T120197

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I736a8e3361e35c8bfd63ff9880f8cb73afcc20dc
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Aude 
Gerrit-Reviewer: Chad 
Gerrit-Reviewer: Florianschmidtwelzow 
Gerrit-Reviewer: Jdlrobson 
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] WantedArticle: Used API instead of AjaxExportList - change (mediawiki...BlueSpiceExtensions)

[Pwirth (Code Review)]

Pwirth has uploaded a new change for review.

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

Change subject: WantedArticle: Used API instead of AjaxExportList
..

WantedArticle: Used API instead of AjaxExportList

Change-Id: I575346abe32e0a8b8f751b105d5f95c157886550
---
M WantedArticle/WantedArticle.class.php
M WantedArticle/WantedArticle.setup.php
A WantedArticle/includes/api/BSApiTasksWantedArticle.php
M WantedArticle/resources/bluespice.wantedArticle.js
4 files changed, 316 insertions(+), 175 deletions(-)


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

diff --git a/WantedArticle/WantedArticle.class.php 
b/WantedArticle/WantedArticle.class.php
index 86ca28a..0e5beb3 100644
--- a/WantedArticle/WantedArticle.class.php
+++ b/WantedArticle/WantedArticle.class.php
@@ -445,151 +445,6 @@
}
 
/**
-* Handles the suggestion ajax request.
-* A new title is entered into the list. Depending on configuration, 
already existing articles are deleted.
-* @return bool true on correct processing. JSON answer is in $sOut 
parameter.
-*/
-   public static function ajaxAddWantedArticle( $sSuggestedArticleWikiLink 
) {
-   if ( BsCore::checkAccessAdmission( 'wantedarticle-suggest' ) 
=== false )
-   return json_encode( array( 'success' => false, 
'message' => wfMessage( 'bs-permissionerror' )->plain() ) );
-
-   if ( empty( $sSuggestedArticleWikiLink ) ) {
-   $sErrorMsg = wfMessage( 
'bs-wantedarticle-ajax-error-no-parameter' )->plain();
-   return json_encode( array( 'success' => false, 
'message' => $sErrorMsg ) ); // TODO RBV (01.07.11 09:07): XHRRequest object.
-   }
-
-   //Check suggestion for invalid characters (clientside 
validation is not enough)
-   $aFoundChars = array();
-   foreach ( BsCore::getForbiddenCharsInArticleTitle() as $sChar ) 
{
-   if ( strpos( $sSuggestedArticleWikiLink, $sChar ) ) {
-   $aFoundChars[] = '"'.$sChar.'"';
-   }
-   }
-
-   if ( count( $aFoundChars ) > 0 ) {
-   $sChars = implode( ', ', $aFoundChars );
-   $sErrorMsg = wfMessage( 
'bs-wantedarticle-title-invalid-chars', count( $aFoundChars ), $sChars 
)->plain();
-   return json_encode( array('success' => false, 'message' 
=> $sErrorMsg ) );
-   }
-
-   //Check if suggested page already exists
-   $oSuggestedTitle = Title::newFromText( 
$sSuggestedArticleWikiLink );
-   $sSuggestedTitle = $oSuggestedTitle->getPrefixedText();
-   if ( $oSuggestedTitle->exists() ) {
-   $sErrorMsg = wfMessage(
-   
'bs-wantedarticle-ajax-error-suggested-page-already-exists',
-   $sSuggestedTitle
-   )->plain();
-   return json_encode(  array('success' => false, 
'message' => $sErrorMsg ) );
-   }
-
-   $oWantedArticle = BsExtensionManager::getExtension( 
'WantedArticle' );
-   $oDataSourceArticle = 
$oWantedArticle->getDataSourceTemplateArticle();
-   $aWishList = $oWantedArticle->getTitleListFromTitle( 
$oDataSourceArticle->getTitle() );
-
-   $bDeleteExisting = BsConfig::get( 
'MW::WantedArticle::DeleteExisting' );
-
-   foreach ( $aWishList as $key => $aWish ) {
-   if ( $oSuggestedTitle->equals( $aWish['title'] ) ){
-   $sErrorMsg = wfMessage(
-   
'bs-wantedarticle-ajax-error-suggested-page-already-on-list',
-   $oSuggestedTitle->getPrefixedText()
-   )->plain();
-   return json_encode( array('success' => true, 
'message' => $sErrorMsg ) );
-   }
-   if ( $bDeleteExisting && $aWish['title']->exists() === 
true ){
-   unset($aWishList[$key]);
-   continue;
-   }
-   }
-   array_unshift(
-   $aWishList,
-   array(
-   'title' => $oSuggestedTitle,
-   'signature' => '--',
-   )
-   );
-
-   // Write new content
-   $oEditStatus = $oWantedArticle->saveTitleListToTitle(
-   $aWishList,
-   $oDataSourceArticle->getTitle(),
-   wfMessage( 

[MediaWiki-commits] [Gerrit] Unique slapo-unique to ensure uniqueness of gidNumber for gr... - change (operations/puppet)

[Muehlenhoff (Code Review)]

Muehlenhoff has uploaded a new change for review.

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

Change subject: Unique slapo-unique to ensure uniqueness of gidNumber for groups
..

Unique slapo-unique to ensure uniqueness of gidNumber for groups

Can also be applied to the OIT mirror (but it's read-only), adding
Joel Krauska to CC to get it added to the slapd run by OIT.

T125940

Change-Id: I3ff7e497f96a94a6957dbfc1303cf2658630f894
---
M modules/openldap/templates/slapd.erb
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/55/269155/1

diff --git a/modules/openldap/templates/slapd.erb 
b/modules/openldap/templates/slapd.erb
index 1992ed6..8549872 100644
--- a/modules/openldap/templates/slapd.erb
+++ b/modules/openldap/templates/slapd.erb
@@ -110,6 +110,7 @@
 # Ensure that user IDs are unique
 overlay unique
 unique_uri ldap:///?uidNumber?sub
+unique_uri ldap:///?gidNumber?sub?(objectClass=posixgroup)
 
 ## Replication ACL
 

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

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

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

[MediaWiki-commits] [Gerrit] Element: Support duration of 0 in scrollIntoView (scroll wit... - change (oojs/ui)

[Code Review]

Bartosz Dziewoński has uploaded a new change for review.

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

Change subject: Element: Support duration of 0 in scrollIntoView (scroll 
without animation)
..

Element: Support duration of 0 in scrollIntoView (scroll without animation)

Change-Id: I58d8d412464f5f6b13368568e5b5a8ff0c7f147b
---
M src/Element.js
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/58/269158/1

diff --git a/src/Element.js b/src/Element.js
index 6b770a5..992064f 100644
--- a/src/Element.js
+++ b/src/Element.js
@@ -621,7 +621,7 @@
}
}
if ( !$.isEmptyObject( anim ) ) {
-   $sc.stop( true ).animate( anim, config.duration || 'fast' );
+   $sc.stop( true ).animate( anim, config.duration === undefined ? 
'fast' : config.duration );
if ( callback ) {
$sc.queue( function ( next ) {
callback();

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I58d8d412464f5f6b13368568e5b5a8ff0c7f147b
Gerrit-PatchSet: 1
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: Bartosz Dziewoński 

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

[MediaWiki-commits] [Gerrit] Use custom generator for mobile search on Wikidata - change (operations/mediawiki-config)

[jenkins-bot (Code Review)]

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

Change subject: Use custom generator for mobile search on Wikidata
..


Use custom generator for mobile search on Wikidata

Bug: T85368
Bug: T125396
Change-Id: I25485981eb90f95d3c6c8344734350533866e361
---
M wmf-config/InitialiseSettings.php
M wmf-config/mobile.php
2 files changed, 11 insertions(+), 0 deletions(-)

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



diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index ed93063..cc219be 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -13613,6 +13613,16 @@
'wbptterms' => 'label'
)
 ),
+'wmgMFSearchGenerator' => array(
+   'default' => array(
+   'name' => 'prefixsearch',
+   'prefix' => 'ps'
+   ),
+   'wikidata' => array(
+   'name' => 'wbsearch',
+   'prefix' => 'wbs'
+   )
+),
 'wmgUseGather' => array(
'default' => false,
'testwiki' => true,
diff --git a/wmf-config/mobile.php b/wmf-config/mobile.php
index 3f44f6b..19769af 100644
--- a/wmf-config/mobile.php
+++ b/wmf-config/mobile.php
@@ -101,6 +101,7 @@
 
$wgMFQueryPropModules = $wmgMFQueryPropModules;
$wgMFSearchAPIParams = $wmgMFSearchAPIParams;
+   $wgMFSearchGenerator = $wmgMFSearchGenerator;
 
$wgMFUseWikibaseDescription = true; // Alpha experiment
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I25485981eb90f95d3c6c8344734350533866e361
Gerrit-PatchSet: 6
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Bene 
Gerrit-Reviewer: Addshore 
Gerrit-Reviewer: Aude 
Gerrit-Reviewer: Bene 
Gerrit-Reviewer: Daniel Kinzler 
Gerrit-Reviewer: Florianschmidtwelzow 
Gerrit-Reviewer: Hoo man 
Gerrit-Reviewer: JanZerebecki 
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] Bump src to 4d44fcc7 for deploy - change (mediawiki...deploy)

[Subramanya Sastry (Code Review)]

Subramanya Sastry has uploaded a new change for review.

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

Change subject: Bump src to 4d44fcc7 for deploy
..

Bump src to 4d44fcc7 for deploy

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


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

diff --git a/src b/src
index 4d06e1b..4d44fcc 16
--- a/src
+++ b/src
-Subproject commit 4d06e1ba7d8674d7bf79e6c71f833cf69277bffc
+Subproject commit 4d44fcc79e90e2d2724460e910ad7ea14358cfb1

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

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

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

[MediaWiki-commits] [Gerrit] Release v0.4.1 - change (mediawiki...mathoid)

[Mobrovac (Code Review)]

Mobrovac has uploaded a new change for review.

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

Change subject: Release v0.4.1
..

Release v0.4.1

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


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/mathoid 
refs/changes/62/269162/1

diff --git a/package.json b/package.json
index 982bdce..93357bf 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "mathoid",
-  "version": "0.4.0",
+  "version": "0.4.1",
   "description": "Render TeX to SVG and MathML using MathJax. Based on 
svgtex.",
   "main": "./app.js",
   "scripts": {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9d540ba4a16b41ee5498786380e3761827aa7397
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/mathoid
Gerrit-Branch: master
Gerrit-Owner: Mobrovac 

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

[MediaWiki-commits] [Gerrit] Add scap3 deployment option for services - change (operations/puppet)

[Thcipriani (Code Review)]

Thcipriani has uploaded a new change for review.

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

Change subject: Add scap3 deployment option for services
..

Add scap3 deployment option for services

This adds a parameter to the service::node resource to allow for
deployment of a service via scap3.

scap::target now installs the specified package using the new scap3
puppet provider.

Change-Id: I067bd20feabf60ab1d9ce336766792a46eefee6b
---
D modules/restbase/manifests/deploy.pp
M modules/restbase/manifests/init.pp
M modules/role/manifests/eventbus/eventbus.pp
M modules/scap/manifests/target.pp
A modules/service/manifests/deploy/scap.pp
A modules/service/manifests/deploy/trebuchet.pp
M modules/service/manifests/node.pp
7 files changed, 84 insertions(+), 107 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/43/269143/1

diff --git a/modules/restbase/manifests/deploy.pp 
b/modules/restbase/manifests/deploy.pp
deleted file mode 100644
index f5d7d89..000
--- a/modules/restbase/manifests/deploy.pp
+++ /dev/null
@@ -1,55 +0,0 @@
-# == Class restbase::deploy
-#
-# Creates user and permissions for deploy user
-# on restbase hosts
-#
-# === Parameters
-#
-# [*public_key*]
-#   This is the public_key for the deploy-service user. The private part of 
this
-#   key should reside in the private puppet repo for the environment. By 
default
-#   this public key is set to the deploy-service user's public key for 
production
-#   private puppet—it should be overwritten using hiera in non-production
-#   environements.
-
-class restbase::deploy(
-$public_key_file = 'puppet:///modules/restbase/servicedeploy_rsa.pub',
-) {
-$user = 'deploy-service'
-
-user { $user:
-ensure => present,
-shell  => '/bin/bash',
-home   => '/var/lib/scap',
-system => true,
-managehome => true,
-}
-
-ssh::userkey { $user:
-source => $public_key_file,
-}
-
-# Using trebuchet provider while scap service deployment is under
-# development—chicken and egg things
-#
-# This should be removed once scap3 is in a final state
-package { 'scap/scap':
-provider => 'trebuchet',
-}
-
-# Rather than futz with adding new functionality to allow a deployment
-# user set per repository in trebuchet, I'm running an exec here
-$dir = '/srv/deployment/restbase/deploy'
-exec { 'chown deploy-service':
-command => "/bin/chown -R ${user} ${dir}",
-unless  => "/usr/bin/test $(/usr/bin/stat -c'%U' ${dir}) = ${user}"
-}
-
-sudo::user { $user:
-privileges => [
-"ALL = (${user}) NOPASSWD: ALL",
-'ALL = (root) NOPASSWD: /usr/sbin/service restbase restart',
-]
-}
-
-}
diff --git a/modules/restbase/manifests/init.pp 
b/modules/restbase/manifests/init.pp
index ddf8693..cc26881 100644
--- a/modules/restbase/manifests/init.pp
+++ b/modules/restbase/manifests/init.pp
@@ -67,6 +67,15 @@
 #   The domain to monitor during the service's operation.
 #   Default: en.wikipedia.org
 #
+# [*deployment*]
+#   If this value is set to 'scap3' then deploy via scap3, otherwise, use 
trebuchet
+#   Default: undef
+#
+# [*deployment_user*]
+#   User that will own the deployment files in the case of:
+#   $deployment => 'scap3'
+#   Default: deploy-service
+#
 class restbase(
 $cassandra_user = 'cassandra',
 $cassandra_password = 'cassandra',
@@ -89,8 +98,20 @@
 $mathoid_uri= 'http://mathoid.svc.eqiad.wmnet:10042',
 $aqs_uri=
 'http://aqs.svc.eqiad.wmnet:7232/analytics.wikimedia.org/v1',
-$monitor_domain = 'en.wikipedia.org',
+$monitor_domain  = 'en.wikipedia.org',
+$deployment  = undef,
+$deployment_user = 'deploy-service',
 ) {
+
+if $deployment == 'scap3' {
+user { $deployment_user:
+ensure => present,
+shell  => '/bin/bash',
+home   => '/var/lib/scap',
+system => true,
+managehome => true,
+}
+}
 
 service::node { 'restbase':
 port=> $port,
@@ -103,6 +124,7 @@
 local_logging   => false,
 auto_refresh=> false,
 init_restart=> false,
+deployment  => $deployment,
 }
 
 }
diff --git a/modules/role/manifests/eventbus/eventbus.pp 
b/modules/role/manifests/eventbus/eventbus.pp
index 9f2fe93..d31d294 100644
--- a/modules/role/manifests/eventbus/eventbus.pp
+++ b/modules/role/manifests/eventbus/eventbus.pp
@@ -12,15 +12,15 @@
 require ::eventlogging
 require ::role::kafka::main::config
 
-$eventlogging_path = '/srv/deployment/eventlogging/eventbus'
+$package = 'eventlogging/eventbus'
+$package_owner = 'eventlogging'
 
 # eventlogging code for eventbus is configured to deploy
 # from the eventlogging/eventbus deploy target
 # via scap/scap.cfg on the 

[MediaWiki-commits] [Gerrit] Fix transclusion node cloneElement method - change (mediawiki...VisualEditor)

[jenkins-bot (Code Review)]

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

Change subject: Fix transclusion node cloneElement method
..


Fix transclusion node cloneElement method

* Override the static cloneElement. getClonedElement shouldn't
  be overridden as doing so misses static invocations.
* Apply the same fix to extension nodes
* Fix DOM loop to reference clone.originalDomElements[ i ]

Logically depends on Id8024c171c to work.

Bug: T126169
Bug: T126114
Change-Id: Icf4d3115db5b12b97a6c805ff3d0b71d9e88b804
---
M modules/ve-mw/dm/nodes/ve.dm.MWExtensionNode.js
M modules/ve-mw/dm/nodes/ve.dm.MWTransclusionNode.js
2 files changed, 35 insertions(+), 14 deletions(-)

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



diff --git a/modules/ve-mw/dm/nodes/ve.dm.MWExtensionNode.js 
b/modules/ve-mw/dm/nodes/ve.dm.MWExtensionNode.js
index 3ad5c15..0d604e0 100644
--- a/modules/ve-mw/dm/nodes/ve.dm.MWExtensionNode.js
+++ b/modules/ve-mw/dm/nodes/ve.dm.MWExtensionNode.js
@@ -77,6 +77,24 @@
return dataElement;
 };
 
+/** */
+ve.dm.MWExtensionNode.static.cloneElement = function () {
+   // TODO: This is the same as 
ve.dm.MWTransclusionnode.static.cloneElement, find a way
+   // to de-duplicate this method.
+   var i, len,
+   // Parent method
+   clone = ve.dm.MWExtensionNode.super.static.cloneElement.apply( 
this, arguments );
+
+   delete clone.attributes.originalMw;
+   // Remove about attribute to prevent about grouping of duplicated 
transclusions
+   if ( clone.originalDomElements ) {
+   for ( i = 0, len = clone.originalDomElements.length; i < len; 
i++ ) {
+   clone.originalDomElements[ i ].removeAttribute( 'about' 
);
+   }
+   }
+   return clone;
+};
+
 ve.dm.MWExtensionNode.static.toDomElements = function ( dataElement, doc, 
converter ) {
var el, els, index,
store = converter.getStore(),
diff --git a/modules/ve-mw/dm/nodes/ve.dm.MWTransclusionNode.js 
b/modules/ve-mw/dm/nodes/ve.dm.MWTransclusionNode.js
index 7309bdc..cbdc45b 100644
--- a/modules/ve-mw/dm/nodes/ve.dm.MWTransclusionNode.js
+++ b/modules/ve-mw/dm/nodes/ve.dm.MWTransclusionNode.js
@@ -20,7 +20,7 @@
  */
 ve.dm.MWTransclusionNode = function VeDmMWTransclusionNode() {
// Parent constructor
-   ve.dm.LeafNode.apply( this, arguments );
+   ve.dm.MWTransclusionNode.super.apply( this, arguments );
 
// Mixin constructors
ve.dm.GeneratedContentNode.call( this );
@@ -189,6 +189,22 @@
ve.resolveAttributes( $( els ), doc, 
ve.dm.Converter.static.computedAttributes );
}
return els;
+};
+
+/** */
+ve.dm.MWTransclusionNode.static.cloneElement = function () {
+   var i, len,
+   // Parent method
+   clone = 
ve.dm.MWTransclusionNode.super.static.cloneElement.apply( this, arguments );
+
+   delete clone.attributes.originalMw;
+   // Remove about attribute to prevent about grouping of duplicated 
transclusions
+   if ( clone.originalDomElements ) {
+   for ( i = 0, len = clone.originalDomElements.length; i < len; 
i++ ) {
+   clone.originalDomElements[ i ].removeAttribute( 'about' 
);
+   }
+   }
+   return clone;
 };
 
 /**
@@ -374,19 +390,6 @@
}
}
return wikitext;
-};
-
-/** */
-ve.dm.MWTransclusionNode.prototype.getClonedElement = function () {
-   var i, len, clone = ve.dm.LeafNode.prototype.getClonedElement.call( 
this );
-   delete clone.attributes.originalMw;
-   // Remove about attribute to prevent about grouping of duplicated 
transclusions
-   if ( clone.originalDomElements ) {
-   for ( i = 0, len = clone.originalDomElements.length; i < len; 
i++ ) {
-   clone.originalDomElements.removeAttribute( 'about' );
-   }
-   }
-   return clone;
 };
 
 /* Concrete subclasses */

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Icf4d3115db5b12b97a6c805ff3d0b71d9e88b804
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders 
Gerrit-Reviewer: Catrope 
Gerrit-Reviewer: DLynch 
Gerrit-Reviewer: Divec 
Gerrit-Reviewer: Esanders 
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] Syncronize VisualEditor: a996356..25be46a - change (mediawiki/extensions)

[Jenkins-mwext-sync (Code Review)]

Jenkins-mwext-sync has uploaded a new change for review.

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

Change subject: Syncronize VisualEditor: a996356..25be46a
..

Syncronize VisualEditor: a996356..25be46a

Change-Id: I3d944e2f05f44a6e918d2401cb96a9a96553f5d5
---
M VisualEditor
1 file changed, 0 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions 
refs/changes/48/269148/1

diff --git a/VisualEditor b/VisualEditor
index a996356..25be46a 16
--- a/VisualEditor
+++ b/VisualEditor
-Subproject commit a996356e12c5e1655d8cd04f42537cd5b1b03b34
+Subproject commit 25be46a57d6b875b64fb3455c93fa776d6d301ee

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I3d944e2f05f44a6e918d2401cb96a9a96553f5d5
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions
Gerrit-Branch: master
Gerrit-Owner: Jenkins-mwext-sync 

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

[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: a996356..25be46a - change (mediawiki/extensions)

[Jenkins-mwext-sync (Code Review)]

Jenkins-mwext-sync has submitted this change and it was merged.

Change subject: Syncronize VisualEditor: a996356..25be46a
..


Syncronize VisualEditor: a996356..25be46a

Change-Id: I3d944e2f05f44a6e918d2401cb96a9a96553f5d5
---
M VisualEditor
1 file changed, 0 insertions(+), 0 deletions(-)

Approvals:
  Jenkins-mwext-sync: Verified; Looks good to me, approved



diff --git a/VisualEditor b/VisualEditor
index a996356..25be46a 16
--- a/VisualEditor
+++ b/VisualEditor
-Subproject commit a996356e12c5e1655d8cd04f42537cd5b1b03b34
+Subproject commit 25be46a57d6b875b64fb3455c93fa776d6d301ee

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I3d944e2f05f44a6e918d2401cb96a9a96553f5d5
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions
Gerrit-Branch: master
Gerrit-Owner: Jenkins-mwext-sync 
Gerrit-Reviewer: Jenkins-mwext-sync 

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

[MediaWiki-commits] [Gerrit] SelectWidget: Prevent mouse highlighting while typing-to-select - change (oojs/ui)

[Code Review]

Bartosz Dziewoński has uploaded a new change for review.

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

Change subject: SelectWidget: Prevent mouse highlighting while typing-to-select
..

SelectWidget: Prevent mouse highlighting while typing-to-select

Chromium's Blink engine will generate spurious 'mouseover' events during
programmatic scrolling and around 100-150 ms after it is finished.
I am pretty sure this violates some specs, but I don't really feel
like spec-lawyering with its developers.

I miss the times when the only browser with broken event handling was IE 6.

Bug: T125740
Change-Id: I4b95935027cec699c0460f4ddf1fb9f6b3c97064
---
M src/widgets/SelectWidget.js
1 file changed, 26 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/57/269157/1

diff --git a/src/widgets/SelectWidget.js b/src/widgets/SelectWidget.js
index 8f579ca..bdc7e33 100644
--- a/src/widgets/SelectWidget.js
+++ b/src/widgets/SelectWidget.js
@@ -60,6 +60,7 @@
this.onKeyPressHandler = this.onKeyPress.bind( this );
this.keyPressBuffer = '';
this.keyPressBufferTimer = null;
+   this.stopSpuriousMouseHighlights = 0;
 
// Events
this.connect( this, {
@@ -223,7 +224,9 @@
  */
 OO.ui.SelectWidget.prototype.onMouseOver = function ( e ) {
var item;
-
+   if ( this.stopSpuriousMouseHighlights ) {
+   return;
+   }
if ( !this.isDisabled() ) {
item = this.getTargetItem( e );
this.highlightItem( item && item.isHighlightable() ? item : 
null );
@@ -294,7 +297,7 @@
} else {
this.chooseItem( nextItem );
}
-   nextItem.scrollElementIntoView();
+   this.scrollItemIntoView( nextItem );
}
 
if ( handled ) {
@@ -321,6 +324,26 @@
  */
 OO.ui.SelectWidget.prototype.unbindKeyDownListener = function () {
this.getElementWindow().removeEventListener( 'keydown', 
this.onKeyDownHandler, true );
+};
+
+/**
+ * Scroll item into view, preventing spurious mouse highlight actions from 
happening.
+ *
+ * @return {OO.ui.OptionWidget} Item to scroll into view
+ * @param {boolean} [immediate] Whether to scroll with no animation
+ */
+OO.ui.SelectWidget.prototype.scrollItemIntoView = function ( item ) {
+   var widget = this;
+   // Chromium's Blink engine will generate spurious 'mouseover' events 
during programmatic scrolling
+   // and around 100-150 ms after it is finished.
+   this.stopSpuriousMouseHighlights++;
+   item.scrollElementIntoView( {
+   complete: function () {
+   setTimeout( function () {
+   widget.stopSpuriousMouseHighlights--;
+   }, 200 );
+   }
+   } );
 };
 
 /**
@@ -385,7 +408,7 @@
} else {
this.chooseItem( item );
}
-   item.scrollElementIntoView();
+   this.scrollItemIntoView( item );
}
 
return false;

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I4b95935027cec699c0460f4ddf1fb9f6b3c97064
Gerrit-PatchSet: 1
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: Bartosz Dziewoński 

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

[MediaWiki-commits] [Gerrit] demo: Measure time needed to construct the demo - change (oojs/ui)

[Code Review]

Bartosz Dziewoński has uploaded a new change for review.

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

Change subject: demo: Measure time needed to construct the demo
..

demo: Measure time needed to construct the demo

On my machine, it takes around 750-900 ms for the widgets demo. (Try it
with debugger closed, as it takes 5 times or so longer with it open.)

Change-Id: Ib50aeaf33a0f05a01612b6d290c4a3e823296783
---
M demos/demo.js
M demos/infusion.js
2 files changed, 12 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/59/269159/1

diff --git a/demos/demo.js b/demos/demo.js
index 97faea5..1f4f1b4 100644
--- a/demos/demo.js
+++ b/demos/demo.js
@@ -185,13 +185,24 @@
  * Load the demo page. Must be called after $element is attached.
  */
 OO.ui.Demo.prototype.initialize = function () {
+   // Helper function to get high resolution profiling data, where 
available.
+   function now() {
+   /*global performance */
+   return ( typeof performance !== 'undefined' ) ? 
performance.now() :
+   Date.now ? Date.now() : new Date().getTime();
+   }
+
var demo = this,
promises = this.stylesheetLinks.map( function ( el ) {
return $( el ).data( 'load-promise' );
} );
$.when.apply( $, promises )
.done( function () {
+   var start, end;
+   start = now();
demo.constructor.static.pages[ demo.mode.page ]( demo );
+   end = now();
+   window.console.log( 'Took ' + ( end - start ) + ' ms to 
build demo page.' );
} )
.fail( function () {
demo.$element.append( $( '' ).text( 'Demo styles 
failed to load.' ) );
diff --git a/demos/infusion.js b/demos/infusion.js
index ea927ea..27ae90a 100644
--- a/demos/infusion.js
+++ b/demos/infusion.js
@@ -21,7 +21,7 @@
return OO.ui.infuse( e.id );
} );
end = now();
-   window.console.log( 'Infusion time: ' + ( end - start ) );
+   window.console.log( 'Took ' + ( end - start ) + ' ms to infuse demo 
page.' );
infuseButton.setDisabled( true );
 }
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib50aeaf33a0f05a01612b6d290c4a3e823296783
Gerrit-PatchSet: 1
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: Bartosz Dziewoński 

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

[MediaWiki-commits] [Gerrit] demo: Add a long DropdownInputWidget demo - change (oojs/ui)

[Code Review]

Bartosz Dziewoński has uploaded a new change for review.

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

Change subject: demo: Add a long DropdownInputWidget demo
..

demo: Add a long DropdownInputWidget demo

A fair sample of ~10% of the languages supported by MediaWiki, plus
a couple more to make things interesting.

For testing issues with long dropdowns (e.g. T121045) and
type-to-select (e.g. T125740).

Change-Id: I117bce169f38f329b1c929e81f711acd62026dad
---
M demos/pages/widgets.js
M demos/widgets.php
2 files changed, 98 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/56/269156/1

diff --git a/demos/pages/widgets.js b/demos/pages/widgets.js
index f446f54..869472c 100644
--- a/demos/pages/widgets.js
+++ b/demos/pages/widgets.js
@@ -1138,6 +1138,55 @@
}
),
new OO.ui.FieldLayout(
+   new OO.ui.DropdownInputWidget( {
+   options: [
+   { data: 'sq', label: 
'Albanian' },
+   { data: 'frp', label: 
'Arpitan' },
+   { data: 'ba', label: 
'Bashkir' },
+   { data: 'pt-br', label: 
'Brazilian Portuguese' },
+   { data: 'tzm', label: 
'Central Atlas Tamazight' },
+   { data: 'zh', label: 
'Chinese' },
+   { data: 'co', label: 
'Corsican' },
+   { data: 'del', label: 
'Delaware' },
+   { data: 'eml', label: 
'Emiliano-Romagnolo' },
+   { data: 'en', label: 
'English' },
+   { data: 'fi', label: 
'Finnish' },
+   { data: 'aln', label: 
'Gheg Albanian' },
+   { data: 'he', label: 
'Hebrew' },
+   { data: 'ilo', label: 
'Iloko' },
+   { data: 'kbd', label: 
'Kabardian' },
+   { data: 'csb', label: 
'Kashubian' },
+   { data: 'avk', label: 
'Kotava' },
+   { data: 'lez', label: 
'Lezghian' },
+   { data: 'nds-nl', 
label: 'Low Saxon' },
+   { data: 'ml', label: 
'Malayalam' },
+   { data: 'dum', label: 
'Middle Dutch' },
+   { data: 'ary', label: 
'Moroccan Arabic' },
+   { data: 'pih', label: 
'Norfuk / Pitkern' },
+   { data: 'ny', label: 
'Nyanja' },
+   { data: 'ang', label: 
'Old English' },
+   { data: 'non', label: 
'Old Norse' },
+   { data: 'pau', label: 
'Palauan' },
+   { data: 'pdt', label: 
'Plautdietsch' },
+   { data: 'ru', label: 
'Russian' },
+   { data: 'stq', label: 
'Saterland Frisian' },
+   { data: 'ii', label: 
'Sichuan Yi' },
+   { data: 'bcc', label: 
'Southern Balochi' },
+   { data: 'shi', label: 
'Tachelhit' },
+   { data: 'th', label: 
'Thai' },
+   { data: 'tr', label: 
'Turkish' },
+   { data: 'fiu-vro', 
label: 'Võro' },
+   { data: 'vls', label: 
'West Flemish' },
+   { data: 'zea', label: 
'Zeelandic' }
+   ],
+   value: 'en'
+   } ),
+   {
+   label: 

[MediaWiki-commits] [Gerrit] Fix possible NPE when showing retryable error. - change (apps...wikipedia)

[jenkins-bot (Code Review)]

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

Change subject: Fix possible NPE when showing retryable error.
..


Fix possible NPE when showing retryable error.

https://rink.hockeyapp.net/manage/apps/226650/app_versions/11/crash_reasons/110303802

Change-Id: I28a8cc7ae0ac510a0175f18848e8bc30b0f760bd
---
M app/src/main/java/org/wikipedia/util/ThrowableUtil.java
1 file changed, 6 insertions(+), 2 deletions(-)

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



diff --git a/app/src/main/java/org/wikipedia/util/ThrowableUtil.java 
b/app/src/main/java/org/wikipedia/util/ThrowableUtil.java
index 66f3d1d..ec28683 100644
--- a/app/src/main/java/org/wikipedia/util/ThrowableUtil.java
+++ b/app/src/main/java/org/wikipedia/util/ThrowableUtil.java
@@ -6,6 +6,8 @@
 import org.json.JSONException;
 import android.content.Context;
 import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+
 import javax.net.ssl.SSLException;
 import java.net.UnknownHostException;
 import java.util.concurrent.TimeoutException;
@@ -65,7 +67,7 @@
 }
 
 public static boolean isRetryable(@NonNull ThrowableUtil.AppError e) {
-return !e.getDetail().contains("404");
+return !(e.getDetail() != null && e.getDetail().contains("404"));
 }
 
 private static boolean isNetworkError(@NonNull Throwable e) {
@@ -106,13 +108,15 @@
 public static class AppError {
 private String error;
 private String detail;
-public AppError(String error, String detail) {
+public AppError(@NonNull String error, @Nullable String detail) {
 this.error = error;
 this.detail = detail;
 }
+@NonNull
 public String getError() {
 return error;
 }
+@Nullable
 public String getDetail() {
 return detail;
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I28a8cc7ae0ac510a0175f18848e8bc30b0f760bd
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Dbrant 
Gerrit-Reviewer: BearND 
Gerrit-Reviewer: Brion VIBBER 
Gerrit-Reviewer: Mholloway 
Gerrit-Reviewer: Niedzielski 
Gerrit-Reviewer: Sniedzielski 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Prevent possible NPE when preparing options menu. - change (apps...wikipedia)

[Dbrant (Code Review)]

Dbrant has uploaded a new change for review.

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

Change subject: Prevent possible NPE when preparing options menu.
..

Prevent possible NPE when preparing options menu.

https://rink.hockeyapp.net/manage/apps/226650/app_versions/11/crash_reasons/110289892

Change-Id: Ib5c88595bd8c2d9a6a38ad909ed438f3aa47bb23
---
M app/src/main/java/org/wikipedia/page/PageFragment.java
1 file changed, 8 insertions(+), 0 deletions(-)


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

diff --git a/app/src/main/java/org/wikipedia/page/PageFragment.java 
b/app/src/main/java/org/wikipedia/page/PageFragment.java
index d6b3abf..0571bba 100755
--- a/app/src/main/java/org/wikipedia/page/PageFragment.java
+++ b/app/src/main/java/org/wikipedia/page/PageFragment.java
@@ -643,6 +643,14 @@
 MenuItem similarTitles = menu.findItem(R.id.menu_page_similar_titles);
 MenuItem themeChooserItem = 
menu.findItem(R.id.menu_page_font_and_theme);
 
+if (otherLangItem == null) {
+// On API <= 19, it looks like onPrepareOptionsMenu can be called 
before the menu
+// is actually inflated.
+// TODO: remove when this is better understood.
+L.logRemoteErrorIfProd(new RuntimeException("onPrepareOptionsMenu 
called with empty menu."));
+return;
+}
+
 if (pageLoadStrategy.isLoading() || errorState) {
 otherLangItem.setEnabled(false);
 findInPageItem.setEnabled(false);

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib5c88595bd8c2d9a6a38ad909ed438f3aa47bb23
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Dbrant 

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

[MediaWiki-commits] [Gerrit] InputWidget: Remove the 'setAccessKey' method - change (oojs/ui)

[jenkins-bot (Code Review)]

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

Change subject: InputWidget: Remove the 'setAccessKey' method
..


InputWidget: Remove the 'setAccessKey' method

The implementation in OO.ui.AccessKeyedElement works for inputs too.

Follow-up to f0c1f434241b6d538d89c770634b8917690ec5da.

Change-Id: Iaa723e91c0a346ff6674584873aafd331ffc57ef
---
M src/widgets/InputWidget.js
1 file changed, 0 insertions(+), 25 deletions(-)

Approvals:
  Bartosz Dziewoński: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/src/widgets/InputWidget.js b/src/widgets/InputWidget.js
index 429790a..02feba2 100644
--- a/src/widgets/InputWidget.js
+++ b/src/widgets/InputWidget.js
@@ -52,7 +52,6 @@
.addClass( 'oo-ui-inputWidget' )
.append( this.$input );
this.setValue( config.value );
-   this.setAccessKey( config.accessKey );
if ( config.dir ) {
this.setDir( config.dir );
}
@@ -192,30 +191,6 @@
this.value = value;
this.emit( 'change', this.value );
}
-   return this;
-};
-
-/**
- * Set the input's access key.
- * FIXME: This is the same code as in OO.ui.mixin.ButtonElement, maybe find a 
better place for it?
- *
- * @param {string} accessKey Input's access key, use empty string to remove
- * @chainable
- */
-OO.ui.InputWidget.prototype.setAccessKey = function ( accessKey ) {
-   accessKey = typeof accessKey === 'string' && accessKey.length ? 
accessKey : null;
-
-   if ( this.accessKey !== accessKey ) {
-   if ( this.$input ) {
-   if ( accessKey !== null ) {
-   this.$input.attr( 'accesskey', accessKey );
-   } else {
-   this.$input.removeAttr( 'accesskey' );
-   }
-   }
-   this.accessKey = accessKey;
-   }
-
return this;
 };
 

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

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

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

[MediaWiki-commits] [Gerrit] Update session log messages - change (mediawiki/core)

[jenkins-bot (Code Review)]

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

Change subject: Update session log messages
..


Update session log messages

* Use PSR-3 templates and context where applicable
* Add log coverage for exceptional events

Bug: T125452
Change-Id: I8f96fa1c5766c739a21219abcae2dbb76de53e2a
---
M includes/session/BotPasswordSessionProvider.php
M includes/session/CookieSessionProvider.php
M includes/session/PHPSessionHandler.php
M includes/session/SessionBackend.php
M includes/session/SessionManager.php
M tests/phpunit/includes/session/BotPasswordSessionProviderTest.php
M tests/phpunit/includes/session/CookieSessionProviderTest.php
M tests/phpunit/includes/session/PHPSessionHandlerTest.php
M tests/phpunit/includes/session/SessionManagerTest.php
9 files changed, 329 insertions(+), 113 deletions(-)

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



diff --git a/includes/session/BotPasswordSessionProvider.php 
b/includes/session/BotPasswordSessionProvider.php
index d9c60c7..81c7ebf 100644
--- a/includes/session/BotPasswordSessionProvider.php
+++ b/includes/session/BotPasswordSessionProvider.php
@@ -118,26 +118,44 @@
array_keys( $metadata )
);
if ( $missingKeys ) {
-   $this->logger->info( "Session $info: Missing metadata: 
" . join( ', ', $missingKeys ) );
+   $this->logger->info( 'Session "{session}": Missing 
metadata: {missing}', array(
+   'session' => $info,
+   'missing' => join( ', ', $missingKeys ),
+   ) );
return false;
}
 
$bp = BotPassword::newFromCentralId( $metadata['centralId'], 
$metadata['appId'] );
if ( !$bp ) {
$this->logger->info(
-   "Session $info: No BotPassword for 
{$metadata['centralId']} {$metadata['appId']}"
-   );
+   'Session "{session}": No BotPassword for 
{centralId} {appId}',
+   array(
+   'session' => $info,
+   'centralId' => $metadata['centralId'],
+   'appId' => $metadata['appId'],
+   ) );
return false;
}
 
if ( !hash_equals( $metadata['token'], $bp->getToken() ) ) {
-   $this->logger->info( "Session $info: BotPassword token 
check failed" );
+   $this->logger->info( 'Session "{session}": BotPassword 
token check failed', array(
+   'session' => $info,
+   'centralId' => $metadata['centralId'],
+   'appId' => $metadata['appId'],
+   ) );
return false;
}
 
$status = $bp->getRestrictions()->check( $request );
if ( !$status->isOk() ) {
-   $this->logger->info( "Session $info: Restrictions check 
failed", $status->getValue() );
+   $this->logger->info(
+   'Session "{session}": Restrictions check 
failed',
+   array(
+   'session' => $info,
+   'restrictions' => $status->getValue(),
+   'centralId' => $metadata['centralId'],
+   'appId' => $metadata['appId'],
+   ) );
return false;
}
 
diff --git a/includes/session/CookieSessionProvider.php 
b/includes/session/CookieSessionProvider.php
index f989cbc..3177dc2 100644
--- a/includes/session/CookieSessionProvider.php
+++ b/includes/session/CookieSessionProvider.php
@@ -123,11 +123,28 @@
 
// Sanity check
if ( $userName !== null && $userInfo->getName() !== 
$userName ) {
+   $this->logger->warning(
+   'Session "{session}" requested with 
mismatched UserID and UserName cookies.',
+   array(
+   'session' => $info['id'],
+   'mismatch' => array(
+   'userid' => $userId,
+   'cookie_username' => 
$userName,
+   'username' => 
$userInfo->getName(),
+   ),
+   ) );
return null;
   

[MediaWiki-commits] [Gerrit] wgRCWatchCategoryMembership true everywhere except wikisource - change (operations/mediawiki-config)

[jenkins-bot (Code Review)]

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

Change subject: wgRCWatchCategoryMembership true everywhere except wikisource
..


wgRCWatchCategoryMembership true everywhere except wikisource

To be deployed on: 8th February (Morning SWAT)

Change-Id: I2cd736129442ba60224e8c5e96ff2e7ce303ee90
---
M wmf-config/InitialiseSettings.php
1 file changed, 2 insertions(+), 8 deletions(-)

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



diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index ed93063..8984463 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -15397,14 +15397,8 @@
 ),
 
 'wgRCWatchCategoryMembership' => array(
-   'default' => false,
-   'mediawikiwiki' => true,
-   'test2wiki' => true,
-   'testwiki' => true,
-   'testwikidatawiki' => true,
-   'zerowiki' => true,
-   'wikipedia' => true,
-   'commonswiki' => true,
+   'default' => true,
+   'wikisource' => false,
 ),
 
 'wmgRelatedSitesPrefixes' => array(

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I2cd736129442ba60224e8c5e96ff2e7ce303ee90
Gerrit-PatchSet: 4
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Addshore 
Gerrit-Reviewer: Addshore 
Gerrit-Reviewer: Alex Monk 
Gerrit-Reviewer: Florianschmidtwelzow 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: Thcipriani 
Gerrit-Reviewer: Tobias Gritschacher 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Enable signature button for the Project namespace in ru.wiki - change (operations/mediawiki-config)

[jenkins-bot (Code Review)]

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

Change subject: Enable signature button for the Project namespace in ru.wiki
..


Enable signature button for the Project namespace in ru.wiki

Bug: T125509
Change-Id: Ifaa36e1c36830209b7e90288ba7997bf3472f0a0
---
M wmf-config/InitialiseSettings.php
1 file changed, 1 insertion(+), 0 deletions(-)

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



diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index 468b55a..93b34c4 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -10755,6 +10755,7 @@
 
'+dewikivoyage' => array( 102 ), // T119420
'+itwiki' => array( 102 ),
+   '+ruwiki' => array( 104 ), // T125509
 ),
 
 'wmgExemptFromUserRobotsControlExtra' => array(

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ifaa36e1c36830209b7e90288ba7997bf3472f0a0
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Dereckson 
Gerrit-Reviewer: Florianschmidtwelzow 
Gerrit-Reviewer: Luke081515 
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] Release v0.4.1 - change (mediawiki...mathoid)

[Mobrovac (Code Review)]

Mobrovac has submitted this change and it was merged.

Change subject: Release v0.4.1
..


Release v0.4.1

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

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



diff --git a/package.json b/package.json
index 982bdce..93357bf 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "mathoid",
-  "version": "0.4.0",
+  "version": "0.4.1",
   "description": "Render TeX to SVG and MathML using MathJax. Based on 
svgtex.",
   "main": "./app.js",
   "scripts": {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I9d540ba4a16b41ee5498786380e3761827aa7397
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/mathoid
Gerrit-Branch: master
Gerrit-Owner: Mobrovac 
Gerrit-Reviewer: Mobrovac 
Gerrit-Reviewer: Physikerwelt 

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

[MediaWiki-commits] [Gerrit] graphoid: add noop jobs - change (integration/config)

[Hashar (Code Review)]

Hashar has uploaded a new change for review.

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

Change subject: graphoid: add noop jobs
..

graphoid: add noop jobs

mediawiki/services/graphoid is not ready yet to run npm jobs because it
has a bunch of dependencies that cant be provisionned via puppet
(T119693).

Had noop jobs for now, will let devs CR+2 without having to force merge.

Bug: T106668
Change-Id: Ie39776a38c213307d12ed1d0be1d0792b2f473ef
---
M zuul/layout.yaml
1 file changed, 5 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/47/269147/1

diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 826ad1b..88df6f5 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -6368,6 +6368,11 @@
   - beta-cxserver-update-eqiad
 
   - name: mediawiki/services/graphoid
+# It is not ready yet T106668 / T119693
+test:
+  - noop
+gate-and-submit:
+  - noop
 experimental:
   - npm-node-4.2
 

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

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

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

[MediaWiki-commits] [Gerrit] citoid: migrate to node4.2 - change (integration/config)

[Hashar (Code Review)]

Hashar has uploaded a new change for review.

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

Change subject: citoid: migrate to node4.2
..

citoid: migrate to node4.2

Bug: T119143
Change-Id: Ib0dd46d31f3bb0c5e6b162e341857a83c8ff11ee
---
M zuul/layout.yaml
1 file changed, 1 insertion(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/44/269144/1

diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index bb4ae54..826ad1b 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -6349,9 +6349,7 @@
 
   - name: mediawiki/services/citoid
 template:
-  - name: npm
-experimental:
-  - npm-node-4.2
+  - name: npm-node-4.2
 
   - name: mediawiki/services/cxserver
 template:

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

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

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

[MediaWiki-commits] [Gerrit] Fix possible crash when laying out tab list. - change (apps...wikipedia)

[Dbrant (Code Review)]

Dbrant has uploaded a new change for review.

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

Change subject: Fix possible crash when laying out tab list.
..

Fix possible crash when laying out tab list.

Whenever we add or remove items in the list of tabs, we're required to
notify the tab list adapter, otherwise it can misbehave.

Bug: T126224
Change-Id: Iebb2b28b6e35f4ab56b267f1ca8b2cb62bd5b3eb
---
M app/src/main/java/org/wikipedia/page/PageFragment.java
1 file changed, 9 insertions(+), 9 deletions(-)


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

diff --git a/app/src/main/java/org/wikipedia/page/PageFragment.java 
b/app/src/main/java/org/wikipedia/page/PageFragment.java
index 6b215f3..d6b3abf 100755
--- a/app/src/main/java/org/wikipedia/page/PageFragment.java
+++ b/app/src/main/java/org/wikipedia/page/PageFragment.java
@@ -436,6 +436,7 @@
 if (position != tabList.size() - 1) {
 Tab tab = tabList.remove(position);
 tabList.add(tab);
+tabsProvider.invalidate();
 pageLoadStrategy.updateCurrentBackStackItem();
 pageLoadStrategy.setBackStack(tab.getBackStack());
 pageLoadStrategy.loadFromBackStack();
@@ -462,18 +463,15 @@
 }
 tabList.remove(position);
 tabFunnel.logClose(tabList.size(), position);
-if (position < tabList.size()) {
-// if it's not the topmost tab, then just delete it and update 
the tab list...
-tabsProvider.invalidate();
-} else if (tabList.size() > 0) {
-tabsProvider.invalidate();
-// but if it's the topmost tab, then load the topmost page in 
the next tab.
-pageLoadStrategy.setBackStack(getCurrentTab().getBackStack());
-pageLoadStrategy.loadFromBackStack();
-} else {
+tabsProvider.invalidate();
+if (tabList.size() == 0) {
 tabFunnel.logCancel(tabList.size());
 // and if the last tab was closed, then finish the activity!
 getActivity().finish();
+} else if (position == tabList.size()) {
+// if it's the topmost tab, then load the topmost page in the 
next tab.
+pageLoadStrategy.setBackStack(getCurrentTab().getBackStack());
+pageLoadStrategy.loadFromBackStack();
 }
 }
 };
@@ -948,6 +946,7 @@
 }
 // put this tab in the requested position
 tabList.add(position, tab);
+tabsProvider.invalidate();
 // add the requested page to its backstack
 tab.getBackStack().add(new PageBackStackItem(title, entry));
 } else {
@@ -1080,6 +1079,7 @@
 if (tabList.size() > 1) {
 // if we're at the end of the current tab's backstack, then pop 
the current tab.
 tabList.remove(tabList.size() - 1);
+tabsProvider.invalidate();
 }
 return false;
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iebb2b28b6e35f4ab56b267f1ca8b2cb62bd5b3eb
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Dbrant 

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

[MediaWiki-commits] [Gerrit] Provide approximate preview of table sort styling - change (mediawiki...VisualEditor)

[Esanders (Code Review)]

Esanders has uploaded a new change for review.

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

Change subject: Provide approximate preview of table sort styling
..

Provide approximate preview of table sort styling

The JS logic is too complex to reproduce in CSS, but this
should be ok for most previews.

Bug: T95189
Change-Id: I45233a0781f04b38182f6287aa087cca548c0adf
---
M extension.json
M modules/ve-mw/ce/nodes/ve.ce.MWTableNode.js
A modules/ve-mw/ce/styles/images/sort_both_readonly.svg
A modules/ve-mw/ce/styles/nodes/ve.ce.MWTableNode.css
4 files changed, 28 insertions(+), 4 deletions(-)


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

diff --git a/extension.json b/extension.json
index dc94409..595d5be 100644
--- a/extension.json
+++ b/extension.json
@@ -1083,21 +1083,22 @@

"modules/ve-mw/ui/elements/ve.ui.MWPreviewElement.js",

"modules/ve-mw/ui/tools/ve.ui.MWEditModeTool.js",
"modules/ve-mw/ui/tools/ve.ui.MWPopupTool.js",
+   
"modules/ve-mw/ui/tools/ve.ui.MWEducationPopupTool.js",

"modules/ve-mw/ui/inspectors/ve.ui.MWExtensionInspector.js",

"modules/ve-mw/ui/inspectors/ve.ui.MWLiveExtensionInspector.js",
-   
"modules/ve-mw/ui/actions/ve.ui.MWLinkAction.js",
-   
"modules/ve-mw/ui/tools/ve.ui.MWEducationPopupTool.js"
+   "modules/ve-mw/ui/actions/ve.ui.MWLinkAction.js"
],
"styles": [
+   
"modules/ve-mw/ce/styles/nodes/ve.ce.MWTableNode.css",

"modules/ve-mw/ui/styles/inspectors/ve.ui.MWExtensionInspector.css",

"modules/ve-mw/ui/styles/inspectors/ve.ui.MWLiveExtensionInspector.css",

"modules/ve-mw/ui/styles/dialogs/ve.ui.MWWelcomeDialog.css",

"modules/ve-mw/ui/styles/dialogs/ve.ui.MWSaveDialog.css",

"modules/ve-mw/ui/styles/elements/ve.ui.MWExpandableErrorElement.css",

"modules/ve-mw/ui/styles/tools/ve.ui.MWPopupTool.css",
+   
"modules/ve-mw/ui/styles/tools/ve.ui.MWEducationPopupTool.css",

"modules/ve-mw/ui/styles/widgets/ve.ui.MWAceEditorWidget.css",
-   
"modules/ve-mw/ui/styles/widgets/ve.ui.MWTocWidget.css",
-   
"modules/ve-mw/ui/styles/tools/ve.ui.MWEducationPopupTool.css"
+   
"modules/ve-mw/ui/styles/widgets/ve.ui.MWTocWidget.css"
],
"skinStyles": {
"vector": [
diff --git a/modules/ve-mw/ce/nodes/ve.ce.MWTableNode.js 
b/modules/ve-mw/ce/nodes/ve.ce.MWTableNode.js
index 80f65fa..1439c0f 100644
--- a/modules/ve-mw/ce/nodes/ve.ce.MWTableNode.js
+++ b/modules/ve-mw/ce/nodes/ve.ce.MWTableNode.js
@@ -22,6 +22,9 @@
 
// Mixin constructors
ve.ce.ClassAttributeNode.call( this );
+
+   // DOM changes
+   this.$element.addClass( 've-ce-mwTableNode' );
 };
 
 /* Inheritance */
diff --git a/modules/ve-mw/ce/styles/images/sort_both_readonly.svg 
b/modules/ve-mw/ce/styles/images/sort_both_readonly.svg
new file mode 100644
index 000..3b97000
--- /dev/null
+++ b/modules/ve-mw/ce/styles/images/sort_both_readonly.svg
@@ -0,0 +1,4 @@
+
+http://www.w3.org/2000/svg; viewBox="0 0 21 9" height="9" 
width="21">
+
+
diff --git a/modules/ve-mw/ce/styles/nodes/ve.ce.MWTableNode.css 
b/modules/ve-mw/ce/styles/nodes/ve.ce.MWTableNode.css
new file mode 100644
index 000..bae1486
--- /dev/null
+++ b/modules/ve-mw/ce/styles/nodes/ve.ce.MWTableNode.css
@@ -0,0 +1,16 @@
+/*!
+ * VisualEditor ContentEditable MediaWiki MWTableNode styles.
+ *
+ * @copyright 2011-2016 VisualEditor Team and others; see AUTHORS.txt
+ * @license The MIT License (MIT); see LICENSE.txt
+ */
+
+/* Approximate jQuery.tableSorter rules to preview some sorting controls */
+.ve-ce-mwTableNode.sortable th:not( .unsortable ):not( [scope=row] ) {
+   /* @embed */
+   background-image: url(../images/sort_both_readonly.svg);
+   /* Keep synchronised with jquery.tablesorter styles */
+   background-repeat: no-repeat;
+   background-position: center right;
+   padding-right: 21px;
+}

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

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

[MediaWiki-commits] [Gerrit] Fixes for the recent changes - change (mediawiki...SemanticForms)

[Yaron Koren (Code Review)]

Yaron Koren has uploaded a new change for review.

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

Change subject: Fixes for the recent changes
..

Fixes for the recent changes

Change-Id: I6b9313ab76cdd5eaf2578aa156823e054aa17f45
---
M SemanticForms.php
M includes/SF_Utils.php
2 files changed, 4 insertions(+), 2 deletions(-)


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

diff --git a/SemanticForms.php b/SemanticForms.php
index 0f48316..cbe437c 100644
--- a/SemanticForms.php
+++ b/SemanticForms.php
@@ -229,7 +229,7 @@
 $GLOBALS['wgAutoloadClasses']['SFTokensInput'] = __DIR__ . 
'/includes/forminputs/SF_TokensInput.php';
 $GLOBALS['wgAutoloadClasses']['SFGoogleMapsInput'] = __DIR__ . 
'/includes/forminputs/SF_GoogleMapsInput.php';
 $GLOBALS['wgAutoloadClasses']['SFOpenLayersInput'] = __DIR__ . 
'/includes/forminputs/SF_OpenLayersInput.php';
-$GLOBALS['wgAutoloadClasses']['SFRegExpInput'] = $dir . 
'/includes/SF_RegExpInput.php';
+$GLOBALS['wgAutoloadClasses']['SFRegExpInput'] = __DIR__ . 
'/includes/forminputs/SF_RegExpInput.php';
 
 $GLOBALS['wgAutoloadClasses']['SFWikiPage'] = __DIR__ . 
'/includes/wikipage/SF_WikiPage.php';
 $GLOBALS['wgAutoloadClasses']['SFWikiPageTemplate'] = __DIR__ . 
'/includes/wikipage/SF_WikiPageTemplate.php';
diff --git a/includes/SF_Utils.php b/includes/SF_Utils.php
index 3589755..0b216bb 100644
--- a/includes/SF_Utils.php
+++ b/includes/SF_Utils.php
@@ -77,7 +77,9 @@
}
 
public static function initialize() {
-   $GLOBALS['sfgScriptPath'] = __DIR__ . '/../';
+   $GLOBALS['sfgPartialPath'] = '/extensions/SemanticForms';
+   $GLOBALS['sfgScriptPath'] = $GLOBALS['wgScriptPath'] . $GLOBALS[
+'sfgPartialPath'];
 
// Admin Links hook needs to be called in a delayed way so that 
it
// will always be called after SMW's Admin Links addition; as of

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6b9313ab76cdd5eaf2578aa156823e054aa17f45
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SemanticForms
Gerrit-Branch: master
Gerrit-Owner: Yaron Koren 

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

[MediaWiki-commits] [Gerrit] graphoid: add noop jobs - change (integration/config)

[jenkins-bot (Code Review)]

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

Change subject: graphoid: add noop jobs
..


graphoid: add noop jobs

mediawiki/services/graphoid is not ready yet to run npm jobs because it
has a bunch of dependencies that cant be provisionned via puppet
(T119693).

Had noop jobs for now, will let devs CR+2 without having to force merge.

Bug: T106668
Change-Id: Ie39776a38c213307d12ed1d0be1d0792b2f473ef
---
M zuul/layout.yaml
1 file changed, 5 insertions(+), 0 deletions(-)

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



diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 826ad1b..88df6f5 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -6368,6 +6368,11 @@
   - beta-cxserver-update-eqiad
 
   - name: mediawiki/services/graphoid
+# It is not ready yet T106668 / T119693
+test:
+  - noop
+gate-and-submit:
+  - noop
 experimental:
   - npm-node-4.2
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie39776a38c213307d12ed1d0be1d0792b2f473ef
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Hashar 
Gerrit-Reviewer: Hashar 
Gerrit-Reviewer: Yurik 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Use strict array search for linker options. - change (mediawiki...IndexFunction)

[jenkins-bot (Code Review)]

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

Change subject: Use strict array search for linker options.
..


Use strict array search for linker options.

This is in anticipation of gerrit change
I16b9d6c3044ae60d5a7fd340569c019ffc4b2a55 (and a good practice
anyway).

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

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



diff --git a/IndexFunction_body.php b/IndexFunction_body.php
index 9ec9be0..b9ef039 100644
--- a/IndexFunction_body.php
+++ b/IndexFunction_body.php
@@ -163,7 +163,7 @@
 
// Turn links to indexes into blue links
static function blueLinkIndexes( $skin, $target, $options, &$text, 
&$attribs, &$ret ) {
-   if ( in_array( 'known', $options ) ) {
+   if ( in_array( 'known', $options, true ) ) {
return true;
}
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie5854d25fef6db9356a4305074bb790ee917a5b6
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/IndexFunction
Gerrit-Branch: master
Gerrit-Owner: Gergő Tisza 
Gerrit-Reviewer: Anomie 
Gerrit-Reviewer: BryanDavis 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Apertium: Fix --log-path position in SystemD unit file - change (operations/puppet)

[Dzahn (Code Review)]

Dzahn has submitted this change and it was merged.

Change subject: Apertium: Fix --log-path position in SystemD unit file
..


Apertium: Fix --log-path position in SystemD unit file

The correct ordering of parameters is `--log-path <%= @log_dir %>`.

Change-Id: I4cbeb35005866a7c387d9c38d1b8051e0a2cbb09
---
M modules/apertium/templates/initscripts/apertium-apy.systemd.erb
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/modules/apertium/templates/initscripts/apertium-apy.systemd.erb 
b/modules/apertium/templates/initscripts/apertium-apy.systemd.erb
index 000e310..de643e6 100644
--- a/modules/apertium/templates/initscripts/apertium-apy.systemd.erb
+++ b/modules/apertium/templates/initscripts/apertium-apy.systemd.erb
@@ -17,7 +17,7 @@
 # https://www.python.org/dev/peps/pep-3143/#correct-daemon-behaviour
 # it only seems to do the first. So we abuse it a bit to get standard behaviour
 # and better logging
-ExecStart=/usr/bin/python3 /usr/share/apertium-apy/servlet.py -j<%= 
@num_of_processes %> -m<%= @max_idle_seconds %> --daemon <%= @log_dir %> 
--log-path /usr/share/apertium/modes
+ExecStart=/usr/bin/python3 /usr/share/apertium-apy/servlet.py -j<%= 
@num_of_processes %> -m<%= @max_idle_seconds %> --daemon --log-path <%= 
@log_dir %> /usr/share/apertium/modes
 
 [Install]
 WantedBy=multi-user.target

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I4cbeb35005866a7c387d9c38d1b8051e0a2cbb09
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Mobrovac 
Gerrit-Reviewer: Alexandros Kosiaris 
Gerrit-Reviewer: Dzahn 
Gerrit-Reviewer: Filippo Giunchedi 
Gerrit-Reviewer: Giuseppe Lavagetto 
Gerrit-Reviewer: KartikMistry 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Fixes for the recent changes - change (mediawiki...SemanticForms)

[jenkins-bot (Code Review)]

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

Change subject: Fixes for the recent changes
..


Fixes for the recent changes

Change-Id: I6b9313ab76cdd5eaf2578aa156823e054aa17f45
---
M SemanticForms.php
M includes/SF_Utils.php
2 files changed, 4 insertions(+), 2 deletions(-)

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



diff --git a/SemanticForms.php b/SemanticForms.php
index 0f48316..cbe437c 100644
--- a/SemanticForms.php
+++ b/SemanticForms.php
@@ -229,7 +229,7 @@
 $GLOBALS['wgAutoloadClasses']['SFTokensInput'] = __DIR__ . 
'/includes/forminputs/SF_TokensInput.php';
 $GLOBALS['wgAutoloadClasses']['SFGoogleMapsInput'] = __DIR__ . 
'/includes/forminputs/SF_GoogleMapsInput.php';
 $GLOBALS['wgAutoloadClasses']['SFOpenLayersInput'] = __DIR__ . 
'/includes/forminputs/SF_OpenLayersInput.php';
-$GLOBALS['wgAutoloadClasses']['SFRegExpInput'] = $dir . 
'/includes/SF_RegExpInput.php';
+$GLOBALS['wgAutoloadClasses']['SFRegExpInput'] = __DIR__ . 
'/includes/forminputs/SF_RegExpInput.php';
 
 $GLOBALS['wgAutoloadClasses']['SFWikiPage'] = __DIR__ . 
'/includes/wikipage/SF_WikiPage.php';
 $GLOBALS['wgAutoloadClasses']['SFWikiPageTemplate'] = __DIR__ . 
'/includes/wikipage/SF_WikiPageTemplate.php';
diff --git a/includes/SF_Utils.php b/includes/SF_Utils.php
index 3589755..0b216bb 100644
--- a/includes/SF_Utils.php
+++ b/includes/SF_Utils.php
@@ -77,7 +77,9 @@
}
 
public static function initialize() {
-   $GLOBALS['sfgScriptPath'] = __DIR__ . '/../';
+   $GLOBALS['sfgPartialPath'] = '/extensions/SemanticForms';
+   $GLOBALS['sfgScriptPath'] = $GLOBALS['wgScriptPath'] . $GLOBALS[
+'sfgPartialPath'];
 
// Admin Links hook needs to be called in a delayed way so that 
it
// will always be called after SMW's Admin Links addition; as of

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I6b9313ab76cdd5eaf2578aa156823e054aa17f45
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SemanticForms
Gerrit-Branch: master
Gerrit-Owner: Yaron Koren 
Gerrit-Reviewer: Yaron Koren 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Disable ULS on VE focusable nodes - change (mediawiki...UniversalLanguageSelector)

[jenkins-bot (Code Review)]

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

Change subject: Disable ULS on VE focusable nodes
..


Disable ULS on VE focusable nodes

The user isn't supposed to type when a focusable node
is selected, and the overlay renders in the top left
corner of the screen.

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

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



diff --git a/extension.json b/extension.json
index 6b7fde2..77e52ce 100644
--- a/extension.json
+++ b/extension.json
@@ -80,7 +80,8 @@
],
"@ULSNoImeSelectors": "Array of jQuery selectors of elements on 
which IME must not be enabled. @since 2013.07",
"ULSNoImeSelectors": [
-   "#wpCaptchaWord"
+   "#wpCaptchaWord",
+   ".ve-ce-surface-paste"
],
"@ULSNoWebfontsSelectors": "Array of jQuery selectors of 
elements on which webfonts must not be applied. By default exclude elements 
with .autonym because that style set font as Autonym @since 2013.09",
"ULSNoWebfontsSelectors": [

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I52a7947175b4be235f77eaf0e02cebd542f8e500
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/UniversalLanguageSelector
Gerrit-Branch: master
Gerrit-Owner: Esanders 
Gerrit-Reviewer: Divec 
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] Deploy Translate extension on ru.wikimedia - change (operations/mediawiki-config)

[jenkins-bot (Code Review)]

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

Change subject: Deploy Translate extension on ru.wikimedia
..


Deploy Translate extension on ru.wikimedia

Bug: T121766
Change-Id: I3d966fc1baa4f89016f8996089d9eaa29ab4ae86
---
M wmf-config/InitialiseSettings.php
1 file changed, 10 insertions(+), 0 deletions(-)

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



diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index cb4c687..25ab21b 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -9188,6 +9188,9 @@
'sysop' => array( 'rollbacker', 'autoeditor', 'uploader', 
'closer', 'filemover', 'suppressredirect' ),
'bureaucrat' => array( 'arbcom' ), // T51334
),
+   '+ruwikimedia' => array(
+   'bureaucrat' => array ( 'translationadmin' ), // T121766
+   ),
'+ruwikiquote' => array(
'sysop' => array( 'autoeditor' )
),
@@ -9858,6 +9861,9 @@
'+ruwiki' => array(
'bureaucrat' => array( 'sysop', 'arbcom' ), // T51334
'sysop' => array( 'rollbacker', 'autoeditor', 'uploader', 
'closer', 'filemover', 'suppressredirect' ),
+   ),
+   '+ruwikimedia' => array(
+   'bureaucrat' => array( 'translationadmin' ), // T121766
),
'+ruwikiquote' => array(
'sysop' => array( 'autoeditor' )
@@ -11601,6 +11607,7 @@
'simplewiki' => array( 'sysop' => array( 'flood' ) ),
'srwiki' => array( 'sysop' => array( 'flood' ) ),
'plwiki' => array( 'sysop' => array( 'flood' ) ), // T22155
+   'ruwikimedia' => array( 'sysop' => array( 'translationadmin' ) ), // 
T121766
'strategywiki' => array( 'sysop' => array( 'flood' ) ),
'wikidata' => array( 'sysop' => array( 'flood', 'translationadmin' ) ), 
// T50013, T48856
'zhwiki' => array( 'sysop' => array( 'flood' ) ),
@@ -11630,6 +11637,7 @@
'mlwiktionary' => array( 'botadmin' => array( 'botadmin' ) ),
'simplewiki' => array( 'sysop' => array( 'flood' ) ),
'plwiki' => array( 'flood' => array( 'flood' ) ), // T22155 , T23238
+   'ruwikimedia' => array( 'sysop' => array( 'translationadmin' ) ), // 
T121766
'strategywiki' => array( 'sysop' => array( 'flood' ) ),
'srwiki' => array( 'sysop' => array( 'flood' ) ),
'wikidata' => array(
@@ -14554,6 +14562,7 @@
'metawiki' => true,
'otrs_wikiwiki' => true, // T63297
'outreachwiki' => true,
+   'ruwikimedia' => true, // T121766
'testwiki' => true,
'wikidata' => true, // T43585
'wikimania2012wiki' => true, // T36120
@@ -14628,6 +14637,7 @@
'incubatorwiki' => true,
'mediawikiwiki' => true,
'metawiki' => true,
+   'ruwikimedia' => true, // T121766
'wikidata' => true, // T43585
'wikimania2012wiki' => true,
'wikimania2013wiki' => true,

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I3d966fc1baa4f89016f8996089d9eaa29ab4ae86
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Dereckson 
Gerrit-Reviewer: Chad 
Gerrit-Reviewer: Florianschmidtwelzow 
Gerrit-Reviewer: Thcipriani 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Set category collation on gd.wikipedia - change (operations/mediawiki-config)

[jenkins-bot (Code Review)]

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

Change subject: Set category collation on gd.wikipedia
..


Set category collation on gd.wikipedia

New collation: uca-default

Bug: T125315
Change-Id: Ie43699a4770e6c464fc2a96ed0e10c32d8d43091
---
M wmf-config/InitialiseSettings.php
1 file changed, 1 insertion(+), 0 deletions(-)

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



diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index cb4c687..cc1b3fd 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -13372,6 +13372,7 @@
'frwikibooks' => 'uca-fr', // T74513
'frwikinews' => 'uca-fr', // T68165
'frwikiversity' => 'uca-fr', // T71782
+   'gdwiki' => 'uca-default', // T125315
'hsbwiki' => 'uca-hsb', // T90689
'huwiki' => 'uca-hu', // T47596
'iswiki' => 'uca-is', // T58859

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie43699a4770e6c464fc2a96ed0e10c32d8d43091
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Dereckson 
Gerrit-Reviewer: Chad 
Gerrit-Reviewer: Florianschmidtwelzow 
Gerrit-Reviewer: Thcipriani 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Remove unused dependency domino - change (mediawiki...mathoid)

[Physikerwelt (Code Review)]

Physikerwelt has uploaded a new change for review.

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

Change subject: Remove unused dependency domino
..

Remove unused dependency domino

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


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/mathoid 
refs/changes/96/269096/1

diff --git a/package.json b/package.json
index 982bdce..45caf59 100644
--- a/package.json
+++ b/package.json
@@ -41,7 +41,6 @@
 "bunyan": "^1.5.1",
 "cassandra-uuid": "^0.0.2",
 "compression": "^1.6.1",
-"domino": "^1.0.21",
 "express": "^4.13.3",
 "js-yaml": "^3.5.2",
 "preq": "^0.4.8",

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Idd569efaa3337ebe732ea8e7f794ed93632681a0
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/mathoid
Gerrit-Branch: master
Gerrit-Owner: Physikerwelt 

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

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

[jenkins-bot (Code Review)]

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

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


Update VE core submodule to master (c283af7)

New changes:
c231686 getViewportDimensions: Fix calculation of 'bottom'
76d7f27 KeyDownHandlers: Make Tab behave the same in table cells as in table 
selections
19891d6 ResizableNode: Remove assumption about 'width'/'height' attributes
380ff04 cloneElements: Use the correct node type when cloning
5e31903 Localisation updates from https://translatewiki.net.

Change-Id: I1225329b99779d84390ca5ee70de5b431cd8cbda
---
M lib/ve
1 file changed, 0 insertions(+), 0 deletions(-)

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



diff --git a/lib/ve b/lib/ve
index f170d48..c283af7 16
--- a/lib/ve
+++ b/lib/ve
-Subproject commit f170d48801901162aa5bd1e5834cca20f904e925
+Subproject commit c283af73679682721f1e04927636ab3255970ad1

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I1225329b99779d84390ca5ee70de5b431cd8cbda
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Jforrester 
Gerrit-Reviewer: Alex Monk 
Gerrit-Reviewer: Esanders 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: 2b01e43..0c49aa0 - change (mediawiki/extensions)

[Jenkins-mwext-sync (Code Review)]

Jenkins-mwext-sync has submitted this change and it was merged.

Change subject: Syncronize VisualEditor: 2b01e43..0c49aa0
..


Syncronize VisualEditor: 2b01e43..0c49aa0

Change-Id: Iadbff978070553672e35e88621199b20a090f566
---
M VisualEditor
1 file changed, 0 insertions(+), 0 deletions(-)

Approvals:
  Jenkins-mwext-sync: Verified; Looks good to me, approved



diff --git a/VisualEditor b/VisualEditor
index 2b01e43..0c49aa0 16
--- a/VisualEditor
+++ b/VisualEditor
-Subproject commit 2b01e437772b1774ceea36d4bab0c621f9933fe3
+Subproject commit 0c49aa06a0f5f1c7580c6f4d7e57809949a68115

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Iadbff978070553672e35e88621199b20a090f566
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions
Gerrit-Branch: master
Gerrit-Owner: Jenkins-mwext-sync 
Gerrit-Reviewer: Jenkins-mwext-sync 

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

[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: 2b01e43..0c49aa0 - change (mediawiki/extensions)

[Jenkins-mwext-sync (Code Review)]

Jenkins-mwext-sync has uploaded a new change for review.

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

Change subject: Syncronize VisualEditor: 2b01e43..0c49aa0
..

Syncronize VisualEditor: 2b01e43..0c49aa0

Change-Id: Iadbff978070553672e35e88621199b20a090f566
---
M VisualEditor
1 file changed, 0 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions 
refs/changes/10/269110/1

diff --git a/VisualEditor b/VisualEditor
index 2b01e43..0c49aa0 16
--- a/VisualEditor
+++ b/VisualEditor
-Subproject commit 2b01e437772b1774ceea36d4bab0c621f9933fe3
+Subproject commit 0c49aa06a0f5f1c7580c6f4d7e57809949a68115

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iadbff978070553672e35e88621199b20a090f566
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions
Gerrit-Branch: master
Gerrit-Owner: Jenkins-mwext-sync 

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

[MediaWiki-commits] [Gerrit] Add README, re-license as GPL - change (labs...extdist)

[jenkins-bot (Code Review)]

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

Change subject: Add README, re-license as GPL
..


Add README, re-license as GPL

Change-Id: I4c298bacb7f634ed7d43b9576ac4829d387c6612
---
A COPYING
D LICENSE
A README
3 files changed, 684 insertions(+), 1 deletion(-)

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



diff --git a/COPYING b/COPYING
new file mode 100644
index 000..94a9ed0
--- /dev/null
+++ b/COPYING
@@ -0,0 +1,674 @@
+GNU GENERAL PUBLIC LICENSE
+   Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. 
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+Preamble
+
+  The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.  We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors.  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+  To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights.  Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received.  You must make sure that they, too, receive
+or can get the source code.  And you must show them these terms so they
+know their rights.
+
+  Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+  For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software.  For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+  Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so.  This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software.  The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable.  Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products.  If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+  Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary.  To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+   TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the 

[MediaWiki-commits] [Gerrit] Pick up on mentions in topic summaries - change (mediawiki...Flow)

[Matthias Mullie (Code Review)]

Matthias Mullie has uploaded a new change for review.

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

Change subject: Pick up on mentions in topic summaries
..

Pick up on mentions in topic summaries

Bug: T125120
Change-Id: I035686e3d87e8a47ab8a6c95423a1bba63339d0b
---
M container.php
M i18n/en.json
M i18n/qqq.json
M includes/Block/TopicSummary.php
M includes/Data/Listener/NotificationListener.php
M includes/Notifications/Controller.php
M includes/Notifications/MentionPresentationModel.php
7 files changed, 67 insertions(+), 27 deletions(-)


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

diff --git a/container.php b/container.php
index 36a3ecd..fa5303c 100644
--- a/container.php
+++ b/container.php
@@ -451,6 +451,7 @@
return array(
'listener.recentchanges' => $c['listener.recentchanges'],
'storage.post_summary.listeners.username' => 
$c['storage.post_summary.listeners.username'],
+   'listeners.notification' => $c['listeners.notification'],
'storage.post_summary_board_history.indexes.primary' => 
$c['storage.post_summary_board_history.indexes.primary'],
'listener.editcount' => $c['listener.editcount'],
'reference.recorder' => $c['reference.recorder'],
diff --git a/i18n/en.json b/i18n/en.json
index de37d0b..2060d05 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -292,6 +292,7 @@
"notification-header-flow-topic-renamed-user-talk": "The topic \"$1\" 
was renamed to \"$2\" on your talk page.",
"notification-header-flow-mention-post": "$1 {{GENDER:$2|mentioned}} 
{{GENDER:$4|you}} in \"$5\".",
"notification-header-flow-mention-header": "$1 {{GENDER:$2|mentioned}} 
{{GENDER:$4|you}} in the description of '''$3'''.",
+   "notification-header-flow-mention-post-summary": "$1 
{{GENDER:$2|mentioned}} {{GENDER:$4|you}} in \"$5\".",
"notification-body-flow-mention": "$1",
"notification-header-flow-enabled-on-talkpage": "New discussion system 
enabled for {{GENDER:$2|your}} user talk page.",
"notification-header-flow-description-edited": "The description of 
'''$1''' was edited.",
diff --git a/i18n/qqq.json b/i18n/qqq.json
index 5ba39e8..fa040a4 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -301,7 +301,8 @@
"notification-header-flow-topic-renamed-v2": "Notification header text 
for when a topic is renamed. Parameters:\n$1 - old title of the topic\n* $2 - 
new title of the topic\n* $3 - username of the person who receives the 
notification, can be used for GENDER\n{{Related|Flow-notification}}",
"notification-header-flow-topic-renamed-user-talk": "Notification 
header text for when a topic is renamed on a user's talk page. Parameters:\n$1 
- old title of the topic\n* $2 - new title of the topic\n* $3 - username of the 
person who receives the notification, can be used for 
GENDER\n{{Related|Flow-notification}}",
"notification-header-flow-mention-post": 
"{{doc-singularthey}}\nNotification header text for when a user is mentioned in 
a post or topic title. Parameters:\n* $1 - the formatted username of the person 
who made the post\n* $2 - the username of the user who mentioned the viewing 
user, can be used for GENDER\n* $3 - title of the Flow board\n* $4 - username 
of the person who receives the notification, can be used for GENDER\n* $5 - 
title of the topic\n{{Related|Flow-notification}}",
-   "notification-header-flow-mention-header": 
"{{doc-singularthey}}\nNotification header text for when a user is mentioned in 
the board description. Parameters:\n* $1 - the formatted username of the person 
who made the post\n* $2 - the username for gender purposes\n* $3 - title of the 
Flow board\n* $4 - username of the person who receives the notification, can be 
used for GENDER\n{{Related|Flow-notification}}",
+   "notification-header-flow-mention-header": 
"{{doc-singularthey}}\nNotification header text for when a user is mentioned in 
the board description. Parameters:\n* $1 - the formatted username of the person 
who made the post\n* $2 - the username of the user who mentioned the viewing 
user, can be used for GENDER\n* $3 - title of the Flow board\n* $4 - username 
of the person who receives the notification, can be used for 
GENDER\n{{Related|Flow-notification}}",
+   "notification-header-flow-mention-post-summary": 
"{{doc-singularthey}}\nNotification header text for when a user is mentioned in 
a post summary. Parameters:\n* $1 - the formatted username of the person who 
made the post\n* $2 - the username of the user who mentioned the viewing user, 
can be used for GENDER\n* $3 - title of the Flow board\n* $4 - username of the 
person who receives the notification, can be used for GENDER\n* $5 - title of 
the topic\n{{Related|Flow-notification}}",
"notification-body-flow-mention": "Notification body text for 

[MediaWiki-commits] [Gerrit] New Wikidata Build - 2016-02-08T10:00:01+0000 - change (mediawiki...Wikidata)

[jenkins-bot (Code Review)]

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

Change subject: New Wikidata Build - 2016-02-08T10:00:01+
..


New Wikidata Build - 2016-02-08T10:00:01+

Change-Id: Ib06415c7bd0c91c1872e72e50d69a3be3fe0fed1
---
M composer.lock
M extensions/ArticlePlaceholder/i18n/fr.json
A extensions/ArticlePlaceholder/i18n/ku-latn.json
A extensions/ArticlePlaceholder/i18n/om.json
M extensions/ArticlePlaceholder/i18n/ru.json
A extensions/ArticlePlaceholder/i18n/sr-ec.json
A extensions/ArticlePlaceholder/i18n/sr-el.json
M extensions/ArticlePlaceholder/i18n/sv.json
M extensions/Wikibase/client/i18n/jam.json
M extensions/Wikibase/client/i18n/krl.json
M extensions/Wikibase/client/i18n/sr-el.json
M extensions/Wikibase/lib/i18n/ja.json
M extensions/Wikibase/lib/tests/phpunit/MockRepository.php
M extensions/Wikibase/lib/tests/phpunit/changes/EntityChangeTest.php
M extensions/Wikibase/lib/tests/phpunit/changes/ItemChangeTest.php
M extensions/Wikibase/lib/tests/phpunit/changes/TestChanges.php
M extensions/Wikibase/lib/tests/phpunit/store/EntityInfoBuilderTest.php
M extensions/Wikibase/lib/tests/phpunit/store/EntityInfoTest.php
M extensions/Wikibase/repo/i18n/ja.json
M extensions/Wikibase/repo/i18n/jam.json
M extensions/Wikibase/repo/i18n/ko.json
M extensions/Wikibase/repo/i18n/ku-latn.json
M extensions/Wikibase/repo/i18n/mai.json
M extensions/Wikibase/repo/i18n/sv.json
M extensions/Wikibase/repo/includes/ChangeOp/ChangeOp.php
M extensions/Wikibase/repo/includes/ChangeOp/ChangeOpAliases.php
M extensions/Wikibase/repo/includes/ChangeOp/ChangeOpBase.php
M extensions/Wikibase/repo/includes/ChangeOp/ChangeOpDescription.php
M extensions/Wikibase/repo/includes/ChangeOp/ChangeOpLabel.php
M extensions/Wikibase/repo/includes/ChangeOp/ChangeOpMainSnak.php
M extensions/Wikibase/repo/includes/ChangeOp/ChangeOpQualifier.php
M extensions/Wikibase/repo/includes/ChangeOp/ChangeOpQualifierRemove.php
M extensions/Wikibase/repo/includes/ChangeOp/ChangeOpReference.php
M extensions/Wikibase/repo/includes/ChangeOp/ChangeOpReferenceRemove.php
M extensions/Wikibase/repo/includes/ChangeOp/ChangeOpRemoveStatement.php
M extensions/Wikibase/repo/includes/ChangeOp/ChangeOpSiteLink.php
M extensions/Wikibase/repo/includes/ChangeOp/ChangeOpStatement.php
M extensions/Wikibase/repo/includes/ChangeOp/ChangeOpStatementRank.php
M extensions/Wikibase/repo/includes/ChangeOp/ChangeOps.php
M extensions/Wikibase/repo/includes/EditEntity.php
M extensions/Wikibase/repo/includes/EditEntityFactory.php
M extensions/Wikibase/repo/tests/phpunit/includes/EditEntityTest.php
M vendor/composer/installed.json
43 files changed, 225 insertions(+), 133 deletions(-)

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



diff --git a/composer.lock b/composer.lock
index 20ef94b..07abd6d 100644
--- a/composer.lock
+++ b/composer.lock
@@ -777,12 +777,12 @@
 "source": {
 "type": "git",
 "url": 
"https://github.com/wikimedia/mediawiki-extensions-ArticlePlaceholder.git;,
-"reference": "922c260fd2fb74bbfedbcef2001b0745cb32859f"
+"reference": "51092c1d365da2e9751f4d898cabd8b9fdb5e137"
 },
 "dist": {
 "type": "zip",
-"url": 
"https://api.github.com/repos/wikimedia/mediawiki-extensions-ArticlePlaceholder/zipball/922c260fd2fb74bbfedbcef2001b0745cb32859f;,
-"reference": "922c260fd2fb74bbfedbcef2001b0745cb32859f",
+"url": 
"https://api.github.com/repos/wikimedia/mediawiki-extensions-ArticlePlaceholder/zipball/51092c1d365da2e9751f4d898cabd8b9fdb5e137;,
+"reference": "51092c1d365da2e9751f4d898cabd8b9fdb5e137",
 "shasum": ""
 },
 "require-dev": {
@@ -801,7 +801,7 @@
 ],
 "description": "Provides a special page with Wikibase information 
about a certain topic, with invitation to create an article for the topic",
 "homepage": 
"https://www.mediawiki.org/wiki/Extension:ArticlePlaceholder;,
-"time": "2016-02-05 11:13:55"
+"time": "2016-02-07 21:12:52"
 },
 {
 "name": "propertysuggester/property-suggester",
@@ -1481,12 +1481,12 @@
 "source": {
 "type": "git",
 "url": 
"https://github.com/wikimedia/mediawiki-extensions-Wikibase.git;,
-"reference": "4072055fbaab63af0ea10306821b4782af5994bd"
+"reference": "d957f9979c21cbd1a77150158298bd4359ce28b7"
 },
 "dist": {
 "type": "zip",
-"url": 
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/4072055fbaab63af0ea10306821b4782af5994bd;,
-"reference": "4072055fbaab63af0ea10306821b4782af5994bd",
+"url": 

[MediaWiki-commits] [Gerrit] Use strict array search for linker options. - change (mediawiki...BlueSpiceExtensions)

[Robert Vogel (Code Review)]

Robert Vogel has submitted this change and it was merged.

Change subject: Use strict array search for linker options.
..


Use strict array search for linker options.

This is in anticipation of gerrit change
I16b9d6c3044ae60d5a7fd340569c019ffc4b2a55 (and a good practice
anyway).

Change-Id: Id7b88de437176be2b4d6ad54cc53807a028b0b9a
---
M PageTemplates/PageTemplates.class.php
1 file changed, 2 insertions(+), 2 deletions(-)

Approvals:
  Robert Vogel: Looks good to me, approved
  Pwirth: Looks good to me, but someone else must approve
  jenkins-bot: Verified



diff --git a/PageTemplates/PageTemplates.class.php 
b/PageTemplates/PageTemplates.class.php
index 8855c21..cd91c46 100644
--- a/PageTemplates/PageTemplates.class.php
+++ b/PageTemplates/PageTemplates.class.php
@@ -367,8 +367,8 @@
 * @return boolean Always true to keep hook running
 */
public function onLinkBegin( $oLinker, $oTarget, &$sHtml, 
&$aCustomAttribs, &$aQuery, &$aOptions, &$sRet ) {
-   if ( in_array( 'known', $aOptions ) ) return true;
-   if ( !in_array( 'broken', $aOptions ) ){ //It's not marked as 
"known" and not as "broken" so we have to check
+   if ( in_array( 'known', $aOptions, true ) ) return true;
+   if ( !in_array( 'broken', $aOptions, true ) ){ //It's not 
marked as "known" and not as "broken" so we have to check
if ( $oTarget->isKnown() ) return true;
}
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Id7b88de437176be2b4d6ad54cc53807a028b0b9a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: master
Gerrit-Owner: Gergő Tisza 
Gerrit-Reviewer: Anomie 
Gerrit-Reviewer: BryanDavis 
Gerrit-Reviewer: Dvogel hallowelt 
Gerrit-Reviewer: Ljonka 
Gerrit-Reviewer: Mglaser 
Gerrit-Reviewer: Pwirth 
Gerrit-Reviewer: Robert Vogel 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Add license-name to credits - change (mediawiki...StopForumSpam)

[Legoktm (Code Review)]

Legoktm has uploaded a new change for review.

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

Change subject: Add license-name to credits
..

Add license-name to credits

Change-Id: Id5eca9b0f38aa22a81feffe353b27252d05499df
---
M StopForumSpam.php
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/StopForumSpam 
refs/changes/90/269090/1

diff --git a/StopForumSpam.php b/StopForumSpam.php
index 9d88690..4acc07e 100644
--- a/StopForumSpam.php
+++ b/StopForumSpam.php
@@ -69,6 +69,7 @@
'url' => 'https://www.mediawiki.org/wiki/Extension:StopForumSpam',
'descriptionmsg' => 'stopforumspam-desc',
'version' => '0.2.0',
+   'license-name' => 'GPL-2.0+'
 );
 
 $wgAutoloadClasses['SFSHooks'] = __DIR__ . '/StopForumSpam.hooks.php';

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

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

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

[MediaWiki-commits] [Gerrit] New Wikidata Build - 2016-02-08T10:00:01+0000 - change (mediawiki...Wikidata)

[WikidataBuilder (Code Review)]

WikidataBuilder has uploaded a new change for review.

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

Change subject: New Wikidata Build - 2016-02-08T10:00:01+
..

New Wikidata Build - 2016-02-08T10:00:01+

Change-Id: Ib06415c7bd0c91c1872e72e50d69a3be3fe0fed1
---
M composer.lock
M extensions/ArticlePlaceholder/i18n/fr.json
A extensions/ArticlePlaceholder/i18n/ku-latn.json
A extensions/ArticlePlaceholder/i18n/om.json
M extensions/ArticlePlaceholder/i18n/ru.json
A extensions/ArticlePlaceholder/i18n/sr-ec.json
A extensions/ArticlePlaceholder/i18n/sr-el.json
M extensions/ArticlePlaceholder/i18n/sv.json
M extensions/Wikibase/client/i18n/jam.json
M extensions/Wikibase/client/i18n/krl.json
M extensions/Wikibase/client/i18n/sr-el.json
M extensions/Wikibase/lib/i18n/ja.json
M extensions/Wikibase/lib/tests/phpunit/MockRepository.php
M extensions/Wikibase/lib/tests/phpunit/changes/EntityChangeTest.php
M extensions/Wikibase/lib/tests/phpunit/changes/ItemChangeTest.php
M extensions/Wikibase/lib/tests/phpunit/changes/TestChanges.php
M extensions/Wikibase/lib/tests/phpunit/store/EntityInfoBuilderTest.php
M extensions/Wikibase/lib/tests/phpunit/store/EntityInfoTest.php
M extensions/Wikibase/repo/i18n/ja.json
M extensions/Wikibase/repo/i18n/jam.json
M extensions/Wikibase/repo/i18n/ko.json
M extensions/Wikibase/repo/i18n/ku-latn.json
M extensions/Wikibase/repo/i18n/mai.json
M extensions/Wikibase/repo/i18n/sv.json
M extensions/Wikibase/repo/includes/ChangeOp/ChangeOp.php
M extensions/Wikibase/repo/includes/ChangeOp/ChangeOpAliases.php
M extensions/Wikibase/repo/includes/ChangeOp/ChangeOpBase.php
M extensions/Wikibase/repo/includes/ChangeOp/ChangeOpDescription.php
M extensions/Wikibase/repo/includes/ChangeOp/ChangeOpLabel.php
M extensions/Wikibase/repo/includes/ChangeOp/ChangeOpMainSnak.php
M extensions/Wikibase/repo/includes/ChangeOp/ChangeOpQualifier.php
M extensions/Wikibase/repo/includes/ChangeOp/ChangeOpQualifierRemove.php
M extensions/Wikibase/repo/includes/ChangeOp/ChangeOpReference.php
M extensions/Wikibase/repo/includes/ChangeOp/ChangeOpReferenceRemove.php
M extensions/Wikibase/repo/includes/ChangeOp/ChangeOpRemoveStatement.php
M extensions/Wikibase/repo/includes/ChangeOp/ChangeOpSiteLink.php
M extensions/Wikibase/repo/includes/ChangeOp/ChangeOpStatement.php
M extensions/Wikibase/repo/includes/ChangeOp/ChangeOpStatementRank.php
M extensions/Wikibase/repo/includes/ChangeOp/ChangeOps.php
M extensions/Wikibase/repo/includes/EditEntity.php
M extensions/Wikibase/repo/includes/EditEntityFactory.php
M extensions/Wikibase/repo/tests/phpunit/includes/EditEntityTest.php
M vendor/composer/installed.json
43 files changed, 225 insertions(+), 133 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikidata 
refs/changes/98/269098/1

diff --git a/composer.lock b/composer.lock
index 20ef94b..07abd6d 100644
--- a/composer.lock
+++ b/composer.lock
@@ -777,12 +777,12 @@
 "source": {
 "type": "git",
 "url": 
"https://github.com/wikimedia/mediawiki-extensions-ArticlePlaceholder.git;,
-"reference": "922c260fd2fb74bbfedbcef2001b0745cb32859f"
+"reference": "51092c1d365da2e9751f4d898cabd8b9fdb5e137"
 },
 "dist": {
 "type": "zip",
-"url": 
"https://api.github.com/repos/wikimedia/mediawiki-extensions-ArticlePlaceholder/zipball/922c260fd2fb74bbfedbcef2001b0745cb32859f;,
-"reference": "922c260fd2fb74bbfedbcef2001b0745cb32859f",
+"url": 
"https://api.github.com/repos/wikimedia/mediawiki-extensions-ArticlePlaceholder/zipball/51092c1d365da2e9751f4d898cabd8b9fdb5e137;,
+"reference": "51092c1d365da2e9751f4d898cabd8b9fdb5e137",
 "shasum": ""
 },
 "require-dev": {
@@ -801,7 +801,7 @@
 ],
 "description": "Provides a special page with Wikibase information 
about a certain topic, with invitation to create an article for the topic",
 "homepage": 
"https://www.mediawiki.org/wiki/Extension:ArticlePlaceholder;,
-"time": "2016-02-05 11:13:55"
+"time": "2016-02-07 21:12:52"
 },
 {
 "name": "propertysuggester/property-suggester",
@@ -1481,12 +1481,12 @@
 "source": {
 "type": "git",
 "url": 
"https://github.com/wikimedia/mediawiki-extensions-Wikibase.git;,
-"reference": "4072055fbaab63af0ea10306821b4782af5994bd"
+"reference": "d957f9979c21cbd1a77150158298bd4359ce28b7"
 },
 "dist": {
 "type": "zip",
-"url": 
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/4072055fbaab63af0ea10306821b4782af5994bd;,
-"reference": "4072055fbaab63af0ea10306821b4782af5994bd",
+"url": 

[MediaWiki-commits] [Gerrit] VCL: do not use illegal "trusted" XFF values for XCIP - change (operations/puppet)

[BBlack (Code Review)]

BBlack has submitted this change and it was merged.

Change subject: VCL: do not use illegal "trusted" XFF values for XCIP
..


VCL: do not use illegal "trusted" XFF values for XCIP

As noted in the linked bug, our XFF-processing needs to get a lot
more advanced in the long run.  For now this closes the functional
issue where we set X-Client-IP to a private or loopback IP when
that's the first XFF entry set by a "trusted" proxy such as
OperaMini.  In these cases we'll fall back to acting as if there
was no trusted proxy and set XCIP to the OperaMini proxy IP for
now (because that's better than logging 127.0.0.1 or whatever as
XCIP).

Bug: T120121
Change-Id: Ib7d46cc1e527265c3f8169d483929acf44278fef
---
M modules/varnish/templates/vcl/wikimedia.vcl.erb
1 file changed, 12 insertions(+), 3 deletions(-)

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



diff --git a/modules/varnish/templates/vcl/wikimedia.vcl.erb 
b/modules/varnish/templates/vcl/wikimedia.vcl.erb
index c802dc7..9e25e10 100644
--- a/modules/varnish/templates/vcl/wikimedia.vcl.erb
+++ b/modules/varnish/templates/vcl/wikimedia.vcl.erb
@@ -10,6 +10,7 @@
 <% if @vcl_config.fetch("layer", "") == "frontend" -%>
 # only used in recv_fe_ip_processing on frontends
 import netmapper;
+import ipcast;
 <% end %>
 
 <%
@@ -319,7 +320,11 @@
}
if (req.http.X-Trusted-Proxy && req.http.X-Forwarded-For) {
// get last from trusted-proxy-supplied XFF
-   set req.http.X-Client-IP = 
regsub(req.http.X-Forwarded-For, "^([^,]+, )+", "");
+   set req.http.maybe-xcip = 
regsub(req.http.X-Forwarded-For, "^([^,]+, )+", "");
+   if(ipcast.ip(req.http.maybe-xcip, "127.0.0.1") !~ 
wikimedia_nets) {
+   set req.http.X-Client-IP = req.http.maybe-xcip;
+   }
+   unset req.http.maybe-xcip;
}
} else {
// XCIP from nginx, XFF set/appended by nginx and contains at
@@ -336,8 +341,12 @@
// regsub's below if there was only one (which would
// alias XCIP by definition), there would be no commas
// to match and XCIP gets reset to its original value.
-   set req.http.X-Client-IP = 
regsub(req.http.X-Forwarded-For, ", [^,]+$", "");
-   set req.http.X-Client-IP = regsub(req.http.X-Client-IP, 
"^([^,]+, )+", "");
+   set req.http.maybe-xcip = 
regsub(req.http.X-Forwarded-For, ", [^,]+$", "");
+   set req.http.maybe-xcip = regsub(req.http.maybe-xcip, 
"^([^,]+, )+", "");
+   if(ipcast.ip(req.http.maybe-xcip, "127.0.0.1") !~ 
wikimedia_nets) {
+   set req.http.X-Client-IP = req.http.maybe-xcip;
+   }
+   unset req.http.maybe-xcip;
}
}
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib7d46cc1e527265c3f8169d483929acf44278fef
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
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] package_builder: set HOOKDIR only when it exists - change (operations/puppet)

[Hashar (Code Review)]

Hashar has uploaded a new change for review.

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

Change subject: package_builder: set HOOKDIR only when it exists
..

package_builder: set HOOKDIR only when it exists

There is no need for Wikimedia custom hooks directory for 'unstable'.

Only set HOOKDIR when the hooks directory exists.

Bug: T125999
Change-Id: I9f092988024b02357be4dc09b3335521b4f30191
---
M modules/package_builder/templates/pbuilderrc.erb
1 file changed, 5 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/95/269095/1

diff --git a/modules/package_builder/templates/pbuilderrc.erb 
b/modules/package_builder/templates/pbuilderrc.erb
index 80e1ca4..5a1479b 100644
--- a/modules/package_builder/templates/pbuilderrc.erb
+++ b/modules/package_builder/templates/pbuilderrc.erb
@@ -27,5 +27,8 @@
 
 APTCACHE="<%= @basepath %>/aptcache/${DIST}-${ARCH}"
 
-# Hooks explicitly don't have an architecture
-HOOKDIR=<%= @basepath %>/hooks/$DIST
+# We do not always provide hooks directory (eg: unstable)
+if [ -d "<%= @basepath %>/hooks/$DIST" ]; then
+# Hooks explicitly don't have an architecture
+HOOKDIR=<%= @basepath %>/hooks/$DIST
+fi

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

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

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

[MediaWiki-commits] [Gerrit] contint: set pbuilder basepath to actual directory - change (operations/puppet)

[Hashar (Code Review)]

Hashar has uploaded a new change for review.

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

Change subject: contint: set pbuilder basepath to actual directory
..

contint: set pbuilder basepath to actual directory

On ci slaves, /var/cache/pbuilder is symlinked to /mnt/pbuilder because
/var is too small and /mnt has extended disk space.

The symlink apparently confuse cowbuilder/cowdancer when it is trying to
--update a base cow image. At the end of the run we have output such as:

 I: unmounting dev/pts filesystem
 I: unmounting run/shm filesystem
 I: unmounting proc filesystem
 vvv
 rename: Not a directory
 ^^^
  -> removing cowbuilder working copy
  -> Moving work directory [/var/cache/pbuilder/build//cow.21918]
 to final location
[/var/cache/pbuilder/base-unstable-amd64.cow/] and cleaning up old copy

I confirmed that the move never occurs for some reason ... Maybe the
double slashes does not help either.

Set basepath for package_builder puppet class. That will also update the
pbuilderrc file to reference the canonical directory instead of the
symlink.

Bug: T125999
Change-Id: Id364404b6c86aa9b5d4a2597a406a97feef9758c
---
M manifests/role/ci.pp
1 file changed, 3 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/03/269103/1

diff --git a/manifests/role/ci.pp b/manifests/role/ci.pp
index 1be0468..b459916 100644
--- a/manifests/role/ci.pp
+++ b/manifests/role/ci.pp
@@ -359,6 +359,9 @@
 # We need /var/cache/pbuilder to be a symlink to /mnt
 # before cowbuilder/pbuilder is installed
 require => Class['contint::packages::labs'],
+# Cowdancer is confused by /var/cache/pbuilder being a symlink
+# causing it to fail to properly --update cow images. T125999
+basepath => '/mnt/pbuilder'
 }
 }
 

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

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

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

[MediaWiki-commits] [Gerrit] Add support for loading a given revision of page - change (mediawiki...cxserver)

[Santhosh (Code Review)]

Santhosh has uploaded a new change for review.

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

Change subject: Add support for loading a given revision of page
..

Add support for loading a given revision of page

This is required when we want to load that old revision if the latest
version is completely different from it and translation is not able
to restore

Change-Id: I5b3520d16ce47ac3494e33f3fcad6265a6baa04d
---
M pageloader/PageLoader.js
M routes/v1.js
M spec.yaml
3 files changed, 17 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/cxserver 
refs/changes/11/269111/1

diff --git a/pageloader/PageLoader.js b/pageloader/PageLoader.js
index 737fe1f..72cf575 100644
--- a/pageloader/PageLoader.js
+++ b/pageloader/PageLoader.js
@@ -35,14 +35,19 @@
 /**
  * @param {string} page
  * @param {string} sourceLanguage
+ * @param {string} revision
  * @return {Promise}
  */
-PageLoader.prototype.load = function ( page, sourceLanguage ) {
+PageLoader.prototype.load = function ( page, sourceLanguage, revision ) {
var url;
 
url = this.conf.restbase_url
.replace( '@lang', sourceLanguage )
.replace( '@title', encodeURIComponent( page ) );
+
+   if ( revision ) {
+   url += '/' + revision;
+   }
 
return preq.get( {
uri: url,
@@ -52,6 +57,7 @@
} ).then( function ( response ) {
return {
body: cheapBodyInnerHTML( response.body ),
+   url: url,
// Restbase returns revision ID in etag  header.
// Example:
// ETag: 
"123456/c4e494da-ee8f-11e4-83a1-8b80de1cde5f"
diff --git a/routes/v1.js b/routes/v1.js
index cdf5892..baf1ace 100644
--- a/routes/v1.js
+++ b/routes/v1.js
@@ -13,14 +13,15 @@
  */
 router = sUtil.router();
 
-router.get( '/page/:language/:title', function ( req, res ) {
+router.get( '/page/:language/:title/:revision?', function ( req, res ) {
var sourceLanguage = req.params.language,
title = req.params.title,
+   revision = req.params.revision,
CXSegmenter = require( __dirname + 
'/../segmentation/CXSegmenter.js' ).CXSegmenter,
PageLoader = require( __dirname + 
'/../pageloader/PageLoader.js' ).PageLoader,
pageloader = new PageLoader( app );
 
-   return pageloader.load( title, sourceLanguage ).then(
+   return pageloader.load( title, sourceLanguage, revision ).then(
function ( response ) {
var segmenter, segmentedContent;
 
diff --git a/spec.yaml b/spec.yaml
index c44e0b7..4708331 100644
--- a/spec.yaml
+++ b/spec.yaml
@@ -53,7 +53,7 @@
   response:
 status: 404
   # from routes/v1.js
-  /v1/page/{language}/{title}:
+  /v1/page/{language}/{title}{/revision}:
 get:
   tags:
 - Page content
@@ -71,12 +71,18 @@
   description: The page title
   type: string
   required: true
+- name: revision
+  in: path
+  description: The page revision id
+  type: string
+  required: false
   x-amples:
 - title: Fetch enwiki Oxygen page
   request:
 params:
   language: en
   title: Oxygen
+  revision: 702870951
   response:
 status: 200
 headers:

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I5b3520d16ce47ac3494e33f3fcad6265a6baa04d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/cxserver
Gerrit-Branch: master
Gerrit-Owner: Santhosh 

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

[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: 0c49aa0..a996356 - change (mediawiki/extensions)

[Jenkins-mwext-sync (Code Review)]

Jenkins-mwext-sync has submitted this change and it was merged.

Change subject: Syncronize VisualEditor: 0c49aa0..a996356
..


Syncronize VisualEditor: 0c49aa0..a996356

Change-Id: Ib8776f1bc8b0fed35802d8ea6ac1542eff7aad1f
---
M VisualEditor
1 file changed, 0 insertions(+), 0 deletions(-)

Approvals:
  Jenkins-mwext-sync: Verified; Looks good to me, approved



diff --git a/VisualEditor b/VisualEditor
index 0c49aa0..a996356 16
--- a/VisualEditor
+++ b/VisualEditor
-Subproject commit 0c49aa06a0f5f1c7580c6f4d7e57809949a68115
+Subproject commit a996356e12c5e1655d8cd04f42537cd5b1b03b34

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib8776f1bc8b0fed35802d8ea6ac1542eff7aad1f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions
Gerrit-Branch: master
Gerrit-Owner: Jenkins-mwext-sync 
Gerrit-Reviewer: Jenkins-mwext-sync 

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

[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: 0c49aa0..a996356 - change (mediawiki/extensions)

[Jenkins-mwext-sync (Code Review)]

Jenkins-mwext-sync has uploaded a new change for review.

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

Change subject: Syncronize VisualEditor: 0c49aa0..a996356
..

Syncronize VisualEditor: 0c49aa0..a996356

Change-Id: Ib8776f1bc8b0fed35802d8ea6ac1542eff7aad1f
---
M VisualEditor
1 file changed, 0 insertions(+), 0 deletions(-)


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

diff --git a/VisualEditor b/VisualEditor
index 0c49aa0..a996356 16
--- a/VisualEditor
+++ b/VisualEditor
-Subproject commit 0c49aa06a0f5f1c7580c6f4d7e57809949a68115
+Subproject commit a996356e12c5e1655d8cd04f42537cd5b1b03b34

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib8776f1bc8b0fed35802d8ea6ac1542eff7aad1f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions
Gerrit-Branch: master
Gerrit-Owner: Jenkins-mwext-sync 

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

[MediaWiki-commits] [Gerrit] Add COPYING, set license-name - change (mediawiki...GoogleAppEngine)

[jenkins-bot (Code Review)]

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

Change subject: Add COPYING, set license-name
..


Add COPYING, set license-name

Change-Id: I92f62eeccb8d8e7a85d119f49755e7e2eef2e46d
---
A COPYING
M GoogleAppEngine.php
2 files changed, 675 insertions(+), 0 deletions(-)

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



diff --git a/COPYING b/COPYING
new file mode 100644
index 000..94a9ed0
--- /dev/null
+++ b/COPYING
@@ -0,0 +1,674 @@
+GNU GENERAL PUBLIC LICENSE
+   Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. 
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+Preamble
+
+  The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.  We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors.  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+  To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights.  Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received.  You must make sure that they, too, receive
+or can get the source code.  And you must show them these terms so they
+know their rights.
+
+  Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+  For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software.  For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+  Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so.  This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software.  The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable.  Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products.  If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+  Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary.  To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+   TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the 

[MediaWiki-commits] [Gerrit] [Hygiene] Use mediawiki.Uri for URI manipulation - change (mediawiki...QuickSurveys)

[Phuedx (Code Review)]

Phuedx has uploaded a new change for review.

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

Change subject: [Hygiene] Use mediawiki.Uri for URI manipulation
..

[Hygiene] Use mediawiki.Uri for URI manipulation

Change-Id: I8cfc1009aa9f522adf49d0c851536c8faff534f5
---
M resources/ext.quicksurveys.views/ExternalSurvey.js
1 file changed, 5 insertions(+), 10 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/QuickSurveys 
refs/changes/97/269097/1

diff --git a/resources/ext.quicksurveys.views/ExternalSurvey.js 
b/resources/ext.quicksurveys.views/ExternalSurvey.js
index dd2558f..4f84a77 100644
--- a/resources/ext.quicksurveys.views/ExternalSurvey.js
+++ b/resources/ext.quicksurveys.views/ExternalSurvey.js
@@ -23,25 +23,20 @@
 */
renderButtons: function () {
var $btnContainer = this.initialPanel.$element.find( 
'.survey-button-container' ),
-   queryParams = {},
btnHref,
buttons,
self = this;
 
-   btnHref = mw.message( this.config.survey.link ).parse();
+   btnHref = new mw.Uri( mw.message( 
this.config.survey.link ).parse() );
+
if ( this.config.survey.instanceTokenParameterName ) {
-   if ( btnHref.indexOf( '?' ) === -1 ) {
-   btnHref += '?';
-   } else {
-   btnHref += '&';
-   }
-   
queryParams[this.config.survey.instanceTokenParameterName] = 
this.config.surveyInstanceToken;
-   btnHref += $.param( queryParams );
+   
btnHref.query[this.config.survey.instanceTokenParameterName] =
+   this.config.surveyInstanceToken;
}
 
buttons = [
{
-   href: btnHref,
+   href: btnHref.toString(),
target: '_blank',
label: mw.msg( 
'ext-quicksurveys-external-survey-yes-button' ),
flags: 'constructive',

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I8cfc1009aa9f522adf49d0c851536c8faff534f5
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/QuickSurveys
Gerrit-Branch: dev
Gerrit-Owner: Phuedx 

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

[MediaWiki-commits] [Gerrit] OO.ui.GroupElement: Add change event - change (oojs/ui)

[Prtksxna (Code Review)]

Prtksxna has uploaded a new change for review.

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

Change subject: OO.ui.GroupElement: Add change event
..

OO.ui.GroupElement: Add change event

The OO.ui.CapsuleMultiSelectWidget already implements this in its add,
remove and clear items methods.

The OO.ui.StackLayout extends those methods but still calls the parent.

The rest of the classes use the mixins methods without change.

Bug: T117250
Change-Id: I1f331ec97951c6e3f6d6a1fb133771cda7bfe6e0
---
M src/mixins/GroupElement.js
A src/widgets/#CapsuleMultiSelectWidget.js#
A src/widgets/.#CapsuleMultiSelectWidget.js
3 files changed, 657 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/04/269104/1

diff --git a/src/mixins/GroupElement.js b/src/mixins/GroupElement.js
index 5bd052f..4263ffd 100644
--- a/src/mixins/GroupElement.js
+++ b/src/mixins/GroupElement.js
@@ -27,6 +27,16 @@
this.setGroupElement( config.$group || $( '' ) );
 };
 
+/* Events */
+
+/**
+ * @event change
+ *
+ * A change event is emitted when the set of selected items changes.
+ *
+ * @param {OO.ui.Element[]} items Items currently in the group
+ */
+
 /* Methods */
 
 /**
@@ -218,6 +228,7 @@
this.items.splice.apply( this.items, [ index, 0 ].concat( items 
) );
}
 
+   this.emit( 'change', this.getItems() );
return this;
 };
 
@@ -254,6 +265,7 @@
}
}
 
+   this.emit( 'change', this.getItems() );
return this;
 };
 
@@ -285,6 +297,7 @@
item.$element.detach();
}
 
+   this.emit( 'change', this.getItems() );
this.items = [];
return this;
 };
diff --git "a/src/widgets/\043CapsuleMultiSelectWidget.js\043" 
"b/src/widgets/\043CapsuleMultiSelectWidget.js\043"
new file mode 100644
index 000..0ea8429
--- /dev/null
+++ "b/src/widgets/\043CapsuleMultiSelectWidget.js\043"
@@ -0,0 +1,643 @@
+/**
+ * CapsuleMultiSelectWidgets are something like a {@link 
OO.ui.ComboBoxInputWidget combo box widget}
+ * that allows for selecting multiple values.
+ *
+ * For more information about menus and options, please see the [OOjs UI 
documentation on MediaWiki][1].
+ *
+ * @example
+ * // Example: A CapsuleMultiSelectWidget.
+ * var capsule = new OO.ui.CapsuleMultiSelectWidget( {
+ * label: 'CapsuleMultiSelectWidget',
+ * selected: [ 'Option 1', 'Option 3' ],
+ * menu: {
+ * items: [
+ * new OO.ui.MenuOptionWidget( {
+ * data: 'Option 1',
+ * label: 'Option One'
+ * } ),
+ * new OO.ui.MenuOptionWidget( {
+ * data: 'Option 2',
+ * label: 'Option Two'
+ * } ),
+ * new OO.ui.MenuOptionWidget( {
+ * data: 'Option 3',
+ * label: 'Option Three'
+ * } ),
+ * new OO.ui.MenuOptionWidget( {
+ * data: 'Option 4',
+ * label: 'Option Four'
+ * } ),
+ * new OO.ui.MenuOptionWidget( {
+ * data: 'Option 5',
+ * label: 'Option Five'
+ * } )
+ * ]
+ * }
+ * } );
+ * $( 'body' ).append( capsule.$element );
+ *
+ * [1]: 
https://www.mediawiki.org/wiki/OOjs_UI/Widgets/Selects_and_Options#Menu_selects_and_options
+ *
+ * @class
+ * @extends OO.ui.Widget
+ * @mixins OO.ui.mixin.TabIndexedElement
+ * @mixins OO.ui.mixin.GroupElement
+ * @uses OO.ui.CapsuleItemWidget
+ * @uses OO.ui.FloatingMenuSelectWidget
+ *
+ * @constructor
+ * @param {Object} [config] Configuration options
+ * @cfg {boolean} [allowArbitrary=false] Allow data items to be added even if 
not present in the menu.
+ * @cfg {Object} [menu] (required) Configuration options to pass to the
+ *  {@link OO.ui.MenuSelectWidget menu select widget}.
+ * @cfg {Object} [popup] Configuration options to pass to the {@link 
OO.ui.PopupWidget popup widget}.
+ *  If specified, this popup will be shown instead of the menu (but the menu
+ *  will still be used for item labels and allowArbitrary=false). The widgets
+ *  in the popup should use {@link #addItemsFromData} or {@link #addItems} as 
necessary.
+ * @cfg {jQuery} [$overlay=this.$element] Render the menu or popup into a 
separate layer.
+ *  This configuration is useful in cases where the expanded menu is larger 
than
+ *  its containing ``. The specified overlay layer is usually on top of
+ *  the containing `` and has a larger area. By default, the menu uses
+ *  relative positioning.
+ */
+OO.ui.CapsuleMultiSelectWidget = function OoUiCapsuleMultiSelectWidget( config 
) {
+   var $tabFocus;
+
+   // Parent constructor
+   OO.ui.CapsuleMultiSelectWidget.parent.call( this, config );
+
+   // Configuration 

[MediaWiki-commits] [Gerrit] (WIP) php flavored entry point (WIP) - change (integration/jenkins)

[Hashar (Code Review)]

Hashar has uploaded a new change for review.

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

Change subject: (WIP) php flavored entry point (WIP)
..

(WIP) php flavored entry point (WIP)

To be registered via Debian alternative and let us easily switch between
PHP versions.

Bug: T126211
Change-Id: I31907c2a27747d0fbf18dba67628bf9a76cc6af6
---
A bin/php
1 file changed, 8 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/jenkins 
refs/changes/09/269109/1

diff --git a/bin/php b/bin/php
new file mode 100755
index 000..ba65c16
--- /dev/null
+++ b/bin/php
@@ -0,0 +1,8 @@
+#!/bin/bash
+
+set -e
+set -u
+
+PHP_FLAVOR=${PHP_FLAVOR:-/usr/bin/env php}
+
+$PHP_FLAVOR "$@"

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I31907c2a27747d0fbf18dba67628bf9a76cc6af6
Gerrit-PatchSet: 1
Gerrit-Project: integration/jenkins
Gerrit-Branch: master
Gerrit-Owner: Hashar 

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

[MediaWiki-commits] [Gerrit] Handle missing descriptions gracefully - change (mediawiki...ArticlePlaceholder)

[jenkins-bot (Code Review)]

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

Change subject: Handle missing descriptions gracefully
..


Handle missing descriptions gracefully

Bug: T125954
Change-Id: I4a3f848065425216610d5ce3ef391709d89ae7f1
---
M includes/Lua/mw.ext.articlePlaceholder.entityRenderer.lua
1 file changed, 7 insertions(+), 1 deletion(-)

Approvals:
  Thiemo Mättig (WMDE): Looks good to me, approved
  jenkins-bot: Verified



diff --git a/includes/Lua/mw.ext.articlePlaceholder.entityRenderer.lua 
b/includes/Lua/mw.ext.articlePlaceholder.entityRenderer.lua
index c027682..b934ca4 100644
--- a/includes/Lua/mw.ext.articlePlaceholder.entityRenderer.lua
+++ b/includes/Lua/mw.ext.articlePlaceholder.entityRenderer.lua
@@ -221,7 +221,13 @@
 -- @param String entityId
 -- @return String description
 local function descriptionRenderer( entityId )
-  return '' .. 
mw.wikibase.description( entityId ) .. ''
+  local description = mw.wikibase.description( entityId )
+
+  if description ~= nil then
+return '' .. description .. 
''
+  else
+return ''
+  end
 end
 
 -- Render an entity, method to call all renderer

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I4a3f848065425216610d5ce3ef391709d89ae7f1
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/ArticlePlaceholder
Gerrit-Branch: master
Gerrit-Owner: Hoo man 
Gerrit-Reviewer: Aude 
Gerrit-Reviewer: Jackmcbarn 
Gerrit-Reviewer: Lucie Kaffee 
Gerrit-Reviewer: Thiemo Mättig (WMDE) 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Keep backward compatability - change (pywikibot/wikibase)

[jenkins-bot (Code Review)]

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

Change subject: Keep backward compatability
..


Keep backward compatability

This returns error on toJSON() in P625 claim:
https://www.wikidata.org/w/api.php?action=query=revisions=221842942=content

Reported at https://github.com/wiki-ai/revscoring/issues/239

Change-Id: I7174587e38332ce48f5ef08a3051869c10208f5e
---
M pywikibase/coordinate.py
1 file changed, 2 insertions(+), 1 deletion(-)

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



diff --git a/pywikibase/coordinate.py b/pywikibase/coordinate.py
index 232a9d4..58705f0 100644
--- a/pywikibase/coordinate.py
+++ b/pywikibase/coordinate.py
@@ -107,7 +107,6 @@
 else:
 # Default to earth or should we use None here?
 globe = 'earth'
-
 return cls(data['latitude'], data['longitude'],
data['altitude'], data['precision'],
globe, site=site, entity=data['globe'])
@@ -135,6 +134,8 @@
 self._dim/(radius*math.cos(math.radians(self.lat
 """
 if not self._precision:
+if self._dim is None:
+return self._precision
 radius = 6378137  # TODO: Support other globes
 self._precision = math.degrees(
 self._dim / (radius * math.cos(math.radians(self.lat

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I7174587e38332ce48f5ef08a3051869c10208f5e
Gerrit-PatchSet: 2
Gerrit-Project: pywikibot/wikibase
Gerrit-Branch: master
Gerrit-Owner: Ladsgroup 
Gerrit-Reviewer: Ladsgroup 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Add README, re-license as GPL - change (labs...extdist)

[Legoktm (Code Review)]

Legoktm has uploaded a new change for review.

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

Change subject: Add README, re-license as GPL
..

Add README, re-license as GPL

Change-Id: I4c298bacb7f634ed7d43b9576ac4829d387c6612
---
A COPYING
D LICENSE
A README
3 files changed, 684 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/labs/tools/extdist 
refs/changes/89/269089/1

diff --git a/COPYING b/COPYING
new file mode 100644
index 000..94a9ed0
--- /dev/null
+++ b/COPYING
@@ -0,0 +1,674 @@
+GNU GENERAL PUBLIC LICENSE
+   Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. 
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+Preamble
+
+  The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.  We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors.  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+  To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights.  Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received.  You must make sure that they, too, receive
+or can get the source code.  And you must show them these terms so they
+know their rights.
+
+  Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+  For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software.  For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+  Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so.  This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software.  The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable.  Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products.  If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+  Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary.  To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+   TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.

[MediaWiki-commits] [Gerrit] Rename composer-test jobs for packages to "composer-package-... - change (integration/config)

[Legoktm (Code Review)]

Legoktm has uploaded a new change for review.

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

Change subject: Rename composer-test jobs for packages to 
"composer-package-{phpflavor}"
..

Rename composer-test jobs for packages to "composer-package-{phpflavor}"

For standardization with with other jobs:
* Drop "php-" prefix ("npm", not "nodejs-npm")
* Drop "-test" suffix ("npm", not "npm-test")

Change-Id: I8768970432fbbfc7af98e4aa08f6632d7779f456
---
M jjb/job-templates.yaml
M zuul/layout.yaml
2 files changed, 8 insertions(+), 8 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/93/269093/1

diff --git a/jjb/job-templates.yaml b/jjb/job-templates.yaml
index 041ff35..aefa5bd 100644
--- a/jjb/job-templates.yaml
+++ b/jjb/job-templates.yaml
@@ -156,8 +156,8 @@
 # Run composer update and composer test
 # Intended for libraries that are published as composer packages
 - job-template:
-name: 'php-composer-test-{phpflavor}'
-node: 'contintLabsSlave && (UbuntuPrecise && phpflavor-php53 && 
phpflavor-{phpflavor}) || (UbuntuTrusty && phpflavor-hhvm && 
phpflavor-{phpflavor})'
+name: 'composer-package-{phpflavor}'
+node: 'contintLabsSlave && phpflavor-{phpflavor}'
 defaults: use-remote-zuul-shallow-clone
 concurrent: true
 triggers:
@@ -169,9 +169,9 @@
  - composer-test
 
 - project:
-name: 'php-composer-test-flavored'
+name: 'composer-package-flavored'
 jobs:
- - 'php-composer-test-{phpflavor}':
+ - 'composer-package-{phpflavor}':
 phpflavor:
 - hhvm
 - php53
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index da9618e..049fb23 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -1407,11 +1407,11 @@
   - php53lint
   - php55lint
 test:
-  - php-composer-test-hhvm
-  - php-composer-test-php53
+  - composer-package-hhvm
+  - composer-package-php53
 gate-and-submit:
-  - php-composer-test-hhvm
-  - php-composer-test-php53
+  - composer-package-hhvm
+  - composer-package-php53
 
   - name: npm
 test:

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

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

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

[MediaWiki-commits] [Gerrit] Add composer-package-php55 job - change (integration/config)

[Legoktm (Code Review)]

Legoktm has uploaded a new change for review.

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

Change subject: Add composer-package-php55 job
..

Add composer-package-php55 job

Change-Id: If2dbe637ebc26668f56669a811b69be8dd9b59bc
---
M jjb/job-templates.yaml
M zuul/layout.yaml
2 files changed, 3 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/94/269094/1

diff --git a/jjb/job-templates.yaml b/jjb/job-templates.yaml
index aefa5bd..9bfe604 100644
--- a/jjb/job-templates.yaml
+++ b/jjb/job-templates.yaml
@@ -175,6 +175,7 @@
 phpflavor:
 - hhvm
 - php53
+- php55
 
 # Checks the committed composer.lock file against the database at
 # https://github.com/FriendsOfPHP/security-advisories and the API
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 049fb23..359345e 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -1409,9 +1409,11 @@
 test:
   - composer-package-hhvm
   - composer-package-php53
+  - composer-package-php55
 gate-and-submit:
   - composer-package-hhvm
   - composer-package-php53
+  - composer-package-php55
 
   - name: npm
 test:

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

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

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

[MediaWiki-commits] [Gerrit] Rename cirrus param cirrusPhraseWinwdow to cirrusPhraseWindow - change (mediawiki...CirrusSearch)

[DCausse (Code Review)]

DCausse has uploaded a new change for review.

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

Change subject: Rename cirrus param cirrusPhraseWinwdow to cirrusPhraseWindow
..

Rename cirrus param cirrusPhraseWinwdow to cirrusPhraseWindow

Change-Id: I94e588e33cbf21056d78d65c72d8f5371293f81a
---
M includes/Hooks.php
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CirrusSearch 
refs/changes/99/269099/1

diff --git a/includes/Hooks.php b/includes/Hooks.php
index ca8cc63..a22de11 100644
--- a/includes/Hooks.php
+++ b/includes/Hooks.php
@@ -99,7 +99,7 @@
$request->getVal( 'cirrusHighlighter' ) 
=== 'experimental' ) {
$wgCirrusSearchUseExperimentalHighlighter = 
true;
}
-   self::overrideNumeric( 
$wgCirrusSearchPhraseRescoreWindowSize, $request, 'cirrusPhraseWinwdow', 1 
);
+   self::overrideNumeric( 
$wgCirrusSearchPhraseRescoreWindowSize, $request, 'cirrusPhraseWindow', 1 );
self::overrideNumeric( $wgCirrusSearchPhraseSlop[ 
'boost' ], $request, 'cirrusPhraseSlop', 10 );
self::overrideNumeric( 
$wgCirrusSearchFunctionRescoreWindowSize, $request, 'cirrusFunctionWindow', 
1 );
self::overrideNumeric( $wgCirrusSearchFragmentSize, 
$request, 'cirrusFragmentSize', 1000 );

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I94e588e33cbf21056d78d65c72d8f5371293f81a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CirrusSearch
Gerrit-Branch: master
Gerrit-Owner: DCausse 

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

[MediaWiki-commits] [Gerrit] Use formatversion=2 for API request - change (mediawiki...WikiEditor)

[Gerrit Patch Uploader (Code Review)]

Gerrit Patch Uploader has uploaded a new change for review.

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

Change subject: Use formatversion=2 for API request
..

Use formatversion=2 for API request

With formatversion=2 the JSON response uses UTF-8 instead of escape sequence
with hex for encoding of non-ASCII characters (e.g. "\u00e4" for "ä").

The JSON response from formatversion=2 has some structural improvements.
This allows a simplification of the processing of the response.
The parameter indexpageids= is not necessary anymore.

Change-Id: Ic08c8ba46b7529952c0fb2f04564b458b55112fd
---
M modules/jquery.wikiEditor.dialogs.config.js
M modules/jquery.wikiEditor.preview.js
2 files changed, 15 insertions(+), 12 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikiEditor 
refs/changes/07/269107/1

diff --git a/modules/jquery.wikiEditor.dialogs.config.js 
b/modules/jquery.wikiEditor.dialogs.config.js
index cfc7690..42908f5 100644
--- a/modules/jquery.wikiEditor.dialogs.config.js
+++ b/modules/jquery.wikiEditor.dialogs.config.js
@@ -180,24 +180,24 @@
$( 
'#wikieditor-toolbar-link-int-target-status' ).data(
'request',
api.get( {
+   formatversion: 
2,
action: 'query',
prop: 
'pageprops',
titles: target,
-   ppprop: 
'disambiguation',
-   indexpageids: 
true
+   ppprop: 
'disambiguation'
} ).done( function ( 
data ) {
var status;
if ( 
!data.query || !data.query.pages ) {
// This 
happens in some weird cases like interwiki links
status 
= false;
} else {
-   var 
page = data.query.pages[ data.query.pageids[ 0 ] ];
+   var 
page = data.query.pages[ 0 ];
status 
= 'exists';
-   if ( 
page.missing !== undefined ) {
+   if ( 
page.missing ) {

status = 'notexists';
-   } else 
if ( page.invalid !== undefined ) {
+   } else 
if ( page.invalid ) {

status = 'invalid';
-   } else 
if ( page.pageprops !== undefined ) {
+   } else 
if ( page.pageprops ) {

status = 'disambig';
}
}
@@ -380,6 +380,7 @@
}
 
var request = api.get( {
+   formatversion: 
2,
action: 
'opensearch',
search: title,
namespace: 0,
diff --git a/modules/jquery.wikiEditor.preview.js 
b/modules/jquery.wikiEditor.preview.js
index 1d621e2..f0a1099 100644
--- a/modules/jquery.wikiEditor.preview.js
+++ b/modules/jquery.wikiEditor.preview.js
@@ -56,20 +56,21 @@
context.modules.preview.$preview.find( 
'.wikiEditor-preview-contents' ).empty();
context.modules.preview.$preview.find( 
'.wikiEditor-preview-loading' ).show();
api.post( {
+

[MediaWiki-commits] [Gerrit] Test: Correct order of expected/actual in setProp tests - change (oojs/core)

[Esanders (Code Review)]

Esanders has uploaded a new change for review.

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

Change subject: Test: Correct order of expected/actual in setProp tests
..

Test: Correct order of expected/actual in setProp tests

Change-Id: I3a32e65cc87cfdcf59385ba14223c3e0bafa52fe
---
M tests/unit/core.test.js
1 file changed, 7 insertions(+), 7 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/oojs/core refs/changes/12/269112/1

diff --git a/tests/unit/core.test.js b/tests/unit/core.test.js
index 22eb296..242efc0 100644
--- a/tests/unit/core.test.js
+++ b/tests/unit/core.test.js
@@ -229,25 +229,25 @@
 
QUnit.test( 'setProp( ' + type + ' )', function ( 
assert ) {
oo.setProp( obj, 'foo', 4 );
-   assert.strictEqual( 4, obj.foo, 'setting an 
existing key with depth 1' );
+   assert.strictEqual( obj.foo, 4, 'setting an 
existing key with depth 1' );
 
oo.setProp( obj, 'test', 'TEST' );
-   assert.strictEqual( 'TEST', obj.test, 'setting 
a new key with depth 1' );
+   assert.strictEqual( obj.test, 'TEST', 'setting 
a new key with depth 1' );
 
oo.setProp( obj, 'bar', 'quux', 'whee', 'YAY' );
-   assert.strictEqual( 'YAY', obj.bar.quux.whee, 
'setting an existing key with depth 3' );
+   assert.strictEqual( obj.bar.quux.whee, 'YAY', 
'setting an existing key with depth 3' );
 
oo.setProp( obj, 'bar', 'a', 'b', 'c' );
-   assert.strictEqual( 'c', obj.bar.a.b, 'setting 
two new keys within an existing key' );
+   assert.strictEqual( obj.bar.a.b, 'c', 'setting 
two new keys within an existing key' );
 
oo.setProp( obj, 'a', 'b', 'c', 'd', 'e', 'f' );
-   assert.strictEqual( 'f', obj.a.b.c.d.e, 
'setting new keys with depth 5' );
+   assert.strictEqual( obj.a.b.c.d.e, 'f', 
'setting new keys with depth 5' );
 
oo.setProp( obj, 'bar', 'baz', 'whee', 'wheee', 
'wh' );
-   assert.strictEqual( null, obj.bar.baz, 
'descending into null fails silently' );
+   assert.strictEqual( obj.bar.baz, null, 
'descending into null fails silently' );
 
oo.setProp( obj, 'foo', 'bar', 5 );
-   assert.strictEqual( 4, obj.foo, 'descending 
into primitive (number) preserves fails silently' );
+   assert.strictEqual( obj.foo, 4, 'descending 
into primitive (number) preserves fails silently' );
} );
}
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I3a32e65cc87cfdcf59385ba14223c3e0bafa52fe
Gerrit-PatchSet: 1
Gerrit-Project: oojs/core
Gerrit-Branch: master
Gerrit-Owner: Esanders 

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

[MediaWiki-commits] [Gerrit] Allow callbacks to be passed to $wgContentHandlers - change (mediawiki/core)

[jenkins-bot (Code Review)]

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

Change subject: Allow callbacks to be passed to $wgContentHandlers
..


Allow callbacks to be passed to $wgContentHandlers

Change-Id: Icf980313a6e7fcc83f5183c450b0a824353596b8
---
M RELEASE-NOTES-1.27
M docs/contenthandler.txt
M includes/DefaultSettings.php
M includes/content/ContentHandler.php
M tests/phpunit/includes/content/ContentHandlerTest.php
5 files changed, 39 insertions(+), 5 deletions(-)

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



diff --git a/RELEASE-NOTES-1.27 b/RELEASE-NOTES-1.27
index 5b9b2b8..d1f8ca7 100644
--- a/RELEASE-NOTES-1.27
+++ b/RELEASE-NOTES-1.27
@@ -158,6 +158,8 @@
   aria-describedby, aria-flowto, aria-label, aria-labelledby, aria-owns.
 * Removed "presentation" restriction on the HTML role attribute in wikitext.
   All values are now allowed for the role attribute.
+* $wgContentHandlers now also supports callbacks to create an instance of the
+  appropriate ContentHandler subclass.
 
 === External library changes in 1.27 ===
 
diff --git a/docs/contenthandler.txt b/docs/contenthandler.txt
index 5f9a0b0..f1f478e 100644
--- a/docs/contenthandler.txt
+++ b/docs/contenthandler.txt
@@ -148,7 +148,8 @@
 
 There are some new globals that can be used to control the behavior of the 
ContentHandler facility:
 
-* $wgContentHandlers associates content model IDs with the names of the 
appropriate ContentHandler subclasses.
+* $wgContentHandlers associates content model IDs with the names of the 
appropriate ContentHandler subclasses
+  or callbacks that create an instance of the appropriate ContentHandler 
subclass.
 
 * $wgNamespaceContentModels maps namespace IDs to a content model that should 
be the default for that namespace.
 
diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index 9c7106f..3ac3c8f 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -904,7 +904,8 @@
 
 /**
  * Plugins for page content model handling.
- * Each entry in the array maps a model id to a class name.
+ * Each entry in the array maps a model id to a class name or callback
+ * that creates an instance of the appropriate ContentHandler subclass.
  *
  * @since 1.21
  */
diff --git a/includes/content/ContentHandler.php 
b/includes/content/ContentHandler.php
index acaa288..e898e72 100644
--- a/includes/content/ContentHandler.php
+++ b/includes/content/ContentHandler.php
@@ -357,11 +357,16 @@
throw new MWException( 
"ContentHandlerForModelID must supply a ContentHandler instance" );
}
} else {
-   $class = $wgContentHandlers[$modelId];
-   $handler = new $class( $modelId );
+   $classOrCallback = $wgContentHandlers[$modelId];
+
+   if ( is_callable( $classOrCallback ) ) {
+   $handler = call_user_func( $classOrCallback, 
$modelId );
+   } else {
+   $handler = new $classOrCallback( $modelId );
+   }
 
if ( !( $handler instanceof ContentHandler ) ) {
-   throw new MWException( "$class from 
\$wgContentHandlers is not " .
+   throw new MWException( "$classOrCallback from 
\$wgContentHandlers is not " .
"compatible with ContentHandler" );
}
}
diff --git a/tests/phpunit/includes/content/ContentHandlerTest.php 
b/tests/phpunit/includes/content/ContentHandlerTest.php
index 8178c12..a72247b 100644
--- a/tests/phpunit/includes/content/ContentHandlerTest.php
+++ b/tests/phpunit/includes/content/ContentHandlerTest.php
@@ -26,6 +26,9 @@
CONTENT_MODEL_CSS => 'CssContentHandler',
CONTENT_MODEL_TEXT => 'TextContentHandler',
'testing' => 'DummyContentHandlerForTesting',
+   'testing-callbacks' => function( $modelId ) {
+   return new 
DummyContentHandlerForTesting( $modelId );
+   }
),
) );
 
@@ -378,4 +381,26 @@
 
return true;
}
+
+   public function provideGetModelForID() {
+   return array(
+   array( CONTENT_MODEL_WIKITEXT, 'WikitextContentHandler' 
),
+   array( CONTENT_MODEL_JAVASCRIPT, 
'JavaScriptContentHandler' ),
+   array( CONTENT_MODEL_JSON, 'JsonContentHandler' ),
+   array( CONTENT_MODEL_CSS, 'CssContentHandler' ),
+   array( CONTENT_MODEL_TEXT, 'TextContentHandler' ),
+   array( 'testing', 

[MediaWiki-commits] [Gerrit] Add license-name to credits - change (mediawiki...StopForumSpam)

[jenkins-bot (Code Review)]

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

Change subject: Add license-name to credits
..


Add license-name to credits

Change-Id: Id5eca9b0f38aa22a81feffe353b27252d05499df
---
M StopForumSpam.php
1 file changed, 1 insertion(+), 0 deletions(-)

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



diff --git a/StopForumSpam.php b/StopForumSpam.php
index 9d88690..99cf26f 100644
--- a/StopForumSpam.php
+++ b/StopForumSpam.php
@@ -69,6 +69,7 @@
'url' => 'https://www.mediawiki.org/wiki/Extension:StopForumSpam',
'descriptionmsg' => 'stopforumspam-desc',
'version' => '0.2.0',
+   'license-name' => 'GPL-2.0+',
 );
 
 $wgAutoloadClasses['SFSHooks'] = __DIR__ . '/StopForumSpam.hooks.php';

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Id5eca9b0f38aa22a81feffe353b27252d05499df
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/StopForumSpam
Gerrit-Branch: master
Gerrit-Owner: Legoktm 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] GroupManager: Used task API instead of AjaxExportList - change (mediawiki...BlueSpiceExtensions)

[Robert Vogel (Code Review)]

Robert Vogel has submitted this change and it was merged.

Change subject: GroupManager: Used task API instead of AjaxExportList
..


GroupManager: Used task API instead of AjaxExportList

PatchSet2:

* fixed whitespace

Change-Id: Ie67f0b860c688540664faae28c5675500ab338a5
---
M GroupManager/GroupManager.class.php
M GroupManager/GroupManager.setup.php
M GroupManager/i18n/en.json
M GroupManager/i18n/qqq.json
A GroupManager/includes/api/BSApiTasksGroupManager.php
M GroupManager/resources/BS.GroupManager/Panel.js
M UserManager/resources/BS.UserManager/dialog/User.js
M UserManager/resources/BS.UserManager/dialog/UserGroups.js
M UserManager/resources/BS.UserManager/panel/Manager.js
9 files changed, 343 insertions(+), 333 deletions(-)

Approvals:
  Robert Vogel: Looks good to me, approved
  Siebrand: Looks good to me, but someone else must approve
  jenkins-bot: Verified



diff --git a/GroupManager/GroupManager.class.php 
b/GroupManager/GroupManager.class.php
index d551397..d21127d 100644
--- a/GroupManager/GroupManager.class.php
+++ b/GroupManager/GroupManager.class.php
@@ -79,281 +79,10 @@
}
 
/**
-* returns a json object which hold the data of all existing usergroups
-* @param string $output the ajax output string
-*/
-   public static function getData() {
-   if ( BsCore::checkAccessAdmission( 'wikiadmin' ) === false ) 
return true;
-   global $wgGroupPermissions, $wgAdditionalGroups;
-
-   $oStoreParams = BsExtJSStoreParams::newFromRequest();
-   $iLimit = $oStoreParams->getLimit();
-   $iStart = $oStoreParams->getStart();
-   $sSort  = $oStoreParams->getSort( 'group_name' );
-   $sDirection = $oStoreParams->getDirection();
-
-   $aGroups = array();
-   foreach ( BsGroupHelper::getAvailableGroups() as $sGroup ) {
-   $aGroups['groups'][] = array(
-   'group_name' => $sGroup,
-   'additional_group' => ( isset( 
$wgAdditionalGroups[$sGroup] ) )
-   );
-   }
-
-   if ( $sDirection == 'DESC' ) {
-   usort( $aGroups['groups'], function ($a, $b) { return 
strnatcasecmp($b["group_name"], $a["group_name"]); });
-   } else {
-   usort( $aGroups['groups'], function ($a, $b) { return 
strnatcasecmp($a["group_name"], $b["group_name"]); });
-   }
-
-   $aGroups['totalCount'] = sizeof( $aGroups['groups'] );
-
-   // Apply limit and offset
-   $aGroups['groups'] = array_slice( $aGroups['groups'], $iStart, 
$iLimit );
-
-
-   return FormatJson::encode( $aGroups );
-   }
-
-   /**
-* returns a json object which hold the data of all existing usergroups
-* @param string $output the ajax output string
-*/
-   public static function getGroups() {
-   if ( BsCore::checkAccessAdmission( 'wikiadmin' ) === false ) 
return true;
-   global $wgGroupPermissions;
-
-   $aGroups = array();
-   foreach ( BsGroupHelper::getAvailableGroups() as $sGroup ) {
-   if ( in_array( $sGroup, array( '*', 'user', 
'autoconfirmed', 'emailconfirmed' ) ) ) continue;
-   if ( !wfMessage( 'group-' . $sGroup 
)->inContentLanguage()->isBlank() ) {
-   $sDisplayName = wfMessage( 'group-' . $sGroup 
)->plain() . " (" . $sGroup . ")";
-   } else {
-   $sDisplayName = $sGroup;
-   }
-
-   $aGroups[] = array(
-   'group' => $sGroup,
-   'displayname' => $sDisplayName
-   );
-   }
-
-   return FormatJson::encode( array( 'groups' => $aGroups ) );
-   }
-
-   /**
-* adds an usergroup to the wiki
-* @param string $output the ajax output string
-*/
-   public static function addGroup( $sGroup ) {
-   if ( wfReadOnly() ) {
-   global $wgReadOnly;
-   return FormatJson::encode( array(
-   'success' => false,
-   'message' => wfMessage( 'bs-readonly', 
$wgReadOnly )->plain()
-   ) );
-   }
-   if ( BsCore::checkAccessAdmission( 'wikiadmin' ) === false ) 
return true;
-
-   // TODO SU (04.07.11 11:40): global sind leider hier noch 
nötig, da werte in den globals geändert werden müssen.
-   global $wgGroupPermissions, $wgAdditionalGroups;
-
-   $output = array(
-   'success' => true,
-   'message' => wfMessage( 

[MediaWiki-commits] [Gerrit] Add COPYING, set license-name - change (mediawiki...AccountInfo)

[Legoktm (Code Review)]

Legoktm has uploaded a new change for review.

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

Change subject: Add COPYING, set license-name
..

Add COPYING, set license-name

Also remove "MIT Licensed code" comment that doesn't apply after
ed71346b73b0.

Change-Id: Ic4c534e8b8a1773ec0d0da7bc71be8cda538cae1
---
M AccountInfo.php
A COPYING
2 files changed, 340 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/AccountInfo 
refs/changes/91/269091/1

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

[MediaWiki-commits] [Gerrit] Ignore RC_EXTERNAL changes for RecentChange_Save - change (mediawiki...CheckUser)

[Addshore (Code Review)]

Addshore has uploaded a new change for review.

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

Change subject: Ignore RC_EXTERNAL changes for RecentChange_Save
..

Ignore RC_EXTERNAL changes for RecentChange_Save

It seems the following extensions already has special
handeling, generally ignoring external edits:
 - Gather
 - MobileFrontend
 - AbuseFilter
 - FlaggedRevs

Bug: T125664
Change-Id: If97bb829327b108fddd14641946fed946eb0ea75
---
M CheckUser.hooks.php
1 file changed, 8 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CheckUser 
refs/changes/06/269106/1

diff --git a/CheckUser.hooks.php b/CheckUser.hooks.php
index 9314589..0cf278f 100755
--- a/CheckUser.hooks.php
+++ b/CheckUser.hooks.php
@@ -17,6 +17,14 @@
if ( defined( 'RC_CATEGORIZE' ) && $rc->getAttribute( 'rc_type' 
) == RC_CATEGORIZE ) {
return true;
}
+   /**
+* RC_EXTERNAL recent changes are not triggered by actions on 
th local wiki.
+* Thus there is no reason to store checkuser data about them.
+* @see https://phabricator.wikimedia.org/T125664
+*/
+   if ( defined( 'RC_EXTERNAL' ) && $rc->getAttribute( 'rc_type' ) 
== RC_EXTERNAL ) {
+   return true;
+   }
 
$attribs = $rc->getAttributes();
// Get IP

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: If97bb829327b108fddd14641946fed946eb0ea75
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CheckUser
Gerrit-Branch: master
Gerrit-Owner: Addshore 

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

[MediaWiki-commits] [Gerrit] Add COPYING, set license-name - change (mediawiki...GoogleAppEngine)

[Legoktm (Code Review)]

Legoktm has uploaded a new change for review.

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

Change subject: Add COPYING, set license-name
..

Add COPYING, set license-name

Change-Id: I92f62eeccb8d8e7a85d119f49755e7e2eef2e46d
---
A COPYING
M GoogleAppEngine.php
2 files changed, 675 insertions(+), 0 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/GoogleAppEngine 
refs/changes/92/269092/1

diff --git a/COPYING b/COPYING
new file mode 100644
index 000..94a9ed0
--- /dev/null
+++ b/COPYING
@@ -0,0 +1,674 @@
+GNU GENERAL PUBLIC LICENSE
+   Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. 
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+Preamble
+
+  The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.  We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors.  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+  To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights.  Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received.  You must make sure that they, too, receive
+or can get the source code.  And you must show them these terms so they
+know their rights.
+
+  Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+  For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software.  For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+  Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so.  This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software.  The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable.  Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products.  If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+  Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary.  To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+   TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work 

[MediaWiki-commits] [Gerrit] Add COPYING, set license-name - change (mediawiki...AccountInfo)

[jenkins-bot (Code Review)]

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

Change subject: Add COPYING, set license-name
..


Add COPYING, set license-name

Also remove "MIT Licensed code" comment that doesn't apply after
ed71346b73b0.

Change-Id: Ic4c534e8b8a1773ec0d0da7bc71be8cda538cae1
---
M AccountInfo.php
A COPYING
2 files changed, 340 insertions(+), 1 deletion(-)

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



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

[MediaWiki-commits] [Gerrit] Add composer-package-php55 job - change (integration/config)

[jenkins-bot (Code Review)]

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

Change subject: Add composer-package-php55 job
..


Add composer-package-php55 job

Change-Id: If2dbe637ebc26668f56669a811b69be8dd9b59bc
---
M jjb/job-templates.yaml
M zuul/layout.yaml
2 files changed, 3 insertions(+), 0 deletions(-)

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



diff --git a/jjb/job-templates.yaml b/jjb/job-templates.yaml
index aefa5bd..9bfe604 100644
--- a/jjb/job-templates.yaml
+++ b/jjb/job-templates.yaml
@@ -175,6 +175,7 @@
 phpflavor:
 - hhvm
 - php53
+- php55
 
 # Checks the committed composer.lock file against the database at
 # https://github.com/FriendsOfPHP/security-advisories and the API
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 049fb23..359345e 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -1409,9 +1409,11 @@
 test:
   - composer-package-hhvm
   - composer-package-php53
+  - composer-package-php55
 gate-and-submit:
   - composer-package-hhvm
   - composer-package-php53
+  - composer-package-php55
 
   - name: npm
 test:

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

Gerrit-MessageType: merged
Gerrit-Change-Id: If2dbe637ebc26668f56669a811b69be8dd9b59bc
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Legoktm 
Gerrit-Reviewer: Hashar 
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] Rename composer-test jobs for packages to "composer-package-... - change (integration/config)

[jenkins-bot (Code Review)]

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

Change subject: Rename composer-test jobs for packages to 
"composer-package-{phpflavor}"
..


Rename composer-test jobs for packages to "composer-package-{phpflavor}"

For standardization with with other jobs:
* Drop "php-" prefix ("npm", not "nodejs-npm")
* Drop "-test" suffix ("npm", not "npm-test")

Change-Id: I8768970432fbbfc7af98e4aa08f6632d7779f456
---
M jjb/job-templates.yaml
M zuul/layout.yaml
2 files changed, 8 insertions(+), 8 deletions(-)

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



diff --git a/jjb/job-templates.yaml b/jjb/job-templates.yaml
index 041ff35..aefa5bd 100644
--- a/jjb/job-templates.yaml
+++ b/jjb/job-templates.yaml
@@ -156,8 +156,8 @@
 # Run composer update and composer test
 # Intended for libraries that are published as composer packages
 - job-template:
-name: 'php-composer-test-{phpflavor}'
-node: 'contintLabsSlave && (UbuntuPrecise && phpflavor-php53 && 
phpflavor-{phpflavor}) || (UbuntuTrusty && phpflavor-hhvm && 
phpflavor-{phpflavor})'
+name: 'composer-package-{phpflavor}'
+node: 'contintLabsSlave && phpflavor-{phpflavor}'
 defaults: use-remote-zuul-shallow-clone
 concurrent: true
 triggers:
@@ -169,9 +169,9 @@
  - composer-test
 
 - project:
-name: 'php-composer-test-flavored'
+name: 'composer-package-flavored'
 jobs:
- - 'php-composer-test-{phpflavor}':
+ - 'composer-package-{phpflavor}':
 phpflavor:
 - hhvm
 - php53
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index da9618e..049fb23 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -1407,11 +1407,11 @@
   - php53lint
   - php55lint
 test:
-  - php-composer-test-hhvm
-  - php-composer-test-php53
+  - composer-package-hhvm
+  - composer-package-php53
 gate-and-submit:
-  - php-composer-test-hhvm
-  - php-composer-test-php53
+  - composer-package-hhvm
+  - composer-package-php53
 
   - name: npm
 test:

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I8768970432fbbfc7af98e4aa08f6632d7779f456
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Legoktm 
Gerrit-Reviewer: Hashar 
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] Enforce SSL on change master - change (operations/software)

[Jcrespo (Code Review)]

Jcrespo has submitted this change and it was merged.

Change subject: Enforce SSL on change master
..


Enforce SSL on change master

Change-Id: I33c80d2cc9ea61f5351bd5cd614eff9dfbe2c2a6
References: T111654
---
M dbtools/repl.pl
1 file changed, 3 insertions(+), 3 deletions(-)

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



diff --git a/dbtools/repl.pl b/dbtools/repl.pl
index a1897bc..d6109eb 100755
--- a/dbtools/repl.pl
+++ b/dbtools/repl.pl
@@ -261,7 +261,7 @@
print "Changing ${child_host}:${child_port} master to 
${parent_log_file}, ${parent_log_pos}...\n";
 
$child->do(
-   "change master to master_host = ?, master_port = 
${parent_port}, master_log_file = ?, master_log_pos = ${parent_log_pos}",
+   "change master to master_host = ?, master_port = 
${parent_port}, master_log_file = ?, master_log_pos = ${parent_log_pos}, 
MASTER_SSL=1",
undef, $parent_host, $parent_log_file
);
 
@@ -343,7 +343,7 @@
print "Changing ${child_host}:${child_port} master to 
${master_log_file}, ${master_log_pos}...\n";
 
$child->do(
-   "change master to master_host = ?, master_port = 
${master_port}, master_log_file = ?, master_log_pos = ${master_log_pos}",
+   "change master to master_host = ?, master_port = 
${master_port}, master_log_file = ?, master_log_pos = ${master_log_pos}, 
MASTER_SSL=1",
undef, $master_host, $master_log_file,
);
 
@@ -377,4 +377,4 @@
_sibs_in_sync;
 
print "Success!\n";
-}
\ No newline at end of file
+}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I33c80d2cc9ea61f5351bd5cd614eff9dfbe2c2a6
Gerrit-PatchSet: 2
Gerrit-Project: operations/software
Gerrit-Branch: master
Gerrit-Owner: Jcrespo 
Gerrit-Reviewer: Jcrespo 

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

[MediaWiki-commits] [Gerrit] Ship Elasticsearch logs to logstash - change (operations/puppet)

[Gehel (Code Review)]

Gehel has uploaded a new change for review.

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

Change subject: Ship Elasticsearch logs to logstash
..

Ship Elasticsearch logs to logstash

WIP - do not merge yet

Introduce gelf4j as a log4j appender to send logs to logstash. Sending log to 
logstash is disabled by default and can be activated by hiera configuration.

Still to do (need some help):

* actually deploy the gelf4j jar in /usr/share/elasticsearch/lib
* understand where in hiera the logstash server should be configured
* test in labs

Bug: T109101
Change-Id: I683bcb75c91e6c2f4dd648517435a477ab23c2a7
---
M modules/elasticsearch/manifests/init.pp
M modules/elasticsearch/manifests/packages.pp
M modules/elasticsearch/templates/logging.yml.erb
3 files changed, 31 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/00/269100/1

diff --git a/modules/elasticsearch/manifests/init.pp 
b/modules/elasticsearch/manifests/init.pp
index fcea3e7..58ecef0 100644
--- a/modules/elasticsearch/manifests/init.pp
+++ b/modules/elasticsearch/manifests/init.pp
@@ -89,7 +89,10 @@
 $bulk_thread_pool_capacity = undef,
 $statsd_host = undef,
 $merge_threads = 3,
-$load_fixed_bitset_filters_eagerly = true) {
+$load_fixed_bitset_filters_eagerly = true,
+$send_logs_to_logstash = false,
+$gelf_host = undef,
+$gelf_port = 12201) {
 
 include ::elasticsearch::packages
 
@@ -98,6 +101,15 @@
 fail('$cluster_name must not be set to "elasticsearch"')
 }
 
+validate_bool($send_logs_to_logstash)
+if $send_logs_to_logstash {
+  if $gelf_host == undef {
+fail('elasticsearch::gelf_host must be defined if sending logs to 
logstash is active.')
+  }
+  validate_string($gelf_host)
+  validate_integer($gelf_port)
+}
+
 file { '/etc/elasticsearch/elasticsearch.yml':
 ensure  => file,
 owner   => 'root',
diff --git a/modules/elasticsearch/manifests/packages.pp 
b/modules/elasticsearch/manifests/packages.pp
index 3546597..6643cba 100644
--- a/modules/elasticsearch/manifests/packages.pp
+++ b/modules/elasticsearch/manifests/packages.pp
@@ -19,4 +19,11 @@
 require_package('python-elasticsearch')
 require_package('python-ipaddr')
 }
+
+if $::elasticsearch::send_logs_to_logstash {
+# TODO: deploy gelf4j jar (https://github.com/t0xa/gelfj /
+# 
http://central.maven.org/maven2/org/graylog2/gelfj/1.1.14/gelfj-1.1.14.jar) not 
sure if this needs to be done
+# via the internal archiva repository and curl, if a .deb package 
needs to be created, ...
+}
+
 }
diff --git a/modules/elasticsearch/templates/logging.yml.erb 
b/modules/elasticsearch/templates/logging.yml.erb
index 3cd8631..a4a5ae5 100644
--- a/modules/elasticsearch/templates/logging.yml.erb
+++ b/modules/elasticsearch/templates/logging.yml.erb
@@ -1,4 +1,4 @@
-rootLogger: INFO, console, file
+rootLogger: INFO, console, file<% if @send_logs_to_logstash %>, 
ship_to_logstash<% end %>
 logger:
   # log action execution errors for easier debugging
   action: DEBUG
@@ -65,3 +65,13 @@
 layout:
   type: pattern
   conversionPattern: "[%d{ISO8601}][%-5p][%-25c] %m%n"
+
+<% if @send_logs_to_logstash %>
+  ship_to_logstash:
+type: org.graylog2.log.GelfAppender
+graylogHost: <%= @gelf_host %>
+graylogPort: <%= @gelf_port %>
+originHost: <%= @hostname %>
+extractStacktrace: true
+addExtendedInformation: true
+<% end %>

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

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

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

[MediaWiki-commits] [Gerrit] Fix the uppercase issue of "lang" parameter in ImagePage (T1... - change (mediawiki/core)

[PhiLiP (Code Review)]

PhiLiP has uploaded a new change for review.

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

Change subject: Fix the uppercase issue of "lang" parameter in ImagePage 
(T125710)
..

Fix the uppercase issue of "lang" parameter in ImagePage (T125710)

Change-Id: I609fac0f56fd677da1aff9d20f9f7b756b3373d9
---
M includes/page/ImagePage.php
1 file changed, 3 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/08/269108/1

diff --git a/includes/page/ImagePage.php b/includes/page/ImagePage.php
index d171e89..e4eea97 100644
--- a/includes/page/ImagePage.php
+++ b/includes/page/ImagePage.php
@@ -1088,7 +1088,7 @@
} else {
$display = $code;
}
-   $opts .= "\n" . Xml::option( $display, $code, $curLang 
=== $code );
+   $opts .= "\n" . Xml::option( $display, strtolower( 
$code ), $curLang === $code );
if ( $curLang === $code ) {
$haveCurrentLang = true;
}
@@ -1101,7 +1101,7 @@
// if its just unmarked content that could be in any 
language.
$opts = Xml::option(
$this->getContext()->msg( 
'img-lang-default' )->text(),
-   $defaultLang,
+   strtolower( $defaultLang ),
$defaultLang === $curLang
) . $opts;
}
@@ -1112,7 +1112,7 @@
} else {
$display = $curLang;
}
-   $opts = Xml::option( $display, $curLang, true ) . $opts;
+   $opts = Xml::option( $display, strtolower( $curLang ), 
true ) . $opts;
}
 
$select = Html::rawElement(

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

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

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

[MediaWiki-commits] [Gerrit] Rename cirrus param cirrusPhraseWinwdow to cirrusPhraseWindow - change (mediawiki...CirrusSearch)

[jenkins-bot (Code Review)]

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

Change subject: Rename cirrus param cirrusPhraseWinwdow to cirrusPhraseWindow
..


Rename cirrus param cirrusPhraseWinwdow to cirrusPhraseWindow

Change-Id: I94e588e33cbf21056d78d65c72d8f5371293f81a
---
M includes/Hooks.php
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Aude: Looks good to me, approved
  Cindy-the-browser-test-bot: Looks good to me, but someone else must approve
  jenkins-bot: Verified



diff --git a/includes/Hooks.php b/includes/Hooks.php
index ca8cc63..a22de11 100644
--- a/includes/Hooks.php
+++ b/includes/Hooks.php
@@ -99,7 +99,7 @@
$request->getVal( 'cirrusHighlighter' ) 
=== 'experimental' ) {
$wgCirrusSearchUseExperimentalHighlighter = 
true;
}
-   self::overrideNumeric( 
$wgCirrusSearchPhraseRescoreWindowSize, $request, 'cirrusPhraseWinwdow', 1 
);
+   self::overrideNumeric( 
$wgCirrusSearchPhraseRescoreWindowSize, $request, 'cirrusPhraseWindow', 1 );
self::overrideNumeric( $wgCirrusSearchPhraseSlop[ 
'boost' ], $request, 'cirrusPhraseSlop', 10 );
self::overrideNumeric( 
$wgCirrusSearchFunctionRescoreWindowSize, $request, 'cirrusFunctionWindow', 
1 );
self::overrideNumeric( $wgCirrusSearchFragmentSize, 
$request, 'cirrusFragmentSize', 1000 );

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I94e588e33cbf21056d78d65c72d8f5371293f81a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CirrusSearch
Gerrit-Branch: master
Gerrit-Owner: DCausse 
Gerrit-Reviewer: Aude 
Gerrit-Reviewer: Cindy-the-browser-test-bot 
Gerrit-Reviewer: Manybubbles 
Gerrit-Reviewer: Smalyshev 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] MWImageModel: Use clearDefaultDimensions - change (mediawiki...VisualEditor)

[jenkins-bot (Code Review)]

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

Change subject: MWImageModel: Use clearDefaultDimensions
..


MWImageModel: Use clearDefaultDimensions

setDefaultDimensions( {} ) is a no-op.

Bug: T126078
Change-Id: I1ef7cae04574e2561d21d4071d19a0067d81b263
---
M modules/ve-mw/dm/models/ve.dm.MWImageModel.js
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Bartosz Dziewoński: Looks good to me, approved
  Jforrester: Looks good to me, but someone else must approve
  jenkins-bot: Verified



diff --git a/modules/ve-mw/dm/models/ve.dm.MWImageModel.js 
b/modules/ve-mw/dm/models/ve.dm.MWImageModel.js
index 4667972..4ce711d 100644
--- a/modules/ve-mw/dm/models/ve.dm.MWImageModel.js
+++ b/modules/ve-mw/dm/models/ve.dm.MWImageModel.js
@@ -998,7 +998,7 @@
this.scalable.setDefaultDimensions( originalDimensions 
);
}
} else {
-   this.scalable.setDefaultDimensions( {} );
+   this.scalable.clearDefaultDimensions();
}
 };
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I1ef7cae04574e2561d21d4071d19a0067d81b263
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders 
Gerrit-Reviewer: Bartosz Dziewoński 
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] Add risk score to Adyen pending queue message - change (mediawiki...DonationInterface)

[jenkins-bot (Code Review)]

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

Change subject: Add risk score to Adyen pending queue message
..


Add risk score to Adyen pending queue message

It will be used by the IPN listener to decide whether to capture
authorized payments or leave them for manual review.

Send pending queue message before opening iframe, stop using
limbo queue since we have no orphan rectifier for Adyen.

Bug: T122244
Change-Id: Ieb45af0c2047dce460cb3c7bb76c0d6ca301b5d9
---
M adyen_gateway/adyen.adapter.php
M gateway_common/DonationQueue.php
M tests/Adapter/Adyen/AdyenTest.php
3 files changed, 34 insertions(+), 6 deletions(-)

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



diff --git a/adyen_gateway/adyen.adapter.php b/adyen_gateway/adyen.adapter.php
index 6059e55..98c7ada 100644
--- a/adyen_gateway/adyen.adapter.php
+++ b/adyen_gateway/adyen.adapter.php
@@ -262,11 +262,24 @@
) );
$this->logger->info( "launching 
external iframe request: " . print_r( $requestParams, true )
);
-   $this->setLimboMessage();
+   $this->setLimboMessage( 'pending' );
break;
}
}
return $this->transaction_response;
+   }
+
+   /**
+* Add risk score to the message we send to the pending queue.
+* The IPN listener will combine this with scores based on CVV and AVS
+* results returned with the authorization notification and determine
+* whether to capture the payment or leave it for manual review.
+* @return array
+*/
+   protected function getStompTransaction() {
+   $transaction = parent::getStompTransaction();
+   $transaction['risk_score'] = $this->risk_score;
+   return $transaction;
}
 
static function getCurrencies() {
@@ -522,15 +535,17 @@
$this->logger->debug( 'Good signature' );
 
$gateway_txn_id = isset( $response['pspReference'] ) ? 
$response['pspReference'] : '';
+   $this->transaction_response->setGatewayTransactionId( 
$gateway_txn_id );
 
$result_code = isset( $response['authResult'] ) ? 
$response['authResult'] : '';
if ( $result_code == 'PENDING' || $result_code == 'AUTHORISED' 
) {
// Both of these are listed as pending because we have 
to submit a capture
// request on 'AUTHORIZATION' ipn message receipt.
-   $this->logger->info( "User came back as pending or 
authorised, placing in pending queue" );
+   $this->logger->info( "User came back as pending or 
authorised, placing in payments-init queue" );
$this->finalizeInternalStatus( FinalStatus::PENDING );
}
else {
+   $this->deleteLimboMessage( 'pending' );
$this->finalizeInternalStatus( FinalStatus::FAILED );
$this->logger->info( "Negative response from gateway. 
Full response: " . print_r( $response, TRUE ) );
throw new ResponseProcessingException(
@@ -538,14 +553,17 @@
ResponseCodes::UNKNOWN
);
}
-   $this->transaction_response->setGatewayTransactionId( 
$gateway_txn_id );
-   // FIXME: Why put that two places in transaction_response?
-   $this->transaction_response->setTxnMessage( 
$this->getFinalStatus() );
$this->runPostProcessHooks();
-   $this->deleteLimboMessage();
}
 
/**
+* Overriding this function because we're queueing our pending message
+* before we redirect the user, so we don't need to send another one
+* when doStompTransaction is called from runPostProcessHooks.
+*/
+   protected function doStompTransaction() {}
+
+   /**
 * TODO do we want to stage the country code for language variants?
protected function stage_language( $type = 'request' ) {
*/
diff --git a/gateway_common/DonationQueue.php b/gateway_common/DonationQueue.php
index 47889eb..d0b1afc 100644
--- a/gateway_common/DonationQueue.php
+++ b/gateway_common/DonationQueue.php
@@ -227,6 +227,7 @@
'last_name' => 'lname',
'optout' => 'optout',
'recurring' => 'recurring',
+   'risk_score' => 'risk_score',
'state_province' => 'state',
'street_address' => 'street',
'supplemental_address_1' => 'street_supplemental',
diff 

[MediaWiki-commits] [Gerrit] This is going to cause /var/log to fill up if I let it run. - change (operations/puppet)

[Andrew Bogott (Code Review)]

Andrew Bogott has uploaded a new change for review.

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

Change subject: This is going to cause /var/log to fill up if I let it run.
..

This is going to cause /var/log to fill up if I let it run.

Revert "Turn pdns loglevels WAY UP"

This reverts commit d9a1a07fda4cff93f6e98c5187e84d3250b07e42.

Change-Id: Ia388851fcddc2c28e2e694d78b4bd0249e79edfe
---
M modules/labs_dns/templates/pdns.conf.erb
1 file changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/54/269354/1

diff --git a/modules/labs_dns/templates/pdns.conf.erb 
b/modules/labs_dns/templates/pdns.conf.erb
index 71d09e4..2f18d35 100644
--- a/modules/labs_dns/templates/pdns.conf.erb
+++ b/modules/labs_dns/templates/pdns.conf.erb
@@ -28,9 +28,9 @@
 setuid=pdns
 
 # Logging
-logging-facility=9
+logging-facility=6
 loglevel=6
-query-logging=yes
+query-logging=no
 log-dns-details=no
 
 # Backends to load

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia388851fcddc2c28e2e694d78b4bd0249e79edfe
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott 

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

[MediaWiki-commits] [Gerrit] Don't require sources for multiverse - change (mediawiki/vagrant)

[LFaraone (Code Review)]

LFaraone has uploaded a new change for review.

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

Change subject: Don't require sources for multiverse
..

Don't require sources for multiverse

Change-Id: I40e23fa4f9001367798f3b34371300125ff68f92
---
M puppet/modules/apt/templates/multiverse.list.erb
1 file changed, 0 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant 
refs/changes/60/269360/1

diff --git a/puppet/modules/apt/templates/multiverse.list.erb 
b/puppet/modules/apt/templates/multiverse.list.erb
index 9e65e58..a383761 100644
--- a/puppet/modules/apt/templates/multiverse.list.erb
+++ b/puppet/modules/apt/templates/multiverse.list.erb
@@ -2,6 +2,4 @@
 # This file is managed by Puppet.
 #
 deb http://archive.ubuntu.com/ubuntu <%= scope['::lsbdistcodename'] %> 
multiverse
-deb-src http://archive.ubuntu.com/ubuntu <%= scope['::lsbdistcodename'] %> 
multiverse
 deb http://security.ubuntu.com/ubuntu <%= scope['::lsbdistcodename'] 
%>-security multiverse
-deb-src http://security.ubuntu.com/ubuntu <%= scope['::lsbdistcodename'] 
%>-security multiverse

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I40e23fa4f9001367798f3b34371300125ff68f92
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: LFaraone 

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

[MediaWiki-commits] [Gerrit] Rephrase notifications - change (mediawiki...ContentTranslation)

[jenkins-bot (Code Review)]

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

Change subject: Rephrase notifications
..


Rephrase notifications

Bug: T125680
Change-Id: I4b3a84f87ee5b736c453909f697e015982010e29
---
M i18n/en.json
M i18n/qqq.json
M includes/EchoNotificationPresentationModel.php
3 files changed, 28 insertions(+), 8 deletions(-)

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



diff --git a/i18n/en.json b/i18n/en.json
index 71b9287..a583f18 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -180,12 +180,14 @@
"cx-tools-missing-link-mark-link": "{{GENDER:|Mark}} as missing",
"echo-category-title-cx": "Translations",
"echo-pref-tooltip-cx": "Notify me about my translations created using 
Content Translation tool",
-   "cx-notification-first-translation": "Congratulations for your first 
translation! Find more pages to translate at [[Special:MyContributions|your 
contributions page]].",
+   "cx-notification-first-translation": "Congratulations on your first 
translation! Check your contributions and find more pages to translate.",
"cx-notification-first-translation-email-subject": "Congratulations for 
your first translation",
"cx-notification-tenth-translation": "Congratulations for your tenth 
translation! You are becoming an expert translator. Keep up the good work!",
"cx-notification-tenth-translation-email-subject": "Congratulations for 
your tenth translation",
"cx-notification-hundredth-translation": "You just made 100 
translations! That is a remarkable achievement. Share the word to other 
editors.",
"cx-notification-hundredth-translation-email-subject": "Congratulations 
for your one hundredth translation",
+   "cx-contributions-link": "Contributions",
+   "cx-your-translations-link": "{{GENDER:$1|Your translations}}",
"cx-translationlist-empty-title": "Nothing to translate?",
"cx-translationlist-empty-desc": "{{GENDER:|Start}} your translation 
now and continue it anytime.",
"cx-tools-link-internal-link": "Link to page",
diff --git a/i18n/qqq.json b/i18n/qqq.json
index 878747f..b6bb1c2 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -193,6 +193,8 @@
"cx-notification-hundredth-translation": "Echo notification 
congratulating the user for hundred published translation.",
"cx-notification-hundredth-translation-email-subject": "Email subject 
to congratulate the user for hundred published translation.",
"cx-translationlist-empty-title": "Title text shown when there is no 
translations by the current user",
+   "cx-contributions-link": "Text of the link to view your contributions",
+   "cx-your-translations-link": "Text of the link to view your 
translations. $1 is the name of the user viewing the notification, can be used 
for GENDER",
"cx-translationlist-empty-desc": "A brief description shown when there 
is no translation by current user",
"cx-tools-link-internal-link": "Label shown in link tool card. Prompts 
to enter an internal link. Please try to make translation short.",
"cx-tools-link-internal-link-placeholder": "Placeholder text for the 
input field to enter an internal link",
diff --git a/includes/EchoNotificationPresentationModel.php 
b/includes/EchoNotificationPresentationModel.php
index c076171..9ab4d18 100644
--- a/includes/EchoNotificationPresentationModel.php
+++ b/includes/EchoNotificationPresentationModel.php
@@ -2,6 +2,8 @@
 
 namespace ContentTranslation;
 
+use SpecialPage;
+
 /**
  * Class that returns structured data for the content translation echo events.
  * @see 
https://www.mediawiki.org/wiki/Echo_%28Notifications%29/New_formatter_system
@@ -13,15 +15,26 @@
}
 
public function getPrimaryLink() {
-   if ( $this->type === 'cx-suggestions-available' )  {
+   if ( $this->type === 'cx-first-translation' )  {
+   $user =  $this->getViewingUserForGender();
+   $title = SpecialPage::getTitleFor( 'MyContributions', 
$user );
return array(
-   'url' =>
-   \SpecialPage::getTitleFor( 
'ContentTranslation', false, 'suggestions' )->getCanonicalURL(),
+   'url' => $title->getCanonicalURL(),
+   'label' => $this->msg( 'cx-contributions-link' )
+   );
+   } elseif ( $this->type === 'cx-suggestions-available' )  {
+   $title = SpecialPage::getTitleFor( 
'ContentTranslation', false, 'suggestions' );
+   return array(
+   'url' => $title->getCanonicalURL(),
'label' => $this->msg( 'cx' )
);
+   } else {
+   $title = SpecialPage::getTitleFor( 

[MediaWiki-commits] [Gerrit] Add URL parameter for external surveys - change (mediawiki...QuickSurveys)

[jenkins-bot (Code Review)]

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

Change subject: Add URL parameter for external surveys
..


Add URL parameter for external surveys

Bug: T124511
Change-Id: Ib39422da8cbe7553fb3112ed88f2a6c453326d1e
---
M extension.json
M includes/ExternalSurvey.php
M includes/SurveyFactory.php
M resources/ext.quicksurveys.views/ExternalSurvey.js
M tests/browser/LocalSettings.php
5 files changed, 34 insertions(+), 5 deletions(-)

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



diff --git a/extension.json b/extension.json
index 0cbead6..5558026 100644
--- a/extension.json
+++ b/extension.json
@@ -39,6 +39,7 @@
"ext.quicksurveys.lib",
"oojs-ui",
"mediawiki.user",
+   "mediawiki.Uri",
"schema.QuickSurveysResponses"
],
"targets": [
@@ -167,6 +168,8 @@
"description": 
"ext-quicksurveys-example-external-survey-description",
"@link": "external link to the survey",
"link": 
"ext-quicksurveys-example-external-survey-link",
+   "@instanceTokenParameterName": "parameter to 
add to link",
+   "instanceTokenParameterName": "parameterName",
"@privacyPolicy": "The i18n key of the privacy 
policy text.",
"privacyPolicy": 
"ext-quicksurveys-example-external-survey-privacy-policy",
"@enabled": "whether the survey is enabled",
diff --git a/includes/ExternalSurvey.php b/includes/ExternalSurvey.php
index a26dcb1..cea52a5 100644
--- a/includes/ExternalSurvey.php
+++ b/includes/ExternalSurvey.php
@@ -19,6 +19,11 @@
private $link;
 
/**
+* @var string The name of the URL parameter filled with the instance 
token appended to $link.
+*/
+   private $instanceTokenParameterName;
+
+   /**
 * @var string The description of the privacy policy of the website 
that hosts the external survey.
 */
private $privacyPolicy;
@@ -31,18 +36,22 @@
$coverage,
$platforms,
$link,
+   $instanceTokenParameterName,
$privacyPolicy
) {
parent::__construct( $name, $question, $description, 
$isEnabled, $coverage, $platforms );
 
$this->name = $name;
$this->link = $link;
+   $this->instanceTokenParameterName = $instanceTokenParameterName;
$this->privacyPolicy = $privacyPolicy;
$this->isInsecure = !preg_match( '/https/i', wfMessage( 
$this->link )->plain() ) ? true : false;
}
 
public function getMessages() {
-   return array_merge( parent::getMessages(), array( 
$this->privacyPolicy, $this->link ) );
+   return array_merge(
+   parent::getMessages(), array( $this->privacyPolicy, 
$this->link )
+   );
}
 
public function toArray() {
@@ -50,6 +59,7 @@
'name' => $this->name,
'type' => 'external',
'link' => $this->link,
+   'instanceTokenParameterName' => 
$this->instanceTokenParameterName,
'isInsecure' => $this->isInsecure,
'privacyPolicy' => $this->privacyPolicy,
);
diff --git a/includes/SurveyFactory.php b/includes/SurveyFactory.php
index 4da6a96..f2bc9c8 100644
--- a/includes/SurveyFactory.php
+++ b/includes/SurveyFactory.php
@@ -116,6 +116,10 @@
);
}
 
+   if ( !isset( $spec['instanceTokenParameterName'] ) ) {
+   $spec['instanceTokenParameterName'] = "";
+   }
+
return new ExternalSurvey(
$spec['name'],
$spec['question'],
@@ -124,6 +128,7 @@
$spec['coverage'],
$spec['platforms'],
$spec['link'],
+   $spec['instanceTokenParameterName'],
$spec['privacyPolicy']
);
}
diff --git a/resources/ext.quicksurveys.views/ExternalSurvey.js 
b/resources/ext.quicksurveys.views/ExternalSurvey.js
index 2a0af0e..4f84a77 100644
--- a/resources/ext.quicksurveys.views/ExternalSurvey.js
+++ b/resources/ext.quicksurveys.views/ExternalSurvey.js
@@ -23,9 +23,20 @@
 */
renderButtons: function () {
var $btnContainer = this.initialPanel.$element.find( 
'.survey-button-container' ),
-   buttons = [
+  

[MediaWiki-commits] [Gerrit] Add URL parameter for external surveys - change (mediawiki...QuickSurveys)

[Bmansurov (Code Review)]

Bmansurov has uploaded a new change for review.

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

Change subject: Add URL parameter for external surveys
..

Add URL parameter for external surveys

Bug: T124511
Change-Id: Ib39422da8cbe7553fb3112ed88f2a6c453326d1e
---
M extension.json
M includes/ExternalSurvey.php
M includes/SurveyFactory.php
M resources/ext.quicksurveys.views/ExternalSurvey.js
M tests/browser/LocalSettings.php
5 files changed, 34 insertions(+), 5 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/QuickSurveys 
refs/changes/51/269351/1

diff --git a/extension.json b/extension.json
index 0cbead6..5558026 100644
--- a/extension.json
+++ b/extension.json
@@ -39,6 +39,7 @@
"ext.quicksurveys.lib",
"oojs-ui",
"mediawiki.user",
+   "mediawiki.Uri",
"schema.QuickSurveysResponses"
],
"targets": [
@@ -167,6 +168,8 @@
"description": 
"ext-quicksurveys-example-external-survey-description",
"@link": "external link to the survey",
"link": 
"ext-quicksurveys-example-external-survey-link",
+   "@instanceTokenParameterName": "parameter to 
add to link",
+   "instanceTokenParameterName": "parameterName",
"@privacyPolicy": "The i18n key of the privacy 
policy text.",
"privacyPolicy": 
"ext-quicksurveys-example-external-survey-privacy-policy",
"@enabled": "whether the survey is enabled",
diff --git a/includes/ExternalSurvey.php b/includes/ExternalSurvey.php
index a26dcb1..cea52a5 100644
--- a/includes/ExternalSurvey.php
+++ b/includes/ExternalSurvey.php
@@ -19,6 +19,11 @@
private $link;
 
/**
+* @var string The name of the URL parameter filled with the instance 
token appended to $link.
+*/
+   private $instanceTokenParameterName;
+
+   /**
 * @var string The description of the privacy policy of the website 
that hosts the external survey.
 */
private $privacyPolicy;
@@ -31,18 +36,22 @@
$coverage,
$platforms,
$link,
+   $instanceTokenParameterName,
$privacyPolicy
) {
parent::__construct( $name, $question, $description, 
$isEnabled, $coverage, $platforms );
 
$this->name = $name;
$this->link = $link;
+   $this->instanceTokenParameterName = $instanceTokenParameterName;
$this->privacyPolicy = $privacyPolicy;
$this->isInsecure = !preg_match( '/https/i', wfMessage( 
$this->link )->plain() ) ? true : false;
}
 
public function getMessages() {
-   return array_merge( parent::getMessages(), array( 
$this->privacyPolicy, $this->link ) );
+   return array_merge(
+   parent::getMessages(), array( $this->privacyPolicy, 
$this->link )
+   );
}
 
public function toArray() {
@@ -50,6 +59,7 @@
'name' => $this->name,
'type' => 'external',
'link' => $this->link,
+   'instanceTokenParameterName' => 
$this->instanceTokenParameterName,
'isInsecure' => $this->isInsecure,
'privacyPolicy' => $this->privacyPolicy,
);
diff --git a/includes/SurveyFactory.php b/includes/SurveyFactory.php
index 4da6a96..f2bc9c8 100644
--- a/includes/SurveyFactory.php
+++ b/includes/SurveyFactory.php
@@ -116,6 +116,10 @@
);
}
 
+   if ( !isset( $spec['instanceTokenParameterName'] ) ) {
+   $spec['instanceTokenParameterName'] = "";
+   }
+
return new ExternalSurvey(
$spec['name'],
$spec['question'],
@@ -124,6 +128,7 @@
$spec['coverage'],
$spec['platforms'],
$spec['link'],
+   $spec['instanceTokenParameterName'],
$spec['privacyPolicy']
);
}
diff --git a/resources/ext.quicksurveys.views/ExternalSurvey.js 
b/resources/ext.quicksurveys.views/ExternalSurvey.js
index 2a0af0e..4f84a77 100644
--- a/resources/ext.quicksurveys.views/ExternalSurvey.js
+++ b/resources/ext.quicksurveys.views/ExternalSurvey.js
@@ -23,9 +23,20 @@
 */
renderButtons: function () {
var $btnContainer = this.initialPanel.$element.find( 

[MediaWiki-commits] [Gerrit] Move ontology to http://wikiba.se/ontology# from beta - change (mediawiki...Wikibase)

[Smalyshev (Code Review)]

Smalyshev has uploaded a new change for review.

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

Change subject: Move ontology to http://wikiba.se/ontology# from beta
..

Move ontology to http://wikiba.se/ontology# from beta

Bug: T112127
Change-Id: Ia143c712105ca3ce57ffac1f5bf9b7f29b654562
---
M repo/includes/rdf/RdfVocabulary.php
M repo/tests/phpunit/data/maintenance/dumpRdf-out.txt
M repo/tests/phpunit/data/rdf/FullStatementRdfBuilder/Q4_all.nt
M repo/tests/phpunit/data/rdf/FullStatementRdfBuilder/Q4_minimal.nt
M repo/tests/phpunit/data/rdf/FullStatementRdfBuilder/Q4_statements.nt
M repo/tests/phpunit/data/rdf/FullStatementRdfBuilder/Q4_values.nt
M repo/tests/phpunit/data/rdf/FullStatementRdfBuilder/Q6_no_qualifiers.nt
M repo/tests/phpunit/data/rdf/FullStatementRdfBuilder/Q6_with_qualifiers.nt
M repo/tests/phpunit/data/rdf/FullStatementRdfBuilder/Q7_all_refs_seen.nt
M repo/tests/phpunit/data/rdf/FullStatementRdfBuilder/Q7_no_refs.nt
M repo/tests/phpunit/data/rdf/FullStatementRdfBuilder/Q7_refs.nt
M repo/tests/phpunit/data/rdf/RdfBuilder/Q10_redirect.nt
M repo/tests/phpunit/data/rdf/RdfBuilder/Q1_info.nt
M repo/tests/phpunit/data/rdf/RdfBuilder/Q1_simple.nt
M repo/tests/phpunit/data/rdf/RdfBuilder/Q2_labels.nt
M repo/tests/phpunit/data/rdf/RdfBuilder/Q3_links.nt
M repo/tests/phpunit/data/rdf/RdfBuilder/Q3_sitelinks.nt
M repo/tests/phpunit/data/rdf/RdfBuilder/Q4_all_statements.nt
M repo/tests/phpunit/data/rdf/RdfBuilder/Q4_claims.nt
M repo/tests/phpunit/data/rdf/RdfBuilder/Q4_props.nt
M repo/tests/phpunit/data/rdf/RdfBuilder/Q4_resolved.nt
M repo/tests/phpunit/data/rdf/RdfBuilder/Q4_truthy_statements.nt
M repo/tests/phpunit/data/rdf/RdfBuilder/Q4_values.nt
M repo/tests/phpunit/data/rdf/RdfBuilder/Q5_badges.nt
M repo/tests/phpunit/data/rdf/RdfBuilder/Q6_no_qualifiers.nt
M repo/tests/phpunit/data/rdf/RdfBuilder/Q6_qualifiers.nt
M repo/tests/phpunit/data/rdf/RdfBuilder/Q6_with_qualifiers.nt
M repo/tests/phpunit/data/rdf/RdfBuilder/Q7_Q9_dedup.nt
M repo/tests/phpunit/data/rdf/RdfBuilder/Q7_no_refs.nt
M repo/tests/phpunit/data/rdf/RdfBuilder/Q7_references.nt
M repo/tests/phpunit/data/rdf/RdfBuilder/Q7_refs.nt
M repo/tests/phpunit/data/rdf/RdfBuilder/Q8_baddates.nt
M repo/tests/phpunit/data/rdf/RdfBuilder/dumpheader.nt
M repo/tests/phpunit/data/rdf/RdfDumpGenerator/empty.nt
M repo/tests/phpunit/data/rdf/RdfDumpGenerator/entities.nt
M repo/tests/phpunit/data/rdf/RdfDumpGenerator/redirect.nt
M repo/tests/phpunit/data/rdf/RdfDumpGenerator/refs.nt
37 files changed, 788 insertions(+), 789 deletions(-)


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


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia143c712105ca3ce57ffac1f5bf9b7f29b654562
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Smalyshev 

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

[MediaWiki-commits] [Gerrit] Get integration/config out of the 'mediawiki' queue - change (integration/config)

[jenkins-bot (Code Review)]

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

Change subject: Get integration/config out of the 'mediawiki' queue
..


Get integration/config out of the 'mediawiki' queue

Bug: T126298
Change-Id: I4d1b173c9c7acd1b663465127fc209cd49ffa3ee
---
M jjb/integration.yaml
M zuul/layout.yaml
2 files changed, 8 insertions(+), 3 deletions(-)

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



diff --git a/jjb/integration.yaml b/jjb/integration.yaml
index 1c47c42..a29cece 100644
--- a/jjb/integration.yaml
+++ b/jjb/integration.yaml
@@ -136,7 +136,10 @@
  - 'integration-zuul-layoutvalidation-gate'
  - '{name}-puppet-validate'
  - '{name}-tox-{toxenv}-jessie':
- toxenv: dib
+ toxenv:
+- dib
+- flake8
+- py27
 
 - project:
 name: 'integration-docroot'
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 58d1596..55727c4 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -1463,14 +1463,16 @@
 check:
   - noop
 test:
-  - tox-jessie
+  - integration-config-tox-flake8-jessie
+  - integration-config-tox-py27-jessie
   - integration-config-puppet-validate
   - integration-config-tox-dib-jessie
   - integration-jjb-config-diff
   - integration-zuul-layoutdiff
   - integration-zuul-layoutvalidation
 gate-and-submit:
-  - tox-jessie
+  - integration-config-tox-flake8-jessie
+  - integration-config-tox-py27-jessie
   - integration-config-puppet-validate
   - integration-config-tox-dib-jessie
   - integration-jjb-config-diff

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I4d1b173c9c7acd1b663465127fc209cd49ffa3ee
Gerrit-PatchSet: 3
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Legoktm 
Gerrit-Reviewer: Hashar 
Gerrit-Reviewer: JanZerebecki 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: jenkins-bot <>

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