date:20140430

[MediaWiki-commits] [Gerrit] Zero ext update - change (mediawiki/core)

2014-04-30 Thread Yurik (Code Review)

Yurik has submitted this change and it was merged.

Change subject: Zero ext update
..


Zero ext update

Change-Id: Ic9d61a64ea9bdf1c1af5d689fc78f40a638d399a
---
M extensions/ZeroRatedMobileAccess
1 file changed, 0 insertions(+), 0 deletions(-)

Approvals:
  Yurik: Looks good to me, approved



diff --git a/extensions/ZeroRatedMobileAccess b/extensions/ZeroRatedMobileAccess
index f90aa7a..c84f8ae 16
--- a/extensions/ZeroRatedMobileAccess
+++ b/extensions/ZeroRatedMobileAccess
-Subproject commit f90aa7a34be80ccb138f545d94951ee7ebcc9a69
+Subproject commit c84f8ae1d76fe0db7762f7414d6b135646f28b76

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic9d61a64ea9bdf1c1af5d689fc78f40a638d399a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.24wmf2
Gerrit-Owner: Yurik 
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] Fix provision from scratch - change (operations...wikimetrics)

2014-04-30 Thread Ottomata (Code Review)

Ottomata has submitted this change and it was merged.

Change subject: Fix provision from scratch
..


Fix provision from scratch

When provisioning a vm with an existing wikimetrics setup, everything
was fine, but errors are evident if you try to provision starting at
nothing.  This change fixes those errors.

Change-Id: I6c9346fdb02255cfdb8a5088d15ffcfe57b20881
---
M manifests/database.pp
1 file changed, 15 insertions(+), 13 deletions(-)

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



diff --git a/manifests/database.pp b/manifests/database.pp
index 878a016..b4f2e86 100644
--- a/manifests/database.pp
+++ b/manifests/database.pp
@@ -45,7 +45,7 @@
 exec { 'wikimetrics_mysql_create_user':
 command => "/usr/bin/mysql ${username_option} ${password_option} -e \"
 CREATE USER '${db_user}'@'localhost' IDENTIFIED BY '${db_pass}';
-CREATE USER '${db_user}'@'127.0.0.1' IDENTIFIED BY '${db_pass}';",
+CREATE USER '${db_user}'@'127.0.0.1' IDENTIFIED BY '${db_pass}';\"",
 unless  => "/usr/bin/mysql ${username_option} ${password_option} -e \"
 SELECT user FROM mysql.user;\" | grep -q \"${db_user}\"",
 user=> 'root',
@@ -66,6 +66,19 @@
 db_root_user => $db_root_user,
 db_root_pass => $db_root_pass,
 }
+
+# If we are running in debug mode, then
+# go ahead and create the test databases
+if $::wikimetrics::debug {
+wikimetrics::database::create { $db_names_testing:
+db_user  => $db_user,
+db_pass  => $db_pass,
+db_root_user => $db_root_user,
+db_root_pass => $db_root_pass,
+before   => Exec['alembic_upgrade_head']
+}
+}
+
 # In wikimetrics.pp we are installing all deps wia pip
 # should be safe to assume alembic is installed
 # this would run only if alembic is not setup
@@ -79,16 +92,5 @@
 Wikimetrics::Database::Create[$db_name_wikimetrics],
 Exec['wikimetrics_mysql_create_user']
 ],
- }
-
- # If we are running in debug mode, then
- # go ahead and create the test databases
- if $::wikimetrics::debug {
- wikimetrics::database::create { $db_names_testing:
- db_user  => $db_user,
- db_pass  => $db_pass,
- db_root_user => $db_root_user,
- db_root_pass => $db_root_pass,
- }
- }
+}
  }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I6c9346fdb02255cfdb8a5088d15ffcfe57b20881
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet/wikimetrics
Gerrit-Branch: master
Gerrit-Owner: Milimetric 
Gerrit-Reviewer: Milimetric 
Gerrit-Reviewer: Ottomata 

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

[MediaWiki-commits] [Gerrit] otrs: fix allowed smtp address - change (operations/puppet)

2014-04-30 Thread Jgreen (Code Review)

Jgreen has submitted this change and it was merged.

Change subject: otrs: fix allowed smtp address
..


otrs: fix allowed smtp address

Change-Id: If3d59a884bc20ec0afc95b736e2b5710af9a8e98
---
M manifests/role/otrs.pp
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/manifests/role/otrs.pp b/manifests/role/otrs.pp
index fd8cfb3..054f275 100644
--- a/manifests/role/otrs.pp
+++ b/manifests/role/otrs.pp
@@ -23,7 +23,7 @@
 ferm::service { 'otrs_smtp':
 proto  => 'tcp',
 port   => '25',
-srange => '($INTERNAL)',
+srange => '($EXTERNAL_NETWORKS)',
 }
 
 generic::systemuser { 'otrs':

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

Gerrit-MessageType: merged
Gerrit-Change-Id: If3d59a884bc20ec0afc95b736e2b5710af9a8e98
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Matanya 
Gerrit-Reviewer: Jgreen 
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 append -plugin to the zip - change (search/repository-swift)

2014-04-30 Thread Chad (Code Review)

Chad has submitted this change and it was merged.

Change subject: Don't append -plugin to the zip
..


Don't append -plugin to the zip

Change-Id: Id13e33dd571e42bd6e56f8ede65ab01310c8e780
---
M pom.xml
1 file changed, 1 insertion(+), 0 deletions(-)

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



diff --git a/pom.xml b/pom.xml
index 5aca6cc..84fcf9a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -89,6 +89,7 @@
 maven-assembly-plugin
 2.3
 
+false
 
${project.build.directory}/releases/
 
 
${basedir}/src/main/assemblies/plugin.xml

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Id13e33dd571e42bd6e56f8ede65ab01310c8e780
Gerrit-PatchSet: 1
Gerrit-Project: search/repository-swift
Gerrit-Branch: master
Gerrit-Owner: Manybubbles 
Gerrit-Reviewer: Chad 

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

[MediaWiki-commits] [Gerrit] Made DB errors go to the exception log again - change (mediawiki/core)

2014-04-30 Thread jenkins-bot (Code Review)

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

Change subject: Made DB errors go to the exception log again
..


Made DB errors go to the exception log again

* Some DB errors are caught while others bubble up to users.
  It is useful to log the latter separately and it also provides
  more context. The exception logs have a backtrace where as the
  regular DB logs do not.

Change-Id: I7ef7693d96e0258119f714e678099e4813ca0c94
---
M includes/db/DatabaseError.php
1 file changed, 0 insertions(+), 8 deletions(-)

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



diff --git a/includes/db/DatabaseError.php b/includes/db/DatabaseError.php
index 3bcf638..4d5c3dc 100644
--- a/includes/db/DatabaseError.php
+++ b/includes/db/DatabaseError.php
@@ -348,14 +348,6 @@
}
 
/**
-* @return bool
-*/
-   function isLoggable() {
-   // Don't send to the exception log, already in dberror log
-   return false;
-   }
-
-   /**
 * @return string
 */
function getPageTitle() {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I7ef7693d96e0258119f714e678099e4813ca0c94
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz 
Gerrit-Reviewer: Chad 
Gerrit-Reviewer: Ori.livneh 
Gerrit-Reviewer: Parent5446 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] phpsh: 1.3.4 -> 1.3.5 - change (mediawiki/vagrant)

2014-04-30 Thread Ori.livneh (Code Review)

Ori.livneh has uploaded a new change for review.

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

Change subject: phpsh: 1.3.4 -> 1.3.5
..

phpsh: 1.3.4 -> 1.3.5

* d8ba6e34ea: Don't crash if 'HOME' is unset in env. Bump version to 1.3.5.
  Fixes .

Change-Id: I851ef5da0398f7d354d49eb24d6d16c77e4d9210
---
M puppet/modules/mediawiki/manifests/phpsh.pp
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant 
refs/changes/32/130632/1

diff --git a/puppet/modules/mediawiki/manifests/phpsh.pp 
b/puppet/modules/mediawiki/manifests/phpsh.pp
index 1c1c2ea..bfa07bc 100644
--- a/puppet/modules/mediawiki/manifests/phpsh.pp
+++ b/puppet/modules/mediawiki/manifests/phpsh.pp
@@ -8,7 +8,7 @@
 include php
 
 package { 'phpsh':
-ensure   => '1.3.4',
+ensure   => '1.3.5',
 provider => pip,
 require  => Package['php5'],
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I851ef5da0398f7d354d49eb24d6d16c77e4d9210
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: Ori.livneh 

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

[MediaWiki-commits] [Gerrit] Removed commented-out migrateThumbFile() code - change (mediawiki/core)

2014-04-30 Thread jenkins-bot (Code Review)

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

Change subject: Removed commented-out migrateThumbFile() code
..


Removed commented-out migrateThumbFile() code

Change-Id: Ic52d3a8d93808b365c3f06fef9e51d65efcd1d57
---
M includes/filerepo/file/File.php
M includes/filerepo/file/LocalFile.php
2 files changed, 0 insertions(+), 37 deletions(-)

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



diff --git a/includes/filerepo/file/File.php b/includes/filerepo/file/File.php
index 84daa80..a9af1e8 100644
--- a/includes/filerepo/file/File.php
+++ b/includes/filerepo/file/File.php
@@ -989,8 +989,6 @@
$thumb = $handler->getTransform( $this, 
$thumbPath, $thumbUrl, $params );
break;
}
-   // Clean up broken thumbnails as needed
-   $this->migrateThumbFile( $thumbName );
// Check if an up-to-date thumbnail already 
exists...
wfDebug( __METHOD__ . ": Doing stat for 
$thumbPath\n" );
if ( !( $flags & self::RENDER_FORCE ) && 
$this->repo->fileExists( $thumbPath ) ) {
diff --git a/includes/filerepo/file/LocalFile.php 
b/includes/filerepo/file/LocalFile.php
index 5bc7b5e..9b9f0a9 100644
--- a/includes/filerepo/file/LocalFile.php
+++ b/includes/filerepo/file/LocalFile.php
@@ -822,41 +822,6 @@
/** createThumb inherited */
/** transform inherited */
 
-   /**
-* Fix thumbnail files from 1.4 or before, with extreme prejudice
-* @todo Do we still care about this? Perhaps a maintenance script
-*   can be made instead. Enabling this code results in a serious
-*   RTT regression for wikis without 404 handling.
-*
-* @param string $thumbName
-*/
-   function migrateThumbFile( $thumbName ) {
-   /* Old code for bug 2532
-   $thumbDir = $this->getThumbPath();
-   $thumbPath = "$thumbDir/$thumbName";
-   if ( is_dir( $thumbPath ) ) {
-   // Directory where file should be
-   // This happened occasionally due to broken migration 
code in 1.5
-   // Rename to broken-*
-   for ( $i = 0; $i < 100; $i++ ) {
-   $broken = $this->repo->getZonePath( 'public' ) 
. "/broken-$i-$thumbName";
-   if ( !file_exists( $broken ) ) {
-   rename( $thumbPath, $broken );
-   break;
-   }
-   }
-   // Doesn't exist anymore
-   clearstatcache();
-   }
-   */
-   /*
-   if ( $this->repo->fileExists( $thumbDir ) ) {
-   // Delete file where directory should be
-   $this->repo->cleanupBatch( array( $thumbDir ) );
-   }
-   */
-   }
-
/** getHandler inherited */
/** iconThumb inherited */
/** getLastError inherited */

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic52d3a8d93808b365c3f06fef9e51d65efcd1d57
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz 
Gerrit-Reviewer: Chad 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] phpsh: 1.3.4 -> 1.3.5 - change (mediawiki/vagrant)

2014-04-30 Thread jenkins-bot (Code Review)

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

Change subject: phpsh: 1.3.4 -> 1.3.5
..


phpsh: 1.3.4 -> 1.3.5

* d8ba6e34ea: Don't crash if 'HOME' is unset in env. Bump version to 1.3.5.
  Fixes .

Change-Id: I851ef5da0398f7d354d49eb24d6d16c77e4d9210
---
M puppet/modules/mediawiki/manifests/phpsh.pp
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Ori.livneh: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/puppet/modules/mediawiki/manifests/phpsh.pp 
b/puppet/modules/mediawiki/manifests/phpsh.pp
index 1c1c2ea..bfa07bc 100644
--- a/puppet/modules/mediawiki/manifests/phpsh.pp
+++ b/puppet/modules/mediawiki/manifests/phpsh.pp
@@ -8,7 +8,7 @@
 include php
 
 package { 'phpsh':
-ensure   => '1.3.4',
+ensure   => '1.3.5',
 provider => pip,
 require  => Package['php5'],
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I851ef5da0398f7d354d49eb24d6d16c77e4d9210
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: Ori.livneh 
Gerrit-Reviewer: Ori.livneh 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Rename mholmquist to marktraceur and sync UID with labs - change (operations/puppet)

2014-04-30 Thread Andrew Bogott (Code Review)

Andrew Bogott has uploaded a new change for review.

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

Change subject: Rename mholmquist to marktraceur and sync UID with labs
..

Rename mholmquist to marktraceur and sync UID with labs

Change-Id: I0e69a80bad84eda35ac44914ef8fae580e659502
---
M manifests/admins.pp
M manifests/site.pp
2 files changed, 8 insertions(+), 8 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/33/130633/1

diff --git a/manifests/admins.pp b/manifests/admins.pp
index cc2dc96..b3cf6bf 100644
--- a/manifests/admins.pp
+++ b/manifests/admins.pp
@@ -1050,10 +1050,10 @@
 }
 }
 
