[MediaWiki-commits] [Gerrit] scap: remove unnecessary unicode em-dash - change (operations/puppet)

2016-02-05 Thread Dzahn (Code Review) 
Dzahn has submitted this change and it was merged.

Change subject: scap: remove unnecessary unicode em-dash
..


scap: remove unnecessary unicode em-dash

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

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



diff --git a/modules/scap/manifests/init.pp b/modules/scap/manifests/init.pp
index 4c08d87..cf61d57 100644
--- a/modules/scap/manifests/init.pp
+++ b/modules/scap/manifests/init.pp
@@ -4,7 +4,7 @@
 
 class scap {
 # Using trebuchet provider while scap service deployment is under
-# development—chicken and egg things
+# development -- chicken and egg things
 #
 # This should be removed once scap3 is in a final state (i.e. packaged
 # or deployed via another method)

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Id9b24db42969a13f115189547469cb58a574d277
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Merlijn van Deen 
Gerrit-Reviewer: Dzahn 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] [DONT MERGE] mediawiki: Rewrite /w/{skins, resources, extensio... - change (operations/puppet)

2016-02-05 Thread Krinkle (Code Review) 
Krinkle has uploaded a new change for review.

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

Change subject: [DONT MERGE] mediawiki: Rewrite /w/{skins,resources,extensions} 
to /w/static.php
..

[DONT MERGE] mediawiki: Rewrite /w/{skins,resources,extensions} to /w/static.php

Requires I1860061a6 (adds /w/static.php) to be deployed first.

The public-wiki-rewrites.incl file is included in all wiki domains.

Bug: T99096
Change-Id: I7653de247fcafc6da573d10a19a69169395b571a
---
M modules/mediawiki/files/apache/sites/public-wiki-rewrites.incl
1 file changed, 5 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/02/268802/1

diff --git a/modules/mediawiki/files/apache/sites/public-wiki-rewrites.incl 
b/modules/mediawiki/files/apache/sites/public-wiki-rewrites.incl
index f4ff058..e1b9e7f 100644
--- a/modules/mediawiki/files/apache/sites/public-wiki-rewrites.incl
+++ b/modules/mediawiki/files/apache/sites/public-wiki-rewrites.incl
@@ -8,3 +8,8 @@
 RewriteRule ^/favicon\.ico$ /w/favicon.php [L]
 # Configurable apple-touch-icon.png
 RewriteRule ^/apple-touch-icon\.png$ /w/touch.php [L]
+
+# Multiversion static files (T99096)
+RewriteRule ^/w/skins/.*$ /w/static.php [L]
+RewriteRule ^/w/resources/.*$ /w/static.php [L]
+RewriteRule ^/w/extensions/.*$ /w/static.php [L]

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

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

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

[MediaWiki-commits] [Gerrit] creation of parsoid-test-admins group - change (operations/puppet)

2016-02-05 Thread Dzahn (Code Review) 
Dzahn has submitted this change and it was merged.

Change subject: creation of parsoid-test-admins group
..


creation of parsoid-test-admins group

This creates the parsoid regresstion testing admin group.  While this
adds the usergroup, it doesn't add any users to said group.  Any users
must be reviewed in the operations team meeting.

As this doesn't add any users to these rights quite yet, it can sit
unmerged until the ops meeting appends users in on 2016-02-01.

This should be reviewed by members of the operations team, as it adds
sudo rights to the cluster.

Bug:T124701
Change-Id: I8a9d250349d88fa19388e4f5a1083a5951496ae1
---
M modules/admin/data/data.yaml
1 file changed, 12 insertions(+), 0 deletions(-)

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



diff --git a/modules/admin/data/data.yaml b/modules/admin/data/data.yaml
index d07f771..d44ce8e 100644
--- a/modules/admin/data/data.yaml
+++ b/modules/admin/data/data.yaml
@@ -465,6 +465,18 @@
 description: T125166
 members: [ssastry]
 privileges: ['ALL = (ALL) NOPASSWD: ALL']
+  parsoid-test-admins:
+gid: 773
+description: parsing team members for parsoid regression testing 
adminstration
+members: []
+privileges: ['ALL = NOPASSWD: /usr/sbin/service parsoid *',
+   'ALL = NOPASSWD: /usr/sbin/service parsoid-rt *',
+   'ALL = NOPASSWD: /usr/sbin/service parsoid-rt-client *',
+   'ALL = NOPASSWD: /usr/sbin/service parsoid-vd *',
+   'ALL = NOPASSWD: /usr/sbin/service parsoid-vd-client *',
+   'ALL = NOPASSWD: /usr/sbin/service diffservice *',
+   'ALL = (parsoid-rt) NOPASSWD: /home/parsoid-rt/update-code.sh',
+   'ALL = NOPASSWD: /bin/journalctl *']
 users:
   rush:
 ensure: present

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I8a9d250349d88fa19388e4f5a1083a5951496ae1
Gerrit-PatchSet: 6
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: RobH 
Gerrit-Reviewer: Alexandros Kosiaris 
Gerrit-Reviewer: Dzahn 
Gerrit-Reviewer: Faidon Liambotis 
Gerrit-Reviewer: Mark Bergsma 
Gerrit-Reviewer: Subramanya Sastry 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Bump portals to master (Move inlined JS to a separate file) - change (operations/mediawiki-config)

2016-02-05 Thread JGirault (Code Review) 
JGirault has uploaded a new change for review.

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

Change subject: Bump portals to master (Move inlined JS to a separate file)
..

Bump portals to master (Move inlined JS to a separate file)

Change-Id: Ic826608dbb3b986a6f4c227282fc5557da99f142
---
M portals
1 file changed, 0 insertions(+), 0 deletions(-)


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

diff --git a/portals b/portals
index c0a8f67..b336739 16
--- a/portals
+++ b/portals
-Subproject commit c0a8f678497630a23e84558b5e71f66ef38e93ee
+Subproject commit b33673967afc65ec219bcd8c9832cb25b104bd68

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

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

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

[MediaWiki-commits] [Gerrit] disable ipsec for cp3032, dead - change (operations/puppet)

2016-02-05 Thread BBlack (Code Review) 
BBlack has uploaded a new change for review.

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

Change subject: disable ipsec for cp3032, dead
..

disable ipsec for cp3032, dead

Change-Id: Id3140fcb75d6711d95d405f5e35b78e41062c098
---
M hieradata/common/cache/ipsec/upload.yaml
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/05/268805/1

diff --git a/hieradata/common/cache/ipsec/upload.yaml 
b/hieradata/common/cache/ipsec/upload.yaml
index 8bbcfe4..7b9609f 100644
--- a/hieradata/common/cache/ipsec/upload.yaml
+++ b/hieradata/common/cache/ipsec/upload.yaml
@@ -23,7 +23,7 @@
 - 'cp1074.eqiad.wmnet'
 - 'cp1099.eqiad.wmnet'
   esams:
-- 'cp3032.esams.wmnet'
+# - 'cp3032.esams.wmnet' # currently-dead: T126062
 - 'cp3033.esams.wmnet'
 - 'cp3034.esams.wmnet'
 - 'cp3035.esams.wmnet'

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

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

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

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

2016-02-05 Thread Paladox (Code Review) 
Paladox has uploaded a new change for review.

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

Change subject: Test
..

Test

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


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

diff --git a/Wikidata.php b/Wikidata.php
index d286a27..adbaf21 100644
--- a/Wikidata.php
+++ b/Wikidata.php
@@ -19,6 +19,7 @@
// $wmgUseWikibaseQualityExternalValidation = true;
 }
 
+
 // no magic, use wmf configs instead to control which entry points to load
 $wgEnableWikibaseRepo = false;
 $wgEnableWikibaseClient = false;

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iffc8dec0345cab22c23094385c7a90fff68bb146
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikidata
Gerrit-Branch: REL1_26
Gerrit-Owner: Paladox 

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

[MediaWiki-commits] [Gerrit] Temporarily skip a test that fails on HHVM. - change (mediawiki...Scribunto)

2016-02-05 Thread Paladox (Code Review) 
Paladox has uploaded a new change for review.

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

Change subject: Temporarily skip a test that fails on HHVM.
..

Temporarily skip a test that fails on HHVM.

HHVM has a bug in json decode https://github.com/facebook/hhvm/issues/5813 .
Skip the test until there is a fix upstream.

Bug: T103346
Change-Id: I7e44d98c29ba9b9f5443665fc046382f696193c9
(cherry picked from commit fa0e32ce994b4f93afbe635b6a7ad95403433a5e)
---
M tests/engines/LuaCommon/TextLibraryTest.php
1 file changed, 9 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Scribunto 
refs/changes/11/268811/1

diff --git a/tests/engines/LuaCommon/TextLibraryTest.php 
b/tests/engines/LuaCommon/TextLibraryTest.php
index 3a31280..fffcd9a 100644
--- a/tests/engines/LuaCommon/TextLibraryTest.php
+++ b/tests/engines/LuaCommon/TextLibraryTest.php
@@ -3,6 +3,15 @@
 class Scribunto_LuaTextLibraryTests extends Scribunto_LuaEngineTestBase {
protected static $moduleName = 'TextLibraryTests';
 
+   public function __construct( $name = null, array $data = array(), 
$dataName = '', $engineName = null ) {
+   parent::__construct( $name, $data, $dataName, $engineName);
+   if ( defined('HHVM_VERSION') ) {
+   // HHVM bug 
https://github.com/facebook/hhvm/issues/5813$
+   $this->skipTests['json decode, invalid values (trailing 
comma)'] =
+   'json decode bug in HHVM';
+   }
+   }
+
protected function setUp() {
parent::setUp();
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I7e44d98c29ba9b9f5443665fc046382f696193c9
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Scribunto
Gerrit-Branch: REL1_26
Gerrit-Owner: Paladox 
Gerrit-Reviewer: JanZerebecki 

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

[MediaWiki-commits] [Gerrit] Remove mwReference tests, moved to Cite extension - change (mediawiki...VisualEditor)

2016-02-05 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged.

Change subject: Remove mwReference tests, moved to Cite extension
..


Remove mwReference tests, moved to Cite extension

Change-Id: I07a2bf45117c2d14c7b00875c0a710e20980a23a
---
M VisualEditor.hooks.php
D modules/ve-mw/tests/dm/ve.dm.InternalList.test.js
D modules/ve-mw/tests/dm/ve.dm.Transaction.test.js
M modules/ve-mw/tests/dm/ve.dm.mwExample.js
4 files changed, 0 insertions(+), 1,027 deletions(-)

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



diff --git a/VisualEditor.hooks.php b/VisualEditor.hooks.php
index cbdbb0c..6599ac1 100644
--- a/VisualEditor.hooks.php
+++ b/VisualEditor.hooks.php
@@ -839,9 +839,7 @@

'lib/ve/tests/dm/ve.dm.DocumentSynchronizer.test.js',
'lib/ve/tests/dm/ve.dm.IndexValueStore.test.js',
'lib/ve/tests/dm/ve.dm.InternalList.test.js',
-   
'modules/ve-mw/tests/dm/ve.dm.InternalList.test.js',
'lib/ve/tests/dm/ve.dm.Transaction.test.js',
-   
'modules/ve-mw/tests/dm/ve.dm.Transaction.test.js',

'lib/ve/tests/dm/ve.dm.TransactionProcessor.test.js',
'lib/ve/tests/dm/ve.dm.APIResultsQueue.test.js',
'lib/ve/tests/dm/ve.dm.Surface.test.js',
diff --git a/modules/ve-mw/tests/dm/ve.dm.InternalList.test.js 
b/modules/ve-mw/tests/dm/ve.dm.InternalList.test.js
deleted file mode 100644
index 0a16481..000
--- a/modules/ve-mw/tests/dm/ve.dm.InternalList.test.js
+++ /dev/null
@@ -1,239 +0,0 @@
-/*!
- * VisualEditor DataModel MediaWiki-specific InternalList tests.
- *
- * @copyright 2011-2016 VisualEditor Team and others; see AUTHORS.txt
- * @license The MIT License (MIT); see LICENSE.txt
- */
-
-QUnit.module( 've.dm.InternalList (MW)', ve.test.utils.mwEnvironment );
-
-/* Tests */
-
-QUnit.test( 'addNode/removeNode', 6, function ( assert ) {
-   var doc = ve.dm.mwExample.createExampleDocument( 'references' ),
-   newInternalList = new ve.dm.InternalList( doc ),
-   referenceNodes = [
-   doc.getDocumentNode().children[ 0 ].children[ 0 ],
-   doc.getDocumentNode().children[ 1 ].children[ 1 ],
-   doc.getDocumentNode().children[ 1 ].children[ 3 ],
-   doc.getDocumentNode().children[ 1 ].children[ 5 ],
-   doc.getDocumentNode().children[ 2 ].children[ 0 ],
-   doc.getDocumentNode().children[ 2 ].children[ 1 ]
-   ],
-   expectedNodes = {
-   'mwReference/': {
-   keyedNodes: {
-   'auto/0': [ referenceNodes[ 0 ] ],
-   'literal/bar': [ referenceNodes[ 1 ], 
referenceNodes[ 3 ] ],
-   'literal/:3': [ referenceNodes[ 2 ] ],
-   'auto/1': [ referenceNodes[ 4 ] ]
-   },
-   firstNodes: [
-   referenceNodes[ 0 ],
-   referenceNodes[ 1 ],
-   referenceNodes[ 2 ],
-   referenceNodes[ 4 ]
-   ],
-   indexOrder: [ 0, 1, 2, 3 ],
-   uniqueListKeys: {},
-   uniqueListKeysInUse: {}
-   },
-   'mwReference/foo': {
-   keyedNodes: {
-   'auto/2': [ referenceNodes[ 5 ] ]
-   },
-   firstNodes: [ undefined, undefined, undefined, 
undefined, referenceNodes[ 5 ] ],
-   indexOrder: [ 4 ],
-   uniqueListKeys: {},
-   uniqueListKeysInUse: {}
-   }
-   };
-
-   assert.deepEqualWithNodeTree(
-   doc.internalList.nodes,
-   expectedNodes,
-   'Document construction populates internal list correctly'
-   );
-
-   newInternalList.addNode( 'mwReference/', 'auto/0', 0, referenceNodes[ 0 
] );
-   newInternalList.addNode( 'mwReference/', 'literal/bar', 1, 
referenceNodes[ 1 ] );
-   newInternalList.addNode( 'mwReference/', 'literal/:3', 2, 
referenceNodes[ 2 ] );
-   newInternalList.addNode( 'mwReference/', 'literal/bar', 1, 
referenceNodes[ 3 ] );
-   newInternalList.addNode( 'mwReference/', 'auto/1', 3, referenceNodes[ 4 
] );
-   newInternalList.addNode( 'mwReference/foo', 'auto/2', 4,

[MediaWiki-commits] [Gerrit] Revert "Download civix from github, not sourceforge" - change (wikimedia...civicrm-buildkit)

2016-02-05 Thread Ejegg (Code Review) 
Ejegg has uploaded a new change for review.

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

Change subject: Revert "Download civix from github, not sourceforge"
..

Revert "Download civix from github, not sourceforge"

CI machines aren't happy with the release script, plus it takes
a while.

This reverts commit c6c8ca87e1d95eafda077f1b9389e7d0de02827c.

Change-Id: I46ad6c9b2649da36753685ffa08be94e20a0379b
---
M bin/civi-download-tools
1 file changed, 6 insertions(+), 12 deletions(-)


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

diff --git a/bin/civi-download-tools b/bin/civi-download-tools
index bae30dd..2f0e925 100755
--- a/bin/civi-download-tools
+++ b/bin/civi-download-tools
@@ -20,8 +20,7 @@
 LOCKFILE="$TMPDIR/civi-download-tools.lock"
 LOCKTIMEOUT=90
 CIVIXVER=14.09.1
-CIVIXRELEASE="https://raw.githubusercontent.com/totten/civix/master/release;
-CIVIXURL="https://github.com/totten/civix.git;
+CIVIXURL="http://downloads.sourceforge.net/project/civix/civix-${CIVIXVER}.tar.bz2?r=http%3A%2F%2Fsourceforge.net%2Fprojects%2Fcivix%2Ffiles%2F_mirror=master;
 HUBTAG="v1.12.1"
 HUBURL="https://github.com/github/hub;
 IS_QUIET=
@@ -165,7 +164,7 @@
   ## Download "civix"
   ## FIXME: Update civix so that it can be installed via composer as a 
dependency
   mkdir -p "$PRJDIR/extern" && touch "$PRJDIR/extern/civix.txt"
-  if [ -z "$IS_FORCE" -a -e "$PRJDIR/bin/civix" -a -d "extern/civix" -a "$(cat 
$PRJDIR/extern/civix.txt)" == "$CIVIXURL-$CIVIXVER" ]; then
+  if [ -z "$IS_FORCE" -a -e "$PRJDIR/bin/civix" -a -d "extern/civix" -a "$(cat 
$PRJDIR/extern/civix.txt)" == "$CIVIXURL" ]; then
 echo_comment "[[civix binary ($PRJDIR/bin/civix) already exists. 
Skipping.]]"
   else
 echo "[[Install civix]]"
@@ -173,17 +172,12 @@
 ## Cleanup
 [ -e app/tmp/civix ] && rm -rf app/tmp/civix
 [ -e extern/civix ] && rm -rf extern/civix
-[ -e "$TMPDIR/civix-$CIVIXVER.tar.bz2" ] && rm -rf 
"$TMPDIR/civix-$CIVIXVER.tar.bz2"
-[ -e "$TMPDIR/civixrelease" ] && rm -f "$TMPDIR/civixrelease"
+[ -e "$TMPDIR/civix.tar.bz2" ] && rm -rf "$TMPDIR/civix.tar.bz2"
 mkdir -p extern/civix
 
 ## Download
-pushd "$TMPDIR" >> /dev/null
-  download_url "$CIVIXRELEASE" civixrelease
-  chmod u+x civixrelease
-  bash -c "./civixrelease \"$CIVIXURL\" \"$CIVIXVER\""
-popd >> /dev/null
-tar xj  --strip-components 1 -C extern/civix -f 
"$TMPDIR/build/civix-$CIVIXVER.tar.bz2"
+download_url "$CIVIXURL" "$TMPDIR/civix.tar.bz2"
+tar xj  --strip-components 1 -C extern/civix -f "$TMPDIR/civix.tar.bz2"
 
 ## Setup a relative symlink
 pushd bin >> /dev/null
@@ -192,7 +186,7 @@
 popd >> /dev/null
 
 ## Mark as downloaded
-echo "$CIVIXURL-$CIVIXVER" > "$PRJDIR/extern/civix.txt"
+echo "$CIVIXURL" > "$PRJDIR/extern/civix.txt"
   fi
 
   ## Download "hub"

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

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

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

[MediaWiki-commits] [Gerrit] Revert "Download civix from github, not sourceforge" - change (wikimedia...civicrm-buildkit)

2016-02-05 Thread Awight (Code Review) 
Awight has submitted this change and it was merged.

Change subject: Revert "Download civix from github, not sourceforge"
..


Revert "Download civix from github, not sourceforge"

CI machines aren't happy with the release script, plus it takes
a while.

This reverts commit c6c8ca87e1d95eafda077f1b9389e7d0de02827c.

Change-Id: I46ad6c9b2649da36753685ffa08be94e20a0379b
---
M bin/civi-download-tools
1 file changed, 6 insertions(+), 12 deletions(-)

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



diff --git a/bin/civi-download-tools b/bin/civi-download-tools
index bae30dd..2f0e925 100755
--- a/bin/civi-download-tools
+++ b/bin/civi-download-tools
@@ -20,8 +20,7 @@
 LOCKFILE="$TMPDIR/civi-download-tools.lock"
 LOCKTIMEOUT=90
 CIVIXVER=14.09.1
-CIVIXRELEASE="https://raw.githubusercontent.com/totten/civix/master/release;
-CIVIXURL="https://github.com/totten/civix.git;
+CIVIXURL="http://downloads.sourceforge.net/project/civix/civix-${CIVIXVER}.tar.bz2?r=http%3A%2F%2Fsourceforge.net%2Fprojects%2Fcivix%2Ffiles%2F_mirror=master;
 HUBTAG="v1.12.1"
 HUBURL="https://github.com/github/hub;
 IS_QUIET=
@@ -165,7 +164,7 @@
   ## Download "civix"
   ## FIXME: Update civix so that it can be installed via composer as a 
dependency
   mkdir -p "$PRJDIR/extern" && touch "$PRJDIR/extern/civix.txt"
-  if [ -z "$IS_FORCE" -a -e "$PRJDIR/bin/civix" -a -d "extern/civix" -a "$(cat 
$PRJDIR/extern/civix.txt)" == "$CIVIXURL-$CIVIXVER" ]; then
+  if [ -z "$IS_FORCE" -a -e "$PRJDIR/bin/civix" -a -d "extern/civix" -a "$(cat 
$PRJDIR/extern/civix.txt)" == "$CIVIXURL" ]; then
 echo_comment "[[civix binary ($PRJDIR/bin/civix) already exists. 
Skipping.]]"
   else
 echo "[[Install civix]]"
@@ -173,17 +172,12 @@
 ## Cleanup
 [ -e app/tmp/civix ] && rm -rf app/tmp/civix
 [ -e extern/civix ] && rm -rf extern/civix
-[ -e "$TMPDIR/civix-$CIVIXVER.tar.bz2" ] && rm -rf 
"$TMPDIR/civix-$CIVIXVER.tar.bz2"
-[ -e "$TMPDIR/civixrelease" ] && rm -f "$TMPDIR/civixrelease"
+[ -e "$TMPDIR/civix.tar.bz2" ] && rm -rf "$TMPDIR/civix.tar.bz2"
 mkdir -p extern/civix
 
 ## Download
-pushd "$TMPDIR" >> /dev/null
-  download_url "$CIVIXRELEASE" civixrelease
-  chmod u+x civixrelease
-  bash -c "./civixrelease \"$CIVIXURL\" \"$CIVIXVER\""
-popd >> /dev/null
-tar xj  --strip-components 1 -C extern/civix -f 
"$TMPDIR/build/civix-$CIVIXVER.tar.bz2"
+download_url "$CIVIXURL" "$TMPDIR/civix.tar.bz2"
+tar xj  --strip-components 1 -C extern/civix -f "$TMPDIR/civix.tar.bz2"
 
 ## Setup a relative symlink
 pushd bin >> /dev/null
@@ -192,7 +186,7 @@
 popd >> /dev/null
 
 ## Mark as downloaded
-echo "$CIVIXURL-$CIVIXVER" > "$PRJDIR/extern/civix.txt"
+echo "$CIVIXURL" > "$PRJDIR/extern/civix.txt"
   fi
 
   ## Download "hub"

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I46ad6c9b2649da36753685ffa08be94e20a0379b
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/civicrm-buildkit
Gerrit-Branch: master
Gerrit-Owner: Ejegg 
Gerrit-Reviewer: Awight 

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

[MediaWiki-commits] [Gerrit] Enable subpages in wikitech's Hiera namespace - change (operations/mediawiki-config)

2016-02-05 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged.

Change subject: Enable subpages in wikitech's Hiera namespace
..


Enable subpages in wikitech's Hiera namespace

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

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



diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index 5e29aa9..ed93063 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -3927,7 +3927,7 @@
'+grantswiki' => array( 0 => 1, 6 => 0, 8 => 0, 10 => 0 ),
'+incubatorwiki' => array( 0 => 1, 6 => 0, 14 => 1 ),
'+internalwiki' => array( 0 => 1, 6 => 0, 8 => 0, 10 => 0 ),
-   '+wikitech' => array( 0 => 1, 110 => 1, 498 => 1 ),
+   '+wikitech' => array( 0 => 1, 110 => 1, 498 => 1, 666 => 1 ),
'+legalteamwiki' => array( 0 => 1 ),
'+mediawikiwiki' => array( 0 => 1, 6 => 0, 8 => 0, 14 => 1 ),
'+metawiki' => array( 0 => 1, 6 => 0, 8 => 0, 200 => 1, 201 => 1, 202 
=> 1, 203 => 1, 208 => 1, 209 => 1 ),

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia3261c883bf81fecd3248fc2475a2bbb9f24de4d
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Alex Monk 
Gerrit-Reviewer: Alex Monk 
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 graphoid to 8f4ad73 - change (mediawiki...deploy)

2016-02-05 Thread Yurik (Code Review) 
Yurik has uploaded a new change for review.

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

Change subject: Update graphoid to 8f4ad73
..

Update graphoid to 8f4ad73

List of changes:
8f4ad73 Disabled http(s) protocols
xxx Update node module dependencies

Change-Id: I7b1d67ab1c08b1cb96081fe5aac6fc328b2869be
---
M node_modules/bluebird/js/browser/bluebird.core.js
M node_modules/bluebird/js/browser/bluebird.core.min.js
M node_modules/bluebird/js/browser/bluebird.js
M node_modules/bluebird/js/browser/bluebird.min.js
M node_modules/bluebird/package.json
M 
node_modules/compression/node_modules/accepts/node_modules/mime-types/package.json
A node_modules/d3-dispatch/.eslintrc
M node_modules/d3-dispatch/build/bundle.js
M node_modules/d3-dispatch/build/d3-dispatch.js
M node_modules/d3-dispatch/build/d3-dispatch.min.js
M node_modules/d3-dispatch/package.json
M node_modules/d3-dispatch/src/dispatch.js
M node_modules/domino/lib/CSSStyleDeclaration.js
M node_modules/domino/lib/HTMLParser.js
M node_modules/domino/lib/cssparser.js
M node_modules/domino/package.json
M node_modules/domino/test/domino.js
M node_modules/express/node_modules/accepts/node_modules/mime-types/package.json
M node_modules/graph-shared/package.json
M node_modules/graph-shared/src/VegaWrapper.js
D node_modules/js-yaml/node_modules/argparse/examples/arguments.js
D node_modules/js-yaml/node_modules/argparse/examples/choice.js
D node_modules/js-yaml/node_modules/argparse/examples/constants.js
D node_modules/js-yaml/node_modules/argparse/examples/help.js
D node_modules/js-yaml/node_modules/argparse/examples/nargs.js
D node_modules/js-yaml/node_modules/argparse/examples/parents.js
D node_modules/js-yaml/node_modules/argparse/examples/prefix_chars.js
D node_modules/js-yaml/node_modules/argparse/examples/sub_commands.js
D node_modules/js-yaml/node_modules/argparse/examples/sum.js
D node_modules/js-yaml/node_modules/argparse/examples/testformatters.js
M node_modules/js-yaml/node_modules/argparse/lib/action.js
M node_modules/js-yaml/node_modules/argparse/lib/action/append.js
M node_modules/js-yaml/node_modules/argparse/lib/action/help.js
M node_modules/js-yaml/node_modules/argparse/lib/action/store.js
M node_modules/js-yaml/node_modules/argparse/lib/action/subparsers.js
M node_modules/js-yaml/node_modules/argparse/lib/action/version.js
M node_modules/js-yaml/node_modules/argparse/lib/action_container.js
M node_modules/js-yaml/node_modules/argparse/lib/argument_parser.js
M node_modules/js-yaml/node_modules/argparse/lib/help/added_formatters.js
M node_modules/js-yaml/node_modules/argparse/lib/help/formatter.js
M node_modules/js-yaml/node_modules/argparse/lib/namespace.js
A node_modules/js-yaml/node_modules/argparse/lib/utils.js
D node_modules/js-yaml/node_modules/argparse/node_modules/lodash/LICENSE
D node_modules/js-yaml/node_modules/argparse/node_modules/lodash/add.js
D node_modules/js-yaml/node_modules/argparse/node_modules/lodash/after.js
D node_modules/js-yaml/node_modules/argparse/node_modules/lodash/array.js
D node_modules/js-yaml/node_modules/argparse/node_modules/lodash/ary.js
D node_modules/js-yaml/node_modules/argparse/node_modules/lodash/assign.js
D node_modules/js-yaml/node_modules/argparse/node_modules/lodash/assignIn.js
D node_modules/js-yaml/node_modules/argparse/node_modules/lodash/assignInWith.js
D node_modules/js-yaml/node_modules/argparse/node_modules/lodash/assignWith.js
D node_modules/js-yaml/node_modules/argparse/node_modules/lodash/at.js
D node_modules/js-yaml/node_modules/argparse/node_modules/lodash/attempt.js
D node_modules/js-yaml/node_modules/argparse/node_modules/lodash/before.js
D node_modules/js-yaml/node_modules/argparse/node_modules/lodash/bind.js
D node_modules/js-yaml/node_modules/argparse/node_modules/lodash/bindAll.js
D node_modules/js-yaml/node_modules/argparse/node_modules/lodash/bindKey.js
D node_modules/js-yaml/node_modules/argparse/node_modules/lodash/camelCase.js
D node_modules/js-yaml/node_modules/argparse/node_modules/lodash/capitalize.js
D node_modules/js-yaml/node_modules/argparse/node_modules/lodash/ceil.js
D node_modules/js-yaml/node_modules/argparse/node_modules/lodash/chain.js
D node_modules/js-yaml/node_modules/argparse/node_modules/lodash/chunk.js
D node_modules/js-yaml/node_modules/argparse/node_modules/lodash/clamp.js
D node_modules/js-yaml/node_modules/argparse/node_modules/lodash/clone.js
D node_modules/js-yaml/node_modules/argparse/node_modules/lodash/cloneDeep.js
D 
node_modules/js-yaml/node_modules/argparse/node_modules/lodash/cloneDeepWith.js
D node_modules/js-yaml/node_modules/argparse/node_modules/lodash/cloneWith.js
D node_modules/js-yaml/node_modules/argparse/node_modules/lodash/collection.js
D node_modules/js-yaml/node_modules/argparse/node_modules/lodash/commit.js
D node_modules/js-yaml/node_modules/argparse/node_modules/lodash/compact.js
D node_modules/js-yaml/node_modules/argparse/node_modules/lodash/concat.js
D

[MediaWiki-commits] [Gerrit] Add 'Backend-Timing' response header on all Apaches - change (operations/puppet)

2016-02-05 Thread Ori.livneh (Code Review) 
Ori.livneh has uploaded a new change for review.

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

Change subject: Add 'Backend-Timing' response header on all Apaches
..

Add 'Backend-Timing' response header on all Apaches

Configure all Apaches to add a "Backend-Timing" response header with the format
'D=XXX t=XXX', where 't' is when the request was received and 'D' is how long
it took to serve the request, both measured in microseconds. The microsecond
resolution is impractical, but this is what Apache provides.

Tested with Apache 2.2 and 2.4.

Change-Id: Ib82b93d167be071cd3ae6ee577c1a235c7986719
---
M modules/apache/files/defaults.conf
1 file changed, 12 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/21/268821/1

diff --git a/modules/apache/files/defaults.conf 
b/modules/apache/files/defaults.conf
index ec71d12..fa3c931 100644
--- a/modules/apache/files/defaults.conf
+++ b/modules/apache/files/defaults.conf
@@ -33,3 +33,15 @@
 # When receiving a graceful-stop signal, wait up to 5 seconds for client
 # connections to close gracefully.
 GracefulShutdownTimeout 5
+
+# Add a response header with the following format:
+#
+#   Backend-Timing: D=109640 t=1454711664235870
+#
+# Where 't' is a timestamp for when the request was received and 'D'
+# is how long it took to begin serving the request, both measured in
+# microseconds. See:
+#   
+
+Header set Backend-Timing "%D %t"
+

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib82b93d167be071cd3ae6ee577c1a235c7986719
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ori.livneh 

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

[MediaWiki-commits] [Gerrit] Temporarily disable unit tests and autoloading autoload.php ... - change (mediawiki...Wikidata)

2016-02-05 Thread Paladox (Code Review) 
Paladox has uploaded a new change for review.

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

Change subject: Temporarily disable unit tests and autoloading autoload.php 
from composer
..

Temporarily disable unit tests and autoloading autoload.php from composer

Since this test is failing REL1_25 branch and others and wasent even
testing because it uses an old config lets turn it off temporarily for
REL1_25 branch. Until a hack can be created.

Adds two new configs

$wmgUseWikidata is for turning off vendor if you want but is on by default.

$wmgUseWikidataTest is for turning on the unit tests. Since they fail this is 
off by default.

Bug: T125722
Change-Id: I5c74bb1a34009cb110d20e43bce8c4349bf7f3a4
---
M Wikidata.php
M extensions/PropertySuggester/PropertySuggester.php
M extensions/ValueView/ValueView.mw.php
M extensions/Wikibase/client/WikibaseClient.php
M extensions/Wikibase/lib/WikibaseLib.php
M extensions/Wikibase/repo/Wikibase.php
6 files changed, 55 insertions(+), 25 deletions(-)


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

diff --git a/Wikidata.php b/Wikidata.php
index 0610e8e..9954905 100644
--- a/Wikidata.php
+++ b/Wikidata.php
@@ -4,35 +4,47 @@
 }
 
 // Jenkins stuff part1
