date:20150618

[MediaWiki-commits] [Gerrit] Revert puppet/self: use the appropriate override - change (operations/puppet)

2015-06-18 Thread Giuseppe Lavagetto (Code Review)

Giuseppe Lavagetto has submitted this change and it was merged.

Change subject: Revert puppet/self: use the appropriate override
..


Revert puppet/self: use the appropriate override

This reverts commit 103148552dedf75ee371683801b95b3056032841.

Change-Id: I9f770ec1166d38dd35a1b7595c3999ad65795af8
---
M modules/base/manifests/puppet.pp
M modules/puppet/manifests/self/config.pp
2 files changed, 2 insertions(+), 1 deletion(-)

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



diff --git a/modules/base/manifests/puppet.pp b/modules/base/manifests/puppet.pp
index c1b6ea6..9889f69 100644
--- a/modules/base/manifests/puppet.pp
+++ b/modules/base/manifests/puppet.pp
@@ -100,3 +100,4 @@
 source   = 'puppet:///modules/base/puppet/97-last-puppet-run',
 }
 }
+
diff --git a/modules/puppet/manifests/self/config.pp 
b/modules/puppet/manifests/self/config.pp
index 3d19444..addbeb2 100644
--- a/modules/puppet/manifests/self/config.pp
+++ b/modules/puppet/manifests/self/config.pp
@@ -74,7 +74,7 @@
 }
 }
 
-Base::Puppet::Config['main'] {
+File | title == '/etc/puppet/puppet.conf.d/10-main.conf' | {
 ensure = absent,
 }
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I9f770ec1166d38dd35a1b7595c3999ad65795af8
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto glavage...@wikimedia.org
Gerrit-Reviewer: Giuseppe Lavagetto glavage...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] Revert puppet/self: use the appropriate override - change (operations/puppet)

2015-06-18 Thread Hashar (Code Review)

Hashar has uploaded a new change for review.

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

Change subject: Revert puppet/self: use the appropriate override
..

Revert puppet/self: use the appropriate override

Causes puppet error on labs puppetmaster self:

Error: Could not retrieve catalog from remote server:
  Error 400 on SERVER: Only subclasses can override parameters
  at 79:modules/puppet/manifests/self/config.pp

This reverts commit 103148552dedf75ee371683801b95b3056032841.

Bug: T102947
Change-Id: I7d842def6ebd3d625f1260fa0a5ba881f0365805
---
M modules/base/manifests/puppet.pp
M modules/puppet/manifests/self/config.pp
2 files changed, 2 insertions(+), 1 deletion(-)


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

diff --git a/modules/base/manifests/puppet.pp b/modules/base/manifests/puppet.pp
index c1b6ea6..9889f69 100644
--- a/modules/base/manifests/puppet.pp
+++ b/modules/base/manifests/puppet.pp
@@ -100,3 +100,4 @@
 source   = 'puppet:///modules/base/puppet/97-last-puppet-run',
 }
 }
+
diff --git a/modules/puppet/manifests/self/config.pp 
b/modules/puppet/manifests/self/config.pp
index 3d19444..addbeb2 100644
--- a/modules/puppet/manifests/self/config.pp
+++ b/modules/puppet/manifests/self/config.pp
@@ -74,7 +74,7 @@
 }
 }
 
-Base::Puppet::Config['main'] {
+File | title == '/etc/puppet/puppet.conf.d/10-main.conf' | {
 ensure = absent,
 }
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I7d842def6ebd3d625f1260fa0a5ba881f0365805
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Hashar has...@free.fr

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

[MediaWiki-commits] [Gerrit] Phasing out of claims - change (mediawiki...WikidataQualityConstraints)

2015-06-18 Thread Jonaskeutel (Code Review)

Jonaskeutel has submitted this change and it was merged.

Change subject: Phasing out of claims
..


Phasing out of claims

[Rebased]

Change-Id: I3ea25bcff5a2b64bf5dbb56d0305a837eed2487a
---
M includes/ConstraintCheck/Checker/CommonsLinkChecker.php
M includes/ConstraintCheck/Checker/DiffWithinRangeChecker.php
M includes/ConstraintCheck/Checker/FormatChecker.php
M includes/ConstraintCheck/Checker/InverseChecker.php
M includes/ConstraintCheck/Checker/MultiValueChecker.php
M includes/ConstraintCheck/Checker/OneOfChecker.php
M includes/ConstraintCheck/Checker/RangeChecker.php
M includes/ConstraintCheck/Checker/SingleValueChecker.php
M includes/ConstraintCheck/Checker/SymmetricChecker.php
M includes/ConstraintCheck/Checker/TargetRequiredClaimChecker.php
M includes/ConstraintCheck/Checker/ValueTypeChecker.php
M includes/ConstraintCheck/DelegatingConstraintChecker.php
M includes/ConstraintCheck/Helper/TypeCheckerHelper.php
M includes/ConstraintCheck/Result/CheckResult.php
M tests/phpunit/Checker/CommonsLinkChecker/CommonsLinkCheckerTest.php
M tests/phpunit/Checker/ConnectionChecker/ConflictsWithCheckerTest.php
M tests/phpunit/Checker/ConnectionChecker/ConnectionCheckerHelperTest.php
M tests/phpunit/Checker/ConnectionChecker/InverseCheckerTest.php
M tests/phpunit/Checker/ConnectionChecker/ItemCheckerTest.php
M tests/phpunit/Checker/ConnectionChecker/SymmetricCheckerTest.php
M tests/phpunit/Checker/ConnectionChecker/TargetRequiredClaimCheckerTest.php
M tests/phpunit/Checker/FormatChecker/FormatCheckerTest.php
M tests/phpunit/Checker/OneOfChecker/OneOfCheckerTest.php
M tests/phpunit/Checker/RangeChecker/DiffWithinRangeCheckerTest.php
M tests/phpunit/Checker/RangeChecker/RangeCheckerTest.php
M tests/phpunit/Checker/TypeChecker/TypeCheckerHelperTest.php
M tests/phpunit/Checker/TypeChecker/TypeCheckerTest.php
M tests/phpunit/Checker/TypeChecker/ValueTypeCheckerTest.php
M tests/phpunit/Checker/ValueCountChecker/MultiValueCheckerTest.php
M tests/phpunit/Checker/ValueCountChecker/SingleValueCheckerTest.php
M tests/phpunit/Checker/ValueCountChecker/UniqueValueCheckerTest.php
M tests/phpunit/Checker/ValueCountChecker/ValueCountCheckerHelperTest.php
M tests/phpunit/EvaluateConstraintReportJobServiceTest.php
M tests/phpunit/Result/CheckResultTest.php
M tests/phpunit/Specials/SpecialConstraintReportTest.php
M tests/phpunit/Violations/CheckResultToViolationTranslatorTest.php
36 files changed, 157 insertions(+), 181 deletions(-)

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



diff --git a/includes/ConstraintCheck/Checker/CommonsLinkChecker.php 
b/includes/ConstraintCheck/Checker/CommonsLinkChecker.php
index 392c5b4..e127219 100644
--- a/includes/ConstraintCheck/Checker/CommonsLinkChecker.php
+++ b/includes/ConstraintCheck/Checker/CommonsLinkChecker.php
@@ -53,7 +53,7 @@
$parameters['constraint_status'] = 
$this-helper-parseSingleParameter( 
$constraintParameters['constraint_status'], true );
}
 
-   $mainSnak = $statement-getClaim()-getMainSnak();
+   $mainSnak = $statement-getMainSnak();
 
/*
 * error handling:
diff --git a/includes/ConstraintCheck/Checker/DiffWithinRangeChecker.php 
b/includes/ConstraintCheck/Checker/DiffWithinRangeChecker.php
index bb0e161..a9d3cb1 100644
--- a/includes/ConstraintCheck/Checker/DiffWithinRangeChecker.php
+++ b/includes/ConstraintCheck/Checker/DiffWithinRangeChecker.php
@@ -61,7 +61,7 @@
$parameters[ 'constraint_status' ] = 
$this-helper-parseSingleParameter( 
$constraintParameters['constraint_status'], true );
}
 
-   $mainSnak = $statement-getClaim()-getMainSnak();
+   $mainSnak = $statement-getMainSnak();
 
/*
 * error handling:
@@ -99,8 +99,8 @@
 
// checks only the first occurrence of the referenced property 
(this constraint implies a single value constraint on that property)
foreach ( $entity-getStatements() as $statement ) {
-   if ( $property === 
$statement-getClaim()-getPropertyId()-getSerialization() ) {
-   $mainSnak = 
$statement-getClaim()-getMainSnak();
+   if ( $property === 
$statement-getPropertyId()-getSerialization() ) {
+   $mainSnak = $statement-getMainSnak();
 
/*
 * error handling:
diff --git a/includes/ConstraintCheck/Checker/FormatChecker.php 
b/includes/ConstraintCheck/Checker/FormatChecker.php
index f7e2ba6..06647f6 100644
--- a/includes/ConstraintCheck/Checker/FormatChecker.php
+++ b/includes/ConstraintCheck/Checker/FormatChecker.php
@@ -56,7 +56,7 @@
$parameters['constraint_status'] = 
$this-helper-parseSingleParameter( 
$constraintParameters['constraint_status'], true );

[MediaWiki-commits] [Gerrit] Fix maintenance script - change (mediawiki...WikidataQualityExternalValidation)

2015-06-18 Thread Tamslo (Code Review)

Tamslo has submitted this change and it was merged.

Change subject: Fix maintenance script
..


Fix maintenance script

Change-Id: Icfb6d2c8060c503e1a9693dfce8d750d06354752
---
M maintenance/UpdateTable.php
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/maintenance/UpdateTable.php b/maintenance/UpdateTable.php
index afe4381..423ae16 100755
--- a/maintenance/UpdateTable.php
+++ b/maintenance/UpdateTable.php
@@ -9,7 +9,7 @@
 
 
 // @codeCoverageIgnoreStart
-$basePath = getenv( MW_INSTALL_PATH ) !== false ? getenv( MW_INSTALL_PATH 
) : __DIR__ . /../../../../..;
+$basePath = getenv( MW_INSTALL_PATH ) !== false ? getenv( MW_INSTALL_PATH 
) : __DIR__ . /../../..;
 require_once $basePath . /maintenance/Maintenance.php;
 // @codeCoverageIgnoreEnd
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Icfb6d2c8060c503e1a9693dfce8d750d06354752
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikidataQualityExternalValidation
Gerrit-Branch: v1
Gerrit-Owner: Tamslo tamaraslosa...@gmail.com
Gerrit-Reviewer: Tamslo tamaraslosa...@gmail.com
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] Rename getRedirectCreator newRedirectCreationInteractor - change (mediawiki...Wikibase)

2015-06-18 Thread jenkins-bot (Code Review)

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

Change subject: Rename getRedirectCreator  newRedirectCreationInteractor
..


Rename getRedirectCreator  newRedirectCreationInteractor

Less confusing when searching for such a method
in the factory.
This also means the new method I am about to introduce
will be named the same

Change-Id: Iaca4febe9db04e6032701d05cd6228b23b1faf0b
---
M repo/includes/WikibaseRepo.php
M repo/includes/specials/SpecialRedirectEntity.php
2 files changed, 2 insertions(+), 2 deletions(-)

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



diff --git a/repo/includes/WikibaseRepo.php b/repo/includes/WikibaseRepo.php
index f71e551..b9bbfa9 100644
--- a/repo/includes/WikibaseRepo.php
+++ b/repo/includes/WikibaseRepo.php
@@ -311,7 +311,7 @@
return $this-getStore()-getEntityRevisionLookup( $uncached );
}
 
-   public function getRedirectCreator( User $user, IContextSource $context 
) {
+   public function newRedirectCreationInteractor( User $user, 
IContextSource $context ) {
return new RedirectCreationInteractor(
$this-getEntityRevisionLookup( 'uncached' ),
$this-getEntityStore(),
diff --git a/repo/includes/specials/SpecialRedirectEntity.php 
b/repo/includes/specials/SpecialRedirectEntity.php
index 01910ac..f74e66e 100644
--- a/repo/includes/specials/SpecialRedirectEntity.php
+++ b/repo/includes/specials/SpecialRedirectEntity.php
@@ -57,7 +57,7 @@
new TokenCheckInteractor(
$this-getUser()
),
-   $wikibaseRepo-getRedirectCreator(
+   $wikibaseRepo-newRedirectCreationInteractor(
$this-getUser(),
$this-getContext()
)

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Iaca4febe9db04e6032701d05cd6228b23b1faf0b
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Addshore addshorew...@gmail.com
Gerrit-Reviewer: Jeroen De Dauw jeroended...@gmail.com
Gerrit-Reviewer: Thiemo Mättig (WMDE) thiemo.maet...@wikimedia.de
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] adds configuration options to Sprint extension - change (phabricator...Sprint)

2015-06-18 Thread Christopher Johnson (WMDE) (Code Review)

Christopher Johnson (WMDE) has uploaded a new change for review.

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

Change subject: adds configuration options to Sprint extension
..

adds configuration options to Sprint extension

this allows for flexibility and fault-tolerance.  Options include
ability to disable workboard integration, charts, and tables.

Bug: T102936
Change-Id: I147258f4593e038263540f03c875e32d57b1f70e
---
M src/__phutil_library_map__.php
M src/application/SprintApplication.php
A src/config/SprintConfigOptions.php
M src/controller/SprintDataViewController.php
M src/view/burndown/SprintDataView.php
5 files changed, 228 insertions(+), 48 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/phabricator/extensions/Sprint 
refs/changes/46/219146/1

diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
index 4f641f7..84b3327 100644
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -39,6 +39,7 @@
 'SprintBoardViewController' = 
'controller/board/SprintBoardViewController.php',
 'SprintColumnTransaction' = 'storage/SprintColumnTransaction.php',
 'SprintConduitAPIMethod' = 'conduit/SprintConduitAPIMethod.php',
+'SprintConfigOptions' = 'config/SprintConfigOptions.php',
 'SprintConstants' = 'constants/SprintConstants.php',
 'SprintController' = 'controller/SprintController.php',
 'SprintControllerTest' = 'tests/SprintControllerTest.php',
@@ -100,6 +101,7 @@
 'SprintBoardTaskEditController' = 'ManiphestController',
 'SprintBoardViewController' = 'SprintBoardController',
 'SprintConduitAPIMethod' = 'ConduitAPIMethod',
+'SprintConfigOptions' = 'PhabricatorApplicationConfigOptions',
 'SprintController' = 'PhabricatorController',
 'SprintControllerTest' = 'SprintTestCase',
 'SprintCreateConduitAPIMethod' = 'SprintConduitAPIMethod',
diff --git a/src/application/SprintApplication.php 
b/src/application/SprintApplication.php
index df7ea14..429b191 100644
--- a/src/application/SprintApplication.php
+++ b/src/application/SprintApplication.php
@@ -30,9 +30,10 @@
   }
 
   public function getRoutes() {
-
-return array(
-// this is the default application route controller
+$enable_board = PhabricatorEnv::getEnvConfig('sprint.enable-sprint-board');
+if ($enable_board == true) {
+  return array(
+// this is the default application route controller
   '/project/sprint/' = array(
   '' = 'SprintListController',
 // these are forked controllers for the Sprint Board
@@ -68,7 +69,7 @@
   'report/history/' = 'SprintHistoryController',
   'report/(?:(?Pview\w+)/)?' = 'SprintReportController',
   'view/(?Pid\d+)/' = 'SprintDataViewController',
-  // all routes following point to default controllers
+// all routes following point to default controllers
   'archive/(?Pid[1-9]\d*)/'
   = 'PhabricatorProjectArchiveController',
   'details/(?Pid[1-9]\d*)/'
@@ -87,12 +88,64 @@
   'update/(?Pid[1-9]\d*)/(?Paction[^/]+)/'
   = 'PhabricatorProjectUpdateController',
   ),
-  // primary tag route override
+// primary tag route override
   '/tag/' = array(
   '(?Pslug[^/]+)/' = 'SprintProjectViewController',
   '(?Pslug[^/]+)/board/' = 'SprintBoardViewController',
   ),
   );
+} else {
+  return array(
+// this is the default application route controller
+  '/project/sprint/' = array(
+  '' = 'SprintListController',
+// these are forked controllers for the Sprint Board
+  'board/(?PprojectID[1-9]\d*)/' = array(
+  'edit/(?:(?Pid\d+)/)?'
+  = 'PhabricatorProjectBoardColumnEditController',
+  'hide/(?:(?Pid\d+)/)?'
+  = 'PhabricatorProjectBoardColumnHideController',
+  'column/(?:(?Pid\d+)/)?'
+  = 'PhabricatorProjectBoardColumnDetailController',
+  'import/'
+  = 'PhabricatorProjectBoardImportController',
+  'reorder/'
+  = 'PhabricatorProjectBoardReorderController',
+  ),
+// these are for board filters and column queries
+  'board/(?Pid[1-9]\d*)/'.
+  '(?Pfilterfilter/)?'.
+  '(?:query/(?PqueryKey[^/]+)/)?'
+  = 'PhabricatorProjectBoardViewController',
+// these are native Sprint application controllers
+  'burn/(?Pid\d+)/' = 'SprintDataViewController',
+  'profile/(?Pid[1-9]\d*)/'
+  = 'SprintProjectProfileController',
+  'report/list/' = 'SprintListController',
+  'report/history/' = 'SprintHistoryController',
+  'report/(?:(?Pview\w+)/)?'

[MediaWiki-commits] [Gerrit] Revert puppet/self: use the appropriate override - change (operations/puppet)

2015-06-18 Thread Giuseppe Lavagetto (Code Review)

Giuseppe Lavagetto has uploaded a new change for review.

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

Change subject: Revert puppet/self: use the appropriate override
..

Revert puppet/self: use the appropriate override

This reverts commit 103148552dedf75ee371683801b95b3056032841.

Change-Id: I9f770ec1166d38dd35a1b7595c3999ad65795af8
---
M modules/base/manifests/puppet.pp
M modules/puppet/manifests/self/config.pp
2 files changed, 2 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/54/219154/1

diff --git a/modules/base/manifests/puppet.pp b/modules/base/manifests/puppet.pp
index c1b6ea6..9889f69 100644
--- a/modules/base/manifests/puppet.pp
+++ b/modules/base/manifests/puppet.pp
@@ -100,3 +100,4 @@
 source   = 'puppet:///modules/base/puppet/97-last-puppet-run',
 }
 }
+
diff --git a/modules/puppet/manifests/self/config.pp 
b/modules/puppet/manifests/self/config.pp
index 3d19444..addbeb2 100644
--- a/modules/puppet/manifests/self/config.pp
+++ b/modules/puppet/manifests/self/config.pp
@@ -74,7 +74,7 @@
 }
 }
 
-Base::Puppet::Config['main'] {
+File | title == '/etc/puppet/puppet.conf.d/10-main.conf' | {
 ensure = absent,
 }
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9f770ec1166d38dd35a1b7595c3999ad65795af8
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto glavage...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] Delete old test items during test setup. - change (mediawiki...Wikibase)

2015-06-18 Thread jenkins-bot (Code Review)

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

Change subject: Delete old test items during test setup.
..


Delete old test items during test setup.

This should make tests that rely on entity data in the database more robust,
by making sure that each test suite starts with a clean set of entities.

Change-Id: I393751e16ab4ebdda9a722370a31c24b449d6375
---
M repo/tests/phpunit/includes/api/EntityTestHelper.php
M repo/tests/phpunit/includes/api/WikibaseApiTestCase.php
2 files changed, 26 insertions(+), 4 deletions(-)

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

Objections:
  Thiemo Mättig (WMDE): There's a problem with this change, please improve



diff --git a/repo/tests/phpunit/includes/api/EntityTestHelper.php 
b/repo/tests/phpunit/includes/api/EntityTestHelper.php
index 70a23ce..7fbc9a9 100644
--- a/repo/tests/phpunit/includes/api/EntityTestHelper.php
+++ b/repo/tests/phpunit/includes/api/EntityTestHelper.php
@@ -357,7 +357,7 @@
 * @param string $handle
 * @throws OutOfBoundsException
 */