-class mholmquist inherits baseaccount {
-$username = 'mholmquist'
+class marktraceur  inherits baseaccount {
+$username = 'marktraceur'
 $realname = 'Mark Holmquist'
-$uid  = '626'
+$uid  = '2165'
 $gid  = '500'
 
 unixaccount { $realname: username => $username, uid => $uid, gid => 
$gid, enabled => $enabled }
@@ -3788,7 +3788,7 @@
 include accounts::manybubbles # promoted per RT 5691
 include accounts::maxsem
 include accounts::mflaschen
-include accounts::mholmquist
+include accounts::marktraceur
 include accounts::mhoover # access revoked
 include accounts::milimetric # promoted per RT 5982
 include accounts::mlitn
@@ -3872,7 +3872,7 @@
 include accounts::dsc #account disabled
 include accounts::hashar
 include accounts::krinkle
-include accounts::mholmquist
+include accounts::marktraceur
 include accounts::reedy
 }
 
diff --git a/manifests/site.pp b/manifests/site.pp
index 72b9352..38cdea6 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -997,7 +997,7 @@
 node 'gallium.wikimedia.org' {
 $cluster = 'misc'
 $gid= '500'
-sudo_user { [ 'bd808', 'demon', 'krinkle', 'reedy', 'mholmquist' ]:
+sudo_user { [ 'bd808', 'demon', 'krinkle', 'reedy', 'marktraceur' ]:
 privileges => [
 'ALL = (jenkins) NOPASSWD: ALL',
 'ALL = (jenkins-slave) NOPASSWD: ALL',
@@ -1328,7 +1328,7 @@
 
 # Used as a Jenkins slave so some folks need escalated privileges
 $gid= '500'
-sudo_user { [ 'bd808', 'demon', 'krinkle', 'reedy', 'mholmquist' ]:
+sudo_user { [ 'bd808', 'demon', 'krinkle', 'reedy', 'marktraceur' ]:
 privileges => [
 'ALL = (jenkins-slave) NOPASSWD: ALL',
 'ALL = (gerritslave) NOPASSWD: ALL',
@@ -2309,7 +2309,7 @@
 include accounts::jforrester   # RT 5302
 include accounts::qchris   # RT 5474
 include accounts::tnegrin  # RT 5391
-include accounts::mholmquist   # RT 6009
+include accounts::marktraceur   # RT 6009
 include accounts::msyed# RT 6506
 include accounts::nuria# RT 6525
 include accounts::csalvia  # RT 6664

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I0e69a80bad84eda35ac44914ef8fae580e659502
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] Rename mholmquist to marktraceur and sync UID with labs - change (operations/puppet)

2014-04-30 Thread Andrew Bogott (Code Review)

Andrew Bogott has submitted this change and it was merged.

Change subject: Rename mholmquist to marktraceur and sync UID with labs
..


Rename mholmquist to marktraceur and sync UID with labs

Change-Id: I0e69a80bad84eda35ac44914ef8fae580e659502
---
M manifests/admins.pp
M manifests/site.pp
2 files changed, 8 insertions(+), 8 deletions(-)

Approvals:
  Andrew Bogott: Looks good to me, approved
  MarkTraceur: Looks good to me, but someone else must approve
  jenkins-bot: Verified



diff --git a/manifests/admins.pp b/manifests/admins.pp
index cc2dc96..b3cf6bf 100644
--- a/manifests/admins.pp
+++ b/manifests/admins.pp
@@ -1050,10 +1050,10 @@
 }
 }
 
-class mholmquist inherits baseaccount {
-$username = 'mholmquist'
+class marktraceur  inherits baseaccount {
+$username = 'marktraceur'
 $realname = 'Mark Holmquist'
-$uid  = '626'
+$uid  = '2165'
 $gid  = '500'
 
 unixaccount { $realname: username => $username, uid => $uid, gid => 
$gid, enabled => $enabled }
@@ -3788,7 +3788,7 @@
 include accounts::manybubbles # promoted per RT 5691
 include accounts::maxsem
 include accounts::mflaschen
-include accounts::mholmquist
+include accounts::marktraceur
 include accounts::mhoover # access revoked
 include accounts::milimetric # promoted per RT 5982
 include accounts::mlitn
@@ -3872,7 +3872,7 @@
 include accounts::dsc #account disabled
 include accounts::hashar
 include accounts::krinkle
-include accounts::mholmquist
+include accounts::marktraceur
 include accounts::reedy
 }
 
diff --git a/manifests/site.pp b/manifests/site.pp
index 72b9352..38cdea6 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -997,7 +997,7 @@
 node 'gallium.wikimedia.org' {
 $cluster = 'misc'
 $gid= '500'
-sudo_user { [ 'bd808', 'demon', 'krinkle', 'reedy', 'mholmquist' ]:
+sudo_user { [ 'bd808', 'demon', 'krinkle', 'reedy', 'marktraceur' ]:
 privileges => [
 'ALL = (jenkins) NOPASSWD: ALL',
 'ALL = (jenkins-slave) NOPASSWD: ALL',
@@ -1328,7 +1328,7 @@
 
 # Used as a Jenkins slave so some folks need escalated privileges
 $gid= '500'
-sudo_user { [ 'bd808', 'demon', 'krinkle', 'reedy', 'mholmquist' ]:
+sudo_user { [ 'bd808', 'demon', 'krinkle', 'reedy', 'marktraceur' ]:
 privileges => [
 'ALL = (jenkins-slave) NOPASSWD: ALL',
 'ALL = (gerritslave) NOPASSWD: ALL',
@@ -2309,7 +2309,7 @@
 include accounts::jforrester   # RT 5302
 include accounts::qchris   # RT 5474
 include accounts::tnegrin  # RT 5391
-include accounts::mholmquist   # RT 6009
+include accounts::marktraceur   # RT 6009
 include accounts::msyed# RT 6506
 include accounts::nuria# RT 6525
 include accounts::csalvia  # RT 6664

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I0e69a80bad84eda35ac44914ef8fae580e659502
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott 
Gerrit-Reviewer: Andrew Bogott 
Gerrit-Reviewer: MarkTraceur 
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 whole subnets in squid.php list for XFF acceptance - change (operations/mediawiki-config)

2014-04-30 Thread BBlack (Code Review)

BBlack has uploaded a new change for review.

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

Change subject: Use whole subnets in squid.php list for XFF acceptance
..

Use whole subnets in squid.php list for XFF acceptance

These new CIDR specs should cover all the infrastructure
subnets where we place Varnish and/or SSL proxies.  They
definitely cover all of the individual IPs being replaced
in this patch (and then some to save future pain).

The reason we don't use an even smaller list with broader
netmasks is that we *do* want to exclude things like networks
that contain labs hosts, etc.

Also, the entries for "singer" and ssl[1-4] were
removed, as these appear to not exist anymore.

Change-Id: I5a2d86ef060b5b95412dbf42f8f955f3834aad8e
---
M wmf-config/squid.php
1 file changed, 29 insertions(+), 231 deletions(-)


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

diff --git a/wmf-config/squid.php b/wmf-config/squid.php
index 1319f5a..a777232 100644
--- a/wmf-config/squid.php
+++ b/wmf-config/squid.php
@@ -5,240 +5,38 @@
 
 # Accept XFF from these proxies
 $wgSquidServersNoPurge = array(
-   '208.80.152.162',   # singer (secure)
+   # Note: the general idea here is to cover infrastructure space
+   # where e.g. Varnish and SSL servers could be located, but exclude
+   # other misc subnets (e.g. labs, analytics).
 
-   # Text
-   # eqiad
-   '10.64.0.123',  # cp1001, API
-   '10.64.0.124',  # cp1002, API
-   '10.64.0.125',  # cp1003, API
-   '10.64.0.126',  # cp1004, API
-   '10.64.0.127',  # cp1005, API
-   '10.64.0.128',  # cp1006
-   '10.64.0.129',  # cp1007
-   '10.64.0.130',  # cp1008
-   '10.64.0.131',  # cp1009
-   '10.64.0.132',  # cp1010
-   '10.64.0.133',  # cp1011
-   '10.64.0.134',  # cp1012
-   '10.64.0.135',  # cp1013
-   '10.64.0.136',  # cp1014
-   '10.64.0.137',  # cp1015
-   '10.64.0.138',  # cp1016
-   '10.64.0.139',  # cp1017
-   '10.64.0.140',  # cp1018
-   '10.64.0.141',  # cp1019
-   '10.64.0.142',  # cp1020
+   ## eqiad
+   '208.80.154.0/26',  # public1-a-eqiad
+   '2620:0:861:1::/64',# public1-a-eqiad
+   '208.80.154.128/26',# public1-b-eqiad
+   '2620:0:861:2::/64',# public1-b-eqiad
+   '208.80.154.64/26', # public1-c-eqiad
+   '2620:0:861:3::/64',# public1-c-eqiad
+   '208.80.155.96/27', # public1-d-eqiad
+   '2620:0:861:4::/64',# public1-d-eqiad
+   '10.64.0.0/22', # private1-a-eqiad
+   '2620:0:861:101::/64',  # private1-a-eqiad
+   '10.64.16.0/22',# private1-b-eqiad
+   '2620:0:861:102::/64',  # private1-b-eqiad
+   '10.64.32.0/22',# private1-c-eqiad
+   '2620:0:861:103::/64',  # private1-c-eqiad
+   '10.64.48.0/22',# private1-d-eqiad
+   '2620:0:861:107::/64',  # private1-d-eqiad
 
-   '10.64.0.159',  # cp1037, Varnish
-   '10.64.0.160',  # cp1038, Varnish
-   '10.64.0.161',  # cp1039, Varnish
-   '10.64.0.162',  # cp1040, Varnish
+   ## esams
+   '91.198.174.0/25',  # public1-esams
+   '2620:0:862:1::/64',# public1-esams
+   '10.20.0.0/24', # private1-esams
+   '2620:0:862:102::/64',  # private1-esams
 
-   '10.64.32.104', # cp1052, Varnish
-   '10.64.32.105', # cp1053, Varnish
-   '10.64.32.106', # cp1054, Varnish
-   '10.64.32.107', # cp1055, Varnish
-   '10.64.0.102',  # cp1065, Varnish
-   '10.64.0.103',  # cp1066, Varnish
-   '10.64.0.104',  # cp1067, Varnish
-   '10.64.0.105',  # cp1068, Varnish
-
-   # esams
-   '91.198.174.41',# amssq31
-   '91.198.174.42',# amssq32
-   '91.198.174.43',# amssq33
-   '91.198.174.44',# amssq34
-   '91.198.174.45',# amssq35
-   '91.198.174.46',# amssq36
-   '91.198.174.47',# amssq37
-   '91.198.174.48',# amssq38
-   '91.198.174.49',# amssq39
-   '91.198.174.50',# amssq40
-   '91.198.174.51',# amssq41
-   '91.198.174.52',# amssq42
-   '91.198.174.53',# amssq43
-   '91.198.174.54',# amssq44
-   '91.198.174.55',# amssq45
-   '91.198.174.56',# amssq46
-
-   '91.198.174.57',# amssq47
-   '2620:0:862:1:A6BA:DBFF:FE30:CFB3',
-
-   '91.198.174.58',# amssq48
-   '2620:0:862:1:A6BA:DBFF:FE38:FFDA',
-
-   '91.198.174.59',# amssq49
-   '2620:0:862:1:A6BA:DBFF:FE38:FAE1',
-
-   '91.198.174.60',# amssq50
-   '2620:0:862:1:A6BA:DBFF:FE38:DB56',
-
-   '91.198.174.61',# amssq51
-   '2620:0:862:1:A6BA:DBFF:FE38:D75F',
-
-   '91.198.174.62',# amssq52
-   '2620:0:862:1:A6BA:DBFF:FE38:DBC0',
-
-   '91.198.174.63',# amssq53
-

[MediaWiki-commits] [Gerrit] Fix formatting of TimeValues with month or day = '00' in tim... - change (mediawiki...Wikibase)

2014-04-30 Thread jenkins-bot (Code Review)

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

Change subject: Fix formatting of TimeValues with month or day = '00' in 
timestamp
..


Fix formatting of TimeValues with month or day = '00' in timestamp

These timestamps are considered valid, but there is an issue
in the way DateTime handles them. In formatting, timestamps a
DateTime object gets constructed in order to localise dates.

DateTime mishandles such timestamps and we need to 'normalise'
and adjust for this.

Bug: 64659
Change-Id: I8c455b02508d23e5086eff4afb4672354c44f4ac
---
M lib/includes/formatters/MwTimeIsoFormatter.php
M lib/tests/phpunit/formatters/MwTimeIsoFormatterTest.php
2 files changed, 42 insertions(+), 0 deletions(-)

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



diff --git a/lib/includes/formatters/MwTimeIsoFormatter.php 
b/lib/includes/formatters/MwTimeIsoFormatter.php
index 8524943..43694ec 100644
--- a/lib/includes/formatters/MwTimeIsoFormatter.php
+++ b/lib/includes/formatters/MwTimeIsoFormatter.php
@@ -79,7 +79,12 @@
STR_PAD_LEFT
);
 
+   if ( $precision <= TimeValue::PRECISION_YEAR ) {
+   $fourDigitYearTimestamp = 
$this->normaliseMwTimestampInput( $fourDigitYearTimestamp );
+   }
+
$timestamp = wfTimestamp( TS_MW, $fourDigitYearTimestamp );
+
$localisedDate = $this->language->sprintfDate(
$this->getDateFormat( $precision ),
$timestamp
@@ -104,6 +109,31 @@
}
 
/**
+* Normalize so that MWTimestamp, which does new DateTime( $timestamp ),
+* can handle timestamp strings with '00' for month and/or '00' for day.
+* We 'round' it to '01' and '01' for formatting purposes.
+*
+* Without this, '+0001995-00-00T00:00:00Z' gets becomes 
'1994-11-30 00:00:00'
+* in the DateTime object.  Then '1994' != '1995' comparison in 
$this->canFormatYear()
+* fails and a timestamp is returned on failure. (see bug: 64659)
+*
+* @param string $fourDigitYearTimestamp
+*
+* @return string
+*/
+   private function normaliseMwTimestampInput( $fourDigitYearTimestamp ) {
+   if ( substr( $fourDigitYearTimestamp, 5, 2 ) === '00' ) {
+   $fourDigitYearTimestamp = substr_replace( 
$fourDigitYearTimestamp, '01', 5, 2 );
+   }
+
+   if ( substr( $fourDigitYearTimestamp, 8, 2 ) === '00' ) {
+   $fourDigitYearTimestamp = substr_replace( 
$fourDigitYearTimestamp, '01', 8, 2 );
+   }
+
+   return $fourDigitYearTimestamp;
+   }
+
+   /**
 * @param string $date
 *
 * @return string
diff --git a/lib/tests/phpunit/formatters/MwTimeIsoFormatterTest.php 
b/lib/tests/phpunit/formatters/MwTimeIsoFormatterTest.php
index 6f3b403..7227e51 100644
--- a/lib/tests/phpunit/formatters/MwTimeIsoFormatterTest.php
+++ b/lib/tests/phpunit/formatters/MwTimeIsoFormatterTest.php
@@ -72,6 +72,18 @@
'+0002013-07-16T00:00:00Z',
TimeValue::PRECISION_YEAR,
),
+   '1995' => array(
+   '+0001995-00-00T00:00:00Z',
+   TimeValue::PRECISION_YEAR,
+   ),
+   '1996' => array(
+   '+0001996-01-00T00:00:00Z',
+   TimeValue::PRECISION_YEAR,
+   ),
+   '1997' => array(
+   '+0001997-00-01T00:00:00Z',
+   TimeValue::PRECISION_YEAR,
+   ),
'13' => array(
'+013-07-16T00:00:00Z',
TimeValue::PRECISION_YEAR,

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I8c455b02508d23e5086eff4afb4672354c44f4ac
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Aude 
Gerrit-Reviewer: Addshore 
Gerrit-Reviewer: Aude 
Gerrit-Reviewer: Daniel Kinzler 
Gerrit-Reviewer: Thiemo Mättig (WMDE) 
Gerrit-Reviewer: Tobias Gritschacher 
Gerrit-Reviewer: WikidataJenkins 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Fix remoteExtPath to Parsoid module - change (mediawiki...Parsoid)

2014-04-30 Thread jenkins-bot (Code Review)

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

Change subject: Fix remoteExtPath to Parsoid module
..


Fix remoteExtPath to Parsoid module

The remoteExtPath should be 'Parsoid/php/modules', causes 404 in 
ResourceLoader ?debug=1 mode.

Bug: 51245
Change-Id: I411b97050fef7dc7d934b35e8ed9065226b30747
---
M php/Parsoid.php
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/php/Parsoid.php b/php/Parsoid.php
index 6a02727..c087dcc 100644
--- a/php/Parsoid.php
+++ b/php/Parsoid.php
@@ -60,7 +60,7 @@
$wgResourceModules += array(
'ext.parsoid.styles' => array(
'localBasePath' => __DIR__ . '/modules',
-   'remoteExtPath' => 'Parsoid/modules',
+   'remoteExtPath' => 'Parsoid/php/modules',
'styles' => 'parsoid.styles.css',
'targets' => array( 'desktop', 'mobile' ),
),

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I411b97050fef7dc7d934b35e8ed9065226b30747
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Parsoid
Gerrit-Branch: master
Gerrit-Owner: Spage 
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] Fixed "getCachedWork" callback in thumb.php to avoid 404s in... - change (mediawiki/core)

2014-04-30 Thread jenkins-bot (Code Review)

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

Change subject: Fixed "getCachedWork" callback in thumb.php to avoid 404s in 
the stream method
..


Fixed "getCachedWork" callback in thumb.php to avoid 404s in the stream method

Change-Id: Id3781b87023291b9f7b2c7b3d8ae429a4065c227
---
M thumb.php
1 file changed, 9 insertions(+), 4 deletions(-)

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



diff --git a/thumb.php b/thumb.php
index c5da918..a5a2bcc 100644
--- a/thumb.php
+++ b/thumb.php
@@ -327,7 +327,7 @@
}
 
// Actually generate a new thumbnail
-   list( $thumb, $errorMsg ) = wfGenerateThumbnail( $img, $params, 
$thumbName );
+   list( $thumb, $errorMsg ) = wfGenerateThumbnail( $img, $params, 
$thumbName, $thumbPath );
 
// Check for thumbnail generation errors...
$msg = wfMessage( 'thumbnail_error' );
@@ -356,9 +356,10 @@
  * @param File $file
  * @param array $params
  * @param string $thumbName
+ * @param string $thumbPath
  * @return array (MediaTransformOutput|bool, string|bool error message HTML)
  */
-function wfGenerateThumbnail( File $file, array $params, $thumbName ) {
+function wfGenerateThumbnail( File $file, array $params, $thumbName, 
$thumbPath ) {
global $wgMemc, $wgAttemptFailureEpoch;
 
$key = wfMemcKey( 'attempt-failures', $wgAttemptFailureEpoch,
@@ -389,8 +390,12 @@
'doWork' => function() use ( $file, $params ) {
return $file->transform( $params, 
File::RENDER_NOW );
},
-   'getCachedWork' => function() use ( $file, 
$params ) {
-   return $file->transform( $params );
+   'getCachedWork' => function() use ( $file, 
$params, $thumbPath ) {
+   // If the worker that finished made 
this thumbnail then use it.
+   // Otherwise, it probably made a 
different thumbnail for this file.
+   return $file->getRepo()->fileExists( 
$thumbPath )
+   ? $file->transform( $params )
+   : false; // retry once more in 
exclusive mode
},
'fallback' => function() {
return wfMessage( 'generic-pool-error' 
)->parse();

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Id3781b87023291b9f7b2c7b3d8ae429a4065c227
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz 
Gerrit-Reviewer: BryanDavis 
Gerrit-Reviewer: Chad 
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 linktrail equal to 'en' - change (mediawiki/core)

2014-04-30 Thread Umherirrender (Code Review)

Umherirrender has uploaded a new change for review.

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

Change subject: Remove linktrail equal to 'en'
..

Remove linktrail equal to 'en'

The languages does not have a fallback language, which maybe is
overridden, so there is no need to have the linktrail in its file.

Change-Id: I48334ae96a2c1318992922a4ad7f44b28485ff61
---
M languages/messages/MessagesLzh.php
M languages/messages/MessagesTh.php
M languages/messages/MessagesYue.php
3 files changed, 0 insertions(+), 7 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/35/130635/1

diff --git a/languages/messages/MessagesLzh.php 
b/languages/messages/MessagesLzh.php
index 2448648..3b55e9a 100644
--- a/languages/messages/MessagesLzh.php
+++ b/languages/messages/MessagesLzh.php
@@ -132,8 +132,6 @@
 'zh both' => 'Y年n月j日 （D） H時i分',
 );
 
-$linkTrail = '/^([a-z]+)(.*)$/sD';
-
 $digitTransformTable = array(
'0' => '〇',
'1' => '一',
diff --git a/languages/messages/MessagesTh.php 
b/languages/messages/MessagesTh.php
index f2052fa..6c55ed0 100644
--- a/languages/messages/MessagesTh.php
+++ b/languages/messages/MessagesTh.php
@@ -192,5 +192,3 @@
'ISO 8601 both' => 'xnY-xnm-xnd"T"xnH:xni:xns',
 );
 
-$linkTrail = '/^([a-z]+)(.*)$/sD';
-
diff --git a/languages/messages/MessagesYue.php 
b/languages/messages/MessagesYue.php
index 04dfabb..c4394d2 100644
--- a/languages/messages/MessagesYue.php
+++ b/languages/messages/MessagesYue.php
@@ -230,6 +230,3 @@
'yue ymd both' => 'Y-n-j H:i',
 );
 
-
-$linkTrail = '/^([a-z]+)(.*)$/sD';
-

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

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

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

[MediaWiki-commits] [Gerrit] [WIP]Edit topic summary - change (mediawiki...Flow)

2014-04-30 Thread Bsitu (Code Review)

Bsitu has uploaded a new change for review.

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

Change subject: [WIP]Edit topic summary
..

[WIP]Edit topic summary

This is a a work in progress and not ready for code review,

Change-Id: I3b13a4333b5860857ec168502d227d028b8c2f6d
---
M Flow.php
M FlowActions.php
M container.php
M handlebars/Makefile
A handlebars/flow_block_topicsummary_edit_topic_summary.html.handlebars
A handlebars/flow_block_topicsummary_edit_topic_summary.html.handlebars.php
M includes/Block/TopicSummary.php
A includes/Formatter/PostSummaryQuery.php
M includes/Formatter/RevisionFormatter.php
M includes/TemplateHelper.php
10 files changed, 190 insertions(+), 93 deletions(-)


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

diff --git a/Flow.php b/Flow.php
index 00ac9b1..84cf6bd 100755
--- a/Flow.php
+++ b/Flow.php
@@ -177,6 +177,7 @@
 $wgAutoloadClasses['Flow\Formatter\RecentChangesQuery'] = $dir . 
'includes/Formatter/RecentChangesQuery.php';
 $wgAutoloadClasses['Flow\Formatter\RecentChangesRow'] = $dir . 
'includes/Formatter/RecentChangesQuery.php';
 $wgAutoloadClasses['Flow\Formatter\SinglePostQuery'] = $dir . 
'includes/Formatter/SinglePostQuery.php';
+$wgAutoloadClasses['Flow\Formatter\PostSummaryQuery'] = $dir . 
'includes/Formatter/PostSummaryQuery.php';
 $wgAutoloadClasses['Flow\Formatter\TopicListQuery'] = $dir . 
'includes/Formatter/TopicListQuery.php';
 $wgAutoloadClasses['Flow\Formatter\TopicHistoryQuery'] = $dir . 
'includes/Formatter/TopicHistoryQuery.php';
 $wgAutoloadClasses['Flow\Formatter\TopicRow'] = $dir . 
'includes/Formatter/TopicRow.php';
diff --git a/FlowActions.php b/FlowActions.php
index e2b2a6d..9278d98 100644
--- a/FlowActions.php
+++ b/FlowActions.php
@@ -83,6 +83,7 @@
),
'button-method' => 'GET',
'links' => array( 'topic', 'topic-history' ),
+   'actions' => array( 'edit-topic-summary' ),
'history' => array(
'i18n-message' => 
'flow-rev-message-create-topic-summary',
'i18n-params' => array(
@@ -107,6 +108,7 @@
),
'button-method' => 'GET',
'links' => array( 'topic', 'topic-history', 'diff-post-summary' 
),
+   'actions' => array( 'edit-topic-summary' ),
'history' => array(
'i18n-message' => 'flow-rev-message-edit-topic-summary',
'i18n-params' => array(
diff --git a/container.php b/container.php
index 2191bf2..f922e29 100644
--- a/container.php
+++ b/container.php
@@ -638,6 +638,13 @@
$c['flow_actions']
);
 } );
+$c['query.postsummary'] = $c->share( function( $c ) {
+   return new Flow\Formatter\PostSummaryQuery(
+   $c['storage'],
+   $c['repository.tree'],
+   $c['flow_actions']
+   );
+} );
 $c['formatter.recentchanges'] = $c->share( function( $c ) {
return new Flow\Formatter\RecentChanges(
$c['permissions'],
diff --git a/handlebars/Makefile b/handlebars/Makefile
index 32e970e..e0fb00e 100644
--- a/handlebars/Makefile
+++ b/handlebars/Makefile
@@ -9,6 +9,7 @@
flow_block_topiclist.html.handlebars.php \
flow_block_topic.html.handlebars.php \
flow_block_board-history.html.handlebars.php \
+   flow_block_topicsummary_edit_topic_summary.html.handlebars.php \
flow_board.html.handlebars.php \
flow_post.html.handlebars.php \
timestamp.html.handlebars.php
@@ -16,6 +17,9 @@
 flow_block_header.html.handlebars.php: flow_block_header.html.handlebars
$(COMPILE) flow_block_header
 
+flow_block_topicsummary_edit_topic_summary.html.handlebars.php: 
flow_block_topicsummary_edit_topic_summary.html.handlebars
+   $(COMPILE) flow_block_topicsummary_edit_topic_summary
+
 flow_board_collapsers_subcomponent.html.handlebars.php: 
flow_board_collapsers_subcomponent.html.handlebars
$(COMPILE) flow_board_collapsers_subcomponent
 
diff --git 
a/handlebars/flow_block_topicsummary_edit_topic_summary.html.handlebars 
b/handlebars/flow_block_topicsummary_edit_topic_summary.html.handlebars
new file mode 100644
index 000..7946a51
--- /dev/null
+++ b/handlebars/flow_block_topicsummary_edit_topic_summary.html.handlebars
@@ -0,0 +1,30 @@
+
+   {{#if errors}}
+   
+   {{#each errors}}
+   {{message}}
+   {{/each}}
+   
+   {{/if}}
+   
+   
+   {{#if revision.previousRevisionId}}
+   
+   {{/if}}
+   
+   {{~#if submitted && submitted.content~}}
+   {{~submitted.content~}}
+   {{~else~}}
+

[MediaWiki-commits] [Gerrit] make WbTime's calendarmodel depend on the family - change (pywikibot/core)

2014-04-30 Thread Ricordisamoa (Code Review)

Ricordisamoa has uploaded a new change for review.

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

Change subject: make WbTime's calendarmodel depend on the family
..

make WbTime's calendarmodel depend on the family

thus complying with the framework's WMF-agnosticism

also fixed some minor typos

Change-Id: Iac89303435ab45f05ed1c2fabba9a531d27142b5
---
M pywikibot/__init__.py
M pywikibot/families/wikidata_family.py
M tests/wikibase_tests.py
3 files changed, 9 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core 
refs/changes/37/130637/1

diff --git a/pywikibot/__init__.py b/pywikibot/__init__.py
index ef50bfc..a21bc06 100644
--- a/pywikibot/__init__.py
+++ b/pywikibot/__init__.py
@@ -215,7 +215,7 @@
 FORMATSTR = '{0:+012d}-{1:02d}-{2:02d}T{3:02d}:{4:02d}:{5:02d}Z'
 
 def __init__(self, year=None, month=None, day=None, hour=None, 
minute=None, second=None, precision=None, before=0,
- after=0, timezone=0, 
calendarmodel='http://www.wikidata.org/entity/Q1985727'):
+ after=0, timezone=0, calendarmodel=None):
 """
 Creates a new WbTime object. The precision can be set
 by the Wikibase int value (0-14) or by a human readable
@@ -249,6 +249,8 @@
 self.after = after
 self.before = before
 self.timezone = timezone
+if calendarmodel is None:
+calendarmodel = Site().data_repository().calendarmodel()
 self.calendarmodel = calendarmodel
 
 # if precision is given it overwrites the autodetection above
@@ -262,7 +264,7 @@
 
 @staticmethod
 def fromTimestr(datetimestr, precision=14, before=0, after=0, timezone=0,
-calendarmodel='http://www.wikidata.org/entity/Q1985727'):
+calendarmodel=None):
 match = re.match('([-+]?\d+)-(\d+)-(\d+)T(\d+):(\d+):(\d+)Z', 
datetimestr)
 if not match:
 raise ValueError(u"Invalid format: '%s'" % datetimestr)
diff --git a/pywikibot/families/wikidata_family.py 
b/pywikibot/families/wikidata_family.py
index 3debaed..d8442c5 100644
--- a/pywikibot/families/wikidata_family.py
+++ b/pywikibot/families/wikidata_family.py
@@ -4,7 +4,7 @@
 
 from pywikibot import family
 
-# The wikidata family
+# The Wikidata family
 
 
 class Family(family.WikimediaFamily):
@@ -26,6 +26,9 @@
 else:
 return (code, self.name)
 
+def calendarmodel(self, code):
+return 'http://www.wikidata.org/entity/Q1985727'
+
 def globes(self, code):
 """Supported globes for Coordinate datatype"""
 return {
diff --git a/tests/wikibase_tests.py b/tests/wikibase_tests.py
index d1338ad..8b811b3 100644
--- a/tests/wikibase_tests.py
+++ b/tests/wikibase_tests.py
@@ -62,7 +62,7 @@
 
 
 class TestLinks(PywikibotTestCase):
-"""Test cases to test links stored in wikidata"""
+"""Test cases to test links stored in Wikidata"""
 def setUp(self):
 super(TestLinks, self).setUp()
 self.wdp = pywikibot.ItemPage(wikidata, 'Q60')

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

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

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

[MediaWiki-commits] [Gerrit] debian packaging directory with our details - change (operations...ircd-ratbox)

2014-04-30 Thread Rush (Code Review)

Rush has submitted this change and it was merged.

Change subject: debian packaging directory with our details
..


debian packaging directory with our details

Change-Id: I8410345c8327f42129deb3bbcb8a0c029892e458
---
A debian/changelog
A debian/compat
A debian/control
A debian/copyright
A debian/docs
A debian/rules
A debian/source/format
7 files changed, 62 insertions(+), 0 deletions(-)

Approvals:
  Rush: Verified; Looks good to me, approved
  Mark Bergsma: Looks good to me, but someone else must approve



diff --git a/debian/changelog b/debian/changelog
new file mode 100644
index 000..67dcca7
--- /dev/null
+++ b/debian/changelog
@@ -0,0 +1,5 @@
+ircd-ratbox (2.2.9-1wm1) main; distribution=precise-wikimedia urgency=low
+
+* Initial release of Wikimedia broadcast only ircd
+
+ -- Chase Pettet   Tue, 15 Apr 2014 10:21:17 -0500
diff --git a/debian/compat b/debian/compat
new file mode 100644
index 000..45a4fb7
--- /dev/null
+++ b/debian/compat
@@ -0,0 +1 @@
+8
diff --git a/debian/control b/debian/control
new file mode 100644
index 000..2602c3e
--- /dev/null
+++ b/debian/control
@@ -0,0 +1,13 @@
+Source: ircd-ratbox
+Section: unknown
+Priority: extra
+Maintainer: Chase Pettet 
+Build-Depends: debhelper (>= 8.0.0), autotools-dev
+Standards-Version: 3.9.2
+Homepage: http://ratbox.org
+
+Package: ircd-ratbox
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: ircd-ratbox is an advanced, stable and fast ircd.
+ Wikimedia user read-only irc for edit events broadcasting.
diff --git a/debian/copyright b/debian/copyright
new file mode 100644
index 000..fcd4100
--- /dev/null
+++ b/debian/copyright
@@ -0,0 +1,25 @@
+Format: http://dep.debian.net/deps/dep5
+Upstream-Name: ircd-ratbox
+Source: ratbox.com
+
+Files: debian/*
+Copyright: 2014 Chase Pettet 
+License: GPL-2+
+ This package is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+ .
+ This package is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see 
+ .
+ On Debian systems, the complete text of the GNU General
+ Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
+
+# Please also look if there are files or directories which have a
+# different copyright/license attached and list them here.
diff --git a/debian/docs b/debian/docs
new file mode 100644
index 000..e845566
--- /dev/null
+++ b/debian/docs
@@ -0,0 +1 @@
+README
diff --git a/debian/rules b/debian/rules
new file mode 100755
index 000..dfe1146
--- /dev/null
+++ b/debian/rules
@@ -0,0 +1,16 @@
+#!/usr/bin/make -f
+# -*- makefile -*-
+# Sample debian/rules that uses debhelper.
+# This file was originally written by Joey Hess and Craig Small.
+# As a special exception, when this file is copied by dh-make into a
+# dh-make output file, you may use that output file without restriction.
+# This special exception was added by Craig Small in version 0.37 of dh-make.
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+%:
+   dh $@ 
+
+override_dh_auto_configure:
+   dh_auto_configure -- --with-nicklen=50 --enable-services 
--with-topiclen=300 --enable-ipv6 --prefix=/usr/
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I8410345c8327f42129deb3bbcb8a0c029892e458
Gerrit-PatchSet: 4
Gerrit-Project: operations/debs/ircd-ratbox
Gerrit-Branch: debian
Gerrit-Owner: Rush 
Gerrit-Reviewer: Mark Bergsma 
Gerrit-Reviewer: Rush 

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

[MediaWiki-commits] [Gerrit] change .gitreview for debian branch - change (operations...ircd-ratbox)

2014-04-30 Thread Rush (Code Review)

Rush has submitted this change and it was merged.

Change subject: change .gitreview for debian branch
..


change .gitreview for debian branch

Change-Id: I13e36139f17cba7fb3d3db73cb6f029a7987bc8b
---
M .gitreview
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/.gitreview b/.gitreview
index 4a1fb49..ecf83f2 100644
--- a/.gitreview
+++ b/.gitreview
@@ -2,5 +2,5 @@
 host=gerrit.wikimedia.org
 port=29418
 project=operations/debs/ircd-ratbox
-defaultbranch=master
+defaultbranch=debian
 defaultrebase=0

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I13e36139f17cba7fb3d3db73cb6f029a7987bc8b
Gerrit-PatchSet: 5
Gerrit-Project: operations/debs/ircd-ratbox
Gerrit-Branch: debian
Gerrit-Owner: Rush 
Gerrit-Reviewer: Rush 

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

[MediaWiki-commits] [Gerrit] Hiding the keyboard when navigation drawer is pulled out - change (apps...wikipedia)

2014-04-30 Thread Dbrant (Code Review)

Dbrant has uploaded a new change for review.

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

Change subject: Hiding the keyboard when navigation drawer is pulled out
..

Hiding the keyboard when navigation drawer is pulled out

Bug: 64339
Change-Id: If29cefc79752c82cb5742eca10af88e39725ee5e
---
M wikipedia/src/main/java/org/wikipedia/search/SearchArticlesFragment.java
1 file changed, 5 insertions(+), 0 deletions(-)


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

diff --git 
a/wikipedia/src/main/java/org/wikipedia/search/SearchArticlesFragment.java 
b/wikipedia/src/main/java/org/wikipedia/search/SearchArticlesFragment.java
index 4938d62..6286b71 100644
--- a/wikipedia/src/main/java/org/wikipedia/search/SearchArticlesFragment.java
+++ b/wikipedia/src/main/java/org/wikipedia/search/SearchArticlesFragment.java
@@ -283,6 +283,11 @@
 params.gravity = Gravity.CENTER_VERTICAL; // Needed because 
this seems to get reset otherwise. hmpf.
 drawerIndicator.setLayoutParams(params);
 }
+@Override
+public void onDrawerOpened(View drawerView) {
+// Hide the keyboard when the drawer is opened
+Utils.hideSoftKeyboard(getActivity());
+}
 });
 
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: If29cefc79752c82cb5742eca10af88e39725ee5e
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] jquery.textSelection: Remove hardcoded checks for removed Wi... - change (mediawiki/core)

2014-04-30 Thread Code Review

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

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

Change subject: jquery.textSelection: Remove hardcoded checks for removed 
WikiEditor iframe mode
..

jquery.textSelection: Remove hardcoded checks for removed WikiEditor iframe mode

Bug: 29328
Change-Id: I6c813cb5601bf79375444b4a1c598218102ce321
---
M resources/src/jquery/jquery.textSelection.js
1 file changed, 2 insertions(+), 27 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/39/130639/1

diff --git a/resources/src/jquery/jquery.textSelection.js 
b/resources/src/jquery/jquery.textSelection.js
index 042db91..76e9601 100644
--- a/resources/src/jquery/jquery.textSelection.js
+++ b/resources/src/jquery/jquery.textSelection.js
@@ -24,9 +24,6 @@
 
$.fn.textSelection = function ( command, options ) {
var fn,
-   context,
-   hasIframe,
-   needSave,
retval;
 
/**
@@ -149,9 +146,6 @@
// See bug 35201.
 
activateElementOnIE( 
this );
-   if ( context ) {
-   
context.fn.restoreCursorAndScrollTop();
-   }
if ( 
options.selectionStart !== undefined ) {
$( this 
).textSelection( 'setSelection', { 'start': options.selectionStart, 'end': 
options.selectionEnd } );
}
@@ -531,18 +525,11 @@
// Position to start selection at
start: undefined,
// Position to end selection at. 
Defaults to start
-   end: undefined,
-   // Element to start selection in 
(iframe only)
-   startContainer: undefined,
-   // Element to end selection in (iframe 
only). Defaults to startContainer
-   endContainer: undefined
+   end: undefined
}, options );
 
if ( options.end === undefined ) {
options.end = options.start;
-   }
-   if ( options.endContainer === undefined ) {
-   options.endContainer = 
options.startContainer;
}
// FIXME: We may not need character 
position-based functions if we insert markers in the right places
break;
@@ -553,19 +540,7 @@
break;
}
 
-   context = $( this ).data( 'wikiEditor-context' );
-   hasIframe = context !== undefined && context && context.$iframe 
!== undefined;
-
-   // IE selection restore voodoo
-   needSave = false;
-   if ( hasIframe && context.savedSelection !== null ) {
-   context.fn.restoreSelection();
-   needSave = true;
-   }
-   retval = ( hasIframe ? context.fn : fn )[command].call( this, 
options );
-   if ( hasIframe && needSave ) {
-   context.fn.saveSelection();
-   }
+   retval = fn[command].call( this, options );
 
return retval;
};

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6c813cb5601bf79375444b4a1c598218102ce321
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
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] Switch zero ext to use config from zerowiki instead of meta - change (operations/mediawiki-config)

2014-04-30 Thread Yurik (Code Review)

Yurik has uploaded a new change for review.

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

Change subject: Switch zero ext to use config from zerowiki instead of meta
..

Switch zero ext to use config from zerowiki instead of meta

Change-Id: Ie27c0858307d3e67a423379b6d407252b8f6c15f
---
M wmf-config/mobile.php
1 file changed, 3 insertions(+), 3 deletions(-)


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

diff --git a/wmf-config/mobile.php b/wmf-config/mobile.php
index 94f02b8..dc60789 100644
--- a/wmf-config/mobile.php
+++ b/wmf-config/mobile.php
@@ -33,9 +33,9 @@
 
if ( $wmgZeroRatedMobileAccess ) {
require_once( 
"$IP/extensions/ZeroRatedMobileAccess/ZeroRatedMobileAccess.php" );
-   // TODO: remove ConfigIndexUri in favor of Api once proven out
-   $wgZeroRatedMobileAccessConfigIndexUri = 
'http://meta.wikimedia.org/w/index.php';
-   $wgZeroRatedMobileAccessApiUri = 
'http://meta.wikimedia.org/w/api.php';
+   $wgZeroRatedMobileAccessApiUri = 
'https://zero.wikimedia.org/w/api.php';
+   $wgZeroRatedMobileAccessApiUserName = 
$wmgZeroRatedMobileAccessApiUserName;
+   $wgZeroRatedMobileAccessApiPassword = 
$wmgZeroRatedMobileAccessApiPassword;
}
 
if ( $wmgZeroDisableImages ) {

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

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

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

[MediaWiki-commits] [Gerrit] Add missing @return in Language.php - change (mediawiki/core)

2014-04-30 Thread Umherirrender (Code Review)

Umherirrender has uploaded a new change for review.

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

Change subject: Add missing @return in Language.php
..

Add missing @return in Language.php

Change-Id: I977bc5bf21235ce0f07cf0214597a37afad2b4eb
---
M languages/Language.php
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/41/130641/1

diff --git a/languages/Language.php b/languages/Language.php
index 95bd31e..964cd9f 100644
--- a/languages/Language.php
+++ b/languages/Language.php
@@ -3048,6 +3048,7 @@
/**
 * Get special page names, as an associative array
 *   case folded alias => real name
+* @return array
 */
function getSpecialPageAliases() {
// Cache aliases because it may be slow to load them

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

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

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

[MediaWiki-commits] [Gerrit] Switch zero ext to use config from zerowiki instead of meta - change (operations/mediawiki-config)

2014-04-30 Thread Dr0ptp4kt (Code Review)

Dr0ptp4kt has submitted this change and it was merged.

Change subject: Switch zero ext to use config from zerowiki instead of meta
..


Switch zero ext to use config from zerowiki instead of meta

Change-Id: Ie27c0858307d3e67a423379b6d407252b8f6c15f
---
M wmf-config/mobile.php
1 file changed, 3 insertions(+), 3 deletions(-)

Approvals:
  Dr0ptp4kt: Checked; Looks good to me, approved



diff --git a/wmf-config/mobile.php b/wmf-config/mobile.php
index 94f02b8..dc60789 100644
--- a/wmf-config/mobile.php
+++ b/wmf-config/mobile.php
@@ -33,9 +33,9 @@
 
if ( $wmgZeroRatedMobileAccess ) {
require_once( 
"$IP/extensions/ZeroRatedMobileAccess/ZeroRatedMobileAccess.php" );
-   // TODO: remove ConfigIndexUri in favor of Api once proven out
-   $wgZeroRatedMobileAccessConfigIndexUri = 
'http://meta.wikimedia.org/w/index.php';
-   $wgZeroRatedMobileAccessApiUri = 
'http://meta.wikimedia.org/w/api.php';
+   $wgZeroRatedMobileAccessApiUri = 
'https://zero.wikimedia.org/w/api.php';
+   $wgZeroRatedMobileAccessApiUserName = 
$wmgZeroRatedMobileAccessApiUserName;
+   $wgZeroRatedMobileAccessApiPassword = 
$wmgZeroRatedMobileAccessApiPassword;
}
 
if ( $wmgZeroDisableImages ) {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie27c0858307d3e67a423379b6d407252b8f6c15f
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Yurik 
Gerrit-Reviewer: Dr0ptp4kt 
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 puppet+vagrant to config, merge out-of-focus extensions - change (mediawiki...MultimediaViewer)

2014-04-30 Thread Code Review

Gergő Tisza has uploaded a new change for review.

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

Change subject: Add puppet+vagrant to config, merge out-of-focus extensions
..

Add puppet+vagrant to config, merge out-of-focus extensions

Change-Id: If7c067ccf4639ca4646b4489d1f28307b650afbd
---
M default
1 file changed, 4 insertions(+), 8 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MultimediaViewer 
refs/changes/43/130643/1

diff --git a/default b/default
index 3aa38f8..40ef305 100644
--- a/default
+++ b/default
@@ -8,16 +8,12 @@
 [section "Core"]
   query = project:mediawiki/core status:open (owner:MarkTraceur OR 
owner:{Gergő Tisza} OR owner:Gilles) limit:10
 [section "Config"]
-  query = (project:operations/mediawiki-config OR 
project:mediawiki/extensions/MultimediaViewer AND 
(ref:refs/meta/dashboards/custom OR ref:refs/meta/config)) status:open 
(owner:MarkTraceur OR owner:{Gergő Tisza} OR owner:Gilles) limit:10
+  query = (project:operations/mediawiki-config OR project:operations/puppet OR 
project:mediawiki/vagrant OR project:mediawiki/extensions/MultimediaViewer AND 
(ref:refs/meta/dashboards/custom OR ref:refs/meta/config)) status:open 
(owner:MarkTraceur OR owner:{Gergő Tisza} OR owner:Gilles) limit:10
 [section "Metrics"]
   query = (project:analytics/multimedia OR 
project:analytics/multimedia/config) status:open limit:10
-[section "CommonsMetadata"]
-  query = project:mediawiki/extensions/CommonsMetadata status:open limit:10
-[section "TimedMediaHandler"]
-  query = project:mediawiki/extensions/TimedMediaHandler status:open limit:10
-[section "GWToolset"]
-  query = project:mediawiki/extensions/GWToolset status:open limit:10
+[section "Other (CMD/TMH/GWT)"]
+  query = (project:mediawiki/extensions/CommonsMetadata OR 
project:mediawiki/extensions/TimedMediaHandler OR 
project:mediawiki/extensions/GWToolset) status:open limit:15
 [section "BetaFeatures"]
-  query = project:mediawiki/extensions/BetaFeatures status:open limit:10
+  query = project:mediawiki/extensions/BetaFeatures status:open limit:5
 [section "Recently merged"]
   query = status:merged NOT owner:L10n-bot (owner:MarkTraceur OR owner:{Gergő 
Tisza} OR owner:Gilles OR project:mediawiki/extensions/MultimediaViewer OR 
project:mediawiki/core OR project:operations/mediawiki-config OR 
project:analytics/multimedia OR project:analytics/multimedia/config OR 
project:mediawiki/extensions/CommonsMetadata OR 
project:mediawiki/extensions/UploadWizard OR 
project:mediawiki/extensions/BetaFeatures) limit:20 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: If7c067ccf4639ca4646b4489d1f28307b650afbd
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MultimediaViewer
Gerrit-Branch: refs/meta/dashboards/custom
Gerrit-Owner: Gergő Tisza 

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

[MediaWiki-commits] [Gerrit] Move UploadWizard to second place, add GWToolset - change (mediawiki...MultimediaViewer)

2014-04-30 Thread Code Review

Gergő Tisza has uploaded a new change for review.

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

Change subject: Move UploadWizard to second place, add GWToolset
..

Move UploadWizard to second place, add GWToolset

Change-Id: Id708bfaf1b41c2f442f9a5b05c138645e0cad5e5
---
M default
1 file changed, 4 insertions(+), 2 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MultimediaViewer 
refs/changes/42/130642/1

diff --git a/default b/default
index 69a44db..3aa38f8 100644
--- a/default
+++ b/default
@@ -3,6 +3,8 @@
   description = All kinds of things
 [section "MultimediaViewer"]
   query = project:mediawiki/extensions/MultimediaViewer status:open limit:20
+[section "UploadWizard"]
+  query = project:mediawiki/extensions/UploadWizard status:open limit:10
 [section "Core"]
   query = project:mediawiki/core status:open (owner:MarkTraceur OR 
owner:{Gergő Tisza} OR owner:Gilles) limit:10
 [section "Config"]
@@ -11,10 +13,10 @@
   query = (project:analytics/multimedia OR 
project:analytics/multimedia/config) status:open limit:10
 [section "CommonsMetadata"]
   query = project:mediawiki/extensions/CommonsMetadata status:open limit:10
-[section "UploadWizard"]
-  query = project:mediawiki/extensions/UploadWizard status:open limit:10
 [section "TimedMediaHandler"]
   query = project:mediawiki/extensions/TimedMediaHandler status:open limit:10
+[section "GWToolset"]
+  query = project:mediawiki/extensions/GWToolset status:open limit:10
 [section "BetaFeatures"]
   query = project:mediawiki/extensions/BetaFeatures status:open limit:10
 [section "Recently merged"]

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id708bfaf1b41c2f442f9a5b05c138645e0cad5e5
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MultimediaViewer
Gerrit-Branch: refs/meta/dashboards/custom
Gerrit-Owner: Gergő Tisza 

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

[MediaWiki-commits] [Gerrit] Fix division by zero in Special:WikiSets - change (mediawiki...CentralAuth)

2014-04-30 Thread Gerrit Patch Uploader (Code Review)

Gerrit Patch Uploader has uploaded a new change for review.

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

Change subject: Fix division by zero in Special:WikiSets
..

Fix division by zero in Special:WikiSets

Bug: 58475
Change-Id: If141c70328812bb578de863c7be7e637239a7da0
---
M specials/SpecialWikiSets.php
1 file changed, 1 insertion(+), 0 deletions(-)


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

diff --git a/specials/SpecialWikiSets.php b/specials/SpecialWikiSets.php
index 9fabf6a..05e6eeb 100644
--- a/specials/SpecialWikiSets.php
+++ b/specials/SpecialWikiSets.php
@@ -232,6 +232,7 @@
$count = count( $list );
# If there are less items than columns, limit the number of 
columns
$columns = $count < $columns ? $count : $columns;
+   $columns = $columns == 0 ? 1 : $columns;
$itemsPerCol = round( $count / $columns );
$i = 0;
$splitLists = array();

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: If141c70328812bb578de863c7be7e637239a7da0
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CentralAuth
Gerrit-Branch: master
Gerrit-Owner: Gerrit Patch Uploader 
Gerrit-Reviewer: Gerrit Patch Uploader 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Move UploadWizard to second place, add GWToolset - change (mediawiki...MultimediaViewer)

2014-04-30 Thread Code Review

Gergő Tisza has submitted this change and it was merged.

Change subject: Move UploadWizard to second place, add GWToolset
..


Move UploadWizard to second place, add GWToolset

Change-Id: Id708bfaf1b41c2f442f9a5b05c138645e0cad5e5
---
M default
1 file changed, 4 insertions(+), 2 deletions(-)

Approvals:
  Gergő Tisza: Verified; Looks good to me, approved



diff --git a/default b/default
index 69a44db..3aa38f8 100644
--- a/default
+++ b/default
@@ -3,6 +3,8 @@
   description = All kinds of things
 [section "MultimediaViewer"]
   query = project:mediawiki/extensions/MultimediaViewer status:open limit:20
+[section "UploadWizard"]
+  query = project:mediawiki/extensions/UploadWizard status:open limit:10
 [section "Core"]
   query = project:mediawiki/core status:open (owner:MarkTraceur OR 
owner:{Gergő Tisza} OR owner:Gilles) limit:10
 [section "Config"]
@@ -11,10 +13,10 @@
   query = (project:analytics/multimedia OR 
project:analytics/multimedia/config) status:open limit:10
 [section "CommonsMetadata"]
   query = project:mediawiki/extensions/CommonsMetadata status:open limit:10
-[section "UploadWizard"]
-  query = project:mediawiki/extensions/UploadWizard status:open limit:10
 [section "TimedMediaHandler"]
   query = project:mediawiki/extensions/TimedMediaHandler status:open limit:10
+[section "GWToolset"]
+  query = project:mediawiki/extensions/GWToolset status:open limit:10
 [section "BetaFeatures"]
   query = project:mediawiki/extensions/BetaFeatures status:open limit:10
 [section "Recently merged"]

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Id708bfaf1b41c2f442f9a5b05c138645e0cad5e5
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MultimediaViewer
Gerrit-Branch: refs/meta/dashboards/custom
Gerrit-Owner: Gergő Tisza 
Gerrit-Reviewer: Gergő Tisza 

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

[MediaWiki-commits] [Gerrit] Suppress weird iOS styling of buttons - change (mediawiki/core)

2014-04-30 Thread Kaldari (Code Review)

Kaldari has uploaded a new change for review.

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

Change subject: Suppress weird iOS styling of buttons
..

Suppress weird iOS styling of buttons

Bug: 64264
Change-Id: I65525e79503937fd42d4df01a1ce63936f4f92e4
---
M resources/src/mediawiki.ui/components/default/buttons.less
1 file changed, 3 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/45/130645/1

diff --git a/resources/src/mediawiki.ui/components/default/buttons.less 
b/resources/src/mediawiki.ui/components/default/buttons.less
index f7a7eae..78b0b33 100644
--- a/resources/src/mediawiki.ui/components/default/buttons.less
+++ b/resources/src/mediawiki.ui/components/default/buttons.less
@@ -31,6 +31,9 @@
margin: 0;
.box-sizing(border-box);
 
+   // Disable weird iOS styling
+   -webkit-appearance: none;
+
// IE6/IE7 hack
// http://stackoverflow.com/a/5838575/365238
*display: inline;

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

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

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

[MediaWiki-commits] [Gerrit] Change the tipsy gravity for the stripe buttons - change (mediawiki...MultimediaViewer)

2014-04-30 Thread jenkins-bot (Code Review)

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

Change subject: Change the tipsy gravity for the stripe buttons
..


Change the tipsy gravity for the stripe buttons

- this avoids an issue where the arrow wouldn't point to what we
want when near the edge of the screen
- this avoids an RTL issue where the bubble would go outside of
the screen

Bug: 64258
Change-Id: I1cc9683af2743b093a45b19d7142fe7e5e66423f
Mingle: https://wikimedia.mingle.thoughtworks.com/projects/multimedia/cards/485
---
M resources/mmv/ui/mmv.ui.stripeButtons.js
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/resources/mmv/ui/mmv.ui.stripeButtons.js 
b/resources/mmv/ui/mmv.ui.stripeButtons.js
index 896402d..8234674 100644
--- a/resources/mmv/ui/mmv.ui.stripeButtons.js
+++ b/resources/mmv/ui/mmv.ui.stripeButtons.js
@@ -68,7 +68,7 @@
.prop( 'title', popupText )
// elements are right-floated so we use prepend instead 
of append to keep the order
.prependTo( this.$buttonContainer )
-   .tipsy( { gravity: 's' } );
+   .tipsy( { gravity: $( document.body ).hasClass( 'rtl' ) 
? 'sw' : 'se' } );
};
 
/**

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I1cc9683af2743b093a45b19d7142fe7e5e66423f
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/MultimediaViewer
Gerrit-Branch: master
Gerrit-Owner: Gilles 
Gerrit-Reviewer: MarkTraceur 
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 puppet+vagrant to config, merge out-of-focus extensions - change (mediawiki...MultimediaViewer)

2014-04-30 Thread Code Review

Gergő Tisza has submitted this change and it was merged.

Change subject: Add puppet+vagrant to config, merge out-of-focus extensions
..


Add puppet+vagrant to config, merge out-of-focus extensions

Change-Id: If7c067ccf4639ca4646b4489d1f28307b650afbd
---
M default
1 file changed, 4 insertions(+), 8 deletions(-)

Approvals:
  Gergő Tisza: Verified; Looks good to me, approved



diff --git a/default b/default
index 3aa38f8..40ef305 100644
--- a/default
+++ b/default
@@ -8,16 +8,12 @@
 [section "Core"]
   query = project:mediawiki/core status:open (owner:MarkTraceur OR 
owner:{Gergő Tisza} OR owner:Gilles) limit:10
 [section "Config"]
-  query = (project:operations/mediawiki-config OR 
project:mediawiki/extensions/MultimediaViewer AND 
(ref:refs/meta/dashboards/custom OR ref:refs/meta/config)) status:open 
(owner:MarkTraceur OR owner:{Gergő Tisza} OR owner:Gilles) limit:10
+  query = (project:operations/mediawiki-config OR project:operations/puppet OR 
project:mediawiki/vagrant OR project:mediawiki/extensions/MultimediaViewer AND 
(ref:refs/meta/dashboards/custom OR ref:refs/meta/config)) status:open 
(owner:MarkTraceur OR owner:{Gergő Tisza} OR owner:Gilles) limit:10
 [section "Metrics"]
   query = (project:analytics/multimedia OR 
project:analytics/multimedia/config) status:open limit:10
-[section "CommonsMetadata"]
-  query = project:mediawiki/extensions/CommonsMetadata status:open limit:10
-[section "TimedMediaHandler"]
-  query = project:mediawiki/extensions/TimedMediaHandler status:open limit:10
-[section "GWToolset"]
-  query = project:mediawiki/extensions/GWToolset status:open limit:10
+[section "Other (CMD/TMH/GWT)"]
+  query = (project:mediawiki/extensions/CommonsMetadata OR 
project:mediawiki/extensions/TimedMediaHandler OR 
project:mediawiki/extensions/GWToolset) status:open limit:15
 [section "BetaFeatures"]
-  query = project:mediawiki/extensions/BetaFeatures status:open limit:10
+  query = project:mediawiki/extensions/BetaFeatures status:open limit:5
 [section "Recently merged"]
   query = status:merged NOT owner:L10n-bot (owner:MarkTraceur OR owner:{Gergő 
Tisza} OR owner:Gilles OR project:mediawiki/extensions/MultimediaViewer OR 
project:mediawiki/core OR project:operations/mediawiki-config OR 
project:analytics/multimedia OR project:analytics/multimedia/config OR 
project:mediawiki/extensions/CommonsMetadata OR 
project:mediawiki/extensions/UploadWizard OR 
project:mediawiki/extensions/BetaFeatures) limit:20 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: If7c067ccf4639ca4646b4489d1f28307b650afbd
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MultimediaViewer
Gerrit-Branch: refs/meta/dashboards/custom
Gerrit-Owner: Gergő Tisza 
Gerrit-Reviewer: Gergő Tisza 

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

[MediaWiki-commits] [Gerrit] Fix tab selection on monobook - change (mediawiki...VisualEditor)

2014-04-30 Thread jenkins-bot (Code Review)

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

Change subject: Fix tab selection on monobook
..


Fix tab selection on monobook

Don't unselect article tab when loading VE, do unselect when restoring normal 
view mode.

Bug: 49407
Change-Id: I4b6e5c898a8af2b404151bba46359dc4bfbd739e
---
M modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.js
1 file changed, 3 insertions(+), 2 deletions(-)

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



diff --git a/modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.js 
b/modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.js
index 9d4d55d..0c69186 100644
--- a/modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.js
+++ b/modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.js
@@ -1374,7 +1374,7 @@
var uri;
 
// Put skin tabs in "edit" mode
-   $( $( '#p-views' ).length ? '#p-views' : '#p-cactions' )
+   $( '#p-views' )
.find( 'li.selected' ).removeClass( 'selected' );
$( '#ca-ve-edit' )
.addClass( 'selected' );
@@ -1408,7 +1408,8 @@
// Put skin tabs back in "view" mode
$( $( '#p-views' ).length ? '#p-views' : '#p-cactions' )
.find( 'li.selected' ).removeClass( 'selected' );
-   $( '#ca-view' ).addClass( 'selected' );
+   $( $( '#ca-view' ).length ? '#ca-view' : '#p-cactions > .pBody > ul > 
li:nth-child(1)' )
+   .addClass( 'selected' );
 
// Make site notice visible again (if present)
$( '#siteNotice.ve-hide' )

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

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

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

[MediaWiki-commits] [Gerrit] Merge remote-tracking branch 'gerrit/master' into frontend-r... - change (mediawiki...Flow)

2014-04-30 Thread jenkins-bot (Code Review)

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

Change subject: Merge remote-tracking branch 'gerrit/master' into 
frontend-rewrite
..


Merge remote-tracking branch 'gerrit/master' into frontend-rewrite

Change-Id: I8dfea2037a2d6563d3f99a45ea63264a85760890
---
M Flow.php
M container.php
M includes/Formatter/IRCLineUrlFormatter.php
M includes/Formatter/RevisionFormatter.php
M includes/api/ApiQueryFlow.php
5 files changed, 4 insertions(+), 38 deletions(-)

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



diff --git a/Flow.php b/Flow.php
index d536481..00ac9b1 100755
--- a/Flow.php
+++ b/Flow.php
@@ -176,15 +176,11 @@
 $wgAutoloadClasses['Flow\Formatter\RecentChanges'] = $dir . 
'includes/Formatter/RecentChanges.php';
 $wgAutoloadClasses['Flow\Formatter\RecentChangesQuery'] = $dir . 
'includes/Formatter/RecentChangesQuery.php';
 $wgAutoloadClasses['Flow\Formatter\RecentChangesRow'] = $dir . 
'includes/Formatter/RecentChangesQuery.php';
-<<< HEAD   (49e2e0 Fix missing edit token)
 $wgAutoloadClasses['Flow\Formatter\SinglePostQuery'] = $dir . 
'includes/Formatter/SinglePostQuery.php';
 $wgAutoloadClasses['Flow\Formatter\TopicListQuery'] = $dir . 
'includes/Formatter/TopicListQuery.php';
 $wgAutoloadClasses['Flow\Formatter\TopicHistoryQuery'] = $dir . 
'includes/Formatter/TopicHistoryQuery.php';
 $wgAutoloadClasses['Flow\Formatter\TopicRow'] = $dir . 
'includes/Formatter/TopicRow.php';
-
-===
 $wgAutoloadClasses['Flow\Formatter\IRCLineUrlFormatter'] = $dir . 
'includes/Formatter/IRCLineUrlFormatter.php';
->>> BRANCH (9e19ba Localisation updates from https://translatewiki.net.)
 
 // Convert model instances into array of user-visible data
 $wgAutoloadClasses['Flow\Formatter\RevisionFormatter'] = $dir . 
'includes/Formatter/RevisionFormatter.php';
diff --git a/container.php b/container.php
index 2191bf2..fe80c15 100644
--- a/container.php
+++ b/container.php
@@ -608,7 +608,7 @@
 $c['formatter.irclineurl'] = $c->share( function( $c ) {
return new Flow\Formatter\IRCLineUrlFormatter(
$c['permissions'],
-   $c['templating']
+   $c['formatter.revision']
);
 } );
 
diff --git a/includes/Formatter/IRCLineUrlFormatter.php 
b/includes/Formatter/IRCLineUrlFormatter.php
index ba3328c..d3e2497 100644
--- a/includes/Formatter/IRCLineUrlFormatter.php
+++ b/includes/Formatter/IRCLineUrlFormatter.php
@@ -22,13 +22,11 @@
$encoded = $rc->getAttribute( 'rc_params' );
if ( !$encoded ) {
wfDebugLog( 'Flow', __METHOD__ . 'Something something' 
);
-   die( 'no rc_params' );
return null;
}
$params = unserialize( $encoded );
if ( !isset( $params['flow-workflow-change'] ) ) {
wfDebugLog( 'Flow', __METHOD__ . 'Something something' 
);
-   die( 'no flow-workflow-change' );
return null;
}
$change = $params['flow-workflow-change'];
@@ -43,7 +41,7 @@
$row->currentRevision = $row->revision;
$row->workflow = $this->mockWorkflow( $rc, $change );
wfRestoreWarnings();
-   $links = $this->serializer->buildActionLinks( $row );
+   $links = $this->serializer->buildLinks( $row );
 
// Listed in order of preference
$accept = array(
@@ -55,11 +53,9 @@
 
foreach ( $accept as $key ) {
if ( isset( $links[$key] ) ) {
-   return $links[$key][0];
+   return $links[$key]['url'];
}
}
-
-   var_dump( $links );die( 'no links generated' );
 
wfDebugLog( 'Flow', __METHOD__
. ': No url generated for action ' . 
$change['action']
diff --git a/includes/Formatter/RevisionFormatter.php 
b/includes/Formatter/RevisionFormatter.php
index 2d970fe..b8d58a7 100644
--- a/includes/Formatter/RevisionFormatter.php
+++ b/includes/Formatter/RevisionFormatter.php
@@ -566,14 +566,8 @@
$title,

'compare-header-revisions',
array(
-<<< HEAD   (49e2e0 Fix missing edit token)
'workflow' => 
$workflowId,

'header_newRevision' => $revId,
-   
'header_oldRevision' => $row->revision->getPrevRevisionId()->getAlphadecimal(),
-===
-   'workflow' => 
$workflowId->getAlp

[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: 2364e35..43c0341 - change (mediawiki/extensions)

2014-04-30 Thread Jenkins-mwext-sync (Code Review)

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

Change subject: Syncronize VisualEditor: 2364e35..43c0341
..


Syncronize VisualEditor: 2364e35..43c0341

Change-Id: Ida1dbe2494e2a8adf691892c825a6bafe9c8b9f5
---
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 2364e35..43c0341 16
--- a/VisualEditor
+++ b/VisualEditor
-Subproject commit 2364e35ad5736eab2e401f2d64ac05fcfb59f95a
+Subproject commit 43c0341ad31ab6e3f6550b98cbcf0a7396269dd9

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ida1dbe2494e2a8adf691892c825a6bafe9c8b9f5
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: 2364e35..43c0341 - change (mediawiki/extensions)

2014-04-30 Thread Jenkins-mwext-sync (Code Review)

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

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

Change subject: Syncronize VisualEditor: 2364e35..43c0341
..

Syncronize VisualEditor: 2364e35..43c0341

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


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions 
refs/changes/47/130647/1

diff --git a/VisualEditor b/VisualEditor
index 2364e35..43c0341 16
--- a/VisualEditor
+++ b/VisualEditor
-Subproject commit 2364e35ad5736eab2e401f2d64ac05fcfb59f95a
+Subproject commit 43c0341ad31ab6e3f6550b98cbcf0a7396269dd9

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ida1dbe2494e2a8adf691892c825a6bafe9c8b9f5
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] Allow header editing - change (mediawiki...Flow)

2014-04-30 Thread jenkins-bot (Code Review)

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

Change subject: Allow header editing
..


Allow header editing

Change-Id: I32481107a5ed0f42613017cab28f59b3a5ba5fdb
---
M handlebars/flow_block_board-history.html.handlebars
M handlebars/flow_block_header.html.handlebars
M handlebars/flow_block_header.html.handlebars.php
A handlebars/flow_block_header_edit.html.handlebars
A handlebars/flow_block_header_edit.html.handlebars.php
M handlebars/flow_block_topic.html.handlebars
M handlebars/flow_block_topiclist.html.handlebars
M handlebars/flow_block_topiclist.html.handlebars.php
M handlebars/flow_board.html.handlebars
M handlebars/flow_board_collapsers_subcomponent.html.handlebars
M handlebars/flow_board_navigation.html.handlebars
M handlebars/flow_newtopic_form.html.handlebars
M handlebars/flow_post.html.handlebars
M handlebars/flow_reply_form.html.handlebars
M handlebars/flow_topic.html.handlebars
M handlebars/flow_topic_navigation.html.handlebars
M handlebars/form_element.html.handlebars
M handlebars/timestamp.html.handlebars
M includes/Block/Header.php
M includes/Formatter/CheckUserQuery.php
M includes/Formatter/RevisionFormatter.php
M includes/Model/UUID.php
22 files changed, 148 insertions(+), 75 deletions(-)

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



diff --git a/handlebars/flow_block_board-history.html.handlebars 
b/handlebars/flow_block_board-history.html.handlebars
old mode 100755
new mode 100644
diff --git a/handlebars/flow_block_header.html.handlebars 
b/handlebars/flow_block_header.html.handlebars
old mode 100755
new mode 100644
index 49badd6..b01952b
--- a/handlebars/flow_block_header.html.handlebars
+++ b/handlebars/flow_block_header.html.handlebars
@@ -1,14 +1,14 @@
 
-   {{#unless revision}}
-   {{l10n "No_header"}}
+
+   {{#if revision && revision.content}}
+   {{html revision.content}}
{{else}}
-   {{#if revision.content}}
-   {{html revision.content}}
-   {{else}}
-   {{l10n "No_header"}}
-   {{/if}}
+   {{l10n "No_header"}}
{{/unless}}
+

-   
+   {{#if revision.actions.edit}}
+   
+   {{/if}}

 
diff --git a/handlebars/flow_block_header.html.handlebars.php 
b/handlebars/flow_block_header.html.handlebars.php
index d4c4108..b7c4ac6 100644
--- a/handlebars/flow_block_header.html.handlebars.php
+++ b/handlebars/flow_block_header.html.handlebars.php
@@ -15,17 +15,17 @@
 
 );
 return '
-   '.((!LCRun2::ifvar(((is_array($in) && isset($in['revision'])) ? 
$in['revision'] : null))) ? '
-   '.LCRun2::ch('l10n', Array('No_header'), 'enc', $cx).'
+
+   '.((LCRun2::ifvar(((is_array($in) && isset($in['revision'])) ? 
$in['revision'] : null))) ? '
+   '.LCRun2::ch('html', Array(((is_array($in['revision']) && 
isset($in['revision']['content'])) ? $in['revision']['content'] : null)), 
'enc', $cx).'
' : '
-   '.((LCRun2::ifvar(((is_array($in['revision']) && 
isset($in['revision']['content'])) ? $in['revision']['content'] : null))) ? '
-   '.LCRun2::ch('html', Array(((is_array($in['revision']) 
&& isset($in['revision']['content'])) ? $in['revision']['content'] : null)), 
'enc', $cx).'
-   ' : '
-   '.LCRun2::ch('l10n', Array('No_header'), 'enc', 
$cx).'
-   ').'
+   '.LCRun2::ch('l10n', Array('No_header'), 'enc', $cx).'
').'
+

-   
+   '.((LCRun2::ifvar(((is_array($in['revision']['actions']) && 
isset($in['revision']['actions']['edit'])) ? $in['revision']['actions']['edit'] 
: null))) ? '
+   
+   ' : '').'

 
 ';
diff --git a/handlebars/flow_block_header_edit.html.handlebars 
b/handlebars/flow_block_header_edit.html.handlebars
new file mode 100644
index 000..5ba392d
--- /dev/null
+++ b/handlebars/flow_block_header_edit.html.handlebars
@@ -0,0 +1,34 @@
+
+
+   {{#if errors}}
+   
+   {{#each errors}}
+   {{message}}
+   {{/each}}
+   
+   {{/if}}
+
+   
+   
+   
+   
+   {{~#if submitted && submitted.content~}}
+   {{~submitted.content~}}
+   {{~else~}}
+   {{~revision.content~}}
+   {{~/if~}}
+   
+   
+   
+   {{~l10n "flow-edit-header-submit"~}}
+   
+   
+   {{~l10n "Preview"~}}
+   
+   
+   {{~l10n "Cancel"~}}
+

[MediaWiki-commits] [Gerrit] Add percentile data to the maps - change (analytics...config)

2014-04-30 Thread MarkTraceur (Code Review)

MarkTraceur has submitted this change and it was merged.

Change subject: Add percentile data to the maps
..


Add percentile data to the maps

Change-Id: Ib1d7dcf40615f1144c082d731757fe013870fc27
Mingle: https://wikimedia.mingle.thoughtworks.com/projects/multimedia/cards/506
---
M datasources/mmv_performance_country_api.json
M datasources/mmv_performance_country_image.json
M graphs/mmv_performance_country_api.json
M graphs/mmv_performance_country_image.json
4 files changed, 150 insertions(+), 6 deletions(-)

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



diff --git a/datasources/mmv_performance_country_api.json 
b/datasources/mmv_performance_country_api.json
index 1e6cdcf..b2ff8cb 100644
--- a/datasources/mmv_performance_country_api.json
+++ b/datasources/mmv_performance_country_api.json
@@ -26,6 +26,26 @@
 "id": "sample_size",
 "label": "Sample size",
 "type": "float"
+},
+{
+"id": "1st_percentile",
+"label": "1st percentile",
+"type": "float"
+},
+{
+"id": "50th_percentile",
+"label": "50th percentile",
+"type": "float"
+},
+{
+"id": "90th_percentile",
+"label": "90th percentile",
+"type": "float"
+},
+{
+"id": "99th_percentile",
+"label": "99th percentile",
+"type": "float"
 }
 ]
 }
\ No newline at end of file
diff --git a/datasources/mmv_performance_country_image.json 
b/datasources/mmv_performance_country_image.json
index 543b325..9596dfc 100644
--- a/datasources/mmv_performance_country_image.json
+++ b/datasources/mmv_performance_country_image.json
@@ -26,6 +26,26 @@
 "id": "sample_size",
 "label": "Sample size",
 "type": "float"
+},
+{
+"id": "1st_percentile",
+"label": "1st percentile",
+"type": "float"
+},
+{
+"id": "50th_percentile",
+"label": "50th percentile",
+"type": "float"
+},
+{
+"id": "90th_percentile",
+"label": "90th percentile",
+"type": "float"
+},
+{
+"id": "99th_percentile",
+"label": "99th percentile",
+"type": "float"
 }
 ]
 }
\ No newline at end of file
diff --git a/graphs/mmv_performance_country_api.json 
b/graphs/mmv_performance_country_api.json
index dc05580..a2ed42d 100644
--- a/graphs/mmv_performance_country_api.json
+++ b/graphs/mmv_performance_country_api.json
@@ -32,10 +32,49 @@
 "type": "Number"
 },
 "options": {
-"label": "Mean",
-"scale": "log",
+"label": "Geometric mean",
+"valueFormat": ",.3r",
+"valueUnitSuffix": "ms"
+}
+},
+{
+"nodeType": "geo-feature",
+"metric": {
+"source_id": "mmv_performance_country_api",
+"source_col": "1st_percentile",
+"type": "Number"
+},
+"options": {
+"label": "1st percentile",
+"valueFormat": ",.3r",
+"valueUnitSuffix": "ms"
+}
+},
+{
+"nodeType": "geo-feature",
+"metric": {
+"source_id": "mmv_performance_country_api",
+"source_col": "50th_percentile",
+"type": "Number"
+},
+"options": {
+"label": "50th percentile",
+"valueFormat": ",.3r",
+"valueUnitSuffix": "ms"
+}
+},
+{
+"nodeType": "geo-feature",
+"metric": {
+"source_id": "mmv_performance_country_api",
+"source_col": "90th_percentile",
+"type": "Number"
+},
+"options": {
+"label": "90th percentile",
 "valueFormat": ",.3r",
 "valueUnitSuffix": "ms",
+"scale": "log",
 "fill": [
 "#00FF00",
 "#FF

[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: 43c0341..265a739 - change (mediawiki/extensions)

2014-04-30 Thread Jenkins-mwext-sync (Code Review)

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

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

Change subject: Syncronize VisualEditor: 43c0341..265a739
..

Syncronize VisualEditor: 43c0341..265a739

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


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

diff --git a/VisualEditor b/VisualEditor
index 43c0341..265a739 16
--- a/VisualEditor
+++ b/VisualEditor
-Subproject commit 43c0341ad31ab6e3f6550b98cbcf0a7396269dd9
+Subproject commit 265a739c0777ce86ba7052bc87d757512ccc7f37

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iba191a918b5c614a393233cfaf72d1c94ef65d5c
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] Use window 'ready' event to focus surfaces - change (mediawiki...VisualEditor)

2014-04-30 Thread jenkins-bot (Code Review)

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

Change subject: Use window 'ready' event to focus surfaces
..


Use window 'ready' event to focus surfaces

Depends on I57864586b in OOUI.

Change-Id: Ic9a6e8d466c4d8b1273f54e621bb5a6cab50be53
---
M modules/ve-mw/ui/dialogs/ve.ui.MWMediaEditDialog.js
M modules/ve-mw/ui/dialogs/ve.ui.MWReferenceDialog.js
2 files changed, 6 insertions(+), 6 deletions(-)

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



diff --git a/modules/ve-mw/ui/dialogs/ve.ui.MWMediaEditDialog.js 
b/modules/ve-mw/ui/dialogs/ve.ui.MWMediaEditDialog.js
index d23608c..6faf447 100644
--- a/modules/ve-mw/ui/dialogs/ve.ui.MWMediaEditDialog.js
+++ b/modules/ve-mw/ui/dialogs/ve.ui.MWMediaEditDialog.js
@@ -25,7 +25,7 @@
this.scalable = null;
 
// Events
-   this.connect( this, { 'open': 'onOpen' } );
+   this.connect( this, { 'ready': 'onReady' } );
 };
 
 /* Inheritance */
@@ -557,9 +557,9 @@
 };
 
 /**
- * Respond to 'open' event. Fires once the dialog has finished opening.
+ * Handle window ready events
  */
-ve.ui.MWMediaEditDialog.prototype.onOpen = function () {
+ve.ui.MWMediaEditDialog.prototype.onReady = function () {
// Focus the caption surface
this.captionSurface.focus();
 };
diff --git a/modules/ve-mw/ui/dialogs/ve.ui.MWReferenceDialog.js 
b/modules/ve-mw/ui/dialogs/ve.ui.MWReferenceDialog.js
index ffe3f0f..03960f0 100644
--- a/modules/ve-mw/ui/dialogs/ve.ui.MWReferenceDialog.js
+++ b/modules/ve-mw/ui/dialogs/ve.ui.MWReferenceDialog.js
@@ -22,7 +22,7 @@
this.referenceModel = null;
 
// Events
-   this.connect( this, { 'open': 'onOpen' } );
+   this.connect( this, { 'ready': 'onReady' } );
 };
 
 /* Inheritance */
@@ -155,9 +155,9 @@
 };
 
 /**
- * Respond to 'open' event. Fires once the dialog has finished opening.
+ * Handle window ready events
  */
-ve.ui.MWReferenceDialog.prototype.onOpen = function () {
+ve.ui.MWReferenceDialog.prototype.onReady = function () {
// Focus the reference surface
this.referenceSurface.focus();
 };

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic9a6e8d466c4d8b1273f54e621bb5a6cab50be53
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders 
Gerrit-Reviewer: Catrope 
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: 43c0341..265a739 - change (mediawiki/extensions)

2014-04-30 Thread Jenkins-mwext-sync (Code Review)

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

Change subject: Syncronize VisualEditor: 43c0341..265a739
..


Syncronize VisualEditor: 43c0341..265a739

Change-Id: Iba191a918b5c614a393233cfaf72d1c94ef65d5c
---
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 43c0341..265a739 16
--- a/VisualEditor
+++ b/VisualEditor
-Subproject commit 43c0341ad31ab6e3f6550b98cbcf0a7396269dd9
+Subproject commit 265a739c0777ce86ba7052bc87d757512ccc7f37

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Iba191a918b5c614a393233cfaf72d1c94ef65d5c
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] Call clearAllMessages in setup instead of swapPanel on the s... - change (mediawiki...VisualEditor)

2014-04-30 Thread jenkins-bot (Code Review)

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

Change subject: Call clearAllMessages in setup instead of swapPanel on the save 
dialog
..


Call clearAllMessages in setup instead of swapPanel on the save dialog

Was clearing things like captchas when swapping panels. It still makes
sense to clear these when opening up the dialog though.

Bug: 62766
Change-Id: I37ceeebc672e2866b805631b189108d8363bdc9f
---
M modules/ve-mw/ui/dialogs/ve.ui.MWSaveDialog.js
1 file changed, 3 insertions(+), 3 deletions(-)

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



diff --git a/modules/ve-mw/ui/dialogs/ve.ui.MWSaveDialog.js 
b/modules/ve-mw/ui/dialogs/ve.ui.MWSaveDialog.js
index 14fda4a..f2c83ab 100644
--- a/modules/ve-mw/ui/dialogs/ve.ui.MWSaveDialog.js
+++ b/modules/ve-mw/ui/dialogs/ve.ui.MWSaveDialog.js
@@ -112,9 +112,6 @@
// Update the window title
this.setTitle( ve.msg( 'visualeditor-savedialog-title-' + panel ) );
 
-   // Old messages should not persist after panel changes
-   this.clearAllMessages();
-
// Reset save button if we disabled it for e.g. unrecoverable spam error
this.saveButton.setDisabled( false );
 
@@ -428,6 +425,9 @@
  * @inheritdoc
  */
 ve.ui.MWSaveDialog.prototype.setup = function () {
+   // Old messages should not persist after panel changes
+   this.clearAllMessages();
+
this.swapPanel( 'save' );
 };
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I37ceeebc672e2866b805631b189108d8363bdc9f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Alex Monk 
Gerrit-Reviewer: Trevor Parscal 
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: 265a739..c3a043f - change (mediawiki/extensions)

2014-04-30 Thread Jenkins-mwext-sync (Code Review)

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

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

Change subject: Syncronize VisualEditor: 265a739..c3a043f
..

Syncronize VisualEditor: 265a739..c3a043f

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


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions 
refs/changes/49/130649/1

diff --git a/VisualEditor b/VisualEditor
index 265a739..c3a043f 16
--- a/VisualEditor
+++ b/VisualEditor
-Subproject commit 265a739c0777ce86ba7052bc87d757512ccc7f37
+Subproject commit c3a043f206c2671ad83f7343183afdac55d9efd8

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I405cca43f02b844fc80119b40820413f47a419fd
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: 265a739..c3a043f - change (mediawiki/extensions)

2014-04-30 Thread Jenkins-mwext-sync (Code Review)

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

Change subject: Syncronize VisualEditor: 265a739..c3a043f
..


Syncronize VisualEditor: 265a739..c3a043f

Change-Id: I405cca43f02b844fc80119b40820413f47a419fd
---
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 265a739..c3a043f 16
--- a/VisualEditor
+++ b/VisualEditor
-Subproject commit 265a739c0777ce86ba7052bc87d757512ccc7f37
+Subproject commit c3a043f206c2671ad83f7343183afdac55d9efd8

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I405cca43f02b844fc80119b40820413f47a419fd
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] Hiding the keyboard when navigation drawer is pulled out - change (apps...wikipedia)

2014-04-30 Thread jenkins-bot (Code Review)

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

Change subject: Hiding the keyboard when navigation drawer is pulled out
..


Hiding the keyboard when navigation drawer is pulled out

Bug: 64339
Change-Id: If29cefc79752c82cb5742eca10af88e39725ee5e
---
M wikipedia/src/main/java/org/wikipedia/search/SearchArticlesFragment.java
1 file changed, 5 insertions(+), 0 deletions(-)

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



diff --git 
a/wikipedia/src/main/java/org/wikipedia/search/SearchArticlesFragment.java 
b/wikipedia/src/main/java/org/wikipedia/search/SearchArticlesFragment.java
index 4938d62..6286b71 100644
--- a/wikipedia/src/main/java/org/wikipedia/search/SearchArticlesFragment.java
+++ b/wikipedia/src/main/java/org/wikipedia/search/SearchArticlesFragment.java
@@ -283,6 +283,11 @@
 params.gravity = Gravity.CENTER_VERTICAL; // Needed because 
this seems to get reset otherwise. hmpf.
 drawerIndicator.setLayoutParams(params);
 }
+@Override
+public void onDrawerOpened(View drawerView) {
+// Hide the keyboard when the drawer is opened
+Utils.hideSoftKeyboard(getActivity());
+}
 });
 
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: If29cefc79752c82cb5742eca10af88e39725ee5e
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Dbrant 
Gerrit-Reviewer: Yuvipanda 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] multigit.sh: Clean the repo before checking out a new branch. - change (integration/jenkins)

2014-04-30 Thread jenkins-bot (Code Review)

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

Change subject: multigit.sh: Clean the repo before checking out a new branch.
..


multigit.sh: Clean the repo before checking out a new branch.

`git checkout` will fail if the tree is dirty.  We then don't need to clean
after the checkout, since the tree will already be clean.

Change-Id: I4de756bb3ccc637f6f544cbe884cf4984597d32d
---
M bin/multigit.sh
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/bin/multigit.sh b/bin/multigit.sh
index f6642c5..15dc6fe 100755
--- a/bin/multigit.sh
+++ b/bin/multigit.sh
@@ -174,9 +174,9 @@
reset_branch="remotes/origin/$branch"
fi
set -x
+   git clean -q -x -f -d
git checkout $branch
git reset --hard $reset_branch
-   git clean -q -x -f -d
set +x
 }
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I4de756bb3ccc637f6f544cbe884cf4984597d32d
Gerrit-PatchSet: 3
Gerrit-Project: integration/jenkins
Gerrit-Branch: master
Gerrit-Owner: Cscott 
Gerrit-Reviewer: Cscott 
Gerrit-Reviewer: GWicke 
Gerrit-Reviewer: Hashar 
Gerrit-Reviewer: Krinkle 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Wait two minutes before checking if queue shrinks - change (mediawiki...CirrusSearch)

2014-04-30 Thread Manybubbles (Code Review)

Manybubbles has uploaded a new change for review.

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

Change subject: Wait two minutes before checking if queue shrinks
..

Wait two minutes before checking if queue shrinks

Waiting less time might cause the job to stop dueue to redis count lag.

Change-Id: Idf506f9e2eb5993571d7c7385bc234442ecd277a
---
M maintenance/forceSearchIndex.php
1 file changed, 6 insertions(+), 1 deletion(-)


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

diff --git a/maintenance/forceSearchIndex.php b/maintenance/forceSearchIndex.php
index 8845d02..af77a95 100644
--- a/maintenance/forceSearchIndex.php
+++ b/maintenance/forceSearchIndex.php
@@ -224,6 +224,7 @@
$this->output( "$operationName a total of $completed pages at 
$rate/second\n" );
 
$lastQueueSizeForOurJob = PHP_INT_MAX;
+   $waitStartTime = microtime( true );
if ( $this->queue ) {
$this->output( "Waiting for jobs to drain from the 
queue\n" );
while ( true ) {
@@ -237,9 +238,13 @@
"and it'll wait for them to 
empty.\n" );
break;
}
+   if ( microtime( true ) - $waitStartTime > 120 ) 
{
+   // Wait at least two full minutes 
before we check if the job count went down.
+   // Less then that and we might be 
seeing lag from redis's counts.
+   $lastQueueSizeForOurJob = 
$queueSizeForOurJob;
+   }
$this->output( "$queueSizeForOurJob jobs left 
on the queue.\n" );
usleep( 
self::SECONDS_BETWEEN_JOB_QUEUE_LENGTH_CHECKS * 100 );
-   $lastQueueSizeForOurJob = $queueSizeForOurJob;
}
}
}

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki.util: Clean up mw.util.$content - change (mediawiki/core)

2014-04-30 Thread Krinkle (Code Review)

Krinkle has uploaded a new change for review.

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

Change subject: mediawiki.util: Clean up mw.util.$content
..

mediawiki.util: Clean up mw.util.$content

* Document how to use it (including the tricky bit with it needing
 a dependency on mediawiki.page.startup).

* Refer to mw.hook and #mw-content-text as recommended method of
  getting just the wikipage content.

* Remove the deprecated backwards-compatibility selectors.
  The core skins (Vector, Monobook, Modern, CologneBlue) all
  have mw-body now. Third-party skins should adopt those if they
  haven't already.

Change-Id: I30bdd893e0a0a340076efa7ce32fbd4b775bc3db
---
M resources/src/mediawiki/mediawiki.util.js
1 file changed, 32 insertions(+), 33 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/51/130651/1

diff --git a/resources/src/mediawiki/mediawiki.util.js 
b/resources/src/mediawiki/mediawiki.util.js
index eb20d22..27a89c5 100644
--- a/resources/src/mediawiki/mediawiki.util.js
+++ b/resources/src/mediawiki/mediawiki.util.js
@@ -13,49 +13,33 @@
 * (don't call before document ready)
 */
init: function () {
-   /* Fill $content var */
util.$content = ( function () {
-   var i, l, $content, selectors;
+   var i, l, $node, selectors;
+
selectors = [
-   // The preferred standard for setting 
$content (class="mw-body")
-   // You may also use (class="mw-body 
mw-body-primary") if you use
-   // mw-body in multiple locations.
-   // Or class="mw-body-primary" if you 
want $content to be deeper
-   // in the dom than mw-body
+   // The preferred standard is class 
"mw-body".
+   // You may also use class "mw-body 
mw-body-primary" if you use
+   // mw-body in multiple locations. Or 
class "mw-body-primary" if
+   // you use mw-body deeper in the DOM.
'.mw-body-primary',
'.mw-body',
 
-   /* Legacy fallbacks for setting the 
content */
-   // Vector, Monobook, Chick, etc... 
based skins
-   '#bodyContent',
-
-   // Modern based skins
-   '#mw_contentholder',
-
-   // Standard, CologneBlue
-   '#article',
-
-   // #content is present on almost all if 
not all skins. Most skins (the above cases)
-   // have #content too, but as an outer 
wrapper instead of the article text container.
-   // The skins that don't have an outer 
wrapper do have #content for everything
-   // so it's a good fallback
-   '#content',
-
-   // If nothing better is found fall back 
to our bodytext div that is guaranteed to be here
+   // If the skin has no such class, fall 
back to the parser output
'#mw-content-text',
 
-   // Should never happen... well, it 
could if someone is not finished writing a skin and has
-   // not inserted bodytext yet. But in 
any case  should always exist
+   // Should never happen... well, it 
could if someone is not finished writing a
+   // skin and has not yet inserted 
bodytext yet.
'body'
];
+
for ( i = 0, l = selectors.length; i < l; i++ ) 
{
-   $content = $( selectors[i] ).first();
-   if ( $content.length ) {
-   return $content;
+   $node = $( selectors[i] );
+   if ( $node.length ) {
+   return $node.first();
}
}
 
-   // Make sure we don't unset util.$content if it 
was preset and we don't find anything
+

[MediaWiki-commits] [Gerrit] multigit.sh: Don't let dirty files prevent a checkout. - change (integration/jenkins)

2014-04-30 Thread Cscott (Code Review)

Cscott has uploaded a new change for review.

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

Change subject: multigit.sh: Don't let dirty files prevent a checkout.
..

multigit.sh: Don't let dirty files prevent a checkout.

Change-Id: Iae63dcc8a5d04aae874ff080351e792550cab87c
---
M bin/multigit.sh
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/jenkins 
refs/changes/52/130652/1

diff --git a/bin/multigit.sh b/bin/multigit.sh
index 15dc6fe..dfca5d7 100755
--- a/bin/multigit.sh
+++ b/bin/multigit.sh
@@ -175,7 +175,7 @@
fi
set -x
git clean -q -x -f -d
-   git checkout $branch
+   git checkout -f $branch
git reset --hard $reset_branch
set +x
 }

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

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

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

[MediaWiki-commits] [Gerrit] Wait two minutes before checking if queue shrinks - change (mediawiki...CirrusSearch)

2014-04-30 Thread jenkins-bot (Code Review)

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

Change subject: Wait two minutes before checking if queue shrinks
..


Wait two minutes before checking if queue shrinks

Waiting less time might cause the job to stop dueue to redis count lag.

Change-Id: Idf506f9e2eb5993571d7c7385bc234442ecd277a
---
M maintenance/forceSearchIndex.php
1 file changed, 6 insertions(+), 1 deletion(-)

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



diff --git a/maintenance/forceSearchIndex.php b/maintenance/forceSearchIndex.php
index 8845d02..af77a95 100644
--- a/maintenance/forceSearchIndex.php
+++ b/maintenance/forceSearchIndex.php
@@ -224,6 +224,7 @@
$this->output( "$operationName a total of $completed pages at 
$rate/second\n" );
 
$lastQueueSizeForOurJob = PHP_INT_MAX;
+   $waitStartTime = microtime( true );
if ( $this->queue ) {
$this->output( "Waiting for jobs to drain from the 
queue\n" );
while ( true ) {
@@ -237,9 +238,13 @@
"and it'll wait for them to 
empty.\n" );
break;
}
+   if ( microtime( true ) - $waitStartTime > 120 ) 
{
+   // Wait at least two full minutes 
before we check if the job count went down.
+   // Less then that and we might be 
seeing lag from redis's counts.
+   $lastQueueSizeForOurJob = 
$queueSizeForOurJob;
+   }
$this->output( "$queueSizeForOurJob jobs left 
on the queue.\n" );
usleep( 
self::SECONDS_BETWEEN_JOB_QUEUE_LENGTH_CHECKS * 100 );
-   $lastQueueSizeForOurJob = $queueSizeForOurJob;
}
}
}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Idf506f9e2eb5993571d7c7385bc234442ecd277a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CirrusSearch
Gerrit-Branch: master
Gerrit-Owner: Manybubbles 
Gerrit-Reviewer: Chad 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] tweak to allow namespaced & static member getForm methods - change (wikimedia...drupal)

2014-04-30 Thread Adamw (Code Review)

Adamw has uploaded a new change for review.

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

Change subject: tweak to allow namespaced & static member getForm methods
..

tweak to allow namespaced & static member getForm methods

Change-Id: Ifd7b86c835ad6ebd7bcddda2080e3e5754a459aa
---
M includes/form.inc
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm/drupal 
refs/changes/53/130653/1

diff --git a/includes/form.inc b/includes/form.inc
index fd80e09..d464465 100644
--- a/includes/form.inc
+++ b/includes/form.inc
@@ -789,7 +789,7 @@
 
   // We first check to see if there's a function named after the $form_id.
   // If there is, we simply pass the arguments on to it to get the form.
-  if (!function_exists($form_id)) {
+  if (!is_callable($form_id)) {
 // In cases where many form_ids need to share a central constructor 
function,
 // such as the node editing form, modules can implement hook_forms(). It
 // maps one or more form_ids to the correct constructor functions.

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ifd7b86c835ad6ebd7bcddda2080e3e5754a459aa
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm/drupal
Gerrit-Branch: master
Gerrit-Owner: Adamw 

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

[MediaWiki-commits] [Gerrit] multigit.sh: Don't let dirty files prevent a checkout. - change (integration/jenkins)

2014-04-30 Thread jenkins-bot (Code Review)

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

Change subject: multigit.sh: Don't let dirty files prevent a checkout.
..


multigit.sh: Don't let dirty files prevent a checkout.

This reverts 6d95448aa9f4c5611f91da2c2d27667fb420f766 and fixes the
problem in a better way: just add the `-f` option to `git checkout`.

Change-Id: Iae63dcc8a5d04aae874ff080351e792550cab87c
---
M bin/multigit.sh
1 file changed, 2 insertions(+), 2 deletions(-)

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



diff --git a/bin/multigit.sh b/bin/multigit.sh
index 15dc6fe..62da0ba 100755
--- a/bin/multigit.sh
+++ b/bin/multigit.sh
@@ -174,9 +174,9 @@
reset_branch="remotes/origin/$branch"
fi
set -x
-   git clean -q -x -f -d
-   git checkout $branch
+   git checkout -f $branch
git reset --hard $reset_branch
+   git clean -q -x -f -d
set +x
 }
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Iae63dcc8a5d04aae874ff080351e792550cab87c
Gerrit-PatchSet: 2
Gerrit-Project: integration/jenkins
Gerrit-Branch: master
Gerrit-Owner: Cscott 
Gerrit-Reviewer: Hashar 
Gerrit-Reviewer: Krinkle 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] HtmlFormatter: fix check for empty ruleset - change (mediawiki/core)

2014-04-30 Thread MaxSem (Code Review)

MaxSem has uploaded a new change for review.

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

Change subject: HtmlFormatter: fix check for empty ruleset
..

HtmlFormatter: fix check for empty ruleset

This ensures that no unneeded HTML parse will occur

Change-Id: I2fae4bea555f823e5244c1430f9f3f43a3f78b71
---
M includes/HtmlFormatter.php
M tests/phpunit/includes/HtmlFormatterTest.php
2 files changed, 27 insertions(+), 2 deletions(-)


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

diff --git a/includes/HtmlFormatter.php b/includes/HtmlFormatter.php
index 83d0530..d02a954 100644
--- a/includes/HtmlFormatter.php
+++ b/includes/HtmlFormatter.php
@@ -136,7 +136,13 @@
wfProfileIn( __METHOD__ );
$removals = $this->parseItemsToRemove();
 
-   if ( !$removals ) {
+   // Bail out early if nothing to do
+   if ( array_reduce( $removals,
+   function( $carry, $item ) {
+   return $carry && !$item;
+   },
+   true
+   ) ) {
wfProfileOut( __METHOD__ );
return array();
}
diff --git a/tests/phpunit/includes/HtmlFormatterTest.php 
b/tests/phpunit/includes/HtmlFormatterTest.php
index 10ccc4f..175fc7f 100644
--- a/tests/phpunit/includes/HtmlFormatterTest.php
+++ b/tests/phpunit/includes/HtmlFormatterTest.php
@@ -6,7 +6,11 @@
 class HtmlFormatterTest extends MediaWikiTestCase {
/**
 * @dataProvider getHtmlData
-* @covers HtmlFormatter::getText
+*
+* @param string $input
+* @param $expectedText
+* @param array $expectedRemoved
+* @param callable|bool $callback
 */
public function testTransform( $input, $expectedText,
$expectedRemoved = array(), $callback = false
@@ -103,4 +107,19 @@
),
);
}
+
+   public function testQuickProcessing() {
+   $f = new MockHtmlFormatter( 'foo' );
+   $f->filterContent();
+   $this->assertFalse( $f->hasDoc, 'HtmlFormatter should not 
needlessly parse HTML' );
+   }
+}
+
+class MockHtmlFormatter extends HtmlFormatter {
+   public $hasDoc = false;
+
+   public function getDoc() {
+   $this->hasDoc = true;
+   return parent::getDoc();
+   }
 }

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

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

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

[MediaWiki-commits] [Gerrit] Consistent use the same IIFE style in javascript - change (mediawiki/core)

2014-04-30 Thread jenkins-bot (Code Review)

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

Change subject: Consistent use the same IIFE style in javascript
..


Consistent use the same IIFE style in javascript

Most of our IIFE (Immediately-Invoced Function Expression) were
already the same way, these two were different. Made them
consistent (parenthesis on the outside).

$ ack '\}\s*\([^)]+\)\s*\)' --js resources/src/ skins/
  81 matches (0 false positives)

$ ack '\}\s*\)\s*\(' --js resources/src/ skins/
  6 matches (2 false positives, 2 in upstream forks)

Fixed the two matches in the last one that weren't upstream forks.

Change-Id: I51da0e7eb3c0a7071af0ebaa3310e31c99b9d3a5
---
M resources/src/mediawiki.page/mediawiki.page.gallery.js
M resources/src/mediawiki/mediawiki.util.js
2 files changed, 3 insertions(+), 3 deletions(-)

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



diff --git a/resources/src/mediawiki.page/mediawiki.page.gallery.js 
b/resources/src/mediawiki.page/mediawiki.page.gallery.js
index 671cec6..e7c962f 100644
--- a/resources/src/mediawiki.page/mediawiki.page.gallery.js
+++ b/resources/src/mediawiki.page/mediawiki.page.gallery.js
@@ -247,7 +247,7 @@
}
}
}
-   } )();
+   }() );
} );
} );
-} )( jQuery, mediaWiki );
+}( jQuery, mediaWiki ) );
diff --git a/resources/src/mediawiki/mediawiki.util.js 
b/resources/src/mediawiki/mediawiki.util.js
index eb20d22..f09d03c 100644
--- a/resources/src/mediawiki/mediawiki.util.js
+++ b/resources/src/mediawiki/mediawiki.util.js
@@ -57,7 +57,7 @@
 
// Make sure we don't unset util.$content if it 
was preset and we don't find anything
return util.$content;
-   } )();
+   }() );
},
 
/* Main body */

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I51da0e7eb3c0a7071af0ebaa3310e31c99b9d3a5
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Krinkle 
Gerrit-Reviewer: Bartosz Dziewoński 
Gerrit-Reviewer: Jack Phoenix 
Gerrit-Reviewer: Siebrand 
Gerrit-Reviewer: TheDJ 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki.api.test: Remove unused Sinon clocks - change (mediawiki/core)

2014-04-30 Thread jenkins-bot (Code Review)

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

Change subject: mediawiki.api.test: Remove unused Sinon clocks
..


mediawiki.api.test: Remove unused Sinon clocks

Change-Id: I64dcd0a97c94e0b3ba1d6e98d0514e31315a24b9
---
M tests/qunit/suites/resources/mediawiki.api/mediawiki.api.parse.test.js
M tests/qunit/suites/resources/mediawiki.api/mediawiki.api.test.js
M tests/qunit/suites/resources/mediawiki.api/mediawiki.api.watch.test.js
3 files changed, 0 insertions(+), 12 deletions(-)

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



diff --git 
a/tests/qunit/suites/resources/mediawiki.api/mediawiki.api.parse.test.js 
b/tests/qunit/suites/resources/mediawiki.api/mediawiki.api.parse.test.js
index 70bcaf9..cd0db7c 100644
--- a/tests/qunit/suites/resources/mediawiki.api/mediawiki.api.parse.test.js
+++ b/tests/qunit/suites/resources/mediawiki.api/mediawiki.api.parse.test.js
@@ -1,11 +1,7 @@
 ( function ( mw ) {
QUnit.module( 'mediawiki.api.parse', QUnit.newMwEnvironment( {
setup: function () {
-   this.clock = this.sandbox.useFakeTimers();
this.server = this.sandbox.useFakeServer();
-   },
-   teardown: function () {
-   this.clock.tick( 1 );
}
} ) );
 
diff --git a/tests/qunit/suites/resources/mediawiki.api/mediawiki.api.test.js 
b/tests/qunit/suites/resources/mediawiki.api/mediawiki.api.test.js
index 4ee8afa..a93f572 100644
--- a/tests/qunit/suites/resources/mediawiki.api/mediawiki.api.test.js
+++ b/tests/qunit/suites/resources/mediawiki.api/mediawiki.api.test.js
@@ -1,11 +1,7 @@
 ( function ( mw ) {
QUnit.module( 'mediawiki.api', QUnit.newMwEnvironment( {
setup: function () {
-   this.clock = this.sandbox.useFakeTimers();
this.server = this.sandbox.useFakeServer();
-   },
-   teardown: function () {
-   this.clock.tick( 1 );
}
} ) );
 
diff --git 
a/tests/qunit/suites/resources/mediawiki.api/mediawiki.api.watch.test.js 
b/tests/qunit/suites/resources/mediawiki.api/mediawiki.api.watch.test.js
index e178090..5965ab7 100644
--- a/tests/qunit/suites/resources/mediawiki.api/mediawiki.api.watch.test.js
+++ b/tests/qunit/suites/resources/mediawiki.api/mediawiki.api.watch.test.js
@@ -1,11 +1,7 @@
 ( function ( mw ) {
QUnit.module( 'mediawiki.api.watch', QUnit.newMwEnvironment( {
setup: function () {
-   this.clock = this.sandbox.useFakeTimers();
this.server = this.sandbox.useFakeServer();
-   },
-   teardown: function () {
-   this.clock.tick( 1 );
}
} ) );
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I64dcd0a97c94e0b3ba1d6e98d0514e31315a24b9
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Krinkle 
Gerrit-Reviewer: Bartosz Dziewoński 
Gerrit-Reviewer: Siebrand 
Gerrit-Reviewer: TheDJ 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Update icon set from design svg. - change (apps...wikipedia)

2014-04-30 Thread Brion VIBBER (Code Review)

Brion VIBBER has submitted this change and it was merged.

Change subject: Update icon set from design svg.
..


Update icon set from design svg.

Adds a gray thingie at the bottom. Not my favorite, but eh.

Change-Id: I780f8ad5d28e131ce148630adfe2fa49bb8bc62d
---
M wikipedia/Images.xcassets/AppIcon.appiconset/icon100.png
M wikipedia/Images.xcassets/AppIcon.appiconset/icon114.png
M wikipedia/Images.xcassets/AppIcon.appiconset/icon120.png
M wikipedia/Images.xcassets/AppIcon.appiconset/icon144.png
M wikipedia/Images.xcassets/AppIcon.appiconset/icon152.png
M wikipedia/Images.xcassets/AppIcon.appiconset/icon29.png
M wikipedia/Images.xcassets/AppIcon.appiconset/icon40.png
M wikipedia/Images.xcassets/AppIcon.appiconset/icon50.png
M wikipedia/Images.xcassets/AppIcon.appiconset/icon57.png
M wikipedia/Images.xcassets/AppIcon.appiconset/icon58.png
M wikipedia/Images.xcassets/AppIcon.appiconset/icon72.png
M wikipedia/Images.xcassets/AppIcon.appiconset/icon76.png
M wikipedia/Images.xcassets/AppIcon.appiconset/icon80.png
M wikipedia/Images.xcassets/AppIcon.appiconset/svg and notes/icon.svg
14 files changed, 23 insertions(+), 59 deletions(-)

Approvals:
  Brion VIBBER: Verified; Looks good to me, approved



diff --git a/wikipedia/Images.xcassets/AppIcon.appiconset/icon100.png 
b/wikipedia/Images.xcassets/AppIcon.appiconset/icon100.png
index 46e9221..f2cab74 100644
--- a/wikipedia/Images.xcassets/AppIcon.appiconset/icon100.png
+++ b/wikipedia/Images.xcassets/AppIcon.appiconset/icon100.png
Binary files differ
diff --git a/wikipedia/Images.xcassets/AppIcon.appiconset/icon114.png 
b/wikipedia/Images.xcassets/AppIcon.appiconset/icon114.png
index b57549f..b05f30f 100644
--- a/wikipedia/Images.xcassets/AppIcon.appiconset/icon114.png
+++ b/wikipedia/Images.xcassets/AppIcon.appiconset/icon114.png
Binary files differ
diff --git a/wikipedia/Images.xcassets/AppIcon.appiconset/icon120.png 
b/wikipedia/Images.xcassets/AppIcon.appiconset/icon120.png
index c3f36ec..5ea5d8d 100644
--- a/wikipedia/Images.xcassets/AppIcon.appiconset/icon120.png
+++ b/wikipedia/Images.xcassets/AppIcon.appiconset/icon120.png
Binary files differ
diff --git a/wikipedia/Images.xcassets/AppIcon.appiconset/icon144.png 
b/wikipedia/Images.xcassets/AppIcon.appiconset/icon144.png
index c4ee216..0e044a7 100644
--- a/wikipedia/Images.xcassets/AppIcon.appiconset/icon144.png
+++ b/wikipedia/Images.xcassets/AppIcon.appiconset/icon144.png
Binary files differ
diff --git a/wikipedia/Images.xcassets/AppIcon.appiconset/icon152.png 
b/wikipedia/Images.xcassets/AppIcon.appiconset/icon152.png
index be33d7f..96eeb95 100644
--- a/wikipedia/Images.xcassets/AppIcon.appiconset/icon152.png
+++ b/wikipedia/Images.xcassets/AppIcon.appiconset/icon152.png
Binary files differ
diff --git a/wikipedia/Images.xcassets/AppIcon.appiconset/icon29.png 
b/wikipedia/Images.xcassets/AppIcon.appiconset/icon29.png
index fef8e60..986e0f6 100644
--- a/wikipedia/Images.xcassets/AppIcon.appiconset/icon29.png
+++ b/wikipedia/Images.xcassets/AppIcon.appiconset/icon29.png
Binary files differ
diff --git a/wikipedia/Images.xcassets/AppIcon.appiconset/icon40.png 
b/wikipedia/Images.xcassets/AppIcon.appiconset/icon40.png
index 10efbc9..4174113 100644
--- a/wikipedia/Images.xcassets/AppIcon.appiconset/icon40.png
+++ b/wikipedia/Images.xcassets/AppIcon.appiconset/icon40.png
Binary files differ
diff --git a/wikipedia/Images.xcassets/AppIcon.appiconset/icon50.png 
b/wikipedia/Images.xcassets/AppIcon.appiconset/icon50.png
index ba7cb55..ebe6c47 100644
--- a/wikipedia/Images.xcassets/AppIcon.appiconset/icon50.png
+++ b/wikipedia/Images.xcassets/AppIcon.appiconset/icon50.png
Binary files differ
diff --git a/wikipedia/Images.xcassets/AppIcon.appiconset/icon57.png 
b/wikipedia/Images.xcassets/AppIcon.appiconset/icon57.png
index 7b3387e..63eb82f 100644
--- a/wikipedia/Images.xcassets/AppIcon.appiconset/icon57.png
+++ b/wikipedia/Images.xcassets/AppIcon.appiconset/icon57.png
Binary files differ
diff --git a/wikipedia/Images.xcassets/AppIcon.appiconset/icon58.png 
b/wikipedia/Images.xcassets/AppIcon.appiconset/icon58.png
index 0c177aa..fd2bbd8 100644
--- a/wikipedia/Images.xcassets/AppIcon.appiconset/icon58.png
+++ b/wikipedia/Images.xcassets/AppIcon.appiconset/icon58.png
Binary files differ
diff --git a/wikipedia/Images.xcassets/AppIcon.appiconset/icon72.png 
b/wikipedia/Images.xcassets/AppIcon.appiconset/icon72.png
index 0104e38..3992be0 100644
--- a/wikipedia/Images.xcassets/AppIcon.appiconset/icon72.png
+++ b/wikipedia/Images.xcassets/AppIcon.appiconset/icon72.png
Binary files differ
diff --git a/wikipedia/Images.xcassets/AppIcon.appiconset/icon76.png 
b/wikipedia/Images.xcassets/AppIcon.appiconset/icon76.png
index 6e662e4..b80ff1d 100644
--- a/wikipedia/Images.xcassets/AppIcon.appiconset/icon76.png
+++ b/wikipedia/Images.xcassets/AppIcon.appiconset/icon76.png
Binary files differ
diff --git a/wikipedia/Images.xcassets/AppIcon.appiconset/icon80.png 
b/w

[MediaWiki-commits] [Gerrit] Work around Cite reset issue - change (mediawiki...parsoid)

2014-04-30 Thread jenkins-bot (Code Review)

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

Change subject: Work around Cite reset issue
..


Work around Cite reset issue

The Cite extension does not currently handle resetState calls in
sub-pipelines, and relies on sharing a single Cite instance between all
pipelines. Fixing this is a longer project, so this patch works around the
issue for now by passing a flag indicating resetState calls in sub-pipelines
and ignoring the call in Cite in that case.

Change-Id: If3d426a5311a55d1c1530860d2b665d3681f1aa9
---
M lib/ext.Cite.js
M lib/mediawiki.parser.js
2 files changed, 8 insertions(+), 6 deletions(-)

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



diff --git a/lib/ext.Cite.js b/lib/ext.Cite.js
index f22f322..1e002c5 100644
--- a/lib/ext.Cite.js
+++ b/lib/ext.Cite.js
@@ -469,9 +469,11 @@
this.references = new References(this);
 };
 
-Cite.prototype.resetState = function() {
-   this.ref.reset();
-   this.references.reset( null, true );
+Cite.prototype.resetState = function(inSubPipeline) {
+   if (!inSubPipeline) {
+   this.ref.reset();
+   this.references.reset( null, true );
+   }
 };
 
 if (typeof module === "object") {
diff --git a/lib/mediawiki.parser.js b/lib/mediawiki.parser.js
index a0d2a2c..308639e 100644
--- a/lib/mediawiki.parser.js
+++ b/lib/mediawiki.parser.js
@@ -314,7 +314,7 @@
var pipe;
if ( this.pipelineCache[cacheKey].length ) {
pipe = this.pipelineCache[cacheKey].pop();
-   pipe.resetState();
+   pipe.resetState(true); // signal that we are resetting a 
sub-pipeline
// Clear both 'end' and 'document' handlers
pipe.removeAllListeners('end');
pipe.removeAllListeners('document');
@@ -425,8 +425,8 @@
  * Ex: parser tests. Currently only parser tests exercise
  * this functionality.
  */
-ParserPipeline.prototype.resetState = function() {
-   this._applyToStage("resetState", []);
+ParserPipeline.prototype.resetState = function(inSubPipeline) {
+   this._applyToStage("resetState", [inSubPipeline]);
 };
 
 /**

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

Gerrit-MessageType: merged
Gerrit-Change-Id: If3d426a5311a55d1c1530860d2b665d3681f1aa9
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/parsoid
Gerrit-Branch: master
Gerrit-Owner: GWicke 
Gerrit-Reviewer: Subramanya Sastry 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Defined WikiFont characters rather than pasting raw chars. - change (apps...wikipedia)

2014-04-30 Thread Brion VIBBER (Code Review)

Brion VIBBER has submitted this change and it was merged.

Change subject: Defined WikiFont characters rather than pasting raw chars.
..


Defined WikiFont characters rather than pasting raw chars.

As Brion pointed out, the raw chars don't render in xCode so
they're hard to read.

The define names I used are based on the names from the names
from the WikiFont repo's font.css file.

Change-Id: Ic7515a61ebdb8bcc4111d18eb9f5118e88dc689c
---
M Wikipedia.xcodeproj/project.pbxproj
A wikipedia/Defines/WMF_WikiFont_Chars.h
M wikipedia/View Controllers/MainMenu/MainMenuViewController.m
M wikipedia/View Controllers/PageHistory/PageHistoryViewController.m
M wikipedia/View Controllers/TopNav/NavController.m
5 files changed, 190 insertions(+), 21 deletions(-)

Approvals:
  Brion VIBBER: Verified; Looks good to me, approved



diff --git a/Wikipedia.xcodeproj/project.pbxproj 
b/Wikipedia.xcodeproj/project.pbxproj
index 1afeab0..cc51073 100644
--- a/Wikipedia.xcodeproj/project.pbxproj
+++ b/Wikipedia.xcodeproj/project.pbxproj
@@ -279,6 +279,7 @@
0466F44E183A30CC00EA1FD7 /* logo-search-placehol...@2x.png */ = 
{isa = PBXFileReference; lastKnownFileType = image.png; path = 
"logo-search-placehol...@2x.png"; sourceTree = ""; };
04735E5E18A5B42D00C89C30 /* LoginTokenOp.h */ = {isa = 
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = 
LoginTokenOp.h; sourceTree = ""; };
04735E5F18A5B42D00C89C30 /* LoginTokenOp.m */ = {isa = 
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path 
= LoginTokenOp.m; sourceTree = ""; };
+   047528A3190F0C2900F2CDA8 /* WMF_WikiFont_Chars.h */ = {isa = 
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = 
WMF_WikiFont_Chars.h; sourceTree = ""; };
0476967A18BBFC9400071963 /* AccountCreationOp.h */ = {isa = 
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = 
AccountCreationOp.h; sourceTree = ""; };
0476967B18BBFC9400071963 /* AccountCreationOp.m */ = {isa = 
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path 
= AccountCreationOp.m; sourceTree = ""; };
047801BC18AE987900DBB747 /* UIButton+ColorMask.h */ = {isa = 
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = 
"UIButton+ColorMask.h"; sourceTree = ""; };
@@ -641,6 +642,7 @@
children = (
04292FFC185FC026002A13FC /* Defines.h */,
043F18F118DCDD3A00D8489A /* WMF_Colors.h */,
+   047528A3190F0C2900F2CDA8 /* 
WMF_WikiFont_Chars.h */,
);
path = Defines;
sourceTree = "";
diff --git a/wikipedia/Defines/WMF_WikiFont_Chars.h 
b/wikipedia/Defines/WMF_WikiFont_Chars.h
new file mode 100644
index 000..b2eebb7
--- /dev/null
+++ b/wikipedia/Defines/WMF_WikiFont_Chars.h
@@ -0,0 +1,161 @@
+
+/* UI ELEMENTS e000_023 */
+
+#define WIKIFONT_CHAR_MAGNIFYING_GLASS   @"\ue000"
+
+#define WIKIFONT_CHAR_ARROW_LEFT @"\ue001"
+
+#define WIKIFONT_CHAR_TICK   @"\ue002"
+
+#define WIKIFONT_CHAR_X  @"\ue003"
+
+#define WIKIFONT_CHAR_X_CIRCLE   @"\ue004"
+
+#define WIKIFONT_CHAR_UNSTAR @"\ue005"
+
+#define WIKIFONT_CHAR_STAR   @"\ue006"
+
+#define WIKIFONT_CHAR_SUN@"\ue007"
+
+#define WIKIFONT_CHAR_STAR_CIRCLE@"\ue008"
+
+#define WIKIFONT_CHAR_FUNNEL @"\ue009"
+
+#define WIKIFONT_CHAR_EYE@"\ue010"
+
+#define WIKIFONT_CHAR_EYE_LID@"\ue011"
+
+#define WIKIFONT_CHAR_BOOKMARK   @"\ue012"
+
+#define WIKIFONT_CHAR_PRINTER@"\ue013"
+
+#define WIKIFONT_CHAR_PUZZLE @"\ue014"
+
+#define WIKIFONT_CHAR_CLOCK  @"\ue015"
+
+#define WIKIFONT_CHAR_DICE   @"\ue016"
+
+#define WIKIFONT_CHAR_MOVE   @"\ue017"
+
+#define WIKIFONT_CHAR_GEAR   @"\ue018"
+
+#define WIKIFONT_CHAR_ELLIPSIS   @"\ue019"
+
+#define WIKIFONT_CHAR_ENVELOPE   @"\ue020"
+
+#define WIKIFONT_CHAR_PIN@"\ue021"
+
+#define WIKIFONT_CHAR_CARET  @"\ue022"
+
+#define WIKIFONT_CHAR_DOWNLOAD   @"\ue023"
+
+
+
+/* STRIPES e040_043 */
+
+#define WIKIFONT_CHAR_STRIPE_COMPACT @"\ue040"
+
+#define WIKIFONT_CHAR_STRIPE_TOC @"\ue041"
+
+#define WIKIFONT_CHAR_STRIPE_EXPANDED@"\ue042"
+
+
+
+/* WIKIPEDIA LOGO e400_401 */
+
+#define WIKIFONT_CHAR_W  @"\ue400"
+
+
+
+/* UI MODERATION ELEMENTS e500_508 */
+
+#defin

[MediaWiki-commits] [Gerrit] mw.ViewPageTarget: Simplify tab transform/restore logic - change (mediawiki...VisualEditor)

2014-04-30 Thread Krinkle (Code Review)

Krinkle has uploaded a new change for review.

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

Change subject: mw.ViewPageTarget: Simplify tab transform/restore logic
..

mw.ViewPageTarget: Simplify tab transform/restore logic

Follows-up I4b6e5c898a8af2b40415.

Change-Id: I5fc0f554d1770d3c8e5b961e74bdfb5741324910
---
M modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.js
1 file changed, 16 insertions(+), 10 deletions(-)


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

diff --git a/modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.js 
b/modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.js
index 0c69186..9d43fec 100644
--- a/modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.js
+++ b/modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.js
@@ -1373,11 +1373,13 @@
 ve.init.mw.ViewPageTarget.prototype.transformPage = function () {
var uri;
 
-   // Put skin tabs in "edit" mode
-   $( '#p-views' )
-   .find( 'li.selected' ).removeClass( 'selected' );
-   $( '#ca-ve-edit' )
-   .addClass( 'selected' );
+   // Deselect current mode (e.g. "read")
+   // Skins like monobook don't have separate tabs sections for content
+   // actions and and namespaces. In that case the below is a no-op.
+   $( '#p-views' ).find( 'li.selected' ).removeClass( 'selected' );
+
+   // Select our mode
+   $( '#ca-ve-edit' ).addClass( 'selected' );
 
// Hide site notice (if present)
$( '#siteNotice:visible' )
@@ -1405,11 +1407,15 @@
 ve.init.mw.ViewPageTarget.prototype.restorePage = function () {
var uri;
 
-   // Put skin tabs back in "view" mode
-   $( $( '#p-views' ).length ? '#p-views' : '#p-cactions' )
-   .find( 'li.selected' ).removeClass( 'selected' );
-   $( $( '#ca-view' ).length ? '#ca-view' : '#p-cactions > .pBody > ul > 
li:nth-child(1)' )
-   .addClass( 'selected' );
+   // Deselect our mode
+   $( '#ca-ve-edit' ).removeClass( 'selected' );
+
+   // Skins like monobook don't have a tab for view mode and indicate
+   // view mode by having the namespace tab selected without any extra tab
+   // selected for action. We didn't do anything to the namespace tab,
+   // so after deselecting ca-ve-edit, we're ready. In skins that do
+   // have a view mode (e.g. Vector), put selection back on that.
+   $( '#ca-view' ).addClass( 'selected' );
 
// Make site notice visible again (if present)
$( '#siteNotice.ve-hide' )

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

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

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

[MediaWiki-commits] [Gerrit] Adjust indent of some comment blocks - change (mediawiki/core)

2014-04-30 Thread Umherirrender (Code Review)

Umherirrender has uploaded a new change for review.

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

Change subject: Adjust indent of some comment blocks
..

Adjust indent of some comment blocks

Change-Id: Ic25419490fa6a35c11ccc2b7810527e6661e027c
---
M includes/DefaultSettings.php
M includes/FormOptions.php
M includes/Revision.php
M languages/messages/MessagesEl.php
M languages/messages/MessagesEn.php
M languages/messages/MessagesNn.php
M tests/phpunit/languages/LanguageGdTest.php
M tests/phpunit/languages/LanguageHeTest.php
8 files changed, 52 insertions(+), 52 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/55/130655/1

diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index 87dc025..8c96727 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -3601,14 +3601,14 @@
 );
 
 /**
-  * Array holding default tracking category names.
-  *
-  * Array contains the system messages for each tracking category.
-  * Tracking categories allow pages with certain characteristics to be tracked.
-  * It works by adding any such page to a category automatically.
-  *
-  * @since 1.23
-  */
+ * Array holding default tracking category names.
+ *
+ * Array contains the system messages for each tracking category.
+ * Tracking categories allow pages with certain characteristics to be tracked.
+ * It works by adding any such page to a category automatically.
+ *
+ * @since 1.23
+ */
 $wgTrackingCategories = array(
'index-category',
'noindex-category',
diff --git a/includes/FormOptions.php b/includes/FormOptions.php
index a8da67e..079267a 100644
--- a/includes/FormOptions.php
+++ b/includes/FormOptions.php
@@ -44,7 +44,7 @@
/** Integer type, maps guessType() to WebRequest::getInt() */
const INT = 1;
/** Float type, maps guessType() to WebRequest::getFloat()
- * @since 1.23 */
+* @since 1.23 */
const FLOAT = 4;
/** Boolean type, maps guessType() to WebRequest::getBool() */
const BOOL = 2;
diff --git a/includes/Revision.php b/includes/Revision.php
index afbd3ac..5a83d38 100644
--- a/includes/Revision.php
+++ b/includes/Revision.php
@@ -1201,18 +1201,18 @@
}
 
/**
- * Get revision text associated with an old or archive row
- * $row is usually an object from wfFetchRow(), both the flags and the 
text
- * field must be included.
- *
- * @param stdClass $row The text data
- * @param string $prefix Table prefix (default 'old_')
- * @param string|bool $wiki The name of the wiki to load the revision 
text from
- *   (same as the the wiki $row was loaded from) or false to indicate 
the local
- *   wiki (this is the default). Otherwise, it must be a symbolic wiki 
database
- *   identifier as understood by the LoadBalancer class.
- * @return string Text the text requested or false on failure
- */
+* Get revision text associated with an old or archive row
+* $row is usually an object from wfFetchRow(), both the flags and the 
text
+* field must be included.
+*
+* @param stdClass $row The text data
+* @param string $prefix Table prefix (default 'old_')
+* @param string|bool $wiki The name of the wiki to load the revision 
text from
+*   (same as the the wiki $row was loaded from) or false to indicate 
the local
+*   wiki (this is the default). Otherwise, it must be a symbolic wiki 
database
+*   identifier as understood by the LoadBalancer class.
+* @return string Text the text requested or false on failure
+*/
public static function getRevisionText( $row, $prefix = 'old_', $wiki = 
false ) {
wfProfileIn( __METHOD__ );
 
diff --git a/languages/messages/MessagesEl.php 
b/languages/messages/MessagesEl.php
index 9ed4447..b2627ff 100644
--- a/languages/messages/MessagesEl.php
+++ b/languages/messages/MessagesEl.php
@@ -10,28 +10,28 @@
  */
 
 /**
-  * Initial translation by Pasok Internet Volunteers
-  * http://forum.pasok.gr
-  * version 1.0 (initial release)
-  *
-  * The project for the translation of MediaWiki into Greek
-  * was undertaken by a group of ICT volunteers working under
-  * the auspices of the Greek political party PASOK.
-  *
-  * The idea behind this effort was  to provide an extensible,
-  * easy-to-use and non-intimidating tool for content development
-  * and project management, to be used throughout the administrative
-  * and political structure of PASOK by staff, volunteers, party members
-  * and elected officials (all of whom possess varying degrees of ICT skills).
-  *
-  * The PASOK ICT team and the volunteers who worked on this project are
-  * now returning the translated interface to the Open-Source Community
-  * with over 98% of the messages translated into

[MediaWiki-commits] [Gerrit] New site method expand_text() which uses api to parse text. - change (pywikibot/core)

2014-04-30 Thread jenkins-bot (Code Review)

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

Change subject: New site method expand_text() which uses api to parse text.
..


New site method expand_text() which uses api to parse text.

Change Page.expand_text() by calling this site method.
Change Site.getcurrenttimestamp() by calling this site method.

Change-Id: I88ad007a015787d93d2c00fe4b4acc1956ff2d0c
---
M pywikibot/page.py
M pywikibot/site.py
2 files changed, 40 insertions(+), 14 deletions(-)

Approvals:
  Ricordisamoa: Looks good to me, but someone else must approve
  Merlijn van Deen: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/pywikibot/page.py b/pywikibot/page.py
index 92607f7..754aba9 100644
--- a/pywikibot/page.py
+++ b/pywikibot/page.py
@@ -419,14 +419,22 @@
 """
 return self.properties(force=force).get('defaultsort')
 
-def expand_text(self, refresh=False):
-"""Return the page text with all templates expanded."""
-if not hasattr(self, "_expanded_text") or (
-self._expanded_text is None) or refresh:
-req = pywikibot.data.api.Request(
-action="expandtemplates", text=self.text,
-title=self.title(withSection=False), site=self.site)
-self._expanded_text = req.submit()["expandtemplates"]["*"]
+@deprecate_arg('refresh', 'force')
+def expand_text(self, force=False, includecomments=False):
+"""Return the page text with all templates and parser words expanded.
+
+@param force: force updating from the live site
+@param includecomments: Also strip comments if includecomments
+parameter is not True.
+@return: unicode or None
+
+"""
+if not hasattr(self, '_expanded_text') or (
+self._expanded_text is None) or force:
+self._expanded_text = self.site.expand_text(
+self.text,
+title=self.title(withSection=False),
+includecomments=includecomments)
 return self._expanded_text
 
 def userName(self):
diff --git a/pywikibot/site.py b/pywikibot/site.py
index fccf2f0..0132716 100644
--- a/pywikibot/site.py
+++ b/pywikibot/site.py
@@ -927,18 +927,36 @@
 
 return self._months_names
 
+def expand_text(self, text, title=None, includecomments=None):
+""" Parses the given text for preprocessing and rendering
+e.g expand templates and strip comments if includecomments
+parameter is not True. Keeps text inside
+ tags unchanges etc. Can be used to parse
+magic parser words like {{CURRENTTIMESTAMP}}.
+
+@param text: text to be expanded
+@type text: unicode
+@param title: page title without section
+@type title: unicode
+@param includecomments: if True do not strip comments
+@type includecomments: bool
+@return: unicode
+
+"""
+req = api.Request(site=self, action='expandtemplates', text=text)
+if title is not None:
+req['title'] = title
+if includecomments is True:
+req['includecomments'] = u''
+return req.submit()['expandtemplates']['*']
+
 def getcurrenttimestamp(self):
 """Return server time, {{CURRENTTIMESTAMP}}, as a string.
 
 Format is 'mmddhhmmss'
 
 """
-r = api.Request(site=self,
-action="parse",
-text="{{CURRENTTIMESTAMP}}",
-contentmodel="wikitext")
-result = r.submit()
-return re.search('\d+', result['parse']['text']['*']).group()
+return self.expand_text("{{CURRENTTIMESTAMP}}")
 
 def getcurrenttime(self):
 """Return a Timestamp object representing the current server time."""

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I88ad007a015787d93d2c00fe4b4acc1956ff2d0c
Gerrit-PatchSet: 14
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: Xqt 
Gerrit-Reviewer: Ladsgroup 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: Merlijn van Deen 
Gerrit-Reviewer: Pyfisch 
Gerrit-Reviewer: Ricordisamoa 
Gerrit-Reviewer: Russell Blau 
Gerrit-Reviewer: Xqt 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] PMD job for mediawiki/core - change (integration/jenkins-job-builder-config)

2014-04-30 Thread Hashar (Code Review)

Hashar has uploaded a new change for review.

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

Change subject: PMD job for mediawiki/core
..

PMD job for mediawiki/core

Change-Id: Iae5cc8626da9156504e931096e6ce1aac34924b2
---
M mediawiki.yaml
1 file changed, 16 insertions(+), 0 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/integration/jenkins-job-builder-config 
refs/changes/57/130657/1

diff --git a/mediawiki.yaml b/mediawiki.yaml
index d3be947..dc76b6c 100644
--- a/mediawiki.yaml
+++ b/mediawiki.yaml
@@ -311,6 +311,22 @@
  - ansicolor
  - timestamps
 
+- job:
+name: 'mediawiki-core-phpmd'
+node: gallium
+defaults: global
+builders:
+ - wipe-workspace
+ - get-mw-core:
+branch: 'master'
+ - shell: |
+ mkdir -p log
+ phpmd . xml codesize \
+--reportfile log/phpmd-codesize.xml \
+--suffixes php,inc \
+--exclude 'languages/messages/*'
+ - publisher:
+  -  # FIGURE OUT PHPMD plugin
 - project:
 name: mediawiki-core-regression
 branch:

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iae5cc8626da9156504e931096e6ce1aac34924b2
Gerrit-PatchSet: 1
Gerrit-Project: integration/jenkins-job-builder-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] When keyboard appears on edit, scroll cursor above keyboard. - change (apps...wikipedia)

2014-04-30 Thread Brion VIBBER (Code Review)

Brion VIBBER has submitted this change and it was merged.

Change subject: When keyboard appears on edit, scroll cursor above keyboard.
..


When keyboard appears on edit, scroll cursor above keyboard.

Change-Id: I0ee7969922cec156c67a1ca65cb67e0397006fac
---
M wikipedia/View Controllers/SectionEditor/SectionEditorViewController.m
1 file changed, 13 insertions(+), 0 deletions(-)

Approvals:
  Brion VIBBER: Verified; Looks good to me, approved



diff --git a/wikipedia/View 
Controllers/SectionEditor/SectionEditorViewController.m b/wikipedia/View 
Controllers/SectionEditor/SectionEditorViewController.m
index a7b5c84..ac59abd 100644
--- a/wikipedia/View Controllers/SectionEditor/SectionEditorViewController.m
+++ b/wikipedia/View Controllers/SectionEditor/SectionEditorViewController.m
@@ -295,6 +295,14 @@
 UIEdgeInsets contentInsets = UIEdgeInsetsMake(0.0, 0.0, 
viewKeyboardRect.size.height, 0.0);
 self.editTextView.contentInset = contentInsets;
 self.editTextView.scrollIndicatorInsets = contentInsets;
+
+// Mark the text view as needing a layout update so the inset changes 
above will
+// be taken in to account when the cursor is scrolled onscreen.
+[self.editTextView setNeedsLayout];
+[self.editTextView layoutIfNeeded];
+
+// Scroll cursor onscreen if needed.
+[self scrollTextViewSoCursorNotUnderKeyboard:self.editTextView];
 }
  
 - (void)keyboardWillBeHidden:(NSNotification*)aNotification
@@ -313,6 +321,11 @@
 CGRect cursorRectInTextView = [textView 
caretRectForPosition:textView.selectedTextRange.start];
 CGRect cursorRectInView = [textView convertRect:cursorRectInTextView 
toView:self.view];
 if(CGRectIntersectsRect(self.viewKeyboardRect, cursorRectInView)){
+
+CGFloat margin = -20;
+// Margin here is the amount the cursor will be scrolled above the 
top of the keyboard.
+cursorRectInTextView = CGRectInset(cursorRectInTextView, 0, 
margin);
+
 [textView scrollRectToVisible:cursorRectInTextView animated:YES];
 }
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I0ee7969922cec156c67a1ca65cb67e0397006fac
Gerrit-PatchSet: 1
Gerrit-Project: apps/ios/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Mhurd 
Gerrit-Reviewer: Brion VIBBER 

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

[MediaWiki-commits] [Gerrit] categoryinfo is only availlable for categories, pep8 changes - change (pywikibot/core)

2014-04-30 Thread jenkins-bot (Code Review)

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

Change subject: categoryinfo is only availlable for categories, pep8 changes
..


categoryinfo is only availlable for categories, pep8 changes

categoryinfo is now a Category attribute. Assinging it from a page
object raises an AttributeError as suggested in the comment. There
is no need to try calling the site method. It always return a dict.

Change-Id: I0b73f4f07dbb079a42345290ebf6c259a23442b9
---
M pywikibot/page.py
1 file changed, 31 insertions(+), 35 deletions(-)

Approvals:
  Merlijn van Deen: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/pywikibot/page.py b/pywikibot/page.py
index 92607f7..5e5d09c 100644
--- a/pywikibot/page.py
+++ b/pywikibot/page.py
@@ -1333,12 +1333,13 @@
 pywikibot.output(u'Deleting %s.' % (self.title(asLink=True)))
 reason = pywikibot.input(u'Please enter a reason for the 
deletion:')
 
-if self.site.username(sysop=True):  # If user is a sysop, delete the 
page
+# If user is a sysop, delete the page
+if self.site.username(sysop=True):
 answer = u'y'
 if prompt and not hasattr(self.site, '_noDeletePrompt'):
 answer = pywikibot.inputChoice(
-u'Do you want to delete %s?' % self.title(asLink=True,
-  
forceInterwiki=True),
+u'Do you want to delete %s?' % self.title(
+asLink=True, forceInterwiki=True),
 ['Yes', 'No', 'All'],
 ['Y', 'N', 'A'],
 'N')
@@ -1572,20 +1573,6 @@
  % (self.title(asLink=True), error.message))
 return False
 
-@property
-def categoryinfo(self):
-"""If supported, return a dict containing category content values:
-
-Numbers of pages, subcategories, files, and total contents.
-
-"""
-if not self.isCategory():
-return  # should this raise an exception??
-try:
-return self.site.categoryinfo(self)
-except NotImplementedError:
-return
-
  DEPRECATED METHODS 
 
 @deprecated("Site.encoding()")
@@ -1726,13 +1713,13 @@
 username, resolution, filesize, comment).
 
 """
-#TODO; return value may need to change
+# TODO; return value may need to change
 return self.site.loadimageinfo(self, history=True)
 
 def getFileVersionHistoryTable(self):
 """Return the version history in the form of a wiki table."""
 lines = []
-#TODO: if getFileVersionHistory changes, make sure this follows it
+# TODO: if getFileVersionHistory changes, make sure this follows it
 for (datetime, username, resolution, size, comment) \
 in self.getFileVersionHistory():
 lines.append(u'| %s || %s || %s || %s || %s'
@@ -2048,6 +2035,15 @@
 targetCat.put(newtext, creationSummary)
 return True
 
+@property
+def categoryinfo(self):
+"""return a dict containing category content values:
+
+Numbers of pages, subcategories, files, and total contents.
+
+"""
+return self.site.categoryinfo(self)
+
  DEPRECATED METHODS 
 @deprecated("list(Category.subcategories(...))")
 def subcategoriesList(self, recurse=False):
@@ -2224,8 +2220,8 @@
 @type subpage: unicode
 """
 if self._isAutoblock:
-#This user is probably being queried for purpose of lifting
-#an autoblock, so has no user pages per se.
+# This user is probably being queried for purpose of lifting
+# an autoblock, so has no user pages per se.
 raise AutoblockUser(
 "This is an autoblock ID, you can only use to unblock it.")
 if subpage:
@@ -2241,8 +2237,8 @@
 @type subpage: unicode
 """
 if self._isAutoblock:
-#This user is probably being queried for purpose of lifting
-#an autoblock, so has no user talk pages per se.
+# This user is probably being queried for purpose of lifting
+# an autoblock, so has no user talk pages per se.
 raise AutoblockUser(
 "This is an autoblock ID, you can only use to unblock it.")
 if subpage:
@@ -2438,12 +2434,12 @@
 id = 'ids'
 site = 'sites'
 title = 'titles'
-#id overrides all
+# id overrides all
 if hasattr(self, 'id'):
 params[id] = self.id
 return params
 
-#the rest only applies to ItemPages, but is still needed here.
+# the rest only applies to ItemPages, but is still needed here.
 if hasattr(self, '_site') and hasattr(self, '_title'):
 params[

[MediaWiki-commits] [Gerrit] use categoryinfo for the number of articles and subcats, pep... - change (pywikibot/core)

2014-04-30 Thread jenkins-bot (Code Review)

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

Change subject: use categoryinfo for the number of articles and subcats, pep8 
changes
..


use categoryinfo for the number of articles and subcats, pep8 changes

categoryinfo gives the number of articles and subcategories. We use
this information for the messages and use the generator functions
to process each article or subcat. This speeds up processing time
(f.e. 10% for "tree" with depth:3)

Made some pep8 changes.

Change-Id: I32e23ccfdc4a9e623fde93fcd161dd910879e9af
---
M scripts/category.py
1 file changed, 15 insertions(+), 20 deletions(-)

Approvals:
  Merlijn van Deen: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/scripts/category.py b/scripts/category.py
index 8922efe..d032c3a 100755
--- a/scripts/category.py
+++ b/scripts/category.py
@@ -323,7 +323,7 @@
 comment = self.editSummary
 if not comment:
 comment = i18n.twtranslate(page.site, 'category-adding',
-{'newcat': newcatTitle})
+   {'newcat': newcatTitle})
 pywikibot.output(u'Comment: %s' % comment)
 if not self.dry:
 if not self.always:
@@ -449,16 +449,14 @@
 self.comment = comment
 if not self.comment:
 if self.newcat:
-template_vars = { \
-'oldcat': self.oldcat.title(
-withNamespace=False),
-'newcat': self.newcat.title(
-withNamespace=False)}
+template_vars = {
+'oldcat': self.oldcat.title(withNamespace=False),
+'newcat': self.newcat.title(withNamespace=False)}
 self.comment = i18n.twtranslate(self.site,
 'category-replacing',
 template_vars)
 else:
-template_vars = {'oldcat': self.oldcat.title( \
+template_vars = {'oldcat': self.oldcat.title(
 withNamespace=False)}
 self.comment = i18n.twtranslate(self.site,
 'category-removing',
@@ -475,8 +473,7 @@
 self._hist()
 self._change(pagegenerators.CategorizedPageGenerator(self.oldcat))
 if not self.pagesonly:
-self._change(pagegenerators.SubCategoriesPageGenerator( \
-self.oldcat))
+
self._change(pagegenerators.SubCategoriesPageGenerator(self.oldcat))
 if self.oldcat.isEmptyCategory() and self.delete_oldcat and \
 ((self.newcat and self.move_oldcat) or not self.newcat):
 self._delete()
@@ -524,7 +521,8 @@
 match = re.compile(REGEX,
re.IGNORECASE | re.MULTILINE | re.DOTALL)
 self.newcat.text = match.sub('', self.newcat.text)
-site_templates = pywikibot.translate(self.site, cfd_templates, 
fallback=False)
+site_templates = pywikibot.translate(self.site, cfd_templates,
+ fallback=False)
 for template_name in site_templates:
 match = re.compile(r"{{%s.*?}}" % template_name, re.IGNORECASE)
 self.newcat.text = match.sub('', self.newcat.text)
@@ -641,12 +639,11 @@
 {'oldcat': self.cat.title()})
 
 def run(self):
-articles = set(self.cat.articles())
-if len(articles) == 0:
+if self.cat.categoryinfo['pages'] == 0:
 pywikibot.output(u'There are no articles in category %s'
  % self.cat.title())
 else:
-for article in articles:
+for article in self.cat.articles():
 if not self.titleRegex or re.search(self.titleRegex,
 article.title()):
 article.change_category(self.cat, None,
@@ -656,12 +653,11 @@
 return
 
 # Also removes the category tag from subcategories' pages
-subcategories = set(self.cat.subcategories())
-if len(subcategories) == 0:
+if self.cat.categoryinfo['subcats'] == 0:
 pywikibot.output(u'There are no subcategories in category %s'
  % self.cat.title())
 else:
-for subcategory in subcategories:
+for subcategory in self.cat.subcategories():
 subcategory.change_category(self.cat, None,
 comment=self.editSummary,
 inPlace=self.inPlace)
@@ -831,12 +827,11 @@
 def run(self):
 cat = pywikibot.Category(self.site, self.catTitle)
 
-articles = set(cat.articles())
-if le

[MediaWiki-commits] [Gerrit] use site.versionnumber() instead of family.versionnumber(sit... - change (pywikibot/core)

2014-04-30 Thread jenkins-bot (Code Review)

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

Change subject: use site.versionnumber() instead of 
family.versionnumber(site.lang)
..


use site.versionnumber() instead of family.versionnumber(site.lang)

Change-Id: I834b79374ddf850d01326bd3470b4eaa26c8
---
M scripts/cosmetic_changes.py
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Merlijn van Deen: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/scripts/cosmetic_changes.py b/scripts/cosmetic_changes.py
index e7836d2..d261459 100755
--- a/scripts/cosmetic_changes.py
+++ b/scripts/cosmetic_changes.py
@@ -338,7 +338,7 @@
 thisNs = namespaces.pop(0)
 if nsNumber == 6 and family.name == 'wikipedia':
 if self.site.lang in ('en', 'fr') and \
-   family.versionnumber(self.site.lang) >= 14:
+   self.site.versionnumber() >= 14:
 # do not change "Image" on en-wiki and fr-wiki
 assert u'Image' in namespaces
 namespaces.remove(u'Image')

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I834b79374ddf850d01326bd3470b4eaa26c8
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: Xqt 
Gerrit-Reviewer: Alex S.H. Lin 
Gerrit-Reviewer: Huji 
Gerrit-Reviewer: Ladsgroup 
Gerrit-Reviewer: Merlijn van Deen 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Fixed date text in History and Saved Pages - change (apps...wikipedia)

2014-04-30 Thread Dbrant (Code Review)

Dbrant has uploaded a new change for review.

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

Change subject: Fixed date text in History and Saved Pages
..

Fixed date text in History and Saved Pages

Bug: 64675
Change-Id: I7521e08c5e0cdf3914a7a4d07828b494c5487792
---
M wikipedia/res/layout/item_history_entry.xml
M wikipedia/res/layout/item_saved_page_entry.xml
2 files changed, 2 insertions(+), 2 deletions(-)


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

diff --git a/wikipedia/res/layout/item_history_entry.xml 
b/wikipedia/res/layout/item_history_entry.xml
index b24a05b..7ff5ab5 100644
--- a/wikipedia/res/layout/item_history_entry.xml
+++ b/wikipedia/res/layout/item_history_entry.xml
@@ -6,7 +6,7 @@
   android:layout_height="match_parent">
 
 https://gerrit.wikimedia.org/r/130659
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I7521e08c5e0cdf3914a7a4d07828b494c5487792
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] Small performance tweaks for commonly called functions - change (mediawiki...parsoid)

2014-04-30 Thread jenkins-bot (Code Review)

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

Change subject: Small performance tweaks for commonly called functions
..


Small performance tweaks for commonly called functions

* Use numeric constants instead of variable dereferences
* locally define isElt 
* use the nodeType in isComment

Change-Id: I8f3a784b089b90619809ebc49268a0be482ad753
---
M lib/mediawiki.DOMUtils.js
1 file changed, 28 insertions(+), 26 deletions(-)

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



diff --git a/lib/mediawiki.DOMUtils.js b/lib/mediawiki.DOMUtils.js
index a083c99..f37509a 100644
--- a/lib/mediawiki.DOMUtils.js
+++ b/lib/mediawiki.DOMUtils.js
@@ -16,6 +16,10 @@
 // define some constructor shortcuts
 var KV = pd.KV;
 
+var isElt = function(node) {
+   return node.nodeType === 1;
+};
+
 /**
  * @class
  * @singleton
@@ -29,9 +33,7 @@
 * See http://dom.spec.whatwg.org/#dom-node-nodetype
 * @param {Node} node
 */
-   isElt: function(node) {
-   return node.nodeType === node.ELEMENT_NODE;
-   },
+   isElt: isElt,
 
/**
 * Check whether this is a DOM text node.
@@ -39,7 +41,7 @@
 * @param {Node} node
 */
isText: function(node) {
-   return node.nodeType === node.TEXT_NODE;
+   return node.nodeType === 3;
},
 
/**
@@ -182,7 +184,7 @@
 * @param {Mixed} defaultVal What to use if there is no JSON attribute 
by that name.
 */
loadDataAttrib: function(node, name, defaultVal) {
-   if ( !this.isElt(node) ) {
+   if ( !isElt(node) ) {
return;
}
var data = this.getNodeData( node );
@@ -196,7 +198,7 @@
 * Save all node.data.* structures to data attributes
 */
saveDataAttribs: function(node) {
-   if ( !this.isElt(node) ) {
+   if ( !isElt(node) ) {
return;
}
var data = this.getNodeData( node );
@@ -219,7 +221,7 @@
 */
loadDataParsoid: function ( node ) {
var dp = this.loadDataAttrib( node, 'parsoid', {} );
-   if ( this.isElt( node ) && !dp.tmp ) {
+   if ( isElt( node ) && !dp.tmp ) {
dp.tmp = {};
}
},
@@ -268,7 +270,7 @@
 * @param {Mixed} defaultVal What should be returned if we fail to find 
a valid JSON structure
 */
getJSONAttribute: function(node, name, defaultVal) {
-   if ( !this.isElt(node) ) {
+   if ( !isElt(node) ) {
return defaultVal !== undefined ? defaultVal : {};
}
 
@@ -448,7 +450,7 @@
 * @param {string} type Expected value of "typeof" attribute
 */
isNodeOfType: function(n, name, type) {
-   return this.hasNodeName(n, name) && n.getAttribute("typeof") 
=== type;
+   return n.nodeName.toLowerCase() === name && 
n.getAttribute("typeof") === type;
},
 
/**
@@ -539,7 +541,7 @@
 */
isLiteralHTMLNode: function(node) {
return (node &&
-   this.isElt(node) &&
+   isElt(node) &&
this.hasLiteralHTMLMarker(this.getDataParsoid(node)));
},
 
@@ -573,7 +575,7 @@
getPrevElementSibling: function(node) {
var sibling = node.previousSibling;
while (sibling) {
-   if (this.isElt(sibling)) {
+   if (isElt(sibling)) {
return sibling;
}
sibling = sibling.previousSibling;
@@ -588,7 +590,7 @@
getNextElementSibling: function(node) {
var sibling = node.nextSibling;
while (sibling) {
-   if (this.isElt(sibling)) {
+   if (isElt(sibling)) {
return sibling;
}
sibling = sibling.nextSibling;
@@ -602,7 +604,7 @@
hasElementChild: function(node) {
var children = node.childNodes;
for (var i = 0, n = children.length; i < n; i++) {
-   if (this.isElt(children[i])) {
+   if (isElt(children[i])) {
return true;
}
}
@@ -617,7 +619,7 @@
var children = node.childNodes;
for (var i = 0, n = children.length; i < n; i++) {
var child = children[i];
-   if (this.isElt(child) &&
+   if (isElt(child) &&
// Is a block-level node

[MediaWiki-commits] [Gerrit] mediawiki.js: Move stray lines in global scope into closure - change (mediawiki/core)

2014-04-30 Thread Krinkle (Code Review)

Krinkle has uploaded a new change for review.

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

Change subject: mediawiki.js: Move stray lines in global scope into closure
..

mediawiki.js: Move stray lines in global scope into closure

There was a local variable "mw" in the (implied) global scope,
which then got assigned to "window.mw". That's a bit odd having
both.

There were also some extra lines hanging outside the closure
(where we used jQuery instead of $).

Make the local "mw" actually local and move the rest into the
closure as well.

Remove obsolete "undefined" variable reset. Per code conventions,
we don't support environments that define "undefined". Most of
our modules already don't account for this but mediawiki base
still did.

Change-Id: Iab31788cc6413d0185d868da9cce130fd4d76cde
---
M resources/src/mediawiki/mediawiki.js
1 file changed, 17 insertions(+), 17 deletions(-)


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

diff --git a/resources/src/mediawiki/mediawiki.js 
b/resources/src/mediawiki/mediawiki.js
index 3025260..d627ecc 100644
--- a/resources/src/mediawiki/mediawiki.js
+++ b/resources/src/mediawiki/mediawiki.js
@@ -7,13 +7,13 @@
  * @alternateClassName mediaWiki
  * @singleton
  */
-
-var mw = ( function ( $, undefined ) {
+( function ( $ ) {
'use strict';
 
/* Private Members */
 
-   var hasOwn = Object.prototype.hasOwnProperty,
+   var mw,
+   hasOwn = Object.prototype.hasOwnProperty,
slice = Array.prototype.slice,
trackCallbacks = $.Callbacks( 'memory' ),
trackQueue = [];
@@ -371,7 +371,7 @@
/**
 * @class mw
 */
-   return {
+   mw = {
/* Public Members */
 
/**
@@ -2403,17 +2403,17 @@
}() )
};
 
+   // Alias $j to jQuery for backwards compatibility
+   // @deprecated since 1.23 Use $ or jQuery instead
+   mw.log.deprecate( window, '$j', $, 'Use $ or jQuery instead.' );
+
+   // Attach to window and globally alias
+   window.mw = window.mediaWiki = mw;
+
+   // Auto-register from pre-loaded startup scripts
+   if ( $.isFunction( window.startUp ) ) {
+   window.startUp();
+   window.startUp = undefined;
+   }
+
 }( jQuery ) );
-
-// Alias $j to jQuery for backwards compatibility
-// @deprecated since 1.23 Use $ or jQuery instead
-mw.log.deprecate( window, '$j', jQuery, 'Use $ or jQuery instead.' );
-
-// Attach to window and globally alias
-window.mw = window.mediaWiki = mw;
-
-// Auto-register from pre-loaded startup scripts
-if ( jQuery.isFunction( window.startUp ) ) {
-   window.startUp();
-   window.startUp = undefined;
-}

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

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

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

[MediaWiki-commits] [Gerrit] Fixed date text in History and Saved Pages - change (apps...wikipedia)

2014-04-30 Thread jenkins-bot (Code Review)

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

Change subject: Fixed date text in History and Saved Pages
..


Fixed date text in History and Saved Pages

Bug: 64675
Change-Id: I7521e08c5e0cdf3914a7a4d07828b494c5487792
---
M wikipedia/res/layout/item_history_entry.xml
M wikipedia/res/layout/item_saved_page_entry.xml
2 files changed, 2 insertions(+), 2 deletions(-)

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



diff --git a/wikipedia/res/layout/item_history_entry.xml 
b/wikipedia/res/layout/item_history_entry.xml
index b24a05b..7ff5ab5 100644
--- a/wikipedia/res/layout/item_history_entry.xml
+++ b/wikipedia/res/layout/item_history_entry.xml
@@ -6,7 +6,7 @@
   android:layout_height="match_parent">
 
 https://gerrit.wikimedia.org/r/130659
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I7521e08c5e0cdf3914a7a4d07828b494c5487792
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Dbrant 
Gerrit-Reviewer: Yuvipanda 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Fix up parsoidsvc repositories location - change (integration/jenkins-job-builder-config)

2014-04-30 Thread Hashar (Code Review)

Hashar has uploaded a new change for review.

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

Change subject: Fix up parsoidsvc repositories location
..

Fix up parsoidsvc repositories location

The parsoidsvc-php-parsertests depends on two repositories:

- mediawiki/services/parsoid which is fetched with the Jenkins git
  plugin in $WORKSPACE and is instructed to clear it out
- mediawiki/core which is fetched via git-archive in the same location
  and hence is cleared out by Jenkins git plugin

To ease debugging, fetch mediawiki/core to a different directory and
manually clean it up using the good old rm -fR

Parsoid is now fetched under /parsoidsvc

Change-Id: I51771f6900a672bffe397283925a9b2236473d35
---
M parsoidsvc.yaml
1 file changed, 16 insertions(+), 4 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/integration/jenkins-job-builder-config 
refs/changes/61/130661/1

diff --git a/parsoidsvc.yaml b/parsoidsvc.yaml
index 1a14780..a34a122 100644
--- a/parsoidsvc.yaml
+++ b/parsoidsvc.yaml
@@ -28,15 +28,27 @@
  - '$ZUUL_COMMIT'
 refspec: '$ZUUL_REF'
 disable-submodules: true
+basedir: parsoidsvc
 builders:
-- get-mw-core:
-branch: 'master'
-- mw-install-sqlite
+# Hack to get mediawiki/core installed in a different directory
+- shell: |
+rm -fR mediawiki/core
+mkdir -p mediawiki/core
+export MW_INSTALL_PATH='mediawiki/core'
+
+# mw-core-get.sh only recognize $WORKSPACE so override it to point
+# to MW_INSTALL_PATH
+# If you read this, feel free to add support for MW_INSTALL_PATH
+WORKSPACE=$MW_INSTALL_PATH 
/srv/deployment/integration/slave-scripts/bin/mw-core-get.sh master
+
+/srv/deployment/integration/slave-scripts/bin/mw-install-sqlite.sh
+
 - shell: |
# Now run parserTests
# FIXME should use the phpunit wrapper
+   cd mediawiki/core
php tests/parserTests.php --color=no --quiet \
---file=tests/parserTests.txt
+--file="$WORKSPACE/parsoidsvc/tests/parserTests.txt"
 
 # Parsoid comes with two repositories:
 # mediawiki/services/parsoid : the actual source code

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I51771f6900a672bffe397283925a9b2236473d35
Gerrit-PatchSet: 1
Gerrit-Project: integration/jenkins-job-builder-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 crasher in template wrapping (introduced in 54b4f37bb). - change (mediawiki...parsoid)

2014-04-30 Thread jenkins-bot (Code Review)

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

Change subject: Fix crasher in template wrapping (introduced in 54b4f37bb).
..


Fix crasher in template wrapping (introduced in 54b4f37bb).

Change-Id: Id640287cc1107d6491b850c863a1980dc111ef76
---
M lib/dom.wrapTemplates.js
1 file changed, 4 insertions(+), 1 deletion(-)

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



diff --git a/lib/dom.wrapTemplates.js b/lib/dom.wrapTemplates.js
index 266cf83..e4968c9 100644
--- a/lib/dom.wrapTemplates.js
+++ b/lib/dom.wrapTemplates.js
@@ -596,7 +596,10 @@
};
 
// Skip template-marker meta-tags
-   while (DU.isTplMarkerMeta(encapInfo.target)) {
+   // Also, skip past comments/text nodes found in fosterable 
positions
+   // which wouldn't have been span-wrapped in the while-loop 
above.
+   while (DU.isTplMarkerMeta(encapInfo.target) || 
!DU.isElt(encapInfo.target)) {
+   console.assert(DU.isElt(encapInfo.target) || 
DU.isFosterablePosition(encapInfo.target));
encapInfo.target = encapInfo.target.nextSibling;
}
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Id640287cc1107d6491b850c863a1980dc111ef76
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/parsoid
Gerrit-Branch: master
Gerrit-Owner: Subramanya Sastry 
Gerrit-Reviewer: Arlolra 
Gerrit-Reviewer: Cscott 
Gerrit-Reviewer: GWicke 
Gerrit-Reviewer: Marcoil 
Gerrit-Reviewer: Subramanya Sastry 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Generate the maps for each site dashboard - change (analytics...config)

2014-04-30 Thread MarkTraceur (Code Review)

MarkTraceur has submitted this change and it was merged.

Change subject: Generate the maps for each site dashboard
..


Generate the maps for each site dashboard

Change-Id: I4cd5d94cd81c5d8575523708427d07ead7473af3
Mingle: https://wikimedia.mingle.thoughtworks.com/projects/multimedia/cards/510/
---
M dashboards/mmv.json
M dashboards/mmv_cawiki.json
M dashboards/mmv_commonswiki.json
M dashboards/mmv_czwiki.json
M dashboards/mmv_dewiki.json
M dashboards/mmv_enwiki.json
M dashboards/mmv_enwikivoyage.json
M dashboards/mmv_eswiki.json
M dashboards/mmv_etwiki.json
M dashboards/mmv_fiwiki.json
M dashboards/mmv_frwiki.json
M dashboards/mmv_global.json
M dashboards/mmv_hewiki.json
M dashboards/mmv_huwiki.json
M dashboards/mmv_itwiki.json
M dashboards/mmv_jawiki.json
M dashboards/mmv_kowiki.json
M dashboards/mmv_mediawikiwiki.json
M dashboards/mmv_nlwiki.json
M dashboards/mmv_plwiki.json
M dashboards/mmv_ptwiki.json
M dashboards/mmv_rowiki.json
M dashboards/mmv_ruwiki.json
M dashboards/mmv_skwiki.json
M dashboards/mmv_svwiki.json
M dashboards/mmv_template.json
M dashboards/mmv_tewiki.json
M dashboards/mmv_thwiki.json
M dashboards/mmv_viwiki.json
C datasources/mmv_geoperformance_api_cawiki.json
C datasources/mmv_geoperformance_api_commonswiki.json
C datasources/mmv_geoperformance_api_czwiki.json
C datasources/mmv_geoperformance_api_dewiki.json
C datasources/mmv_geoperformance_api_enwiki.json
C datasources/mmv_geoperformance_api_enwikivoyage.json
C datasources/mmv_geoperformance_api_eswiki.json
C datasources/mmv_geoperformance_api_etwiki.json
C datasources/mmv_geoperformance_api_fiwiki.json
C datasources/mmv_geoperformance_api_frwiki.json
C datasources/mmv_geoperformance_api_global.json
C datasources/mmv_geoperformance_api_hewiki.json
C datasources/mmv_geoperformance_api_huwiki.json
C datasources/mmv_geoperformance_api_itwiki.json
C datasources/mmv_geoperformance_api_jawiki.json
C datasources/mmv_geoperformance_api_kowiki.json
C datasources/mmv_geoperformance_api_mediawikiwiki.json
C datasources/mmv_geoperformance_api_nlwiki.json
C datasources/mmv_geoperformance_api_plwiki.json
C datasources/mmv_geoperformance_api_ptwiki.json
C datasources/mmv_geoperformance_api_rowiki.json
C datasources/mmv_geoperformance_api_ruwiki.json
C datasources/mmv_geoperformance_api_skwiki.json
C datasources/mmv_geoperformance_api_svwiki.json
C datasources/mmv_geoperformance_api_tewiki.json
C datasources/mmv_geoperformance_api_thwiki.json
C datasources/mmv_geoperformance_api_viwiki.json
C datasources/mmv_geoperformance_image_cawiki.json
C datasources/mmv_geoperformance_image_commonswiki.json
C datasources/mmv_geoperformance_image_czwiki.json
C datasources/mmv_geoperformance_image_dewiki.json
C datasources/mmv_geoperformance_image_enwiki.json
C datasources/mmv_geoperformance_image_enwikivoyage.json
C datasources/mmv_geoperformance_image_eswiki.json
C datasources/mmv_geoperformance_image_etwiki.json
R datasources/mmv_geoperformance_image_fiwiki.json
C datasources/mmv_geoperformance_image_frwiki.json
C datasources/mmv_geoperformance_image_global.json
C datasources/mmv_geoperformance_image_hewiki.json
C datasources/mmv_geoperformance_image_huwiki.json
C datasources/mmv_geoperformance_image_itwiki.json
C datasources/mmv_geoperformance_image_jawiki.json
C datasources/mmv_geoperformance_image_kowiki.json
C datasources/mmv_geoperformance_image_mediawikiwiki.json
C datasources/mmv_geoperformance_image_nlwiki.json
C datasources/mmv_geoperformance_image_plwiki.json
C datasources/mmv_geoperformance_image_ptwiki.json
C datasources/mmv_geoperformance_image_rowiki.json
C datasources/mmv_geoperformance_image_ruwiki.json
C datasources/mmv_geoperformance_image_skwiki.json
C datasources/mmv_geoperformance_image_svwiki.json
C datasources/mmv_geoperformance_image_tewiki.json
C datasources/mmv_geoperformance_image_thwiki.json
C datasources/mmv_geoperformance_image_viwiki.json
C datasources/mmv_geoperformance_template.json
D datasources/mmv_performance_country_api.json
M generate.php
C graphs/mmv_geoperformance_api_cawiki.json
C graphs/mmv_geoperformance_api_commonswiki.json
C graphs/mmv_geoperformance_api_czwiki.json
C graphs/mmv_geoperformance_api_dewiki.json
C graphs/mmv_geoperformance_api_enwiki.json
C graphs/mmv_geoperformance_api_enwikivoyage.json
C graphs/mmv_geoperformance_api_eswiki.json
C graphs/mmv_geoperformance_api_etwiki.json
C graphs/mmv_geoperformance_api_fiwiki.json
C graphs/mmv_geoperformance_api_frwiki.json
C graphs/mmv_geoperformance_api_global.json
C graphs/mmv_geoperformance_api_hewiki.json
C graphs/mmv_geoperformance_api_huwiki.json
C graphs/mmv_geoperformance_api_itwiki.json
C graphs/mmv_geoperformance_api_jawiki.json
C graphs/mmv_geoperformance_api_kowiki.json
C graphs/mmv_geoperformance_api_mediawikiwiki.json
C graphs/mmv_geoperformance_api_nlwiki.json
C graphs/mmv_geoperformance_api_plwiki.json
C graphs/mmv_geoperformance_api_ptwiki.json
C graphs/mmv_geoperformance_api_

[MediaWiki-commits] [Gerrit] mw-core-get.sh: allow installation to $MW_INSTALL_PATH inste... - change (integration/jenkins)

2014-04-30 Thread Cscott (Code Review)

Cscott has uploaded a new change for review.

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

Change subject: mw-core-get.sh: allow installation to $MW_INSTALL_PATH instead 
of $WORKSPACE.
..

mw-core-get.sh: allow installation to $MW_INSTALL_PATH instead of $WORKSPACE.

Change-Id: Id22cd337741b24396c4b91acbcc4c9288a04388f
---
M bin/mw-core-get.sh
1 file changed, 8 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/jenkins 
refs/changes/62/130662/1

diff --git a/bin/mw-core-get.sh b/bin/mw-core-get.sh
index 04660b7..afb339a 100755
--- a/bin/mw-core-get.sh
+++ b/bin/mw-core-get.sh
@@ -7,17 +7,21 @@
 # git tree-ish passed to git-archve (or gitblit)
 TREE_ISH=${1:-'master'}
 
+# Use MW_INSTALL_PATH if it is set, otherwise use WORKSPACE
+DEST="${MW_INSTALL_PATH:-${WORKSPACE}}"
+
+
 # Very basic validation
-if [[ ! -d "$WORKSPACE" || ! -w "$WORKSPACE" ]]; then
-   echo "\$WORKSPACE must be pointing to a directory"
+if [[ ! -d "$DEST" || ! -w "$DEST" ]]; then
+   echo "\$DEST must be pointing to a directory"
exit 1
 fi
 
 if [ -d "$GIT_LOCAL" ]; then
git archive --remote="$GIT_LOCAL" "$TREE_ISH" \
-   | (cd "$WORKSPACE" && tar xf -)
+   | (cd "$DEST" && tar xf -)
 else
# Fallback to git.wikimedia.org
curl 
"https://git.wikimedia.org/zip/?r=mediawiki/core.git&format=gz&h=$TREE_ISH"; \
-   | (cd "$WORKSPACE" && tar xzf -)
+   | (cd "$DEST" && tar xzf -)
 fi

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

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

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

[MediaWiki-commits] [Gerrit] chmod +x the scripts, fix username - change (analytics/multimedia)

2014-04-30 Thread MarkTraceur (Code Review)

MarkTraceur has submitted this change and it was merged.

Change subject: chmod +x the scripts, fix username
..


chmod +x the scripts, fix username

Change-Id: I42bd7a6d9a59e2fcfea039e806b072ae1f858d21
---
M build-action-tsvs
M build-geoperf-tsvs
M build-perf-tsvs
3 files changed, 11 insertions(+), 8 deletions(-)

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



diff --git a/build-action-tsvs b/build-action-tsvs
old mode 100644
new mode 100755
index c66331c..324e1d0
--- a/build-action-tsvs
+++ b/build-action-tsvs
@@ -1,8 +1,9 @@
 #!/usr/bin/env bash
 
+REMOTEUSER="marktraceur"
 MYSQL_CMD="mysql --defaults-file=~/.my.cnf.relevant log"
-SQL_DIR="/home/mholmquist/multimedia/actions"
-TSV_DIR="/home/mholmquist/tsvs_new"
+SQL_DIR="/home/$REMOTEUSER/multimedia/actions"
+TSV_DIR="/home/$REMOTEUSER/tsvs_new"
 PUBLIC_DIR="/a/public-datasets/all/multimedia"
 
 echo "Updating global action counts..."
diff --git a/build-geoperf-tsvs b/build-geoperf-tsvs
old mode 100644
new mode 100755
index d301a13..73431ed
--- a/build-geoperf-tsvs
+++ b/build-geoperf-tsvs
@@ -1,8 +1,9 @@
 #!/usr/bin/env bash
 
+REMOTEUSER="marktraceur"
 MYSQL_CMD="mysql --defaults-file=~/.my.cnf.relevant log"
-SQL_DIR="/home/mholmquist/multimedia/geoperf"
-TSV_DIR="/home/mholmquist/tsvs_new"
+SQL_DIR="/home/$REMOTEUSER/multimedia/geoperf"
+TSV_DIR="/home/$REMOTEUSER/tsvs_new"
 PUBLIC_DIR="/a/public-datasets/all/multimedia"
 
 echo "Updating global geo perf data..."
@@ -27,4 +28,4 @@
 mv $tsvpath 
$PUBLIC_DIR/media-viewer-geoperf-$wikiname-$statname.tsv
 done
 echo "  Done!"
-done
\ No newline at end of file
+done
diff --git a/build-perf-tsvs b/build-perf-tsvs
old mode 100644
new mode 100755
index d9452b9..2ff70ae
--- a/build-perf-tsvs
+++ b/build-perf-tsvs
@@ -1,8 +1,9 @@
 #!/usr/bin/env bash
 
+REMOTEUSER="marktraceur"
 MYSQL_CMD="mysql --defaults-file=~/.my.cnf.relevant log"
-SQL_DIR="/home/mholmquist/multimedia/perf"
-TSV_DIR="/home/mholmquist/tsvs_new"
+SQL_DIR="/home/$REMOTEUSER/multimedia/perf"
+TSV_DIR="/home/$REMOTEUSER/tsvs_new"
 PUBLIC_DIR="/a/public-datasets/all/multimedia"
 
 echo "Updating global perf data..."
@@ -32,4 +33,4 @@
 echo "Updating mmv-versus-filepage perf data..."
 tsvpath="$TSV_DIR/mvp_mmv_versus_filepage.tsv"
 $MYSQL_CMD < $SQL_DIR/mmv-versus-filepage.sql > $tsvpath && mv $tsvpath 
$PUBLIC_DIR/media-viewer-perf-mmv-versus-filepage.tsv
-echo "  Done!"
\ No newline at end of file
+echo "  Done!"

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I42bd7a6d9a59e2fcfea039e806b072ae1f858d21
Gerrit-PatchSet: 1
Gerrit-Project: analytics/multimedia
Gerrit-Branch: master
Gerrit-Owner: MarkTraceur 
Gerrit-Reviewer: MarkTraceur 

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

[MediaWiki-commits] [Gerrit] chmod +x the scripts, fix username - change (analytics/multimedia)

2014-04-30 Thread MarkTraceur (Code Review)

MarkTraceur has uploaded a new change for review.

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

Change subject: chmod +x the scripts, fix username
..

chmod +x the scripts, fix username

Change-Id: I42bd7a6d9a59e2fcfea039e806b072ae1f858d21
---
M build-action-tsvs
M build-geoperf-tsvs
M build-perf-tsvs
3 files changed, 11 insertions(+), 8 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/analytics/multimedia 
refs/changes/63/130663/1

diff --git a/build-action-tsvs b/build-action-tsvs
old mode 100644
new mode 100755
index c66331c..324e1d0
--- a/build-action-tsvs
+++ b/build-action-tsvs
@@ -1,8 +1,9 @@
 #!/usr/bin/env bash
 
+REMOTEUSER="marktraceur"
 MYSQL_CMD="mysql --defaults-file=~/.my.cnf.relevant log"
-SQL_DIR="/home/mholmquist/multimedia/actions"
-TSV_DIR="/home/mholmquist/tsvs_new"
+SQL_DIR="/home/$REMOTEUSER/multimedia/actions"
+TSV_DIR="/home/$REMOTEUSER/tsvs_new"
 PUBLIC_DIR="/a/public-datasets/all/multimedia"
 
 echo "Updating global action counts..."
diff --git a/build-geoperf-tsvs b/build-geoperf-tsvs
old mode 100644
new mode 100755
index d301a13..73431ed
--- a/build-geoperf-tsvs
+++ b/build-geoperf-tsvs
@@ -1,8 +1,9 @@
 #!/usr/bin/env bash
 
+REMOTEUSER="marktraceur"
 MYSQL_CMD="mysql --defaults-file=~/.my.cnf.relevant log"
-SQL_DIR="/home/mholmquist/multimedia/geoperf"
-TSV_DIR="/home/mholmquist/tsvs_new"
+SQL_DIR="/home/$REMOTEUSER/multimedia/geoperf"
+TSV_DIR="/home/$REMOTEUSER/tsvs_new"
 PUBLIC_DIR="/a/public-datasets/all/multimedia"
 
 echo "Updating global geo perf data..."
@@ -27,4 +28,4 @@
 mv $tsvpath 
$PUBLIC_DIR/media-viewer-geoperf-$wikiname-$statname.tsv
 done
 echo "  Done!"
-done
\ No newline at end of file
+done
diff --git a/build-perf-tsvs b/build-perf-tsvs
old mode 100644
new mode 100755
index d9452b9..2ff70ae
--- a/build-perf-tsvs
+++ b/build-perf-tsvs
@@ -1,8 +1,9 @@
 #!/usr/bin/env bash
 
+REMOTEUSER="marktraceur"
 MYSQL_CMD="mysql --defaults-file=~/.my.cnf.relevant log"
-SQL_DIR="/home/mholmquist/multimedia/perf"
-TSV_DIR="/home/mholmquist/tsvs_new"
+SQL_DIR="/home/$REMOTEUSER/multimedia/perf"
+TSV_DIR="/home/$REMOTEUSER/tsvs_new"
 PUBLIC_DIR="/a/public-datasets/all/multimedia"
 
 echo "Updating global perf data..."
@@ -32,4 +33,4 @@
 echo "Updating mmv-versus-filepage perf data..."
 tsvpath="$TSV_DIR/mvp_mmv_versus_filepage.tsv"
 $MYSQL_CMD < $SQL_DIR/mmv-versus-filepage.sql > $tsvpath && mv $tsvpath 
$PUBLIC_DIR/media-viewer-perf-mmv-versus-filepage.tsv
-echo "  Done!"
\ No newline at end of file
+echo "  Done!"

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I42bd7a6d9a59e2fcfea039e806b072ae1f858d21
Gerrit-PatchSet: 1
Gerrit-Project: analytics/multimedia
Gerrit-Branch: master
Gerrit-Owner: MarkTraceur 

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

[MediaWiki-commits] [Gerrit] phpunit installer installs known good version - change (mediawiki/core)

2014-04-30 Thread Manybubbles (Code Review)

Manybubbles has uploaded a new change for review.

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

Change subject: phpunit installer installs known good version
..

phpunit installer installs known good version

Mediawiki's unit tests don't work with phpunit >= 4.0.  Before we get them
working with it, we need to make sure that new developers get a known good
version of phpunit when they try to run tests.

Change-Id: I2af3759a5cf2b3abd2d038f83fe7628da3ee6584
---
M tests/phpunit/install-phpunit.sh
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/64/130664/1

diff --git a/tests/phpunit/install-phpunit.sh b/tests/phpunit/install-phpunit.sh
index 1f60293..5a0cc35 100755
--- a/tests/phpunit/install-phpunit.sh
+++ b/tests/phpunit/install-phpunit.sh
@@ -20,7 +20,7 @@
 pear channel-discover components.ez.no
 pear channel-discover pear.symfony.com
 pear update-channels
-pear install --alldeps phpunit/PHPUnit
+pear install --alldeps phpunit/PHPUnit-3.7.30
 else if ( has_binary apt-get ); then
 echo Installing phpunit with apt-get
 apt-get install phpunit

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

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

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

[MediaWiki-commits] [Gerrit] Add class name to protected pages, to allow for specific CSS... - change (mediawiki...VisualEditor)

2014-04-30 Thread Alex Monk (Code Review)

Alex Monk has uploaded a new change for review.

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

Change subject: Add class name to protected pages, to allow for specific CSS 
styling of edit area
..

Add class name to protected pages, to allow for specific CSS styling of edit 
area

Also get rid of checking for NS_MEDIAWIKI explictly and use
MWNamespace::getRestrictionLevels instead

Bug: 50783
Change-Id: I5986ddb9b6f17e4a2aca12dbb551cce4a6cfd663
---
M ApiVisualEditor.php
M modules/ve-mw/init/ve.init.mw.Target.js
2 files changed, 13 insertions(+), 2 deletions(-)


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

diff --git a/ApiVisualEditor.php b/ApiVisualEditor.php
index c023eca..c7455f0 100644
--- a/ApiVisualEditor.php
+++ b/ApiVisualEditor.php
@@ -330,13 +330,19 @@
}
}
 
-   if ( $page->getNamespace() != NS_MEDIAWIKI ) {
+   // Look at protection status to set up notices 
+ surface class(es)
+   $protectedClass = null;
+   if ( MWNamespace::getRestrictionLevels( 
$page->getNamespace() ) !== array( '' ) ) {
// Page protected from editing
if ( $page->isProtected( 'edit' ) ) {
# Is the title semi-protected?
if ( $page->isSemiProtected() ) 
{
+   $protectedClass .= 
'mw-textarea-sprotected';
+
$noticeMsg = 
'semiprotectedpagewarning';
} else {
+   $protectedClass .= 
'mw-textarea-protected';
+
# Then it must be 
protected based on static groups (regular)
$noticeMsg = 
'protectedpagewarning';
}
@@ -347,6 +353,8 @@
// Deal with cascading edit protection
list( $sources, $restrictions ) = 
$page->getCascadeProtectionSources();
if ( isset( $restrictions['edit'] ) ) {
+   $protectedClass .= ' 
mw-textarea-cprotected';
+
$notice = $this->msg( 
'cascadeprotectedwarning' )->parseAsBlock() . '';
// Unfortunately there's no 
nice way to get only the pages which cause
// editing to be restricted
@@ -439,6 +447,7 @@
'notices' => $notices,
'checkboxes' => 
$checkboxes,
'links' => $links,
+   'protectedClass' => 
$protectedClass
),
$parsed['result']
);
diff --git a/modules/ve-mw/init/ve.init.mw.Target.js 
b/modules/ve-mw/init/ve.init.mw.Target.js
index 941db9a..9fe292c 100644
--- a/modules/ve-mw/init/ve.init.mw.Target.js
+++ b/modules/ve-mw/init/ve.init.mw.Target.js
@@ -394,6 +394,7 @@
this.constructor.static.fixBase( this.doc, document );
 
this.remoteNotices = ve.getObjectValues( data.notices );
+   this.protectedClass = data.protectedClass;
this.$checkboxes = $( ve.getObjectValues( data.checkboxes 
).join( '' ) );
// Populate checkboxes with default values for minor and watch
this.$checkboxes
@@ -1311,7 +1312,8 @@
setTimeout( function () {
// Create ui.Surface (also creates ce.Surface and 
dm.Surface and builds CE tree)
target.surface = target.createSurface( dmDoc );
-   target.surface.$element.addClass( 
've-init-mw-viewPageTarget-surface' );
+   target.surface.$element.addClass( 
've-init-mw-viewPageTarget-surface' )
+   .addClass( target.protectedClass );
setTimeout( function () {
// Initialize surface
target.surface.getContext().hide();

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I5986ddb9b6f17e4a2aca12dbb5

[MediaWiki-commits] [Gerrit] Fix the geoperf generation script - change (analytics/multimedia)

2014-04-30 Thread MarkTraceur (Code Review)

MarkTraceur has uploaded a new change for review.

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

Change subject: Fix the geoperf generation script
..

Fix the geoperf generation script

Change-Id: I8681e68f1c05e3e08f60af7d572d7811b2b0d46a
---
M build-geoperf-tsvs
1 file changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/analytics/multimedia 
refs/changes/66/130666/1

diff --git a/build-geoperf-tsvs b/build-geoperf-tsvs
index 73431ed..6625e33 100755
--- a/build-geoperf-tsvs
+++ b/build-geoperf-tsvs
@@ -16,8 +16,8 @@
 done
 echo "  Done!"
 
-for sqlpath in `ls $SQL_DIR/*-filerepoinfo.sql | grep -v template.sql`; do
-wikiname=`basename $sqlpath | sed "s/-filerepoinfo.sql//"`
+for sqlpath in `ls $SQL_DIR/*-image.sql | grep -v template.sql`; do
+wikiname=`basename $sqlpath | sed "s/-image.sql//"`
 echo "Updating geo perf data for $wikiname wiki..."
 
 for sqlfilepath in `ls $SQL_DIR/${wikiname}-*.sql`; do

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I8681e68f1c05e3e08f60af7d572d7811b2b0d46a
Gerrit-PatchSet: 1
Gerrit-Project: analytics/multimedia
Gerrit-Branch: master
Gerrit-Owner: MarkTraceur 

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

[MediaWiki-commits] [Gerrit] Add ability to remove cohorts from database. - change (analytics/wikimetrics)

2014-04-30 Thread Milimetric (Code Review)

Milimetric has submitted this change and it was merged.

Change subject: Add ability to remove cohorts from database.
..


Add ability to remove cohorts from database.

Owners can remove their cohorts from the database. A warning will show if there
are other users sharing the cohort. When deleted, viewers records will be
deleted from their personal list. If a viewer deletes a cohort, it will only
delete the cohort from their personal list, not from the cohort database.

Change-Id: I431cad933d5b888f10fe5533b75e7b1776649ab3
---
M tests/test_controllers/test_cohorts.py
M wikimetrics/controllers/cohorts.py
M wikimetrics/exceptions.py
M wikimetrics/static/js/cohortList.js
M wikimetrics/static/js/site.js
M wikimetrics/templates/cohorts.html
6 files changed, 246 insertions(+), 26 deletions(-)

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



diff --git a/tests/test_controllers/test_cohorts.py 
b/tests/test_controllers/test_cohorts.py
index e86df9d..e8cb362 100644
--- a/tests/test_controllers/test_cohorts.py
+++ b/tests/test_controllers/test_cohorts.py
@@ -1,12 +1,12 @@
 import json
 import time
 from StringIO import StringIO
-from nose.tools import assert_equal, assert_true, assert_false, raises, nottest
+from nose.tools import assert_equal, assert_not_equal, assert_true, 
assert_false
 from wikimetrics.configurables import app
 from tests.fixtures import WebTest
 from wikimetrics.models import (
 Cohort, CohortUser, CohortUserRole, ValidateCohort,
-CohortWikiUser, WikiUser,
+CohortWikiUser, WikiUser, User
 )
 
 
@@ -135,26 +135,127 @@
 assert_true(
 response.data.find('Validating cohort') >= 0
 )
-
-def test_delete_cohort(self):
+
+def test_delete_cohort_owner_no_viewer(self):
 response = self.app.post('/cohorts/delete/{0}'.format(self.cohort.id))
-
+
 assert_equal(response.status_code, 200)
 assert_true(response.data.find('isRedirect') >= 0)
 assert_true(response.data.find('/cohorts/') >= 0)
+cohort_id = self.cohort.id
 self.session.commit()
+
+# Check that all relevant rows are deleted
+cwu = self.session.query(CohortWikiUser) \
+.filter(CohortWikiUser.cohort_id == cohort_id) \
+.first()
+assert_equal(cwu, None)
 cu = self.session.query(CohortUser) \
-.filter(CohortUser.cohort_id == self.cohort.id) \
+.filter(CohortUser.cohort_id == cohort_id) \
+.filter(CohortUser.user_id == self.owner_user_id) \
 .first()
 assert_equal(cu, None)
-
+wu = self.session.query(WikiUser) \
+.filter(WikiUser.validating_cohort == cohort_id) \
+.first()
+assert_equal(wu, None)
+c = self.session.query(Cohort).get(cohort_id)
+assert_equal(c, None)
+
+def test_delete_cohort_owner_has_viewer(self):
+viewer_user = User()
+self.session.add(viewer_user)
+self.session.commit()
+
+viewer_cohort_user = CohortUser(
+user_id=viewer_user.id,
+cohort_id=self.cohort.id,
+role=CohortUserRole.VIEWER
+)
+self.session.add(viewer_cohort_user)
+self.session.commit()
+response = self.app.post('/cohorts/delete/{0}'.format(self.cohort.id))
+
+assert_equal(response.status_code, 200)
+assert_true(response.data.find('isRedirect') >= 0)
+assert_true(response.data.find('/cohorts/') >= 0)
+cohort_id = self.cohort.id
+self.session.commit()
+
+# Check that all relevant rows are deleted
+cwu = self.session.query(CohortWikiUser) \
+.filter(CohortWikiUser.cohort_id == cohort_id) \
+.first()
+assert_equal(cwu, None)
+cu = self.session.query(CohortUser) \
+.filter(CohortUser.cohort_id == cohort_id) \
+.first()
+assert_equal(cu, None)
+wu = self.session.query(WikiUser) \
+.filter(WikiUser.validating_cohort == cohort_id) \
+.first()
+assert_equal(wu, None)
+c = self.session.query(Cohort).get(cohort_id)
+assert_equal(c, None)
+
+def test_delete_cohort_as_viewer(self):
+# Changing the owner_user_id to a VIEWER
+self.session.query(CohortUser) \
+.filter(CohortUser.user_id == self.owner_user_id) \
+.filter(CohortUser.cohort_id == self.cohort.id) \
+.update({'role': CohortUserRole.VIEWER})
+self.session.commit()
+
+# Adding a different CohortUser as owner
+new_cohort_user = CohortUser(
+cohort_id=self.cohort.id,
+role=CohortUserRole.OWNER
+)
+self.session.add(new_cohort_user)
+self.session.commit()
+
+response = self.app.post('/cohorts/delete/{0}'.format(self.cohort.id))
+
+assert_e

[MediaWiki-commits] [Gerrit] Fix the geoperf generation script - change (analytics/multimedia)

2014-04-30 Thread MarkTraceur (Code Review)

MarkTraceur has submitted this change and it was merged.

Change subject: Fix the geoperf generation script
..


Fix the geoperf generation script

Change-Id: I8681e68f1c05e3e08f60af7d572d7811b2b0d46a
---
M build-geoperf-tsvs
1 file changed, 2 insertions(+), 2 deletions(-)

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



diff --git a/build-geoperf-tsvs b/build-geoperf-tsvs
index 73431ed..6625e33 100755
--- a/build-geoperf-tsvs
+++ b/build-geoperf-tsvs
@@ -16,8 +16,8 @@
 done
 echo "  Done!"
 
-for sqlpath in `ls $SQL_DIR/*-filerepoinfo.sql | grep -v template.sql`; do
-wikiname=`basename $sqlpath | sed "s/-filerepoinfo.sql//"`
+for sqlpath in `ls $SQL_DIR/*-image.sql | grep -v template.sql`; do
+wikiname=`basename $sqlpath | sed "s/-image.sql//"`
 echo "Updating geo perf data for $wikiname wiki..."
 
 for sqlfilepath in `ls $SQL_DIR/${wikiname}-*.sql`; do

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I8681e68f1c05e3e08f60af7d572d7811b2b0d46a
Gerrit-PatchSet: 1
Gerrit-Project: analytics/multimedia
Gerrit-Branch: master
Gerrit-Owner: MarkTraceur 
Gerrit-Reviewer: MarkTraceur 

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

[MediaWiki-commits] [Gerrit] Revert "Redirect users to upload.wikimedia.org for direct li... - change (mediawiki...ZeroRatedMobileAccess)

2014-04-30 Thread Yurik (Code Review)

Yurik has uploaded a new change for review.

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

Change subject: Revert "Redirect users to upload.wikimedia.org for direct links 
if okay."
..

Revert "Redirect users to upload.wikimedia.org for direct links if okay."

Lots of issues surfaced from http://*.zero.* to https://... redirection 
(invalid cert).

This reverts commit b2b6d3f2257b9a5983d7eb6471db373e05311c49.

Change-Id: I582bf42a3ba1f7306286e332de16d1933526b53a
---
M includes/PageRenderingHooks.php
M modules/interstitial.js
2 files changed, 27 insertions(+), 39 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ZeroRatedMobileAccess 
refs/changes/67/130667/1

diff --git a/includes/PageRenderingHooks.php b/includes/PageRenderingHooks.php
index f1bd855..2dd3733 100644
--- a/includes/PageRenderingHooks.php
+++ b/includes/PageRenderingHooks.php
@@ -792,7 +792,7 @@
return array( 'softredirect' => $toUrl );
}
$fromUrl = MobileContext::singleton()->getMobileUrl( 
$fromTitle->getFullURL() );
-   $redir = false; // true if silent redirect, false for the 
warning
+   $redir = false;
$urlBits = wfParseUrl( $toUrl );
$toHost = is_array( $urlBits ) && array_key_exists( 'host', 
$urlBits ) ? $urlBits['host'] : false;
$toScheme = is_array( $urlBits ) && array_key_exists( 'scheme', 
$urlBits ) ? $urlBits['scheme'] : false;
@@ -806,21 +806,19 @@
}
if ( $toHost ) {
// Check http->https switch and match 
(optional-language.)(subdomain.site).org
-   if ( $toScheme !== 'https' || $config['enableHttps'] ) {
-   if ( $toHost === 'upload.wikimedia.org' && 
$config['showImages'] ) {
-   $redir = true;
-   } elseif ( preg_match( 
'/^([^.]+\.)?([^.]+\.[^.]+)\.org$/', $toHost, $matches ) ) {
-   // Another language in wikipedia
-   $lang = $matches[1];
-   $site = $matches[2];
-   // see if the site is whitelisted, and 
if it is, make sure the language is.
-   if ( in_array( $site, $config['sites'] 
) ) {
-   if ( $lang ) {
-   $freeLangs = 
$config['whitelistedLangs'];
-   $redir = count( 
$freeLangs ) == 0 || in_array( rtrim( $lang, '.' ), $freeLangs );
-   } else {
-   $redir = true; // there 
is no language, but the site is whitelisted, so don't warn
-   }
+   if ( ( $toScheme !== 'https' || $config['enableHttps'] 
) &&
+   preg_match( 
'/^([^.]+\.)?([^.]+\.[^.]+)\.org$/', $toHost, $matches )
+   ) {
+   // Another language in wikipedia
+   $lang = $matches[1];
+   $site = $matches[2];
+   // see if the site is whitelisted, and if it 
is, make sure the language is.
+   if ( in_array( $site, $config['sites'] ) ) {
+   if ( $lang ) {
+   $freeLangs = 
$config['whitelistedLangs'];
+   $redir = count( $freeLangs ) == 
0 || in_array( rtrim( $lang, '.' ), $freeLangs );
+   } else {
+   $redir = true; // there is no 
language, but the site is whitelisted, so don't warn
}
}
}
diff --git a/modules/interstitial.js b/modules/interstitial.js
index a1af435..7c539c5 100644
--- a/modules/interstitial.js
+++ b/modules/interstitial.js
@@ -63,14 +63,11 @@
 showWarning, // true if a warning page should be shown
 toUrl, // target URL of the link
 toAsAnchor, // target URL as a DOM  object
-toHostname, // hostname of of the URL
-toHostParts, // hostname parts of the URL
+toHostParts, // hostname part of the URL
 toLang = false, // language of the destination site
 toSite = false, // non-language specific name of the site, 
e.g. "m.wikipedia"
 isLocal, // true if the target is a link to the current site
-isHttpsSwitch, // true if the link would switch fro

[MediaWiki-commits] [Gerrit] Revert "Redirect users to upload.wikimedia.org for direct li... - change (mediawiki...ZeroRatedMobileAccess)

2014-04-30 Thread jenkins-bot (Code Review)

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

Change subject: Revert "Redirect users to upload.wikimedia.org for direct links 
if okay."
..


Revert "Redirect users to upload.wikimedia.org for direct links if okay."

Lots of issues surfaced from http://*.zero.* to https://... redirection 
(invalid cert).

This reverts commit b2b6d3f2257b9a5983d7eb6471db373e05311c49.

Change-Id: I582bf42a3ba1f7306286e332de16d1933526b53a
---
M includes/PageRenderingHooks.php
M modules/interstitial.js
2 files changed, 27 insertions(+), 39 deletions(-)

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



diff --git a/includes/PageRenderingHooks.php b/includes/PageRenderingHooks.php
index f1bd855..2dd3733 100644
--- a/includes/PageRenderingHooks.php
+++ b/includes/PageRenderingHooks.php
@@ -792,7 +792,7 @@
return array( 'softredirect' => $toUrl );
}
$fromUrl = MobileContext::singleton()->getMobileUrl( 
$fromTitle->getFullURL() );
-   $redir = false; // true if silent redirect, false for the 
warning
+   $redir = false;
$urlBits = wfParseUrl( $toUrl );
$toHost = is_array( $urlBits ) && array_key_exists( 'host', 
$urlBits ) ? $urlBits['host'] : false;
$toScheme = is_array( $urlBits ) && array_key_exists( 'scheme', 
$urlBits ) ? $urlBits['scheme'] : false;
@@ -806,21 +806,19 @@
}
if ( $toHost ) {
// Check http->https switch and match 
(optional-language.)(subdomain.site).org
-   if ( $toScheme !== 'https' || $config['enableHttps'] ) {
-   if ( $toHost === 'upload.wikimedia.org' && 
$config['showImages'] ) {
-   $redir = true;
-   } elseif ( preg_match( 
'/^([^.]+\.)?([^.]+\.[^.]+)\.org$/', $toHost, $matches ) ) {
-   // Another language in wikipedia
-   $lang = $matches[1];
-   $site = $matches[2];
-   // see if the site is whitelisted, and 
if it is, make sure the language is.
-   if ( in_array( $site, $config['sites'] 
) ) {
-   if ( $lang ) {
-   $freeLangs = 
$config['whitelistedLangs'];
-   $redir = count( 
$freeLangs ) == 0 || in_array( rtrim( $lang, '.' ), $freeLangs );
-   } else {
-   $redir = true; // there 
is no language, but the site is whitelisted, so don't warn
-   }
+   if ( ( $toScheme !== 'https' || $config['enableHttps'] 
) &&
+   preg_match( 
'/^([^.]+\.)?([^.]+\.[^.]+)\.org$/', $toHost, $matches )
+   ) {
+   // Another language in wikipedia
+   $lang = $matches[1];
+   $site = $matches[2];
+   // see if the site is whitelisted, and if it 
is, make sure the language is.
+   if ( in_array( $site, $config['sites'] ) ) {
+   if ( $lang ) {
+   $freeLangs = 
$config['whitelistedLangs'];
+   $redir = count( $freeLangs ) == 
0 || in_array( rtrim( $lang, '.' ), $freeLangs );
+   } else {
+   $redir = true; // there is no 
language, but the site is whitelisted, so don't warn
}
}
}
diff --git a/modules/interstitial.js b/modules/interstitial.js
index a1af435..7c539c5 100644
--- a/modules/interstitial.js
+++ b/modules/interstitial.js
@@ -63,14 +63,11 @@
 showWarning, // true if a warning page should be shown
 toUrl, // target URL of the link
 toAsAnchor, // target URL as a DOM  object
-toHostname, // hostname of of the URL
-toHostParts, // hostname parts of the URL
+toHostParts, // hostname part of the URL
 toLang = false, // language of the destination site
 toSite = false, // non-language specific name of the site, 
e.g. "m.wikipedia"
 isLocal, // true if the target is a link to the current site
-isHttpsSwitch, // true if the link would switch from http to 
https
-isFreeLookingUploadDotLink, // wheth

[MediaWiki-commits] [Gerrit] Updated zero ext - change (mediawiki/core)

2014-04-30 Thread Yurik (Code Review)

Yurik has uploaded a new change for review.

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

Change subject: Updated zero ext
..

Updated zero ext

Change-Id: I9a4c2a00d9f3d63155d4b267b3422050a6f7fbb1
---
M extensions/ZeroRatedMobileAccess
1 file changed, 0 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/68/130668/1

diff --git a/extensions/ZeroRatedMobileAccess b/extensions/ZeroRatedMobileAccess
index c84f8ae..d43139a 16
--- a/extensions/ZeroRatedMobileAccess
+++ b/extensions/ZeroRatedMobileAccess
-Subproject commit c84f8ae1d76fe0db7762f7414d6b135646f28b76
+Subproject commit d43139af7afc3f798dbb225f8ec59d603b6ef721

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9a4c2a00d9f3d63155d4b267b3422050a6f7fbb1
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.24wmf2
Gerrit-Owner: Yurik 

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

[MediaWiki-commits] [Gerrit] Append redirect=no to RecentChanges/Watchlist redirect entries - change (mediawiki/core)

2014-04-30 Thread jenkins-bot (Code Review)

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

Change subject: Append redirect=no to RecentChanges/Watchlist redirect entries
..


Append redirect=no to RecentChanges/Watchlist redirect entries

This change adds redirect=no in the URL of redirect entries in the 
RecentChanges or in the Watchlist.
Entries which are not redirects will not be affected.
Some typos in documentation were also fixed.

Bug: 890
Change-Id: I79593811d92b2f57abd742c8ba9e66769d8bc9b7
---
M RELEASE-NOTES-1.24
M includes/Feed.php
M includes/changes/ChangesList.php
M includes/specials/SpecialRecentchanges.php
4 files changed, 8 insertions(+), 3 deletions(-)

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



diff --git a/RELEASE-NOTES-1.24 b/RELEASE-NOTES-1.24
index 48ea3d4..42eadaa 100644
--- a/RELEASE-NOTES-1.24
+++ b/RELEASE-NOTES-1.24
@@ -18,6 +18,8 @@
   option and a size specification set will now always ignore the provided
   size and display an unscaled image, as the documentation has always
   claimed it would.
+* (bug 890) Links in Special:RecentChanges and Special:Watchlist no longer
+  follow redirects to their target pages.
 
 === Web API changes in 1.24 ===
 
diff --git a/includes/Feed.php b/includes/Feed.php
index 1b99519..7089c92 100644
--- a/includes/Feed.php
+++ b/includes/Feed.php
@@ -93,7 +93,7 @@
}
 
/**
-* set the unique id of an item
+* Set the unique id of an item
 *
 * @param string $uniqueId Unique id for the item
 * @param bool $rssIsPermalink Set to true if the guid (unique id) is a 
permalink (RSS feeds only)
@@ -141,7 +141,7 @@
}
 
/**
-* Get the title of this item
+* Get the date of this item
 *
 * @return string
 */
diff --git a/includes/changes/ChangesList.php b/includes/changes/ChangesList.php
index 69e1e9e..246f95d 100644
--- a/includes/changes/ChangesList.php
+++ b/includes/changes/ChangesList.php
@@ -344,6 +344,9 @@
 */
public function insertArticleLink( &$s, &$rc, $unpatrolled, $watched ) {
$params = array();
+   if ( $rc->getTitle()->isRedirect() ) {
+   $params = array( 'redirect' => 'no' );
+   }
 
$articlelink = Linker::linkKnown(
$rc->getTitle(),
diff --git a/includes/specials/SpecialRecentchanges.php 
b/includes/specials/SpecialRecentchanges.php
index f1a31a5..f770307 100644
--- a/includes/specials/SpecialRecentchanges.php
+++ b/includes/specials/SpecialRecentchanges.php
@@ -527,7 +527,7 @@
}
 
/**
-* Create a input to filter changes by categories
+* Create an input to filter changes by categories
 *
 * @param FormOptions $opts
 * @return array

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I79593811d92b2f57abd742c8ba9e66769d8bc9b7
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Withoutaname 
Gerrit-Reviewer: Anomie 
Gerrit-Reviewer: MaxSem 
Gerrit-Reviewer: PiRSquared17 
Gerrit-Reviewer: Reedy 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Remove some cache control complexity - change (mediawiki...DonationInterface)

2014-04-30 Thread Mwalker (Code Review)

Mwalker has uploaded a new change for review.

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

Change subject: Remove some cache control complexity
..

Remove some cache control complexity

We've never used this code, its rotting, and I'm about to tear
apart contribution tracking so I figured some cleaning was in
order.

Change-Id: I2fc18aa3d9a841e159507ed4888e30e176ce6e6f
---
M DonationInterface.php
M gateway_common/DonationData.php
M gateway_common/gateway.adapter.php
M tests/DonationDataTestCase.php
4 files changed, 2 insertions(+), 101 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/DonationInterface 
refs/changes/69/130669/1

diff --git a/DonationInterface.php b/DonationInterface.php
index 613c7b4..b6b17e0 100644
--- a/DonationInterface.php
+++ b/DonationInterface.php
@@ -267,15 +267,6 @@
 $wgDonationInterfaceNoScriptRedirect = null;
 
 /**
- * Set the max-age value for Squid
- *
- * If you have Squid enabled for caching, use this variable to configure
- * the s-max-age for cached requests.
- * @var int Time in seconds
- */
-$wgDonationInterfaceSMaxAge = 6000;
-
-/**
  * Configure price ceiling and floor for valid contribution amount.  Values
  * should be in USD.
  */
diff --git a/gateway_common/DonationData.php b/gateway_common/DonationData.php
index 2b86f1a..73c467a 100644
--- a/gateway_common/DonationData.php
+++ b/gateway_common/DonationData.php
@@ -87,7 +87,6 @@
// Pull both of these here. We can logic out 
which one to use in the normalize bits. 
'language' => $wgRequest->getText( 'language', 
null ),
'uselang' => $wgRequest->getText( 'uselang', 
null ),
-   '_cache_' => $wgRequest->getText( '_cache_', 
null ),
'token' => $wgRequest->getText( 'token', null ),
'contribution_tracking_id' => 
$wgRequest->getText( 'contribution_tracking_id' ),
'data_hash' => $wgRequest->getText( 'data_hash' 
),
@@ -124,8 +123,6 @@

//if we have saved any donation data to the session, pull them 
in as well.
$this->integrateDataFromSession();
-
-   $this->doCacheStuff();
 
$this->normalize();
 
@@ -440,43 +437,8 @@
 */
protected function handleContributionTrackingID(){
if ( !$this->isSomething( 'contribution_tracking_id' ) ) {
-   if ( !$this->isCaching() ) {
-   $this->saveContributionTracking();
-   } else {
-   $this->log( "Declining to create a 
contribution_tracking record, because we are in cache mode." );
-   }
+   $this->saveContributionTracking();
}
-   }
-   
-   /**
-* Tells us if we think we're in caching mode or not. 
-* @staticvar string $cache Keeps track of the mode so we don't have to 
-* calculate it from the data fields more than once. 
-* @return boolean true if we are going to be caching, false if we 
aren't. 
-*/
-   public function isCaching(){
-   
-   static $cache = null;
-
-   if ( is_null( $cache ) ){
-   if ( $this->getVal( '_cache_' ) === 'true' ){ //::head. 
hit. keyboard.::
-   if ( $this->isSomething( 'utm_source_id' ) && 
!is_null( 'utm_source_id' ) ){
-   $cache = true;
-   }
-   }
-   if ( is_null( $cache ) ){
-   $cache = false;
-   }
-   }
-   
-//this business could change at any second, and it will 
prevent us from 
-//caching, so we're going to keep asking if it's set.
-   $c = $this->getAdapterClass();
-   if ( $c::session_exists() ) {
-   $cache = false;
-   }   
-   
-   return $cache;
}

/**
@@ -741,34 +703,6 @@
 
$this->setVal( 'email', $email );
$this->expunge( 'emailAdd' );
-   }
-
-   /**
-* This function sets the token to the string 'cache' if we're caching, 
and 
-* then sets the s-maxage header to whatever you specify for the 
SMaxAge.
-* NOTES: The bit where we setSquidMaxage will not work at all, under 
two 
-* conditions: 
-* The user has a session ID.
-* The mediawiki_session cookie is set in the user's browser.
-* @global bool $wgUseSquid
-* @global type $wgOut 
-*/
-   protected function doCacheStuff() {
-   //TODO:

[MediaWiki-commits] [Gerrit] Fix noop typo - change (mediawiki...DonationInterface)

2014-04-30 Thread Mwalker (Code Review)

Mwalker has uploaded a new change for review.

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

Change subject: Fix noop typo
..

Fix noop typo

What do we even use debugarray for!?

Change-Id: I80a2358def8395667dd0bbf1d18374c22908d9a3
---
M gateway_common/gateway.adapter.php
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/DonationInterface 
refs/changes/70/130670/1

diff --git a/gateway_common/gateway.adapter.php 
b/gateway_common/gateway.adapter.php
index 43558a4..93bb8b4 100644
--- a/gateway_common/gateway.adapter.php
+++ b/gateway_common/gateway.adapter.php
@@ -1157,7 +1157,7 @@
// log that the transaction is essentially complete
$this->log( " Transaction complete." );
 
-   $this->debugarray[] = 'numAttempt = ' . 
$this->getData_Staged('numAttempt');
+   $this->debugarray[] = 'numAttempt = ' . self::session_getData( 
'numAttempt' );
 
return $this->getTransactionAllResults();
}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I80a2358def8395667dd0bbf1d18374c22908d9a3
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/DonationInterface
Gerrit-Branch: master
Gerrit-Owner: Mwalker 

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

[MediaWiki-commits] [Gerrit] Base WorldPay Order ID on CTID - change (mediawiki...DonationInterface)

2014-04-30 Thread Mwalker (Code Review)

Mwalker has uploaded a new change for review.

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

Change subject: Base WorldPay Order ID on CTID
..

Base WorldPay Order ID on CTID

Work in progress

Change-Id: Ifd8f6117dad1751fe54c11817a9ea2271c819268
---
M gateway_common/DonationData.php
M gateway_common/gateway.adapter.php
M worldpay_gateway/worldpay.adapter.php
3 files changed, 37 insertions(+), 5 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/DonationInterface 
refs/changes/71/130671/1

diff --git a/gateway_common/DonationData.php b/gateway_common/DonationData.php
index 73c467a..ef259b7 100644
--- a/gateway_common/DonationData.php
+++ b/gateway_common/DonationData.php
@@ -523,7 +523,7 @@
if ( $this->gateway->isBatchProcessor() ) {
$override = $this->getVal( 'order_id' );
}
-   $this->setVal( 'order_id', $this->gateway->normalizeOrderID( 
$override ) );
+   $this->setVal( 'order_id', $this->gateway->normalizeOrderID( 
$override, $this ) );
}
 
/**
diff --git a/gateway_common/gateway.adapter.php 
b/gateway_common/gateway.adapter.php
index 93bb8b4..38002d6 100644
--- a/gateway_common/gateway.adapter.php
+++ b/gateway_common/gateway.adapter.php
@@ -3450,9 +3450,13 @@
 * the override's word for order_id's final value.
 * Also used when receiving the order_id from external sources
 * (example: An API response)
+*
+* @param DonationData $dataObj Reference to the donation data object 
when
+* we're creating the order ID in the constructor of the object (and 
thus
+* do not yet have a reference to it.)
 * @return string The normalized value of order_id
 */
-   public function normalizeOrderID( $override = null ) {
+   public function normalizeOrderID( $override = null, $dataObj = null ) {
$selected = false;
$source = null;
$value = null;
@@ -3481,7 +3485,7 @@
if ( !$selected && !array_key_exists( 'generated', 
$this->order_id_candidates ) && $this->getOrderIDMeta( 'generate' ) ) {
$selected = true;
$source = 'generated';
-   $value = $this->generateOrderID();
+   $value = $this->generateOrderID( $dataObj );
$this->order_id_candidates[$source] = $value; //so we 
don't regen accidentally
}
 
@@ -3500,10 +3504,15 @@
/**
 * Default orderID generation
 * This used to be done in DonationData, but gateways should control
-* the format here. Override this in child classes. 
+* the format here. Override this in child classes.
+*
+* @param DonationData $dataObj Reference to the donation data object
+* when we are forced to create the order ID during construction of it
+* and thus do not already have a reference. THIS IS A HACK! /me vomits
+*
 * @return int A freshly generated order ID
 */
-   public function generateOrderID() {
+   public function generateOrderID( $dataObj = null ) {
$order_id = ( string ) mt_rand( 1000, 99 );
return $order_id;
}
diff --git a/worldpay_gateway/worldpay.adapter.php 
b/worldpay_gateway/worldpay.adapter.php
index ce6a4f5..1ca3d15 100644
--- a/worldpay_gateway/worldpay.adapter.php
+++ b/worldpay_gateway/worldpay.adapter.php
@@ -1118,4 +1118,27 @@
return $result;
}
 
+   /**
+* WorldPay doesn't check order numbers until settlement at
+* which point it's too late to do much about it. So; our order
+* numbers will by the contribution tracking ID with an attempt
+* number appended.
+*
+* OrderNumber is limited to 17 characters (alpha numeric)
+*
+* We're going to produce them as [0-9]{4-10}\.[0-9]{2}
+*
+* @return int|string
+*/
+   public function generateOrderID( $dataObj = null ) {
+   $dataObj = ( $dataObj !== null ) ?: $this->dataObj;
+
+   if ( !$dataObj->getVal_Escaped( 'contribution_tracking_id' ) ) {
+   $dataObj->updateContributionTracking( true );
+   }
+   $ctid = $dataObj->getVal_Escaped( 'contribution_tracking_id' );
+   $attemptNum = $this->session_getData( 'attemptNum' );
+
+   return "{$ctid}.{$attemptNum}";
+   }
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ifd8f6117dad1751fe54c11817a9ea2271c819268
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/DonationInterface
Gerrit-Branch: master
Gerrit-Owner: Mwalker 

__

[MediaWiki-commits] [Gerrit] Updated zero ext - change (mediawiki/core)

2014-04-30 Thread Yurik (Code Review)

Yurik has uploaded a new change for review.

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

Change subject: Updated zero ext
..

Updated zero ext

Change-Id: I6a326d38b648da0493a5f168b3622a07a74a8aa0
---
M extensions/ZeroRatedMobileAccess
1 file changed, 0 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/72/130672/1

diff --git a/extensions/ZeroRatedMobileAccess b/extensions/ZeroRatedMobileAccess
index c84f8ae..d43139a 16
--- a/extensions/ZeroRatedMobileAccess
+++ b/extensions/ZeroRatedMobileAccess
-Subproject commit c84f8ae1d76fe0db7762f7414d6b135646f28b76
+Subproject commit d43139af7afc3f798dbb225f8ec59d603b6ef721

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6a326d38b648da0493a5f168b3622a07a74a8aa0
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.24wmf1
Gerrit-Owner: Yurik 

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

[MediaWiki-commits] [Gerrit] mw-core-get.sh: Record the commit fetched. - change (integration/jenkins)

2014-04-30 Thread Cscott (Code Review)

Cscott has uploaded a new change for review.

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

Change subject: mw-core-get.sh: Record the commit fetched.
..

mw-core-get.sh: Record the commit fetched.

Change-Id: I69f78f000e3b5449f6e158f1b5f71f58478e951e
---
M bin/mw-core-get.sh
1 file changed, 2 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/jenkins 
refs/changes/73/130673/1

diff --git a/bin/mw-core-get.sh b/bin/mw-core-get.sh
index 04660b7..7f0c103 100755
--- a/bin/mw-core-get.sh
+++ b/bin/mw-core-get.sh
@@ -14,8 +14,9 @@
 fi
 
 if [ -d "$GIT_LOCAL" ]; then
+   # Record the exact commit fetched on stderr via 'git get-tar-commit-id'
git archive --remote="$GIT_LOCAL" "$TREE_ISH" \
-   | (cd "$WORKSPACE" && tar xf -)
+   | tee >(git get-tar-commit-id 1>&2 ; cat > /dev/null ) \
 else
# Fallback to git.wikimedia.org
curl 
"https://git.wikimedia.org/zip/?r=mediawiki/core.git&format=gz&h=$TREE_ISH"; \

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

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

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

[MediaWiki-commits] [Gerrit] WIP: DO NOT MERGE! Add MCC-MNC once per app session on cellu... - change (apps...wikipedia)

2014-04-30 Thread Dr0ptp4kt (Code Review)

Dr0ptp4kt has uploaded a new change for review.

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

Change subject: WIP: DO NOT MERGE! Add MCC-MNC once per app session on cellular.
..

WIP: DO NOT MERGE! Add MCC-MNC once per app session on cellular.

Change-Id: I1c145a623abb582449152f0cf37ffaac3e8829ff
---
M wikipedia/Categories/NSURLRequest+DictionaryRequest.m
M wikipedia/Zero/ZeroConfigState.h
2 files changed, 68 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/apps/ios/wikipedia 
refs/changes/74/130674/1

diff --git a/wikipedia/Categories/NSURLRequest+DictionaryRequest.m 
b/wikipedia/Categories/NSURLRequest+DictionaryRequest.m
index ae17b7e..9c1cd68 100644
--- a/wikipedia/Categories/NSURLRequest+DictionaryRequest.m
+++ b/wikipedia/Categories/NSURLRequest+DictionaryRequest.m
@@ -3,7 +3,11 @@
 
 #import "NSURLRequest+DictionaryRequest.h"
 #import "NSString+Extras.h"
+#import "SessionSingleton.h"
 #import "WikipediaAppUtils.h"
+#import 
+#import 
+#include 
 
 @implementation NSURLRequest (DictionaryRequest)
 
@@ -30,6 +34,7 @@
 [request addValue:@"" forHTTPHeaderField:@"Accept-Encoding"];
 [request addValue:[WikipediaAppUtils versionedUserAgent] 
forHTTPHeaderField:@"User-Agent"];
 // NSLog(@"%@", [WikipediaAppUtils versionedUserAgent]);
+[self addMCCMNCToRequestIfAppropriate:request];
 [request setHTTPBody:[[NSURLRequest constructEncodedURL:parameters] 
dataUsingEncoding:NSUTF8StringEncoding]];
 return request;
 }
@@ -45,6 +50,68 @@
 [request addValue:[WikipediaAppUtils versionedUserAgent] 
forHTTPHeaderField:@"User-Agent"];
 // NSLog(@"%@", [WikipediaAppUtils versionedUserAgent]);
 [request addValue:@"application/x-www-form-urlencoded" 
forHTTPHeaderField:@"Content-Type"];
+[self addMCCMNCToRequestIfAppropriate:request];
 return request;
 }
+
++(void) addMCCMNCToRequestIfAppropriate: (NSMutableURLRequest*) req
+{
+CTCarrier *mno = [[[CTTelephonyNetworkInfo alloc] init] 
subscriberCellularProvider];
+if (mno && ![SessionSingleton sharedInstance].zeroConfigState.sentMCCMNC) {
+SCNetworkReachabilityRef reachabilityRef = 
SCNetworkReachabilityCreateWithAddress(NULL,
+   
   [[[req URL] host] UTF8String]);
+SCNetworkReachabilityFlags reachabilityFlags;
+SCNetworkReachabilityGetFlags(reachabilityRef, &reachabilityFlags);
+
+
+/*
+ SCNetworkReachabilityContext context = {0, (__bridge void *)(self), 
NULL, NULL, NULL};
+ SCNetworkReachabilitySetCallback(reachabilityRef, 
ReachabilityCallback, &context);
+ SCNetworkReachabilityScheduleWithRunLoop(reachabilityRef, 
CFRunLoopGetMain(), kCFRunLoopDefaultMode);
+ */
+
+
+BOOL transient = reachabilityFlags & 
kSCNetworkReachabilityFlagsTransientConnection;
+BOOL reachable = reachabilityFlags & 
kSCNetworkReachabilityFlagsReachable;
+BOOL connectionRequired = reachabilityFlags & 
kSCNetworkReachabilityFlagsConnectionRequired;
+BOOL requiresTraffic = reachabilityFlags & 
kSCNetworkReachabilityFlagsConnectionOnTraffic;
+BOOL intervention = reachabilityFlags & 
kSCNetworkReachabilityFlagsInterventionRequired;
+BOOL onDemand = reachabilityFlags &  
kSCNetworkReachabilityFlagsConnectionOnDemand;
+BOOL local = reachabilityFlags & 
kSCNetworkReachabilityFlagsIsLocalAddress;
+BOOL direct = reachabilityFlags & kSCNetworkReachabilityFlagsIsDirect;
+BOOL cellular = reachabilityFlags & kSCNetworkReachabilityFlagsIsWWAN;
+
+
+NSLog(@"Reachability Flag Status: %c%c %c%c%c%c%c%c%c\n",
+  (reachabilityFlags & kSCNetworkReachabilityFlagsIsWWAN)  
? 'W' : '-',
+  (reachabilityFlags & kSCNetworkReachabilityFlagsReachable)   
 ? 'R' : '-',
+  
+  (reachabilityFlags & 
kSCNetworkReachabilityFlagsTransientConnection)  ? 't' : '-',
+  (reachabilityFlags & 
kSCNetworkReachabilityFlagsConnectionRequired)   ? 'c' : '-',
+  (reachabilityFlags & 
kSCNetworkReachabilityFlagsConnectionOnTraffic)  ? 'C' : '-',
+  (reachabilityFlags & 
kSCNetworkReachabilityFlagsInterventionRequired) ? 'i' : '-',
+  (reachabilityFlags & 
kSCNetworkReachabilityFlagsConnectionOnDemand)   ? 'D' : '-',
+  (reachabilityFlags & kSCNetworkReachabilityFlagsIsLocalAddress)  
 ? 'l' : '-',
+  (reachabilityFlags & kSCNetworkReachabilityFlagsIsDirect)
 ? 'd' : '-'
+  );
+
+/*
+ if (
+ !(reachabilityFlags & kSCNetworkReachabilityFlagsConnectionRequired) 
// hot connection to server available
+ && ((reachabilityFlags & kSCNetworkReachabilityFlagsReachable) && 
(reachabilityFlags & kSCNetworkReachabilityFlagsI

[MediaWiki-commits] [Gerrit] Updated zero ext - change (mediawiki/core)

2014-04-30 Thread jenkins-bot (Code Review)

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

Change subject: Updated zero ext
..


Updated zero ext

Change-Id: I9a4c2a00d9f3d63155d4b267b3422050a6f7fbb1
---
M extensions/ZeroRatedMobileAccess
1 file changed, 0 insertions(+), 0 deletions(-)

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



diff --git a/extensions/ZeroRatedMobileAccess b/extensions/ZeroRatedMobileAccess
index c84f8ae..d43139a 16
--- a/extensions/ZeroRatedMobileAccess
+++ b/extensions/ZeroRatedMobileAccess
-Subproject commit c84f8ae1d76fe0db7762f7414d6b135646f28b76
+Subproject commit d43139af7afc3f798dbb225f8ec59d603b6ef721

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I9a4c2a00d9f3d63155d4b267b3422050a6f7fbb1
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.24wmf2
Gerrit-Owner: Yurik 
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] Updated zero ext - change (mediawiki/core)

2014-04-30 Thread jenkins-bot (Code Review)

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

Change subject: Updated zero ext
..


Updated zero ext

Change-Id: I6a326d38b648da0493a5f168b3622a07a74a8aa0
---
M extensions/ZeroRatedMobileAccess
1 file changed, 0 insertions(+), 0 deletions(-)

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



diff --git a/extensions/ZeroRatedMobileAccess b/extensions/ZeroRatedMobileAccess
index c84f8ae..d43139a 16
--- a/extensions/ZeroRatedMobileAccess
+++ b/extensions/ZeroRatedMobileAccess
-Subproject commit c84f8ae1d76fe0db7762f7414d6b135646f28b76
+Subproject commit d43139af7afc3f798dbb225f8ec59d603b6ef721

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I6a326d38b648da0493a5f168b3622a07a74a8aa0
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.24wmf1
Gerrit-Owner: Yurik 
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] Fix up parsoidsvc repositories location - change (integration/jenkins-job-builder-config)

2014-04-30 Thread jenkins-bot (Code Review)

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

Change subject: Fix up parsoidsvc repositories location
..


Fix up parsoidsvc repositories location

The parsoidsvc-php-parsertests depends on two repositories:

- mediawiki/services/parsoid which is fetched with the Jenkins git
  plugin in $WORKSPACE and is instructed to clear it out
- mediawiki/core which is fetched via git-archive in the same location
  and hence is cleared out by Jenkins git plugin

To ease debugging, fetch mediawiki/core to a different directory and
manually clean it up using the good old rm -fR

Parsoid is now fetched under /parsoidsvc

mediawiki/core is fetched under src/mediawiki/core. The mw-set-env.sh
env script detects that and set MW_INSTALL_PATH accordingly.

Change-Id: I51771f6900a672bffe397283925a9b2236473d35
---
M parsoidsvc.yaml
1 file changed, 17 insertions(+), 4 deletions(-)

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



diff --git a/parsoidsvc.yaml b/parsoidsvc.yaml
index 1a14780..9fa4a7e 100644
--- a/parsoidsvc.yaml
+++ b/parsoidsvc.yaml
@@ -28,15 +28,28 @@
  - '$ZUUL_COMMIT'
 refspec: '$ZUUL_REF'
 disable-submodules: true
+basedir: parsoidsvc
 builders:
-- get-mw-core:
-branch: 'master'
-- mw-install-sqlite
+# Hack to get mediawiki/core installed in a different directory
+- shell: |
+rm -fR src/mediawiki/core
+mkdir -p src/mediawiki/core
+export MW_INSTALL_PATH='src/mediawiki/core'
+
+# mw-core-get.sh only recognize $WORKSPACE so override it to point
+# to MW_INSTALL_PATH
+# Support added with https://gerrit.wikimedia.org/r/#/c/130662/
+# which is pending merge.
+WORKSPACE=$MW_INSTALL_PATH 
/srv/deployment/integration/slave-scripts/bin/mw-core-get.sh master
+
+/srv/deployment/integration/slave-scripts/bin/mw-install-sqlite.sh
+
 - shell: |
# Now run parserTests
# FIXME should use the phpunit wrapper
+   cd src/mediawiki/core
php tests/parserTests.php --color=no --quiet \
---file=tests/parserTests.txt
+--file="$WORKSPACE/parsoidsvc/tests/parserTests.txt"
 
 # Parsoid comes with two repositories:
 # mediawiki/services/parsoid : the actual source code

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I51771f6900a672bffe397283925a9b2236473d35
Gerrit-PatchSet: 4
Gerrit-Project: integration/jenkins-job-builder-config
Gerrit-Branch: master
Gerrit-Owner: Hashar 
Gerrit-Reviewer: Cscott 
Gerrit-Reviewer: Hashar 
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 description for Compact personal bar - change (mediawiki...VectorBeta)

2014-04-30 Thread JGonera (Code Review)

JGonera has uploaded a new change for review.

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

Change subject: Update description for Compact personal bar
..

Update description for Compact personal bar

As per Jared's request.

Change-Id: I0a3602b519ea36fa211ca9a0f0867558ce79ad9f
---
M i18n/en.json
1 file changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VectorBeta 
refs/changes/75/130675/1

diff --git a/i18n/en.json b/i18n/en.json
index c6db745..ad1e94f 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -6,7 +6,7 @@
 "vectorbeta-desc": "Typography refresh of the Vector skin using 
BetaFeatures",
 "vector-beta-feature-typography-description": "Updates typography of the 
Vector skin to improve readability, accessibility and consistency.",
 "vector-beta-feature-compact-personal-bar-message": "Compact personal bar",
-"vector-beta-feature-compact-personal-bar-description": "Collapses 
personal bar into a flyout menu.",
+"vector-beta-feature-compact-personal-bar-description": "Clean and 
organized access to Watchlist, Notifications, and Talk page. A simplified site 
header with access to tools when you need them.",
 "vector-beta-feature-fixedheader-message": "Fixed header",
 "vector-beta-feature-fixedheader-description": "Turns the header on the 
default Vector skin into a fixed header."
-}
\ No newline at end of file
+}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I0a3602b519ea36fa211ca9a0f0867558ce79ad9f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VectorBeta
Gerrit-Branch: master
Gerrit-Owner: JGonera 

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

[MediaWiki-commits] [Gerrit] Remove unnecessary CSS rule - change (mediawiki...VectorBeta)

2014-04-30 Thread jenkins-bot (Code Review)

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

Change subject: Remove unnecessary CSS rule
..


Remove unnecessary CSS rule

Not needed and makes a question mark icon in Echo overlay go to the next
line.

Change-Id: I372500395665e54ff0851c2f3808f1bcc43ad383
---
M resources/compactPersonalBar/compactPersonalBar.less
1 file changed, 0 insertions(+), 4 deletions(-)

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



diff --git a/resources/compactPersonalBar/compactPersonalBar.less 
b/resources/compactPersonalBar/compactPersonalBar.less
index d40066b..f2d61a2 100644
--- a/resources/compactPersonalBar/compactPersonalBar.less
+++ b/resources/compactPersonalBar/compactPersonalBar.less
@@ -129,10 +129,6 @@
 #pt-notifications {
// FIXME: overrides for weird echo badge styling
margin: 0 .8em 0 1.6em !important;
-
-   a {
-   display: block;
-   }
 }
 
 #pt-watchlist a {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I372500395665e54ff0851c2f3808f1bcc43ad383
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VectorBeta
Gerrit-Branch: master
Gerrit-Owner: JGonera 
Gerrit-Reviewer: Jdlrobson 
Gerrit-Reviewer: Jorm 
Gerrit-Reviewer: Kaldari 
Gerrit-Reviewer: Yuvipanda 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] parsoidsvc-php-parsertests: record test hashes. - change (integration/jenkins-job-builder-config)

2014-04-30 Thread Cscott (Code Review)

Cscott has uploaded a new change for review.

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

Change subject: parsoidsvc-php-parsertests: record test hashes.
..

parsoidsvc-php-parsertests: record test hashes.

Log (a hash of) the exact parserTest files involved, so that any unexpected
results can be debugged.

Change-Id: I907157c17aec17c938f5352f74638c18c6ea3cd7
---
M parsoidsvc.yaml
1 file changed, 3 insertions(+), 0 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/integration/jenkins-job-builder-config 
refs/changes/77/130677/1

diff --git a/parsoidsvc.yaml b/parsoidsvc.yaml
index 9fa4a7e..cfd3470 100644
--- a/parsoidsvc.yaml
+++ b/parsoidsvc.yaml
@@ -45,6 +45,9 @@
 /srv/deployment/integration/slave-scripts/bin/mw-install-sqlite.sh
 
 - shell: |
+   # record the versions of parsertests we're running, for debugging
+   # if something goes wrong
+   find -name parserTests.txt -print0 | xargs -0 md5sum -b
# Now run parserTests
# FIXME should use the phpunit wrapper
cd src/mediawiki/core

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I907157c17aec17c938f5352f74638c18c6ea3cd7
Gerrit-PatchSet: 1
Gerrit-Project: integration/jenkins-job-builder-config
Gerrit-Branch: master
Gerrit-Owner: Cscott 

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

[MediaWiki-commits] [Gerrit] Fixed crashing on red links. - change (apps...wikipedia)

2014-04-30 Thread Dbrant (Code Review)

Dbrant has uploaded a new change for review.

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

Change subject: Fixed crashing on red links.
..

Fixed crashing on red links.

Bug: 64423
Change-Id: I88be44efc3e588f55899ad74d6b8f39be2bab49e
---
M wikipedia/src/main/java/org/wikipedia/page/LinkHandler.java
1 file changed, 5 insertions(+), 2 deletions(-)


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

diff --git a/wikipedia/src/main/java/org/wikipedia/page/LinkHandler.java 
b/wikipedia/src/main/java/org/wikipedia/page/LinkHandler.java
index 5bb2cda..8b4f7bf 100644
--- a/wikipedia/src/main/java/org/wikipedia/page/LinkHandler.java
+++ b/wikipedia/src/main/java/org/wikipedia/page/LinkHandler.java
@@ -68,7 +68,6 @@
 } else {
 Uri uri = Uri.parse(href);
 String authority = uri.getAuthority();
-// We don't want to handle /w/ URIs.
 // FIXME: Make this more complete, only to not handle URIs 
that contain unsupported actions
 if (authority != null && Site.isSupportedSite(authority) && 
uri.getPath().startsWith("/wiki/")) {
 Site site = new Site(authority);
@@ -76,7 +75,11 @@
 PageTitle title = site.titleForInternalLink(uri.getPath());
 onInternalLinkClicked(title);
 } else {
-handleExternalLink(uri);
+// if it's a /w/ URI, turn it into a full URI and go 
external
+if (href.startsWith("/w/")) {
+href = String.format("%1$s://%2$s", 
WikipediaApp.PROTOCOL, currentSite.getDomain()) + href;
+}
+handleExternalLink(Uri.parse(href));
 }
 }
 } catch (JSONException e) {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I88be44efc3e588f55899ad74d6b8f39be2bab49e
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] Avoid fatal error if doing a DB query after close() - change (mediawiki/core)

2014-04-30 Thread Aaron Schulz (Code Review)

Aaron Schulz has uploaded a new change for review.

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

Change subject: Avoid fatal error if doing a DB query after close()
..

Avoid fatal error if doing a DB query after close()

Change-Id: I606a3ec5a45136abf396f86f5a65db209128d5c9
---
M includes/db/Database.php
M includes/db/DatabaseMysqlBase.php
2 files changed, 9 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/79/130679/1

diff --git a/includes/db/Database.php b/includes/db/Database.php
index b502bb9..be78f79 100644
--- a/includes/db/Database.php
+++ b/includes/db/Database.php
@@ -780,6 +780,10 @@
$this->mForeign = $foreign;
 
if ( $user ) {
+   $this->mServer = $server;
+   $this->mUser = $user;
+   $this->mPassword = $password;
+   $this->mDBname = $dbName;
$this->open( $server, $user, $password, $dbName );
}
}
@@ -1088,6 +1092,11 @@
 
$queryId = MWDebug::query( $sql, $fname, $isMaster );
 
+   # Avoid fatals if close() was called
+   if ( !$this->isOpen() ) {
+   throw new DBUnexpectedError( $this, "DB connection was 
already closed." );
+   }
+
# Do the query and handle errors
$ret = $this->doQuery( $commentedSql );
 
diff --git a/includes/db/DatabaseMysqlBase.php 
b/includes/db/DatabaseMysqlBase.php
index 837d094..4270bba 100644
--- a/includes/db/DatabaseMysqlBase.php
+++ b/includes/db/DatabaseMysqlBase.php
@@ -64,10 +64,6 @@
$realServer = $server;
}
$this->close();
-   $this->mServer = $server;
-   $this->mUser = $user;
-   $this->mPassword = $password;
-   $this->mDBname = $dbName;
 
wfProfileIn( "dbconnect-$server" );
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I606a3ec5a45136abf396f86f5a65db209128d5c9
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz 

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

[MediaWiki-commits] [Gerrit] parsoidsvc-php-parsertests: record test hashes. - change (integration/jenkins-job-builder-config)

2014-04-30 Thread jenkins-bot (Code Review)

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

Change subject: parsoidsvc-php-parsertests: record test hashes.
..


parsoidsvc-php-parsertests: record test hashes.

Log (a hash of) the exact parserTest files involved, so that any unexpected
results can be debugged.

Change-Id: I907157c17aec17c938f5352f74638c18c6ea3cd7
---
M parsoidsvc.yaml
1 file changed, 3 insertions(+), 0 deletions(-)

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



diff --git a/parsoidsvc.yaml b/parsoidsvc.yaml
index 9fa4a7e..cfd3470 100644
--- a/parsoidsvc.yaml
+++ b/parsoidsvc.yaml
@@ -45,6 +45,9 @@
 /srv/deployment/integration/slave-scripts/bin/mw-install-sqlite.sh
 
 - shell: |
+   # record the versions of parsertests we're running, for debugging
+   # if something goes wrong
+   find -name parserTests.txt -print0 | xargs -0 md5sum -b
# Now run parserTests
# FIXME should use the phpunit wrapper
cd src/mediawiki/core

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I907157c17aec17c938f5352f74638c18c6ea3cd7
Gerrit-PatchSet: 1
Gerrit-Project: integration/jenkins-job-builder-config
Gerrit-Branch: master
Gerrit-Owner: Cscott 
Gerrit-Reviewer: Hashar 
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 Nearby BF from whitelist - change (operations/mediawiki-config)

2014-04-30 Thread Jforrester (Code Review)

Jforrester has uploaded a new change for review.

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

Change subject: Remove Nearby BF from whitelist
..

Remove Nearby BF from whitelist

Already disabled cluster-wide with an in-extension feature flag.

Change-Id: I45bddd9303b7c9c4aaf41ad7a1aba6e4f60ca850
---
M wmf-config/InitialiseSettings.php
1 file changed, 0 insertions(+), 1 deletion(-)


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

diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index 00e2954..7dc199e 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -10728,7 +10728,6 @@
'visualeditor-enable',  // VisualEditor – on-going 
(special permission)
'math-enable-visualeditor', // 2014-05-21 – VE formula 
editor
'multimedia-viewer',// 2014-05-21 – MediaViewer
-   'betafeatures-geonotahack', // 2014-05-21 – Near this page
'cirrussearch-default', // 2014-06-09 – New Seach
'uls-compact-links',// 2014-09-06 – Compact 
language links
'popups',   // 2014-09-18 – Hovercards

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

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

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

< 1 2 3 4 >

101 - 200 of 374 matches

Mail list logo