-if ( PHP_SAPI === 'cli' && strpos( getenv( 'JOB_NAME' ), 
'mwext-Wikidata-testextension' ) !== false ) {
+if ( isset( $wgWikimediaJenkinsCI ) && $wgWikimediaJenkinsCI == true ) {
// in future, run as non-experimental
if ( !defined( 'WB_EXPERIMENTAL_FEATURES' ) || 
!WB_EXPERIMENTAL_FEATURES ) {
define( 'WB_EXPERIMENTAL_FEATURES', true );
}
 
-   $wmgUseWikibaseRepo = true;
-   $wmgUseWikibaseClient = true;
+   /* Hack for REL1_25 since it is failing */
+   $wmgUseWikidata = true;
+   $wmgUseWikidataTest = false;
+
+   if ( isset( $wmgUseWikidata ) && $wmgUseWikidata == true ) {
+   $wmgUseWikibaseRepo = true;
+   $wmgUseWikibaseClient = true;
+   }
 }
 
 // no magic, use wmf configs instead to control which entry points to load
 $wgEnableWikibaseRepo = false;
 $wgEnableWikibaseClient = false;
 
-include_once __DIR__ . '/vendor/autoload.php';
+if ( isset( $wmgUseWikidata ) && $wmgUseWikidata == true ) {
+   if ( file_exists(  __DIR__ . '/vendor/autoload.php' ) ) {
+   include_once __DIR__ . '/vendor/autoload.php';
+   }
+}
 
-if ( !empty( $wmgUseWikibaseRepo ) ) {
+if ( isset( $wmgUseWikibaseRepo ) && $wmgUseWikibaseRepo == true ) {
include_once __DIR__ . '/extensions/Wikibase/repo/Wikibase.php';
include_once __DIR__ . '/extensions/Wikidata.org/WikidataOrg.php';
include_once __DIR__ . 
'/extensions/PropertySuggester/PropertySuggester.php';
include_once __DIR__ . '/WikibaseRepo.settings.php';
 }
 
-if ( !empty( $wmgUseWikibaseClient ) ) {
+if ( isset( $wmgUseWikibaseClient ) && $wmgUseWikibaseClient == true ) {
include_once __DIR__ . '/extensions/Wikibase/client/WikibaseClient.php';
include_once __DIR__ . '/WikibaseClient.settings.php';
 }
 
-$wgHooks['UnitTestsList'][] = '\Wikidata\WikidataHooks::onUnitTestsList';
+if ( isset( $wmgUseWikidataTest ) && $wmgUseWikidataTest == true ) {
+   $wgHooks['UnitTestsList'][] = 
'\Wikidata\WikidataHooks::onUnitTestsList';
+}
 
 $wgExtensionCredits['wikibase'][] = array(
'path' => __FILE__,
@@ -45,7 +57,7 @@
 );
 
 // Jenkins stuff part2
-if ( PHP_SAPI === 'cli' && strpos( getenv( 'JOB_NAME' ), 
'mwext-Wikidata-testextension' ) !== false ) {
+if ( isset( $wgWikimediaJenkinsCI ) && $wgWikimediaJenkinsCI == true ) {
//Jenkins always loads both so no need to check if they are loaded 
before getting settings
require_once __DIR__ . '/extensions/Wikibase/repo/ExampleSettings.php';
require_once __DIR__ . 
'/extensions/Wikibase/client/ExampleSettings.php';
diff --git a/extensions/PropertySuggester/PropertySuggester.php 
b/extensions/PropertySuggester/PropertySuggester.php
index b8202c9..e9b904c 100644
--- a/extensions/PropertySuggester/PropertySuggester.php
+++ b/extensions/PropertySuggester/PropertySuggester.php
@@ -35,9 +35,13 @@
 global $wgAPIModules;
 $wgAPIModules['wbsgetsuggestions'] = 'PropertySuggester\GetSuggestions';
 
-global $wgHooks;
+global $wgHooks, $wmgUseWikidataTest;
 $wgHooks['BeforePageDisplay'][] = 
'PropertySuggesterHooks::onBeforePageDisplay';
-$wgHooks['UnitTestsList'][] = 'PropertySuggesterHooks::onUnitTestsList';
+
+if ( isset( $wmgUseWikidataTest ) && $wmgUseWikidataTest == true ) {
+   $wgHooks['UnitTestsList'][] = 'PropertySuggesterHooks::onUnitTestsList';
+}
+
 $wgHooks['LoadExtensionSchemaUpdates'][] = 
'PropertySuggesterHooks::onCreateSchema';
 
 $remoteExtPathParts = explode(
diff --git a/extensions/ValueView/ValueView.mw.php 
b/extensions/ValueView/ValueView.mw.php
index 45f4bec..4b4beb7 100644
--- a/extensions/ValueView/ValueView.mw.php
+++

[MediaWiki-commits] [Gerrit] Revert "Revert "Revert "Revert "Install Jessie on db1018"""" - change (operations/puppet)

2016-02-05 Thread Jcrespo (Code Review) 
Jcrespo has uploaded a new change for review.

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

Change subject: Revert "Revert "Revert "Revert "Install Jessie on db1018
..

Revert "Revert "Revert "Revert "Install Jessie on db1018

This reverts commit a376eed3c16eb2f4224ab9eef4669ef763266103.

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


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/26/268826/1

diff --git a/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200 
b/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
index 0196edf..3e399d7 100644
--- a/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
+++ b/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
@@ -1224,6 +1224,8 @@
 host db1018 {
hardware ethernet 78:2b:cb:0a:13:12;
fixed-address db1018.eqiad.wmnet;
+   option pxelinux.pathprefix "jessie-installer/";
+   filename "jessie-installer/debian-installer/amd64/pxelinux.0";
 }
 
 host db1019 {

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

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

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

[MediaWiki-commits] [Gerrit] Temporarily disable unit tests and autoloading autoload.php ... - change (mediawiki...Wikidata)

2016-02-05 Thread Paladox (Code Review) 
Paladox has uploaded a new change for review.

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

Change subject: Temporarily disable unit tests and autoloading autoload.php 
from composer
..

Temporarily disable unit tests and autoloading autoload.php from composer

Since this test is failing REL1_25 branch and others and wasent even
testing because it uses an old config lets turn it off temporarily for
REL1_25 branch. Until a hack can be created.

Adds two new configs

$wmgUseWikidata is for turning off vendor if you want but is on by default.

$wmgUseWikidataTest is for turning on the unit tests. Since they fail this is 
off by default.

Bug: T125722
Change-Id: Ia5f42f5a8f57b47994a39e69a10db6560c4eb9f6
---
M Wikidata.php
M extensions/PropertySuggester/PropertySuggester.php
M extensions/ValueView/ValueView.mw.php
M extensions/Wikibase/client/WikibaseClient.php
M extensions/Wikibase/lib/WikibaseLib.php
M extensions/Wikibase/repo/Wikibase.php
6 files changed, 55 insertions(+), 25 deletions(-)


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

diff --git a/Wikidata.php b/Wikidata.php
index 0610e8e..9954905 100644
--- a/Wikidata.php
+++ b/Wikidata.php
@@ -4,35 +4,47 @@
 }
 
 // Jenkins stuff part1
-if ( PHP_SAPI === 'cli' && strpos( getenv( 'JOB_NAME' ), 
'mwext-Wikidata-testextension' ) !== false ) {
+if ( isset( $wgWikimediaJenkinsCI ) && $wgWikimediaJenkinsCI == true ) {
// in future, run as non-experimental
if ( !defined( 'WB_EXPERIMENTAL_FEATURES' ) || 
!WB_EXPERIMENTAL_FEATURES ) {
define( 'WB_EXPERIMENTAL_FEATURES', true );
}
 
-   $wmgUseWikibaseRepo = true;
-   $wmgUseWikibaseClient = true;
+   /* Hack for REL1_25 since it is failing */
+   $wmgUseWikidata = true;
+   $wmgUseWikidataTest = false;
+
+   if ( isset( $wmgUseWikidata ) && $wmgUseWikidata == true ) {
+   $wmgUseWikibaseRepo = true;
+   $wmgUseWikibaseClient = true;
+   }
 }
 
 // no magic, use wmf configs instead to control which entry points to load
 $wgEnableWikibaseRepo = false;
 $wgEnableWikibaseClient = false;
 
-include_once __DIR__ . '/vendor/autoload.php';
+if ( isset( $wmgUseWikidata ) && $wmgUseWikidata == true ) {
+   if ( file_exists(  __DIR__ . '/vendor/autoload.php' ) ) {
+   include_once __DIR__ . '/vendor/autoload.php';
+   }
+}
 
-if ( !empty( $wmgUseWikibaseRepo ) ) {
+if ( isset( $wmgUseWikibaseRepo ) && $wmgUseWikibaseRepo == true ) {
include_once __DIR__ . '/extensions/Wikibase/repo/Wikibase.php';
include_once __DIR__ . '/extensions/Wikidata.org/WikidataOrg.php';
include_once __DIR__ . 
'/extensions/PropertySuggester/PropertySuggester.php';
include_once __DIR__ . '/WikibaseRepo.settings.php';
 }
 
-if ( !empty( $wmgUseWikibaseClient ) ) {
+if ( isset( $wmgUseWikibaseClient ) && $wmgUseWikibaseClient == true ) {
include_once __DIR__ . '/extensions/Wikibase/client/WikibaseClient.php';
include_once __DIR__ . '/WikibaseClient.settings.php';
 }
 
-$wgHooks['UnitTestsList'][] = '\Wikidata\WikidataHooks::onUnitTestsList';
+if ( isset( $wmgUseWikidataTest ) && $wmgUseWikidataTest == true ) {
+   $wgHooks['UnitTestsList'][] = 
'\Wikidata\WikidataHooks::onUnitTestsList';
+}
 
 $wgExtensionCredits['wikibase'][] = array(
'path' => __FILE__,
@@ -45,7 +57,7 @@
 );
 
 // Jenkins stuff part2
-if ( PHP_SAPI === 'cli' && strpos( getenv( 'JOB_NAME' ), 
'mwext-Wikidata-testextension' ) !== false ) {
+if ( isset( $wgWikimediaJenkinsCI ) && $wgWikimediaJenkinsCI == true ) {
//Jenkins always loads both so no need to check if they are loaded 
before getting settings
require_once __DIR__ . '/extensions/Wikibase/repo/ExampleSettings.php';
require_once __DIR__ . 
'/extensions/Wikibase/client/ExampleSettings.php';
diff --git a/extensions/PropertySuggester/PropertySuggester.php 
b/extensions/PropertySuggester/PropertySuggester.php
index b8202c9..e9b904c 100644
--- a/extensions/PropertySuggester/PropertySuggester.php
+++ b/extensions/PropertySuggester/PropertySuggester.php
@@ -35,9 +35,13 @@
 global $wgAPIModules;
 $wgAPIModules['wbsgetsuggestions'] = 'PropertySuggester\GetSuggestions';
 
-global $wgHooks;
+global $wgHooks, $wmgUseWikidataTest;
 $wgHooks['BeforePageDisplay'][] = 
'PropertySuggesterHooks::onBeforePageDisplay';
-$wgHooks['UnitTestsList'][] = 'PropertySuggesterHooks::onUnitTestsList';
+
+if ( isset( $wmgUseWikidataTest ) && $wmgUseWikidataTest == true ) {
+   $wgHooks['UnitTestsList'][] = 'PropertySuggesterHooks::onUnitTestsList';
+}
+
 $wgHooks['LoadExtensionSchemaUpdates'][] = 
'PropertySuggesterHooks::onCreateSchema';
 
 $remoteExtPathParts = explode(
diff --git a/extensions/ValueView/ValueView.mw.php 
b/extensions/ValueView/ValueView.mw.php
index 45f4bec..4b4beb7 100644
--- a/extensions/ValueView/ValueView.mw.php
+++

[MediaWiki-commits] [Gerrit] Temporarily disable unit tests and autoloading autoload.php ... - change (mediawiki...Wikidata)

2016-02-05 Thread Paladox (Code Review) 
Paladox has uploaded a new change for review.

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

Change subject: Temporarily disable unit tests and autoloading autoload.php 
from composer
..

Temporarily disable unit tests and autoloading autoload.php from composer

Since this test is failing REL1_25 branch and others and wasent even
testing because it uses an old config lets turn it off temporarily for
REL1_25 branch. Until a hack can be created.

Adds two new configs

$wmgUseWikidata is for turning off vendor if you want but is on by default.

$wmgUseWikidataTest is for turning on the unit tests. Since they fail this is 
off by default.

Bug: T125722
Change-Id: Iab5a905837d4116e660f2178325a14d4965f5c93
---
M Wikidata.php
M extensions/PropertySuggester/PropertySuggester.php
M extensions/ValueView/ValueView.mw.php
M extensions/Wikibase/client/WikibaseClient.php
M extensions/Wikibase/lib/WikibaseLib.php
M extensions/Wikibase/repo/Wikibase.php
6 files changed, 55 insertions(+), 25 deletions(-)


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

diff --git a/Wikidata.php b/Wikidata.php
index 0610e8e..9954905 100644
--- a/Wikidata.php
+++ b/Wikidata.php
@@ -4,35 +4,47 @@
 }
 
 // Jenkins stuff part1
-if ( PHP_SAPI === 'cli' && strpos( getenv( 'JOB_NAME' ), 
'mwext-Wikidata-testextension' ) !== false ) {
+if ( isset( $wgWikimediaJenkinsCI ) && $wgWikimediaJenkinsCI == true ) {
// in future, run as non-experimental
if ( !defined( 'WB_EXPERIMENTAL_FEATURES' ) || 
!WB_EXPERIMENTAL_FEATURES ) {
define( 'WB_EXPERIMENTAL_FEATURES', true );
}
 
-   $wmgUseWikibaseRepo = true;
-   $wmgUseWikibaseClient = true;
+   /* Hack for REL1_25 since it is failing */
+   $wmgUseWikidata = true;
+   $wmgUseWikidataTest = false;
+
+   if ( isset( $wmgUseWikidata ) && $wmgUseWikidata == true ) {
+   $wmgUseWikibaseRepo = true;
+   $wmgUseWikibaseClient = true;
+   }
 }
 
 // no magic, use wmf configs instead to control which entry points to load
 $wgEnableWikibaseRepo = false;
 $wgEnableWikibaseClient = false;
 
-include_once __DIR__ . '/vendor/autoload.php';
+if ( isset( $wmgUseWikidata ) && $wmgUseWikidata == true ) {
+   if ( file_exists(  __DIR__ . '/vendor/autoload.php' ) ) {
+   include_once __DIR__ . '/vendor/autoload.php';
+   }
+}
 
-if ( !empty( $wmgUseWikibaseRepo ) ) {
+if ( isset( $wmgUseWikibaseRepo ) && $wmgUseWikibaseRepo == true ) {
include_once __DIR__ . '/extensions/Wikibase/repo/Wikibase.php';
include_once __DIR__ . '/extensions/Wikidata.org/WikidataOrg.php';
include_once __DIR__ . 
'/extensions/PropertySuggester/PropertySuggester.php';
include_once __DIR__ . '/WikibaseRepo.settings.php';
 }
 
-if ( !empty( $wmgUseWikibaseClient ) ) {
+if ( isset( $wmgUseWikibaseClient ) && $wmgUseWikibaseClient == true ) {
include_once __DIR__ . '/extensions/Wikibase/client/WikibaseClient.php';
include_once __DIR__ . '/WikibaseClient.settings.php';
 }
 
-$wgHooks['UnitTestsList'][] = '\Wikidata\WikidataHooks::onUnitTestsList';
+if ( isset( $wmgUseWikidataTest ) && $wmgUseWikidataTest == true ) {
+   $wgHooks['UnitTestsList'][] = 
'\Wikidata\WikidataHooks::onUnitTestsList';
+}
 
 $wgExtensionCredits['wikibase'][] = array(
'path' => __FILE__,
@@ -45,7 +57,7 @@
 );
 
 // Jenkins stuff part2
-if ( PHP_SAPI === 'cli' && strpos( getenv( 'JOB_NAME' ), 
'mwext-Wikidata-testextension' ) !== false ) {
+if ( isset( $wgWikimediaJenkinsCI ) && $wgWikimediaJenkinsCI == true ) {
//Jenkins always loads both so no need to check if they are loaded 
before getting settings
require_once __DIR__ . '/extensions/Wikibase/repo/ExampleSettings.php';
require_once __DIR__ . 
'/extensions/Wikibase/client/ExampleSettings.php';
diff --git a/extensions/PropertySuggester/PropertySuggester.php 
b/extensions/PropertySuggester/PropertySuggester.php
index b8202c9..e9b904c 100644
--- a/extensions/PropertySuggester/PropertySuggester.php
+++ b/extensions/PropertySuggester/PropertySuggester.php
@@ -35,9 +35,13 @@
 global $wgAPIModules;
 $wgAPIModules['wbsgetsuggestions'] = 'PropertySuggester\GetSuggestions';
 
-global $wgHooks;
+global $wgHooks, $wmgUseWikidataTest;
 $wgHooks['BeforePageDisplay'][] = 
'PropertySuggesterHooks::onBeforePageDisplay';
-$wgHooks['UnitTestsList'][] = 'PropertySuggesterHooks::onUnitTestsList';
+
+if ( isset( $wmgUseWikidataTest ) && $wmgUseWikidataTest == true ) {
+   $wgHooks['UnitTestsList'][] = 'PropertySuggesterHooks::onUnitTestsList';
+}
+
 $wgHooks['LoadExtensionSchemaUpdates'][] = 
'PropertySuggesterHooks::onCreateSchema';
 
 $remoteExtPathParts = explode(
diff --git a/extensions/ValueView/ValueView.mw.php 
b/extensions/ValueView/ValueView.mw.php
index 45f4bec..4b4beb7 100644
--- a/extensions/ValueView/ValueView.mw.php
+++

[MediaWiki-commits] [Gerrit] Revert "Revert "Revert "Revert "Install Jessie on db1018"""" - change (operations/puppet)

2016-02-05 Thread Jcrespo (Code Review) 
Jcrespo has submitted this change and it was merged.

Change subject: Revert "Revert "Revert "Revert "Install Jessie on db1018
..


Revert "Revert "Revert "Revert "Install Jessie on db1018

This reverts commit a376eed3c16eb2f4224ab9eef4669ef763266103.

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

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



diff --git a/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200 
b/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
index a235cc0..8eccc30 100644
--- a/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
+++ b/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
@@ -1224,6 +1224,8 @@
 host db1018 {
hardware ethernet 78:2b:cb:0a:13:12;
fixed-address db1018.eqiad.wmnet;
+   option pxelinux.pathprefix "jessie-installer/";
+   filename "jessie-installer/debian-installer/amd64/pxelinux.0";
 }
 
 host db1019 {

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

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

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

[MediaWiki-commits] [Gerrit] CRM-17951 (merged into 4.7) Add function to safe-add option ... - change (wikimedia...civicrm)

2016-02-05 Thread Ejegg (Code Review) 
Ejegg has submitted this change and it was merged.

Change subject: CRM-17951 (merged into 4.7) Add function to safe-add option 
values in upgrade
..


CRM-17951 (merged into 4.7) Add function to safe-add option values in upgrade

THis allows us to pre-add option values without hitting problems on upgrade.

THe primary gain is that the upstream script uses it but I prefer us to use the 
same functions

Bug: T124979

Change-Id: I7043c9d57733b3ebe2180cedbf513316456faf47
---
M CRM/Core/BAO/OptionValue.php
1 file changed, 18 insertions(+), 0 deletions(-)

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



diff --git a/CRM/Core/BAO/OptionValue.php b/CRM/Core/BAO/OptionValue.php
index 116bcbc..a33c795 100644
--- a/CRM/Core/BAO/OptionValue.php
+++ b/CRM/Core/BAO/OptionValue.php
@@ -518,4 +518,22 @@
 return $options;
   }
 
+  /**
+   * Ensure an option value exists.
+   *
+   * This function is intended to be called from the upgrade script to ensure
+   * that an option value exists, without hitting an error if it already 
exists.
+   *
+   * This is sympathetic to sites who might pre-add it.
+   */
+  public static function ensureOptionValueExists($params) {
+$existingValues = civicrm_api3('OptionValue', 'get', array(
+  'option_group_name' => $params['option_group_id'],
+  'name' => $params['name'],
+));
+if (!$existingValues['count']) {
+  civicrm_api3('OptionValue', 'create', $params);
+}
+  }
+
 }

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

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

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

[MediaWiki-commits] [Gerrit] Download civix from github, not sourceforge - change (wikimedia...civicrm-buildkit)

2016-02-05 Thread Awight (Code Review) 
Awight has submitted this change and it was merged.

Change subject: Download civix from github, not sourceforge
..


Download civix from github, not sourceforge

Change-Id: Idf7cea7b732c6d525e94f74c081ef4852bdaea1f
---
M bin/civi-download-tools
1 file changed, 12 insertions(+), 6 deletions(-)

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



diff --git a/bin/civi-download-tools b/bin/civi-download-tools
index 2f0e925..bae30dd 100755
--- a/bin/civi-download-tools
+++ b/bin/civi-download-tools
@@ -20,7 +20,8 @@
 LOCKFILE="$TMPDIR/civi-download-tools.lock"
 LOCKTIMEOUT=90
 CIVIXVER=14.09.1
-CIVIXURL="http://downloads.sourceforge.net/project/civix/civix-${CIVIXVER}.tar.bz2?r=http%3A%2F%2Fsourceforge.net%2Fprojects%2Fcivix%2Ffiles%2F_mirror=master;
+CIVIXRELEASE="https://raw.githubusercontent.com/totten/civix/master/release;
+CIVIXURL="https://github.com/totten/civix.git;
 HUBTAG="v1.12.1"
 HUBURL="https://github.com/github/hub;
 IS_QUIET=
@@ -164,7 +165,7 @@
   ## Download "civix"
   ## FIXME: Update civix so that it can be installed via composer as a 
dependency
   mkdir -p "$PRJDIR/extern" && touch "$PRJDIR/extern/civix.txt"
-  if [ -z "$IS_FORCE" -a -e "$PRJDIR/bin/civix" -a -d "extern/civix" -a "$(cat 
$PRJDIR/extern/civix.txt)" == "$CIVIXURL" ]; then
+  if [ -z "$IS_FORCE" -a -e "$PRJDIR/bin/civix" -a -d "extern/civix" -a "$(cat 
$PRJDIR/extern/civix.txt)" == "$CIVIXURL-$CIVIXVER" ]; then
 echo_comment "[[civix binary ($PRJDIR/bin/civix) already exists. 
Skipping.]]"
   else
 echo "[[Install civix]]"
@@ -172,12 +173,17 @@
 ## Cleanup
 [ -e app/tmp/civix ] && rm -rf app/tmp/civix
 [ -e extern/civix ] && rm -rf extern/civix
-[ -e "$TMPDIR/civix.tar.bz2" ] && rm -rf "$TMPDIR/civix.tar.bz2"
+[ -e "$TMPDIR/civix-$CIVIXVER.tar.bz2" ] && rm -rf 
"$TMPDIR/civix-$CIVIXVER.tar.bz2"
+[ -e "$TMPDIR/civixrelease" ] && rm -f "$TMPDIR/civixrelease"
 mkdir -p extern/civix
 
 ## Download
-download_url "$CIVIXURL" "$TMPDIR/civix.tar.bz2"
-tar xj  --strip-components 1 -C extern/civix -f "$TMPDIR/civix.tar.bz2"
+pushd "$TMPDIR" >> /dev/null
+  download_url "$CIVIXRELEASE" civixrelease
+  chmod u+x civixrelease
+  bash -c "./civixrelease \"$CIVIXURL\" \"$CIVIXVER\""
+popd >> /dev/null
+tar xj  --strip-components 1 -C extern/civix -f 
"$TMPDIR/build/civix-$CIVIXVER.tar.bz2"
 
 ## Setup a relative symlink
 pushd bin >> /dev/null
@@ -186,7 +192,7 @@
 popd >> /dev/null
 
 ## Mark as downloaded
-echo "$CIVIXURL" > "$PRJDIR/extern/civix.txt"
+echo "$CIVIXURL-$CIVIXVER" > "$PRJDIR/extern/civix.txt"
   fi
 
   ## Download "hub"

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Idf7cea7b732c6d525e94f74c081ef4852bdaea1f
Gerrit-PatchSet: 2
Gerrit-Project: wikimedia/fundraising/civicrm-buildkit
Gerrit-Branch: master
Gerrit-Owner: Ejegg 
Gerrit-Reviewer: Awight 
Gerrit-Reviewer: Ejegg 

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

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

2016-02-05 Thread Pwirth (Code Review) 
Pwirth has uploaded a new change for review.

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

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

GroupManager: Used task API instead of AjaxExportList

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


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

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

[MediaWiki-commits] [Gerrit] Add @since tags to all classes in view - change (mediawiki...Wikibase)

2016-02-05 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged.

Change subject: Add @since tags to all classes in view
..


Add @since tags to all classes in view

Also unify @license and @licence. The later is used much more often
in our code base.

Change-Id: I15ac31c055e93ab2859ecdb74170ca3ff171a70f
---
M view/resources.php
M view/resources.test.php
M view/resources/resources.php
M view/resources/wikibase/entityChangers/resources.php
M view/resources/wikibase/entityIdFormatter/resources.php
M view/resources/wikibase/view/resources.php
M view/src/EmptyEditSectionGenerator.php
M view/src/EntityIdFormatterFactory.php
M view/src/HtmlSnakFormatterFactory.php
M view/src/SpecialPageLinker.php
M view/src/Template/TemplateFactory.php
M view/tests/qunit/jquery/resources.php
M view/tests/qunit/resources.php
M view/tests/qunit/wikibase/entityChangers/resources.php
M view/tests/qunit/wikibase/entityIdFormatter/resources.php
M view/tests/qunit/wikibase/utilities/resources.php
M view/tests/qunit/wikibase/view/resources.php
17 files changed, 53 insertions(+), 14 deletions(-)

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



diff --git a/view/resources.php b/view/resources.php
index 3f66461..d41f390 100644
--- a/view/resources.php
+++ b/view/resources.php
@@ -1,7 +1,9 @@
 
  */
 return call_user_func( function() {
diff --git a/view/resources.test.php b/view/resources.test.php
index 94f3b24..cfed07b 100644
--- a/view/resources.test.php
+++ b/view/resources.test.php
@@ -1,7 +1,9 @@
 
  */
 global $wgHooks;
diff --git a/view/resources/resources.php b/view/resources/resources.php
index 0c1132b..b95770b 100644
--- a/view/resources/resources.php
+++ b/view/resources/resources.php
@@ -1,7 +1,9 @@
 
  */
 return call_user_func( function() {
diff --git a/view/resources/wikibase/entityChangers/resources.php 
b/view/resources/wikibase/entityChangers/resources.php
index 99b2e23..4520bf8 100644
--- a/view/resources/wikibase/entityChangers/resources.php
+++ b/view/resources/wikibase/entityChangers/resources.php
@@ -1,6 +1,9 @@
 
  */
 return call_user_func( function() {
diff --git a/view/resources/wikibase/entityIdFormatter/resources.php 
b/view/resources/wikibase/entityIdFormatter/resources.php
index a14ef99..a0bd386 100644
--- a/view/resources/wikibase/entityIdFormatter/resources.php
+++ b/view/resources/wikibase/entityIdFormatter/resources.php
@@ -1,7 +1,9 @@
 
  */
 return call_user_func( function() {
diff --git a/view/resources/wikibase/view/resources.php 
b/view/resources/wikibase/view/resources.php
index 22a4b22..f99454b 100644
--- a/view/resources/wikibase/view/resources.php
+++ b/view/resources/wikibase/view/resources.php
@@ -1,7 +1,9 @@
 
  */
 return call_user_func( function() {
diff --git a/view/src/EmptyEditSectionGenerator.php 
b/view/src/EmptyEditSectionGenerator.php
index 30a741f..a65ec21 100644
--- a/view/src/EmptyEditSectionGenerator.php
+++ b/view/src/EmptyEditSectionGenerator.php
@@ -9,6 +9,9 @@
 /**
  * An EditSectionGenerator returning empty string for edit sections
  *
+ * @since 0.5
+ *
+ * @licence GNU GPL v2+
  * @author Adrian Heine < adrian.he...@wikimedia.de >
  */
 class EmptyEditSectionGenerator implements EditSectionGenerator {
diff --git a/view/src/EntityIdFormatterFactory.php 
b/view/src/EntityIdFormatterFactory.php
index 43fe049..f2f223e 100644
--- a/view/src/EntityIdFormatterFactory.php
+++ b/view/src/EntityIdFormatterFactory.php
@@ -8,7 +8,9 @@
 /**
  * A factory interface for generating EntityIdFormatters.
  *
- * @license GPL 2+
+ * @since 0.5
+ *
+ * @licence GNU GPL v2+
  * @author Daniel Kinzler
  */
 interface EntityIdFormatterFactory {
diff --git a/view/src/HtmlSnakFormatterFactory.php 
b/view/src/HtmlSnakFormatterFactory.php
index c80ba59..87fe94d 100644
--- a/view/src/HtmlSnakFormatterFactory.php
+++ b/view/src/HtmlSnakFormatterFactory.php
@@ -8,7 +8,10 @@
 
 /**
  * A factory constructing SnakFormatters that output HTML.
+ *
  * @since 0.5
+ *
+ * @licence GNU GPL v2+
  * @author Adrian Heine < adrian.he...@wikimedia.de >
  */
 interface HtmlSnakFormatterFactory {
diff --git a/view/src/SpecialPageLinker.php b/view/src/SpecialPageLinker.php
index 88d1430..a1abddb 100644
--- a/view/src/SpecialPageLinker.php
+++ b/view/src/SpecialPageLinker.php
@@ -5,6 +5,9 @@
 /**
  * A service returning a URL for a specific special page with optional 
parameters.
  *
+ * @since 0.5
+ *
+ * @licence GNU GPL v2+
  * @author Adrian Heine < adrian.he...@wikimedia.de >
  */
 interface SpecialPageLinker {
diff --git a/view/src/Template/TemplateFactory.php 
b/view/src/Template/TemplateFactory.php
index bc83352..21ef349 100644
--- a/view/src/Template/TemplateFactory.php
+++ b/view/src/Template/TemplateFactory.php
@@ -3,7 +3,9 @@
 namespace Wikibase\View\Template;
 
 /**
- * @license GNU GPL v2+
+ * @since 0.5
+ *
+ * @licence GNU GPL v2+
  * @author Adrian Lang < adrian.l...@wikimedia.de >
  * @author Thiemo Mättig
  */

[MediaWiki-commits] [Gerrit] temporarily de-sensitize ipsec icinga checks - change (operations/puppet)

2016-02-05 Thread BBlack (Code Review) 
BBlack has uploaded a new change for review.

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

Change subject: temporarily de-sensitize ipsec icinga checks
..

temporarily de-sensitize ipsec icinga checks

Change-Id: I2b66bd0eb515622b7c870cf9d853dbce999c19a9
---
M modules/strongswan/manifests/monitoring/host.pp
1 file changed, 1 insertion(+), 0 deletions(-)


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

diff --git a/modules/strongswan/manifests/monitoring/host.pp 
b/modules/strongswan/manifests/monitoring/host.pp
index 5ea4d44..c225bee 100644
--- a/modules/strongswan/manifests/monitoring/host.pp
+++ b/modules/strongswan/manifests/monitoring/host.pp
@@ -17,5 +17,6 @@
 nrpe::monitor_service { 'IPsec':
 description  => 'IPsec',
 nrpe_command => '/usr/bin/sudo 
/usr/local/lib/nagios/plugins/check_strongswan',
+retries  => 7, # default 3, this is temporary during rolling cache 
restarts (--bblack 2016-02-05)
 }
 }

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

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

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

[MediaWiki-commits] [Gerrit] Testing db jessie installer problems on db2030 - change (operations/puppet)

2016-02-05 Thread Jcrespo (Code Review) 
Jcrespo has submitted this change and it was merged.

Change subject: Testing db jessie installer problems on db2030
..


Testing db jessie installer problems on db2030

This will clarify if it is host-dependent or installer-updates-
dependent.

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

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



diff --git a/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200 
b/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
index 92ff499..5809785 100644
--- a/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
+++ b/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
@@ -1604,6 +1604,8 @@
 host db2030 {
hardware ethernet d4:ae:52:93:41:6d;
fixed-address db2030.codfw.wmnet;
+   option pxelinux.pathprefix "jessie-installer/";
+   filename "jessie-installer/debian-installer/amd64/pxelinux.0";
 }
 
 host db2031 {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib8a883e7a15ee9a3846e372e086a1319276451df
Gerrit-PatchSet: 4
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Jcrespo 
Gerrit-Reviewer: Jcrespo 
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 the user who actually made the revision for onRevisionIn... - change (mediawiki...WikimediaEvents)

2016-02-05 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged.

Change subject: Use the user who actually made the revision for 
onRevisionInsertComplete
..


Use the user who actually made the revision for onRevisionInsertComplete

This is probably more correct, and avoids a log message from
SessionManager.

Bug: T124367
Change-Id: Idab3e093070cadfd5e18ceed30325d116e13b56f
---
M WikimediaEventsHooks.php
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Gergő Tisza: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/WikimediaEventsHooks.php b/WikimediaEventsHooks.php
index f5ac107..ae3be13 100644
--- a/WikimediaEventsHooks.php
+++ b/WikimediaEventsHooks.php
@@ -128,7 +128,7 @@
 */
public static function onRevisionInsertComplete( &$revision, $data, 
$flags ) {
$context = RequestContext::getMain();
-   $user = $context->getUser();
+   $user = User::newFromId( $revision->getUser( Revision::RAW ) );
 
// Anonymous users and bots don't count (sorry!)
if ( $user->isAnon() || $user->isAllowed( 'bot' ) ) {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Idab3e093070cadfd5e18ceed30325d116e13b56f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikimediaEvents
Gerrit-Branch: master
Gerrit-Owner: Anomie 
Gerrit-Reviewer: Anomie 
Gerrit-Reviewer: BryanDavis 
Gerrit-Reviewer: Gergő Tisza 
Gerrit-Reviewer: Ori.livneh 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] WDQS_Lag monitoring increase timespan - change (operations/puppet)

2016-02-05 Thread Addshore (Code Review) 
Addshore has uploaded a new change for review.

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

Change subject: WDQS_Lag monitoring increase timespan
..

WDQS_Lag monitoring increase timespan

Due to general lag in this data appearing in
graphite and also due to the fact that the data
is filled one host at a time it seems a 10 min
scope does not cover enough data points.

It would seem the requirements are
50% of data points be present.

A 30 minuite scope should allow for that.

Change-Id: I82ecd485c92a2b29f9928b9c018b4d3cab2c25e1
---
M modules/wdqs/manifests/monitor/services.pp
1 file changed, 2 insertions(+), 2 deletions(-)


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

diff --git a/modules/wdqs/manifests/monitor/services.pp 
b/modules/wdqs/manifests/monitor/services.pp
index d2f14d0..2c50786 100644
--- a/modules/wdqs/manifests/monitor/services.pp
+++ b/modules/wdqs/manifests/monitor/services.pp
@@ -39,9 +39,9 @@
 monitoring::graphite_threshold { 'WDQS_Lag':
 description => 'High lag',
 metric  => "wikidata.query.lag.${::hostname}",
-from=> '10min',
+from=> '30min',
 warning => '600', # 10 minutes
 critical=> '1800', # 30 minutes
-percentage  => '50', # Don't freak out on spikes
+percentage  => '30', # Don't freak out on spikes
 }
 }

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

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

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

[MediaWiki-commits] [Gerrit] scap: correct clone directives - change (operations/puppet)

2016-02-05 Thread Giuseppe Lavagetto (Code Review) 
Giuseppe Lavagetto has uploaded a new change for review.

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

Change subject: scap: correct clone directives
..

scap: correct clone directives

Also correct the erroneous documentation of git::clone

Change-Id: Ie6705ea3b4f0c36675bbb67acb916c54b7ce7623
---
M modules/git/manifests/clone.pp
M modules/scap/manifests/l10nupdate.pp
2 files changed, 20 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/81/268681/1

diff --git a/modules/git/manifests/clone.pp b/modules/git/manifests/clone.pp
index cce0eff..d41be3b 100644
--- a/modules/git/manifests/clone.pp
+++ b/modules/git/manifests/clone.pp
@@ -39,7 +39,7 @@
 #   }
 #
 # Will clone +http://blabla.org/core.git+ branch +the_best_branch+ at
-#  +/path/to/clone/container/core+
+#  +/path/to/clone/container/+
 #
 #   # Example: check out from gerrit:
 #   git::clone { 'analytics/wikimetrics':
diff --git a/modules/scap/manifests/l10nupdate.pp 
b/modules/scap/manifests/l10nupdate.pp
index a9c7a27..b5684ad 100644
--- a/modules/scap/manifests/l10nupdate.pp
+++ b/modules/scap/manifests/l10nupdate.pp
@@ -114,11 +114,28 @@
 group  => $deployment_group,
 mode   => '0755',
 }
-git::clone { ['mediawiki/core', 'mediawiki/skins', 'mediawiki/extensions']:
-directory  => '/var/lib/l10nupdate/mediawiki/',
+
+git::clone { 'mediawiki/core':
+directory  => '/var/lib/l10nupdate/mediawiki/core',
 owner  => 'l10nupdate',
 group  => $deployment_group,
 recurse_submodules => true,
+require=> File['/var/lib/l10nupdate/mediawiki'],
+}
+
+git::clone { 'mediawiki/extensions':
+directory  => '/var/lib/l10nupdate/mediawiki/extensions',
+owner  => 'l10nupdate',
+group  => $deployment_group,
+require=> File['/var/lib/l10nupdate/mediawiki'],
+}
+
+git::clone { 'mediawiki/skins':
+directory  => '/var/lib/l10nupdate/mediawiki/skins',
+owner  => 'l10nupdate',
+group  => $deployment_group,
+recurse_submodules => true,
+require=> File['/var/lib/l10nupdate/mediawiki'],
 }
 
 }

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

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

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

[MediaWiki-commits] [Gerrit] WiP: BsCommonAjaxInterface --> API #1 - change (mediawiki...BlueSpiceFoundation)

2016-02-05 Thread Robert Vogel (Code Review) 
Robert Vogel has uploaded a new change for review.

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

Change subject: WiP: BsCommonAjaxInterface --> API #1
..

WiP: BsCommonAjaxInterface --> API #1

WORK IN PROGRESS DO NOT MERGE

Step 1: TitleStore

Change-Id: Ia50033eed466166dcf9162815dc61fa325e55507
---
M BlueSpiceFoundation.php
M includes/AutoLoader.php
M includes/CommonAJAXInterface.php
A includes/api/BSApiTitleStore.php
4 files changed, 250 insertions(+), 223 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceFoundation 
refs/changes/85/268685/1

diff --git a/BlueSpiceFoundation.php b/BlueSpiceFoundation.php
index e3c708b..50c6119 100644
--- a/BlueSpiceFoundation.php
+++ b/BlueSpiceFoundation.php
@@ -69,6 +69,7 @@
 $wgAPIModules['bs-filebackend-store'] = 'BSApiFileBackendStore';
 $wgAPIModules['bs-user-store'] = 'BSApiUserStore';
 $wgAPIModules['bs-group-store'] = 'BSApiGroupStore';
+$wgAPIModules['bs-title-store'] = 'BSApiTitleStore';
 
 //I18N MW1.23+
 $wgMessagesDirs['BlueSpice'] = __DIR__ . '/i18n/core';
diff --git a/includes/AutoLoader.php b/includes/AutoLoader.php
index 5f27a8f..07e283c 100644
--- a/includes/AutoLoader.php
+++ b/includes/AutoLoader.php
@@ -63,6 +63,7 @@
 $GLOBALS['wgAutoloadClasses']['BSApiFileBackendStore'] = 
__DIR__."/api/BSApiFileBackendStore.php";
 $GLOBALS['wgAutoloadClasses']['BSApiUserStore'] = 
__DIR__."/api/BSApiUserStore.php";
 $GLOBALS['wgAutoloadClasses']['BSApiGroupStore'] = __DIR__ . 
'/api/BSApiGroupStore.php';
+$GLOBALS['wgAutoloadClasses']['BSApiTitleStore'] = __DIR__ . 
'/api/BSApiTitleStore.php';
 
 //adapter
 $GLOBALS['wgAutoloadClasses']['BsExtensionMW'] = 
__DIR__."/ExtensionMW.class.php";
diff --git a/includes/CommonAJAXInterface.php b/includes/CommonAJAXInterface.php
index 5d44860..67b7773 100644
--- a/includes/CommonAJAXInterface.php
+++ b/includes/CommonAJAXInterface.php
@@ -2,229 +2,6 @@
 
 class BsCommonAJAXInterface {
 
-   /**
-* Returns a List of Titles for the client side
-* @global Language $wgLang
-* @param string $sOptions JSON formatted options array
-* @return BsCAResponse
-*/
-   public static function getTitleStoreData( $sOptions = '{}' ) {
-   global $wgContLang;
-   $oResponse = BsCAResponse::newFromPermission( 'read' );
-   if ( $oResponse->isSuccess() === false ) {
-   return $oResponse;
-   }
-
-   $oContext = RequestContext::getMain();
-   $oParams = BsExtJSStoreParams::newFromRequest();
-   $aOptions = FormatJson::decode( $sOptions, true ) + array(
-   'limit' => 100,
-   'namespaces' => array(),
-   'returnQuery' => false
-   );
-
-   $sQuery = strtolower( $oParams->getQuery() );
-   $sQuery = str_replace( '_', ' ', $sQuery );
-
-   //See JS BS.model.Title
-   $aPayload = array();
-   $aDataSet = array(
-   'page_id' => 0,
-   'page_namespace' => 0,
-   'page_title' => '',
-   'prefixedText' => '',
-   'displayText' => '',
-   'type' => 'wikipage'
-   );
-
-   //Step 1: Collect namespaces
-   $aNamespaces = $wgContLang->getNamespaces();
-   asort( $aNamespaces );
-   foreach ( $aNamespaces as $iNsId => $sNamespaceText ) {
-   if ( empty( $sNamespaceText ) ) {
-   continue;
-   }
-
-   if ( !in_array( $iNsId, $aOptions['namespaces'] ) ) {
-   continue;
-   }
-
-   $sNormNSText = strtolower( $sNamespaceText );
-   $sNormNSText = str_replace( '_', ' ', $sNormNSText );
-
-   if ( empty( $sQuery ) || strpos( $sNormNSText, $sQuery 
) === 0) {
-
-   //Only namespaces a user has the read 
permission for
-   $oDummyTitle = 
Title::newFromText($sNamespaceText.':X');
-   if( $oDummyTitle->userCan('read') === false ) {
-   continue;
-   }
-
-   $aPayload[] = array(
-   'type' => 'namespace',
-   'displayText' => $sNamespaceText.':'
-   ) + $aDataSet;
-   }
-   }
-
-   if ( empty( $sQuery ) ) {
-   $oResponse->setPayload( $aPayload );
-   return $oResponse;
-   }
-
-   //Step 2: Find pages
-   $oQueryTitle =

[MediaWiki-commits] [Gerrit] icinga contactgroups: add jzerebecki and irc-wikidata to wdqs - change (operations/puppet)

2016-02-05 Thread JanZerebecki (Code Review) 
JanZerebecki has uploaded a new change for review.

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

Change subject: icinga contactgroups: add jzerebecki and irc-wikidata to wdqs
..

icinga contactgroups: add jzerebecki and irc-wikidata to wdqs

Change-Id: I1ee72f782e1c4d84193eae2ac50928912f118e56
---
M modules/nagios_common/files/contactgroups.cfg
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/modules/nagios_common/files/contactgroups.cfg 
b/modules/nagios_common/files/contactgroups.cfg
index 8df55d9..3db8e8e 100644
--- a/modules/nagios_common/files/contactgroups.cfg
+++ b/modules/nagios_common/files/contactgroups.cfg
@@ -62,7 +62,7 @@
 # T111243
 define contactgroup {
 contactgroup_name   wdqs-admins
-members smalyshev
+members smalyshev,irc-wikidata,jzerebecki
 }
 
 define contactgroup {

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

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

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

[MediaWiki-commits] [Gerrit] Don't replace !! in elements - change (mediawiki/core)

2016-02-05 Thread Arlolra (Code Review) 
Arlolra has uploaded a new change for review.

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

Change subject: Don't replace !! in elements
..

Don't replace !! in elements

 * 55313f4e almost got it right, but missed the str_replacing table
   headings.

 * Thankfully, this was doubly broken before that patch since the
   StringUtils::explodeMarkup would have skipped the || which would
   go on to be explode by table cell attribute parsing. The test case
   provided would look like,

   
   
   |">ha ho
   

   Suffice it to say, noone is using this in production.

 * Note that we can't just entity encode the ! since that would break
   style attributes with !important.

 * Also note, Parsoid already gets this right.

 * Adds a StringUtils::replaceMarkup

Change-Id: Iab3ae4518fcb307b795d57eece420ba48af0a3bf
---
M includes/libs/StringUtils.php
M includes/parser/Parser.php
M tests/parser/parserTests.txt
3 files changed, 44 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/88/268688/1

diff --git a/includes/libs/StringUtils.php b/includes/libs/StringUtils.php
index c56ed07..23fb25e 100644
--- a/includes/libs/StringUtils.php
+++ b/includes/libs/StringUtils.php
@@ -289,6 +289,31 @@
}
 
/**
+* More or less "markup-safe" str_replace()
+* Ignores any instances of the separator inside `<...>`
+* @param string $search
+* @param string $replace
+* @param string $text
+* @return string
+*/
+   static function replaceMarkup( $search, $replace, $text ) {
+   $placeholder = "\x00";
+
+   // Remove placeholder instances
+   $text = str_replace( $placeholder, '', $text );
+
+   // Replace instances of the separator inside HTML-like tags 
with the placeholder
+   $replacer = new DoubleReplacer( $search, $placeholder );
+   $cleaned = StringUtils::delimiterReplaceCallback( '<', '>', 
$replacer->cb(), $text );
+
+   // Explode, then put the replaced separators back in
+   $cleaned = str_replace( $search, $replace, $cleaned );
+   $text = str_replace( $placeholder, $search, $cleaned );
+
+   return $text;
+   }
+
+   /**
 * Escape a string to make it suitable for inclusion in a preg_replace()
 * replacement parameter.
 *
diff --git a/includes/parser/Parser.php b/includes/parser/Parser.php
index f947285..bf99096 100644
--- a/includes/parser/Parser.php
+++ b/includes/parser/Parser.php
@@ -1115,7 +1115,7 @@
 
// Implies both are valid for table headings.
if ( $first_character === '!' ) {
-   $line = str_replace( '!!', '||', $line 
);
+   $line = StringUtils::replaceMarkup( 
'!!', '||', $line );
}
 
# Split up multiple cells on the same line.
diff --git a/tests/parser/parserTests.txt b/tests/parser/parserTests.txt
index d866ed8..6e271d5 100644
--- a/tests/parser/parserTests.txt
+++ b/tests/parser/parserTests.txt
@@ -6335,6 +6335,24 @@
 !! end
 
 !! test
+Element attributes with double ! should not be broken up by 
+!! wikitext
+{|
+! hi ha ho
+|}
+!! html/php
+
+
+ hi ha ho
+
+
+!! html/parsoid
+
+ hi ha 
ho
+
+!! end
+
+!! test
 ! and || in element attributes should not be parsed as /
 !! wikitext
 {|

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

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

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

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

2016-02-05 Thread Sbisson (Code Review) 
Sbisson has uploaded a new change for review.

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

Change subject: [WIP] Rephrase notifications
..

[WIP] Rephrase notifications

Add links to thank and discuss.

Bug: T125693
Change-Id: Ib6ec612db042c434b5dc14a7e9027f585f2e4057
---
M PageTriage.php
M api/ApiPageTriageAction.php
M api/ApiPageTriageTagging.php
M i18n/en.json
M i18n/qqq.json
M includes/Notifications/PageTriageAddDeletionTagPresentationModel.php
M includes/Notifications/PageTriageAddMaintenanceTagPresentationModel.php
M includes/Notifications/PageTriageMarkAsReviewedPresentationModel.php
A includes/Notifications/PageTriagePresentationModel.php
9 files changed, 119 insertions(+), 84 deletions(-)


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

diff --git a/PageTriage.php b/PageTriage.php
index bd3c060..439f831 100644
--- a/PageTriage.php
+++ b/PageTriage.php
@@ -144,6 +144,8 @@
. 'includes/PageTriageLogFormatter.php';
 $wgAutoloadClasses['PageTriageNotificationFormatter'] = $dir
. 'includes/Notifications/PageTriageNotificationFormatter.php';
+$wgAutoloadClasses['PageTriagePresentationModel'] = $dir
+   . 'includes/Notifications/PageTriagePresentationModel.php';
 $wgAutoloadClasses['PageTriageMarkAsReviewedPresentationModel'] = $dir
. 
'includes/Notifications/PageTriageMarkAsReviewedPresentationModel.php';
 $wgAutoloadClasses['PageTriageAddMaintenanceTagPresentationModel'] = $dir
diff --git a/api/ApiPageTriageAction.php b/api/ApiPageTriageAction.php
index 1474857..5de3755 100644
--- a/api/ApiPageTriageAction.php
+++ b/api/ApiPageTriageAction.php
@@ -35,7 +35,10 @@
PageTriageUtil::createNotificationEvent(
$article,
$this->getUser(),
-   'pagetriage-mark-as-reviewed'
+   'pagetriage-mark-as-reviewed',
+   array(
+   'note' => $params['note'],
+   )
);
}
 
diff --git a/api/ApiPageTriageTagging.php b/api/ApiPageTriageTagging.php
index 82c9301..1314cfb 100644
--- a/api/ApiPageTriageTagging.php
+++ b/api/ApiPageTriageTagging.php
@@ -96,6 +96,8 @@
 
$api->execute();
 
+   $note = $wgContLang->truncate( $params['note'], 150 );
+
// logging to the logging table
if ( $params['taglist'] ) {
if ( $params['deletion'] ) {
@@ -109,7 +111,10 @@
$article,
$this->getUser(),
'pagetriage-add-deletion-tag',
-   $params['taglist']
+   array(
+   'tags' => 
$params['taglist'],
+   'note' => $note,
+   )
);
} else {
$entry = array(
@@ -119,7 +124,11 @@
$article,
$this->getUser(),

'pagetriage-add-maintenance-tag',
-   $params['taglist']
+   array(
+   'tags' => 
$params['taglist'],
+   'note' => $note,
+   'revId' => 
$api->getResult()->getResultData( array( 'edit', 'newrevid' ) ),
+   )
);
}
 
@@ -127,7 +136,6 @@
$logEntry = new ManualLogEntry( $type, 
$action );
$logEntry->setPerformer( 
$this->getUser() );
$logEntry->setTarget( 
$article->getTitle() );
-   $note = $wgContLang->truncate( 
$params['note'], 150 );
if ( $note ) {
$logEntry->setComment( $note );
}
diff --git a/i18n/en.json b/i18n/en.json
index 2fcde15..f9c9b09 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -364,9 +364,14 @@
"pagetriage-notification-add-deletion-tag2": "The page [[$2]] was 
{{GENDER:$1|reviewed}} and {{GENDER:$1|marked for deletion}} by

[MediaWiki-commits] [Gerrit] Set CSP to false - change (operations/puppet)

2016-02-05 Thread Yurik (Code Review) 
Yurik has uploaded a new change for review.

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

Change subject: Set CSP to false
..

Set CSP to false

At the moment this is a noop because CSP is not set for kartotherian
We plan to add it to Kartotherian, and gently roll it into production

Change-Id: Ia01e64d73eec278912b168199698c831b7dfc36a
---
M modules/kartotherian/templates/config.yaml.erb
1 file changed, 4 insertions(+), 0 deletions(-)


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

diff --git a/modules/kartotherian/templates/config.yaml.erb 
b/modules/kartotherian/templates/config.yaml.erb
index 687dca2..60ce1e6 100644
--- a/modules/kartotherian/templates/config.yaml.erb
+++ b/modules/kartotherian/templates/config.yaml.erb
@@ -8,3 +8,7 @@
 cassandra-pswd: '<%= @cassandra_kartotherian_pass %>'
 
 sources: sources.prod.yaml
+
+# At the moment this is a noop because CSP is not set for kartotherian
+# We plan to add it to Kartotherian, and gently roll it into production
+csp: false

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

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

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

[MediaWiki-commits] [Gerrit] Add "external ID" type to OWL ontology. - change (mediawiki...Wikibase)

2016-02-05 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged.

Change subject: Add "external ID" type to OWL ontology.
..


Add "external ID" type to OWL ontology.

Change-Id: I04296c81d11710c41b101b61e876228836bc548a
---
M docs/ontology.owl
1 file changed, 7 insertions(+), 0 deletions(-)

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



diff --git a/docs/ontology.owl b/docs/ontology.owl
index 283fd42..184076d 100644
--- a/docs/ontology.owl
+++ b/docs/ontology.owl
@@ -177,6 +177,13 @@
   
   
 
+  
+  WikibaseExternalId
+  Type for referring to ID defined by external 
authority.
+  
+  
+
+

[MediaWiki-commits] [Gerrit] Don't require showImages=true to return carrier messages fro... - change (mediawiki...ZeroBanner)

2016-02-05 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged.

Change subject: Don't require showImages=true to return carrier messages from 
the API
..


Don't require showImages=true to return carrier messages from the API

Needed by the apps in order to get custom message info for certain partners
who currently have showImages set to false.

If there are situations where an image to be created with info from the API
should be suppressed instead, that would be more appropriately handled
elsewhere.

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

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



diff --git a/includes/ApiZeroBanner.php b/includes/ApiZeroBanner.php
index 01a7f29..bd2c64b 100644
--- a/includes/ApiZeroBanner.php
+++ b/includes/ApiZeroBanner.php
@@ -85,7 +85,7 @@
}
$state = PageRenderingHooks::getState( $this );
$config = $state->getZeroConfig();
-   if ( $config && !$config->disableApps() && 
$config->showImages() ) {
+   if ( $config && !$config->disableApps() ) {
$lang = $this->getLanguage();
$langCode = $lang->getCode();
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib4eaea7459b5529307cbb8523a67819d60936eed
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ZeroBanner
Gerrit-Branch: master
Gerrit-Owner: Mholloway 
Gerrit-Reviewer: Yurik 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Add Special:UserLogin/signup to search suggestions - change (mediawiki/core)

2016-02-05 Thread Alex Monk (Code Review) 
Alex Monk has uploaded a new change for review.

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

Change subject: Add Special:UserLogin/signup to search suggestions
..

Add Special:UserLogin/signup to search suggestions

Change-Id: I8aa1c7526f5c8d4c80b2cc649b39a30c1da3946a
---
M includes/specials/SpecialUserlogin.php
1 file changed, 3 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/79/268679/1

diff --git a/includes/specials/SpecialUserlogin.php 
b/includes/specials/SpecialUserlogin.php
index d9a5e4f..05e5229 100644
--- a/includes/specials/SpecialUserlogin.php
+++ b/includes/specials/SpecialUserlogin.php
@@ -1758,4 +1758,7 @@
return $expired;
}
 
+   protected function getSubpagesForPrefixSearch() {
+   return array( 'signup' );
+   }
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I8aa1c7526f5c8d4c80b2cc649b39a30c1da3946a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Alex Monk 

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

[MediaWiki-commits] [Gerrit] Introduces Wikibase performance mark - change (mediawiki...Wikibase)

2016-02-05 Thread Jonas Kress (WMDE) (Code Review) 
Jonas Kress (WMDE) has uploaded a new change for review.

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

Change subject: Introduces Wikibase performance mark
..

Introduces Wikibase performance mark

This is a wrapper for window.performance

Change-Id: Ib8ca57e6df6210d31fa51939eea2c8ce8febec03
---
M repo/resources/Resources.php
A repo/resources/performance/Mark.js
A repo/resources/performance/__namespace.js
A repo/resources/performance/resources.php
M repo/resources/wikibase.ui.entityViewInit.js
5 files changed, 71 insertions(+), 9 deletions(-)


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

diff --git a/repo/resources/Resources.php b/repo/resources/Resources.php
index dd8aa2e..73bbc48 100644
--- a/repo/resources/Resources.php
+++ b/repo/resources/Resources.php
@@ -105,7 +105,8 @@
'wikibase.store.CachingEntityStore',
'wikibase.store.CombiningEntityStore',
'wikibase.view.ViewFactory',
-   'wikibase.WikibaseContentLanguages'
+   'wikibase.WikibaseContentLanguages',
+   'wikibase.performance.Mark'
),
'messages' => array(
'pagetitle',
@@ -158,6 +159,7 @@
$modules,
include __DIR__ . '/experts/resources.php',
include __DIR__ . '/formatters/resources.php',
-   include __DIR__ . '/parsers/resources.php'
+   include __DIR__ . '/parsers/resources.php',
+   include __DIR__ . '/performance/resources.php'
);
 } );
diff --git a/repo/resources/performance/Mark.js 
b/repo/resources/performance/Mark.js
new file mode 100644
index 000..6d528c7
--- /dev/null
+++ b/repo/resources/performance/Mark.js
@@ -0,0 +1,24 @@
+( function( wb, performance ) {
+   "use strict";
+
+   var MODULE = wb.performance;
+
+   /**
+* Wikibase performance mark
+*
+* @class wikibase.performance.Marks
+* @licence GNU GPL v2+
+*
+* @author Jonas Kress
+* @static
+*/
+   var SELF = MODULE.Mark = function( nameString ) {
+   if( !performance ){
+   return;
+   }
+
+   performance.mark( nameString );
+   }
+
+
+}( wikibase, window.performance ) );
diff --git a/repo/resources/performance/__namespace.js 
b/repo/resources/performance/__namespace.js
new file mode 100644
index 000..b2fef95
--- /dev/null
+++ b/repo/resources/performance/__namespace.js
@@ -0,0 +1,5 @@
+/**
+ * @license GNU GPL v2+
+ * @author Jonas Kress
+ */
+wikibase.performance = wikibase.performance || {};
\ No newline at end of file
diff --git a/repo/resources/performance/resources.php 
b/repo/resources/performance/resources.php
new file mode 100644
index 000..850f032
--- /dev/null
+++ b/repo/resources/performance/resources.php
@@ -0,0 +1,36 @@
+ __DIR__,
+   'remoteExtPath' => '..' . $remoteExtPath[0],
+   );
+
+   return array(
+   'wikibase.performance.__namespace' => $moduleTemplate + array(
+   'scripts' => array(
+   '__namespace.js'
+   ),
+   'dependencies' => array(
+   'wikibase',
+   )
+   ),
+
+   'wikibase.performance.Mark' => $moduleTemplate + array(
+   'scripts' => array(
+   'Mark.js',
+   ),
+   'dependencies' => array(
+   'wikibase.performance.__namespace',
+   ),
+   ),
+   );
+} );
diff --git a/repo/resources/wikibase.ui.entityViewInit.js 
b/repo/resources/wikibase.ui.entityViewInit.js
index 0b5b2b4..44a5691 100644
--- a/repo/resources/wikibase.ui.entityViewInit.js
+++ b/repo/resources/wikibase.ui.entityViewInit.js
@@ -337,12 +337,7 @@
if ( mw.config.get( 'wbEntity' ) === null ) {
return;
}
-
-   // This is copied from startup.js in MediaWiki core.
-   var mwPerformance = window.performance && performance.mark ? 
performance : {
-   mark: function() {}
-   };
-   mwPerformance.mark( 'wbInitStart' );
+   wikibase.performance.Mark( 'wbInitStart' );
 
var $entityview = $( '.wikibase-entityview' );
var entityInitializer = new wb.EntityInitializer( 'wbEntity' );
@@ -361,7 +356,7 @@
attachWatchLinkUpdater( $entityview, viewName );
}
 
-

[MediaWiki-commits] [Gerrit] Display a message in motd if puppet agent is disabled - change (operations/puppet)

2016-02-05 Thread Ema (Code Review) 
Ema has uploaded a new change for review.

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

Change subject: Display a message in motd if puppet agent is disabled
..

Display a message in motd if puppet agent is disabled

Change-Id: I37039ddc47a265e4c314a2536a6c073691d0fa05
---
A modules/base/files/puppet/98-puppet-agent-disabled
M modules/base/manifests/puppet.pp
2 files changed, 17 insertions(+), 0 deletions(-)


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

diff --git a/modules/base/files/puppet/98-puppet-agent-disabled 
b/modules/base/files/puppet/98-puppet-agent-disabled
new file mode 100644
index 000..1b385b0
--- /dev/null
+++ b/modules/base/files/puppet/98-puppet-agent-disabled
@@ -0,0 +1,11 @@
+#!/bin/sh
+# Script displaying a message if Puppet agent is disabled.
+
+PATH=/bin:/usr/bin
+
+lockfile="/var/lib/puppet/state/agent_disabled.lock"
+
+if test -f $lockfile; then
+reason="$(jq -r '.disabled_message' $lockfile 2>/dev/null)"
+echo "Puppet disabled. $reason"
+fi
diff --git a/modules/base/manifests/puppet.pp b/modules/base/manifests/puppet.pp
index b4e0872..6fb5fe3 100644
--- a/modules/base/manifests/puppet.pp
+++ b/modules/base/manifests/puppet.pp
@@ -95,4 +95,10 @@
 priority => 97,
 source   => 'puppet:///modules/base/puppet/97-last-puppet-run',
 }
+
+motd::script { 'puppet-agent-disabled':
+ensure   => present,
+priority => 98,
+source   => 'puppet:///modules/base/puppet/98-puppet-agent-disabled',
+}
 }

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

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

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

[MediaWiki-commits] [Gerrit] require_once is not a function - change (mediawiki...PageTriage)

2016-02-05 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged.

Change subject: require_once is not a function
..


require_once is not a function

Remove parentheses around require_once
See T116779

Change-Id: I900e54900494fa415df997982f291387b0f47719
---
M PageTriage.php
M cron/updatePageTriageQueue.php
M cron/updateUserMetadata.php
M tools/cleanupPageTriage.php
M tools/cleanupPageTriageLog.php
M tools/cleanupPageTriagePageTags.php
6 files changed, 11 insertions(+), 11 deletions(-)

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



diff --git a/PageTriage.php b/PageTriage.php
index cbfb7a0..bd3c060 100644
--- a/PageTriage.php
+++ b/PageTriage.php
@@ -30,7 +30,7 @@
 if ( !defined( 'MEDIAWIKI' ) ) {
echo <
Gerrit-Reviewer: Mattflaschen 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Prevent possible crash when getting image via pipeline. - change (apps...wikipedia)

2016-02-05 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged.

Change subject: Prevent possible crash when getting image via pipeline.
..


Prevent possible crash when getting image via pipeline.

The exception will be fed to HockeyApp, but the user will just see a
toast.

T114658

Change-Id: Idc289beca38b61731e15cfff18995749a508b6de
---
M app/src/main/java/org/wikipedia/page/gallery/ImagePipelineBitmapGetter.java
1 file changed, 11 insertions(+), 4 deletions(-)

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



diff --git 
a/app/src/main/java/org/wikipedia/page/gallery/ImagePipelineBitmapGetter.java 
b/app/src/main/java/org/wikipedia/page/gallery/ImagePipelineBitmapGetter.java
index 84bcfa4..7efaaf5 100644
--- 
a/app/src/main/java/org/wikipedia/page/gallery/ImagePipelineBitmapGetter.java
+++ 
b/app/src/main/java/org/wikipedia/page/gallery/ImagePipelineBitmapGetter.java
@@ -17,6 +17,8 @@
 import com.facebook.imagepipeline.request.ImageRequest;
 import com.facebook.imagepipeline.request.ImageRequestBuilder;
 
+import org.wikipedia.util.log.L;
+
 public abstract class ImagePipelineBitmapGetter {
 private Context context;
 private String imageUrl;
@@ -42,10 +44,15 @@
 private class BitmapDataSubscriber extends BaseBitmapDataSubscriber {
 @Override
 protected void onNewResultImpl(Bitmap tempBitmap) {
-Bitmap bitmap = Bitmap.createBitmap(tempBitmap.getWidth(), 
tempBitmap.getHeight(), Bitmap.Config.ARGB_);
-Canvas canvas = new Canvas(bitmap);
-canvas.drawBitmap(tempBitmap, 0f, 0f, new Paint());
-onSuccess(bitmap);
+try {
+Bitmap bitmap = Bitmap.createBitmap(tempBitmap.getWidth(), 
tempBitmap.getHeight(), Bitmap.Config.ARGB_);
+Canvas canvas = new Canvas(bitmap);
+canvas.drawBitmap(tempBitmap, 0f, 0f, new Paint());
+onSuccess(bitmap);
+} catch (Throwable t) {
+L.logRemoteErrorIfProd(t);
+onError(t);
+}
 }
 
 @Override

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

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

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

[MediaWiki-commits] [Gerrit] Bump mobile app session metrics driver mem to 4G - change (analytics/refinery)

2016-02-05 Thread Ottomata (Code Review) 
Ottomata has submitted this change and it was merged.

Change subject: Bump mobile app session metrics driver mem to 4G
..


Bump mobile app session metrics driver mem to 4G

It currently causes the job not to start,
failing because of too many input parquet files
to reconciliate.

Bug: T125960

Change-Id: I3c68ef5bad3482827303bf5a5a98d4de9e53e8c4
---
M oozie/mobile_apps/session_metrics/bundle.properties
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/oozie/mobile_apps/session_metrics/bundle.properties 
b/oozie/mobile_apps/session_metrics/bundle.properties
index 2c67ab4..3baf3f4 100644
--- a/oozie/mobile_apps/session_metrics/bundle.properties
+++ b/oozie/mobile_apps/session_metrics/bundle.properties
@@ -54,7 +54,7 @@
 spark_job_name= app_session_metrics
 spark_number_executors= 32
 spark_executor_memory = 2G
-spark_driver_memory   = 2G
+spark_driver_memory   = 4G
 output_directory  = ${name_node}/wmf/data/wmf/mobile_apps
 temporary_directory   = 
${name_node}/tmp/mobile_apps/session_metrics
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I3c68ef5bad3482827303bf5a5a98d4de9e53e8c4
Gerrit-PatchSet: 1
Gerrit-Project: analytics/refinery
Gerrit-Branch: master
Gerrit-Owner: Joal 
Gerrit-Reviewer: Mforns 
Gerrit-Reviewer: Nuria 
Gerrit-Reviewer: Ottomata 

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

[MediaWiki-commits] [Gerrit] allow dataset servers to have rsync access to /srv/dumps on ... - change (operations/puppet)

2016-02-05 Thread ArielGlenn (Code Review) 
ArielGlenn has uploaded a new change for review.

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

Change subject: allow dataset servers to have rsync access to /srv/dumps on 
labstore
..

allow dataset servers to have rsync access to /srv/dumps on labstore

Bug: T117180
Change-Id: Id3fe0fe7c7676152e6a886c5b5dd404d8e8fef1d
---
M modules/role/manifests/labs/nfs/extras.pp
1 file changed, 6 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/92/268692/1

diff --git a/modules/role/manifests/labs/nfs/extras.pp 
b/modules/role/manifests/labs/nfs/extras.pp
index 34c2aa7..6a6c308 100644
--- a/modules/role/manifests/labs/nfs/extras.pp
+++ b/modules/role/manifests/labs/nfs/extras.pp
@@ -23,6 +23,12 @@
 hosts_allow => $dump_servers_ips,
 }
 
+rsync::server::module { 'dumps':
+path=> '/srv/dumps',
+read_only   => 'no',
+hosts_allow => $dump_servers_ips,
+}
+
 # Allow users to push files from statistics servers here.
 file { '/srv/statistics':
 ensure => 'directory',

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

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

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

[MediaWiki-commits] [Gerrit] Update maps - change (mediawiki...SemanticForms)

2016-02-05 Thread Paladox (Code Review) 
Paladox has uploaded a new change for review.

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

Change subject: Update maps
..

Update maps

This introduces optional dependacys on OpenLayers mediawiki extension.

If that extension is installed openlayers map will use the new updated
maps js code if the extension is not installed it will fallback and use
the website.

Google maps will always use the new js code.

Change-Id: Id698203f9cb2ddbef903ae924223b1bf34eab566
---
M .jshintignore
M Gruntfile.js
M composer.json
M includes/SF_Utils.php
M includes/forminputs/SF_GoogleMapsInput.php
M includes/forminputs/SF_OpenLayersInput.php
A libs/SF_maps.backup.js
M libs/SF_maps.js
8 files changed, 361 insertions(+), 140 deletions(-)


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

diff --git a/.jshintignore b/.jshintignore
index 3493ee3..861a7cc 100644
--- a/.jshintignore
+++ b/.jshintignore
@@ -3,6 +3,6 @@
 libs/jquery.dynatree.js
 libs/jquery.fancybox.js
 libs/select2.js
-libs/SF_maps.js
+libs/SF_maps.backup.js
 node_modules/
 vendor/
diff --git a/Gruntfile.js b/Gruntfile.js
index c679ec7..758a69a 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -17,7 +17,7 @@
'!libs/jquery.dynatree.js',
'!libs/jquery.fancybox.js',
'!libs/select2.js',
-   '!libs/SF_maps.js'
+   '!libs/SF_maps.backup'
]
},
// banana: {
diff --git a/composer.json b/composer.json
index 758e5a9..67122c2 100644
--- a/composer.json
+++ b/composer.json
@@ -19,7 +19,8 @@
],
"require": {
"php": ">=5.3.0",
-   "composer/installers": "1.*,>=1.0.1"
+   "composer/installers": "1.*,>=1.0.1",
+   "mediawiki/open-layers": "dev-master"
},
"autoload": {
"files" : [
@@ -29,6 +30,9 @@
"extra": {
"branch-alias": {
"dev-master": "2.8.x-dev"
+   },
+   "installer-paths": {
+   "../{$name}": ["mediawiki/open-layers"]
}
},
"require-dev": {
diff --git a/includes/SF_Utils.php b/includes/SF_Utils.php
index 3589755..007368d 100644
--- a/includes/SF_Utils.php
+++ b/includes/SF_Utils.php
@@ -1357,13 +1357,46 @@
) );
}
 
-   $resourceLoader->register( array(
-   'ext.semanticforms.maps' => array(
-   'localBasePath' => __DIR__,
-   'remoteExtPath' => 'SemanticForms',
-   'scripts' => '/../libs/SF_maps.js',
-   ),
-   ) );
+   if ( version_compare( $GLOBALS['wgVersion'], '1.27c', '>' ) ) {
+   if ( ExtensionRegistry::getInstance()->isLoaded( 
'OpenLayers' ) ) {
+   $resourceLoader->register( array(
+   'ext.semanticforms.maps' => array(
+   'localBasePath' => __DIR__,
+   'remoteExtPath' => 
'SemanticForms',
+   'scripts' => 
'/../libs/SF_maps.js',
+   'dependencies' => array(
+   'ext.openlayers.main',
+   )
+   ),
+   ) );
+   } else {
+   $resourceLoader->register( array(
+   'ext.semanticforms.maps.backup' => 
array(
+   'localBasePath' => __DIR__,
+   'remoteExtPath' => 
'SemanticForms',
+   'scripts' => 
'/../libs/SF_maps.backup.js',
+   ),
+   ) );
+   }
+   } else {
+   $resourceLoader->register( array(
+   'ext.semanticforms.maps.backup' => array(
+   'localBasePath' => __DIR__,
+   'remoteExtPath' => 'SemanticForms',
+   'scripts' => 
'/../libs/SF_maps.backup.js',
+   ),
+   ) );
+   }
+
+   if ( class_exists( 'SFGoogleMapsInput' ) ) {
+   $resourceLoader->register( array(
+   'ext.semanticforms.maps.google' => array(
+

[MediaWiki-commits] [Gerrit] scap: clone repositories for l10update - change (operations/puppet)

2016-02-05 Thread Giuseppe Lavagetto (Code Review) 
Giuseppe Lavagetto has uploaded a new change for review.

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

Change subject: scap: clone repositories for l10update
..

scap: clone repositories for l10update

Change-Id: Ifabea760d91691dacd1f6292e58ec5a7bb4c8b09
---
M modules/scap/manifests/l10nupdate.pp
1 file changed, 15 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/78/268678/1

diff --git a/modules/scap/manifests/l10nupdate.pp 
b/modules/scap/manifests/l10nupdate.pp
index c0f5443..a9c7a27 100644
--- a/modules/scap/manifests/l10nupdate.pp
+++ b/modules/scap/manifests/l10nupdate.pp
@@ -106,4 +106,19 @@
 source => 'puppet:///modules/scap/l10nupdate.logrotate',
 mode   => '0444',
 }
+
+# Git clones for the l10update git job
+file { '/var/lib/l10nupdate/mediawiki':
+ensure => directory,
+owner  => 'l10nupdate',
+group  => $deployment_group,
+mode   => '0755',
+}
+git::clone { ['mediawiki/core', 'mediawiki/skins', 'mediawiki/extensions']:
+directory  => '/var/lib/l10nupdate/mediawiki/',
+owner  => 'l10nupdate',
+group  => $deployment_group,
+recurse_submodules => true,
+}
+
 }

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

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

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

[MediaWiki-commits] [Gerrit] Adding a new email template for Burrow lag alerts. - change (operations/puppet)

2016-02-05 Thread Elukey (Code Review) 
Elukey has uploaded a new change for review.

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

Change subject: Adding a new email template for Burrow lag alerts.
..

Adding a new email template for Burrow lag alerts.

Change-Id: I62e55f7b4e485184bcb59bf5c4100ac3316ee115
Signed-off-by: elukey 
---
M manifests/role/analytics/burrow.pp
M modules/burrow/manifests/init.pp
A modules/burrow/templates/analytics-email.tmpl
M modules/burrow/templates/burrow.cfg.erb
4 files changed, 28 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/82/268682/1

diff --git a/manifests/role/analytics/burrow.pp 
b/manifests/role/analytics/burrow.pp
index 0be5255..e0b465c 100644
--- a/manifests/role/analytics/burrow.pp
+++ b/manifests/role/analytics/burrow.pp
@@ -15,7 +15,8 @@
 kafka_brokers  => $role::kafka::analytics::config::brokers_array,
 smtp_server=> 'mx1001.wikimedia.org',
 from_email => "burrow@${::fqdn}",
-to_emails  => ['analytics-ale...@wikimedia.org']
+to_emails  => ['analytics-ale...@wikimedia.org'],
+email_template => 'analytics-email.tmpl'
 }
 
 # Burrow has an HTTP REST API on port 8000
diff --git a/modules/burrow/manifests/init.pp b/modules/burrow/manifests/init.pp
index e0f6a37..18ccdee 100644
--- a/modules/burrow/manifests/init.pp
+++ b/modules/burrow/manifests/init.pp
@@ -15,6 +15,7 @@
 # $smtp_server- SMTP server to send emails from
 # $from_email - From email address for notification
 # $to_email   - Comma separated email addresses to send email 
notification to
+# $email_template - The name of the email template to use
 
 class burrow (
 $ensure = 'present',
@@ -28,6 +29,7 @@
 $smtp_server,
 $from_email,
 $to_emails,
+$email_template = "default-email.tmpl",
 )
 {
 require_package('burrow')
@@ -37,6 +39,11 @@
 content => template('burrow/burrow.cfg.erb'),
 }
 
+file { '/etc/burrow/analytics-email.tmpl':
+ensure  => $ensure,
+content => template('analytics-email.tmpl'),
+}
+
 service { 'burrow':
 ensure => ensure_service($ensure),
 enable => true,
diff --git a/modules/burrow/templates/analytics-email.tmpl 
b/modules/burrow/templates/analytics-email.tmpl
new file mode 100644
index 000..567adb6
--- /dev/null
+++ b/modules/burrow/templates/analytics-email.tmpl
@@ -0,0 +1,18 @@
+From: {{.From}}
+To: {{.To}}
+Subject: [Burrow] Kafka Consumer Lag Alert
+
+The Kafka consumer groups you are monitoring are currently showing problems. 
The following groups are in a problem state (groups not listed are OK):
+
+{{range .Results}}{{if or (ne 0 .Status) (ne 5 .Status)}}Cluster:  {{.Cluster}}
+Group:{{.Group}}
+Status:   {{if eq 1 .Status}}WARNING{{else if eq 2 .Status}}ERROR{{end}}
+Complete: {{.Complete}}
+Errors:   {{len .Partitions}} partitions have problems
+Format:   Topic:Partition (start_timestamp, start_offset, start_lag) -> 
(end_unix_timestamp, end_offset, end_lag)
+
+{{range .Partitions}}  {{if eq 1 .Status}} WARN{{else if eq 2 
.Status}}  ERR{{else if eq 3 .Status}} STOP{{else if eq 4 .Status}}STALL{{end}} 
{{.Topic}}:{{.Partition}} ({{.Start.Timestamp}}, {{.Start.Offset}}, 
{{.Start.Lag}}) -> ({{.End.Timestamp}}, {{.End.Offset}}, {{.End.Lag}})
+{{end}}{{end}}
+
+--
+{{end}}
\ No newline at end of file
diff --git a/modules/burrow/templates/burrow.cfg.erb 
b/modules/burrow/templates/burrow.cfg.erb
index 26f4d62..c49e6f5 100644
--- a/modules/burrow/templates/burrow.cfg.erb
+++ b/modules/burrow/templates/burrow.cfg.erb
@@ -40,7 +40,7 @@
 server=<%= @smtp_server %>
 port=25
 from=<%= @from_email %>
-template=/etc/burrow/default-email.tmpl
+template=/etc/burrow/@email_template
 
 <% @to_emails.each do |to_email| -%>
 [email "<%= to_email %>"]

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

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

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

[MediaWiki-commits] [Gerrit] scap: correct clone directives - change (operations/puppet)

2016-02-05 Thread Giuseppe Lavagetto (Code Review) 
Giuseppe Lavagetto has submitted this change and it was merged.

Change subject: scap: correct clone directives
..


scap: correct clone directives

Also correct the erroneous documentation of git::clone

Change-Id: Ie6705ea3b4f0c36675bbb67acb916c54b7ce7623
---
M modules/git/manifests/clone.pp
M modules/scap/manifests/l10nupdate.pp
2 files changed, 20 insertions(+), 3 deletions(-)

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



diff --git a/modules/git/manifests/clone.pp b/modules/git/manifests/clone.pp
index cce0eff..d41be3b 100644
--- a/modules/git/manifests/clone.pp
+++ b/modules/git/manifests/clone.pp
@@ -39,7 +39,7 @@
 #   }
 #
 # Will clone +http://blabla.org/core.git+ branch +the_best_branch+ at
-#  +/path/to/clone/container/core+
+#  +/path/to/clone/container/+
 #
 #   # Example: check out from gerrit:
 #   git::clone { 'analytics/wikimetrics':
diff --git a/modules/scap/manifests/l10nupdate.pp 
b/modules/scap/manifests/l10nupdate.pp
index a9c7a27..b5684ad 100644
--- a/modules/scap/manifests/l10nupdate.pp
+++ b/modules/scap/manifests/l10nupdate.pp
@@ -114,11 +114,28 @@
 group  => $deployment_group,
 mode   => '0755',
 }
-git::clone { ['mediawiki/core', 'mediawiki/skins', 'mediawiki/extensions']:
-directory  => '/var/lib/l10nupdate/mediawiki/',
+
+git::clone { 'mediawiki/core':
+directory  => '/var/lib/l10nupdate/mediawiki/core',
 owner  => 'l10nupdate',
 group  => $deployment_group,
 recurse_submodules => true,
+require=> File['/var/lib/l10nupdate/mediawiki'],
+}
+
+git::clone { 'mediawiki/extensions':
+directory  => '/var/lib/l10nupdate/mediawiki/extensions',
+owner  => 'l10nupdate',
+group  => $deployment_group,
+require=> File['/var/lib/l10nupdate/mediawiki'],
+}
+
+git::clone { 'mediawiki/skins':
+directory  => '/var/lib/l10nupdate/mediawiki/skins',
+owner  => 'l10nupdate',
+group  => $deployment_group,
+recurse_submodules => true,
+require=> File['/var/lib/l10nupdate/mediawiki'],
 }
 
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie6705ea3b4f0c36675bbb67acb916c54b7ce7623
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto 
Gerrit-Reviewer: Giuseppe Lavagetto 

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

[MediaWiki-commits] [Gerrit] Reenable kafka1012 broker - change (operations/puppet)

2016-02-05 Thread Ottomata (Code Review) 
Ottomata has uploaded a new change for review.

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

Change subject: Reenable kafka1012 broker
..

Reenable kafka1012 broker

Bug: T125199
Change-Id: I74f896d5509aa9c7ed2c9e700161a8768b8e4585
---
M hieradata/hosts/kafka1012.yaml
1 file changed, 0 insertions(+), 1 deletion(-)


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

diff --git a/hieradata/hosts/kafka1012.yaml b/hieradata/hosts/kafka1012.yaml
index 6e64576..04133b4 100644
--- a/hieradata/hosts/kafka1012.yaml
+++ b/hieradata/hosts/kafka1012.yaml
@@ -1,4 +1,3 @@
 debdeploy::grains:
   debdeploy-kafka:
 value: canary
-kafka::server::enabled: false
\ No newline at end of file

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

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

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

[MediaWiki-commits] [Gerrit] Revert "Revert "RESTBase: enable metrics batching"" - change (operations/puppet)

2016-02-05 Thread Filippo Giunchedi (Code Review) 
Filippo Giunchedi has submitted this change and it was merged.

Change subject: Revert "Revert "RESTBase: enable metrics batching""
..


Revert "Revert "RESTBase: enable metrics batching""

This reverts commit a842841bbf6b02b22c50bda70a3a8d3e55827607.

The bug we initially witnessed in
79b5c511b3920e9174302aabf081b4d347a94e36 has since been fixed, so now
it's safe(r) to enable metrics batching for RESTBase.

Bug: T121231
Change-Id: I3d505061b3058837c183d8ce47c4a3c06980a63d
---
M modules/restbase/templates/config.labs.yaml.erb
M modules/restbase/templates/config.yaml.erb
2 files changed, 2 insertions(+), 0 deletions(-)

Approvals:
  Filippo Giunchedi: Verified; Looks good to me, approved



diff --git a/modules/restbase/templates/config.labs.yaml.erb 
b/modules/restbase/templates/config.labs.yaml.erb
index 337dcf8..a81ef7f 100644
--- a/modules/restbase/templates/config.labs.yaml.erb
+++ b/modules/restbase/templates/config.labs.yaml.erb
@@ -135,6 +135,7 @@
   type: statsd # default, but lets be explicit
   host: <%= @statsd_host %>
   port: <%= @statsd_port %>
+  batch: true
 
 app_base_path: /srv/deployment/restbase/deploy/restbase
 
diff --git a/modules/restbase/templates/config.yaml.erb 
b/modules/restbase/templates/config.yaml.erb
index 15b2904..004b0c7 100644
--- a/modules/restbase/templates/config.yaml.erb
+++ b/modules/restbase/templates/config.yaml.erb
@@ -886,6 +886,7 @@
   type: statsd # default, but lets be explicit
   host: <%= @statsd_host %>
   port: <%= @statsd_port %>
+  batch: true
 
 app_base_path: /srv/deployment/restbase/deploy/restbase
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I3d505061b3058837c183d8ce47c4a3c06980a63d
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Mobrovac 
Gerrit-Reviewer: Eevans 
Gerrit-Reviewer: Filippo Giunchedi 
Gerrit-Reviewer: GWicke 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Remove redundant variable name from @var tags - change (mediawiki...Wikibase)

2016-02-05 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged.

Change subject: Remove redundant variable name from @var tags
..


Remove redundant variable name from @var tags

Change-Id: I41561227bcdfcc22b21eb74e4bfcf3797466148b
---
M client/includes/store/AddUsagesForPageJob.php
M lib/includes/UnionContentLanguages.php
2 files changed, 3 insertions(+), 3 deletions(-)

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



diff --git a/client/includes/store/AddUsagesForPageJob.php 
b/client/includes/store/AddUsagesForPageJob.php
index d52c294..14bc1f0 100644
--- a/client/includes/store/AddUsagesForPageJob.php
+++ b/client/includes/store/AddUsagesForPageJob.php
@@ -39,7 +39,7 @@
private $usageUpdater;
 
/**
-* @var EntityIdParser $idParser
+* @var EntityIdParser
 */
private $idParser;
 
diff --git a/lib/includes/UnionContentLanguages.php 
b/lib/includes/UnionContentLanguages.php
index 0bcf361..8037042 100644
--- a/lib/includes/UnionContentLanguages.php
+++ b/lib/includes/UnionContentLanguages.php
@@ -10,12 +10,12 @@
 class UnionContentLanguages implements ContentLanguages {
 
/**
-* @var ContentLanguages $a
+* @var ContentLanguages
 */
private $a;
 
/**
-* @var ContentLanguages $b
+* @var ContentLanguages
 */
private $b;
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I41561227bcdfcc22b21eb74e4bfcf3797466148b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Thiemo Mättig (WMDE) 
Gerrit-Reviewer: Addshore 
Gerrit-Reviewer: Adrian Lang 
Gerrit-Reviewer: Bene 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] temporarily de-sensitize ipsec icinga checks - change (operations/puppet)

2016-02-05 Thread BBlack (Code Review) 
BBlack has submitted this change and it was merged.

Change subject: temporarily de-sensitize ipsec icinga checks
..


temporarily de-sensitize ipsec icinga checks

Change-Id: I2b66bd0eb515622b7c870cf9d853dbce999c19a9
---
M modules/strongswan/manifests/monitoring/host.pp
1 file changed, 1 insertion(+), 0 deletions(-)

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



diff --git a/modules/strongswan/manifests/monitoring/host.pp 
b/modules/strongswan/manifests/monitoring/host.pp
index 5ea4d44..c225bee 100644
--- a/modules/strongswan/manifests/monitoring/host.pp
+++ b/modules/strongswan/manifests/monitoring/host.pp
@@ -17,5 +17,6 @@
 nrpe::monitor_service { 'IPsec':
 description  => 'IPsec',
 nrpe_command => '/usr/bin/sudo 
/usr/local/lib/nagios/plugins/check_strongswan',
+retries  => 7, # default 3, this is temporary during rolling cache 
restarts (--bblack 2016-02-05)
 }
 }

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

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

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

[MediaWiki-commits] [Gerrit] Invalidate PropertyInfoStore when rebuilding PropertyInfoTable - change (mediawiki...Wikibase)

2016-02-05 Thread Aude (Code Review) 
Aude has uploaded a new change for review.

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

Change subject: Invalidate PropertyInfoStore when rebuilding PropertyInfoTable
..

Invalidate PropertyInfoStore when rebuilding PropertyInfoTable

when changing a property's data type, this allows the
property info cache to be invalidated and the changes
be reflected more immediately in places like wbgetentities.

Bug: T125996
Change-Id: I517fe40ba812fa75de12a6be5b86d74561d55157
---
M repo/includes/store/sql/DatabaseSchemaUpdater.php
M repo/includes/store/sql/PropertyInfoTableBuilder.php
M repo/maintenance/rebuildPropertyInfo.php
M repo/tests/phpunit/includes/store/sql/PropertyInfoTableBuilderTest.php
4 files changed, 31 insertions(+), 24 deletions(-)


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

diff --git a/repo/includes/store/sql/DatabaseSchemaUpdater.php 
b/repo/includes/store/sql/DatabaseSchemaUpdater.php
index 7bc632c..fdc6fa9 100644
--- a/repo/includes/store/sql/DatabaseSchemaUpdater.php
+++ b/repo/includes/store/sql/DatabaseSchemaUpdater.php
@@ -4,16 +4,11 @@
 
 use DatabaseBase;
 use DatabaseUpdater;
-use HashBagOStuff;
 use MWException;
 use Wikibase\Store;
 use Wikibase\PropertyInfoTable;
 use Wikibase\PropertyInfoTableBuilder;
 use Wikibase\Lib\Reporting\ObservableMessageReporter;
-use Wikibase\Lib\Store\CachingEntityRevisionLookup;
-use Wikibase\Lib\Store\RevisionBasedEntityLookup;
-use Wikibase\Lib\Store\Sql\WikiPageEntityMetaDataLookup;
-use Wikibase\Lib\Store\WikiPageEntityRevisionLookup;
 use Wikibase\Repo\WikibaseRepo;
 
 /**
@@ -190,22 +185,15 @@
}
);
 
-   $table = new PropertyInfoTable( false );
$wikibaseRepo = WikibaseRepo::getDefaultInstance();
 
-   $contentCodec = $wikibaseRepo->getEntityContentDataCodec();
-   $propertyInfoBuilder = $wikibaseRepo->newPropertyInfoBuilder();
-
-   $wikiPageEntityLookup = new WikiPageEntityRevisionLookup(
-   $contentCodec,
-   new WikiPageEntityMetaDataLookup( 
$wikibaseRepo->getEntityIdParser() ),
-   false
+   $builder = new PropertyInfoTableBuilder(
+   new PropertyInfoTable( false ),
+   $wikibaseRepo->getEntityLookup(),
+   $wikibaseRepo->getPropertyInfoBuilder(),
+   $wikibaseRepo->getStore()->getPropertyInfoStore()
);
 
-   $cachingEntityLookup = new CachingEntityRevisionLookup( 
$wikiPageEntityLookup, new HashBagOStuff() );
-   $entityLookup = new RevisionBasedEntityLookup( 
$cachingEntityLookup );
-
-   $builder = new PropertyInfoTableBuilder( $table, $entityLookup, 
$propertyInfoBuilder );
$builder->setReporter( $reporter );
$builder->setUseTransactions( false );
 
diff --git a/repo/includes/store/sql/PropertyInfoTableBuilder.php 
b/repo/includes/store/sql/PropertyInfoTableBuilder.php
index cf623e2..b07af5c 100644
--- a/repo/includes/store/sql/PropertyInfoTableBuilder.php
+++ b/repo/includes/store/sql/PropertyInfoTableBuilder.php
@@ -7,6 +7,7 @@
 use Wikibase\DataModel\Entity\PropertyId;
 use Wikibase\DataModel\Services\Lookup\EntityLookup;
 use Wikibase\Lib\Reporting\MessageReporter;
+use Wikibase\PropertyInfoStore;
 
 /**
  * Utility class for rebuilding the wb_property_info table.
@@ -32,6 +33,11 @@
 * @var PropertyInfoBuilder
 */
private $propertyInfoBuilder;
+
+   /**
+* @var PropertyInfoStore
+*/
+   private $propertyInfoStore;
 
/**
 * @var MessageReporter|null
@@ -68,15 +74,18 @@
 * @param PropertyInfoTable $propertyInfoTable
 * @param EntityLookup $entityLookup
 * @param PropertyInfoBuilder $propertyInfoBuilder
+* @param PropertyInfoStore $propertyInfoStore
 */
public function __construct(
PropertyInfoTable $propertyInfoTable,
EntityLookup $entityLookup,
-   PropertyInfoBuilder $propertyInfoBuilder
+   PropertyInfoBuilder $propertyInfoBuilder,
+   PropertyInfoStore $propertyInfoStore
) {
$this->propertyInfoTable = $propertyInfoTable;
$this->entityLookup = $entityLookup;
$this->propertyInfoBuilder = $propertyInfoBuilder;
+   $this->propertyInfoStore = $propertyInfoStore;
}
 
/**
@@ -254,7 +263,8 @@
 
$info = $this->propertyInfoBuilder->buildPropertyInfo( 
$property );
 
-   $this->propertyInfoTable->setPropertyInfo(
+   // update PropertyInfoStore, which might have caching that 
needs invalidation.
+   $this->propertyInfoStore->setPropertyInfo(

[MediaWiki-commits] [Gerrit] WDQS_Lag monitoring increase timespan - change (operations/puppet)

2016-02-05 Thread Dzahn (Code Review) 
Dzahn has submitted this change and it was merged.

Change subject: WDQS_Lag monitoring increase timespan
..


WDQS_Lag monitoring increase timespan

Due to general lag in this data appearing in
graphite and also due to the fact that the data
is filled one host at a time it seems a 10 min
scope does not cover enough data points.

It would seem the requirements are
50% of data points be present.

A 30 minuite scope should allow for that.

Change-Id: I82ecd485c92a2b29f9928b9c018b4d3cab2c25e1
---
M modules/wdqs/manifests/monitor/services.pp
1 file changed, 2 insertions(+), 2 deletions(-)

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



diff --git a/modules/wdqs/manifests/monitor/services.pp 
b/modules/wdqs/manifests/monitor/services.pp
index d2f14d0..2c50786 100644
--- a/modules/wdqs/manifests/monitor/services.pp
+++ b/modules/wdqs/manifests/monitor/services.pp
@@ -39,9 +39,9 @@
 monitoring::graphite_threshold { 'WDQS_Lag':
 description => 'High lag',
 metric  => "wikidata.query.lag.${::hostname}",
-from=> '10min',
+from=> '30min',
 warning => '600', # 10 minutes
 critical=> '1800', # 30 minutes
-percentage  => '50', # Don't freak out on spikes
+percentage  => '30', # Don't freak out on spikes
 }
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I82ecd485c92a2b29f9928b9c018b4d3cab2c25e1
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Addshore 
Gerrit-Reviewer: Dzahn 
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 special page excluded from PHPCS' Squiz.Scope.MethodScop... - change (mediawiki...Wikibase)

2016-02-05 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged.

Change subject: Fix special page excluded from PHPCS' Squiz.Scope.MethodScope 
rule
..


Fix special page excluded from PHPCS' Squiz.Scope.MethodScope rule

Change-Id: I836f0d0171bb63e3c93ece8ef462164399f59c8b
---
M client/includes/specials/SpecialPagesWithBadges.php
M client/includes/specials/SpecialUnconnectedPages.php
M phpcs.xml
3 files changed, 6 insertions(+), 8 deletions(-)

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



diff --git a/client/includes/specials/SpecialPagesWithBadges.php 
b/client/includes/specials/SpecialPagesWithBadges.php
index 94838fd..d537aa3 100644
--- a/client/includes/specials/SpecialPagesWithBadges.php
+++ b/client/includes/specials/SpecialPagesWithBadges.php
@@ -212,6 +212,7 @@
 * @return string
 */
public function formatResult( $skin, $result ) {
+   // FIXME: This should use a TitleFactory.
$title = Title::newFromID( $result->value );
$out = Linker::linkKnown( $title );
 
diff --git a/client/includes/specials/SpecialUnconnectedPages.php 
b/client/includes/specials/SpecialUnconnectedPages.php
index b5ff969..efc0079 100644
--- a/client/includes/specials/SpecialUnconnectedPages.php
+++ b/client/includes/specials/SpecialUnconnectedPages.php
@@ -49,7 +49,7 @@
 *
 * @return bool Always false because we do not want to build RSS/Atom 
feeds for this page.
 */
-   function isSyndicated() {
+   public function isSyndicated() {
return false;
}
 
@@ -126,7 +126,7 @@
 *
 * @return array[]
 */
-   function getQueryInfo() {
+   public function getQueryInfo() {
$dbr = wfGetDB( DB_SLAVE );
 
$conds = $this->buildConditionals( $dbr );
@@ -167,7 +167,7 @@
 *
 * @return ResultWrapper
 */
-   function reallyDoQuery( $limit, $offset = false ) {
+   public function reallyDoQuery( $limit, $offset = false ) {
if ( is_int( $offset ) && $offset > self::MAX_OFFSET ) {
return new FakeResultWrapper( array() );
}
@@ -183,7 +183,8 @@
 *
 * @return string
 */
-   function formatResult( $skin, $result ) {
+   public function formatResult( $skin, $result ) {
+   // FIXME: This should use a TitleFactory.
$title = Title::newFromID( $result->value );
$out = Linker::linkKnown( $title );
 
diff --git a/phpcs.xml b/phpcs.xml
index 00325f0..5ff1efb 100644
--- a/phpcs.xml
+++ b/phpcs.xml
@@ -63,10 +63,6 @@



-   
-   
-   SpecialUnconnectedPages\.php
-   




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

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

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

[MediaWiki-commits] [Gerrit] Reenable kafka1012 broker - change (operations/puppet)

2016-02-05 Thread Ottomata (Code Review) 
Ottomata has submitted this change and it was merged.

Change subject: Reenable kafka1012 broker
..


Reenable kafka1012 broker

Bug: T125199
Change-Id: I74f896d5509aa9c7ed2c9e700161a8768b8e4585
---
M hieradata/hosts/kafka1012.yaml
1 file changed, 0 insertions(+), 1 deletion(-)

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



diff --git a/hieradata/hosts/kafka1012.yaml b/hieradata/hosts/kafka1012.yaml
index 6e64576..04133b4 100644
--- a/hieradata/hosts/kafka1012.yaml
+++ b/hieradata/hosts/kafka1012.yaml
@@ -1,4 +1,3 @@
 debdeploy::grains:
   debdeploy-kafka:
 value: canary
-kafka::server::enabled: false
\ No newline at end of file

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

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

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

[MediaWiki-commits] [Gerrit] Don't limit mw-ui-input border on Special:UserLogin - change (mediawiki...MobileFrontend)

2016-02-05 Thread Florianschmidtwelzow (Code Review) 
Florianschmidtwelzow has uploaded a new change for review.

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

Change subject: Don't limit mw-ui-input border on Special:UserLogin
..

Don't limit mw-ui-input border on Special:UserLogin

Not all fields (especially fields which are generated by extensions) have
has a mw-ui-vform-field class in the div-container. But these fields should
have a border, too, so an user can identify them as an input field.

This change removes a redundant border: rule and moves the border rule for
the mw-ui-vform-field input fields to apply to all mw-ui-input fields.

Bug: T125945
Change-Id: I3261dfcd5bb289706e10cb3cd758ca79aaaedc5c
---
M resources/skins.minerva.special.userlogin.styles/userlogin.less
1 file changed, 10 insertions(+), 11 deletions(-)


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

diff --git a/resources/skins.minerva.special.userlogin.styles/userlogin.less 
b/resources/skins.minerva.special.userlogin.styles/userlogin.less
index 5abf582..92d26a8 100644
--- a/resources/skins.minerva.special.userlogin.styles/userlogin.less
+++ b/resources/skins.minerva.special.userlogin.styles/userlogin.less
@@ -177,7 +177,6 @@
 
.mw-ui-input {
padding: .8em .5em;
-   border: none;
}
 
// hide on mobile only media queries (placeholder support)
@@ -193,18 +192,18 @@
> label {
display: none;
}
+   }
+   }
 
-   // Make the inputs look connected in mobile mode
-   .mw-ui-input {
-   border: solid 1px @colorGrayLight;
+   // Make the inputs look connected in mobile mode
+   .mw-ui-input {
+   border: solid 1px @colorGrayLight;
 
-   #wpEmail,
-   &.loginPassword {
-   border-top-left-radius: 0;
-   border-top-right-radius: 0;
-   margin-top: -1px;
-   }
-   }
+   #wpEmail,
+   &.loginPassword {
+   border-top-left-radius: 0;
+   border-top-right-radius: 0;
+   margin-top: -1px;
}
}
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I3261dfcd5bb289706e10cb3cd758ca79aaaedc5c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Florianschmidtwelzow 

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

[MediaWiki-commits] [Gerrit] scap: clone repositories for l10update - change (operations/puppet)

2016-02-05 Thread Giuseppe Lavagetto (Code Review) 
Giuseppe Lavagetto has submitted this change and it was merged.

Change subject: scap: clone repositories for l10update
..


scap: clone repositories for l10update

Change-Id: Ifabea760d91691dacd1f6292e58ec5a7bb4c8b09
---
M modules/scap/manifests/l10nupdate.pp
1 file changed, 15 insertions(+), 0 deletions(-)

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



diff --git a/modules/scap/manifests/l10nupdate.pp 
b/modules/scap/manifests/l10nupdate.pp
index c0f5443..a9c7a27 100644
--- a/modules/scap/manifests/l10nupdate.pp
+++ b/modules/scap/manifests/l10nupdate.pp
@@ -106,4 +106,19 @@
 source => 'puppet:///modules/scap/l10nupdate.logrotate',
 mode   => '0444',
 }
+
+# Git clones for the l10update git job
+file { '/var/lib/l10nupdate/mediawiki':
+ensure => directory,
+owner  => 'l10nupdate',
+group  => $deployment_group,
+mode   => '0755',
+}
+git::clone { ['mediawiki/core', 'mediawiki/skins', 'mediawiki/extensions']:
+directory  => '/var/lib/l10nupdate/mediawiki/',
+owner  => 'l10nupdate',
+group  => $deployment_group,
+recurse_submodules => true,
+}
+
 }

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

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

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

[MediaWiki-commits] [Gerrit] Prevent crash in Wiktionary dialog. - change (apps...wikipedia)

2016-02-05 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged.

Change subject: Prevent crash in Wiktionary dialog.
..


Prevent crash in Wiktionary dialog.

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

Change-Id: I005f8d52517787d4155188aeef01ec3b026dddcb
---
M app/src/main/java/org/wikipedia/server/restbase/RbDefinition.java
M app/src/main/java/org/wikipedia/wiktionary/WiktionaryDialog.java
2 files changed, 5 insertions(+), 4 deletions(-)

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



diff --git a/app/src/main/java/org/wikipedia/server/restbase/RbDefinition.java 
b/app/src/main/java/org/wikipedia/server/restbase/RbDefinition.java
index 9a5d9ba..f58422f 100644
--- a/app/src/main/java/org/wikipedia/server/restbase/RbDefinition.java
+++ b/app/src/main/java/org/wikipedia/server/restbase/RbDefinition.java
@@ -24,7 +24,7 @@
 return usagesByLang;
 }
 
-public Usage[] getUsagesForLang(String langCode) {
+@Nullable public Usage[] getUsagesForLang(String langCode) {
 return usagesByLang.get(langCode);
 }
 
diff --git a/app/src/main/java/org/wikipedia/wiktionary/WiktionaryDialog.java 
b/app/src/main/java/org/wikipedia/wiktionary/WiktionaryDialog.java
index 92ddab1..2eca049 100644
--- a/app/src/main/java/org/wikipedia/wiktionary/WiktionaryDialog.java
+++ b/app/src/main/java/org/wikipedia/wiktionary/WiktionaryDialog.java
@@ -153,12 +153,13 @@
 LinearLayout fullDefinitionsList = (LinearLayout) 
rootView.findViewById(R.id.wiktionary_definitions_by_part_of_speech);
 
 RbDefinition.Usage[] usageList = 
currentDefinition.getUsagesForLang("en");
-if (usageList.length == 0) {
+if (usageList == null || usageList.length == 0) {
 displayNoDefinitionsFound();
+return;
 }
-for (int i = 0; i < usageList.length; i++) {
+for (RbDefinition.Usage usage : usageList) {
 View usageView = 
inflater.inflate(R.layout.item_wiktionary_definitions_list, (ViewGroup) 
rootView, false);
-layOutUsage(usageList[i], usageView, inflater);
+layOutUsage(usage, usageView, inflater);
 fullDefinitionsList.addView(usageView);
 }
 }

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

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

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

[MediaWiki-commits] [Gerrit] Fix cannot access private property OutputPage::$mHTMLtitle I... - change (mediawiki...AddHTMLMetaAndTitle)

2016-02-05 Thread Southparkfan (Code Review) 
Southparkfan has uploaded a new change for review.

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

Change subject: Fix cannot access private property OutputPage::$mHTMLtitle It 
doesn't seem to be used anyway, so I did not even bother to use getHTMLTitle(). 
This issue doesn't exist in master.
..

Fix cannot access private property OutputPage::$mHTMLtitle
It doesn't seem to be used anyway, so I did not even bother to use
getHTMLTitle(). This issue doesn't exist in master.

Change-Id: I4a09c4e0ac52dee2688ae863fa3bc889eba4efc1
---
M Add_HTML_Meta_and_Title.php
1 file changed, 4 insertions(+), 6 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/AddHTMLMetaAndTitle 
refs/changes/93/268693/1

diff --git a/Add_HTML_Meta_and_Title.php b/Add_HTML_Meta_and_Title.php
index 9e1c9bc..ff2bc08 100644
--- a/Add_HTML_Meta_and_Title.php
+++ b/Add_HTML_Meta_and_Title.php
@@ -106,16 +106,14 @@
 # Merge keyword data into OutputPage as meta tags
 foreach ($data as $item) {
 $content = @base64_decode($item);
-   $content = htmlspecialchars($content, ENT_QUOTES);  
-if ($content){
-   $new_title = $out->mHTMLtitle;
+   $content = htmlspecialchars($content, ENT_QUOTES);  
+if ($content) {

-   //Set page title
+   // Set page title
global $wgSitename;
$new_title = "$content - $wgSitename";
-   $out->mHTMLtitleFromPagetitle = true;
$out->setHTMLTitle( $new_title );
-   }
+   }
 }
return true;
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I4a09c4e0ac52dee2688ae863fa3bc889eba4efc1
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/AddHTMLMetaAndTitle
Gerrit-Branch: REL1_26
Gerrit-Owner: Southparkfan 

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

[MediaWiki-commits] [Gerrit] Fix metrics with spaces in URL - change (analytics/dashiki)

2016-02-05 Thread Milimetric (Code Review) 
Milimetric has submitted this change and it was merged.

Change subject: Fix metrics with spaces in URL
..


Fix metrics with spaces in URL

Change-Id: Ia6c9378dacefac9c4ab4e751c83b3a39943fbad2
---
M src/lib/state-manager.js
1 file changed, 2 insertions(+), 2 deletions(-)

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



diff --git a/src/lib/state-manager.js b/src/lib/state-manager.js
index c51f82a..8329630 100644
--- a/src/lib/state-manager.js
+++ b/src/lib/state-manager.js
@@ -69,7 +69,7 @@
 State.prototype.buildHashFragment = function () {
 
 var projects = 'projects=' + this.projects.join(',');
-var metrics = 'metrics=' + this.metrics.join(',');
+var metrics = 'metrics=' + encodeURIComponent(this.metrics.join(','));
 return projects + '/' + metrics;
 };
 
@@ -103,7 +103,7 @@
 if (choice[0] === 'projects' && choice.length > 1) {
 projects = choice[1].split(',');
 } else if (choice[0] === 'metrics' && choice.length > 1) {
-metrics = choice[1].split(',');
+metrics = choice[1].split(',').map(decodeURIComponent);
 }
 });
 return new State(projects, metrics);

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia6c9378dacefac9c4ab4e751c83b3a39943fbad2
Gerrit-PatchSet: 1
Gerrit-Project: analytics/dashiki
Gerrit-Branch: master
Gerrit-Owner: Milimetric 
Gerrit-Reviewer: Milimetric 

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

[MediaWiki-commits] [Gerrit] Add sarin to autoinstall Bug:T125752 - change (operations/puppet)

2016-02-05 Thread Papaul (Code Review) 
Papaul has uploaded a new change for review.

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

Change subject: Add  sarin to autoinstall Bug:T125752
..

Add  sarin to autoinstall
Bug:T125752

Change-Id: I394d0be79fef68d9be8f62c04716f4e50bed56ba
---
M modules/install_server/files/autoinstall/netboot.cfg
1 file changed, 2 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/14/268714/1

diff --git a/modules/install_server/files/autoinstall/netboot.cfg 
b/modules/install_server/files/autoinstall/netboot.cfg
index db6af30..8972a68 100755
--- a/modules/install_server/files/autoinstall/netboot.cfg
+++ b/modules/install_server/files/autoinstall/netboot.cfg
@@ -125,7 +125,8 @@
restbase200[12]) echo partman/cassandrahosts-4ssd-srv.cfg ;; \
restbase200[3-6]) echo partman/cassandrahosts-4ssd.cfg ;; \
rhenium) echo partman/raid1-gpt.cfg ;; \
-   snapshot[1-4]|snapshot100[1-4]) echo partman/snapshot.cfg ;; \
+   sarin echo partman/raid1-lvm-ext4-srv.cfg  ;; \
+snapshot[1-4]|snapshot100[1-4]) echo partman/snapshot.cfg ;; \
stat1002) echo partman/lvm-noraid-large.a.cfg ;; \
tin) echo partman/lvm-tin.cfg ;; \
virt100[1-9]) echo partman/virt-raid10-cisco.cfg ;; \

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

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

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

[MediaWiki-commits] [Gerrit] Convert a bunch of HACK:/XXX:/FIXME: tags to a task reference - change (VisualEditor/VisualEditor)

2016-02-05 Thread Jforrester (Code Review) 
Jforrester has uploaded a new change for review.

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

Change subject: Convert a bunch of HACK:/XXX:/FIXME: tags to a task reference
..

Convert a bunch of HACK:/XXX:/FIXME: tags to a task reference

Change-Id: I032bc18ef1b42778c263edceb9ca38d5435f4c82
---
M src/ce/styles/ve.ce.Surface.css
M src/ce/ve.ce.BranchNode.js
M src/ce/ve.ce.ContentBranchNode.js
M src/ce/ve.ce.Surface.js
M src/dm/nodes/ve.dm.BlockImageNode.js
M src/dm/ve.dm.Annotation.js
M src/dm/ve.dm.AnnotationSet.js
M src/dm/ve.dm.Document.js
M src/dm/ve.dm.SurfaceFragment.js
M src/init/ve.init.Platform.js
M src/ui/inspectors/ve.ui.FragmentInspector.js
M src/ui/styles/tools/ve.ui.FormatTool.css
M src/ui/windowmanagers/ve.ui.MobileWindowManager.js
M src/ve.utils.js
14 files changed, 39 insertions(+), 40 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/VisualEditor/VisualEditor 
refs/changes/16/268716/1

diff --git a/src/ce/styles/ve.ce.Surface.css b/src/ce/styles/ve.ce.Surface.css
index 0ff045b..7a1d4fb 100644
--- a/src/ce/styles/ve.ce.Surface.css
+++ b/src/ce/styles/ve.ce.Surface.css
@@ -55,7 +55,7 @@
 
 .ve-ce-surface-paste {
position: fixed;
-   /* Hack: Stop the viewport scrolling when the paste target is typed 
into */
+   /* FIXME T126024: Stop the viewport scrolling when the paste target is 
typed into */
top: 3em;
left: 0;
/* Try to avoid wrapping by not setting a width because of 
https://code.google.com/p/chromium/issues/detail?id=318925 */
diff --git a/src/ce/ve.ce.BranchNode.js b/src/ce/ve.ce.BranchNode.js
index 2e0d1f8..b4eb391 100644
--- a/src/ce/ve.ce.BranchNode.js
+++ b/src/ce/ve.ce.BranchNode.js
@@ -287,8 +287,8 @@
 
for ( i in this.getModel().slugPositions ) {
slugNode = doc.importNode( slugTemplate, true );
-   // FIXME: InternalListNode has an empty $element, so we assume 
that the slug goes at the
-   // end instead. This is a hack and the internal list needs to 
die in a fire.
+   // FIXME T126019: InternalListNode has an empty $element, so we 
assume that the slug goes
+   // at the end instead. This is a hack and the internal list 
needs to die in a fire.
if ( this.children[ i ] && this.children[ i ].$element[ 0 ] ) {
child = this.children[ i ].$element[ 0 ];
// child.parentNode might not be equal to 
this.$element[ 0 ]: e.g. annotated inline nodes
diff --git a/src/ce/ve.ce.ContentBranchNode.js 
b/src/ce/ve.ce.ContentBranchNode.js
index ffb7fb4..bb52fc1 100644
--- a/src/ce/ve.ce.ContentBranchNode.js
+++ b/src/ce/ve.ce.ContentBranchNode.js
@@ -139,10 +139,10 @@
// Parent method
ve.ce.BranchNode.prototype.onSplice.apply( this, arguments );
 
-   // HACK: adjust slugNodes indexes if isRenderingLocked. This should be 
sufficient to
-   // keep this.slugNodes valid - only text changes can occur, which 
cannot create a
-   // requirement for a new slug (it can make an existing slug redundant, 
but it is
-   // harmless to leave it there).
+   // FIXME T126025: adjust slugNodes indexes if isRenderingLocked. This 
should be
+   // sufficient to keep this.slugNodes valid - only text changes can 
occur, which
+   // cannot create a requirement for a new slug (it can make an existing 
slug
+   // redundant, but it is harmless to leave it there).
if (
this.root instanceof ve.ce.DocumentNode &&
this.root.getSurface().isRenderingLocked
@@ -154,7 +154,9 @@
this.renderContents();
 };
 
-/** @inheritdoc */
+/**
+ * @inheritdoc
+ */
 ve.ce.ContentBranchNode.prototype.setupBlockSlugs = function () {
// Respect render lock
if (
diff --git a/src/ce/ve.ce.Surface.js b/src/ce/ve.ce.Surface.js
index 3c53e14..5d84b03 100644
--- a/src/ce/ve.ce.Surface.js
+++ b/src/ce/ve.ce.Surface.js
@@ -316,7 +316,7 @@
// Disconnect DOM events on the window
this.$window.off( 'resize', this.onWindowResizeHandler );
 
-   // HACK: Blur to make selection/cursor disappear (needed in Firefox
+   // FIXME T126041: Blur to make selection/cursor disappear (needed in 
Firefox
// in some cases, and in iOS to hide the keyboard)
if ( this.isFocused() ) {
this.blur();
@@ -681,7 +681,7 @@
setTimeout( this.afterDocumentMouseDown.bind( this, e, 
this.getSelection() ) );
 
// Handle triple click
-   // HACK: do not do triple click handling in IE, because their click 
counting is broken
+   // FIXME T126043: do not do triple click handling in IE, because their 
click counting is broken
if ( e.originalEvent.detail >= 3 && 
!ve.init.platform.constructor.static.isInternetExplorer() ) {
// Browser default behaviour for triple click won't behave as 
we want

[MediaWiki-commits] [Gerrit] netboot.cfg - replace tabs with spaces - change (operations/puppet)

2016-02-05 Thread Dzahn (Code Review) 
Dzahn has uploaded a new change for review.

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

Change subject: netboot.cfg - replace tabs with spaces
..

netboot.cfg - replace tabs with spaces

Another file we have to edit all the time and we keep
ending up with mixed spaces and tabs because puppet files and DNS
have been switched to use spaces.  So just replacing them here for
once as well.

Change-Id: I4af863f1efc34de5819a4124ce2248fae2357fb9
---
M modules/install_server/files/autoinstall/netboot.cfg
1 file changed, 125 insertions(+), 125 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/17/268717/1

diff --git a/modules/install_server/files/autoinstall/netboot.cfg 
b/modules/install_server/files/autoinstall/netboot.cfg
index db6af30..3b4e1d0 100755
--- a/modules/install_server/files/autoinstall/netboot.cfg
+++ b/modules/install_server/files/autoinstall/netboot.cfg
@@ -7,129 +7,129 @@
 # configs for installing via netboot
 
 # Generally we'll do a basic server install.
-d-ipreseed/include string  common.cfg passwd.cfg override.cfg
+d-i preseed/include string  common.cfg passwd.cfg override.cfg
 
-d-ipreseed/include_command string  \
-   case $(ip route show | grep default | cut -d' ' -f 3) in \
-   208.80.153.1) echo subnets/public1-a-codfw.cfg ;; \
-   208.80.153.33) echo subnets/public1-b-codfw.cfg ;; \
-   208.80.153.65) echo subnets/public1-c-codfw.cfg ;; \
-   208.80.153.97) echo subnets/public1-d-codfw.cfg ;; \
-   208.80.154.1) echo subnets/public1-a-eqiad.cfg ;; \
-   208.80.154.129) echo subnets/public1-b-eqiad.cfg ;; \
-   208.80.154.65) echo subnets/public1-c-eqiad.cfg ;; \
-   208.80.155.97) echo subnets/public1-d-eqiad.cfg ;; \
-   208.80.155.65) echo subnets/sandbox1-b-eqiad.cfg ;; \
-   10.64.0.1) echo subnets/private1-a-eqiad.cfg ;; \
-   10.64.4.1) echo subnets/labs-hosts1-a-eqiad.cfg ;; \
-   10.64.16.1) echo subnets/private1-b-eqiad.cfg ;; \
-   10.64.20.1) echo subnets/labs-hosts1-b-eqiad.cfg ;; \
-   10.64.32.1) echo subnets/private1-c-eqiad.cfg ;; \
-   10.64.36.1) echo subnets/labs-hosts1-c-eqiad.cfg ;; \
-   10.64.48.1) echo subnets/private1-d-eqiad.cfg ;; \
-   10.64.52.1) echo subnets/labs-hosts1-d-eqiad.cfg ;; \
-   10.64.5.1) echo subnets/analytics1-a-eqiad.cfg ;; \
-   10.64.21.1) echo subnets/analytics1-b-eqiad.cfg ;; \
-   10.64.36.1) echo subnets/analytics1-c-eqiad.cfg ;; \
-   10.64.53.1) echo subnets/analytics1-d-eqiad.cfg ;; \
-   10.64.37.1) echo subnets/labs-support1-c-eqiad.cfg ;; \
-   10.128.0.1) echo subnets/private1-ulsfo.cfg ;; \
-   10.192.0.1) echo subnets/private1-a-codfw.cfg ;; \
-   10.192.16.1) echo subnets/private1-b-codfw.cfg ;; \
-   10.192.20.1) echo subnets/labs-hosts1-b-codfw.cfg ;; \
-   10.192.21.1) echo subnets/labs-support1-b-codfw.cfg ;; \
-   10.192.32.1) echo subnets/private1-c-codfw.cfg ;; \
-   10.192.48.1) echo subnets/private1-d-codfw.cfg ;; \
-   91.198.174.1) echo subnets/public1-esams.cfg ;; \
-   198.35.26.1) echo subnets/public1-ulsfo.cfg ;; \
-   10.20.0.1) echo subnets/private1-esams.cfg ;; \
-   esac; \
-   \
-   case $(debconf-get netcfg/get_hostname) in \
-   acamar|achernar|baham|lithium|radon|rhodium) echo 
partman/raid1-lvm.cfg ;; \
-   analytics100[3-9]) echo partman/analytics-cisco.cfg ;; \
-   analytics1017) echo partman/raid1-30G.cfg ;; \
-   analytics1015) echo partman/raid1-lvm-ext4.cfg ;; \
-   analytics102[3-7]) echo partman/analytics-dell.cfg ;; \
-   
analytics102[8-9]|analytics103[0-9]|analytics104[0-9]|analytics105[0-9]) echo 
partman/analytics-flex.cfg ;; \
-   aqs100[123]) echo partman/raid1-30G.cfg ;; \
-   
antimony|arsenic|heze|magnesium|neodymium|oxygen|palladium|promethium|strontium|terbium)
 echo partman/lvm.cfg ;; \