-   private static function unRegisterEntity( $handle ) {
+   public static function unRegisterEntity( $handle ) {
unset( self::$activeIds[ self::$activeHandles[ $handle ] ] );
unset( self::$activeHandles[ $handle ] );
}
diff --git a/repo/tests/phpunit/includes/api/WikibaseApiTestCase.php 
b/repo/tests/phpunit/includes/api/WikibaseApiTestCase.php
index 83e8534..3b0477e 100644
--- a/repo/tests/phpunit/includes/api/WikibaseApiTestCase.php
+++ b/repo/tests/phpunit/includes/api/WikibaseApiTestCase.php
@@ -3,12 +3,15 @@
 namespace Wikibase\Test\Api;
 
 use ApiTestCase;
+use OutOfBoundsException;
 use Revision;
 use TestSites;
 use TestUser;
+use Title;
 use UsageException;
 use User;
 use Wikibase\Repo\WikibaseRepo;
+use WikiPage;
 
 /**
  * Base class for test classes that test the API modules that derive from 
ApiWikibaseModifyItem.
@@ -97,9 +100,11 @@
$activeHandles = EntityTestHelper::getActiveHandles();
 
foreach ( $activeHandles as $handle = $id ) {
-   $params = EntityTestHelper::getEntityClear( $handle );
-   $params['action'] = 'wbeditentity';
-   $this-doApiRequestWithToken( $params );
+   $title = $this-getTestEntityTitle( $handle );
+
+   $page = WikiPage::factory( $title );
+   $page-doDeleteArticle( 'Test reset' );
+   EntityTestHelper::unRegisterEntity( $handle );
}
 
foreach ( $handles as $handle ) {
@@ -117,6 +122,23 @@
}
 
/**
+* @param string $handle
+*
+* @return null|Title
+*/
+   protected function getTestEntityTitle( $handle ) {
+   try {
+   $idString = EntityTestHelper::getId( $handle );
+   $id = 
WikibaseRepo::getDefaultInstance()-getEntityIdParser()-parse( $idString );
+   $title =  
WikibaseRepo::getDefaultInstance()-getEntityTitleLookup()-getTitleForId( $id 
);
+   } catch ( OutOfBoundsException $ex ) {
+   $title = null;
+   }
+
+   return $title;
+   }
+
+   /**
 * Loads an entity from the database (via an API call).
 *
 * @param string $id

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I393751e16ab4ebdda9a722370a31c24b449d6375
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Daniel Kinzler daniel.kinz...@wikimedia.de
Gerrit-Reviewer: Addshore addshorew...@gmail.com
Gerrit-Reviewer: Aude aude.w...@gmail.com
Gerrit-Reviewer: Hoo man h...@online.de
Gerrit-Reviewer: JanZerebecki jan.wikime...@zerebecki.de
Gerrit-Reviewer: Lucie Kaffee lucie.kaf...@wikimedia.de
Gerrit-Reviewer: Thiemo Mättig (WMDE) thiemo.maet...@wikimedia.de
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] Allow aklapper to reset user authentications on Phabricator - change (operations/puppet)

2015-06-18 Thread Aklapper (Code Review)

Aklapper has uploaded a new change for review.

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

Change subject: Allow aklapper to reset user authentications on Phabricator
..

Allow aklapper to reset user authentications on Phabricator

as such requests come up from time to time. Related documentation:
https://wikitech.wikimedia.org/wiki/Phabricator

Change-Id: Ie28a37d3837a4e6f5ae5769c485da93390c2c976
---
M modules/admin/data/data.yaml
1 file changed, 3 insertions(+), 1 deletion(-)


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

diff --git a/modules/admin/data/data.yaml b/modules/admin/data/data.yaml
index fc3161c..0504805 100644
--- a/modules/admin/data/data.yaml
+++ b/modules/admin/data/data.yaml
@@ -287,11 +287,13 @@
 description: Users who can do sane CLI admin things
  * Remove repositories
  * Manage repositories, phd service, and workers
+ * Reset authentication of users
 members: [aklapper]
 privileges: ['ALL = NOPASSWD: /srv/phab/phabricator/bin/remove destroy r*',
  'ALL = NOPASSWD: /srv/phab/phabricator/bin/repository',
  'ALL = NOPASSWD: /srv/phab/phabricator/bin/phd',
- 'ALL = NOPASSWD: /srv/phab/phabricator/bin/worker']
+ 'ALL = NOPASSWD: /srv/phab/phabricator/bin/worker',
+ 'ALL = NOPASSWD: /srv/phab/phabricator/auth strip']
   zotero-admin:
 gid: 747
 description: group of zotero admins

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie28a37d3837a4e6f5ae5769c485da93390c2c976
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Aklapper aklap...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] Disable gate on WikidataQualityConstraints - change (integration/config)

2015-06-18 Thread Hashar (Code Review)

Hashar has uploaded a new change for review.

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

Change subject: Disable gate on WikidataQualityConstraints
..

Disable gate on WikidataQualityConstraints

The jobs are failling and patches are force merged. That disrupts Zuul
processing.
Disable the whole gate-and-submit for WikidataQualityConstraints.

Bug: T102950
Change-Id: I38e9cc6bbf9da4b3000cd659621567409d9d818f
---
M zuul/layout.yaml
1 file changed, 8 insertions(+), 8 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/61/219161/1

diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 5a89b61..ddd3323 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -5821,14 +5821,14 @@
 zend:
   - mwext-WikidataQualityConstraints-repo-tests-sqlite-zend
   - mwext-WikidataQualityConstraints-repo-tests-mysql-zend
-gate-and-submit:
-  - phplint
-  - php-composer-package-validate
-  - mwext-WikidataQualityConstraints-repo-tests-sqlite-zend
-  - mwext-WikidataQualityConstraints-repo-tests-mysql-zend
-  - mwext-WikidataQualityConstraints-repo-tests-sqlite-hhvm
-  - mwext-WikidataQualityConstraints-repo-tests-mysql-hhvm
-  - mwext-WikidataQualityConstraints-qunit
+#gate-and-submit:
+#  - phplint
+#  - php-composer-package-validate
+#  - mwext-WikidataQualityConstraints-repo-tests-sqlite-zend
+#  - mwext-WikidataQualityConstraints-repo-tests-mysql-zend
+#  - mwext-WikidataQualityConstraints-repo-tests-sqlite-hhvm
+#  - mwext-WikidataQualityConstraints-repo-tests-mysql-hhvm
+#  - mwext-WikidataQualityConstraints-qunit
 
   - name: mediawiki/extensions/WikidataQualityExternalValidation
 template:

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I38e9cc6bbf9da4b3000cd659621567409d9d818f
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Hashar has...@free.fr

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

[MediaWiki-commits] [Gerrit] Avoid database access in MergeItemsTest by mocking ChangeOpF... - change (mediawiki...Wikibase)

2015-06-18 Thread Daniel Kinzler (Code Review)

Daniel Kinzler has uploaded a new change for review.

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

Change subject: Avoid database access in MergeItemsTest by mocking 
ChangeOpFactoryProvider
..

Avoid database access in MergeItemsTest by mocking ChangeOpFactoryProvider

Change-Id: Ie7e132283a89d70101511e19197ebc9c0bd739db
---
M repo/tests/phpunit/includes/api/MergeItemsTest.php
1 file changed, 72 insertions(+), 20 deletions(-)


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

diff --git a/repo/tests/phpunit/includes/api/MergeItemsTest.php 
b/repo/tests/phpunit/includes/api/MergeItemsTest.php
index 2cc9841..31d1996 100644
--- a/repo/tests/phpunit/includes/api/MergeItemsTest.php
+++ b/repo/tests/phpunit/includes/api/MergeItemsTest.php
@@ -8,14 +8,20 @@
 use User;
 use Wikibase\Api\ApiErrorReporter;
 use Wikibase\Api\MergeItems;
+use Wikibase\ChangeOp\ChangeOpFactoryProvider;
 use Wikibase\DataModel\Entity\BasicEntityIdParser;
-use Wikibase\DataModel\Entity\EntityId;
+use Wikibase\Lib\ClaimGuidGenerator;
 use Wikibase\Repo\Interactors\ItemMergeInteractor;
 use Wikibase\Repo\Interactors\RedirectCreationInteractor;
 use Wikibase\Repo\Hooks\EditFilterHookRunner;
+use Wikibase\Repo\Store\EntityPermissionChecker;
 use Wikibase\Repo\WikibaseRepo;
 use Wikibase\Test\EntityModificationTestHelper;
 use Wikibase\Test\MockRepository;
+use Wikibase\Test\MockSiteStore;
+use Wikibase\Validators\EntityConstraintProvider;
+use Wikibase\Validators\SnakValidator;
+use Wikibase\Validators\TermValidatorFactory;
 
 /**
  * @covers Wikibase\Api\MergeItems
@@ -51,8 +57,6 @@
protected function setUp() {
parent::setUp();
 
-   $this-setUpSites();
-
$this-entityModificationTestHelper = new 
EntityModificationTestHelper();
$this-apiModuleTestHelper = new ApiModuleTestHelper();
 
@@ -71,18 +75,9 @@
) );
}
 
-   private function setUpSites() {
-   static $isSetup = false;
-
-   if ( !$isSetup ) {
-   $sitesTable = 
WikibaseRepo::getDefaultInstance()-getSiteStore();
-   $sitesTable-clear();
-   $sitesTable-saveSites( TestSites::getSites() );
-
-   $isSetup = true;
-   }
-   }
-
+   /**
+* @return EntityPermissionChecker
+*/
private function getPermissionCheckers() {
$permissionChecker = $this-getMock( 
'Wikibase\Repo\Store\EntityPermissionChecker' );
 
@@ -129,25 +124,32 @@
$resultBuilder = 
WikibaseRepo::getDefaultInstance()-getApiHelperFactory()-getResultBuilder( 
$module );
$summaryFormatter = 
WikibaseRepo::getDefaultInstance()-getSummaryFormatter();
 
-   $changeOpsFactory = 
WikibaseRepo::getDefaultInstance()-getChangeOpFactoryProvider()-getMergeChangeOpFactory();
-$wikibaseRepo = WikibaseRepo::getDefaultInstance();
+   $changeOpsFactoryProvider = new ChangeOpFactoryProvider(
+   $this-getConstraintProvider(),
+   new ClaimGuidGenerator(),
+   
WikibaseRepo::getDefaultInstance()-getClaimGuidValidator(),
+   
WikibaseRepo::getDefaultInstance()-getClaimGuidParser(),
+   $this-getSnakValidator(),
+   $this-getTermValidatorFactory(),
+   new MockSiteStore( TestSites::getSites() )
+   );
 
$module-setServices(
$idParser,
$errorReporter,
$resultBuilder,
new ItemMergeInteractor(
-   $changeOpsFactory,
+   
$changeOpsFactoryProvider-getMergeChangeOpFactory(),
$this-mockRepository,
$this-mockRepository,
$this-getPermissionCheckers(),
-   $wikibaseRepo-getSummaryFormatter(),
+   $summaryFormatter,
$module-getUser(),
 new RedirectCreationInteractor(
 $this-mockRepository,
 $this-mockRepository,
 $this-getPermissionCheckers(),
-$wikibaseRepo-getSummaryFormatter(),
+$summaryFormatter,
 $module-getUser(),
 $this-getMockEditFilterHookRunner(),
 $this-mockRepository
@@ -156,6 +158,56 @@
);
}
 
+   /**
+* @return EntityConstraintProvider

[MediaWiki-commits] [Gerrit] Don't break update.php - change (mediawiki...Flow)

2015-06-18 Thread Matthias Mullie (Code Review)

Matthias Mullie has uploaded a new change for review.

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

Change subject: Don't break update.php
..

Don't break update.php

This maintenance script should no longer automatically run as
part of update.php. We've disallowed updating these columns, so
update.php will fail should this script still find any incorrect
data that needs to be updated.

Instead, the script can now still be run manually if need be.
When it fails, it'll show instructions on how to proceed.

Change-Id: I9099f98b287dfd426a4247782ff00ad6ffde7307
---
M Hooks.php
M maintenance/FlowUpdateRevisionContentLength.php
2 files changed, 10 insertions(+), 4 deletions(-)


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

diff --git a/Hooks.php b/Hooks.php
index a21f8f9..c3c7855 100644
--- a/Hooks.php
+++ b/Hooks.php
@@ -225,9 +225,6 @@
require_once __DIR__.'/maintenance/FlowPopulateLinksTables.php';
$updater-addPostDatabaseUpdateMaintenance( 
'FlowPopulateLinksTables' );
 
-   require_once 
__DIR__.'/maintenance/FlowUpdateRevisionContentLength.php';
-   $updater-addPostDatabaseUpdateMaintenance( 
'FlowUpdateRevisionContentLength' );
-
require_once __DIR__.'/maintenance/FlowFixLog.php';
$updater-addPostDatabaseUpdateMaintenance( 'FlowFixLog' );
 
diff --git a/maintenance/FlowUpdateRevisionContentLength.php 
b/maintenance/FlowUpdateRevisionContentLength.php
index e4a9c45..b281979 100644
--- a/maintenance/FlowUpdateRevisionContentLength.php
+++ b/maintenance/FlowUpdateRevisionContentLength.php
@@ -117,7 +117,16 @@
}
 
$this-updateRevision( $obj, $previous );
-   $om-put( $obj );
+
+   try {
+   $om-put( $obj );
+   } catch ( \Exception $e ) {
+   $this-error(
+   'Failed to update revision ' . 
$obj-getRevisionId()-getAlphadecimal() . ': ' . $e-getMessage() . \n.
+   'Please make sure rev_content, 
rev_content_length, rev_flags  rev_previous_content_length are part of 
RevisionStorage::$allowedUpdateColumns.'
+   );
+   throw $e;
+   }
$this-output( '.' );
}
$dbw-commit();

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9099f98b287dfd426a4247782ff00ad6ffde7307
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: Matthias Mullie mmul...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] Fix maintenance script - change (mediawiki...WikidataQualityExternalValidation)

2015-06-18 Thread Tamslo (Code Review)

Tamslo has uploaded a new change for review.

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

Change subject: Fix maintenance script
..

Fix maintenance script

Change-Id: Icfb6d2c8060c503e1a9693dfce8d750d06354752
---
M maintenance/UpdateTable.php
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/maintenance/UpdateTable.php b/maintenance/UpdateTable.php
index afe4381..423ae16 100755
--- a/maintenance/UpdateTable.php
+++ b/maintenance/UpdateTable.php
@@ -9,7 +9,7 @@
 
 
 // @codeCoverageIgnoreStart
-$basePath = getenv( MW_INSTALL_PATH ) !== false ? getenv( MW_INSTALL_PATH 
) : __DIR__ . /../../../../..;
+$basePath = getenv( MW_INSTALL_PATH ) !== false ? getenv( MW_INSTALL_PATH 
) : __DIR__ . /../../..;
 require_once $basePath . /maintenance/Maintenance.php;
 // @codeCoverageIgnoreEnd
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Icfb6d2c8060c503e1a9693dfce8d750d06354752
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikidataQualityExternalValidation
Gerrit-Branch: v1
Gerrit-Owner: Tamslo tamaraslosa...@gmail.com

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

[MediaWiki-commits] [Gerrit] HTTPS: raise HSTS default floor to 3 days - change (operations/puppet)

2015-06-18 Thread BBlack (Code Review)

BBlack has uploaded a new change for review.

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

Change subject: HTTPS: raise HSTS default floor to 3 days
..

HTTPS: raise HSTS default floor to 3 days

Change-Id: Ie9be0423a2e56d3a7773ba7b16db30608117a6f8
---
M modules/varnish/templates/vcl/wikimedia.vcl.erb
1 file changed, 1 insertion(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/59/219159/1

diff --git a/modules/varnish/templates/vcl/wikimedia.vcl.erb 
b/modules/varnish/templates/vcl/wikimedia.vcl.erb
index d3a9c1a..0be0b78 100644
--- a/modules/varnish/templates/vcl/wikimedia.vcl.erb
+++ b/modules/varnish/templates/vcl/wikimedia.vcl.erb
@@ -205,11 +205,8 @@
if (req.http.Host ~ (?i)^ru\.) {
set resp.http.Strict-Transport-Security = 
max-age=15768000;
}
-   else if (req.http.Host ~ (?i)^(ca|el|en|he|it|ug|zh)\.) {
-   set resp.http.Strict-Transport-Security = 
max-age=259200;
-   }
else if (!resp.http.Strict-Transport-Security) {
-   set resp.http.Strict-Transport-Security = 
max-age=86400;
+   set resp.http.Strict-Transport-Security = 
max-age=259200;
}
}
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie9be0423a2e56d3a7773ba7b16db30608117a6f8
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BBlack bbl...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] Add documentation to GlobalBlocking messages currently missi... - change (mediawiki...GlobalBlocking)

2015-06-18 Thread Glaisher (Code Review)

Glaisher has uploaded a new change for review.

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

Change subject: Add documentation to GlobalBlocking messages currently missing 
them
..

Add documentation to GlobalBlocking messages currently missing them

Also removed 'globalblocking-whitelist-errors' doc which is no longer used.

Bug: T102851

Change-Id: I876e39c7a86bbd8fea5b22b81bfd14deff329ceb
---
M i18n/qqq.json
1 file changed, 26 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/GlobalBlocking 
refs/changes/60/219160/1

diff --git a/i18n/qqq.json b/i18n/qqq.json
index 90570cc..c8a4038 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -6,6 +6,7 @@
EugeneZelenko,
Ficell,
Fryed-peach,
+   Glaisher,
Jon Harald Søby,
Lloffiwr,
Meno25,
@@ -30,6 +31,12 @@
},
globalblocking-desc: {{desc|name=Global 
Blocking|url=https://www.mediawiki.org/wiki/Extension:GlobalBlocking}};,
globalblocking-block: {{Identical|Globally block IP address}},
+   globalblocking-modify-intro: Used as an introductory text on 
Special:GlobalBlock form if the target is already blocked.\n\nSee also:\n* 
{{msg-mw|globalblocking-block-intro}},
+   globalblocking-block-intro: 
{{Doc-specialpagesummary|globalblock}}Used as an introductory text on 
Special:GlobalBlock form.\n\nSee also:\n* 
{{msg-mw|globalblocking-modify-intro}},
+   globalblocking-block-legend: Used as legend for the fieldset around 
the input form of Special:GlobalBlock.,
+   globalblocking-block-submit: Used as submit button text on 
Special:GlobalBlock form.\n\nSee also:\n* 
{{msg-mw|globalblocking-modify-submit}}\n* {{msg-mw|ipbsubmit}},
+   globalblocking-modify-submit: Used as submit button text on 
Special:GlobalBlock form when modifying an existing global block.\n\nSee 
also:\n* {{msg-mw|globalblocking-block-submit}}\n* {{msg-mw|ipb-change-block}},
+   globalblocking-return: Link to Special:GlobalBlockList. Shown on 
Special:GlobalBlock, Special:GlobalWhiteList and Special:GlobalUnblock below 
the success message.\n\nSuccess 
messages:\n*{{msg-mw|globalblocking-block-success}}\n*{{msg-mw|globalblocking-modify-success}}\n*{{msg-mw|globalblocking-unblock-unblocked}}\n*{{msg-mw|globalblocking-whitelist-whitelisted}}\n*{{msg-mw|globalblocking-whitelist-dewhitelisted}},
globalblocking-expiry-options: {{notranslate}},
globalblocking-block-reason: {{Identical|Reason}},
globalblocking-block-otherreason: {{Identical/Other/additional 
reason}},
@@ -64,21 +71,37 @@
globalblocking-list-whitelisted: Used as a block option in 
Special:GlobalBlockList. Parameters:\n* $1 - username\n* $2 - reason,
globalblocking-list-whitelist: {{Identical|Local status}},
globalblocking-list-modify: {{Identical|Modify}},
-   globalblocking-goto-block: {{Identical|Globally block IP address}},
+   globalblocking-list: Title of Special:GlobalBlockList,
+   globalblocking-search-legend: Used as legend of the fieldset around 
the input form of Special:GlobalBlockList\n\nSee also:\n* 
{{msg-mw|ipblocklist-legend}}\n *{{msg-mw|globalblocking-block-legend}},
+   globalblocking-search-submit: Used as submit button text on 
Special:GlobalBlockList form.\n\nSee also:\n* {{msg-mw|Ipblocklist-submit}},
+   globalblocking-list-noresults: Shown on Special:GlobalBlockList when 
no global blocks are found. Shown when the target is specified or if there are 
no global blocks.\n\nSee also:\n* {{msg-mw|ipblocklist-no-results}},
+   globalblocking-goto-block: Navigation link to 
Special:GlobalBlock.\n{{Identical|Globally block IP address}}\n\nSee also:\n* 
{{msg-mw|globalblocking-goto-status}}\n* 
{{msg-mw|globalblocking-goto-unblock}},
+   globalblocking-goto-unblock: Navigation link to 
Special:GlobalUnblock. Shown below the title of Special:GlobalBlock, 
Special:GlobalBlockList and Special:GlobalBlockStatus.\n\nSee also:\n* 
{{msg-mw|globalblocking-goto-block}}\n* {{msg-mw|globalblocking-goto-status}},
+   globalblocking-goto-status: Navigation link to 
Special:GlobalBlockWhitelist. Shown below the title of Special:GlobalBlock, 
Special:GlobalBlockList and Special:GlobalBlockWhitelist.\n\nSee also:\n* 
{{msg-mw|globalblocking-goto-block}}\n* {{msg-mw|globalblocking-goto-unblock}},
globalblocking-notblocked: Used as error message in 
Special:GlobalBlockStatus and Special:RemoveGlobalBlock. Parameters:\n* $1 - IP 
address,
globalblocking-unblock-ipinvalid: {{Identical|The IP address ($1) 
...}},
globalblocking-unblock-reason: {{Identical|Reason}},
globalblocking-unblock-unblocked: Used as success message in 
[[Special:RemoveGlobalBlock]]. Parameters:\n* $1 - IP address\n* $2 - global 
block ID,

[MediaWiki-commits] [Gerrit] deployment-prep: Disable all NFS - change (operations/puppet)

2015-06-18 Thread Yuvipanda (Code Review)

Yuvipanda has uploaded a new change for review.

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

Change subject: deployment-prep: Disable all NFS
..

deployment-prep: Disable all NFS

Attempt rescue of as much of deployment-prep as possible

Change-Id: I65603d0b43379f9315d89e98d1a6c10e9ffa79c1
---
M hieradata/labs/deployment-prep/common.yaml
1 file changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/62/219162/1

diff --git a/hieradata/labs/deployment-prep/common.yaml 
b/hieradata/labs/deployment-prep/common.yaml
index c3302c0..44375e8 100644
--- a/hieradata/labs/deployment-prep/common.yaml
+++ b/hieradata/labs/deployment-prep/common.yaml
@@ -767,7 +767,7 @@
 - deployment-elastic08
 elasticsearch::cluster_name: beta-search
 nfs_mounts:
-  project: true
-  home: true
+  project: false
+  home: false
   scratch: false
   dumps: false

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I65603d0b43379f9315d89e98d1a6c10e9ffa79c1
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Yuvipanda yuvipa...@gmail.com

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

[MediaWiki-commits] [Gerrit] Promote alpha header to beta - change (mediawiki...MobileFrontend)

2015-06-18 Thread Bmansurov (Code Review)

Bmansurov has uploaded a new change for review.

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

Change subject: Promote alpha header to beta
..

Promote alpha header to beta

Also:
* remove the extra space before the search input in search overlay
* make the overlay background white (similar to alpha) so that the
  open left nav is not visible behind the overlay

Bug: T101295
Change-Id: Ib23aead42ad804e4db89a20588e2bc28adeea40b
---
M includes/Resources.php
M includes/skins/MinervaTemplateAlpha.php
M includes/skins/MinervaTemplateBeta.php
M includes/skins/SkinMinervaAlpha.php
M resources/mobile.head/init.js
M resources/mobile.mainMenu/MainMenu.js
M resources/mobile.overlays/Overlay.less
M resources/mobile.search/SearchOverlay.less
M resources/mobile.special.mobilemenu.styles/mobilemenu.less
M resources/mobile.startup/Skin.js
M resources/skins.minerva.base.styles/ui.less
R resources/skins.minerva.beta.styles/magnifying-glass-gray.svg
R resources/skins.minerva.beta.styles/magnifying-glass.png
R resources/skins.minerva.beta.styles/magnifying-glass.svg
R resources/skins.minerva.beta.styles/ui.less
D resources/skins.minerva.tablet.alpha.styles/common.alpha.less
M resources/skins.minerva.tablet.beta.styles/common.less
17 files changed, 108 insertions(+), 144 deletions(-)


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

diff --git a/includes/Resources.php b/includes/Resources.php
index 0cc10fb..e4d9908 100644
--- a/includes/Resources.php
+++ b/includes/Resources.php
@@ -102,12 +102,6 @@
'resources/skins.minerva.tablet.beta.styles/hacks.less',
),
),
-   'skins.minerva.tablet.alpha.styles' = 
$wgMFResourceFileModuleBoilerplate + array(
-   'position' = 'top',
-   'styles' = array(
-   
'resources/skins.minerva.tablet.alpha.styles/common.alpha.less'
-   ),
-   ),
'skins.minerva.icons.images' = $wgMFResourceFileModuleBoilerplate + 
array(
'class' = 'ResourceLoaderImageModule',
'prefix' = 'mw-ui',
@@ -202,13 +196,6 @@
),
),
 
-   'skins.minerva.alpha.styles' = $wgMFResourceFileModuleBoilerplate + 
array(
-   'position' = 'top',
-   'styles' = array(
-   'resources/skins.minerva.alpha.styles/ui.alpha.less',
-   ),
-   ),
-
'skins.minerva.beta.styles' = $wgMFResourceFileModuleBoilerplate + 
array(
'position' = 'top',
'styles' = array(
@@ -217,6 +204,7 @@
'resources/skins.minerva.beta.styles/footer.less',
'resources/skins.minerva.beta.styles/main.less',
'resources/skins.minerva.beta.styles/hacks.less',
+   'resources/skins.minerva.beta.styles/ui.less',
),
),
'skins.minerva.beta.images' = $wgMFResourceFileModuleBoilerplate + 
array(
@@ -248,18 +236,11 @@
'rtl' = 'images/icons/move-rtl.svg',
),
),
+   // Special:MobileMenu-specific back icon
+   'back-mobilemenu' = 'images/icons/alpha/back-ltr.svg',
+   'search' = 'images/icons/magnifying-glass.svg',
),
),
-   'skins.minerva.alpha.images' = $wgMFResourceFileModuleBoilerplate + 
array(
-   'position' = 'bottom',
-   'class' = 'ResourceLoaderImageModule',
-   'selector' = '.mw-ui-icon-{name}:before',
-   'images' = array(
-   // Special:MobileMenu-specific back icon
-   'back-mobilemenu' = 
'images/icons/alpha/back-ltr.svg',
-   'search' = 'images/icons/magnifying-glass.svg',
-   ),
-   ),
 );
 
 $wgResourceModules = array_merge( $wgResourceModules, array(
diff --git a/includes/skins/MinervaTemplateAlpha.php 
b/includes/skins/MinervaTemplateAlpha.php
index 76368e6..1725919 100644
--- a/includes/skins/MinervaTemplateAlpha.php
+++ b/includes/skins/MinervaTemplateAlpha.php
@@ -49,64 +49,4 @@
 
return $result;
}
-
-   /**
-* @inheritdoc
-*/
-   protected function getHeaderHtml( $data ) {
-   $templateParser = new TemplateParser( __DIR__ );
-   $args = array(
-   'siteName' = SkinMinerva::getSitename(),
-   'mobileMenuClass' = MobileUI::iconClass( 'search', 
'element', 'header-icon' ),
-   'mobileMenuLink' = SpecialPage::getTitleFor( 
'MobileMenu' )-getLocalUrl(),
-   'mobileMenuTitle' = wfMessage( 
'mobile-frontend-main-menu' )-parse(),
-

[MediaWiki-commits] [Gerrit] Swallow unexpected exceptions when creating/deleting messages. - change (sink_nova_fixed_multi)

2015-06-18 Thread Andrew Bogott (Code Review)

Andrew Bogott has submitted this change and it was merged.

Change subject: Swallow unexpected exceptions when creating/deleting messages.
..


Swallow unexpected exceptions when creating/deleting messages.

Designate is lame; it doesn't log exceptions but it /does/ interrupt
execution of other things when they're thrown.

Change-Id: Ic356e500931b2aa35fa9bd5d9b6b1f38f9ecac1b
---
M nova_fixed_multi/novamulti.py
M setup.py
2 files changed, 18 insertions(+), 6 deletions(-)

Approvals:
  Andrew Bogott: Verified; Looks good to me, approved



diff --git a/nova_fixed_multi/novamulti.py b/nova_fixed_multi/novamulti.py
index 18a95eb..02c4530 100644
--- a/nova_fixed_multi/novamulti.py
+++ b/nova_fixed_multi/novamulti.py
@@ -21,6 +21,8 @@
 from designate.openstack.common import log as logging
 from nova_fixed_multi.base import BaseAddressMultiHandler
 
+import sys
+
 LOG = logging.getLogger(__name__)
 
 cfg.CONF.register_group(cfg.OptGroup(
@@ -60,12 +62,22 @@
 LOG.debug('NovaFixedHandler received notification - %s' % event_type)
 
 if event_type == 'compute.instance.create.end':
-self._create(payload['fixed_ips'], payload,
- resource_id=payload['instance_id'],
- resource_type='instance')
+try:
+self._create(payload['fixed_ips'], payload,
+ resource_id=payload['instance_id'],
+ resource_type='instance')
+except:
+LOG.debug( Unexpected error: %s %
+  sys.exc_info()[0])
+LOG.debug( (swallowed))
 
 elif event_type == 'compute.instance.delete.start':
-self._delete(resource_id=payload['instance_id'],
- resource_type='instance')
+try:
+self._delete(resource_id=payload['instance_id'],
+ resource_type='instance')
+except:
+LOG.debug( Unexpected error: %s %
+  sys.exc_info()[0])
+LOG.debug( (swallowed))
 else:
 raise ValueError('NovaFixedHandler received an invalid event type')
diff --git a/setup.py b/setup.py
index 90310af..71d8172 100644
--- a/setup.py
+++ b/setup.py
@@ -18,7 +18,7 @@
 
 setuptools.setup(
 name=nova_fixed_multi,
-version=2015.3,
+version=2015.6,
 author=Wikimedia Foundation,
 author_email=abog...@wikimedia.org,
 description=Designate sink handler that supports multiple arecords per 
instance,

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic356e500931b2aa35fa9bd5d9b6b1f38f9ecac1b
Gerrit-PatchSet: 1
Gerrit-Project: sink_nova_fixed_multi
Gerrit-Branch: master
Gerrit-Owner: Andrew Bogott abog...@wikimedia.org
Gerrit-Reviewer: Andrew Bogott abog...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] Delete old test items during test setup. - change (mediawiki...Wikibase)

2015-06-18 Thread Daniel Kinzler (Code Review)

Daniel Kinzler has uploaded a new change for review.

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

Change subject: Delete old test items during test setup.
..

Delete old test items during test setup.

This should make tests that rely on entity data in the database more robust,
by making sure that each test suite starts with a clean set of entities.

Change-Id: I393751e16ab4ebdda9a722370a31c24b449d6375
---
M repo/tests/phpunit/includes/api/EntityTestHelper.php
M repo/tests/phpunit/includes/api/WikibaseApiTestCase.php
2 files changed, 26 insertions(+), 4 deletions(-)


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

diff --git a/repo/tests/phpunit/includes/api/EntityTestHelper.php 
b/repo/tests/phpunit/includes/api/EntityTestHelper.php
index 70a23ce..7fbc9a9 100644
--- a/repo/tests/phpunit/includes/api/EntityTestHelper.php
+++ b/repo/tests/phpunit/includes/api/EntityTestHelper.php
@@ -357,7 +357,7 @@
 * @param string $handle
 * @throws OutOfBoundsException
 */
-   private static function unRegisterEntity( $handle ) {
+   public static function unRegisterEntity( $handle ) {
unset( self::$activeIds[ self::$activeHandles[ $handle ] ] );
unset( self::$activeHandles[ $handle ] );
}
diff --git a/repo/tests/phpunit/includes/api/WikibaseApiTestCase.php 
b/repo/tests/phpunit/includes/api/WikibaseApiTestCase.php
index 83e8534..3b0477e 100644
--- a/repo/tests/phpunit/includes/api/WikibaseApiTestCase.php
+++ b/repo/tests/phpunit/includes/api/WikibaseApiTestCase.php
@@ -3,12 +3,15 @@
 namespace Wikibase\Test\Api;
 
 use ApiTestCase;
+use OutOfBoundsException;
 use Revision;
 use TestSites;
 use TestUser;
+use Title;
 use UsageException;
 use User;
 use Wikibase\Repo\WikibaseRepo;
+use WikiPage;
 
 /**
  * Base class for test classes that test the API modules that derive from 
ApiWikibaseModifyItem.
@@ -97,9 +100,11 @@
$activeHandles = EntityTestHelper::getActiveHandles();
 
foreach ( $activeHandles as $handle = $id ) {
-   $params = EntityTestHelper::getEntityClear( $handle );
-   $params['action'] = 'wbeditentity';
-   $this-doApiRequestWithToken( $params );
+   $title = $this-getTestEntityTitle( $handle );
+
+   $page = WikiPage::factory( $title );
+   $page-doDeleteArticle( 'Test reset' );
+   EntityTestHelper::unRegisterEntity( $handle );
}
 
foreach ( $handles as $handle ) {
@@ -117,6 +122,23 @@
}
 
/**
+* @param string $handle
+*
+* @return null|Title
+*/
+   protected function getTestEntityTitle( $handle ) {
+   try {
+   $idString = EntityTestHelper::getId( $handle );
+   $id = 
WikibaseRepo::getDefaultInstance()-getEntityIdParser()-parse( $idString );
+   $title =  
WikibaseRepo::getDefaultInstance()-getEntityTitleLookup()-getTitleForId( $id 
);
+   } catch ( OutOfBoundsException $ex ) {
+   $title = null;
+   }
+
+   return $title;
+   }
+
+   /**
 * Loads an entity from the database (via an API call).
 *
 * @param string $id

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I393751e16ab4ebdda9a722370a31c24b449d6375
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Daniel Kinzler daniel.kinz...@wikimedia.de

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

[MediaWiki-commits] [Gerrit] labs: do not use nfs on precises for ssh keys - change (operations/puppet)

2015-06-18 Thread Yuvipanda (Code Review)

Yuvipanda has submitted this change and it was merged.

Change subject: labs: do not use nfs on precises for ssh keys
..


labs: do not use nfs on precises for ssh keys

Since there is a severe NFS outage on labs, we do the following:

- Assure we don't mount /public/keys from nfs
- Run manage-nfs-keys locally (it now writes to /public/keys)
- Don't run it on the nfs server anymore

Change-Id: I97f846e6f0f2296424e18e2ca5da7a4172ed349c
---
M manifests/role/labs.pp
M modules/ldap/files/scripts/manage-keys-nfs
M modules/openstack/manifests/project-nfs-storage-service.pp
3 files changed, 10 insertions(+), 9 deletions(-)

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



diff --git a/manifests/role/labs.pp b/manifests/role/labs.pp
index 0fd787a..b4c6bc6 100644
--- a/manifests/role/labs.pp
+++ b/manifests/role/labs.pp
@@ -125,14 +125,14 @@
 ensure  = directory,
 require = File['/public'],
 }
+
 mount { '/public/keys':
-ensure  = mounted,
-atboot  = true,
-fstype  = 'nfs',
-options = ro,${nfs_opts},
-device  = ${nfs_server}:/keys,
-require = File['/public/keys', '/etc/modprobe.d/nfs-no-idmap'],
-notify  = Service['ssh'],
+ensure  = absent,
+}
+
+
+exec { '/usr/local/sbin/manage-keys-nfs':
+require = [File['/public/keys'], 
File['/usr/local/sbin/manage-keys-nfs']],
 }
 }
 
diff --git a/modules/ldap/files/scripts/manage-keys-nfs 
b/modules/ldap/files/scripts/manage-keys-nfs
index 2fc3fe4..b79bc47 100755
--- a/modules/ldap/files/scripts/manage-keys-nfs
+++ b/modules/ldap/files/scripts/manage-keys-nfs
@@ -28,7 +28,7 @@
 
 class ExportManager:
 def __init__(self):
-self.keysdir = /srv/keys/
+self.keysdir = /public/keys/
 self.loglevel = INFO
 self.logfile = None
 self.hostname = socket.gethostname()
diff --git a/modules/openstack/manifests/project-nfs-storage-service.pp 
b/modules/openstack/manifests/project-nfs-storage-service.pp
index 8e4616f..53bc8e7 100644
--- a/modules/openstack/manifests/project-nfs-storage-service.pp
+++ b/modules/openstack/manifests/project-nfs-storage-service.pp
@@ -63,8 +63,9 @@
 }
 
 if ($::site == 'eqiad') {
+# Not needed anymore, keys are written locally to the host
 cron { 'Update labs ssh keys':
-ensure  = present,
+ensure  = absent,
 user= 'root',
 command = '/usr/local/sbin/manage-keys-nfs 
--logfile=/var/log/manage-keys.log /dev/null 21',
 hour= '*',

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I97f846e6f0f2296424e18e2ca5da7a4172ed349c
Gerrit-PatchSet: 4
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto glavage...@wikimedia.org
Gerrit-Reviewer: Yuvipanda yuvipa...@gmail.com

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

[MediaWiki-commits] [Gerrit] Add flow_workflow_update_timestamp index - change (mediawiki...Flow)

2015-06-18 Thread Matthias Mullie (Code Review)

Matthias Mullie has submitted this change and it was merged.

Change subject: Add flow_workflow_update_timestamp index
..


Add flow_workflow_update_timestamp index

Bug: T102871
Change-Id: I6ea8981a295bae2776133959e7414a053cbd6e2d
---
M Hooks.php
A db_patches/patch-flow_workflow_update_timestamp_idx.sql
M flow.sql
3 files changed, 4 insertions(+), 0 deletions(-)

Approvals:
  Chad: Looks good to me, but someone else must approve
  Catrope: Looks good to me, but someone else must approve
  Matthias Mullie: Looks good to me, approved
  Springle: Looks good to me, but someone else must approve
  EBernhardson: Looks good to me, but someone else must approve
  jenkins-bot: Verified



diff --git a/Hooks.php b/Hooks.php
index a21f8f9..3a7b954 100644
--- a/Hooks.php
+++ b/Hooks.php
@@ -198,6 +198,7 @@
$updater-dropExtensionField( 'flow_workflow', 
'workflow_user_ip', $dir/db_patches/patch-drop_workflow_user.sql );
$updater-addExtensionField( 'flow_revision', 
'rev_content_length', $dir/db_patches/patch-add-revision-content-length.sql );
$updater-addExtensionIndex( 'flow_ext_ref', 
'flow_ext_ref_idx', $dir/db_patches/patch-remove_unique_ref_indices.sql );
+   $updater-addExtensionIndex( 'flow_workflow', 
'flow_workflow_update_timestamp', 
$dir/db_patches/patch-flow_workflow_update_timestamp_idx.sql );
 
require_once __DIR__.'/maintenance/FlowUpdateRecentChanges.php';
$updater-addPostDatabaseUpdateMaintenance( 
'FlowUpdateRecentChanges' );
diff --git a/db_patches/patch-flow_workflow_update_timestamp_idx.sql 
b/db_patches/patch-flow_workflow_update_timestamp_idx.sql
new file mode 100644
index 000..b274f80
--- /dev/null
+++ b/db_patches/patch-flow_workflow_update_timestamp_idx.sql
@@ -0,0 +1,2 @@
+-- FlowForceSearchIndex.php maintenance script will request workflows between 
timestamps
+CREATE INDEX /*i*/flow_workflow_update_timestamp ON /*_*/flow_workflow 
(workflow_last_update_timestamp);
diff --git a/flow.sql b/flow.sql
index 2ba529e..37b4696 100644
--- a/flow.sql
+++ b/flow.sql
@@ -17,6 +17,7 @@
 ) /*$wgDBTableOptions*/;
 
 CREATE INDEX /*i*/flow_workflow_lookup ON /*_*/flow_workflow (workflow_wiki, 
workflow_namespace, workflow_title_text);
+CREATE INDEX /*i*/flow_workflow_update_timestamp ON /*_*/flow_workflow 
(workflow_last_update_timestamp);
 
 CREATE TABLE /*_*/flow_subscription (
   subscription_workflow_id int unsigned not null,

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I6ea8981a295bae2776133959e7414a053cbd6e2d
Gerrit-PatchSet: 6
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: Matthias Mullie mmul...@wikimedia.org
Gerrit-Reviewer: Catrope roan.katt...@gmail.com
Gerrit-Reviewer: Chad ch...@wikimedia.org
Gerrit-Reviewer: EBernhardson ebernhard...@wikimedia.org
Gerrit-Reviewer: Jcrespo jcre...@wikimedia.org
Gerrit-Reviewer: Matthias Mullie mmul...@wikimedia.org
Gerrit-Reviewer: SG shah...@gmail.com
Gerrit-Reviewer: Springle sprin...@wikimedia.org
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] deployment-prep: Disable all NFS - change (operations/puppet)

2015-06-18 Thread Yuvipanda (Code Review)

Yuvipanda has submitted this change and it was merged.

Change subject: deployment-prep: Disable all NFS
..


deployment-prep: Disable all NFS

Attempt rescue of as much of deployment-prep as possible

Change-Id: I65603d0b43379f9315d89e98d1a6c10e9ffa79c1
---
M hieradata/labs/deployment-prep/common.yaml
1 file changed, 2 insertions(+), 2 deletions(-)

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



diff --git a/hieradata/labs/deployment-prep/common.yaml 
b/hieradata/labs/deployment-prep/common.yaml
index 5f8fcc7..0f30a0a 100644
--- a/hieradata/labs/deployment-prep/common.yaml
+++ b/hieradata/labs/deployment-prep/common.yaml
@@ -769,7 +769,7 @@
 elasticsearch::cluster_name: beta-search
 elasticsearch::script_disable_dynamic: false
 nfs_mounts:
-  project: true
-  home: true
+  project: false
+  home: false
   scratch: false
   dumps: false

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I65603d0b43379f9315d89e98d1a6c10e9ffa79c1
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Yuvipanda yuvipa...@gmail.com
Gerrit-Reviewer: Yuvipanda yuvipa...@gmail.com

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

[MediaWiki-commits] [Gerrit] Add EntryScape as external project - change (translatewiki)

2015-06-18 Thread Siebrand (Code Review)

Siebrand has uploaded a new change for review.

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

Change subject: Add EntryScape as external project
..

Add EntryScape as external project

Change-Id: Ieec2e5bb2058356d8dfb6ceedefbcad30320652f
---
M REPOCONF.siebrand
M bin/EXTERNAL-PROJECTS
2 files changed, 2 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/translatewiki 
refs/changes/47/219147/1

diff --git a/REPOCONF.siebrand b/REPOCONF.siebrand
index e513089..d318458 100644
--- a/REPOCONF.siebrand
+++ b/REPOCONF.siebrand
@@ -9,6 +9,7 @@
 REPO_BLOCKLY=g...@github.com:google/blockly.git
 REPO_BLOCKLYGAMES=g...@github.com:google/blockly-games.git
 REPO_EOL=g...@github.com:EOL/eol.git
+REPO_ENTRYSCAPE=g...@bitbucket.org:metasolutions/entryscape-nls.git
 REPO_ETHERPADLITE=g...@github.com:ether/etherpad-lite.git
 REPO_ETHERPADLITE_BRANCH=develop
 REPO_EUROPEANA=g...@github.com:europeana/Europeana1914-1918.git
diff --git a/bin/EXTERNAL-PROJECTS b/bin/EXTERNAL-PROJECTS
index 1d7be59..1ad2a46 100644
--- a/bin/EXTERNAL-PROJECTS
+++ b/bin/EXTERNAL-PROJECTS
@@ -2,6 +2,7 @@
 pywikibot
 blockly
 eol
+entryscape
 etherpad-lite
 europeana
 freecol

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ieec2e5bb2058356d8dfb6ceedefbcad30320652f
Gerrit-PatchSet: 1
Gerrit-Project: translatewiki
Gerrit-Branch: master
Gerrit-Owner: Siebrand siebr...@kitano.nl

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

[MediaWiki-commits] [Gerrit] Copied i18n from master to v1. - change (mediawiki...WikidataQualityExternalValidation)

2015-06-18 Thread Dominic.sauer (Code Review)

Dominic.sauer has submitted this change and it was merged.

Change subject: Copied i18n from master to v1.
..


Copied i18n from master to v1.

Change-Id: Ic104213ce284735e046fff2342571a86ef9a131c
---
A i18n/arq.json
A i18n/bcl.json
M i18n/bn.json
A i18n/ca.json
A i18n/ce.json
A i18n/cs.json
M i18n/de.json
A i18n/en-gb.json
M i18n/en.json
M i18n/es.json
A i18n/fa.json
M i18n/fr.json
A i18n/fy.json
A i18n/gl.json
A i18n/gu.json
A i18n/he.json
A i18n/ht.json
A i18n/it.json
M i18n/ksh.json
A i18n/ku-latn.json
M i18n/lb.json
A i18n/lv.json
M i18n/mk.json
A i18n/nb.json
A i18n/ne.json
M i18n/nl.json
A i18n/pam.json
M i18n/pl.json
M i18n/ps.json
A i18n/pt-br.json
M i18n/pt.json
M i18n/qqq.json
A i18n/ro.json
M i18n/ru.json
A i18n/sd.json
A i18n/si.json
A i18n/sv.json
A i18n/tr.json
A i18n/vi.json
M i18n/zh-hans.json
M i18n/zh-hant.json
41 files changed, 800 insertions(+), 175 deletions(-)

Approvals:
  Dominic.sauer: Verified; Looks good to me, approved



diff --git a/i18n/arq.json b/i18n/arq.json
new file mode 100644
index 000..5657926
--- /dev/null
+++ b/i18n/arq.json
@@ -0,0 +1,8 @@
+{
+   @metadata: {
+   authors: [
+   Oldstoneage
+   ]
+   },
+   wbqev-violation-header-external-source: مصدر خرجاني:
+}
diff --git a/i18n/bcl.json b/i18n/bcl.json
new file mode 100644
index 000..2ba433d
--- /dev/null
+++ b/i18n/bcl.json
@@ -0,0 +1,11 @@
+{
+   @metadata: {
+   authors: [
+   Geopoet
+   ]
+   },
+   wbqev-crosscheck-explanation-general: Ining espesyal na pahina 
naggigibo nin krukis na pagmansay sa tahaw kan mga aytem sa Wikidat asin 
panluwas an mga datos-sarayan. Ika makakapaghiling sa mga datos-sarayan na 
samuyang ginagamit sa espesyal na pahina,
+   wbqev-crosscheck-result-headline: Resulta para sa,
+   wbqev-violation-header-external-source: Panluwas na ginikanan:,
+   wbqev-violation-header-external-values: Panluwas na mga halaga:
+}
diff --git a/i18n/bn.json b/i18n/bn.json
index 530dab0..3a55849 100644
--- a/i18n/bn.json
+++ b/i18n/bn.json
@@ -4,7 +4,16 @@
Aftabuzzaman
]
},
-   wikidataquality-crosscheck-result-table-header-external-source: 
বাহ্যিক উৎস,
-   wikidataquality-externaldbs-name: নাম,
-   wikidataquality-externaldbs-license: লাইসেন্স
+   wbqev-crosscheck-form-entityid-placeholder: Qxx,
+   wbqev-crosscheck-form-submit-label: পরীক্ষা করুন,
+   wbqev-crosscheck-result-headline: $1-এর ফলাফল,
+   wbqev-crosscheck-result-table-header-references: তথ্যসূত্র,
+   wbqev-crosscheck-result-table-header-local-value: উইকিউপাত্ত মান,
+   wbqev-crosscheck-result-table-header-external-source: বাহ্যিক উৎস,
+   wbqev-crosscheck-result-table-header-status: অবস্থা,
+   wbqev-crosscheck-status-match: মিলেছে,
+   wbqev-crosscheck-status-references-stated: বিবৃত,
+   wbqev-externaldbs-language: উপাত্তের ভাষা,
+   wbqev-externaldbs-size: আকার,
+   wbqev-externaldbs-license: লাইসেন্স
 }
diff --git a/i18n/ca.json b/i18n/ca.json
new file mode 100644
index 000..a6bb562
--- /dev/null
+++ b/i18n/ca.json
@@ -0,0 +1,18 @@
+{
+   @metadata: {
+   authors: [
+   Macofe
+   ]
+   },
+   wbqev-crosscheck-result-headline: Resultat de $1,
+   wbqev-crosscheck-result-table-header-references: Referències,
+   wbqev-crosscheck-result-table-header-external-value: Valors externs,
+   wbqev-crosscheck-result-table-header-external-source: Font externa,
+   wbqev-crosscheck-result-table-header-status: Estat,
+   wbqev-crosscheck-status-partial-match: Coincidència parcial,
+   wbqev-externaldbs-overview-headline: Base de dades,
+   wbqev-externaldbs-name: Nom,
+   wbqev-externaldbs-size: Mida,
+   wbqev-externaldbs-license: Llicència,
+   wbqev-violation-header-external-values: Valors externs:
+}
diff --git a/i18n/ce.json b/i18n/ce.json
new file mode 100644
index 000..11f93bf
--- /dev/null
+++ b/i18n/ce.json
@@ -0,0 +1,18 @@
+{
+   @metadata: {
+   authors: [
+   Умар
+   ]
+   },
+   wbqev-crosscheck-form-submit-label: Хьажа,
+   wbqev-crosscheck-result-table-header-references: Хьажоргаш,
+   wbqev-crosscheck-result-table-header-local-value: Викихаамийн 
билгало,
+   wbqev-crosscheck-result-table-header-external-source: Арахьара 
хьост,
+   wbqev-crosscheck-result-table-header-status: Статус,
+   wbqev-crosscheck-status-references-stated: аьлла,
+   wbqev-externaldbs-overview-headline: Хаамийн база,
+   wbqev-externaldbs-name: ЦӀе,
+   wbqev-externaldbs-id: ID,
+   wbqev-externaldbs-size: Барам,
+   wbqev-violation-header-external-source: Арахьара хьост:
+}
diff --git a/i18n/cs.json b/i18n/cs.json
new file mode 100644
index

[MediaWiki-commits] [Gerrit] Add new Wikipedia languages gom and lrc - change (pywikibot/compat)

2015-06-18 Thread jenkins-bot (Code Review)

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

Change subject: Add new Wikipedia languages gom and lrc
..


Add new Wikipedia languages gom and lrc

backported from core

Change-Id: Id84df6a7a367a9173cf8018a87269c2b6d251560
---
M families/wikipedia_family.py
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/families/wikipedia_family.py b/families/wikipedia_family.py
index ce94565..6f4883b 100644
--- a/families/wikipedia_family.py
+++ b/families/wikipedia_family.py
@@ -44,7 +44,7 @@
 'ltg', 'zu', 'om', 'za', 'chy', 'cu', 'rmy', 'tw', 'tn', 'chr',
 'mai', 'pih', 'got', 'xh', 'bi', 'sm', 'ss', 'rn', 'ki', 'pnt',
 'bm', 'iu', 'ee', 'lg', 'ts', 'fj', 'ak', 'ik', 'st', 'sg', 'ff',
-'dz', 'ny', 'ch', 'ti', 've', 'ks', 'tum', 'cr',
+'dz', 'ny', 'ch', 'ti', 've', 'ks', 'tum', 'cr', 'gom', 'lrc',
 ]
 
 self.langs = dict([(lang, '%s.wikipedia.org' % lang)

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Id84df6a7a367a9173cf8018a87269c2b6d251560
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/compat
Gerrit-Branch: master
Gerrit-Owner: Xqt i...@gno.de
Gerrit-Reviewer: John Vandenberg jay...@gmail.com
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] labs: do not use nfs on precises for ssh keys - change (operations/puppet)

2015-06-18 Thread Giuseppe Lavagetto (Code Review)

Giuseppe Lavagetto has uploaded a new change for review.

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

Change subject: labs: do not use nfs on precises for ssh keys
..

labs: do not use nfs on precises for ssh keys

Since there is a severe NFS outage on labs, we do the following:

- Assure we don't mount /public/keys from nfs
- Run manage-nfs-keys locally

Also, a config option was added to manage-nfs-keys in order to allow
choosing the output directory

Change-Id: I97f846e6f0f2296424e18e2ca5da7a4172ed349c
---
M manifests/role/labs.pp
M modules/ldap/files/scripts/manage-keys-nfs
2 files changed, 10 insertions(+), 7 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/57/219157/1

diff --git a/manifests/role/labs.pp b/manifests/role/labs.pp
index 0fd787a..f3b5279 100644
--- a/manifests/role/labs.pp
+++ b/manifests/role/labs.pp
@@ -125,14 +125,14 @@
 ensure  = directory,
 require = File['/public'],
 }
+
 mount { '/public/keys':
-ensure  = mounted,
-atboot  = true,
-fstype  = 'nfs',
-options = ro,${nfs_opts},
-device  = ${nfs_server}:/keys,
-require = File['/public/keys', '/etc/modprobe.d/nfs-no-idmap'],
-notify  = Service['ssh'],
+ensure  = absent,
+}
+
+
+exec { '/usr/local/sbin/manage-keys-nfs --dir /public/keys':
+require = [File['/public/keys'], 
File['/usr/local/sbin/manage-keys-nfs']],
 }
 }
 
diff --git a/modules/ldap/files/scripts/manage-keys-nfs 
b/modules/ldap/files/scripts/manage-keys-nfs
index 2fc3fe4..60cc871 100755
--- a/modules/ldap/files/scripts/manage-keys-nfs
+++ b/modules/ldap/files/scripts/manage-keys-nfs
@@ -42,6 +42,7 @@
 
 parser.add_option(--logfile, dest=logfile, help=Write output to 
the specified log file. (default: stdout))
 parser.add_option(--loglevel, dest=loglevel, help=Change level of 
logging; NONE, INFO, DEBUG (default: INFO))
+parser.add_option(--dir, dest=keysdir, help=Output directory 
(default: /srv/keys))
 (options, args) = parser.parse_args()
 ldapSupportLib.setBindInfoByOptions(options, parser)
 
@@ -49,6 +50,8 @@
 self.logfile = options.logfile
 if options.loglevel:
 self.loglevel = options.loglevel
+if options.keysdir:
+self.keysdir = options.keysdir
 
 base = ldapSupportLib.getBase()
 ds = ldapSupportLib.connect()

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I97f846e6f0f2296424e18e2ca5da7a4172ed349c
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto glavage...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] [WIP] Setting up new extension - change (mediawiki...BSExtendedSearch)

2015-06-18 Thread Robert Vogel (Code Review)

Robert Vogel has uploaded a new change for review.

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

Change subject: [WIP] Setting up new extension
..

[WIP] Setting up new extension

This is the first change. The extension does not work yet

Change-Id: I204ad7bce1d7ee8c03d2cdfda87f0d9fec69225a
---
A .gitignore
A BSExtendedSearch.php
A composer.json
A includes/api/BSApiQueryExtendedSearch.php
4 files changed, 244 insertions(+), 0 deletions(-)


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

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000..22d0d82
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+vendor
diff --git a/BSExtendedSearch.php b/BSExtendedSearch.php
new file mode 100644
index 000..e69de29
--- /dev/null
+++ b/BSExtendedSearch.php
diff --git a/composer.json b/composer.json
new file mode 100644
index 000..0b6af31
--- /dev/null
+++ b/composer.json
@@ -0,0 +1,5 @@
+{
+require: {
+solarium/solarium: dev-master
+}
+}
diff --git a/includes/api/BSApiQueryExtendedSearch.php 
b/includes/api/BSApiQueryExtendedSearch.php
new file mode 100644
index 000..0a94d33
--- /dev/null
+++ b/includes/api/BSApiQueryExtendedSearch.php
@@ -0,0 +1,238 @@
+?php
+
+/**
+ * TODO: Implement as subclass of BSApiExtJSStoreBase and map ExtJS Store
+ * filters to Solr filterQuery-feature
+ */
+class BSApiQueryExtendedSearch extends ApiBase {
+   protected $root = 'results';
+   protected $totalProperty = 'total';
+
+   /**
+   * @var Solarium\QueryType\Select\Query\Query
+   */
+   protected $query = null;
+
+   /**
+   * @var \Solarium\QueryType\Select\Query\Component\EdisMax
+   */
+   protected $edismax = null;
+
+   /**
+   * @var 
Solarium\QueryType\Select\Query\Component\Highlighting\Highlighting
+   */
+   protected $hl = null;
+
+   public function execute() {
+   global $bsgExtendedSearchDefaultEDisMaxQueryFields;
+   $aSearchParams = $this-getParameter( 'searchParams' );
+   if( !isset( $aSearchParams['qf'] ) ) {
+   $aSearchParams['qf'] = 
$bsgExtendedSearchDefaultEDisMaxQueryFields; //Array
+   }
+
+   wfRunHooks( 'BSApiQueryExtendedSearchBeforeExecute', array( 
$this, $aSearchParams ) );
+
+   $client = $this-makeClient();
+   $this-query = $this-makeQuery( $client );
+   $this-edismax = $this-query-getEDisMax();
+   $this-edismax-setQueryFields( $this-makeQueryFields( 
$aSearchParams ) );
+   $this-makeFilterQueries( $this-query, $aSearchParams );
+
+   $this-query
+   -setQuery( $this-getParameter('query') ) // '*:*' is 
not supported by eDisMax
+   -setStart( $this-getParameter('start') )
+   -setRows( $this-getParameter('limit') );
+
+   $this-hl = $this-query-getHighlighting();
+   //TODO: use setOptions to allow more extensability
+   $this-hl-setFields('title, text');
+   $this-hl-setSnippets(3);
+   $this-hl-setSimplePrefix('span 
class=bs-extendedsearch-highlight');
+   $this-hl-setSimplePostfix('/span');
+
+   $resultset = $client-execute($this-query);
+
+   $aData = array();
+   foreach( $resultset as $document ) {
+   $aData[] = $this-makeResultRow( $document, $resultset 
);
+   }
+
+   $result = $this-getResult();
+   $result-setIndexedTagName( $aData, $this-root );
+   $result-addValue( null, $this-root, $aData );
+   $result-addValue( null, 'facetts', array() ); //TODO: 
Implement for facetted quieries!
+   $result-addValue( null, $this-totalProperty, 
$resultset-getNumFound() );
+   }
+
+   public function getAllowedParams() {
+   return array(
+   'searchParams' = array(
+   ApiBase::PARAM_TYPE = 'string',
+   ApiBase::PARAM_REQUIRED = false,
+   ApiBase::PARAM_DFLT = '{}'
+   ),
+   'query' = array(
+   ApiBase::PARAM_TYPE = 'string',
+   ApiBase::PARAM_REQUIRED = true
+   ),
+   'start' = array(
+   ApiBase::PARAM_TYPE = 'integer',
+   ApiBase::PARAM_REQUIRED = false,
+   ApiBase::PARAM_DFLT = 0
+   ),
+   'limit' = array(
+   ApiBase::PARAM_TYPE = 'integer',
+   ApiBase::PARAM_REQUIRED = false,
+

[MediaWiki-commits] [Gerrit] HTTPS: raise HSTS default floor to 3 days - change (operations/puppet)

2015-06-18 Thread BBlack (Code Review)

BBlack has submitted this change and it was merged.

Change subject: HTTPS: raise HSTS default floor to 3 days
..


HTTPS: raise HSTS default floor to 3 days

Change-Id: Ie9be0423a2e56d3a7773ba7b16db30608117a6f8
---
M modules/varnish/templates/vcl/wikimedia.vcl.erb
1 file changed, 1 insertion(+), 4 deletions(-)

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



diff --git a/modules/varnish/templates/vcl/wikimedia.vcl.erb 
b/modules/varnish/templates/vcl/wikimedia.vcl.erb
index d3a9c1a..0be0b78 100644
--- a/modules/varnish/templates/vcl/wikimedia.vcl.erb
+++ b/modules/varnish/templates/vcl/wikimedia.vcl.erb
@@ -205,11 +205,8 @@
if (req.http.Host ~ (?i)^ru\.) {
set resp.http.Strict-Transport-Security = 
max-age=15768000;
}
-   else if (req.http.Host ~ (?i)^(ca|el|en|he|it|ug|zh)\.) {
-   set resp.http.Strict-Transport-Security = 
max-age=259200;
-   }
else if (!resp.http.Strict-Transport-Security) {
-   set resp.http.Strict-Transport-Security = 
max-age=86400;
+   set resp.http.Strict-Transport-Security = 
max-age=259200;
}
}
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie9be0423a2e56d3a7773ba7b16db30608117a6f8
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BBlack bbl...@wikimedia.org
Gerrit-Reviewer: BBlack bbl...@wikimedia.org
Gerrit-Reviewer: Faidon Liambotis fai...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] Hieraize deployment configuration - change (operations/puppet)

2015-06-18 Thread Alexandros Kosiaris (Code Review)

Alexandros Kosiaris has uploaded a new change for review.

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

Change subject: Hieraize deployment configuration
..

Hieraize deployment configuration

Move the entire repo_config to hiera. This should also easy programmatic
access to it

Change-Id: Ic36d7a0aceea692081b3a6b5163c25f6e8ce51af
---
A hieradata/common/role/deployment.yaml
M manifests/role/deployment.pp
2 files changed, 89 insertions(+), 121 deletions(-)


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

diff --git a/hieradata/common/role/deployment.yaml 
b/hieradata/common/role/deployment.yaml
new file mode 100644
index 000..a676eee
--- /dev/null
+++ b/hieradata/common/role/deployment.yaml
@@ -0,0 +1,88 @@
+repo_config:
+  integration/mediawiki-tools-codesniffer:
+upstream: https://gerrit.wikimedia.org/r/mediawiki/tools/codesniffer
+  integration/phpunit:
+upstream: https://gerrit.wikimedia.org/r/integration/phpunit
+  integration/phpcs:
+upstream: https://gerrit.wikimedia.org/r/integration/phpcs
+  integration/php-coveralls:
+upstream: https://gerrit.wikimedia.org/r/integration/php-coveralls
+  integration/slave-scripts:
+upstream: https://gerrit.wikimedia.org/r/integration/jenkins
+checkout_submodules: true
+  gdash/gdash:
+upstream: https://gerrit.wikimedia.org/r/operations/software/gdash
+  jobrunner/jobrunner:
+upstream: https://gerrit.wikimedia.org/r/mediawiki/services/jobrunner
+service_name: jobrunner
+  grafana/grafana:
+upstream: https://gerrit.wikimedia.org/r/operations/software/grafana
+  parsoid/deploy:
+upstream: 
https://gerrit.wikimedia.org/r/p/mediawiki/services/parsoid/deploy
+checkout_submodules: true
+service_name: parsoid
+  eventlogging/EventLogging:
+upstream: https://gerrit.wikimedia.org/r/mediawiki/extensions/EventLogging
+  ocg/ocg:
+upstream: https://gerrit.wikimedia.org/r/mediawiki/services/ocg-collection
+service_name: ocg
+checkout_submodules: true
+  mathoid/deploy:
+upstream: https://gerrit.wikimedia.org/r/mediawiki/services/mathoid/deploy
+service_name: mathoid
+checkout_submodules: true
+  citoid/deploy:
+upstream: https://gerrit.wikimedia.org/r/mediawiki/services/citoid/deploy
+service_name: citoid
+checkout_submodules: true
+  zotero/translation-server:
+upstream: 
https://gerrit.wikimedia.org/r/mediawiki/services/zotero/translation-server
+service_name: zotero
+  zotero/translators:
+upstream: 
https://gerrit.wikimedia.org/r/mediawiki/services/zotero/translators
+  graphoid/deploy:
+upstream: https://gerrit.wikimedia.org/r/mediawiki/services/graphoid/deploy
+service_name: graphoid
+checkout_submodules: true
+  rcstream/rcstream:
+upstream: https://gerrit.wikimedia.org/r/mediawiki/services/rcstream
+service_name: rcstream
+  restbase/deploy:
+upstream: https://gerrit.wikimedia.org/r/mediawiki/services/restbase/deploy
+service_name: restbase
+checkout_submodules: true
+  fluoride/fluoride:
+upstream: https://gerrit.wikimedia.org/r/mediawiki/tools/fluoride
+  statsv/statsv:
+upstream: https://gerrit.wikimedia.org/r/analytics/statsv
+  abacist/abacist:
+upstream: https://gerrit.wikimedia.org/r/analytics/abacist
+  test/testrepo:
+service_name: puppet
+checkout_submodules: true
+  elasticsearch/plugins:
+gitfat_enabled: true
+upstream: 
https://gerrit.wikimedia.org/r/operations/software/elasticsearch/plugins
+  analytics/refinery:
+gitfat_enabled: true
+upstream: https://gerrit.wikimedia.org/r/analytics/refinery
+  scholarships/scholarships:
+upstream: https://gerrit.wikimedia.org/r/wikimedia/wikimania-scholarships
+  librenms/librenms:
+upstream: https://gerrit.wikimedia.org/r/operations/software/librenms
+  kibana/kibana:
+upstream: https://gerrit.wikimedia.org/r/operations/software/kibana
+  scap/scap:
+upstream: https://gerrit.wikimedia.org/r/mediawiki/tools/scap
+  servermon/servermon:
+service_name: gunicorn
+  iegreview/iegreview:
+grain: iegreview
+upstream: https://gerrit.wikimedia.org/r/wikimedia/iegreview
+  cxserver/deploy:
+service_name: cxserver
+upstream: https://gerrit.wikimedia.org/r/mediawiki/services/cxserver/deploy
+checkout_submodules: true
+  dropwizard/metrics:
+gitfat_enabled: true
+upstream: 
https://gerrit.wikimedia.org/r/operations/software/dropwizard-metrics
diff --git a/manifests/role/deployment.pp b/manifests/role/deployment.pp
index 7949d66..d9f1a69 100644
--- a/manifests/role/deployment.pp
+++ b/manifests/role/deployment.pp
@@ -1,127 +1,7 @@
 # Configuration info: 
https://wikitech.wikimedia.org/wiki/Trebuchet#Adding_a_new_repo
 # Troubleshooting: 
https://wikitech.wikimedia.org/wiki/Trebuchet#Troubleshooting
 class role::deployment::config {
-$repo_config = {
-'integration/mediawiki-tools-codesniffer' = {

[MediaWiki-commits] [Gerrit] Version 3.3 - change (mediawiki...SemanticForms)

2015-06-18 Thread Yaron Koren (Code Review)

Yaron Koren has uploaded a new change for review.

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

Change subject: Version 3.3
..

Version 3.3

Change-Id: I8799b74650717eeb471e974e0fe5a3054c6be1aa
---
M INSTALL
M SemanticForms.php
2 files changed, 3 insertions(+), 3 deletions(-)


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

diff --git a/INSTALL b/INSTALL
index 1dc0639..8c2c354 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,4 +1,4 @@
-[[Semantic Forms 3.2]]
+[[Semantic Forms 3.3]]
 
 Contents:
 * Disclaimer
diff --git a/SemanticForms.php b/SemanticForms.php
index afba110..c26efd1 100644
--- a/SemanticForms.php
+++ b/SemanticForms.php
@@ -41,10 +41,10 @@
return 1;
 }
 
-define( 'SF_VERSION', '3.2' );
+define( 'SF_VERSION', '3.3' );
 
 if ( !defined( 'SMW_VERSION' ) ) {
-   //die( ERROR: a href=\http://semantic-mediawiki.org\;Semantic 
MediaWiki/a must be installed for Semantic Forms to run! );
+   // SMW defines these namespaces itself.
define( 'SF_NS_FORM', 106 );
define( 'SF_NS_FORM_TALK', 107 );
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I8799b74650717eeb471e974e0fe5a3054c6be1aa
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SemanticForms
Gerrit-Branch: master
Gerrit-Owner: Yaron Koren yaro...@gmail.com

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

[MediaWiki-commits] [Gerrit] Implementing full text search. - change (apps...wikipedia)

2015-06-18 Thread Fjalapeno (Code Review)

Fjalapeno has uploaded a new change for review.

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

Change subject: Implementing full text search.
..

Implementing full text search.

Follow on for Bug: T102362

Updated fetcher for full text search.
Implemented search suggestion button.
Added NSError category for making app specific errors.

Lots of uncrustifucation.

Change-Id: I748da6d9bf6c2bffe733ec49d44d5f057fec5e65
---
M MediaWikiKit/MediaWikiKit/MWKArticle.m
A NSError+WMFExtensions.h
A NSError+WMFExtensions.m
M Wikipedia.xcodeproj/project.pbxproj
M Wikipedia/Networking/Fetchers/SearchResultFetcher.m
M Wikipedia/UI-V5/Global.h
M Wikipedia/UI-V5/TGLStackedViewController/TGLStackedLayout.m
M Wikipedia/UI-V5/UICollectionView+WMFExtensions.h
M Wikipedia/UI-V5/UICollectionView+WMFExtensions.m
M Wikipedia/UI-V5/UIStoryboard+WMFExtensions.m
M Wikipedia/UI-V5/WMFAppViewController.m
M Wikipedia/UI-V5/WMFArticleListCollectionViewController.h
M Wikipedia/UI-V5/WMFArticleListCollectionViewController.m
M Wikipedia/UI-V5/WMFArticleListDataSource.h
M Wikipedia/UI-V5/WMFBottomStackLayout.m
M Wikipedia/UI-V5/WMFOffScreenFlowLayout.m
M Wikipedia/UI-V5/WMFSavedPagesDataSource.m
M Wikipedia/UI-V5/WMFSearchFetcher.h
M Wikipedia/UI-V5/WMFSearchFetcher.m
M Wikipedia/UI-V5/WMFSearchResults.h
M Wikipedia/UI-V5/WMFSearchResults.m
M Wikipedia/UI-V5/WMFSearchViewController.h
M Wikipedia/UI-V5/WMFSearchViewController.m
M Wikipedia/UI-V5/iPhone_Root.storyboard
24 files changed, 358 insertions(+), 348 deletions(-)


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

diff --git a/MediaWikiKit/MediaWikiKit/MWKArticle.m 
b/MediaWikiKit/MediaWikiKit/MWKArticle.m
index b60f71a..9a7dab0 100644
--- a/MediaWikiKit/MediaWikiKit/MWKArticle.m
+++ b/MediaWikiKit/MediaWikiKit/MWKArticle.m
@@ -68,16 +68,15 @@
 return self;
 }
 
-- (instancetype)initWithTitle:(MWKTitle*)title 
dataStore:(MWKDataStore*)dataStore searchResultsDict:(NSDictionary*)dict{
+- (instancetype)initWithTitle:(MWKTitle*)title 
dataStore:(MWKDataStore*)dataStore searchResultsDict:(NSDictionary*)dict {
 self = [self initWithTitle:title dataStore:dataStore];
 if (self) {
 self.entityDescription = [self optionalString:@description 
dict:dict];
-self.snippet = [self optionalString:@snippet dict:dict];
+self.snippet   = [self optionalString:@snippet dict:dict];
 }
-
+
 return self;
 }
-
 
 #pragma mark - NSObject
 
@@ -238,18 +237,17 @@
 return [self.dataStore imageWithURL:url article:self];
 }
 
-- (void)loadThumbnailFromDisk{
-
+- (void)loadThumbnailFromDisk {
 /**
  *  The folowing logic was pulled from the Article Fetcher
  *  Putting it here to being to coalesce populating Article data
  *  in a single place. This will be addressed natuarlly as we
  *  refactor model class mapping in the network layer.
  */
-if(!self.thumbnailURL){
+if (!self.thumbnailURL) {
 return;
 }
-
+
 if ([[self existingImageWithURL:self.thumbnailURL] isCached]) {
 return;
 }
@@ -270,7 +268,6 @@
 }
 }
 }
-
 
 /**
  * Return image object if folder for that image exists
diff --git a/NSError+WMFExtensions.h b/NSError+WMFExtensions.h
new file mode 100644
index 000..1163b0a
--- /dev/null
+++ b/NSError+WMFExtensions.h
@@ -0,0 +1,16 @@
+
+#import Foundation/Foundation.h
+
+extern NSString* const WMFErrorDomain;
+
+typedef NS_ENUM(NSInteger, WMFErrorType) {
+
+WMFErrorTypeStringLength,
+
+};
+
+@interface NSError (WMFExtensions)
+
++ (NSError*)wmf_errorWithType:(WMFErrorType)type 
userInfo:(NSDictionary*)userInfo;
+
+@end
diff --git a/NSError+WMFExtensions.m b/NSError+WMFExtensions.m
new file mode 100644
index 000..14e11ad
--- /dev/null
+++ b/NSError+WMFExtensions.m
@@ -0,0 +1,13 @@
+
+#import NSError+WMFExtensions.h
+
+NSString* const WMFErrorDomain = @WMFErrorDomain;
+
+@implementation NSError (WMFExtensions)
+
++ (NSError*)wmf_errorWithType:(WMFErrorType)type 
userInfo:(NSDictionary*)userInfo{
+
+return [NSError errorWithDomain:WMFErrorDomain code:type 
userInfo:userInfo];
+}
+
+@end
diff --git a/Wikipedia.xcodeproj/project.pbxproj 
b/Wikipedia.xcodeproj/project.pbxproj
index 40779ac..c1a0456 100644
--- a/Wikipedia.xcodeproj/project.pbxproj
+++ b/Wikipedia.xcodeproj/project.pbxproj
@@ -180,6 +180,8 @@
04F27B7818FE0F2E00EDD838 /* PageHistoryViewController.m in 
Sources */ = {isa = PBXBuildFile; fileRef = 04F27B7418FE0F2E00EDD838 /* 
PageHistoryViewController.m */; };
04F39590186CF80100B0D6FC /* TOCViewController.m in Sources */ = 
{isa = PBXBuildFile; fileRef = 04F3958F186CF80100B0D6FC /* TOCViewController.m 
*/; };
08D631F71A69B1AB00D87AD0 /* WMFImageGalleryViewController.m in 
Sources */ = {isa = PBXBuildFile; fileRef = 08D631F61A69B1AB00D87AD0 /* 
WMFImageGalleryViewController.m */; };
+

[MediaWiki-commits] [Gerrit] Make deceleration rates normal when scrolling in the app. - change (apps...wikipedia)

2015-06-18 Thread Fjalapeno (Code Review)

Fjalapeno has uploaded a new change for review.

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

Change subject: Make deceleration rates normal when scrolling in the app.
..

Make deceleration rates normal when scrolling in the app.

Bug: T102961
Change-Id: I0257f02833f152c390681214d7b50492b1e6f1ce
---
M Wikipedia/View Controllers/Nearby/NearbyViewController.m
M Wikipedia/View Controllers/WebView/WebViewController.m
2 files changed, 2 insertions(+), 2 deletions(-)


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

diff --git a/Wikipedia/View Controllers/Nearby/NearbyViewController.m 
b/Wikipedia/View Controllers/Nearby/NearbyViewController.m
index 322c3e4..5ec2381 100644
--- a/Wikipedia/View Controllers/Nearby/NearbyViewController.m
+++ b/Wikipedia/View Controllers/Nearby/NearbyViewController.m
@@ -370,8 +370,6 @@
 self.locationManager.headingFilter  = 1.5;
 self.locationManager.distanceFilter = 1.0;
 
-((UIScrollView*)self.collectionView).decelerationRate = 
UIScrollViewDecelerationRateFast;
-
 [self.locationManager startUpdatingLocation];
 if (self.headingAvailable) {
 [self.locationManager startUpdatingHeading];
diff --git a/Wikipedia/View Controllers/WebView/WebViewController.m 
b/Wikipedia/View Controllers/WebView/WebViewController.m
index b308f20..b66e1aa 100644
--- a/Wikipedia/View Controllers/WebView/WebViewController.m
+++ b/Wikipedia/View Controllers/WebView/WebViewController.m
@@ -63,6 +63,8 @@
 [self setupTrackingFooter];
 
 self.bottomNavHeightConstraint.constant = CHROME_MENUS_HEIGHT;
+
+self.webView.scrollView.decelerationRate = 
UIScrollViewDecelerationRateNormal;
 
 self.scrollingToTop = NO;
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I0257f02833f152c390681214d7b50492b1e6f1ce
Gerrit-PatchSet: 1
Gerrit-Project: apps/ios/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Fjalapeno cfl...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] analytics1024 - conf1002 - change (operations/puppet)

2015-06-18 Thread Ottomata (Code Review)

Ottomata has submitted this change and it was merged.

Change subject: analytics1024 - conf1002
..


analytics1024 - conf1002

Change-Id: I7c6c487a83ef7bcf7bee46dd14545ab29a79f083
---
M hieradata/common.yaml
M manifests/site.pp
2 files changed, 2 insertions(+), 2 deletions(-)

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



diff --git a/hieradata/common.yaml b/hieradata/common.yaml
index 38c389c..fb90b6c 100644
--- a/hieradata/common.yaml
+++ b/hieradata/common.yaml
@@ -232,6 +232,6 @@
 sites:
   eqiad: []
 zookeeper_hosts:
-  analytics1024.eqiad.wmnet: '1024'
   analytics1025.eqiad.wmnet: '1025'
   conf1001.eqiad.wmnet: '1101'
+  conf1002.eqiad.wmnet: '1102'
diff --git a/manifests/site.pp b/manifests/site.pp
index a28b7bb..771f444 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -362,7 +362,7 @@
 include base::firewall
 include standard
 
-if $hostname == 'conf1001' {
+if $hostname == 'conf1001' or $hostname == 'conf1002' {
 include role::zookeeper::server
 }
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I7c6c487a83ef7bcf7bee46dd14545ab29a79f083
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ottomata o...@wikimedia.org
Gerrit-Reviewer: Ottomata o...@wikimedia.org
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] beta: Change kibana password location - change (operations/puppet)

2015-06-18 Thread BryanDavis (Code Review)

BryanDavis has uploaded a new change for review.

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

Change subject: beta: Change kibana password location
..

beta: Change kibana password location

Move the expected htpasswd data file location off of nfs.

Bug: T102962
Change-Id: I3fadf41674522069637e855aa37c9d39dc1b6a77
---
M manifests/role/kibana.pp
1 file changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/84/219184/1

diff --git a/manifests/role/kibana.pp b/manifests/role/kibana.pp
index 484c9cb..7d37d0a 100644
--- a/manifests/role/kibana.pp
+++ b/manifests/role/kibana.pp
@@ -14,7 +14,7 @@
 $hostname= 'logstash.beta.wmflabs.org'
 $deploy_dir  = '/srv/deployment/kibana/kibana'
 $auth_realm  = 'Logstash (ssh deployment-bastion.eqiad.wmflabs 
sudo cat /root/secrets.txt)'
-$auth_file   = '/data/project/logstash/.htpasswd'
+$auth_file   = '/etc/logstash/htpasswd'
 $require_ssl = true
 } else {
 # Regular labs instance
@@ -31,7 +31,7 @@
 default = $::kibana_authrealm,
 }
 $auth_file = $::kibana_authfile ? {
-undef   = '/data/project/logstash/.htpasswd',
+undef   = '/etc/logstash/htpasswd',
 default = $::kibana_authfile,
 }
 $require_ssl = false

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I3fadf41674522069637e855aa37c9d39dc1b6a77
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BryanDavis bda...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] Copied i18n from master to v1. - change (mediawiki...WikidataQualityConstraints)

2015-06-18 Thread JanZerebecki (Code Review)

JanZerebecki has submitted this change and it was merged.

Change subject: Copied i18n from master to v1.
..


Copied i18n from master to v1.

Change-Id: I8ea1385a4d704577b1243a139bdb50ee8c5ff03a
---
A i18n/arq.json
A i18n/bcl.json
M i18n/bn.json
A i18n/bs.json
A i18n/ca.json
A i18n/ce.json
A i18n/cs.json
A i18n/de.json
M i18n/en.json
M i18n/es.json
A i18n/eu.json
A i18n/fa.json
A i18n/fi.json
A i18n/fr.json
A i18n/gl.json
A i18n/ht.json
A i18n/it.json
A i18n/ko.json
M i18n/ksh.json
A i18n/ku-latn.json
M i18n/lb.json
A i18n/lrc.json
M i18n/mg.json
A i18n/mk.json
A i18n/nb.json
A i18n/ne.json
M i18n/nl.json
A i18n/pl.json
A i18n/ps.json
A i18n/pt.json
M i18n/qqq.json
M i18n/ru.json
A i18n/sd.json
A i18n/si.json
A i18n/sv.json
A i18n/tg-cyrl.json
A i18n/tr.json
A i18n/vi.json
A i18n/xmf.json
A i18n/yi.json
M i18n/zh-hans.json
M i18n/zh-hant.json
42 files changed, 743 insertions(+), 75 deletions(-)

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



diff --git a/i18n/arq.json b/i18n/arq.json
new file mode 100644
index 000..8a7c7e6
--- /dev/null
+++ b/i18n/arq.json
@@ -0,0 +1,10 @@
+{
+   @metadata: {
+   authors: [
+   Oldstoneage
+   ]
+   },
+   wbqc-constraintreport-not-existent-entity: هاد الحاجة ما كايناش!,
+   wbqc-constraintreport-result-table-header-status: الحالة,
+   wbqc-violations-group: حتمات
+}
diff --git a/i18n/bcl.json b/i18n/bcl.json
new file mode 100644
index 000..daf6932
--- /dev/null
+++ b/i18n/bcl.json
@@ -0,0 +1,12 @@
+{
+   @metadata: {
+   authors: [
+   Geopoet
+   ]
+   },
+   wbqc-constraintreport-result-headline: Resulta para sa,
+   wbqc-constraintreport-not-existent-entity: An entidad bakong 
eksistido!,
+   wbqc-constraintreport-status-exception: Kalaenan,
+   wbqc-constraintreport-result-table-header-status: Kamugtakan,
+   wbqc-violations-group: Mga Nakakapagpugol
+}
diff --git a/i18n/bn.json b/i18n/bn.json
index cca9ab9..77b55b0 100644
--- a/i18n/bn.json
+++ b/i18n/bn.json
@@ -4,5 +4,9 @@
Aftabuzzaman
]
},
-   wikidataquality-constraintreport-result-table-header-constraint: 
সীমাবদ্ধতা
+   wbqc-constraintreport-form-submit-label: পরীক্ষা করুন,
+   wbqc-constraintreport-form-entityid-placeholder: Qxx/Pxx,
+   wbqc-constraintreport-result-headline: $1-এর ফলাফল,
+   wbqc-constraintreport-status-todo: করণীয়,
+   wbqc-constraintreport-result-link-to-claim: দাবি করতে চলুন
 }
