date:20160122

[MediaWiki-commits] [Gerrit] Add GRAMMAR support for interwikiintegration-setuptext - change (mediawiki...InterwikiIntegration)

2016-01-22 Thread IoannisKydonis (Code Review)

IoannisKydonis has uploaded a new change for review.

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

Change subject: Add GRAMMAR support for interwikiintegration-setuptext
..

Add GRAMMAR support for interwikiintegration-setuptext

Thread:
https://translatewiki.net/wiki/Thread:Translating_talk:MediaWiki/About_MediaWiki:Interwikiintegration-setuptext/ksh

Change-Id: I71fca11ca1453c3c06edc290d1f73ae4cb0afc6a
---
M i18n/en.json
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/InterwikiIntegration 
refs/changes/34/265734/1

diff --git a/i18n/en.json b/i18n/en.json
index cfb5999..91210be 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -11,7 +11,7 @@
"populateinterwikiwatchlisttable": "Populate interwiki watchlist table",
"populateinterwikirecentchangestable": "Populate interwiki recent 
changes table",
"populateinterwikipagetable": "Populate interwiki page table",
-   "interwikiintegration-setuptext": "$1's tables have been configured. Be 
sure to configure the tables on your other wikis as well.",
+   "interwikiintegration-setuptext": "{{GRAMMAR|Genitive|$1}} tables have 
been configured. Be sure to configure the tables on your other wikis as well.",
"interwikiintegration-interwikiwatchlist-setuptext": "Interwiki 
watchlist tables have been populated.",
"interwikiintegration-interwikirecentchanges-setuptext": "Interwiki 
recentchanges tables have been populated.",
"interwikiintegration-interwikipage-setuptext": "Interwiki page tables 
have been populated.",

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I71fca11ca1453c3c06edc290d1f73ae4cb0afc6a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/InterwikiIntegration
Gerrit-Branch: master
Gerrit-Owner: IoannisKydonis 

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

[MediaWiki-commits] [Gerrit] Reword globalrenamequeue-request-userinfo-global - change (mediawiki...CentralAuth)

2016-01-22 Thread IoannisKydonis (Code Review)

IoannisKydonis has uploaded a new change for review.

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

Change subject: Reword globalrenamequeue-request-userinfo-global
..

Reword globalrenamequeue-request-userinfo-global

Thread:
https://translatewiki.net/wiki/Thread:Translating_talk:MediaWiki/About_MediaWiki:Globalrenamequeue-request-userinfo-global/en

Change-Id: I3425708005b3dff3f8a09f8e3697d3753341c019
---
M i18n/en.json
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/i18n/en.json b/i18n/en.json
index 7289e9d..ed50ed0 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -463,7 +463,7 @@
"globalrenamequeue-request-title": "Rename \"$1\"?",
"globalrenamequeue-request-header": "[$1 $2] is 
requesting a rename to $3.",
"globalrenamequeue-request-userinfo-local": "* user: 
[[Special:CentralAuth/$1]]\n* home wiki: $2\n* new name: 
[[Special:CentralAuth/$3]]\n",
-   "globalrenamequeue-request-userinfo-global": "* user: 
[[Special:CentralAuth/$1]]\n* home wiki: $2\n* new name: 
[[Special:CentralAuth/$3]]\n* global edit count: $4",
+   "globalrenamequeue-request-userinfo-global": "* current username: 
[[Special:CentralAuth/$1]]\n* home wiki: $2\n* new username: 
[[Special:CentralAuth/$3]]\n* global edit count: $4",
"globalrenamequeue-request-reason": "Reason for requesting 
rename\n:$1",
"globalrenamequeue-request-reason-sul": "User notified of global name 
conflict in preparation for SUL finalization.",
"globalrenamequeue-request-comments-label": "Notes/reasoning",

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I3425708005b3dff3f8a09f8e3697d3753341c019
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CentralAuth
Gerrit-Branch: master
Gerrit-Owner: IoannisKydonis 

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

[MediaWiki-commits] [Gerrit] Introduce tox as an entry point - change (labs...crosswatch)

2016-01-22 Thread Hashar (Code Review)

Hashar has uploaded a new change for review.

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

Change subject: Introduce tox as an entry point
..

Introduce tox as an entry point

tox is a wrapper around virtualenv which ease testing. It setup the
virtualenv under /.tox and run whatever command you want under the venv.

Ignore /.tox

Add README.md to MANIFEST.in, it is read by setuptools to set the
long_description but was not included in the sdist.

Mention use of tox/flake8 in README.md

Create a very basic tox.ini file that defines a couple env:

flake8: run the pep8 and pyflakes linter.
- skip running sdist and install using --develop by setting 'usedevelop
  = True'
- just depends on flake8
- flake8 {posargs}  let you pass extra parameters when invoking tox, eg:
  tox -eflake8 -- --statistics

Change-Id: I392711db726657bb8b26278eb0309c7761758963
py27: just run the install step since no tests are around
---
M .gitignore
M MANIFEST.in
M README.md
A tox.ini
4 files changed, 18 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/labs/tools/crosswatch 
refs/changes/35/265735/1

diff --git a/.gitignore b/.gitignore
index a42bdcf..c56b396 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
+/.tox
 .ropeproject
 .idea
 *.py[cod]
diff --git a/MANIFEST.in b/MANIFEST.in
index 1379ba9..90ae8c7 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1 +1,2 @@
+include README.md
 graft backend/server/public
diff --git a/README.md b/README.md
index ea5ad0e..bf68f55 100644
--- a/README.md
+++ b/README.md
@@ -47,5 +47,9 @@
 directory. Change the name of the tool in `frontend/gulpfile.js` and
 `backend/config.py` and the `scripts` files.
 
+# Testing
+
+Invoke `tox`. We rely on flake8 to enforce python style.
+
 #License
 Licensed under 
[ISC](https://en.wikipedia.org/w/index.php?title=ISC_license=653545972)
diff --git a/tox.ini b/tox.ini
new file mode 100644
index 000..b134b7f
--- /dev/null
+++ b/tox.ini
@@ -0,0 +1,12 @@
+[tox]
+envlist = flake8,py27
+
+[testenv]
+commands = python setup.py install
+
+[testenv:flake8]
+# skip sdist, use --develop
+usedevelop = True
+
+deps = flake8
+commands = flake8 {posargs}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I392711db726657bb8b26278eb0309c7761758963
Gerrit-PatchSet: 1
Gerrit-Project: labs/tools/crosswatch
Gerrit-Branch: master
Gerrit-Owner: Hashar 

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

[MediaWiki-commits] [Gerrit] Add PLURAL support for minimumlengtherror message - change (mediawiki...MinimumNameLength)

2016-01-22 Thread MtDu (Code Review)

MtDu has uploaded a new change for review.

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

Change subject: Add PLURAL support for minimumlengtherror message
..

Add PLURAL support for minimumlengtherror message

https://translatewiki.net/wiki/Thread:Translating_talk:MediaWiki/About_MediaWiki:Minimumnamelength-error/ksh

Change-Id: Ifa7844db0754873792b60c37fb3ae405a951df5c
---
M MinimumNameLength.php
M i18n/en.json
2 files changed, 2 insertions(+), 2 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MinimumNameLength 
refs/changes/38/265738/1

diff --git a/MinimumNameLength.php b/MinimumNameLength.php
index d6e006c..1de493a 100644
--- a/MinimumNameLength.php
+++ b/MinimumNameLength.php
@@ -60,7 +60,7 @@
 
if( mb_strlen( $user->getName() ) < $wgMinimumUsernameLength ) {
 
-   $error = wfMessage( 'minimumnamelength-error', 
$wgMinimumUsernameLength )->plain();
+   $error = wfMessage( 'minimumnamelength-error' )->numParams( 
$wgMinimumUsernameLength )->plain();
return false;
}
 
diff --git a/i18n/en.json b/i18n/en.json
index 5d8652d..b22efa9 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -6,5 +6,5 @@
]
},
"minimumnamelength-desc": "Allows to enforce a minimum username length",
-   "minimumnamelength-error": "Your username is too short. The minimum 
required length is $1."
+   "minimumnamelength-error": "Your username is too short. The minimum 
required length is {PLURAL:$1|character|characters}}."
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ifa7844db0754873792b60c37fb3ae405a951df5c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MinimumNameLength
Gerrit-Branch: master
Gerrit-Owner: MtDu 

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

[MediaWiki-commits] [Gerrit] Fix broken sorting on Special:GadgetUsage - change (mediawiki...Gadgets)

2016-01-22 Thread Niharika29 (Code Review)

Niharika29 has uploaded a new change for review.

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

Change subject: Fix broken sorting on Special:GadgetUsage
..

Fix broken sorting on Special:GadgetUsage

Bug: T123659
Change-Id: Ib16e4d90f7025c94afb3e4e55dba8431c23ccf86
---
M SpecialGadgetUsage.php
1 file changed, 6 insertions(+), 1 deletion(-)


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

diff --git a/SpecialGadgetUsage.php b/SpecialGadgetUsage.php
index ab93dcd..5a4393d 100644
--- a/SpecialGadgetUsage.php
+++ b/SpecialGadgetUsage.php
@@ -133,7 +133,12 @@
$headers[] = 'gadgetusage-activeusers';
}
foreach( $headers as $h ) {
-   $html .= Html::element( 'th', array(), $this->msg( $h 
)->text() );
+   if ( $h == 'gadgetusage-gadget' ) {
+   $html .= Html::element( 'th', array(), 
$this->msg( $h )->text() );
+   } else {
+   $html .= Html::element( 'th', array( 
'data-sort-type' => 'number' ),
+   $this->msg( $h )->text() );
+   }
}
$html .= Html::closeElement( 'tr' );
$this->getOutput()->addHTML( $html );

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib16e4d90f7025c94afb3e4e55dba8431c23ccf86
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Gadgets
Gerrit-Branch: master
Gerrit-Owner: Niharika29 

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

[MediaWiki-commits] [Gerrit] Track cross-wiki notifications beta feature - change (analytics/limn-ee-data)

2016-01-22 Thread Milimetric (Code Review)

Milimetric has submitted this change and it was merged.

Change subject: Track cross-wiki notifications beta feature
..


Track cross-wiki notifications beta feature

Add a graph tracking how many people have enabled the cross-wiki
notifications beta feature

Change-Id: I7fea145e02cbd55bacf4c86595720ce5a2690d42
---
M ee/config.yaml
A ee/crosswiki_betafeature.sql
2 files changed, 19 insertions(+), 0 deletions(-)

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



diff --git a/ee/config.yaml b/ee/config.yaml
index e089e28..f3c457f 100644
--- a/ee/config.yaml
+++ b/ee/config.yaml
@@ -4,6 +4,11 @@
 port: 3306
 creds_file: /a/.my.cnf.research
 db: enwiki # just a default, queries already specify it
+mediawiki:
+host: "analytics-store.eqiad.wmnet"
+port: 3306
+creds_file: /a/.my.cnf.research
+db: enwiki # just a default, queries already specify it
 
 defaults:
 db: x1
@@ -37,3 +42,11 @@
 starts: 2013-09-01
 explode_by:
 wiki_db: enwiki, dewiki, eswiki, frwiki, hewiki, huwiki, itwiki, 
nlwiki, plwiki, ptwiki, svwiki
+crosswiki_betafeature:
+db: mediawiki
+frequency: days
+granularity: days
+timeboxed: true
+starts: 2016-01-19
+explode_by:
+wiki_db: testwiki, test2wiki, mediawikiwiki
diff --git a/ee/crosswiki_betafeature.sql b/ee/crosswiki_betafeature.sql
new file mode 100644
index 000..7c417e8
--- /dev/null
+++ b/ee/crosswiki_betafeature.sql
@@ -0,0 +1,6 @@
+select date('{from_timestamp}') as date,
+   count(*) as {wiki_db}
+   from {wiki_db}.user_properties
+   where up_property='echo-cross-wiki-notifications'
+   and up_value=1;
+

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I7fea145e02cbd55bacf4c86595720ce5a2690d42
Gerrit-PatchSet: 2
Gerrit-Project: analytics/limn-ee-data
Gerrit-Branch: master
Gerrit-Owner: Catrope 
Gerrit-Reviewer: Milimetric 
Gerrit-Reviewer: Springle 

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

[MediaWiki-commits] [Gerrit] nodepool: dist-upgrade when preparing snapshot - change (integration/config)

2016-01-22 Thread jenkins-bot (Code Review)

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

Change subject: nodepool: dist-upgrade when preparing snapshot
..


nodepool: dist-upgrade when preparing snapshot

Trying to upgrade does not always work for some mysterious reason...

Bug: T124447
Change-Id: I7e6b11c454b3a726984b427c0238e64ab5911669
---
M nodepool/scripts/setup_node.sh
1 file changed, 2 insertions(+), 2 deletions(-)

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



diff --git a/nodepool/scripts/setup_node.sh b/nodepool/scripts/setup_node.sh
index 4683a6f..9bdbee3 100755
--- a/nodepool/scripts/setup_node.sh
+++ b/nodepool/scripts/setup_node.sh
@@ -27,7 +27,7 @@
 sudo git -C /puppet pull
 sudo /usr/local/bin/puppet-apply 
/opt/git/integration/config/dib/puppet/ciimage.pp
 
-echo "apt-get upgrade && clean"
+echo "apt-get dist-upgrade && clean"
 sudo apt-get -q update
-sudo apt-get -V -q -y upgrade
+sudo apt-get -V -q -y dist-upgrade
 sudo apt-get clean

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

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

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

[MediaWiki-commits] [Gerrit] Follow-up I04ca47: Adjust comment to note we still care it's... - change (VisualEditor/VisualEditor)

2016-01-22 Thread jenkins-bot (Code Review)

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

Change subject: Follow-up I04ca47: Adjust comment to note we still care it's 
native
..


Follow-up I04ca47: Adjust comment to note we still care it's native

Change-Id: I86bcc599024625568bf25840d68b4e12557b2d3a
---
M src/ce/ve.ce.Surface.js
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/src/ce/ve.ce.Surface.js b/src/ce/ve.ce.Surface.js
index de8e1f0..c6e000b 100644
--- a/src/ce/ve.ce.Surface.js
+++ b/src/ce/ve.ce.Surface.js
@@ -570,7 +570,7 @@
 
this.$deactivatedSelection.empty();
 
-   // Check we have a deactivated surface
+   // Check we have a deactivated surface and a native selection
if ( this.deactivated && selection.isNativeCursor() ) {
rects = selection.getSelectionRects();
if ( rects ) {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I86bcc599024625568bf25840d68b4e12557b2d3a
Gerrit-PatchSet: 1
Gerrit-Project: VisualEditor/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Jforrester 
Gerrit-Reviewer: DLynch 
Gerrit-Reviewer: Esanders 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Update jscs and readable-stream dependencies for consistency. - change (mediawiki...text_renderer)

2016-01-22 Thread jenkins-bot (Code Review)

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

Change subject: Update jscs and readable-stream dependencies for consistency.
..


Update jscs and readable-stream dependencies for consistency.

Change-Id: Id32f18713ceefa0d0210e480adf84ac9eee42df4
---
M package.json
1 file changed, 2 insertions(+), 2 deletions(-)

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



diff --git a/package.json b/package.json
index 31889ac..4fe9de8 100644
--- a/package.json
+++ b/package.json
@@ -28,7 +28,7 @@
 "domino": "~1.0.19",
 "linewrap": "~0.2.1",
 "prfun": "~2.1.1",
-"readable-stream": "~1.0.0",
+"readable-stream": "~1.0.33",
 "sqlite3": "~3.1.0",
 "tmp": "~0.0.27"
   },
@@ -36,7 +36,7 @@
   "mw-ocg-bundler": "~1.3.0"
   },
   "devDependencies": {
-"jscs": "~2.1.1",
+"jscs": "~2.5.0",
 "jshint": "~2.8.0",
 "mocha": "~2.3.3",
 "npm-travis": "~1.0.0"

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Id32f18713ceefa0d0210e480adf84ac9eee42df4
Gerrit-PatchSet: 1
Gerrit-Project: 
mediawiki/extensions/Collection/OfflineContentGenerator/text_renderer
Gerrit-Branch: master
Gerrit-Owner: Cscott 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Update jscs dependency to match mw-ocg-bundler. - change (mediawiki...OfflineContentGenerator)

2016-01-22 Thread jenkins-bot (Code Review)

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

Change subject: Update jscs dependency to match mw-ocg-bundler.
..


Update jscs dependency to match mw-ocg-bundler.

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

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



diff --git a/package.json b/package.json
index f621b91..4715730 100644
--- a/package.json
+++ b/package.json
@@ -43,7 +43,7 @@
 "hiredis": "~0.4.0"
   },
   "devDependencies": {
-"jscs": "~2.1.1",
+"jscs": "~2.5.0",
 "jshint": "~2.8.0",
 "request": "~2.64.0",
 "mw-ocg-bundler": 
"wikimedia/mediawiki-extensions-Collection-OfflineContentGenerator-bundler#master"

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic09f2d75739212f6898f782fa3a58b6067e5fd8c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Collection/OfflineContentGenerator
Gerrit-Branch: master
Gerrit-Owner: Cscott 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Update jscs to 2.5.0 to match mw-ocg-bundler. - change (mediawiki...latex_renderer)

2016-01-22 Thread jenkins-bot (Code Review)

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

Change subject: Update jscs to 2.5.0 to match mw-ocg-bundler.
..


Update jscs to 2.5.0 to match mw-ocg-bundler.

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

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



diff --git a/package.json b/package.json
index b33a69e..8943364 100644
--- a/package.json
+++ b/package.json
@@ -39,7 +39,7 @@
 "tmp": "~0.0.27"
   },
   "devDependencies": {
-"jscs": "~2.1.1",
+"jscs": "~2.5.0",
 "jshint": "~2.8.0",
 "mocha": "~2.3.3",
 "npm-travis": "~1.0.0"

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I6fb52c0e501f596e0a737d743334c8acca540b13
Gerrit-PatchSet: 1
Gerrit-Project: 
mediawiki/extensions/Collection/OfflineContentGenerator/latex_renderer
Gerrit-Branch: master
Gerrit-Owner: Cscott 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: 90f29e3..d29524c - change (mediawiki/extensions)

2016-01-22 Thread Jenkins-mwext-sync (Code Review)

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

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

Change subject: Syncronize VisualEditor: 90f29e3..d29524c
..

Syncronize VisualEditor: 90f29e3..d29524c

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


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

diff --git a/VisualEditor b/VisualEditor
index 90f29e3..d29524c 16
--- a/VisualEditor
+++ b/VisualEditor
-Subproject commit 90f29e34209f1834c5dc7c8a71da82b4e5c41a9b
+Subproject commit d29524c8b3ecee3a94c2006496dd16336e73c332

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

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

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

[MediaWiki-commits] [Gerrit] [mathoid] experimental npm-node-4.2 - change (integration/config)

2016-01-22 Thread jenkins-bot (Code Review)

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

Change subject: [mathoid] experimental npm-node-4.2
..


[mathoid] experimental npm-node-4.2

The Mathoid service requires nodejs 4.2 which is only available on
Jessie.  Introduce a new job 'npm-node-4.2' which runs on Nodepool
disposable instances with castor enabled.

Since that is highly experimental, add it solely to the experimental
pipeline of mediawiki/services/mathoid.

Introduce the macro assert-node-version-4.2

Bug: T119143
Bug: T124447
Change-Id: I690e1931ef565b01df5106e177adab158f7f404e
---
M jjb/job-templates.yaml
M jjb/macro.yaml
M zuul/layout.yaml
3 files changed, 30 insertions(+), 0 deletions(-)

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



diff --git a/jjb/job-templates.yaml b/jjb/job-templates.yaml
index 490a901..3cf3046 100644
--- a/jjb/job-templates.yaml
+++ b/jjb/job-templates.yaml
@@ -93,6 +93,28 @@
  - global-teardown
 
 - job:
+name: 'npm-node-4.2'
+node: ci-jessie-wikimedia
+defaults: use-remote-zuul-shallow-clone
+concurrent: true
+properties:
+ - zeromq-event
+triggers:
+ - zuul
+builders:
+ - assert-node-version-4.2
+ # FIXME: we should save node_modules and run npm prune
+ - castor-load
+ - shell: |
+ node --version
+ npm --version
+ npm install
+ npm test
+publishers:
+ - archive-log-dir
+ - castor-save
+
+- job:
 name: 'npm-run-doc'
 node: contintLabsSlave && UbuntuTrusty
 defaults: use-remote-zuul-shallow-clone
diff --git a/jjb/macro.yaml b/jjb/macro.yaml
index 6eff6aa..26e0201 100644
--- a/jjb/macro.yaml
+++ b/jjb/macro.yaml
@@ -281,6 +281,12 @@
  version: ^v0[.]10[.]
 
 - builder:
+name: assert-node-version-4.2
+builders:
+ - assert-node-version:
+ version: ^v4[.]2[.]
+
+- builder:
 name: jsduck
 builders:
  - shell: |
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index cc7d84e..f300e62 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -6310,6 +6310,8 @@
   - name: mediawiki/services/mathoid
 template:
   - name: npm
+experimental:
+  - npm-node-4.2
 
   - name: mediawiki/services/mathoid/deploy
 test:

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

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

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

[MediaWiki-commits] [Gerrit] vhtcpd (0.0.11-1) unstable; urgency=low - change (operations...vhtcpd)

2016-01-22 Thread BBlack (Code Review)

BBlack has submitted this change and it was merged.

Change subject: vhtcpd (0.0.11-1) unstable; urgency=low
..


vhtcpd (0.0.11-1) unstable; urgency=low

  * bump "upstream" for updates

 -- Brandon Black   Fri, 22 Jan 2016 20:05:13 +

Change-Id: I13441b89cd1bfa35cb7fa8df067b65f5b0320d76
---
M debian/changelog
1 file changed, 6 insertions(+), 0 deletions(-)

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



diff --git a/debian/changelog b/debian/changelog
index c8c72dc..9de3662 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+vhtcpd (0.0.11-1) unstable; urgency=low
+
+  * bump "upstream" for updates
+
+ -- Brandon Black   Fri, 22 Jan 2016 20:05:13 +
+
 vhtcpd (0.0.10-3) unstable; urgency=low
 
   * Fixed Build-Depends (was missing libpcre3-dev and libev-dev)

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I13441b89cd1bfa35cb7fa8df067b65f5b0320d76
Gerrit-PatchSet: 2
Gerrit-Project: operations/software/varnish/vhtcpd
Gerrit-Branch: debian
Gerrit-Owner: BBlack 
Gerrit-Reviewer: BBlack 

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

[MediaWiki-commits] [Gerrit] remove no-create-orig from gbp.conf - change (operations...vhtcpd)

2016-01-22 Thread BBlack (Code Review)

BBlack has uploaded a new change for review.

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

Change subject: remove no-create-orig from gbp.conf
..

remove no-create-orig from gbp.conf

Change-Id: I7c040f32f3eebe1aa65763515aaab804cb58499f
---
M debian/gbp.conf
1 file changed, 0 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/software/varnish/vhtcpd 
refs/changes/28/265828/1

diff --git a/debian/gbp.conf b/debian/gbp.conf
index 16cab37..5845c4f 100644
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@ -5,7 +5,6 @@
 upstream-tree=tag
 debian-branch=debian
 overlay = True
-no-create-orig = True
 compression = xz
 tarball-dir = ../tarballs
 export-dir = ../build-area

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I7c040f32f3eebe1aa65763515aaab804cb58499f
Gerrit-PatchSet: 1
Gerrit-Project: operations/software/varnish/vhtcpd
Gerrit-Branch: debian
Gerrit-Owner: BBlack 

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

[MediaWiki-commits] [Gerrit] Remove redundant commit() in maybePruneIPData() - change (mediawiki...CheckUser)

2016-01-22 Thread jenkins-bot (Code Review)

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

Change subject: Remove redundant commit() in maybePruneIPData()
..


Remove redundant commit() in maybePruneIPData()

Change-Id: Ia52443f779e317e4b0f6799d90d578a4ec1dc172
---
M CheckUser.hooks.php
1 file changed, 0 insertions(+), 1 deletion(-)

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



diff --git a/CheckUser.hooks.php b/CheckUser.hooks.php
index a879b84..a68b538 100755
--- a/CheckUser.hooks.php
+++ b/CheckUser.hooks.php
@@ -240,7 +240,6 @@
 
if ( $ids ) {
$dbw->delete( 'cu_changes', array( 
'cuc_id' => $ids ), $fname );
-   $dbw->commit( 'flush' );
}
} );
}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia52443f779e317e4b0f6799d90d578a4ec1dc172
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CheckUser
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz 
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] Restbase mobile-via-text fixup 2/2 - change (operations/puppet)