-   
argon|bast4001|copper|neon|ruthenium|subra|suhail|titanium|ytterbium) echo 
partman/raid1-lvm.cfg ;; \
-   
bast2001|berkelium|californium|curium|dbproxy10[0-1][0-9]|holmium|install2001|iridium)
 echo partman/raid1.cfg ;; \
-   bast*) echo partman/lvm.cfg ;; \
-   boron|chromium|hydrogen) echo partman/lvm.cfg ;; \
-   helium|potassium|tmh1002) echo partman/raid1-1partition.cfg ;; \
-   lawrencium|netmon1001|stat1002|tungsten) echo partman/db.cfg ;; 
\
-   carbon|stat1003) echo partman/raid5-gpt-lvm.cfg ;; \
-   cerium|praseodymium|xenon) echo 
partman/cassandrahosts-3ssd-srv.cfg ;; \
-

[MediaWiki-commits] [Gerrit] [DONT MERGE] Set $wgResourceBasePath to "/w" - change (operations/mediawiki-config)

2016-02-05 Thread Krinkle (Code Review) 
Krinkle has uploaded a new change for review.

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

Change subject: [DONT MERGE] Set $wgResourceBasePath to "/w"
..

[DONT MERGE] Set $wgResourceBasePath to "/w"

* Requires I1860061a6 (adds /w/static.php) to be deployed first.
* Requires Apache config to be deployed first.