diff --git a/i18n/bs.json b/i18n/bs.json
new file mode 100644
index 000..7a81728
--- /dev/null
+++ b/i18n/bs.json
@@ -0,0 +1,8 @@
+{
+   @metadata: {
+   authors: [
+   Emir Mujadzic
+   ]
+   },
+   wbqc-constraintreport-status-exception: Izuzetak
+}
diff --git a/i18n/ca.json b/i18n/ca.json
new file mode 100644
index 000..6e75372
--- /dev/null
+++ b/i18n/ca.json
@@ -0,0 +1,12 @@
+{
+   @metadata: {
+   authors: [
+   Macofe
+   ]
+   },
+   wbqc-constraintreport-result-headline: Resultat de $1,
+   wbqc-constraintreport-status-violation: Violació,
+   wbqc-constraintreport-status-exception: Excepció,
+   wbqc-constraintreport-result-table-header-status: Estat,
+   wbqc-violation-header-parameters: Paràmetres:
+}
diff --git a/i18n/ce.json b/i18n/ce.json
new file mode 100644
index 000..590d414
--- /dev/null
+++ b/i18n/ce.json
@@ -0,0 +1,11 @@
+{
+   @metadata: {
+   authors: [
+   Умар
+   ]
+   },
+   wbqc-constraintreport-result-headline: $1 хилам,
+   wbqc-constraintreport-status-violation: Дохор,
+   wbqc-constraintreport-result-table-header-status: Статус,
+   wbqc-violation-header-parameters: Параметраш:
+}
diff --git a/i18n/cs.json b/i18n/cs.json
new file mode 100644
index 000..a19e94b
--- /dev/null
+++ b/i18n/cs.json
@@ -0,0 +1,8 @@
+{
+   @metadata: {
+   authors: [
+   Cvanca
+   ]
+   },
+   wikidataquality-constraintreport-result-table-header-constraint: 
Omezení
+}
diff --git a/i18n/de.json b/i18n/de.json
new file mode 100644
index 000..47fedbb
--- /dev/null
+++ b/i18n/de.json
@@ -0,0 +1,64 @@
+{
+   @metadata: {
+   authors: [
+   Inkowik,
+   Metalhead64,
+   Purodha
+   ]
+   },
+   wbqc-constraintreport: Beschränkungsbericht,
+   wbqc-constraintreport-explanation-part-one: Diese Spezialseite führt 
Beschränkungsprüfungen zu jedem gewünschten Objekt durch. Die vom Live-System 
abgerufenen Objekte und jede behobene Beschränkungsverletzung wird sofort von 
dieser Liste entfernt.,
+   wbqc-constraintreport-explanation-part-two: Die

[MediaWiki-commits] [Gerrit] Factor handling of entity formats out of EntityDataSerializa... - change (mediawiki...Wikibase)

2015-06-18 Thread jenkins-bot (Code Review)

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

Change subject: Factor handling of entity formats out of 
EntityDataSerializationService
..


Factor handling of entity formats out of EntityDataSerializationService

That class IMO did to many things and using it for T96298 was
quite painful because of EntityDataSerializationService's
dependencies.

The code has been copied almost 1:1 as there was only one place
where the code now in EntityDataSerializationService needs information
about formats.

Change-Id: If7d137a61215f31d2a110b1272b99e31984d7dbd
---
A repo/includes/LinkedData/EntityDataFormatProvider.php
M repo/includes/LinkedData/EntityDataRequestHandler.php
M repo/includes/LinkedData/EntityDataSerializationService.php
M repo/includes/specials/SpecialEntityData.php
A repo/tests/phpunit/includes/LinkedData/EntityDataFormatProviderTest.php
M repo/tests/phpunit/includes/LinkedData/EntityDataRequestHandlerTest.php
M repo/tests/phpunit/includes/LinkedData/EntityDataSerializationServiceTest.php
M repo/tests/phpunit/includes/specials/SpecialEntityDataTest.php
8 files changed, 573 insertions(+), 458 deletions(-)

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



diff --git a/repo/includes/LinkedData/EntityDataFormatProvider.php 
b/repo/includes/LinkedData/EntityDataFormatProvider.php
new file mode 100644
index 000..91a10ba
--- /dev/null
+++ b/repo/includes/LinkedData/EntityDataFormatProvider.php
@@ -0,0 +1,298 @@
+?php
+
+namespace Wikibase\Repo\LinkedData;
+
+use ApiMain;
+use DerivativeContext;
+use DerivativeRequest;
+use RequestContext;
+use Wikimedia\Purtle\RdfWriterFactory;
+
+/**
+ * Service for getting information about supported data formats.
+ *
+ * @since 0.5
+ *
+ * @licence GNU GPL v2+
+ * @author Daniel Kinzler
+ * @author Thomas Pellissier Tanon
+ * @author Anja Jentzsch  anja.jentz...@wikimedia.de 
+ * @author Marius Hoch  h...@online.de 
+ */
+class EntityDataFormatProvider {
+
+   /**
+* White list of supported formats.
+*
+* @var array|null
+*/
+   private $formatWhiteList = null;
+
+   /**
+* @var null|array Associative array from MIME type to format name
+* @note: initialized by initFormats()
+*/
+   private $mimeTypes = null;
+
+   /**
+* @var null|array Associative array from file extension to format name
+* @note: initialized by initFormats()
+*/
+   private $fileExtensions = null;
+
+   /**
+* @var RdfWriterFactory
+*/
+   private $rdfWriterFactory;
+
+   public function __construct() {
+   $this-rdfWriterFactory = new RdfWriterFactory();
+   }
+
+   /**
+* @param array $formatWhiteList
+*/
+   public function setFormatWhiteList( $formatWhiteList ) {
+   $this-formatWhiteList = $formatWhiteList;
+
+   // force re-init of format maps
+   $this-fileExtensions = null;
+   $this-mimeTypes = null;
+   }
+
+   /**
+* @return array
+*/
+   public function getFormatWhiteList() {
+   return $this-formatWhiteList;
+   }
+
+   /**
+* Returns the list of supported MIME types that can be used to specify 
the
+* output format.
+*
+* @return string[]
+*/
+   public function getSupportedMimeTypes() {
+   $this-initFormats();
+
+   return array_keys( $this-mimeTypes );
+   }
+
+   /**
+* Returns the list of supported file extensions that can be used
+* to specify a format.
+*
+* @return string[]
+*/
+   public function getSupportedExtensions() {
+   $this-initFormats();
+
+   return array_keys( $this-fileExtensions );
+   }
+
+   /**
+* Returns the list of supported formats using their canonical names.
+*
+* @return string[]
+*/
+   public function getSupportedFormats() {
+   $this-initFormats();
+
+   return array_unique( array_merge(
+   array_values( $this-mimeTypes ),
+   array_values( $this-fileExtensions )
+   ) );
+   }
+
+   /**
+* Returns a canonical format name. Used to normalize the format 
identifier.
+*
+* @param string $format the format as a file extension or MIME type.
+*
+* @return string|null the canonical format name, or null of the format 
is not supported
+*/
+   public function getFormatName( $format ) {
+   $this-initFormats();
+
+   $format = trim( strtolower( $format ) );
+
+   if ( array_key_exists( $format, $this-mimeTypes ) ) {
+   return $this-mimeTypes[$format];
+   }
+
+   if ( array_key_exists(

[MediaWiki-commits] [Gerrit] Use Material-ish edit pencil background - change (mediawiki...MobileApp)

2015-06-18 Thread jenkins-bot (Code Review)

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

Change subject: Use Material-ish edit pencil background
..


Use Material-ish edit pencil background

Corresponding frontend (Android) change: https://gerrit.wikimedia.org/r/219082

Bug: T99678
Change-Id: I49e12b213a5884e3b20f30be66daaa4cdd783f9f
---
M styles/editlinks.less
1 file changed, 25 insertions(+), 5 deletions(-)

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



diff --git a/styles/editlinks.less b/styles/editlinks.less
index 0479ca6..3fede6f 100644
--- a/styles/editlinks.less
+++ b/styles/editlinks.less
@@ -1,17 +1,37 @@
 a.edit_section_button {
-height: 32px;
-width: 32px;
-border: 8px solid transparent;
+height: 48px;
+width: 48px;
 /* @embed */
 background-image: url(../images/edit.png);
 background-repeat: no-repeat;
 background-size: 32px 32px;
+background-position: center;
 float: right;
 display: inline-float;
+position: relative;
 }
 
-a.edit_section_button:active {
-background-color: rgba(128,128,128,.1);
+a.edit_section_button:before {
+/* inactive background transform */
+content: ;
+position: absolute;
+z-index: -1;
+border-radius: 50%;
+-webkit-transform: scale(0);
+transform: scale(0);
+-webkit-transition: transform 300ms cubic-bezier(0.250, 0.460, 0.450, 
0.940);
+transition: transform 300ms cubic-bezier(0.250, 0.460, 0.450, 0.940); /* 
ease out quad */
+}
+
+a.edit_section_button:active:before {
+/* active background transform */
+width: 200%;
+height: 200%;
+top: -50%;
+left: -50%;
+background-color: #eee;
+-webkit-transform: scale(.6);
+transform: scale(.6);
 }
 
 .no-editing {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I49e12b213a5884e3b20f30be66daaa4cdd783f9f
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/MobileApp
Gerrit-Branch: master
Gerrit-Owner: Niedzielski sniedziel...@wikimedia.org
Gerrit-Reviewer: BearND bsitzm...@wikimedia.org
Gerrit-Reviewer: Bgerstle bgers...@wikimedia.org
Gerrit-Reviewer: Dbrant dbr...@wikimedia.org
Gerrit-Reviewer: Fjalapeno cfl...@wikimedia.org
Gerrit-Reviewer: Mholloway mhollo...@wikimedia.org
Gerrit-Reviewer: Mhurd mh...@wikimedia.org
Gerrit-Reviewer: Niedzielski sniedziel...@wikimedia.org
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] Fix handling of deleted property text in references + qualif... - change (mediawiki...Wikibase)

2015-06-18 Thread Aude (Code Review)

Aude has uploaded a new change for review.

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

Change subject: Fix handling of deleted property text in references + qualifiers
..

Fix handling of deleted property text in references + qualifiers

@todo: fix handling of the values on references and qualifiers
with deleted property.

Change-Id: I025d858ae43b313bc8f12dcf4a2e5a3069ba6d69
---
M view/resources/jquery/wikibase/snakview/snakview.js
M view/resources/jquery/wikibase/snakview/snakview.variations.Value.js
2 files changed, 2 insertions(+), 17 deletions(-)


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

diff --git a/view/resources/jquery/wikibase/snakview/snakview.js 
b/view/resources/jquery/wikibase/snakview/snakview.js
index 2a1bd71..de8a123 100644
--- a/view/resources/jquery/wikibase/snakview/snakview.js
+++ b/view/resources/jquery/wikibase/snakview/snakview.js
@@ -734,7 +734,7 @@
this.options.entityStore.get( propertyId )
.done( function( fetchedProperty ) {
deferred.resolve( self._createPropertyDOM(
-   fetchedProperty ? 
fetchedProperty.getContent() : undefined,
+   fetchedProperty ? 
fetchedProperty.getContent() : propertyId,
fetchedProperty ? 
fetchedProperty.getTitle() : undefined
) );
} )
diff --git 
a/view/resources/jquery/wikibase/snakview/snakview.variations.Value.js 
b/view/resources/jquery/wikibase/snakview/snakview.variations.Value.js
index fea0e98..359e178 100644
--- a/view/resources/jquery/wikibase/snakview/snakview.variations.Value.js
+++ b/view/resources/jquery/wikibase/snakview/snakview.variations.Value.js
@@ -331,23 +331,8 @@
this._valueView = null;
this.$viewPort.empty();
}
+
$valueViewDom = this.$viewPort.wrapInner( 'div/' 
).children();
-
-   // Can't choose a view for displaying empty value 
without indication by data type
-   // definition which kind of value should be creatable 
by the new valueview.
-   // NOTE: We run into this situation if we have a Snak 
which is using a deleted property,
-   //  so the DataType can not be determined while we 
still want to display the valueview.
-   if( !dataType  dataValue === null ) {
-   // This message will be shown if the initial 
value uses a different Snak type but
-   // the user tries to change the snak type to 
value Snak. This simply doesn't make
-   // any sense since we have no indicator for 
what kind of value should be entered
-   // if the Property doesn't provide us with that 
info.
-   $valueViewDom
-   .text( mw.msg( 
'wikibase-snakview-variation-nonewvaluefordeletedproperty' ) )
-   .addClass( this.variationBaseClass + 
'-nonewvaluefordeletedproperty' );
-
-   return false; // no valueview created!
-   }
 
this._valueView = this._valueViewBuilder.initValueView(
$valueViewDom,

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I025d858ae43b313bc8f12dcf4a2e5a3069ba6d69
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Aude aude.w...@gmail.com

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

[MediaWiki-commits] [Gerrit] Fixed tests - change (mediawiki...WikidataQualityConstraints)

2015-06-18 Thread Jonaskeutel (Code Review)

Jonaskeutel has submitted this change and it was merged.

Change subject: Fixed tests
..


Fixed tests

Change-Id: I27ad24f098608d5a877f9902f2f96ecb3c664476
---
M includes/Constraint.php
M includes/ConstraintCheck/Helper/ConstraintReportHelper.php
M includes/ConstraintRepository.php
M maintenance/UpdateTable.php
M tests/phpunit/Checker/FormatChecker/FormatCheckerTest.php
M tests/phpunit/ConstraintRepositoryTest.php
M tests/phpunit/ConstraintTest.php
M tests/phpunit/Helper/ConstraintReportHelperTest.php
8 files changed, 41 insertions(+), 33 deletions(-)

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



diff --git a/includes/Constraint.php b/includes/Constraint.php
index d85f910..699296d 100644
--- a/includes/Constraint.php
+++ b/includes/Constraint.php
@@ -2,6 +2,9 @@
 
 namespace WikibaseQuality\ConstraintReport;
 
+use Wikibase\DataModel\Entity\PropertyId;
+
+
 /**
  * Class Constraint
  *
@@ -38,11 +41,11 @@
 
/**
 * @param string $constraintClaimGuid
-* @param string $propertyId
+* @param PropertyId $propertyId
 * @param string $constraintTypeQid
 * @param array $constraintParameters
 */
-   public function __construct( $constraintClaimGuid, $propertyId, 
$constraintTypeQid, $constraintParameters) {
+   public function __construct( $constraintClaimGuid, PropertyId 
$propertyId, $constraintTypeQid, $constraintParameters) {
$this-constraintClaimGuid = $constraintClaimGuid;
$this-constraintTypeQid = $constraintTypeQid;
$this-propertyId = $propertyId;
diff --git a/includes/ConstraintCheck/Helper/ConstraintReportHelper.php 
b/includes/ConstraintCheck/Helper/ConstraintReportHelper.php
index bd5a9bd..4f10d75 100755
--- a/includes/ConstraintCheck/Helper/ConstraintReportHelper.php
+++ b/includes/ConstraintCheck/Helper/ConstraintReportHelper.php
@@ -87,7 +87,7 @@
 */
public function parseParameterArray( $parameterArray, $asString = false 
) {
if ( $parameterArray[ 0 ] === '' ) { // parameter not given
-   return array ( 'null' );
+   return array ( 'none' );
} else {
$array = array ();
foreach ( $parameterArray as $parameter ) {
@@ -104,7 +104,7 @@
 * @return null|string
 */
public function getParameterFromJson( $json, $parameter ) {
-   isset( $json-$parameter ) ? $json-$parameter : null;
+   return isset( $json-$parameter ) ? $json-$parameter : null;
}
 
 }
\ No newline at end of file
diff --git a/includes/ConstraintRepository.php 
b/includes/ConstraintRepository.php
index 42586c2..487c24e 100644
--- a/includes/ConstraintRepository.php
+++ b/includes/ConstraintRepository.php
@@ -42,7 +42,7 @@
function ( Constraint $constraint ) {
return array(
'constraint_guid' = 
$constraint-getConstraintClaimGuid(),
-   'pid' = $constraint-getPropertyId(),
+   'pid' = 
$constraint-getPropertyId()-getNumericId(),
'constraint_type_qid' = 
$constraint-getConstraintTypeQid(),
'constraint_parameters' = json_encode( 
$constraint-getConstraintParameters() )
);
@@ -84,7 +84,8 @@
foreach( $results as $result ) {
$constraintTypeQid = $result-constraint_type_qid;
$constraintParameters = (array) json_decode( 
$result-constraint_parameters );
-   $constraints[] = new Constraint( 
$result-constraint_guid, new PropertyId( $result-pid ), $constraintTypeQid, 
$constraintParameters );
+   $serializedPid = 'P' . $result-pid;
+   $constraints[] = new Constraint( 
$result-constraint_guid, new PropertyId( $serializedPid ), $constraintTypeQid, 
$constraintParameters );
}
return $constraints;
}
diff --git a/maintenance/UpdateTable.php b/maintenance/UpdateTable.php
index 9e94d9b..9b822d2 100644
--- a/maintenance/UpdateTable.php
+++ b/maintenance/UpdateTable.php
@@ -3,6 +3,7 @@
 namespace WikibaseQuality\ConstraintReport\Maintenance;
 
 // @codeCoverageIgnoreStart
+use Wikibase\DataModel\Entity\PropertyId;
 use WikibaseQuality\ConstraintReport\Constraint;
 use WikibaseQuality\ConstraintReport\ConstraintReportFactory;
 
@@ -63,7 +64,8 @@
}
 
$constraintParameters = (array) json_decode( $data[3] );
-   $accumulator[] = new Constraint( $data[0], $data[1], 
$data[2], $constraintParameters );
+   $propertyId = new PropertyId( 'P' . $data[1] );
+

[MediaWiki-commits] [Gerrit] Fix for raid1-lvm-conf.cfg - change (operations/puppet)

2015-06-18 Thread Ottomata (Code Review)

Ottomata has uploaded a new change for review.

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

Change subject: Fix for raid1-lvm-conf.cfg
..

Fix for raid1-lvm-conf.cfg

Change-Id: I4e5ad4dcbba9fc2c69277f62c46b1325409f2eed
---
M modules/install-server/files/autoinstall/partman/raid1-lvm-conf.cfg
1 file changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/71/219171/1

diff --git 
a/modules/install-server/files/autoinstall/partman/raid1-lvm-conf.cfg 
b/modules/install-server/files/autoinstall/partman/raid1-lvm-conf.cfg
index 8760c3c..dc2c016 100644
--- a/modules/install-server/files/autoinstall/partman/raid1-lvm-conf.cfg
+++ b/modules/install-server/files/autoinstall/partman/raid1-lvm-conf.cfg
@@ -59,7 +59,7 @@
 use_filesystem{ } \
 filesystem{ ext4 } \
 $defaultignore{ } \
-.
+. \
 1000 1000 25 ext4 \
 mountpoint{ /var/lib/zookeeper } \
 method{ format } \
@@ -70,7 +70,7 @@
 use_filesystem{ } \
 filesystem{ ext4 } \
 $defaultignore{ } \
-. \
+.
 
 
 d-i partman-md/confirm  boolean true

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I4e5ad4dcbba9fc2c69277f62c46b1325409f2eed
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ottomata o...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] Prepare changelog for version 0.0.14 - change (analytics...source)

2015-06-18 Thread Joal (Code Review)

Joal has uploaded a new change for review.

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

Change subject: Prepare changelog for version 0.0.14
..

Prepare changelog for version 0.0.14

Change-Id: Ife7ac0cdad122cf92821bcc0ee7cd3586e86cbdf
---
M changelog.md
1 file changed, 4 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/analytics/refinery/source 
refs/changes/81/219181/1

diff --git a/changelog.md b/changelog.md
index 30371e4..026c492 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,5 +1,8 @@
+## v0.0.14
+* Add Spark mobile_apps sessions statistics job.
+
 ## v0.0.13
-* Fix bug in Webrequest.normalizeHost when uri_host is empty string._
+* Fix bug in Webrequest.normalizeHost when uri_host is empty string.
 
 ## v0.0.12
 * wmf_app_version field now in map returned by UAParserUDF.

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ife7ac0cdad122cf92821bcc0ee7cd3586e86cbdf
Gerrit-PatchSet: 1
Gerrit-Project: analytics/refinery/source
Gerrit-Branch: master
Gerrit-Owner: Joal j...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] Hovercards: Disable test release on Catalan and Greek Wikipe... - change (operations/mediawiki-config)

2015-06-18 Thread jenkins-bot (Code Review)

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

Change subject: Hovercards: Disable test release on Catalan and Greek Wikipedias
..


Hovercards: Disable test release on Catalan and Greek Wikipedias

To go out on 2015-06-18, following the two month test release.

Bug: T92555
Change-Id: I56e6766f27b73e1aa3270a10473b73a7297f4ea6
---
M wmf-config/InitialiseSettings.php
1 file changed, 0 insertions(+), 2 deletions(-)

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

Objections:
  Jforrester: There's a problem with this change, please improve



diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index 52b326a..bd028ce 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -11790,8 +11790,6 @@
 
 'wmgUsePopups' = array(
'default' = false,
-   'cawiki' = true,  // T88164
-   'elwiki' = true,  // T88164
 ),
 
 'wmgPopupsBetaFeature' = array(

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I56e6766f27b73e1aa3270a10473b73a7297f4ea6
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Jforrester jforres...@wikimedia.org
Gerrit-Reviewer: Greg Grossmeier g...@wikimedia.org
Gerrit-Reviewer: Jforrester jforres...@wikimedia.org
Gerrit-Reviewer: Thcipriani tcipri...@wikimedia.org
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] Update zookeeper ferm to allow connections from all internal... - change (operations/puppet)

2015-06-18 Thread Ottomata (Code Review)

Ottomata has uploaded a new change for review.

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

Change subject: Update zookeeper ferm to allow connections from all internal 
networks
..

Update zookeeper ferm to allow connections from all internal networks

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


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/83/219183/1

diff --git a/manifests/role/zookeeper.pp b/manifests/role/zookeeper.pp
index c8e0678..19cb7b3 100644
--- a/manifests/role/zookeeper.pp
+++ b/manifests/role/zookeeper.pp
@@ -85,7 +85,7 @@
 proto  = 'tcp',
 # Zookeeper client, protocol, and jmx listen ports.
 port   = (2181 2182 2183 ${$::zookeeper::server::jmx_port}),
-srange = '($ANALYTICS_NETWORKS)',
+srange = '($INTERNAL)',
 }
 # Use jmxtrans for sending metrics to ganglia
 class { 'zookeeper::jmxtrans':

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I7aa03e42745c9612c6f9e8d9fbb04f28fd1944e8
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ottomata o...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] Update zookeeper ferm to allow connections from all internal... - change (operations/puppet)

2015-06-18 Thread Ottomata (Code Review)

Ottomata has submitted this change and it was merged.

Change subject: Update zookeeper ferm to allow connections from all internal 
networks
..


Update zookeeper ferm to allow connections from all internal networks

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

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



diff --git a/manifests/role/zookeeper.pp b/manifests/role/zookeeper.pp
index c8e0678..19cb7b3 100644
--- a/manifests/role/zookeeper.pp
+++ b/manifests/role/zookeeper.pp
@@ -85,7 +85,7 @@
 proto  = 'tcp',
 # Zookeeper client, protocol, and jmx listen ports.
 port   = (2181 2182 2183 ${$::zookeeper::server::jmx_port}),
-srange = '($ANALYTICS_NETWORKS)',
+srange = '($INTERNAL)',
 }
 # Use jmxtrans for sending metrics to ganglia
 class { 'zookeeper::jmxtrans':

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I7aa03e42745c9612c6f9e8d9fbb04f28fd1944e8
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ottomata o...@wikimedia.org
Gerrit-Reviewer: Ottomata o...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] beta: Change kibana password location - change (operations/puppet)

2015-06-18 Thread Yuvipanda (Code Review)

Yuvipanda has submitted this change and it was merged.

Change subject: beta: Change kibana password location
..


beta: Change kibana password location

Move the expected htpasswd data file location off of nfs.

Bug: T102962
Change-Id: I3fadf41674522069637e855aa37c9d39dc1b6a77
---
M manifests/role/kibana.pp
1 file changed, 2 insertions(+), 2 deletions(-)

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



diff --git a/manifests/role/kibana.pp b/manifests/role/kibana.pp
index 484c9cb..7d37d0a 100644
--- a/manifests/role/kibana.pp
+++ b/manifests/role/kibana.pp
@@ -14,7 +14,7 @@
 $hostname= 'logstash.beta.wmflabs.org'
 $deploy_dir  = '/srv/deployment/kibana/kibana'
 $auth_realm  = 'Logstash (ssh deployment-bastion.eqiad.wmflabs 
sudo cat /root/secrets.txt)'
-$auth_file   = '/data/project/logstash/.htpasswd'
+$auth_file   = '/etc/logstash/htpasswd'
 $require_ssl = true
 } else {
 # Regular labs instance
@@ -31,7 +31,7 @@
 default = $::kibana_authrealm,
 }
 $auth_file = $::kibana_authfile ? {
-undef   = '/data/project/logstash/.htpasswd',
+undef   = '/etc/logstash/htpasswd',
 default = $::kibana_authfile,
 }
 $require_ssl = false

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I3fadf41674522069637e855aa37c9d39dc1b6a77
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BryanDavis bda...@wikimedia.org
Gerrit-Reviewer: Hashar has...@free.fr
Gerrit-Reviewer: Yuvipanda yuvipa...@gmail.com
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] Fix test for unknown sites in OtherProjectsSitesGeneratorTest - change (mediawiki...Wikibase)

2015-06-18 Thread Lucie Kaffee (Code Review)

Lucie Kaffee has submitted this change and it was merged.

Change subject: Fix test for unknown sites in OtherProjectsSitesGeneratorTest
..


Fix test for unknown sites in OtherProjectsSitesGeneratorTest

Change-Id: I893b08f4441666abb7b4a6bc1d6d085eafaabf72
---
M client/tests/phpunit/includes/OtherProjectsSitesGeneratorTest.php
1 file changed, 13 insertions(+), 6 deletions(-)

Approvals:
  Lucie Kaffee: Looks good to me, approved



diff --git a/client/tests/phpunit/includes/OtherProjectsSitesGeneratorTest.php 
b/client/tests/phpunit/includes/OtherProjectsSitesGeneratorTest.php
index 0012d29..2eb632f 100644
--- a/client/tests/phpunit/includes/OtherProjectsSitesGeneratorTest.php
+++ b/client/tests/phpunit/includes/OtherProjectsSitesGeneratorTest.php
@@ -75,15 +75,22 @@
array()
);
 
-   $tests['Unknown site'] = array(
-   array( 'wikipedia', 'wikisource' ),
-   'kittenswiki',
-   array()
-   );
-
return $tests;
}
 