2016-01-22 Thread BBlack (Code Review)

BBlack has uploaded a new change for review.

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

Change subject: Restbase mobile-via-text fixup 2/2
..

Restbase mobile-via-text fixup 2/2

Re-use the x-dt-host header set in the frontends from 1/2 when
doing the mobile hostname backend mangle, to reduce duplication.

Previous change must be rolled out fully to all frontends before
applying this to any backends!

Change-Id: I43a581341f2dc400c64e4665d4f887cd679a706c
---
M templates/varnish/text-backend.inc.vcl.erb
1 file changed, 1 insertion(+), 13 deletions(-)


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

diff --git a/templates/varnish/text-backend.inc.vcl.erb 
b/templates/varnish/text-backend.inc.vcl.erb
index 5abc309..7c8740c 100644
--- a/templates/varnish/text-backend.inc.vcl.erb
+++ b/templates/varnish/text-backend.inc.vcl.erb
@@ -50,19 +50,7 @@
 <% if @site_tier == "one" && scope.function_hiera(["cluster"]) == "cache_text" 
-%>
 sub mobile_hostname_1be_mangle {
if (req.http.X-Subdomain) {
-   // Rewrite m.mediawiki.org to mediawiki.org etc
-   if (req.http.host == "m.mediawiki.org") {
-   set bereq.http.host = "www.mediawiki.org";
-   } else if (req.http.host == "m.wikimediafoundation.org") {
-   set bereq.http.host = "wikimediafoundation.org";
-   } else if (req.http.host == "m.wikisource.org") {
-   set bereq.http.host = "wikisource.org";
-   } else if (req.http.host == "m.wikidata.org") {
-   set bereq.http.host = "www.wikidata.org";
-   } else {
-   // Replace .(m|zero)..org by 
..org
-   set bereq.http.host = regsub(req.http.host, 
"^([a-zA-Z0-9-]+)\.(m|zero)\.", "\1.");
-   }
+   set bereq.http.host = req.http.x-dt-host;
}
 }
 <% end -%>

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I43a581341f2dc400c64e4665d4f887cd679a706c
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] Restbase mobile-via-text fixup 1/2 - change (operations/puppet)

2016-01-22 Thread BBlack (Code Review)

BBlack has uploaded a new change for review.

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

Change subject: Restbase mobile-via-text fixup 1/2
..

Restbase mobile-via-text fixup 1/2

1. Rather than directly rewrite mobile->desktop hostnames on the
cache_mobile cluster only in recv, rewrite them into a new header
x-dt-host on both cache_mobile and cache_text.
2. On cache_mobile, set req.http.host = req.http.x-dt-host
3. if it's an RB URL, also set req.http.host = req.http.x-dt-host

Change-Id: I2b48d02bd1089c5274d3eb80d8c2e00e9ae73434
---
M templates/varnish/text-frontend.inc.vcl.erb
1 file changed, 19 insertions(+), 12 deletions(-)


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

diff --git a/templates/varnish/text-frontend.inc.vcl.erb 
b/templates/varnish/text-frontend.inc.vcl.erb
index 05b614c..24c69fb 100644
--- a/templates/varnish/text-frontend.inc.vcl.erb
+++ b/templates/varnish/text-frontend.inc.vcl.erb
@@ -161,11 +161,14 @@
// Always set or clear X-Subdomain and X-Orig-Cookie
unset req.http.X-Orig-Cookie;
unset req.http.X-Subdomain;
+   unset req.http.x-dt-host; // desktop host, if mobile hostname 
on request
+
if (req.http.host ~ "^([a-zA-Z0-9-]+\.)?zero\." && 
req.http.host != "zero.wikimedia.org") {
set req.http.X-Subdomain = "ZERO";
} else if (req.http.host ~ "^([a-zA-Z0-9-]+\.)?m\.") {
set req.http.X-Subdomain = "M";
}
+
 <% if scope.function_hiera(["cluster"]) == "cache_mobile" -%>
// mobile-cluster-only: prevent desktop/text hostnames from
// being used here, or they'll pollute the cache for mobile
@@ -183,26 +186,30 @@
call tag_carrier;
}
 
-<% if scope.function_hiera(["cluster"]) == "cache_mobile" -%>
-   // in the text cluster this is now done on tier-one
-   // bereq to the applayer only, but it's preserved for
-   // the mobile cluster here so that we don't
-   // effectively invalidate the whole mobile cache on
-   // cache_mobile machines in the process...
-   // Rewrite m.mediawiki.org to mediawiki.org etc
+   // Rewrite mobile hostnames to desktop hostnames as 
x-dt-host
if (req.http.host == "m.mediawiki.org") {
-   set req.http.host = "www.mediawiki.org";
+   set req.http.x-dt-host = "www.mediawiki.org";
} else if (req.http.host == 
"m.wikimediafoundation.org") {
-   set req.http.host = "wikimediafoundation.org";
+   set req.http.x-dt-host = 
"wikimediafoundation.org";
} else if (req.http.host == "m.wikisource.org") {
-   set req.http.host = "wikisource.org";
+   set req.http.x-dt-host = "wikisource.org";
} else if (req.http.host == "m.wikidata.org") {
-   set req.http.host = "www.wikidata.org";
+   set req.http.x-dt-host = "www.wikidata.org";
} else {
// Replace .(m|zero)..org by 
..org
-   set req.http.host = regsub(req.http.host, 
"^([a-zA-Z0-9-]+)\.(m|zero)\.", "\1.");
+   set req.http.x-dt-host = regsub(req.http.host, 
"^([a-zA-Z0-9-]+)\.(m|zero)\.", "\1.");
}
+<% if scope.function_hiera(["cluster"]) == "cache_mobile" -%>
+   // legacy cache_mobile actually resets the real Host: 
header value here, cache_text does not...
+   set req.http.host = req.http.x-dt-host;
 <% end -%>
+   if (req.url ~ "^/api/rest_v1/") {
+   // for Restbase, there is no difference in 
desktop-vs-mobile hostnames,
+   // so rewrite mobile hostnames to desktop 
hostnames for singular caching
+   // (this affects the Host: header, and also the 
url rewrite for restbase
+   // elsewhere that uses req.http.host)
+   set req.http.host = req.http.x-dt-host;
+   }
}
}
 

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

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

[MediaWiki-commits] [Gerrit] Update jscs to 2.5.0 to match mw-ocg-bundler. - change (mediawiki...latex_renderer)

2016-01-22 Thread Cscott (Code Review)

Cscott has uploaded a new change for review.

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

Change subject: Update jscs to 2.5.0 to match mw-ocg-bundler.
..

Update jscs to 2.5.0 to match mw-ocg-bundler.

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


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Collection/OfflineContentGenerator/latex_renderer
 refs/changes/03/265803/1

diff --git a/package.json b/package.json
index b33a69e..8943364 100644
--- a/package.json
+++ b/package.json
@@ -39,7 +39,7 @@
 "tmp": "~0.0.27"
   },
   "devDependencies": {
-"jscs": "~2.1.1",
+"jscs": "~2.5.0",
 "jshint": "~2.8.0",
 "mocha": "~2.3.3",
 "npm-travis": "~1.0.0"

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6fb52c0e501f596e0a737d743334c8acca540b13
Gerrit-PatchSet: 1
Gerrit-Project: 
mediawiki/extensions/Collection/OfflineContentGenerator/latex_renderer
Gerrit-Branch: master
Gerrit-Owner: Cscott 

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

[MediaWiki-commits] [Gerrit] Update jscs dependency to match mw-ocg-bundler. - change (mediawiki...OfflineContentGenerator)

2016-01-22 Thread Cscott (Code Review)

Cscott has uploaded a new change for review.

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

Change subject: Update jscs dependency to match mw-ocg-bundler.
..

Update jscs dependency to match mw-ocg-bundler.

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


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Collection/OfflineContentGenerator
 refs/changes/08/265808/1

diff --git a/package.json b/package.json
index f621b91..4715730 100644
--- a/package.json
+++ b/package.json
@@ -43,7 +43,7 @@
 "hiredis": "~0.4.0"
   },
   "devDependencies": {
-"jscs": "~2.1.1",
+"jscs": "~2.5.0",
 "jshint": "~2.8.0",
 "request": "~2.64.0",
 "mw-ocg-bundler": 
"wikimedia/mediawiki-extensions-Collection-OfflineContentGenerator-bundler#master"

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic09f2d75739212f6898f782fa3a58b6067e5fd8c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Collection/OfflineContentGenerator
Gerrit-Branch: master
Gerrit-Owner: Cscott 

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

[MediaWiki-commits] [Gerrit] wrap complex assert funcs in NDEBUG checks - change (operations...vhtcpd)

2016-01-22 Thread BBlack (Code Review)

BBlack has uploaded a new change for review.

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

Change subject: wrap complex assert funcs in NDEBUG checks
..

wrap complex assert funcs in NDEBUG checks

Change-Id: Id3e3e561b790162bacb66ea4a308fceef6cdb78e
---
M src/purger.c
M src/strq.c
2 files changed, 16 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/software/varnish/vhtcpd 
refs/changes/06/265806/1

diff --git a/src/purger.c b/src/purger.c
index 0bde22a..796eb84 100644
--- a/src/purger.c
+++ b/src/purger.c
@@ -192,6 +192,12 @@
 .on_message_complete = msg_complete_cb
 };
 
+#ifdef NDEBUG
+
+#define purger_assert_sanity(x) ((void)(0))
+
+#else
+
 // Obviously, these assertions aren't always true mid-function
 //   while transitioning from one state to another.  They're the
 //   states we should be in when we return to the eventloop, and
@@ -265,6 +271,8 @@
 }
 }
 
+#endif
+
 // The fixed parts of the request string.
 // The two holes are for the URL and the hostname.
 static const char out_prefix[] = "PURGE ";
diff --git a/src/strq.c b/src/strq.c
index bc2714d..a3e6675 100644
--- a/src/strq.c
+++ b/src/strq.c
@@ -82,6 +82,12 @@
 ev_timer* reclaim_timer;
 };
 
+#ifdef NDEBUG
+
+#define assert_queue_sane(x) ((void)(0))
+
+#else
+
 static void assert_queue_sane(strq_t* q) {
 dmn_assert(q);
 dmn_assert(q->q_size < q->q_alloc);
@@ -113,6 +119,8 @@
 dmn_assert(one_vhead_is_head);
 }
 
+#endif
+
 static void reclaim_cb(struct ev_loop* loop, ev_timer* w, int revents);
 
 strq_t* strq_new(struct ev_loop* loop, unsigned max_mb, unsigned num_vheads) {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id3e3e561b790162bacb66ea4a308fceef6cdb78e
Gerrit-PatchSet: 1
Gerrit-Project: operations/software/varnish/vhtcpd
Gerrit-Branch: master
Gerrit-Owner: BBlack 

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

[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: e6c6105..b66aa99 - change (mediawiki/extensions)

2016-01-22 Thread Jenkins-mwext-sync (Code Review)

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

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

Change subject: Syncronize VisualEditor: e6c6105..b66aa99
..

Syncronize VisualEditor: e6c6105..b66aa99

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


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions 
refs/changes/14/265814/1

diff --git a/VisualEditor b/VisualEditor
index e6c6105..b66aa99 16
--- a/VisualEditor
+++ b/VisualEditor
-Subproject commit e6c61052a0dc5169309de88cb5c871943882a74e
+Subproject commit b66aa990ba3eca965741686dc4ce4400e62e5854

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

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

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

[MediaWiki-commits] [Gerrit] Follow-up I9714cf3: Add tests for wikitable paste - change (mediawiki...VisualEditor)

2016-01-22 Thread jenkins-bot (Code Review)

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

Change subject: Follow-up I9714cf3: Add tests for wikitable paste
..


Follow-up I9714cf3: Add tests for wikitable paste

Bug: T85577
Change-Id: I8e2893c9a6f80fafe6cae142e4f50ffbe6d550ac
---
M modules/ve-mw/tests/dm/ve.dm.mwExample.js
1 file changed, 25 insertions(+), 0 deletions(-)

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



diff --git a/modules/ve-mw/tests/dm/ve.dm.mwExample.js 
b/modules/ve-mw/tests/dm/ve.dm.mwExample.js
index b82283a..a559eae 100644
--- a/modules/ve-mw/tests/dm/ve.dm.mwExample.js
+++ b/modules/ve-mw/tests/dm/ve.dm.mwExample.js
@@ -940,6 +940,31 @@
{ type: '/internalList' }
]
},
+   'table is created as wikitable on paste': {
+   body: 'Foo',
+   fromClipboard: true,
+   data: [
+   {
+   type: 'mwTable',
+   attributes: {
+   wikitable: true
+   }
+   },
+   { type: 'tableSection', attributes: { style: 'body' } },
+   { type: 'tableRow' },
+   { type: 'tableCell', attributes: { style: 'data' } },
+   { type: 'paragraph', internal: { generated: 'wrapper' } 
},
+   'F', 'o', 'o',
+   { type: '/paragraph' },
+   { type: '/tableCell' },
+   { type: '/tableRow' },
+   { type: '/tableSection' },
+   { type: '/mwTable' },
+   { type: 'internalList' },
+   { type: '/internalList' }
+   ],
+   normalizedBody: 'Foo'
+   },
'mw:Transclusion (block level)': {
body: ve.dm.mwExample.MWTransclusion.blockOpen + 
ve.dm.mwExample.MWTransclusion.blockContent,
data: [

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

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

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

[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: e6c6105..b66aa99 - change (mediawiki/extensions)

2016-01-22 Thread Jenkins-mwext-sync (Code Review)

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

Change subject: Syncronize VisualEditor: e6c6105..b66aa99
..


Syncronize VisualEditor: e6c6105..b66aa99

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

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



diff --git a/VisualEditor b/VisualEditor
index e6c6105..b66aa99 16
--- a/VisualEditor
+++ b/VisualEditor
-Subproject commit e6c61052a0dc5169309de88cb5c871943882a74e
+Subproject commit b66aa990ba3eca965741686dc4ce4400e62e5854

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

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

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

[MediaWiki-commits] [Gerrit] Hygiene: consolidate duplicate code - change (apps...wikipedia)

2016-01-22 Thread jenkins-bot (Code Review)

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

Change subject: Hygiene: consolidate duplicate code
..


Hygiene: consolidate duplicate code

No functional changes intended.

Change-Id: I25dc3eeef9481542eb5db9756c8eea2b99865024
---
A app/src/main/java/org/wikipedia/server/Protection.java
M app/src/main/java/org/wikipedia/server/mwapi/MwPageEndpointsCache.java
M app/src/main/java/org/wikipedia/server/mwapi/MwPageLead.java
M app/src/main/java/org/wikipedia/server/restbase/RbEndpointsCache.java
M app/src/main/java/org/wikipedia/server/restbase/RbPageLead.java
M app/src/test/java/org/wikipedia/server/mwapi/MwPageLeadTest.java
M app/src/test/java/org/wikipedia/server/restbase/RbPageLeadTest.java
7 files changed, 109 insertions(+), 176 deletions(-)

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



diff --git a/app/src/main/java/org/wikipedia/server/Protection.java 
b/app/src/main/java/org/wikipedia/server/Protection.java
new file mode 100644
index 000..0c2489d
--- /dev/null
+++ b/app/src/main/java/org/wikipedia/server/Protection.java
@@ -0,0 +1,83 @@
+package org.wikipedia.server;
+
+import android.support.annotation.Nullable;
+
+import com.google.gson.JsonArray;
+import com.google.gson.JsonDeserializationContext;
+import com.google.gson.JsonDeserializer;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonParseException;
+import com.google.gson.annotations.Expose;
+
+import org.wikipedia.util.log.L;
+
+import java.lang.reflect.Type;
+
+/** Protection settings for a page */
+public class Protection {
+@Expose
+private String[] edit;
+
+public Protection() {
+this.edit = new String[]{};
+}
+
+public Protection(String[] edit) {
+this.edit = edit;
+}
+
+// TODO should send them all, but callers need to be updated, too, (future 
patch)
+@Nullable
+public String getFirstAllowedEditorRole() {
+if (edit.length > 0) {
+return edit[0];
+}
+return null;
+}
+
+/**
+ * Need a custom Deserializer since the mediawiki API provides an 
inconsistent API.
+ * Sometimes it returns an object, and other times when it's empty it 
returns an empty
+ * array. See https://phabricator.wikimedia.org/T69054
+ */
+public static class Deserializer implements JsonDeserializer {
+/**
+ * Gson invokes this call-back method during deserialization when it 
encounters a field
+ * of the specified type.
+ * In the implementation of this call-back method, you should 
consider invoking
+ * {@link JsonDeserializationContext#deserialize(JsonElement, Type)} 
method to create
+ * objects for any non-trivial field of the returned object. However, 
you should never
+ * invoke it on the the same type passing {@code json} since that will 
cause an infinite
+ * loop (Gson will call your call-back method again).
+ *
+ * @param jsonEl The Json data being deserialized
+ * @param typeOfT The type of the Object to deserialize to
+ * @param jdc The deserialization context
+ * @return a deserialized object of the specified type typeOfT which is
+ * a subclass of {@code T}
+ * @throws JsonParseException if json is not in the expected format of 
{@code typeofT}
+ */
+@Override
+public Protection deserialize(JsonElement jsonEl, Type typeOfT,
+  JsonDeserializationContext jdc)
+throws JsonParseException {
+if (jsonEl.isJsonArray()) {
+JsonArray array = jsonEl.getAsJsonArray();
+if (array.size() != 0) {
+L.w("Unexpected array size " + array.toString());
+}
+} else {
+JsonElement editEl = jsonEl.getAsJsonObject().get("edit");
+if (editEl != null) {
+JsonArray editorRolesJsonArray = editEl.getAsJsonArray();
+String[] editorRoles = new 
String[editorRolesJsonArray.size()];
+for (int i = 0; i < editorRolesJsonArray.size(); i++) {
+editorRoles[i] = 
editorRolesJsonArray.get(i).getAsString();
+}
+return new Protection(editorRoles);
+}
+}
+return new Protection();
+}
+}
+}
\ No newline at end of file
diff --git 
a/app/src/main/java/org/wikipedia/server/mwapi/MwPageEndpointsCache.java 
b/app/src/main/java/org/wikipedia/server/mwapi/MwPageEndpointsCache.java
index c5a2cf4..6577ff9 100644
--- a/app/src/main/java/org/wikipedia/server/mwapi/MwPageEndpointsCache.java
+++ b/app/src/main/java/org/wikipedia/server/mwapi/MwPageEndpointsCache.java
@@ -3,6 +3,7 @@
 import org.wikipedia.OkHttpConnectionFactory;
 import org.wikipedia.Site;
 import

[MediaWiki-commits] [Gerrit] Delete note about non-existing files - change (mediawiki...Wikibase)

2016-01-22 Thread Code Review

Matěj Suchánek has uploaded a new change for review.

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

Change subject: Delete note about non-existing files
..

Delete note about non-existing files

They were deleted in Ice9688f6d25f2410b2a04ccd48aae78acd953f19.

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


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

diff --git a/README.md b/README.md
index 6a9cf38..51147d3 100644
--- a/README.md
+++ b/README.md
@@ -26,8 +26,6 @@
 
 The lib bundles common code that is used by both the client and the repo.
 
-Note that in each of the directories you will also find `README.md` notes for 
each of the extensions.
-
 ## Install
 
 This package contains three interrelated MediaWiki extensions:

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: If05fcf54c58541126afac71d60b5b5a0f44076e3
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Matěj Suchánek 

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

[MediaWiki-commits] [Gerrit] Moved designate domain IDs into hiera - change (operations/puppet)

2016-01-22 Thread Andrew Bogott (Code Review)

Andrew Bogott has uploaded a new change for review.

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

Change subject: Moved designate domain IDs into hiera
..

Moved designate domain IDs into hiera

Change-Id: I68a914b2e062f4678a81ce246634aac88cf5655e
---
M hieradata/codfw/labtest.yaml
M hieradata/eqiad.yaml
M modules/openstack/templates/kilo/designate/designate.conf.erb
3 files changed, 7 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/22/265822/1

diff --git a/hieradata/codfw/labtest.yaml b/hieradata/codfw/labtest.yaml
index 101c3d1..733aa44 100644
--- a/hieradata/codfw/labtest.yaml
+++ b/hieradata/codfw/labtest.yaml
@@ -97,6 +97,8 @@
   pdns_db_name: 'pdns'
   rabbit_host:  *labsnovacontroller
   controller_hostname: *labsnovacontroller
+  domain_id_internal_forward: '61194e5b-b78b-4979-bcdb-581dc4f296bf'
+  domain_id_internal_reverse: '7766d667-4a29-4a0a-9c36-77e9c4e38a32'
 
 glanceconfig:
   db_host: 'labtestcontrol2001.wikimedia.org'
diff --git a/hieradata/eqiad.yaml b/hieradata/eqiad.yaml
index e110b1a..2bbb524 100644
--- a/hieradata/eqiad.yaml
+++ b/hieradata/eqiad.yaml
@@ -126,6 +126,8 @@
   pdns_db_name: 'pdns'
   rabbit_host:  *labsnovacontroller
   controller_hostname: *labsnovacontroller
+  domain_id_internal_forward: '114f1333-c2c1-44d3-beb4-ebed1a91742b'
+  domain_id_internal_reverse: '8d114f3c-815b-466c-bdd4-9b91f704ea60'
 
 labs_baremetal_servers:
   - '10.64.20.12'
diff --git a/modules/openstack/templates/kilo/designate/designate.conf.erb 
b/modules/openstack/templates/kilo/designate/designate.conf.erb
index 9bb0faf..2212e22 100644
--- a/modules/openstack/templates/kilo/designate/designate.conf.erb
+++ b/modules/openstack/templates/kilo/designate/designate.conf.erb
@@ -211,13 +211,13 @@
 #---
 [handler:nova_fixed_multi]
 # Domain ID of domain to create records in. For a pre-existing domain, in this 
case eqiad.wmflabs
-domain_id = '114f1333-c2c1-44d3-beb4-ebed1a91742b'
+domain_id = <%= @designateconfig["domain_id_internal_forward"] %>
 notification_topics = monitor
 notification_topics = notifications
 control_exchange = nova
 format = '%(hostname)s.%(project_name)s.%(domain)s'
 format = '%(hostname)s.%(domain)s'
-reverse_domain_id = '8d114f3c-815b-466c-bdd4-9b91f704ea60'
+domain_id = <%= @designateconfig["domain_id_internal_reverse"] %>
 reverse_format = '%(hostname)s.%(project_name)s.%(domain)s'
 keystone_auth_name = "novaadmin"
 keystone_auth_pass = "<%= @keystoneconfig['ldap_user_pass'] %>"
@@ -229,7 +229,7 @@
 #---
 [handler:nova_ldap]
 # Domain ID of domain to create records in. For a pre-existing domain, in this 
case eqiad.wmflabs
-domain_id = '114f1333-c2c1-44d3-beb4-ebed1a91742b'
+domain_id = <%= @designateconfig["domain_id_internal_forward"] %>
 notification_topics = monitor
 notification_topics = notifications
 control_exchange = nova

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I68a914b2e062f4678a81ce246634aac88cf5655e
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] Merge branch 'master' into wmf-deploy - change (mediawiki...ocg-collection)

2016-01-22 Thread Cscott (Code Review)

Cscott has submitted this change and it was merged.

Change subject: Merge branch 'master' into wmf-deploy
..


Merge branch 'master' into wmf-deploy

Change-Id: I2f35f3c093330559551f0b2665cfda32cd7a606b
---
0 files changed, 0 insertions(+), 0 deletions(-)

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




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

Gerrit-MessageType: merged
Gerrit-Change-Id: I2f35f3c093330559551f0b2665cfda32cd7a606b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/ocg-collection
Gerrit-Branch: wmf-deploy
Gerrit-Owner: Cscott 
Gerrit-Reviewer: Cscott 

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

[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: 90f29e3..d29524c - change (mediawiki/extensions)

2016-01-22 Thread Jenkins-mwext-sync (Code Review)

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

Change subject: Syncronize VisualEditor: 90f29e3..d29524c
..


Syncronize VisualEditor: 90f29e3..d29524c

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

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



diff --git a/VisualEditor b/VisualEditor
index 90f29e3..d29524c 16
--- a/VisualEditor
+++ b/VisualEditor
-Subproject commit 90f29e34209f1834c5dc7c8a71da82b4e5c41a9b
+Subproject commit d29524c8b3ecee3a94c2006496dd16336e73c332

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

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

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

[MediaWiki-commits] [Gerrit] wrap complex assert funcs in NDEBUG checks - change (operations...vhtcpd)

2016-01-22 Thread BBlack (Code Review)

BBlack has submitted this change and it was merged.

Change subject: wrap complex assert funcs in NDEBUG checks
..


wrap complex assert funcs in NDEBUG checks

Change-Id: Id3e3e561b790162bacb66ea4a308fceef6cdb78e
---
M src/purger.c
M src/strq.c
2 files changed, 16 insertions(+), 0 deletions(-)

Approvals:
  Ori.livneh: Looks good to me, but someone else must approve
  BBlack: Verified; Looks good to me, approved



diff --git a/src/purger.c b/src/purger.c
index 0bde22a..796eb84 100644
--- a/src/purger.c
+++ b/src/purger.c
@@ -192,6 +192,12 @@
 .on_message_complete = msg_complete_cb
 };
 
+#ifdef NDEBUG
+
+#define purger_assert_sanity(x) ((void)(0))
+
+#else
+
 // Obviously, these assertions aren't always true mid-function
 //   while transitioning from one state to another.  They're the
 //   states we should be in when we return to the eventloop, and
@@ -265,6 +271,8 @@
 }
 }
 