Bug: T99096
Change-Id: I0d61c89d7ed078e4959f80ebec3762f74588
---
M wmf-config/CommonSettings.php
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index 2a15e9c..ece273c 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -222,7 +222,7 @@
 $wgLocalStylePath = "{$wgScriptPath}/static/$wmgVersionNumber/skins";
 
 // Don't include a hostname in these urls (T106966, T112646)
-$wgResourceBasePath = "/static/{$wmgVersionNumber}";
+$wgResourceBasePath = $wgScriptPath;
 $wgExtensionAssetsPath = "{$wgResourceBasePath}/extensions";
 $wgStylePath = "{$wgResourceBasePath}/skins";
 

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

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

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

[MediaWiki-commits] [Gerrit] [GWToolset] add composer-test - change (integration/config)

2016-02-05 Thread Hashar (Code Review) 
Hashar has uploaded a new change for review.

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

Change subject: [GWToolset] add composer-test
..

[GWToolset] add composer-test

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

Bug: T125553
Change-Id: Id0f410ae606905ed90d5fbb7e031188a2f22b288
---
M zuul/layout.yaml
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/20/268720/1

diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 7d1d890..ff5bcad 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -3456,6 +3456,7 @@
 
   - name: mediawiki/extensions/GWToolset
 template:
+  - name: composer-test
   - name: jshint
   - name: npm
   - name: extension-unittests-generic

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

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

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