+   public function testOtherProjectSiteIds_unknownSite() {
+   $siteStore = $this-getSiteStoreMock();
+   $otherProjectsSitesProvider = new OtherProjectsSitesGenerator( 
$siteStore, 'kittenswiki', array( 'wikidata' ) );
+
+   // getOtherProjectsSiteIds does wfWarn in case it's being 
called with a siteid
+   // it doesn't know about. That's fine, we can just ignore that.
+   \MediaWiki\suppressWarnings();
+   $result = $otherProjectsSitesProvider-getOtherProjectsSiteIds( 
array( 'wikipedia', 'wikisource' ) );
+   \MediaWiki\restoreWarnings();
+
+   $this-assertSame( array(), $result );
+   }
+
/**
 * @return MockSiteStore
 */

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I893b08f4441666abb7b4a6bc1d6d085eafaabf72
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Hoo man h...@online.de
Gerrit-Reviewer: Aude aude.w...@gmail.com
Gerrit-Reviewer: Daniel Kinzler daniel.kinz...@wikimedia.de
Gerrit-Reviewer: Hoo man h...@online.de
Gerrit-Reviewer: JanZerebecki jan.wikime...@zerebecki.de
Gerrit-Reviewer: Lucie Kaffee lucie.kaf...@wikimedia.de
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] Link to misc on other datasets index - change (operations/puppet)

2015-06-18 Thread ArielGlenn (Code Review)

ArielGlenn has submitted this change and it was merged.

Change subject: Link to misc on other datasets index
..


Link to misc on other datasets index

Change-Id: Ia221cf5482dec2500cb5ea17c9b75935547ff3ed
---
M modules/dataset/files/html/other_index.html
1 file changed, 1 insertion(+), 0 deletions(-)

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



diff --git a/modules/dataset/files/html/other_index.html 
b/modules/dataset/files/html/other_index.html
index 1c6e823..5cce406 100644
--- a/modules/dataset/files/html/other_index.html
+++ b/modules/dataset/files/html/other_index.html
@@ -127,6 +127,7 @@
a href=scanset/1911 Edition of the Encyclopedia 
Britannica, scanned as tiff files/abr /
a href=wep/User signup data for the Wikipedia 
Education Program/abr /
a href=bugzilla/Sanitized Bugzilla database dump/a
+   a href=misc/Miscellaneous - Phabricator and SVN 
dumps/a
div class=visualClear/div
/div
/div

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia221cf5482dec2500cb5ea17c9b75935547ff3ed
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alex Monk kren...@gmail.com
Gerrit-Reviewer: ArielGlenn ar...@wikimedia.org
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] dump server other/misc index.html needed a br - change (operations/puppet)

2015-06-18 Thread ArielGlenn (Code Review)

ArielGlenn has uploaded a new change for review.

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

Change subject: dump server other/misc index.html needed a br
..

dump server other/misc index.html needed a br

Change-Id: I4a6915b028d7c03db520c94954654cb5fe4a5344
---
M modules/dataset/files/html/other_index.html
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/90/219190/1

diff --git a/modules/dataset/files/html/other_index.html 
b/modules/dataset/files/html/other_index.html
index 5cce406..926c14a 100644
--- a/modules/dataset/files/html/other_index.html
+++ b/modules/dataset/files/html/other_index.html
@@ -126,7 +126,7 @@
a href=diffdbApril 2011 English language Wikipedia 
revisions as additions/removals to the previous text/abr /
a href=scanset/1911 Edition of the Encyclopedia 
Britannica, scanned as tiff files/abr /
a href=wep/User signup data for the Wikipedia 
Education Program/abr /
-   a href=bugzilla/Sanitized Bugzilla database dump/a
+   a href=bugzilla/Sanitized Bugzilla database 
dump/abr /
a href=misc/Miscellaneous - Phabricator and SVN 
dumps/a
div class=visualClear/div
/div

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I4a6915b028d7c03db520c94954654cb5fe4a5344
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: ArielGlenn ar...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] analytics1024 - conf1002 - change (operations/puppet)

2015-06-18 Thread Ottomata (Code Review)

Ottomata has uploaded a new change for review.

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

Change subject: analytics1024 - conf1002
..

analytics1024 - conf1002

Change-Id: I7c6c487a83ef7bcf7bee46dd14545ab29a79f083
---
M hieradata/common.yaml
M manifests/site.pp
2 files changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/73/219173/1

diff --git a/hieradata/common.yaml b/hieradata/common.yaml
index 38c389c..fb90b6c 100644
--- a/hieradata/common.yaml
+++ b/hieradata/common.yaml
@@ -232,6 +232,6 @@
 sites:
   eqiad: []
 zookeeper_hosts:
-  analytics1024.eqiad.wmnet: '1024'
   analytics1025.eqiad.wmnet: '1025'
   conf1001.eqiad.wmnet: '1101'
+  conf1002.eqiad.wmnet: '1102'
diff --git a/manifests/site.pp b/manifests/site.pp
index a28b7bb..771f444 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -362,7 +362,7 @@
 include base::firewall
 include standard
 
-if $hostname == 'conf1001' {
+if $hostname == 'conf1001' or $hostname == 'conf1002' {
 include role::zookeeper::server
 }
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I7c6c487a83ef7bcf7bee46dd14545ab29a79f083
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ottomata o...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] Allow optional firejail containment for nodejs services. - change (operations/puppet)

2015-06-18 Thread Muehlenhoff (Code Review)

Muehlenhoff has uploaded a new change for review.

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

Change subject: Allow optional firejail containment for nodejs services.
..

Allow optional firejail containment for nodejs services.

This has been tested with mathoid and we can convert the services
one by one after individual review.
Bug: T101870

Change-Id: I7e9c8d1c3f7d6655bba598938eba885210c9e9d6
---
M modules/service/manifests/node.pp
M modules/service/templates/node/upstart.conf.erb
2 files changed, 8 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/77/219177/1

diff --git a/modules/service/manifests/node.pp 
b/modules/service/manifests/node.pp
index d917527..c348e9d 100644
--- a/modules/service/manifests/node.pp
+++ b/modules/service/manifests/node.pp
@@ -49,6 +49,7 @@
   $config = undef,
   $no_file = 1,
   $healthcheck_url='/_info',
+  $firejail = false,
 ) {
 # Import all common configuration
 include service::configuration
@@ -74,8 +75,8 @@
 $local_logdir = ${service::configuration::log_dir}/${title}
 $local_logfile = ${local_logdir}/main.log
 
-# Software and the deployed code
-require_package('nodejs', 'nodejs-legacy')
+# Software and the deployed code, firejail for containment
+require_package('nodejs', 'nodejs-legacy', 'firejail')
 package { ${title}/deploy:
 provider = 'trebuchet',
 }
@@ -164,3 +165,4 @@
 check_command = check_http_port_url!${port}!${healthcheck_url},
 }
 }
+
diff --git a/modules/service/templates/node/upstart.conf.erb 
b/modules/service/templates/node/upstart.conf.erb
index ba0803d..7297956 100644
--- a/modules/service/templates/node/upstart.conf.erb
+++ b/modules/service/templates/node/upstart.conf.erb
@@ -21,4 +21,8 @@
 kill timeout 60
 
 chdir /srv/deployment/%= @title %/deploy
+% if @firejail %
 exec /usr/bin/nodejs src/server.js -c /etc/%= @title %/config.yaml
+% else %
+exec /usr/bin/firejail --caps.drop=all --seccomp /usr/bin/nodejs src/server.js 
-c /etc/%= @title %/config.yaml
+% end %

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I7e9c8d1c3f7d6655bba598938eba885210c9e9d6
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Muehlenhoff mmuhlenh...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] T102649 Allow raw content for html builder, escape content b... - change (mediawiki...WikidataQuality)

2015-06-18 Thread Soeren.oldag (Code Review)

Soeren.oldag has uploaded a new change for review.

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

Change subject: T102649 Allow raw content for html builder, escape content by 
default
..

T102649 Allow raw content for html builder, escape content by default

Change-Id: I30a40b02b5fbd673468dbc0218f0263915fe20ed
---
M includes/Html/HtmlTableCellBuilder.php
M includes/Html/HtmlTableHeaderBuilder.php
2 files changed, 49 insertions(+), 11 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikidataQuality 
refs/changes/80/219180/1

diff --git a/includes/Html/HtmlTableCellBuilder.php 
b/includes/Html/HtmlTableCellBuilder.php
index 348451d..c840949 100755
--- a/includes/Html/HtmlTableCellBuilder.php
+++ b/includes/Html/HtmlTableCellBuilder.php
@@ -25,17 +25,31 @@
private $attributes;
 
/**
-* @param $content Html
-* @param array $attributes
+* Determines, whether the content is raw html or should be escaped.
+*
+* @var bool
 */