+#endif
+
 // The fixed parts of the request string.
 // The two holes are for the URL and the hostname.
 static const char out_prefix[] = "PURGE ";
diff --git a/src/strq.c b/src/strq.c
index bc2714d..a3e6675 100644
--- a/src/strq.c
+++ b/src/strq.c
@@ -82,6 +82,12 @@
 ev_timer* reclaim_timer;
 };
 
+#ifdef NDEBUG
+
+#define assert_queue_sane(x) ((void)(0))
+
+#else
+
 static void assert_queue_sane(strq_t* q) {
 dmn_assert(q);
 dmn_assert(q->q_size < q->q_alloc);
@@ -113,6 +119,8 @@
 dmn_assert(one_vhead_is_head);
 }
 
+#endif
+
 static void reclaim_cb(struct ev_loop* loop, ev_timer* w, int revents);
 
 strq_t* strq_new(struct ev_loop* loop, unsigned max_mb, unsigned num_vheads) {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Id3e3e561b790162bacb66ea4a308fceef6cdb78e
Gerrit-PatchSet: 1
Gerrit-Project: operations/software/varnish/vhtcpd
Gerrit-Branch: master
Gerrit-Owner: BBlack 
Gerrit-Reviewer: BBlack 
Gerrit-Reviewer: Ori.livneh 

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

[MediaWiki-commits] [Gerrit] 0.0.11 release stuff - change (operations...vhtcpd)

2016-01-22 Thread BBlack (Code Review)

BBlack has submitted this change and it was merged.

Change subject: 0.0.11 release stuff
..


0.0.11 release stuff

Change-Id: I65fb413f6429d5759cfed580a1dc72953e5b1dee
---
M NEWS
M configure.ac
2 files changed, 5 insertions(+), 1 deletion(-)

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



diff --git a/NEWS b/NEWS
index e760f04..28127d1 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,7 @@
+0.0.11 - 2016-01-22
+  wrapped complex assert funcs in NDEBUG checks to make sure they
+don't affect NDEBUG builds
+
 0.0.10 - 2013-09-09
   Bugfix: was not handling connection close during RECVWAIT
 state on purger connections.
diff --git a/configure.ac b/configure.ac
index d60c86c..4062ca0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ([2.68])
-AC_INIT([vhtcpd],[0.0.10],[bbl...@wikimedia.org],[vhtcpd],[https://gerrit.wikimedia.org/r/gitweb?p=operations/software/varnish/vhtcpd.git])
+AC_INIT([vhtcpd],[0.0.11],[bbl...@wikimedia.org],[vhtcpd],[https://gerrit.wikimedia.org/r/gitweb?p=operations/software/varnish/vhtcpd.git])
 AC_CONFIG_SRCDIR([src/main.c])
 AC_CONFIG_AUX_DIR([acaux])
 AM_INIT_AUTOMAKE([1.11.3 dist-xz no-dist-gzip foreign tar-ustar -Wall])

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I65fb413f6429d5759cfed580a1dc72953e5b1dee
Gerrit-PatchSet: 1
Gerrit-Project: operations/software/varnish/vhtcpd
Gerrit-Branch: master
Gerrit-Owner: BBlack 
Gerrit-Reviewer: BBlack 

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

[MediaWiki-commits] [Gerrit] mediawiki.util: Add JS-handler usage example for addPortletL... - change (mediawiki/core)

2016-01-22 Thread Krinkle (Code Review)

Krinkle has uploaded a new change for review.

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

Change subject: mediawiki.util: Add JS-handler usage example for 
addPortletLink()
..

mediawiki.util: Add JS-handler usage example for addPortletLink()

Makes it clear that the method returns the Element node which
can then be used to attach event handlers.

Change-Id: Id33d3dc24a439cc6fe86f2de5baafa0aa779b2c0
---
M resources/src/mediawiki/mediawiki.util.js
1 file changed, 12 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/34/265834/1

diff --git a/resources/src/mediawiki/mediawiki.util.js 
b/resources/src/mediawiki/mediawiki.util.js
index f9810f9..1cb4d66 100644
--- a/resources/src/mediawiki/mediawiki.util.js
+++ b/resources/src/mediawiki/mediawiki.util.js
@@ -235,10 +235,20 @@
 * (e.g. `'#foobar'`) for that item.
 *
 * mw.util.addPortletLink(
-* 'p-tb', 'http://mediawiki.org/',
-* 'MediaWiki.org', 't-mworg', 'Go to MediaWiki.org ', 
'm', '#t-print'
+* 'p-tb', 'https://www.mediawiki.org/',
+* 'mediawiki.org', 't-mworg', 'Go to mediawiki.org', 
'm', '#t-print'
 * );
 *
+* var node = mw.util.addPortletLink(
+* 'p-tb',
+* new mw.Title( 'Special:ExamplePanel' ).getUrl(),
+* 'Panel'
+* );
+* $( node ).on( 'click', function ( e ) {
+* mw.example.Panel.create().show();
+* e.preventDefault();
+* } );
+*
 * @param {string} portlet ID of the target portlet ( 
'p-cactions' or 'p-personal' etc.)
 * @param {string} href Link URL
 * @param {string} text Link text

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

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

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

[MediaWiki-commits] [Gerrit] Update jscs and readable-stream dependencies for consistency. - change (mediawiki...zim_renderer)

2016-01-22 Thread jenkins-bot (Code Review)

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

Change subject: Update jscs and readable-stream dependencies for consistency.
..


Update jscs and readable-stream dependencies for consistency.

Change-Id: I040e0dacf585cbaeaa575767e03404c703c1c1df
---
M package.json
1 file changed, 2 insertions(+), 2 deletions(-)

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



diff --git a/package.json b/package.json
index 7521203..0357715 100644
--- a/package.json
+++ b/package.json
@@ -31,12 +31,12 @@
 "core-js": "~0.9.18",
 "domino": "~1.0.19",
 "prfun": "~2.1.1",
-"readable-stream": "~1.0.0",
+"readable-stream": "~1.0.33",
 "sqlite3": "~3.1.0",
 "tmp": "~0.0.27"
   },
   "devDependencies": {
-"jscs": "~2.1.1",
+"jscs": "~2.5.0",
 "jshint": "~2.8.0",
 "mocha": "~2.3.3",
 "npm-travis": "~1.0.0"

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I040e0dacf585cbaeaa575767e03404c703c1c1df
Gerrit-PatchSet: 1
Gerrit-Project: 
mediawiki/extensions/Collection/OfflineContentGenerator/zim_renderer
Gerrit-Branch: master
Gerrit-Owner: Cscott 
Gerrit-Reviewer: Cscott 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] [mathoid] experimental npm-node-4-2 - change (integration/config)

2016-01-22 Thread Hashar (Code Review)

Hashar has uploaded a new change for review.

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

Change subject: [mathoid] experimental npm-node-4-2
..

[mathoid] experimental npm-node-4-2

The Mathoid service requires nodejs 4.2 which is only available on
Jessie.  Introduce a new job 'npm-node-4-2' which runs on Nodepool
disposable instances with castor enabled.

Since that is highly experimental, add it solely to the experimental
pipeline of mediawiki/services/mathoid.

Introduce the macro assert-node-version-4.2

Bug: T124447
Change-Id: I690e1931ef565b01df5106e177adab158f7f404e
---
M jjb/job-templates.yaml
M jjb/macro.yaml
M zuul/layout.yaml
3 files changed, 30 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/17/265817/1

diff --git a/jjb/job-templates.yaml b/jjb/job-templates.yaml
index 490a901..65e7ee8 100644
--- a/jjb/job-templates.yaml
+++ b/jjb/job-templates.yaml
@@ -93,6 +93,28 @@
  - global-teardown
 
 - job:
+name: 'npm-node-4-2'
+node: ci-jessie-wikimedia
+defaults: use-remote-zuul-shallow-clone
+concurrent: true
+properties:
+ - zeromq-event
+triggers:
+ - zuul
+builders:
+ - assert-node-version-4.2
+ # FIXME: we should save node_modules and run npm prune
+ - castor-load
+ - shell: |
+ node --version
+ npm --version
+ npm install
+ npm test
+publishers:
+ - archive-log-dir
+ - castor-save
+
+- job:
 name: 'npm-run-doc'
 node: contintLabsSlave && UbuntuTrusty
 defaults: use-remote-zuul-shallow-clone
diff --git a/jjb/macro.yaml b/jjb/macro.yaml
index 6eff6aa..26e0201 100644
--- a/jjb/macro.yaml
+++ b/jjb/macro.yaml
@@ -281,6 +281,12 @@
  version: ^v0[.]10[.]
 
 - builder:
+name: assert-node-version-4.2
+builders:
+ - assert-node-version:
+ version: ^v4[.]2[.]
+
+- builder:
 name: jsduck
 builders:
  - shell: |
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index cc7d84e..b455388 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -6310,6 +6310,8 @@
   - name: mediawiki/services/mathoid
 template:
   - name: npm
+experimental:
+  - npm-node-4-2
 
   - name: mediawiki/services/mathoid/deploy
 test:

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

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

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

[MediaWiki-commits] [Gerrit] Clarify documentation of apihelp-flow+edit-title-param-content - change (mediawiki...Flow)

2016-01-22 Thread jenkins-bot (Code Review)

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

Change subject: Clarify documentation of apihelp-flow+edit-title-param-content
..


Clarify documentation of apihelp-flow+edit-title-param-content

Thread:
https://translatewiki.net/wiki/Thread:Translating_talk:MediaWiki/About_MediaWiki:Apihelp-flow%2Bedit-title-param-content/en

Change-Id: I1066845bad06590088c7a8a15ca2ad750f61def3
---
M i18n/qqq.json
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/i18n/qqq.json b/i18n/qqq.json
index fc90cef..494e0b2 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -473,7 +473,7 @@
"apihelp-flow+edit-post-example-1": 
"{{doc-apihelp-example|flow+edit-post}}",
"apihelp-flow+edit-title-description": 
"{{doc-apihelp-description|flow+edit-title}}",
"apihelp-flow+edit-title-param-prev_revision": 
"{{doc-apihelp-param|flow+edit-title|prev_revision}}",
-   "apihelp-flow+edit-title-param-content": 
"{{doc-apihelp-param|flow+edit-title|content}}",
+   "apihelp-flow+edit-title-param-content": 
"{{doc-apihelp-param|flow+edit-title|content}}\n'topic-title-wikitext' is the 
allowed format and should not be translated.",
"apihelp-flow+edit-title-example-1": 
"{{doc-apihelp-example|flow+edit-title}}",
"apihelp-flow+edit-topic-summary-description": 
"{{doc-apihelp-description|flow+edit-topic-summary}}",
"apihelp-flow+edit-topic-summary-param-prev_revision": 
"{{doc-apihelp-param|flow+edit-topic-summary|prev_revision}}",

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I1066845bad06590088c7a8a15ca2ad750f61def3
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: IoannisKydonis 
Gerrit-Reviewer: Mattflaschen 
Gerrit-Reviewer: Nemo bis 
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] Updating to latest masters - change (mediawiki...ocg-collection)

2016-01-22 Thread Cscott (Code Review)

Cscott has submitted this change and it was merged.

Change subject: Updating to latest masters
..


Updating to latest masters

Deployed new service (8a9626602a907ef6c2cb825119292933245efede):
* Update dependencies.

Deployed new latexer (28793564325d1f5c941ce2d3be0b6cd288ae714f):
* Update dependencies.

Deployed new texter(73f7b86871abff978c818ce3941c52072b0e53f5):
* Update dependencies.

Change-Id: I59f7e75d1cac4b2e54484091dcad6483f62bde78
---
M mw-ocg-latexer
M mw-ocg-service
M mw-ocg-texter
3 files changed, 0 insertions(+), 0 deletions(-)

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



diff --git a/mw-ocg-latexer b/mw-ocg-latexer
index c87d63a..2879356 16
--- a/mw-ocg-latexer
+++ b/mw-ocg-latexer
-Subproject commit c87d63a404fbd60423f3d5a6058085c3c3f70668
+Subproject commit 28793564325d1f5c941ce2d3be0b6cd288ae714f
diff --git a/mw-ocg-service b/mw-ocg-service
index 3d55189..8a96266 16
--- a/mw-ocg-service
+++ b/mw-ocg-service
-Subproject commit 3d551890421f360f16f2b580686aca823490a6e2
+Subproject commit 8a9626602a907ef6c2cb825119292933245efede
diff --git a/mw-ocg-texter b/mw-ocg-texter
index 89c4826..73f7b86 16
--- a/mw-ocg-texter
+++ b/mw-ocg-texter
-Subproject commit 89c4826d9db7a3719ba056317bdb6cc8cdaf2161
+Subproject commit 73f7b86871abff978c818ce3941c52072b0e53f5

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I59f7e75d1cac4b2e54484091dcad6483f62bde78
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/ocg-collection
Gerrit-Branch: master
Gerrit-Owner: Cscott 
Gerrit-Reviewer: Cscott 

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

[MediaWiki-commits] [Gerrit] When loading VE from action=edit/submit, replace the title s... - change (mediawiki...VisualEditor)

2016-01-22 Thread jenkins-bot (Code Review)

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

Change subject: When loading VE from action=edit/submit, replace the title shown
..


When loading VE from action=edit/submit, replace the title shown

Bug: T117643
Change-Id: Ice21389d02ea10adc668c5b0a64ba2b0b9cf5744
---
M modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.js
1 file changed, 3 insertions(+), 0 deletions(-)

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



diff --git a/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.js 
b/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.js
index 9db9d3d..a0f89b1 100644
--- a/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.js
+++ b/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.js
@@ -276,6 +276,9 @@
this.checkboxFields = [];
this.checkboxesByName = {};
this.$otherFields = $( [] );
+   if ( [ 'edit', 'submit' ].indexOf( mw.util.getParamValue( 'action' ) ) 
!== -1 ) {
+   $( '#content #firstHeading' ).text( mw.config.get( 'wgTitle' ) 
);
+   }
 
if ( data.checkboxes ) {
defaults = {

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

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

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

[MediaWiki-commits] [Gerrit] Remove putrid remains of $wgAllowAsyncCopyUploads - change (mediawiki/core)

2016-01-22 Thread jenkins-bot (Code Review)

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

Change subject: Remove putrid remains of $wgAllowAsyncCopyUploads
..


Remove putrid remains of $wgAllowAsyncCopyUploads

None of this works and it's been long begging for a mercy kill.
All it does is waste contributor time on updating deprecations
in the dead code. I imagine we wouldn't reuse much of this
code if we're ever going to reimplement it.

Bug: T119336
Change-Id: Ibd26a4bea621857aac77823017e9be9b7dc52cca
---
M RELEASE-NOTES-1.27
M autoload.php
M includes/DefaultSettings.php
M includes/api/ApiUpload.php
M includes/api/i18n/en.json
M includes/api/i18n/qqq.json
D includes/jobqueue/jobs/UploadFromUrlJob.php
M includes/upload/UploadFromUrl.php
M languages/i18n/en.json
M languages/i18n/qqq.json
M maintenance/dictionary/mediawiki.dic
M tests/phpunit/includes/api/ApiUploadTest.php
M tests/phpunit/includes/upload/UploadFromUrlTest.php
13 files changed, 13 insertions(+), 594 deletions(-)

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



diff --git a/RELEASE-NOTES-1.27 b/RELEASE-NOTES-1.27
index def80ea..7d7825d 100644
--- a/RELEASE-NOTES-1.27
+++ b/RELEASE-NOTES-1.27
@@ -86,6 +86,8 @@
   auto-creation when 'createaccount' is not granted to all users.
 * Deprecated AuthPluginAutoCreate hook in favor of LocalUserCreated.
 * Most cookie-handling methods in User are deprecated.
+* $wgAllowAsyncCopyUploads and $CopyUploadAsyncTimeout were removed. This was 
an
+  experimental feature that has never worked.
 
 === New features in 1.27 ===
 * $wgDataCenterId and $wgDataCenterRoles where added, which will serve as
@@ -183,6 +185,7 @@
 * action=login transparently allows login using bot passwords. Clients should
   merely need to change the username and password used after setting up a bot
   password.
+* action=upload no longer understands statuskey, asyncdownload or leavemessage.
 
 === Action API internal changes in 1.27 ===
 * ApiQueryORM removed.
diff --git a/autoload.php b/autoload.php
index 24a4d72..26b6598 100644
--- a/autoload.php
+++ b/autoload.php
@@ -1338,7 +1338,6 @@
'UploadFromFile' => __DIR__ . '/includes/upload/UploadFromFile.php',
'UploadFromStash' => __DIR__ . '/includes/upload/UploadFromStash.php',
'UploadFromUrl' => __DIR__ . '/includes/upload/UploadFromUrl.php',
-   'UploadFromUrlJob' => __DIR__ . 
'/includes/jobqueue/jobs/UploadFromUrlJob.php',
'UploadLogFormatter' => __DIR__ . 
'/includes/logging/UploadLogFormatter.php',
'UploadSourceAdapter' => __DIR__ . 
'/includes/import/UploadSourceAdapter.php',
'UploadSourceField' => __DIR__ . '/includes/specials/SpecialUpload.php',
diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index 9e945eaf..a22a29d 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -662,12 +662,6 @@
 $wgAllowCopyUploads = false;
 
 /**
- * Allow asynchronous copy uploads.
- * This feature is experimental and broken as of r81612.
- */
-$wgAllowAsyncCopyUploads = false;
-
-/**
  * A list of domains copy uploads can come from
  *
  * @since 1.20
@@ -696,17 +690,6 @@
  * @since 1.22
  */
 $wgCopyUploadTimeout = false;
-
-/**
- * Different timeout for upload by url when run as a background job
- * This could be useful since when fetching large files via job queue,
- * you may want a different timeout, especially because there is no
- * http request being kept alive.
- *
- * false means fallback to $wgCopyUploadTimeout.
- * @since 1.22
- */
-$wgCopyUploadAsyncTimeout = false;
 
 /**
  * Max size for uploads, in bytes. If not set to an array, applies to all
@@ -6908,7 +6891,6 @@
'sendMail' => 'EmaillingJob',
'enotifNotify' => 'EnotifNotifyJob',
'fixDoubleRedirect' => 'DoubleRedirectJob',
-   'uploadFromUrl' => 'UploadFromUrlJob',
'AssembleUploadChunks' => 'AssembleUploadChunksJob',
'PublishStashedFile' => 'PublishStashedFileJob',
'ThumbnailRender' => 'ThumbnailRenderJob',
diff --git a/includes/api/ApiUpload.php b/includes/api/ApiUpload.php
index e76b365..82f66a8 100644
--- a/includes/api/ApiUpload.php
+++ b/includes/api/ApiUpload.php
@@ -382,7 +382,7 @@
// chunk or one and only one of the following parameters is 
needed
if ( !$this->mParams['chunk'] ) {
$this->requireOnlyOneParameter( $this->mParams,
-   'filekey', 'file', 'url', 'statuskey' );
+   'filekey', 'file', 'url' );
}
 
// Status report for "upload to stash"/"upload from stash"
@@ -398,23 +398,6 @@
}
unset( $progress['status'] ); // remove Status object
$this->getResult()->addValue(

[MediaWiki-commits] [Gerrit] Moved designate domain IDs into hiera - change (operations/puppet)

2016-01-22 Thread Andrew Bogott (Code Review)

Andrew Bogott has submitted this change and it was merged.

Change subject: Moved designate domain IDs into hiera
..


Moved designate domain IDs into hiera

Change-Id: I68a914b2e062f4678a81ce246634aac88cf5655e
---
M hieradata/codfw/labtest.yaml
M hieradata/eqiad.yaml
M modules/openstack/templates/kilo/designate/designate.conf.erb
3 files changed, 7 insertions(+), 3 deletions(-)

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



diff --git a/hieradata/codfw/labtest.yaml b/hieradata/codfw/labtest.yaml
index 101c3d1..733aa44 100644
--- a/hieradata/codfw/labtest.yaml
+++ b/hieradata/codfw/labtest.yaml
@@ -97,6 +97,8 @@
   pdns_db_name: 'pdns'
   rabbit_host:  *labsnovacontroller
   controller_hostname: *labsnovacontroller
+  domain_id_internal_forward: '61194e5b-b78b-4979-bcdb-581dc4f296bf'
+  domain_id_internal_reverse: '7766d667-4a29-4a0a-9c36-77e9c4e38a32'
 
 glanceconfig:
   db_host: 'labtestcontrol2001.wikimedia.org'
diff --git a/hieradata/eqiad.yaml b/hieradata/eqiad.yaml
index e110b1a..2bbb524 100644
--- a/hieradata/eqiad.yaml
+++ b/hieradata/eqiad.yaml
@@ -126,6 +126,8 @@
   pdns_db_name: 'pdns'
   rabbit_host:  *labsnovacontroller
   controller_hostname: *labsnovacontroller
+  domain_id_internal_forward: '114f1333-c2c1-44d3-beb4-ebed1a91742b'
+  domain_id_internal_reverse: '8d114f3c-815b-466c-bdd4-9b91f704ea60'
 
 labs_baremetal_servers:
   - '10.64.20.12'
diff --git a/modules/openstack/templates/kilo/designate/designate.conf.erb 
b/modules/openstack/templates/kilo/designate/designate.conf.erb
index 9bb0faf..2212e22 100644
--- a/modules/openstack/templates/kilo/designate/designate.conf.erb
+++ b/modules/openstack/templates/kilo/designate/designate.conf.erb
@@ -211,13 +211,13 @@
 #---
 [handler:nova_fixed_multi]
 # Domain ID of domain to create records in. For a pre-existing domain, in this 
case eqiad.wmflabs
-domain_id = '114f1333-c2c1-44d3-beb4-ebed1a91742b'
+domain_id = <%= @designateconfig["domain_id_internal_forward"] %>
 notification_topics = monitor
 notification_topics = notifications
 control_exchange = nova
 format = '%(hostname)s.%(project_name)s.%(domain)s'
 format = '%(hostname)s.%(domain)s'
-reverse_domain_id = '8d114f3c-815b-466c-bdd4-9b91f704ea60'
+domain_id = <%= @designateconfig["domain_id_internal_reverse"] %>
 reverse_format = '%(hostname)s.%(project_name)s.%(domain)s'
 keystone_auth_name = "novaadmin"
 keystone_auth_pass = "<%= @keystoneconfig['ldap_user_pass'] %>"
@@ -229,7 +229,7 @@
 #---
 [handler:nova_ldap]
 # Domain ID of domain to create records in. For a pre-existing domain, in this 
case eqiad.wmflabs
-domain_id = '114f1333-c2c1-44d3-beb4-ebed1a91742b'
+domain_id = <%= @designateconfig["domain_id_internal_forward"] %>
 notification_topics = monitor
 notification_topics = notifications
 control_exchange = nova

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I68a914b2e062f4678a81ce246634aac88cf5655e
Gerrit-PatchSet: 1
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] Fix jenkins tests - change (mediawiki...OpenLayers)

2016-01-22 Thread jenkins-bot (Code Review)

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

Change subject: Fix jenkins tests
..


Fix jenkins tests

Also add translatible name.

And also add a i18n description.

Change-Id: I7a545f6f4d6845d4ff38b3ed6280b8db4eefc870
---
M composer.json
M extension.json
M i18n/en.json
M i18n/qqq.json
4 files changed, 6 insertions(+), 3 deletions(-)

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



diff --git a/composer.json b/composer.json
index 0e140e7..7500faa 100644
--- a/composer.json
+++ b/composer.json
@@ -15,7 +15,7 @@
"homepage": "http://yaronkoren.com/;
},
{
-   "name": "Paladox",
+   "name": "Paladox"
}
],
"require-dev": {
diff --git a/extension.json b/extension.json
index 79e938c..959a9ee 100644
--- a/extension.json
+++ b/extension.json
@@ -1,6 +1,7 @@
 {
-   "@Note": "When updating this file please also update SemanticForms.php 
with the same changes.",
+   "@Note": "When updating this file please also update OpenLayers.php 
with the same changes.",
"name": "OpenLayers",
+   "namemsg": "openlayers-extensionname",
"version": "1.0.0",
"author": [
"Yaron Koren",
diff --git a/i18n/en.json b/i18n/en.json
index 04a630e..db3da5b 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -5,5 +5,6 @@
"Paladox"
]
},
-   "semanticforms-desc": ""
+   "openlayers-extensionname": "OpenLayers",
+   "openlayers-desc": "This extension is fore adding the OpenLayers 
modules to other extensions."
 }
diff --git a/i18n/qqq.json b/i18n/qqq.json
index 0dbd6d6..8d9189b 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -4,5 +4,6 @@
"Paladox"
]
},
+   "openlayers-extensionname": "{{optional}}",
"openlayers-desc": 
"{{desc|name=OpenLayers|url=https://www.mediawiki.org/wiki/Extension:OpenLayers}};
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I7a545f6f4d6845d4ff38b3ed6280b8db4eefc870
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/OpenLayers
Gerrit-Branch: master
Gerrit-Owner: Paladox 
Gerrit-Reviewer: Paladox 
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] Small fix to enable redirect to articles - change (mediawiki...ArticlePlaceholder)

2016-01-22 Thread Lucie Kaffee (Code Review)

Lucie Kaffee has uploaded a new change for review.

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

Change subject: Small fix to enable redirect to articles
..

Small fix to enable redirect to articles

Bug: T109442
Change-Id: Ibaaa70bca491b6cca3f99a7d078d85129934d4f3
---
M Specials/SpecialAboutTopic.php
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ArticlePlaceholder 
refs/changes/37/265837/1

diff --git a/Specials/SpecialAboutTopic.php b/Specials/SpecialAboutTopic.php
index 5d932e6..4503fc3 100644
--- a/Specials/SpecialAboutTopic.php
+++ b/Specials/SpecialAboutTopic.php
@@ -323,7 +323,7 @@
array( $this->siteGlobalID )
);
 
-   if ( isset( $sitelinksTitles[0][1] ) ) {
+   if ( isset( $sitelinkTitles[0][1] ) ) {
$sitelinkTitle = $sitelinkTitles[0][1];
return $this->titleFactory->newFromText( $sitelinkTitle 
)->getLinkURL();
}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibaaa70bca491b6cca3f99a7d078d85129934d4f3
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ArticlePlaceholder
Gerrit-Branch: master
Gerrit-Owner: Lucie Kaffee 

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

[MediaWiki-commits] [Gerrit] Replace DB begin()/commit() with startAtomic()/endAtomic() a... - change (mediawiki...CloseWikis)

2016-01-22 Thread Aaron Schulz (Code Review)

Aaron Schulz has uploaded a new change for review.

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

Change subject: Replace DB begin()/commit() with startAtomic()/endAtomic() as 
needed
..

Replace DB begin()/commit() with startAtomic()/endAtomic() as needed

Bug: T120791
Change-Id: Iea5402d6317311782a750cac95ddaa9d3c70265d
---
M CloseWikis.php
1 file changed, 5 insertions(+), 5 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CloseWikis 
refs/changes/38/265838/1

diff --git a/CloseWikis.php b/CloseWikis.php
index 3fb0f62..ed27f52 100644
--- a/CloseWikis.php
+++ b/CloseWikis.php
@@ -150,8 +150,8 @@
 */
static function close( $wiki, $dispreason, $by ) {
global $wgMemc;
-   $dbw = CloseWikis::getMasterDB();
-   $dbw->begin( __METHOD__ );
+   $dbw = self::getMasterDB();
+   $dbw->startAtomic( __METHOD__ );
$dbw->insert(
'closedwikis',
array(
@@ -164,7 +164,7 @@
array( 'IGNORE' )   // Better error handling
);
$result = (bool)$dbw->affectedRows();
-   $dbw->commit( __METHOD__ );
+   $dbw->endAtomic( __METHOD__ );
$wgMemc->delete( "closedwikis:{$wiki}" );
self::$cachedList = null;
return $result;
@@ -174,14 +174,14 @@
static function reopen( $wiki ) {
global $wgMemc;
$dbw = self::getMasterDB();
-   $dbw->begin( __METHOD__ );
+   $dbw->startAtomic( __METHOD__ );
$dbw->delete(
'closedwikis',
array( 'cw_wiki' => $wiki ),
__METHOD__
);
$result = (bool)$dbw->affectedRows();
-   $dbw->commit( __METHOD__ );
+   $dbw->endAtomic( __METHOD__ );
$wgMemc->delete( "closedwikis:{$wiki}" );
self::$cachedList = null;
return $result;

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iea5402d6317311782a750cac95ddaa9d3c70265d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CloseWikis
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] Replace DB begin()/commit() with startAtomic()/endAtomic() a... - change (mediawiki...LiveTranslate)

2016-01-22 Thread Aaron Schulz (Code Review)

Aaron Schulz has uploaded a new change for review.

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

Change subject: Replace DB begin()/commit() with startAtomic()/endAtomic() as 
needed
..

Replace DB begin()/commit() with startAtomic()/endAtomic() as needed

Bug: T120791
Change-Id: I0c78f4ea080d29cf47b72dd62a96586a66ad7390
---
M api/ApiImportTranslationMemories.php
1 file changed, 4 insertions(+), 9 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/LiveTranslate 
refs/changes/39/265839/1

diff --git a/api/ApiImportTranslationMemories.php 
b/api/ApiImportTranslationMemories.php
index 1d5107e..9592ca2 100644
--- a/api/ApiImportTranslationMemories.php
+++ b/api/ApiImportTranslationMemories.php
@@ -89,9 +89,9 @@
 
$idOffset = ( $memoryId - 1 ) * 10;
$wordId = 0;
-   
-   $dbw->begin( __METHOD__ );
-   
+
+   $dbw->startAtomic( __METHOD__ );
+
// Insert the memory in the db.
foreach ( $tm->getTranslationUnits() as $tu ) {
if ( $GLOBALS['egLTRequireSignificance'] && 
!$tu->isSignificant() ) {
@@ -118,11 +118,6 @@
}

$wordId++;
-   
-   if ( $wordId % 500 == 0 ) {
-   $dbw->commit( __METHOD__ );
-   $dbw->begin( __METHOD__ );
-   }
}

$dbw->update(
@@ -135,7 +130,7 @@
array( 'memory_id' => $memoryId )
);
 
-   $dbw->commit( __METHOD__ );
+   $dbw->endAtomic( __METHOD__ );
}

/**

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I0c78f4ea080d29cf47b72dd62a96586a66ad7390
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/LiveTranslate
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] nodepool: dist-upgrade when preparing snapshot - change (integration/config)

2016-01-22 Thread Hashar (Code Review)

Hashar has uploaded a new change for review.

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

Change subject: nodepool: dist-upgrade when preparing snapshot
..

nodepool: dist-upgrade when preparing snapshot

Trying to upgrade does not always work for some mysterious reason...

Bug: T124447
Change-Id: I7e6b11c454b3a726984b427c0238e64ab5911669
---
M nodepool/scripts/setup_node.sh
1 file changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/02/265802/1

diff --git a/nodepool/scripts/setup_node.sh b/nodepool/scripts/setup_node.sh
index 4683a6f..9bdbee3 100755
--- a/nodepool/scripts/setup_node.sh
+++ b/nodepool/scripts/setup_node.sh
@@ -27,7 +27,7 @@
 sudo git -C /puppet pull
 sudo /usr/local/bin/puppet-apply 
/opt/git/integration/config/dib/puppet/ciimage.pp
 
-echo "apt-get upgrade && clean"
+echo "apt-get dist-upgrade && clean"
 sudo apt-get -q update
-sudo apt-get -V -q -y upgrade
+sudo apt-get -V -q -y dist-upgrade
 sudo apt-get clean

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

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

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

[MediaWiki-commits] [Gerrit] Add PLURAL support for SHOW_LAST_DAYS message - change (labs...crosswatch)

2016-01-22 Thread MtDu (Code Review)

MtDu has uploaded a new change for review.

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

Change subject: Add PLURAL support for SHOW_LAST_DAYS message
..

Add PLURAL support for SHOW_LAST_DAYS message

https://translatewiki.net/wiki/Thread:Support/About_Wikimedia:Crosswatch-SHOW_LAST_DAYS/en

Change-Id: I24f909839e714227d5191c874fce677d8911fd1f
---
M frontend/src/i18n/en.json
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/labs/tools/crosswatch 
refs/changes/04/265804/1

diff --git a/frontend/src/i18n/en.json b/frontend/src/i18n/en.json
index c03facc..937a33f 100644
--- a/frontend/src/i18n/en.json
+++ b/frontend/src/i18n/en.json
@@ -16,7 +16,7 @@
   "WIKIS": "Wikis",
   "LASTREVONLY": "Show only the latest change per page",
   "SHOW_LAST_HOURS": "Show last {{number}} hours",
-  "SHOW_LAST_DAYS": "Show last {{number}} days",
+  "SHOW_LAST_DAYS": "Show last {{PLURAL:{{number}}|day|days}}",
   "MINOR_EDITS": "minor edits",
   "BOT_EDITS": "bot edits",
   "ANON_EDITS": "anonymous user edits",

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I24f909839e714227d5191c874fce677d8911fd1f
Gerrit-PatchSet: 1
Gerrit-Project: labs/tools/crosswatch
Gerrit-Branch: master
Gerrit-Owner: MtDu 

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

[MediaWiki-commits] [Gerrit] Update jscs and readable-stream dependencies for consistency. - change (mediawiki...text_renderer)

2016-01-22 Thread Cscott (Code Review)

Cscott has uploaded a new change for review.

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

Change subject: Update jscs and readable-stream dependencies for consistency.
..

Update jscs and readable-stream dependencies for consistency.

Change-Id: Id32f18713ceefa0d0210e480adf84ac9eee42df4
---
M package.json
1 file changed, 2 insertions(+), 2 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Collection/OfflineContentGenerator/text_renderer
 refs/changes/05/265805/1

diff --git a/package.json b/package.json
index 31889ac..4fe9de8 100644
--- a/package.json
+++ b/package.json
@@ -28,7 +28,7 @@
 "domino": "~1.0.19",
 "linewrap": "~0.2.1",
 "prfun": "~2.1.1",
-"readable-stream": "~1.0.0",
+"readable-stream": "~1.0.33",
 "sqlite3": "~3.1.0",
 "tmp": "~0.0.27"
   },
@@ -36,7 +36,7 @@
   "mw-ocg-bundler": "~1.3.0"
   },
   "devDependencies": {
-"jscs": "~2.1.1",
+"jscs": "~2.5.0",
 "jshint": "~2.8.0",
 "mocha": "~2.3.3",
 "npm-travis": "~1.0.0"

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id32f18713ceefa0d0210e480adf84ac9eee42df4
Gerrit-PatchSet: 1
Gerrit-Project: 
mediawiki/extensions/Collection/OfflineContentGenerator/text_renderer
Gerrit-Branch: master
Gerrit-Owner: Cscott 

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

[MediaWiki-commits] [Gerrit] Temporarily disable MathSearchUtilsTest test - change (mediawiki...MathSearch)

2016-01-22 Thread jenkins-bot (Code Review)

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

Change subject: Temporarily disable MathSearchUtilsTest test
..


Temporarily disable MathSearchUtilsTest test

* This causes problems on Jenkins.

Change-Id: I1a823b14b8284eb3c18c24af02d47c11da457d38
---
M tests/MathSearchUtilsTest.php
1 file changed, 1 insertion(+), 3 deletions(-)

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



diff --git a/tests/MathSearchUtilsTest.php b/tests/MathSearchUtilsTest.php
index 7a01ab0..c984488 100644
--- a/tests/MathSearchUtilsTest.php
+++ b/tests/MathSearchUtilsTest.php
@@ -18,9 +18,7 @@
 ';
public function test() {
$dbw = wfGetDB( DB_MASTER );
-   if ( $dbw->getType() !== 'mysql' ) {
-   $this->markTestSkipped( __METHOD__ . " supports MySql 
databases only." );
-   }
+   $this->markTestSkipped( __METHOD__ . " temporary deactivated." 
);
$dbw->query( 'CREATE TEMPORARY TABLE IF NOT EXISTS 
tmp_math_util_test (s TEXT, i INT)' );
$dbw->insert(
"tmp_math_util_test", array( array( 's'=>'a', 'i'=>1 ), 
array( 's'=>'b','i'=>2 ) )

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I1a823b14b8284eb3c18c24af02d47c11da457d38
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/MathSearch
Gerrit-Branch: master
Gerrit-Owner: Physikerwelt 
Gerrit-Reviewer: Aaron Schulz 
Gerrit-Reviewer: Dyiop 
Gerrit-Reviewer: Hcohl 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: Whyameri 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] vhtcpd (0.0.11-1) unstable; urgency=low - change (operations...vhtcpd)

2016-01-22 Thread BBlack (Code Review)

BBlack has uploaded a new change for review.

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

Change subject: vhtcpd (0.0.11-1) unstable; urgency=low
..

vhtcpd (0.0.11-1) unstable; urgency=low

  * bump "upstream" for updates

 -- Brandon Black   Fri, 22 Jan 2016 20:05:13 +

Change-Id: I13441b89cd1bfa35cb7fa8df067b65f5b0320d76
---
M debian/changelog
1 file changed, 6 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/software/varnish/vhtcpd 
refs/changes/11/265811/1

diff --git a/debian/changelog b/debian/changelog
index c8c72dc..9de3662 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+vhtcpd (0.0.11-1) unstable; urgency=low
+
+  * bump "upstream" for updates
+
+ -- Brandon Black   Fri, 22 Jan 2016 20:05:13 +
+
 vhtcpd (0.0.10-3) unstable; urgency=low
 
   * Fixed Build-Depends (was missing libpcre3-dev and libev-dev)

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I13441b89cd1bfa35cb7fa8df067b65f5b0320d76
Gerrit-PatchSet: 1
Gerrit-Project: operations/software/varnish/vhtcpd
Gerrit-Branch: debian
Gerrit-Owner: BBlack 

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

[MediaWiki-commits] [Gerrit] Update jscs and readable-stream dependencies for consistency. - change (mediawiki...zim_renderer)

2016-01-22 Thread Cscott (Code Review)

Cscott has uploaded a new change for review.

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

Change subject: Update jscs and readable-stream dependencies for consistency.
..

Update jscs and readable-stream dependencies for consistency.

Change-Id: I040e0dacf585cbaeaa575767e03404c703c1c1df
---
M package.json
1 file changed, 2 insertions(+), 2 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Collection/OfflineContentGenerator/zim_renderer
 refs/changes/09/265809/1

diff --git a/package.json b/package.json
index 7521203..0357715 100644
--- a/package.json
+++ b/package.json
@@ -31,12 +31,12 @@
 "core-js": "~0.9.18",
 "domino": "~1.0.19",
 "prfun": "~2.1.1",
-"readable-stream": "~1.0.0",
+"readable-stream": "~1.0.33",
 "sqlite3": "~3.1.0",
 "tmp": "~0.0.27"
   },
   "devDependencies": {
-"jscs": "~2.1.1",
+"jscs": "~2.5.0",
 "jshint": "~2.8.0",
 "mocha": "~2.3.3",
 "npm-travis": "~1.0.0"

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I040e0dacf585cbaeaa575767e03404c703c1c1df
Gerrit-PatchSet: 1
Gerrit-Project: 
mediawiki/extensions/Collection/OfflineContentGenerator/zim_renderer
Gerrit-Branch: master
Gerrit-Owner: Cscott 

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

[MediaWiki-commits] [Gerrit] Follow-up I9714cf3: Add tests for wikitable paste - change (mediawiki...VisualEditor)

2016-01-22 Thread Esanders (Code Review)

Esanders has uploaded a new change for review.

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

Change subject: Follow-up I9714cf3: Add tests for wikitable paste
..

Follow-up I9714cf3: Add tests for wikitable paste

Bug: T85577
Change-Id: I8e2893c9a6f80fafe6cae142e4f50ffbe6d550ac
---
M modules/ve-mw/tests/dm/ve.dm.mwExample.js
1 file changed, 25 insertions(+), 0 deletions(-)


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

diff --git a/modules/ve-mw/tests/dm/ve.dm.mwExample.js 
b/modules/ve-mw/tests/dm/ve.dm.mwExample.js
index b82283a..a559eae 100644
--- a/modules/ve-mw/tests/dm/ve.dm.mwExample.js
+++ b/modules/ve-mw/tests/dm/ve.dm.mwExample.js
@@ -940,6 +940,31 @@
{ type: '/internalList' }
]
},
+   'table is created as wikitable on paste': {
+   body: 'Foo',
+   fromClipboard: true,
+   data: [
+   {
+   type: 'mwTable',
+   attributes: {
+   wikitable: true
+   }
+   },
+   { type: 'tableSection', attributes: { style: 'body' } },
+   { type: 'tableRow' },
+   { type: 'tableCell', attributes: { style: 'data' } },
+   { type: 'paragraph', internal: { generated: 'wrapper' } 
},
+   'F', 'o', 'o',
+   { type: '/paragraph' },
+   { type: '/tableCell' },
+   { type: '/tableRow' },
+   { type: '/tableSection' },
+   { type: '/mwTable' },
+   { type: 'internalList' },
+   { type: '/internalList' }
+   ],
+   normalizedBody: 'Foo'
+   },
'mw:Transclusion (block level)': {
body: ve.dm.mwExample.MWTransclusion.blockOpen + 
ve.dm.mwExample.MWTransclusion.blockContent,
data: [

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

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

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

[MediaWiki-commits] [Gerrit] Merge branch 'master' into debian - change (operations...vhtcpd)

2016-01-22 Thread BBlack (Code Review)

BBlack has uploaded a new change for review.

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

Change subject: Merge branch 'master' into debian
..

Merge branch 'master' into debian

Change-Id: I4db704bf07ad99fbb2897dff61044cc8cd7243a1
---
0 files changed, 0 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/software/varnish/vhtcpd 
refs/changes/10/265810/1


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I4db704bf07ad99fbb2897dff61044cc8cd7243a1
Gerrit-PatchSet: 1
Gerrit-Project: operations/software/varnish/vhtcpd
Gerrit-Branch: debian
Gerrit-Owner: BBlack 

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

[MediaWiki-commits] [Gerrit] When loading VE, replace the title shown - change (mediawiki...VisualEditor)

2016-01-22 Thread Alex Monk (Code Review)

Alex Monk has uploaded a new change for review.

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

Change subject: When loading VE, replace the title shown
..

When loading VE, replace the title shown

Just in case we were loaded from somewhere like action=edit

Bug: T117643
Change-Id: Ice21389d02ea10adc668c5b0a64ba2b0b9cf5744
---
M modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.js
1 file changed, 1 insertion(+), 0 deletions(-)


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

diff --git a/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.js 
b/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.js
index 9db9d3d..6783553 100644
--- a/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.js
+++ b/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.js
@@ -276,6 +276,7 @@
this.checkboxFields = [];
this.checkboxesByName = {};
this.$otherFields = $( [] );
+   $( '#content #firstHeading' ).text( mw.config.get( 'wgTitle' ) );
 
if ( data.checkboxes ) {
defaults = {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ice21389d02ea10adc668c5b0a64ba2b0b9cf5744
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Alex Monk 

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

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

2016-01-22 Thread Paladox (Code Review)

Paladox has uploaded a new change for review.

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

Change subject: Test
..

Test

Change-Id: If1dd61349014f48d629739764ad675cc235a6d6f
---
M composer.json
1 file changed, 8 insertions(+), 0 deletions(-)


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

diff --git a/composer.json b/composer.json
index be0487c..15f38db 100644
--- a/composer.json
+++ b/composer.json
@@ -15,5 +15,13 @@
],
"require": {
"composer/installers" : ">=1.0.1"
+   },
+   "require-dev": {
+   "sstalle/php7cc": "dev-master"
+   },
+   "scripts": {
+   "test": [
+   "php7cc"
+   ]
}
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: If1dd61349014f48d629739764ad675cc235a6d6f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Scribunto
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] Make preventSessionsForUser() use READ_LATEST - change (mediawiki/core)

2016-01-22 Thread Aaron Schulz (Code Review)

Aaron Schulz has uploaded a new change for review.

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

Change subject: Make preventSessionsForUser() use READ_LATEST
..

Make preventSessionsForUser() use READ_LATEST

Bug: T124441
Change-Id: Id5b9f27c7814937eb5e71a0a6fb219173325c41a
---
M includes/session/SessionManager.php
M includes/user/User.php
2 files changed, 7 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/23/265823/1

diff --git a/includes/session/SessionManager.php 
b/includes/session/SessionManager.php
index c4f33d0..588eca4 100644
--- a/includes/session/SessionManager.php
+++ b/includes/session/SessionManager.php
@@ -529,9 +529,12 @@
 
// Reset the user's token to kill existing sessions
$user = User::newFromName( $username );
-   if ( $user && $user->getToken() ) {
-   $user->setToken( true );
-   $user->saveSettings();
+   if ( $user ) { // valid name
+   $user->load( User::READ_LATEST ); // T124441
+   if ( $user->getToken() ) {
+   $user->setToken( true );
+   $user->saveSettings();
+   }
}
 
// Instruct the session providers to kill any other sessions 
too.
diff --git a/includes/user/User.php b/includes/user/User.php
index 47e67e5..19333f4 100644
--- a/includes/user/User.php
+++ b/includes/user/User.php
@@ -634,6 +634,7 @@
// No user. Create it?
return $options['create'] ? self::createNew( $name ) : 
null;
}
+
$user = self::newFromRow( $row );
 
// A user is considered to exist as a non-system user if it has 
a

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id5b9f27c7814937eb5e71a0a6fb219173325c41a
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] Update VE core submodule to master (0329d1d) - change (mediawiki...VisualEditor)

2016-01-22 Thread jenkins-bot (Code Review)

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

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


Update VE core submodule to master (0329d1d)

New changes:
7626140 Localisation updates from https://translatewiki.net.
1b51288 Refactor unicorn handling in ve.ce.Document#getNodeAndOffset
2458c1a Localisation updates from https://translatewiki.net.
af4a978 Initial cursor position: outside any nails
0ac9d6c Fix node length calculation
9dcb412 Fix logic for showing alien context item
0c4c39d Localisation updates from https://translatewiki.net.
92bb6d3 ElementLinearData#Sanitize: Remove meaningless HTML whitespace by 
default
4e2aa21 ce.Surface: Show deactivated selection when cursor is collapsed
b448f7d Remove background colour form table headers
87aa8da Follow-up I04ca47: Adjust comment to note we still care it's native

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

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



diff --git a/lib/ve b/lib/ve
index 3a92f7e..0329d1d 16
--- a/lib/ve
+++ b/lib/ve
-Subproject commit 3a92f7e3ae53939456716dc81b79d6b1bee1bbbd
+Subproject commit 0329d1ddc89ae1c3ab9feeb29ce5faf18bb9858c

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

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

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

[MediaWiki-commits] [Gerrit] Added dummy password for passwords::openldap::labtest - change (labs/private)

2016-01-22 Thread Andrew Bogott (Code Review)

Andrew Bogott has uploaded a new change for review.

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

Change subject: Added dummy password for passwords::openldap::labtest
..

Added dummy password for passwords::openldap::labtest

Change-Id: I87163e76bce2a984cc7d2acc000da1a2989d15b4
---
M modules/passwords/manifests/init.pp
1 file changed, 4 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/labs/private 
refs/changes/27/265827/1

diff --git a/modules/passwords/manifests/init.pp 
b/modules/passwords/manifests/init.pp
index 5c16f11..4dd9719 100644
--- a/modules/passwords/manifests/init.pp
+++ b/modules/passwords/manifests/init.pp
@@ -448,6 +448,10 @@
 $sync_pass = 'BAAR'
 }
 
+class passwords::openldap::labtest {
+$sync_pass = 'FBAAR'
+}
+
 class passwords::tessera {
 $secret_key = 'notsecret'
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I87163e76bce2a984cc7d2acc000da1a2989d15b4
Gerrit-PatchSet: 1
Gerrit-Project: labs/private
Gerrit-Branch: master
Gerrit-Owner: Andrew Bogott 

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

[MediaWiki-commits] [Gerrit] Merge branch 'master' into debian - change (operations...vhtcpd)

2016-01-22 Thread BBlack (Code Review)

BBlack has submitted this change and it was merged.

Change subject: Merge branch 'master' into debian
..


Merge branch 'master' into debian

Change-Id: I4db704bf07ad99fbb2897dff61044cc8cd7243a1
---
0 files changed, 0 insertions(+), 0 deletions(-)

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




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

Gerrit-MessageType: merged
Gerrit-Change-Id: I4db704bf07ad99fbb2897dff61044cc8cd7243a1
Gerrit-PatchSet: 1
Gerrit-Project: operations/software/varnish/vhtcpd
Gerrit-Branch: debian
Gerrit-Owner: BBlack 
Gerrit-Reviewer: BBlack 

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

[MediaWiki-commits] [Gerrit] Change permision on binarys from 0644 to 0755 - change (mediawiki...Scribunto)

2016-01-22 Thread Paladox (Code Review)

Paladox has uploaded a new change for review.

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

Change subject: Change permision on binarys from 0644 to 0755
..

Change permision on binarys from 0644 to 0755

It was causing not executed problem.

Bug: T124471
Change-Id: I8708e41cafb8cc553614b4c4472c4a5b19eff0f7
---
M engines/LuaStandalone/binaries/lua5_1_5_linux_32_generic/lua
M engines/LuaStandalone/binaries/lua5_1_5_linux_64_generic/lua
M engines/LuaStandalone/binaries/lua5_1_5_mac_lion_fat_generic/lua
3 files changed, 0 insertions(+), 0 deletions(-)


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

diff --git a/engines/LuaStandalone/binaries/lua5_1_5_linux_32_generic/lua 
b/engines/LuaStandalone/binaries/lua5_1_5_linux_32_generic/lua
index 6c468e7..f0e286e 100755
--- a/engines/LuaStandalone/binaries/lua5_1_5_linux_32_generic/lua
+++ b/engines/LuaStandalone/binaries/lua5_1_5_linux_32_generic/lua
Binary files differ
diff --git a/engines/LuaStandalone/binaries/lua5_1_5_linux_64_generic/lua 
b/engines/LuaStandalone/binaries/lua5_1_5_linux_64_generic/lua
index 7ec7f90..58c5624 100755
--- a/engines/LuaStandalone/binaries/lua5_1_5_linux_64_generic/lua
+++ b/engines/LuaStandalone/binaries/lua5_1_5_linux_64_generic/lua
Binary files differ
diff --git a/engines/LuaStandalone/binaries/lua5_1_5_mac_lion_fat_generic/lua 
b/engines/LuaStandalone/binaries/lua5_1_5_mac_lion_fat_generic/lua
index 7c04d5e..7a9b061 100755
--- a/engines/LuaStandalone/binaries/lua5_1_5_mac_lion_fat_generic/lua
+++ b/engines/LuaStandalone/binaries/lua5_1_5_mac_lion_fat_generic/lua
Binary files differ

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I8708e41cafb8cc553614b4c4472c4a5b19eff0f7
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Scribunto
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] add notes to remember how to build this thing - change (operations...vhtcpd)

2016-01-22 Thread BBlack (Code Review)

BBlack has uploaded a new change for review.

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

Change subject: add notes to remember how to build this thing
..

add notes to remember how to build this thing

Change-Id: I0915b3857529d0ea4442a3afb8ab3d9da9c2a85b
---
A debian/README.BUILD.WMF
1 file changed, 12 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/software/varnish/vhtcpd 
refs/changes/31/265831/1

diff --git a/debian/README.BUILD.WMF b/debian/README.BUILD.WMF
new file mode 100644
index 000..c3edeea
--- /dev/null
+++ b/debian/README.BUILD.WMF
@@ -0,0 +1,12 @@
+How I last built this on copper.eqiad.wmnet (it has submodules and blah 
blah)...
+
+-- added to ~/.gitconfig:
+[http]
+   proxy = http://webproxy.eqiad.wmnet:8080
+[https]
+   proxy = http://webproxy.eqiad.wmnet:8080
+--
+export http_proxy=http://webproxy.eqiad.wmnet:8080
+git clone https://gerrit.wikimedia.org/r/operations/software/varnish/vhtcpd
+git checkout debian
+DIST=jessie ARCH=amd64 WIKIMEDIA=yes git buildpackage --git-submodules 
--git-pbuilder --git-debian-branch=debian --git-upstream-branch=master 
--git-upstream-tree=branch --git-export-dir=../build-area --git-dist=jessie -us 
-uc

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I0915b3857529d0ea4442a3afb8ab3d9da9c2a85b
Gerrit-PatchSet: 1
Gerrit-Project: operations/software/varnish/vhtcpd
Gerrit-Branch: debian
Gerrit-Owner: BBlack 

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

[MediaWiki-commits] [Gerrit] Delete note about non-existing files - change (mediawiki...Wikibase)

2016-01-22 Thread jenkins-bot (Code Review)

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

Change subject: Delete note about non-existing files
..


Delete note about non-existing files

They were deleted in Ice9688f6d25f2410b2a04ccd48aae78acd953f19.

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

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



diff --git a/README.md b/README.md
index 6a9cf38..51147d3 100644
--- a/README.md
+++ b/README.md
@@ -26,8 +26,6 @@
 
 The lib bundles common code that is used by both the client and the repo.
 
-Note that in each of the directories you will also find `README.md` notes for 
each of the extensions.
-
 ## Install
 
 This package contains three interrelated MediaWiki extensions:

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

Gerrit-MessageType: merged
Gerrit-Change-Id: If05fcf54c58541126afac71d60b5b5a0f44076e3
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Matěj Suchánek 
Gerrit-Reviewer: Aude 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Remove redundant commit() in maybePruneIPData() - change (mediawiki...CheckUser)

2016-01-22 Thread Aaron Schulz (Code Review)

Aaron Schulz has uploaded a new change for review.

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

Change subject: Remove redundant commit() in maybePruneIPData()
..

Remove redundant commit() in maybePruneIPData()

Change-Id: Ia52443f779e317e4b0f6799d90d578a4ec1dc172
---
M CheckUser.hooks.php
1 file changed, 0 insertions(+), 1 deletion(-)


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

diff --git a/CheckUser.hooks.php b/CheckUser.hooks.php
index a879b84..a68b538 100755
--- a/CheckUser.hooks.php
+++ b/CheckUser.hooks.php
@@ -240,7 +240,6 @@
 
if ( $ids ) {
$dbw->delete( 'cu_changes', array( 
'cuc_id' => $ids ), $fname );
-   $dbw->commit( 'flush' );
}
} );
}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia52443f779e317e4b0f6799d90d578a4ec1dc172
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CheckUser
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] Fix jenkins tests - change (mediawiki...OpenLayers)

2016-01-22 Thread Paladox (Code Review)

Paladox has uploaded a new change for review.

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

Change subject: Fix jenkins tests
..

Fix jenkins tests

Also add translatible name.

And also add a i18n description.

Change-Id: I7a545f6f4d6845d4ff38b3ed6280b8db4eefc870
---
M composer.json
M extension.json
M i18n/en.json
M i18n/qqq.json
4 files changed, 6 insertions(+), 3 deletions(-)


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

diff --git a/composer.json b/composer.json
index 0e140e7..7500faa 100644
--- a/composer.json
+++ b/composer.json
@@ -15,7 +15,7 @@
"homepage": "http://yaronkoren.com/;
},
{
-   "name": "Paladox",
+   "name": "Paladox"
}
],
"require-dev": {
diff --git a/extension.json b/extension.json
index 79e938c..959a9ee 100644
--- a/extension.json
+++ b/extension.json
@@ -1,6 +1,7 @@
 {
-   "@Note": "When updating this file please also update SemanticForms.php 
with the same changes.",
+   "@Note": "When updating this file please also update OpenLayers.php 
with the same changes.",
"name": "OpenLayers",
+   "namemsg": "openlayers-extensionname",
"version": "1.0.0",
"author": [
"Yaron Koren",
diff --git a/i18n/en.json b/i18n/en.json
index 04a630e..db3da5b 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -5,5 +5,6 @@
"Paladox"
]
},
-   "semanticforms-desc": ""
+   "openlayers-extensionname": "OpenLayers",
+   "openlayers-desc": "This extension is fore adding the OpenLayers 
modules to other extensions."
 }
diff --git a/i18n/qqq.json b/i18n/qqq.json
index 0dbd6d6..8d9189b 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -4,5 +4,6 @@
"Paladox"
]
},
+   "openlayers-extensionname": "{{optional}}",
"openlayers-desc": 
"{{desc|name=OpenLayers|url=https://www.mediawiki.org/wiki/Extension:OpenLayers}};
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I7a545f6f4d6845d4ff38b3ed6280b8db4eefc870
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/OpenLayers
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] Special:GatherEditFeed prevent FOUC - change (mediawiki...Gather)

2016-01-22 Thread jenkins-bot (Code Review)

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

Change subject: Special:GatherEditFeed prevent FOUC
..


Special:GatherEditFeed prevent FOUC

Load mobile.pagelist.styles and mobile.pagesummary.styles in 
to prevent flash of unstyles content.

Bug: T124326
Change-Id: I70d1269bf88a3a69799e48161001ce3f0b9d9cce
---
M includes/specials/SpecialGatherEditFeed.php
1 file changed, 3 insertions(+), 1 deletion(-)

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



diff --git a/includes/specials/SpecialGatherEditFeed.php 
b/includes/specials/SpecialGatherEditFeed.php
index a442ba4..ac96e9c 100644
--- a/includes/specials/SpecialGatherEditFeed.php
+++ b/includes/specials/SpecialGatherEditFeed.php
@@ -45,7 +45,9 @@
$out->addModuleStyles( array(
'mediawiki.ui.input',
'ext.gather.styles',
-   'ext.gather.menu.icon'
+   'ext.gather.menu.icon',
+   'mobile.pagelist.styles',
+   'mobile.pagesummary.styles',
) );
$out->setProperty( 'unstyledContent', true );
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I70d1269bf88a3a69799e48161001ce3f0b9d9cce
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/Gather
Gerrit-Branch: dev
Gerrit-Owner: Victorbarbu 
Gerrit-Reviewer: Jdlrobson 
Gerrit-Reviewer: Sumit 
Gerrit-Reviewer: Victorbarbu 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Replace DB begin()/commit() with startAtomic()/endAtomic() a... - change (mediawiki...CloseWikis)

2016-01-22 Thread jenkins-bot (Code Review)

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

Change subject: Replace DB begin()/commit() with startAtomic()/endAtomic() as 
needed
..


Replace DB begin()/commit() with startAtomic()/endAtomic() as needed

Bug: T120791
Change-Id: Iea5402d6317311782a750cac95ddaa9d3c70265d
---
M CloseWikis.php
1 file changed, 5 insertions(+), 5 deletions(-)

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



diff --git a/CloseWikis.php b/CloseWikis.php
index 3fb0f62..ed27f52 100644
--- a/CloseWikis.php
+++ b/CloseWikis.php
@@ -150,8 +150,8 @@
 */
static function close( $wiki, $dispreason, $by ) {
global $wgMemc;
-   $dbw = CloseWikis::getMasterDB();
-   $dbw->begin( __METHOD__ );
+   $dbw = self::getMasterDB();
+   $dbw->startAtomic( __METHOD__ );
$dbw->insert(
'closedwikis',
array(
@@ -164,7 +164,7 @@
array( 'IGNORE' )   // Better error handling
);
$result = (bool)$dbw->affectedRows();
-   $dbw->commit( __METHOD__ );
+   $dbw->endAtomic( __METHOD__ );
$wgMemc->delete( "closedwikis:{$wiki}" );
self::$cachedList = null;
return $result;
@@ -174,14 +174,14 @@
static function reopen( $wiki ) {
global $wgMemc;
$dbw = self::getMasterDB();
-   $dbw->begin( __METHOD__ );
+   $dbw->startAtomic( __METHOD__ );
$dbw->delete(
'closedwikis',
array( 'cw_wiki' => $wiki ),
__METHOD__
);
$result = (bool)$dbw->affectedRows();
-   $dbw->commit( __METHOD__ );
+   $dbw->endAtomic( __METHOD__ );
$wgMemc->delete( "closedwikis:{$wiki}" );
self::$cachedList = null;
return $result;

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Iea5402d6317311782a750cac95ddaa9d3c70265d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CloseWikis
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz 
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] SessionManager: Kill getPersistedSessionId() - change (mediawiki/core)

2016-01-22 Thread Anomie (Code Review)

Anomie has uploaded a new change for review.

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

Change subject: SessionManager: Kill getPersistedSessionId()
..

SessionManager: Kill getPersistedSessionId()

It's not guaranteed that loadSessionFromStore() will succeed after
whatever alterations the SessionProvider might have made later in the
request.

So instead, let's make a new global object that stores the SessionId
of the persistent session that was loaded during Setup.php, if any. Then
we can check that when we need to know whether the session was
persisted.

Bug: T124468
Change-Id: I1e8e616c83b16aadd86b0a0a40826d40f6e8abe4
---
M includes/Setup.php
M includes/WebRequest.php
M includes/session/SessionManager.php
M includes/session/SessionManagerInterface.php
M includes/specials/SpecialUserlogin.php
M tests/phpunit/includes/session/SessionManagerTest.php
6 files changed, 17 insertions(+), 54 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/40/265840/1

diff --git a/includes/Setup.php b/includes/Setup.php
index e962a49..85ff3f3 100644
--- a/includes/Setup.php
+++ b/includes/Setup.php
@@ -691,6 +691,11 @@
 
 // Set up the session
 $ps_session = Profiler::instance()->scopedProfileIn( $fname . '-session' );
+/**
+ * @var MediaWiki\\Session\\SessionId|null $wgInitialSessionId The persistent
+ * session ID (if any) loaded at startup
+ */
+$wgInitialSessionId = null;
 if ( !defined( 'MW_NO_SESSION' ) && !$wgCommandLineMode ) {
// If session.auto_start is there, we can't touch session name
if ( $wgPHPSessionHandling !== 'disable' && !wfIniGetBool( 
'session.auto_start' ) ) {
@@ -723,6 +728,10 @@
throw $ex;
}
 
+   if ( $session->isPersistent() ) {
+   $wgInitialSessionId = $session->getSessionId();
+   }
+
$session->renew();
if ( MediaWiki\Session\PHPSessionHandler::isEnabled() &&
( $session->isPersistent() || $session->shouldRememberUser() )
diff --git a/includes/WebRequest.php b/includes/WebRequest.php
index 2c14618..4c4ca97 100644
--- a/includes/WebRequest.php
+++ b/includes/WebRequest.php
@@ -686,8 +686,10 @@
 * @return bool
 */
public function checkSessionCookie() {
+   global $wgInitialSessionId;
wfDeprecated( __METHOD__, '1.27' );
-   return SessionManager::singleton()->getPersistedSessionId( 
$this ) !== null;
+   return $wgInitialSessionId !== null &&
+   $this->getSession()->getId() === 
(string)$wgInitialSessionId;
}
 
/**
diff --git a/includes/session/SessionManager.php 
b/includes/session/SessionManager.php
index c4f33d0..ecc4e54 100644
--- a/includes/session/SessionManager.php
+++ b/includes/session/SessionManager.php
@@ -178,15 +178,6 @@
$this->logger = $logger;
}
 
-   public function getPersistedSessionId( WebRequest $request ) {
-   $info = $this->getSessionInfoForRequest( $request );
-   if ( $info && $info->wasPersisted() ) {
-   return $info->getId();
-   } else {
-   return null;
-   }
-   }
-
public function getSessionForRequest( WebRequest $request ) {
$info = $this->getSessionInfoForRequest( $request );
 
diff --git a/includes/session/SessionManagerInterface.php 
b/includes/session/SessionManagerInterface.php
index d58d3b9..14af630 100644
--- a/includes/session/SessionManagerInterface.php
+++ b/includes/session/SessionManagerInterface.php
@@ -35,21 +35,6 @@
  */
 interface SessionManagerInterface extends LoggerAwareInterface {
/**
-* Fetch the persisted session ID in a request.
-*
-* Note this is not the same thing as whether the session associated 
with
-* the request is currently persistent, as the session might have been
-* first made persistent during this request.
-*
-* @param WebRequest $request
-* @return string|null
-* @throws \\OverflowException if there are multiple sessions tied for 
top
-*  priority in the request. Exception has a property "sessionInfos"
-*  holding the SessionInfo objects for the sessions involved.
-*/
-   public function getPersistedSessionId( WebRequest $request );
-
-   /**
 * Fetch the session for a request
 *
 * @note You probably want to use $request->getSession() instead. It's 
more
diff --git a/includes/specials/SpecialUserlogin.php 
b/includes/specials/SpecialUserlogin.php
index 24e1675..9473dff 100644
--- a/includes/specials/SpecialUserlogin.php
+++ b/includes/specials/SpecialUserlogin.php
@@ -1566,10 +1566,12 @@
 * @return bool
 */
function hasSessionCookie() {
-   global $wgDisableCookieCheck;
+   global $wgDisableCookieCheck,

[MediaWiki-commits] [Gerrit] Remove begin()/commit() calls that can break outer transactions - change (mediawiki...PollNY)

2016-01-22 Thread Aaron Schulz (Code Review)

Aaron Schulz has uploaded a new change for review.

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

Change subject: Remove begin()/commit() calls that can break outer transactions
..

Remove begin()/commit() calls that can break outer transactions

The single statements are already atomic and will commit at
the end of the request in commitMasterChanges().

Bug: T120791
Change-Id: I51e87794ad9d65472f47262e2d31d1692f2a4c2b
---
M PollClass.php
1 file changed, 0 insertions(+), 5 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/PollNY 
refs/changes/41/265841/1

diff --git a/PollClass.php b/PollClass.php
index 0d198ad..59bc884 100644
--- a/PollClass.php
+++ b/PollClass.php
@@ -49,7 +49,6 @@
),
__METHOD__
);
-   $dbw->commit( __METHOD__ );
}
 
/**
@@ -73,7 +72,6 @@
),
__METHOD__
);
-   $dbw->commit( __METHOD__ );
if( $choiceID > 0 ) {
$this->incPollVoteCount( $pollID );
$this->incChoiceVoteCount( $choiceID );
@@ -96,7 +94,6 @@
array( 'pc_id' => $choiceID ),
__METHOD__
);
-   $dbw->commit( __METHOD__ );
}
 
/**
@@ -112,7 +109,6 @@
array( 'poll_id' => $pollID ),
__METHOD__
);
-   $dbw->commit( __METHOD__ );
}
 
/**
@@ -319,7 +315,6 @@
array( 'poll_id' => (int)$pollId ),
__METHOD__
);
-   $dbw->commit( __METHOD__ );
}
 
/**

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I51e87794ad9d65472f47262e2d31d1692f2a4c2b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/PollNY
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] Remove begin()/commit() calls that can break outer transactions - change (mediawiki...QuizGame)

2016-01-22 Thread Aaron Schulz (Code Review)

Aaron Schulz has uploaded a new change for review.

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

Change subject: Remove begin()/commit() calls that can break outer transactions
..

Remove begin()/commit() calls that can break outer transactions

The single statements are already atomic and will commit at
the end of the request in commitMasterChanges().

Bug: T120791
Change-Id: Id91bb586a4f7589e4b59ee23d78c3cf4844d9d15
---
M QuestionGameHome.body.php
M api/ApiQuizGame.php
M api/ApiQuizGameVote.php
3 files changed, 0 insertions(+), 9 deletions(-)


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

diff --git a/QuestionGameHome.body.php b/QuestionGameHome.body.php
index ba67d8f..28607d5 100644
--- a/QuestionGameHome.body.php
+++ b/QuestionGameHome.body.php
@@ -1303,7 +1303,6 @@
),
__METHOD__
);
-   $dbw->commit( __METHOD__ );
}
}
 
diff --git a/api/ApiQuizGame.php b/api/ApiQuizGame.php
index 50142bb..493c9ba 100644
--- a/api/ApiQuizGame.php
+++ b/api/ApiQuizGame.php
@@ -55,7 +55,6 @@
array( 'q_id' => intval( $id ) ),
__METHOD__
);
-   $dbw->commit( __METHOD__ );
 
$output = wfMessage( 
'quizgame-ajax-unprotected' )->text();
 
@@ -72,7 +71,6 @@
array( 'q_id' => intval( $id ) ),
__METHOD__
);
-   $dbw->commit( __METHOD__ );
 
$output = wfMessage( 'quizgame-ajax-protected' 
)->text();
 
@@ -106,7 +104,6 @@
array( 'q_id' => intval( $id ) ),
__METHOD__
);
-   $dbw->commit( __METHOD__ );
 
$output = wfMessage( 'quizgame-ajax-unflagged' 
)->text();
 
@@ -147,7 +144,6 @@
array( 'q_id' => intval( $id ) ),
__METHOD__
);
-   $dbw->commit( __METHOD__ );
 
$output = wfMessage( 'quizgame-ajax-flagged' 
)->text();
 
@@ -212,21 +208,18 @@
array( 'a_q_id' => intval( $id ) ),
__METHOD__
);
-   $dbw->commit( __METHOD__ );
 
$dbw->delete(
'quizgame_choice',
array( 'choice_q_id' => intval( $id ) ),
__METHOD__
);
-   $dbw->commit( __METHOD__ );
 
$dbw->delete(
'quizgame_questions',
array( 'q_id' => intval( $id ) ),
__METHOD__
);
-   $dbw->commit( __METHOD__ );
 
$output = wfMessage( 'quizgame-ajax-deleted' 
)->text();
 
diff --git a/api/ApiQuizGameVote.php b/api/ApiQuizGameVote.php
index 75ee6b3..7377208 100644
--- a/api/ApiQuizGameVote.php
+++ b/api/ApiQuizGameVote.php
@@ -81,7 +81,6 @@
array( 'uv_user_id' => $user->getId(), 'uv_q_id' => 
intval( $id ) ),
__METHOD__
);
-   $dbw->commit( __METHOD__ );
 
// Update answer picked
$dbw->update(

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id91bb586a4f7589e4b59ee23d78c3cf4844d9d15
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/QuizGame
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] Moved designate domain IDs into hiera - change (operations/puppet)

2016-01-22 Thread Andrew Bogott (Code Review)

Andrew Bogott has uploaded a new change for review.

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

Change subject: Moved designate domain IDs into hiera
..

Moved designate domain IDs into hiera

Change-Id: I352f00a2a730c3603024f094d462c0ac4c60
---
M hieradata/codfw/labtest.yaml
M hieradata/eqiad.yaml
M modules/openstack/templates/kilo/designate/designate.conf.erb
3 files changed, 7 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/44/265844/1

diff --git a/hieradata/codfw/labtest.yaml b/hieradata/codfw/labtest.yaml
index 101c3d1..733aa44 100644
--- a/hieradata/codfw/labtest.yaml
+++ b/hieradata/codfw/labtest.yaml
@@ -97,6 +97,8 @@
   pdns_db_name: 'pdns'
   rabbit_host:  *labsnovacontroller
   controller_hostname: *labsnovacontroller
+  domain_id_internal_forward: '61194e5b-b78b-4979-bcdb-581dc4f296bf'
+  domain_id_internal_reverse: '7766d667-4a29-4a0a-9c36-77e9c4e38a32'
 
 glanceconfig:
   db_host: 'labtestcontrol2001.wikimedia.org'
diff --git a/hieradata/eqiad.yaml b/hieradata/eqiad.yaml
index e110b1a..2bbb524 100644
--- a/hieradata/eqiad.yaml
+++ b/hieradata/eqiad.yaml
@@ -126,6 +126,8 @@
   pdns_db_name: 'pdns'
   rabbit_host:  *labsnovacontroller
   controller_hostname: *labsnovacontroller
+  domain_id_internal_forward: '114f1333-c2c1-44d3-beb4-ebed1a91742b'
+  domain_id_internal_reverse: '8d114f3c-815b-466c-bdd4-9b91f704ea60'
 
 labs_baremetal_servers:
   - '10.64.20.12'
diff --git a/modules/openstack/templates/kilo/designate/designate.conf.erb 
b/modules/openstack/templates/kilo/designate/designate.conf.erb
index 9bb0faf..c06f9de 100644
--- a/modules/openstack/templates/kilo/designate/designate.conf.erb
+++ b/modules/openstack/templates/kilo/designate/designate.conf.erb
@@ -211,13 +211,13 @@
 #---
 [handler:nova_fixed_multi]
 # Domain ID of domain to create records in. For a pre-existing domain, in this 
case eqiad.wmflabs
-domain_id = '114f1333-c2c1-44d3-beb4-ebed1a91742b'
+domain_id = '<%= @designateconfig["domain_id_internal_forward"] %>'
 notification_topics = monitor
 notification_topics = notifications
 control_exchange = nova
 format = '%(hostname)s.%(project_name)s.%(domain)s'
 format = '%(hostname)s.%(domain)s'
-reverse_domain_id = '8d114f3c-815b-466c-bdd4-9b91f704ea60'
+domain_id = '<%= @designateconfig["domain_id_internal_reverse"] %>'
 reverse_format = '%(hostname)s.%(project_name)s.%(domain)s'
 keystone_auth_name = "novaadmin"
 keystone_auth_pass = "<%= @keystoneconfig['ldap_user_pass'] %>"
@@ -229,7 +229,7 @@
 #---
 [handler:nova_ldap]
 # Domain ID of domain to create records in. For a pre-existing domain, in this 
case eqiad.wmflabs
-domain_id = '114f1333-c2c1-44d3-beb4-ebed1a91742b'
+domain_id = '<%= @designateconfig["domain_id_internal_forward"] %>'
 notification_topics = monitor
 notification_topics = notifications
 control_exchange = nova

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I352f00a2a730c3603024f094d462c0ac4c60
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] SessionManager: Kill getPersistedSessionId() - change (mediawiki/core)

2016-01-22 Thread jenkins-bot (Code Review)

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

Change subject: SessionManager: Kill getPersistedSessionId()
..


SessionManager: Kill getPersistedSessionId()

It's not guaranteed that loadSessionFromStore() will succeed after
whatever alterations the SessionProvider might have made later in the
request.

So instead, let's make a new global object that stores the SessionId
of the persistent session that was loaded during Setup.php, if any. Then
we can check that when we need to know whether the session was
persisted.

Bug: T124468
Change-Id: I1e8e616c83b16aadd86b0a0a40826d40f6e8abe4
---
M includes/Setup.php
M includes/WebRequest.php
M includes/session/SessionManager.php
M includes/session/SessionManagerInterface.php
M includes/specials/SpecialUserlogin.php
M tests/phpunit/includes/session/SessionManagerTest.php
6 files changed, 17 insertions(+), 54 deletions(-)

Approvals:
  Legoktm: Looks good to me, approved
  Gergő Tisza: Looks good to me, but someone else must approve
  jenkins-bot: Verified



diff --git a/includes/Setup.php b/includes/Setup.php
index e962a49..85ff3f3 100644
--- a/includes/Setup.php
+++ b/includes/Setup.php
@@ -691,6 +691,11 @@
 
 // Set up the session
 $ps_session = Profiler::instance()->scopedProfileIn( $fname . '-session' );
+/**
+ * @var MediaWiki\\Session\\SessionId|null $wgInitialSessionId The persistent
+ * session ID (if any) loaded at startup
+ */
+$wgInitialSessionId = null;
 if ( !defined( 'MW_NO_SESSION' ) && !$wgCommandLineMode ) {
// If session.auto_start is there, we can't touch session name
if ( $wgPHPSessionHandling !== 'disable' && !wfIniGetBool( 
'session.auto_start' ) ) {
@@ -723,6 +728,10 @@
throw $ex;
}
 
+   if ( $session->isPersistent() ) {
+   $wgInitialSessionId = $session->getSessionId();
+   }
+
$session->renew();
if ( MediaWiki\Session\PHPSessionHandler::isEnabled() &&
( $session->isPersistent() || $session->shouldRememberUser() )
diff --git a/includes/WebRequest.php b/includes/WebRequest.php
index 2c14618..4c4ca97 100644
--- a/includes/WebRequest.php
+++ b/includes/WebRequest.php
@@ -686,8 +686,10 @@
 * @return bool
 */
public function checkSessionCookie() {
+   global $wgInitialSessionId;
wfDeprecated( __METHOD__, '1.27' );
-   return SessionManager::singleton()->getPersistedSessionId( 
$this ) !== null;
+   return $wgInitialSessionId !== null &&
+   $this->getSession()->getId() === 
(string)$wgInitialSessionId;
}
 
/**
diff --git a/includes/session/SessionManager.php 
b/includes/session/SessionManager.php
index c4f33d0..ecc4e54 100644
--- a/includes/session/SessionManager.php
+++ b/includes/session/SessionManager.php
@@ -178,15 +178,6 @@
$this->logger = $logger;
}
 
-   public function getPersistedSessionId( WebRequest $request ) {
-   $info = $this->getSessionInfoForRequest( $request );
-   if ( $info && $info->wasPersisted() ) {
-   return $info->getId();
-   } else {
-   return null;
-   }
-   }
-
public function getSessionForRequest( WebRequest $request ) {
$info = $this->getSessionInfoForRequest( $request );
 
diff --git a/includes/session/SessionManagerInterface.php 
b/includes/session/SessionManagerInterface.php
index d58d3b9..14af630 100644
--- a/includes/session/SessionManagerInterface.php
+++ b/includes/session/SessionManagerInterface.php
@@ -35,21 +35,6 @@
  */
 interface SessionManagerInterface extends LoggerAwareInterface {
/**
-* Fetch the persisted session ID in a request.
-*
-* Note this is not the same thing as whether the session associated 
with
-* the request is currently persistent, as the session might have been
-* first made persistent during this request.
-*
-* @param WebRequest $request
-* @return string|null
-* @throws \\OverflowException if there are multiple sessions tied for 
top
-*  priority in the request. Exception has a property "sessionInfos"
-*  holding the SessionInfo objects for the sessions involved.
-*/
-   public function getPersistedSessionId( WebRequest $request );
-
-   /**
 * Fetch the session for a request
 *
 * @note You probably want to use $request->getSession() instead. It's 
more
diff --git a/includes/specials/SpecialUserlogin.php 
b/includes/specials/SpecialUserlogin.php
index 24e1675..9473dff 100644
--- a/includes/specials/SpecialUserlogin.php
+++ b/includes/specials/SpecialUserlogin.php
@@ -1566,10 +1566,12 @@
 * @return bool
 */
function hasSessionCookie() {
-   global $wgDisableCookieCheck;
+

[MediaWiki-commits] [Gerrit] Fix using $this inside a closure - change (mediawiki...Renameuser)

2016-01-22 Thread Legoktm (Code Review)

Legoktm has uploaded a new change for review.

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

Change subject: Fix using $this inside a closure
..

Fix using $this inside a closure

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


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

diff --git a/RenameuserSQL.php b/RenameuserSQL.php
index 57dad4e..bf5e236 100755
--- a/RenameuserSQL.php
+++ b/RenameuserSQL.php
@@ -334,7 +334,7 @@
// Clear caches and inform authentication plugins
$user = User::newFromId( $that->uid );
$wgAuth->updateExternalDB( $user );
-   Hooks::run( 'RenameUserComplete', array( $this->uid, 
$this->old, $this->new ) );
+   Hooks::run( 'RenameUserComplete', array( $that->uid, 
$that->old, $that->new ) );
// Publish to RC
$logEntry->publish( $logid );
} );

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I212669ed366149c5f23bd6b20ad6143823aea802
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Renameuser
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] Enable translations for extension OpenLayers - change (translatewiki)

2016-01-22 Thread Paladox (Code Review)

Paladox has uploaded a new change for review.

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

Change subject: Enable translations for extension OpenLayers
..

Enable translations for extension OpenLayers

https://git.wikimedia.org/tree/mediawiki%2Fextensions%2FOpenLayers

Change-Id: I2809649b6c94374e476d184e665ff7eeba97ec3f
---
M groups/MediaWiki/mediawiki-extensions.txt
1 file changed, 2 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/translatewiki 
refs/changes/45/265845/1

diff --git a/groups/MediaWiki/mediawiki-extensions.txt 
b/groups/MediaWiki/mediawiki-extensions.txt
index 4f618a8..9cfcba0 100644
--- a/groups/MediaWiki/mediawiki-extensions.txt
+++ b/groups/MediaWiki/mediawiki-extensions.txt
@@ -1643,6 +1643,8 @@
 Open Graph Meta
 magicfile = OpenGraphMeta/OpenGraphMeta.magic.php
 
+Open Layers
+
 # Open Search Xml # Moved into core, Ie0ab90902ede9499879402290006466efba479e9 
2014-11-27
 
 Open Stack Manager

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2809649b6c94374e476d184e665ff7eeba97ec3f
Gerrit-PatchSet: 1
Gerrit-Project: translatewiki
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] diamond: monitor nscd behavior for ldap clients - change (operations/puppet)

2016-01-22 Thread Rush (Code Review)

Rush has uploaded a new change for review.

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

Change subject: diamond: monitor nscd behavior for ldap clients
..

diamond: monitor nscd behavior for ldap clients

Change-Id: Iacd61bfde19e8316931215be6a60a84b2514b142
---
M modules/labstore/manifests/fileserver.pp
A modules/ldap/files/monitor/nscd.py
M modules/ldap/manifests/client/nss.pp
M modules/role/manifests/labs/instance.pp
4 files changed, 117 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/47/265847/1

diff --git a/modules/labstore/manifests/fileserver.pp 
b/modules/labstore/manifests/fileserver.pp
index 645c5d7..f45abb2 100644
--- a/modules/labstore/manifests/fileserver.pp
+++ b/modules/labstore/manifests/fileserver.pp
@@ -113,4 +113,8 @@
 diamond::collector { 'NfsdCollector':
 source   => 'puppet:///modules/labstore/monitor/nfsd.py',
 }
+
+diamond::collector { 'NscdCollector':
+source => 'puppet:///modules/ldap/monitor/nscd.py',
+}
 }
diff --git a/modules/ldap/files/monitor/nscd.py 
b/modules/ldap/files/monitor/nscd.py
new file mode 100644
index 000..9708da5
--- /dev/null
+++ b/modules/ldap/files/monitor/nscd.py
@@ -0,0 +1,98 @@
+# coding=utf-8
+
+"""
+collect nscd statistics (name service caching daemon)
+
+no native structured access
+
+ Dependencies
+
+  * nscd (Debian GLIBC 2.19-18+deb8u1) 2.19
+  * sudo for nscd -g
+
+"""
+
+import syslog
+import subprocess
+import diamond.collector
+
+
+def runBash(cmd):
+p = subprocess.Popen(cmd, shell=True, stdout=subprocess.PIPE)
+out = p.stdout.read().strip()
+return out
+
+
+class NscdCollector(diamond.collector.Collector):
+
+nscd = ['current number of threads',
+'maximum number of threads',
+'number of times clients had to wait']
+
+caches = ['cache hits on positive entries',
+  'cache hits on negative entries',
+  'cache misses on positive entries',
+  'cache misses on negative entries',
+  'cache hit rate',
+  'current number of cached values',
+  'maximum number of cached values']
+
+def get_default_config_help(self):
+config_help = super(NscdCollector, self).get_default_config_help()
+config_help.update({
+})
+return config_help
+
+def get_default_config(self):
+"""
+Returns the default collector settings
+"""
+config = super(NscdCollector, self).get_default_config()
+config.update({
+'enabled':  False,
+'path': 'nscd',
+'command':  'sudo /usr/sbin/nscd -g',
+})
+return config
+
+def format_metric(self, value):
+# Example value:
+# 0  maximum number of cached values
+value = value.strip().split(' ', 2)
+integer = value[0].strip('%')
+name = value[2].replace(' ', '_').strip()
+return name, integer
+
+def collect(self):
+
+try:
+stats = runBash(self.config['command'])
+except:
+self.log.error("nscd stats collection failed")
+return
+
+# break on the one unique char per section
+sep_stats = stats.split(':')
+
+# name, index, value array
+sections = [('nscd', 1, self.nscd),
+('passwd', 2, self.caches),
+('group', 3, self.caches),
+('hosts', 4, self.caches)]
+
+results = {}
+for section in sections:
+results[section[0]] = {}
+# Get the values for the relevant section
+values = sep_stats[section[1]].splitlines()
+
+# match up real lines and intended metrics
+for value in values:
+for metric in section[2]:
+if metric in value:
+name, integer = self.format_metric(value)
+results[section[0]][name] = integer
+
+for section, kv in results.iteritems():
+for k, v in kv.iteritems():
+self.publish("%s.%s" % (section, k),  v)
diff --git a/modules/ldap/manifests/client/nss.pp 
b/modules/ldap/manifests/client/nss.pp
index bd9a6a4..4b7bbb7 100644
--- a/modules/ldap/manifests/client/nss.pp
+++ b/modules/ldap/manifests/client/nss.pp
@@ -75,5 +75,15 @@
 mode=> '0440',
 content => template('ldap/nslcd.conf.erb'),
 }
-}
 
+# nscd -g (stats output) is only allowed as root
+sudo::user { 'diamond_sudo_for_nscd':
+user   => 'diamond',
+privileges => ['diamond ALL = NOPASSWD: /usr/sbin/nscd -g']
+}
+
+diamond::collector { 'Nscd':
+source  => 'puppet:///modules/ldap/monitor/nscd.py',
+require => Package['nscd'],
+}
+}
diff --git a/modules/role/manifests/labs/instance.pp

[MediaWiki-commits] [Gerrit] Remove begin()/commit() calls that can break outer transactions - change (mediawiki...PureWikiDeletion)

2016-01-22 Thread Aaron Schulz (Code Review)

Aaron Schulz has uploaded a new change for review.

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

Change subject: Remove begin()/commit() calls that can break outer transactions
..

Remove begin()/commit() calls that can break outer transactions

The single statements are already atomic and will commit at
the end of the request in commitMasterChanges().

Bug: T120791
Change-Id: I8abf7fc222bf9bd9aea8a0ee8d978a9e121cd0fd
---
M PureWikiDeletion.hooks.php
1 file changed, 5 insertions(+), 2 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/PureWikiDeletion 
refs/changes/46/265846/1

diff --git a/PureWikiDeletion.hooks.php b/PureWikiDeletion.hooks.php
index 4cb0065..5d6bf04 100644
--- a/PureWikiDeletion.hooks.php
+++ b/PureWikiDeletion.hooks.php
@@ -60,12 +60,14 @@
'blank_parent_id' => $revision->getParentId()
);
$dbw->insert( 'blanked_page', $blank_row );
+   
$log = new LogPage( 'blank' );
$log->addEntry( 'blank', $mTitle, $summary, array(), 
$user );
-   $dbw->commit( __METHOD__ );
+
$dbw->delete( 'recentchanges',
array( 'rc_this_oldid' => $blankRevId
) );
+
Article::onArticleDelete( $mTitle );
$mTitle->resetArticleID( 0 );
if ( $user->getOption( 'watchblank' ) ) {
@@ -93,12 +95,13 @@
$blank_page_id = $article->getID();
$dbw->delete ( 'blanked_page',
array( "blank_page_id" => 
$blank_page_id ) );
+
$log = new LogPage( 'blank' );
$log->addEntry( 'unblank', $mTitle, $summary, 
array(), $user );
-   $dbw->commit( __METHOD__ );
$dbw->delete( 'recentchanges',
array( 'rc_this_oldid' => $blankRevId
) );
+
$mTitle->touchLinks();
$mTitle->invalidateCache();
$mTitle->purgeSquid();

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I8abf7fc222bf9bd9aea8a0ee8d978a9e121cd0fd
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/PureWikiDeletion
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] Update cu_changes and cu_log tables when a user is renamed - change (mediawiki...CheckUser)

2016-01-22 Thread Legoktm (Code Review)

Legoktm has uploaded a new change for review.

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

Change subject: Update cu_changes and cu_log tables when a user is renamed
..

Update cu_changes and cu_log tables when a user is renamed

Bug: T85196
Change-Id: Iac0a96dbb328d6fe362a9e72322e32007bebd4d3
---
M CheckUser.hooks.php
M CheckUser.php
M extension.json
3 files changed, 19 insertions(+), 0 deletions(-)


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

diff --git a/CheckUser.hooks.php b/CheckUser.hooks.php
index a879b84..2074a5e 100755
--- a/CheckUser.hooks.php
+++ b/CheckUser.hooks.php
@@ -428,4 +428,19 @@
 
return true;
}
+
+   /**
+* For integration with the Renameuser extension.
+*
+* @param RenameuserSQL $renameUserSQL
+* @return bool
+*/
+   public static function onRenameUserSQL( RenameuserSQL $renameUserSQL ) {
+   $renameUserSQL->tables['cu_changes'] = array( 'cuc_user_text', 
'cuc_user' );
+   $renameUserSQL->tables['cu_log'] = array( 'cul_user_text', 
'cul_user' );
+
+   return true;
+   }
+
+
 }
diff --git a/CheckUser.php b/CheckUser.php
index 3fdd20e..0ac2e6b 100644
--- a/CheckUser.php
+++ b/CheckUser.php
@@ -79,6 +79,7 @@
 $wgHooks['AuthPluginAutoCreate'][] = 'CheckUserHooks::onAuthPluginAutoCreate';
 $wgHooks['AddNewAccount'][] = 'CheckUserHooks::onAddNewAccount';
 $wgHooks['UserMergeAccountFields'][] = 
'CheckUserHooks::onUserMergeAccountFields';
+$wgHooks['RenameUserSQL'][] = 'CheckUserHooks::onRenameUserSQL';
 
 # Occasional pruning of CU data
 $wgHooks['ArticleEditUpdatesDeleteFromRecentchanges'][] = 
'CheckUserHooks::maybePruneIPData';
diff --git a/extension.json b/extension.json
index cf30413..550af42 100644
--- a/extension.json
+++ b/extension.json
@@ -46,6 +46,9 @@
"UserMergeAccountFields": [
"CheckUserHooks::onUserMergeAccountFields"
],
+   "RenameUserSQL": [
+   "CheckUserHooks::onRenameUserSQL"
+   ],
"ArticleEditUpdatesDeleteFromRecentchanges": [
"CheckUserHooks::maybePruneIPData"
],

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iac0a96dbb328d6fe362a9e72322e32007bebd4d3
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CheckUser
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] SessionManager: Kill getPersistedSessionId() - change (mediawiki/core)

2016-01-22 Thread jenkins-bot (Code Review)

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

Change subject: SessionManager: Kill getPersistedSessionId()
..


SessionManager: Kill getPersistedSessionId()

It's not guaranteed that loadSessionFromStore() will succeed after
whatever alterations the SessionProvider might have made later in the
request.

So instead, let's make a new global object that stores the SessionId
of the persistent session that was loaded during Setup.php, if any. Then
we can check that when we need to know whether the session was
persisted.

Bug: T124468
Change-Id: I1e8e616c83b16aadd86b0a0a40826d40f6e8abe4
---
M includes/Setup.php
M includes/WebRequest.php
M includes/session/SessionManager.php
M includes/session/SessionManagerInterface.php
M includes/specials/SpecialUserlogin.php
M tests/phpunit/includes/session/SessionManagerTest.php
6 files changed, 17 insertions(+), 54 deletions(-)

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



diff --git a/includes/Setup.php b/includes/Setup.php
index e962a49..85ff3f3 100644
--- a/includes/Setup.php
+++ b/includes/Setup.php
@@ -691,6 +691,11 @@
 
 // Set up the session
 $ps_session = Profiler::instance()->scopedProfileIn( $fname . '-session' );
+/**
+ * @var MediaWiki\\Session\\SessionId|null $wgInitialSessionId The persistent
+ * session ID (if any) loaded at startup
+ */
+$wgInitialSessionId = null;
 if ( !defined( 'MW_NO_SESSION' ) && !$wgCommandLineMode ) {
// If session.auto_start is there, we can't touch session name
if ( $wgPHPSessionHandling !== 'disable' && !wfIniGetBool( 
'session.auto_start' ) ) {
@@ -723,6 +728,10 @@
throw $ex;
}
 
+   if ( $session->isPersistent() ) {
+   $wgInitialSessionId = $session->getSessionId();
+   }
+
$session->renew();
if ( MediaWiki\Session\PHPSessionHandler::isEnabled() &&
( $session->isPersistent() || $session->shouldRememberUser() )
diff --git a/includes/WebRequest.php b/includes/WebRequest.php
index 2c14618..4c4ca97 100644
--- a/includes/WebRequest.php
+++ b/includes/WebRequest.php
@@ -686,8 +686,10 @@
 * @return bool
 */
public function checkSessionCookie() {
+   global $wgInitialSessionId;
wfDeprecated( __METHOD__, '1.27' );
-   return SessionManager::singleton()->getPersistedSessionId( 
$this ) !== null;
+   return $wgInitialSessionId !== null &&
+   $this->getSession()->getId() === 
(string)$wgInitialSessionId;
}
 
/**
diff --git a/includes/session/SessionManager.php 
b/includes/session/SessionManager.php
index c4f33d0..ecc4e54 100644
--- a/includes/session/SessionManager.php
+++ b/includes/session/SessionManager.php
@@ -178,15 +178,6 @@
$this->logger = $logger;
}
 
-   public function getPersistedSessionId( WebRequest $request ) {
-   $info = $this->getSessionInfoForRequest( $request );
-   if ( $info && $info->wasPersisted() ) {
-   return $info->getId();
-   } else {
-   return null;
-   }
-   }
-
public function getSessionForRequest( WebRequest $request ) {
$info = $this->getSessionInfoForRequest( $request );
 
diff --git a/includes/session/SessionManagerInterface.php 
b/includes/session/SessionManagerInterface.php
index d58d3b9..14af630 100644
--- a/includes/session/SessionManagerInterface.php
+++ b/includes/session/SessionManagerInterface.php
@@ -35,21 +35,6 @@
  */
 interface SessionManagerInterface extends LoggerAwareInterface {
/**
-* Fetch the persisted session ID in a request.
-*
-* Note this is not the same thing as whether the session associated 
with
-* the request is currently persistent, as the session might have been
-* first made persistent during this request.
-*
-* @param WebRequest $request
-* @return string|null
-* @throws \\OverflowException if there are multiple sessions tied for 
top
-*  priority in the request. Exception has a property "sessionInfos"
-*  holding the SessionInfo objects for the sessions involved.
-*/
-   public function getPersistedSessionId( WebRequest $request );
-
-   /**
 * Fetch the session for a request
 *
 * @note You probably want to use $request->getSession() instead. It's 
more
diff --git a/includes/specials/SpecialUserlogin.php 
b/includes/specials/SpecialUserlogin.php
index 24e1675..9473dff 100644
--- a/includes/specials/SpecialUserlogin.php
+++ b/includes/specials/SpecialUserlogin.php
@@ -1566,10 +1566,12 @@
 * @return bool
 */
function hasSessionCookie() {
-   global $wgDisableCookieCheck;
+   global $wgDisableCookieCheck, $wgInitialSessionId;
 
-

[MediaWiki-commits] [Gerrit] Consistently use require_once for MWVersion.php - change (operations/mediawiki-config)

2016-01-22 Thread jenkins-bot (Code Review)

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

Change subject: Consistently use require_once for MWVersion.php
..


Consistently use require_once for MWVersion.php

Most files used it already, but some used 'require' or 'include' instead.
Also strip redundant parentheses per our coding conventions.

'require' and 'include' are operators, not functions.

Change-Id: If799694471be2b2e1b6d6303d7cf870820003284
---
M extract2.php
M mobilelanding.php
M w/api.php
M w/auth-api.php
M w/favicon.php
M w/thumb_handler.php
M w/touch.php
7 files changed, 8 insertions(+), 8 deletions(-)

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



diff --git a/extract2.php b/extract2.php
index e0f2407..b1fac44 100644
--- a/extract2.php
+++ b/extract2.php
@@ -2,7 +2,7 @@
 $lang = 'meta';
 putenv( "MW_LANG={$lang}" ); // notify MWMultiVersion
 
-require '/srv/mediawiki/w/MWVersion.php';
+require_once '/srv/mediawiki/w/MWVersion.php';
 require getMediaWiki( 'includes/WebStart.php' );
 
 $allowed_templates = array(
diff --git a/mobilelanding.php b/mobilelanding.php
index f2ca3bc..40376e4 100644
--- a/mobilelanding.php
+++ b/mobilelanding.php
@@ -1,8 +1,8 @@
 https://gerrit.wikimedia.org/r/263415
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: If799694471be2b2e1b6d6303d7cf870820003284
Gerrit-PatchSet: 2
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Krinkle 
Gerrit-Reviewer: 20after4 
Gerrit-Reviewer: Chad 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: Reedy 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Fix using $this inside a closure - change (mediawiki...Renameuser)

2016-01-22 Thread jenkins-bot (Code Review)

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

Change subject: Fix using $this inside a closure
..


Fix using $this inside a closure

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

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



diff --git a/RenameuserSQL.php b/RenameuserSQL.php
index 57dad4e..bf5e236 100755
--- a/RenameuserSQL.php
+++ b/RenameuserSQL.php
@@ -334,7 +334,7 @@
// Clear caches and inform authentication plugins
$user = User::newFromId( $that->uid );
$wgAuth->updateExternalDB( $user );
-   Hooks::run( 'RenameUserComplete', array( $this->uid, 
$this->old, $this->new ) );
+   Hooks::run( 'RenameUserComplete', array( $that->uid, 
$that->old, $that->new ) );
// Publish to RC
$logEntry->publish( $logid );
} );

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I212669ed366149c5f23bd6b20ad6143823aea802
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Renameuser
Gerrit-Branch: master
Gerrit-Owner: Legoktm 
Gerrit-Reviewer: Aaron Schulz 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Small fix to enable redirect to articles - change (mediawiki...ArticlePlaceholder)

2016-01-22 Thread jenkins-bot (Code Review)

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

Change subject: Small fix to enable redirect to articles
..


Small fix to enable redirect to articles

Bug: T109442
Change-Id: Ibaaa70bca491b6cca3f99a7d078d85129934d4f3
---
M Specials/SpecialAboutTopic.php
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/Specials/SpecialAboutTopic.php b/Specials/SpecialAboutTopic.php
index 5d932e6..4503fc3 100644
--- a/Specials/SpecialAboutTopic.php
+++ b/Specials/SpecialAboutTopic.php
@@ -323,7 +323,7 @@
array( $this->siteGlobalID )
);
 
-   if ( isset( $sitelinksTitles[0][1] ) ) {
+   if ( isset( $sitelinkTitles[0][1] ) ) {
$sitelinkTitle = $sitelinkTitles[0][1];
return $this->titleFactory->newFromText( $sitelinkTitle 
)->getLinkURL();
}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ibaaa70bca491b6cca3f99a7d078d85129934d4f3
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ArticlePlaceholder
Gerrit-Branch: master
Gerrit-Owner: Lucie Kaffee 
Gerrit-Reviewer: Hoo man 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Moved designate domain IDs into hiera - change (operations/puppet)

2016-01-22 Thread Andrew Bogott (Code Review)

Andrew Bogott has submitted this change and it was merged.

Change subject: Moved designate domain IDs into hiera
..


Moved designate domain IDs into hiera

Change-Id: I352f00a2a730c3603024f094d462c0ac4c60
---
M hieradata/codfw/labtest.yaml
M hieradata/eqiad.yaml
M modules/openstack/templates/kilo/designate/designate.conf.erb
3 files changed, 7 insertions(+), 3 deletions(-)

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



diff --git a/hieradata/codfw/labtest.yaml b/hieradata/codfw/labtest.yaml
index 101c3d1..733aa44 100644
--- a/hieradata/codfw/labtest.yaml
+++ b/hieradata/codfw/labtest.yaml
@@ -97,6 +97,8 @@
   pdns_db_name: 'pdns'
   rabbit_host:  *labsnovacontroller
   controller_hostname: *labsnovacontroller
+  domain_id_internal_forward: '61194e5b-b78b-4979-bcdb-581dc4f296bf'
+  domain_id_internal_reverse: '7766d667-4a29-4a0a-9c36-77e9c4e38a32'
 
 glanceconfig:
   db_host: 'labtestcontrol2001.wikimedia.org'
diff --git a/hieradata/eqiad.yaml b/hieradata/eqiad.yaml
index e110b1a..2bbb524 100644
--- a/hieradata/eqiad.yaml
+++ b/hieradata/eqiad.yaml
@@ -126,6 +126,8 @@
   pdns_db_name: 'pdns'
   rabbit_host:  *labsnovacontroller
   controller_hostname: *labsnovacontroller
+  domain_id_internal_forward: '114f1333-c2c1-44d3-beb4-ebed1a91742b'
+  domain_id_internal_reverse: '8d114f3c-815b-466c-bdd4-9b91f704ea60'
 
 labs_baremetal_servers:
   - '10.64.20.12'
diff --git a/modules/openstack/templates/kilo/designate/designate.conf.erb 
b/modules/openstack/templates/kilo/designate/designate.conf.erb
index 9bb0faf..a0bae33 100644
--- a/modules/openstack/templates/kilo/designate/designate.conf.erb
+++ b/modules/openstack/templates/kilo/designate/designate.conf.erb
@@ -211,13 +211,13 @@
 #---
 [handler:nova_fixed_multi]
 # Domain ID of domain to create records in. For a pre-existing domain, in this 
case eqiad.wmflabs
-domain_id = '114f1333-c2c1-44d3-beb4-ebed1a91742b'
+domain_id = '<%= @designateconfig["domain_id_internal_forward"] %>'
 notification_topics = monitor
 notification_topics = notifications
 control_exchange = nova
 format = '%(hostname)s.%(project_name)s.%(domain)s'
 format = '%(hostname)s.%(domain)s'
-reverse_domain_id = '8d114f3c-815b-466c-bdd4-9b91f704ea60'
+reverse_domain_id = '<%= @designateconfig["domain_id_internal_reverse"] %>'
 reverse_format = '%(hostname)s.%(project_name)s.%(domain)s'
 keystone_auth_name = "novaadmin"
 keystone_auth_pass = "<%= @keystoneconfig['ldap_user_pass'] %>"
@@ -229,7 +229,7 @@
 #---
 [handler:nova_ldap]
 # Domain ID of domain to create records in. For a pre-existing domain, in this 
case eqiad.wmflabs
-domain_id = '114f1333-c2c1-44d3-beb4-ebed1a91742b'
+domain_id = '<%= @designateconfig["domain_id_internal_forward"] %>'
 notification_topics = monitor
 notification_topics = notifications
 control_exchange = nova

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I352f00a2a730c3603024f094d462c0ac4c60
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] ruthenium: switch rsyncd setup over from osmium - change (operations/puppet)

2016-01-22 Thread Dzahn (Code Review)

Dzahn has uploaded a new change for review.

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

Change subject: ruthenium: switch rsyncd setup over from osmium
..

ruthenium: switch rsyncd setup over from osmium

After having copied data from ruthenium to osmium
and reinstalling ruthenium, now we need to copy it back
where it came from.

Bug:T122328
Change-Id: Ia84d168baa97a5ba740805d2b07bfbb77146c520
---
M manifests/role/rsync_ruthenium.pp
M manifests/site.pp
2 files changed, 4 insertions(+), 4 deletions(-)


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

diff --git a/manifests/role/rsync_ruthenium.pp 
b/manifests/role/rsync_ruthenium.pp
index 241b168..5223063 100644
--- a/manifests/role/rsync_ruthenium.pp
+++ b/manifests/role/rsync_ruthenium.pp
@@ -1,11 +1,11 @@
 class role::rsync_ruthenium {
 
-$sourceip='10.64.16.151'
+$sourceip='10.64.32.146'
 
 include rsync::server
 
 rsync::server::module { 'ruthenium':
-path=> '/srv/ruthenium',
+path=> '/mnt/data',
 read_only   => 'no',
 hosts_allow => $sourceip,
 }
diff --git a/manifests/site.pp b/manifests/site.pp
index 19aa4d3..3315994 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -2170,7 +2170,7 @@
 
 # VisualEditor performance testing rig
 node 'osmium.eqiad.wmnet' {
-role ve, rsync_ruthenium
+role ve
 include ::standard
 }
 
@@ -2302,7 +2302,7 @@
 # Right now, both rt-server and rt-clients run on the same node
 # But, we are likely going to split them into different boxes soon.
 node 'ruthenium.eqiad.wmnet' {
-role testsystem, parsoid::testing, parsoid-rt-server, parsoid-rt-client
+role testsystem, parsoid::testing, parsoid-rt-server, parsoid-rt-client, 
rsync_ruthenium
 }
 
 # T95046 install/deploy scandium as zuul merger (ci) server

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

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

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

[MediaWiki-commits] [Gerrit] Fix for 4930647 - Special:ViewXML does not write - change (mediawiki...DataTransfer)

2016-01-22 Thread Yaron Koren (Code Review)

Yaron Koren has submitted this change and it was merged.

Change subject: Fix for 4930647 - Special:ViewXML does not write
..


Fix for 4930647 - Special:ViewXML does not write

Change-Id: I6231bf33ca0a3bd0156bb0881487f186c5614514
---
M specials/DT_ViewXML.php
1 file changed, 0 insertions(+), 4 deletions(-)

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



diff --git a/specials/DT_ViewXML.php b/specials/DT_ViewXML.php
index e6beaff..bd8eb7a 100644
--- a/specials/DT_ViewXML.php
+++ b/specials/DT_ViewXML.php
@@ -14,10 +14,6 @@
parent::__construct( $name );
}
 
-   public function doesWrites() {
-   return true;
-   }
-
function execute( $query ) {
$this->setHeaders();
self::doSpecialViewXML( $query );

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I6231bf33ca0a3bd0156bb0881487f186c5614514
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/DataTransfer
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] ruthenium: switch rsyncd setup over from osmium - change (operations/puppet)

2016-01-22 Thread Dzahn (Code Review)

Dzahn has submitted this change and it was merged.

Change subject: ruthenium: switch rsyncd setup over from osmium
..


ruthenium: switch rsyncd setup over from osmium

After having copied data from ruthenium to osmium
and reinstalling ruthenium, now we need to copy it back
where it came from.

Bug:T122328
Change-Id: Ia84d168baa97a5ba740805d2b07bfbb77146c520
---
M manifests/role/rsync_ruthenium.pp
M manifests/site.pp
2 files changed, 4 insertions(+), 4 deletions(-)

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



diff --git a/manifests/role/rsync_ruthenium.pp 
b/manifests/role/rsync_ruthenium.pp
index 241b168..5223063 100644
--- a/manifests/role/rsync_ruthenium.pp
+++ b/manifests/role/rsync_ruthenium.pp
@@ -1,11 +1,11 @@
 class role::rsync_ruthenium {
 
-$sourceip='10.64.16.151'
+$sourceip='10.64.32.146'
 
 include rsync::server
 
 rsync::server::module { 'ruthenium':
-path=> '/srv/ruthenium',
+path=> '/mnt/data',
 read_only   => 'no',
 hosts_allow => $sourceip,
 }
diff --git a/manifests/site.pp b/manifests/site.pp
index fd9fe71..a250a8b 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -2175,7 +2175,7 @@
 
 # VisualEditor performance testing rig
 node 'osmium.eqiad.wmnet' {
-role ve, rsync_ruthenium
+role ve
 include ::standard
 }
 
@@ -2318,7 +2318,7 @@
 # Right now, both rt-server and rt-clients run on the same node
 # But, we are likely going to split them into different boxes soon.
 node 'ruthenium.eqiad.wmnet' {
-role testsystem, parsoid::testing, parsoid-rt-server, parsoid-rt-client
+role testsystem, parsoid::testing, parsoid-rt-server, parsoid-rt-client, 
rsync_ruthenium
 }
 
 # T95046 install/deploy scandium as zuul merger (ci) server

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

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

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

[MediaWiki-commits] [Gerrit] beta: update hostname to have .deployment-prep. - change (operations/mediawiki-config)

2016-01-22 Thread Hashar (Code Review)

Hashar has uploaded a new change for review.

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

Change subject: beta: update hostname to have .deployment-prep.
..

beta: update hostname to have .deployment-prep.

Labs now namespace labs projects fqdn by using the labs tenant name.
Update all occurences of beta related instances hostname so they get the
'deployment-prep' subdomain.

Change-Id: Idd398f460ab6149f26c772bd6c30fe029ece2a8e
---
M wmf-config/CommonSettings-labs.php
M wmf-config/CommonSettings.php
M wmf-config/InitialiseSettings-labs.php
M wmf-config/db-labs.php
M wmf-config/jobqueue-labs.php
5 files changed, 9 insertions(+), 9 deletions(-)


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

diff --git a/wmf-config/CommonSettings-labs.php 
b/wmf-config/CommonSettings-labs.php
index 90e0ce3..a9c894a 100644
--- a/wmf-config/CommonSettings-labs.php
+++ b/wmf-config/CommonSettings-labs.php
@@ -22,7 +22,7 @@
 // stream recent changes to redis
 $wgRCFeeds['redis'] = array(
'formatter' => 'JSONRCFeedFormatter',
-   'uri'   => 
"redis://deployment-stream.eqiad.wmflabs:6379/rc.$wgDBname",
+   'uri'   => 
"redis://deployment-stream.deployment-prep.eqiad.wmflabs:6379/rc.$wgDBname",
 );
 
 $wgProfiler['udphost'] = 'labmon1001.eqiad.wmnet';
@@ -39,7 +39,7 @@
 $wgResourceLoaderStorageEnabled = true;
 
 if ( $wmgUseEventLogging ) {
-   $wgEventLoggingFile = 
'udp://deployment-eventlogging03.eqiad.wmflabs:8421/EventLogging';
+   $wgEventLoggingFile = 
'udp://deployment-eventlogging03.deployment-prep.eqiad.wmflabs:8421/EventLogging';
 }
 
 $wgLocalVirtualHosts = array(
@@ -234,7 +234,7 @@
 if ( $wmgUseMath ) {
$wgMathFileBackend = false;
$wgMathDirectory   = '/data/project/upload7/math';
-   $wgMathMathMLUrl = 'http://deployment-mathoid.eqiad.wmflabs:10042';
+   $wgMathMathMLUrl = 
'http://deployment-mathoid.deployment-prep.eqiad.wmflabs:10042';
 }
 
 if ( $wmgUseScore ) {
diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index 015d0db..1901d72 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -86,7 +86,7 @@
$wmfUdp2logDest = 'fluorine.eqiad.wmnet:8420';
break;
 case 'labs':
-   $wmfUdp2logDest = 'deployment-fluorine.eqiad.wmflabs:8420';
+   $wmfUdp2logDest = 
'deployment-fluorine.deployment-prep.eqiad.wmflabs:8420';
break;
 default:
$wmfUdp2logDest = '127.0.0.1:8420';
diff --git a/wmf-config/InitialiseSettings-labs.php 
b/wmf-config/InitialiseSettings-labs.php
index 38165a4..1534127 100644
--- a/wmf-config/InitialiseSettings-labs.php
+++ b/wmf-config/InitialiseSettings-labs.php
@@ -364,7 +364,7 @@
),
 
'wmgRestbaseServer' => array(
-   'default' => "http://10.68.17.227:7231; // 
deployment-restbase01.eqiad.wmflabs
+   'default' => "http://10.68.17.227:7231; // 
deployment-restbase01.deployment-prep.eqiad.wmflabs
),
 
'wmgUseRestbaseVRS' => array(
@@ -526,7 +526,7 @@
),
 
'wgUploadThumbnailRenderHttpCustomDomain' => array(
-   'default' => 'deployment-cache-upload04.eqiad.wmflabs',
+   'default' => 
'deployment-cache-upload04.deployment-prep.eqiad.wmflabs',
),
 
'wmgUseApiFeatureUsage' => array(
diff --git a/wmf-config/db-labs.php b/wmf-config/db-labs.php
index ee47294..8989b99 100644
--- a/wmf-config/db-labs.php
+++ b/wmf-config/db-labs.php
@@ -33,8 +33,8 @@
),
 
'hostsByName' => array(
-   'deployment-db1'  => '10.68.16.193', # 
deployment-db1.eqiad.wmflabs
-   'deployment-db2'  => '10.68.17.94', # 
deployment-db2.eqiad.wmflabs
+   'deployment-db1'  => '10.68.16.193', # 
deployment-db1.deployment-prep.eqiad.wmflabs
+   'deployment-db2'  => '10.68.17.94', # 
deployment-db2.deployment-prep.eqiad.wmflabs
),
);
 
diff --git a/wmf-config/jobqueue-labs.php b/wmf-config/jobqueue-labs.php
index 3b533de..8ae3472 100644
--- a/wmf-config/jobqueue-labs.php
+++ b/wmf-config/jobqueue-labs.php
@@ -3,7 +3,7 @@
 
 if( $wmfRealm == 'labs' ) {  # safe guard
 
-$jobRedisServer = 'deployment-redis01.eqiad.wmflabs';
+$jobRedisServer = 'deployment-redis01.deployment-prep.eqiad.wmflabs';
 
 $wgJobTypeConf['default'] = array(
'class'   => 'JobQueueRedis',

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

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

___

[MediaWiki-commits] [Gerrit] 0.0.11 release stuff - change (operations...vhtcpd)

2016-01-22 Thread BBlack (Code Review)

BBlack has uploaded a new change for review.

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

Change subject: 0.0.11 release stuff
..

0.0.11 release stuff

Change-Id: I65fb413f6429d5759cfed580a1dc72953e5b1dee
---
M NEWS
M configure.ac
2 files changed, 5 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/software/varnish/vhtcpd 
refs/changes/07/265807/1

diff --git a/NEWS b/NEWS
index e760f04..28127d1 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,7 @@
+0.0.11 - 2016-01-22
+  wrapped complex assert funcs in NDEBUG checks to make sure they
+don't affect NDEBUG builds
+
 0.0.10 - 2013-09-09
   Bugfix: was not handling connection close during RECVWAIT
 state on purger connections.
diff --git a/configure.ac b/configure.ac
index d60c86c..4062ca0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ([2.68])
-AC_INIT([vhtcpd],[0.0.10],[bbl...@wikimedia.org],[vhtcpd],[https://gerrit.wikimedia.org/r/gitweb?p=operations/software/varnish/vhtcpd.git])
+AC_INIT([vhtcpd],[0.0.11],[bbl...@wikimedia.org],[vhtcpd],[https://gerrit.wikimedia.org/r/gitweb?p=operations/software/varnish/vhtcpd.git])
 AC_CONFIG_SRCDIR([src/main.c])
 AC_CONFIG_AUX_DIR([acaux])
 AM_INIT_AUTOMAKE([1.11.3 dist-xz no-dist-gzip foreign tar-ustar -Wall])

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I65fb413f6429d5759cfed580a1dc72953e5b1dee
Gerrit-PatchSet: 1
Gerrit-Project: operations/software/varnish/vhtcpd
Gerrit-Branch: master
Gerrit-Owner: BBlack 

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

[MediaWiki-commits] [Gerrit] update jquery.ui.wdget.js to 1.11.4 - change (mediawiki/core)

2016-01-22 Thread Jonas Kress (WMDE) (Code Review)

Jonas Kress (WMDE) has uploaded a new change for review.

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

Change subject: update jquery.ui.wdget.js to 1.11.4
..

update jquery.ui.wdget.js to 1.11.4

Change-Id: I7087a87057bb802691a21d4460bb362d8684845b
---
M resources/lib/jquery.ui/jquery.ui.widget.js
1 file changed, 100 insertions(+), 81 deletions(-)


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

diff --git a/resources/lib/jquery.ui/jquery.ui.widget.js 
b/resources/lib/jquery.ui/jquery.ui.widget.js
index 067476d..30454ee 100644
--- a/resources/lib/jquery.ui/jquery.ui.widget.js
+++ b/resources/lib/jquery.ui/jquery.ui.widget.js
@@ -1,30 +1,42 @@
 /*!
- * jQuery UI Widget 1.9.2
+ * jQuery UI Widget 1.11.4
  * http://jqueryui.com
  *
- * Copyright 2012 jQuery Foundation and other contributors
+ * Copyright jQuery Foundation and other contributors
  * Released under the MIT license.
  * http://jquery.org/license
  *
  * http://api.jqueryui.com/jQuery.widget/
  */
-(function( $, undefined ) {
 
-var uuid = 0,
-   slice = Array.prototype.slice,
-   _cleanData = $.cleanData;
-$.cleanData = function( elems ) {
-   for ( var i = 0, elem; (elem = elems[i]) != null; i++ ) {
-   try {
-   $( elem ).triggerHandler( "remove" );
-   // http://bugs.jquery.com/ticket/8235
-   } catch( e ) {}
-   }
-   _cleanData( elems );
-};
+
+var widget_uuid = 0,
+   widget_slice = Array.prototype.slice;
+
+$.cleanData = (function( orig ) {
+   return function( elems ) {
+   var events, elem, i;
+   for ( i = 0; (elem = elems[i]) != null; i++ ) {
+   try {
+
+   // Only trigger remove when necessary to save 
time
+   events = $._data( elem, "events" );
+   if ( events && events.remove ) {
+   $( elem ).triggerHandler( "remove" );
+   }
+
+   // http://bugs.jquery.com/ticket/8235
+   } catch ( e ) {}
+   }
+   orig( elems );
+   };
+})( $.cleanData );
 
 $.widget = function( name, base, prototype ) {
var fullName, existingConstructor, constructor, basePrototype,
+   // proxiedPrototype allows the provided prototype to remain 
unmodified
+   // so that it can be used as a mixin for multiple widgets 
(#8876)
+   proxiedPrototype = {},
namespace = name.split( "." )[ 0 ];
 
name = name.split( "." )[ 1 ];
@@ -71,43 +83,43 @@
// inheriting from
basePrototype.options = $.widget.extend( {}, basePrototype.options );
$.each( prototype, function( prop, value ) {
-   if ( $.isFunction( value ) ) {
-   prototype[ prop ] = (function() {
-   var _super = function() {
-   return base.prototype[ prop 
].apply( this, arguments );
-   },
-   _superApply = function( args ) {
-   return base.prototype[ prop 
].apply( this, args );
-   };
-   return function() {
-   var __super = this._super,
-   __superApply = this._superApply,
-   returnValue;
-
-   this._super = _super;
-   this._superApply = _superApply;
-
-   returnValue = value.apply( this, 
arguments );
-
-   this._super = __super;
-   this._superApply = __superApply;
-
-   return returnValue;
-   };
-   })();
+   if ( !$.isFunction( value ) ) {
+   proxiedPrototype[ prop ] = value;
+   return;
}
+   proxiedPrototype[ prop ] = (function() {
+   var _super = function() {
+   return base.prototype[ prop ].apply( 
this, arguments );
+   },
+   _superApply = function( args ) {
+   return base.prototype[ prop ].apply( 
this, args );
+   };
+   return function() {
+   var __super = this._super,
+   __superApply = this._superApply,
+   returnValue;
+
+

[MediaWiki-commits] [Gerrit] Add missing @since to new IdLookup classes - change (mediawiki/core)

2016-01-22 Thread jenkins-bot (Code Review)

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

Change subject: Add missing @since to new IdLookup classes
..


Add missing @since to new IdLookup classes

Follow up I49568358ec35fdfd0b9e53e441adabded5c7b80f

Change-Id: I9f2e9a7c9bb5dd8608cfc6678a3557d916f0b09f
---
M includes/user/CentralIdLookup.php
M includes/user/LocalIdLookup.php
2 files changed, 3 insertions(+), 0 deletions(-)

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



diff --git a/includes/user/CentralIdLookup.php 
b/includes/user/CentralIdLookup.php
index 4c2b5b7..4b833ba 100644
--- a/includes/user/CentralIdLookup.php
+++ b/includes/user/CentralIdLookup.php
@@ -23,6 +23,8 @@
 /**
  * The CentralIdLookup service allows for connecting local users with
  * cluster-wide IDs.
+ *
+ * @since 1.27
  */
 abstract class CentralIdLookup implements IDBAccessObject {
// Audience options for accessors
diff --git a/includes/user/LocalIdLookup.php b/includes/user/LocalIdLookup.php
index 58892ea..c0f9c05 100644
--- a/includes/user/LocalIdLookup.php
+++ b/includes/user/LocalIdLookup.php
@@ -28,6 +28,7 @@
  *  $wgSharedDB and $wgSharedTables set, and that all wikis involved in the
  *  sharing are listed in $wgLocalDatabases, and that no wikis not involved in
  *  the sharing are listed in $wgLocalDatabases.
+ * @since 1.27
  */
 class LocalIdLookup extends CentralIdLookup {
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I9f2e9a7c9bb5dd8608cfc6678a3557d916f0b09f
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Nikerabbit 
Gerrit-Reviewer: Umherirrender 
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 OutputPage::getModuleStyles warning Change-Id: I95833bd2... - change (mediawiki...Lingo)

2016-01-22 Thread Foxtrott (Code Review)

Foxtrott has submitted this change and it was merged.

Change subject: fix OutputPage::getModuleStyles warning Change-Id: 
I95833bd213a1822081199e28612880d9964d4a8e
..


fix OutputPage::getModuleStyles warning
Change-Id: I95833bd213a1822081199e28612880d9964d4a8e
---
M Lingo.php
1 file changed, 1 insertion(+), 0 deletions(-)

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



diff --git a/Lingo.php b/Lingo.php
index f6465b0..0aadd6a 100644
--- a/Lingo.php
+++ b/Lingo.php
@@ -96,6 +96,7 @@
'ext.Lingo.Styles'  => array(
'localBasePath' => $dir,
'remoteExtPath' => 'Lingo',
+   'position'  => 'top',
'styles'=> 'styles/Lingo.css',
),
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I95833bd213a1822081199e28612880d9964d4a8e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Lingo
Gerrit-Branch: master
Gerrit-Owner: Freephile 
Gerrit-Reviewer: Foxtrott 
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 VE core submodule to master (0329d1d) - change (mediawiki...VisualEditor)

2016-01-22 Thread Jforrester (Code Review)

Jforrester has uploaded a new change for review.

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

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

Update VE core submodule to master (0329d1d)

New changes:
7626140 Localisation updates from https://translatewiki.net.
1b51288 Refactor unicorn handling in ve.ce.Document#getNodeAndOffset
2458c1a Localisation updates from https://translatewiki.net.
af4a978 Initial cursor position: outside any nails
0ac9d6c Fix node length calculation
9dcb412 Fix logic for showing alien context item
0c4c39d Localisation updates from https://translatewiki.net.
92bb6d3 ElementLinearData#Sanitize: Remove meaningless HTML whitespace by 
default
4e2aa21 ce.Surface: Show deactivated selection when cursor is collapsed
b448f7d Remove background colour form table headers
87aa8da Follow-up I04ca47: Adjust comment to note we still care it's native

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


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

diff --git a/lib/ve b/lib/ve
index 3a92f7e..0329d1d 16
--- a/lib/ve
+++ b/lib/ve
-Subproject commit 3a92f7e3ae53939456716dc81b79d6b1bee1bbbd
+Subproject commit 0329d1ddc89ae1c3ab9feeb29ce5faf18bb9858c

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

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

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

[MediaWiki-commits] [Gerrit] Updating to latest masters - change (mediawiki...ocg-collection)

2016-01-22 Thread Cscott (Code Review)

Cscott has uploaded a new change for review.

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

Change subject: Updating to latest masters
..

Updating to latest masters

Deployed new service (8a9626602a907ef6c2cb825119292933245efede):
* Update dependencies.

Deployed new latexer (28793564325d1f5c941ce2d3be0b6cd288ae714f):
* Update dependencies.

Deployed new texter(73f7b86871abff978c818ce3941c52072b0e53f5):
* Update dependencies.

Change-Id: I59f7e75d1cac4b2e54484091dcad6483f62bde78
---
M mw-ocg-latexer
M mw-ocg-service
M mw-ocg-texter
3 files changed, 0 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/ocg-collection 
refs/changes/20/265820/1

diff --git a/mw-ocg-latexer b/mw-ocg-latexer
index c87d63a..2879356 16
--- a/mw-ocg-latexer
+++ b/mw-ocg-latexer
-Subproject commit c87d63a404fbd60423f3d5a6058085c3c3f70668
+Subproject commit 28793564325d1f5c941ce2d3be0b6cd288ae714f
diff --git a/mw-ocg-service b/mw-ocg-service
index 3d55189..8a96266 16
--- a/mw-ocg-service
+++ b/mw-ocg-service
-Subproject commit 3d551890421f360f16f2b580686aca823490a6e2
+Subproject commit 8a9626602a907ef6c2cb825119292933245efede
diff --git a/mw-ocg-texter b/mw-ocg-texter
index 89c4826..73f7b86 16
--- a/mw-ocg-texter
+++ b/mw-ocg-texter
-Subproject commit 89c4826d9db7a3719ba056317bdb6cc8cdaf2161
+Subproject commit 73f7b86871abff978c818ce3941c52072b0e53f5

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I59f7e75d1cac4b2e54484091dcad6483f62bde78
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/ocg-collection
Gerrit-Branch: master
Gerrit-Owner: Cscott 

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

[MediaWiki-commits] [Gerrit] Merge branch 'master' into wmf-deploy - change (mediawiki...ocg-collection)

2016-01-22 Thread Cscott (Code Review)

Cscott has uploaded a new change for review.

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

Change subject: Merge branch 'master' into wmf-deploy
..

Merge branch 'master' into wmf-deploy

Change-Id: I2f35f3c093330559551f0b2665cfda32cd7a606b
---
0 files changed, 0 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/ocg-collection 
refs/changes/21/265821/1


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2f35f3c093330559551f0b2665cfda32cd7a606b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/ocg-collection
Gerrit-Branch: wmf-deploy
Gerrit-Owner: Cscott 

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

[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: b66aa99..90f29e3 - change (mediawiki/extensions)

2016-01-22 Thread Jenkins-mwext-sync (Code Review)

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

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

Change subject: Syncronize VisualEditor: b66aa99..90f29e3
..

Syncronize VisualEditor: b66aa99..90f29e3

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


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions 
refs/changes/24/265824/1

diff --git a/VisualEditor b/VisualEditor
index b66aa99..90f29e3 16
--- a/VisualEditor
+++ b/VisualEditor
-Subproject commit b66aa990ba3eca965741686dc4ce4400e62e5854
+Subproject commit 90f29e34209f1834c5dc7c8a71da82b4e5c41a9b

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

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

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

[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: b66aa99..90f29e3 - change (mediawiki/extensions)

2016-01-22 Thread Jenkins-mwext-sync (Code Review)

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

Change subject: Syncronize VisualEditor: b66aa99..90f29e3
..


Syncronize VisualEditor: b66aa99..90f29e3

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

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



diff --git a/VisualEditor b/VisualEditor
index b66aa99..90f29e3 16
--- a/VisualEditor
+++ b/VisualEditor
-Subproject commit b66aa990ba3eca965741686dc4ce4400e62e5854
+Subproject commit 90f29e34209f1834c5dc7c8a71da82b4e5c41a9b

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

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

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

[MediaWiki-commits] [Gerrit] Add styles modules to Special:GatherEditFeed - change (mediawiki...Gather)

2016-01-22 Thread Victorbarbu (Code Review)

Victorbarbu has uploaded a new change for review.

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

Change subject: Add styles modules to Special:GatherEditFeed
..

Add styles modules to Special:GatherEditFeed

Bug: T124326
Change-Id: I70d1269bf88a3a69799e48161001ce3f0b9d9cce
---
M includes/specials/SpecialGatherEditFeed.php
1 file changed, 3 insertions(+), 2 deletions(-)


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

diff --git a/includes/specials/SpecialGatherEditFeed.php 
b/includes/specials/SpecialGatherEditFeed.php
index a442ba4..85d5de9 100644
--- a/includes/specials/SpecialGatherEditFeed.php
+++ b/includes/specials/SpecialGatherEditFeed.php
@@ -45,9 +45,10 @@
$out->addModuleStyles( array(
'mediawiki.ui.input',
'ext.gather.styles',
-   'ext.gather.menu.icon'
+   'ext.gather.menu.icon',
+   'mobile.pagelist.styles',
+   'mobile.pagesummary.styles',
) );
-   $out->setProperty( 'unstyledContent', true );
 
$this->showRecentChangesHeader();
$user = $this->getUser();

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I70d1269bf88a3a69799e48161001ce3f0b9d9cce
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Gather
Gerrit-Branch: dev
Gerrit-Owner: Victorbarbu 

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

[MediaWiki-commits] [Gerrit] Added dummy password for passwords::openldap::labtest - change (labs/private)

2016-01-22 Thread Andrew Bogott (Code Review)

Andrew Bogott has submitted this change and it was merged.

Change subject: Added dummy password for passwords::openldap::labtest
..


Added dummy password for passwords::openldap::labtest

Change-Id: I87163e76bce2a984cc7d2acc000da1a2989d15b4
---
M modules/passwords/manifests/init.pp
1 file changed, 4 insertions(+), 0 deletions(-)

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



diff --git a/modules/passwords/manifests/init.pp 
b/modules/passwords/manifests/init.pp
index 5c16f11..4dd9719 100644
--- a/modules/passwords/manifests/init.pp
+++ b/modules/passwords/manifests/init.pp
@@ -448,6 +448,10 @@
 $sync_pass = 'BAAR'
 }
 
+class passwords::openldap::labtest {
+$sync_pass = 'FBAAR'
+}
+
 class passwords::tessera {
 $secret_key = 'notsecret'
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I87163e76bce2a984cc7d2acc000da1a2989d15b4
Gerrit-PatchSet: 1
Gerrit-Project: labs/private
Gerrit-Branch: master
Gerrit-Owner: Andrew Bogott 
Gerrit-Reviewer: Andrew Bogott 

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

[MediaWiki-commits] [Gerrit] remove no-create-orig from gbp.conf - change (operations...vhtcpd)

2016-01-22 Thread BBlack (Code Review)

BBlack has submitted this change and it was merged.

Change subject: remove no-create-orig from gbp.conf
..


remove no-create-orig from gbp.conf

Change-Id: I7c040f32f3eebe1aa65763515aaab804cb58499f
---
M debian/gbp.conf
1 file changed, 0 insertions(+), 1 deletion(-)

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



diff --git a/debian/gbp.conf b/debian/gbp.conf
index 16cab37..5845c4f 100644
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@ -5,7 +5,6 @@
 upstream-tree=tag
 debian-branch=debian
 overlay = True
-no-create-orig = True
 compression = xz
 tarball-dir = ../tarballs
 export-dir = ../build-area

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I7c040f32f3eebe1aa65763515aaab804cb58499f
Gerrit-PatchSet: 1
Gerrit-Project: operations/software/varnish/vhtcpd
Gerrit-Branch: debian
Gerrit-Owner: BBlack 
Gerrit-Reviewer: BBlack 

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

[MediaWiki-commits] [Gerrit] Remove mixin param from /beacon/impression calls - change (mediawiki...CentralNotice)

2016-01-22 Thread AndyRussG (Code Review)

AndyRussG has uploaded a new change for review.

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

Change subject: Remove mixin param from /beacon/impression calls
..

Remove mixin param from /beacon/impression calls

Bug: T120082
Change-Id: Ib4170a6693048f97b5935bc1e806eb89183de38f
---
M resources/subscribing/ext.centralNotice.display.state.js
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CentralNotice 
refs/changes/29/265829/1

diff --git a/resources/subscribing/ext.centralNotice.display.state.js 
b/resources/subscribing/ext.centralNotice.display.state.js
index ced7b90..4173440 100644
--- a/resources/subscribing/ext.centralNotice.display.state.js
+++ b/resources/subscribing/ext.centralNotice.display.state.js
@@ -220,6 +220,7 @@
 
if ( cleanForURLSerialization ) {
delete dataCopy.getVars;
+   delete dataCopy.mixins;
}
 
return dataCopy;

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib4170a6693048f97b5935bc1e806eb89183de38f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CentralNotice
Gerrit-Branch: master
Gerrit-Owner: AndyRussG 

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

[MediaWiki-commits] [Gerrit] add notes to remember how to build this thing - change (operations...vhtcpd)

2016-01-22 Thread BBlack (Code Review)

BBlack has submitted this change and it was merged.

Change subject: add notes to remember how to build this thing
..


add notes to remember how to build this thing

Change-Id: I0915b3857529d0ea4442a3afb8ab3d9da9c2a85b
---
A debian/README.BUILD.WMF
1 file changed, 12 insertions(+), 0 deletions(-)

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



diff --git a/debian/README.BUILD.WMF b/debian/README.BUILD.WMF
new file mode 100644
index 000..c3edeea
--- /dev/null
+++ b/debian/README.BUILD.WMF
@@ -0,0 +1,12 @@
+How I last built this on copper.eqiad.wmnet (it has submodules and blah 
blah)...
+
+-- added to ~/.gitconfig:
+[http]
+   proxy = http://webproxy.eqiad.wmnet:8080
+[https]
+   proxy = http://webproxy.eqiad.wmnet:8080
+--
+export http_proxy=http://webproxy.eqiad.wmnet:8080
+git clone https://gerrit.wikimedia.org/r/operations/software/varnish/vhtcpd
+git checkout debian
+DIST=jessie ARCH=amd64 WIKIMEDIA=yes git buildpackage --git-submodules 
--git-pbuilder --git-debian-branch=debian --git-upstream-branch=master 
--git-upstream-tree=branch --git-export-dir=../build-area --git-dist=jessie -us 
-uc

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I0915b3857529d0ea4442a3afb8ab3d9da9c2a85b
Gerrit-PatchSet: 1
Gerrit-Project: operations/software/varnish/vhtcpd
Gerrit-Branch: debian
Gerrit-Owner: BBlack 
Gerrit-Reviewer: BBlack 

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

[MediaWiki-commits] [Gerrit] Revert "Moved designate domain IDs into hiera" - change (operations/puppet)

2016-01-22 Thread Andrew Bogott (Code Review)

Andrew Bogott has uploaded a new change for review.

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

Change subject: Revert "Moved designate domain IDs into hiera"
..

Revert "Moved designate domain IDs into hiera"

This breaks something, will need to make another attempt.

This reverts commit 7811415ef7f511c43b81f8cc65d3cbdbce026ff1.

Change-Id: I031a060acff89d00cfe3e166aae11490eedb3a38
---
M hieradata/codfw/labtest.yaml
M hieradata/eqiad.yaml
M modules/openstack/templates/kilo/designate/designate.conf.erb
3 files changed, 3 insertions(+), 7 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/32/265832/1

diff --git a/hieradata/codfw/labtest.yaml b/hieradata/codfw/labtest.yaml
index 733aa44..101c3d1 100644
--- a/hieradata/codfw/labtest.yaml
+++ b/hieradata/codfw/labtest.yaml
@@ -97,8 +97,6 @@
   pdns_db_name: 'pdns'
   rabbit_host:  *labsnovacontroller
   controller_hostname: *labsnovacontroller
-  domain_id_internal_forward: '61194e5b-b78b-4979-bcdb-581dc4f296bf'
-  domain_id_internal_reverse: '7766d667-4a29-4a0a-9c36-77e9c4e38a32'
 
 glanceconfig:
   db_host: 'labtestcontrol2001.wikimedia.org'
diff --git a/hieradata/eqiad.yaml b/hieradata/eqiad.yaml
index 2bbb524..e110b1a 100644
--- a/hieradata/eqiad.yaml
+++ b/hieradata/eqiad.yaml
@@ -126,8 +126,6 @@
   pdns_db_name: 'pdns'
   rabbit_host:  *labsnovacontroller
   controller_hostname: *labsnovacontroller
-  domain_id_internal_forward: '114f1333-c2c1-44d3-beb4-ebed1a91742b'
-  domain_id_internal_reverse: '8d114f3c-815b-466c-bdd4-9b91f704ea60'
 
 labs_baremetal_servers:
   - '10.64.20.12'
diff --git a/modules/openstack/templates/kilo/designate/designate.conf.erb 
b/modules/openstack/templates/kilo/designate/designate.conf.erb
index 2212e22..9bb0faf 100644
--- a/modules/openstack/templates/kilo/designate/designate.conf.erb
+++ b/modules/openstack/templates/kilo/designate/designate.conf.erb
@@ -211,13 +211,13 @@
 #---
 [handler:nova_fixed_multi]
 # Domain ID of domain to create records in. For a pre-existing domain, in this 
case eqiad.wmflabs
-domain_id = <%= @designateconfig["domain_id_internal_forward"] %>
+domain_id = '114f1333-c2c1-44d3-beb4-ebed1a91742b'
 notification_topics = monitor
 notification_topics = notifications
 control_exchange = nova
 format = '%(hostname)s.%(project_name)s.%(domain)s'
 format = '%(hostname)s.%(domain)s'
-domain_id = <%= @designateconfig["domain_id_internal_reverse"] %>
+reverse_domain_id = '8d114f3c-815b-466c-bdd4-9b91f704ea60'
 reverse_format = '%(hostname)s.%(project_name)s.%(domain)s'
 keystone_auth_name = "novaadmin"
 keystone_auth_pass = "<%= @keystoneconfig['ldap_user_pass'] %>"
@@ -229,7 +229,7 @@
 #---
 [handler:nova_ldap]
 # Domain ID of domain to create records in. For a pre-existing domain, in this 
case eqiad.wmflabs
-domain_id = <%= @designateconfig["domain_id_internal_forward"] %>
+domain_id = '114f1333-c2c1-44d3-beb4-ebed1a91742b'
 notification_topics = monitor
 notification_topics = notifications
 control_exchange = nova

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I031a060acff89d00cfe3e166aae11490eedb3a38
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] Revert "Moved designate domain IDs into hiera" - change (operations/puppet)

2016-01-22 Thread Andrew Bogott (Code Review)

Andrew Bogott has submitted this change and it was merged.

Change subject: Revert "Moved designate domain IDs into hiera"
..


Revert "Moved designate domain IDs into hiera"

This breaks something, will need to make another attempt.

This reverts commit 7811415ef7f511c43b81f8cc65d3cbdbce026ff1.

Change-Id: I031a060acff89d00cfe3e166aae11490eedb3a38
---
M hieradata/codfw/labtest.yaml
M hieradata/eqiad.yaml
M modules/openstack/templates/kilo/designate/designate.conf.erb
3 files changed, 3 insertions(+), 7 deletions(-)

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



diff --git a/hieradata/codfw/labtest.yaml b/hieradata/codfw/labtest.yaml
index 733aa44..101c3d1 100644
--- a/hieradata/codfw/labtest.yaml
+++ b/hieradata/codfw/labtest.yaml
@@ -97,8 +97,6 @@
   pdns_db_name: 'pdns'
   rabbit_host:  *labsnovacontroller
   controller_hostname: *labsnovacontroller
-  domain_id_internal_forward: '61194e5b-b78b-4979-bcdb-581dc4f296bf'
-  domain_id_internal_reverse: '7766d667-4a29-4a0a-9c36-77e9c4e38a32'
 
 glanceconfig:
   db_host: 'labtestcontrol2001.wikimedia.org'
diff --git a/hieradata/eqiad.yaml b/hieradata/eqiad.yaml
index 2bbb524..e110b1a 100644
--- a/hieradata/eqiad.yaml
+++ b/hieradata/eqiad.yaml
@@ -126,8 +126,6 @@
   pdns_db_name: 'pdns'
   rabbit_host:  *labsnovacontroller
   controller_hostname: *labsnovacontroller
-  domain_id_internal_forward: '114f1333-c2c1-44d3-beb4-ebed1a91742b'
-  domain_id_internal_reverse: '8d114f3c-815b-466c-bdd4-9b91f704ea60'
 
 labs_baremetal_servers:
   - '10.64.20.12'
diff --git a/modules/openstack/templates/kilo/designate/designate.conf.erb 
b/modules/openstack/templates/kilo/designate/designate.conf.erb
index 2212e22..9bb0faf 100644
--- a/modules/openstack/templates/kilo/designate/designate.conf.erb
+++ b/modules/openstack/templates/kilo/designate/designate.conf.erb
@@ -211,13 +211,13 @@
 #---
 [handler:nova_fixed_multi]
 # Domain ID of domain to create records in. For a pre-existing domain, in this 
case eqiad.wmflabs
-domain_id = <%= @designateconfig["domain_id_internal_forward"] %>
+domain_id = '114f1333-c2c1-44d3-beb4-ebed1a91742b'
 notification_topics = monitor
 notification_topics = notifications
 control_exchange = nova
 format = '%(hostname)s.%(project_name)s.%(domain)s'
 format = '%(hostname)s.%(domain)s'
-domain_id = <%= @designateconfig["domain_id_internal_reverse"] %>
+reverse_domain_id = '8d114f3c-815b-466c-bdd4-9b91f704ea60'
 reverse_format = '%(hostname)s.%(project_name)s.%(domain)s'
 keystone_auth_name = "novaadmin"
 keystone_auth_pass = "<%= @keystoneconfig['ldap_user_pass'] %>"
@@ -229,7 +229,7 @@
 #---
 [handler:nova_ldap]
 # Domain ID of domain to create records in. For a pre-existing domain, in this 
case eqiad.wmflabs
-domain_id = <%= @designateconfig["domain_id_internal_forward"] %>
+domain_id = '114f1333-c2c1-44d3-beb4-ebed1a91742b'
 notification_topics = monitor
 notification_topics = notifications
 control_exchange = nova

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I031a060acff89d00cfe3e166aae11490eedb3a38
Gerrit-PatchSet: 1
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] Hygiene: Remove the class code - change (mediawiki...MobileFrontend)

2016-01-22 Thread Jdlrobson (Code Review)

Jdlrobson has uploaded a new change for review.

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

Change subject: Hygiene: Remove the class code
..

Hygiene: Remove the class code

Have a single library oo-extend inside mobile.oo
now we are using the OO simplified way of doing things.

Change-Id: Ie8a815a0230ca81185c3d9acd138bac1934f408d
---
M includes/Resources.php
D resources/mobile.oo/Class.js
A resources/mobile.oo/oo-extend.js
3 files changed, 25 insertions(+), 71 deletions(-)


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

diff --git a/includes/Resources.php b/includes/Resources.php
index 4ab904a..34e182b 100644
--- a/includes/Resources.php
+++ b/includes/Resources.php
@@ -185,7 +185,7 @@
'oojs',
),
'scripts' => array(
-   'resources/mobile.oo/Class.js',
+   'resources/mobile.oo/oo-extend.js',
),
),
'mobile.view' => $wgMFResourceFileModuleBoilerplate + array(
diff --git a/resources/mobile.oo/Class.js b/resources/mobile.oo/Class.js
deleted file mode 100644
index 0d7b51c..000
--- a/resources/mobile.oo/Class.js
+++ /dev/null
@@ -1,70 +0,0 @@
-( function ( M ) {
-   /**
-* Extends a class with new methods and member properties.
-*
-* @param {Function} Child function
-* @param {Object|Function} ParentOrPrototype class to inherit from OR 
if no inheriting class a prototype to
-*  extend the class with,
-* @param {Object} prototype
-* @member OO
-*/
-   OO.mfExtend = function ( Child, ParentOrPrototype, prototype ) {
-   var key;
-   if ( prototype ) {
-   OO.inheritClass( Child, ParentOrPrototype );
-   } else {
-   OO.initClass( Class );
-   prototype = ParentOrPrototype;
-   }
-   for ( key in prototype ) {
-   Child.prototype[key] = prototype[key];
-   }
-   };
-
-   /**
-* Extends a class with new methods and member properties.
-*
-* @member Class
-* @param {Object} prototype Prototype that should be incorporated into 
the new Class.
-* @method
-* @return {Class}
-*/
-   function extend( prototype ) {
-   var Parent = this;
-
-   /**
-* @ignore
-*/
-   function Child() {
-   return Parent.apply( this, arguments );
-   }
-   OO.mfExtend( Child, Parent, prototype );
-   Child.extend = extend;
-   return Child;
-   }
-
-   /**
-* An extensible program-code-template for creating objects
-*
-* @class Class
-*/
-   function Class() {
-   OO.EventEmitter.call( this );
-   this.initialize.apply( this, arguments );
-   }
-   OO.mixinClass( Class, OO.EventEmitter );
-
-   /**
-* Constructor, if you override it, use _super().
-* @method
-*/
-   Class.prototype.initialize = function () {};
-   Class.extend = extend;
-   mw.log.deprecate( Class, 'extend', extend,
-   'Class is deprecated. Do not use this. Use OO.mfExtend' );
-
-   M.define( 'mobile.oo/Class', Class );
-   M.deprecate( 'Class', Class,
-   'OO.initClass, OO.inheritClass or OO.extendClass to create a 
class' );
-
-}( mw.mobileFrontend ) );
diff --git a/resources/mobile.oo/oo-extend.js b/resources/mobile.oo/oo-extend.js
new file mode 100644
index 000..e8872ba
--- /dev/null
+++ b/resources/mobile.oo/oo-extend.js
@@ -0,0 +1,24 @@
+( function ( M ) {
+   /**
+* Extends a class with new methods and member properties.
+*
+* @param {Function} Child function
+* @param {Object|Function} ParentOrPrototype class to inherit from OR 
if no inheriting class a prototype to
+*  extend the class with,
+* @param {Object} prototype
+* @member OO
+*/
+   OO.mfExtend = function ( Child, ParentOrPrototype, prototype ) {
+   var key;
+   if ( prototype ) {
+   OO.inheritClass( Child, ParentOrPrototype );
+   } else {
+   OO.initClass( Child );
+   prototype = ParentOrPrototype;
+   }
+   for ( key in prototype ) {
+   Child.prototype[key] = prototype[key];
+   }
+   };
+
+}( mw.mobileFrontend ) );

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie8a815a0230ca81185c3d9acd138bac1934f408d
Gerrit-PatchSet: 1

1 2 3 4 5 >

1 - 100 of 404 matches

Mail list logo