[MediaWiki-commits] [Gerrit] dhcp: fix syntax error, missing bracket - change (operations/puppet)

2016-02-05 Thread Dzahn (Code Review) 
Dzahn has submitted this change and it was merged.

Change subject: dhcp: fix syntax error, missing bracket
..


dhcp: fix syntax error, missing bracket

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

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



diff --git a/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200 
b/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
index 86f2ee6..a235cc0 100644
--- a/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
+++ b/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
@@ -6328,6 +6328,7 @@
 fixed-address sarin.codfw.wmnet;
 option pxelinux.pathprefix "jessie-installer/";
 filename "jessie-installer/debian-installer/amd64/pxelinux.0";
+}
 
 host scandium {
hardware ethernet 84:2b:2b:fd:be:52;

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

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

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

[MediaWiki-commits] [Gerrit] Remove extsrc bloat from references data-mw - change (mediawiki...parsoid)

2016-02-05 Thread Arlolra (Code Review) 
Arlolra has uploaded a new change for review.

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

Change subject: Remove extsrc bloat from references data-mw
..

Remove extsrc bloat from references data-mw

 * This hasn't been used since 2013! See 5bfa0e9e

Change-Id: Iea382829f38788541b3bc4f8595a0d6bf600c167
---
M lib/ext/Cite.js
M tests/parserTests-blacklist.js
M tests/parserTests.txt
3 files changed, 22 insertions(+), 51 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/parsoid 
refs/changes/18/268718/1

diff --git a/lib/ext/Cite.js b/lib/ext/Cite.js
index 9f2822c..077e673 100644
--- a/lib/ext/Cite.js
+++ b/lib/ext/Cite.js
@@ -483,32 +483,24 @@
 References.prototype.insertReferencesIntoDOM = function(refsNode, refsData, 
refsInReferencesHTML) {
var dp = DU.getDataParsoid(refsNode);
var group = dp.group || '';
-   var src = dp.src || '';  // fall back so we don't crash
-   // Extract ext-source for .. usage
-   var body = Util.extractExtBody("references", src).trim();
-   var refGroup = refsData.getRefGroup(group);
 
var dataMw =  DU.getDataMw(refsNode);
if (!Object.keys(dataMw).length) {
-   var datamwBody;
-   // We'll have to output data-mw.body.extsrc in
-   // scenarios where original wikitext was of the form:
-   // " lot of refs here "
-   // Ex: See [[en:Barack Obama]]
-   if (body.length > 0) {
-   datamwBody = {
-   'extsrc': body,
-   'html': refsInReferencesHTML.join(''),
-   };
-   }
dataMw = {
'name': 'references',
-   'body': datamwBody,
'attrs': {
// Dont emit empty keys
'group': group || undefined,
},
};
+
+   var src = dp.src || '';  // fall back so we don't 
crash
+   // Extract ext-source for .. usage
+   var body = Util.extractExtBody('references', src).trim();
+   if (body.length > 0) {
+   dataMw.body = { 'html': refsInReferencesHTML.join('') };
+   }
+
DU.setDataMw(refsNode, dataMw);
}
 
@@ -521,6 +513,7 @@
refsNode.removeChild(refsNode.firstChild);
}
 
+   var refGroup = refsData.getRefGroup(group);
if (refGroup) {
refGroup.refs.forEach(refGroup.renderLine.bind(refGroup, 
refsNode));
}
@@ -571,16 +564,13 @@
} else {
return state.serializer.extensionHandler(node, state, 
function() {
var dataMw = DU.getDataMw(node);
-   var html = dataMw.body.html;
-   if (typeof html !== 'string' || html.length === 
0) {
-   // Fallback to extsrc, see comment in
-   // insertReferencesIntoDOM above.
-   return null;
-   } else {
+   if (typeof dataMw.body.html === 'string') {
return state.serializer.serializeHTML({
env: state.env,
extName: dataMw.name,
-   }, html);
+   }, dataMw.body.html);
+   } else {
+   return '';
}
});
}
diff --git a/tests/parserTests-blacklist.js b/tests/parserTests-blacklist.js
index 1aae6a0..b5b34ec 100644
--- a/tests/parserTests-blacklist.js
+++ b/tests/parserTests-blacklist.js
@@ -386,7 +386,6 @@
 add("wt2wt", "Ref: 9. unclosed comments should not leak out of ref-body", "A 
foo  B C\n");
 add("wt2wt", "Ref: 10. Unclosed HTML tags should not leak out of ref-body", "A 
 foo  B C\n\n");
 add("wt2wt", "Ref: 19. ref-tags with identical name encodings should get 
identical indexes", "1 foo 2 \n\n");
-add("wt2wt", "References: 5. ref tags in references should be processed while 
ignoring all other content", "A \nB bar\n\n\nfoo\n");
 add("wt2wt", "References: 9. Generate missing references list at the end", "A 
foo\nB bar\n\n");
 add("wt2wt", "Entities in ref name", "hi\n");
 add("wt2wt", "HTML tag with broken attribute value quoting", "Foo\n");
@@ -620,7 +619,6 @@
 add("html2html", "Gallery override link with malicious javascript (bug 
34852)", "\t\t*  \t\t\thttp://example.com/images/thumb/3/3a/Foobar.jpg/120px-Foobar.jpg\; 
alt=\"120px-Foobar.jpg\" rel=\"mw:externalImage\"

[MediaWiki-commits] [Gerrit] T107481: Steal stopWorker from service-runner - change (mediawiki...parsoid)

2016-02-05 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged.

Change subject: T107481: Steal stopWorker from service-runner
..


T107481: Steal stopWorker from service-runner

 * Adds a dep on semver.

Change-Id: I3b739a977b0fb8e90f57523c7e835e614aa55634
---
M bin/server.js
M lib/api/apiUtils.js
M npm-shrinkwrap.json
M package.json
4 files changed, 48 insertions(+), 5 deletions(-)

Approvals:
  Subramanya Sastry: Looks good to me, approved
  Mobrovac: Looks good to me, but someone else must approve
  jenkins-bot: Verified



diff --git a/bin/server.js b/bin/server.js
index cbd76ea..2da9a61 100755
--- a/bin/server.js
+++ b/bin/server.js
@@ -26,6 +26,8 @@
 var cluster = require('cluster');
 var path = require('path');
 var util = require('util');
+var semver = require('semver');
+var Promise = require('../lib/utils/promise.js');
 
 // process arguments
 var opts = require("yargs")
@@ -107,6 +109,40 @@
 
 var timer = parsoidConfig.performanceTimer;
 
+// Workaround for https://github.com/nodejs/node/pull/3510
+var fixClusterHandleLeak = function(worker) {
+   if (semver.gte(process.version, '4.2.2')) { return; }
+   var exitHandler = worker.process.listeners('exit')[0].listener;
+   var disconnectHandler = 
worker.process.listeners('disconnect')[0].listener;
+   worker.process.removeListener('exit', exitHandler);
+   worker.process.once('exit', function() {
+   if (worker.state !== 'disconnected') {
+   disconnectHandler();
+   }
+   exitHandler.apply(this, arguments);
+   });
+};
+
+var stopWorker = function(workerId) {
+   var worker = cluster.workers[workerId];
+   var p = new Promise(function(resolve) {
+   var timeout = setTimeout(function() {
+   // 
https://nodejs.org/api/cluster.html#cluster_worker_kill_signal_sigterm
+   // `worker.kill()` wants `worker.state === 
'disconnected'`.
+   // If that doesn't happen shortly, escalate!
+   process.kill(worker.process.pid, 'SIGKILL');
+   resolve();
+   }, 10 * 1000);
+   worker.on('disconnect', function() {
+   worker.kill('SIGKILL');
+   clearTimeout(timeout);
+   resolve();
+   });
+   });
+   worker.disconnect();
+   return p;
+};
+
 if (cluster.isMaster && argv.n > 0) {
// Master
 
@@ -114,6 +150,7 @@
var timeouts = new Map();
var spawn = function() {
var worker = cluster.fork();
+   fixClusterHandleLeak(worker);
worker.on('message', timeoutHandler.bind(null, worker));
};
 
@@ -137,7 +174,7 @@
msg.location, pid
));
if (timer) { 
timer.count('worker.exit.SIGKILL', ''); }
-   worker.kill("SIGKILL");
+   stopWorker(worker.id);
spawn();
}
}, msg.timeout));
@@ -160,9 +197,9 @@
});
 
var shutdownMaster = function() {
-   processLogger.log("info", "shutting down, killing workers");
-   cluster.disconnect(function() {
-   processLogger.log("info", "exiting");
+   processLogger.log('info', 'shutting down, killing workers');
+   Promise.map(Object.keys(cluster.workers), 
stopWorker).then(function() {
+   processLogger.log('info', 'exiting');
process.exit(0);
});
};
diff --git a/lib/api/apiUtils.js b/lib/api/apiUtils.js
index b912550..ffdbf52 100644
--- a/lib/api/apiUtils.js
+++ b/lib/api/apiUtils.js
@@ -4,6 +4,7 @@
 var cluster = require('cluster');
 var domino = require('domino');
 var util = require('util');
+var semver = require('semver');
 
 var Diff = require('../utils/Diff.js').Diff;
 var DU = require('../utils/DOMUtils.js').DOMUtils;
@@ -163,7 +164,7 @@
 };
 
 // Cluster support was very experimental and missing methods in v0.8.x
-var sufficientNodeVersion = !/^v0\.[0-8]\./.test(process.version);
+var sufficientNodeVersion = semver.gte(process.version, '0.10.0');
 
 /**
  * @method
diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
index 730b825..cf59410 100644
--- a/npm-shrinkwrap.json
+++ b/npm-shrinkwrap.json
@@ -4405,6 +4405,10 @@
 }
   }
 },
+"semver": {
+  "version": "5.1.0",
+  "resolved": "https://registry.npmjs.org/semver/-/semver-5.1.0.tgz;
+},
 "serve-favicon": {
   "version": "2.3.0",
   "resolved": 
"https://registry.npmjs.org/serve-favicon/-/serve-favicon-2.3.0.tgz;,
diff --git a/package.json b/package.json
index

[MediaWiki-commits] [Gerrit] Add sarin to DHCP Bug:T125752 - change (operations/puppet)

2016-02-05 Thread Dzahn (Code Review) 
Dzahn has submitted this change and it was merged.

Change subject: Add sarin to DHCP Bug:T125752
..


Add sarin to DHCP
Bug:T125752

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

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



diff --git a/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200 
b/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
index 5809785..86f2ee6 100644
--- a/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
+++ b/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
@@ -6323,6 +6323,12 @@
filename "jessie-installer/debian-installer/amd64/pxelinux.0";
 }
 
+host sarin {
+hardware ethernet 90:B1:1C:2D:85:40;
+fixed-address sarin.codfw.wmnet;
+option pxelinux.pathprefix "jessie-installer/";
+filename "jessie-installer/debian-installer/amd64/pxelinux.0";
+
 host scandium {
hardware ethernet 84:2b:2b:fd:be:52;
fixed-address scandium.eqiad.wmnet;

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

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

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

[MediaWiki-commits] [Gerrit] dhcp: fix syntax error, missing bracket - change (operations/puppet)

2016-02-05 Thread Dzahn (Code Review) 
Dzahn has uploaded a new change for review.

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

Change subject: dhcp: fix syntax error, missing bracket
..

dhcp: fix syntax error, missing bracket

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


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/05/268705/1

diff --git a/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200 
b/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
index 86f2ee6..a235cc0 100644
--- a/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
+++ b/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
@@ -6328,6 +6328,7 @@
 fixed-address sarin.codfw.wmnet;
 option pxelinux.pathprefix "jessie-installer/";
 filename "jessie-installer/debian-installer/amd64/pxelinux.0";
+}
 
 host scandium {
hardware ethernet 84:2b:2b:fd:be:52;

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

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

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

[MediaWiki-commits] [Gerrit] Fix "Uncaught TypeError: $.cookie is not a function" - change (mediawiki...VisualEditor)

2016-02-05 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged.

Change subject: Fix "Uncaught TypeError: $.cookie is not a function"
..


Fix "Uncaught TypeError: $.cookie is not a function"

Was being thrown on all read pages and caused VE to no longer
load properly.

Three places make use of $.cookie():
* ve.init.mw.DesktopArticleTarget.init.js
* ve.init.mw.DesktopArticleTarget.js
* ve.ui.MWEducationPopupTool.js

Presumably this worked by luck previously due to another extension
or core module depending on it and loading earlier but no more.

Change-Id: I6b00822f1d5d17add3e298cbd77f4790899aaec2
(cherry picked from commit 7099ae0eef7ce8531db724b4e73e588ed41859ce)
---
M extension.json
1 file changed, 3 insertions(+), 0 deletions(-)

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



diff --git a/extension.json b/extension.json
index 541e0d8..814fb52 100644
--- a/extension.json
+++ b/extension.json
@@ -266,6 +266,7 @@
},
"dependencies": [
"jquery.client",
+   "jquery.cookie",
"mediawiki.page.startup",
"mediawiki.Title",
"mediawiki.Uri",
@@ -336,6 +337,7 @@
"ext.visualEditor.base",
"ext.visualEditor.mediawiki",
"ext.visualEditor.core.desktop",
+   "jquery.cookie",
"mediawiki.jqueryMsg",
"mediawiki.util"
],
@@ -1101,6 +1103,7 @@
"mediawiki.user",
"mediawiki.util",
"mediawiki.jqueryMsg",
+   "jquery.cookie",
"jquery.byteLimit",
"mediawiki.skinning.content.parsoid",
"mediawiki.language.specialCharacters",

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I6b00822f1d5d17add3e298cbd77f4790899aaec2
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: wmf/1.27.0-wmf.12
Gerrit-Owner: Paladox 
Gerrit-Reviewer: Alex Monk 
Gerrit-Reviewer: Hashar 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] dhcp: replace tabs with spaces - change (operations/puppet)

2016-02-05 Thread Dzahn (Code Review) 
Dzahn has uploaded a new change for review.

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

Change subject: dhcp: replace tabs with spaces
..

dhcp: replace tabs with spaces

Since we replaced tabs in puppet and DNS and we keep getting mixed
spaces and tabs in these files all the time, i'm just replacing all tabs
here for once.

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


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/06/268706/1


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

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

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

[MediaWiki-commits] [Gerrit] Delete assessment records on page deletion - change (mediawiki...PageAssessments)

2016-02-05 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged.

Change subject: Delete assessment records on page deletion
..


Delete assessment records on page deletion

Also fixes spacing issues in a few places.
Bug: T124823
Change-Id: I73a548a95c80c0032ec708200b04af0f686f5b6c
---
M PageAssessments.hooks.php
M PageAssessmentsBody.php
M PageAssessmentsSaveJob.php
M extension.json
4 files changed, 42 insertions(+), 14 deletions(-)

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



diff --git a/PageAssessments.hooks.php b/PageAssessments.hooks.php
index 625b754..6f161c2 100644
--- a/PageAssessments.hooks.php
+++ b/PageAssessments.hooks.php
@@ -27,7 +27,7 @@
 * @param $parser Parser
 * @return bool
 */
-   public static function onParserFirstCallInit ( &$parser ) {
+   public static function onParserFirstCallInit( &$parser ) {
$parser->setFunctionHook( 'assessment', 
'PageAssessmentsBody::cacheAssessment' );
}
 
@@ -36,7 +36,7 @@
 * @param OutputPage $out OutputPage object
 * @param ParserOutput $pOut ParserOutput object
 */
-   public static function onOutputPageParserOutput ( OutputPage $out, 
ParserOutput $pOut ) {
+   public static function onOutputPageParserOutput( OutputPage $out, 
ParserOutput $pOut ) {
if ( $pOut->getExtensionData( 
'ext-pageassessment-assessmentdata' ) != null ) {
$assessmentData = $pOut->getExtensionData( 
'ext-pageassessment-assessmentdata' );
$title = $pOut->getDisplayTitle();
@@ -52,7 +52,7 @@
 * Run database updates
 * @param DatabaseUpdater $updater DatabaseUpdater object
 */
-   public static function onLoadExtensionSchemaUpdates ( DatabaseUpdater 
$updater = null ) {
+   public static function onLoadExtensionSchemaUpdates( DatabaseUpdater 
$updater = null ) {
$dbDir = __DIR__ . '/db';
$updater->addExtensionUpdate( array( 'addtable', 
'page_assessments', "$dbDir/addReviewsTable.sql", true ) );
return true;
@@ -66,4 +66,12 @@
return true;
}
 
+   /**
+* Delete assessment records when page is deleted
+*/
+   public static function onArticleDeleteComplete( &$article, &$user, 
$reason, $id, $content = null, $logEntry ) {
+   PageAssessmentsBody::deleteRecordsForPage( $id );
+   return true;
+   }
+
 }
diff --git a/PageAssessmentsBody.php b/PageAssessmentsBody.php
index a67131b..8c16558 100644
--- a/PageAssessmentsBody.php
+++ b/PageAssessmentsBody.php
@@ -26,7 +26,7 @@
/**
 * Driver function
 */
-   public static function execute ( $titleObj, $assessmentData ) {
+   public static function execute( $titleObj, $assessmentData ) {
$pageId = $titleObj->getArticleID();
$revisionId = $titleObj->getLatestRevID();
// Compile a list of projects to find out which ones to be 
deleted afterwards
@@ -76,9 +76,9 @@
/**
 * Update record in DB if there are new values
 * @param array $values New values to be entered into the DB
-* @return bool True/False on query success/fail
+* @return bool true
 */
-   public static function updateRecord ( $values ) {
+   public static function updateRecord( $values ) {
$dbr = wfGetDB( DB_SLAVE );
$conds =  array(
'pa_page_id' => $values['pa_page_id'],
@@ -107,9 +107,9 @@
/**
 * Insert a new record in DB
 * @param array $values New values to be entered into the DB
-* @return bool True/False on query success/fail
+* @return bool true
 */
-   public static function insertRecord ( $values ) {
+   public static function insertRecord( $values ) {
$dbw = wfGetDB( DB_MASTER );
$dbw->insert( 'page_assessments', $values, __METHOD__ );
return true;
@@ -122,7 +122,7 @@
 * @param string $project Project
 * @return array $results All projects associated with given page title
 */
-   public static function getAllProjects ( $pageId ) {
+   public static function getAllProjects( $pageId ) {
$dbr = wfGetDB( DB_SLAVE );
$res = $dbr->select(
'page_assessments',
@@ -142,13 +142,30 @@
/**
 * Delete a record from DB
 * @param array $values Conditions for looking up records to delete
-* @return bool True/False on query success/fail
+* @return bool true
 */
-   public static function deleteRecord ( $values ) {
+   public static function deleteRecord( $values ) {
$dbw = wfGetDB( DB_MASTER );
$conds = array(

[MediaWiki-commits] [Gerrit] Add wbc_entity_usage table if wiki is in wikidataclient.dblist - change (mediawiki...WikimediaMaintenance)

2016-02-05 Thread Aude (Code Review) 
Aude has uploaded a new change for review.

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

Change subject: Add wbc_entity_usage table if wiki is in wikidataclient.dblist
..

Add wbc_entity_usage table if wiki is in wikidataclient.dblist

Checking wikidataclient.dblist is probably more reliable
way of determining if a wiki should have wbc_entity_usage
added.

Bug: T122512
Change-Id: I8fced5b30ab61720eeb30b10cc7511afe8055bab
---
M addWiki.php
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/addWiki.php b/addWiki.php
index 7dc3966..380ab32 100644
--- a/addWiki.php
+++ b/addWiki.php
@@ -128,7 +128,7 @@
break;
}
 
-   if ( $site !== 'wikimedia' ) {
+   if ( in_array( $dbName, MWWikiversions::readDbListFile( 
'wikidataclient' ) ) {
$dbw->sourceFile( 
"$IP/extensions/Wikidata/extensions/Wikibase/client/sql/entity_usage.sql" );
}
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I8fced5b30ab61720eeb30b10cc7511afe8055bab
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikimediaMaintenance
Gerrit-Branch: master
Gerrit-Owner: Aude 

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

[MediaWiki-commits] [Gerrit] Default extensions to not use the 'invisible icon' - change (mediawiki...VisualEditor)

2016-02-05 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged.

Change subject: Default extensions to not use the 'invisible icon'
..


Default extensions to not use the 'invisible icon'

Bug: T125767
Change-Id: I58c58080382974a887ebc52c1ac80cb5970db8c7
(cherry picked from commit 5864a62134b761be0ce79cc5dbdf0efc3d1e4074)
---
M modules/ve-mw/ce/nodes/ve.ce.MWExtensionNode.js
1 file changed, 0 insertions(+), 2 deletions(-)

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



diff --git a/modules/ve-mw/ce/nodes/ve.ce.MWExtensionNode.js 
b/modules/ve-mw/ce/nodes/ve.ce.MWExtensionNode.js
index c9ed5fc..dd31e12 100644
--- a/modules/ve-mw/ce/nodes/ve.ce.MWExtensionNode.js
+++ b/modules/ve-mw/ce/nodes/ve.ce.MWExtensionNode.js
@@ -46,8 +46,6 @@
  */
 ve.ce.MWExtensionNode.static.rendersEmpty = false;
 
-ve.ce.MWExtensionNode.static.iconWhenInvisible = 'alienextension';
-
 /* Methods */
 
 /** */

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I58c58080382974a887ebc52c1ac80cb5970db8c7
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: wmf/1.27.0-wmf.12
Gerrit-Owner: Jforrester 
Gerrit-Reviewer: Esanders 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Revert "VE: Never use invisible icon" - change (mediawiki...Graph)

2016-02-05 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged.

Change subject: Revert "VE: Never use invisible icon"
..


Revert "VE: Never use invisible icon"

The default value is now null so this is not required.

This reverts commit b0b78b6abad278ca0dae85c1b73818a1d008f559.

Change-Id: Ibd9e73f39439d1483311c6f161251cc2a191ce2f
Depends-On: I58c58080382974a887ebc52c1ac80cb5970db8c7
---
M modules/ve-graph/ve.ce.MWGraphNode.js
1 file changed, 0 insertions(+), 2 deletions(-)

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



diff --git a/modules/ve-graph/ve.ce.MWGraphNode.js 
b/modules/ve-graph/ve.ce.MWGraphNode.js
index 41739fe..2c8db20 100644
--- a/modules/ve-graph/ve.ce.MWGraphNode.js
+++ b/modules/ve-graph/ve.ce.MWGraphNode.js
@@ -49,8 +49,6 @@
 
 ve.ce.MWGraphNode.static.tagName = 'div';
 
-ve.ce.MWGraphNode.static.iconWhenInvisible = null;
-
 /* Static Methods */
 
 /**

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ibd9e73f39439d1483311c6f161251cc2a191ce2f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Graph
Gerrit-Branch: master
Gerrit-Owner: Esanders 
Gerrit-Reviewer: Esanders 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Add semver and bump src for 4d06e1ba - change (mediawiki...deploy)

2016-02-05 Thread Arlolra (Code Review) 
Arlolra has uploaded a new change for review.

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

Change subject: Add semver and bump src for 4d06e1ba
..

Add semver and bump src for 4d06e1ba

Change-Id: Iaca1b4c323f72aba7119f60c95f1bda12957124c
---
A node_modules/.bin/semver
A node_modules/semver/.npmignore
A node_modules/semver/.travis.yml
A node_modules/semver/LICENSE
A node_modules/semver/README.md
A node_modules/semver/bin/semver
A node_modules/semver/package.json
A node_modules/semver/range.bnf
A node_modules/semver/semver.js
A node_modules/semver/test/big-numbers.js
A node_modules/semver/test/clean.js
A node_modules/semver/test/gtr.js
A node_modules/semver/test/index.js
A node_modules/semver/test/ltr.js
A node_modules/semver/test/major-minor-patch.js
M src
16 files changed, 2,903 insertions(+), 0 deletions(-)


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

diff --git a/node_modules/.bin/semver b/node_modules/.bin/semver
new file mode 12
index 000..317eb29
--- /dev/null
+++ b/node_modules/.bin/semver
@@ -0,0 +1 @@
+../semver/bin/semver
\ No newline at end of file
diff --git a/node_modules/semver/.npmignore b/node_modules/semver/.npmignore
new file mode 100644
index 000..534108e
--- /dev/null
+++ b/node_modules/semver/.npmignore
@@ -0,0 +1,4 @@
+node_modules/
+coverage/
+.nyc_output/
+nyc_output/
diff --git a/node_modules/semver/.travis.yml b/node_modules/semver/.travis.yml
new file mode 100644
index 000..991d04b
--- /dev/null
+++ b/node_modules/semver/.travis.yml
@@ -0,0 +1,5 @@
+language: node_js
+node_js:
+  - '0.10'
+  - '0.12'
+  - 'iojs'
diff --git a/node_modules/semver/LICENSE b/node_modules/semver/LICENSE
new file mode 100644
index 000..19129e3
--- /dev/null
+++ b/node_modules/semver/LICENSE
@@ -0,0 +1,15 @@
+The ISC License
+
+Copyright (c) Isaac Z. Schlueter and Contributors
+
+Permission to use, copy, modify, and/or distribute this software for any
+purpose with or without fee is hereby granted, provided that the above
+copyright notice and this permission notice appear in all copies.
+
+THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR
+IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
diff --git a/node_modules/semver/README.md b/node_modules/semver/README.md
new file mode 100644
index 000..0b14a7e
--- /dev/null
+++ b/node_modules/semver/README.md
@@ -0,0 +1,327 @@
+semver(1) -- The semantic versioner for npm
+===
+
+## Usage
+
+$ npm install semver
+
+semver.valid('1.2.3') // '1.2.3'
+semver.valid('a.b.c') // null
+semver.clean('  =v1.2.3   ') // '1.2.3'
+semver.satisfies('1.2.3', '1.x || >=2.5.0 || 5.0.0 - 7.2.3') // true
+semver.gt('1.2.3', '9.8.7') // false
+semver.lt('1.2.3', '9.8.7') // true
+
+As a command-line utility:
+
+$ semver -h
+
+Usage: semver  [ [...]] [-r  | -i  | --preid 
 | -l | -rv]
+Test if version(s) satisfy the supplied range(s), and sort them.
+
+Multiple versions or ranges may be supplied, unless increment
+option is specified.  In that case, only a single version may
+be used, and it is incremented by the specified level
+
+Program exits successfully if any valid version satisfies
+all supplied ranges, and prints all satisfying versions.
+
+If no versions are valid, or ranges are not satisfied,
+then exits failure.
+
+Versions are printed in ascending order, so supplying
+multiple versions to the utility will just sort them.
+
+## Versions
+
+A "version" is described by the `v2.0.0` specification found at
+.
+
+A leading `"="` or `"v"` character is stripped off and ignored.
+
+## Ranges
+
+A `version range` is a set of `comparators` which specify versions
+that satisfy the range.
+
+A `comparator` is composed of an `operator` and a `version`.  The set
+of primitive `operators` is:
+
+* `<` Less than
+* `<=` Less than or equal to
+* `>` Greater than
+* `>=` Greater than or equal to
+* `=` Equal.  If no operator is specified, then equality is assumed,
+  so this operator is optional, but MAY be included.
+
+For example, the comparator `>=1.2.7` would match the versions
+`1.2.7`, `1.2.8`, `2.5.3`, and `1.3.9`, but not the versions `1.2.6`
+or `1.1.0`.
+
+Comparators can be joined by whitespace to form a `comparator set`,
+which is satisfied by the **intersection** of all of the comparators
+it includes.
+
+A range is composed of one or more comparator sets, joined by `||`.  A
+version matches a range if and

[MediaWiki-commits] [Gerrit] Remove uses of plain .contentEditable - change (VisualEditor/VisualEditor)

2016-02-05 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged.

Change subject: Remove uses of plain .contentEditable
..


Remove uses of plain .contentEditable

Browsers handle the inheritance via isContentEditable, so we don't have to
think about it. Add a helper method so checks don't have to think about
text nodes.

Bug: T116214
Change-Id: Ib7beda39e9195c77d29faf8120c89c053b6f2b90
---
M jsduck.json
M src/ce/ve.ce.Surface.js
M src/ce/ve.ce.View.js
M src/ve.utils.js
M tests/ve.test.js
5 files changed, 21 insertions(+), 13 deletions(-)

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



diff --git a/jsduck.json b/jsduck.json
index c928bd9..5e42b91 100644
--- a/jsduck.json
+++ b/jsduck.json
@@ -8,7 +8,7 @@
"--builtin-classes": true,
"--processes": "0",
"--warnings-exit-nonzero": true,
-   "--external": 
"HTMLDocument,Window,Node,Set,Range,Selection,ClientRect,File,Blob,DataTransfer,DataTransferItem,KeyboardEvent,MouseEvent",
+   "--external": 
"HTMLDocument,Window,Node,Text,Set,Range,Selection,ClientRect,File,Blob,DataTransfer,DataTransferItem,KeyboardEvent,MouseEvent",
"--": [
".jsduck/external.js",
"lib/oojs",
diff --git a/src/ce/ve.ce.Surface.js b/src/ce/ve.ce.Surface.js
index e288175..9175fd4 100644
--- a/src/ce/ve.ce.Surface.js
+++ b/src/ce/ve.ce.Surface.js
@@ -1155,7 +1155,7 @@
 * @return {ve.ce.Node|null} node, or null if not in a focusable node
 */
function getSurroundingFocusableNode( node, offset, direction ) {
-   var focusNode, $focusNode;
+   var focusNode;
if ( node.nodeType === Node.TEXT_NODE ) {
focusNode = node;
} else if ( direction > 0 && offset < node.childNodes.length ) {
@@ -1166,13 +1166,12 @@
focusNode = node;
}
 
-   $focusNode = $( focusNode );
-   // If the first ancestor with contenteditable set is ce=true, 
then we are allowed
-   // to be inside this focusable node (e.g. editing a table cell 
or caption)
-   if ( $focusNode.closest( '[contenteditable]' ).prop( 
'contenteditable' ) === 'true' ) {
+   if ( ve.isContentEditable( focusNode ) ) {
+   // We are allowed to be inside this focusable node 
(e.g. editing a
+   // table cell or caption).
return null;
}
-   return $focusNode.closest( '.ve-ce-focusableNode, 
.ve-ce-tableNode' ).data( 'view' ) || null;
+   return $( focusNode ).closest( '.ve-ce-focusableNode, 
.ve-ce-tableNode' ).data( 'view' ) || null;
}
 
/**
diff --git a/src/ce/ve.ce.View.js b/src/ce/ve.ce.View.js
index 81099b4..b893557 100644
--- a/src/ce/ve.ce.View.js
+++ b/src/ce/ve.ce.View.js
@@ -171,11 +171,7 @@
  * @return {boolean} Node is inside a contentEditable node
  */
 ve.ce.View.prototype.isInContentEditable = function () {
-   var node = this.$element[ 0 ].parentNode;
-   while ( node && node.contentEditable === 'inherit' ) {
-   node = node.parentNode;
-   }
-   return !!( node && node.contentEditable === 'true' );
+   return ve.isContentEditable( this.$element[ 0 ].parentNode );
 };
 
 /**
diff --git a/src/ve.utils.js b/src/ve.utils.js
index 7a15804..9713019 100644
--- a/src/ve.utils.js
+++ b/src/ve.utils.js
@@ -701,6 +701,19 @@
 };
 
 /**
+ * Check whether a given node is contentEditable
+ *
+ * Handles 'inherit', via checking isContentEditable. Knows to check for text
+ * nodes, and will return whether the text node's parent is contentEditable.
+ *
+ * @param  {HTMLElement|Text} node Node to check contenteditable status of
+ * @return {boolean} Node is contenteditable
+ */
+ve.isContentEditable = function ( node ) {
+   return ( node.nodeType === Node.TEXT_NODE ? node.parentNode : node 
).isContentEditable;
+};
+
+/**
  * Create an HTMLDocument from an HTML string.
  *
  * The html parameter is supposed to be a full HTML document with a doctype 
and an `` tag.
diff --git a/tests/ve.test.js b/tests/ve.test.js
index eac697e..ce956a0 100644
--- a/tests/ve.test.js
+++ b/tests/ve.test.js
@@ -960,7 +960,7 @@
QUnit.expect( 2 * tests.length );
 
div = document.createElement( 'div' );
-   div.contentEditable = true;
+   div.contentEditable = 'true';
 
for ( direction in { forward: undefined, backward: undefined } ) {
for ( i = 0, len = tests.length; i < len; i++ ) {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib7beda39e9195c77d29faf8120c89c053b6f2b90
Gerrit-PatchSet: 4
Gerrit-Project: VisualEditor/VisualEditor
Gerrit-Branch:

[MediaWiki-commits] [Gerrit] Remove direct insertions of JS into the page HTML - change (mediawiki...SemanticForms)

2016-02-05 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged.

Change subject: Remove direct insertions of JS into the page HTML
..


Remove direct insertions of JS into the page HTML

This prevents calls to jQuery when it is not yet available.

Change-Id: Ie9238c1bc6a134166c31b2cc3ed3099c05dd86ff
---
M includes/forminputs/SF_FormInput.php
M libs/SemanticForms.js
2 files changed, 45 insertions(+), 22 deletions(-)

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



diff --git a/includes/forminputs/SF_FormInput.php 
b/includes/forminputs/SF_FormInput.php
index e391aa1..c5a60f2 100644
--- a/includes/forminputs/SF_FormInput.php
+++ b/includes/forminputs/SF_FormInput.php
@@ -116,6 +116,23 @@
}
 
/**
+* @param $key
+* @param $configVars
+* @param $functionData
+* @param $input_id
+* @return array
+*/
+   private static function updateFormInputJsFunctionData( $key, 
&$configVars, $functionData, $input_id ) {
+   if ( array_key_exists( $key, $configVars ) ) {
+   $functionDataArray = $configVars[ $key ];
+   } else {
+   $functionDataArray = array();
+   }
+   $functionDataArray[ $input_id ] = $functionData;
+   return $functionDataArray;
+   }
+
+   /**
 * Return an array of the default parameters for this input where the
 * parameter name is the key while the parameter value is the value.
 *
@@ -203,7 +220,10 @@
 * @param String $name The name of the initialization function.
 * @param String $param The parameter passed to the initialization 
function.
 */
-   public function addJsInitFunctionData( $name, $param = 'null' ) {
+   public function addJsInitFunctionData( $name, $param = null ) {
+   if ( is_string( $param ) ) {
+   $param = json_decode( $param );
+   }
$this->mJsInitFunctionData[] = array( 'name' => $name, 'param' 
=> $param );
}
 
@@ -337,31 +357,18 @@
$output->addModuleScripts( $modules );
}
 
-   // create calls to JS initialization and validation
-   // TODO: This data should be transferred as a JSON blob and 
then be evaluated from a dedicated JS file
if ( $input->getJsInitFunctionData() || 
$input->getJsValidationFunctionData() ) {
 
-   $jstext = '';
$input_id = $input_name == 'sf_free_text' ? 
'sf_free_text' : "input_$sfgFieldNum";
+   $configVars = $output->getJsConfigVars();
 
-   foreach ( $input->getJsInitFunctionData() as 
$jsInitFunctionData ) {
-   $jstext .= 
"jQuery('#$input_id').SemanticForms_registerInputInit({$jsInitFunctionData['name']},
 {$jsInitFunctionData['param']} );";
-   }
+   $initFunctionData = 
self::updateFormInputJsFunctionData( 'ext.sf.initFunctionData', $configVars, 
$input->getJsInitFunctionData(), $input_id );
+   $validationFunctionData = 
self::updateFormInputJsFunctionData( 'ext.sf.validationFunctionData', 
$configVars, $input->getJsValidationFunctionData(), $input_id );
 
-   foreach ( $input->getJsValidationFunctionData() as 
$jsValidationFunctionData ) {
-   $jstext .= 
"jQuery('#$input_id').SemanticForms_registerInputValidation( 
{$jsValidationFunctionData['name']}, {$jsValidationFunctionData['param']});";
-   }
-
-   if ( $modules !== null ) {
-   $jstext = 'mediaWiki.loader.using(' . 
json_encode( $modules )
-   . ',function(){' . $jstext
-   . '},function(e,module){alert(module+": 
"+e);});';
-   }
-
-   $jstext = 'jQuery(function(){' . $jstext . '});';
-
-   // write JS code directly to the page's code
-   $output->addHeadItem( Html::inlineScript( $jstext ) );
+   $output->addJsConfigVars( array(
+   'ext.sf.initFunctionData' => $initFunctionData,
+   'ext.sf.validationFunctionData' => 
$validationFunctionData
+   ) );
}
 
return $input->getHtmlText();
diff --git a/libs/SemanticForms.js b/libs/SemanticForms.js
index bfb0a64..02c3866 100644
--- a/libs/SemanticForms.js
+++ b/libs/SemanticForms.js
@@ -482,7 +482,7 @@
 // Used for handling 'show on select' for the 'checkbox' input.
 jQuery.fn.showIfCheckedCheckbox = function(partOfMultiple, initPage) {
var sfgShowOnSelect = mediaWiki.config.get( 'sfgShowOnSelect' );
-

[MediaWiki-commits] [Gerrit] Clean up syntax errors and bad names - change (analytics/dashiki)

2016-02-05 Thread Milimetric (Code Review) 
Milimetric has submitted this change and it was merged.

Change subject: Clean up syntax errors and bad names
..


Clean up syntax errors and bad names

Change-Id: Icd4577a91201c7f00d74e2f53ba89ce52820c24a
---
M src/app/config.js
M src/app/require.config.js
M src/app/startup.js
M src/components/a-b-compare/a-b-compare.js
M src/components/a-b-compare/compare-stacked-bars.js
M src/components/a-b-compare/compare-sunburst.js
M src/components/a-b-compare/compare-timeseries.js
M src/components/annotation-list/annotation-list.js
M src/components/annotation-list/bindings.js
M src/components/breakdown-toggle/breakdown-toggle.js
M src/components/button-group/button-group.js
M src/components/compare-layout/compare-layout.js
M src/components/dropdown/dropdown.js
M src/components/metric-selector/bindings.js
M src/components/metric-selector/metric-selector.js
R src/components/metrics-by-project-layout/metrics-by-project-layout.html
R src/components/metrics-by-project-layout/metrics-by-project-layout.js
M src/components/project-selector/bindings.js
M src/components/project-selector/project-selector.js
M src/components/tabs-layout/tabs-layout.js
D src/components/time-selector/time-selector.html
D src/components/time-selector/time-selector.js
R src/components/visualizers/wikimetrics/wikimetrics.html
R src/components/visualizers/wikimetrics/wikimetrics.js
M src/layouts/metrics-by-project/index.html
M src/layouts/metrics-by-project/index.js
M src/lib/ajax-wrapper.js
M src/lib/logger.js
M src/lib/polyfills.js
M src/lib/state-manager.js
M src/lib/utils.js
M src/lib/window.js
M test/SpecRunner.browser.js
M test/components/wikimetrics-layout.js
M test/components/wikimetrics-visualizer.js
35 files changed, 79 insertions(+), 92 deletions(-)

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



diff --git a/src/app/config.js b/src/app/config.js
index c3ba165..87542de 100644
--- a/src/app/config.js
+++ b/src/app/config.js
@@ -1,8 +1,8 @@
+'use strict';
 /**
  * Static configuration object
  */
 define(function (require) {
-'use strict';
 
 // load any config files written by the build system
 var buildConfig = require('./config-from-build');
@@ -40,10 +40,5 @@
 endpoint: '//datasets.wikimedia.org/limn-public-data/metrics',
 format: 'tsv'
 },
-
-
-//urlProjectLanguageChoices: 
'/stubs/fake-wikimetrics/projectLanguageChoices.json',
-//urlCategorizedMetrics: 
'/stubs/fake-wikimetrics/categorizedMetrics.json',
-//urlDefaultDashboard: '/stubs/fake-wikimetrics/defaultDashboard.json',
 };
 });
diff --git a/src/app/require.config.js b/src/app/require.config.js
index 5e94fe2..16ab609 100644
--- a/src/app/require.config.js
+++ b/src/app/require.config.js
@@ -1,5 +1,3 @@
-/* jshint -W098 */
-/* jshint -W079 */
 'use strict';
 // require.js looks for the following global when initializing
 var require = {
diff --git a/src/app/startup.js b/src/app/startup.js
index 5d6965e..7a2b020 100644
--- a/src/app/startup.js
+++ b/src/app/startup.js
@@ -1,9 +1,9 @@
+'use strict';
 /**
 All requires below live on global scope.
 There is no need to specify them as such
 **/
 define(function(require) {
-'use strict';
 
 var ko = require('knockout');
 
@@ -14,11 +14,10 @@
 // separate layouts, TODO: make each layout register its own components
 
 // *** BEGIN Metrics By Project Layout Components ** //
-ko.components.register('wikimetrics-layout', { require: 
'components/wikimetrics-layout/wikimetrics-layout' });
-ko.components.register('wikimetrics-visualizer', { require: 
'components/wikimetrics-visualizer/wikimetrics-visualizer' });
+ko.components.register('metrics-by-project-layout', { require: 
'components/metrics-by-project-layout/metrics-by-project-layout' });
+ko.components.register('wikimetrics', { require: 
'components/visualizers/wikimetrics/wikimetrics' });
 ko.components.register('project-selector', { require: 
'components/project-selector/project-selector' });
 ko.components.register('metric-selector', { require: 
'components/metric-selector/metric-selector' });
-ko.components.register('time-selector', { require: 
'components/time-selector/time-selector' });
 ko.components.register('breakdown-toggle', { require: 
'components/breakdown-toggle/breakdown-toggle' });
 ko.components.register('vega-timeseries', { require: 
'components/visualizers/vega-timeseries/vega-timeseries' });
 ko.components.register('annotation-list', { require: 
'components/annotation-list/annotation-list' });
diff --git a/src/components/a-b-compare/a-b-compare.js 
b/src/components/a-b-compare/a-b-compare.js
index 7294082..6319f6f 100644
--- a/src/components/a-b-compare/a-b-compare.js
+++ b/src/components/a-b-compare/a-b-compare.js
@@ -1,5 +1,5 @@
+'use strict';
 define(function (require) {
-'use strict';
 
 var templateMarkup =

[MediaWiki-commits] [Gerrit] Implement a Tabular Layout - change (analytics/dashiki)

2016-02-05 Thread Nuria (Code Review) 
Nuria has submitted this change and it was merged.

Change subject: Implement a Tabular Layout
..


Implement a Tabular Layout

Added a README.md in the layouts folder

Bug: T118329
Change-Id: Ib89953df6102a3d2da75839dd38cc1a6f2085ee7
---
M .gitignore
M README.md
M bower.json
M src/app/startup.js
M src/components/a-b-compare/compare-stacked-bars.html
M src/components/compare-layout/compare-layout.js
A src/components/tabs-layout/tabs-layout.html
A src/components/tabs-layout/tabs-layout.js
A src/components/visualizers/README.md
M src/components/visualizers/dygraphs-timeseries/bindings.js
R src/components/visualizers/filter-timeseries/filter-timeseries.html
R src/components/visualizers/filter-timeseries/filter-timeseries.js
M src/components/visualizers/stacked-bars/bindings.js
M src/components/visualizers/stacked-bars/stacked-bars.html
M src/components/visualizers/sunburst/sunburst.html
A src/components/visualizers/visualizer/visualizer.html
A src/components/visualizers/visualizer/visualizer.js
A src/css/semantic2.button.css
A src/css/semantic2.divider.css
A src/css/semantic2.header.css
A src/css/semantic2.menu.css
A src/css/semantic2.segment.css
A src/layouts/README.md
M src/layouts/compare/01_styles.css
M src/layouts/compare/index.html
M src/layouts/compare/index.js
A src/layouts/tabs/index.html
A src/layouts/tabs/index.js
A src/layouts/tabs/styles.css
M src/lib/utils.js
A test/components/tabs-layout.js
31 files changed, 425 insertions(+), 43 deletions(-)

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



diff --git a/.gitignore b/.gitignore
index d90390f..f9cbb4a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,6 @@
 # temp files and install artifacts
 *swp
+*swo
 .DS_Store
 node_modules/
 bower_modules/
diff --git a/README.md b/README.md
index db40b33..ac8a007 100644
--- a/README.md
+++ b/README.md
@@ -28,7 +28,8 @@
 What is this magic?  When you pass `--layout compare` to the gulp build, 
you're telling it
 to use the layout defined in src/layouts/compare/.  When you pass `--config
 VisualEditorAndWikitext`, you're telling it to configure this layout with the 
article found
-at http://meta.wikimedia.org/wiki/Config:VisualEditorAndWikitext
+at http://meta.wikimedia.org/wiki/Config:VisualEditorAndWikitext.  For all 
valid layouts,
+see the `src/layouts` folder and the README there.
 
 ### Build and Dev tools
 
diff --git a/bower.json b/bower.json
index 55ea471..13ce466 100644
--- a/bower.json
+++ b/bower.json
@@ -13,6 +13,7 @@
 "URIjs": "~1.13.2",
 "typeahead.js": "~0.10.5",
 "semantic": "~0.19.0",
+"semantic-2": "semantic#2.1",
 "mediawiki-storage": "latest",
 "marked": "~0.3.2",
 "twix": "~0.5.1",
diff --git a/src/app/startup.js b/src/app/startup.js
index 6da70f7..5d6965e 100644
--- a/src/app/startup.js
+++ b/src/app/startup.js
@@ -11,8 +11,9 @@
 require('ajaxWrapper');
 require('logger');
 require('app/ko-extensions/global-bindings');
+// separate layouts, TODO: make each layout register its own components
 
-// register components here like
+// *** BEGIN Metrics By Project Layout Components ** //
 ko.components.register('wikimetrics-layout', { require: 
'components/wikimetrics-layout/wikimetrics-layout' });
 ko.components.register('wikimetrics-visualizer', { require: 
'components/wikimetrics-visualizer/wikimetrics-visualizer' });
 ko.components.register('project-selector', { require: 
'components/project-selector/project-selector' });
@@ -21,10 +22,10 @@
 ko.components.register('breakdown-toggle', { require: 
'components/breakdown-toggle/breakdown-toggle' });
 ko.components.register('vega-timeseries', { require: 
'components/visualizers/vega-timeseries/vega-timeseries' });
 ko.components.register('annotation-list', { require: 
'components/annotation-list/annotation-list' });
+// *** END Metrics By Project Layout Components  //
 
 
-// *** BEGIN Funnel Layout Components ** //
-// separate layout, TODO: make multiple layouts coexist
+// *** BEGIN Compare Layout Components ** //
 ko.components.register('compare-layout', { require: 
'components/compare-layout/compare-layout' });
 ko.components.register('dropdown', { require: 
'components/dropdown/dropdown' });
 ko.components.register('button-group', { require: 
'components/button-group/button-group' });
@@ -32,16 +33,21 @@
 ko.components.register('rickshaw-timeseries', { require: 
'components/visualizers/rickshaw-timeseries/rickshaw-timeseries' });
 ko.components.register('nvd3-timeseries', { require: 
'components/visualizers/nvd3-timeseries/nvd3-timeseries' });
 ko.components.register('dygraphs-timeseries', { require: 
'components/visualizers/dygraphs-timeseries/dygraphs-timeseries' });
+ko.components.register('filter-timeseries', { require:

[MediaWiki-commits] [Gerrit] Require grunt for Flow - change (mediawiki/vagrant)

2016-02-05 Thread Mattflaschen (Code Review) 
Mattflaschen has uploaded a new change for review.

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

Change subject: Require grunt for Flow
..

Require grunt for Flow

This is needed for the pre-commit scripts.

Change-Id: I35e2073287565dfb47bb7ae4242c9b111bd01704
---
M puppet/modules/role/manifests/flow.pp
1 file changed, 4 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant 
refs/changes/07/268707/1

diff --git a/puppet/modules/role/manifests/flow.pp 
b/puppet/modules/role/manifests/flow.pp
index b112c2b..51aa5be 100644
--- a/puppet/modules/role/manifests/flow.pp
+++ b/puppet/modules/role/manifests/flow.pp
@@ -16,6 +16,10 @@
 browser_tests => '.',
 }
 
+# Seems this may need some require_package type thing.
+# Some other component is going to want this eventually too.
+npm::global { 'grunt-cli' }
+
 mediawiki::group { 'flow-creator':
   wiki  => $::mediawiki::wiki_name,
   group_name=> 'flow-creator',

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I35e2073287565dfb47bb7ae4242c9b111bd01704
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: Mattflaschen 

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

[MediaWiki-commits] [Gerrit] Fix typo and sort by alphabetical order wgExtraSignatureName... - change (operations/mediawiki-config)

2016-02-05 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged.

Change subject: Fix typo and sort by alphabetical order 
wgExtraSignatureNamespaces
..


Fix typo and sort by alphabetical order wgExtraSignatureNamespaces

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

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



diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index cb4c687..468b55a 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -10748,12 +10748,13 @@
 
 'wgExtraSignatureNamespaces' => array(
// Namespaces not listed in $wgContentNamespaces are not necessary here
-   // for core, but reinforcing defalt config doesn't harm.
+   // for core, but reinforcing default config doesn't harm.
'default' => array( NS_PROJECT, NS_HELP ),
'+wikimedia' => array( NS_MAIN ),
'+special' => array( NS_MAIN ),
-   '+itwiki' => array( 102 ),
+
'+dewikivoyage' => array( 102 ), // T119420
+   '+itwiki' => array( 102 ),
 ),
 
 'wmgExemptFromUserRobotsControlExtra' => array(

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

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

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

[MediaWiki-commits] [Gerrit] VE: Fix toolbar hack - change (mediawiki...Cite)

2016-02-05 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged.

Change subject: VE: Fix toolbar hack
..


VE: Fix toolbar hack

Change-Id: I2cad81a89ae0c55d4209bfef3a1db239381996ca
---
M modules/ve-cite/ve.ui.MWReference.init.js
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/modules/ve-cite/ve.ui.MWReference.init.js 
b/modules/ve-cite/ve.ui.MWReference.init.js
index b2a6dce..f92adef 100644
--- a/modules/ve-cite/ve.ui.MWReference.init.js
+++ b/modules/ve-cite/ve.ui.MWReference.init.js
@@ -16,7 +16,7 @@
if ( ve.getProp( toolGroups[ j ], 'include', 0, 'group' 
) === 'cite' ) {
// Skip if the cite group exists already
linkIndex = -1;
-   break targetLoop;
+   continue targetLoop;
}
}
// Looking through the object to find what we actually need

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I2cad81a89ae0c55d4209bfef3a1db239381996ca
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Cite
Gerrit-Branch: master
Gerrit-Owner: Esanders 
Gerrit-Reviewer: DLynch 
Gerrit-Reviewer: Jackmcbarn 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Fixed hierarchySelect's collapsed parameter. Fixed display o... - change (mediawiki...HierarchyBuilder)

2016-02-05 Thread Kji (Code Review) 
Kji has submitted this change and it was merged.

Change subject: Fixed hierarchySelect's collapsed parameter. Fixed display of 
ampersands in page display names. Corrected anchorLinkHolders method to be 
static.
..


Fixed hierarchySelect's collapsed parameter.
Fixed display of ampersands in page display names.
Corrected anchorLinkHolders method to be static.

Change-Id: I4b35d9c4cd0dc041cc8fc16e3990716ed0b780ee
---
M HierarchyBuilder.php
M HierarchyBuilder_body.php
M extension.json
M includes/selectFromHierarchy.js
4 files changed, 7 insertions(+), 7 deletions(-)

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



diff --git a/HierarchyBuilder.php b/HierarchyBuilder.php
index f67b502..25e9a6f 100644
--- a/HierarchyBuilder.php
+++ b/HierarchyBuilder.php
@@ -55,7 +55,7 @@
' Semantic Forms 2.5.2 or above.' );
 }
 
-define( 'HB_VERSION', '3.0.0' );
+define( 'HB_VERSION', '3.0.1' );
 
 # credits
 $wgExtensionCredits['parserhook'][] = array (
diff --git a/HierarchyBuilder_body.php b/HierarchyBuilder_body.php
index 0f65d33..3c8489b 100644
--- a/HierarchyBuilder_body.php
+++ b/HierarchyBuilder_body.php
@@ -1019,7 +1019,7 @@
 * @return string: Wikitext formatted hierarchy where with all the link
 *  placeholders removed and replaced by html anchors.
 */
-   private function anchorLinkHolders( $hierarchy ) {
+   private static function anchorLinkHolders( $hierarchy ) {
$pattern = '##';
$numMatches = preg_match_all( $pattern, $hierarchy, $matches );
if ( $numMatches !== false ) {
@@ -1132,7 +1132,7 @@
}
 
// note that if anything fails in the pipeline we return the 
pagename
-   return $displayname;
+   return htmlspecialchars_decode($displayname);
}
 
/**
diff --git a/extension.json b/extension.json
index d3a92f0..006fd10 100644
--- a/extension.json
+++ b/extension.json
@@ -1,6 +1,6 @@
 {
"name": "HierarchyBuilder",
-   "version": "3.0.0",
+   "version": "3.0.1",
"author": [
"[https://www.mediawiki.org/wiki/User:Cindy.cicalese Cindy 
Cicalese]",
"[https://www.mediawiki.org/wiki/User:Kevin.ji Kevin Ji]"
diff --git a/includes/selectFromHierarchy.js b/includes/selectFromHierarchy.js
index 60f76c9..e70bbd0 100644
--- a/includes/selectFromHierarchy.js
+++ b/includes/selectFromHierarchy.js
@@ -77,7 +77,7 @@
if ( params.hierarchy.length < 1 ) {
return;
}
-
+   
var twostate = params.threestate ? false : true;
 
var legacyMode = params.legacyMode;
@@ -159,8 +159,8 @@
.bind( "loaded.jstree", function( 
event, data ) {
obj.initializeTree( jqDivId, 
params.isDisabled,
selectedComponents, 
true, inputId, params.collapsed, legacyMode, params.threestate );
-   $( jqDivId )
-   .jstree( "open_all" );
+   /*$( jqDivId )
+   .jstree( "open_all" );*/
} );
 
$( jqDivId )

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I4b35d9c4cd0dc041cc8fc16e3990716ed0b780ee
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/HierarchyBuilder
Gerrit-Branch: master
Gerrit-Owner: Kji 
Gerrit-Reviewer: Kji 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Reworked patch to be smaller and error proof. - change (wikimedia...civicrm)

2016-02-05 Thread Ejegg (Code Review) 
Ejegg has uploaded a new change for review.

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

Change subject: Reworked patch to be smaller and error proof.
..

Reworked patch to be smaller and error proof.

Change-Id: I82a4dfd3d44043f6ede130a1221a89a9b7a7a775
---
M CRM/Profile/Page/MultipleRecordFieldsListing.php
1 file changed, 22 insertions(+), 24 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm/civicrm 
refs/changes/00/268700/1

diff --git a/CRM/Profile/Page/MultipleRecordFieldsListing.php 
b/CRM/Profile/Page/MultipleRecordFieldsListing.php
index 808a5f9..09644e0 100644
--- a/CRM/Profile/Page/MultipleRecordFieldsListing.php
+++ b/CRM/Profile/Page/MultipleRecordFieldsListing.php
@@ -337,33 +337,31 @@
   // TODO: Not all widget types and validation rules are supported 
by crmEditable so some fields will not be in-place editable
   $fieldAttributes = array('class' => 
"crmf-custom_{$fieldId}_$recId");
   $editable = FALSE;
-  if ($linkAction & CRM_Core_Action::UPDATE) {
+  if (!$options[$fieldId]['attributes']['is_view'] && $linkAction 
& CRM_Core_Action::UPDATE) {
 $spec = $options[$fieldId]['attributes'];
-if ($spec['is_view'] == '0') {
-  switch ($spec['html_type']) {
-case 'Text':
-  // Other data types like money would require some extra 
validation
-  // FIXME: crmEditable currently does not support any 
validation rules :(
-  $supportedDataTypes = array('Float', 'String', 'Int');
-  $editable = in_array($spec['data_type'], 
$supportedDataTypes);
-  break;
+switch ($spec['html_type']) {
+  case 'Text':
+// Other data types like money would require some extra 
validation
+// FIXME: crmEditable currently does not support any 
validation rules :(
+$supportedDataTypes = array('Float', 'String', 'Int');
+$editable = in_array($spec['data_type'], 
$supportedDataTypes);
+break;
 
-case 'TextArea':
-  $editable = TRUE;
-  $fieldAttributes['data-type'] = 'textarea';
-  break;
+  case 'TextArea':
+$editable = TRUE;
+$fieldAttributes['data-type'] = 'textarea';
+break;
 
-case 'Radio':
-case 'Select':
-case 'Select Country':
-case 'Select State/Province':
-  $editable = TRUE;
-  $fieldAttributes['data-type'] = $spec['data_type'] == 
'Boolean' ? 'boolean' : 'select';
-  if (!$spec['is_required']) {
-$fieldAttributes['data-empty-option'] = ts('- none -');
-  }
-  break;
-  }
+  case 'Radio':
+  case 'Select':
+  case 'Select Country':
+  case 'Select State/Province':
+$editable = TRUE;
+$fieldAttributes['data-type'] = $spec['data_type'] == 
'Boolean' ? 'boolean' : 'select';
+if (!$spec['is_required']) {
+  $fieldAttributes['data-empty-option'] = ts('- none -');
+}
+break;
 }
   }
   if ($editable) {

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

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

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

[MediaWiki-commits] [Gerrit] Added is_view check to prevent editing read only custom fields. - change (wikimedia...civicrm)

2016-02-05 Thread Ejegg (Code Review) 
Ejegg has uploaded a new change for review.

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

Change subject: Added is_view check to prevent editing read only custom fields.
..

Added is_view check to prevent editing read only custom fields.

Change-Id: Idfc72d1861534b974b3df186e9aa898d0b8cb32e
---
M CRM/Profile/Page/MultipleRecordFieldsListing.php
1 file changed, 25 insertions(+), 21 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm/civicrm 
refs/changes/99/268699/1

diff --git a/CRM/Profile/Page/MultipleRecordFieldsListing.php 
b/CRM/Profile/Page/MultipleRecordFieldsListing.php
index e0bee92..808a5f9 100644
--- a/CRM/Profile/Page/MultipleRecordFieldsListing.php
+++ b/CRM/Profile/Page/MultipleRecordFieldsListing.php
@@ -228,6 +228,7 @@
 'time_format',
 'default_value',
 'is_required',
+'is_view',
   );
   foreach ($fieldIDs as $key => $fieldID) {
 $fieldIDs[$key] = !is_numeric($fieldID) ? 
CRM_Core_BAO_CustomField::getKeyID($fieldID) : $fieldID;
@@ -252,6 +253,7 @@
 $options[$fieldIDs[$key]]['attributes']['data_type'] = 
$returnValues['data_type'];
 $options[$fieldIDs[$key]]['attributes']['is_required'] = 
!empty($returnValues['is_required']);
 $options[$fieldIDs[$key]]['attributes']['default_value'] = 
CRM_Utils_Array::value('default_value', $returnValues);
+$options[$fieldIDs[$key]]['attributes']['is_view'] = 
CRM_Utils_Array::value('is_view', $returnValues);
 
 $options[$fieldIDs[$key]]['attributes']['format']
   = $options[$fieldIDs[$key]]['attributes']['date_format'] = 
CRM_Utils_Array::value('date_format', $returnValues);
@@ -337,29 +339,31 @@
   $editable = FALSE;
   if ($linkAction & CRM_Core_Action::UPDATE) {
 $spec = $options[$fieldId]['attributes'];
-switch ($spec['html_type']) {
-  case 'Text':
-// Other data types like money would require some extra 
validation
-// FIXME: crmEditable currently does not support any 
validation rules :(
-$supportedDataTypes = array('Float', 'String', 'Int');
-$editable = in_array($spec['data_type'], 
$supportedDataTypes);
-break;
+if ($spec['is_view'] == '0') {
+  switch ($spec['html_type']) {
+case 'Text':
+  // Other data types like money would require some extra 
validation
+  // FIXME: crmEditable currently does not support any 
validation rules :(
+  $supportedDataTypes = array('Float', 'String', 'Int');
+  $editable = in_array($spec['data_type'], 
$supportedDataTypes);
+  break;
 
-  case 'TextArea':
-$editable = TRUE;
-$fieldAttributes['data-type'] = 'textarea';
-break;
+case 'TextArea':
+  $editable = TRUE;
+  $fieldAttributes['data-type'] = 'textarea';
+  break;
 
-  case 'Radio':
-  case 'Select':
-  case 'Select Country':
-  case 'Select State/Province':
-$editable = TRUE;
-$fieldAttributes['data-type'] = $spec['data_type'] == 
'Boolean' ? 'boolean' : 'select';
-if (!$spec['is_required']) {
-  $fieldAttributes['data-empty-option'] = ts('- none -');
-}
-break;
+case 'Radio':
+case 'Select':
+case 'Select Country':
+case 'Select State/Province':
+  $editable = TRUE;
+  $fieldAttributes['data-type'] = $spec['data_type'] == 
'Boolean' ? 'boolean' : 'select';
+  if (!$spec['is_required']) {
+$fieldAttributes['data-empty-option'] = ts('- none -');
+  }
+  break;
+  }
 }
   }
   if ($editable) {

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

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

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

[MediaWiki-commits] [Gerrit] CRM-17733 Update DOMPDF to 0.6.2 - change (wikimedia...civicrm)

2016-02-05 Thread Ejegg (Code Review) 
Ejegg has uploaded a new change for review.

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

Change subject: CRM-17733 Update DOMPDF to 0.6.2
..

CRM-17733 Update DOMPDF to 0.6.2

Upstream patch didn't apply, so I just copied the composer.lock
changes

Change-Id: Ic2eeb91919e83f387457c8fb0e3ccd19a7a55baf
---
M composer.lock
1 file changed, 5 insertions(+), 5 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm/civicrm 
refs/changes/01/268701/1

diff --git a/composer.lock b/composer.lock
index 7450d25..372ce0f 100644
--- a/composer.lock
+++ b/composer.lock
@@ -48,16 +48,16 @@
 },
 {
 "name": "dompdf/dompdf",
-"version": "v0.6.1",
+"version": "v0.6.2",
 "source": {
 "type": "git",
 "url": "https://github.com/dompdf/dompdf.git;,
-"reference": "cf7d8a0a27270418850cc7d7ea532159e5eeb3eb"
+"reference": "cc06008f75262510ee135b8cbb14e333a309f651"
 },
 "dist": {
 "type": "zip",
-"url": 
"https://api.github.com/repos/dompdf/dompdf/zipball/cf7d8a0a27270418850cc7d7ea532159e5eeb3eb;,
-"reference": "cf7d8a0a27270418850cc7d7ea532159e5eeb3eb",
+"url": 
"https://api.github.com/repos/dompdf/dompdf/zipball/cc06008f75262510ee135b8cbb14e333a309f651;,
+"reference": "cc06008f75262510ee135b8cbb14e333a309f651",
 "shasum": ""
 },
 "require": {
@@ -85,7 +85,7 @@
 ],
 "description": "DOMPDF is a CSS 2.1 compliant HTML to PDF 
converter",
 "homepage": "https://github.com/dompdf/dompdf;,
-"time": "2014-03-11 01:59:52"
+"time": "2015-12-07 04:07:13"
 },
 {
 "name": "phenx/php-font-lib",

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

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

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

[MediaWiki-commits] [Gerrit] Fix (non-SessionManager) session handling - change (mediawiki...OAuth)

2016-02-05 Thread Anomie (Code Review) 
Anomie has uploaded a new change for review.

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

Change subject: Fix (non-SessionManager) session handling
..

Fix (non-SessionManager) session handling

If PHP starts a session before OAuth's UserLoadFromSession hook gets
run, the wfSetupSession() call to switch to OAuth's session won't
actually load the OAuth session's data into $_SESSION unless we first
close that earlier session. But it will happily save that non-OAuth
session's $_SESSION data over the OAuth session's data.

Change-Id: I71d0c851b965680a97e7c566d601b9ac7e8e4d19
---
M api/MWOAuthAPI.setup.php
1 file changed, 6 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/OAuth 
refs/changes/02/268702/1

diff --git a/api/MWOAuthAPI.setup.php b/api/MWOAuthAPI.setup.php
index 410f399..b9d99b2 100755
--- a/api/MWOAuthAPI.setup.php
+++ b/api/MWOAuthAPI.setup.php
@@ -166,6 +166,12 @@
$cache->set( $key, $session, 
$wgObjectCacheSessionExpiry );
}
 
+   // Close any existing session before opening a 
new one,
+   // otherwise PHP won't load our session's data 
into $_SESSION.
+   if ( session_id() !== '' ) {
+   session_write_close();
+   }
+
wfSetupSession( $session['id'] ); // 
create/reuse this "anonymous" session
\Hooks::register( 'AfterFinalPageOutput', 
function( $out ) {
// Just in case, make sure this is not 
a valid login session for sanity

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I71d0c851b965680a97e7c566d601b9ac7e8e4d19
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/OAuth
Gerrit-Branch: master
Gerrit-Owner: Anomie 

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

[MediaWiki-commits] [Gerrit] CRM-17177. die() instead of trigger_error() when accessed vi... - change (wikimedia...civicrm)

2016-02-05 Thread Ejegg (Code Review) 
Ejegg has uploaded a new change for review.

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

Change subject: CRM-17177. die() instead of trigger_error() when accessed via 
web.
..

CRM-17177. die() instead of trigger_error() when accessed via web.

Change-Id: I6d64041d1165a3c691936a010763e168d0ca66be
---
M bin/cli.class.php
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm/civicrm 
refs/changes/98/268698/1

diff --git a/bin/cli.class.php b/bin/cli.class.php
index 9a569b0..7088796 100644
--- a/bin/cli.class.php
+++ b/bin/cli.class.php
@@ -88,7 +88,7 @@
   return TRUE;
 }
 else {
-  trigger_error("cli.php can only be run from command line.", 
E_USER_ERROR);
+  die("cli.php can only be run from command line.");
 }
   }
 

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

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

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

[MediaWiki-commits] [Gerrit] Migrating to shared protocol lib - change (mediawiki...Graph)

2016-02-05 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged.

Change subject: Migrating to shared protocol lib
..


Migrating to shared protocol lib

* Disable http/https
* Rework shared protocol handling

Change-Id: If17019f119a97eb45ab0acfd3a19819da34fe496
---
M extension.json
M includes/DataModule.php
A lib/graph2.compiled.js
M modules/graph1.js
M modules/graph2.js
M package.json
6 files changed, 359 insertions(+), 167 deletions(-)

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



diff --git a/extension.json b/extension.json
index 7a8fe01..6271466 100644
--- a/extension.json
+++ b/extension.json
@@ -75,7 +75,7 @@
"lib/d3.js",
"lib/topojson.js",
"lib/vega2/vega.js",
-   "modules/graph2.js"
+   "lib/graph2.compiled.js"
],
"dependencies": [
"ext.graph.data",
@@ -128,7 +128,8 @@
"ext.graph.visualEditor"
],
"config": {
-   "GraphDataDomains": [],
+   "GraphHttpDomains": [],
+   "GraphHttpsDomains": [],
"GraphDefaultVegaVer": 1,
"GraphIsTrusted": false,
"GraphImgServiceUrl": false
diff --git a/includes/DataModule.php b/includes/DataModule.php
index a36f913..f48e38b 100644
--- a/includes/DataModule.php
+++ b/includes/DataModule.php
@@ -19,7 +19,8 @@
public function getScript( ResourceLoaderContext $context ) {
$config = $context->getResourceLoader()->getConfig();
return ResourceLoader::makeConfigSetScript( array(
-   'wgGraphDataDomains' => $config->get( 
'GraphDataDomains' ),
+   'wgGraphHttpDomains' => $config->get( 
'GraphHttpDomains' ),
+   'wgGraphHttpsDomains' => $config->get( 
'GraphHttpsDomains' ),
'wgGraphIsTrusted' => $config->get( 'GraphIsTrusted' ),
) );
}
diff --git a/lib/graph2.compiled.js b/lib/graph2.compiled.js
new file mode 100644
index 000..900380a
--- /dev/null
+++ b/lib/graph2.compiled.js
@@ -0,0 +1,296 @@
+(function e(t,n,r){function s(o,u){if(!n[o]){if(!t[o]){var a=typeof 
require=="function"&if(!u&)return a(o,!0);if(i)return i(o,!0);var 
f=new Error("Cannot find module '"+o+"'");throw f.code="MODULE_NOT_FOUND",f}var 
l=n[o]={exports:{}};t[o][0].call(l.exports,function(e){var n=t[o][1][e];return 
s(n?n:e)},l,l.exports,e,t,n,r)}return n[o].exports}var i=typeof 
require=="function"&for(var o=0;o

[MediaWiki-commits] [Gerrit] Depool db1018 for reimaging - change (operations/mediawiki-config)

2016-02-05 Thread Jcrespo (Code Review) 
Jcrespo has uploaded a new change for review.

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

Change subject: Depool db1018 for reimaging
..

Depool db1018 for reimaging

This is needed as this server will become the master next week.
Initially blocked by T125256.

Bug: T125215
Change-Id: I910a72ddee7b03d6018c71c3c24b112366166fec
---
M wmf-config/db-eqiad.php
1 file changed, 8 insertions(+), 8 deletions(-)


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

diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php
index 626c054..8cbd87a 100644
--- a/wmf-config/db-eqiad.php
+++ b/wmf-config/db-eqiad.php
@@ -102,7 +102,7 @@
'db1024' => 0,   # 1.4TB  64GB
'db1021' => 0,   # 1.4TB  64GB, vslow, dump
'db1036' => 0,   # 1.4TB  64GB, watchlist, recentchanges, 
contributions, logpager
-   'db1018' => 100, # 1.4TB  64GB
+#  'db1018' => 100, # 1.4TB  64GB
'db1054' => 200, # 2.8TB  96GB, api
'db1060' => 200, # 2.8TB  96GB, api
'db1063' => 400, # 2.8TB 128GB
@@ -143,8 +143,8 @@
's7' => array(
'db1033' => 0,   # 1.4TB  64GB,
'db1028' => 0,   # 1.4TB  64GB, vslow, dump
-   'db1034' => 0,   # 1.4TB  64GB, watchlist, recentchanges, 
contributions, logpager
-   'db1041' => 200, # 1.4TB  64GB
+#  'db1034' => 0,   # 1.4TB  64GB, watchlist, recentchanges, 
contributions, logpager
+   'db1041' => 0, # 1.4TB  64GB
'db1039' => 300, # 1.4TB  64GB
'db1062' => 500, # 2.8TB 128GB
),
@@ -335,19 +335,19 @@
'db1028' => 1,
),
'watchlist' => array(
-   'db1034' => 1,
+   'db1041' => 1,
),
'recentchanges' => array(
-   'db1034' => 1,
+   'db1041' => 1,
),
'recentchangeslinked' => array(
-   'db1034' => 1,
+   'db1041' => 1,
),
'contributions' => array(
-   'db1034' => 1,
+   'db1041' => 1,
),
'logpager' => array(
-   'db1034' => 1,
+   'db1041' => 1,
),
),
 ),

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

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

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

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

2016-02-05 Thread Sbisson (Code Review) 
Sbisson has uploaded a new change for review.

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

Change subject: Rephrase notifications
..

Rephrase notifications

* bold course name
* truncate course name if needed

Bug: T125692
Change-Id: Ie0f74eca9143ae3c23c07b7b1a83e94aa016296e
---
M i18n/en.json
M includes/notifications/PresentationModel/RoleAdd.php
2 files changed, 16 insertions(+), 8 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/EducationProgram 
refs/changes/11/268711/1

diff --git a/i18n/en.json b/i18n/en.json
index 4bfb028..88ba5ef 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -720,11 +720,11 @@
"ep-online-add-notification-title": "You have been {{GENDER:$1|added}} 
as an online volunteer to [[$2|$3]] by [[User:$1|$1]].",
"ep-online-add-notification-title-email-subject": "You have been 
{{GENDER:$1|added}} as an online volunteer to $2 by $1.",
"ep-online-add-notification-title-email-body": "You have been 
{{GENDER:$1|added}} as an online volunteer to $2 by $1.",
-   "notification-header-ep-campus-add-notification": "You have been 
{{GENDER:$2|added}} as a campus volunteer to $3 by $1.",
-   "notification-header-ep-course-talk-notification": "The course talk 
page of $3 was {{GENDER:$2|edited}} by $1.",
-   "notification-header-ep-instructor-add-notification": "You have been 
{{GENDER:$2|added}} as an instructor to $3 by $1.",
-   "notification-header-ep-online-add-notification": "You have been 
{{GENDER:$2|added}} as an online volunteer to $3 by $1.",
-   "notification-header-ep-student-add-notification": "You have been 
{{GENDER:$2|added}} to $3 by $1.",
+   "notification-header-ep-campus-add-notification": "You have been 
{{GENDER:$2|added}} as a campus volunteer to '''$3'''.",
+   "notification-header-ep-course-talk-notification": "The course talk 
page '''$3''' was {{GENDER:$2|edited}}.",
+   "notification-header-ep-instructor-add-notification": "You have been 
{{GENDER:$2|added}} as an instructor to '''$3'''.",
+   "notification-header-ep-online-add-notification": "You have been 
{{GENDER:$2|added}} as an online volunteer to '''$3'''.",
+   "notification-header-ep-student-add-notification": "You have been 
{{GENDER:$2|added}} to '''$3'''.",
"apihelp-addstudents-description": "Add multiple students to a course.",
"apihelp-addstudents-param-studentusernames": "The usernames of the 
students to add to the course.",
"apihelp-addstudents-param-courseid": "The ID of the course to which 
the students should be added/removed.",
diff --git a/includes/notifications/PresentationModel/RoleAdd.php 
b/includes/notifications/PresentationModel/RoleAdd.php
index a2ecdee..7fad071 100644
--- a/includes/notifications/PresentationModel/RoleAdd.php
+++ b/includes/notifications/PresentationModel/RoleAdd.php
@@ -40,6 +40,16 @@
public function getHeaderMessage() {
$msg = parent::getHeaderMessage();
 
+   $truncatedCourseName = $this->language->truncate(
+   $this->getCourseName(),
+   self::PAGE_NAME_RECOMMENDED_LENGTH
+   );
+   $msg->params( $truncatedCourseName );
+
+   return $msg;
+   }
+
+   private function getCourseName() {
// TODO Here we're adding yet another bit of unencapsulated code
// that depends on the standard org/course (term) format.
// Other patches currently in the pipeline face the same issue.
@@ -47,8 +57,6 @@
// Once they're through we can consider a general solution.
$fullTitle = $this->event->getTitle()->getText();
$titleParts = explode( '/', $fullTitle, 2 );
-   $msg->params( $titleParts[1] );
-
-   return $msg;
+   return $titleParts[1];
}
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie0f74eca9143ae3c23c07b7b1a83e94aa016296e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/EducationProgram
Gerrit-Branch: master
Gerrit-Owner: Sbisson 

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

[MediaWiki-commits] [Gerrit] Download civix from github, not sourceforge - change (wikimedia...civicrm-buildkit)

2016-02-05 Thread Ejegg (Code Review) 
Ejegg has uploaded a new change for review.

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

Change subject: Download civix from github, not sourceforge
..

Download civix from github, not sourceforge

Change-Id: Idf7cea7b732c6d525e94f74c081ef4852bdaea1f
---
M bin/civi-download-tools
1 file changed, 12 insertions(+), 6 deletions(-)


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

diff --git a/bin/civi-download-tools b/bin/civi-download-tools
index 2f0e925..9cf7dc3 100755
--- a/bin/civi-download-tools
+++ b/bin/civi-download-tools
@@ -20,7 +20,8 @@
 LOCKFILE="$TMPDIR/civi-download-tools.lock"
 LOCKTIMEOUT=90
 CIVIXVER=14.09.1
-CIVIXURL="http://downloads.sourceforge.net/project/civix/civix-${CIVIXVER}.tar.bz2?r=http%3A%2F%2Fsourceforge.net%2Fprojects%2Fcivix%2Ffiles%2F_mirror=master;
+CIVIXRELEASE="https://raw.githubusercontent.com/totten/civix/master/release;
+CIVIXURL="https://github.com/totten/civix.git;
 HUBTAG="v1.12.1"
 HUBURL="https://github.com/github/hub;
 IS_QUIET=
@@ -164,7 +165,7 @@
   ## Download "civix"
   ## FIXME: Update civix so that it can be installed via composer as a 
dependency
   mkdir -p "$PRJDIR/extern" && touch "$PRJDIR/extern/civix.txt"
-  if [ -z "$IS_FORCE" -a -e "$PRJDIR/bin/civix" -a -d "extern/civix" -a "$(cat 
$PRJDIR/extern/civix.txt)" == "$CIVIXURL" ]; then
+  if [ -z "$IS_FORCE" -a -e "$PRJDIR/bin/civix" -a -d "extern/civix" -a "$(cat 
$PRJDIR/extern/civix.txt)" == "$CIVIXURL-$CIVIXVER" ]; then
 echo_comment "[[civix binary ($PRJDIR/bin/civix) already exists. 
Skipping.]]"
   else
 echo "[[Install civix]]"
@@ -172,12 +173,17 @@
 ## Cleanup
 [ -e app/tmp/civix ] && rm -rf app/tmp/civix
 [ -e extern/civix ] && rm -rf extern/civix
-[ -e "$TMPDIR/civix.tar.bz2" ] && rm -rf "$TMPDIR/civix.tar.bz2"
+[ -e "$TMPDIR/civix-$CIVIXVER.tar.bz2" ] && rm -rf 
"$TMPDIR/civix-$CIVIXVER.tar.bz2"
+[ -e "$TMPDIR/civixrelease" ] && rm -f "$TMPDIR/civixrelease"
 mkdir -p extern/civix
 
 ## Download
-download_url "$CIVIXURL" "$TMPDIR/civix.tar.bz2"
-tar xj  --strip-components 1 -C extern/civix -f "$TMPDIR/civix.tar.bz2"
+pushd "$TMPDIR" >> /dev/null
+  download_url "$CIVIXRELEASE" civixrelease
+  chmod u+x civixrelease
+  bash -c "civixrelease \"$CIVIXURL\" \"$CIVIXVER\""
+popd >> /dev/null
+tar xj  --strip-components 1 -C extern/civix -f 
"$TMPDIR/build/civix-$CIVIXVER.tar.bz2"
 
 ## Setup a relative symlink
 pushd bin >> /dev/null
@@ -186,7 +192,7 @@
 popd >> /dev/null
 
 ## Mark as downloaded
-echo "$CIVIXURL" > "$PRJDIR/extern/civix.txt"
+echo "$CIVIXURL-$CIVIXVER" > "$PRJDIR/extern/civix.txt"
   fi
 
   ## Download "hub"

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

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

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

[MediaWiki-commits] [Gerrit] Set up fabric to deploy dashboards powered by dashiki - change (analytics/dashiki)

2016-02-05 Thread Milimetric (Code Review) 
Milimetric has submitted this change and it was merged.

Change subject: Set up fabric to deploy dashboards powered by dashiki
..


Set up fabric to deploy dashboards powered by dashiki

Bug: T110351
Change-Id: I62ff16b7c23f5480b0e47d64fe4e1ecab0bf8c30
---
M README.md
A config.yaml
A fabfile.py
3 files changed, 272 insertions(+), 0 deletions(-)

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



diff --git a/README.md b/README.md
index ac8a007..3676115 100644
--- a/README.md
+++ b/README.md
@@ -12,8 +12,10 @@
 
 ```
 git clone https://gerrit.wikimedia.org/r/analytics/dashiki
+
 cd dashiki
 
+# If you have fabric(from PyPI) installed you can also run `fab setup` instead 
of the following three
 npm install
 bower install
 sudo npm install -g gulp
@@ -80,6 +82,47 @@
 karma start
 ```
 
+# Deploy
+We have fabric to help deploy dashboards - some parts of this explanation are 
Wikimedia labs specific - however you can also use the deployer without.
+
+To install fabric
+
+```
+pip install fabric
+```
+
+Once you've built and tested your dashboard, add a section to the 
`dashiki/config.yaml` file with relevant config, for instance:
+
+```
+edit-analysis:
+layout: compare
+config: VisualEditorAndWikitext
+piwikHost:
+piwikId:
+hostname: edit-analysis.wmflabs.org
+subfolder: compare
+```
+
+In Wikimedia labs, we are hoping to have all the dashboards setup in the 
Dashiki labs project, so ask for access to this project. And from Wikitech's 
Manage Web Proxies page, set up a proxy for your hostname. Use the 
dashiki-staging-01 instance to test, and dasiki-01 as prod. You can have 
different hostnames for them, like:
+
+```
+edit-analysis-test.wmflabs.org, 
http://dashiki-staging-01.dashiki.eqiad.wmflabs:80
+edit-analysis.wmflabs.org, http://dashiki-01.dashiki.eqiad.wmflabs:80
+```
+
+If you are deploying to a different instance, add a stage to the STAGES 
dictionary defined in the fabfile.
+
+You are all set. Apache has been configured on our instances to serve all 
files out of /srv/static/hostname at https://hostname. If you are not using 
labs - you can have a similar setup - Feel free to adapt the fabfile to suit 
your destination paths. (Our puppet setup is 
[here](https://github.com/wikimedia/operations-puppet/blob/production/manifests/role/simplestatic.pp))
+
+* What all can you do with fabric? - `fab help`
+* Find all dashboards setup in config.yaml - `fab dashboards`
+* Find the stages you can deploy to - `fab stages`
+* How is a dashboard currently configured - `fab config:`
+* Deploy a dashboard - `fab dashboard: [staging|production] 
deploy`
+* Change dashboard config params while deploying: (This uses fabric's [keyword 
args 
syntax](http://docs.fabfile.org/en/1.10/usage/fab.html#per-task-arguments)) -
+`fab 
dashboard:edit-analysis,layout=compare,hostname=edit-analysis-test.wmflabs.org 
staging deploy`
+
+
 # Future Plans
 
 ### implement parameter validation
diff --git a/config.yaml b/config.yaml
new file mode 100644
index 000..d58aeae
--- /dev/null
+++ b/config.yaml
@@ -0,0 +1,16 @@
+# Deployment config for dashboards
+config:
+edit-analysis:
+layout: compare
+config: VisualEditorAndWikitext
+piwikHost:
+piwikId:
+hostname: edit-analysis-test.wmflabs.org
+subfolder: compare
+language-reportcard:
+layout: metrics-by-project
+config: LanguageReportcard
+piwikHost:
+piwikId:
+hostname: language-reportcard-test.wmflabs.org
+subfolder:
diff --git a/fabfile.py b/fabfile.py
new file mode 100644
index 000..43bff2f
--- /dev/null
+++ b/fabfile.py
@@ -0,0 +1,213 @@
+from fabric.api import local, env, sudo, put, task, require
+from functools import wraps
+
+import yaml
+
+
+STAGES = {
+'staging': {
+'hosts': ['dashiki-staging-01.dashiki.eqiad.wmflabs'],
+'branch': 'master',
+},
+'production': {
+'hosts': ['dashiki-01.dashiki.eqiad.wmflabs'],
+'branch': 'master',
+},
+}
+
+
+env.use_ssh_config = True
+env.shell = '/bin/bash -c'
+
+CONFIG_FILE = 'config.yaml'
+BASE_PATH = '/srv/static'
+
+with open(CONFIG_FILE) as config:
+contents = yaml.load(config)
+DASHBOARDS = contents['config']
+
+
+def ensure_stage(fn):
+"""
+Decorator to ensure the stage is set
+"""
+@wraps(fn)
+def wrapper(*args, **kwargs):
+# The require operation will abort if the key stage
+# is not set in the environment
+require('stage', provided_by=(staging, production,))
+return fn(*args, **kwargs)
+return wrapper
+
+
+def ensure_dashboard(fn):
+"""
+Decorator to ensure the stage is set
+"""
+@wraps(fn)
+def wrapper(*args, **kwargs):
+# The require operation will abort if the key stage
+# is not set in the environment
+require('dashboard',

[MediaWiki-commits] [Gerrit] Temporarily disable unit tests and autoloading autoload.php ... - change (mediawiki...Wikidata)

2016-02-05 Thread Paladox (Code Review) 
Paladox has uploaded a new change for review.

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

Change subject: Temporarily disable unit tests and autoloading autoload.php 
from composer
..

Temporarily disable unit tests and autoloading autoload.php from composer

Since this test is failing REL1_25 branch and others and wasent even
testing because it uses an old config lets turn it off temporarily for
REL1_25 branch. Until a hack can be created.

Bug: T125722
Change-Id: I9fd6fb136e763dd8339d3d10d40a95a8fb547265
---
M Wikidata.php
1 file changed, 13 insertions(+), 4 deletions(-)


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

diff --git a/Wikidata.php b/Wikidata.php
index 0610e8e..7774a68 100644
--- a/Wikidata.php
+++ b/Wikidata.php
@@ -4,12 +4,15 @@
 }
 
 // Jenkins stuff part1
-if ( PHP_SAPI === 'cli' && strpos( getenv( 'JOB_NAME' ), 
'mwext-Wikidata-testextension' ) !== false ) {
+if ( isset( $wgWikimediaJenkinsCI ) && $wgWikimediaJenkinsCI == true ) {
// in future, run as non-experimental
if ( !defined( 'WB_EXPERIMENTAL_FEATURES' ) || 
!WB_EXPERIMENTAL_FEATURES ) {
define( 'WB_EXPERIMENTAL_FEATURES', true );
}
 
+   /* Hack for REL1_25 since it is failing */
+   $wmgUseWikidata = true;
+   $wmgUseWikidataTest = false;
$wmgUseWikibaseRepo = true;
$wmgUseWikibaseClient = true;
 }
@@ -18,7 +21,11 @@
 $wgEnableWikibaseRepo = false;
 $wgEnableWikibaseClient = false;
 
-include_once __DIR__ . '/vendor/autoload.php';
+if ( !empty( $wmgUseWikidata ) ) {
+   if ( file_exists(  __DIR__ . '/vendor/autoload.php' ) ) {
+   include_once __DIR__ . '/vendor/autoload.php';
+   }
+}
 
 if ( !empty( $wmgUseWikibaseRepo ) ) {
include_once __DIR__ . '/extensions/Wikibase/repo/Wikibase.php';
@@ -32,7 +39,9 @@
include_once __DIR__ . '/WikibaseClient.settings.php';
 }
 
-$wgHooks['UnitTestsList'][] = '\Wikidata\WikidataHooks::onUnitTestsList';
+if ( isset( $wmgUseWikidataTest ) && $wmgUseWikidataTest == true ) {
+   $wgHooks['UnitTestsList'][] = 
'\Wikidata\WikidataHooks::onUnitTestsList';
+}
 
 $wgExtensionCredits['wikibase'][] = array(
'path' => __FILE__,
@@ -45,7 +54,7 @@
 );
 
 // Jenkins stuff part2
-if ( PHP_SAPI === 'cli' && strpos( getenv( 'JOB_NAME' ), 
'mwext-Wikidata-testextension' ) !== false ) {
+if ( isset( $wgWikimediaJenkinsCI ) && $wgWikimediaJenkinsCI == true ) {
//Jenkins always loads both so no need to check if they are loaded 
before getting settings
require_once __DIR__ . '/extensions/Wikibase/repo/ExampleSettings.php';
require_once __DIR__ . 
'/extensions/Wikibase/client/ExampleSettings.php';

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

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

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

[MediaWiki-commits] [Gerrit] Don't limit mw-ui-input border on Special:UserLogin - change (mediawiki...MobileFrontend)

2016-02-05 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged.

Change subject: Don't limit mw-ui-input border on Special:UserLogin
..


Don't limit mw-ui-input border on Special:UserLogin

Not all fields (especially fields which are generated by extensions) have
has a mw-ui-vform-field class in the div-container. But these fields should
have a border, too, so an user can identify them as an input field.

This change removes a redundant border: rule and moves the border rule for
the mw-ui-vform-field input fields to apply to all mw-ui-input fields.

Bug: T125945
Change-Id: I3261dfcd5bb289706e10cb3cd758ca79aaaedc5c
---
M resources/skins.minerva.special.userlogin.styles/userlogin.less
1 file changed, 10 insertions(+), 11 deletions(-)

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



diff --git a/resources/skins.minerva.special.userlogin.styles/userlogin.less 
b/resources/skins.minerva.special.userlogin.styles/userlogin.less
index 5abf582..92d26a8 100644
--- a/resources/skins.minerva.special.userlogin.styles/userlogin.less
+++ b/resources/skins.minerva.special.userlogin.styles/userlogin.less
@@ -177,7 +177,6 @@
 
.mw-ui-input {
padding: .8em .5em;
-   border: none;
}
 
// hide on mobile only media queries (placeholder support)
@@ -193,18 +192,18 @@
> label {
display: none;
}
+   }
+   }
 
-   // Make the inputs look connected in mobile mode
-   .mw-ui-input {
-   border: solid 1px @colorGrayLight;
+   // Make the inputs look connected in mobile mode
+   .mw-ui-input {
+   border: solid 1px @colorGrayLight;
 
-   #wpEmail,
-   &.loginPassword {
-   border-top-left-radius: 0;
-   border-top-right-radius: 0;
-   margin-top: -1px;
-   }
-   }
+   #wpEmail,
+   &.loginPassword {
+   border-top-left-radius: 0;
+   border-top-right-radius: 0;
+   margin-top: -1px;
}
}
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I3261dfcd5bb289706e10cb3cd758ca79aaaedc5c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Florianschmidtwelzow 
Gerrit-Reviewer: Jdlrobson 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] [GWToolset] add composer-test - change (integration/config)

2016-02-05 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged.

Change subject: [GWToolset] add composer-test
..


[GWToolset] add composer-test

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

Bug: T125553
Change-Id: Id0f410ae606905ed90d5fbb7e031188a2f22b288
---
M zuul/layout.yaml
1 file changed, 1 insertion(+), 0 deletions(-)

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



diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 7d1d890..ff5bcad 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -3456,6 +3456,7 @@
 
   - name: mediawiki/extensions/GWToolset
 template:
+  - name: composer-test
   - name: jshint
   - name: npm
   - name: extension-unittests-generic

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Id0f410ae606905ed90d5fbb7e031188a2f22b288
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Hashar 
Gerrit-Reviewer: Hashar 
Gerrit-Reviewer: Jean-Frédéric 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Add ady language - change (mediawiki...cxserver)

2016-02-05 Thread Alex Monk (Code Review) 
Alex Monk has uploaded a new change for review.

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

Change subject: Add ady language
..

Add ady language

Bug: T125501
Change-Id: Ia7d9f4b04b61b88867551030d52a648c578c9f1e
---
M config.dev.yaml
M config.prod.yaml
2 files changed, 4 insertions(+), 0 deletions(-)


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

diff --git a/config.dev.yaml b/config.dev.yaml
index 2559436..ced19d3 100644
--- a/config.dev.yaml
+++ b/config.dev.yaml
@@ -68,6 +68,7 @@
 source:
   - ab
   - ace
+  - ady
   - af
   - ak
   - am
@@ -349,6 +350,7 @@
 target:
   - ab
   - ace
+  - ady
   - af
   - ak
   - am
diff --git a/config.prod.yaml b/config.prod.yaml
index 2d50191..a0d9708 100644
--- a/config.prod.yaml
+++ b/config.prod.yaml
@@ -69,6 +69,7 @@
 source:
   - ab
   - ace
+  - ady
   - af
   - ak
   - am
@@ -350,6 +351,7 @@
 target:
   - ab
   - ace
+  - ady
   - af
   - ak
   - am

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia7d9f4b04b61b88867551030d52a648c578c9f1e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/cxserver
Gerrit-Branch: master
Gerrit-Owner: Alex Monk 

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

[MediaWiki-commits] [Gerrit] Reload keyholder-agent on keyholder-auth change - change (operations/puppet)

2016-02-05 Thread Thcipriani (Code Review) 
Thcipriani has uploaded a new change for review.

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

Change subject: Reload keyholder-agent on keyholder-auth change
..

Reload keyholder-agent on keyholder-auth change

Currently, if puppet adds a new key and a corresponding new
keyholder-auth.d yaml file to go with it this requires an root to run:

keyholder restart
keyholder arm

This change should ensure that only a `keyholder arm` is needed since it
will reload the keyholder permissions if a permission file has changed.

Bug: T125992
Change-Id: Ic9803696768fb8fa83d8e4ebad85119194c71c14
---
M modules/keyholder/manifests/agent.pp
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/08/268708/1

diff --git a/modules/keyholder/manifests/agent.pp 
b/modules/keyholder/manifests/agent.pp
index 9c5426d..8837f95 100644
--- a/modules/keyholder/manifests/agent.pp
+++ b/modules/keyholder/manifests/agent.pp
@@ -40,6 +40,7 @@
 owner   => 'root',
 group   => 'keyholder',
 mode=> '0440',
+notify  => Service['keyholder-agent'],
 }
 
 # lint:ignore:puppet_url_without_modules

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

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

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

[MediaWiki-commits] [Gerrit] Depool db1018 for reimaging - change (operations/mediawiki-config)

2016-02-05 Thread Jcrespo (Code Review) 
Jcrespo has submitted this change and it was merged.

Change subject: Depool db1018 for reimaging
..


Depool db1018 for reimaging

This is needed as this server will become the master next week.
Initially blocked by T125256.

Bug: T125215
Change-Id: I910a72ddee7b03d6018c71c3c24b112366166fec
---
M wmf-config/db-eqiad.php
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php
index 626c054..62cfb22 100644
--- a/wmf-config/db-eqiad.php
+++ b/wmf-config/db-eqiad.php
@@ -102,7 +102,7 @@
'db1024' => 0,   # 1.4TB  64GB
'db1021' => 0,   # 1.4TB  64GB, vslow, dump
'db1036' => 0,   # 1.4TB  64GB, watchlist, recentchanges, 
contributions, logpager
-   'db1018' => 100, # 1.4TB  64GB
+#  'db1018' => 100, # 1.4TB  64GB (down for maintenance)
'db1054' => 200, # 2.8TB  96GB, api
'db1060' => 200, # 2.8TB  96GB, api
'db1063' => 400, # 2.8TB 128GB

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I910a72ddee7b03d6018c71c3c24b112366166fec
Gerrit-PatchSet: 3
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Jcrespo 
Gerrit-Reviewer: Chad 
Gerrit-Reviewer: Florianschmidtwelzow 
Gerrit-Reviewer: Jcrespo 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Reload keyholder-agent on keyholder-auth change - change (operations/puppet)

2016-02-05 Thread Ori.livneh (Code Review) 
Ori.livneh has submitted this change and it was merged.

Change subject: Reload keyholder-agent on keyholder-auth change
..


Reload keyholder-agent on keyholder-auth change

Currently, if puppet adds a new key and a corresponding new
keyholder-auth.d yaml file to go with it this requires an root to run:

keyholder restart
keyholder arm

This change should ensure that only a `keyholder arm` is needed since it
will reload the keyholder permissions if a permission file has changed.

Bug: T125992
Change-Id: Ic9803696768fb8fa83d8e4ebad85119194c71c14
---
M modules/keyholder/manifests/agent.pp
1 file changed, 1 insertion(+), 0 deletions(-)

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



diff --git a/modules/keyholder/manifests/agent.pp 
b/modules/keyholder/manifests/agent.pp
index 9c5426d..8837f95 100644
--- a/modules/keyholder/manifests/agent.pp
+++ b/modules/keyholder/manifests/agent.pp
@@ -40,6 +40,7 @@
 owner   => 'root',
 group   => 'keyholder',
 mode=> '0440',
+notify  => Service['keyholder-agent'],
 }
 
 # lint:ignore:puppet_url_without_modules

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic9803696768fb8fa83d8e4ebad85119194c71c14
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Thcipriani 
Gerrit-Reviewer: Ori.livneh 

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

  1   2   3   4   >