-   public function __construct( $content, array $attributes = array() ) {
+   private $isRawContent;
+
+   /**
+* @param string HTML $content
+* @param array $attributes
+* @param bool $isRawContent
+*
+* @throws InvalidArgumentException
+*/
+   public function __construct( $content, array $attributes = array(), 
$isRawContent = false ) {
// Check parameters
if ( !is_string( $content ) ) {
throw new InvalidArgumentException( '$content must be 
string.' );
}
+   if ( !is_bool( $isRawContent ) ) {
+   throw new InvalidArgumentException( '$isRawContent must 
be boolean.' );
+   }
 
$this-content = $content;
$this-attributes = $attributes;
+   $this-isRawContent = $isRawContent;
}
 
/**
@@ -58,12 +72,17 @@
 * @return string HTML
 */
public function toHtml() {
+   $content = $this-content;
+   if ( !$this-isRawContent ) {
+   $content = htmlspecialchars( $this-content );
+   }
+
return
Html::openElement(
'td',
$this-getAttributes()
)
-   . $this-content
+   . $content
. Html::closeElement( 'td' );
}
-}
\ No newline at end of file
+}
diff --git a/includes/Html/HtmlTableHeaderBuilder.php 
b/includes/Html/HtmlTableHeaderBuilder.php
index 10a004b..6814278 100755
--- a/includes/Html/HtmlTableHeaderBuilder.php
+++ b/includes/Html/HtmlTableHeaderBuilder.php
@@ -27,19 +27,33 @@
private $isSortable;
 
/**
-* @param string $content HTML
-* @param bool $isSortable
+* Determines, whether the content is raw html or should be escaped.
+*
+* @var bool
 */
-   public function __construct( $content, $isSortable = false ) {
+   private $isRawContent;
+
+   /**
+* @param string HTML $content
+* @param bool $isSortable
+* @param bool $isRawContent
+*
+* @throws InvalidArgumentException
+*/
+   public function __construct( $content, $isSortable = false, 
$isRawContent = false ) {
if ( !is_string( $content ) ) {
throw new InvalidArgumentException( '$content must be 
string.' );
}
if ( !is_bool( $isSortable ) ) {
throw new InvalidArgumentException( '$isSortable must 
be boolean.' );
}
+   if ( !is_bool( $isRawContent ) ) {
+   throw new InvalidArgumentException( '$isRawContent must 
be boolean.' );
+   }
 
$this-content = $content;
$this-isSortable = $isSortable;
+   $this-isRawContent = $isRawContent;
}
 
/**
@@ -69,12 +83,17 @@
$attributes['class'] = 'unsortable';
}
 
+   $content = $this-content;
+   if ( !$this-isRawContent ) {
+   $content = htmlspecialchars( $this-content );
+   }
+
return
Html::openElement(
'th',
$attributes
)
-   . $this-content
-   . Html::closeElement( 'th' );
+   . $content
+   . Html::closeElement('th');
}
-}
\ No newline at end of file
+}

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

Gerrit-MessageType:

[MediaWiki-commits] [Gerrit] T102649 Allow raw content for html builder, escape content b... - change (mediawiki...WikidataQuality)

2015-06-18 Thread Soeren.oldag (Code Review)

Soeren.oldag has submitted this change and it was merged.

Change subject: T102649 Allow raw content for html builder, escape content by 
default
..


T102649 Allow raw content for html builder, escape content by default

Change-Id: I30a40b02b5fbd673468dbc0218f0263915fe20ed
---
M includes/Html/HtmlTableCellBuilder.php
M includes/Html/HtmlTableHeaderBuilder.php
2 files changed, 49 insertions(+), 11 deletions(-)

Approvals:
  Soeren.oldag: Verified; Looks good to me, approved



diff --git a/includes/Html/HtmlTableCellBuilder.php 
b/includes/Html/HtmlTableCellBuilder.php
index 348451d..c840949 100755
--- a/includes/Html/HtmlTableCellBuilder.php
+++ b/includes/Html/HtmlTableCellBuilder.php
@@ -25,17 +25,31 @@
private $attributes;
 
/**
-* @param $content Html
-* @param array $attributes
+* Determines, whether the content is raw html or should be escaped.
+*
+* @var bool
 */
-   public function __construct( $content, array $attributes = array() ) {
+   private $isRawContent;
+
+   /**
+* @param string HTML $content
+* @param array $attributes
+* @param bool $isRawContent
+*
+* @throws InvalidArgumentException
+*/
+   public function __construct( $content, array $attributes = array(), 
$isRawContent = false ) {
// Check parameters
if ( !is_string( $content ) ) {
throw new InvalidArgumentException( '$content must be 
string.' );
}
+   if ( !is_bool( $isRawContent ) ) {
+   throw new InvalidArgumentException( '$isRawContent must 
be boolean.' );
+   }
 
$this-content = $content;
$this-attributes = $attributes;
+   $this-isRawContent = $isRawContent;
}
 
/**
@@ -58,12 +72,17 @@
 * @return string HTML
 */
public function toHtml() {
+   $content = $this-content;
+   if ( !$this-isRawContent ) {
+   $content = htmlspecialchars( $this-content );
+   }
+
return
Html::openElement(
'td',
$this-getAttributes()
)
-   . $this-content
+   . $content
. Html::closeElement( 'td' );
}
-}
\ No newline at end of file
+}
diff --git a/includes/Html/HtmlTableHeaderBuilder.php 
b/includes/Html/HtmlTableHeaderBuilder.php
index 10a004b..6814278 100755
--- a/includes/Html/HtmlTableHeaderBuilder.php
+++ b/includes/Html/HtmlTableHeaderBuilder.php
@@ -27,19 +27,33 @@
private $isSortable;
 
/**
-* @param string $content HTML
-* @param bool $isSortable
+* Determines, whether the content is raw html or should be escaped.
+*
+* @var bool
 */
-   public function __construct( $content, $isSortable = false ) {
+   private $isRawContent;
+
+   /**
+* @param string HTML $content
+* @param bool $isSortable
+* @param bool $isRawContent
+*
+* @throws InvalidArgumentException
+*/
+   public function __construct( $content, $isSortable = false, 
$isRawContent = false ) {
if ( !is_string( $content ) ) {
throw new InvalidArgumentException( '$content must be 
string.' );
}
if ( !is_bool( $isSortable ) ) {
throw new InvalidArgumentException( '$isSortable must 
be boolean.' );
}
+   if ( !is_bool( $isRawContent ) ) {
+   throw new InvalidArgumentException( '$isRawContent must 
be boolean.' );
+   }
 
$this-content = $content;
$this-isSortable = $isSortable;
+   $this-isRawContent = $isRawContent;
}
 
/**
@@ -69,12 +83,17 @@
$attributes['class'] = 'unsortable';
}
 
+   $content = $this-content;
+   if ( !$this-isRawContent ) {
+   $content = htmlspecialchars( $this-content );
+   }
+
return
Html::openElement(
'th',
$attributes
)
-   . $this-content
-   . Html::closeElement( 'th' );
+   . $content
+   . Html::closeElement('th');
}
-}
\ No newline at end of file
+}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I30a40b02b5fbd673468dbc0218f0263915fe20ed

[MediaWiki-commits] [Gerrit] Prepare changelog for version 0.0.14 - change (analytics...source)

2015-06-18 Thread Ottomata (Code Review)

Ottomata has submitted this change and it was merged.

Change subject: Prepare changelog for version 0.0.14
..


Prepare changelog for version 0.0.14

Change-Id: Ife7ac0cdad122cf92821bcc0ee7cd3586e86cbdf
---
M changelog.md
1 file changed, 4 insertions(+), 1 deletion(-)

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



diff --git a/changelog.md b/changelog.md
index 30371e4..026c492 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,5 +1,8 @@
+## v0.0.14
+* Add Spark mobile_apps sessions statistics job.
+
 ## v0.0.13
-* Fix bug in Webrequest.normalizeHost when uri_host is empty string._
+* Fix bug in Webrequest.normalizeHost when uri_host is empty string.
 
 ## v0.0.12
 * wmf_app_version field now in map returned by UAParserUDF.

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ife7ac0cdad122cf92821bcc0ee7cd3586e86cbdf
Gerrit-PatchSet: 1
Gerrit-Project: analytics/refinery/source
Gerrit-Branch: master
Gerrit-Owner: Joal j...@wikimedia.org
Gerrit-Reviewer: Ottomata o...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] Use WikibaseRepo::newRedirectCreationInteractor in CreateRed... - change (mediawiki...Wikibase)

2015-06-18 Thread jenkins-bot (Code Review)

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

Change subject: Use WikibaseRepo::newRedirectCreationInteractor in 
CreateRedirect
..


Use WikibaseRepo::newRedirectCreationInteractor in CreateRedirect

Change-Id: I0376381eebb6e432051aaf4796ccef5828771b4b
---
M repo/includes/WikibaseRepo.php
M repo/includes/api/CreateRedirect.php
2 files changed, 9 insertions(+), 13 deletions(-)

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



diff --git a/repo/includes/WikibaseRepo.php b/repo/includes/WikibaseRepo.php
index 957c2ff..08a90d3 100644
--- a/repo/includes/WikibaseRepo.php
+++ b/repo/includes/WikibaseRepo.php
@@ -313,6 +313,14 @@
return $this-getStore()-getEntityRevisionLookup( $uncached );
}
 
+   /**
+* @since 0.5
+*
+* @param User $user
+* @param IContextSource $context
+*
+* @return RedirectCreationInteractor
+*/
public function newRedirectCreationInteractor( User $user, 
IContextSource $context ) {
return new RedirectCreationInteractor(
$this-getEntityRevisionLookup( 'uncached' ),
diff --git a/repo/includes/api/CreateRedirect.php 
b/repo/includes/api/CreateRedirect.php
index dc94479..5bf03ab 100644
--- a/repo/includes/api/CreateRedirect.php
+++ b/repo/includes/api/CreateRedirect.php
@@ -52,19 +52,7 @@
$this-setServices(
WikibaseRepo::getDefaultInstance()-getEntityIdParser(),

WikibaseRepo::getDefaultInstance()-getApiHelperFactory()-getErrorReporter( 
$this ),
-   new RedirectCreationInteractor(
-   
WikibaseRepo::getDefaultInstance()-getEntityRevisionLookup( 'uncached' ),
-   
WikibaseRepo::getDefaultInstance()-getEntityStore(),
-   
WikibaseRepo::getDefaultInstance()-getEntityPermissionChecker(),
-   
WikibaseRepo::getDefaultInstance()-getSummaryFormatter(),
-   $this-getUser(),
-   new EditFilterHookRunner(
-   
WikibaseRepo::getDefaultInstance()-getEntityTitleLookup(),
-   
WikibaseRepo::getDefaultInstance()-getEntityContentFactory(),
-   $this-getContext()
-   ),
-   
WikibaseRepo::getDefaultInstance()-getStore()-getEntityRedirectLookup()
-   )
+   
WikibaseRepo::getDefaultInstance()-newRedirectCreationInteractor( 
$this-getUser(), $this-getContext() )
);
}
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I0376381eebb6e432051aaf4796ccef5828771b4b
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Hoo man h...@online.de
Gerrit-Reviewer: Addshore addshorew...@gmail.com
Gerrit-Reviewer: Aude aude.w...@gmail.com
Gerrit-Reviewer: Daniel Kinzler daniel.kinz...@wikimedia.de
Gerrit-Reviewer: Hoo man h...@online.de
Gerrit-Reviewer: JanZerebecki jan.wikime...@zerebecki.de
Gerrit-Reviewer: Lucie Kaffee lucie.kaf...@wikimedia.de
Gerrit-Reviewer: Thiemo Mättig (WMDE) thiemo.maet...@wikimedia.de
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] Use SearchInteractor in SpecialItemDisambiguation - change (mediawiki...Wikibase)

2015-06-18 Thread Addshore (Code Review)

Addshore has uploaded a new change for review.

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

Change subject: Use SearchInteractor in SpecialItemDisambiguation
..

Use SearchInteractor in SpecialItemDisambiguation

Bug: T90692
Change-Id: I24bc570df0ef3d0c31a14c304e416684c7a9
---
M repo/includes/ItemDisambiguation.php
M repo/includes/specials/SpecialItemDisambiguation.php
M repo/tests/phpunit/includes/ItemDisambiguationTest.php
M repo/tests/phpunit/includes/specials/SpecialItemDisambiguationTest.php
4 files changed, 247 insertions(+), 410 deletions(-)


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

diff --git a/repo/includes/ItemDisambiguation.php 
b/repo/includes/ItemDisambiguation.php
index 4f045ba..aa428c0 100644
--- a/repo/includes/ItemDisambiguation.php
+++ b/repo/includes/ItemDisambiguation.php
@@ -3,9 +3,10 @@
 namespace Wikibase;
 
 use Html;
-use Wikibase\DataModel\Entity\Item;
+use Wikibase\DataModel\Term\Term;
 use Wikibase\Lib\EntityIdFormatter;
 use Wikibase\Lib\LanguageNameLookup;
+use Wikibase\Repo\Interactors\TermSearchInteractor;
 
 /**
  * Class representing the disambiguation of a list of WikibaseItems.
@@ -17,8 +18,14 @@
  * @author jeblad
  * @author Jeroen De Dauw  jeroended...@gmail.com 
  * @author Daniel Kinzler
+ * @authro Adam Shorland
  */
 class ItemDisambiguation {
+
+   /**
+* @var EntityIdFormatter
+*/
+   private $linkFormatter;
 
/**
 * @var LanguageNameLookup
@@ -28,37 +35,23 @@
/**
 * @var string
 */
-   private $searchLangCode;
-
-   /**
-* @var string
-*/
-   private $userLangCode;
-
-   /**
-* @var EntityIdFormatter
-*/
-   private $linkFormatter;
+   private $displayLanguageCode;
 
/**
 * @since 0.5
 *
-* @param string $searchLangCode The language the search was performed 
for.
-* @param string $userLangCode The user's interface language.
-* @param LanguageNameLookup $languageNameLookup
 * @param EntityIdFormatter $linkFormatter A formatter for generating 
HTML links for a given EntityId.
+* @param LanguageNameLookup $languageNameLookup
+* @param string $displayLanguageCode
 */
public function __construct(
-   $searchLangCode,
-   $userLangCode,
+   EntityIdFormatter $linkFormatter,
LanguageNameLookup $languageNameLookup,
-   EntityIdFormatter $linkFormatter
+   $displayLanguageCode
) {
-   $this-searchLangCode = $searchLangCode;
-   $this-userLangCode = $userLangCode;
-
$this-linkFormatter = $linkFormatter;
$this-languageNameLookup = $languageNameLookup;
+   $this-displayLanguageCode = $displayLanguageCode;
}
 
/**
@@ -66,69 +59,70 @@
 *
 * @since 0.5
 *
-* @param Item[] $items
+* @param array[] $searchResults as returned by TermSearchInteractor
 *
 * @return string HTML
 */
-   public function getHTML( array $items ) {
+   public function getHTML( array $searchResults ) {
return
'ul class=wikibase-disambiguation' .
implode( '', array_map(
-   array( $this, 'getItemHtml' ),
-   $items
+   array( $this, 'getResultHtml' ),
+   $searchResults
) ).
'/ul';
}
 
/**
-* @param Item $item
+* @param array[] $searchResult
 *
 * @return string HTML
 */
-   public function getItemHtml( Item $item ) {
-   $userLang = $this-userLangCode;
-   $searchLang = $this-searchLangCode;
-
-   $result = $this-linkFormatter-formatEntityId( $item-getId() 
);
-
-   // Display the label in the searched language in case it is 
different than in
-   // the user language.
-   if ( $userLang !== $searchLang
-$item-getLabel( $userLang ) !== $item-getLabel( 
$searchLang )  ) {
-   $result .= $this-getLabelHtml( $item, $searchLang );
-   };
-
-   $result .= $this-getDescriptionHtml( $item, $userLang );
-
+   public function getResultHtml( array $searchResult ) {
+   $result = $this-linkFormatter-formatEntityId( 
$searchResult['entityId'] );
+   $result .= $this-getLabelHtml(
+   $searchResult[TermSearchInteractor::DISPLAYTERMS_KEY],
+   $searchResult[TermSearchInteractor::MATCHEDTERM_KEY]
+   );
+

[MediaWiki-commits] [Gerrit] Use SearchInteractor in SearchEntities - change (mediawiki...Wikibase)

2015-06-18 Thread Addshore (Code Review)

Addshore has uploaded a new change for review.

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

Change subject: Use SearchInteractor in SearchEntities
..

Use SearchInteractor in SearchEntities

Bug: T90692
Change-Id: Iedef04773521e295946121f134db074d26676c2e
---
M repo/includes/api/SearchEntities.php
M repo/tests/phpunit/includes/api/SearchEntitiesTest.php
2 files changed, 403 insertions(+), 459 deletions(-)


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

diff --git a/repo/includes/api/SearchEntities.php 
b/repo/includes/api/SearchEntities.php
index 3571902..403396c 100644
--- a/repo/includes/api/SearchEntities.php
+++ b/repo/includes/api/SearchEntities.php
@@ -4,26 +4,23 @@
 
 use ApiBase;
 use ApiMain;
-use ApiResult;
+use OutOfBoundsException;
 use Wikibase\DataModel\Entity\EntityId;
 use Wikibase\DataModel\Entity\EntityIdParser;
 use Wikibase\DataModel\Entity\EntityIdParsingException;
+use Wikibase\DataModel\Term\Term;
 use Wikibase\Lib\ContentLanguages;
-use Wikibase\LanguageFallbackChainFactory;
 use Wikibase\Lib\Store\EntityTitleLookup;
+use Wikibase\Lib\Store\LabelDescriptionLookup;
+use Wikibase\Lib\Store\LanguageFallbackLabelDescriptionLookup;
+use Wikibase\Lib\Store\TermLookup;
+use Wikibase\Repo\Interactors\TermIndexSearchInteractor;
 use Wikibase\Repo\WikibaseRepo;
-use Wikibase\TermIndexEntry;
 use Wikibase\TermIndex;
+use Wikibase\TermIndexEntry;
 
 /**
  * API module to search for Wikibase entities.
- *
- * FIXME: this module is doing to much work. Ranking terms is not its job and 
should be delegated
- * FIXME: the continuation currently relies on the search order returned by 
the TermStore
- *
- * Note: Continuation only works for a rather small number of entities. It is 
assumed that a large
- * number of entities will not be searched through by human editors, and that 
bots cannot search
- * through them anyway.
  *
  * @since 0.2
  *
@@ -32,6 +29,7 @@
  * @author Jens Ohlig  jens.oh...@wikimedia.de 
  * @author Tobias Gritschacher  tobias.gritschac...@wikimedia.de 
  * @author Thiemo Mättig
+ * @author Adam Shorland
  */
 class SearchEntities extends ApiBase {
 
@@ -46,14 +44,19 @@
private $idParser;
 
/**
+* @var TermIndexSearchInteractor
+*/
+   private $termIndexSearchInteractor;
+
+   /**
 * @var TermIndex
 */
private $termIndex;
 
/**
-* @var  LanguageFallbackChainFactory
+* @var LabelDescriptionLookup
 */
-   private $languageFallbackChainFactory;
+   private $labelDescriptionLookup;
 
/**
 * @var ContentLanguages
@@ -77,79 +80,73 @@
 
$repo = WikibaseRepo::getDefaultInstance();
$this-setServices(
-   $repo-getStore()-getTermIndex(),
$repo-getEntityTitleLookup(),
$repo-getEntityIdParser(),
$repo-getEntityFactory()-getEntityTypes(),
$repo-getTermsLanguages(),
-   $repo-getLanguageFallbackChainFactory()
+   $repo-newTermSearchInteractor( 
$this-getLanguage()-getCode() ),
+   $repo-getStore()-getTermIndex(),
+   new LanguageFallbackLabelDescriptionLookup(
+   $repo-getTermLookup(),
+   $repo-getLanguageFallbackChainFactory()
+   -newFromLanguageCode( 
$this-getLanguage()-getCode() )
+   )
);
}
 
/**
 * Override services, for use for testing.
 *
-* @param TermIndex $termIndex
 * @param EntityTitleLookup $titleLookup
 * @param EntityIdParser $idParser
 * @param array $entityTypes
 * @param ContentLanguages $termLanguages
-* @param LanguageFallbackChainFactory $languageFallbackChainFactory
+* @param TermIndexSearchInteractor $termIndexSearchInteractor
+* @param TermIndex $termIndex
+* @param LabelDescriptionLookup $labelDescriptionLookup
 */
public function setServices(
-   TermIndex $termIndex,
EntityTitleLookup $titleLookup,
EntityIdParser $idParser,
array $entityTypes,
ContentLanguages $termLanguages,
-   LanguageFallbackChainFactory $languageFallbackChainFactory
+   TermIndexSearchInteractor $termIndexSearchInteractor,
+   TermIndex $termIndex,
+   LabelDescriptionLookup $labelDescriptionLookup
) {
-   $this-termIndex = $termIndex;
$this-titleLookup = $titleLookup;
$this-idParser = $idParser;
$this-entityTypes = $entityTypes;
$this-termsLanguages = $termLanguages;
-

[MediaWiki-commits] [Gerrit] Allow raw content for html builder, escape content by default - change (mediawiki...WikidataQuality)

2015-06-18 Thread Dominic.sauer (Code Review)

Dominic.sauer has uploaded a new change for review.

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

Change subject: Allow raw content for html builder, escape content by default
..

Allow raw content for html builder, escape content by default

Change-Id: I30a40b02b5fbd673468dbc0218f0263915fe20ed
---
M includes/Html/HtmlTableCellBuilder.php
M includes/Html/HtmlTableHeaderBuilder.php
2 files changed, 49 insertions(+), 11 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikidataQuality 
refs/changes/74/219174/1

diff --git a/includes/Html/HtmlTableCellBuilder.php 
b/includes/Html/HtmlTableCellBuilder.php
index 348451d..c840949 100755
--- a/includes/Html/HtmlTableCellBuilder.php
+++ b/includes/Html/HtmlTableCellBuilder.php
@@ -25,17 +25,31 @@
private $attributes;
 
/**
-* @param $content Html
-* @param array $attributes
+* Determines, whether the content is raw html or should be escaped.
+*
+* @var bool
 */
-   public function __construct( $content, array $attributes = array() ) {
+   private $isRawContent;
+
+   /**
+* @param string HTML $content
+* @param array $attributes
+* @param bool $isRawContent
+*
+* @throws InvalidArgumentException
+*/
+   public function __construct( $content, array $attributes = array(), 
$isRawContent = false ) {
// Check parameters
if ( !is_string( $content ) ) {
throw new InvalidArgumentException( '$content must be 
string.' );
}
+   if ( !is_bool( $isRawContent ) ) {
+   throw new InvalidArgumentException( '$isRawContent must 
be boolean.' );
+   }
 
$this-content = $content;
$this-attributes = $attributes;
+   $this-isRawContent = $isRawContent;
}
 
/**
@@ -58,12 +72,17 @@
 * @return string HTML
 */
public function toHtml() {
+   $content = $this-content;
+   if ( !$this-isRawContent ) {
+   $content = htmlspecialchars( $this-content );
+   }
+
return
Html::openElement(
'td',
$this-getAttributes()
)
-   . $this-content
+   . $content
. Html::closeElement( 'td' );
}
-}
\ No newline at end of file
+}
diff --git a/includes/Html/HtmlTableHeaderBuilder.php 
b/includes/Html/HtmlTableHeaderBuilder.php
index 10a004b..6814278 100755
--- a/includes/Html/HtmlTableHeaderBuilder.php
+++ b/includes/Html/HtmlTableHeaderBuilder.php
@@ -27,19 +27,33 @@
private $isSortable;
 
/**
-* @param string $content HTML
-* @param bool $isSortable
+* Determines, whether the content is raw html or should be escaped.
+*
+* @var bool
 */
-   public function __construct( $content, $isSortable = false ) {
+   private $isRawContent;
+
+   /**
+* @param string HTML $content
+* @param bool $isSortable
+* @param bool $isRawContent
+*
+* @throws InvalidArgumentException
+*/
+   public function __construct( $content, $isSortable = false, 
$isRawContent = false ) {
if ( !is_string( $content ) ) {
throw new InvalidArgumentException( '$content must be 
string.' );
}
if ( !is_bool( $isSortable ) ) {
throw new InvalidArgumentException( '$isSortable must 
be boolean.' );
}
+   if ( !is_bool( $isRawContent ) ) {
+   throw new InvalidArgumentException( '$isRawContent must 
be boolean.' );
+   }
 
$this-content = $content;
$this-isSortable = $isSortable;
+   $this-isRawContent = $isRawContent;
}
 
/**
@@ -69,12 +83,17 @@
$attributes['class'] = 'unsortable';
}
 
+   $content = $this-content;
+   if ( !$this-isRawContent ) {
+   $content = htmlspecialchars( $this-content );
+   }
+
return
Html::openElement(
'th',
$attributes
)
-   . $this-content
-   . Html::closeElement( 'th' );
+   . $content
+   . Html::closeElement('th');
}
-}
\ No newline at end of file
+}

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

Gerrit-MessageType: newchange

[MediaWiki-commits] [Gerrit] Add tests for SpecialUnconnectedPages - change (mediawiki...Wikibase)

2015-06-18 Thread WMDE

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

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

Change subject: Add tests for SpecialUnconnectedPages
..

Add tests for SpecialUnconnectedPages

This also fixes all issues I found in I080d17c.

Change-Id: I201054d15a83f672f6be624b81e5b8e35e164717
---
M client/includes/specials/SpecialUnconnectedPages.php
M client/tests/phpunit/includes/specials/SpecialUnconnectedPagesTest.php
2 files changed, 85 insertions(+), 35 deletions(-)


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

diff --git a/client/includes/specials/SpecialUnconnectedPages.php 
b/client/includes/specials/SpecialUnconnectedPages.php
index 0ef4066..c27fa82 100644
--- a/client/includes/specials/SpecialUnconnectedPages.php
+++ b/client/includes/specials/SpecialUnconnectedPages.php
@@ -6,6 +6,8 @@
 use FakeResultWrapper;
 use Linker;
 use QueryPage;
+use ResultWrapper;
+use Skin;
 use Title;
 use Wikibase\Client\WikibaseClient;
 use Wikibase\NamespaceChecker;
@@ -17,6 +19,7 @@
  * @licence GNU GPL v2+
  * @author John Erling Blad  jeb...@gmail.com 
  * @author Amir Sarabadani  ladsgr...@gmail.com 
+ * @author Daniel Kinzler
  */
 class SpecialUnconnectedPages extends QueryPage {
 
@@ -26,39 +29,29 @@
const MAX_OFFSET = 1;
 
/**
-* Title object build from the $startPageName parameter
-*
-* @var Title|null
-*/
-   private $startTitle = null;
-
-   /**
 * @var NamespaceChecker|null
 */
private $namespaceChecker = null;
 
/**
-* Set to 'only' if the search should only include pages with inter 
wiki links
+* @see SpecialPage::__construct
 *
-* @var string
+* @param string $name
 */
-   private $iwData = '';
-
-   public function __construct() {
-   parent::__construct( 'UnconnectedPages' );
+   public function __construct( $name = 'UnconnectedPages' ) {
+   parent::__construct( $name );
}
 
-   function isExpensive() {
-   return false;
-   }
-
+   /**
+* @see QueryPage::isSyndicated
+*
+* @return bool Always false because we do not want to build RSS/Atom 
feeds for this page.
+*/
function isSyndicated() {
return false;
}
 
/**
-* Set the NamespaceChecker
-*
 * @since 0.4
 *
 * @param NamespaceChecker $namespaceChecker
@@ -68,11 +61,6 @@
}
 
/**
-* @see SpecialPage::getDescription
-*
-   /**
-* Get the NamespaceChecker
-*
 * @since 0.4
 *
 * @return NamespaceChecker
@@ -89,6 +77,7 @@
 
return $this-namespaceChecker;
}
+
/**
 * Build conditionals for namespace
 *
@@ -103,9 +92,6 @@
public function buildConditionals( DatabaseBase $dbr, Title $title = 
null, NamespaceChecker $checker = null ) {
$conds = array();
 
-   if ( $title === null ) {
-   $title = $this-startTitle;
-   }
if ( $checker === null ) {
$checker = $this-getNamespaceChecker();
}
@@ -118,22 +104,26 @@
return $conds;
}
 
+   /**
+* @see QueryPage::getQueryInfo
+*
+* @return array[]
+*/
function getQueryInfo() {
$dbr = wfGetDB( DB_SLAVE );
+
$conds = $this-buildConditionals( $dbr );
-   $conds[] = 'page_is_redirect = 0';
+   $conds['page_is_redirect'] = 0;
$conds[] = 'pp_propname IS NULL';
-   if ( $this-iwData === 'only' ) {
-   $conds[] = 'll_from IS NOT NULL';
-   }
-   $dbrg = array (
+
+   return array(
'tables' = array(
'page',
'page_props',
'langlinks'
),
'fields' = array(
-'value' = 'page_id',
+   'value' = 'page_id',
'page_namespace',
'page_title',
'page_id',
@@ -153,19 +143,35 @@
'langlinks' = array( 'LEFT JOIN', 'll_from = 
page_id' )
)
);
-   return $dbrg;
}
 
+   /**
+* @see QueryPage::getOrderFields
+*
+* @return string[]
+*/
function getOrderFields() {
return array( 'value' );
}
 
+   /**
+* @see QueryPage::sortDescending
+*
+* @return bool

[MediaWiki-commits] [Gerrit] Copied i18n from master to v1. - change (mediawiki...WikidataQuality)

2015-06-18 Thread Dominic.sauer (Code Review)

Dominic.sauer has submitted this change and it was merged.

Change subject: Copied i18n from master to v1.
..


Copied i18n from master to v1.

Change-Id: I09d49430b8ef30ae61ab933ce39189319c8afdc3
---
A i18n/arq.json
A i18n/bcl.json
M i18n/ca.json
M i18n/ce.json
A i18n/cs.json
M i18n/de.json
M i18n/en.json
M i18n/es.json
A i18n/eu.json
M i18n/fa.json
A i18n/fi.json
M i18n/fr.json
A i18n/gl.json
M i18n/he.json
A i18n/it.json
M i18n/ksh.json
M i18n/ku-latn.json
M i18n/lb.json
A i18n/lrc.json
A i18n/lv.json
M i18n/mg.json
M i18n/mk.json
M i18n/nb.json
M i18n/ne.json
M i18n/nl.json
M i18n/pl.json
M i18n/ps.json
M i18n/pt.json
M i18n/qqq.json
A i18n/roa-tara.json
M i18n/ru.json
A i18n/sd.json
A i18n/tg-cyrl.json
M i18n/tr.json
A i18n/vi.json
A i18n/xmf.json
M i18n/yi.json
M i18n/zh-hans.json
M i18n/zh-hant.json
39 files changed, 774 insertions(+), 314 deletions(-)

Approvals:
  Dominic.sauer: Verified; Looks good to me, approved



diff --git a/i18n/arq.json b/i18n/arq.json
new file mode 100644
index 000..8a623c4
--- /dev/null
+++ b/i18n/arq.json
@@ -0,0 +1,15 @@
+{
+   @metadata: {
+   authors: [
+   Oldstoneage
+   ]
+   },
+   wbq-violations-group-label: جماعة:,
+   wbq-violations-form-select-all: (كلشي),
+   wbq-violations-exceptions-checkbox-label: ورّي المتفرّدات,
+   wbq-violations-submit-button-label: ورّي الخطيّات,
+   wbq-violations-table-header-status: الحالة,
+   wbq-violations-table-header-additional-info: شي معلومات زيادة,
+   wbq-violations-status-unverified: ماشي مأكّد,
+   wbq-violations-status-exception: متفرّدة
+}
diff --git a/i18n/bcl.json b/i18n/bcl.json
new file mode 100644
index 000..c0334e4
--- /dev/null
+++ b/i18n/bcl.json
@@ -0,0 +1,17 @@
+{
+   @metadata: {
+   authors: [
+   Geopoet
+   ]
+   },
+   wbq-violations-description: Listahan kan kalidad nin mga isyu kan 
datos,
+   wbq-violations-group-label: Grupo:,
+   wbq-violations-form-select-all: (gabos),
+   wbq-violations-exceptions-checkbox-label: Ipahiling an mga 
ipinalaen,
+   wbq-violations-submit-button-label: Ipahiling an mga kabalgahan,
+   wbq-violations-table-header-entity: Entidad,
+   wbq-violations-table-header-status: Kamugtakan,
+   wbq-violations-table-header-additional-info: Kadugangang 
impormasyon,
+   wbq-violations-status-unverified: Bakong beripikado,
+   wbq-violations-mark-as-exception: Markadong pinagpalaen
+}
diff --git a/i18n/ca.json b/i18n/ca.json
index 0f73861..a106026 100644
--- a/i18n/ca.json
+++ b/i18n/ca.json
@@ -1,15 +1,20 @@
 {
-  @metadata: {
-authors: [
-  Fitoschido
-]
-  },
-  wikidataquality-specialpages-group: Qualitat de Wikidata,
-  wikidataquality-value: Valor,
-  wikidataquality-status: Estat,
-  wikidataquality-crosscheck-result-item-not-existent: L’element no 
existeix.,
-  wikidataquality-crosscheck-result-no-wd-entity: No s’ha pogut trobar 
l’entitat referenciada,
-  wikidataquality-crosscheck-result-no-ext-entity: No s’ha pogut trobar 
l’entitat externa,
-  wikidataquality-crosscheck-comparative-value: Valor comparatiu,
-  wikidataquality-crosscheck-external-source: Font externa
+   @metadata: {
+   authors: [
+   Fitoschido,
+   Macofe
+   ]
+   },
+   wbq-violations-group-label: Grup:,
+   wbq-violations-type-label: Tipus:,
+   wbq-violations-form-select-all: (tots),
+   wbq-violations-exceptions-checkbox-label: Mostra excepcions,
+   wbq-violations-table-header-entity: Entitat,
+   wbq-violations-table-header-constraint-type: Tipus,
+   wbq-violations-table-header-updated-at: Última actualització,
+   wbq-violations-table-header-status: Estat,
+   wbq-violations-table-header-additional-info: Informació addicional,
+   wbq-violations-status-exception: Excepció,
+   wbq-violations-next-page: Pàgina següent ,
+   wbq-violations-prev-page:  Pàgina anterior
 }
diff --git a/i18n/ce.json b/i18n/ce.json
index 3968d39..1d50265 100644
--- a/i18n/ce.json
+++ b/i18n/ce.json
@@ -1,10 +1,14 @@
 {
-  @metadata: {
-authors: [
-  Умар
-]
-  },
-  wikidataquality-value: МаьӀна,
-  wikidataquality-status: Статус,
-  wikidataquality-crosscheck-result-success: Матч
+   @metadata: {
+   authors: [
+   Умар
+   ]
+   },
+   wbq-violations-group-label: Тоба:,
+   wbq-violations-type-label: Тайпа:,
+   wbq-violations-form-select-all: (массо),
+   wbq-violations-table-header-claim: Дехар,
+   wbq-violations-table-header-constraint-type: Тайпа,
+   wbq-violations-table-header-status: Статус,
+   wbq-violations-status-unverified: Хьажанза
 }
diff --git a/i18n/cs.json b/i18n/cs.json
new file mode 100644
index 000..ea57f4e
--- /dev/null

[MediaWiki-commits] [Gerrit] Added overwrite switch for SqlViolationRepo. - change (mediawiki...WikidataQuality)

2015-06-18 Thread Dominic.sauer (Code Review)

Dominic.sauer has submitted this change and it was merged.

Change subject: Added overwrite switch for SqlViolationRepo.
..


Added overwrite switch for SqlViolationRepo.

Change-Id: I404db9ce415649c0b52bc2be5b52b018935f7b91
---
M includes/Violations/SqlViolationRepo.php
M includes/Violations/ViolationStore.php
2 files changed, 7 insertions(+), 2 deletions(-)

Approvals:
  Dominic.sauer: Verified; Looks good to me, approved



diff --git a/includes/Violations/SqlViolationRepo.php 
b/includes/Violations/SqlViolationRepo.php
index 54f6e35..40d5181 100755
--- a/includes/Violations/SqlViolationRepo.php
+++ b/includes/Violations/SqlViolationRepo.php
@@ -106,12 +106,16 @@
 
/**
 * @param Violation $violation
+* @param bool $overwriteExisting
 * @return bool
 */
-   public function insert( Violation $violation ) {
+   public function insert( Violation $violation, $overwriteExisting = 
false ) {
$db = wfGetDB( DB_MASTER );
 
if( $this-violationExists( $db, $violation ) ) {
+   if( $overwriteExisting ) {
+   return $this-update( $violation, false );
+   }
throw new InvalidArgumentException( 'Given violation 
already exists in database.' );
}
 
diff --git a/includes/Violations/ViolationStore.php 
b/includes/Violations/ViolationStore.php
index 8893cd5..0c586e8 100644
--- a/includes/Violations/ViolationStore.php
+++ b/includes/Violations/ViolationStore.php
@@ -15,9 +15,10 @@
 * Inserts given violation into database.
 *
 * @param Violation $violation
+* @param bool $overwriteExisting
 * @return mixed
 */
-   public function insert( Violation $violation );
+   public function insert( Violation $violation, $overwriteExisting = 
false );
 
/**
 * Updates given violation in database.

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I404db9ce415649c0b52bc2be5b52b018935f7b91
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikidataQuality
Gerrit-Branch: master
Gerrit-Owner: Soeren.oldag soeren_ol...@freenet.de
Gerrit-Reviewer: Dominic.sauer dominic.sa...@yahoo.de

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

[MediaWiki-commits] [Gerrit] Extend the core TemplateParser - change (mediawiki...Gather)

2015-06-18 Thread Phuedx (Code Review)

Phuedx has uploaded a new change for review.

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

Change subject: Extend the core TemplateParser
..

Extend the core TemplateParser

TemplateParser#getTemplate eval's a compiled template so that the
renderer function can be returned to the caller. Due to a bug in HHVM's
implementation of eval [0], we can't rely on the render function
returned by #getTemplate on being the correct one.

Extend the Gather\views\TemplateParser class so that #getTemplate will
write the compiled template to a file that is then required, thus
avoiding eval. The compiled templates are written to the
templates/compiled directory and should be committed whenever they
change.

Since the new TemplateParser class can't change the public API of the
parent TemplateParser (LSP), the rest of the codebase should be agnostic
to the change. However, because we're expecting the compiled templates
to be committed, modify Gather\views\helpers\Template::render
to force template recompilation whenever the GatherRecompileTemplates
config variable is true.

The GatherRecompileTemplates config variable defaults to false.
Developers are expected to override it during development.

Also reverts Work around Mustache problems (1c1f658) so we're in a
clean state immediately.

[0] https://github.com/facebook/hhvm/pull/5502

Bug: T102941
Change-Id: I729dd34d102879e596428cb07d8cf381071068bb
---
M extension.json
M includes/views/CollectionsListItemCard.php
A includes/views/TemplateParser.php
M includes/views/helpers/Template.php
M templates/CollectionsListItemCard.mustache
A templates/compiled/CardImage.mustache.php
A templates/compiled/CollectionsList.mustache.php
A templates/compiled/CollectionsListItemCard.mustache.php
8 files changed, 204 insertions(+), 39 deletions(-)


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

diff --git a/extension.json b/extension.json
index 21759b6..c80570e 100644
--- a/extension.json
+++ b/extension.json
@@ -79,6 +79,7 @@
Gather\\views\\Pagination: includes/views/Pagination.php,
Gather\\views\\ReportTableRow: 
includes/views/ReportTableRow.php,
Gather\\views\\ReportTable: includes/views/ReportTable.php,
+   Gather\\views\\TemplateParser: 
includes/views/TemplateParser.php,
Gather\\views\\helpers\\CSS: includes/views/helpers/CSS.php,
Gather\\views\\helpers\\Template: 
includes/views/helpers/Template.php,
Gather\\SpecialGather: includes/specials/SpecialGather.php,
@@ -701,7 +702,8 @@
config: {
GatherShouldShowTutorial: true,
GatherAllowPublicWatchlist: false,
-   GatherEnableBetaFeature: false
+   GatherEnableBetaFeature: false,
+   GatherRecompileTemplates: false
},
manifest_version: 1
 }
diff --git a/includes/views/CollectionsListItemCard.php 
b/includes/views/CollectionsListItemCard.php
index 845d3db..f1bdf6b 100644
--- a/includes/views/CollectionsListItemCard.php
+++ b/includes/views/CollectionsListItemCard.php
@@ -78,40 +78,7 @@
'class' = helpers\CSS::iconClass( 'profile', 
'before' ),
'label' = $owner-getName(),
);
-   // FIXME: Not needed when 
https://phabricator.wikimedia.org/T101918 is fixed.
-   $ownerElement = Html::element( 'a', array(
-   'class' = 'collection-owner ' . 
$defaults['owner']['class'],
-   'href' = $defaults['owner']['link'],
-   ), $defaults['owner']['label'] );
-   } else {
-   // FIXME: Not needed when 
https://phabricator.wikimedia.org/T101918 is fixed.
-   $ownerElement = Html::element( 'span', array( 'class' 
= 'collection-card-following' ),
-   $this-getPrivacyMsg() );
}
-   // FIXME: Use Template::render( 'CollectionsListItemCard', 
array_merge( $defaults, $data ) );
-   // as soon as https://phabricator.wikimedia.org/T101918 is 
fixed.
-   return Html::openElement( 'div',
-   array(
-   'class' = $defaults['hasImage'] ? 
'collection-card' : 'collection-card without-image',
-   ) ) .
-   Html::rawElement( 'a', array(
-   'href' = $defaults['collectionUrl'],
-   'class' = 'collection-card-image',
-   ), $defaults['image'] ) .
-   Html::openElement( 'div', array(
-   'class' = 'collection-card-overlay',
-   'dir' = $defaults['langdir'],
-

[MediaWiki-commits] [Gerrit] Add languages for deployment on 20150618 - change (analytics/limn-language-data)

2015-06-18 Thread jenkins-bot (Code Review)

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

Change subject: Add languages for deployment on 20150618
..


Add languages for deployment on 20150618

Change-Id: I1e1f7fd91d42d376ea22e315949719460e803f56
---
M language/content_translation_beta.sql
M language/content_translation_beta_manual.sql
M reportgenerator/config/config.json
3 files changed, 107 insertions(+), 3 deletions(-)

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



diff --git a/language/content_translation_beta.sql 
b/language/content_translation_beta.sql
index ee85461..df759c6 100644
--- a/language/content_translation_beta.sql
+++ b/language/content_translation_beta.sql
@@ -205,7 +205,23 @@
 tetwiki,
 towiki,
 tywiki,
-xalwiki
+xalwiki,
+alswiki,
+angwiki,
+barwiki,
+dewiki,
+dsbwiki,
+fowiki,
+frrwiki,
+hsbwiki,
+ikwiki,
+iswiki,
+klwiki,
+kshwiki,
+lbwiki,
+ndswiki,
+pflwiki,
+stqwiki
 
from (select *
from ( select count(*) as cawiki from cawiki.user_properties where 
up_property = 'cx' and up_value = 1 ) ca
@@ -633,6 +649,42 @@
 ( select count(*) as tywiki from tywiki.user_properties where 
up_property = 'cx' and up_value = 1 ) ty on 1=1
 left join
 ( select count(*) as xalwiki from xalwiki.user_properties 
where up_property = 'cx' and up_value = 1 ) xal on 1=1
+left join
+( select count(*) as alswiki from alswiki.user_properties 
where up_property = 'cx' and up_value = 1 ) als on 1=1
+left join
+( select count(*) as angwiki from angwiki.user_properties 
where up_property = 'cx' and up_value = 1 ) ang on 1=1
+left join
+( select count(*) as barwiki from barwiki.user_properties 
where up_property = 'cx' and up_value = 1 ) bar on 1=1
+left join
+( select count(*) as dewiki from dewiki.user_properties where 
up_property = 'cx' and up_value = 1 ) de on 1=1
+left join
+( select count(*) as dsbwiki from dsbwiki.user_properties 
where up_property = 'cx' and up_value = 1 ) dsb on 1=1
+left join
+( select count(*) as fowiki from fowiki.user_properties where 
up_property = 'cx' and up_value = 1 ) fo on 1=1
+left join
+( select count(*) as frrwiki from frrwiki.user_properties 
where up_property = 'cx' and up_value = 1 ) frr on 1=1
+left join
+( select count(*) as hsbwiki from hsbwiki.user_properties 
where up_property = 'cx' and up_value = 1 ) hsb on 1=1
+left join
+( select count(*) as ikwiki from ikwiki.user_properties where 
up_property = 'cx' and up_value = 1 ) ik on 1=1
+left join
+( select count(*) as iswiki from iswiki.user_properties where 
up_property = 'cx' and up_value = 1 ) is on 1=1
+left join
+( select count(*) as klwiki from klwiki.user_properties where 
up_property = 'cx' and up_value = 1 ) kl on 1=1
 ) seventh30
 
+cross join
+
+(select *
+   from ( select count(*) as kshwiki from kshwiki.user_properties 
where up_property = 'cx' and up_value = 1 ) ksh
+left join
+( select count(*) as lbwiki from lbwiki.user_properties where 
up_property = 'cx' and up_value = 1 ) lb on 1=1
+left join
+( select count(*) as ndswiki from ndswiki.user_properties 
where up_property = 'cx' and up_value = 1 ) nds on 1=1
+left join
+( select count(*) as pflwiki from pflwiki.user_properties 
where up_property = 'cx' and up_value = 1 ) pfl on 1=1
+left join
+( select count(*) as stqwiki from stqwiki.user_properties 
where up_property = 'cx' and up_value = 1 ) stq on 1=1
+) eigth30
+
 ;
diff --git a/language/content_translation_beta_manual.sql 
b/language/content_translation_beta_manual.sql
index 52be72a..90db624 100644
--- a/language/content_translation_beta_manual.sql
+++ b/language/content_translation_beta_manual.sql
@@ -205,7 +205,23 @@
 tetwiki,
 towiki,
 tywiki,
-xalwiki
+xalwiki,
+alswiki,
+angwiki,
+barwiki,
+dewiki,
+dsbwiki,
+fowiki,
+frrwiki,
+hsbwiki,
+ikwiki,
+iswiki,
+klwiki,
+kshwiki,
+lbwiki,
+ndswiki,
+pflwiki,
+stqwiki
 
from (select *
from ( select count(*) as cawiki from cawiki.user_properties where 
up_property = 'cx' and up_value = 1 and up_user not in ( select up_user from 
cawiki.user_properties where

[MediaWiki-commits] [Gerrit] Fix export bug where Zotero fails to export - change (mediawiki...citoid)

2015-06-18 Thread Mobrovac (Code Review)

Mobrovac has submitted this change and it was merged.

Change subject: Fix export bug where Zotero fails to export
..


Fix export bug where Zotero fails to export

Caused internal server errors when Zotero returned
a non-200 response code due to incorrect arg being
passed to reject() and cr.logger being called, which
was undefined.

Bug: T102534
Change-Id: I349fa70abe699def16b08d34d8875bd561168cab
---
M lib/CitoidRequest.js
M lib/CitoidService.js
M lib/Exporter.js
3 files changed, 13 insertions(+), 17 deletions(-)

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



diff --git a/lib/CitoidRequest.js b/lib/CitoidRequest.js
index a7cdbcc..baea288 100644
--- a/lib/CitoidRequest.js
+++ b/lib/CitoidRequest.js
@@ -14,6 +14,7 @@
 function CitoidRequest(req, app) {
 
this.request = req;
+   this.logger = req.logger || app.logger;
 
this.response = new CitoidResponse(); // Prepare an empty response
 
diff --git a/lib/CitoidService.js b/lib/CitoidService.js
index 4737385..f6323de 100644
--- a/lib/CitoidService.js
+++ b/lib/CitoidService.js
@@ -38,7 +38,7 @@
 
 /**
  * Requests to the citoid service
- * @param   {Object}   cr   CitoidRequest object
+ * @param   {Object}   cr CitoidRequest object
  * @returns {Object}  BBPromise for CitoidRequest object
  */
 CitoidService.prototype.request = function(cr) {
@@ -54,8 +54,8 @@
 
 /**
  * Promise for adding correct response function given input type
- * @param  {Object}   cr  CitoidRequest object with new getResponse function 
added as a property
- * @return {Object}   BBPromise object for modified CitoidRequest object 
from input
+ * @param  {Object}   cr CitoidRequest object with new getResponse 
function added as a property
+ * @return {Object}  BBPromise object for modified CitoidRequest 
object from input
  */
 CitoidService.prototype.addResponseFunction = BBPromise.method(function(cr){
var search = cr.search;
@@ -127,8 +127,8 @@
 
 /**
  * Promise of requested citation metadata from a URL
- * @param  {Object}   cr  CitoidRequest object with new getResponse function 
added as a property
- * @return {Object}  BBPromise object for modified CitoidRequest object 
from input
+ * @param  {Object}   cr CitoidRequest object with new getResponse 
function added as a property
+ * @return {Object}  BBPromise object for modified CitoidRequest 
object from input
  */
 CitoidService.prototype.requestFromURL = function(cr) {
 
@@ -152,7 +152,7 @@
if (response) {
self.stats.increment('zotero.req.' + 
Math.floor(response.status / 100) + 'xx');
if (response.status === 200){
-   logger.log('debug/zotero', Successfully 
retrieved and translated body from Zotero);
+   logger.log('debug/zotero', Successfully 
retrieved body from Zotero);
cr.setCitation(null, 200, response.body);
return cr;
} else {
@@ -310,8 +310,8 @@
 
 /**
  * Requests citation metadata from a PMID or PMCID identifier.
- * @param  {Object}   cr CitoidRequest object with pm(c)id, type and 
format
- * @returns {Object}  BBPromise for CitoidRequest object
+ * @param  {Object}   cr CitoidRequest object with pm(c)id, type and format
+ * @returns {Object} BBPromise for CitoidRequest object
  */
 CitoidService.prototype.requestFromPM = function(cr){
 
@@ -377,8 +377,8 @@
 
 /**
  * Scrape and export to Zotero translator if nessecary
- * @param  {Object}   opts  options object containing export format
- * @returns {Object}  BBPromise for CitoidRequest object
+ * @param  {Object}   cr CitoidRequest object
+ * @return {Object}  BBPromise for CitoidRequest object
  */
 CitoidService.prototype.scrape = function(cr){
 
diff --git a/lib/Exporter.js b/lib/Exporter.js
index ace61fb..1bdccda 100644
--- a/lib/Exporter.js
+++ b/lib/Exporter.js
@@ -100,7 +100,7 @@
citation = fixAccessDate(citation);
 
// Run on cr for export failure
-   function reject(cr, response){
+   function reject(cr){
var format = cr.format;
var message  = Unable to serve  + format +  format at this 
time;
var error = {Error: message};
@@ -113,12 +113,7 @@
 
return zoteroService.zoteroExportRequest([citation], cr.format).then(
function(response){
-   var zotResCode = response.status;
-   var body = response.body;
-   if (zotResCode !== 200){
-   return reject(response);
-   }
-   // Don't set response code; could be 520 or 200
+   // Don't reset response code; could be 520 or 200

[MediaWiki-commits] [Gerrit] Link to misc on other datasets index - change (operations/puppet)

2015-06-18 Thread Alex Monk (Code Review)

Alex Monk has uploaded a new change for review.

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

Change subject: Link to misc on other datasets index
..

Link to misc on other datasets index

Change-Id: Ia221cf5482dec2500cb5ea17c9b75935547ff3ed
---
M modules/dataset/files/html/other_index.html
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/63/219163/1

diff --git a/modules/dataset/files/html/other_index.html 
b/modules/dataset/files/html/other_index.html
index 1c6e823..5cce406 100644
--- a/modules/dataset/files/html/other_index.html
+++ b/modules/dataset/files/html/other_index.html
@@ -127,6 +127,7 @@
a href=scanset/1911 Edition of the Encyclopedia 
Britannica, scanned as tiff files/abr /
a href=wep/User signup data for the Wikipedia 
Education Program/abr /
a href=bugzilla/Sanitized Bugzilla database dump/a
+   a href=misc/Miscellaneous - Phabricator and SVN 
dumps/a
div class=visualClear/div
/div
/div

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia221cf5482dec2500cb5ea17c9b75935547ff3ed
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alex Monk kren...@gmail.com

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

[MediaWiki-commits] [Gerrit] Fix behaviour of EntityRevisionLookup::getLatestRevisionId i... - change (mediawiki...Wikibase)

2015-06-18 Thread jenkins-bot (Code Review)

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

Change subject: Fix behaviour of EntityRevisionLookup::getLatestRevisionId 
implementations
..


Fix behaviour of EntityRevisionLookup::getLatestRevisionId implementations

The MockRepository one threw an UnresolvedRedirectException
if the entity it was called with is a redirect, but the real
implementation in WikiPageEntityRevisionLookup doesn't do that.

In order to fix this, I changed all implementations to work with
redirects in a consistent manner by returning false for them.
All callers that relied on the implemetation in MockRepository
have been changed to use EntityRedirectLookup.

Bug: T101625
Change-Id: I8d05f1fb093216cf30168ae52a27ac8dd53e3d04
---
M lib/includes/store/EntityRedirectLookup.php
M lib/includes/store/EntityRevisionLookup.php
M lib/includes/store/sql/WikiPageEntityMetaDataLookup.php
M lib/includes/store/sql/WikiPageEntityRevisionLookup.php
M lib/tests/phpunit/MockRepository.php
M repo/includes/Interactors/RedirectCreationInteractor.php
M repo/includes/WikibaseRepo.php
M repo/includes/api/CreateRedirect.php
M repo/includes/store/sql/EntityPerPageTable.php
M repo/tests/phpunit/includes/Interactors/RedirectCreationInteractorTest.php
M repo/tests/phpunit/includes/api/CreateRedirectTest.php
M repo/tests/phpunit/includes/specials/SpecialRedirectEntityTest.php
12 files changed, 56 insertions(+), 28 deletions(-)

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



diff --git a/lib/includes/store/EntityRedirectLookup.php 
b/lib/includes/store/EntityRedirectLookup.php
index 8bf2aff..40a128e 100644
--- a/lib/includes/store/EntityRedirectLookup.php
+++ b/lib/includes/store/EntityRedirectLookup.php
@@ -31,10 +31,12 @@
 * @since 0.5
 *
 * @param EntityId $entityId
+* @param string $forUpdate If for update is given the redirect will 
be
+*determined from the canonical master database.
 *
 * @return EntityId|null|false The ID of the redirect target, or null 
if $entityId
 * does not refer to a redirect, or false if $entityId is not 
known.
 */
-   public function getRedirectForEntityId( EntityId $entityId );
+   public function getRedirectForEntityId( EntityId $entityId, $forUpdate 
= '' );
 
 }
diff --git a/lib/includes/store/EntityRevisionLookup.php 
b/lib/includes/store/EntityRevisionLookup.php
index b43051b..10763fc 100644
--- a/lib/includes/store/EntityRevisionLookup.php
+++ b/lib/includes/store/EntityRevisionLookup.php
@@ -59,7 +59,7 @@
 * @param string $mode LATEST_FROM_SLAVE or LATEST_FROM_MASTER. 
LATEST_FROM_MASTER would force the
 *revision to be determined from the canonical master database.
 *
-* @return int|false
+* @return int|false Returns false in case the entity doesn't exist 
(this includes redirects).
 */
public function getLatestRevisionId( EntityId $entityId, $mode = 
self::LATEST_FROM_SLAVE );
 
diff --git a/lib/includes/store/sql/WikiPageEntityMetaDataLookup.php 
b/lib/includes/store/sql/WikiPageEntityMetaDataLookup.php
index 1841a24..1908291 100644
--- a/lib/includes/store/sql/WikiPageEntityMetaDataLookup.php
+++ b/lib/includes/store/sql/WikiPageEntityMetaDataLookup.php
@@ -105,6 +105,7 @@
'rev_content_format',
'rev_timestamp',
'page_latest',
+   'page_is_redirect',
'old_id',
'old_text',
'old_flags'
diff --git a/lib/includes/store/sql/WikiPageEntityRevisionLookup.php 
b/lib/includes/store/sql/WikiPageEntityRevisionLookup.php
index b60a1fd..9bbbf54 100644
--- a/lib/includes/store/sql/WikiPageEntityRevisionLookup.php
+++ b/lib/includes/store/sql/WikiPageEntityRevisionLookup.php
@@ -126,7 +126,7 @@
$rows = $this-entityMetaDataAccessor-loadRevisionInformation( 
array( $entityId ), $mode );
$row = $rows[$entityId-getSerialization()];
 
-   if ( $row  $row-page_latest ) {
+   if ( $row  $row-page_latest  !$row-page_is_redirect ) {
return (int)$row-page_latest;
}
 
diff --git a/lib/tests/phpunit/MockRepository.php 
b/lib/tests/phpunit/MockRepository.php
index 7a7d2c0..c2014ea 100644
--- a/lib/tests/phpunit/MockRepository.php
+++ b/lib/tests/phpunit/MockRepository.php
@@ -575,7 +575,11 @@
 * @return int|false
 */
public function getLatestRevisionId( EntityId $entityId, $mode = 
self::LATEST_FROM_SLAVE ) {
-   $revision = $this-getEntityRevision( $entityId, $mode );
+   try {
+   $revision = $this-getEntityRevision( $entityId, $mode 
);
+   } catch ( UnresolvedRedirectException $e ) {
+   return false;
+

[MediaWiki-commits] [Gerrit] Use UnDeserializableValue expert for handling such values - change (mediawiki...Wikibase)

2015-06-18 Thread jenkins-bot (Code Review)

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

Change subject: Use UnDeserializableValue expert for handling such values
..


Use UnDeserializableValue expert for handling such values

Bug: T92975
Change-Id: If2b167681fee5923822c8646d37f34740fb78070
---
M repo/resources/experts/getStore.js
M repo/resources/experts/resources.php
M view/resources/jquery/wikibase/snakview/snakview.variations.Value.js
M view/resources/wikibase/store/store.ApiEntityStore.js
M view/resources/wikibase/wikibase.ValueViewBuilder.js
5 files changed, 31 insertions(+), 12 deletions(-)

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



diff --git a/repo/resources/experts/getStore.js 
b/repo/resources/experts/getStore.js
index 107d55f..0fced22 100644
--- a/repo/resources/experts/getStore.js
+++ b/repo/resources/experts/getStore.js
@@ -33,6 +33,11 @@
dv.TimeValue.TYPE
);
 
+   expertStore.registerDataValueExpert(
+   vv.experts.UnDeserializableValue,
+   dv.UnDeserializableValue.TYPE
+   );
+
// Register experts for data types defined in Wikibase. Since those 
data types are defined by a
// setting, it needs to be checked whether they are actually defined.
 
diff --git a/repo/resources/experts/resources.php 
b/repo/resources/experts/resources.php
index a1dc338..3609ca8 100644
--- a/repo/resources/experts/resources.php
+++ b/repo/resources/experts/resources.php
@@ -37,6 +37,7 @@
'jquery.valueview.experts.MonolingualText',
'jquery.valueview.experts.StringValue',
'jquery.valueview.experts.TimeInput',
+   
'jquery.valueview.experts.UnDeserializableValue',
'jquery.valueview.experts.UnsupportedValue',
'wikibase.datamodel.EntityId',
'wikibase.experts.__namespace',
diff --git 
a/view/resources/jquery/wikibase/snakview/snakview.variations.Value.js 
b/view/resources/jquery/wikibase/snakview/snakview.variations.Value.js
index 426f5af..fea0e98 100644
--- a/view/resources/jquery/wikibase/snakview/snakview.variations.Value.js
+++ b/view/resources/jquery/wikibase/snakview/snakview.variations.Value.js
@@ -175,7 +175,8 @@
 
// If the new value's type is not the 
data value type used by the Snak's
// property data type, something is 
very wrong. Display warning!
-   if( newValue  dataType  
newValue.getType() !== dataType.getDataValueType() ) {
+   if( newValue  dataType  
newValue.getType() !== dataType.getDataValueType()
+newValue.getType() !== 
dv.UnDeserializableValue.TYPE ) {
handleDataValueTypeMismatch(
newValue.getType(),

dataType.getDataValueType()
diff --git a/view/resources/wikibase/store/store.ApiEntityStore.js 
b/view/resources/wikibase/store/store.ApiEntityStore.js
index 38d27c0..2327f90 100644
--- a/view/resources/wikibase/store/store.ApiEntityStore.js
+++ b/view/resources/wikibase/store/store.ApiEntityStore.js
@@ -57,15 +57,21 @@
this._repoApi.getEntities( entityIds, null, 
this._languages )
.done( function( result ) {
$.each( result.entities, function( id, 
entityData ) {
-   if( entityData.missing === '' ) {
-   return; // missing entity
+   // return entities not found (e.g. 
deleted) as null, and allow
+   // valueViewBuilder to select 
appropriate expert for such case.
+   var entity = null,
+   entityId = id;
+
+   if( entityData.missing !== '' ) {
+   entity = 
self._fetchedEntityUnserializer.deserialize( {
+   title: entityData.title,
+   content: entityData
+   } );
+
+   entityId = 
entity.getContent().getId();
}
 
-   var entity = 
self._fetchedEntityUnserializer.deserialize( {
-   title: entityData.title,
-   content: entityData
-

[MediaWiki-commits] [Gerrit] Add convenience getTerm method to TermIndexEntry - change (mediawiki...Wikibase)

2015-06-18 Thread Addshore (Code Review)

Addshore has uploaded a new change for review.

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

Change subject: Add convenience getTerm method to TermIndexEntry
..

Add convenience getTerm method to TermIndexEntry

Change-Id: I95cc093bec3f275b09257da6403037139debc3cd
---
M lib/includes/TermIndexEntry.php
M lib/tests/phpunit/TermIndexEntryTest.php
2 files changed, 18 insertions(+), 0 deletions(-)


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

diff --git a/lib/includes/TermIndexEntry.php b/lib/includes/TermIndexEntry.php
index 88facdb..4312cca 100644
--- a/lib/includes/TermIndexEntry.php
+++ b/lib/includes/TermIndexEntry.php
@@ -5,6 +5,7 @@
 use MWException;
 use Wikibase\DataModel\Entity\EntityId;
 use Wikibase\DataModel\LegacyIdInterpreter;
+use Wikibase\DataModel\Term\Term;
 
 /**
  * Object representing a term index entry.
@@ -220,4 +221,11 @@
return 0;
}
 
+   /**
+* @return Term
+*/
+   public function getTerm() {
+   return new Term( $this-getLanguage(), $this-getText() );
+   }
+
 }
diff --git a/lib/tests/phpunit/TermIndexEntryTest.php 
b/lib/tests/phpunit/TermIndexEntryTest.php
index 7946320..f56cb94 100644
--- a/lib/tests/phpunit/TermIndexEntryTest.php
+++ b/lib/tests/phpunit/TermIndexEntryTest.php
@@ -3,6 +3,7 @@
 namespace Wikibase\Test;
 
 use Wikibase\DataModel\LegacyIdInterpreter;
+use Wikibase\DataModel\Term\Term;
 use Wikibase\TermIndexEntry;
 
 /**
@@ -173,4 +174,13 @@
}
}
 
+   public function testToTerm() {
+   $termIndexEntry = new TermIndexEntry( array(
+   'termLanguage' = 'en',
+   'termText' = 'foo',
+   ) );
+   $expectedTerm = new Term( 'en', 'foo' );
+   $this-assertEquals( $expectedTerm, $termIndexEntry-getTerm() 
);
+   }
+
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I95cc093bec3f275b09257da6403037139debc3cd
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Addshore addshorew...@gmail.com

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

[MediaWiki-commits] [Gerrit] T102649 Allow raw content for html builder, escape content b... - change (mediawiki...WikidataQuality)

2015-06-18 Thread Soeren.oldag (Code Review)

Soeren.oldag has submitted this change and it was merged.

Change subject: T102649 Allow raw content for html builder, escape content by 
default
..


T102649 Allow raw content for html builder, escape content by default

Change-Id: I30a40b02b5fbd673468dbc0218f0263915fe20ed
---
M includes/Html/HtmlTableCellBuilder.php
M includes/Html/HtmlTableHeaderBuilder.php
2 files changed, 49 insertions(+), 11 deletions(-)

Approvals:
  Soeren.oldag: Verified; Looks good to me, approved



diff --git a/includes/Html/HtmlTableCellBuilder.php 
b/includes/Html/HtmlTableCellBuilder.php
index 348451d..c840949 100755
--- a/includes/Html/HtmlTableCellBuilder.php
+++ b/includes/Html/HtmlTableCellBuilder.php
@@ -25,17 +25,31 @@
private $attributes;
 
/**
-* @param $content Html
-* @param array $attributes
+* Determines, whether the content is raw html or should be escaped.
+*
+* @var bool
 */
-   public function __construct( $content, array $attributes = array() ) {
+   private $isRawContent;
+
+   /**
+* @param string HTML $content
+* @param array $attributes
+* @param bool $isRawContent
+*
+* @throws InvalidArgumentException
+*/
+   public function __construct( $content, array $attributes = array(), 
$isRawContent = false ) {
// Check parameters
if ( !is_string( $content ) ) {
throw new InvalidArgumentException( '$content must be 
string.' );
}
+   if ( !is_bool( $isRawContent ) ) {
+   throw new InvalidArgumentException( '$isRawContent must 
be boolean.' );
+   }
 
$this-content = $content;
$this-attributes = $attributes;
+   $this-isRawContent = $isRawContent;
}
 
/**
@@ -58,12 +72,17 @@
 * @return string HTML
 */
public function toHtml() {
+   $content = $this-content;
+   if ( !$this-isRawContent ) {
+   $content = htmlspecialchars( $this-content );
+   }
+
return
Html::openElement(
'td',
$this-getAttributes()
)
-   . $this-content
+   . $content
. Html::closeElement( 'td' );
}
-}
\ No newline at end of file
+}
diff --git a/includes/Html/HtmlTableHeaderBuilder.php 
b/includes/Html/HtmlTableHeaderBuilder.php
index 10a004b..6814278 100755
--- a/includes/Html/HtmlTableHeaderBuilder.php
+++ b/includes/Html/HtmlTableHeaderBuilder.php
@@ -27,19 +27,33 @@
private $isSortable;
 
/**
-* @param string $content HTML
-* @param bool $isSortable
+* Determines, whether the content is raw html or should be escaped.
+*
+* @var bool
 */
-   public function __construct( $content, $isSortable = false ) {
+   private $isRawContent;
+
+   /**
+* @param string HTML $content
+* @param bool $isSortable
+* @param bool $isRawContent
+*
+* @throws InvalidArgumentException
+*/
+   public function __construct( $content, $isSortable = false, 
$isRawContent = false ) {
if ( !is_string( $content ) ) {
throw new InvalidArgumentException( '$content must be 
string.' );
}
if ( !is_bool( $isSortable ) ) {
throw new InvalidArgumentException( '$isSortable must 
be boolean.' );
}
+   if ( !is_bool( $isRawContent ) ) {
+   throw new InvalidArgumentException( '$isRawContent must 
be boolean.' );
+   }
 
$this-content = $content;
$this-isSortable = $isSortable;
+   $this-isRawContent = $isRawContent;
}
 
/**
@@ -69,12 +83,17 @@
$attributes['class'] = 'unsortable';
}
 
+   $content = $this-content;
+   if ( !$this-isRawContent ) {
+   $content = htmlspecialchars( $this-content );
+   }
+
return
Html::openElement(
'th',
$attributes
)
-   . $this-content
-   . Html::closeElement( 'th' );
+   . $content
+   . Html::closeElement('th');
}
-}
\ No newline at end of file
+}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I30a40b02b5fbd673468dbc0218f0263915fe20ed

[MediaWiki-commits] [Gerrit] Added initial Debian packaging for apertium-urd - change (operations...apertium-urd)

2015-06-18 Thread Alexandros Kosiaris (Code Review)

Alexandros Kosiaris has submitted this change and it was merged.

Change subject: Added initial Debian packaging for apertium-urd
..


Added initial Debian packaging for apertium-urd

Bug: T101811
Change-Id: I048f8d93ea13d3fbc157e2f65834a0248610fc0a
---
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, 113 insertions(+), 0 deletions(-)

Approvals:
  Alexandros Kosiaris: Verified; Looks good to me, approved



diff --git a/debian/changelog b/debian/changelog
new file mode 100644
index 000..44e6f21
--- /dev/null
+++ b/debian/changelog
@@ -0,0 +1,11 @@
+apertium-urd (0.1.0~r57551-1) trusty; urgency=low
+
+  [ Tino Didriksen ]
+  * Initial release
+  * No tarball release, so taking directly from svn
+
+  [ Kartik Mistry ]
+  * Fixed dependencies.
+  * Rebuilt for Trusty.
+
+ -- Kartik Mistry kar...@debian.org  Tue, 09 Jun 2015 12:43:23 +0530
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..ec5bcd3
--- /dev/null
+++ b/debian/control
@@ -0,0 +1,29 @@
+Source: apertium-urd
+Section: science
+Priority: optional
+Maintainer: Debian Science Team 
debian-science-maintain...@lists.alioth.debian.org
+Uploaders: Tino Didriksen m...@tinodidriksen.com,
+   Kartik Mistry kar...@debian.org
+Build-Depends: apertium (= 3.3),
+   autotools-dev,
+   cg3,
+   debhelper (= 8.0),
+   dh-autoreconf,
+   gawk,
+   hfst,
+   libapertium3-3.3-dev,
+   libhfst39-dev,
+   liblttoolbox3-3.3-dev (= 3.3),
+   locales,
+   lttoolbox (= 3.3),
+   pkg-config (= 0.21)
+Standards-Version: 3.9.6
+Homepage: http://apertium.org/
+Vcs-Git: git://anonscm.debian.org/debian-science/packages/apertium-urd.git
+Vcs-Browser: 
https://anonscm.debian.org/cgit/debian-science/packages/apertium-urd.git
+
+Package: apertium-urd
+Architecture: all
+Depends: apertium (= 3.3), cg3, hfst, ${misc:Depends}, ${shlibs:Depends}
+Description: Apertium single language data for Urdu
+ Data package providing Apertium language resources for Urdu
diff --git a/debian/copyright b/debian/copyright
new file mode 100644
index 000..58bf940
--- /dev/null
+++ b/debian/copyright
@@ -0,0 +1,41 @@
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Source: http://apertium.org/
+
+Files: *
+Copyright: 2013-2014, Francis M. Tyers fty...@prompsit.com
+   2013-2014, Kevin Brubeck Unhammer unham...@fsfe.org
+2014, Sudarsh Rathi sud1...@users.sourceforge.net
+License: GPL-3
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, version 3 of the License
+ .
+ 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 http://www.gnu.org/licenses/.
+ .
+ On Debian systems, the complete text of the GNU General
+ Public License version 3 can be found in /usr/share/common-licenses/GPL-3.
+
+Files: debian/*
+Copyright: 2014, Apertium Project Management Committee 
apertium-...@dlsi.ua.es
+License: GPL-3+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 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 http://www.gnu.org/licenses/.
+ .
+ On Debian systems, the complete text of the GNU General
+ Public License version 3 can be found in /usr/share/common-licenses/GPL-3.
diff --git a/debian/docs b/debian/docs
new file mode 100644
index 000..6f83607
--- /dev/null
+++ b/debian/docs
@@ -0,0 +1,3 @@
+AUTHORS
+NEWS
+README
diff --git a/debian/rules b/debian/rules
new file mode 100755
index 000..11004df
--- /dev/null
+++ b/debian/rules
@@ -0,0 +1,27 @@
+#!/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
+#

[MediaWiki-commits] [Gerrit] Fixed tests - change (mediawiki...WikidataQualityConstraints)

2015-06-18 Thread Tamslo (Code Review)

Tamslo has uploaded a new change for review.

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

Change subject: Fixed tests
..

Fixed tests

Change-Id: I27ad24f098608d5a877f9902f2f96ecb3c664476
---
M includes/Constraint.php
M includes/ConstraintCheck/Helper/ConstraintReportHelper.php
M includes/ConstraintRepository.php
M maintenance/UpdateTable.php
M tests/phpunit/Checker/FormatChecker/FormatCheckerTest.php
M tests/phpunit/ConstraintRepositoryTest.php
M tests/phpunit/ConstraintTest.php
M tests/phpunit/Helper/ConstraintReportHelperTest.php
8 files changed, 41 insertions(+), 33 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikidataQualityConstraints
 refs/changes/64/219164/1

diff --git a/includes/Constraint.php b/includes/Constraint.php
index d85f910..699296d 100644
--- a/includes/Constraint.php
+++ b/includes/Constraint.php
@@ -2,6 +2,9 @@
 
 namespace WikibaseQuality\ConstraintReport;
 
+use Wikibase\DataModel\Entity\PropertyId;
+
+
 /**
  * Class Constraint
  *
@@ -38,11 +41,11 @@
 
/**
 * @param string $constraintClaimGuid
-* @param string $propertyId
+* @param PropertyId $propertyId
 * @param string $constraintTypeQid
 * @param array $constraintParameters
 */
-   public function __construct( $constraintClaimGuid, $propertyId, 
$constraintTypeQid, $constraintParameters) {
+   public function __construct( $constraintClaimGuid, PropertyId 
$propertyId, $constraintTypeQid, $constraintParameters) {
$this-constraintClaimGuid = $constraintClaimGuid;
$this-constraintTypeQid = $constraintTypeQid;
$this-propertyId = $propertyId;
diff --git a/includes/ConstraintCheck/Helper/ConstraintReportHelper.php 
b/includes/ConstraintCheck/Helper/ConstraintReportHelper.php
index bd5a9bd..4f10d75 100755
--- a/includes/ConstraintCheck/Helper/ConstraintReportHelper.php
+++ b/includes/ConstraintCheck/Helper/ConstraintReportHelper.php
@@ -87,7 +87,7 @@
 */
public function parseParameterArray( $parameterArray, $asString = false 
) {
if ( $parameterArray[ 0 ] === '' ) { // parameter not given
-   return array ( 'null' );
+   return array ( 'none' );
} else {
$array = array ();
foreach ( $parameterArray as $parameter ) {
@@ -104,7 +104,7 @@
 * @return null|string
 */
public function getParameterFromJson( $json, $parameter ) {
-   isset( $json-$parameter ) ? $json-$parameter : null;
+   return isset( $json-$parameter ) ? $json-$parameter : null;
}
 
 }
\ No newline at end of file
diff --git a/includes/ConstraintRepository.php 
b/includes/ConstraintRepository.php
index 42586c2..487c24e 100644
--- a/includes/ConstraintRepository.php
+++ b/includes/ConstraintRepository.php
@@ -42,7 +42,7 @@
function ( Constraint $constraint ) {
return array(
'constraint_guid' = 
$constraint-getConstraintClaimGuid(),
-   'pid' = $constraint-getPropertyId(),
+   'pid' = 
$constraint-getPropertyId()-getNumericId(),
'constraint_type_qid' = 
$constraint-getConstraintTypeQid(),
'constraint_parameters' = json_encode( 
$constraint-getConstraintParameters() )
);
@@ -84,7 +84,8 @@
foreach( $results as $result ) {
$constraintTypeQid = $result-constraint_type_qid;
$constraintParameters = (array) json_decode( 
$result-constraint_parameters );
-   $constraints[] = new Constraint( 
$result-constraint_guid, new PropertyId( $result-pid ), $constraintTypeQid, 
$constraintParameters );
+   $serializedPid = 'P' . $result-pid;
+   $constraints[] = new Constraint( 
$result-constraint_guid, new PropertyId( $serializedPid ), $constraintTypeQid, 
$constraintParameters );
}
return $constraints;
}
diff --git a/maintenance/UpdateTable.php b/maintenance/UpdateTable.php
index 9e94d9b..9b822d2 100644
--- a/maintenance/UpdateTable.php
+++ b/maintenance/UpdateTable.php
@@ -3,6 +3,7 @@
 namespace WikibaseQuality\ConstraintReport\Maintenance;
 
 // @codeCoverageIgnoreStart
+use Wikibase\DataModel\Entity\PropertyId;
 use WikibaseQuality\ConstraintReport\Constraint;
 use WikibaseQuality\ConstraintReport\ConstraintReportFactory;
 
@@ -63,7 +64,8 @@
}
 
$constraintParameters = (array) json_decode( $data[3] );
-   $accumulator[] = new Constraint( $data[0], $data[1], 
$data[2], $constraintParameters

[MediaWiki-commits] [Gerrit] Fix test for unknown sites in OtherProjectsSitesGeneratorTest - change (mediawiki...Wikibase)

2015-06-18 Thread Hoo man (Code Review)

Hoo man has uploaded a new change for review.

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

Change subject: Fix test for unknown sites in OtherProjectsSitesGeneratorTest
..

Fix test for unknown sites in OtherProjectsSitesGeneratorTest

Change-Id: I893b08f4441666abb7b4a6bc1d6d085eafaabf72
---
M client/tests/phpunit/includes/OtherProjectsSitesGeneratorTest.php
1 file changed, 13 insertions(+), 6 deletions(-)


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

diff --git a/client/tests/phpunit/includes/OtherProjectsSitesGeneratorTest.php 
b/client/tests/phpunit/includes/OtherProjectsSitesGeneratorTest.php
index 0012d29..2eb632f 100644
--- a/client/tests/phpunit/includes/OtherProjectsSitesGeneratorTest.php
+++ b/client/tests/phpunit/includes/OtherProjectsSitesGeneratorTest.php
@@ -75,15 +75,22 @@
array()
);
 
-   $tests['Unknown site'] = array(
-   array( 'wikipedia', 'wikisource' ),
-   'kittenswiki',
-   array()
-   );
-
return $tests;
}
 
+   public function testOtherProjectSiteIds_unknownSite() {
+   $siteStore = $this-getSiteStoreMock();
+   $otherProjectsSitesProvider = new OtherProjectsSitesGenerator( 
$siteStore, 'kittenswiki', array( 'wikidata' ) );
+
+   // getOtherProjectsSiteIds does wfWarn in case it's being 
called with a siteid
+   // it doesn't know about. That's fine, we can just ignore that.
+   \MediaWiki\suppressWarnings();
+   $result = $otherProjectsSitesProvider-getOtherProjectsSiteIds( 
array( 'wikipedia', 'wikisource' ) );
+   \MediaWiki\restoreWarnings();
+
+   $this-assertSame( array(), $result );
+   }
+
/**
 * @return MockSiteStore
 */

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I893b08f4441666abb7b4a6bc1d6d085eafaabf72
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Hoo man h...@online.de

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

[MediaWiki-commits] [Gerrit] Version 3.3 - change (mediawiki...SemanticForms)

2015-06-18 Thread jenkins-bot (Code Review)

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

Change subject: Version 3.3
..


Version 3.3

Change-Id: I8799b74650717eeb471e974e0fe5a3054c6be1aa
---
M INSTALL
M SemanticForms.php
2 files changed, 3 insertions(+), 3 deletions(-)

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



diff --git a/INSTALL b/INSTALL
index 1dc0639..8c2c354 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,4 +1,4 @@
-[[Semantic Forms 3.2]]
+[[Semantic Forms 3.3]]
 
 Contents:
 * Disclaimer
diff --git a/SemanticForms.php b/SemanticForms.php
index afba110..c26efd1 100644
--- a/SemanticForms.php
+++ b/SemanticForms.php
@@ -41,10 +41,10 @@
return 1;
 }
 
-define( 'SF_VERSION', '3.2' );
+define( 'SF_VERSION', '3.3' );
 
 if ( !defined( 'SMW_VERSION' ) ) {
-   //die( ERROR: a href=\http://semantic-mediawiki.org\;Semantic 
MediaWiki/a must be installed for Semantic Forms to run! );
+   // SMW defines these namespaces itself.
define( 'SF_NS_FORM', 106 );
define( 'SF_NS_FORM_TALK', 107 );
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I8799b74650717eeb471e974e0fe5a3054c6be1aa
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SemanticForms
Gerrit-Branch: master
Gerrit-Owner: Yaron Koren yaro...@gmail.com
Gerrit-Reviewer: Yaron Koren yaro...@gmail.com
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] Added overwrite switch for SqlViolationRepo. - change (mediawiki...WikidataQuality)

2015-06-18 Thread Soeren.oldag (Code Review)

Soeren.oldag has uploaded a new change for review.

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

Change subject: Added overwrite switch for SqlViolationRepo.
..

Added overwrite switch for SqlViolationRepo.

Change-Id: I404db9ce415649c0b52bc2be5b52b018935f7b91
---
M includes/Violations/SqlViolationRepo.php
M includes/Violations/ViolationStore.php
2 files changed, 7 insertions(+), 2 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikidataQuality 
refs/changes/78/219178/1

diff --git a/includes/Violations/SqlViolationRepo.php 
b/includes/Violations/SqlViolationRepo.php
index 54f6e35..40d5181 100755
--- a/includes/Violations/SqlViolationRepo.php
+++ b/includes/Violations/SqlViolationRepo.php
@@ -106,12 +106,16 @@
 
/**
 * @param Violation $violation
+* @param bool $overwriteExisting
 * @return bool
 */
-   public function insert( Violation $violation ) {
+   public function insert( Violation $violation, $overwriteExisting = 
false ) {
$db = wfGetDB( DB_MASTER );
 
if( $this-violationExists( $db, $violation ) ) {
+   if( $overwriteExisting ) {
+   return $this-update( $violation, false );
+   }
throw new InvalidArgumentException( 'Given violation 
already exists in database.' );
}
 
diff --git a/includes/Violations/ViolationStore.php 
b/includes/Violations/ViolationStore.php
index 8893cd5..0c586e8 100644
--- a/includes/Violations/ViolationStore.php
+++ b/includes/Violations/ViolationStore.php
@@ -15,9 +15,10 @@
 * Inserts given violation into database.
 *
 * @param Violation $violation
+* @param bool $overwriteExisting
 * @return mixed
 */
-   public function insert( Violation $violation );
+   public function insert( Violation $violation, $overwriteExisting = 
false );
 
/**
 * Updates given violation in database.

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I404db9ce415649c0b52bc2be5b52b018935f7b91
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikidataQuality
Gerrit-Branch: master
Gerrit-Owner: Soeren.oldag soeren_ol...@freenet.de

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

[MediaWiki-commits] [Gerrit] Added initial Debian package of apertium-cy-en - change (operations...apertium-cy-en)

2015-06-18 Thread Alexandros Kosiaris (Code Review)

Alexandros Kosiaris has submitted this change and it was merged.

Change subject: Added initial Debian package of apertium-cy-en
..


Added initial Debian package of apertium-cy-en

Bug: T102101
Change-Id: I1fb98e06feacf4f87596ed22ed0c0b12d732b4df
---
A debian/changelog
A debian/compat
A debian/control
A debian/copyright
A debian/docs
A debian/rules
A debian/source/format
A debian/watch
8 files changed, 127 insertions(+), 0 deletions(-)

Approvals:
  Alexandros Kosiaris: Verified; Looks good to me, approved



diff --git a/debian/changelog b/debian/changelog
new file mode 100644
index 000..e884754
--- /dev/null
+++ b/debian/changelog
@@ -0,0 +1,11 @@
+apertium-cy-en (0.1.1~r57554-1) trusty; urgency=low
+
+  [ Tino Didriksen ]
+  * Initial release
+  * No significant changes in svn since tarball, so taking directly from svn
+
+  [ Kartik Mistry ]
+  * Rebuilt for Trusty.
+  * Fixed dependencies.
+
+ -- Kartik Mistry kar...@debian.org  Thu, 11 Jun 2015 19:53:10 +0530
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..431cfd9
--- /dev/null
+++ b/debian/control
@@ -0,0 +1,30 @@
+Source: apertium-cy-en
+Section: science
+Priority: optional
+Maintainer: Debian Science Team 
debian-science-maintain...@lists.alioth.debian.org
+Uploaders: Tino Didriksen m...@tinodidriksen.com,
+   Kartik Mistry kar...@debian.org
+Build-Depends: apertium (= 3.3),
+   autotools-dev,
+   cg3,
+   debhelper (= 8.0),
+   dh-autoreconf,
+   gawk,
+   libapertium3-3.3-dev,
+   liblttoolbox3-3.3-dev (= 3.3),
+   locales,
+   lttoolbox (= 3.3),
+   pkg-config (= 0.21)
+Standards-Version: 3.9.6
+Homepage: http://apertium.org/
+Vcs-Git: git://anonscm.debian.org/debian-science/packages/apertium-cy-en.git
+Vcs-Browser: 
https://anonscm.debian.org/cgit/debian-science/packages/apertium-cy-en.git
+
+Package: apertium-cy-en
+Architecture: all
+Depends: apertium (= 3.3), cg3, ${misc:Depends}, ${shlibs:Depends}
+Provides: apertium-en-cy
+Conflicts: apertium-en-cy
+Description: Apertium translation data for the Welsh-English pair
+ Data package providing Apertium language resources for translating
+ between the Welsh and English languages.
diff --git a/debian/copyright b/debian/copyright
new file mode 100644
index 000..b853f12
--- /dev/null
+++ b/debian/copyright
@@ -0,0 +1,50 @@
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Source: http://apertium.org/
+
+Files: *
+Copyright: 2005-2009, Kevin Donnelly don...@users.sourceforge.net
+   2007-2008, Generalitat de Catalunya (dades anglés)
+   2007-2010, Jim O'Regan jore...@gmail.com
+   2007-2014, Francis M. Tyers fty...@prompsit.com
+2007, Liamtomkins liamtomk...@users.sourceforge.net
+2009, Pminervini pminerv...@users.sourceforge.net
+   2010-2014, Kevin Brubeck Unhammer unham...@fsfe.org
+2012, Anthony J. Bentley 
anthonyjbent...@users.sourceforge.net
+License: GPL-2
+
+Files: alt.xsl
+Copyright: 2005, Universitat d'Alacant / Universidad de Alicante
+License: GPL-2
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, version 2 of the License
+ .
+ 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 http://www.gnu.org/licenses/.
+ .
+ On Debian systems, the complete text of the GNU General
+ Public License version 2 can be found in /usr/share/common-licenses/GPL-2.
+
+Files: debian/*
+Copyright: 2014, Apertium Project Management Committee 
apertium-...@dlsi.ua.es
+License: GPL-2+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 2 of the License, or
+ (at your option) any later version.
+ .
+ This 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 http://www.gnu.org/licenses/.
+ .
+ On Debian systems, the complete text of the GNU General
+ Public License version 2 can be found in

[MediaWiki-commits] [Gerrit] Fix for raid1-lvm-conf.cfg - change (operations/puppet)

2015-06-18 Thread Ottomata (Code Review)

Ottomata has submitted this change and it was merged.

Change subject: Fix for raid1-lvm-conf.cfg
..


Fix for raid1-lvm-conf.cfg

Change-Id: I4e5ad4dcbba9fc2c69277f62c46b1325409f2eed
---
M modules/install-server/files/autoinstall/partman/raid1-lvm-conf.cfg
1 file changed, 2 insertions(+), 2 deletions(-)

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



diff --git 
a/modules/install-server/files/autoinstall/partman/raid1-lvm-conf.cfg 
b/modules/install-server/files/autoinstall/partman/raid1-lvm-conf.cfg
index 8760c3c..dc2c016 100644
--- a/modules/install-server/files/autoinstall/partman/raid1-lvm-conf.cfg
+++ b/modules/install-server/files/autoinstall/partman/raid1-lvm-conf.cfg
@@ -59,7 +59,7 @@
 use_filesystem{ } \
 filesystem{ ext4 } \
 $defaultignore{ } \
-.
+. \
 1000 1000 25 ext4 \
 mountpoint{ /var/lib/zookeeper } \
 method{ format } \
@@ -70,7 +70,7 @@
 use_filesystem{ } \
 filesystem{ ext4 } \
 $defaultignore{ } \
-. \
+.
 
 
 d-i partman-md/confirm  boolean true

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I4e5ad4dcbba9fc2c69277f62c46b1325409f2eed
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ottomata o...@wikimedia.org
Gerrit-Reviewer: Ottomata o...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] Few fixes and error handling for JS. - change (mediawiki...WikidataQuality)

2015-06-18 Thread Dominic.sauer (Code Review)

Dominic.sauer has submitted this change and it was merged.

Change subject: Few fixes and error handling for JS.
..


Few fixes and error handling for JS.

Change-Id: I0ae873d4003b846d8446b1eda9261ebc851fe48c
---
M WikibaseQuality.php
M i18n/en.json
M i18n/qqq.json
M modules/ext.WikibaseQuality.SpecialViolationsPage.js
M modules/ext.WikibaseQuality.UiScript.js
5 files changed, 84 insertions(+), 73 deletions(-)

Approvals:
  Dominic.sauer: Verified; Looks good to me, approved



diff --git a/WikibaseQuality.php b/WikibaseQuality.php
index 64d565c..d7f350c 100755
--- a/WikibaseQuality.php
+++ b/WikibaseQuality.php
@@ -31,30 +31,31 @@
$GLOBALS['wgSpecialPages']['Violations'] = array( 
'WikibaseQuality\SpecialPageFactory', 'newSpecialViolationsPage' );
 
// Define modules
-$remoteExtPathParts = explode(
-DIRECTORY_SEPARATOR . 'extensions' . DIRECTORY_SEPARATOR, __DIR__, 2
-);
+   $remoteExtPathParts = explode(
+   DIRECTORY_SEPARATOR . 'extensions' . DIRECTORY_SEPARATOR, 
__DIR__, 2
+   );
$GLOBALS['wgResourceModules']['SpecialViolationsPage'] = array (
'styles' = 
'/modules/ext.WikibaseQuality.SpecialViolationsPage.css',
-'scripts' = '/modules/ext.WikibaseQuality.SpecialViolationsPage.js',
-'dependencies' = array( 'jquery.confirmable' ),
+   'scripts' = 
'/modules/ext.WikibaseQuality.SpecialViolationsPage.js',
+   'dependencies'  = array( 'jquery.confirmable' ),
'localBasePath' = __DIR__,
'remoteExtPath' = $remoteExtPathParts[1],
-'messages' = array(
-'wbq-violations-status-violation',
-'wbq-violations-status-exception',
-'wbq-violations-mark-as-violation',
-'wbq-violations-mark-as-exception'
-)
+   'messages' = array(
+   'wbq-violations-status-violation',
+   'wbq-violations-status-exception',
+   'wbq-violations-mark-as-violation',
+   'wbq-violations-mark-as-exception',
+   'wbq-violations-permission-denied'
+   )
);
 
-$GLOBALS['wgResourceModules']['ext.WikibaseQuality.UiScript'] = array(
-'scripts'   = 'modules/ext.WikibaseQuality.UiScript.js',
-'styles'= 'modules/ext.WikibaseQuality.UiScript.css',
-'dependencies' = array( 'jquery.confirmable' ),
-'localBasePath' = __DIR__,
-'remoteExtPath' = $remoteExtPathParts[1]
-);
+   $GLOBALS['wgResourceModules']['ext.WikibaseQuality.UiScript'] = array(
+   'scripts'   = 'modules/ext.WikibaseQuality.UiScript.js',
+   'styles'= 'modules/ext.WikibaseQuality.UiScript.css',
+   'dependencies'  = array( 'jquery.confirmable' ),
+   'localBasePath' = __DIR__,
+   'remoteExtPath' = $remoteExtPathParts[1]
+   );
 
// Register hooks for QUnit Tests
$GLOBALS['wgHooks']['ResourceLoaderTestModules'][] = function( array 
$testModules, \ResourceLoader $resourceLoader ) {
diff --git a/i18n/en.json b/i18n/en.json
index dda2e06..ed4eeb2 100755
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -1,54 +1,55 @@
 {
-  @metadata: {
-authors: BP2014N1
-  },
-  wbq-desc: Base extension for wikibase quality extensions that manages 
found incorrect data,
-  specialpages-group-wikibasequality: Wikibase Quality,
+   @metadata: {
+   authors: BP2014N1
+   },
+   wbq-desc: Base extension for wikibase quality extensions that 
manages found incorrect data,
+   specialpages-group-wikibasequality: Wikibase Quality,
 
-  wbq-violations-description: List of data quality issues,
-  wbq-violations-explanations-general: This special page lists all data 
quality issues that were detected in Wikidata. Such issues may be violations 
against defined constraints or mismatches with other external databases. ,
-  wbq-violations-explanations-exceptions: If a statement is incorrectly 
labeled as a data quality issue, it can be marked as exception by privileged 
users. Those exceptions are not shown in the list per default. Existing 
exceptions can also be reverted and set as issue again. ,
-  wbq-violatons-filter-headline: Filter issues,
-  wbq-violations-entity-id-label: Entity ID:,
-  wbq-violations-entity-id-placeholder: Qxx/Pxx,
-  wbq-violations-property-id-label: Property ID:,
-  wbq-violations-property-id-placeholder: Pxx,
-  wbq-violations-group-label: Group:,
-  wbq-violations-type-label: Type:,
-  wbq-violations-form-select-all: (all),
-  wbq-violations-exceptions-checkbox-label: Show exceptions,
-  wbq-violations-submit-button-label: Show Violations,
-  wbq-violations-invalid-entity-id: Given entity ID is not a valid.,
-  wbq-violations-not-existent-entity: Entity with given ID does not exist.,
-

[MediaWiki-commits] [Gerrit] WIP: Add Safeifier ActionModule to verify wildcard before co... - change (search/extra)

2015-06-18 Thread DCausse (Code Review)

DCausse has uploaded a new change for review.

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

Change subject: WIP: Add Safeifier ActionModule to verify wildcard before 
compiling
..

WIP: Add Safeifier ActionModule to verify wildcard before compiling

I will comment this patch in the phab ticket

Bug: T102589
Change-Id: Ifcc9e55a4d81d48c05a76ca1afdd9b3adbf86006
---
M pom.xml
A src/main/java/org/elasticsearch/index/query/UnsafeSaferQueryParseContext.java
M src/main/java/org/wikimedia/search/extra/ExtraPlugin.java
M src/main/java/org/wikimedia/search/extra/safer/Safeifier.java
M src/main/java/org/wikimedia/search/extra/safer/SaferQueryBuilder.java
M src/main/java/org/wikimedia/search/extra/safer/SaferQueryParser.java
A 
src/main/java/org/wikimedia/search/extra/safer/wildcard/CheckWildcardsAction.java
A 
src/main/java/org/wikimedia/search/extra/safer/wildcard/CheckWildcardsActionModule.java
A 
src/main/java/org/wikimedia/search/extra/safer/wildcard/CheckWildcardsActionModuleParser.java
A 
src/main/java/org/wikimedia/search/extra/safer/wildcard/DelayedWildcardQuery.java
A 
src/main/java/org/wikimedia/search/extra/safer/wildcard/SaferMapperQueryParser.java
A 
src/main/java/org/wikimedia/search/extra/safer/wildcard/TooManyWildcardsException.java
A src/test/java/org/wikimedia/search/extra/safer/CheckWildcardsTest.java
M src/test/java/org/wikimedia/search/extra/safer/SaferQueryStringTest.java
14 files changed, 749 insertions(+), 30 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/search/extra 
refs/changes/82/219182/1

diff --git a/pom.xml b/pom.xml
index ec14044..a01aead 100644
--- a/pom.xml
+++ b/pom.xml
@@ -43,7 +43,7 @@
 
   properties
 project.build.sourceEncodingUTF-8/project.build.sourceEncoding
-elasticsearch.version1.3.4/elasticsearch.version
+elasticsearch.version1.3.6/elasticsearch.version
 lucene.version4.9.1/lucene.version
   /properties
 
diff --git 
a/src/main/java/org/elasticsearch/index/query/UnsafeSaferQueryParseContext.java 
b/src/main/java/org/elasticsearch/index/query/UnsafeSaferQueryParseContext.java
new file mode 100644
index 000..54dfa4c
--- /dev/null
+++ 
b/src/main/java/org/elasticsearch/index/query/UnsafeSaferQueryParseContext.java
@@ -0,0 +1,290 @@
+package org.elasticsearch.index.query;
+
+import java.io.IOException;
+import java.util.Collection;
+import java.util.EnumSet;
+import java.util.Set;
+
+import org.apache.lucene.queryparser.classic.MapperQueryParser;
+import org.apache.lucene.queryparser.classic.QueryParserSettings;
+import org.apache.lucene.search.Filter;
+import org.apache.lucene.search.Query;
+import org.apache.lucene.search.similarities.Similarity;
+import org.elasticsearch.cache.recycler.CacheRecycler;
+import org.elasticsearch.common.ParseField.Flag;
+import org.elasticsearch.common.collect.ImmutableMap;
+import org.elasticsearch.common.logging.ESLogger;
+import org.elasticsearch.common.logging.Loggers;
+import org.elasticsearch.common.lucene.search.NoCacheQuery;
+import org.elasticsearch.common.xcontent.XContentParser;
+import org.elasticsearch.index.Index;
+import org.elasticsearch.index.analysis.AnalysisService;
+import org.elasticsearch.index.cache.filter.support.CacheKeyFilter.Key;
+import org.elasticsearch.index.cache.query.parser.QueryParserCache;
+import org.elasticsearch.index.engine.IndexEngine;
+import org.elasticsearch.index.fielddata.IndexFieldData;
+import org.elasticsearch.index.mapper.FieldMapper;
+import org.elasticsearch.index.mapper.MapperService;
+import org.elasticsearch.index.mapper.MapperService.SmartNameFieldMappers;
+import org.elasticsearch.index.mapper.MapperService.SmartNameObjectMapper;
+import org.elasticsearch.index.search.child.CustomQueryWrappingFilter;
+import org.elasticsearch.index.similarity.SimilarityService;
+import org.elasticsearch.script.ScriptService;
+import org.elasticsearch.search.lookup.SearchLookup;
+import org.wikimedia.search.extra.safer.SaferQueryParser;
+import org.wikimedia.search.extra.safer.wildcard.CheckWildcardsActionModule;
+import org.wikimedia.search.extra.safer.wildcard.SaferMapperQueryParser;
+
+/**
+ * Hack for {@link CheckWildcardsActionModule}
+ *
+ * This class is just here to allow a custom MapperQueryParser to be used into 
{@link QueryStringQueryParser}
+ * XXX: Potential flaw, this object is stored in a thread local cache in 
{@link SaferQueryParser} 
+ *
+ * The normal QueryParseContext seems to be index scoped (see the thread 
local cache {@link IndexQueryParserService})
+ * but this one will be node scoped (it's not clear to me
+ *
+ * in org.elasticsearch.index.query because we need package visibility for 
{@link QueryParseContext#indexQueryParser}
+ */
+public class UnsafeSaferQueryParseContext extends QueryParseContext {
+private QueryParseContext parseContext = null;
+private final SaferMapperQueryParser queryParser;
+
+public UnsafeSaferQueryParseContext() {
+// XXX: Don't store

[MediaWiki-commits] [Gerrit] Rename WikidataQuality repos to WikibaseQuality repos. - change (integration/config)

2015-06-18 Thread JanZerebecki (Code Review)

JanZerebecki has uploaded a new change for review.

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

Change subject: Rename WikidataQuality repos to WikibaseQuality repos.
..

Rename WikidataQuality repos to WikibaseQuality repos.

Also remove duplicate jshint job, it already is run during npm.

Change-Id: I4677df5b3d16f5379e1cb6ae8ec00413a3d551f7
---
M zuul/layout.yaml
1 file changed, 12 insertions(+), 6 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/85/219185/1

diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 5a89b61..086fbe6 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -5780,14 +5780,15 @@
   - name: extension-unittests-generic
   - name: npm
 
-  - name: mediawiki/extensions/WikidataQuality
+  - name: mediawiki/extensions/WikibaseQuality
 template:
-  - name: lint-js
   - name: npm
 check:
+  - jsonlint
   - phplint
   - php-composer-package-validate
 test:
+  - jsonlint
   - phplint
   - php-composer-package-validate
   - mwext-WikidataQuality-repo-tests-sqlite-hhvm
@@ -5797,6 +5798,7 @@
   - mwext-WikidataQuality-repo-tests-sqlite-zend
   - mwext-WikidataQuality-repo-tests-mysql-zend
 gate-and-submit:
+  - jsonlint
   - phplint
   - php-composer-package-validate
   - mwext-WikidataQuality-repo-tests-sqlite-zend
@@ -5805,14 +5807,15 @@
   - mwext-WikidataQuality-repo-tests-mysql-hhvm
   - mwext-WikidataQuality-qunit
 
-  - name: mediawiki/extensions/WikidataQualityConstraints
+  - name: mediawiki/extensions/WikibaseQualityConstraints
 template:
-  - name: lint-js
   - name: npm
 check:
+  - jsonlint
   - phplint
   - php-composer-package-validate
 test:
+  - jsonlint
   - phplint
   - php-composer-package-validate
   - mwext-WikidataQualityConstraints-repo-tests-sqlite-hhvm
@@ -5822,6 +5825,7 @@
   - mwext-WikidataQualityConstraints-repo-tests-sqlite-zend
   - mwext-WikidataQualityConstraints-repo-tests-mysql-zend
 gate-and-submit:
+  - jsonlint
   - phplint
   - php-composer-package-validate
   - mwext-WikidataQualityConstraints-repo-tests-sqlite-zend
@@ -5830,14 +5834,15 @@
   - mwext-WikidataQualityConstraints-repo-tests-mysql-hhvm
   - mwext-WikidataQualityConstraints-qunit
 
-  - name: mediawiki/extensions/WikidataQualityExternalValidation
+  - name: mediawiki/extensions/WikibaseQualityExternalValidation
 template:
-  - name: lint-js
   - name: npm
 check:
+  - jsonlint
   - phplint
   - php-composer-package-validate
 test:
+  - jsonlint
   - phplint
   - php-composer-package-validate
   - mwext-WikidataQualityExternalValidation-repo-tests-sqlite-hhvm
@@ -5848,6 +5853,7 @@
   - mwext-WikidataQualityExternalValidation-repo-tests-sqlite-zend
   - mwext-WikidataQualityExternalValidation-repo-tests-mysql-zend
 gate-and-submit:
+  - jsonlint
   - phplint
   - php-composer-package-validate
   - mwext-WikidataQualityExternalValidation-repo-tests-sqlite-zend

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I4677df5b3d16f5379e1cb6ae8ec00413a3d551f7
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: JanZerebecki jan.wikime...@zerebecki.de

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

[MediaWiki-commits] [Gerrit] Add languages for deployment on 20150618 - change (analytics/limn-language-data)

2015-06-18 Thread KartikMistry (Code Review)

KartikMistry has uploaded a new change for review.

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

Change subject: Add languages for deployment on 20150618
..

Add languages for deployment on 20150618

Change-Id: I1e1f7fd91d42d376ea22e315949719460e803f56
---
M language/content_translation_beta.sql
M language/content_translation_beta_manual.sql
M reportgenerator/config/config.json
3 files changed, 107 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/analytics/limn-language-data 
refs/changes/86/219186/1

diff --git a/language/content_translation_beta.sql 
b/language/content_translation_beta.sql
index ee85461..df759c6 100644
--- a/language/content_translation_beta.sql
+++ b/language/content_translation_beta.sql
@@ -205,7 +205,23 @@
 tetwiki,
 towiki,
 tywiki,
-xalwiki
+xalwiki,
+alswiki,
+angwiki,
+barwiki,
+dewiki,
+dsbwiki,
+fowiki,
+frrwiki,
+hsbwiki,
+ikwiki,
+iswiki,
+klwiki,
+kshwiki,
+lbwiki,
+ndswiki,
+pflwiki,
+stqwiki
 
from (select *
from ( select count(*) as cawiki from cawiki.user_properties where 
up_property = 'cx' and up_value = 1 ) ca
@@ -633,6 +649,42 @@
 ( select count(*) as tywiki from tywiki.user_properties where 
up_property = 'cx' and up_value = 1 ) ty on 1=1
 left join
 ( select count(*) as xalwiki from xalwiki.user_properties 
where up_property = 'cx' and up_value = 1 ) xal on 1=1
+left join
+( select count(*) as alswiki from alswiki.user_properties 
where up_property = 'cx' and up_value = 1 ) als on 1=1
+left join
+( select count(*) as angwiki from angwiki.user_properties 
where up_property = 'cx' and up_value = 1 ) ang on 1=1
+left join
+( select count(*) as barwiki from barwiki.user_properties 
where up_property = 'cx' and up_value = 1 ) bar on 1=1
+left join
+( select count(*) as dewiki from dewiki.user_properties where 
up_property = 'cx' and up_value = 1 ) de on 1=1
+left join
+( select count(*) as dsbwiki from dsbwiki.user_properties 
where up_property = 'cx' and up_value = 1 ) dsb on 1=1
+left join
+( select count(*) as fowiki from fowiki.user_properties where 
up_property = 'cx' and up_value = 1 ) fo on 1=1
+left join
+( select count(*) as frrwiki from frrwiki.user_properties 
where up_property = 'cx' and up_value = 1 ) frr on 1=1
+left join
+( select count(*) as hsbwiki from hsbwiki.user_properties 
where up_property = 'cx' and up_value = 1 ) hsb on 1=1
+left join
+( select count(*) as ikwiki from ikwiki.user_properties where 
up_property = 'cx' and up_value = 1 ) ik on 1=1
+left join
+( select count(*) as iswiki from iswiki.user_properties where 
up_property = 'cx' and up_value = 1 ) is on 1=1
+left join
+( select count(*) as klwiki from klwiki.user_properties where 
up_property = 'cx' and up_value = 1 ) kl on 1=1
 ) seventh30
 
+cross join
+
+(select *
+   from ( select count(*) as kshwiki from kshwiki.user_properties 
where up_property = 'cx' and up_value = 1 ) ksh
+left join
+( select count(*) as lbwiki from lbwiki.user_properties where 
up_property = 'cx' and up_value = 1 ) lb on 1=1
+left join
+( select count(*) as ndswiki from ndswiki.user_properties 
where up_property = 'cx' and up_value = 1 ) nds on 1=1
+left join
+( select count(*) as pflwiki from pflwiki.user_properties 
where up_property = 'cx' and up_value = 1 ) pfl on 1=1
+left join
+( select count(*) as stqwiki from stqwiki.user_properties 
where up_property = 'cx' and up_value = 1 ) stq on 1=1
+) eigth30
+
 ;
diff --git a/language/content_translation_beta_manual.sql 
b/language/content_translation_beta_manual.sql
index 52be72a..90db624 100644
--- a/language/content_translation_beta_manual.sql
+++ b/language/content_translation_beta_manual.sql
@@ -205,7 +205,23 @@
 tetwiki,
 towiki,
 tywiki,
-xalwiki
+xalwiki,
+alswiki,
+angwiki,
+barwiki,
+dewiki,
+dsbwiki,
+fowiki,
+frrwiki,
+hsbwiki,
+ikwiki,
+iswiki,
+klwiki,
+kshwiki,
+lbwiki,
+ndswiki,
+pflwiki,
+stqwiki
 
from (select *
from ( select count(*) as cawiki from cawiki.user_properties where 
up_property = 'cx' and up_value = 1 and up_user

[MediaWiki-commits] [Gerrit] statsdlb: minor lint - change (operations/puppet)

2015-06-18 Thread Matanya (Code Review)

Matanya has uploaded a new change for review.

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

Change subject: statsdlb: minor lint
..

statsdlb: minor lint

Change-Id: I87655e349ec0171f3ac197dac325b5a1f8d65581
---
M modules/statsdlb/manifests/init.pp
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/87/219187/1

diff --git a/modules/statsdlb/manifests/init.pp 
b/modules/statsdlb/manifests/init.pp
index 624db23..081863c 100644
--- a/modules/statsdlb/manifests/init.pp
+++ b/modules/statsdlb/manifests/init.pp
@@ -29,7 +29,7 @@
 ) {
 validate_ensure($ensure)
 validate_array($backend_ports)
-validate_re(${backend_ports}, '^\d+(\s\d+)*$', '$backend_ports must be 
an array of port numbers')
+validate_re($backend_ports, '^\d+(\s\d+)*$', '$backend_ports must be an 
array of port numbers')
 validate_re($server_port, '^\d+$', '$server_port must be a port number')
 
 package { 'statsdlb':

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I87655e349ec0171f3ac197dac325b5a1f8d65581
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Matanya mata...@foss.co.il

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

[MediaWiki-commits] [Gerrit] nova: fix string containing only a variable - change (operations/puppet)

2015-06-18 Thread Matanya (Code Review)

Matanya has uploaded a new change for review.

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

Change subject: nova: fix string containing only a variable
..

nova: fix string containing only a variable

Change-Id: Ie9018a84240ecc0168dd6433cef2642be6e23546
---
M modules/openstack/manifests/nova/compute.pp
1 file changed, 3 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/89/219189/1

diff --git a/modules/openstack/manifests/nova/compute.pp 
b/modules/openstack/manifests/nova/compute.pp
index 0ac7b9e..d73c914 100644
--- a/modules/openstack/manifests/nova/compute.pp
+++ b/modules/openstack/manifests/nova/compute.pp
@@ -12,7 +12,7 @@
 $certname = virt-star.${site}.wmnet
 $ca_target = '/etc/ssl/certs/wmf_ca_2014_2017.pem'
 }
-install_certificate{ ${certname}: }
+install_certificate{ $certname: }
 
 file { /var/lib/nova/${certname}.key:
 owner   = 'nova',
@@ -28,12 +28,12 @@
 file { '/var/lib/nova/clientcert.pem':
 ensure  = link,
 target  = /etc/ssl/localcerts/${certname}.crt,
-require = Install_certificate[${certname}],
+require = Install_certificate[$certname],
 }
 file { '/var/lib/nova/cacert.pem':
 ensure  = link,
 target  = $ca_target,
-require = Install_certificate[${certname}],
+require = Install_certificate[$certname],
 }
 file { '/var/lib/nova/.ssh':
 ensure  = directory,

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie9018a84240ecc0168dd6433cef2642be6e23546
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Matanya mata...@foss.co.il

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

[MediaWiki-commits] [Gerrit] [tools] report outage on tools.wmflabs.org - change (operations/puppet)

2015-06-18 Thread Merlijn van Deen (Code Review)

Merlijn van Deen has uploaded a new change for review.

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

Change subject: [tools] report outage on tools.wmflabs.org
..

[tools] report outage on tools.wmflabs.org

Change-Id: I0a6c6d0101cf3671a04ea57509bec7011557671e
---
M modules/dynamicproxy/templates/urlproxy.conf
1 file changed, 2 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/91/219191/1

diff --git a/modules/dynamicproxy/templates/urlproxy.conf 
b/modules/dynamicproxy/templates/urlproxy.conf
index 9591890..d4a5b37 100644
--- a/modules/dynamicproxy/templates/urlproxy.conf
+++ b/modules/dynamicproxy/templates/urlproxy.conf
@@ -50,6 +50,8 @@
 
 %- end -%
 
+return 503 Severe labs outage in progress. a 
href='https://wikitech.wikimedia.org/wiki/Incident_documentation/20150617-LabsNFSOutage'details
 here/a;
+
 # Some projects have tools that take data in and process them
 # for a long time. While ideally they should be made async, this
 # is an interim solution that works for now.

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I0a6c6d0101cf3671a04ea57509bec7011557671e
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Merlijn van Deen valhall...@arctus.nl

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

[MediaWiki-commits] [Gerrit] Add maven-scala-plugin version for release to work - change (analytics...source)

2015-06-18 Thread Joal (Code Review)

Joal has uploaded a new change for review.

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

Change subject: Add maven-scala-plugin version for release to work
..

Add maven-scala-plugin version for release to work

Change-Id: I200d09dd4e6c5213bb8c64800ec3484029f8d861
---
M refinery-job/pom.xml
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/analytics/refinery/source 
refs/changes/95/219195/1

diff --git a/refinery-job/pom.xml b/refinery-job/pom.xml
index e5d784c..4885078 100644
--- a/refinery-job/pom.xml
+++ b/refinery-job/pom.xml
@@ -85,6 +85,7 @@
 plugin
 groupIdorg.scala-tools/groupId
 artifactIdmaven-scala-plugin/artifactId
+version2.15.2/version
 executions
 execution
 goals

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I200d09dd4e6c5213bb8c64800ec3484029f8d861
Gerrit-PatchSet: 1
Gerrit-Project: analytics/refinery/source
Gerrit-Branch: master
Gerrit-Owner: Joal j...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] WIP: Send authorization header to cxserver - change (mediawiki...ContentTranslation)

2015-06-18 Thread Nikerabbit (Code Review)

Nikerabbit has uploaded a new change for review.

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

Change subject: WIP: Send authorization header to cxserver
..

WIP: Send authorization header to cxserver

Todo: add missing i18n message
Depends on commit on cxserver allowing the header

Change-Id: If349547fe072b3e7ef5a226afd34373a2199eb95
---
M composer.json
M extension.json
M modules/tools/ext.cx.tools.mt.js
3 files changed, 39 insertions(+), 8 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ContentTranslation 
refs/changes/94/219194/1

diff --git a/composer.json b/composer.json
index 5d3d30a..72bac9b 100644
--- a/composer.json
+++ b/composer.json
@@ -17,7 +17,8 @@
},
require: {
php: =5.3.0,
-   composer/installers: =1.0.1
+   composer/installers: =1.0.1,
+   firebase/php-jwt: ~2.1.0
},
require-dev: {
jakub-onderka/php-parallel-lint: 0.8.*,
diff --git a/extension.json b/extension.json
index da3643b..59639f1 100644
--- a/extension.json
+++ b/extension.json
@@ -38,7 +38,8 @@
APIModules: {
cxpublish: ApiContentTranslationPublish,
cxdelete: ApiContentTranslationDelete,
-   cxconfiguration: ApiContentTranslationConfiguration
+   cxconfiguration: ApiContentTranslationConfiguration,
+   cxtoken: ApiContentTranslationToken
},
APIListModules: {
contenttranslation: ApiQueryContentTranslation,
@@ -55,11 +56,12 @@
},
AutoloadClasses: {
ApiContentTranslationConfiguration: 
api/ApiContentTranslationConfiguration.php,
-   ApiContentTranslationPublish: 
api/ApiContentTranslationPublish.php,
ApiContentTranslationDelete: 
api/ApiContentTranslationDelete.php,
+   ApiContentTranslationPublish: 
api/ApiContentTranslationPublish.php,
+   ApiContentTranslationToken: 
api/ApiContentTranslationToken.php,
ApiQueryContentTranslation: 
api/ApiQueryContentTranslation.php,
-   ApiQueryContentTranslationStats: 
api/ApiQueryContentTranslationStats.php,
ApiQueryContentTranslationLanguageTrend: 
api/ApiQueryContentTranslationLanguageTrend.php,
+   ApiQueryContentTranslationStats: 
api/ApiQueryContentTranslationStats.php,
ApiQueryPublishedTranslations: 
api/ApiQueryPublishedTranslations.php,
ContentTranslationHooks: ContentTranslation.hooks.php,
ContentTranslation\\Database: includes/Database.php,
@@ -105,7 +107,11 @@
ContentTranslationUseMagnusTool: true,
ContentTranslationBrowserBlacklist: [ {
msie: [ [ , 10 ] ]
-   } ]
+   } ],
+   ContentTranslationCXServerAuth: {
+   algorithm: HS256,
+   key: 
+   }
},
ResourceModules: {
ext.cx.contributions: {
diff --git a/modules/tools/ext.cx.tools.mt.js b/modules/tools/ext.cx.tools.mt.js
index 29e69c1..2e0c33b 100644
--- a/modules/tools/ext.cx.tools.mt.js
+++ b/modules/tools/ext.cx.tools.mt.js
@@ -11,11 +11,28 @@
 ( function ( $, mw ) {
'use strict';
 
-   var cache = {}, // MT requests cache
+   var
+   cxserverToken = { issued: undefined, jwt: undefined },
+   cache = {}, // MT requests cache
providerIdPrefix = 'cx-provider-',
disableMT = 'disable-mt',
noMT = 'no-mt',
sourceMT = 'source-mt';
+
+   function getCXServerToken() {
+   if ( cxserverToken.jwt !== undefined ) {
+   return $.Deferred().resolve( cxserverToken.jwt );
+   }
+
+   // TODO: refetch if token is too old
+   return (new mw.Api())
+   .postWithToken( 'edit', { action: 'cxtoken' } )
+   .then( function ( response ) {
+   cxserverToken.jwt = response.jwt;
+   cxserverToken.issued = Date.now();
+   return response.jwt;
+   } );
+   }
 
/**
 * Get the registry of machine translation providers
@@ -80,8 +97,15 @@
$provider: MTControlCard.provider
} );
 
-   return $.post( mtURL, sourceHtml ).then( null, function () {
-   return $.Deferred().reject( 'service-failure', 
arguments ).promise();
+   return getCXServerToken().then( function ( token ) {
+   return $.ajax( {
+   type: 'post',
+   url: mtURL,
+   data: sourceHtml,
+   headers: {

[MediaWiki-commits] [Gerrit] Update raid1-lvm-conf.cfg - change (operations/puppet)

2015-06-18 Thread Ottomata (Code Review)

Ottomata has uploaded a new change for review.

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

Change subject: Update raid1-lvm-conf.cfg
..

Update raid1-lvm-conf.cfg

Change-Id: I4379f58ada57e5f4dc91fc3ca35f2d10f89df923
---
M modules/install-server/files/autoinstall/partman/raid1-lvm-conf.cfg
1 file changed, 20 insertions(+), 8 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/93/219193/1

diff --git 
a/modules/install-server/files/autoinstall/partman/raid1-lvm-conf.cfg 
b/modules/install-server/files/autoinstall/partman/raid1-lvm-conf.cfg
index dc2c016..fed1f6f 100644
--- a/modules/install-server/files/autoinstall/partman/raid1-lvm-conf.cfg
+++ b/modules/install-server/files/autoinstall/partman/raid1-lvm-conf.cfg
@@ -1,10 +1,16 @@
 # Automatic software RAID 1 with LVM partitioning.
-# / is 30GB on /dev/md0.
-# /dev/md1 fills up rest of disk, and a single LVM volume group is created on 
it.
-#   swap is 8GB on an LV
+# / is 30G on /dev/md0.
+# /dev/md1 fills up 1T of sda2 and sdb2, and a single LVM volume group is 
created on it.
+#   swap is 10G on an LV
 #   /var is a 60G LV
-#   /var/lib/zookeeper is a 250G LV
 #   /var/lib/etcd is a 250G LV
+#   /var/lib/zookeeper is a 250G LV
+#   _placeholder is an LV that fills up the rest of space.
+# This is a hack to keep the zookeepeer partition from using up all free 
space.
+#
+# NOTE:  Partition priorities were calculated after reading
+#
http://www.bishnet.net/tim/blog/2015/01/29/understanding-partman-autoexpert_recipe/
+#sum(priority - minimum) == 100%
 
 # Use the first 2 disks for RAID1
 d-i partman-auto/method  string  raid
@@ -31,14 +37,14 @@
 $primary{ } \
 $lvmignore{ } \
 . \
-1000 1000 8000 linux-swap \
+1000 1001 1 linux-swap \
 method{ swap } \
 format{ } \
 $lvmok{ } \
 lv_name{ swap } \
 $defaultignore{ } \
 . \
-1000 1000 6 ext4 \
+1000 1006 6 ext4 \
 mountpoint{ /var } \
 method{ format } \
 $primary{ } \
@@ -49,7 +55,7 @@
 filesystem{ ext4 } \
 $defaultignore{ } \
 . \
-1000 1000 25 ext4 \
+1000 1025 25 ext4 \
 mountpoint{ /var/lib/etcd } \
 method{ format } \
 $primary{ } \
@@ -60,7 +66,7 @@
 filesystem{ ext4 } \
 $defaultignore{ } \
 . \
-1000 1000 25 ext4 \
+1000 1025 25 ext4 \
 mountpoint{ /var/lib/zookeeper } \
 method{ format } \
 $primary{ } \
@@ -70,6 +76,12 @@
 use_filesystem{ } \
 filesystem{ ext4 } \
 $defaultignore{ } \
+. \
+1000 1043 -1 ext4 \
+method{ keep } \
+$defaultignore{ } \
+$lvmok{ } \
+lv_name{ _placeholder } \
 .
 
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I4379f58ada57e5f4dc91fc3ca35f2d10f89df923
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ottomata o...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] Allow Authorization header - change (mediawiki...cxserver)

2015-06-18 Thread Nikerabbit (Code Review)

Nikerabbit has uploaded a new change for review.

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

Change subject: Allow Authorization header
..

Allow Authorization header

Change-Id: I5d3b0e62569a88857d523d5a90a12ddb7ece0488
---
M ContentTranslationService.js
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/ContentTranslationService.js b/ContentTranslationService.js
index 469c53a..1443ec5 100644
--- a/ContentTranslationService.js
+++ b/ContentTranslationService.js
@@ -45,7 +45,7 @@
 
 app.use( function ( req, res, next ) {
res.header( 'Access-Control-Allow-Origin', conf( 'allowCORS' ) );
-   res.header( 'Access-Control-Allow-Headers', 'X-Requested-With' );
+   res.header( 'Access-Control-Allow-Headers', 'X-Requested-With, 
Authorization' );
next();
 } );
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I5d3b0e62569a88857d523d5a90a12ddb7ece0488
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/cxserver
Gerrit-Branch: master
Gerrit-Owner: Nikerabbit niklas.laxst...@gmail.com

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

[MediaWiki-commits] [Gerrit] [tools] report outage on tools.wmflabs.org - change (operations/puppet)

2015-06-18 Thread Yuvipanda (Code Review)

Yuvipanda has submitted this change and it was merged.

Change subject: [tools] report outage on tools.wmflabs.org
..


[tools] report outage on tools.wmflabs.org

Change-Id: I0a6c6d0101cf3671a04ea57509bec7011557671e
---
M modules/dynamicproxy/templates/urlproxy.conf
1 file changed, 4 insertions(+), 0 deletions(-)

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



diff --git a/modules/dynamicproxy/templates/urlproxy.conf 
b/modules/dynamicproxy/templates/urlproxy.conf
index 9591890..dc0e068 100644
--- a/modules/dynamicproxy/templates/urlproxy.conf
+++ b/modules/dynamicproxy/templates/urlproxy.conf
@@ -50,6 +50,10 @@
 
 %- end -%
 
+# Banner for labs outage 2015-06-18
+default_type text/html;
+return 503 \n\nhtmlSevere labs outage in progress. a 
href='https://wikitech.wikimedia.org/wiki/Incident_documentation/20150617-LabsNFSOutage'details
 here/a\n\n;
+
 # Some projects have tools that take data in and process them
 # for a long time. While ideally they should be made async, this
 # is an interim solution that works for now.

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I0a6c6d0101cf3671a04ea57509bec7011557671e
Gerrit-PatchSet: 4
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Merlijn van Deen valhall...@arctus.nl
Gerrit-Reviewer: Yuvipanda yuvipa...@gmail.com
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] Upgrade mediawiki codesniffer to 0.2.0 - change (mediawiki...MobileFrontend)

2015-06-18 Thread jenkins-bot (Code Review)

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

Change subject: Upgrade mediawiki codesniffer to 0.2.0
..


Upgrade mediawiki codesniffer to 0.2.0

Change-Id: Ia2909d26820464732d2bd46ca3ebff667b8fd15a
---
M composer.json
M includes/MobileContext.php
M includes/MobileFrontend.body.php
M includes/MobileFrontend.hooks.php
M includes/specials/SpecialMobileEditor.php
M includes/specials/SpecialMobileWatchlist.php
6 files changed, 6 insertions(+), 6 deletions(-)

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



diff --git a/composer.json b/composer.json
index 6f6d621..d73d133 100644
--- a/composer.json
+++ b/composer.json
@@ -1,7 +1,7 @@
 {
require-dev: {
jakub-onderka/php-parallel-lint: 0.8.*,
-   mediawiki/mediawiki-codesniffer: 0.1.0
+   mediawiki/mediawiki-codesniffer: 0.2.0
},
scripts: {
test: [
diff --git a/includes/MobileContext.php b/includes/MobileContext.php
index b69c04d..5b39b61 100644
--- a/includes/MobileContext.php
+++ b/includes/MobileContext.php
@@ -1046,7 +1046,7 @@
 */
public function addAnalyticsLogItemFromXAnalytics( $xanalytics_item ) {
list( $key, $val ) = explode( '=', $xanalytics_item, 2 );
-   $this-addAnalyticsLogItem( urldecode( $key ), urldecode( $val 
));
+   $this-addAnalyticsLogItem( urldecode( $key ), urldecode( $val 
) );
}
 
/**
diff --git a/includes/MobileFrontend.body.php b/includes/MobileFrontend.body.php
index 81b5f8e..7ed20bc 100644
--- a/includes/MobileFrontend.body.php
+++ b/includes/MobileFrontend.body.php
@@ -85,7 +85,7 @@
return null;
}
return $entity-getFingerprint()-getDescription( 
$wgContLang-getCode() )-getText();
-   } catch ( Exception $ex) {
+   } catch ( Exception $ex ) {
// Do nothing, exception mostly due to description 
being unavailable in needed language
}
return null;
diff --git a/includes/MobileFrontend.hooks.php 
b/includes/MobileFrontend.hooks.php
index 7dfcb03..0236b65 100644
--- a/includes/MobileFrontend.hooks.php
+++ b/includes/MobileFrontend.hooks.php
@@ -194,7 +194,7 @@
 
// Bug 43123: force mobile URLs only for local redirects
if ( $context-isLocalUrl( $redirect ) ) {
-   $out-addVaryHeader( 'X-Subdomain');
+   $out-addVaryHeader( 'X-Subdomain' );
$out-addVaryHeader( 'X-CS' );
$redirect = $context-getMobileUrl( $redirect );
}
diff --git a/includes/specials/SpecialMobileEditor.php 
b/includes/specials/SpecialMobileEditor.php
index 266d0a1..de27686 100644
--- a/includes/specials/SpecialMobileEditor.php
+++ b/includes/specials/SpecialMobileEditor.php
@@ -22,7 +22,7 @@
public function executeWhenAvailable( $subpage ) {
$title = Title::newFromText( $subpage );
 
-   if ( is_null( $title )) {
+   if ( is_null( $title ) ) {
$this-showPageNotFound();
return;
}
diff --git a/includes/specials/SpecialMobileWatchlist.php 
b/includes/specials/SpecialMobileWatchlist.php
index b9253a3..06a343a 100644
--- a/includes/specials/SpecialMobileWatchlist.php
+++ b/includes/specials/SpecialMobileWatchlist.php
@@ -238,7 +238,7 @@
$options = array( 'ORDER BY' = 'rc_timestamp DESC' );
$options['LIMIT'] = self::LIMIT;
 
-   $rollbacker = $user-isAllowed('rollback');
+   $rollbacker = $user-isAllowed( 'rollback' );
if ( $rollbacker ) {
$tables[] = 'page';
$join_conds['page'] = array( 'LEFT JOIN', 
'rc_cur_id=page_id' );

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia2909d26820464732d2bd46ca3ebff667b8fd15a
Gerrit-PatchSet: 9
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Paladox thomasmulhall...@yahoo.com
Gerrit-Reviewer: Florianschmidtwelzow florian.schmidt.wel...@t-online.de
Gerrit-Reviewer: Jdlrobson jrob...@wikimedia.org
Gerrit-Reviewer: Legoktm legoktm.wikipe...@gmail.com
Gerrit-Reviewer: Paladox thomasmulhall...@yahoo.com
Gerrit-Reviewer: Phuedx g...@samsmith.io
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] Rename WikidataQuality repos to WikibaseQuality repos. - change (integration/config)

2015-06-18 Thread jenkins-bot (Code Review)

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

Change subject: Rename WikidataQuality repos to WikibaseQuality repos.
..


Rename WikidataQuality repos to WikibaseQuality repos.

Remove duplicate jshint job, it already is run during npm.
Remove duplicate trigger for npm job.

Change-Id: I4677df5b3d16f5379e1cb6ae8ec00413a3d551f7
---
M jjb/wikidata.yaml
M zuul/layout.yaml
2 files changed, 58 insertions(+), 63 deletions(-)

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



diff --git a/jjb/wikidata.yaml b/jjb/wikidata.yaml
index a9f6948..35ecdfa 100644
--- a/jjb/wikidata.yaml
+++ b/jjb/wikidata.yaml
@@ -195,7 +195,7 @@
   - wikidata-query-rdf
 
 - project:
-name: WikidataQuality
+name: WikibaseQuality
 # By default we do not need any other extensions:
 dependencies: 
 
@@ -209,7 +209,7 @@
 jobs:
 
  - 'mwext-{ext-name}-{kind}-tests-{dbflavor}-{phpflavor}':
-ext-name: 'WikidataQuality'
+ext-name: 'WikibaseQuality'
 kind: repo
 repoorclient: 'repo'
 dependencies: 'Wikibase'
@@ -219,14 +219,14 @@
 phpflavor:
   - zend
   - hhvm
-phpunit-params: '--group WikibaseQuality,WikidataQuality'
+phpunit-params: '--group WikibaseQuality'
 
  - 'mwext-{ext-name}-qunit':
-ext-name: 'WikidataQuality'
+ext-name: 'WikibaseQuality'
 dependencies: 'Wikibase'
 
 - project:
-name: WikidataQualityConstraints
+name: WikibaseQualityConstraints
 # By default we do not need any other extensions:
 dependencies: 
 
@@ -239,29 +239,25 @@
 
 jobs:
 
- - '{name}-{ext-name}-npm':
-name: 'mwext'
-ext-name: 'WikidataQualityConstraints'
-
  - 'mwext-{ext-name}-{kind}-tests-{dbflavor}-{phpflavor}':
-ext-name: 'WikidataQualityConstraints'
+ext-name: 'WikibaseQualityConstraints'
 kind: repo
 repoorclient: 'repo'
-dependencies: 'Wikibase WikidataQuality'
+dependencies: 'Wikibase WikibaseQuality'
 dbflavor:
   - mysql
   - sqlite
 phpflavor:
   - zend
   - hhvm
-phpunit-params: '--group WikidataQuality'
+phpunit-params: '--group WikibaseQuality'
 
  - 'mwext-{ext-name}-qunit':
-ext-name: 'WikidataQualityConstraints'
-dependencies: 'Wikibase WikidataQuality'
+ext-name: 'WikibaseQualityConstraints'
+dependencies: 'Wikibase WikibaseQuality'
 
 - project:
-name: WikidataQualityExternalValidation
+name: WikibaseQualityExternalValidation
 # By default we do not need any other extensions:
 dependencies: 
 
@@ -274,24 +270,19 @@
 
 jobs:
 
- - '{name}-{ext-name}-npm':
-name: 'mwext'
-ext-name: 'WikidataQualityExternalValidation'
-
  - 'mwext-{ext-name}-{kind}-tests-{dbflavor}-{phpflavor}':
-ext-name: 'WikidataQualityExternalValidation'
+ext-name: 'WikibaseQualityExternalValidation'
 kind: repo
 repoorclient: 'repo'
-dependencies: 'Wikibase WikidataQuality'
+dependencies: 'Wikibase WikibaseQuality'
 dbflavor:
   - mysql
   - sqlite
 phpflavor:
   - zend
   - hhvm
-phpunit-params: '--group WikidataQuality'
+phpunit-params: '--group WikibaseQuality'
 
  - 'mwext-{ext-name}-qunit':
-ext-name: 'WikidataQualityExternalValidation'
-dependencies: 'Wikibase WikidataQuality'
-
+ext-name: 'WikibaseQualityExternalValidation'
+dependencies: 'Wikibase WikibaseQuality'
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 5a89b61..ba0f310 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -5780,82 +5780,86 @@
   - name: extension-unittests-generic
   - name: npm
 
-  - name: mediawiki/extensions/WikidataQuality
+  - name: mediawiki/extensions/WikibaseQuality
 template:
-  - name: lint-js
   - name: npm
 check:
+  - jsonlint
   - phplint
   - php-composer-package-validate
 test:
+  - jsonlint
   - phplint
   - php-composer-package-validate
-  - mwext-WikidataQuality-repo-tests-sqlite-hhvm
-  - mwext-WikidataQuality-repo-tests-mysql-hhvm
-  - mwext-WikidataQuality-qunit
+  - mwext-WikibaseQuality-repo-tests-sqlite-hhvm
+  - mwext-WikibaseQuality-repo-tests-mysql-hhvm
+  - mwext-WikibaseQuality-qunit
 zend:
-  - mwext-WikidataQuality-repo-tests-sqlite-zend
-  - mwext-WikidataQuality-repo-tests-mysql-zend
+  - mwext-WikibaseQuality-repo-tests-sqlite-zend
+  - mwext-WikibaseQuality-repo-tests-mysql-zend
 gate-and-submit:
+  - jsonlint
   - phplint
   - php-composer-package-validate
-  - mwext-WikidataQuality-repo-tests-sqlite-zend
-  - mwext-WikidataQuality-repo-tests-mysql-zend
-  - mwext-WikidataQuality-repo-tests-sqlite-hhvm
-

[MediaWiki-commits] [Gerrit] Add documentation to GlobalBlocking messages currently missi... - change (mediawiki...GlobalBlocking)

2015-06-18 Thread jenkins-bot (Code Review)

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

Change subject: Add documentation to GlobalBlocking messages currently missing 
them
..


Add documentation to GlobalBlocking messages currently missing them

Also removed 'globalblocking-whitelist-errors' and
'globalblocking-unblock-subtitle' which is no longer used.

Bug: T102851

Change-Id: I876e39c7a86bbd8fea5b22b81bfd14deff329ceb
---
M i18n/en.json
M i18n/qqq.json
2 files changed, 25 insertions(+), 3 deletions(-)

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



diff --git a/i18n/en.json b/i18n/en.json
index 5f748bb..d8c6f4e 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -62,7 +62,6 @@
globalblocking-unblock-unblocked: You have successfully removed the 
global block #$2 on the IP address '''$1'''.,
globalblocking-unblock-errors: Your removal of the global block was 
unsuccessful, for the following {{PLURAL:$1|reason|reasons}}:,
globalblocking-unblock-successsub: Global block successfully 
removed.,
-   globalblocking-unblock-subtitle: Removing global block,
globalblocking-unblock-intro: You can use this form to remove a 
global block.,
globalblocking-whitelist: Local status of global blocks,
globalblocking-whitelist-notapplied: Global blocks are not applied 
at this wiki,\nso the local status of global blocks cannot be modified.,
diff --git a/i18n/qqq.json b/i18n/qqq.json
index 90570cc..e20b686 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -6,6 +6,7 @@
EugeneZelenko,
Ficell,
Fryed-peach,
+   Glaisher,
Jon Harald Søby,
Lloffiwr,
Meno25,
@@ -30,6 +31,12 @@
},
globalblocking-desc: {{desc|name=Global 
Blocking|url=https://www.mediawiki.org/wiki/Extension:GlobalBlocking}};,
globalblocking-block: {{Identical|Globally block IP address}},
+   globalblocking-modify-intro: Used as an introductory text on 
Special:GlobalBlock form if the target is already blocked.\n\nSee also:\n* 
{{msg-mw|globalblocking-block-intro}},
+   globalblocking-block-intro: 
{{Doc-specialpagesummary|globalblock}}Used as an introductory text on 
Special:GlobalBlock form.\n\nSee also:\n* 
{{msg-mw|globalblocking-modify-intro}},
+   globalblocking-block-legend: Used as legend for the fieldset around 
the input form of Special:GlobalBlock.,
+   globalblocking-block-submit: Used as submit button text on 
Special:GlobalBlock form.\n\nSee also:\n* 
{{msg-mw|globalblocking-modify-submit}}\n* {{msg-mw|ipbsubmit}},
+   globalblocking-modify-submit: Used as submit button text on 
Special:GlobalBlock form when modifying an existing global block.\n\nSee 
also:\n* {{msg-mw|globalblocking-block-submit}}\n* {{msg-mw|ipb-change-block}},
+   globalblocking-return: Link to Special:GlobalBlockList. Shown on 
Special:GlobalBlock, Special:GlobalWhiteList and Special:GlobalUnblock below 
the success message.\n\nSuccess 
messages:\n*{{msg-mw|globalblocking-block-success}}\n*{{msg-mw|globalblocking-modify-success}}\n*{{msg-mw|globalblocking-unblock-unblocked}}\n*{{msg-mw|globalblocking-whitelist-whitelisted}}\n*{{msg-mw|globalblocking-whitelist-dewhitelisted}},
globalblocking-expiry-options: {{notranslate}},
globalblocking-block-reason: {{Identical|Reason}},
globalblocking-block-otherreason: {{Identical/Other/additional 
reason}},
@@ -64,21 +71,36 @@
globalblocking-list-whitelisted: Used as a block option in 
Special:GlobalBlockList. Parameters:\n* $1 - username\n* $2 - reason,
globalblocking-list-whitelist: {{Identical|Local status}},
globalblocking-list-modify: {{Identical|Modify}},
-   globalblocking-goto-block: {{Identical|Globally block IP address}},
+   globalblocking-list: Title of Special:GlobalBlockList,
+   globalblocking-search-legend: Used as legend of the fieldset around 
the input form of Special:GlobalBlockList\n\nSee also:\n* 
{{msg-mw|ipblocklist-legend}}\n *{{msg-mw|globalblocking-block-legend}},
+   globalblocking-search-submit: Used as submit button text on 
Special:GlobalBlockList form.\n\nSee also:\n* {{msg-mw|Ipblocklist-submit}},
+   globalblocking-list-noresults: Shown on Special:GlobalBlockList when 
no global blocks are found. Shown when the target is specified or if there are 
no global blocks.\n\nSee also:\n* {{msg-mw|ipblocklist-no-results}},
+   globalblocking-goto-block: Navigation link to 
Special:GlobalBlock.\n{{Identical|Globally block IP address}}\n\nSee also:\n* 
{{msg-mw|globalblocking-goto-status}}\n* 
{{msg-mw|globalblocking-goto-unblock}},
+   globalblocking-goto-unblock: Navigation link to 
Special:GlobalUnblock. Shown below the title of Special:GlobalBlock, 
Special:GlobalBlockList and Special:GlobalBlockStatus.\n\nSee

[MediaWiki-commits] [Gerrit] Fix custom table naming when table_name is not set - change (wikimedia...civicrm)

2015-06-18 Thread Ejegg (Code Review)

Ejegg has submitted this change and it was merged.

Change subject: Fix custom table naming when table_name is not set
..


Fix custom table naming when table_name is not set

This is important when writing migrations for legacy tables which were created
from the UI.  In this case, we want Civi to build table name like
civicrm_value_GROUPNAME_ID.  Note that this only affects dev and test 
installs.

Change-Id: I25fcf9cccecd6e33cacfb7b1b9280f5eed028ac3
---
M CRM/Core/BAO/CustomField.php
M CRM/Core/BAO/CustomGroup.php
M patches/civicrm-4.2.19-drupal-wmf-custom-names.patch
3 files changed, 15 insertions(+), 11 deletions(-)

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



diff --git a/CRM/Core/BAO/CustomField.php b/CRM/Core/BAO/CustomField.php
index f734d65..f414984 100644
--- a/CRM/Core/BAO/CustomField.php
+++ b/CRM/Core/BAO/CustomField.php
@@ -2225,6 +2225,7 @@
   return $dao-id;
 }
 else {
+  // FIXME: This should be an exception.
   return NULL;
 }
   }
diff --git a/CRM/Core/BAO/CustomGroup.php b/CRM/Core/BAO/CustomGroup.php
index 3df400b..951c9f6 100644
--- a/CRM/Core/BAO/CustomGroup.php
+++ b/CRM/Core/BAO/CustomGroup.php
@@ -140,15 +140,6 @@
   $group-created_id = CRM_Utils_Array::value('created_id', $params);
   $group-created_date = CRM_Utils_Array::value('created_date', $params);
 
-
-  // lets create the table associated with the group and save it
-  if (isset($params['table_name'])) {
-  $tableName = $params['table_name'];
-  } else {
-  $munged_title = strtolower(CRM_Utils_String::munge($group-title, 
'_', 32));
-  $tableName = civicrm_value_{$munged_title}_{$group-id};
-  }
-
   // we do this only once, so name never changes
   $group-name = CRM_Utils_String::munge($params['title'], '_', 64);
   if (isset($params['name'])) {
@@ -163,7 +154,15 @@
 $transaction = new CRM_Core_Transaction();
 
 $group-save();
-if ($tableName) {
+
+if (isset($params['table_name'])) {
+  $tableName = $params['table_name'];
+} else {
+  $munged_title = strtolower(CRM_Utils_String::munge($group-title, '_', 
32));
+  $tableName = civicrm_value_{$munged_title}_{$group-id};
+}
+
+if (!isset($params['id'])) {
   $group-table_name = $tableName;
   CRM_Core_DAO::setFieldValue('CRM_Core_DAO_CustomGroup',
 $group-id,
@@ -190,7 +189,7 @@
 // reset the cache
 CRM_Utils_System::flushCache();
 
-if ($tableName) {
+if (!isset($params['id'])) {
   CRM_Utils_Hook::post('create', 'CustomGroup', $group-id, $group);
 }
 else {
diff --git a/patches/civicrm-4.2.19-drupal-wmf-custom-names.patch 
b/patches/civicrm-4.2.19-drupal-wmf-custom-names.patch
index 41f858d..2807c90 100644
--- a/patches/civicrm-4.2.19-drupal-wmf-custom-names.patch
+++ b/patches/civicrm-4.2.19-drupal-wmf-custom-names.patch
@@ -1,3 +1,7 @@
+Note: this code was wrong for the case where table_name is not passed in.
+The change has been upstreamed correctly, abandon this.
+
+I donno what the is_view thing was about.
 diff -urN civicrm-4.2.19/CRM/Core/BAO/CustomField.php 
civicrm-4.2.19-wmf/CRM/Core/BAO/CustomField.php
 --- civicrm-4.2.19/CRM/Core/BAO/CustomField.php2014-09-09 
15:40:20.0 -0700
 +++ civicrm-4.2.19-wmf/CRM/Core/BAO/CustomField.php2015-03-11 
13:31:10.274248477 -0700

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I25fcf9cccecd6e33cacfb7b1b9280f5eed028ac3
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm/civicrm
Gerrit-Branch: master
Gerrit-Owner: Awight awi...@wikimedia.org
Gerrit-Reviewer: AndyRussG andrew.green...@gmail.com
Gerrit-Reviewer: Awight awi...@wikimedia.org
Gerrit-Reviewer: Cdentinger cdentin...@wikimedia.org
Gerrit-Reviewer: Ejegg eeggles...@wikimedia.org
Gerrit-Reviewer: Katie Horn kh...@wikimedia.org
Gerrit-Reviewer: Ssmith ssm...@wikimedia.org
Gerrit-Reviewer: XenoRyet dkozlow...@wikimedia.org
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] Qualify erb template variables - change (operations/puppet)

2015-06-18 Thread Ottomata (Code Review)

Ottomata has submitted this change and it was merged.

Change subject: Qualify erb template variables
..


Qualify erb template variables

Bug: T97251
Change-Id: I1e9655024162966a93082ee9f96bfbb8f259f715
---
M manifests/role/analytics/kafka.pp
M modules/zookeeper
M templates/udp2log/filters.erbium.erb
M templates/udp2log/filters.misc.erb
M templates/udp2log/filters.mw.erb
5 files changed, 6 insertions(+), 6 deletions(-)

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



diff --git a/manifests/role/analytics/kafka.pp 
b/manifests/role/analytics/kafka.pp
index 52aa19a..b77e7d8 100644
--- a/manifests/role/analytics/kafka.pp
+++ b/manifests/role/analytics/kafka.pp
@@ -108,7 +108,7 @@
 }
 $zookeeper_hosts  = keys(hiera('zookeeper_hosts'))
 $zookeeper_chroot = /kafka/${kafka_cluster_name}
-$zookeeper_url= inline_template(%= @zookeeper_hosts.sort.join(',') 
%%= zookeeper_chroot %)
+$zookeeper_url= inline_template(%= @zookeeper_hosts.sort.join(',') 
%%= @zookeeper_chroot %)
 }
 
 # == Class role::analytics::kafka::client
diff --git a/modules/zookeeper b/modules/zookeeper
index 3272c7c..6e3a24b 16
--- a/modules/zookeeper
+++ b/modules/zookeeper
-Subproject commit 3272c7cc8dbe5ca5746c20ab8598229c69ad6d2d
+Subproject commit 6e3a24b08327f61bb09a9924e76e51c09180b3d9
diff --git a/templates/udp2log/filters.erbium.erb 
b/templates/udp2log/filters.erbium.erb
index 7707dc1..6a4eaef 100644
--- a/templates/udp2log/filters.erbium.erb
+++ b/templates/udp2log/filters.erbium.erb
@@ -3,7 +3,7 @@
 ###
 
 ### udp2log packet loss monitoring
-pipe 10 /usr/bin/packet-loss 10 '\t'  %= packet_loss_log %
+pipe 10 /usr/bin/packet-loss 10 '\t'  %= @packet_loss_log %
 
 ### Fundraising
 ## Landing pages
@@ -16,9 +16,9 @@
 ### 0.0001 of all udp2log messages
 # This filter has been migrated to Hive. It's output is available on
 # stat1002 at /a/log/webrequest/archive/sampled
-file 1000 %= log_directory %/sampled-1000.tsv.log
+file 1000 %= @log_directory %/sampled-1000.tsv.log
 
 ### All 5xx error responses.
 # This filter has been migrated to Hive. It's output is available on
 # stat1002 at /a/log/webrequest/archive/5xx
-pipe 1 /usr/bin/udp-filter -F '\t' -r -s '^5' | awk -W interactive '$9 !~ 
upload.wikimedia.org'  %= log_directory %/5xx.tsv.log
+pipe 1 /usr/bin/udp-filter -F '\t' -r -s '^5' | awk -W interactive '$9 !~ 
upload.wikimedia.org'  %= @log_directory %/5xx.tsv.log
diff --git a/templates/udp2log/filters.misc.erb 
b/templates/udp2log/filters.misc.erb
index ac9febb..d3f4de4 100644
--- a/templates/udp2log/filters.misc.erb
+++ b/templates/udp2log/filters.misc.erb
@@ -3,7 +3,7 @@
 ###
 
 ### udp2log packet loss monitoring
-pipe 10 /usr/bin/packet-loss 10 '\t'  %= log_directory %/packet-loss.log
+pipe 10 /usr/bin/packet-loss 10 '\t'  %= @log_directory %/packet-loss.log
 
 ### This feeds all http related graphs in graphite / gdash.wikimedia.org
 # We moved this to erbium on Jan 30, and recently have been noticing
diff --git a/templates/udp2log/filters.mw.erb b/templates/udp2log/filters.mw.erb
index 1878327..d83516f 100644
--- a/templates/udp2log/filters.mw.erb
+++ b/templates/udp2log/filters.mw.erb
@@ -1,4 +1,4 @@
-flush pipe 1 python /usr/local/bin/demux.py% if 
has_variable?(log_directory) then % --basedir %= log_directory %% end %
+flush pipe 1 python /usr/local/bin/demux.py% if 
has_variable?(log_directory) then % --basedir %= @log_directory %% end %
 
 # Relay MediaWiki exceptions and fatals to eventlog1001 for generating reports.
 # The trailing space in the egrep regex expression, make sure we only catch

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I1e9655024162966a93082ee9f96bfbb8f259f715
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ottomata o...@wikimedia.org
Gerrit-Reviewer: Ottomata o...@wikimedia.org
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] wikitech apache: qualify realm var - change (operations/puppet)

2015-06-18 Thread Ottomata (Code Review)

Ottomata has submitted this change and it was merged.

Change subject: wikitech apache: qualify realm var
..


wikitech apache: qualify realm var

bug: T97251
Change-Id: I3a75d669bbb9f18c3b1d580b9263e7060cc81ec9
---
M templates/apache/sites/wikitech.wikimedia.org.erb
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/templates/apache/sites/wikitech.wikimedia.org.erb 
b/templates/apache/sites/wikitech.wikimedia.org.erb
index d820b43..4519235 100644
--- a/templates/apache/sites/wikitech.wikimedia.org.erb
+++ b/templates/apache/sites/wikitech.wikimedia.org.erb
@@ -103,7 +103,7 @@
 Alias /w /srv/mediawiki/docroot/wikimedia.org/w
 Alias /wiki /srv/mediawiki/docroot/wikimedia.org/w/index.php
 Alias /dumps /a/backup/public
-% if realm == labs %
+% if @realm == labs %
 # Add additional wikis for development
 Alias /w2 /srv/org/wikimedia/controller/wikis/w2
 Alias /wiki2 /srv/org/wikimedia/controller/wikis/w2/index.php

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I3a75d669bbb9f18c3b1d580b9263e7060cc81ec9
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Matanya mata...@foss.co.il
Gerrit-Reviewer: Alexandros Kosiaris akosia...@wikimedia.org
Gerrit-Reviewer: Andrew Bogott abog...@wikimedia.org
Gerrit-Reviewer: Dzahn dz...@wikimedia.org
Gerrit-Reviewer: Ottomata o...@wikimedia.org
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] Fix stacked-bar chart - change (analytics/dashiki)

2015-06-18 Thread Milimetric (Code Review)

Milimetric has submitted this change and it was merged.

Change subject: Fix stacked-bar chart
..


Fix stacked-bar chart

Includes:
* if: data bug fix
* correction of raw data int casting

Bug: T91123
Change-Id: I10999d5597b5c9e0993a78ee86a4717e646ae9d7
---
M src/app/data-converters/separated-values.js
M src/components/a-b-compare/compare-stacked-bars.html
2 files changed, 6 insertions(+), 6 deletions(-)

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



diff --git a/src/app/data-converters/separated-values.js 
b/src/app/data-converters/separated-values.js
index 1676375..c132dee 100644
--- a/src/app/data-converters/separated-values.js
+++ b/src/app/data-converters/separated-values.js
@@ -86,10 +86,11 @@
 rowsByDate[row[0]].push(
 _(value).take(header.length).map(function (v) {
 // force numbers, strings, or null
-var number = parseFloat(v);
-return isNaN(number)
-? v ? v : null
-: number;
+v = v.trim();
+if (/^[-+]?([0-9]+(\.[0-9]+)?|\.[0-9]+)$/.test(v)) {
+return parseFloat(v);
+}
+return v.length === 0 ? null : v;
 }).value()
 );
 });
diff --git a/src/components/a-b-compare/compare-stacked-bars.html 
b/src/components/a-b-compare/compare-stacked-bars.html
index 30a3f0b..a535785 100644
--- a/src/components/a-b-compare/compare-stacked-bars.html
+++ b/src/components/a-b-compare/compare-stacked-bars.html
@@ -1,9 +1,8 @@
-div class=ui grid
+div class=ui grid  data-bind=if: data
 div data-bind=if: data().showAB.a class=eight wide full height column
 stacked-bars params=data: data().a, colors: $data.colors/
 /div
 div data-bind=if: data().showAB.b class=eight wide full height column
 stacked-bars params=data: data().b, colors: $data.colors/
 /div
-div class=stacked-bars-legend/div
 /div

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I10999d5597b5c9e0993a78ee86a4717e646ae9d7
Gerrit-PatchSet: 4
Gerrit-Project: analytics/dashiki
Gerrit-Branch: master
Gerrit-Owner: Mforns mfo...@wikimedia.org
Gerrit-Reviewer: Mforns mfo...@wikimedia.org
Gerrit-Reviewer: Milimetric dandree...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] Hygiene: Officially deprecate global functions - change (mediawiki...CentralNotice)

2015-06-18 Thread jenkins-bot (Code Review)

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

Change subject: Hygiene: Officially deprecate global functions
..


Hygiene: Officially deprecate global functions

Change-Id: Idfa3ba83462f955400b07cb9c13a2f5c550c76d6
---
M modules/ext.centralNotice.bannerController/bannerController.js
1 file changed, 9 insertions(+), 15 deletions(-)

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



diff --git a/modules/ext.centralNotice.bannerController/bannerController.js 
b/modules/ext.centralNotice.bannerController/bannerController.js
index 5533e59..dec1389 100644
--- a/modules/ext.centralNotice.bannerController/bannerController.js
+++ b/modules/ext.centralNotice.bannerController/bannerController.js
@@ -281,16 +281,6 @@
 
mw.cnBannerControllerLib.chooseBanner( randomBanner );
},
-   // TODO: move function definitions once controller cache has 
cleared
-   insertBanner: function( bannerJson ) {
-   window.insertBanner( bannerJson );
-   },
-   toggleNotice: function () {
-   window.toggleNotice();
-   },
-   hideBanner: function() {
-   window.hideBanner();
-   },
// Record banner impression using old-style URL
recordImpression: function( data ) {
 
@@ -417,8 +407,7 @@
// banner was specifically requested via banner= the record impression 
call
// will NOT be made.
//
-   // TODO: Migrate away from global functions
-   window.insertBanner = function ( bannerJson ) {
+   mw.centralNotice.insertBanner = function ( bannerJson ) {
var url, targets, durations, cookieName, cookieVal, deleteOld, 
now,
parsedCookie, bucket;
 
@@ -541,7 +530,7 @@
};
 
// Function for hiding banners when the user clicks the close button
-   window.hideBanner = function () {
+   mw.centralNotice.hideBanner = function () {
var d = new Date(),
cookieVal = {
v: 1,
@@ -577,10 +566,15 @@
};
 
// This function is deprecated
-   window.toggleNotice = function () {
-   window.hideBanner();
+   mw.centralNotice.toggleNotice = function () {
+   mw.centralNotice.hideBanner();
};
 
+   // Deprecation notices:
+   mw.log.deprecate( window, 'insertBanner', 
mw.centralNotice.insertBanner, 'Use mw.centralNotice method instead' );
+   mw.log.deprecate( window, 'hideBanner', mw.centralNotice.hideBanner, 
'Use mw.centralNotice method instead' );
+   mw.log.deprecate( window, 'toggleNotice', 
mw.centralNotice.toggleNotice, 'Use mw.centralNotice method instead' );
+
// Initialize CentralNotice
$( function() {
mw.centralNotice.initialize();

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Idfa3ba83462f955400b07cb9c13a2f5c550c76d6
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/extensions/CentralNotice
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson jrob...@wikimedia.org
Gerrit-Reviewer: AndyRussG andrew.green...@gmail.com
Gerrit-Reviewer: Awight awi...@wikimedia.org
Gerrit-Reviewer: Ejegg eeggles...@wikimedia.org
Gerrit-Reviewer: Krinkle krinklem...@gmail.com
Gerrit-Reviewer: Ssmith ssm...@wikimedia.org
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] Update raid1-lvm-conf.cfg - change (operations/puppet)

2015-06-18 Thread Ottomata (Code Review)

Ottomata has submitted this change and it was merged.

Change subject: Update raid1-lvm-conf.cfg
..


Update raid1-lvm-conf.cfg

Change-Id: I4379f58ada57e5f4dc91fc3ca35f2d10f89df923
---
M modules/install-server/files/autoinstall/partman/raid1-lvm-conf.cfg
1 file changed, 22 insertions(+), 8 deletions(-)

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



diff --git 
a/modules/install-server/files/autoinstall/partman/raid1-lvm-conf.cfg 
b/modules/install-server/files/autoinstall/partman/raid1-lvm-conf.cfg
index dc2c016..d09d2b3 100644
--- a/modules/install-server/files/autoinstall/partman/raid1-lvm-conf.cfg
+++ b/modules/install-server/files/autoinstall/partman/raid1-lvm-conf.cfg
@@ -1,10 +1,18 @@
+# Partman recipe for conf100x servers (etcd  zookeeper)
+#
 # Automatic software RAID 1 with LVM partitioning.
-# / is 30GB on /dev/md0.
-# /dev/md1 fills up rest of disk, and a single LVM volume group is created on 
it.
-#   swap is 8GB on an LV
+# / is 30G on /dev/md0.
+# /dev/md1 fills up 1T of sda2 and sdb2, and a single LVM volume group is 
created on it.
+#   swap is 10G on an LV
 #   /var is a 60G LV
-#   /var/lib/zookeeper is a 250G LV
 #   /var/lib/etcd is a 250G LV
+#   /var/lib/zookeeper is a 250G LV
+#   _placeholder is an LV that fills up the rest of space.
+# This is a hack to keep the zookeepeer partition from using up all free 
space.
+#
+# NOTE:  Partition priorities were calculated after reading
+#
http://www.bishnet.net/tim/blog/2015/01/29/understanding-partman-autoexpert_recipe/
+#sum(priority - minimum) == 100%
 
 # Use the first 2 disks for RAID1
 d-i partman-auto/method  string  raid
@@ -31,14 +39,14 @@
 $primary{ } \
 $lvmignore{ } \
 . \
-1000 1000 8000 linux-swap \
+1000 1001 1 linux-swap \
 method{ swap } \
 format{ } \
 $lvmok{ } \
 lv_name{ swap } \
 $defaultignore{ } \
 . \
-1000 1000 6 ext4 \
+1000 1006 6 ext4 \
 mountpoint{ /var } \
 method{ format } \
 $primary{ } \
@@ -49,7 +57,7 @@
 filesystem{ ext4 } \
 $defaultignore{ } \
 . \
-1000 1000 25 ext4 \
+1000 1025 25 ext4 \
 mountpoint{ /var/lib/etcd } \
 method{ format } \
 $primary{ } \
@@ -60,7 +68,7 @@
 filesystem{ ext4 } \
 $defaultignore{ } \
 . \
-1000 1000 25 ext4 \
+1000 1025 25 ext4 \
 mountpoint{ /var/lib/zookeeper } \
 method{ format } \
 $primary{ } \
@@ -70,6 +78,12 @@
 use_filesystem{ } \
 filesystem{ ext4 } \
 $defaultignore{ } \
+. \
+1000 1043 -1 ext4 \
+method{ keep } \
+$defaultignore{ } \
+$lvmok{ } \
+lv_name{ _placeholder } \
 .
 
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I4379f58ada57e5f4dc91fc3ca35f2d10f89df923
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ottomata o...@wikimedia.org
Gerrit-Reviewer: Ottomata o...@wikimedia.org
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] Port mw-vagrant install scripts into this repo - change (wikimedia...crm)

2015-06-18 Thread jenkins-bot (Code Review)

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

Change subject: Port mw-vagrant install scripts into this repo
..


Port mw-vagrant install scripts into this repo

Not pleasant to use, but better than nothing... TODO: Glue on some
porcelain, then rewrite puppet to use these scripts.

Change-Id: I59a068b0e690a4e7e3d4b60577dcf686aa5f7885
---
A bin/civicrm-install.php
A bin/drupal-install.sh
2 files changed, 75 insertions(+), 0 deletions(-)

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



diff --git a/bin/civicrm-install.php b/bin/civicrm-install.php
new file mode 100644
index 000..cc6e74b
--- /dev/null
+++ b/bin/civicrm-install.php
@@ -0,0 +1,51 @@
+?php
+
+if ( count( $argv ) !== 6 ) {
+   $usage = EOT
+Usage: php ${argv[0]} SITE_NAME CIVICRM_DB DRUPAL_DB DB_USER DB_PASS
+
+Example: php ${argv[0]} civi.localhost.net civicrm drupal civiUser civiPass
+
+EOT;
+   die( $usage );
+}
+
+$basedir = __DIR__ . '/..';
+
+$SITE_NAME = $argv[1];
+$CIVICRM_DB = $argv[2];
+$DRUPAL_DB = $argv[3];
+$DB_USER = $argv[4];
+$DB_PASS = $argv[5];
+
+$config = array(
+'site_dir' = 'default',
+'base_url' = http://${SITE_NAME}/;,
+'mysql' = array(
+'username' = $DB_USER,
+'password' = $DB_PASS,
+'server' = 'localhost',
+'database' = $CIVICRM_DB,
+),
+'drupal' = array(
+'username' = $DB_USER,
+'password' = $DB_PASS,
+'server' = 'localhost',
+'database' = $DRUPAL_DB,
+),
+);
+
+global $cmsPath, $crmPath, $installType;
+$cmsPath = ${basedir}/drupal;
+$crmPath = ${basedir}/civicrm;
+$installType = 'drupal';
+
+define( 'VERSION', '7.0' );
+define( 'DB_USER', $config['drupal']['username'] );
+define( 'DB_PASSWORD', $config['drupal']['password'] );
+define( 'DB_HOST', $config['drupal']['server'] );
+define( 'DB_NAME', $config['drupal']['database'] );
+
+require_once ${basedir}/civicrm/install/civicrm.php;
+
+civicrm_main( $config );
diff --git a/bin/drupal-install.sh b/bin/drupal-install.sh
new file mode 100755
index 000..1d5bd7d
--- /dev/null
+++ b/bin/drupal-install.sh
@@ -0,0 +1,24 @@
+#!/bin/bash
+
+if [ $# -ne 3 ]; then
+   app_name=`basename $0`
+   cat -EOS
+   Usage: $app_name DB_URL SITE_NAME ADMIN_PASSWORD
+
+   Example: $app_name mysql://DB_USER:DB_PASS@localhost/DRUPAL_DB 
crm.localhost.net ADMIN123
+   EOS
+
+   exit 1
+fi
+
+DB_URL=$1
+SITE_NAME=$2
+ADMIN_PASSWORD=$3
+
+drush \
+   --root=`dirname $0`/../drupal \
+site-install standard \
+--db-url=$DB_URL \
+--site-name=$SITE_NAME \
+--account-name=admin --account-pass=$ADMIN_PASSWORD \
+install_configure_form.update_status_module='array(FALSE,FALSE)'

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I59a068b0e690a4e7e3d4b60577dcf686aa5f7885
Gerrit-PatchSet: 4
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: master
Gerrit-Owner: Awight awi...@wikimedia.org
Gerrit-Reviewer: AndyRussG andrew.green...@gmail.com
Gerrit-Reviewer: Awight awi...@wikimedia.org
Gerrit-Reviewer: Cdentinger cdentin...@wikimedia.org
Gerrit-Reviewer: Ejegg eeggles...@wikimedia.org
Gerrit-Reviewer: Katie Horn kh...@wikimedia.org
Gerrit-Reviewer: Ssmith ssm...@wikimedia.org
Gerrit-Reviewer: XenoRyet dkozlow...@wikimedia.org
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] Added Wikimedia/Assert dependency. - change (mediawiki...WikibaseQuality)

2015-06-18 Thread Soeren.oldag (Code Review)

Soeren.oldag has uploaded a new change for review.

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

Change subject: Added Wikimedia/Assert dependency.
..

Added Wikimedia/Assert dependency.

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


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

diff --git a/composer.json b/composer.json
index c1b91e2..a18 100755
--- a/composer.json
+++ b/composer.json
@@ -16,7 +16,8 @@
require: {
php: =5.3.0,
wikibase/data-model: ~3.0,
-   serialization/serialization: 3.*,=3.2.1
+   serialization/serialization: 3.*,=3.2.1,
+   wikimedia/assert: ~0.2.2
},
require-dev: {
phpunit/phpunit: ~3.7,=3.7.37|~4.5,

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I5dc4a9ea121278adb603106e3cde63410bba997c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikibaseQuality
Gerrit-Branch: master
Gerrit-Owner: Soeren.oldag soeren_ol...@freenet.de

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

[MediaWiki-commits] [Gerrit] registration: Improve error message if a non-array attribute... - change (mediawiki/core)

2015-06-18 Thread jenkins-bot (Code Review)

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

Change subject: registration: Improve error message if a non-array attribute is 
set
..


registration: Improve error message if a non-array attribute is set

Otherwise array_merge_recursive() will trigger a confusing and unhelpful
warning.

Bug: T102523
Change-Id: I7e4778cb7552fe93a08f315c9888ec64322e2501
---
M includes/registration/ExtensionProcessor.php
1 file changed, 5 insertions(+), 1 deletion(-)

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



diff --git a/includes/registration/ExtensionProcessor.php 
b/includes/registration/ExtensionProcessor.php
index 0a09ff5..273e9ef 100644
--- a/includes/registration/ExtensionProcessor.php
+++ b/includes/registration/ExtensionProcessor.php
@@ -290,10 +290,14 @@
 
/**
 * @param string $name
-* @param mixed $value
+* @param array $value
 * @param array $array
+* @throws InvalidArgumentException
 */
protected function storeToArray( $name, $value, $array ) {
+   if ( !is_array( $value ) ) {
+   throw new InvalidArgumentException( The value for 
'$name' should be an array );
+   }
if ( isset( $array[$name] ) ) {
$array[$name] = array_merge_recursive( $array[$name], 
$value );
} else {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I7e4778cb7552fe93a08f315c9888ec64322e2501
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Legoktm legoktm.wikipe...@gmail.com
Gerrit-Reviewer: Addshore addshorew...@gmail.com
Gerrit-Reviewer: Jack Phoenix j...@countervandalism.net
Gerrit-Reviewer: Legoktm legoktm.wikipe...@gmail.com
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] webserver, generic_vhost: qualify title var - change (operations/puppet)

2015-06-18 Thread Dzahn (Code Review)

Dzahn has submitted this change and it was merged.

Change subject: webserver,generic_vhost: qualify title var
..


webserver,generic_vhost: qualify title var

bug: T97251
Change-Id: Ifb44e18dc4b5eb6257d0c7ca47d89bb10020388a
---
M templates/apache/generic_vhost.erb
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/templates/apache/generic_vhost.erb 
b/templates/apache/generic_vhost.erb
index 315756f..174ca2e 100644
--- a/templates/apache/generic_vhost.erb
+++ b/templates/apache/generic_vhost.erb
@@ -45,7 +45,7 @@
 % end -%
 ServerAdmin %= @server_admin %
 
-Redirect permanent / https://%= title %/
+Redirect permanent / https://%= @title %/
 /VirtualHost
 % end -%
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ifb44e18dc4b5eb6257d0c7ca47d89bb10020388a
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Matanya mata...@foss.co.il
Gerrit-Reviewer: Alexandros Kosiaris akosia...@wikimedia.org
Gerrit-Reviewer: Andrew Bogott abog...@wikimedia.org
Gerrit-Reviewer: Dzahn dz...@wikimedia.org
Gerrit-Reviewer: Ori.livneh o...@wikimedia.org
Gerrit-Reviewer: jenkins-bot 

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

1 2 3 4 >

1 - 100 of 337 matches

Mail list logo