date:20150609

[MediaWiki-commits] [Gerrit] Missed updating one thing for the lowercasing of function names - change (at-ease)

2015-06-09 Thread Legoktm (Code Review)

Legoktm has uploaded a new change for review.

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

Change subject: Missed updating one thing for the lowercasing of function names
..

Missed updating one thing for the lowercasing of function names

Change-Id: I915088473f11222592a0d1df438a7adadcf06088
---
M src/Functions.php
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/at-ease refs/changes/19/217219/1

diff --git a/src/Functions.php b/src/Functions.php
index 459613f..8cd75c1 100644
--- a/src/Functions.php
+++ b/src/Functions.php
@@ -56,5 +56,5 @@
  * Restore error level to previous value
  */
 function restoreWarnings() {
-   SuppressWarnings( true );
+   suppressWarnings( true );
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I915088473f11222592a0d1df438a7adadcf06088
Gerrit-PatchSet: 1
Gerrit-Project: at-ease
Gerrit-Branch: master
Gerrit-Owner: Legoktm 

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

[MediaWiki-commits] [Gerrit] Bump phabricator release tag - change (operations/puppet)

2015-06-09 Thread Ori.livneh (Code Review)

Ori.livneh has submitted this change and it was merged.

Change subject: Bump phabricator release tag
..


Bump phabricator release tag

Change-Id: I02dc0bc5d2d32b010a5023a7f37441b39b14b761
---
M manifests/role/phabricator.pp
1 file changed, 7 insertions(+), 7 deletions(-)

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



diff --git a/manifests/role/phabricator.pp b/manifests/role/phabricator.pp
index fdcb750..22a4551 100644
--- a/manifests/role/phabricator.pp
+++ b/manifests/role/phabricator.pp
@@ -33,7 +33,7 @@
 include role::phabricator::config
 include phabricator::monitoring
 
-$current_tag = 'release/2015-06-03/1'
+$current_tag = 'release/2015-06-10/1'
 $domain = 'phabricator.wikimedia.org'
 $altdom = 'phab.wmfusercontent.org'
 $mysql_host = 'm3-master.eqiad.wmnet'
@@ -44,11 +44,11 @@
 mysql_admin_user => $role::phabricator::config::mysql_adminuser,
 mysql_admin_pass => $role::phabricator::config::mysql_adminpass,
 auth_type=> 'dual',
-sprint_tag   => 'release/2015-05-08',
-security_tag => 'release/2015-05-06/1',
+sprint_tag   => $current_tag,
+security_tag => $current_tag,
 libraries=> ['/srv/phab/libext/Sprint/src',
 '/srv/phab/libext/security/src'],
-extension_tag=> 'HEAD',
+extension_tag=> $current_tag,
 extensions   => [ 'MediaWikiUserpageCustomField.php',
   'LDAPUserpageCustomField.php',
   'PhabricatorMediaWikiAuthProvider.php',
@@ -162,16 +162,16 @@
 
 # pass not sensitive but has to match phab and db
 $mysqlpass = 'labspass'
-$current_tag = 'release/2015-06-03/1'
+$current_tag = 'release/2015-06-10/1'
 class { '::phabricator':
 git_tag   => $current_tag,
 lock_file => '/var/run/phab_repo_lock',
 auth_type => 'local',
-sprint_tag=> 'release/2015-05-08',
+sprint_tag=> $current_tag,
 libraries => {
 'sprint' => '/srv/phab/libext/Sprint/src',
 },
-extension_tag => 'release/2015-05-06/1',
+extension_tag => $current_tag,
 extensions=> [ 'MediaWikiUserpageCustomField.php',
   'LDAPUserpageCustomField.php',
   'PhabricatorMediaWikiAuthProvider.php',

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I02dc0bc5d2d32b010a5023a7f37441b39b14b761
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: 20after4 
Gerrit-Reviewer: 20after4 
Gerrit-Reviewer: Chasemp 
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] Add .travis.yml & phpcs.xml to the ignore list of .gitattrib... - change (at-ease)

2015-06-09 Thread Legoktm (Code Review)

Legoktm has uploaded a new change for review.

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

Change subject: Add .travis.yml & phpcs.xml to the ignore list of .gitattributes
..

Add .travis.yml & phpcs.xml to the ignore list of .gitattributes

Change-Id: Ic53a5756e2c12f4788d29fc14ceb32ebb8fdd4c2
---
M .gitattributes
1 file changed, 2 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/at-ease refs/changes/18/217218/1

diff --git a/.gitattributes b/.gitattributes
index 2fd41e1..8ccbe38 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,8 +1,10 @@
 .gitattributes export-ignore
 .gitignore export-ignore
 .gitreview export-ignore
+.travis.yml export-ignore
 Doxyfile export-ignore
 composer.json export-ignore
 doc export-ignore
+phpcs.xml export-ignore
 phpunit.xml.dist export-ignore
 tests export-ignore

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic53a5756e2c12f4788d29fc14ceb32ebb8fdd4c2
Gerrit-PatchSet: 1
Gerrit-Project: at-ease
Gerrit-Branch: master
Gerrit-Owner: Legoktm 

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

[MediaWiki-commits] [Gerrit] Add intent_share_search_label to ignored in the Wikipedia app - change (translatewiki)

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

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

Change subject: Add intent_share_search_label to ignored in the Wikipedia app
..


Add intent_share_search_label to ignored in the Wikipedia app

Its value is "@string/search_hint".
It's an internal technical string.

Change-Id: Ib1a1970bd2b97dd181e244f13f70d5cdaf83427c
---
M groups/Wikimedia/WikimediaMobile-android.yaml
1 file changed, 1 insertion(+), 0 deletions(-)

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



diff --git a/groups/Wikimedia/WikimediaMobile-android.yaml 
b/groups/Wikimedia/WikimediaMobile-android.yaml
index ba1b22c..af3a58f 100644
--- a/groups/Wikimedia/WikimediaMobile-android.yaml
+++ b/groups/Wikimedia/WikimediaMobile-android.yaml
@@ -222,6 +222,7 @@
 
 TAGS:
   ignored:
+- wikipedia-android-strings-intent_share_search_label
 - wikipedia-android-strings-zero_webpage_url
   optional:
 - wikipedia-android-strings-privacy_policy_url

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib1a1970bd2b97dd181e244f13f70d5cdaf83427c
Gerrit-PatchSet: 3
Gerrit-Project: translatewiki
Gerrit-Branch: master
Gerrit-Owner: Amire80 
Gerrit-Reviewer: Amire80 
Gerrit-Reviewer: BearND 
Gerrit-Reviewer: Nikerabbit 
Gerrit-Reviewer: Raimond Spekking 
Gerrit-Reviewer: Siebrand 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Throw an exception if we can't find the PHID for a slug - change (labs...forrestbot)

2015-06-09 Thread Legoktm (Code Review)

Legoktm has submitted this change and it was merged.

Change subject: Throw an exception if we can't find the PHID for a slug
..


Throw an exception if we can't find the PHID for a slug

Change-Id: Ib49ac7d0d4634642b1547e8e229fbe807a421ff0
---
M forrestbot.py
1 file changed, 5 insertions(+), 9 deletions(-)

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



diff --git a/forrestbot.py b/forrestbot.py
index 3a0901a..030910c 100644
--- a/forrestbot.py
+++ b/forrestbot.py
@@ -68,15 +68,11 @@
 
 @functools.lru_cache()
 def get_slug_PHID(slug):
-try:
-rq = list(phab.request('project.query', {'slugs': 
[slug]})['slugMap'].values())
-if rq:
-logging.debug("Slug {slug} = PHID {phid}".format(slug=slug, 
phid=rq[0]))
-return rq[0]
-except:
-pass
-logger.warning("No PHID found for slug #%s!" % slug)
-return None
+rq = list(phab.request('project.query', {'slugs': 
[slug]})['slugMap'].values())
+if rq:
+logging.debug("Slug {slug} = PHID {phid}".format(slug=slug, 
phid=rq[0]))
+return rq[0]
+raise Exception("No PHID found for slug #%s!" % slug)
 
 def get_slug(branch):
 """ Slugify the branch name.

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib49ac7d0d4634642b1547e8e229fbe807a421ff0
Gerrit-PatchSet: 2
Gerrit-Project: labs/tools/forrestbot
Gerrit-Branch: master
Gerrit-Owner: Legoktm 
Gerrit-Reviewer: Legoktm 

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

[MediaWiki-commits] [Gerrit] Bump phabricator release tag - change (operations/puppet)

2015-06-09 Thread 20after4 (Code Review)

20after4 has uploaded a new change for review.

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

Change subject: Bump phabricator release tag
..

Bump phabricator release tag

Change-Id: I02dc0bc5d2d32b010a5023a7f37441b39b14b761
---
M manifests/role/phabricator.pp
1 file changed, 7 insertions(+), 7 deletions(-)


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

diff --git a/manifests/role/phabricator.pp b/manifests/role/phabricator.pp
index fdcb750..22a4551 100644
--- a/manifests/role/phabricator.pp
+++ b/manifests/role/phabricator.pp
@@ -33,7 +33,7 @@
 include role::phabricator::config
 include phabricator::monitoring
 
-$current_tag = 'release/2015-06-03/1'
+$current_tag = 'release/2015-06-10/1'
 $domain = 'phabricator.wikimedia.org'
 $altdom = 'phab.wmfusercontent.org'
 $mysql_host = 'm3-master.eqiad.wmnet'
@@ -44,11 +44,11 @@
 mysql_admin_user => $role::phabricator::config::mysql_adminuser,
 mysql_admin_pass => $role::phabricator::config::mysql_adminpass,
 auth_type=> 'dual',
-sprint_tag   => 'release/2015-05-08',
-security_tag => 'release/2015-05-06/1',
+sprint_tag   => $current_tag,
+security_tag => $current_tag,
 libraries=> ['/srv/phab/libext/Sprint/src',
 '/srv/phab/libext/security/src'],
-extension_tag=> 'HEAD',
+extension_tag=> $current_tag,
 extensions   => [ 'MediaWikiUserpageCustomField.php',
   'LDAPUserpageCustomField.php',
   'PhabricatorMediaWikiAuthProvider.php',
@@ -162,16 +162,16 @@
 
 # pass not sensitive but has to match phab and db
 $mysqlpass = 'labspass'
-$current_tag = 'release/2015-06-03/1'
+$current_tag = 'release/2015-06-10/1'
 class { '::phabricator':
 git_tag   => $current_tag,
 lock_file => '/var/run/phab_repo_lock',
 auth_type => 'local',
-sprint_tag=> 'release/2015-05-08',
+sprint_tag=> $current_tag,
 libraries => {
 'sprint' => '/srv/phab/libext/Sprint/src',
 },
-extension_tag => 'release/2015-05-06/1',
+extension_tag => $current_tag,
 extensions=> [ 'MediaWikiUserpageCustomField.php',
   'LDAPUserpageCustomField.php',
   'PhabricatorMediaWikiAuthProvider.php',

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I02dc0bc5d2d32b010a5023a7f37441b39b14b761
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: 20after4 

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

[MediaWiki-commits] [Gerrit] Update README for lowercasing of function names - change (at-ease)

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

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

Change subject: Update README for lowercasing of function names
..


Update README for lowercasing of function names

Change-Id: Ib0fc3618681a0bd69751710464eb77b190cd38a2
---
M README.md
1 file changed, 2 insertions(+), 2 deletions(-)

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



diff --git a/README.md b/README.md
index 812f24d..dc060cd 100644
--- a/README.md
+++ b/README.md
@@ -26,9 +26,9 @@
 -
 
 ```
-\MediaWiki\SuppressWarnings();
+\MediaWiki\suppressWarnings();
 $content = file_get_contents( 'foobar.txt' );
-\MediaWiki\RestoreWarnings();
+\MediaWiki\restoreWarnings();
 ```
 
 Running tests

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib0fc3618681a0bd69751710464eb77b190cd38a2
Gerrit-PatchSet: 1
Gerrit-Project: at-ease
Gerrit-Branch: master
Gerrit-Owner: Legoktm 
Gerrit-Reviewer: BryanDavis 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Update README for lowercasing of function names - change (at-ease)

2015-06-09 Thread Legoktm (Code Review)

Legoktm has uploaded a new change for review.

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

Change subject: Update README for lowercasing of function names
..

Update README for lowercasing of function names

Change-Id: Ib0fc3618681a0bd69751710464eb77b190cd38a2
---
M README.md
1 file changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/at-ease refs/changes/16/217216/1

diff --git a/README.md b/README.md
index 812f24d..dc060cd 100644
--- a/README.md
+++ b/README.md
@@ -26,9 +26,9 @@
 -
 
 ```
-\MediaWiki\SuppressWarnings();
+\MediaWiki\suppressWarnings();
 $content = file_get_contents( 'foobar.txt' );
-\MediaWiki\RestoreWarnings();
+\MediaWiki\restoreWarnings();
 ```
 
 Running tests

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib0fc3618681a0bd69751710464eb77b190cd38a2
Gerrit-PatchSet: 1
Gerrit-Project: at-ease
Gerrit-Branch: master
Gerrit-Owner: Legoktm 

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

[MediaWiki-commits] [Gerrit] Throw an exception if we can't find the PHID for a slug - change (labs...forrestbot)

2015-06-09 Thread Legoktm (Code Review)

Legoktm has uploaded a new change for review.

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

Change subject: Throw an exception if we can't find the PHID for a slug
..

Throw an exception if we can't find the PHID for a slug

Change-Id: Ib49ac7d0d4634642b1547e8e229fbe807a421ff0
---
M forrestbot.py
1 file changed, 5 insertions(+), 9 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/labs/tools/forrestbot 
refs/changes/15/217215/1

diff --git a/forrestbot.py b/forrestbot.py
index 3a0901a..030910c 100644
--- a/forrestbot.py
+++ b/forrestbot.py
@@ -68,15 +68,11 @@
 
 @functools.lru_cache()
 def get_slug_PHID(slug):
-try:
-rq = list(phab.request('project.query', {'slugs': 
[slug]})['slugMap'].values())
-if rq:
-logging.debug("Slug {slug} = PHID {phid}".format(slug=slug, 
phid=rq[0]))
-return rq[0]
-except:
-pass
-logger.warning("No PHID found for slug #%s!" % slug)
-return None
+rq = list(phab.request('project.query', {'slugs': 
[slug]})['slugMap'].values())
+if rq:
+logging.debug("Slug {slug} = PHID {phid}".format(slug=slug, 
phid=rq[0]))
+return rq[0]
+raise Exception("No PHID found for slug #%s!" % slug)
 
 def get_slug(branch):
 """ Slugify the branch name.

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib49ac7d0d4634642b1547e8e229fbe807a421ff0
Gerrit-PatchSet: 1
Gerrit-Project: labs/tools/forrestbot
Gerrit-Branch: master
Gerrit-Owner: Legoktm 

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

[MediaWiki-commits] [Gerrit] Initial commit - change (at-ease)

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

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

Change subject: Initial commit
..


Initial commit

Parts of the README were taken from:
 
https://www.mediawiki.org/w/index.php?title=Manual:Coding_conventions/PHP&oldid=1662879#Error_handling

Bug: T100923
Change-Id: Id792d62ed2ae8d04011451459e53d3f88dfea8d7
---
A .gitattributes
A .gitignore
A .travis.yml
A COPYING
A Doxyfile
A README.md
A composer.json
A doc/README
A phpcs.xml
A phpunit.xml.dist
A src/Functions.php
A tests/FunctionsTest.php
12 files changed, 600 insertions(+), 0 deletions(-)

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



diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 000..2fd41e1
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,8 @@
+.gitattributes export-ignore
+.gitignore export-ignore
+.gitreview export-ignore
+Doxyfile export-ignore
+composer.json export-ignore
+doc export-ignore
+phpunit.xml.dist export-ignore
+tests export-ignore
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000..f6f384e
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,4 @@
+/coverage
+/doc/html
+vendor/
+composer.lock
diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 000..3d4019f
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,13 @@
+language: php
+php:
+  - "5.3.3"
+  - "5.3"
+  - "5.4"
+  - "5.5"
+  - "5.6"
+  - "hhvm"
+sudo: false
+install:
+  - composer install
+script:
+  - composer test
diff --git a/COPYING b/COPYING
new file mode 100644
index 000..019694a
--- /dev/null
+++ b/COPYING
@@ -0,0 +1,342 @@
+== GNU GENERAL PUBLIC LICENSE ==
+
+Version 2, June 1991
+
+Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
+Everyone is permitted to copy and distribute verbatim copies
+of this license document, but changing it is not allowed.
+
+=== Preamble ===
+
+The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Library General Public License instead.)  You can apply it to
+your programs, too.
+
+When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
+
+We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+The precise terms and conditions for copying, distribution and
+modification follow.
+
+== TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION ==
+
+'''0.''' This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program o

[MediaWiki-commits] [Gerrit] WIP: switch misc cluster to ganglia_new - change (operations/puppet)

2015-06-09 Thread Dzahn (Code Review)

Dzahn has uploaded a new change for review.

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

Change subject: WIP: switch misc cluster to ganglia_new
..

WIP: switch misc cluster to ganglia_new

Change-Id: Idf0ce19e9d2d6eacd0fabbf127a14252c2e811eb
---
M hieradata/common.yaml
M hieradata/regex.yaml
2 files changed, 5 insertions(+), 3 deletions(-)


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

diff --git a/hieradata/common.yaml b/hieradata/common.yaml
index d2577bb..640c30c 100644
--- a/hieradata/common.yaml
+++ b/hieradata/common.yaml
@@ -39,9 +39,7 @@
 name: "Miscellaneous"
 id: 8
 sites:
-  eqiad:
-- carbon.wikimedia.org
-- ms1004.eqiad.wmnet
+  eqiad: []
   codfw: []
   esams: []
   appserver:
diff --git a/hieradata/regex.yaml b/hieradata/regex.yaml
index ac9d363..7ddd6a5 100644
--- a/hieradata/regex.yaml
+++ b/hieradata/regex.yaml
@@ -30,6 +30,10 @@
   __regex: !ruby/regexp /^mw100[1-2]\.eqiad\.wmnet$/
   ganglia_class: "new"
 
+misc:
+  __regex: !ruby/regexp /^ ? $/
+  ganglia_class: "new"
+
 cassandra_test:
   __regex: !ruby/regexp /^(cerium|praseodymium|xenon)\.eqiad\.wmnet$/
   cassandra::seeds:

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Idf0ce19e9d2d6eacd0fabbf127a14252c2e811eb
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] Rephrase cx-tools-missing-link-text and add gender support - change (mediawiki...ContentTranslation)

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

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

Change subject: Rephrase cx-tools-missing-link-text and add gender support
..


Rephrase cx-tools-missing-link-text and add gender support

* Imperative verbs needs gender.
* Change plural "pages" to "page", to put the current target in context.

Change-Id: If770e093ded59e7c458dec78c90a8a1aedc15047
---
M i18n/en.json
1 file changed, 2 insertions(+), 2 deletions(-)

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



diff --git a/i18n/en.json b/i18n/en.json
index ad192a5..a5c8b9c 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -188,8 +188,8 @@
"cx-stats-weekly-published": "Last week",
"cx-stats-local-published": "$1 in $2",
"cx-stats-grouping-title": "{{PLURAL:$1|$1 translation|$1 
translations}}",
-   "cx-tools-missing-link-text": "Mark missing pages to encourage their 
creation.",
+   "cx-tools-missing-link-text": "{{GENDER:|Mark}} the page as missing to 
encourage its creation.",
"cx-tools-missing-link-tooltip": "Translate (in new window)",
"cx-tools-missing-link-title": "Missing link",
-   "cx-tools-missing-link-mark-link": "Mark as missing"
+   "cx-tools-missing-link-mark-link": "{{GENDER:|Mark}} as missing"
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: If770e093ded59e7c458dec78c90a8a1aedc15047
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/ContentTranslation
Gerrit-Branch: master
Gerrit-Owner: Amire80 
Gerrit-Reviewer: Pginer 
Gerrit-Reviewer: Santhosh 
Gerrit-Reviewer: Siebrand 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Add Wikibase link only to pages in the main namespace - change (mediawiki...ContentTranslation)

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

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

Change subject: Add Wikibase link only to pages in the main namespace
..


Add Wikibase link only to pages in the main namespace

Bug: T101410
Change-Id: Iba7e6abb01ad8b1f4c207c705ff079517aa0bb03
---
M modules/publish/ext.cx.wikibase.link.js
1 file changed, 7 insertions(+), 1 deletion(-)

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



diff --git a/modules/publish/ext.cx.wikibase.link.js 
b/modules/publish/ext.cx.wikibase.link.js
index 345dec6..6b7207a 100644
--- a/modules/publish/ext.cx.wikibase.link.js
+++ b/modules/publish/ext.cx.wikibase.link.js
@@ -14,7 +14,13 @@
 * Link the source and target articles in the Wikibase repo
 */
var addWikibaseLink = function ( sourceLanguage, targetLanguage, 
sourceTitle, targetTitle ) {
-   var sourceApi;
+   var title, sourceApi;
+
+   // Link only pages in the main space
+   title = new mw.Title( sourceTitle );
+   if ( title.getNamespaceId() !== 0 ) {
+   return;
+   }
 
sourceApi = mw.cx.siteMapper.getApi( mw.cx.sourceLanguage );
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Iba7e6abb01ad8b1f4c207c705ff079517aa0bb03
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ContentTranslation
Gerrit-Branch: master
Gerrit-Owner: Amire80 
Gerrit-Reviewer: Nikerabbit 
Gerrit-Reviewer: Santhosh 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] RTL fixes for the link card - change (mediawiki...ContentTranslation)

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

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

Change subject: RTL fixes for the link card
..


RTL fixes for the link card

* Apply lang and dir to the language label.
* Apply lang and dir to the link's container, instead of .
  This shows ellipsis on the correct end for long link titles.
* Fix the location of the X that removes the link.

Change-Id: I179d4e3439487d934799287180e0113a47a0f560
---
M modules/tools/ext.cx.tools.link.js
M modules/tools/styles/ext.cx.tools.link.less
2 files changed, 11 insertions(+), 3 deletions(-)

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



diff --git a/modules/tools/ext.cx.tools.link.js 
b/modules/tools/ext.cx.tools.link.js
index 79485bc..db689a3 100644
--- a/modules/tools/ext.cx.tools.link.js
+++ b/modules/tools/ext.cx.tools.link.js
@@ -362,11 +362,19 @@
)
);
$cardHeader.append( $( '' )
+   .prop( {
+   lang: this.page.language,
+   dir: $.uls.data.getDir( this.page.language )
+   } )
.addClass( 'card__title--language' ) );
 
$linkInfo.append( $cardHeader );
 
$linkContainer = $( '' )
+   .prop( {
+   lang: this.page.language,
+   dir: $.uls.data.getDir( this.page.language )
+   } )
.addClass( 'card__link-container' );
 
if ( this.page ) {
@@ -374,8 +382,6 @@
.addClass( 'card__link-text' )
.text( this.page.title )
.prop( {
-   lang: this.page.language,
-   dir: $.uls.data.getDir( 
this.page.language ),
target: '_blank',
href: this.siteMapper.getPageUrl( 
this.page.language, this.page.title )
} );
diff --git a/modules/tools/styles/ext.cx.tools.link.less 
b/modules/tools/styles/ext.cx.tools.link.less
index 867dacd..ff43d95 100644
--- a/modules/tools/styles/ext.cx.tools.link.less
+++ b/modules/tools/styles/ext.cx.tools.link.less
@@ -49,7 +49,7 @@
.background-image-svg('../images/clear.svg', '../images/clear.png');
background-repeat: no-repeat;
background-color: #FF;
-   background-position: 10px center;
+   background-position: left 10px center;
background-size: 15px;
padding: 5px 10px 5px 32px;
cursor: pointer;
@@ -108,8 +108,10 @@
.card__link-container {
.mw-ui-item;
.mw-ui-one-whole;
+
overflow: hidden;
text-overflow: ellipsis;
+   text-align: left;
padding: 4px;
padding-bottom: 15px;
min-height: 65px;

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I179d4e3439487d934799287180e0113a47a0f560
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ContentTranslation
Gerrit-Branch: master
Gerrit-Owner: Amire80 
Gerrit-Reviewer: Nikerabbit 
Gerrit-Reviewer: Santhosh 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Backport core window.onerror snippet for 1.23 - change (mediawiki...Sentry)

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

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

Change subject: Backport core window.onerror snippet for 1.23
..


Backport core window.onerror snippet for 1.23

Bug: T100090
Change-Id: Ib3e9d94a5717c89f7da73dc3439563940cfc4e1d
---
M resources/init.js
1 file changed, 20 insertions(+), 0 deletions(-)

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



diff --git a/resources/init.js b/resources/init.js
index 6b8e22b..0ab9b82 100644
--- a/resources/init.js
+++ b/resources/init.js
@@ -81,4 +81,24 @@
raven.captureMessage( error, { source: 'EventLogging' } 
);
} );
} );
+
+   // 1.23 BC - starting 1.25, this block is in core
+   function installGlobalHandler() {
+   // We will preserve the return value of the previous handler. 
window.onerror works the
+   // opposite way than normal event handlers (returning true will 
prevent the default
+   // action, returning false will let the browser handle the 
error normally, by e.g.
+   // logging to the console), so our fallback old handler needs 
to return false.
+   var oldHandler = window.onerror || function () { return false; 
};
+
+   /**
+* Dumb window.onerror handler which forwards the errors via 
mw.track.
+* @fires global_error
+*/
+   window.onerror = function ( errorMessage, url, lineNumber, 
columnNumber, errorObject ) {
+   mw.track( 'global.error', { errorMessage: errorMessage, 
url: url,
+   lineNumber: lineNumber, columnNumber: 
columnNumber, errorObject: errorObject } );
+   return oldHandler.apply( this, arguments );
+   };
+   }
+   installGlobalHandler();
 } ) ( mediaWiki, jQuery );

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib3e9d94a5717c89f7da73dc3439563940cfc4e1d
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/extensions/Sentry
Gerrit-Branch: REL1_23
Gerrit-Owner: Gergő Tisza 
Gerrit-Reviewer: BryanDavis 
Gerrit-Reviewer: Gergő Tisza 
Gerrit-Reviewer: Gilles 
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] Set defaultbranch for REL1_23 - change (mediawiki...Sentry)

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

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

Change subject: Set defaultbranch for REL1_23
..


Set defaultbranch for REL1_23

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

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



diff --git a/.gitreview b/.gitreview
index 01c1e6c..44332aa 100644
--- a/.gitreview
+++ b/.gitreview
@@ -2,5 +2,5 @@
 host=gerrit.wikimedia.org
 port=29418
 project=mediawiki/extensions/Sentry.git
-defaultbranch=master
+defaultbranch=REL1_23
 defaultrebase=0

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I6423dd38e149e57dc26d3f7f7190a8acb0de7148
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Sentry
Gerrit-Branch: REL1_23
Gerrit-Owner: Gergő Tisza 
Gerrit-Reviewer: BryanDavis 
Gerrit-Reviewer: Chad 
Gerrit-Reviewer: Gilles 
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] Make Sentry actually lazy-load - change (mediawiki...Sentry)

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

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

Change subject: Make Sentry actually lazy-load
..


Make Sentry actually lazy-load

(backport from 5c9fa39dcb679e0426789549581714b7b0696318 to REL1_23)

Also update some stuff that changed in core during the reviews
(window.onerror event name + arguments) and remove functionality
that did not get through the review (error ids, async callback
error reports).

The way sinon.js is used to stub window.Raven is undocumented
but recommended by the author so should be safe:
https://github.com/cjohansen/Sinon.JS/issues/23#issuecomment-1434679

Bug: T88874
Change-Id: I0b3d1518316e6ed9b7de9161952fad2f90f0bcd0
---
M Sentry.php
M SentryHooks.php
M resources/init.js
M tests/qunit/init.test.js
4 files changed, 27 insertions(+), 31 deletions(-)

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



diff --git a/Sentry.php b/Sentry.php
index 6026e2f..f80f939 100644
--- a/Sentry.php
+++ b/Sentry.php
@@ -15,12 +15,13 @@
 $wgAutoloadClasses['SentryHooks'] = __DIR__ . '/SentryHooks.php';
 
 $wgResourceModules += array(
-   'sentry' => array(
-   'scripts' => array(
-   'raven/raven.js',
-   'init.js',
-   ),
-   'position' => 'top',
+   'sentry.init' => array(
+   'scripts' => array( 'init.js' ),
+   'localBasePath' => __DIR__ . '/resources',
+   'remoteExtPath' => 'Sentry/resources',
+   ),
+   'sentry.raven' => array(
+   'scripts' => array( 'raven/raven.js' ),
'localBasePath' => __DIR__ . '/resources',
'remoteExtPath' => 'Sentry/resources',
),
diff --git a/SentryHooks.php b/SentryHooks.php
index 1ed5d2f..c653f8a 100644
--- a/SentryHooks.php
+++ b/SentryHooks.php
@@ -23,7 +23,7 @@
 * @return bool
 */
public static function onBeforePageDisplay( &$out, &$skin ) {
-   $out->addModules( array( 'sentry' ) );
+   $out->addModules( array( 'sentry.init' ) );
 
return true;
}
@@ -35,7 +35,7 @@
public static function onResourceLoaderTestModules( array 
&$testModules, ResourceLoader &$resourceLoader ) {
$testModules['qunit']['sentry.test'] = array(
'scripts' => array( 'init.test.js' ),
-   'dependencies' => array( 'sentry' ),
+   'dependencies' => array( 'sentry.init' ),
'localBasePath' => __DIR__ . '/tests/qunit',
'remoteExtPath' => 'Sentry/tests/qunit',
);
diff --git a/resources/init.js b/resources/init.js
index d8644ea..6b8e22b 100644
--- a/resources/init.js
+++ b/resources/init.js
@@ -5,7 +5,7 @@
 * @return {jQuery.Deferred} a deferred with the Raven.js object
 */
function initRaven() {
-   return mw.loader.using( 'sentry' ).then( function () {
+   return mw.loader.using( 'sentry.raven' ).then( function () {
if ( !raven ) {
var config = mw.config.get( 'wgSentry' ),
options = {};
@@ -51,31 +51,28 @@
 */
function report( topic, data ) {
mw.sentry.initRaven().done( function ( raven ) {
-   var tags = { source: data.source },
-   log = window.console && ( console.warn || 
console.log );
+   var tags = { source: data.source };
 
if ( data.module ) {
tags.module = data.module;
}
$.extend( tags, data.context );
 
-   raven.captureException( data.exception, { tags: tags, 
event_id: data.id } );
-
-   if ( log ) {
-   log.call( console, 'MediaWiki error logging: 
reported an error with id ' + data.id );
-   log.call( console, 'Please refer to this error 
id when reporting an error.' );
-   }
+   raven.captureException( data.exception, { tags: tags } 
);
} );
}
 
-   mw.trackSubscribe( 'errorLogging.exception', report );
+   // make these available for unit tests
+   mw.sentry = { initRaven: initRaven, report: report };
+
mw.trackSubscribe( 'resourceloader.exception', report );
 
-   mw.trackSubscribe( 'errorLogging.windowOnerror', function ( topic, data 
) {
+   mw.trackSubscribe( 'global.error', function ( topic, data ) {
mw.sentry.initRaven().done( function ( raven ) {
// By this point, Raven replaced the old 
window.onerror; we need to process errors
// caught before that which are queued in mw.track.
-

[MediaWiki-commits] [Gerrit] Use normal line numbers - change (mediawiki...SyntaxHighlight_GeSHi)

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

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

Change subject: Use normal line numbers
..


Use normal line numbers

'Fancy' line numbers are a fairly useless feature, not seen
in any other code highlighter. As the extension doesn't let you
choose a line number mode, default to normal.

Bug: T101602
Change-Id: Iccbd3ba6c91c58b0ea0f0c09832f1422936cd475
---
M SyntaxHighlight_GeSHi.class.php
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/SyntaxHighlight_GeSHi.class.php b/SyntaxHighlight_GeSHi.class.php
index d679e54..fcaa4a2 100644
--- a/SyntaxHighlight_GeSHi.class.php
+++ b/SyntaxHighlight_GeSHi.class.php
@@ -102,7 +102,7 @@
 
// Line numbers
if ( isset( $args['line'] ) ) {
-   $geshi->enable_line_numbers( GESHI_FANCY_LINE_NUMBERS );
+   $geshi->enable_line_numbers( GESHI_NORMAL_LINE_NUMBERS 
);
}
// Highlighting specific lines
if ( isset( $args['highlight'] ) ) {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Iccbd3ba6c91c58b0ea0f0c09832f1422936cd475
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SyntaxHighlight_GeSHi
Gerrit-Branch: master
Gerrit-Owner: Esanders 
Gerrit-Reviewer: Bartosz Dziewoński 
Gerrit-Reviewer: Brion VIBBER 
Gerrit-Reviewer: Krinkle 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] objectcache: Minor code clean up in ObjectCache.php - change (mediawiki/core)

2015-06-09 Thread Krinkle (Code Review)

Krinkle has uploaded a new change for review.

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

Change subject: objectcache: Minor code clean up in ObjectCache.php
..

objectcache: Minor code clean up in ObjectCache.php

* Whitespace.
* Simplify logic.
* Apply coding conventions to documentation blocks (empty line
  before annotations, no empty lines between annotation, consistent
  order of annotations).

Change-Id: I3e5268d6a6295643d5725c66ea2a01bccf610ed8
---
M includes/objectcache/ObjectCache.php
1 file changed, 22 insertions(+), 31 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/13/217213/1

diff --git a/includes/objectcache/ObjectCache.php 
b/includes/objectcache/ObjectCache.php
index 7faf4bb..c5850b6 100644
--- a/includes/objectcache/ObjectCache.php
+++ b/includes/objectcache/ObjectCache.php
@@ -38,6 +38,7 @@
 class ObjectCache {
/** @var Array Map of (id => BagOStuff) */
public static $instances = array();
+
/** @var Array Map of (id => WANObjectCache) */
public static $wanInstances = array();
 
@@ -45,35 +46,29 @@
 * Get a cached instance of the specified type of cache object.
 *
 * @param string $id
-*
 * @return BagOStuff
 */
static function getInstance( $id ) {
-   if ( isset( self::$instances[$id] ) ) {
-   return self::$instances[$id];
+   if ( !isset( self::$instances[$id] ) ) {
+   self::$instances[$id] = self::newFromId( $id );
}
 
-   $object = self::newFromId( $id );
-   self::$instances[$id] = $object;
-   return $object;
+   return self::$instances[$id];
}
 
/**
 * Get a cached instance of the specified type of cache object.
 *
-* @param string $id
-*
-* @return WANObjectCache
 * @since 1.26
+* @param string $id
+* @return WANObjectCache
 */
static function getWANInstance( $id ) {
-   if ( isset( self::$wanInstances[$id] ) ) {
-   return self::$wanInstances[$id];
+   if ( !isset( self::$wanInstances[$id] ) ) {
+   self::$wanInstances[$id] = self::newWANCacheFromId( $id 
);
}
 
-   $object = self::newWANCacheFromId( $id );
-   self::$wanInstances[$id] = $object;
-   return $object;
+   return self::$wanInstances[$id];
}
 
/**
@@ -88,9 +83,8 @@
 * Create a new cache object of the specified type.
 *
 * @param string $id
-*
-* @throws MWException
 * @return BagOStuff
+* @throws MWException
 */
static function newFromId( $id ) {
global $wgObjectCaches;
@@ -107,9 +101,8 @@
 * Create a new cache object from parameters
 *
 * @param array $params
-*
-* @throws MWException
 * @return BagOStuff
+* @throws MWException
 */
static function newFromParams( $params ) {
if ( isset( $params['loggroup'] ) ) {
@@ -140,6 +133,7 @@
 * be an alias to the configured cache choice for that.
 * If no cache choice is configured (by default $wgMainCacheType is 
CACHE_NONE),
 * then CACHE_ANYTHING will forward to CACHE_DB.
+*
 * @param array $params
 * @return BagOStuff
 */
@@ -162,8 +156,8 @@
 *
 * @param array $params
 * @param int|string $fallback Fallback cache, e.g. (CACHE_NONE, 
"hash") (since 1.24)
-* @throws MWException
 * @return BagOStuff
+* @throws MWException
 */
static function newAccelerator( $params, $fallback = null ) {
if ( function_exists( 'apc_fetch' ) ) {
@@ -173,11 +167,11 @@
} elseif ( function_exists( 'wincache_ucache_get' ) ) {
$id = 'wincache';
} else {
-   if ( $fallback !== null ) {
-   return self::newFromId( $fallback );
+   if ( $fallback === null ) {
+   throw new MWException( 'CACHE_ACCEL requested 
but no suitable object ' .
+   'cache is present. You may want to 
install APC.' );
}
-   throw new MWException( "CACHE_ACCEL requested but no 
suitable object " .
-   "cache is present. You may want to install 
APC." );
+   $id = $fallback;
}
return self::newFromId( $id );
}
@@ -190,7 +184,6 @@
 * switching between the two clients randomly would be disastrous.
 *
 * @param array $params
-*

[MediaWiki-commits] [Gerrit] Removed cruft "images" folder and cruft image copying script. - change (apps...wikipedia)

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

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

Change subject: Removed cruft "images" folder and cruft image copying script.
..


Removed cruft "images" folder and cruft image copying script.

Restricted about.html png width since srcset no longer does so
when the bundled image protocol serves up 2x and 3x density
versions.

Change-Id: I13f4ccb15e50080923f307100c6293eb15c8e271
---
M MediaWikiKit/MediaWikiKit/MWKSite.m
M Wikipedia.xcodeproj/project.pbxproj
M Wikipedia/assets/about.html
D scripts/copy-wmflogo-to-assets.sh
M www/about.html
5 files changed, 2 insertions(+), 26 deletions(-)

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



diff --git a/MediaWikiKit/MediaWikiKit/MWKSite.m 
b/MediaWikiKit/MediaWikiKit/MWKSite.m
index df444a0..35f6285 100644
--- a/MediaWikiKit/MediaWikiKit/MWKSite.m
+++ b/MediaWikiKit/MediaWikiKit/MWKSite.m
@@ -87,7 +87,6 @@
  self.language,
  isMobile ? @"m." : @"",
  self.domain]];
-
 }
 
 #pragma mark - NSObject
diff --git a/Wikipedia.xcodeproj/project.pbxproj 
b/Wikipedia.xcodeproj/project.pbxproj
index ce12535..002f73c 100644
--- a/Wikipedia.xcodeproj/project.pbxproj
+++ b/Wikipedia.xcodeproj/project.pbxproj
@@ -1538,13 +1538,6 @@
path = Keychain;
sourceTree = "";
};
-   0466F44C183A30CC00EA1FD7 /* Images */ = {
-   isa = PBXGroup;
-   children = (
-   );
-   path = Images;
-   sourceTree = "";
-   };
0480AE791AA4E61000A9950C /* Footer */ = {
isa = PBXGroup;
children = (
@@ -2487,7 +2480,6 @@
D4B0ADFF19365F4600F0AC90 /* EventLogging */,
0442F57C1900718600F55DF9 /* Fonts */,
0493C2C91952373100EBB973 /* Housekeeping */,
-   0466F44C183A30CC00EA1FD7 /* Images */,
0463639518A844380049EE4F /* Keychain */,
0487041519F824D700B7D307 /* Networking */,
04616DF71AE7060C00815BCE /* Protocols */,
diff --git a/Wikipedia/assets/about.html b/Wikipedia/assets/about.html
index 52a5665..0e93ed9 100644
--- a/Wikipedia/assets/about.html
+++ b/Wikipedia/assets/about.html
@@ -61,6 +61,7 @@
 
 .wmf-logo{
 padding-right:0.5em;
+width:60px;
 }
 
 
diff --git a/scripts/copy-wmflogo-to-assets.sh 
b/scripts/copy-wmflogo-to-assets.sh
deleted file mode 100755
index 96eb77a..000
--- a/scripts/copy-wmflogo-to-assets.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/sh
-
-# When Images.xcassets is compiled it creates 3 pngs from wmf_logo.pdf
-# This script copies those files to the "assets/images/" folder
-
-target_path="${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/"
-assets_path="${target_path}/assets/images"
-
-mkdir -p "${assets_path}"
-
-copy_target_to_assets() {
-  cp -v "${target_path}/$1" "${assets_path}/$2"
-}
-
-copy_target_to_assets "WMFLogo_60.png" "wmflogo_60.png"
-copy_target_to_assets "wmflogo...@2x.png" "wmflogo_120.png"
-copy_target_to_assets "wmflogo...@3x.png" "wmflogo_180.png"
diff --git a/www/about.html b/www/about.html
index 52a5665..0e93ed9 100644
--- a/www/about.html
+++ b/www/about.html
@@ -61,6 +61,7 @@
 
 .wmf-logo{
 padding-right:0.5em;
+width:60px;
 }
 
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I13f4ccb15e50080923f307100c6293eb15c8e271
Gerrit-PatchSet: 4
Gerrit-Project: apps/ios/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Mhurd 
Gerrit-Reviewer: Bgerstle 
Gerrit-Reviewer: Fjalapeno 
Gerrit-Reviewer: Mhurd 
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 fastlane metadata for app store including screenshots - change (apps...wikipedia)

2015-06-09 Thread Fjalapeno (Code Review)

Fjalapeno has uploaded a new change for review.

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

Change subject: Update fastlane metadata for app store including screenshots
..

Update fastlane metadata for app store including screenshots

Change-Id: I46e1b0c7836f5b66bfc9797ec0e2b1d338e709d6
---
M .gitignore
M fastlane/Deliverfile
M fastlane/metadata/en-US/software_url.txt
M fastlane/metadata/en-US/support_url.txt
A fastlane/screenshots/en-US/1_ipad_1536x2048ss-80.png
A fastlane/screenshots/en-US/1_iphone35_640x960ss-80-2.png
A fastlane/screenshots/en-US/1_iphone4_640x1136ss-80.png
A fastlane/screenshots/en-US/1_iphone6Plus_1242x2208ss-80.png
A fastlane/screenshots/en-US/1_iphone6_750x1334ss-80.png
A fastlane/screenshots/en-US/2_ipad_1536x2048ss-80-2.png
A fastlane/screenshots/en-US/2_iphone35_640x960ss-80.png
A fastlane/screenshots/en-US/2_iphone4_640x1136ss-80-2.png
A fastlane/screenshots/en-US/2_iphone6Plus_1242x2208ss-80-2.png
A fastlane/screenshots/en-US/2_iphone6_750x1334ss-80-2.png
A fastlane/screenshots/en-US/3_ipad_1536x2048ss-80-3.png
A fastlane/screenshots/en-US/3_iphone35_640x960ss-80-3.png
A fastlane/screenshots/en-US/3_iphone4_640x1136ss-80-3.png
A fastlane/screenshots/en-US/3_iphone6Plus_1242x2208ss-80-3.png
A fastlane/screenshots/en-US/3_iphone6_750x1334ss-80-3.png
A fastlane/screenshots/en-US/4_ipad_1536x2048ss-80-4.png
A fastlane/screenshots/en-US/4_iphone35_640x960ss-80-4.png
A fastlane/screenshots/en-US/4_iphone4_640x1136ss-80-4.png
A fastlane/screenshots/en-US/4_iphone6Plus_1242x2208ss-80-4.png
A fastlane/screenshots/en-US/4_iphone6_750x1334ss-80-4.png
A fastlane/screenshots/en-US/5_ipad_1536x2048ss-80-5.png
A fastlane/screenshots/en-US/5_iphone35_640x960ss-80-5.png
A fastlane/screenshots/en-US/5_iphone4_640x1136ss-80-5.png
A fastlane/screenshots/en-US/5_iphone6Plus_1242x2208ss-80-5.png
A fastlane/screenshots/en-US/5_iphone6_750x1334ss-80-5.png
29 files changed, 3 insertions(+), 7 deletions(-)


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

diff --git a/.gitignore b/.gitignore
index 02159c8..3101a17 100644
--- a/.gitignore
+++ b/.gitignore
@@ -42,11 +42,6 @@
 #
 # Pods/
 
-# FastLane
-screenshots/
-fastlane/report.xml
-fastlane/Error*.png
-
 # www
 node_modules/
 # TODO: remove this when assets is moved into build/
diff --git a/fastlane/Deliverfile b/fastlane/Deliverfile
index b30e375..30d8d5e 100644
--- a/fastlane/Deliverfile
+++ b/fastlane/Deliverfile
@@ -16,3 +16,4 @@
 
 copyright "#{Time.now.year} Wikimedia Foundation"
 
+screenshots_path "./screenshots"
diff --git a/fastlane/metadata/en-US/software_url.txt 
b/fastlane/metadata/en-US/software_url.txt
index 2c9afd8..219c8b7 100644
--- a/fastlane/metadata/en-US/software_url.txt
+++ b/fastlane/metadata/en-US/software_url.txt
@@ -1 +1 @@
-https://blog.wikimedia.org/2015/04/15/new-release-wikipedia-app-ios/
\ No newline at end of file
+https://m.mediawiki.org/wiki/Wikimedia_Apps/Team
diff --git a/fastlane/metadata/en-US/support_url.txt 
b/fastlane/metadata/en-US/support_url.txt
index ee7d9eb..89310b9 100644
--- a/fastlane/metadata/en-US/support_url.txt
+++ b/fastlane/metadata/en-US/support_url.txt
@@ -1 +1 @@
-https://m.mediawiki.org/wiki/Wikimedia_Apps/Team
\ No newline at end of file
+https://www.mediawiki.org/wiki/Wikimedia_Apps/FAQ
diff --git a/fastlane/screenshots/en-US/1_ipad_1536x2048ss-80.png 
b/fastlane/screenshots/en-US/1_ipad_1536x2048ss-80.png
new file mode 100644
index 000..35de030
--- /dev/null
+++ b/fastlane/screenshots/en-US/1_ipad_1536x2048ss-80.png
Binary files differ
diff --git a/fastlane/screenshots/en-US/1_iphone35_640x960ss-80-2.png 
b/fastlane/screenshots/en-US/1_iphone35_640x960ss-80-2.png
new file mode 100644
index 000..ad838d6
--- /dev/null
+++ b/fastlane/screenshots/en-US/1_iphone35_640x960ss-80-2.png
Binary files differ
diff --git a/fastlane/screenshots/en-US/1_iphone4_640x1136ss-80.png 
b/fastlane/screenshots/en-US/1_iphone4_640x1136ss-80.png
new file mode 100644
index 000..4b39ef0
--- /dev/null
+++ b/fastlane/screenshots/en-US/1_iphone4_640x1136ss-80.png
Binary files differ
diff --git a/fastlane/screenshots/en-US/1_iphone6Plus_1242x2208ss-80.png 
b/fastlane/screenshots/en-US/1_iphone6Plus_1242x2208ss-80.png
new file mode 100644
index 000..f00e29e
--- /dev/null
+++ b/fastlane/screenshots/en-US/1_iphone6Plus_1242x2208ss-80.png
Binary files differ
diff --git a/fastlane/screenshots/en-US/1_iphone6_750x1334ss-80.png 
b/fastlane/screenshots/en-US/1_iphone6_750x1334ss-80.png
new file mode 100644
index 000..f834606
--- /dev/null
+++ b/fastlane/screenshots/en-US/1_iphone6_750x1334ss-80.png
Binary files differ
diff --git a/fastlane/screenshots/en-US/2_ipad_1536x2048ss-80-2.png 
b/fastlane/screenshots/en-US/2_ipad_1536x2048ss-80-2.png
new file mode 100644
index 000..8ceab36
--- /dev/null
+++ b/fastlane/screenshots/en-US/2_ipad_1536x2048ss-80-2.png
Binary files differ
diff --git a/fastlane/sc

[MediaWiki-commits] [Gerrit] Remove unused EchoDiscussionParser::getNotifiedUsersForComme... - change (mediawiki...Echo)

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

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

Change subject: Remove unused EchoDiscussionParser::getNotifiedUsersForComment()
..


Remove unused EchoDiscussionParser::getNotifiedUsersForComment()

Change-Id: I63c51835f54735c04f8356cf8ce161210895c378
---
M includes/DiscussionParser.php
M tests/phpunit/includes/DiscussionParserTest.php
2 files changed, 0 insertions(+), 40 deletions(-)

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



diff --git a/includes/DiscussionParser.php b/includes/DiscussionParser.php
index 5c1cb57..0e3f168 100644
--- a/includes/DiscussionParser.php
+++ b/includes/DiscussionParser.php
@@ -204,45 +204,6 @@
}
 
/**
-* Given a Revision object, determines which users are interested
-* in related EchoEvents.
-*
-* @param $revision Revision object.
-* @return Array of User objects
-*/
-   static function getNotifiedUsersForComment( $revision ) {
-   $interpretation = self::getChangeInterpretationForRevision( 
$revision );
-   $users = array();
-
-   foreach ( $interpretation as $action ) {
-   if ( $action['type'] == 'add-comment' ) {
-   $fullSection = $action['full-section'];
-   $interestedUsers = array_keys( 
self::extractSignatures( $fullSection, $revision->getTitle() ) );
-
-   foreach ( $interestedUsers as $userName ) {
-   $user = User::newFromName( $userName );
-
-   // Deliberately ignoring anonymous users
-   if ( $user && $user->getID() ) {
-   $users[$user->getID()] = $user;
-   }
-   }
-   }
-   }
-
-   if ( $revision->getTitle()->getNamespace() == NS_USER_TALK ) {
-   $userName = $revision->getTitle()->getText();
-   $user = User::newFromName( $userName );
-
-   if ( $user ) {
-   $users[$user->getID()] = $user;
-   }
-   }
-
-   return $users;
-   }
-
-   /**
 * Given a Revision object, returns a talk-page-centric interpretation
 * of the changes made in it.
 *
diff --git a/tests/phpunit/includes/DiscussionParserTest.php 
b/tests/phpunit/includes/DiscussionParserTest.php
index c0c29b5..48211dd 100644
--- a/tests/phpunit/includes/DiscussionParserTest.php
+++ b/tests/phpunit/includes/DiscussionParserTest.php
@@ -372,7 +372,6 @@
// - stripHeader
// - stripIndents
// - stripSignature
-   // - getNotifiedUsersForComment
 
public function testDiscussionParserAcceptsInternalDiff() {
global $wgDiff;

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I63c51835f54735c04f8356cf8ce161210895c378
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Echo
Gerrit-Branch: master
Gerrit-Owner: Legoktm 
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] Fix for lead image not fading in. - change (apps...wikipedia)

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

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

Change subject: Fix for lead image not fading in.
..


Fix for lead image not fading in.

Fix for landscape article title tap causing image gallery to appear.

Fix for some lead image compiler warnings.

Set animation duration to 0.5 seconds

Bug: T101072
Change-Id: I7b309ac729ae3992ee72f6734e6012b6cf6e66db
---
M Wikipedia/Images.xcassets/lead-default.imageset/lead-default.png
M Wikipedia/View Controllers/WebView/WebViewController.m
M Wikipedia/assets/styleoverrides.css
M www/less/leadImage.less
4 files changed, 73 insertions(+), 45 deletions(-)

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



diff --git a/Wikipedia/Images.xcassets/lead-default.imageset/lead-default.png 
b/Wikipedia/Images.xcassets/lead-default.imageset/lead-default.png
index 496004f..35baa96 100644
--- a/Wikipedia/Images.xcassets/lead-default.imageset/lead-default.png
+++ b/Wikipedia/Images.xcassets/lead-default.imageset/lead-default.png
Binary files differ
diff --git a/Wikipedia/View Controllers/WebView/WebViewController.m 
b/Wikipedia/View Controllers/WebView/WebViewController.m
index 90c672b..b308f20 100644
--- a/Wikipedia/View Controllers/WebView/WebViewController.m
+++ b/Wikipedia/View Controllers/WebView/WebViewController.m
@@ -1540,8 +1540,7 @@
 NSString* title   = article.displaytitle;
 NSString* description = article.entityDescription ? 
[[article.entityDescription wmf_stringByRemovingHTML] 
wmf_stringByCapitalizingFirstCharacter] : @"";
 
-BOOL hasImage  = article.imageURL ? YES : NO;
-CGFloat fontMultiplier = [self 
leadImageGetSizeReductionMultiplierForTitleOfLength:title.length];
+BOOL hasImage = article.imageURL != nil;
 
 // offsetY is percent to shift image vertically. 0 aligns top to top of 
lead_image_div,
 // 50 centers it vertically, and 100 aligns bottom of image to bottom of 
lead_image_div.
@@ -1554,36 +1553,32 @@
 }
 }
 
-NSString* leadImageDivStyleOverrides =
-!hasImage ? @"" : [NSString stringWithFormat:
-   @"background-image:-webkit-linear-gradient(top, 
rgba(0,0,0,0.0) 0%%, rgba(0,0,0,0.5) 100%%),"
-   @"url('%@')"
-   @"%@;"
-   "background-position: 50%% %ld%%;",
-   article.imageURL,
-   [article.image isCached] ? @"" : 
@",url('wmf://bundledImage/lead-default')",
-   offsetY];
+static NSString* formatString =
+@""
+""
+""
+""
+"%@"
+"%@"
+""
+"";
 
-NSString* leadImageHtml =
-[NSString stringWithFormat:
- @""
- ""
- "%@"
- "%@"
- ""
- "",
- leadImageDivStyleOverrides,
- [NSString stringWithFormat:@"font-size:%.02fpx;", 34.0f * 
fontMultiplier],
+NSString* html =
+[NSString stringWithFormat:formatString,
+ article.imageURL,
+ (long)offsetY,
+ [article.image isCached] ? @"display:none;" : @"",
+ 34.0f* [self 
leadImageGetSizeReductionMultiplierForTitleOfLength:title.length],
  title,
- [NSString stringWithFormat:@"font-size:%.02fpx;", 17.0f],
+ 17.0f,
  description
 ];
 
 if (!hasImage) {
-leadImageHtml = [NSString stringWithFormat:@"%@", leadImageHtml];
+html = [NSString stringWithFormat:@"%@", html];
 }
 
-return leadImageHtml;
+return html;
 }
 
 - 
(CGFloat)leadImageGetSizeReductionMultiplierForTitleOfLength:(NSUInteger)length 
{
@@ -1621,12 +1616,8 @@
 }
 
 - (NSInteger)leadImageFocalOffsetYPercentageFromTopOfRect:(CGRect)rect {
-float percentFromTop = (CGRectGetMidY(rect) * 100.0f);
-return @(MAX(0, MIN(100, percentFromTop))).integerValue;
-}
-
-+ (NSString*)hidePlaceholderJS {
-return @"document.getElementById('lead_image_div').style.backgroundImage = 
document.getElementById('lead_image_div').style.backgroundImage.replace('wmf://bundledImage/lead-default',
 'wmf://bundledImage/empty');";
+float percentFromTop = CGRectGetMidY(rect) * 100.0f;
+return (NSInteger)(MAX(0.0f, MIN(100.0f, percentFromTop)));
 }
 
 - (void)leadImageHidePlaceHolderAndCenterOnFaceIfNeeded:(CGRect)rect {
@@ -1636,14 +1627,9 @@
 [NSString 
stringWithFormat:@"document.getElementById('lead_image_div').style.backgroundPosition
 = '100%% %ld%%';", (long)[self 
leadImageFocalOffsetYPercentageFromTopOfRect:rect]];
 }
 
-static NSString* animationCss = nil;
-if (!animationCss) {
-animationCss =
-@"document.getElementById('lead_image_div').style.transition = 
'background-position 0.8s';";
-}
-[self.webView stringByEvaluatingJavaScriptFromString:[@[animationCss,
-[WebViewCo

[MediaWiki-commits] [Gerrit] Fix for lead image not fading in. - change (apps...wikipedia)

2015-06-09 Thread Fjalapeno (Code Review)

Fjalapeno has uploaded a new change for review.

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

Change subject: Fix for lead image not fading in.
..

Fix for lead image not fading in.

Fix for landscape article title tap causing image gallery to appear.

Fix for some lead image compiler warnings.

Set animation duration to 0.5 seconds

Bug: T101072
Change-Id: I7b309ac729ae3992ee72f6734e6012b6cf6e66db
---
M Wikipedia/Images.xcassets/lead-default.imageset/lead-default.png
M Wikipedia/View Controllers/WebView/WebViewController.m
M Wikipedia/assets/styleoverrides.css
M www/less/leadImage.less
4 files changed, 74 insertions(+), 49 deletions(-)


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

diff --git a/Wikipedia/Images.xcassets/lead-default.imageset/lead-default.png 
b/Wikipedia/Images.xcassets/lead-default.imageset/lead-default.png
index 496004f..35baa96 100644
--- a/Wikipedia/Images.xcassets/lead-default.imageset/lead-default.png
+++ b/Wikipedia/Images.xcassets/lead-default.imageset/lead-default.png
Binary files differ
diff --git a/Wikipedia/View Controllers/WebView/WebViewController.m 
b/Wikipedia/View Controllers/WebView/WebViewController.m
index 28663f4..21d80b0 100644
--- a/Wikipedia/View Controllers/WebView/WebViewController.m
+++ b/Wikipedia/View Controllers/WebView/WebViewController.m
@@ -1540,8 +1540,7 @@
 NSString* title   = article.displaytitle;
 NSString* description = article.entityDescription ? 
[[article.entityDescription wmf_stringByRemovingHTML] 
wmf_stringByCapitalizingFirstCharacter] : @"";
 
-BOOL hasImage  = article.imageURL ? YES : NO;
-CGFloat fontMultiplier = [self 
leadImageGetSizeReductionMultiplierForTitleOfLength:title.length];
+BOOL hasImage = article.imageURL != nil;
 
 // offsetY is percent to shift image vertically. 0 aligns top to top of 
lead_image_div,
 // 50 centers it vertically, and 100 aligns bottom of image to bottom of 
lead_image_div.
@@ -1554,36 +1553,32 @@
 }
 }
 
-NSString* leadImageDivStyleOverrides =
-!hasImage ? @"" : [NSString stringWithFormat:
-   @"background-image:-webkit-linear-gradient(top, 
rgba(0,0,0,0.0) 0%%, rgba(0,0,0,0.5) 100%%),"
-   @"url('%@')"
-   @"%@;"
-   "background-position: 50%% %ld%%;",
-   article.imageURL,
-   [article.image isCached] ? @"" : 
@",url('wmf://bundledImage/lead-default.png')",
-   offsetY];
+static NSString* formatString =
+@""
+""
+""
+""
+"%@"
+"%@"
+""
+"";
 
-NSString* leadImageHtml =
-[NSString stringWithFormat:
- @""
- ""
- "%@"
- "%@"
- ""
- "",
- leadImageDivStyleOverrides,
- [NSString stringWithFormat:@"font-size:%.02fpx;", 34.0f * 
fontMultiplier],
+NSString* html =
+[NSString stringWithFormat:formatString,
+ article.imageURL,
+ (long)offsetY,
+ [article.image isCached] ? @"display:none;" : @"",
+ 34.0f* [self 
leadImageGetSizeReductionMultiplierForTitleOfLength:title.length],
  title,
- [NSString stringWithFormat:@"font-size:%.02fpx;", 17.0f],
+ 17.0f,
  description
 ];
 
 if (!hasImage) {
-leadImageHtml = [NSString stringWithFormat:@"%@", leadImageHtml];
+html = [NSString stringWithFormat:@"%@", html];
 }
 
-return leadImageHtml;
+return html;
 }
 
 - 
(CGFloat)leadImageGetSizeReductionMultiplierForTitleOfLength:(NSUInteger)length 
{
@@ -1621,32 +1616,20 @@
 }
 
 - (NSInteger)leadImageFocalOffsetYPercentageFromTopOfRect:(CGRect)rect {
-float percentFromTop = (CGRectGetMidY(rect) * 100.0f);
-return @(MAX(0, MIN(100, percentFromTop))).integerValue;
-}
-
-+ (NSString*)hidePlaceholderJS {
-#warning FIXME: abstract away "get lead image div" logic
-return @"document.getElementById('lead_image_div').style.backgroundImage = 
document.getElementById('lead_image_div').style.backgroundImage.replace('wmf://bundledImage/lead-default.png',
 'wmf://bundledImage/empty.png');";
+float percentFromTop = CGRectGetMidY(rect) * 100.0f;
+return (NSInteger)(MAX(0.0f, MIN(100.0f, percentFromTop)));
 }
 
 - (void)leadImageHidePlaceHolderAndCenterOnFaceIfNeeded:(CGRect)rect {
 NSString* applyFocalOffsetJS = @"";
 if (!CGRectEqualToRect(rect, CGRectZero)) {
-#warning FIXME: abstract away "get lead image div" logic
 applyFocalOffsetJS =
-[NSString 
stringWithFormat:@"document.getElementById('lead_image_div').style.backgroundPosition
 = '100%% %d%%';", [self leadImageFocalOffsetYPercentageFromTopOfRect:rect]];
+[NSString 
stringWithFormat:@"document.getElementById('lead_image_div').st

[MediaWiki-commits] [Gerrit] Revert some changes from the swift patch that accidentally g... - change (apps...wikipedia)

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

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

Change subject: Revert some changes from the swift patch that accidentally got 
in.
..


Revert some changes from the swift patch that accidentally got in.

For some reason the iOS 7 replacement for url construction does not work.
Need to investigate further, until then just using what works.

Change-Id: I6a25e3cdfb544d92fca5400ec94b705f36a0dbc4
---
M MediaWikiKit/MediaWikiKit/MWKSite.m
1 file changed, 15 insertions(+), 10 deletions(-)

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



diff --git a/MediaWikiKit/MediaWikiKit/MWKSite.m 
b/MediaWikiKit/MediaWikiKit/MWKSite.m
index 13fca78..df444a0 100644
--- a/MediaWikiKit/MediaWikiKit/MWKSite.m
+++ b/MediaWikiKit/MediaWikiKit/MWKSite.m
@@ -73,16 +73,21 @@
 }
 
 - (NSURL*)apiEndpoint:(BOOL)isMobile {
-NSURLComponents* apiEndpointComponents = [[NSURLComponents alloc] init];
-apiEndpointComponents.scheme = @"https";
-NSMutableArray* hostComponents = [NSMutableArray 
arrayWithObject:self.language];
-if (isMobile) {
-[hostComponents addObject:@"m"];
-}
-[hostComponents addObject:self.domain];
-apiEndpointComponents.host = [hostComponents 
componentsJoinedByString:@"."];
-apiEndpointComponents.path = @"";
-return [apiEndpointComponents URL];
+//NSURLComponents* apiEndpointComponents = [[NSURLComponents alloc] init];
+//apiEndpointComponents.scheme = @"https";
+//NSMutableArray* hostComponents = [NSMutableArray 
arrayWithObject:self.language];
+//if (isMobile) {
+//[hostComponents addObject:@"m"];
+//}
+//[hostComponents addObject:self.domain];
+//apiEndpointComponents.host = [hostComponents 
componentsJoinedByString:@"."];
+//apiEndpointComponents.path = @"";
+//return [apiEndpointComponents URL];
+return [NSURL URLWithString:[NSString 
stringWithFormat:@"https://%@.%@%@/w/api.php";,
+ self.language,
+ isMobile ? @"m." : @"",
+ self.domain]];
+
 }
 
 #pragma mark - NSObject

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I6a25e3cdfb544d92fca5400ec94b705f36a0dbc4
Gerrit-PatchSet: 1
Gerrit-Project: apps/ios/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Fjalapeno 
Gerrit-Reviewer: Bgerstle 
Gerrit-Reviewer: Mhurd 
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 some changes from the swift patch that accidentally g... - change (apps...wikipedia)

2015-06-09 Thread Fjalapeno (Code Review)

Fjalapeno has uploaded a new change for review.

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

Change subject: Revert some changes from the swift patch that accidentally got 
in.
..

Revert some changes from the swift patch that accidentally got in.

For some reason the iOS 7 replacement for url construction does not work.
Need to investigate further, until then just using what works.

Change-Id: I6a25e3cdfb544d92fca5400ec94b705f36a0dbc4
---
M MediaWikiKit/MediaWikiKit/MWKSite.m
1 file changed, 15 insertions(+), 10 deletions(-)


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

diff --git a/MediaWikiKit/MediaWikiKit/MWKSite.m 
b/MediaWikiKit/MediaWikiKit/MWKSite.m
index 13fca78..df444a0 100644
--- a/MediaWikiKit/MediaWikiKit/MWKSite.m
+++ b/MediaWikiKit/MediaWikiKit/MWKSite.m
@@ -73,16 +73,21 @@
 }
 
 - (NSURL*)apiEndpoint:(BOOL)isMobile {
-NSURLComponents* apiEndpointComponents = [[NSURLComponents alloc] init];
-apiEndpointComponents.scheme = @"https";
-NSMutableArray* hostComponents = [NSMutableArray 
arrayWithObject:self.language];
-if (isMobile) {
-[hostComponents addObject:@"m"];
-}
-[hostComponents addObject:self.domain];
-apiEndpointComponents.host = [hostComponents 
componentsJoinedByString:@"."];
-apiEndpointComponents.path = @"";
-return [apiEndpointComponents URL];
+//NSURLComponents* apiEndpointComponents = [[NSURLComponents alloc] init];
+//apiEndpointComponents.scheme = @"https";
+//NSMutableArray* hostComponents = [NSMutableArray 
arrayWithObject:self.language];
+//if (isMobile) {
+//[hostComponents addObject:@"m"];
+//}
+//[hostComponents addObject:self.domain];
+//apiEndpointComponents.host = [hostComponents 
componentsJoinedByString:@"."];
+//apiEndpointComponents.path = @"";
+//return [apiEndpointComponents URL];
+return [NSURL URLWithString:[NSString 
stringWithFormat:@"https://%@.%@%@/w/api.php";,
+ self.language,
+ isMobile ? @"m." : @"",
+ self.domain]];
+
 }
 
 #pragma mark - NSObject

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6a25e3cdfb544d92fca5400ec94b705f36a0dbc4
Gerrit-PatchSet: 1
Gerrit-Project: apps/ios/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Fjalapeno 

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

[MediaWiki-commits] [Gerrit] Fix trivial whitespace after hash marks - change (operations/puppet)

2015-06-09 Thread Ori.livneh (Code Review)

Ori.livneh has submitted this change and it was merged.

Change subject: Fix trivial whitespace after hash marks
..


Fix trivial whitespace after hash marks

Change-Id: Ib89d10ad53d851ac9f4aab08feae0602b97b95da
---
M modules/phabricator/templates/phab_update_tag.erb
1 file changed, 3 insertions(+), 3 deletions(-)

Approvals:
  Ori.livneh: Verified; Looks good to me, approved



diff --git a/modules/phabricator/templates/phab_update_tag.erb 
b/modules/phabricator/templates/phab_update_tag.erb
index 78fde70..c58f5b5 100644
--- a/modules/phabricator/templates/phab_update_tag.erb
+++ b/modules/phabricator/templates/phab_update_tag.erb
@@ -90,7 +90,7 @@
 log_repo_head
 echo ""
 
-#Have puppet update and checkout tag specified in puppet
+# Have puppet update and checkout tag specified in puppet
 log "Running puppet with tags 'git' to manage repo tags"
 $puppet agent --test --tags git
 
@@ -98,8 +98,8 @@
 log_repo_head
 echo ""
 
-#upgrades are idempotent so there is no concern for multiple passes
-#--force silences the 'please stop apache' warnings, etc
+# upgrades are idempotent so there is no concern for multiple passes
+# --force silences the 'please stop apache' warnings, etc
 <%= @phabdir %>/phabricator/bin/storage upgrade --force -u <%= @storage_user 
%> -p <%= @storage_pass %>
 #  --password password, -p password
 #  --user username, -u username

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib89d10ad53d851ac9f4aab08feae0602b97b95da
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Negative24 
Gerrit-Reviewer: Dzahn 
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] Fixed "wfTimestamp() fed bogus time value" errors - change (mediawiki/core)

2015-06-09 Thread Ori.livneh (Code Review)

Ori.livneh has submitted this change and it was merged.

Change subject: Fixed "wfTimestamp() fed bogus time value" errors
..


Fixed "wfTimestamp() fed bogus time value" errors

* This broke OutputPage::checkLastModified() as the touched time was false

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

Approvals:
  Ori.livneh: Looks good to me, approved



diff --git a/includes/User.php b/includes/User.php
index bf0326a..61313a3 100644
--- a/includes/User.php
+++ b/includes/User.php
@@ -2362,7 +2362,7 @@
 
$timestamp = $cache->getCheckKeyTime( $key );
if ( $timestamp ) {
-   $this->mQuickTouched = wfTimestamp( 
TS_MW, $timestamp );
+   $this->mQuickTouched = wfTimestamp( 
TS_MW, (int)$timestamp );
} else {
# Set the timestamp to get HTTP 304 
cache hits
$this->touch();

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I118d3ddf07c7b69ad269f3aee0c70ab4159df192
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.26wmf9
Gerrit-Owner: Aaron Schulz 
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] Fixed "wfTimestamp() fed bogus time value" errors - change (mediawiki/core)

2015-06-09 Thread Ori.livneh (Code Review)

Ori.livneh has submitted this change and it was merged.

Change subject: Fixed "wfTimestamp() fed bogus time value" errors
..


Fixed "wfTimestamp() fed bogus time value" errors

* This broke OutputPage::checkLastModified() as the touched time was false

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

Approvals:
  Ori.livneh: Looks good to me, approved



diff --git a/includes/User.php b/includes/User.php
index fc07b6d..1587edf 100644
--- a/includes/User.php
+++ b/includes/User.php
@@ -2365,7 +2365,7 @@
 
$timestamp = $cache->getCheckKeyTime( $key );
if ( $timestamp ) {
-   $this->mQuickTouched = wfTimestamp( 
TS_MW, $timestamp );
+   $this->mQuickTouched = wfTimestamp( 
TS_MW, (int)$timestamp );
} else {
# Set the timestamp to get HTTP 304 
cache hits
$this->touch();

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I118d3ddf07c7b69ad269f3aee0c70ab4159df192
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.26wmf8
Gerrit-Owner: Aaron Schulz 
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] m4 replication rule for analytics-store - change (operations/puppet)

2015-06-09 Thread Springle (Code Review)

Springle has submitted this change and it was merged.

Change subject: m4 replication rule for analytics-store
..


m4 replication rule for analytics-store

This used to happen, then switched to an out-of-band replication
approach due to lag issues. With the change to TokuDB, plus the
batched-inserts work done to eventlogging consumer earlier this
year, we can switch back.

Change-Id: I117ea89dc2c7491d7db9797e72c261f41a0e74f3
---
M templates/mariadb/dbstore.my.cnf.erb
1 file changed, 1 insertion(+), 0 deletions(-)

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



diff --git a/templates/mariadb/dbstore.my.cnf.erb 
b/templates/mariadb/dbstore.my.cnf.erb
index 62d454b..6690532 100644
--- a/templates/mariadb/dbstore.my.cnf.erb
+++ b/templates/mariadb/dbstore.my.cnf.erb
@@ -71,6 +71,7 @@
 s6.replicate-wild-do-table = %wik%.%
 s7.replicate-wild-do-table = %wik%.%,centralauth.%
 m3.replicate-wild-do-table = phab%.%,phlegal%.%
+m4.replicate-wild-do-table = log.%
 
 [mysqldump]
 

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

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

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

[MediaWiki-commits] [Gerrit] s5 pager slave partitioning - change (operations/software)

2015-06-09 Thread Springle (Code Review)

Springle has submitted this change and it was merged.

Change subject: s5 pager slave partitioning
..


s5 pager slave partitioning

Change-Id: If8243abe23fb175866f524bf39adf547fc67df3e
---
A dbtools/s5-pager.sql
1 file changed, 80 insertions(+), 0 deletions(-)

Approvals:
  Jcrespo: Looks good to me, but someone else must approve
  Springle: Verified; Looks good to me, approved



diff --git a/dbtools/s5-pager.sql b/dbtools/s5-pager.sql
new file mode 100644
index 000..9e3671d
--- /dev/null
+++ b/dbtools/s5-pager.sql
@@ -0,0 +1,80 @@
+-- dewiki
+
+  select   1 as n, count(rev_user) from dewiki.revision where rev_user 
 < 1
+union select   1 as n, count(rev_user) from dewiki.revision where rev_user 
>= 1   and rev_user < 1
+union select   2 as n, count(rev_user) from dewiki.revision where rev_user 
>= 1   and rev_user < 2
+union select   3 as n, count(rev_user) from dewiki.revision where rev_user 
>= 2   and rev_user < 3
+union select  10 as n, count(rev_user) from dewiki.revision where rev_user 
>= 3   and rev_user < 10
+union select  20 as n, count(rev_user) from dewiki.revision where rev_user 
>= 10  and rev_user < 20
+union select  30 as n, count(rev_user) from dewiki.revision where rev_user 
>= 20  and rev_user < 30
+union select 100 as n, count(rev_user) from dewiki.revision where rev_user 
>= 30  and rev_user < 100
+union select 200 as n, count(rev_user) from dewiki.revision where rev_user 
>= 100 and rev_user < 200;
+
+ALTER TABLE dewiki.logging
+  DROP PRIMARY KEY,
+  ADD PRIMARY KEY (log_id, log_user)
+  PARTITION BY RANGE (log_user) (
+  PARTITION p1 VALUES LESS THAN (1),
+  PARTITION p1 VALUES LESS THAN (1),
+  PARTITION p2 VALUES LESS THAN (2),
+  PARTITION p5 VALUES LESS THAN (3),
+  PARTITION p10 VALUES LESS THAN (10),
+  PARTITION p20 VALUES LESS THAN (20),
+  PARTITION p30 VALUES LESS THAN (30),
+  PARTITION p100 VALUES LESS THAN (100),
+  PARTITION pMAXVALUE VALUES LESS THAN MAXVALUE );
+
+ALTER TABLE dewiki.revision
+  DROP PRIMARY KEY,
+  DROP INDEX rev_id,
+  ADD PRIMARY KEY (rev_id, rev_user)
+  PARTITION BY RANGE (rev_user) (
+  PARTITION p1 VALUES LESS THAN (1),
+  PARTITION p1 VALUES LESS THAN (1),
+  PARTITION p2 VALUES LESS THAN (2),
+  PARTITION p5 VALUES LESS THAN (5),
+  PARTITION p10 VALUES LESS THAN (10),
+  PARTITION p20 VALUES LESS THAN (20),
+  PARTITION p30 VALUES LESS THAN (30),
+  PARTITION p100 VALUES LESS THAN (100),
+  PARTITION pMAXVALUE VALUES LESS THAN MAXVALUE );
+
+-- wikidatawiki
+
+  select   1 as n, count(rev_user) from wikidatawiki.revision where 
rev_user  < 1
+union select   1 as n, count(rev_user) from wikidatawiki.revision where 
rev_user >= 1   and rev_user < 1
+union select   2 as n, count(rev_user) from wikidatawiki.revision where 
rev_user >= 1   and rev_user < 2
+union select   3 as n, count(rev_user) from wikidatawiki.revision where 
rev_user >= 2   and rev_user < 3
+union select  10 as n, count(rev_user) from wikidatawiki.revision where 
rev_user >= 3   and rev_user < 10
+union select  20 as n, count(rev_user) from wikidatawiki.revision where 
rev_user >= 10  and rev_user < 20
+union select  30 as n, count(rev_user) from wikidatawiki.revision where 
rev_user >= 20  and rev_user < 30
+union select 100 as n, count(rev_user) from wikidatawiki.revision where 
rev_user >= 30  and rev_user < 100
+union select 200 as n, count(rev_user) from wikidatawiki.revision where 
rev_user >= 100 and rev_user < 200;
+
+ALTER TABLE wikidatawiki.logging
+  DROP PRIMARY KEY,
+  ADD PRIMARY KEY (log_id, log_user)
+  PARTITION BY RANGE (log_user) (
+  PARTITION p1 VALUES LESS THAN (1),
+  PARTITION p1 VALUES LESS THAN (1),
+  PARTITION p2 VALUES LESS THAN (2),
+  PARTITION p3 VALUES LESS THAN (3),
+  PARTITION p10 VALUES LESS THAN (10),
+  PARTITION p20 VALUES LESS THAN (20),
+  PARTITION p30 VALUES LESS THAN (30),
+  PARTITION p100 VALUES LESS THAN (100),
+  PARTITION pMAXVALUE VALUES LESS THAN MAXVALUE );
+
+ALTER TABLE wikidatawiki.revision
+  DROP PRIMARY KEY,
+  ADD PRIMARY KEY (rev_id, rev_user)
+  PARTITION BY RANGE (rev_user) (
+  PARTITION p1 VALUES LESS THAN (1),
+  PARTITION p1 VALUES LESS THAN (1),
+  PARTITION p2 VALUES LESS THAN (2),
+  PARTITION p3 VALUES LESS THAN (3),
+  PARTITION p10 VALUES LESS THAN (10),
+  PARTITION p20 VALUES LESS THAN (20),
+  PARTITION p30 VALUES LESS THAN (30),
+  PARTITION p100 VALUES LESS THAN (100),
+  PARTITION pMAXVALUE VALUES LESS THAN MAXVALUE );
\ No newline at end of file

-- 
To view, visit https://gerrit.wikimedia.org/r/2155

[MediaWiki-commits] [Gerrit] Fix trivial whitespace after hash marks - change (operations/puppet)

2015-06-09 Thread Negative24 (Code Review)

Negative24 has uploaded a new change for review.

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

Change subject: Fix trivial whitespace after hash marks
..

Fix trivial whitespace after hash marks

Change-Id: Ib89d10ad53d851ac9f4aab08feae0602b97b95da
---
M modules/phabricator/templates/phab_update_tag.erb
1 file changed, 3 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/09/217209/1

diff --git a/modules/phabricator/templates/phab_update_tag.erb 
b/modules/phabricator/templates/phab_update_tag.erb
index 78fde70..c58f5b5 100644
--- a/modules/phabricator/templates/phab_update_tag.erb
+++ b/modules/phabricator/templates/phab_update_tag.erb
@@ -90,7 +90,7 @@
 log_repo_head
 echo ""
 
-#Have puppet update and checkout tag specified in puppet
+# Have puppet update and checkout tag specified in puppet
 log "Running puppet with tags 'git' to manage repo tags"
 $puppet agent --test --tags git
 
@@ -98,8 +98,8 @@
 log_repo_head
 echo ""
 
-#upgrades are idempotent so there is no concern for multiple passes
-#--force silences the 'please stop apache' warnings, etc
+# upgrades are idempotent so there is no concern for multiple passes
+# --force silences the 'please stop apache' warnings, etc
 <%= @phabdir %>/phabricator/bin/storage upgrade --force -u <%= @storage_user 
%> -p <%= @storage_pass %>
 #  --password password, -p password
 #  --user username, -u username

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

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

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

[MediaWiki-commits] [Gerrit] Fixed "wfTimestamp() fed bogus time value" errors - change (mediawiki/core)

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

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

Change subject: Fixed "wfTimestamp() fed bogus time value" errors
..


Fixed "wfTimestamp() fed bogus time value" errors

* This broke OutputPage::checkLastModified() as the touched time was false

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

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



diff --git a/includes/User.php b/includes/User.php
index bf0326a..61313a3 100644
--- a/includes/User.php
+++ b/includes/User.php
@@ -2362,7 +2362,7 @@
 
$timestamp = $cache->getCheckKeyTime( $key );
if ( $timestamp ) {
-   $this->mQuickTouched = wfTimestamp( 
TS_MW, $timestamp );
+   $this->mQuickTouched = wfTimestamp( 
TS_MW, (int)$timestamp );
} else {
# Set the timestamp to get HTTP 304 
cache hits
$this->touch();

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I118d3ddf07c7b69ad269f3aee0c70ab4159df192
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz 
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] Fixed "wfTimestamp() fed bogus time value" errors - change (mediawiki/core)

2015-06-09 Thread Aaron Schulz (Code Review)

Aaron Schulz has uploaded a new change for review.

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

Change subject: Fixed "wfTimestamp() fed bogus time value" errors
..

Fixed "wfTimestamp() fed bogus time value" errors

* This broke OutputPage::checkLastModified() as the touched time was false

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


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/07/217207/1

diff --git a/includes/User.php b/includes/User.php
index bf0326a..61313a3 100644
--- a/includes/User.php
+++ b/includes/User.php
@@ -2362,7 +2362,7 @@
 
$timestamp = $cache->getCheckKeyTime( $key );
if ( $timestamp ) {
-   $this->mQuickTouched = wfTimestamp( 
TS_MW, $timestamp );
+   $this->mQuickTouched = wfTimestamp( 
TS_MW, (int)$timestamp );
} else {
# Set the timestamp to get HTTP 304 
cache hits
$this->touch();

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I118d3ddf07c7b69ad269f3aee0c70ab4159df192
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.26wmf9
Gerrit-Owner: Aaron Schulz 

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

[MediaWiki-commits] [Gerrit] Fixed "wfTimestamp() fed bogus time value" errors - change (mediawiki/core)

2015-06-09 Thread Aaron Schulz (Code Review)

Aaron Schulz has uploaded a new change for review.

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

Change subject: Fixed "wfTimestamp() fed bogus time value" errors
..

Fixed "wfTimestamp() fed bogus time value" errors

* This broke OutputPage::checkLastModified() as the touched time was false

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


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

diff --git a/includes/User.php b/includes/User.php
index fc07b6d..1587edf 100644
--- a/includes/User.php
+++ b/includes/User.php
@@ -2365,7 +2365,7 @@
 
$timestamp = $cache->getCheckKeyTime( $key );
if ( $timestamp ) {
-   $this->mQuickTouched = wfTimestamp( 
TS_MW, $timestamp );
+   $this->mQuickTouched = wfTimestamp( 
TS_MW, (int)$timestamp );
} else {
# Set the timestamp to get HTTP 304 
cache hits
$this->touch();

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I118d3ddf07c7b69ad269f3aee0c70ab4159df192
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.26wmf8
Gerrit-Owner: Aaron Schulz 

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

[MediaWiki-commits] [Gerrit] Fixed "wfTimestamp() fed bogus time value" errors - change (mediawiki/core)

2015-06-09 Thread Aaron Schulz (Code Review)

Aaron Schulz has uploaded a new change for review.

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

Change subject: Fixed "wfTimestamp() fed bogus time value" errors
..

Fixed "wfTimestamp() fed bogus time value" errors

* This broke OutputPage::checkLastModified() as the touched time was false

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


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/06/217206/1

diff --git a/includes/User.php b/includes/User.php
index bf0326a..61313a3 100644
--- a/includes/User.php
+++ b/includes/User.php
@@ -2362,7 +2362,7 @@
 
$timestamp = $cache->getCheckKeyTime( $key );
if ( $timestamp ) {
-   $this->mQuickTouched = wfTimestamp( 
TS_MW, $timestamp );
+   $this->mQuickTouched = wfTimestamp( 
TS_MW, (int)$timestamp );
} else {
# Set the timestamp to get HTTP 304 
cache hits
$this->touch();

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I118d3ddf07c7b69ad269f3aee0c70ab4159df192
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz 

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

[MediaWiki-commits] [Gerrit] ores: Don't ensure latest the deployment repo - change (operations/puppet)

2015-06-09 Thread Yuvipanda (Code Review)

Yuvipanda has submitted this change and it was merged.

Change subject: ores: Don't ensure latest the deployment repo
..


ores: Don't ensure latest the deployment repo

We use fabric for that

Change-Id: I37eb3eaf1e3aa0ad3f079068838cb897c3dbe5da
---
M modules/ores/manifests/web.pp
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/modules/ores/manifests/web.pp b/modules/ores/manifests/web.pp
index 84768cd..33825f1 100644
--- a/modules/ores/manifests/web.pp
+++ b/modules/ores/manifests/web.pp
@@ -50,9 +50,9 @@
 
 git::clone { 'ores-wm-config':
 origin=> 'https://github.com/wiki-ai/ores-wikimedia-config.git',
+ensure=> present,
 directory => $config_path,
 branch=> $branch,
-ensure=> 'latest',
 owner => 'www-data',
 group => 'www-data',
 require   => File['/srv/ores'],

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

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

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

[MediaWiki-commits] [Gerrit] ores: Don't ensure latest the deployment repo - change (operations/puppet)

2015-06-09 Thread Yuvipanda (Code Review)

Yuvipanda has uploaded a new change for review.

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

Change subject: ores: Don't ensure latest the deployment repo
..

ores: Don't ensure latest the deployment repo

We use fabric for that

Change-Id: I37eb3eaf1e3aa0ad3f079068838cb897c3dbe5da
---
M modules/ores/manifests/web.pp
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/modules/ores/manifests/web.pp b/modules/ores/manifests/web.pp
index 84768cd..33825f1 100644
--- a/modules/ores/manifests/web.pp
+++ b/modules/ores/manifests/web.pp
@@ -50,9 +50,9 @@
 
 git::clone { 'ores-wm-config':
 origin=> 'https://github.com/wiki-ai/ores-wikimedia-config.git',
+ensure=> present,
 directory => $config_path,
 branch=> $branch,
-ensure=> 'latest',
 owner => 'www-data',
 group => 'www-data',
 require   => File['/srv/ores'],

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

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

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

[MediaWiki-commits] [Gerrit] Fix finding slugs for merged patches on wmf branches - change (labs...forrestbot)

2015-06-09 Thread Legoktm (Code Review)

Legoktm has submitted this change and it was merged.

Change subject: Fix finding slugs for merged patches on wmf branches
..


Fix finding slugs for merged patches on wmf branches

INFO:forrestbot:https://gerrit.wikimedia.org/r/217179: merged in branch 
wmf/1.26wmf9, Task T101895, needs slugs ['mwwmf/1.26wmf9']
WARNING:forrestbot:No PHID found for slug #mwwmf/1.26wmf9!

Change-Id: Ieb59f751bb6bb97f9327343c4dd935cfeb8d1824
---
M forrestbot.py
1 file changed, 3 insertions(+), 0 deletions(-)

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



diff --git a/forrestbot.py b/forrestbot.py
index 378748a..3a0901a 100644
--- a/forrestbot.py
+++ b/forrestbot.py
@@ -83,6 +83,7 @@
 
 REL1_23 --> mw1.23
 1.23wmf6 -> mw1.23wmf6
+wmf/1.26wmf9 -> mw1.26wmf9
 
 :param branch: Branch name
 :return: Slugified branch name
@@ -90,6 +91,8 @@
 if branch[:3] == "REL":
 major, minor = branch.split("REL")[1].split("_")
 return "mw%s.%s" % (major, minor)
+elif branch.startswith('wmf/'):
+return 'mw' + branch[:4]
 elif "wmf" in branch:
 return 'mw'+branch
 else:

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ieb59f751bb6bb97f9327343c4dd935cfeb8d1824
Gerrit-PatchSet: 2
Gerrit-Project: labs/tools/forrestbot
Gerrit-Branch: master
Gerrit-Owner: Legoktm 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: Legoktm 

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

[MediaWiki-commits] [Gerrit] depool db1057 - change (operations/mediawiki-config)

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

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

Change subject: depool db1057
..


depool db1057

Change-Id: Ic67dee5edd083136870175e319c8c8898f983979
---
M wmf-config/db-eqiad.php
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php
index 4b4c0f3..5928a51 100755
--- a/wmf-config/db-eqiad.php
+++ b/wmf-config/db-eqiad.php
@@ -92,7 +92,7 @@
'db1051' => 0,   # 2.8TB  96GB, vslow, dump
'db1055' => 0,   # 2.8TB  96GB, watchlist, recentchanges, 
contributions, logpager
'db1053' => 200, # 2.8TB  96GB
-   'db1057' => 200, # 2.8TB  96GB
+   # minatenance 'db1057' => 200, # 2.8TB  96GB
'db1065' => 100, # 2.8TB 160GB, api
'db1066' => 100, # 2.8TB 160GB, api
'db1072' => 500, # 2.8TB 160GB

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

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

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

[MediaWiki-commits] [Gerrit] labs: Count /data/scratch as shared storage - change (operations/puppet)

2015-06-09 Thread Yuvipanda (Code Review)

Yuvipanda has submitted this change and it was merged.

Change subject: labs: Count /data/scratch as shared storage
..


labs: Count /data/scratch as shared storage

Bug: T101660
Change-Id: Ied4295e3845450bfdb78f53f085f1885f1214e32
---
M manifests/role/labs.pp
1 file changed, 12 insertions(+), 12 deletions(-)

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



diff --git a/manifests/role/labs.pp b/manifests/role/labs.pp
index 3b3ade7..6ddc81b 100644
--- a/manifests/role/labs.pp
+++ b/manifests/role/labs.pp
@@ -79,20 +79,20 @@
 device  => "${nfs_server}:/project/${instanceproject}/project",
 require => File['/data/project', '/etc/modprobe.d/nfs-no-idmap'],
 }
-}
 
-file { '/data/scratch':
-ensure  => directory,
-require => File['/data'],
-}
+file { '/data/scratch':
+ensure  => directory,
+require => File['/data'],
+}
 
-mount { '/data/scratch':
-ensure  => mounted,
-atboot  => true,
-fstype  => 'nfs',
-options => "rw,${nfs_opts}",
-device  => "${nfs_server}:/scratch",
-require => File['/data/scratch', '/etc/modprobe.d/nfs-no-idmap'],
+mount { '/data/scratch':
+ensure  => mounted,
+atboot  => true,
+fstype  => 'nfs',
+options => "rw,${nfs_opts}",
+device  => "${nfs_server}:/scratch",
+require => File['/data/scratch', '/etc/modprobe.d/nfs-no-idmap'],
+}
 }
 
 file { '/public/dumps':

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

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

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

[MediaWiki-commits] [Gerrit] labs: Count /data/scratch as shared storage - change (operations/puppet)

2015-06-09 Thread Yuvipanda (Code Review)

Yuvipanda has uploaded a new change for review.

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

Change subject: labs: Count /data/scratch as shared storage
..

labs: Count /data/scratch as shared storage

Bug: T101660
Change-Id: Ied4295e3845450bfdb78f53f085f1885f1214e32
---
M manifests/role/labs.pp
1 file changed, 12 insertions(+), 12 deletions(-)


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

diff --git a/manifests/role/labs.pp b/manifests/role/labs.pp
index 3b3ade7..6ddc81b 100644
--- a/manifests/role/labs.pp
+++ b/manifests/role/labs.pp
@@ -79,20 +79,20 @@
 device  => "${nfs_server}:/project/${instanceproject}/project",
 require => File['/data/project', '/etc/modprobe.d/nfs-no-idmap'],
 }
-}
 
-file { '/data/scratch':
-ensure  => directory,
-require => File['/data'],
-}
+file { '/data/scratch':
+ensure  => directory,
+require => File['/data'],
+}
 
-mount { '/data/scratch':
-ensure  => mounted,
-atboot  => true,
-fstype  => 'nfs',
-options => "rw,${nfs_opts}",
-device  => "${nfs_server}:/scratch",
-require => File['/data/scratch', '/etc/modprobe.d/nfs-no-idmap'],
+mount { '/data/scratch':
+ensure  => mounted,
+atboot  => true,
+fstype  => 'nfs',
+options => "rw,${nfs_opts}",
+device  => "${nfs_server}:/scratch",
+require => File['/data/scratch', '/etc/modprobe.d/nfs-no-idmap'],
+}
 }
 
 file { '/public/dumps':

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

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

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

[MediaWiki-commits] [Gerrit] depool db1057 - change (operations/mediawiki-config)

2015-06-09 Thread Springle (Code Review)

Springle has uploaded a new change for review.

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

Change subject: depool db1057
..

depool db1057

Change-Id: Ic67dee5edd083136870175e319c8c8898f983979
---
M wmf-config/db-eqiad.php
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php
index 4b4c0f3..5928a51 100755
--- a/wmf-config/db-eqiad.php
+++ b/wmf-config/db-eqiad.php
@@ -92,7 +92,7 @@
'db1051' => 0,   # 2.8TB  96GB, vslow, dump
'db1055' => 0,   # 2.8TB  96GB, watchlist, recentchanges, 
contributions, logpager
'db1053' => 200, # 2.8TB  96GB
-   'db1057' => 200, # 2.8TB  96GB
+   # minatenance 'db1057' => 200, # 2.8TB  96GB
'db1065' => 100, # 2.8TB 160GB, api
'db1066' => 100, # 2.8TB 160GB, api
'db1072' => 500, # 2.8TB 160GB

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

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

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

[MediaWiki-commits] [Gerrit] Fix finding slugs for merged patches on wmf branches - change (labs...forrestbot)

2015-06-09 Thread Legoktm (Code Review)

Legoktm has uploaded a new change for review.

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

Change subject: Fix finding slugs for merged patches on wmf branches
..

Fix finding slugs for merged patches on wmf branches

Change-Id: Ieb59f751bb6bb97f9327343c4dd935cfeb8d1824
INFO:forrestbot:https://gerrit.wikimedia.org/r/217179: merged in branch 
wmf/1.26wmf9, Task T101895, needs slugs ['mwwmf/1.26wmf9']
WARNING:forrestbot:No PHID found for slug #mwwmf/1.26wmf9!
---
M forrestbot.py
1 file changed, 3 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/labs/tools/forrestbot 
refs/changes/02/217202/1

diff --git a/forrestbot.py b/forrestbot.py
index 378748a..3a0901a 100644
--- a/forrestbot.py
+++ b/forrestbot.py
@@ -83,6 +83,7 @@
 
 REL1_23 --> mw1.23
 1.23wmf6 -> mw1.23wmf6
+wmf/1.26wmf9 -> mw1.26wmf9
 
 :param branch: Branch name
 :return: Slugified branch name
@@ -90,6 +91,8 @@
 if branch[:3] == "REL":
 major, minor = branch.split("REL")[1].split("_")
 return "mw%s.%s" % (major, minor)
+elif branch.startswith('wmf/'):
+return 'mw' + branch[:4]
 elif "wmf" in branch:
 return 'mw'+branch
 else:

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ieb59f751bb6bb97f9327343c4dd935cfeb8d1824
Gerrit-PatchSet: 1
Gerrit-Project: labs/tools/forrestbot
Gerrit-Branch: master
Gerrit-Owner: Legoktm 

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

[MediaWiki-commits] [Gerrit] Split Buggy extension into its own role - change (mediawiki/vagrant)

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

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

Change subject: Split Buggy extension into its own role
..


Split Buggy extension into its own role

Change-Id: I95afb5b9aeedfcadcfbf75774a6906cfdb3a7fbf
---
A puppet/modules/role/files/buggy/VagrantRoleBuggy.wiki
A puppet/modules/role/manifests/buggy.pp
M puppet/modules/role/manifests/sentry.pp
M puppet/modules/role/templates/sentry/VagrantRoleSentry.wiki.erb
4 files changed, 50 insertions(+), 35 deletions(-)

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



diff --git a/puppet/modules/role/files/buggy/VagrantRoleBuggy.wiki 
b/puppet/modules/role/files/buggy/VagrantRoleBuggy.wiki
new file mode 100644
index 000..bdde408
--- /dev/null
+++ b/puppet/modules/role/files/buggy/VagrantRoleBuggy.wiki
@@ -0,0 +1,37 @@
+
+'''Buggy''' is an extension that is intentionally buggy. This is useful when 
you want to test functionality related to bug handling or error reporting. 
Buggy has originally been created to help with the testing of 
[[:mw:Extension:Sentry|]]
+
+
+== Trigger errors ==
+=== Normal ===
+* [{{fullurl:{{FULLPAGENAME}}|buggy=css}} Syntax error in CSS]
+* [{{fullurl:{{FULLPAGENAME}}|buggy=less}} LESS error]
+* [{{fullurl:{{FULLPAGENAME}}|buggy=startup}} Error in module initialization 
code]
+* [{{fullurl:{{FULLPAGENAME}}|buggy=setTimeout}} Error in setTimeout callback]
+* [{{fullurl:{{FULLPAGENAME}}|buggy=onready}} Error in $.ready callback]
+* [{{fullurl:{{FULLPAGENAME}}|buggy=click}} Error in jQuery click handler]
+* [{{fullurl:{{FULLPAGENAME}}|buggy=ajax}} Error in jQuery AJAX success 
handler]
+* [{{fullurl:{{FULLPAGENAME}}|buggy=misc-cb}} Other (unwrapped) callback]
+* [{{fullurl:{{FULLPAGENAME}}|buggy=mwload}} Error in mw.loader.using callback]
+* [{{fullurl:{{FULLPAGENAME}}|buggy=logError}} Manual error reporting]
+* 
[{{fullurl:{{FULLPAGENAME}}|buggy[0]=startup&buggy[1]=setTimeout&buggy[2]=onready&buggy[3]=click}}
 Multiple errors (startup + setTimeout + $.ready + click)]
+
+=== Debug mode ===
+* [{{fullurl:{{FULLPAGENAME}}|debug=1&buggy=css}} Syntax error in CSS]
+* [{{fullurl:{{FULLPAGENAME}}|debug=1&buggy=less}} LESS error]
+* [{{fullurl:{{FULLPAGENAME}}|debug=1&buggy=startup}} Error in module 
initialization code]
+* [{{fullurl:{{FULLPAGENAME}}|debug=1&buggy=setTimeout}} Error in setTimeout 
callback]
+* [{{fullurl:{{FULLPAGENAME}}|debug=1&buggy=onready}} Error in $.ready 
callback]
+* [{{fullurl:{{FULLPAGENAME}}|debug=1&buggy=click}} Error in jQuery click 
handler]
+* [{{fullurl:{{FULLPAGENAME}}|debug=1&buggy=ajax}} Error in jQuery AJAX 
success handler]
+* [{{fullurl:{{FULLPAGENAME}}|debug=1&buggy=misc-cb}} Other (unwrapped) 
callback]
+* [{{fullurl:{{FULLPAGENAME}}|debug=1&buggy=mwload}} Error in mw.loader.using 
callback]
+* [{{fullurl:{{FULLPAGENAME}}|debug=1&buggy=logError}} Manual error reporting]
+* 
[{{fullurl:{{FULLPAGENAME}}|debug=1&buggy[0]=startup&buggy[1]=setTimeout&buggy[2]=onready&buggy[3]=click}}
 Multiple errors (startup + setTimeout + $.ready + click)]
+
+=== Server-side ===
+* [{{fullurl:{{FULLPAGENAME}}|buggy=php-exception}} PHP exception]
+* [{{fullurl:{{FULLPAGENAME}}|buggy=php-mwexception}} PHP MWException]
+* [{{fullurl:{{FULLPAGENAME}}|buggy=missing-class}} Using non-existent class]
+* [{{fullurl:{{FULLPAGENAME}}|buggy=sql}} SQL error]
+* [{{SERVER}}/w/api.php?action=buggy API error]
diff --git a/puppet/modules/role/manifests/buggy.pp 
b/puppet/modules/role/manifests/buggy.pp
new file mode 100644
index 000..f4bee3f
--- /dev/null
+++ b/puppet/modules/role/manifests/buggy.pp
@@ -0,0 +1,11 @@
+# == Class: role::buggy
+# Buggy extension - an extension that generates bugs.
+#
+class role::buggy {
+mediawiki::extension { 'Buggy': }
+
+mediawiki::import_text { 'VagrantRoleBuggy':
+source => 'puppet:///modules/role/buggy/VagrantRoleBuggy.wiki',
+}
+}
+
diff --git a/puppet/modules/role/manifests/sentry.pp 
b/puppet/modules/role/manifests/sentry.pp
index 6405470..2cd4024 100644
--- a/puppet/modules/role/manifests/sentry.pp
+++ b/puppet/modules/role/manifests/sentry.pp
@@ -9,6 +9,7 @@
 $dsn,
 ) {
 include ::sentry
+include ::role::buggy
 
 mediawiki::extension { 'Sentry':
 settings => [
@@ -17,8 +18,6 @@
 "\$wgSentryDsn = trim(file_get_contents('${dsn}'));",
 ],
 }
-
-mediawiki::extension { 'Buggy': }
 
 mediawiki::import_text{ 'VagrantRoleSentry':
 content => template('role/sentry/VagrantRoleSentry.wiki.erb'),
diff --git a/puppet/modules/role/templates/sentry/VagrantRoleSentry.wiki.erb 
b/puppet/modules/role/templates/sentry/VagrantRoleSentry.wiki.erb
index ff67ec9..539b6ba 100644
--- a/puppet/modules/role/templates/sentry/VagrantRoleSentry.wiki.erb
+++ b/puppet/modules/role/templates/sentry/VagrantRoleSentry.wiki.erb
@@ -2,36 +2,4 @@
 
 See [https://www.mediawiki.org/wiki/Extension:Sentry the help page of the 
Sentry extension] fo

[MediaWiki-commits] [Gerrit] Update FlaggedRevs for cherry-picks - change (mediawiki/core)

2015-06-09 Thread Ori.livneh (Code Review)

Ori.livneh has submitted this change and it was merged.

Change subject: Update FlaggedRevs for cherry-picks
..


Update FlaggedRevs for cherry-picks

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

Approvals:
  Ori.livneh: Verified; Looks good to me, approved



diff --git a/extensions/FlaggedRevs b/extensions/FlaggedRevs
index c82d400..30949e3 16
--- a/extensions/FlaggedRevs
+++ b/extensions/FlaggedRevs
-Subproject commit c82d400e821323d222934ab6c769fc939bd6
+Subproject commit 30949e3208a4487179a5090385e1bd868d0ea21a

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie9c67cd45b7ea3626b9af8ad784b82158da16407
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.26wmf9
Gerrit-Owner: Ori.livneh 
Gerrit-Reviewer: Ori.livneh 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Update FlaggedRevs for cherry-picks - change (mediawiki/core)

2015-06-09 Thread Ori.livneh (Code Review)

Ori.livneh has submitted this change and it was merged.

Change subject: Update FlaggedRevs for cherry-picks
..


Update FlaggedRevs for cherry-picks

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

Approvals:
  Ori.livneh: Verified; Looks good to me, approved



diff --git a/extensions/FlaggedRevs b/extensions/FlaggedRevs
index 21d871c..8f5d153 16
--- a/extensions/FlaggedRevs
+++ b/extensions/FlaggedRevs
-Subproject commit 21d871c7f0539188abc61d79577264abb3351773
+Subproject commit 8f5d153f18ca0347dec50083bf0c2df7d12ca798

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I03c413145c424c859d8f27013c956c3338484762
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.26wmf8
Gerrit-Owner: Ori.livneh 
Gerrit-Reviewer: Ori.livneh 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Update FlaggedRevs for cherry-picks - change (mediawiki/core)

2015-06-09 Thread Ori.livneh (Code Review)

Ori.livneh has uploaded a new change for review.

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

Change subject: Update FlaggedRevs for cherry-picks
..

Update FlaggedRevs for cherry-picks

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


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/01/217201/1

diff --git a/extensions/FlaggedRevs b/extensions/FlaggedRevs
index c82d400..30949e3 16
--- a/extensions/FlaggedRevs
+++ b/extensions/FlaggedRevs
-Subproject commit c82d400e821323d222934ab6c769fc939bd6
+Subproject commit 30949e3208a4487179a5090385e1bd868d0ea21a

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie9c67cd45b7ea3626b9af8ad784b82158da16407
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.26wmf9
Gerrit-Owner: Ori.livneh 

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

[MediaWiki-commits] [Gerrit] Update FlaggedRevs for cherry-picks - change (mediawiki/core)

2015-06-09 Thread Ori.livneh (Code Review)

Ori.livneh has uploaded a new change for review.

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

Change subject: Update FlaggedRevs for cherry-picks
..

Update FlaggedRevs for cherry-picks

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


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/00/217200/1

diff --git a/extensions/FlaggedRevs b/extensions/FlaggedRevs
index 21d871c..8f5d153 16
--- a/extensions/FlaggedRevs
+++ b/extensions/FlaggedRevs
-Subproject commit 21d871c7f0539188abc61d79577264abb3351773
+Subproject commit 8f5d153f18ca0347dec50083bf0c2df7d12ca798

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I03c413145c424c859d8f27013c956c3338484762
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.26wmf8
Gerrit-Owner: Ori.livneh 

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

[MediaWiki-commits] [Gerrit] Avoid extra post-save parse that can sometimes occur - change (mediawiki...FlaggedRevs)

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

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

Change subject: Avoid extra post-save parse that can sometimes occur
..


Avoid extra post-save parse that can sometimes occur

* Just avoid the purges in stableVersionUpdates() when they are
  already pointless, which also avoids this problem

Change-Id: I5c0ade287576358f389757ca4bde784a204e19ef
(cherry picked from commit ccf2a434b7cc6e3af9873210efa9f59fd9d60f62)
---
M backend/FlaggedRevs.class.php
1 file changed, 8 insertions(+), 3 deletions(-)

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



diff --git a/backend/FlaggedRevs.class.php b/backend/FlaggedRevs.class.php
old mode 100644
new mode 100755
index ff4c010..927ac78
--- a/backend/FlaggedRevs.class.php
+++ b/backend/FlaggedRevs.class.php
@@ -569,6 +569,7 @@
 * @param FlaggedRevision|null $oldSv, the old stable version (optional)
 * @param Object editInfo Article edit info about the current revision 
(optional)
 * @return bool stable version text/file changed and FR_INCLUDES_STABLE
+* @throws Exception
 */
public static function stableVersionUpdates(
$page, $sv = null, $oldSv = null, $editInfo = null
@@ -618,9 +619,13 @@
}
# Lazily rebuild dependancies on next parse (we invalidate 
below)
FlaggedRevs::clearStableOnlyDeps( $title->getArticleID() );
-   # Clear page cache
-   $title->invalidateCache();
-   self::purgeSquid( $title );
+   # Clear page cache unless this is hooked via 
ArticleEditUpdates, in
+   # which case these updates will happen already with tuned 
timestamps
+   if ( !$editInfo ) {
+   $title->invalidateCache();
+   self::purgeSquid( $title );
+   }
+
return $changed;
}
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I5c0ade287576358f389757ca4bde784a204e19ef
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/FlaggedRevs
Gerrit-Branch: wmf/1.26wmf9
Gerrit-Owner: Aaron Schulz 
Gerrit-Reviewer: Jackmcbarn 
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] Make Sentry actually lazy-load - change (mediawiki...Sentry)

2015-06-09 Thread Code Review

Gergő Tisza has uploaded a new change for review.

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

Change subject: Make Sentry actually lazy-load
..

Make Sentry actually lazy-load

(backport from 5c9fa39dcb679e0426789549581714b7b0696318 to REL1_23)

Also update some stuff that changed in core during the reviews
(window.onerror event name + arguments) and remove functionality
that did not get through the review (error ids, async callback
error reports).

The way sinon.js is used to stub window.Raven is undocumented
but recommended by the author so should be safe:
https://github.com/cjohansen/Sinon.JS/issues/23#issuecomment-1434679

Bug: T88874
Change-Id: I0b3d1518316e6ed9b7de9161952fad2f90f0bcd0
---
M Sentry.php
M SentryHooks.php
M resources/init.js
M tests/qunit/init.test.js
4 files changed, 27 insertions(+), 31 deletions(-)


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

diff --git a/Sentry.php b/Sentry.php
index 6026e2f..f80f939 100644
--- a/Sentry.php
+++ b/Sentry.php
@@ -15,12 +15,13 @@
 $wgAutoloadClasses['SentryHooks'] = __DIR__ . '/SentryHooks.php';
 
 $wgResourceModules += array(
-   'sentry' => array(
-   'scripts' => array(
-   'raven/raven.js',
-   'init.js',
-   ),
-   'position' => 'top',
+   'sentry.init' => array(
+   'scripts' => array( 'init.js' ),
+   'localBasePath' => __DIR__ . '/resources',
+   'remoteExtPath' => 'Sentry/resources',
+   ),
+   'sentry.raven' => array(
+   'scripts' => array( 'raven/raven.js' ),
'localBasePath' => __DIR__ . '/resources',
'remoteExtPath' => 'Sentry/resources',
),
diff --git a/SentryHooks.php b/SentryHooks.php
index 1ed5d2f..c653f8a 100644
--- a/SentryHooks.php
+++ b/SentryHooks.php
@@ -23,7 +23,7 @@
 * @return bool
 */
public static function onBeforePageDisplay( &$out, &$skin ) {
-   $out->addModules( array( 'sentry' ) );
+   $out->addModules( array( 'sentry.init' ) );
 
return true;
}
@@ -35,7 +35,7 @@
public static function onResourceLoaderTestModules( array 
&$testModules, ResourceLoader &$resourceLoader ) {
$testModules['qunit']['sentry.test'] = array(
'scripts' => array( 'init.test.js' ),
-   'dependencies' => array( 'sentry' ),
+   'dependencies' => array( 'sentry.init' ),
'localBasePath' => __DIR__ . '/tests/qunit',
'remoteExtPath' => 'Sentry/tests/qunit',
);
diff --git a/resources/init.js b/resources/init.js
index d8644ea..6b8e22b 100644
--- a/resources/init.js
+++ b/resources/init.js
@@ -5,7 +5,7 @@
 * @return {jQuery.Deferred} a deferred with the Raven.js object
 */
function initRaven() {
-   return mw.loader.using( 'sentry' ).then( function () {
+   return mw.loader.using( 'sentry.raven' ).then( function () {
if ( !raven ) {
var config = mw.config.get( 'wgSentry' ),
options = {};
@@ -51,31 +51,28 @@
 */
function report( topic, data ) {
mw.sentry.initRaven().done( function ( raven ) {
-   var tags = { source: data.source },
-   log = window.console && ( console.warn || 
console.log );
+   var tags = { source: data.source };
 
if ( data.module ) {
tags.module = data.module;
}
$.extend( tags, data.context );
 
-   raven.captureException( data.exception, { tags: tags, 
event_id: data.id } );
-
-   if ( log ) {
-   log.call( console, 'MediaWiki error logging: 
reported an error with id ' + data.id );
-   log.call( console, 'Please refer to this error 
id when reporting an error.' );
-   }
+   raven.captureException( data.exception, { tags: tags } 
);
} );
}
 
-   mw.trackSubscribe( 'errorLogging.exception', report );
+   // make these available for unit tests
+   mw.sentry = { initRaven: initRaven, report: report };
+
mw.trackSubscribe( 'resourceloader.exception', report );
 
-   mw.trackSubscribe( 'errorLogging.windowOnerror', function ( topic, data 
) {
+   mw.trackSubscribe( 'global.error', function ( topic, data ) {
mw.sentry.initRaven().done( function ( raven ) {
// By this point, Raven replaced the old 
window.onerror; we need to process errors

[MediaWiki-commits] [Gerrit] Set defaultbranch for REL1_23 - change (mediawiki...Sentry)

2015-06-09 Thread Code Review

Gergő Tisza has uploaded a new change for review.

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

Change subject: Set defaultbranch for REL1_23
..

Set defaultbranch for REL1_23

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


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

diff --git a/.gitreview b/.gitreview
index 01c1e6c..44332aa 100644
--- a/.gitreview
+++ b/.gitreview
@@ -2,5 +2,5 @@
 host=gerrit.wikimedia.org
 port=29418
 project=mediawiki/extensions/Sentry.git
-defaultbranch=master
+defaultbranch=REL1_23
 defaultrebase=0

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6423dd38e149e57dc26d3f7f7190a8acb0de7148
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Sentry
Gerrit-Branch: REL1_23
Gerrit-Owner: Gergő Tisza 

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

[MediaWiki-commits] [Gerrit] Backport core window.onerror snippet for 1.24 - change (mediawiki...Sentry)

2015-06-09 Thread Code Review

Gergő Tisza has uploaded a new change for review.

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

Change subject: Backport core window.onerror snippet for 1.24
..

Backport core window.onerror snippet for 1.24

Bug: T100090
Change-Id: Ib3e9d94a5717c89f7da73dc3439563940cfc4e1d
---
M resources/init.js
1 file changed, 20 insertions(+), 0 deletions(-)


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

diff --git a/resources/init.js b/resources/init.js
index 5a2691f..116e1fc 100644
--- a/resources/init.js
+++ b/resources/init.js
@@ -81,4 +81,24 @@
raven.captureMessage( error, { source: 'EventLogging' } 
);
} );
} );
+
+   // 1.23 BC - starting 1.25, this block is in core
+   function installGlobalHandler() {
+   // We will preserve the return value of the previous handler. 
window.onerror works the
+   // opposite way than normal event handlers (returning true will 
prevent the default
+   // action, returning false will let the browser handle the 
error normally, by e.g.
+   // logging to the console), so our fallback old handler needs 
to return false.
+   var oldHandler = window.onerror || function () { return false; 
};
+
+   /**
+* Dumb window.onerror handler which forwards the errors via 
mw.track.
+* @fires global_error
+*/
+   window.onerror = function ( errorMessage, url, lineNumber, 
columnNumber, errorObject ) {
+   mw.track( 'global.error', { errorMessage: errorMessage, 
url: url,
+   lineNumber: lineNumber, columnNumber: 
columnNumber, errorObject: errorObject } );
+   return oldHandler.apply( this, arguments );
+   };
+   }
+   installGlobalHandler();
 } ) ( mediaWiki, jQuery );

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib3e9d94a5717c89f7da73dc3439563940cfc4e1d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Sentry
Gerrit-Branch: master
Gerrit-Owner: Gergő Tisza 

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

[MediaWiki-commits] [Gerrit] Avoid extra post-save parse that can sometimes occur - change (mediawiki...FlaggedRevs)

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

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

Change subject: Avoid extra post-save parse that can sometimes occur
..


Avoid extra post-save parse that can sometimes occur

* Just avoid the purges in stableVersionUpdates() when they are
  already pointless, which also avoids this problem

Change-Id: I5c0ade287576358f389757ca4bde784a204e19ef
(cherry picked from commit ccf2a434b7cc6e3af9873210efa9f59fd9d60f62)
---
M backend/FlaggedRevs.class.php
1 file changed, 8 insertions(+), 3 deletions(-)

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



diff --git a/backend/FlaggedRevs.class.php b/backend/FlaggedRevs.class.php
old mode 100644
new mode 100755
index ff4c010..927ac78
--- a/backend/FlaggedRevs.class.php
+++ b/backend/FlaggedRevs.class.php
@@ -569,6 +569,7 @@
 * @param FlaggedRevision|null $oldSv, the old stable version (optional)
 * @param Object editInfo Article edit info about the current revision 
(optional)
 * @return bool stable version text/file changed and FR_INCLUDES_STABLE
+* @throws Exception
 */
public static function stableVersionUpdates(
$page, $sv = null, $oldSv = null, $editInfo = null
@@ -618,9 +619,13 @@
}
# Lazily rebuild dependancies on next parse (we invalidate 
below)
FlaggedRevs::clearStableOnlyDeps( $title->getArticleID() );
-   # Clear page cache
-   $title->invalidateCache();
-   self::purgeSquid( $title );
+   # Clear page cache unless this is hooked via 
ArticleEditUpdates, in
+   # which case these updates will happen already with tuned 
timestamps
+   if ( !$editInfo ) {
+   $title->invalidateCache();
+   self::purgeSquid( $title );
+   }
+
return $changed;
}
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I5c0ade287576358f389757ca4bde784a204e19ef
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/FlaggedRevs
Gerrit-Branch: wmf/1.26wmf8
Gerrit-Owner: Aaron Schulz 
Gerrit-Reviewer: Jackmcbarn 
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] Revert some parts of 217002 which got implicitly merged. - change (apps...wikipedia)

2015-06-09 Thread Mhurd (Code Review)

Mhurd has uploaded a new change for review.

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

Change subject: Revert some parts of 217002 which got implicitly merged.
..

Revert some parts of 217002 which got implicitly merged.

Not sure how, but this was merged w/o review and had some
changes to the bundled image protocol handler which were
experimental.

Change-Id: I13f4ccb15e50080923f307100c6293eb15c8e271
---
M Wikipedia/Protocols/WMFBundledImageProtocol.m
M Wikipedia/View Controllers/WebView/WebViewController.m
M Wikipedia/assets/about.html
M www/about.html
4 files changed, 15 insertions(+), 17 deletions(-)


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

diff --git a/Wikipedia/Protocols/WMFBundledImageProtocol.m 
b/Wikipedia/Protocols/WMFBundledImageProtocol.m
index 6f754df..224f65b 100644
--- a/Wikipedia/Protocols/WMFBundledImageProtocol.m
+++ b/Wikipedia/Protocols/WMFBundledImageProtocol.m
@@ -27,19 +27,17 @@
 - (void)startLoading {
 NSString* fileName = [self.request.URL wmf_getValue];
 
-UIImage* image = [UIImage imageNamed:fileName];
-if (!image) {
-[[self client] URLProtocol:self didFailWithError:[NSError 
errorWithDomain:NSCocoaErrorDomain code:NSFileNoSuchFileError userInfo:nil]];
-return;
-}
-
-NSData* data = UIImagePNGRepresentation(image);
-NSAssert(data.length, @"Image \"%@\" is empty!", fileName);
-
 NSURLResponse* response = [[NSURLResponse alloc] 
initWithURL:self.request.URL
-MIMEType:@"image/png"
-   expectedContentLength:data.length
-textEncodingName:@"binary"];
+MIMEType:[kImageSlash 
stringByAppendingString:[fileName pathExtension]]
+   expectedContentLength:-1
+textEncodingName:nil];
+
+NSString* imagePath = [[NSBundle mainBundle] pathForResource:[fileName 
stringByDeletingPathExtension]
+  ofType:[fileName 
pathExtension]];
+
+NSData* data = [NSData dataWithContentsOfFile:imagePath];
+
+NSAssert(data.length, @"Image \"%@\" is empty!", fileName);
 
 [[self client] URLProtocol:self didReceiveResponse:response 
cacheStoragePolicy:NSURLCacheStorageNotAllowed];
 [[self client] URLProtocol:self didLoadData:data];
@@ -49,4 +47,4 @@
 - (void)stopLoading {
 }
 
-@end
+@end
\ No newline at end of file
diff --git a/Wikipedia/View Controllers/WebView/WebViewController.m 
b/Wikipedia/View Controllers/WebView/WebViewController.m
index 90c672b..9808f3f 100644
--- a/Wikipedia/View Controllers/WebView/WebViewController.m
+++ b/Wikipedia/View Controllers/WebView/WebViewController.m
@@ -1561,7 +1561,7 @@
@"%@;"
"background-position: 50%% %ld%%;",
article.imageURL,
-   [article.image isCached] ? @"" : 
@",url('wmf://bundledImage/lead-default')",
+   [article.image isCached] ? @"" : 
@",url('wmf://bundledImage/lead-default.png')",
offsetY];
 
 NSString* leadImageHtml =
@@ -1626,7 +1626,7 @@
 }
 
 + (NSString*)hidePlaceholderJS {
-return @"document.getElementById('lead_image_div').style.backgroundImage = 
document.getElementById('lead_image_div').style.backgroundImage.replace('wmf://bundledImage/lead-default',
 'wmf://bundledImage/empty');";
+return @"document.getElementById('lead_image_div').style.backgroundImage = 
document.getElementById('lead_image_div').style.backgroundImage.replace('wmf://bundledImage/lead-default.png',
 'wmf://bundledImage/empty.png');";
 }
 
 - (void)leadImageHidePlaceHolderAndCenterOnFaceIfNeeded:(CGRect)rect {
diff --git a/Wikipedia/assets/about.html b/Wikipedia/assets/about.html
index 52a5665..d979f2a 100644
--- a/Wikipedia/assets/about.html
+++ b/Wikipedia/assets/about.html
@@ -96,7 +96,7 @@
 
 
 
-
+
 
 
 footer
diff --git a/www/about.html b/www/about.html
index 52a5665..d979f2a 100644
--- a/www/about.html
+++ b/www/about.html
@@ -96,7 +96,7 @@
 
 
 
-
+
 
 
 footer

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I13f4ccb15e50080923f307100c6293eb15c8e271
Gerrit-PatchSet: 1
Gerrit-Project: apps/ios/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Mhurd 

___
MediaWiki-commits mailing list
Medi

[MediaWiki-commits] [Gerrit] Avoid extra post-save parse that can sometimes occur - change (mediawiki...FlaggedRevs)

2015-06-09 Thread Aaron Schulz (Code Review)

Aaron Schulz has uploaded a new change for review.

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

Change subject: Avoid extra post-save parse that can sometimes occur
..

Avoid extra post-save parse that can sometimes occur

* Just avoid the purges in stableVersionUpdates() when they are
  already pointless, which also avoids this problem

Change-Id: I5c0ade287576358f389757ca4bde784a204e19ef
(cherry picked from commit ccf2a434b7cc6e3af9873210efa9f59fd9d60f62)
---
M backend/FlaggedRevs.class.php
1 file changed, 8 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/FlaggedRevs 
refs/changes/95/217195/1

diff --git a/backend/FlaggedRevs.class.php b/backend/FlaggedRevs.class.php
old mode 100644
new mode 100755
index ff4c010..927ac78
--- a/backend/FlaggedRevs.class.php
+++ b/backend/FlaggedRevs.class.php
@@ -569,6 +569,7 @@
 * @param FlaggedRevision|null $oldSv, the old stable version (optional)
 * @param Object editInfo Article edit info about the current revision 
(optional)
 * @return bool stable version text/file changed and FR_INCLUDES_STABLE
+* @throws Exception
 */
public static function stableVersionUpdates(
$page, $sv = null, $oldSv = null, $editInfo = null
@@ -618,9 +619,13 @@
}
# Lazily rebuild dependancies on next parse (we invalidate 
below)
FlaggedRevs::clearStableOnlyDeps( $title->getArticleID() );
-   # Clear page cache
-   $title->invalidateCache();
-   self::purgeSquid( $title );
+   # Clear page cache unless this is hooked via 
ArticleEditUpdates, in
+   # which case these updates will happen already with tuned 
timestamps
+   if ( !$editInfo ) {
+   $title->invalidateCache();
+   self::purgeSquid( $title );
+   }
+
return $changed;
}
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I5c0ade287576358f389757ca4bde784a204e19ef
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/FlaggedRevs
Gerrit-Branch: wmf/1.26wmf8
Gerrit-Owner: Aaron Schulz 

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

[MediaWiki-commits] [Gerrit] Avoid extra post-save parse that can sometimes occur - change (mediawiki...FlaggedRevs)

2015-06-09 Thread Aaron Schulz (Code Review)

Aaron Schulz has uploaded a new change for review.

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

Change subject: Avoid extra post-save parse that can sometimes occur
..

Avoid extra post-save parse that can sometimes occur

* Just avoid the purges in stableVersionUpdates() when they are
  already pointless, which also avoids this problem

Change-Id: I5c0ade287576358f389757ca4bde784a204e19ef
(cherry picked from commit ccf2a434b7cc6e3af9873210efa9f59fd9d60f62)
---
M backend/FlaggedRevs.class.php
1 file changed, 8 insertions(+), 3 deletions(-)


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

diff --git a/backend/FlaggedRevs.class.php b/backend/FlaggedRevs.class.php
old mode 100644
new mode 100755
index ff4c010..927ac78
--- a/backend/FlaggedRevs.class.php
+++ b/backend/FlaggedRevs.class.php
@@ -569,6 +569,7 @@
 * @param FlaggedRevision|null $oldSv, the old stable version (optional)
 * @param Object editInfo Article edit info about the current revision 
(optional)
 * @return bool stable version text/file changed and FR_INCLUDES_STABLE
+* @throws Exception
 */
public static function stableVersionUpdates(
$page, $sv = null, $oldSv = null, $editInfo = null
@@ -618,9 +619,13 @@
}
# Lazily rebuild dependancies on next parse (we invalidate 
below)
FlaggedRevs::clearStableOnlyDeps( $title->getArticleID() );
-   # Clear page cache
-   $title->invalidateCache();
-   self::purgeSquid( $title );
+   # Clear page cache unless this is hooked via 
ArticleEditUpdates, in
+   # which case these updates will happen already with tuned 
timestamps
+   if ( !$editInfo ) {
+   $title->invalidateCache();
+   self::purgeSquid( $title );
+   }
+
return $changed;
}
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I5c0ade287576358f389757ca4bde784a204e19ef
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/FlaggedRevs
Gerrit-Branch: wmf/1.26wmf9
Gerrit-Owner: Aaron Schulz 

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

[MediaWiki-commits] [Gerrit] ores: Switch to newer deployment model - change (operations/puppet)

2015-06-09 Thread Yuvipanda (Code Review)

Yuvipanda has submitted this change and it was merged.

Change subject: ores: Switch to newer deployment model
..


ores: Switch to newer deployment model

Change-Id: I67428d38bd8f4d526ad2fa06e913bd417ad0fb9c
---
M modules/ores/manifests/web.pp
1 file changed, 7 insertions(+), 8 deletions(-)

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



diff --git a/modules/ores/manifests/web.pp b/modules/ores/manifests/web.pp
index 8184f21..84768cd 100644
--- a/modules/ores/manifests/web.pp
+++ b/modules/ores/manifests/web.pp
@@ -25,7 +25,7 @@
 'myspell-en-gb', 'myspell-en-us',
 'myspell-en-za', 'myspell-fr')
 
-$src_path = '/srv/ores/src'
+$config_path = '/srv/ores/config'
 $venv_path = '/srv/ores/venv'
 $data_path = '/srv/ores/data'
 
@@ -48,9 +48,9 @@
 require => File['/srv'],
 }
 
-git::clone { 'ores-src':
-origin=> 
'https://github.com/halfak/Objective-Revision-Evaluation-Service.git',
-directory => $src_path,
+git::clone { 'ores-wm-config':
+origin=> 'https://github.com/wiki-ai/ores-wikimedia-config.git',
+directory => $config_path,
 branch=> $branch,
 ensure=> 'latest',
 owner => 'www-data',
@@ -62,12 +62,11 @@
 settings => {
 uwsgi => {
 plugins => 'python3',
-protocol=> 'uwsgi',
-'wsgi-file' => "${src_path}/ores.wsgi",
+'wsgi-file' => "${config_path}/ores.wmflabs.org.wsgi",
 master  => true,
-chdir   => $src_path,
+chdir   => $config_path,
 http-socket => '0.0.0.0:8080',
-venv=> '/srv/ores/venv',
+venv=> $venv_path,
 processes   => inline_template('<%= @processorcount.to_i * 4 
%>'),
 }
 }

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

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

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

[MediaWiki-commits] [Gerrit] ores: Switch to newer deployment model - change (operations/puppet)

2015-06-09 Thread Yuvipanda (Code Review)

Yuvipanda has uploaded a new change for review.

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

Change subject: ores: Switch to newer deployment model
..

ores: Switch to newer deployment model

Change-Id: I67428d38bd8f4d526ad2fa06e913bd417ad0fb9c
---
M modules/ores/manifests/web.pp
1 file changed, 7 insertions(+), 8 deletions(-)


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

diff --git a/modules/ores/manifests/web.pp b/modules/ores/manifests/web.pp
index 8184f21..84768cd 100644
--- a/modules/ores/manifests/web.pp
+++ b/modules/ores/manifests/web.pp
@@ -25,7 +25,7 @@
 'myspell-en-gb', 'myspell-en-us',
 'myspell-en-za', 'myspell-fr')
 
-$src_path = '/srv/ores/src'
+$config_path = '/srv/ores/config'
 $venv_path = '/srv/ores/venv'
 $data_path = '/srv/ores/data'
 
@@ -48,9 +48,9 @@
 require => File['/srv'],
 }
 
-git::clone { 'ores-src':
-origin=> 
'https://github.com/halfak/Objective-Revision-Evaluation-Service.git',
-directory => $src_path,
+git::clone { 'ores-wm-config':
+origin=> 'https://github.com/wiki-ai/ores-wikimedia-config.git',
+directory => $config_path,
 branch=> $branch,
 ensure=> 'latest',
 owner => 'www-data',
@@ -62,12 +62,11 @@
 settings => {
 uwsgi => {
 plugins => 'python3',
-protocol=> 'uwsgi',
-'wsgi-file' => "${src_path}/ores.wsgi",
+'wsgi-file' => "${config_path}/ores.wmflabs.org.wsgi",
 master  => true,
-chdir   => $src_path,
+chdir   => $config_path,
 http-socket => '0.0.0.0:8080',
-venv=> '/srv/ores/venv',
+venv=> $venv_path,
 processes   => inline_template('<%= @processorcount.to_i * 4 
%>'),
 }
 }

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

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

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

[MediaWiki-commits] [Gerrit] ores: Fix typo in role definition - change (operations/puppet)

2015-06-09 Thread Yuvipanda (Code Review)

Yuvipanda has submitted this change and it was merged.

Change subject: ores: Fix typo in role definition
..


ores: Fix typo in role definition

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

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



diff --git a/manifests/role/labsores.pp b/manifests/role/labsores.pp
index ffc6447..fd3a52c 100644
--- a/manifests/role/labsores.pp
+++ b/manifests/role/labsores.pp
@@ -27,7 +27,7 @@
 
 class role::labs::ores::staging {
 
-class { '::ores::lb':
+class { '::ores::web':
 branch => 'staging',
 }
 

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

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

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

[MediaWiki-commits] [Gerrit] ores: Fix typo in role definition - change (operations/puppet)

2015-06-09 Thread Yuvipanda (Code Review)

Yuvipanda has uploaded a new change for review.

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

Change subject: ores: Fix typo in role definition
..

ores: Fix typo in role definition

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


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

diff --git a/manifests/role/labsores.pp b/manifests/role/labsores.pp
index ffc6447..fd3a52c 100644
--- a/manifests/role/labsores.pp
+++ b/manifests/role/labsores.pp
@@ -27,7 +27,7 @@
 
 class role::labs::ores::staging {
 
-class { '::ores::lb':
+class { '::ores::web':
 branch => 'staging',
 }
 

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

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

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

[MediaWiki-commits] [Gerrit] ores: Add redis and redisproxy roles / classes - change (operations/puppet)

2015-06-09 Thread Yuvipanda (Code Review)

Yuvipanda has submitted this change and it was merged.

Change subject: ores: Add redis and redisproxy roles / classes
..


ores: Add redis and redisproxy roles / classes

Change-Id: I7234c931709d9f17d302306d1bdaa69853c18390
---
M manifests/role/labsores.pp
A modules/ores/manifests/redis.pp
A modules/ores/manifests/redisproxy.pp
3 files changed, 33 insertions(+), 0 deletions(-)

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



diff --git a/manifests/role/labsores.pp b/manifests/role/labsores.pp
index 7113f21..ffc6447 100644
--- a/manifests/role/labsores.pp
+++ b/manifests/role/labsores.pp
@@ -1,5 +1,15 @@
 class role::labs::ores::web {
 include ::ores::web
+
+class { '::ores::redisproxy':
+server => hiera('redis_server'),
+}
+}
+
+class role::labs::ores::redis {
+class { '::ores::redis':
+maxmemory => '3G',
+}
 }
 
 class role::labs::ores::lb(
@@ -25,4 +35,12 @@
 realservers => [ 'localhost:8080' ],
 cache   => false,
 }
+
+class { '::ores::redis':
+maxmemory => '256M',
+}
+
+class { '::ores::redisproxy':
+server => 'localhost',
+}
 }
diff --git a/modules/ores/manifests/redis.pp b/modules/ores/manifests/redis.pp
new file mode 100644
index 000..fba04bf
--- /dev/null
+++ b/modules/ores/manifests/redis.pp
@@ -0,0 +1,7 @@
+class ores::redis(
+$maxmemory
+) {
+class { '::redis':
+maxmemory => $maxmemory,
+}
+}
diff --git a/modules/ores/manifests/redisproxy.pp 
b/modules/ores/manifests/redisproxy.pp
new file mode 100644
index 000..4f94a10
--- /dev/null
+++ b/modules/ores/manifests/redisproxy.pp
@@ -0,0 +1,8 @@
+class ores::redisproxy(
+$server,
+) {
+host { 'ores-redis':
+ensure => present,
+ip => ipresolve($server, 4, $::nameservers[0]),
+}
+}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I7234c931709d9f17d302306d1bdaa69853c18390
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Yuvipanda 
Gerrit-Reviewer: Yuvipanda 
Gerrit-Reviewer: coren 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] jobrunners: switch to ganglia_new - change (operations/puppet)

2015-06-09 Thread Dzahn (Code Review)

Dzahn has uploaded a new change for review.

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

Change subject: jobrunners: switch to ganglia_new
..

jobrunners: switch to ganglia_new

following the example from I26226ed090cbe5466

Change-Id: If997fa11154c6281ea51d70166f79caa5cc8c8a1
---
M hieradata/common.yaml
M hieradata/regex.yaml
M manifests/site.pp
3 files changed, 5 insertions(+), 6 deletions(-)


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

diff --git a/hieradata/common.yaml b/hieradata/common.yaml
index 09f127b..d2577bb 100644
--- a/hieradata/common.yaml
+++ b/hieradata/common.yaml
@@ -145,9 +145,7 @@
 name: "Jobrunners"
 id: 31
 sites:
-  eqiad:
-- mw1001.eqiad.wmnet
-- mw1002.eqiad.wmnet
+  eqiad: []
   codfw: []
   analytics: 
 name: "Analytics cluster"
diff --git a/hieradata/regex.yaml b/hieradata/regex.yaml
index c701877..ac9d363 100644
--- a/hieradata/regex.yaml
+++ b/hieradata/regex.yaml
@@ -26,6 +26,10 @@
   __regex: !ruby/regexp /^ocg100\d\.eqiad\.wmnet$/
   ganglia_class: "new"
 
+jobrunner:
+  __regex: !ruby/regexp /^mw100[1-2]\.eqiad\.wmnet$/
+  ganglia_class: "new"
+
 cassandra_test:
   __regex: !ruby/regexp /^(cerium|praseodymium|xenon)\.eqiad\.wmnet$/
   cassandra::seeds:
diff --git a/manifests/site.pp b/manifests/site.pp
index 640aa14..a05d99d 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1866,9 +1866,6 @@
 
 # mw1001-1016 are jobrunners
 node /^mw10(0[1-9]|1[0-6])\.eqiad\.wmnet$/ {
-if $::hostname =~ /^mw100[12]$/ {
-$ganglia_aggregator = true
-}
 role mediawiki::jobrunner
 }
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: If997fa11154c6281ea51d70166f79caa5cc8c8a1
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] labs: Allow using hiera to turn off NFS homes / shared storage - change (operations/puppet)

2015-06-09 Thread Yuvipanda (Code Review)

Yuvipanda has submitted this change and it was merged.

Change subject: labs: Allow using hiera to turn off NFS homes / shared storage
..


labs: Allow using hiera to turn off NFS homes / shared storage

No ensure => absent set since instances that already have it
mounted should be hand managed to get them removed.

Bug: T101660
Change-Id: I490fa21b5ff7338da605e2caa1b32afb2f85f479
---
M manifests/role/labs.pp
1 file changed, 31 insertions(+), 26 deletions(-)

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



diff --git a/manifests/role/labs.pp b/manifests/role/labs.pp
index 5f4a409..3b3ade7 100644
--- a/manifests/role/labs.pp
+++ b/manifests/role/labs.pp
@@ -22,14 +22,6 @@
 readable => true,
 }
 
-# Directory for data mounts
-file { '/data':
-ensure => directory,
-owner  => 'root',
-group  => 'root',
-mode   => '0755',
-}
-
 file { '/etc/mailname':
 ensure  => present,
 content => "${::fqdn}\n",
@@ -54,33 +46,46 @@
 $nfs_server = 'labstore.svc.eqiad.wmnet'
 $dumps_server = 'labstore1003.eqiad.wmnet'
 
-mount { '/home':
-ensure  => mounted,
-atboot  => true,
-fstype  => 'nfs',
-options => "rw,${nfs_opts}",
-device  => "${nfs_server}:/project/${instanceproject}/home",
-require => File['/etc/modprobe.d/nfs-no-idmap'],
+if hiera('has_shared_home', true) {
+mount { '/home':
+ensure  => mounted,
+atboot  => true,
+fstype  => 'nfs',
+options => "rw,${nfs_opts}",
+device  => "${nfs_server}:/project/${instanceproject}/home",
+require => File['/etc/modprobe.d/nfs-no-idmap'],
+}
 }
 
-file { '/data/project':
-ensure  => directory,
-require => File['/data'],
-}
+if hiera('has_shared_project_space', true) {
+# Directory for data mounts
+file { '/data':
+ensure => directory,
+owner  => 'root',
+group  => 'root',
+mode   => '0755',
+}
 
-mount { '/data/project':
-ensure  => mounted,
-atboot  => true,
-fstype  => 'nfs',
-options => "rw,${nfs_opts}",
-device  => "${nfs_server}:/project/${instanceproject}/project",
-require => File['/data/project', '/etc/modprobe.d/nfs-no-idmap'],
+file { '/data/project':
+ensure  => directory,
+require => File['/data'],
+}
+
+mount { '/data/project':
+ensure  => mounted,
+atboot  => true,
+fstype  => 'nfs',
+options => "rw,${nfs_opts}",
+device  => "${nfs_server}:/project/${instanceproject}/project",
+require => File['/data/project', '/etc/modprobe.d/nfs-no-idmap'],
+}
 }
 
 file { '/data/scratch':
 ensure  => directory,
 require => File['/data'],
 }
+
 mount { '/data/scratch':
 ensure  => mounted,
 atboot  => true,

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

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

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

[MediaWiki-commits] [Gerrit] ores: Add redis and redisproxy roles / classes - change (operations/puppet)

2015-06-09 Thread Yuvipanda (Code Review)

Yuvipanda has uploaded a new change for review.

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

Change subject: ores: Add redis and redisproxy roles / classes
..

ores: Add redis and redisproxy roles / classes

Change-Id: I7234c931709d9f17d302306d1bdaa69853c18390
---
M manifests/role/labsores.pp
A modules/ores/manifests/redis.pp
A modules/ores/manifests/redisproxy.pp
3 files changed, 33 insertions(+), 0 deletions(-)


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

diff --git a/manifests/role/labsores.pp b/manifests/role/labsores.pp
index 7113f21..ffc6447 100644
--- a/manifests/role/labsores.pp
+++ b/manifests/role/labsores.pp
@@ -1,5 +1,15 @@
 class role::labs::ores::web {
 include ::ores::web
+
+class { '::ores::redisproxy':
+server => hiera('redis_server'),
+}
+}
+
+class role::labs::ores::redis {
+class { '::ores::redis':
+maxmemory => '3G',
+}
 }
 
 class role::labs::ores::lb(
@@ -25,4 +35,12 @@
 realservers => [ 'localhost:8080' ],
 cache   => false,
 }
+
+class { '::ores::redis':
+maxmemory => '256M',
+}
+
+class { '::ores::redisproxy':
+server => 'localhost',
+}
 }
diff --git a/modules/ores/manifests/redis.pp b/modules/ores/manifests/redis.pp
new file mode 100644
index 000..fba04bf
--- /dev/null
+++ b/modules/ores/manifests/redis.pp
@@ -0,0 +1,7 @@
+class ores::redis(
+$maxmemory
+) {
+class { '::redis':
+maxmemory => $maxmemory,
+}
+}
diff --git a/modules/ores/manifests/redisproxy.pp 
b/modules/ores/manifests/redisproxy.pp
new file mode 100644
index 000..18da8fc
--- /dev/null
+++ b/modules/ores/manifests/redisproxy.pp
@@ -0,0 +1,8 @@
+class ores::redisproxy(
+$server,
+) {
+host { 'ores-redis':
+ensure => present,
+ip => ipresolve($server, 4, $::nameservers[0]),
+}
+}$

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

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

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

[MediaWiki-commits] [Gerrit] Fix EntityFactory calling a non-existing newEmpty method - change (mediawiki...Wikibase)

2015-06-09 Thread Jeroen De Dauw (Code Review)

Jeroen De Dauw has submitted this change and it was merged.

Change subject: Fix EntityFactory calling a non-existing newEmpty method
..


Fix EntityFactory calling a non-existing newEmpty method

This is required to make the DataModel 3 switch possible. We removed
Property::newEmpty but no tool had a chance to find this line of code.
This patch does not solve the issues in this class, but also does not
make it worse in my opinion.

Note that this class is deprecated anyway. If you think I'm making it
worse, please only block this patch if you have a better suggestion.

This patch is cross-compatible with all DataModel versions.

Change-Id: Ibd64d52c0900ea08835f6fa38aea87ebfc8276d7
---
M lib/includes/EntityFactory.php
1 file changed, 10 insertions(+), 3 deletions(-)

Approvals:
  Jeroen De Dauw: Looks good to me, approved



diff --git a/lib/includes/EntityFactory.php b/lib/includes/EntityFactory.php
index 1b624fe..7ff2f8f 100644
--- a/lib/includes/EntityFactory.php
+++ b/lib/includes/EntityFactory.php
@@ -2,8 +2,8 @@
 
 namespace Wikibase;
 
-use MWException;
 use OutOfBoundsException;
+use RuntimeException;
 use Wikibase\DataModel\Entity\Entity;
 use Wikibase\DataModel\Entity\Item;
 use Wikibase\DataModel\Entity\Property;
@@ -106,12 +106,19 @@
 *
 * @param String $entityType The type of the desired new entity.
 *
-* @throws MWException if the given entity type is not known.
+* @throws RuntimeException
 * @return Entity The new Entity object.
 */
public function newEmpty( $entityType ) {
$class = $this->getEntityClass( $entityType );
-   return $class::newEmpty();
+
+   if ( method_exists( $class, 'newFromType' ) ) {
+   return $class::newFromType( '' );
+   } elseif ( method_exists( $class, 'newEmpty' ) ) {
+   return $class::newEmpty();
+   } else {
+   throw new RuntimeException( "$class does not support a 
newEmpty method" );
+   }
}
 
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ibd64d52c0900ea08835f6fa38aea87ebfc8276d7
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Thiemo Mättig (WMDE) 
Gerrit-Reviewer: Bene 
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] AAAA record for wikitech-static.wikimedia.org - change (operations/dns)

2015-06-09 Thread Dzahn (Code Review)

Dzahn has submitted this change and it was merged.

Change subject:  record for wikitech-static.wikimedia.org
..


 record for wikitech-static.wikimedia.org

While dealing with T101803 we noticed that while wikitech-static
has an IPv6 address to which you can actually send requests,
wikitech-static.wikimedia.org does not resolve to it.

See also P749

Bug:T101803
Change-Id: Ia01a34655c95d18fb5b94dac1b4d4ecc1f4b551e
---
M templates/wikimedia.org
1 file changed, 1 insertion(+), 0 deletions(-)

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



diff --git a/templates/wikimedia.org b/templates/wikimedia.org
index 398e89c..b261cc3 100644
--- a/templates/wikimedia.org
+++ b/templates/wikimedia.org
@@ -679,6 +679,7 @@
 yarn 1H  IN CNAMEmisc-web-lb.eqiad
 wikitech 1H  IN CNAMEsilver
 wikitech-static  1H  IN A166.78.57.240
+ 1H  IN  2001:4800:7810:512:4bbc:637f:ff04:d370
 
 ; SNI testing hostname
 pinkunicorn600 A 208.80.154.42

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia01a34655c95d18fb5b94dac1b4d4ecc1f4b551e
Gerrit-PatchSet: 3
Gerrit-Project: operations/dns
Gerrit-Branch: master
Gerrit-Owner: Alex Monk 
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] Avoid parser cache miss that often occurs post-save - change (mediawiki/core)

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

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

Change subject: Avoid parser cache miss that often occurs post-save
..


Avoid parser cache miss that often occurs post-save

* This should not happen as doEditContent() saves the parser cache,
  so only the rare casing if incompatible options should have misses
* The bug could also cause post-save misses with edit stashing
* Avoid the second page parse post-redirect by making sure cache
  timestamps match up instead of calling time() at several points
* Likewise for null edits, which used a different code path
* Removed redundant purge in onArticleCreate() as the new row sets _touched
* Removed pointless purge in onArticleDelete() as there is no row to update
  (the method no-ops in that case to avoid contention already)

Change-Id: I178fe334a3f8691ffd9452bec30561a0c5d37c6c
---
M includes/Title.php
M includes/page/WikiPage.php
M includes/parser/CacheTime.php
3 files changed, 16 insertions(+), 17 deletions(-)

Approvals:
  Ori.livneh: Looks good to me, approved
  Aaron Schulz: Looks good to me, but someone else must approve
  jenkins-bot: Verified



diff --git a/includes/Title.php b/includes/Title.php
index d5eff46..7aa4113 100644
--- a/includes/Title.php
+++ b/includes/Title.php
@@ -4380,9 +4380,10 @@
/**
 * Updates page_touched for this page; called from LinksUpdate.php
 *
+* @param integer $purgeTime TS_MW timestamp [optional]
 * @return bool True if the update succeeded
 */
-   public function invalidateCache() {
+   public function invalidateCache( $purgeTime = null ) {
if ( wfReadOnly() ) {
return false;
}
@@ -4394,11 +4395,13 @@
$method = __METHOD__;
$dbw = wfGetDB( DB_MASTER );
$conds = $this->pageCond();
-   $dbw->onTransactionIdle( function () use ( $dbw, $conds, 
$method ) {
+   $dbw->onTransactionIdle( function () use ( $dbw, $conds, 
$method, $purgeTime ) {
+   $dbTimestamp = $dbw->timestamp( $purgeTime ?: time() );
+
$dbw->update(
'page',
-   array( 'page_touched' => $dbw->timestamp() ),
-   $conds,
+   array( 'page_touched' => $dbTimestamp ),
+   $conds + array( 'page_touched < ' . 
$dbw->addQuotes( $dbTimestamp ) ),
$method
);
} );
diff --git a/includes/page/WikiPage.php b/includes/page/WikiPage.php
index 5e4438a..2804d32 100644
--- a/includes/page/WikiPage.php
+++ b/includes/page/WikiPage.php
@@ -1267,10 +1267,9 @@
$conditions['page_latest'] = $lastRevision;
}
 
-   $now = wfTimestampNow();
$row = array( /* SET */
'page_latest'  => $revision->getId(),
-   'page_touched' => $dbw->timestamp( $now ),
+   'page_touched' => $dbw->timestamp( 
$revision->getTimestamp() ),
'page_is_new'  => ( $lastRevision === 0 ) ? 1 : 0,
'page_is_redirect' => $rt !== null ? 1 : 0,
'page_len' => $len,
@@ -1868,7 +1867,7 @@
$revision = null;
// Update page_touched, this is usually 
implicit in the page update
// Other cache updates are done in 
onArticleEdit()
-   $this->mTitle->invalidateCache();
+   $this->mTitle->invalidateCache( $now );
}
} else {
// Create new article
@@ -2173,13 +2172,12 @@
$editInfo = $this->mPreparedEdit;
}
 
-   // Save it to the parser cache
-   if ( $wgEnableParserCache ) {
-   $parserCache = ParserCache::singleton();
-   $parserCache->save(
-   $editInfo->output, $this, $editInfo->popts, 
$editInfo->timestamp, $editInfo->revid
-   );
-   }
+   // Save it to the parser cache.
+   // Make sure the cache time matches page_touched to avoid 
double parsing.
+   ParserCache::singleton()->save(
+   $editInfo->output, $this, $editInfo->popts,
+   $revision->getTimestamp(), $editInfo->revid
+   );
 
// Update the links tables and other secondary data
if ( $content ) {
@@ -3142,7 +3140,6 @@
// Update existence markers on article/talk tabs...
$other = $title->getOtherPage();
 
-

[MediaWiki-commits] [Gerrit] Fix-up for Ic39de554c: blackhole stdev, not stddev. - change (operations/puppet)

2015-06-09 Thread Filippo Giunchedi (Code Review)

Filippo Giunchedi has submitted this change and it was merged.

Change subject: Fix-up for Ic39de554c: blackhole stdev, not stddev.
..


Fix-up for Ic39de554c: blackhole stdev, not stddev.

Change-Id: I9a9f0f54a1db39c0442453f4efacacab7ec311ce
---
M modules/graphite/templates/local-relay.conf.erb
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/modules/graphite/templates/local-relay.conf.erb 
b/modules/graphite/templates/local-relay.conf.erb
index 699209c..94deb6c 100644
--- a/modules/graphite/templates/local-relay.conf.erb
+++ b/modules/graphite/templates/local-relay.conf.erb
@@ -13,7 +13,7 @@
   stop
   ;
 
-match stddev$
+match stdev$
   send to blackhole
   stop
   ;

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I9a9f0f54a1db39c0442453f4efacacab7ec311ce
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ori.livneh 
Gerrit-Reviewer: Filippo Giunchedi 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Fix-up for Ic39de554c: blackhole stdev, not stddev. - change (operations/puppet)

2015-06-09 Thread Ori.livneh (Code Review)

Ori.livneh has uploaded a new change for review.

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

Change subject: Fix-up for Ic39de554c: blackhole stdev, not stddev.
..

Fix-up for Ic39de554c: blackhole stdev, not stddev.

Change-Id: I9a9f0f54a1db39c0442453f4efacacab7ec311ce
---
M modules/graphite/templates/local-relay.conf.erb
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/modules/graphite/templates/local-relay.conf.erb 
b/modules/graphite/templates/local-relay.conf.erb
index 699209c..94deb6c 100644
--- a/modules/graphite/templates/local-relay.conf.erb
+++ b/modules/graphite/templates/local-relay.conf.erb
@@ -13,7 +13,7 @@
   stop
   ;
 
-match stddev$
+match stdev$
   send to blackhole
   stop
   ;

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9a9f0f54a1db39c0442453f4efacacab7ec311ce
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] tin: set cluster in hiera, not in site.pp - change (operations/puppet)

2015-06-09 Thread Dzahn (Code Review)

Dzahn has submitted this change and it was merged.

Change subject: tin: set cluster in hiera, not in site.pp
..


tin: set cluster in hiera, not in site.pp

set the cluster variable in hiera, not in site.pp anymore

Change-Id: Id9b65405c7e03651abe6838844e54e342aed287d
---
M hieradata/hosts/tin.yaml
M manifests/site.pp
2 files changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/hieradata/hosts/tin.yaml b/hieradata/hosts/tin.yaml
index ed1c067..13048e6 100644
--- a/hieradata/hosts/tin.yaml
+++ b/hieradata/hosts/tin.yaml
@@ -8,3 +8,4 @@
   - deployment
   - parsoid-admin
   - ocg-render-admins
+cluster: misc
diff --git a/manifests/site.pp b/manifests/site.pp
index 91131d2..c2504ad 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -2391,7 +2391,6 @@
 }
 
 node 'tin.eqiad.wmnet' {
-$cluster = 'misc'
 
 include standard
 include role::deployment::server

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Id9b65405c7e03651abe6838844e54e342aed287d
Gerrit-PatchSet: 4
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn 
Gerrit-Reviewer: Dzahn 
Gerrit-Reviewer: Giuseppe Lavagetto 
Gerrit-Reviewer: John F. Lewis 
Gerrit-Reviewer: Ofus 
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] Get operations/mediawiki-config out of the mediawiki gate-an... - change (integration/config)

2015-06-09 Thread Legoktm (Code Review)

Legoktm has uploaded a new change for review.

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

Change subject: Get operations/mediawiki-config out of the mediawiki 
gate-and-submit queue
..

Get operations/mediawiki-config out of the mediawiki gate-and-submit queue

Bug: T101908
Change-Id: Ibe7506619be7581337910c3de12caab204d56202
---
M jjb/operations-misc.yaml
M zuul/layout.yaml
2 files changed, 26 insertions(+), 7 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/88/217188/1

diff --git a/jjb/operations-misc.yaml b/jjb/operations-misc.yaml
index f980786..bde66fd 100644
--- a/jjb/operations-misc.yaml
+++ b/jjb/operations-misc.yaml
@@ -23,3 +23,24 @@
  - 'operations-dns-lint'
  - '{name}-tabs':
  fileselector: '*'
+
+- project:
+name: 'operations-mw-config'
+jobs:
+ - '{name}-phplint'
+
+# Runs 'phpunit' and 'composer validate', for the
+# operations/mediawiki-config repo to get it out of
+# the MediaWiki gate-and-submit queue (T101908)
+- job:
+name: 'operations-mw-config-phpunit'
+node: contintLabsSlave && UbuntuPrecise
+defaults: use-remote-zuul-shallow-clone
+triggers:
+ - zuul
+builders:
+ - composer-validate
+ - phpunit-junit
+publishers:
+ - phpunit-junit
+ - archive-log-dir
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 0af509f..639a263 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -2680,16 +2680,14 @@
 
   - name: operations/mediawiki-config
 check:
-  - phplint
+  - operations-mw-config-phplint
   - php-composer-validate
 test:
-  - phplint
-  - phpunit
-  - php-composer-validate
+  - operations-mw-config-phplint
+  - operations-mw-config-phpunit
 gate-and-submit:
-  - phplint
-  - phpunit
-  - php-composer-validate
+  - operations-mw-config-phplint
+  - operations-mw-config-phpunit
 experimental:
   - php-composer-test
 postmerge:

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

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

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

[MediaWiki-commits] [Gerrit] Revert "Move labs-ns0 from virt1000 to labcontrol1001" - change (operations/puppet)

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

Andrew Bogott has submitted this change and it was merged.

Change subject: Revert "Move labs-ns0 from virt1000 to labcontrol1001"
..


Revert "Move labs-ns0 from virt1000 to labcontrol1001"

This reverts commit 93ce7b3f03944dda6f6c376364cacec5c5905788.

Change-Id: I2379214b4083fdd9605055706e24a01551a6b9cb
---
M manifests/site.pp
1 file changed, 2 insertions(+), 1 deletion(-)

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



diff --git a/manifests/site.pp b/manifests/site.pp
index 7b44687..91131d2 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1247,7 +1247,7 @@
 role nova::controller
 
 include standard
-include role::dns::ldap
+# include role::dns::ldap
 include ldap::role::client::labs
 include role::salt::masters::labs
 include role::deployment::salt_masters
@@ -2438,6 +2438,7 @@
 
 node 'virt1000.wikimedia.org' {
 include standard
+include role::dns::ldap
 }
 
 node /^virt100[5-7].eqiad.wmnet/ {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I2379214b4083fdd9605055706e24a01551a6b9cb
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott 
Gerrit-Reviewer: Andrew Bogott 
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 app version to user agent map - change (analytics...source)

2015-06-09 Thread Ottomata (Code Review)

Ottomata has submitted this change and it was merged.

Change subject: Add app version to user agent map
..


Add app version to user agent map

UAParser parses the app version of 'mobile app' requests
into a field in the user agent map called 'wmf_app_version'.
For requests other than 'mobile app', 'wmf_app_version' is '-'.

Bug: T99932
Change-Id: I2800d990d203addf06bdb89c137caefdbbe97f0f
---
M 
refinery-core/src/main/java/org/wikimedia/analytics/refinery/core/UAParser.java
A 
refinery-core/src/test/java/org/wikimedia/analytics/refinery/core/TestUAParserAppVersionRecognition.java
2 files changed, 64 insertions(+), 2 deletions(-)

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



diff --git 
a/refinery-core/src/main/java/org/wikimedia/analytics/refinery/core/UAParser.java
 
b/refinery-core/src/main/java/org/wikimedia/analytics/refinery/core/UAParser.java
index 068024e..de41e8c 100644
--- 
a/refinery-core/src/main/java/org/wikimedia/analytics/refinery/core/UAParser.java
+++ 
b/refinery-core/src/main/java/org/wikimedia/analytics/refinery/core/UAParser.java
@@ -66,8 +66,8 @@
  * Function extracting browser, device and os information from the UA 
string.
  * In case the uaString is null, make it an empty String.
  * @param uaString the ua string to parse
- * @return the ua map with browser_name, browser_major, device, os_name,
- * os_minor, os_major keys and associated values.
+ * @return the ua map with browser_family, browser_major, device_family,
+ * os_family, os_major, os_minor, wmf_app_version keys and associated 
values.
  */
 public Map getUAMap(String uaString) {
 result.clear();
@@ -115,6 +115,15 @@
 result.put("os_minor", NA);
 }
 
+String wmfAppStart = "WikipediaApp/";
+if (uaString.startsWith(wmfAppStart)) {
+int from = wmfAppStart.length();
+int to = uaString.indexOf(' ', from);
+result.put("wmf_app_version", uaString.substring(from, to));
+} else {
+result.put("wmf_app_version", NA);
+}
+
 return result;
 }
 
diff --git 
a/refinery-core/src/test/java/org/wikimedia/analytics/refinery/core/TestUAParserAppVersionRecognition.java
 
b/refinery-core/src/test/java/org/wikimedia/analytics/refinery/core/TestUAParserAppVersionRecognition.java
new file mode 100644
index 000..df2f65a
--- /dev/null
+++ 
b/refinery-core/src/test/java/org/wikimedia/analytics/refinery/core/TestUAParserAppVersionRecognition.java
@@ -0,0 +1,53 @@
+/**
+ * Copyright (C) 2015 Wikimedia Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.wikimedia.analytics.refinery.core;
+
+import junit.framework.TestCase;
+import org.junit.Before;
+import org.junit.Test;
+import java.util.Map;
+
+
+public class TestUAParserAppVersionRecognition extends TestCase {
+
+UAParser uaParser = null;
+
+@Before
+public void setUp() {
+uaParser = new UAParser();
+}
+
+@Test
+public void testAppRequest() {
+
+String ua1 = "WikipediaApp/2.0-r-2015-04-23 (Android 5.0.1; Phone) 
Google Play";
+Map uaMap1 = uaParser.getUAMap(ua1);
+assertEquals("App version check", "2.0-r-2015-04-23", 
uaMap1.get("wmf_app_version"));
+
+String ua2 = "WikipediaApp/4.1.2 (iPhone OS 8.3; Tablet)";
+Map uaMap2 = uaParser.getUAMap(ua2);
+assertEquals("App version check", "4.1.2", 
uaMap2.get("wmf_app_version"));
+}
+
+@Test
+public void testNonAppRequest() {
+
+String ua = "Mozilla/5.0 (X11; Ubuntu; Linux x86_64; rv:19.0) 
Gecko/20100101 Firefox/19.0";
+Map uaMap = uaParser.getUAMap(ua);
+assertEquals("App version check", uaParser.NA, 
uaMap.get("wmf_app_version"));
+}
+}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I2800d990d203addf06bdb89c137caefdbbe97f0f
Gerrit-PatchSet: 10
Gerrit-Project: analytics/refinery/source
Gerrit-Branch: master
Gerrit-Owner: Mforns 
Gerrit-Reviewer: Joal 
Gerrit-Reviewer: Mforns 
Gerrit-Reviewer: Ottomata 

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

[MediaWiki-commits] [Gerrit] Revert "Move labs-ns0 from virt1000 to labcontrol1001" - change (operations/puppet)

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

Andrew Bogott has uploaded a new change for review.

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

Change subject: Revert "Move labs-ns0 from virt1000 to labcontrol1001"
..

Revert "Move labs-ns0 from virt1000 to labcontrol1001"

This reverts commit 93ce7b3f03944dda6f6c376364cacec5c5905788.

Change-Id: I2379214b4083fdd9605055706e24a01551a6b9cb
---
M manifests/site.pp
1 file changed, 2 insertions(+), 1 deletion(-)


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

diff --git a/manifests/site.pp b/manifests/site.pp
index 7b44687..91131d2 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1247,7 +1247,7 @@
 role nova::controller
 
 include standard
-include role::dns::ldap
+# include role::dns::ldap
 include ldap::role::client::labs
 include role::salt::masters::labs
 include role::deployment::salt_masters
@@ -2438,6 +2438,7 @@
 
 node 'virt1000.wikimedia.org' {
 include standard
+include role::dns::ldap
 }
 
 node /^virt100[5-7].eqiad.wmnet/ {

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

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

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

[MediaWiki-commits] [Gerrit] Enable wikimedia-extra plugin options for cirrus - change (operations/mediawiki-config)

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

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

Change subject: Enable wikimedia-extra plugin options for cirrus
..


Enable wikimedia-extra plugin options for cirrus

Cirrus was using a fallback that isn't as well tested.

Bug: T101842
Change-Id: I130f15a18e9be129189f2e8bf64c847f286f9077
---
M wmf-config/CirrusSearch-common.php
1 file changed, 3 insertions(+), 0 deletions(-)

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



diff --git a/wmf-config/CirrusSearch-common.php 
b/wmf-config/CirrusSearch-common.php
index a42126c..db1fc0e 100644
--- a/wmf-config/CirrusSearch-common.php
+++ b/wmf-config/CirrusSearch-common.php
@@ -51,6 +51,9 @@
'build',
'use',
),
+   'super_detect_noop' => true,
+   'field_value_factor_with_default' => true,
+   'id_hash_mod_filter' => true,
 );
 
 # Enable the "experimental" highlighter on all wikis

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I130f15a18e9be129189f2e8bf64c847f286f9077
Gerrit-PatchSet: 2
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Manybubbles 
Gerrit-Reviewer: Catrope 
Gerrit-Reviewer: EBernhardson 
Gerrit-Reviewer: Manybubbles 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Follow-up 1fc57830e: Fix variants for OOUI images - change (mediawiki/core)

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

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

Change subject: Follow-up 1fc57830e: Fix variants for OOUI images
..


Follow-up 1fc57830e: Fix variants for OOUI images

Fixes T101895, caused by 1fc57830e.

Bug: T101895
Change-Id: Icd9af0d2eba2a62a1761cb9c9dcd90fc736c2b39
---
M includes/resourceloader/ResourceLoaderOOUIImageModule.php
1 file changed, 8 insertions(+), 1 deletion(-)

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



diff --git a/includes/resourceloader/ResourceLoaderOOUIImageModule.php 
b/includes/resourceloader/ResourceLoaderOOUIImageModule.php
index 6d76493..ebbeb01 100644
--- a/includes/resourceloader/ResourceLoaderOOUIImageModule.php
+++ b/includes/resourceloader/ResourceLoaderOOUIImageModule.php
@@ -43,9 +43,16 @@
 
if ( file_exists( $dataPath ) ) {
$data = json_decode( file_get_contents( 
$dataPath ), true );
-   array_walk_recursive( $data['images'], function 
( &$path ) use ( $rootPath, $theme ) {
+   $fixPath = function ( &$path ) use ( $rootPath, 
$theme ) {
// TODO Allow extensions to specify 
this path somehow
$path = $rootPath . '/' . $theme . '/' 
. $path;
+   };
+   array_walk( $data['images'], function ( &$value 
) use ( $fixPath ) {
+   if ( is_string( $value['file'] ) ) {
+   $fixPath( $value['file'] );
+   } else if ( is_array( $value['file'] ) 
) {
+   array_walk_recursive( 
$value['file'], $fixPath );
+   }
} );
} else {
$data = array();

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Icd9af0d2eba2a62a1761cb9c9dcd90fc736c2b39
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.26wmf9
Gerrit-Owner: Jforrester 
Gerrit-Reviewer: Catrope 
Gerrit-Reviewer: Krinkle 
Gerrit-Reviewer: Legoktm 
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] [WMF] resourceloader: Add logging for T101806 private modules - change (mediawiki/core)

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

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

Change subject: [WMF] resourceloader: Add logging for T101806 private modules
..


[WMF] resourceloader: Add logging for T101806 private modules

Don't merge in master.

To test the mw.track(), comment out the makeResourceLoaderLink()
call for 'user.tokens' in OutputPage.php. Then subscribe to the event
in e.g. Common.js using:

mw.trackSubscribe('', function (topic, data) {
  console.log('[mw.track] ' + topic, data);
});

Bug: T101806
Change-Id: I96c4fb96b8bd11b3020e489b1e72d6bb8bfbc8cd
(cherry picked from commit e5e83faa4c42bfdd762398ac406c48dc28824f0e)
---
M resources/src/mediawiki/mediawiki.js
1 file changed, 12 insertions(+), 0 deletions(-)

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



diff --git a/resources/src/mediawiki/mediawiki.js 
b/resources/src/mediawiki/mediawiki.js
index ec3c0c3..b0c7837 100644
--- a/resources/src/mediawiki/mediawiki.js
+++ b/resources/src/mediawiki/mediawiki.js
@@ -1358,6 +1358,18 @@
$.each( dependencies, function ( idx, module ) {
var state = mw.loader.getState( module 
);
if ( state === 'registered' && 
$.inArray( module, queue ) === -1 ) {
+   // WMF patch: Logging for 
T101806
+   if ( registry[module].group === 
'private' ) {
+   mw.track( 
'resourceloader.forbidden', {
+   module: module,
+   // Log which 
modules in this request depend on the private module
+   request: 
$.grep( dependencies, function ( dep ) {
+   if ( 
$.inArray( module, registry[dep].dependencies ) !== -1 ) {
+   
return true;
+   }
+   } )
+   } );
+   }
queue.push( module );
if ( async ) {
registry[module].async 
= true;

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I96c4fb96b8bd11b3020e489b1e72d6bb8bfbc8cd
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.26wmf9
Gerrit-Owner: Krinkle 
Gerrit-Reviewer: Catrope 
Gerrit-Reviewer: Edokter 
Gerrit-Reviewer: Jack Phoenix 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] [WMF] resourceloader: Add logging for T101806 private modules - change (mediawiki/core)

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

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

Change subject: [WMF] resourceloader: Add logging for T101806 private modules
..


[WMF] resourceloader: Add logging for T101806 private modules

Don't merge in master.

To test the mw.track(), comment out the makeResourceLoaderLink()
call for 'user.tokens' in OutputPage.php. Then subscribe to the event
in e.g. Common.js using:

mw.trackSubscribe('', function (topic, data) {
  console.log('[mw.track] ' + topic, data);
});

Bug: T101806
Change-Id: I96c4fb96b8bd11b3020e489b1e72d6bb8bfbc8cd
---
M resources/src/mediawiki/mediawiki.js
1 file changed, 12 insertions(+), 0 deletions(-)

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



diff --git a/resources/src/mediawiki/mediawiki.js 
b/resources/src/mediawiki/mediawiki.js
index 0c24720..17e442a 100644
--- a/resources/src/mediawiki/mediawiki.js
+++ b/resources/src/mediawiki/mediawiki.js
@@ -1358,6 +1358,18 @@
$.each( dependencies, function ( idx, module ) {
var state = mw.loader.getState( module 
);
if ( state === 'registered' && 
$.inArray( module, queue ) === -1 ) {
+   // WMF patch: Logging for 
T101806
+   if ( registry[module].group === 
'private' ) {
+   mw.track( 
'resourceloader.forbidden', {
+   module: module,
+   // Log which 
modules in this request depend on the private module
+   request: 
$.grep( dependencies, function ( dep ) {
+   if ( 
$.inArray( module, registry[dep].dependencies ) !== -1 ) {
+   
return true;
+   }
+   } )
+   } );
+   }
queue.push( module );
if ( async ) {
registry[module].async 
= true;

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I96c4fb96b8bd11b3020e489b1e72d6bb8bfbc8cd
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.26wmf8
Gerrit-Owner: Krinkle 
Gerrit-Reviewer: Catrope 
Gerrit-Reviewer: Edokter 
Gerrit-Reviewer: Jack Phoenix 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Added handling of "having" clause for "deferred" formats - change (mediawiki...Cargo)

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

Yaron Koren has submitted this change and it was merged.

Change subject: Added handling of "having" clause for "deferred" formats
..


Added handling of "having" clause for "deferred" formats

Change-Id: Ie8cbfca497c7ab12460cba65c6c0b628d9da5765
---
M formats/CargoDeferredFormat.php
1 file changed, 3 insertions(+), 0 deletions(-)

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



diff --git a/formats/CargoDeferredFormat.php b/formats/CargoDeferredFormat.php
index 9dfc5e1..3a8abd5 100644
--- a/formats/CargoDeferredFormat.php
+++ b/formats/CargoDeferredFormat.php
@@ -43,6 +43,9 @@
if ( $sqlQuery->mGroupByStr != '' ) {
$queryParams['group by'] = 
$sqlQuery->mGroupByStr;
}
+   if ( $sqlQuery->mHavingStr != '' ) {
+   $queryParams['having'] = $sqlQuery->mHavingStr;
+   }
if ( $sqlQuery->mOrderByStr != '' ) {
$queryParams['order by'] = 
$sqlQuery->mOrderByStr;
}

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

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

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

[MediaWiki-commits] [Gerrit] Fix variants for OO UI images - change (mediawiki/core)

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

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

Change subject: Fix variants for OO UI images
..


Fix variants for OO UI images

Fixes T101895, caused by https://gerrit.wikimedia.org/r/#/c/212917/

Bug: T101895
Change-Id: Icd9af0d2eba2a62a1761cb9c9dcd90fc736c2b39
---
M includes/resourceloader/ResourceLoaderOOUIImageModule.php
1 file changed, 8 insertions(+), 1 deletion(-)

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



diff --git a/includes/resourceloader/ResourceLoaderOOUIImageModule.php 
b/includes/resourceloader/ResourceLoaderOOUIImageModule.php
index 6d76493..ebbeb01 100644
--- a/includes/resourceloader/ResourceLoaderOOUIImageModule.php
+++ b/includes/resourceloader/ResourceLoaderOOUIImageModule.php
@@ -43,9 +43,16 @@
 
if ( file_exists( $dataPath ) ) {
$data = json_decode( file_get_contents( 
$dataPath ), true );
-   array_walk_recursive( $data['images'], function 
( &$path ) use ( $rootPath, $theme ) {
+   $fixPath = function ( &$path ) use ( $rootPath, 
$theme ) {
// TODO Allow extensions to specify 
this path somehow
$path = $rootPath . '/' . $theme . '/' 
. $path;
+   };
+   array_walk( $data['images'], function ( &$value 
) use ( $fixPath ) {
+   if ( is_string( $value['file'] ) ) {
+   $fixPath( $value['file'] );
+   } else if ( is_array( $value['file'] ) 
) {
+   array_walk_recursive( 
$value['file'], $fixPath );
+   }
} );
} else {
$data = array();

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Icd9af0d2eba2a62a1761cb9c9dcd90fc736c2b39
Gerrit-PatchSet: 8
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Mattflaschen 
Gerrit-Reviewer: Bartosz Dziewoński 
Gerrit-Reviewer: Catrope 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: Krinkle 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: Mattflaschen 
Gerrit-Reviewer: Trevor Parscal 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] HTTPS redirect: zh, ug 301 - change (operations/puppet)

2015-06-09 Thread BBlack (Code Review)

BBlack has submitted this change and it was merged.

Change subject: HTTPS redirect: zh,ug 301
..


HTTPS redirect: zh,ug 301

Change-Id: Id360d766d841a51627698e1076cf93578094caeb
---
M modules/varnish/templates/vcl/wikimedia.vcl.erb
1 file changed, 2 insertions(+), 10 deletions(-)

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



diff --git a/modules/varnish/templates/vcl/wikimedia.vcl.erb 
b/modules/varnish/templates/vcl/wikimedia.vcl.erb
index 03ac605..601b665 100644
--- a/modules/varnish/templates/vcl/wikimedia.vcl.erb
+++ b/modules/varnish/templates/vcl/wikimedia.vcl.erb
@@ -172,23 +172,15 @@
if (req.request == "GET" || req.request == "HEAD") {
if (req.http.X-Forwarded-Proto != "https") {
if (req.url ~ "(?i)^https?:") {
-   if (req.url ~ "(?i)^https?://ru\.") {
+   if (req.url ~ "(?i)^https?://(ru|zh|ug)\.") {
set req.http.Location = regsub(req.url, 
"(?i)^http:", "https:");
error 751 "TLS Redirect";
-   }
-   if(req.url ~ "(?i)^https?://(zh|ug)\.") {
-   set req.http.Location = regsub(req.url, 
"(?i)^http:", "https:");
-   error 752 "TLS Redirect";
}
}
else {
-   if (req.http.Host ~ "(?i)^ru\.") {
+   if(req.http.Host ~ "(?i)^(ru|zh|ug)\.") {
set req.http.Location = "https://"; + 
req.http.Host + req.url;
error 751 "TLS Redirect";
-   }
-   if(req.http.Host ~ "(?i)^(zh|ug)\.") {
-   set req.http.Location = "https://"; + 
req.http.Host + req.url;
-   error 752 "TLS Redirect";
}
}
}

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

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

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

[MediaWiki-commits] [Gerrit] Remove unused EchoDiscussionParser::getNotifiedUsersForComme... - change (mediawiki...Echo)

2015-06-09 Thread Legoktm (Code Review)

Legoktm has uploaded a new change for review.

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

Change subject: Remove unused EchoDiscussionParser::getNotifiedUsersForComment()
..

Remove unused EchoDiscussionParser::getNotifiedUsersForComment()

Change-Id: I63c51835f54735c04f8356cf8ce161210895c378
---
M includes/DiscussionParser.php
1 file changed, 0 insertions(+), 39 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Echo 
refs/changes/86/217186/1

diff --git a/includes/DiscussionParser.php b/includes/DiscussionParser.php
index 5c1cb57..0e3f168 100644
--- a/includes/DiscussionParser.php
+++ b/includes/DiscussionParser.php
@@ -204,45 +204,6 @@
}
 
/**
-* Given a Revision object, determines which users are interested
-* in related EchoEvents.
-*
-* @param $revision Revision object.
-* @return Array of User objects
-*/
-   static function getNotifiedUsersForComment( $revision ) {
-   $interpretation = self::getChangeInterpretationForRevision( 
$revision );
-   $users = array();
-
-   foreach ( $interpretation as $action ) {
-   if ( $action['type'] == 'add-comment' ) {
-   $fullSection = $action['full-section'];
-   $interestedUsers = array_keys( 
self::extractSignatures( $fullSection, $revision->getTitle() ) );
-
-   foreach ( $interestedUsers as $userName ) {
-   $user = User::newFromName( $userName );
-
-   // Deliberately ignoring anonymous users
-   if ( $user && $user->getID() ) {
-   $users[$user->getID()] = $user;
-   }
-   }
-   }
-   }
-
-   if ( $revision->getTitle()->getNamespace() == NS_USER_TALK ) {
-   $userName = $revision->getTitle()->getText();
-   $user = User::newFromName( $userName );
-
-   if ( $user ) {
-   $users[$user->getID()] = $user;
-   }
-   }
-
-   return $users;
-   }
-
-   /**
 * Given a Revision object, returns a talk-page-centric interpretation
 * of the changes made in it.
 *

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

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

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

[MediaWiki-commits] [Gerrit] changes BoardDataProvider source from FeedQuery to Maniphest... - change (phabricator...Sprint)

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

Christopher Johnson (WMDE) has submitted this change and it was merged.

Change subject: changes BoardDataProvider source from FeedQuery to Maniphest 
Transaction Query
..


changes BoardDataProvider source from FeedQuery to Maniphest Transaction Query

upstream made recent changes to Application Transactions so that Project Feed
no longer shows Board Column Changes.  This broke the Sprint Burndown Chart that
needs board column information to show when tasks are moved into done.

Change-Id: I1d765dc6f67756175d233678b3a75b68292d6dbc
---
M src/storage/BoardDataProvider.php
1 file changed, 7 insertions(+), 14 deletions(-)

Approvals:
  Christopher Johnson (WMDE): Verified; Looks good to me, approved



diff --git a/src/storage/BoardDataProvider.php 
b/src/storage/BoardDataProvider.php
index ba14bed..9be921f 100644
--- a/src/storage/BoardDataProvider.php
+++ b/src/storage/BoardDataProvider.php
@@ -174,23 +174,16 @@
   private function getProjectColumnXactions() {
 $xactions = array();
 $scope_phid = $this->project->getPHID();
-$query = new PhabricatorFeedQuery();
-$query->setFilterPHIDs(
-array(
-$scope_phid,
-));
+$query = new ManiphestTransactionQuery();
+
$query->withTransactionTypes(array(ManiphestTransaction::TYPE_PROJECT_COLUMN));
 $query->setViewer($this->viewer);
-$stories = $query->execute();
-foreach ($stories as $xaction) {
-  $xaction_date = $xaction->getEpoch();
+$col_xactions = $query->execute();
+foreach ($col_xactions as $xaction) {
+  $xaction_date = $xaction->getDateCreated();
   if ($xaction_date >= $this->start && $xaction_date <= $this->end) {
-$xaction = $xaction->getPrimaryTransaction();
-switch ($xaction->getTransactionType()) {
-  case ManiphestTransaction::TYPE_PROJECT_COLUMN:
+$newval = $xaction->getNewValue();
+if ($newval['projectPHID'] == $scope_phid) {
 $xactions[] = $xaction;
-break;
-  default:
-break;
 }
   }
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I1d765dc6f67756175d233678b3a75b68292d6dbc
Gerrit-PatchSet: 1
Gerrit-Project: phabricator/extensions/Sprint
Gerrit-Branch: master
Gerrit-Owner: Christopher Johnson (WMDE) 
Gerrit-Reviewer: Christopher Johnson (WMDE) 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Added handling of "having" clause for "deferred" formats - change (mediawiki...Cargo)

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

Yaron Koren has uploaded a new change for review.

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

Change subject: Added handling of "having" clause for "deferred" formats
..

Added handling of "having" clause for "deferred" formats

Change-Id: Ie8cbfca497c7ab12460cba65c6c0b628d9da5765
---
M formats/CargoDeferredFormat.php
1 file changed, 3 insertions(+), 0 deletions(-)


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

diff --git a/formats/CargoDeferredFormat.php b/formats/CargoDeferredFormat.php
index 9dfc5e1..3a8abd5 100644
--- a/formats/CargoDeferredFormat.php
+++ b/formats/CargoDeferredFormat.php
@@ -43,6 +43,9 @@
if ( $sqlQuery->mGroupByStr != '' ) {
$queryParams['group by'] = 
$sqlQuery->mGroupByStr;
}
+   if ( $sqlQuery->mHavingStr != '' ) {
+   $queryParams['having'] = $sqlQuery->mHavingStr;
+   }
if ( $sqlQuery->mOrderByStr != '' ) {
$queryParams['order by'] = 
$sqlQuery->mOrderByStr;
}

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

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

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

[MediaWiki-commits] [Gerrit] [WMF] resourceloader: Add logging for T101806 private modules - change (mediawiki/core)

2015-06-09 Thread Krinkle (Code Review)

Krinkle has uploaded a new change for review.

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

Change subject: [WMF] resourceloader: Add logging for T101806 private modules
..

[WMF] resourceloader: Add logging for T101806 private modules

Don't merge in master.

To test the mw.track(), comment out the makeResourceLoaderLink()
call for 'user.tokens' in OutputPage.php. Then subscribe to the event
in e.g. Common.js using:

mw.trackSubscribe('', function (topic, data) {
  console.log('[mw.track] ' + topic, data);
});

Bug: T101806
Change-Id: I96c4fb96b8bd11b3020e489b1e72d6bb8bfbc8cd
(cherry picked from commit e5e83faa4c42bfdd762398ac406c48dc28824f0e)
---
M resources/src/mediawiki/mediawiki.js
1 file changed, 12 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/84/217184/1

diff --git a/resources/src/mediawiki/mediawiki.js 
b/resources/src/mediawiki/mediawiki.js
index ec3c0c3..b0c7837 100644
--- a/resources/src/mediawiki/mediawiki.js
+++ b/resources/src/mediawiki/mediawiki.js
@@ -1358,6 +1358,18 @@
$.each( dependencies, function ( idx, module ) {
var state = mw.loader.getState( module 
);
if ( state === 'registered' && 
$.inArray( module, queue ) === -1 ) {
+   // WMF patch: Logging for 
T101806
+   if ( registry[module].group === 
'private' ) {
+   mw.track( 
'resourceloader.forbidden', {
+   module: module,
+   // Log which 
modules in this request depend on the private module
+   request: 
$.grep( dependencies, function ( dep ) {
+   if ( 
$.inArray( module, registry[dep].dependencies ) !== -1 ) {
+   
return true;
+   }
+   } )
+   } );
+   }
queue.push( module );
if ( async ) {
registry[module].async 
= true;

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I96c4fb96b8bd11b3020e489b1e72d6bb8bfbc8cd
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.26wmf9
Gerrit-Owner: Krinkle 

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

[MediaWiki-commits] [Gerrit] changes BoardDataProvider source from FeedQuery to Maniphest... - change (phabricator...Sprint)

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

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

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

Change subject: changes BoardDataProvider source from FeedQuery to Maniphest 
Transaction Query
..

changes BoardDataProvider source from FeedQuery to Maniphest Transaction Query

upstream made recent changes to Application Transactions so that Project Feed
no longer shows Board Column Changes.  This broke the Sprint Burndown Chart that
needs board column information to show when tasks are moved into done.

Change-Id: I1d765dc6f67756175d233678b3a75b68292d6dbc
---
M src/storage/BoardDataProvider.php
1 file changed, 7 insertions(+), 14 deletions(-)


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

diff --git a/src/storage/BoardDataProvider.php 
b/src/storage/BoardDataProvider.php
index ba14bed..9be921f 100644
--- a/src/storage/BoardDataProvider.php
+++ b/src/storage/BoardDataProvider.php
@@ -174,23 +174,16 @@
   private function getProjectColumnXactions() {
 $xactions = array();
 $scope_phid = $this->project->getPHID();
-$query = new PhabricatorFeedQuery();
-$query->setFilterPHIDs(
-array(
-$scope_phid,
-));
+$query = new ManiphestTransactionQuery();
+
$query->withTransactionTypes(array(ManiphestTransaction::TYPE_PROJECT_COLUMN));
 $query->setViewer($this->viewer);
-$stories = $query->execute();
-foreach ($stories as $xaction) {
-  $xaction_date = $xaction->getEpoch();
+$col_xactions = $query->execute();
+foreach ($col_xactions as $xaction) {
+  $xaction_date = $xaction->getDateCreated();
   if ($xaction_date >= $this->start && $xaction_date <= $this->end) {
-$xaction = $xaction->getPrimaryTransaction();
-switch ($xaction->getTransactionType()) {
-  case ManiphestTransaction::TYPE_PROJECT_COLUMN:
+$newval = $xaction->getNewValue();
+if ($newval['projectPHID'] == $scope_phid) {
 $xactions[] = $xaction;
-break;
-  default:
-break;
 }
   }
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I1d765dc6f67756175d233678b3a75b68292d6dbc
Gerrit-PatchSet: 1
Gerrit-Project: phabricator/extensions/Sprint
Gerrit-Branch: master
Gerrit-Owner: Christopher Johnson (WMDE) 

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

[MediaWiki-commits] [Gerrit] HTTPS redirect: zh, ug 301 - change (operations/puppet)

2015-06-09 Thread BBlack (Code Review)

BBlack has uploaded a new change for review.

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

Change subject: HTTPS redirect: zh,ug 301
..

HTTPS redirect: zh,ug 301

Change-Id: Id360d766d841a51627698e1076cf93578094caeb
---
M modules/varnish/templates/vcl/wikimedia.vcl.erb
1 file changed, 2 insertions(+), 10 deletions(-)


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

diff --git a/modules/varnish/templates/vcl/wikimedia.vcl.erb 
b/modules/varnish/templates/vcl/wikimedia.vcl.erb
index 03ac605..601b665 100644
--- a/modules/varnish/templates/vcl/wikimedia.vcl.erb
+++ b/modules/varnish/templates/vcl/wikimedia.vcl.erb
@@ -172,23 +172,15 @@
if (req.request == "GET" || req.request == "HEAD") {
if (req.http.X-Forwarded-Proto != "https") {
if (req.url ~ "(?i)^https?:") {
-   if (req.url ~ "(?i)^https?://ru\.") {
+   if (req.url ~ "(?i)^https?://(ru|zh|ug)\.") {
set req.http.Location = regsub(req.url, 
"(?i)^http:", "https:");
error 751 "TLS Redirect";
-   }
-   if(req.url ~ "(?i)^https?://(zh|ug)\.") {
-   set req.http.Location = regsub(req.url, 
"(?i)^http:", "https:");
-   error 752 "TLS Redirect";
}
}
else {
-   if (req.http.Host ~ "(?i)^ru\.") {
+   if(req.http.Host ~ "(?i)^(ru|zh|ug)\.") {
set req.http.Location = "https://"; + 
req.http.Host + req.url;
error 751 "TLS Redirect";
-   }
-   if(req.http.Host ~ "(?i)^(zh|ug)\.") {
-   set req.http.Location = "https://"; + 
req.http.Host + req.url;
-   error 752 "TLS Redirect";
}
}
}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id360d766d841a51627698e1076cf93578094caeb
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] labs: Allow using hiera to turn off NFS homes / shared storage - change (operations/puppet)

2015-06-09 Thread Yuvipanda (Code Review)

Yuvipanda has uploaded a new change for review.

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

Change subject: labs: Allow using hiera to turn off NFS homes / shared storage
..

labs: Allow using hiera to turn off NFS homes / shared storage

No ensure => absent set since instances that already have it
mounted should be hand managed to get them removed.

Bug: T101660
Change-Id: I490fa21b5ff7338da605e2caa1b32afb2f85f479
---
M manifests/role/labs.pp
1 file changed, 31 insertions(+), 26 deletions(-)


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

diff --git a/manifests/role/labs.pp b/manifests/role/labs.pp
index 5f4a409..3b3ade7 100644
--- a/manifests/role/labs.pp
+++ b/manifests/role/labs.pp
@@ -22,14 +22,6 @@
 readable => true,
 }
 
-# Directory for data mounts
-file { '/data':
-ensure => directory,
-owner  => 'root',
-group  => 'root',
-mode   => '0755',
-}
-
 file { '/etc/mailname':
 ensure  => present,
 content => "${::fqdn}\n",
@@ -54,33 +46,46 @@
 $nfs_server = 'labstore.svc.eqiad.wmnet'
 $dumps_server = 'labstore1003.eqiad.wmnet'
 
-mount { '/home':
-ensure  => mounted,
-atboot  => true,
-fstype  => 'nfs',
-options => "rw,${nfs_opts}",
-device  => "${nfs_server}:/project/${instanceproject}/home",
-require => File['/etc/modprobe.d/nfs-no-idmap'],
+if hiera('has_shared_home', true) {
+mount { '/home':
+ensure  => mounted,
+atboot  => true,
+fstype  => 'nfs',
+options => "rw,${nfs_opts}",
+device  => "${nfs_server}:/project/${instanceproject}/home",
+require => File['/etc/modprobe.d/nfs-no-idmap'],
+}
 }
 
-file { '/data/project':
-ensure  => directory,
-require => File['/data'],
-}
+if hiera('has_shared_project_space', true) {
+# Directory for data mounts
+file { '/data':
+ensure => directory,
+owner  => 'root',
+group  => 'root',
+mode   => '0755',
+}
 
-mount { '/data/project':
-ensure  => mounted,
-atboot  => true,
-fstype  => 'nfs',
-options => "rw,${nfs_opts}",
-device  => "${nfs_server}:/project/${instanceproject}/project",
-require => File['/data/project', '/etc/modprobe.d/nfs-no-idmap'],
+file { '/data/project':
+ensure  => directory,
+require => File['/data'],
+}
+
+mount { '/data/project':
+ensure  => mounted,
+atboot  => true,
+fstype  => 'nfs',
+options => "rw,${nfs_opts}",
+device  => "${nfs_server}:/project/${instanceproject}/project",
+require => File['/data/project', '/etc/modprobe.d/nfs-no-idmap'],
+}
 }
 
 file { '/data/scratch':
 ensure  => directory,
 require => File['/data'],
 }
+
 mount { '/data/scratch':
 ensure  => mounted,
 atboot  => true,

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

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

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

[MediaWiki-commits] [Gerrit] Follow-up 1fc57830e: Fix variants for OOUI images - change (mediawiki/core)

2015-06-09 Thread Jforrester (Code Review)

Jforrester has uploaded a new change for review.

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

Change subject: Follow-up 1fc57830e: Fix variants for OOUI images
..

Follow-up 1fc57830e: Fix variants for OOUI images

Fixes T101895, caused by 1fc57830e.

Bug: T101895
Change-Id: Icd9af0d2eba2a62a1761cb9c9dcd90fc736c2b39
---
M includes/resourceloader/ResourceLoaderOOUIImageModule.php
1 file changed, 8 insertions(+), 1 deletion(-)


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

diff --git a/includes/resourceloader/ResourceLoaderOOUIImageModule.php 
b/includes/resourceloader/ResourceLoaderOOUIImageModule.php
index 6d76493..ebbeb01 100644
--- a/includes/resourceloader/ResourceLoaderOOUIImageModule.php
+++ b/includes/resourceloader/ResourceLoaderOOUIImageModule.php
@@ -43,9 +43,16 @@
 
if ( file_exists( $dataPath ) ) {
$data = json_decode( file_get_contents( 
$dataPath ), true );
-   array_walk_recursive( $data['images'], function 
( &$path ) use ( $rootPath, $theme ) {
+   $fixPath = function ( &$path ) use ( $rootPath, 
$theme ) {
// TODO Allow extensions to specify 
this path somehow
$path = $rootPath . '/' . $theme . '/' 
. $path;
+   };
+   array_walk( $data['images'], function ( &$value 
) use ( $fixPath ) {
+   if ( is_string( $value['file'] ) ) {
+   $fixPath( $value['file'] );
+   } else if ( is_array( $value['file'] ) 
) {
+   array_walk_recursive( 
$value['file'], $fixPath );
+   }
} );
} else {
$data = array();

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Icd9af0d2eba2a62a1761cb9c9dcd90fc736c2b39
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.26wmf9
Gerrit-Owner: Jforrester 
Gerrit-Reviewer: Mattflaschen 

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

[MediaWiki-commits] [Gerrit] Explicitly define module position - change (mediawiki...TimedMediaHandler)

2015-06-09 Thread Paladox (Code Review)

Paladox has uploaded a new change for review.

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

Change subject: Explicitly define module position
..

Explicitly define module position

Style modules currently added through addModuleStyles default
to being in the head ("top" position). This is an unhealthy default,
since only critical styles that are needed at pageload should be
in the head. In order to be able to switch the default to "bottom",
existing module positions have to be defined explicitly.

Bug: T97410
Change-Id: I332bc719dee8caa8a836e9e4cc639e1caf7222ce
---
M TimedMediaHandler.hooks.php
M i18n/eu.json
2 files changed, 4 insertions(+), 1 deletion(-)


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

diff --git a/TimedMediaHandler.hooks.php b/TimedMediaHandler.hooks.php
index 3e4cfbf..02eef42 100644
--- a/TimedMediaHandler.hooks.php
+++ b/TimedMediaHandler.hooks.php
@@ -63,6 +63,7 @@
// Add the PopUpMediaTransform module ( specific to timedMedia 
handler ( no support in mwEmbed modules )
$wgResourceModules+= array(
'mw.PopUpMediaTransform' => $baseExtensionResource + 
array(
+   'position' => 'top',
'scripts' => 'resources/mw.PopUpThumbVideo.js',
'dependencies' => array( 'mw.MwEmbedSupport', 
'mediawiki.Title' ),
),
diff --git a/i18n/eu.json b/i18n/eu.json
index b7e457e..7009519 100644
--- a/i18n/eu.json
+++ b/i18n/eu.json
@@ -4,7 +4,8 @@
"An13sa",
"Joxemai",
"Theklan",
-   "පසිඳු කාවින්ද"
+   "පසිඳු කාවින්ද",
+   "Subi"
]
},
"timedmedia-desc": "Ogg Theora eta Vorbis fitxategientzako edukiontzia, 
JavaScript playerrarekin",
@@ -18,6 +19,7 @@
"timedmedia-download": "Fitxategia jaitsi",
"timedmedia-desc-link": "Fitxategi honen inguruan",
"timedmedia-status": "Egoera",
+   "timedmedia-source-audio-file-desc": "Jatorrizko $1 fitxategia ($2)",
"timedmedia-subtitle-new-go": "Joan",
"timedmedia-file": "Fitxategia"
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I332bc719dee8caa8a836e9e4cc639e1caf7222ce
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/TimedMediaHandler
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] Move labs-ns0 from virt1000 to labcontrol1001 - change (operations/puppet)

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

Andrew Bogott has submitted this change and it was merged.

Change subject: Move labs-ns0 from virt1000 to labcontrol1001
..


Move labs-ns0 from virt1000 to labcontrol1001

Change-Id: I0b98567fb1a9e69208a04128f1727e930be99d5c
---
M manifests/site.pp
1 file changed, 1 insertion(+), 2 deletions(-)

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



diff --git a/manifests/site.pp b/manifests/site.pp
index 91131d2..7b44687 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1247,7 +1247,7 @@
 role nova::controller
 
 include standard
-# include role::dns::ldap
+include role::dns::ldap
 include ldap::role::client::labs
 include role::salt::masters::labs
 include role::deployment::salt_masters
@@ -2438,7 +2438,6 @@
 
 node 'virt1000.wikimedia.org' {
 include standard
-include role::dns::ldap
 }
 
 node /^virt100[5-7].eqiad.wmnet/ {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I0b98567fb1a9e69208a04128f1727e930be99d5c
Gerrit-PatchSet: 4
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott 
Gerrit-Reviewer: Andrew Bogott 
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 OOjs UI to v0.11.4 - change (VisualEditor/VisualEditor)

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

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

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


Update OOjs UI to v0.11.4

Release notes:
 https://git.wikimedia.org/blob/oojs%2Fui.git/v0.11.4/History.md

Change-Id: Id329e753412b33d5b4cf55bfc04ee072843bacc0
---
M .jsduck/categories.json
M .jsduck/eg-iframe.html
M demos/ve/desktop-dist.html
M demos/ve/desktop.html
M demos/ve/mobile-dist.html
M demos/ve/mobile.html
A lib/oojs-ui/i18n/as.json
M lib/oojs-ui/i18n/be-tarask.json
M lib/oojs-ui/i18n/de.json
M lib/oojs-ui/i18n/en.json
M lib/oojs-ui/i18n/eo.json
M lib/oojs-ui/i18n/es.json
M lib/oojs-ui/i18n/eu.json
M lib/oojs-ui/i18n/fr.json
M lib/oojs-ui/i18n/gl.json
M lib/oojs-ui/i18n/gu.json
M lib/oojs-ui/i18n/he.json
M lib/oojs-ui/i18n/ksh.json
M lib/oojs-ui/i18n/ku-latn.json
M lib/oojs-ui/i18n/lb.json
M lib/oojs-ui/i18n/mk.json
M lib/oojs-ui/i18n/mr.json
M lib/oojs-ui/i18n/ms.json
M lib/oojs-ui/i18n/nap.json
M lib/oojs-ui/i18n/pl.json
M lib/oojs-ui/i18n/pt.json
M lib/oojs-ui/i18n/qqq.json
M lib/oojs-ui/i18n/ro.json
A lib/oojs-ui/i18n/sa.json
M lib/oojs-ui/i18n/te.json
A lib/oojs-ui/i18n/xmf.json
M lib/oojs-ui/i18n/zh-hans.json
M lib/oojs-ui/oojs-ui-apex-icons-editing-advanced.css
M lib/oojs-ui/oojs-ui-apex-icons-editing-advanced.raster.css
M lib/oojs-ui/oojs-ui-apex-icons-editing-advanced.raster.rtl.css
M lib/oojs-ui/oojs-ui-apex-icons-editing-advanced.rtl.css
M lib/oojs-ui/oojs-ui-apex-icons-editing-advanced.vector.css
M lib/oojs-ui/oojs-ui-apex-icons-editing-advanced.vector.rtl.css
M lib/oojs-ui/oojs-ui-apex-icons-editing-core.css
M lib/oojs-ui/oojs-ui-apex-icons-editing-core.raster.css
M lib/oojs-ui/oojs-ui-apex-icons-editing-core.raster.rtl.css
M lib/oojs-ui/oojs-ui-apex-icons-editing-core.rtl.css
M lib/oojs-ui/oojs-ui-apex-icons-editing-core.vector.css
M lib/oojs-ui/oojs-ui-apex-icons-editing-core.vector.rtl.css
M lib/oojs-ui/oojs-ui-apex-icons-editing-list.css
M lib/oojs-ui/oojs-ui-apex-icons-editing-list.raster.css
M lib/oojs-ui/oojs-ui-apex-icons-editing-list.raster.rtl.css
M lib/oojs-ui/oojs-ui-apex-icons-editing-list.rtl.css
M lib/oojs-ui/oojs-ui-apex-icons-editing-list.vector.css
M lib/oojs-ui/oojs-ui-apex-icons-editing-list.vector.rtl.css
M lib/oojs-ui/oojs-ui-apex-icons-editing-styling.css
M lib/oojs-ui/oojs-ui-apex-icons-editing-styling.raster.css
M lib/oojs-ui/oojs-ui-apex-icons-editing-styling.raster.rtl.css
M lib/oojs-ui/oojs-ui-apex-icons-editing-styling.rtl.css
M lib/oojs-ui/oojs-ui-apex-icons-editing-styling.vector.css
M lib/oojs-ui/oojs-ui-apex-icons-editing-styling.vector.rtl.css
M lib/oojs-ui/oojs-ui-apex-icons-moderation.css
M lib/oojs-ui/oojs-ui-apex-icons-moderation.raster.css
M lib/oojs-ui/oojs-ui-apex-icons-moderation.raster.rtl.css
M lib/oojs-ui/oojs-ui-apex-icons-moderation.rtl.css
M lib/oojs-ui/oojs-ui-apex-icons-moderation.vector.css
M lib/oojs-ui/oojs-ui-apex-icons-moderation.vector.rtl.css
M lib/oojs-ui/oojs-ui-apex-icons-movement.css
M lib/oojs-ui/oojs-ui-apex-icons-movement.raster.css
M lib/oojs-ui/oojs-ui-apex-icons-movement.raster.rtl.css
M lib/oojs-ui/oojs-ui-apex-icons-movement.rtl.css
M lib/oojs-ui/oojs-ui-apex-icons-movement.vector.css
M lib/oojs-ui/oojs-ui-apex-icons-movement.vector.rtl.css
M lib/oojs-ui/oojs-ui-apex-noimages.css
M lib/oojs-ui/oojs-ui-apex-noimages.raster.css
M lib/oojs-ui/oojs-ui-apex-noimages.raster.rtl.css
M lib/oojs-ui/oojs-ui-apex-noimages.rtl.css
M lib/oojs-ui/oojs-ui-apex-noimages.vector.css
M lib/oojs-ui/oojs-ui-apex-noimages.vector.rtl.css
M lib/oojs-ui/oojs-ui-apex.css
M lib/oojs-ui/oojs-ui-apex.js
M lib/oojs-ui/oojs-ui-apex.raster.css
M lib/oojs-ui/oojs-ui-apex.raster.rtl.css
M lib/oojs-ui/oojs-ui-apex.rtl.css
M lib/oojs-ui/oojs-ui-apex.vector.css
M lib/oojs-ui/oojs-ui-apex.vector.rtl.css
M lib/oojs-ui/oojs-ui-mediawiki-icons-alerts.css
M lib/oojs-ui/oojs-ui-mediawiki-icons-alerts.raster.css
M lib/oojs-ui/oojs-ui-mediawiki-icons-alerts.raster.rtl.css
M lib/oojs-ui/oojs-ui-mediawiki-icons-alerts.rtl.css
M lib/oojs-ui/oojs-ui-mediawiki-icons-alerts.vector.css
M lib/oojs-ui/oojs-ui-mediawiki-icons-alerts.vector.rtl.css
M lib/oojs-ui/oojs-ui-mediawiki-icons-content.css
M lib/oojs-ui/oojs-ui-mediawiki-icons-content.raster.css
M lib/oojs-ui/oojs-ui-mediawiki-icons-content.raster.rtl.css
M lib/oojs-ui/oojs-ui-mediawiki-icons-content.rtl.css
M lib/oojs-ui/oojs-ui-mediawiki-icons-content.vector.css
M lib/oojs-ui/oojs-ui-mediawiki-icons-content.vector.rtl.css
M lib/oojs-ui/oojs-ui-mediawiki-icons-editing-advanced.css
M lib/oojs-ui/oojs-ui-mediawiki-icons-editing-advanced.raster.css
M lib/oojs-ui/oojs-ui-mediawiki-icons-editing-advanced.raster.rtl.css
M lib/oojs-ui/oojs-ui-mediawiki-icons-editing-advanced.rtl.css
M lib/oojs-ui/oojs-ui-mediawiki-icons-editing-advanced.vector.css
M lib/oojs-ui/oojs-ui-mediawiki-icons-editing-advanced.vector.rtl.css
M lib/oojs-ui/oojs-ui-mediawiki-icons-editing-core.css
M lib/oojs-ui/oojs-ui-mediawiki-icons-editing-core.raster.css
M lib/oojs-ui/oo

[MediaWiki-commits] [Gerrit] Update OOjs UI to v0.11.4 - change (mediawiki/core)

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

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

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


Update OOjs UI to v0.11.4

Release notes:
 https://git.wikimedia.org/blob/oojs%2Fui.git/v0.11.4/History.md

Change-Id: Id329e753412b33d5b4cf55bfc04ee072843bacc0
---
M composer.json
A resources/lib/oojs-ui/i18n/as.json
M resources/lib/oojs-ui/i18n/be-tarask.json
M resources/lib/oojs-ui/i18n/de.json
M resources/lib/oojs-ui/i18n/en.json
M resources/lib/oojs-ui/i18n/eo.json
M resources/lib/oojs-ui/i18n/es.json
M resources/lib/oojs-ui/i18n/eu.json
M resources/lib/oojs-ui/i18n/fr.json
M resources/lib/oojs-ui/i18n/gl.json
M resources/lib/oojs-ui/i18n/gu.json
M resources/lib/oojs-ui/i18n/he.json
M resources/lib/oojs-ui/i18n/ksh.json
M resources/lib/oojs-ui/i18n/ku-latn.json
M resources/lib/oojs-ui/i18n/lb.json
M resources/lib/oojs-ui/i18n/mk.json
M resources/lib/oojs-ui/i18n/mr.json
M resources/lib/oojs-ui/i18n/ms.json
M resources/lib/oojs-ui/i18n/nap.json
M resources/lib/oojs-ui/i18n/pl.json
M resources/lib/oojs-ui/i18n/pt.json
M resources/lib/oojs-ui/i18n/qqq.json
M resources/lib/oojs-ui/i18n/ro.json
A resources/lib/oojs-ui/i18n/sa.json
M resources/lib/oojs-ui/i18n/te.json
A resources/lib/oojs-ui/i18n/xmf.json
M resources/lib/oojs-ui/i18n/zh-hans.json
M resources/lib/oojs-ui/oojs-ui-apex-noimages.css
M resources/lib/oojs-ui/oojs-ui-apex.js
M resources/lib/oojs-ui/oojs-ui-mediawiki-noimages.css
M resources/lib/oojs-ui/oojs-ui-mediawiki.js
M resources/lib/oojs-ui/oojs-ui.js
M resources/lib/oojs-ui/themes/apex/images/icons/add.svg
M resources/lib/oojs-ui/themes/apex/images/icons/advanced.png
M resources/lib/oojs-ui/themes/apex/images/icons/advanced.svg
M resources/lib/oojs-ui/themes/apex/images/icons/alert.svg
M resources/lib/oojs-ui/themes/apex/images/icons/align-center.svg
M resources/lib/oojs-ui/themes/apex/images/icons/align-float-left.svg
M resources/lib/oojs-ui/themes/apex/images/icons/align-float-right.svg
M resources/lib/oojs-ui/themes/apex/images/icons/arched-arrow-ltr.png
M resources/lib/oojs-ui/themes/apex/images/icons/arched-arrow-ltr.svg
M resources/lib/oojs-ui/themes/apex/images/icons/arched-arrow-rtl.png
M resources/lib/oojs-ui/themes/apex/images/icons/arched-arrow-rtl.svg
M resources/lib/oojs-ui/themes/apex/images/icons/arrow-ltr.svg
M resources/lib/oojs-ui/themes/apex/images/icons/arrow-rtl.svg
M resources/lib/oojs-ui/themes/apex/images/icons/bigger-ltr.svg
M resources/lib/oojs-ui/themes/apex/images/icons/bigger-rtl.svg
M resources/lib/oojs-ui/themes/apex/images/icons/block.svg
M resources/lib/oojs-ui/themes/apex/images/icons/blockUndo-ltr.svg
M resources/lib/oojs-ui/themes/apex/images/icons/blockUndo-rtl.svg
M resources/lib/oojs-ui/themes/apex/images/icons/bold-a.svg
M resources/lib/oojs-ui/themes/apex/images/icons/bold-arab-ain.png
M resources/lib/oojs-ui/themes/apex/images/icons/bold-arab-ain.svg
M resources/lib/oojs-ui/themes/apex/images/icons/bold-arab-dad.png
M resources/lib/oojs-ui/themes/apex/images/icons/bold-arab-dad.svg
M resources/lib/oojs-ui/themes/apex/images/icons/bold-armn-to.png
M resources/lib/oojs-ui/themes/apex/images/icons/bold-armn-to.svg
M resources/lib/oojs-ui/themes/apex/images/icons/bold-b.svg
M resources/lib/oojs-ui/themes/apex/images/icons/bold-cyrl-be.png
M resources/lib/oojs-ui/themes/apex/images/icons/bold-cyrl-be.svg
M resources/lib/oojs-ui/themes/apex/images/icons/bold-cyrl-te.svg
M resources/lib/oojs-ui/themes/apex/images/icons/bold-cyrl-zhe.png
M resources/lib/oojs-ui/themes/apex/images/icons/bold-cyrl-zhe.svg
M resources/lib/oojs-ui/themes/apex/images/icons/bold-f.svg
M resources/lib/oojs-ui/themes/apex/images/icons/bold-g.png
M resources/lib/oojs-ui/themes/apex/images/icons/bold-g.svg
M resources/lib/oojs-ui/themes/apex/images/icons/bold-geor-man.png
M resources/lib/oojs-ui/themes/apex/images/icons/bold-geor-man.svg
M resources/lib/oojs-ui/themes/apex/images/icons/bold-l.svg
M resources/lib/oojs-ui/themes/apex/images/icons/bold-n.svg
M resources/lib/oojs-ui/themes/apex/images/icons/bold-v.svg
M resources/lib/oojs-ui/themes/apex/images/icons/cancel.png
M resources/lib/oojs-ui/themes/apex/images/icons/cancel.svg
M resources/lib/oojs-ui/themes/apex/images/icons/caret-ltr.png
M resources/lib/oojs-ui/themes/apex/images/icons/caret-ltr.svg
M resources/lib/oojs-ui/themes/apex/images/icons/caret-rtl.svg
M resources/lib/oojs-ui/themes/apex/images/icons/caretDown.svg
M resources/lib/oojs-ui/themes/apex/images/icons/caretUp.png
M resources/lib/oojs-ui/themes/apex/images/icons/caretUp.svg
M resources/lib/oojs-ui/themes/apex/images/icons/case-sensitive.png
M resources/lib/oojs-ui/themes/apex/images/icons/case-sensitive.svg
M resources/lib/oojs-ui/themes/apex/images/icons/check.png
M resources/lib/oojs-ui/themes/apex/images/icons/check.svg
M resources/lib/oojs-ui/themes/apex/images/icons/circle.svg
M resources/lib/oojs-ui/themes/apex/images/icons/close.svg
M resources/lib/oojs-ui/themes/apex/images/icons/c

[MediaWiki-commits] [Gerrit] Avoid parser cache miss that often occurs post-save - change (mediawiki/core)

2015-06-09 Thread Ori.livneh (Code Review)

Ori.livneh has uploaded a new change for review.

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

Change subject: Avoid parser cache miss that often occurs post-save
..

Avoid parser cache miss that often occurs post-save

* This should not happen as doEditContent() saves the parser cache,
  so only the rare casing if incompatible options should have misses
* The bug could also cause post-save misses with edit stashing
* Avoid the second page parse post-redirect by making sure cache
  timestamps match up instead of calling time() at several points
* Likewise for null edits, which used a different code path
* Removed redundant purge in onArticleCreate() as the new row sets _touched
* Removed pointless purge in onArticleDelete() as there is no row to update
  (the method no-ops in that case to avoid contention already)

Change-Id: I178fe334a3f8691ffd9452bec30561a0c5d37c6c
---
M includes/Title.php
M includes/page/WikiPage.php
M includes/parser/CacheTime.php
3 files changed, 16 insertions(+), 17 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/77/217177/1

diff --git a/includes/Title.php b/includes/Title.php
index d5eff46..7aa4113 100644
--- a/includes/Title.php
+++ b/includes/Title.php
@@ -4380,9 +4380,10 @@
/**
 * Updates page_touched for this page; called from LinksUpdate.php
 *
+* @param integer $purgeTime TS_MW timestamp [optional]
 * @return bool True if the update succeeded
 */
-   public function invalidateCache() {
+   public function invalidateCache( $purgeTime = null ) {
if ( wfReadOnly() ) {
return false;
}
@@ -4394,11 +4395,13 @@
$method = __METHOD__;
$dbw = wfGetDB( DB_MASTER );
$conds = $this->pageCond();
-   $dbw->onTransactionIdle( function () use ( $dbw, $conds, 
$method ) {
+   $dbw->onTransactionIdle( function () use ( $dbw, $conds, 
$method, $purgeTime ) {
+   $dbTimestamp = $dbw->timestamp( $purgeTime ?: time() );
+
$dbw->update(
'page',
-   array( 'page_touched' => $dbw->timestamp() ),
-   $conds,
+   array( 'page_touched' => $dbTimestamp ),
+   $conds + array( 'page_touched < ' . 
$dbw->addQuotes( $dbTimestamp ) ),
$method
);
} );
diff --git a/includes/page/WikiPage.php b/includes/page/WikiPage.php
index 5e4438a..2804d32 100644
--- a/includes/page/WikiPage.php
+++ b/includes/page/WikiPage.php
@@ -1267,10 +1267,9 @@
$conditions['page_latest'] = $lastRevision;
}
 
-   $now = wfTimestampNow();
$row = array( /* SET */
'page_latest'  => $revision->getId(),
-   'page_touched' => $dbw->timestamp( $now ),
+   'page_touched' => $dbw->timestamp( 
$revision->getTimestamp() ),
'page_is_new'  => ( $lastRevision === 0 ) ? 1 : 0,
'page_is_redirect' => $rt !== null ? 1 : 0,
'page_len' => $len,
@@ -1868,7 +1867,7 @@
$revision = null;
// Update page_touched, this is usually 
implicit in the page update
// Other cache updates are done in 
onArticleEdit()
-   $this->mTitle->invalidateCache();
+   $this->mTitle->invalidateCache( $now );
}
} else {
// Create new article
@@ -2173,13 +2172,12 @@
$editInfo = $this->mPreparedEdit;
}
 
-   // Save it to the parser cache
-   if ( $wgEnableParserCache ) {
-   $parserCache = ParserCache::singleton();
-   $parserCache->save(
-   $editInfo->output, $this, $editInfo->popts, 
$editInfo->timestamp, $editInfo->revid
-   );
-   }
+   // Save it to the parser cache.
+   // Make sure the cache time matches page_touched to avoid 
double parsing.
+   ParserCache::singleton()->save(
+   $editInfo->output, $this, $editInfo->popts,
+   $revision->getTimestamp(), $editInfo->revid
+   );
 
// Update the links tables and other secondary data
if ( $content ) {
@@ -3142,7 +3140,6 @@
// Update existence markers on article/talk tabs...
$other = $title->getOtherPage();
 
-   $other->invalidateCach

[MediaWiki-commits] [Gerrit] Html: Add buttonAttributes() more diligently - change (mediawiki/core)

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

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

Change subject: Html: Add buttonAttributes() more diligently
..


Html: Add buttonAttributes() more diligently

It was done only for elements generated with linkButton() or
submitButton(), and not input().

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

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



diff --git a/includes/Html.php b/includes/Html.php
index 6da70b1..235096d 100644
--- a/includes/Html.php
+++ b/includes/Html.php
@@ -715,6 +715,9 @@
if ( in_array( $type, array( 'text', 'search', 'email', 
'password', 'number' ) ) ) {
$attribs = self::getTextInputAttributes( $attribs );
}
+   if ( in_array( $type, array( 'button', 'reset', 'submit' ) ) ) {
+   $attribs = self::buttonAttributes( $attribs );
+   }
return self::element( 'input', $attribs );
}
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Idd7e01d596997bd5cade5a7851daf64bee10bb49
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Bartosz Dziewoński 
Gerrit-Reviewer: Daniel Friesen 
Gerrit-Reviewer: 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] Show wikidata description at top of beta page. - change (mediawiki...MobileFrontend)

2015-06-09 Thread Jdlrobson (Code Review)

Jdlrobson has uploaded a new change for review.

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

Change subject: Show wikidata description at top of beta page.
..

Show wikidata description at top of beta page.

Well that was surprisingly easy..

Bug: T100709
Change-Id: I5a0efabea0caebecf1a51824a0b60d26e2114942
---
M includes/MobileFrontend.hooks.php
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/includes/MobileFrontend.hooks.php 
b/includes/MobileFrontend.hooks.php
index 8854874..7dfcb03 100644
--- a/includes/MobileFrontend.hooks.php
+++ b/includes/MobileFrontend.hooks.php
@@ -973,7 +973,7 @@
$outputPage->enableTOC( false );
$outputPage->setProperty( 'MinervaTOC', 
$po->getTOCHTML() !== '' );
 
-   if ( $wgMFUseWikibaseDescription && 
$context->isAlphaGroupMember() ) {
+   if ( $wgMFUseWikibaseDescription && 
$context->isBetaGroupMember() ) {
$item = $po->getProperty( 'wikibase_item' );
if ( $item ) {
$desc = 
ExtMobileFrontend::getWikibaseDescription( $item );

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

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

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

[MediaWiki-commits] [Gerrit] ores: Don't overwrite staging branch with deploy branch all ... - change (operations/puppet)

2015-06-09 Thread Yuvipanda (Code Review)

Yuvipanda has submitted this change and it was merged.

Change subject: ores: Don't overwrite staging branch with deploy branch all the 
time
..


ores: Don't overwrite staging branch with deploy branch all the time

Change-Id: I78163fba5fac2aa7f5831526f3addd254974d33d
---
M manifests/role/labsores.pp
M modules/ores/manifests/web.pp
2 files changed, 9 insertions(+), 3 deletions(-)

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



diff --git a/manifests/role/labsores.pp b/manifests/role/labsores.pp
index bafc55e..7113f21 100644
--- a/manifests/role/labsores.pp
+++ b/manifests/role/labsores.pp
@@ -16,7 +16,11 @@
 }
 
 class role::labs::ores::staging {
-include ::ores::web
+
+class { '::ores::lb':
+branch => 'staging',
+}
+
 class { '::ores::lb':
 realservers => [ 'localhost:8080' ],
 cache   => false,
diff --git a/modules/ores/manifests/web.pp b/modules/ores/manifests/web.pp
index 39efb50..8184f21 100644
--- a/modules/ores/manifests/web.pp
+++ b/modules/ores/manifests/web.pp
@@ -1,6 +1,8 @@
 # = Class: ores::web
 # Sets up a uwsgi based web server for ORES running python3
-class ores::web {
+class ores::web(
+$branch = 'deploy',
+) {
 # Let's use a virtualenv for maximum flexibility - we can convert
 # this to deb packages in the future if needed. We also install build tools
 # because they are needed by pip to install scikit.
@@ -49,7 +51,7 @@
 git::clone { 'ores-src':
 origin=> 
'https://github.com/halfak/Objective-Revision-Evaluation-Service.git',
 directory => $src_path,
-branch=> 'deploy',
+branch=> $branch,
 ensure=> 'latest',
 owner => 'www-data',
 group => 'www-data',

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I78163fba5fac2aa7f5831526f3addd254974d33d
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Yuvipanda 
Gerrit-Reviewer: Yuvipanda 
Gerrit-Reviewer: coren 

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

[MediaWiki-commits] [Gerrit] shinken: Use service address for labs puppetmaster - change (operations/puppet)

2015-06-09 Thread Yuvipanda (Code Review)

Yuvipanda has submitted this change and it was merged.

Change subject: shinken: Use service address for labs puppetmaster
..


shinken: Use service address for labs puppetmaster

Change-Id: Ic49f4e1edfeb5688773280f50283fc2ea215fe36
---
M modules/shinken/files/labs/basic-infra-checks.cfg
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/modules/shinken/files/labs/basic-infra-checks.cfg 
b/modules/shinken/files/labs/basic-infra-checks.cfg
index 00a1506..ca4535c 100644
--- a/modules/shinken/files/labs/basic-infra-checks.cfg
+++ b/modules/shinken/files/labs/basic-infra-checks.cfg
@@ -1,6 +1,6 @@
 define host {
 host_name   labs-puppetmaster
-address labcontrol1001.wikimedia.org
+address labs-puppetmaster-eqiad.wikimedia.org
 alias   Wikimedia Labs puppetmaster
 contact_groups  labs-infra
 use generic-host

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic49f4e1edfeb5688773280f50283fc2ea215fe36
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Yuvipanda 
Gerrit-Reviewer: Yuvipanda 

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

[MediaWiki-commits] [Gerrit] shinken: Use service address for labs puppetmaster - change (operations/puppet)

2015-06-09 Thread Yuvipanda (Code Review)

Yuvipanda has uploaded a new change for review.

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

Change subject: shinken: Use service address for labs puppetmaster
..

shinken: Use service address for labs puppetmaster

Change-Id: Ic49f4e1edfeb5688773280f50283fc2ea215fe36
---
M modules/shinken/files/labs/basic-infra-checks.cfg
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/75/217175/1

diff --git a/modules/shinken/files/labs/basic-infra-checks.cfg 
b/modules/shinken/files/labs/basic-infra-checks.cfg
index 00a1506..ca4535c 100644
--- a/modules/shinken/files/labs/basic-infra-checks.cfg
+++ b/modules/shinken/files/labs/basic-infra-checks.cfg
@@ -1,6 +1,6 @@
 define host {
 host_name   labs-puppetmaster
-address labcontrol1001.wikimedia.org
+address labs-puppetmaster-eqiad.wikimedia.org
 alias   Wikimedia Labs puppetmaster
 contact_groups  labs-infra
 use generic-host

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

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

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

1 2 3 4 5 >

1 - 100 of 431 matches

Mail list logo