[MediaWiki-commits] [Gerrit] WebInstaller: Don't call getSoftwareLink() - change (mediawiki/core)

2014-01-08 Thread PleaseStand (Code Review) 
PleaseStand has uploaded a new change for review.

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


Change subject: WebInstaller: Don't call getSoftwareLink()
..

WebInstaller: Don't call getSoftwareLink()

Quick hack to get the installer working when a MySQL database
extension is not compiled in; will clean up for 1.23 in a
subsequent commit.

Bug: 58167
Change-Id: I6dbc9d32c8c2d8f233a67d574229b80444885aea
---
M RELEASE-NOTES-1.23
M includes/installer/WebInstallerPage.php
2 files changed, 10 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/89/106489/1

diff --git a/RELEASE-NOTES-1.23 b/RELEASE-NOTES-1.23
index 19bbdc7..344f0a5 100644
--- a/RELEASE-NOTES-1.23
+++ b/RELEASE-NOTES-1.23
@@ -102,6 +102,8 @@
   remaining page content.
 * (bug 23542) imagelinks now stores both the redirect and target (as
   templatelinks does).
+* (bug 58167) The web installer no longer throws an exception when PHP is
+  compiled without support for MySQL yet with support for another DBMS.
 
 === Web API changes in 1.23 ===
 * (bug 54884) action=parse&prop=categories now indicates hidden and missing
diff --git a/includes/installer/WebInstallerPage.php 
b/includes/installer/WebInstallerPage.php
index aa324de..f82d28b 100644
--- a/includes/installer/WebInstallerPage.php
+++ b/includes/installer/WebInstallerPage.php
@@ -485,7 +485,14 @@
// config-support-sqlite
$dbSupport = '';
foreach ( $this->parent->getDBTypes() as $type ) {
-   $link = DatabaseBase::factory( $type 
)->getSoftwareLink();
+   // FIXME: "lego" message construction
+   $links = array(
+   'mysql' => '[http://www.mysql.com/ MySQL]',
+   'postgres' => '[http://www.postgresql.org/ 
PostgreSQL]',
+   'oracle' => '[http://www.oracle.com/ Oracle]',
+   'sqlite' => '[http://sqlite.org/ SQLite]',
+   );
+   $link = isset( $links[$type] ) ? $links[$type] : 
wfMessage( "config-type-$type" )->plain();
$dbSupport .= wfMessage( "config-support-$type", $link 
)->plain() . "\n";
}
$this->addHTML( $this->parent->getInfoBox(

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

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

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

[MediaWiki-commits] [Gerrit] Clean up config-support-* messages - change (mediawiki/core)

2014-01-08 Thread PleaseStand (Code Review) 
PleaseStand has uploaded a new change for review.

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


Change subject: Clean up config-support-* messages
..

Clean up config-support-* messages

Follows-up I6dbc9d32.

* Avoid "lego" construction: put link text directly in the messages,
  which because the messages are parsed as wikitext, is easy to do.
* Put URLs in separate, ignored messages to avoid duplication in
  Database*::getSoftwareLink().
* Because I had to touch a MySQL-related i18n message, I figured
  this would be a good time to address bug 28281 (regarding MySQL
  forks and Special:Version).
* Other miscellaneous message changes, such as recommending the
  mysqli PHP extension over the old, deprecated mysql extension.

Bug: 28281
Bug: 58167
Change-Id: I4b10f8b84c8aef61f26a6c0d1b70ca7932514d61
---
M includes/db/DatabaseMssql.php
M includes/db/DatabaseMysqlBase.php
M includes/db/DatabaseOracle.php
M includes/db/DatabasePostgres.php
M includes/db/DatabaseSqlite.php
M includes/installer/Installer.i18n.php
M includes/installer/WebInstallerPage.php
M languages/messages/MessagesEn.php
M languages/messages/MessagesQqq.php
M maintenance/language/messageTypes.inc
M maintenance/language/messages.inc
11 files changed, 66 insertions(+), 29 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/90/106490/1

diff --git a/includes/db/DatabaseMssql.php b/includes/db/DatabaseMssql.php
index 3a89cd5..7fc655f 100644
--- a/includes/db/DatabaseMssql.php
+++ b/includes/db/DatabaseMssql.php
@@ -729,7 +729,7 @@
 * @return string wikitext of a link to the server software's web site
 */
public function getSoftwareLink() {
-   return "[http://www.microsoft.com/sql/ MS SQL Server]";
+   return "[{{int:version-db-mssql-url}} MS SQL Server]";
}
 
/**
diff --git a/includes/db/DatabaseMysqlBase.php 
b/includes/db/DatabaseMysqlBase.php
index 12fee94..1e29e1b 100644
--- a/includes/db/DatabaseMysqlBase.php
+++ b/includes/db/DatabaseMysqlBase.php
@@ -763,7 +763,14 @@
 * @return string
 */
public function getSoftwareLink() {
-   return '[http://www.mysql.com/ MySQL]';
+   $version = $this->getServerVersion();
+   if ( strpos( $version, 'MariaDB' ) !== false ) {
+   return '[{{int:version-db-mariadb-url}} MariaDB]';
+   } elseif ( strpos( $version, 'percona' ) !== false ) {
+   return '[{{int:version-db-percona-url}} Percona 
Server]';
+   } else {
+   return '[{{int:version-db-mysql-url}} MySQL]';
+   }
}
 
/**
diff --git a/includes/db/DatabaseOracle.php b/includes/db/DatabaseOracle.php
index 3336d1e..9761639 100644
--- a/includes/db/DatabaseOracle.php
+++ b/includes/db/DatabaseOracle.php
@@ -939,7 +939,7 @@
 * @return string wikitext of a link to the server software's web site
 */
public function getSoftwareLink() {
-   return '[http://www.oracle.com/ Oracle]';
+   return '[{{int:version-db-oracle-url}} Oracle]';
}
 
/**
diff --git a/includes/db/DatabasePostgres.php b/includes/db/DatabasePostgres.php
index 21a7bcf..536e464 100644
--- a/includes/db/DatabasePostgres.php
+++ b/includes/db/DatabasePostgres.php
@@ -1140,7 +1140,7 @@
 * @return string wikitext of a link to the server software's web site
 */
public function getSoftwareLink() {
-   return '[http://www.postgresql.org/ PostgreSQL]';
+   return '[{{int:version-db-postgres-url}} PostgreSQL]';
}
 
/**
diff --git a/includes/db/DatabaseSqlite.php b/includes/db/DatabaseSqlite.php
index ea35391..12eca7b 100644
--- a/includes/db/DatabaseSqlite.php
+++ b/includes/db/DatabaseSqlite.php
@@ -655,7 +655,7 @@
 * @return string wikitext of a link to the server software's web site
 */
public function getSoftwareLink() {
-   return "[http://sqlite.org/ SQLite]";
+   return "[{{int:version-db-sqlite-url}} SQLite]";
}
 
/**
diff --git a/includes/installer/Installer.i18n.php 
b/includes/installer/Installer.i18n.php
index 68dd216..30f52e8 100644
--- a/includes/installer/Installer.i18n.php
+++ b/includes/installer/Installer.i18n.php
@@ -100,9 +100,8 @@
'config-no-db'=> 'Could not find a suitable 
database driver! You need to install a database driver for PHP.
 The following database types are supported: $1.
 
-If you are on shared hosting, ask your hosting provider to install a suitable 
database driver.
-If you compiled PHP yourself, reconfigure it with a database client enabled, 
for example using ./configure --with-mysql.
-If you installed PHP from a Debian or Ubuntu package, then you also need 
install the php5-mysql module.',
+If you compiled PHP yourse

[MediaWiki-commits] [Gerrit] Web installer: Remove support for old config-support-* trans... - change (mediawiki/core)

2014-01-08 Thread PleaseStand (Code Review) 
PleaseStand has uploaded a new change for review.

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


Change subject: Web installer: Remove support for old config-support-* 
translations
..

Web installer: Remove support for old config-support-* translations

To be merged after all outdated translations left by I4b10f8b8
have been updated.

Bug: 58167
Change-Id: I0add7265ecc0d7b857e3c188bb8f56f1447c436e
---
M includes/installer/WebInstallerPage.php
1 file changed, 1 insertion(+), 9 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/91/106491/1

diff --git a/includes/installer/WebInstallerPage.php 
b/includes/installer/WebInstallerPage.php
index 25c2d1a..81e0164 100644
--- a/includes/installer/WebInstallerPage.php
+++ b/includes/installer/WebInstallerPage.php
@@ -485,15 +485,7 @@
// config-support-sqlite
$dbSupport = '';
foreach ( $this->parent->getDBTypes() as $type ) {
-   // FIXME: remove message parameter once old "lego" 
translations are gone
-   $links = array(
-   'mysql' => '[{{int:version-db-mysql-url}} 
MySQL]',
-   'postgres' => '[{{int:version-db-postgres-url}} 
PostgreSQL]',
-   'oracle' => '[{{int:version-db-oracle-url}} 
Oracle]',
-   'sqlite' => '[{{int:version-db-sqlite-url}} 
SQLite]',
-   );
-   $link = isset( $links[$type] ) ? $links[$type] : 
wfMessage( "config-type-$type" )->plain();
-   $dbSupport .= wfMessage( "config-support-$type", $link 
)->plain() . "\n";
+   $dbSupport .= wfMessage( "config-support-$type" 
)->plain() . "\n";
}
$this->addHTML( $this->parent->getInfoBox(
wfMessage( 'config-support-info', trim( $dbSupport ) 
)->text() ) );

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

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

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

[MediaWiki-commits] [Gerrit] Update extension setup files - change (mediawiki...ContentTranslation)

2014-01-08 Thread KartikMistry (Code Review) 
KartikMistry has uploaded a new change for review.

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


Change subject: Update extension setup files
..

Update extension setup files

Change-Id: I2736e51058db204dd485d6fd183eec9917ca50dd
---
M AUTHORS.txt
M CONTRIBUTING.md
M Resources.php
M i18n/en.json
M i18n/qqq.json
5 files changed, 27 insertions(+), 20 deletions(-)


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

diff --git a/AUTHORS.txt b/AUTHORS.txt
index 1c91f88..1b54a13 100644
--- a/AUTHORS.txt
+++ b/AUTHORS.txt
@@ -1,3 +1,8 @@
 Amir E. Aharoni 
+David Chan 
+Kartik Mistry 
+Pau Giner 
+Runa Bhattacharjee 
 Santhosh Thottingal 
 Siebrand Mazeland 
+Sucheta Ghoshal 
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 62cf448..5738a8b 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,4 +1,4 @@
-# Contributing to ContentTranslation
+# Contributing to Content translation
 
 Thank you for helping us develop ContentTranslation!
 
@@ -9,7 +9,7 @@
 ## Bug reports
 
 Please report bugs to 
[bugzilla.wikimedia.org](https://bugzilla.wikimedia.org/enter_bug.cgi?product=MediaWiki%20extensions&component=ContentTranslation)
-using the `ContentTranslation` product.  Feel free to use the `General`
+using the `ContentTranslation` product. Feel free to use the `General`
 component if you don't know where else your bug might belong. Don't
 worry about specifying version, severity, hardware, or OS.
 
@@ -19,7 +19,6 @@
 [configured](https://www.mediawiki.org/wiki/Manual:JavaScript_unit_testing) to
 allow running of tests. Set in `LocalSettings.php`:
 ```php
-// https://www.mediawiki.org/wiki/Manual:JavaScript_unit_testing
 $wgEnableJavaScriptTest = true;
 ```
 
@@ -28,9 +27,9 @@
 
 ## Building documentation
 
-ContentTranslation uses [JSDuck](https://github.com/senchalabs/jsduck) to 
process
-documentation comments embedded in the code.  To build the documentation, you
-will need `ruby`, `gem`, and `jsduck` installed.
+ContentTranslation uses [JSDuck](https://github.com/senchalabs/jsduck) to
+process documentation comments embedded in the code. To build the 
documentation,
+you will need `ruby`, `gem`, and `jsduck` installed.
 
 ### Installing ruby and gem
 
@@ -61,20 +60,22 @@
 ```
 
 You may need to set `MW_INSTALL_PATH` in your environment to the location of
-your mediawiki installation if ContentTranslation is not checked out directly 
in the
-mediawiki extensions folder (for example, if you're using a symlink).
+your mediawiki installation if ContentTranslation is not checked out directly
+in the mediawiki extensions folder (for example, if you're using a symlink).
 
 The generated documentation is in the `docs/` subdirectory.  View the
 documentation at
 `http://URL_OF_MEDIAWIKI/extensions/ContentTranslation/docs/`
 (for example, ).
 
-Note that `jsduck` doesn't support browsing vis the `file:` protocol.
+Note that `jsduck` doesn't support browsing is the `file:` protocol.
 
 ## ContentTranslation Code Guidelines
 
-We inherit the code structure (about whitespace, naming and comments) 
conventions
-from MediaWiki. See [Manual:Coding 
conventions/JavaScript](https://www.mediawiki.org/wiki/Manual:Coding_conventions/JavaScript)
+We inherit the code structure (about whitespace, naming and comments)
+conventions from MediaWiki.
+
+See [Manual:Coding 
conventions/JavaScript](https://www.mediawiki.org/wiki/Manual:Coding_conventions/JavaScript)
 on mediawiki.org.
 
 Git commit messages should follow the conventions described in
@@ -92,7 +93,8 @@
 ### Annotations
 
 We use the following annotations. They should be used in the order as they are 
described
-here, for consistency. See 
[JSDuck/Tags](https://github.com/senchalabs/jsduck/wiki/Tags) for more 
elaborate documentation.
+here, for consistency. See 
[JSDuck/Tags](https://github.com/senchalabs/jsduck/wiki/Tags)
+for more elaborate documentation.
 
 * @class Name (optional, guessed)
 * @abstract
diff --git a/Resources.php b/Resources.php
index bdee580..9fe644c 100644
--- a/Resources.php
+++ b/Resources.php
@@ -1,6 +1,6 @@
  __DIR__,
'remoteExtPath' => 'ContentTranslation/modules'
-);
\ No newline at end of file
+);
diff --git a/i18n/en.json b/i18n/en.json
index cfad421..879d202 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -4,6 +4,6 @@
 "Santhosh.thottingal"
 ]
 },
-"ct": "Translate page",
-"ct-desc": "A tool that allows editors to translate pages from one 
language to another with the help of machine translation and other translation 
aids"
-}
\ No newline at end of file
+"cot": "Translate page",
+"cot-desc": "A tool that allows editors to translate pages from one 
language to another with the help of machine translation and other translation 
aids"
+}
diff --git a/i18n/qqq.json b/i18n/qqq.json
index ec3c176..3d8fd28 100644
--- a/i18n/qq

[MediaWiki-commits] [Gerrit] Update special page Special:ContentTranslation - change (mediawiki...ContentTranslation)

2014-01-08 Thread KartikMistry (Code Review) 
KartikMistry has uploaded a new change for review.

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


Change subject: Update special page Special:ContentTranslation
..

Update special page Special:ContentTranslation

Change-Id: I4bd00c91d06f6591eeec06227512885b5186686a
---
M Autoload.php
M ContentTranslation.php
2 files changed, 10 insertions(+), 7 deletions(-)


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

diff --git a/Autoload.php b/Autoload.php
index 973707c..411b8c1 100644
--- a/Autoload.php
+++ b/Autoload.php
@@ -3,10 +3,12 @@
  * Autoload definitions.
  *
  * @file
- * @copyright 2014 ContentTranslation Team and others; see AUTHORS.txt
- * @license GPL-2.0+; see LICENSE.txt
+ * @copyright See AUTHORS.txt
+ * @license GPL-2.0+
  */
 
-$dir =__DIR__;
+global $wgAutoloadClasses;
+
+$dir = __DIR__;
 
 $wgAutoloadClasses['SpecialContentTranslation'] = 
"$dir/specials/SpecialContentTranslation.php";
diff --git a/ContentTranslation.php b/ContentTranslation.php
index 768ce70..c3af5fa 100644
--- a/ContentTranslation.php
+++ b/ContentTranslation.php
@@ -6,8 +6,8 @@
  *
  * @file
  * @ingroup Extensions
- * @copyright 2014 ContentTranslation Team and others; see AUTHORS.txt
- * @license GPL-2.0+; see LICENSE.txt
+ * @copyright See AUTHORS.txt
+ * @license GPL-2.0+
  */
 
 /**
@@ -42,8 +42,9 @@
 require_once "$dir/Resources.php";
 require_once "$dir/Autoload.php";
 
-$GLOBALS['wgMessagesDirs']['ContentTranslation'] = __DIR__ . "/i18n";
-$GLOBALS['wgMessagesDirs']['ContentTranslationAlias'] = __DIR__ . 
"/ContentTranslation.alias.php";
+$GLOBALS['wgMessagesDirs']['ContentTranslation'] = "$dir/i18n";
+$GLOBALS['wgExtensionsMessagesFiles']['ContentTranslationAlias'] =
+   "$dir/ContentTranslation.alias.php";
 
 // Special pages
 $wgSpecialPages['ContentTranslation'] = 'SpecialContentTranslation';

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I4bd00c91d06f6591eeec06227512885b5186686a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ContentTranslation
Gerrit-Branch: master
Gerrit-Owner: KartikMistry 

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

[MediaWiki-commits] [Gerrit] Add more browser test steps - change (mediawiki...ContentTranslation)

2014-01-08 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged.

Change subject: Add more browser test steps
..


Add more browser test steps

Change-Id: I56277bb0e2d6bd356aec06c1f64c672f993e9af6
---
M tests/browser/features/step_definitions/special_content_translation_steps.rb
M tests/browser/features/support/pages/content_translation_page.rb
2 files changed, 23 insertions(+), 20 deletions(-)

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



diff --git 
a/tests/browser/features/step_definitions/special_content_translation_steps.rb 
b/tests/browser/features/step_definitions/special_content_translation_steps.rb
index c6e2d6c..84ed1a6 100644
--- 
a/tests/browser/features/step_definitions/special_content_translation_steps.rb
+++ 
b/tests/browser/features/step_definitions/special_content_translation_steps.rb
@@ -7,7 +7,7 @@
 end
 
 When(/^I write "(.*?)" in the editing area in the translation column$/) do 
|translation|
-   on(ContentTranslationPage).translation_editing_area = translation
+   on(ContentTranslationPage).translation_editor = translation
 end
 
 Then(/^I don't see a "Publish Translation" button$/) do
@@ -31,7 +31,7 @@
 end
 
 Then(/^I see an input box pre\-filled with the text "(.*?)" above the editing 
area in the second column$/) do |text|
-   pending # express the regexp above with the code you wish you had
+   on(ContentTranslationPage).target_title.should == text
 end
 
 Then(/^I see a source column with the content of the page "(.*?)"$/) do 
|page_name|
@@ -39,47 +39,40 @@
 end
 
 Then(/^I see a translation column with an empty editing area$/) do
-   pending # express the regexp above with the code you wish you had
+   on(ContentTranslationPage).translation_editor.should == ""
 end
 
 Then(/^I see a translation information column$/) do
-   pending # express the regexp above with the code you wish you had
+   on(ContentTranslationPage).column("information").should be_visible
 end
 
 Then(/^I see a translation progress bar$/) do
-   pending # express the regexp above with the code you wish you had
+   pending "Not implemented yet"
+   on(ContentTranslationPage).progress_bar.should be_visible
 end
 
 Then(/^I see the message "You must be logged in to translate in this 
page\."$/) do
pending # express the regexp above with the code you wish you had
 end
 
-Then(/^I see the title "(.*?)" at the top of the source column$/) do 
|page_title|
-   pending # express the regexp above with the code you wish you had
+Then(/^I see the title "(.*?)" at the top of the source column$/) do 
|source_page_title|
+   on(ContentTranslationPage).source_title.should == source_page_title
 end
 
 Then(/^the content of the page is "(.*?)"$/) do |page_content|
pending # express the regexp above with the code you wish you had
 end
 
-Then(/^the direction of the source column is "(.+)"$/) do |direction|
-   pending # express the regexp above with the code you wish you had
-end
-
-Then(/^the direction of the translation column is "(.+)"$/) do |direction|
-   pending # express the regexp above with the code you wish you had
+Then(/^the direction of the (.+) column is "(.+)"$/) do |column_type, 
direction|
+   on(ContentTranslationPage).column(column_type).attribute("dir").should 
== direction
 end
 
 Then(/^the first version in the history of the page "(.+?)" should have the 
tag "(.+?)"$/) do |page_title, tag_name|
pending # express the regexp above with the code you wish you had
 end
 
-Then(/^the language code of the source column is "(.+)"$/) do |language_code|
-   pending # express the regexp above with the code you wish you had
-end
-
-Then(/^the language code of the translation column is "(.+?)"$/) do 
|language_code|
-   pending # express the regexp above with the code you wish you had
+Then(/^the language code of the (.+) column is "(.+)"$/) do |column_type, 
language_code|
+   on(ContentTranslationPage).column(column_type).attribute("lang").should 
== language_code
 end
 
 Then(/^the page "(.+?)" is displayed$/) do |page_title|
diff --git a/tests/browser/features/support/pages/content_translation_page.rb 
b/tests/browser/features/support/pages/content_translation_page.rb
index ebcff53..d07919b 100644
--- a/tests/browser/features/support/pages/content_translation_page.rb
+++ b/tests/browser/features/support/pages/content_translation_page.rb
@@ -7,6 +7,8 @@
 
button(:publish_translation, class: "publish-translation")
 
+   div(:progress_bar, class: "ct-progress-bar")
+
def column(column_type)
@browser.div(class: ".ct-column.#{column_type}")
end
@@ -15,7 +17,15 @@
column(column_type).span(class: "language-label")
end
 
-   def translation_editing_area
+   def source_title
+   column("source").h1(class: "source-title")
+   end
+
+

[MediaWiki-commits] [Gerrit] Run update.php in `make master` - change (mediawiki...Flow)

2014-01-08 Thread Spage (Code Review) 
Spage has uploaded a new change for review.

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


Change subject: Run update.php in `make master`
..

Run update.php in `make master`

Trim some of its 230 lines of "... already done" output.

Change-Id: I66c44363f8a60abffa3bbc7d48cbed5a539a76d8
---
M Makefile
1 file changed, 7 insertions(+), 6 deletions(-)


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

diff --git a/Makefile b/Makefile
index e631279..95238d5 100644
--- a/Makefile
+++ b/Makefile
@@ -5,10 +5,11 @@
 
 master:
git fetch
-   echo Here is what is new on origin/master
-   # This doesn't work, despite what gitrevisions(7) says.
-   git log HEAD..origin/master
-   echo Get master
+   @echo Here is what is new on origin/master:
+   @git log HEAD..origin/master
+   @echo Checkout and update master:
git checkout master && git pull --ff-only
-   echo Update Parsoid and restart it\? Other extensions\?
-   echo Run some tests\!\!\!
+   @echo Apply DB updates \(if any\)
+   @php $(MW_INSTALL_PATH)/maintenance/update.php  --quick | sed -n 
'/^[^.]/p'
+   @echo TODO Update Parsoid and restart it\? Other extensions\?
+   @echo Run some tests\!\!\!

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I66c44363f8a60abffa3bbc7d48cbed5a539a76d8
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: Spage 

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

[MediaWiki-commits] [Gerrit] Replace usage of deprecated Title::escapeLocalURL() - change (mediawiki...CheckUser)

2014-01-08 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged.

Change subject: Replace usage of deprecated Title::escapeLocalURL()
..


Replace usage of deprecated Title::escapeLocalURL()

Change-Id: Id3e6ab27e6e7d0937d4364b7c98713bd7edaedbf
---
M specials/SpecialCheckUser.php
M specials/SpecialCheckUserLog.php
2 files changed, 25 insertions(+), 9 deletions(-)

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



diff --git a/specials/SpecialCheckUser.php b/specials/SpecialCheckUser.php
index 05a1c8f..a5a692c 100644
--- a/specials/SpecialCheckUser.php
+++ b/specials/SpecialCheckUser.php
@@ -116,6 +116,7 @@
 */
protected function showForm( $user, $reason, $checktype, $ip, $xff, 
$name, $period ) {
$action = $this->getPageTitle()->escapeLocalUrl();
+   $action = htmlspecialchars( 
$this->getPageTitle()->getLocalUrl() );
# Fill in requested type if it makes sense
$encipusers = $encedits = $encuserips = 0;
if ( $checktype == 'subipusers' && ( $ip || $xff ) ) {
@@ -448,9 +449,12 @@
foreach ( $ips_edits as $ip => $edits ) {
$s .= '';
$s .= '' .
+   htmlspecialchars( 
$this->getPageTitle()->getLocalURL( array(
+   'user' => $ip,
+   'reason' => $reason
+   ) ) ) . '">' .
htmlspecialchars( $ip ) . '';
-   $s .= ' (' .
+   $s .= ' (' .
$this->msg( 'blocklink' )->escaped() . 
')';
if ( $ips_first[$ip] == $ips_last[$ip] ) {
$s .= ' (' . 
$this->getLanguage()->timeanddate( wfTimestamp( TS_MW, $ips_first[$ip] ), true 
) . ') ';
@@ -609,7 +613,11 @@
$ip = long2ip( wfBaseConvert( 
$row->cuc_ip_hex, 16, 10, 8 ) );
}
$s .= '' . $ip . '';
if ( $row->first == $row->last ) {
$s .= ' (' . 
$this->getLanguage()->timeanddate( wfTimestamp( TS_MW, $row->first ), true ) . 
') ';
@@ -901,7 +909,11 @@
$ip = long2ip( wfBaseConvert( 
$row->cuc_ip_hex, 16, 10, 8 ) );
}
$s .= '' . $ip . '';
if ( $row->first == $row->last ) {
$s .= ' (' . 
$this->getLanguage()->timeanddate( wfTimestamp( TS_MW, $row->first ), true ) . 
') ';
@@ -971,7 +983,7 @@
}
}
 
-   $action = $this->getPageTitle()->escapeLocalURL( 
'action=block' );
+   $action = htmlspecialchars( 
$this->getPageTitle()->getLocalURL( 'action=block' ) );
$s = "";
$s .= '';
foreach ( $users_edits as $name => $count ) {
@@ -982,8 +994,10 @@
# Add user tool links
$s .= Linker::userLink( - 1 , $name ) . 
Linker::userToolLinks( - 1 , $name );
# Add CheckUser link
-   $s .= ' (' . $this->msg( 'checkuser-check' )->escaped() . ')';
+   $s .= ' (' . $this->msg( 
'checkuser-check' )->escaped() . ')';
# Show edit time range
if ( $users_first[$name] == $users_last[$name] 
) {
// @todo FIXME: Hard coded parentheses.
@@ -1038,7 +1052,9 @@
$set = $users_infosets[$name][$i];
# IP link
$s .= '';
-   $s .= '' 
. htmlspecialchars( $set[0] ) . '';
+   $s .= '' . htmlspecialchars( 
$set[0] ) . '';
# XFF string, link to /xff search
if ( $set[1] ) {
# Flag our trusted proxies
diff --git a/specials/SpecialCheckUserLog.php b/specials/SpecialCheckUserLog.php
index 457b529..ef85ab5 100644
--- a/specials/SpecialCheckUserLog.php
+++ b/specials/SpecialCheckUserLog.php
@@ -99,7 +99,7 @@
$msgSearch = $this->msg( 'checkuser-search' )->escaped();
$input = "";
$msgSearchForm = $this->msg( 'checkuser-search-form' 
)->rawParams( $select, $input )->escaped();
-   $for

[MediaWiki-commits] [Gerrit] Remove obsolete columns during update - change (mediawiki...Flow)

2014-01-08 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged.

Change subject: Remove obsolete columns during update
..


Remove obsolete columns during update

This is a better version for https://gerrit.wikimedia.org/r/#/c/106464/

The bug:
An error occurred.
The error message received was: Exception Caught: Update not allowed on: 
tree_orig_user_text, rev_user_text, rev_edit_user_text

Change-Id: Iaf1693aade7c81bbd75fbe5f4a5f234c8861f032
---
M includes/Data/RevisionStorage.php
1 file changed, 23 insertions(+), 0 deletions(-)

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



diff --git a/includes/Data/RevisionStorage.php 
b/includes/Data/RevisionStorage.php
index 7fd0bd7..f2db7b3 100644
--- a/includes/Data/RevisionStorage.php
+++ b/includes/Data/RevisionStorage.php
@@ -19,6 +19,14 @@
'rev_mod_timestamp',
'rev_mod_reason',
);
+
+   // Delete when these columns are dropped from production
+   static protected $obsoleteUpdateColumns = array (
+   'tree_orig_user_text',
+   'rev_user_text',
+   'rev_edit_user_text',
+   );
+
protected $externalStores;
 
abstract protected function joinTable();
@@ -282,6 +290,14 @@
// for suppressing?
public function update( array $old, array $new ) {
$changeSet = ObjectManager::calcUpdates( $old, $new );
+
+   foreach( static::$obsoleteUpdateColumns as $val ) {
+   // Need to use array_key_exists to check null value
+   if ( array_key_exists( $val, $changeSet ) ) {
+   unset( $changeSet[$val] );
+   }
+   }
+
$extra = array_diff( array_keys( $changeSet ), 
static::$allowedUpdateColumns );
if ( $extra ) {
throw new DataModelException( 'Update not allowed on: ' 
. implode( ', ', $extra ), 'process-data' );
@@ -408,6 +424,13 @@
return $changes;
}
 
+   foreach( static::$obsoleteUpdateColumns as $val ) {
+   // Need to use array_key_exists to check null value
+   if ( array_key_exists( $val, $treeChanges ) ) {
+   unset( $treeChanges[$val] );
+   }
+   }
+
$extra = array_diff( array_keys( $treeChanges ), 
static::$allowedUpdateColumns );
if ( $extra ) {
throw new DataModelException( 'Update not allowed on: ' 
. implode( ', ', $extra ), 'process-data' );

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Iaf1693aade7c81bbd75fbe5f4a5f234c8861f032
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: Bsitu 
Gerrit-Reviewer: EBernhardson 
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 deprecated User::editToken with User::getEditToken (... - change (mediawiki/core)

2014-01-08 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged.

Change subject: Replace deprecated User::editToken with User::getEditToken 
(1.19)
..


Replace deprecated User::editToken with User::getEditToken (1.19)

Change-Id: Ic845c2a62488ea44a306c83652b503fa2c862d8c
---
M includes/specials/SpecialUserlogin.php
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/includes/specials/SpecialUserlogin.php 
b/includes/specials/SpecialUserlogin.php
index 3e67d56..8e5ef58 100644
--- a/includes/specials/SpecialUserlogin.php
+++ b/includes/specials/SpecialUserlogin.php
@@ -1298,7 +1298,7 @@
 */
public static function setLoginToken() {
global $wgRequest;
-   // Generate a token directly instead of using $user->editToken()
+   // Generate a token directly instead of using 
$user->getEditToken()
// because the latter reuses $_SESSION['wsEditToken']
$wgRequest->setSessionData( 'wsLoginToken', 
MWCryptRand::generateHex( 32 ) );
}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic845c2a62488ea44a306c83652b503fa2c862d8c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Siebrand 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: jenkins-bot

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

[MediaWiki-commits] [Gerrit] Segregate watchlist and recentshangeslinked queries on all s... - change (operations/mediawiki-config)

2014-01-08 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged.

Change subject: Segregate watchlist and recentshangeslinked queries on all 
shards.
..


Segregate watchlist and recentshangeslinked queries on all shards.

As happened with s1 enwiki long ago, these query types are worth
separating from general traffic on the large wikis to reduce the
effects of hitting cold data. Not really necessary on s3 but nice
to be consistent.

Also the logpager slaves now have partitioned logging tables on
a hash of log_user. All these queries that filter by user id can
take advantage of partition pruning there.

Change-Id: I5f2816468695e5ff7cd61886482f8d4a214fd670
---
M wmf-config/db-eqiad.php
1 file changed, 43 insertions(+), 6 deletions(-)

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



diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php
index 8f7b159..f295770 100644
--- a/wmf-config/db-eqiad.php
+++ b/wmf-config/db-eqiad.php
@@ -98,42 +98,42 @@
's2' => array(
'db1036'=> 0,
'db1018'=> 0, # snapshot, vslow
-   'db1002'=> 50, # contributions, logpager
+   'db1002'=> 50, # watchlist, recentchangeslinked, 
contributions, logpager
'db1009'=> 400,
'db1034'=> 400,
),
/* s3 */ 'DEFAULT' => array(
'db1038'=> 0,
'db1035'=> 0, # snapshot, vslow
-   'db1003'=> 50, # contributions, logpager
+   'db1003'=> 50, # watchlist, recentchangeslinked, 
contributions, logpager
'db1010'=> 400,
'db1019'=> 400,
),
's4' => array(
'db1059'   => 0,
'db1042'   => 0, # snapshot, vslow
-   'db1004'   => 50, # contributions, logpager
+   'db1004'   => 50, # watchlist, recentchangeslinked, 
contributions, logpager
'db1011'   => 400,
'db1020'   => 400,
),
's5' => array(
'db1058'   => 0,
'db1005'   => 0, # snapshot, vslow
-   'db1026'   => 50, # contributions, logpager
+   'db1026'   => 50, # watchlist, recentchangeslinked, 
contributions, logpager
'db1021'   => 400,
'db1045'   => 400,
),
's6' => array(
'db1027'   => 0,
'db1022'   => 0, # snapshot, vslow
-   'db1040'   => 50, # contributions, logpager
+   'db1040'   => 50, # watchlist, recentchangeslinked, 
contributions, logpager
'db1015'   => 400,
'db1006'   => 400,
),
's7' => array(
'db1039' => 0,
'db1007' => 0, # snapshot, vslow
-   'db1041' => 50, # contributions, logpager
+   'db1041' => 50, # watchlist, recentchangeslinked, 
contributions, logpager
'db1024' => 400,
'db1028' => 400,
),
@@ -151,9 +151,16 @@
 ),
 
 'groupLoadsBySection' => array(
+   // s1 => groupLoadsByDB
's2' => array(
'vslow' => array(
'db1018' => 1,
+   ),
+   'watchlist' => array(
+   'db1002' => 1,
+   ),
+   'recentchangeslinked' => array(
+   'db1002' => 1,
),
'contributions' => array(
'db1002' => 1,
@@ -166,6 +173,12 @@
'vslow' => array(
'db1035' => 1,
),
+   'watchlist' => array(
+   'db1003' => 1,
+   ),
+   'recentchangeslinked' => array(
+   'db1003' => 1,
+   ),
'contributions' => array(
'db1003' => 1,
),
@@ -176,6 +189,12 @@
's4' => array(
'vslow' => array(
'db1042' => 1,
+   ),
+   'watchlist' => array(
+   'db1004' => 1,
+   ),
+   'recentchangeslinked' => array(
+   'db1004' => 1,
),
'contributions' => array(
'db1004' => 1,
@@ -188,6 +207,12 @@
'vslow' => array(
'db1005' => 1,
),
+   'watchlist' => array(
+   'db1026' => 1,
+   ),
+   'recentchangeslinked' => array(
+   'db1026' => 1,
+   ),
'contributions' => array(
'db1026' => 1,
),
@@ -199,6 +224,12 @@
'vslow' => array(
'db1022' => 1,
),
+   'watchlist' => ar

[MediaWiki-commits] [Gerrit] Segregate watchlist and recentshangeslinked queries on all s... - change (operations/mediawiki-config)

2014-01-08 Thread Springle (Code Review) 
Springle has uploaded a new change for review.

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


Change subject: Segregate watchlist and recentshangeslinked queries on all 
shards.
..

Segregate watchlist and recentshangeslinked queries on all shards.

As happened with s1 enwiki long ago, these query types are worth
separating from general traffic on the large wikis to reduce the
effects of hitting cold data. Not really necessary on s3 but nice
to be consistent.

Also the logpager slaves now have partitioned logging tables on
a hash of log_user. All these queries that filter by user id can
take advantage of partition pruning there.

Change-Id: I5f2816468695e5ff7cd61886482f8d4a214fd670
---
M wmf-config/db-eqiad.php
1 file changed, 43 insertions(+), 6 deletions(-)


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

diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php
index 8f7b159..f295770 100644
--- a/wmf-config/db-eqiad.php
+++ b/wmf-config/db-eqiad.php
@@ -98,42 +98,42 @@
's2' => array(
'db1036'=> 0,
'db1018'=> 0, # snapshot, vslow
-   'db1002'=> 50, # contributions, logpager
+   'db1002'=> 50, # watchlist, recentchangeslinked, 
contributions, logpager
'db1009'=> 400,
'db1034'=> 400,
),
/* s3 */ 'DEFAULT' => array(
'db1038'=> 0,
'db1035'=> 0, # snapshot, vslow
-   'db1003'=> 50, # contributions, logpager
+   'db1003'=> 50, # watchlist, recentchangeslinked, 
contributions, logpager
'db1010'=> 400,
'db1019'=> 400,
),
's4' => array(
'db1059'   => 0,
'db1042'   => 0, # snapshot, vslow
-   'db1004'   => 50, # contributions, logpager
+   'db1004'   => 50, # watchlist, recentchangeslinked, 
contributions, logpager
'db1011'   => 400,
'db1020'   => 400,
),
's5' => array(
'db1058'   => 0,
'db1005'   => 0, # snapshot, vslow
-   'db1026'   => 50, # contributions, logpager
+   'db1026'   => 50, # watchlist, recentchangeslinked, 
contributions, logpager
'db1021'   => 400,
'db1045'   => 400,
),
's6' => array(
'db1027'   => 0,
'db1022'   => 0, # snapshot, vslow
-   'db1040'   => 50, # contributions, logpager
+   'db1040'   => 50, # watchlist, recentchangeslinked, 
contributions, logpager
'db1015'   => 400,
'db1006'   => 400,
),
's7' => array(
'db1039' => 0,
'db1007' => 0, # snapshot, vslow
-   'db1041' => 50, # contributions, logpager
+   'db1041' => 50, # watchlist, recentchangeslinked, 
contributions, logpager
'db1024' => 400,
'db1028' => 400,
),
@@ -151,9 +151,16 @@
 ),
 
 'groupLoadsBySection' => array(
+   // s1 => groupLoadsByDB
's2' => array(
'vslow' => array(
'db1018' => 1,
+   ),
+   'watchlist' => array(
+   'db1002' => 1,
+   ),
+   'recentchangeslinked' => array(
+   'db1002' => 1,
),
'contributions' => array(
'db1002' => 1,
@@ -166,6 +173,12 @@
'vslow' => array(
'db1035' => 1,
),
+   'watchlist' => array(
+   'db1003' => 1,
+   ),
+   'recentchangeslinked' => array(
+   'db1003' => 1,
+   ),
'contributions' => array(
'db1003' => 1,
),
@@ -176,6 +189,12 @@
's4' => array(
'vslow' => array(
'db1042' => 1,
+   ),
+   'watchlist' => array(
+   'db1004' => 1,
+   ),
+   'recentchangeslinked' => array(
+   'db1004' => 1,
),
'contributions' => array(
'db1004' => 1,
@@ -188,6 +207,12 @@
'vslow' => array(
'db1005' => 1,
),
+   'watchlist' => array(
+   'db1026' => 1,
+   ),
+   'recentchangeslinked' => array(
+   'db1026' => 1,
+   ),
'contributions' => array(
'db1026' => 1,
),
@@ -199,6 +224,12 @@
'vslow' => array(
'db1022' => 1

[MediaWiki-commits] [Gerrit] Declare visibility on all properties in ForkController - change (mediawiki/core)

2014-01-08 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged.

Change subject: Declare visibility on all properties in ForkController
..


Declare visibility on all properties in ForkController

Grepped all of core and extensions, and nothing uses them

Change-Id: I8e4f191aafffdbc2254e39bed81a5209cdf29795
---
M includes/ForkController.php
1 file changed, 4 insertions(+), 4 deletions(-)

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



diff --git a/includes/ForkController.php b/includes/ForkController.php
index ced45af..2d5aa4b 100644
--- a/includes/ForkController.php
+++ b/includes/ForkController.php
@@ -30,11 +30,11 @@
  * @ingroup Maintenance
  */
 class ForkController {
-   var $children = array();
-   var $termReceived = false;
-   var $flags = 0, $procsToStart = 0;
+   protected $children = array();
+   protected $termReceived = false;
+   protected $flags = 0, $procsToStart = 0;
 
-   static $restartableSignals = array(
+   protected static $restartableSignals = array(
SIGFPE,
SIGILL,
SIGSEGV,

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I8e4f191aafffdbc2254e39bed81a5209cdf29795
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Chad 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: jenkins-bot

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

[MediaWiki-commits] [Gerrit] Escape more bad syntax - change (mediawiki...CirrusSearch)

2014-01-08 Thread Manybubbles (Code Review) 
Manybubbles has uploaded a new change for review.

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


Change subject: Escape more bad syntax
..

Escape more bad syntax

This should stop many of the "invalid syntax" exceptions we see.

Change-Id: I9952f2ecfe6e9c9d770f50df4266d688c535269e
---
M includes/Searcher.php
M tests/browser/features/full_text.feature
2 files changed, 16 insertions(+), 3 deletions(-)


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

diff --git a/includes/Searcher.php b/includes/Searcher.php
index dff04b6..114f822 100644
--- a/includes/Searcher.php
+++ b/includes/Searcher.php
@@ -848,10 +848,11 @@
wfProfileIn( __METHOD__ );
// Turn bad fuzzy searches into searches that contain a ~
$string = preg_replace_callback( 
'/(?[^\s"])~(?\S+)/', function ( $matches ) {
-   if ( preg_match( '/0|(?:0?\.[0-9]+)|(?:1(?:\.0)?)/', 
$matches[ 'trailing' ] ) ) {
+   if ( preg_match( 
'/^(?:0|(?:0?\.[0-9]+)|(?:1(?:\.0)?))$/', $matches[ 'trailing' ] ) ) {
+   wfDebugLog( 'CirrusSearch', "Found fuzzy:  " . 
$matches[ 'trailing' ] );
return $matches[ 0 ];
} else {
-   return $matches[ 'leading' ] . '\\~' . 
$matches[ 'trailing' ];
+   return $matches[ 'leading' ] . '\\~' . 
preg_replace( '/~/', '\~', $matches[ 'trailing' ] );
}
}, $string );
// Turn bad proximity searches into searches that contain a ~
@@ -863,7 +864,7 @@
}
}, $string );
// Escape +, -, and ! when not followed immediately by a term.
-   $string = preg_replace( '/(?:\\+|\\-|\\!)(?:\s|$)/', '$0', 
$string );
+   $string = preg_replace_callback( 
'/([\\+\\-\\!]+)([\\+\\-\\!\\~\s]|$)/', 
'CirrusSearch\Searcher::escapeBadSyntax', $string );
// Lowercase AND and OR when not surrounded on both sides by a 
term.
// Lowercase NOT when it doesn't have a term after it.
$string = preg_replace_callback( '/(?:AND|OR|NOT)\s*$/', 
'CirrusSearch\Searcher::lowercaseMatched', $string );
@@ -872,6 +873,10 @@
return $string;
}
 
+   private static function escapeBadSyntax( $matches ) {
+   return "\\" . implode( "\\", str_split( $matches[ 1 ] ) ) . 
$matches[ 2 ];
+   }
+
private static function lowercaseMatched( $matches ) {
return strtolower( $matches[ 0 ] );
}
diff --git a/tests/browser/features/full_text.feature 
b/tests/browser/features/full_text.feature
index 286b987..d6b92b9 100644
--- a/tests/browser/features/full_text.feature
+++ b/tests/browser/features/full_text.feature
@@ -375,6 +375,14 @@
   | catapult AND + amazing |
   | catapult AND - amazing |
   | catapult AND ! amazing |
+  | catapult!!!|
+  | catapult   |
+  |  catapult  |
+  | --- catapult   |
+  |  catapult  |
+  | ++catapultcatapult |
+  | :~!$$=!~\!{<} catapult |
+  | catapult -_~^_~^_^^|
 
   @boolean_operators @setup_main
   Scenario: searching for NOT something will not crash (technically it should 
bring up the most linked document, but this isn't worth checking)

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

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

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

[MediaWiki-commits] [Gerrit] Remove obsolete columns during update - change (mediawiki...Flow)

2014-01-08 Thread Bsitu (Code Review) 
Bsitu has uploaded a new change for review.

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


Change subject: Remove obsolete columns during update
..

Remove obsolete columns during update

This is a better version for https://gerrit.wikimedia.org/r/#/c/106464/

The bug:
An error occurred.
The error message received was: Exception Caught: Update not allowed on: 
tree_orig_user_text, rev_user_text, rev_edit_user_text

Change-Id: Iaf1693aade7c81bbd75fbe5f4a5f234c8861f032
---
M includes/Data/RevisionStorage.php
1 file changed, 23 insertions(+), 0 deletions(-)


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

diff --git a/includes/Data/RevisionStorage.php 
b/includes/Data/RevisionStorage.php
index 7fd0bd7..69e9106 100644
--- a/includes/Data/RevisionStorage.php
+++ b/includes/Data/RevisionStorage.php
@@ -19,6 +19,14 @@
'rev_mod_timestamp',
'rev_mod_reason',
);
+
+   // Delete when these columns are dropped from production
+   static protected $obsoleteUpdateColumns = array (
+   'tree_orig_user_text',
+   'rev_user_text',
+   'rev_edit_user_text',   
+   );
+
protected $externalStores;
 
abstract protected function joinTable();
@@ -282,6 +290,14 @@
// for suppressing?
public function update( array $old, array $new ) {
$changeSet = ObjectManager::calcUpdates( $old, $new );
+
+   foreach( static::$obsoleteUpdateColumns as $val ) {
+   // Need to use array_key_exists to check null value
+   if ( array_key_exists( $val, $changeSet ) ) {
+   unset( $changeSet[$val] );
+   }
+   }
+
$extra = array_diff( array_keys( $changeSet ), 
static::$allowedUpdateColumns );
if ( $extra ) {
throw new DataModelException( 'Update not allowed on: ' 
. implode( ', ', $extra ), 'process-data' );
@@ -408,6 +424,13 @@
return $changes;
}
 
+   foreach( static::$obsoleteUpdateColumns as $val ) {
+   // Need to use array_key_exists to check null value
+   if ( array_key_exists( $val, $treeChanges ) ) {
+   unset( $treeChanges[$val] );
+   }
+   }
+
$extra = array_diff( array_keys( $treeChanges ), 
static::$allowedUpdateColumns );
if ( $extra ) {
throw new DataModelException( 'Update not allowed on: ' 
. implode( ', ', $extra ), 'process-data' );

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iaf1693aade7c81bbd75fbe5f4a5f234c8861f032
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: Bsitu 

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

[MediaWiki-commits] [Gerrit] Fix metadata loading - change (mediawiki...MultimediaViewer)

2014-01-08 Thread Code Review 
Gergő Tisza has uploaded a new change for review.

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


Change subject: Fix metadata loading
..

Fix metadata loading

fetchImageInfo() was used to load different property sets,
but had a single cache, so sometimes the results with less properties
overwrote the ones with more.

This is a dirty hack to deal with that. I will revisit once we
use promises.

Bug: 59817
Change-Id: I4f375bcc4e6fcfdb3e3fe7a30fc90a8fd44164c3
---
M resources/ext.multimediaViewer/ext.multimediaViewer.js
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/resources/ext.multimediaViewer/ext.multimediaViewer.js 
b/resources/ext.multimediaViewer/ext.multimediaViewer.js
index 3e4508a..03de282 100755
--- a/resources/ext.multimediaViewer/ext.multimediaViewer.js
+++ b/resources/ext.multimediaViewer/ext.multimediaViewer.js
@@ -821,7 +821,7 @@
targetWidth = widths.target,
requestedWidth = widths.requested;
 
-   props = props || iiprops;
+   props = $.merge( props || [], iiprops ); // FIXME bug 59817
apiArgs.iiprop = props.join( '|' );
apiArgs.iiurlwidth = requestedWidth;
 

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

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

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

[MediaWiki-commits] [Gerrit] Import populate script from Gist - change (mediawiki...GettingStarted)

2014-01-08 Thread Mattflaschen (Code Review) 
Mattflaschen has uploaded a new change for review.

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


Change subject: Import populate script from Gist
..

Import populate script from Gist

Original code by Ori Livneh, at https://gist.github.com/atdt/5159480

Co-Author: Matthew Flaschen 
Change-Id: Iae074bb8fd83f2e923ccd84b3b5f80d51cd836e9
---
A maintenance/populate_categories.php
1 file changed, 71 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/GettingStarted 
refs/changes/79/106479/1

diff --git a/maintenance/populate_categories.php 
b/maintenance/populate_categories.php
new file mode 100644
index 000..9e73e79
--- /dev/null
+++ b/maintenance/populate_categories.php
@@ -0,0 +1,71 @@
+mDescription = 'Populates GettingStarted Redis sets from 
categories';
+   }
+
+   function populateCategory( $category ) {
+   $key = RedisCategorySync::makeCategoryKey( $category );
+   echo "Key: $key\n";
+
+   $dbr = wfGetDB( DB_SLAVE );
+   $res = $dbr->select(
+   array( 'page', 'categorylinks' ),
+   array( 'page_id' ),
+   array(
+   'cl_from = page_id',
+   'cl_to' => $category->getName(),
+   'page_is_redirect' => 0,
+   'page_namespace' => NS_MAIN,
+   ),
+   __FUNCTION__
+   );
+
+   $pages = array();
+   foreach( $res as $row ) {
+   $pages[] = $row->page_id;
+   }
+   if ( !count( $pages ) ) {
+   return 0;
+   }
+
+
+   $conn = RedisCategorySync::getClient();
+   $redis = $conn->multi( \Redis::PIPELINE );
+
+   $batches = array_chunk( $pages, 100 );
+   foreach( $batches as $batch ) {
+   array_unshift( $batch, $key );
+   call_user_func_array( array( $redis, 'sAdd' ), $batch );
+   }
+   return $redis->exec() ? count( $pages ) : 0;
+   }
+
+   public function execute() {
+   foreach( RedisCategorySync::getCategories() as $catName ) {
+   echo "Populating category '${catName}' ...\n";
+   $cat = \Category::newFromName( $catName );
+   $count = $this->populateCategory( $cat );
+   echo "Updated / refreshed $count pages in 
category.\n\n";
+   }
+   }
+}
+
+$maintClass = 'GettingStarted\PopulateCategories';
+require_once( RUN_MAINTENANCE_IF_MAIN );

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iae074bb8fd83f2e923ccd84b3b5f80d51cd836e9
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/GettingStarted
Gerrit-Branch: master
Gerrit-Owner: Mattflaschen 
Gerrit-Reviewer: Ori.livneh 

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

[MediaWiki-commits] [Gerrit] disable index_merge_sort_union - change (operations/puppet)

2014-01-08 Thread Springle (Code Review) 
Springle has submitted this change and it was merged.

Change subject: disable index_merge_sort_union
..


disable index_merge_sort_union

Change-Id: I5776741a29d7d4006c18725503c2a7838835d909
---
M modules/coredb_mysql/templates/prod.my.cnf.erb
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/modules/coredb_mysql/templates/prod.my.cnf.erb 
b/modules/coredb_mysql/templates/prod.my.cnf.erb
index b8fa52f..84ed1cb 100644
--- a/modules/coredb_mysql/templates/prod.my.cnf.erb
+++ b/modules/coredb_mysql/templates/prod.my.cnf.erb
@@ -71,7 +71,7 @@
 collation_server=binary
 
 log_slow_verbosity=Query_plan
-optimizer_switch='mrr=on,mrr_cost_based=on,mrr_sort_keys=on,optimize_join_buffer_size=on,extended_keys=off'
+optimizer_switch='mrr=on,mrr_cost_based=on,mrr_sort_keys=on,optimize_join_buffer_size=on,extended_keys=off,index_merge_sort_union=off'
 #thread_handling=pool-of-threads
 #extra_port=3308
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I5776741a29d7d4006c18725503c2a7838835d909
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Springle 
Gerrit-Reviewer: Springle 
Gerrit-Reviewer: jenkins-bot

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

[MediaWiki-commits] [Gerrit] disable index_merge_sort_union - change (operations/puppet)

2014-01-08 Thread Springle (Code Review) 
Springle has uploaded a new change for review.

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


Change subject: disable index_merge_sort_union
..

disable index_merge_sort_union

Change-Id: I5776741a29d7d4006c18725503c2a7838835d909
---
M modules/coredb_mysql/templates/prod.my.cnf.erb
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/modules/coredb_mysql/templates/prod.my.cnf.erb 
b/modules/coredb_mysql/templates/prod.my.cnf.erb
index b8fa52f..84ed1cb 100644
--- a/modules/coredb_mysql/templates/prod.my.cnf.erb
+++ b/modules/coredb_mysql/templates/prod.my.cnf.erb
@@ -71,7 +71,7 @@
 collation_server=binary
 
 log_slow_verbosity=Query_plan
-optimizer_switch='mrr=on,mrr_cost_based=on,mrr_sort_keys=on,optimize_join_buffer_size=on,extended_keys=off'
+optimizer_switch='mrr=on,mrr_cost_based=on,mrr_sort_keys=on,optimize_join_buffer_size=on,extended_keys=off,index_merge_sort_union=off'
 #thread_handling=pool-of-threads
 #extra_port=3308
 

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

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

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

[MediaWiki-commits] [Gerrit] Add support for more Flickr URLs - change (mediawiki...UploadWizard)

2014-01-08 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged.

Change subject: Add support for more Flickr URLs
..


Add support for more Flickr URLs

Added support for:
* User Collections
* User Photostreams
* Group pools
* User Galleries
* User Favorites

Bug: 42964
Change-Id: I470fc57f7575e71c40cbe9d6150beffeb13a874b
---
M UploadWizard.i18n.php
M resources/mw.FlickrChecker.js
2 files changed, 217 insertions(+), 15 deletions(-)

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



diff --git a/UploadWizard.i18n.php b/UploadWizard.i18n.php
index 90fada4..bcf3d9b 100644
--- a/UploadWizard.i18n.php
+++ b/UploadWizard.i18n.php
@@ -51,7 +51,7 @@
'mwe-upwiz-add-file-flickr-n' => 'Add more images from Flickr',
'mwe-upwiz-add-flickr-or' => 'Or' ,
'mwe-upwiz-add-flickr' => 'Get from Flickr',
-   'mwe-upwiz-flickr-input-placeholder' => 'Flickr image/photoset URL',
+   'mwe-upwiz-flickr-input-placeholder' => 'Flickr URL',
'mwe-upwiz-select-flickr' => 'Upload selected images',
'mwe-upwiz-flickr-disclaimer1' => 'This form will load content hosted 
by flickr.com and subject to the
 Flickr [https://www.flickr.com/help/terms/ terms of use] and 
[https://www.flickr.com/help/privacy-policy/ privacy policy].',
@@ -321,7 +321,7 @@
'mwe-upwiz-license-external' => 'The file is under the following 
license on the source site "$1": $2.',
'mwe-upwiz-license-external-invalid' => 'The file is under the 
following license on the source site "$1": $2. Unfortunately, this wiki does 
not allow that license.',
'mwe-upwiz-license-photoset-invalid' => 'Unfortunately, no image in the 
photoset has a license appropriate to be used on this site.',
-   'mwe-upwiz-url-invalid' => 'The URL entered points to an invalid or 
restricted $1 image or photoset and cannot be used.',
+   'mwe-upwiz-url-invalid' => 'The URL entered is unsupported or points to 
an invalid or restricted $1 image or photoset and cannot be used.',
'mwe-upwiz-categories' => 'Categories',
'mwe-upwiz-categories-add' => 'Add another category',
'mwe-upwiz-category-will-be-added' => 'This category is not in use 
yet.',
diff --git a/resources/mw.FlickrChecker.js b/resources/mw.FlickrChecker.js
index 1ddfa67..12750e3 100644
--- a/resources/mw.FlickrChecker.js
+++ b/resources/mw.FlickrChecker.js
@@ -49,19 +49,34 @@
checkFlickr: function( flickrInputUrl ) {
this.url = flickrInputUrl;
var photoIdMatches = 
this.url.match(/flickr\.com\/(?:x\/t\/[^\/]+\/)?photos\/[^\/]+\/([0-9]+)/),
-   albumIdMatches = 
this.url.match(/flickr\.com\/photos\/[^\/]+\/sets\/([0-9]+)/);
+   albumIdMatches = 
this.url.match(/flickr\.com\/photos\/[^\/]+\/sets\/([0-9]+)/),
+   userCollectionMatches = 
this.url.match(/flickr\.com\/(?:x\/t\/[^\/]+\/)?photos\/[^\/]+\/collections\/?([0-9]+)?/),
+   userPhotostreamMatches = 
this.url.match(/flickr\.com\/(?:x\/t\/[^\/]+\/)?photos\/([^\/]+)/),
+   groupPoolMatches = 
this.url.match(/flickr\.com\/groups\/[^\/]+(?:\/pool\/([^\/]+))?/),
+   userGalleryMatches = 
this.url.match(/flickr\.com\/(?:x\/t\/[^\/]+\/)?photos\/[^\/]+\/galleries\/([0-9]+)/),
+   userFavoritesMatches = 
this.url.match(/flickr\.com\/(?:x\/t\/[^\/]+\/)?photos\/([^\/]+)\/favorites/);
if ( photoIdMatches === null ) {
// try static urls
photoIdMatches = 
this.url.match(/static\.?flickr\.com\/[^\/]+\/([0-9]+)_/);
}
-   if ( albumIdMatches || photoIdMatches ) {
+   if ( albumIdMatches || photoIdMatches || userCollectionMatches 
|| userPhotostreamMatches ||
+   groupPoolMatches || userGalleryMatches || 
userFavoritesMatches ) {
$( '#mwe-upwiz-upload-add-flickr-container' ).hide();
this.imageUploads = [];
if ( albumIdMatches && albumIdMatches[1] > 0 ) {
this.getPhotoset( albumIdMatches );
-   }
-   if ( photoIdMatches && photoIdMatches[1] > 0 ) {
+   } else if ( photoIdMatches && photoIdMatches[1] > 0 ) {
this.getPhoto( photoIdMatches );
+   } else if ( userCollectionMatches ) {
+   this.getCollection( userCollectionMatches );
+   } else if ( userFavoritesMatches && 
userFavoritesMatches[1] ) {
+   this.getPhotostream( 'favorites', 
userPhotostreamMatches );
+   } else if ( userGalleryMatches &&

[MediaWiki-commits] [Gerrit] Revert "Temporarily add obsolete columns to $allowUpateColumns" - change (mediawiki...Flow)

2014-01-08 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged.

Change subject: Revert "Temporarily add obsolete columns to $allowUpateColumns"
..


Revert "Temporarily add obsolete columns to $allowUpateColumns"

This reverts commit ed8f14048ec4ece5c541f999c616724dafc6a100.

Change-Id: I80d176e1abf3df9c0bb4aba48e9f163f238dfd80
---
M includes/Data/RevisionStorage.php
1 file changed, 0 insertions(+), 3 deletions(-)

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



diff --git a/includes/Data/RevisionStorage.php 
b/includes/Data/RevisionStorage.php
index af0555e..7fd0bd7 100644
--- a/includes/Data/RevisionStorage.php
+++ b/includes/Data/RevisionStorage.php
@@ -18,9 +18,6 @@
'rev_mod_user_text',
'rev_mod_timestamp',
'rev_mod_reason',
-   'tree_orig_user_text',
-   'rev_user_text',
-   'rev_edit_user_text',
);
protected $externalStores;
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I80d176e1abf3df9c0bb4aba48e9f163f238dfd80
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: EBernhardson 
Gerrit-Reviewer: EBernhardson 
Gerrit-Reviewer: jenkins-bot

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

[MediaWiki-commits] [Gerrit] Temporarily add obsolete columns to $allowUpateColumns - change (mediawiki...Flow)

2014-01-08 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged.

Change subject: Temporarily add obsolete columns to $allowUpateColumns
..


Temporarily add obsolete columns to $allowUpateColumns

They should be removed once these obsolete columns are removed from database

Change-Id: I6007b944917ce54f21fb403c1abb061162fd896d
---
M includes/Data/RevisionStorage.php
1 file changed, 3 insertions(+), 0 deletions(-)

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



diff --git a/includes/Data/RevisionStorage.php 
b/includes/Data/RevisionStorage.php
index 7fd0bd7..af0555e 100644
--- a/includes/Data/RevisionStorage.php
+++ b/includes/Data/RevisionStorage.php
@@ -18,6 +18,9 @@
'rev_mod_user_text',
'rev_mod_timestamp',
'rev_mod_reason',
+   'tree_orig_user_text',
+   'rev_user_text',
+   'rev_edit_user_text',
);
protected $externalStores;
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I6007b944917ce54f21fb403c1abb061162fd896d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: Bsitu 
Gerrit-Reviewer: EBernhardson 
Gerrit-Reviewer: jenkins-bot

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

[MediaWiki-commits] [Gerrit] Refactor extensions out of common module - change (wikimedia...crm)

2014-01-08 Thread Katie Horn (Code Review) 
Katie Horn has submitted this change and it was merged.

Change subject: Refactor extensions out of common module
..


Refactor extensions out of common module

Deployment:
* Stop everything
* drush rr
* drush cc all
* Restart stuff

Change-Id: I3e2156c735b58e6b90464e91ec458406da62e6b7
---
R sites/all/modules/wmf_civicrm/WmfTransaction.php
R sites/all/modules/wmf_civicrm/bootstrap.inc
R sites/all/modules/wmf_civicrm/civicrm_api_check.inc
R sites/all/modules/wmf_civicrm/db_switcher.inc
R sites/all/modules/wmf_civicrm/recurring.inc
R sites/all/modules/wmf_civicrm/scripts/find_refunds.drush.inc
R sites/all/modules/wmf_civicrm/scripts/resettle.drush.inc
R sites/all/modules/wmf_civicrm/tests/Refund.test
R sites/all/modules/wmf_civicrm/tracking.inc
R sites/all/modules/wmf_civicrm/wmf_civicrm.info
R sites/all/modules/wmf_civicrm/wmf_civicrm.install
R sites/all/modules/wmf_civicrm/wmf_civicrm.module
M sites/all/modules/wmf_common/wmf_common.info
R sites/all/modules/wmf_communication/Job.php
R sites/all/modules/wmf_communication/Mailer.php
R sites/all/modules/wmf_communication/MailingTemplate.php
R sites/all/modules/wmf_communication/Recipient.php
R sites/all/modules/wmf_communication/Templating.php
R sites/all/modules/wmf_communication/Translation.php
R sites/all/modules/wmf_communication/tests/Job.test
R sites/all/modules/wmf_communication/tests/TestThankyouTemplate.php
R sites/all/modules/wmf_communication/tests/templates/html/thank_you.it.html
R 
sites/all/modules/wmf_communication/tests/templates/subject/thank_you.it.subject
R sites/all/modules/wmf_communication/tests/templates/txt/thank_you.it.txt
R sites/all/modules/wmf_communication/tests/wmf_communication_tests.info
R sites/all/modules/wmf_communication/tests/wmf_communication_tests.module
R sites/all/modules/wmf_communication/wmf_communication.drush.inc
R sites/all/modules/wmf_communication/wmf_communication.info
R sites/all/modules/wmf_communication/wmf_communication.install
R sites/all/modules/wmf_communication/wmf_communication.module
R sites/all/modules/wmf_logging/wmf_logging.info
R sites/all/modules/wmf_logging/wmf_logging.module
32 files changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/sites/all/modules/wmf_common/WmfTransaction.php 
b/sites/all/modules/wmf_civicrm/WmfTransaction.php
similarity index 100%
rename from sites/all/modules/wmf_common/WmfTransaction.php
rename to sites/all/modules/wmf_civicrm/WmfTransaction.php
diff --git a/sites/all/modules/wmf_common/wmf_civicrm/bootstrap.inc 
b/sites/all/modules/wmf_civicrm/bootstrap.inc
similarity index 100%
rename from sites/all/modules/wmf_common/wmf_civicrm/bootstrap.inc
rename to sites/all/modules/wmf_civicrm/bootstrap.inc
diff --git a/sites/all/modules/wmf_common/wmf_civicrm/civicrm_api_check.inc 
b/sites/all/modules/wmf_civicrm/civicrm_api_check.inc
similarity index 100%
rename from sites/all/modules/wmf_common/wmf_civicrm/civicrm_api_check.inc
rename to sites/all/modules/wmf_civicrm/civicrm_api_check.inc
diff --git a/sites/all/modules/wmf_common/wmf_civicrm/db_switcher.inc 
b/sites/all/modules/wmf_civicrm/db_switcher.inc
similarity index 100%
rename from sites/all/modules/wmf_common/wmf_civicrm/db_switcher.inc
rename to sites/all/modules/wmf_civicrm/db_switcher.inc
diff --git a/sites/all/modules/wmf_common/wmf_civicrm/recurring.inc 
b/sites/all/modules/wmf_civicrm/recurring.inc
similarity index 100%
rename from sites/all/modules/wmf_common/wmf_civicrm/recurring.inc
rename to sites/all/modules/wmf_civicrm/recurring.inc
diff --git 
a/sites/all/modules/wmf_common/wmf_civicrm/scripts/find_refunds.drush.inc 
b/sites/all/modules/wmf_civicrm/scripts/find_refunds.drush.inc
similarity index 100%
rename from 
sites/all/modules/wmf_common/wmf_civicrm/scripts/find_refunds.drush.inc
rename to sites/all/modules/wmf_civicrm/scripts/find_refunds.drush.inc
diff --git 
a/sites/all/modules/wmf_common/wmf_civicrm/scripts/resettle.drush.inc 
b/sites/all/modules/wmf_civicrm/scripts/resettle.drush.inc
similarity index 100%
rename from sites/all/modules/wmf_common/wmf_civicrm/scripts/resettle.drush.inc
rename to sites/all/modules/wmf_civicrm/scripts/resettle.drush.inc
diff --git a/sites/all/modules/wmf_common/wmf_civicrm/tests/Refund.test 
b/sites/all/modules/wmf_civicrm/tests/Refund.test
similarity index 100%
rename from sites/all/modules/wmf_common/wmf_civicrm/tests/Refund.test
rename to sites/all/modules/wmf_civicrm/tests/Refund.test
diff --git a/sites/all/modules/wmf_common/wmf_civicrm/tracking.inc 
b/sites/all/modules/wmf_civicrm/tracking.inc
similarity index 100%
rename from sites/all/modules/wmf_common/wmf_civicrm/tracking.inc
rename to sites/all/modules/wmf_civicrm/tracking.inc
diff --git a/sites/all/modules/wmf_common/wmf_civicrm/wmf_civicrm.info 
b/sites/all/modules/wmf_civicrm/wmf_civicrm.info
similarity index 90%
rename from sites/all/modules/wmf_

[MediaWiki-commits] [Gerrit] repool db1041 - change (operations/mediawiki-config)

2014-01-08 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged.

Change subject: repool db1041
..


repool db1041

Change-Id: I3d178e0ede9d9198bef1d516b086974dc72af0db
---
M wmf-config/db-eqiad.php
1 file changed, 7 insertions(+), 7 deletions(-)

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



diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php
index 1c0744d..8f7b159 100644
--- a/wmf-config/db-eqiad.php
+++ b/wmf-config/db-eqiad.php
@@ -133,7 +133,7 @@
's7' => array(
'db1039' => 0,
'db1007' => 0, # snapshot, vslow
-   //'db1041' => 50, # contributions, logpager
+   'db1041' => 50, # contributions, logpager
'db1024' => 400,
'db1028' => 400,
),
@@ -210,12 +210,12 @@
'vslow' => array(
'db1007' => 1,
),
-// 'contributions' => array(
-// 'db1041' => 1,
-// ),
-// 'logpager' => array(
-// 'db1041' => 1,
-// ),
+   'contributions' => array(
+   'db1041' => 1,
+   ),
+   'logpager' => array(
+   'db1041' => 1,
+   ),
),
 ),
 

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

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

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

[MediaWiki-commits] [Gerrit] repool db1041 - change (operations/mediawiki-config)

2014-01-08 Thread Springle (Code Review) 
Springle has uploaded a new change for review.

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


Change subject: repool db1041
..

repool db1041

Change-Id: I3d178e0ede9d9198bef1d516b086974dc72af0db
---
M wmf-config/db-eqiad.php
1 file changed, 7 insertions(+), 7 deletions(-)


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

diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php
index 1c0744d..8f7b159 100644
--- a/wmf-config/db-eqiad.php
+++ b/wmf-config/db-eqiad.php
@@ -133,7 +133,7 @@
's7' => array(
'db1039' => 0,
'db1007' => 0, # snapshot, vslow
-   //'db1041' => 50, # contributions, logpager
+   'db1041' => 50, # contributions, logpager
'db1024' => 400,
'db1028' => 400,
),
@@ -210,12 +210,12 @@
'vslow' => array(
'db1007' => 1,
),
-// 'contributions' => array(
-// 'db1041' => 1,
-// ),
-// 'logpager' => array(
-// 'db1041' => 1,
-// ),
+   'contributions' => array(
+   'db1041' => 1,
+   ),
+   'logpager' => array(
+   'db1041' => 1,
+   ),
),
 ),
 

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

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

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

[MediaWiki-commits] [Gerrit] Cache requested workflows in UrlGenerator - change (mediawiki...Flow)

2014-01-08 Thread EBernhardson (Code Review) 
EBernhardson has uploaded a new change for review.

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


Change subject: Cache requested workflows in UrlGenerator
..

Cache requested workflows in UrlGenerator

UrlGenerator often is requested to create multiple
urls for the same workflow.  Cache the loaded workflows
instead of requesting them each and every time.

Change-Id: Id2f8dfce05fa7798934832ba94cb75edc151a2dc
---
M includes/UrlGenerator.php
1 file changed, 25 insertions(+), 5 deletions(-)


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

diff --git a/includes/UrlGenerator.php b/includes/UrlGenerator.php
index c7011e1..91ce957 100644
--- a/includes/UrlGenerator.php
+++ b/includes/UrlGenerator.php
@@ -9,6 +9,21 @@
 use Flow\Exception\InvalidInputException;
 
 class UrlGenerator {
+   /**
+* @var OccupationController
+*/
+   protected $occupationController;
+
+   /**
+* @var ObjectManager Workflow storage
+*/
+   protected $storage;
+
+   /**
+* @var array Cached array of already loaded workflows
+*/
+   protected $workflows = array();
+
public function __construct( ObjectManager $workflowStorage, 
OccupationController $occupationController ) {
$this->occupationController = $occupationController;
$this->storage = $workflowStorage;
@@ -87,7 +102,7 @@
if ( !$revision->isTopicTitle() ) {
$data['topic[postId]'] = 
$revision->getPostId()->getHex();
}
-   
+
if ( $specificRevision ) {
$data['topic[revId]'] = 
$revision->getRevisionId()->getHex();
}
@@ -109,11 +124,16 @@
 */
public function generateUrlData( $workflow, $action = 'view', array 
$query = array() ) {
if ( ! $workflow instanceof Workflow ) {
-   $workflowId = $workflow;
// Only way to know what title the workflow points at
-   $workflow = $this->storage->get( $workflowId );
-   if ( !$workflow ) {
-   throw new InvalidInputException( 'Invalid 
workflow: ' . $workflowId, 'invalid-workflow' );
+   $workflowId = $workflow;
+   if ( isset( $this->workflows[$workflowId->getHex()] ) ) 
{
+   $workflow = 
$this->workflows[$workflowId->getHex()];
+   } else {
+   $workflow = $this->storage->get( $workflowId );
+   if ( !$workflow ) {
+   throw new InvalidInputException( 
'Invalid workflow: ' . $workflowId, 'invalid-workflow' );
+   }
+   $this->workflows[$workflowId->getHex()] = 
$workflow;
}
}
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id2f8dfce05fa7798934832ba94cb75edc151a2dc
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: EBernhardson 

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

[MediaWiki-commits] [Gerrit] (FR #1279) Preserve message headers when rejecting and reque... - change (wikimedia...crm)

2014-01-08 Thread Adamw (Code Review) 
Adamw has uploaded a new change for review.

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


Change subject: (FR #1279) Preserve message headers when rejecting and requeuing
..

(FR #1279) Preserve message headers when rejecting and requeuing

Change-Id: I6cb4e69342498ca9a33cbecc23791318892ac4c9
---
M sites/all/modules/wmf_common/wmf_common.module
1 file changed, 7 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/74/106474/1

diff --git a/sites/all/modules/wmf_common/wmf_common.module 
b/sites/all/modules/wmf_common/wmf_common.module
index 1a62060..7d75cfb 100644
--- a/sites/all/modules/wmf_common/wmf_common.module
+++ b/sites/all/modules/wmf_common/wmf_common.module
@@ -322,9 +322,9 @@
 
   switch ( $form_state['values']['op'] ) {
   case $form_state['values']['resend']:
-$q->enqueue( json_encode( $body ), $headers, $queue );
-
 $msg = $q->getByAnyId( "{$queue}-damaged", $correlationId );
+$q->enqueue( json_encode( $body ), $headers + $msg->headers, $queue );
+
 $q->ack( $msg );
 
 drupal_set_message( t( 'Message %id resent for processing.', array( '%id' 
=> $correlationId ) ) );
@@ -352,5 +352,9 @@
   $name = mime_header_encode( "{$correlationId}.json" );
   drupal_add_http_header( 'Content-Type', 'application/json' );
   drupal_add_http_header( 'Content-Disposition', "attachment; 
filename=\"{$name}\"" );
-  echo( $msg->body );
+  $data = json_encode( array(
+'headers' => $msg->headers,
+'body' => json_decode( $msg->body, true ),
+  ) );
+  echo( $data );
 }

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

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

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

[MediaWiki-commits] [Gerrit] Load images normally - change (mediawiki...MultimediaViewer)

2014-01-08 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged.

Change subject: Load images normally
..


Load images normally

Removes the spinner, loads images line-by-line. Supposedly more
expected for most users.

Change-Id: Ia5fba4c8d8af681c0a95e43d34014b07e33941c4
---
M MultimediaViewer.php
M resources/ext.multimediaViewer/ext.multimediaViewer.css
M resources/ext.multimediaViewer/ext.multimediaViewer.js
M resources/ext.multimediaViewer/ext.multimediaViewer.lightboxinterface.js
M resources/multilightbox/lightboximage.js
M resources/multilightbox/lightboxinterface.js
M tests/qunit/ext.multimediaViewer.test.js
7 files changed, 65 insertions(+), 45 deletions(-)

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



diff --git a/MultimediaViewer.php b/MultimediaViewer.php
index 5050d42..6df2b66 100644
--- a/MultimediaViewer.php
+++ b/MultimediaViewer.php
@@ -101,7 +101,6 @@
'ext.multimediaViewer.lightboximage',
'mediawiki.Title',
'jquery.ui.dialog',
-   'jquery.spinner',
'jquery.hidpi',
),
 
diff --git a/resources/ext.multimediaViewer/ext.multimediaViewer.css 
b/resources/ext.multimediaViewer/ext.multimediaViewer.css
index db8c7b9..3aac386 100644
--- a/resources/ext.multimediaViewer/ext.multimediaViewer.css
+++ b/resources/ext.multimediaViewer/ext.multimediaViewer.css
@@ -278,15 +278,6 @@
width: 50%;
 }
 
-.mlb-image .mw-spinner {
-   margin-left: auto;
-   margin-right: auto;
-}
-
-.mlb-image.empty .mw-spinner {
-   display: block;
-}
-
 .mlb-image.empty img {
display: none;
 }
@@ -361,4 +352,4 @@
 
 .mlb-post-image:hover .mw-mlb-drag-icon {
opacity: 1;
-}
\ No newline at end of file
+}
diff --git a/resources/ext.multimediaViewer/ext.multimediaViewer.js 
b/resources/ext.multimediaViewer/ext.multimediaViewer.js
index 3e4508a..c11fa3c 100755
--- a/resources/ext.multimediaViewer/ext.multimediaViewer.js
+++ b/resources/ext.multimediaViewer/ext.multimediaViewer.js
@@ -327,32 +327,22 @@
 *
 * @protected
 *
-* @param {mw.LightboxInterface} ui lightbox that got resized
-* @param {Object} data information regarding the new resized image
+* @param {LightboxInterface} ui lightbox that got resized
+* @param {Object} imageInfo information regarding the new resized image
 * @param {number} targetWidth
 */
-   MMVP.loadResizedImage = function ( ui, data, targetWidth ) {
-   var imageInfo, innerInfo, rpid, viewer, image;
+   MMVP.loadResizedImage = function ( ui, imageInfo, targetWidth ) {
+   var innerInfo, rpid, viewer, image;
 
// Replace image only if data was returned.
-   if ( data && data.query && data.query.pages ) {
+   if ( imageInfo ) {
viewer = this;
image = new Image();
-
-   $.each( data.query.pages, function ( i, page ) {
-   imageInfo = page;
-   return false;
-   } );
 
innerInfo = imageInfo.imageinfo[0];
 
image.onload = function () {
-   if ( image.width > targetWidth ) {
-   image.width = targetWidth;
-   }
viewer.profileEnd( rpid );
-   ui.replaceImageWith( image );
-   this.updateControls();
};
 
rpid = this.profileStart( 'image-resize', {
@@ -362,6 +352,11 @@
}, innerInfo.mime );
 
image.src = innerInfo.thumburl || innerInfo.url;
+   if ( innerInfo.thumbwidth > targetWidth ) {
+   image.width = targetWidth;
+   }
+   ui.replaceImageWith( image );
+   this.updateControls();
}
};
 
@@ -677,16 +672,12 @@
// Avoids trying to load /wiki/Undefined and doesn't
// cost any network time - the library currently needs
// some src attribute to work. Will fix.
-   image.src = initialSrc;
+   image.initialSrc = initialSrc;
this.currentImageFilename = 
image.filePageTitle.getPrefixedText();
this.currentImageFileTitle = image.filePageTitle;
this.lightbox.iface.comingFromPopstate = comingFromPopstate;
this.lightbox.open();
$( document.body ).addClass( 'mw-mlb-lightbox-open' );
-   this.lightbox.iface.$imageDiv.append( $.createSpinner( {
-   id: 'mw-mlb-loading-spinner',
-   size:

[MediaWiki-commits] [Gerrit] Add styling for fancycaptcha refresh link - change (mediawiki...MobileFrontend)

2014-01-08 Thread Theopolisme (Code Review) 
Theopolisme has uploaded a new change for review.

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


Change subject: Add styling for fancycaptcha refresh link
..

Add styling for fancycaptcha refresh link

Bug: 51482
Change-Id: Iaa02fe9e942df29c6a8881614185029d444ddfa2
---
M includes/skins/UserAccountCreateMobileTemplate.php
A less/specials/images/login/refresh.png
A less/specials/images/login/refresh.svg
M less/specials/userlogin.less
4 files changed, 33 insertions(+), 1 deletion(-)


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

diff --git a/includes/skins/UserAccountCreateMobileTemplate.php 
b/includes/skins/UserAccountCreateMobileTemplate.php
index 0c1ecf0..5c2c17c 100644
--- a/includes/skins/UserAccountCreateMobileTemplate.php
+++ b/includes/skins/UserAccountCreateMobileTemplate.php
@@ -123,13 +123,15 @@
$output->addModuleStyles( 
'ext.confirmEdit.fancyCaptcha.styles' );
$output->addModules( 
'ext.confirmEdit.fancyCaptchaMobile' );
$captchaReload = Html::element( 'br' ) .
+   Html::openElement( 'div', array( 'id' 
=> 'mf-captcha-reload-container' ) ) .
Html::element(
'span',
array(
'class' => 
'confirmedit-captcha-reload fancycaptcha-reload'
),
wfMessage( 
'fancycaptcha-reload-text' )->text()
-   );
+   ) .
+   Html::closeElement( 'div' ); 
#mf-captcha-reload-container
}
}
else {
diff --git a/less/specials/images/login/refresh.png 
b/less/specials/images/login/refresh.png
new file mode 100644
index 000..8dc3b67
--- /dev/null
+++ b/less/specials/images/login/refresh.png
Binary files differ
diff --git a/less/specials/images/login/refresh.svg 
b/less/specials/images/login/refresh.svg
new file mode 100644
index 000..bcd024f
--- /dev/null
+++ b/less/specials/images/login/refresh.svg
@@ -0,0 +1,10 @@
+
+
+http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd";>
+http://www.w3.org/2000/svg"; 
xmlns:xlink="http://www.w3.org/1999/xlink"; x="0px" y="0px"
+width="40px" height="40px" viewBox="0 0 40 40" enable-background="new 
0 0 40 40" xml:space="preserve">
+
+
diff --git a/less/specials/userlogin.less b/less/specials/userlogin.less
index 9ef6724..0b57dbc 100644
--- a/less/specials/userlogin.less
+++ b/less/specials/userlogin.less
@@ -49,3 +49,23 @@
text-align: center;
}
 }
+
+/* fancycaptcha reload button */
+#mf-captcha-reload-container {
+   border-top: 1px dashed #e1e1e1;
+   display: inline-block;
+   padding: 14px 25%;
+
+   .fancycaptcha-reload {
+   color: #787878;
+   font-weight: bold;
+   background-image: url(images/login/refresh.png);
+   background-repeat: no-repeat;
+   background-size: 24px;
+   padding: 4px 0px 4px 26px;
+   }
+
+   .fancycaptcha-reload-loading {
+   background-image: @ajaxLoadingImage;
+   }
+}

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

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

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

[MediaWiki-commits] [Gerrit] (FR #1280) Store queue message source metadata fields in Civi - change (wikimedia...crm)

2014-01-08 Thread Adamw (Code Review) 
Adamw has uploaded a new change for review.

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


Change subject: (FR #1280) Store queue message source metadata fields in Civi
..

(FR #1280) Store queue message source metadata fields in Civi

Change-Id: I1a6fd85ba876376a452dd8f012283e4aa3b269d5
---
M sites/all/modules/queue2civicrm/queue2civicrm.module
M sites/all/modules/wmf_common/wmf_civicrm/wmf_civicrm.module
2 files changed, 49 insertions(+), 30 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/72/106472/1

diff --git a/sites/all/modules/queue2civicrm/queue2civicrm.module 
b/sites/all/modules/queue2civicrm/queue2civicrm.module
index 3aead0c..454abe0 100644
--- a/sites/all/modules/queue2civicrm/queue2civicrm.module
+++ b/sites/all/modules/queue2civicrm/queue2civicrm.module
@@ -214,14 +214,24 @@
 
 /**
  * Process one contribution from the queue to CiviCRM.
+ *
+ * @param Stomp_Frame $msg
  */
-function queue2civicrm_import( $msg ) {
+function queue2civicrm_import( Stomp_Frame $msg ) {
 // save the original message for logging
 $msg_orig = $msg;
 
-if (!is_array($msg)) {
-$msg = json_decode($msg->body, true);
-}
+// Take valuable message headers and flatten them into the message body
+$pull_headers = array(
+'source_name',
+'source_type',
+'source_host',
+'source_run_id',
+'source_version',
+'source_enqueued_time',
+);
+$msg = json_decode( $msg->body, true )
++ array_intersect_key( $msg->headers, array_flip( $pull_headers ) );
 
 /**
 * prepare data for logging
@@ -229,7 +239,7 @@
 $log = array(
 'gateway' => $msg[ 'gateway' ],
 'gateway_txn_id' => $msg[ 'gateway_txn_id' ],
-'data' => ( is_array( $msg_orig ) ? json_encode( $msg_orig ) : 
$msg_orig->body ),
+'data' => $msg_orig->body,
 'timestamp' => time(),
 'verified' => 0,
 );
diff --git a/sites/all/modules/wmf_common/wmf_civicrm/wmf_civicrm.module 
b/sites/all/modules/wmf_common/wmf_civicrm/wmf_civicrm.module
index e2b2c3d..91c1e3e 100644
--- a/sites/all/modules/wmf_common/wmf_civicrm/wmf_civicrm.module
+++ b/sites/all/modules/wmf_common/wmf_civicrm/wmf_civicrm.module
@@ -290,39 +290,48 @@
 }
   
 /**
-*  Apply custom field defaults.
-*
 *  Hopefully the Civi API will eventually handle custom fields in the
 *  above "Create" call.
 *
-* At the moment, all custom fields get default values for online 
contribution EXCEPT for 'Donor Comment'.
-*
 * NOTE: the custom field for "Gift_Information" indicates that check 
number is stored here.  It is not.
 */
-
-$comment = ( isset( $msg[ 'comment' ] ) ) ? $msg[ 'comment'] : '';
-$lettercode = ( $msg[ 'letter_code' ] ) ? $msg[ 'letter_code'] : NULL;
-$gateway_account = array_key_exists( 'gateway_account', $msg ) ? $msg[ 
'gateway_account' ] : '';
-
-// n.b. Data field names are legacy, and do not necessarily match the 
labels.
-$custom_vars = array(
-'Contribution_Comments' => $comment,
-'Gift_Data' => $lettercode,
-'gateway_account' => $gateway_account,
+$custom_field_defaults = array(
+'Contribution_Comments' => '',
+'Gift_Data' => NULL,
+'gateway_account' => '',
 );
-if ( array_key_exists( 'gift_source', $msg ) ) {
-$custom_vars['Campaign'] = $msg['gift_source'];
-}
-if ( array_key_exists( 'direct_mail_appeal', $msg ) ) {
-$custom_vars['Appeal'] = $msg['direct_mail_appeal'];
-}
-if ( array_key_exists( 'restrictions', $msg ) ) {
-$custom_vars['Fund'] = $msg['restrictions'];
-}
-if ( array_key_exists( 'import_batch_number', $msg ) ) {
-$custom_vars['import_batch_number'] = $msg['import_batch_number'];
+
+// Legacy field names which do not match the message field names
+$custom_name_mangle = array(
+'comment' => 'Contribution_Comments',
+'direct_mail_appeal' => 'Appeal',
+'gift_source' => 'Campaign',
+'letter_code' => 'Gift_Data',
+'restrictions' => 'Fund',
+);
+
+// Custom fields with names that match the message fields
+$custom_name_passthrough = array(
+'gateway_account',
+'import_batch_number',
+'source_name',
+'source_type',
+'source_host',
+'source_run_id',
+'source_version',
+'source_enqueued_time',
+);
+
+$custom_fields = $custom_name_mangle
++ array_combine( $custom_name_passthrough, $custom_name_passthrough );
+
+foreach ( $custom_fields as $msg_key => $custom_key ) {
+if ( array_key_exists( $msg_key, $msg ) ) {
+$custom_vars[$custom_key] = $msg[$msg_key];
+}
 }
 
+$custom_vars += $custom_field_defaults;
 wmf_civicrm_set_custom_field_values( $contribution_result[ 'id' ], 
$custom_va

[MediaWiki-commits] [Gerrit] Revert "Update Collection to master tip" - change (mediawiki/core)

2014-01-08 Thread MaxSem (Code Review) 
MaxSem has submitted this change and it was merged.

Change subject: Revert "Update Collection to master tip"
..


Revert "Update Collection to master tip"

This reverts commit 9ad249f6834e34577a73dafa8cf7429f1e7eccd8.

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

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



diff --git a/extensions/Collection b/extensions/Collection
index ae8991c..488d8da 16
--- a/extensions/Collection
+++ b/extensions/Collection
-Subproject commit ae8991c5076688767879fc7e6c0f94971ac37b95
+Subproject commit 488d8daad500f4d9e9b400b6568ba170b54b0a70

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I2ba2ee39eb9dd642c4d55fdf3070d168a1d391b0
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.23wmf9
Gerrit-Owner: MaxSem 
Gerrit-Reviewer: MaxSem 

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

[MediaWiki-commits] [Gerrit] WIP: Update parsoid puppet config to use new repository - change (operations/puppet)

2014-01-08 Thread Subramanya Sastry (Code Review) 
Subramanya Sastry has uploaded a new change for review.

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


Change subject: WIP: Update parsoid puppet config to use new repository
..

WIP: Update parsoid puppet config to use new repository

* Eliminated init.d script and used upstart script
  - shared script with betalabs that hashar created

* Switched parsoid repo to mediawiki/services/parsoid/deploy
  and added service-restart to use upstart config.

* Bunch of related changes and updates.

Change-Id: Ic8de01920b44a01090fa4297f2f5a6b9879654b8
---
M files/misc/parsoid
D files/misc/parsoid.init
M files/misc/parsoid.upstart
M manifests/role/deployment.pp
M manifests/role/parsoid.pp
M modules/deployment/files/modules/parsoid.py
6 files changed, 54 insertions(+), 105 deletions(-)


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

diff --git a/files/misc/parsoid b/files/misc/parsoid
index 0e0b2e3..5ef2630 100644
--- a/files/misc/parsoid
+++ b/files/misc/parsoid
@@ -5,12 +5,16 @@
 ### puppet:///files/misc/parsoid
 #
 
+# SSS FIXME: Who/what uses this script? Can this be deleted?
+# And, /var/lib/parsoid/Parsoid also seems incorrect since
+# it should be /srv/deployment/parsoid/Parsoid?
+
 # Script to start Parsoid
 
 (
-   cd /var/lib/parsoid/Parsoid/js/lib
-   export NODE_PATH=/var/lib/parsoid/Parsoid/js/lib/node_modules
-   sudo -E -u parsoid nohup node /var/lib/parsoid/Parsoid/js/api/server.js 
> /var/lib/parsoid/nohup.out 2>&1 &
+   cd /var/lib/parsoid/Parsoid/src/lib
+   export NODE_PATH=/var/lib/parsoid/Parsoid/node_modules
+   sudo -E -u parsoid nohup node 
/var/lib/parsoid/Parsoid/src/api/server.js > /var/lib/parsoid/nohup.out 2>&1 &
PARSOIDPID=$!
echo $PARSOIDPID > /var/run/parsoid.pid
wait $PARSOIDPID
diff --git a/files/misc/parsoid.init b/files/misc/parsoid.init
deleted file mode 100644
index a50ab1e..000
--- a/files/misc/parsoid.init
+++ /dev/null
@@ -1,77 +0,0 @@
-#! /bin/sh
-
-#
-### THIS FILE IS MANAGED BY PUPPET
-### puppet:///files/misc/parsoid.init
-#
-
-### BEGIN INIT INFO
-# Provides:  parsoid
-# Required-Start:$network $named $remote_fs $syslog
-# Required-Stop: $network $named $remote_fs $syslog
-# Should-Start:  parsoid
-# Default-Start: 2 3 4 5
-# Default-Stop:  0 1 6
-### END INIT INFO
-
-PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
-DAEMON=/usr/bin/parsoid
-NAME=parsoid
-DESC=parsoid
-PIDFILE="/var/run/${NAME}.pid"
-
-test -x $DAEMON || exit 0
-
-. /lib/lsb/init-functions
-
-reload_parsoid() {
-   # SIGHUP isn't supported by the Parsoid server yet, but this should be 
easy to implement
-   # See 
https://groups.google.com/forum/?fromgroups#!topic/nodejs/3e-eo0y9ZLI
-   start-stop-daemon --stop --quiet --signal HUP --pidfile $PIDFILE
-}
-
-start_parsoid() {
-   start-stop-daemon --start --quiet --pidfile $PIDFILE --startas $DAEMON 
-- $NAME
-}
-
-stop_parsoid() {
-   start-stop-daemon --stop --quiet --oknodo --pidfile $PIDFILE
-   # Stuck workers don't always restart properly, so kill them hard
-   pkill -9 -f Parsoid/js/api/server.js
-}
-
-status_parsoid() {
-   status_of_proc -p "${PIDFILE}" "${DAEMON}" "${NAME}"
-}
-
-case "$1" in
-start)
-   log_begin_msg "Starting $DESC"
-   start_parsoid
-   log_end_msg $?
-   ;;
-stop)
-   log_begin_msg "Stopping $DESC"
-   stop_parsoid
-   log_end_msg $?
-   ;;
-reload)
-   log_begin_msg "Reloading $DESC"
-   reload_parsoid
-   log_end_msg $?
-   ;;
-status)
-   status_parsoid
-   ;;
-restart|force-reload)
-   log_begin_msg "Restarting $DESC"
-   stop_parsoid
-   sleep 1
-   start_parsoid
-   log_end_msg $?
-   ;;
-  *)
-   echo "Usage: $0 {start|stop|status|restart|force-reload|reload}" >&2
-   exit 1
-   ;;
-esac
diff --git a/files/misc/parsoid.upstart b/files/misc/parsoid.upstart
index 060efd8..d950f3a 100644
--- a/files/misc/parsoid.upstart
+++ b/files/misc/parsoid.upstart
@@ -20,9 +20,11 @@
 
 # Basic build in default, would be overridden by whatever
 # is defined in the DEFAULTFILE defined above
+# These settings are based on checking out the
+# mediawiki/services/parsoid/deploy repo
 env VCAP_APP_PORT="8000"
-env NODE_PATH="/var/lib/parsoid/Parsoid/js/node_modules"
-env PARSOID_BASE_PATH="/var/lib/parsoid/Parsoid"
+env NODE_PATH="/var/lib/parsoid/Parsoid/node_modules"
+env PARSOID_BASE_PATH="/var/lib/parsoid/Parsoid/src"
 
 respawn
 
diff --git a/manifests/role/deployment.pp b/manifests/role/deployment.pp
index 6d32a44..31c8bc4 100644
--- a/manifests/role/deployment.pp
+++ b/manifests/role/deployment

[MediaWiki-commits] [Gerrit] WIP: Story 1522: Table of contents - change (mediawiki...MobileFrontend)

2014-01-08 Thread Jdlrobson (Code Review) 
Jdlrobson has uploaded a new change for review.

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


Change subject: WIP: Story 1522: Table of contents
..

WIP: Story 1522: Table of contents

TODO: merge HeadingLink with Section
TODO: Initialise a page with a Page object
TODO: Create TableOfContents based on Page object
TODO: Styling

Change-Id: Ieabe8f7071696cde6afbdc6df853aacdb741a4a3
---
M includes/Resources.php
M javascripts/common/View.js
M javascripts/common/application.js
A javascripts/modules/toc/toc.js
M javascripts/modules/toggling/toggle.js
A less/modules/toc/images/contents.png
A less/modules/toc/images/contents.svg
A less/modules/toc/toc.less
M less/tablet/common.less
A templates/modules/toc/toc.html
A templates/modules/toc/tocheading.html
11 files changed, 185 insertions(+), 10 deletions(-)


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

diff --git a/includes/Resources.php b/includes/Resources.php
index 63fff9d..3009b0e 100644
--- a/includes/Resources.php
+++ b/includes/Resources.php
@@ -139,6 +139,29 @@
),
),
 
+   'mobile.toc' => $wgMFMobileResourceBoilerplate + array(
+   'dependencies' => array(
+   'mobile.startup',
+   'mobile.templates',
+   ),
+   'scripts' => array(
+   'javascripts/modules/toc/toc.js',
+   ),
+   'styles' => array(
+   'less/modules/toc/toc.less',
+   ),
+   'templates' => array(
+   'modules/toc/toc',
+   'modules/toc/tocheading'
+   ),
+   ),
+
+   'tablet.scripts' => $wgMFMobileResourceBoilerplate + array(
+   'dependencies' => array(
+   'mobile.toc',
+   ),
+   ),
+
'mobile.styles.beta' => $wgMFMobileResourceBoilerplate + array(
'styles' => array(
'less/common/uiNew.less',
@@ -194,8 +217,8 @@
'javascripts/common/OverlayManager.js',
'javascripts/common/api.js',
'javascripts/common/PageApi.js',
-   'javascripts/common/application.js',
'javascripts/common/View.js',
+   'javascripts/common/application.js',
'javascripts/common/settings.js',
),
'position' => 'bottom',
diff --git a/javascripts/common/View.js b/javascripts/common/View.js
index 4a432ea..eb8b84b 100644
--- a/javascripts/common/View.js
+++ b/javascripts/common/View.js
@@ -155,6 +155,8 @@
};
} );
 
+   // FIXME: Deprecate view
M.define( 'view', View );
+   M.define( 'View', View );
 
 }( mw.mobileFrontend, jQuery ) );
diff --git a/javascripts/common/application.js 
b/javascripts/common/application.js
index 8ca0a71..fd7963d 100644
--- a/javascripts/common/application.js
+++ b/javascripts/common/application.js
@@ -100,15 +100,18 @@
}
 
/**
-* Tests current window size and if suitable loads styles specific for 
larger devices
+* Tests current window size and if suitable loads styles and scripts 
specific for larger devices
 *
-* @name M.loadWideScreenStyles
+* @name M.loadWideScreenModules
 * @function
 */
-   function loadWideScreenStyles() {
+   function loadWideScreenModules() {
if ( isWideScreen() ) {
// Adjust screen for tablets
-   mw.loader.using( 'tablet.styles' );
+   mw.loader.using( [
+   'tablet.styles',
+   'tablet.scripts'
+   ] );
}
}
 
@@ -235,8 +238,8 @@
if ( supportsTouchEvents() ) {
$doc.addClass( 'touch-events' );
}
-   loadWideScreenStyles();
-   $( window ).on( 'resize', loadWideScreenStyles );
+   $( loadWideScreenModules );
+   $( window ).on( 'resize', loadWideScreenModules );
}
 
/**
diff --git a/javascripts/modules/toc/toc.js b/javascripts/modules/toc/toc.js
new file mode 100644
index 000..483b768
--- /dev/null
+++ b/javascripts/modules/toc/toc.js
@@ -0,0 +1,49 @@
+( function( M, $ ) {
+var View = M.require( 'View' ), TableOfContents, HeadingLink,
+   toggle = M.require( 'toggle' );
+
+HeadingLink = View.extend( {
+   link: '#foo',
+   text: 'Heading',
+   subheadings: [],
+   initialize: function( options ) {
+   this._super( options );
+   this.children = options.children;
+   this.text = options.text;
+   this.link = options.link;
+   }
+} );
+
+T

[MediaWiki-commits] [Gerrit] Update EventLogging to master - change (mediawiki/core)

2014-01-08 Thread Ori.livneh (Code Review) 
Ori.livneh has submitted this change and it was merged.

Change subject: Update EventLogging to master
..


Update EventLogging to master

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

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



diff --git a/extensions/EventLogging b/extensions/EventLogging
index 36cd7fb..ff9c437 16
--- a/extensions/EventLogging
+++ b/extensions/EventLogging
-Subproject commit 36cd7fbd9f763f369fb3d7ae503ef4c9133f99bf
+Subproject commit ff9c4379ed71271dd457170fabaf07d02f28e778

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ibb87d6014cca4cc759d90b764b0a1c032e075728
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.23wmf8
Gerrit-Owner: Ori.livneh 
Gerrit-Reviewer: Ori.livneh 
Gerrit-Reviewer: jenkins-bot

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

[MediaWiki-commits] [Gerrit] Made use of proper backend-fail-store message - change (mediawiki/core)

2014-01-08 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged.

Change subject: Made use of proper backend-fail-store message
..


Made use of proper backend-fail-store message

Change-Id: I89d275926530b16f5660863608b89541d72c9f33
---
M includes/filebackend/SwiftFileBackend.php
1 file changed, 2 insertions(+), 2 deletions(-)

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



diff --git a/includes/filebackend/SwiftFileBackend.php 
b/includes/filebackend/SwiftFileBackend.php
index 1480662..8790f05 100644
--- a/includes/filebackend/SwiftFileBackend.php
+++ b/includes/filebackend/SwiftFileBackend.php
@@ -262,7 +262,7 @@
$sha1Hash = sha1_file( $params['src'] );
wfRestoreWarnings();
if ( $sha1Hash === false ) { // source doesn't exist?
-   $status->fatal( 'backend-fail-copy', $params['src'], 
$params['dst'] );
+   $status->fatal( 'backend-fail-store', $params['src'], 
$params['dst'] );
 
return $status;
}
@@ -271,7 +271,7 @@
 
$handle = fopen( $params['src'], 'rb+' );
if ( $handle === false ) { // source doesn't exist?
-   $status->fatal( 'backend-fail-copy', $params['src'], 
$params['dst'] );
+   $status->fatal( 'backend-fail-store', $params['src'], 
$params['dst'] );
 
return $status;
}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I89d275926530b16f5660863608b89541d72c9f33
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz 
Gerrit-Reviewer: BryanDavis 
Gerrit-Reviewer: jenkins-bot

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

[MediaWiki-commits] [Gerrit] DUPs should be dropped, not rejected - change (wikimedia...crm)

2014-01-08 Thread Adamw (Code Review) 
Adamw has uploaded a new change for review.

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


Change subject: DUPs should be dropped, not rejected
..

DUPs should be dropped, not rejected

Change-Id: I633b41c42a794ff2a76b7fe395d9f097cc65
---
M sites/all/modules/wmf_common/Queue.php
M sites/all/modules/wmf_common/WmfException.php
2 files changed, 10 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/68/106468/1

diff --git a/sites/all/modules/wmf_common/Queue.php 
b/sites/all/modules/wmf_common/Queue.php
index ba21e8b..dac6f65 100644
--- a/sites/all/modules/wmf_common/Queue.php
+++ b/sites/all/modules/wmf_common/Queue.php
@@ -91,7 +91,10 @@
 }
 }
 
-if ( $ex->isRejectMessage() ) {
+if ( $ex->isDropMessage() ) {
+watchdog( 'wmf_common', "Dropping message altogether: " . 
Queue::getCorrelationId( $msg ), NULL, WATCHDOG_ERROR );
+$this->ack( $msg );
+} elseif ( $ex->isRejectMessage() ) {
 watchdog( 'wmf_common', "\nRemoving failed message from 
the queue: \n" . print_r($msg, TRUE), NULL, WATCHDOG_ERROR );
 $this->reject( $msg, $ex );
 
diff --git a/sites/all/modules/wmf_common/WmfException.php 
b/sites/all/modules/wmf_common/WmfException.php
index de53bcb..9713bf5 100644
--- a/sites/all/modules/wmf_common/WmfException.php
+++ b/sites/all/modules/wmf_common/WmfException.php
@@ -29,7 +29,7 @@
 'reject' => TRUE,
 ),
 'DUPLICATE_CONTRIBUTION' => array(
-'reject' => TRUE,
+'drop' => TRUE,
 'no-email' => TRUE,
 ),
 'GET_CONTRIBUTION' => array(
@@ -107,6 +107,11 @@
 return $this->getErrorCharacteristic('reject', FALSE);
 }
 
+function isDropMessage()
+{
+return $this->getErrorCharacteristic('drop', FALSE);
+}
+
 function isRequeue()
 {
 return $this->getErrorCharacteristic('requeue', FALSE);

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

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

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

[MediaWiki-commits] [Gerrit] Fixed minor unit test dir leakage - change (mediawiki/core)

2014-01-08 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged.

Change subject: Fixed minor unit test dir leakage
..


Fixed minor unit test dir leakage

Change-Id: I78cf483dde5078d4fad4e1738d8bb8a8f634e3b1
---
M tests/phpunit/includes/filebackend/FileBackendTest.php
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/tests/phpunit/includes/filebackend/FileBackendTest.php 
b/tests/phpunit/includes/filebackend/FileBackendTest.php
index c48fdc9..f5e6568 100644
--- a/tests/phpunit/includes/filebackend/FileBackendTest.php
+++ b/tests/phpunit/includes/filebackend/FileBackendTest.php
@@ -2345,7 +2345,7 @@
unlink( $file );
}
}
-   $containers = array( 'unittest-cont1', 'unittest-cont2' );
+   $containers = array( 'unittest-cont1', 'unittest-cont2', 
'unittest-cont-bad' );
foreach ( $containers as $container ) {
$this->deleteFiles( $container );
}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I78cf483dde5078d4fad4e1738d8bb8a8f634e3b1
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz 
Gerrit-Reviewer: BryanDavis 
Gerrit-Reviewer: jenkins-bot

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

[MediaWiki-commits] [Gerrit] Revert "Update Collection to master tip" - change (mediawiki/core)

2014-01-08 Thread MaxSem (Code Review) 
MaxSem has submitted this change and it was merged.

Change subject: Revert "Update Collection to master tip"
..


Revert "Update Collection to master tip"

This reverts commit 7b8f52cc62f4f32818514f308eecf97e0d4d380f.

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

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



diff --git a/extensions/Collection b/extensions/Collection
index ae8991c..488d8da 16
--- a/extensions/Collection
+++ b/extensions/Collection
-Subproject commit ae8991c5076688767879fc7e6c0f94971ac37b95
+Subproject commit 488d8daad500f4d9e9b400b6568ba170b54b0a70

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I71bfb8ddc821554957d0af73fedcde7d4e49d9af
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.23wmf8
Gerrit-Owner: MaxSem 
Gerrit-Reviewer: MaxSem 

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

[MediaWiki-commits] [Gerrit] Utilize Post::getRootPost instead of TreeRepository - change (mediawiki...Flow)

2014-01-08 Thread EBernhardson (Code Review) 
EBernhardson has uploaded a new change for review.

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


Change subject: Utilize Post::getRootPost instead of TreeRepository
..

Utilize Post::getRootPost instead of TreeRepository

The addition of Post::getRootPost allows to not use
TreeRepository in a few instances.

Change-Id: I5a432a9c461ef0bcec8f78894edbd7cd31a1e042
---
M includes/Data/RecentChanges.php
M includes/Log/PostModerationLogger.php
M includes/Model/PostRevision.php
M includes/View/History/HistoryRenderer.php
4 files changed, 12 insertions(+), 30 deletions(-)


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

diff --git a/includes/Data/RecentChanges.php b/includes/Data/RecentChanges.php
index 5c43ee2..8b86223 100644
--- a/includes/Data/RecentChanges.php
+++ b/includes/Data/RecentChanges.php
@@ -158,12 +158,8 @@
}
 
public function onAfterInsert( $object, array $row ) {
-   // There might be a more efficient way to get this workflow id
-   $workflowId = $this->tree->findRoot( $object->getPostId() );
-   if ( !$workflowId ) {
-   wfWarn( __METHOD__ . ": could not locate root for post 
" . $object->getPostId()->getHex() );
-   return;
-   }
+   // The workflow id is the same as the root's post id
+   $workflowId = $object->getRootPost()->getPostId();
// These are likely already in the in-process cache
$workflow = $this->storage->get( 'Workflow', $workflowId );
if ( !$workflow ) {
@@ -187,23 +183,7 @@
}
 
protected function getTopicTitle( PostRevision $rev ) {
-   if ( $rev->isTopicTitle() ) {
-   return $rev->getContent( 'wikitext' );
-   }
-   $topicTitleId = $this->tree->findRoot( $rev->getPostId() );
-   if ( $topicTitleId === null ) {
-   return null;
-   }
-   $found = $this->storage->find(
-   'PostRevision',
-   array( 'tree_rev_descendant_id' => $topicTitleId ),
-   array( 'sort' => 'rev_id', 'order' => 'DESC', 'limit' 
=> 1 )
-   );
-   if ( !$found ) {
-   return null;
-   }
-
-   $content = reset( $found )->getContent( 'wikitext' );
+   $content = $rev->getRootPost()->getContent( 'wikitext' );
if ( is_object( $content ) ) {
// moderated
return null;
diff --git a/includes/Log/PostModerationLogger.php 
b/includes/Log/PostModerationLogger.php
index 29ffc89..4a56234 100644
--- a/includes/Log/PostModerationLogger.php
+++ b/includes/Log/PostModerationLogger.php
@@ -23,9 +23,8 @@
}
 
if ( $this->logger->canLog( $object, $object->getChangeType() ) 
) {
-   // This is awful but it's all I can think of
-   $rootPost = $this->treeRepo->findRoot( 
$object->getPostId() );
-   $workflow = $this->storage->get( 'Workflow', $rootPost 
);
+   $rootPostId = $object->getRootPost()->getPostId();
+   $workflow = $this->storage->get( 'Workflow', 
$rootPostId );
$logParams = array();
 
if ( $object->isTopicTitle() ) {
@@ -74,4 +73,4 @@
 
return $changeTypes;
}
-}
\ No newline at end of file
+}
diff --git a/includes/Model/PostRevision.php b/includes/Model/PostRevision.php
index 401cae9..3285172 100644
--- a/includes/Model/PostRevision.php
+++ b/includes/Model/PostRevision.php
@@ -170,9 +170,12 @@
}
 
public function getRootPost() {
-   if ( $this->rootPost === null ) {
-   throw new DataModelException( 'Depth not loaded for 
post: ' . $this->postId->getHex(), 'process-data' );
+   if ( $this->isTopicTitle() ) {
+   return $this;
+   } elseif ( $this->rootPost === null ) {
+   throw new DataModelException( 'Root not loaded for 
post: ' . $this->postId->getHex(), 'process-data' );
}
+
return $this->rootPost;
}
 
diff --git a/includes/View/History/HistoryRenderer.php 
b/includes/View/History/HistoryRenderer.php
index c4b0804..b1a677e 100644
--- a/includes/View/History/HistoryRenderer.php
+++ b/includes/View/History/HistoryRenderer.php
@@ -156,7 +156,7 @@
// Board history
} else {
if ( $revision->getRevisionType() === 'post' ) {
-   $workFlowId = \Flow\Container::get( 
'repository.tree' )->findRoot( $revision->getPostId() );
+

[MediaWiki-commits] [Gerrit] Update Collection to master tip - change (mediawiki/core)

2014-01-08 Thread MaxSem (Code Review) 
MaxSem has submitted this change and it was merged.

Change subject: Update Collection to master tip
..


Update Collection to master tip

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

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



diff --git a/extensions/Collection b/extensions/Collection
index 488d8da..ae8991c 16
--- a/extensions/Collection
+++ b/extensions/Collection
-Subproject commit 488d8daad500f4d9e9b400b6568ba170b54b0a70
+Subproject commit ae8991c5076688767879fc7e6c0f94971ac37b95

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I6fd75825699485c65a22e8470bf1a632336d1fae
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.23wmf8
Gerrit-Owner: MaxSem 
Gerrit-Reviewer: MaxSem 
Gerrit-Reviewer: jenkins-bot

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

[MediaWiki-commits] [Gerrit] Disable wgMaxBacklinksInvalidate now that throttling is used - change (operations/mediawiki-config)

2014-01-08 Thread Aaron Schulz (Code Review) 
Aaron Schulz has uploaded a new change for review.

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


Change subject: Disable wgMaxBacklinksInvalidate now that throttling is used
..

Disable wgMaxBacklinksInvalidate now that throttling is used

Change-Id: I3c2d755bf976915c0d07b6994a2a342cafc39944
---
M docroot/bits/WikipediaMobileFirefoxOS
M wmf-config/CommonSettings.php
2 files changed, 1 insertion(+), 2 deletions(-)


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

diff --git a/docroot/bits/WikipediaMobileFirefoxOS 
b/docroot/bits/WikipediaMobileFirefoxOS
index f12b7b2..696e0d1 16
--- a/docroot/bits/WikipediaMobileFirefoxOS
+++ b/docroot/bits/WikipediaMobileFirefoxOS
-Subproject commit f12b7b2122797c0602c10a1f902955998143f3e4
+Subproject commit 696e0d1ca17c5e2d953503c7b36feb440e29cd94
diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index 91adb0b..5137edb 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -2189,10 +2189,9 @@
require_once( "$IP/extensions/RandomRootPage/Randomrootpage.php" );
 }
 
-# Avoid excessive drops in squid hit rates
-$wgMaxBacklinksInvalidate = 20;
 # Similar to above but not for single template/file changes
 $wgJobBackoffThrottling = array(
+   # Avoid excessive CPU due to cache misses from rapid invalidations
'htmlCacheUpdate' => 10 // 10 pages/sec per runner
 );
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I3c2d755bf976915c0d07b6994a2a342cafc39944
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
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 Collection to master tip - change (mediawiki/core)

2014-01-08 Thread MaxSem (Code Review) 
MaxSem has submitted this change and it was merged.

Change subject: Update Collection to master tip
..


Update Collection to master tip

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

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



diff --git a/extensions/Collection b/extensions/Collection
index 488d8da..ae8991c 16
--- a/extensions/Collection
+++ b/extensions/Collection
-Subproject commit 488d8daad500f4d9e9b400b6568ba170b54b0a70
+Subproject commit ae8991c5076688767879fc7e6c0f94971ac37b95

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I01a242c99ece7cf09278b4076c6d5f54dfb70139
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.23wmf9
Gerrit-Owner: MaxSem 
Gerrit-Reviewer: MaxSem 
Gerrit-Reviewer: jenkins-bot

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

[MediaWiki-commits] [Gerrit] Enable beta mobile diff on testwiki - change (operations/mediawiki-config)

2014-01-08 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged.

Change subject: Enable beta mobile diff on testwiki
..


Enable beta mobile diff on testwiki

Change-Id: Ie7112a6c1701cfeedc96050ecb123da820b9bf73
---
M wmf-config/InitialiseSettings-labs.php
M wmf-config/InitialiseSettings.php
M wmf-config/mobile-labs.php
M wmf-config/mobile.php
4 files changed, 8 insertions(+), 2 deletions(-)

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



diff --git a/wmf-config/InitialiseSettings-labs.php 
b/wmf-config/InitialiseSettings-labs.php
index 5e53c80..fce99a6 100644
--- a/wmf-config/InitialiseSettings-labs.php
+++ b/wmf-config/InitialiseSettings-labs.php
@@ -232,6 +232,9 @@
'wmgMFUseCentralAuthToken' => array(
'default' => true,
),
+   'wmgMFEnableBetaDiff' => array(
+   'default' => true,
+   ),
 
'wmgEnableGeoData' => array(
'default' => true,
diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index 1b5de7c..fa07290 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -11275,6 +11275,10 @@
 'wmgMFEnablePhotoUploadCTA' => array(
'default' => false,
 ),
+'wmgMFEnableBetaDiff' => array(
+   'default' => false,
+   'testwiki' => true,
+),
 
 'wgExtraGenderNamespaces' => array(
'default' => array(),
diff --git a/wmf-config/mobile-labs.php b/wmf-config/mobile-labs.php
index b4d6b41..abe786d 100644
--- a/wmf-config/mobile-labs.php
+++ b/wmf-config/mobile-labs.php
@@ -14,5 +14,3 @@
 
 // Keep Going experiments
 $wgMFKeepGoing = true;
-
-$wgMFEnableBetaDiff = true;
diff --git a/wmf-config/mobile.php b/wmf-config/mobile.php
index c311a89..67ebfd1 100644
--- a/wmf-config/mobile.php
+++ b/wmf-config/mobile.php
@@ -88,4 +88,5 @@
 
$wgMFEnableSiteNotice = $wmgMFEnableSiteNotice;
$wgMFEnablePhotoUploadCTA = $wmgMFEnablePhotoUploadCTA;
+   $wgMFEnableBetaDiff = $wmgMFEnableBetaDiff;
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie7112a6c1701cfeedc96050ecb123da820b9bf73
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: MaxSem 
Gerrit-Reviewer: MaxSem 
Gerrit-Reviewer: jenkins-bot

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

[MediaWiki-commits] [Gerrit] Temporarily add obsolete columns to $allowUpateColumns - change (mediawiki...Flow)

2014-01-08 Thread Bsitu (Code Review) 
Bsitu has uploaded a new change for review.

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


Change subject: Temporarily add obsolete columns to $allowUpateColumns
..

Temporarily add obsolete columns to $allowUpateColumns

They should be removed once these obsolete columns are removed from database

Change-Id: I6007b944917ce54f21fb403c1abb061162fd896d
---
M includes/Data/RevisionStorage.php
1 file changed, 3 insertions(+), 0 deletions(-)


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

diff --git a/includes/Data/RevisionStorage.php 
b/includes/Data/RevisionStorage.php
index 7fd0bd7..af0555e 100644
--- a/includes/Data/RevisionStorage.php
+++ b/includes/Data/RevisionStorage.php
@@ -18,6 +18,9 @@
'rev_mod_user_text',
'rev_mod_timestamp',
'rev_mod_reason',
+   'tree_orig_user_text',
+   'rev_user_text',
+   'rev_edit_user_text',
);
protected $externalStores;
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6007b944917ce54f21fb403c1abb061162fd896d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: Bsitu 

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

[MediaWiki-commits] [Gerrit] Fix MultimediaViewer EventLogging code - change (mediawiki/core)

2014-01-08 Thread MarkTraceur (Code Review) 
MarkTraceur has submitted this change and it was merged.

Change subject: Fix MultimediaViewer EventLogging code
..


Fix MultimediaViewer EventLogging code

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

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



diff --git a/extensions/MultimediaViewer b/extensions/MultimediaViewer
index 3cd213a..5e084ac 16
--- a/extensions/MultimediaViewer
+++ b/extensions/MultimediaViewer
-Subproject commit 3cd213a0729b04d3e206275938443c4575520fd6
+Subproject commit 5e084ac1e56fb203c96044bd6ecaff9a321fb4f7

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I02340f4ac430e6bdeaf1d3eba412b4554484b37f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.23wmf9
Gerrit-Owner: MarkTraceur 
Gerrit-Reviewer: MarkTraceur 
Gerrit-Reviewer: jenkins-bot

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

[MediaWiki-commits] [Gerrit] Fix MultimediaViewer EventLogging code - change (mediawiki/core)

2014-01-08 Thread MarkTraceur (Code Review) 
MarkTraceur has uploaded a new change for review.

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


Change subject: Fix MultimediaViewer EventLogging code
..

Fix MultimediaViewer EventLogging code

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


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/63/106463/1

diff --git a/extensions/MultimediaViewer b/extensions/MultimediaViewer
index 3cd213a..5e084ac 16
--- a/extensions/MultimediaViewer
+++ b/extensions/MultimediaViewer
-Subproject commit 3cd213a0729b04d3e206275938443c4575520fd6
+Subproject commit 5e084ac1e56fb203c96044bd6ecaff9a321fb4f7

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I02340f4ac430e6bdeaf1d3eba412b4554484b37f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.23wmf9
Gerrit-Owner: MarkTraceur 

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

[MediaWiki-commits] [Gerrit] Fix MultimediaViewer EventLogging code - change (mediawiki/core)

2014-01-08 Thread MarkTraceur (Code Review) 
MarkTraceur has submitted this change and it was merged.

Change subject: Fix MultimediaViewer EventLogging code
..


Fix MultimediaViewer EventLogging code

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

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



diff --git a/extensions/MultimediaViewer b/extensions/MultimediaViewer
index 7e6f546..9d3c09c 16
--- a/extensions/MultimediaViewer
+++ b/extensions/MultimediaViewer
-Subproject commit 7e6f5462a928ac0f4800572829ab53805a67645e
+Subproject commit 9d3c09c02f98250507d9e110d9aaf3bf8286dbd7

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Id7cbde0bde80bfde5fb10c4964ddcfb8317dd18e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.23wmf8
Gerrit-Owner: MarkTraceur 
Gerrit-Reviewer: MarkTraceur 
Gerrit-Reviewer: jenkins-bot

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

[MediaWiki-commits] [Gerrit] Fix MultimediaViewer EventLogging code - change (mediawiki/core)

2014-01-08 Thread MarkTraceur (Code Review) 
MarkTraceur has uploaded a new change for review.

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


Change subject: Fix MultimediaViewer EventLogging code
..

Fix MultimediaViewer EventLogging code

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


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/62/106462/1

diff --git a/extensions/MultimediaViewer b/extensions/MultimediaViewer
index 7e6f546..9d3c09c 16
--- a/extensions/MultimediaViewer
+++ b/extensions/MultimediaViewer
-Subproject commit 7e6f5462a928ac0f4800572829ab53805a67645e
+Subproject commit 9d3c09c02f98250507d9e110d9aaf3bf8286dbd7

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id7cbde0bde80bfde5fb10c4964ddcfb8317dd18e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.23wmf8
Gerrit-Owner: MarkTraceur 

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

[MediaWiki-commits] [Gerrit] Fixed minor unit test dir leakage - change (mediawiki/core)

2014-01-08 Thread Aaron Schulz (Code Review) 
Aaron Schulz has uploaded a new change for review.

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


Change subject: Fixed minor unit test dir leakage
..

Fixed minor unit test dir leakage

Change-Id: I78cf483dde5078d4fad4e1738d8bb8a8f634e3b1
---
M tests/phpunit/includes/filebackend/FileBackendTest.php
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/61/106461/1

diff --git a/tests/phpunit/includes/filebackend/FileBackendTest.php 
b/tests/phpunit/includes/filebackend/FileBackendTest.php
index c48fdc9..f5e6568 100644
--- a/tests/phpunit/includes/filebackend/FileBackendTest.php
+++ b/tests/phpunit/includes/filebackend/FileBackendTest.php
@@ -2345,7 +2345,7 @@
unlink( $file );
}
}
-   $containers = array( 'unittest-cont1', 'unittest-cont2' );
+   $containers = array( 'unittest-cont1', 'unittest-cont2', 
'unittest-cont-bad' );
foreach ( $containers as $container ) {
$this->deleteFiles( $container );
}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I78cf483dde5078d4fad4e1738d8bb8a8f634e3b1
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] Add missing i18n for search region - change (wikimedia/wikimania-scholarships)

2014-01-08 Thread BryanDavis (Code Review) 
BryanDavis has uploaded a new change for review.

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


Change subject: Add missing i18n for search region
..

Add missing i18n for search region

Bug: 59844
Change-Id: Ia41fdf3984f46abbe4d9183cbee49572c2cc4721
---
M data/i18n/en.json
M data/i18n/qqq.json
M data/templates/review/search.html
3 files changed, 7 insertions(+), 5 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/wikimania-scholarships 
refs/changes/60/106460/1

diff --git a/data/i18n/en.json b/data/i18n/en.json
index 4ba4ac0..95e4761 100644
--- a/data/i18n/en.json
+++ b/data/i18n/en.json
@@ -246,5 +246,6 @@
"no-results": "No results found",
 
"csrf-heading": "Invalid request",
-   "csrf-message": "The request that was submitted was missing the request 
forgery protection token. Please return to the form, reload the page and try 
again."
+   "csrf-message": "The request that was submitted was missing the request 
forgery protection token. Please return to the form, reload the page and try 
again.",
+   "search-region": "Geographic region:"
 }
diff --git a/data/i18n/qqq.json b/data/i18n/qqq.json
index 858e23e..b2f0b94 100644
--- a/data/i18n/qqq.json
+++ b/data/i18n/qqq.json
@@ -211,5 +211,6 @@
 "page-of-pages": "Paginated report page indicator. Parameters:\n* $1 - 
current page number\n* $2 - total page count",
 "no-results": "Content for report with no results",
 "csrf-heading": "Header for cross site request forgery (CSRF) error page",
-"csrf-message": "Cross site request forgery (CSRF) error page body"
-}
\ No newline at end of file
+"csrf-message": "Cross site request forgery (CSRF) error page body",
+"search-region": "Input label, followed by text box",
+}
diff --git a/data/templates/review/search.html 
b/data/templates/review/search.html
index 6b5f255..c4522d9 100644
--- a/data/templates/review/search.html
+++ b/data/templates/review/search.html
@@ -23,8 +23,8 @@
 
   
   
-{{ wgLang.message( 'form-region' ) 
}}
-
+{{ wgLang.message( 'search-region' ) 
}}
+
   
   
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia41fdf3984f46abbe4d9183cbee49572c2cc4721
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/wikimania-scholarships
Gerrit-Branch: master
Gerrit-Owner: BryanDavis 
Gerrit-Reviewer: jenkins-bot

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

[MediaWiki-commits] [Gerrit] Don't use bogus nonefm format - change (mediawiki...ApiSandbox)

2014-01-08 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged.

Change subject: Don't use bogus nonefm format
..


Don't use bogus nonefm format

Bug: 57504
Change-Id: I3ecd8a0aea6908f6401430e889b1b9904cbbe672
---
M resources/main.js
1 file changed, 7 insertions(+), 3 deletions(-)

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



diff --git a/resources/main.js b/resources/main.js
index ee6555b..7600b33 100644
--- a/resources/main.js
+++ b/resources/main.js
@@ -550,7 +550,7 @@
} );
 
$form.submit( function ( e ) {
-   var url, params, mustBePosted, historyEntry;
+   var url, params, mustBePosted, historyEntry, formatStr;
 
// Prevent browser from submitting the form
// and reloading the page to the action-url.
@@ -568,7 +568,8 @@
url += '&' + $query.val();
params += queryRequest.getRequestData();
}
-   url += '&format=' + $format.val();
+   formatStr = $format.val();
+   url += '&format=' + formatStr;
 
params += genericRequest.getRequestData();
if ( $( '#param-generator' ).length && $( 
'#param-generator' ).val() ) {
@@ -594,7 +595,10 @@
$requestUrl.val( url + params );
$postRow.hide();
}
-   url = url.replace( /(&format=[^&]+)/, '$1fm' );
+   // There is no nonefm format
+   if ( formatStr !== 'none' ) {
+   url = url.replace( /(&format=[^&]+)/, '$1fm' );
+   }
runQuery( { url: url, params: params,
type: mustBePosted ? 'POST' : 'GET' } );
} );

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I3ecd8a0aea6908f6401430e889b1b9904cbbe672
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/ApiSandbox
Gerrit-Branch: master
Gerrit-Owner: MaxSem 
Gerrit-Reviewer: Awjrichards 
Gerrit-Reviewer: JGonera 
Gerrit-Reviewer: Jdlrobson 
Gerrit-Reviewer: Nikerabbit 
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 Collection to master tip - change (mediawiki/core)

2014-01-08 Thread MaxSem (Code Review) 
MaxSem has uploaded a new change for review.

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


Change subject: Update Collection to master tip
..

Update Collection to master tip

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


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/59/106459/1

diff --git a/extensions/Collection b/extensions/Collection
index 488d8da..ae8991c 16
--- a/extensions/Collection
+++ b/extensions/Collection
-Subproject commit 488d8daad500f4d9e9b400b6568ba170b54b0a70
+Subproject commit ae8991c5076688767879fc7e6c0f94971ac37b95

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I01a242c99ece7cf09278b4076c6d5f54dfb70139
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.23wmf9
Gerrit-Owner: MaxSem 

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

[MediaWiki-commits] [Gerrit] Remove Special:GettingStarted and notifications - change (mediawiki...GettingStarted)

2014-01-08 Thread Mattflaschen (Code Review) 
Mattflaschen has uploaded a new change for review.

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


Change subject: Remove Special:GettingStarted and notifications
..

Remove Special:GettingStarted and notifications

* Productize test version from OB6
* Remove almost all references to the special page
* Remove all Echo notifications
* Change GettingStarted to be officially an API extension
* Remove dead code and minor fm

Change-Id: Iab6b347c6e3b1810291e2f8206fc2534dc787d02
---
D GettingStarted.alias.php
M GettingStarted.i18n.php
M GettingStarted.php
M Hooks.php
M README
D SpecialGettingStarted.php
D resources/ext.gettingstarted.js
D resources/ext.gettingstarted.showSeparatePage.accountCreation.js
D resources/ext.gettingstarted.specialPage.js
M resources/ext.gettingstarted.taskToolbar.js
10 files changed, 13 insertions(+), 610 deletions(-)


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

diff --git a/GettingStarted.alias.php b/GettingStarted.alias.php
deleted file mode 100644
index f2e47d7..000
--- a/GettingStarted.alias.php
+++ /dev/null
@@ -1,115 +0,0 @@
- array( 'GettingStarted', 'Getting Started' ),
-);
-
-/** Arabic (العربية) */
-$specialPageAliases['ar'] = array(
-   'GettingStarted' => array( 'البدء' ),
-);
-
-/** German (Deutsch) */
-$specialPageAliases['de'] = array(
-   'GettingStarted' => array( 'Anfangen' ),
-);
-
-/** Zazaki (Zazaki) */
-$specialPageAliases['diq'] = array(
-   'GettingStarted' => array( 'ŞoSerterin' ),
-);
-
-/** Esperanto (Esperanto) */
-$specialPageAliases['eo'] = array(
-   'GettingStarted' => array( 'Komencado', 'Komencante' ),
-);
-
-/** Persian (فارسی) */
-$specialPageAliases['fa'] = array(
-   'GettingStarted' => array( 'شروع‌کردن' ),
-);
-
-/** Galician (galego) */
-$specialPageAliases['gl'] = array(
-   'GettingStarted' => array( 'Primeiros_pasos' ),
-);
-
-/** Hungarian (magyar) */
-$specialPageAliases['hu'] = array(
-   'GettingStarted' => array( 'Első_lépések' ),
-);
-
-/** Indonesian (Bahasa Indonesia) */
-$specialPageAliases['id'] = array(
-   'GettingStarted' => array( 'Mulai' ),
-);
-
-/** Korean (한국어) */
-$specialPageAliases['ko'] = array(
-   'GettingStarted' => array( '시작하기' ),
-);
-
-/** Luxembourgish (Lëtzebuergesch) */
-$specialPageAliases['lb'] = array(
-   'GettingStarted' => array( 'Fir_unzefänken' ),
-);
-
-/** Minangkabau (Baso Minangkabau) */
-$specialPageAliases['min'] = array(
-   'GettingStarted' => array( 'Mamulai' ),
-);
-
-/** Macedonian (македонски) */
-$specialPageAliases['mk'] = array(
-   'GettingStarted' => array( 'КакоДаПочнете' ),
-);
-
-/** Malayalam (മലയാളം) */
-$specialPageAliases['ml'] = array(
-   'GettingStarted' => array( 'തുടങ്ങുക' ),
-);
-
-/** Low Saxon (Netherlands) (Nedersaksies) */
-$specialPageAliases['nds-nl'] = array(
-   'GettingStarted' => array( 'An_de_slag' ),
-);
-
-/** Dutch (Nederlands) */
-$specialPageAliases['nl'] = array(
-   'GettingStarted' => array( 'AanDeSlag' ),
-);
-
-/** Norwegian Nynorsk (norsk nynorsk) */
-$specialPageAliases['nn'] = array(
-   'GettingStarted' => array( 'Kom_i_gang' ),
-);
-
-/** vèneto (vèneto) */
-$specialPageAliases['vec'] = array(
-   'GettingStarted' => array( 'ParScominsiar' ),
-);
-
-/** Vietnamese (Tiếng Việt) */
-$specialPageAliases['vi'] = array(
-   'GettingStarted' => array( 'Bắt_đầu' ),
-);
-
-/** Simplified Chinese (中文（简体）‎) */
-$specialPageAliases['zh-hans'] = array(
-   'GettingStarted' => array( '入门' ),
-);
-
-/** Traditional Chinese (中文（繁體）‎) */
-$specialPageAliases['zh-hant'] = array(
-   'GettingStarted' => array( '入門指南' ),
-);
\ No newline at end of file
diff --git a/GettingStarted.i18n.php b/GettingStarted.i18n.php
index 34337ef..9786c39 100644
--- a/GettingStarted.i18n.php
+++ b/GettingStarted.i18n.php
@@ -12,26 +12,13 @@
  */
 $messages['en'] = array(
'gettingstarted' => "Getting started",
-   'gettingstarted-desc' => 'Adds a [[Special:GettingStarted|welcome 
page]] for new users (shown after account creation)',
-   'gettingstarted-welcomesiteuser' => "Welcome to $1, $2!",
-   'gettingstarted-welcomesiteuseranon' => "Getting started",
-   'gettingstarted-welcome-back-site-user' => "Welcome back, $2",
-   'gettingstarted-task-header' => 'Thanks for joining {{SITENAME}}! Here 
are some ways you can get involved.
-
-Choose an option below, and you will see a random page that needs help.',
-   'gettingstarted-return' => "← No thanks, return to the page I was 
reading",
+   // TODO (mattflaschen, 2013-01-08): Placeholder
+   'gettingstarted-desc' => 'Helps new users become editors',
'gettingstarted-project-link' => '{{ns:Project}}:GettingStarted',
// Change tags
'tag-gettingstarted_edit' => 'new editor 
[[{{MediaWiki:gettingstarted-project-link}}|getting started]]',
+   // XXX (mattflaschen, 2013-

[MediaWiki-commits] [Gerrit] Made use of proper backend-fail-store message - change (mediawiki/core)

2014-01-08 Thread Aaron Schulz (Code Review) 
Aaron Schulz has uploaded a new change for review.

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


Change subject: Made use of proper backend-fail-store message
..

Made use of proper backend-fail-store message

Change-Id: I89d275926530b16f5660863608b89541d72c9f33
---
M includes/filebackend/SwiftFileBackend.php
1 file changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/57/106457/1

diff --git a/includes/filebackend/SwiftFileBackend.php 
b/includes/filebackend/SwiftFileBackend.php
index 1480662..8790f05 100644
--- a/includes/filebackend/SwiftFileBackend.php
+++ b/includes/filebackend/SwiftFileBackend.php
@@ -262,7 +262,7 @@
$sha1Hash = sha1_file( $params['src'] );
wfRestoreWarnings();
if ( $sha1Hash === false ) { // source doesn't exist?
-   $status->fatal( 'backend-fail-copy', $params['src'], 
$params['dst'] );
+   $status->fatal( 'backend-fail-store', $params['src'], 
$params['dst'] );
 
return $status;
}
@@ -271,7 +271,7 @@
 
$handle = fopen( $params['src'], 'rb+' );
if ( $handle === false ) { // source doesn't exist?
-   $status->fatal( 'backend-fail-copy', $params['src'], 
$params['dst'] );
+   $status->fatal( 'backend-fail-store', $params['src'], 
$params['dst'] );
 
return $status;
}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I89d275926530b16f5660863608b89541d72c9f33
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 Collection to master tip - change (mediawiki/core)

2014-01-08 Thread MaxSem (Code Review) 
MaxSem has uploaded a new change for review.

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


Change subject: Update Collection to master tip
..

Update Collection to master tip

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


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/56/106456/1

diff --git a/extensions/Collection b/extensions/Collection
index 488d8da..ae8991c 16
--- a/extensions/Collection
+++ b/extensions/Collection
-Subproject commit 488d8daad500f4d9e9b400b6568ba170b54b0a70
+Subproject commit ae8991c5076688767879fc7e6c0f94971ac37b95

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6fd75825699485c65a22e8470bf1a632336d1fae
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.23wmf8
Gerrit-Owner: MaxSem 

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

[MediaWiki-commits] [Gerrit] noc: remove ishmael & cleanup - change (operations/puppet)

2014-01-08 Thread Faidon Liambotis (Code Review) 
Faidon Liambotis has submitted this change and it was merged.

Change subject: noc: remove ishmael & cleanup
..


noc: remove ishmael & cleanup

ishmael has been moved into a module, a role class and a different box
(neon) for a while. Remove references to it from noc, and while at it,
remove a couple of other dangling references (graphite, Rails/Sinatra)
and some now-unused modules (LDAP, proxy, passenger).

Note that since the class is applied to just one box and for simplicity,
no ensure => absents are provided but these will be cleaned up manually.

Change-Id: I02dc96298b75c4aa7cf9e46cb006c21e11cdad60
---
M manifests/misc/noc.pp
D templates/apache/sites/ishmael.wikimedia.org.erb
2 files changed, 1 insertion(+), 50 deletions(-)

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



diff --git a/manifests/misc/noc.pp b/manifests/misc/noc.pp
index fde8e7e..e7f5f8f 100644
--- a/manifests/misc/noc.pp
+++ b/manifests/misc/noc.pp
@@ -3,12 +3,9 @@
 class misc::noc-wikimedia {
system::role { "misc::noc-wikimedia": description => 
"noc.wikimedia.org" }
 
-   package { [ "apache2", "libapache2-mod-php5", 
"libapache2-mod-passenger", "libsinatra-ruby", "rails" ]:
+   package { [ 'apache2', 'libapache2-mod-php5' ]:
ensure => latest;
}
-
-   include passwords::ldap::wmf_cluster
-   $proxypass = $passwords::ldap::wmf_cluster::proxypass
 
file {
"/etc/apache2/sites-available/noc.wikimedia.org":
@@ -18,12 +15,6 @@
owner => root,
group => root,
source => 
"puppet:///files/apache/sites/noc.wikimedia.org";
-   "/etc/apache2/sites-available/ishmael.wikimedia.org":
-   path => 
"/etc/apache2/sites-available/ishmael.wikimedia.org",
-   content => 
template('apache/sites/ishmael.wikimedia.org.erb'),
-   mode => 0440,
-   owner => root,
-   group => www-data;
"/usr/lib/cgi-bin":
source => "puppet:///files/cgi-bin/noc/",
recurse => true,
@@ -38,14 +29,9 @@
apache_module { php5: name => "php5" }
apache_module { userdir: name => "userdir" }
apache_module { cgi: name => "cgi" }
-   apache_module { ldap: name => "ldap" }
-   apache_module { authnz_ldap: name => "authnz_ldap" }
-   apache_module { proxy: name => "proxy" }
-   apache_module { proxy_http: name => "proxy_http" }
apache_module { ssl: name => "ssl" }
 
apache_site { noc: name => "noc.wikimedia.org" }
-   apache_site { graphiteproxy: name => "graphite.wikimedia.org" }
 
service { apache2:
require => [ Package[apache2], Apache_module[userdir], 
Apache_module[cgi], Apache_site[noc] ],
@@ -63,4 +49,3 @@
minute => "*";
}
 }
-
diff --git a/templates/apache/sites/ishmael.wikimedia.org.erb 
b/templates/apache/sites/ishmael.wikimedia.org.erb
deleted file mode 100644
index a770cc8..000
--- a/templates/apache/sites/ishmael.wikimedia.org.erb
+++ /dev/null
@@ -1,34 +0,0 @@
-# vim:ft=apache:
-
-   ServerName ishmael.wikimedia.org
-   Redirect / "https://ishmael.wikimedia.org/";
-
-
-
-   ServerName ishmael.wikimedia.org
-
-   SSLEngine on
-   SSLProtocol -ALL +SSLv3 +TLSv1
-   SSLCipherSuite 
AES128-GCM-SHA256:RC4-SHA:RC4-MD5:DES-CBC3-SHA:AES128-SHA:AES256-SHA
-   SSLHonorCipherOrder on
-   SSLCertificateFile /etc/ssl/certs/star.wikimedia.org.pem
-   SSLCertificateKeyFile /etc/ssl/private/star.wikimedia.org.key
-
-   
-   Order allow,deny
-   Allow from all
-
-   AuthName "WMF Labs (use wiki login name not shell)"
-   AuthType Basic
-   AuthBasicProvider ldap
-   AuthLDAPBindDN cn=proxyagent,ou=profile,dc=wikimedia,dc=org
-   AuthLDAPBindPassword <%= proxypass %>
-   AuthLDAPURL "ldap://virt0.wikimedia.org 
virt1000.wikimedia.org/ou=people,dc=wikimedia,dc=org?cn"
-   Require ldap-group cn=wmf,ou=groups,dc=wikimedia,dc=org
-   #Require valid-user
-
-   ProxyPass http://ishmael.pmtpa.wmnet/
-   ProxyPassReverse http://ishmael.pmtpa.wmnet/
-   
-
-

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

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

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

[MediaWiki-commits] [Gerrit] noc: remove ishmael & cleanup - change (operations/puppet)

2014-01-08 Thread Faidon Liambotis (Code Review) 
Faidon Liambotis has uploaded a new change for review.

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


Change subject: noc: remove ishmael & cleanup
..

noc: remove ishmael & cleanup

ishmael has been moved into a module, a role class and a different box
(neon) for a while. Remove references to it from noc, and while at it,
remove a couple of other dangling references (graphite, Rails/Sinatra)
and some now-unused modules (LDAP, proxy, passenger).

Note that since the class is applied to just one box and for simplicity,
no ensure => absents are provided but these will be cleaned up manually.

Change-Id: I02dc96298b75c4aa7cf9e46cb006c21e11cdad60
---
M manifests/misc/noc.pp
D templates/apache/sites/ishmael.wikimedia.org.erb
2 files changed, 1 insertion(+), 50 deletions(-)


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

diff --git a/manifests/misc/noc.pp b/manifests/misc/noc.pp
index fde8e7e..e7f5f8f 100644
--- a/manifests/misc/noc.pp
+++ b/manifests/misc/noc.pp
@@ -3,12 +3,9 @@
 class misc::noc-wikimedia {
system::role { "misc::noc-wikimedia": description => 
"noc.wikimedia.org" }
 
-   package { [ "apache2", "libapache2-mod-php5", 
"libapache2-mod-passenger", "libsinatra-ruby", "rails" ]:
+   package { [ 'apache2', 'libapache2-mod-php5' ]:
ensure => latest;
}
-
-   include passwords::ldap::wmf_cluster
-   $proxypass = $passwords::ldap::wmf_cluster::proxypass
 
file {
"/etc/apache2/sites-available/noc.wikimedia.org":
@@ -18,12 +15,6 @@
owner => root,
group => root,
source => 
"puppet:///files/apache/sites/noc.wikimedia.org";
-   "/etc/apache2/sites-available/ishmael.wikimedia.org":
-   path => 
"/etc/apache2/sites-available/ishmael.wikimedia.org",
-   content => 
template('apache/sites/ishmael.wikimedia.org.erb'),
-   mode => 0440,
-   owner => root,
-   group => www-data;
"/usr/lib/cgi-bin":
source => "puppet:///files/cgi-bin/noc/",
recurse => true,
@@ -38,14 +29,9 @@
apache_module { php5: name => "php5" }
apache_module { userdir: name => "userdir" }
apache_module { cgi: name => "cgi" }
-   apache_module { ldap: name => "ldap" }
-   apache_module { authnz_ldap: name => "authnz_ldap" }
-   apache_module { proxy: name => "proxy" }
-   apache_module { proxy_http: name => "proxy_http" }
apache_module { ssl: name => "ssl" }
 
apache_site { noc: name => "noc.wikimedia.org" }
-   apache_site { graphiteproxy: name => "graphite.wikimedia.org" }
 
service { apache2:
require => [ Package[apache2], Apache_module[userdir], 
Apache_module[cgi], Apache_site[noc] ],
@@ -63,4 +49,3 @@
minute => "*";
}
 }
-
diff --git a/templates/apache/sites/ishmael.wikimedia.org.erb 
b/templates/apache/sites/ishmael.wikimedia.org.erb
deleted file mode 100644
index a770cc8..000
--- a/templates/apache/sites/ishmael.wikimedia.org.erb
+++ /dev/null
@@ -1,34 +0,0 @@
-# vim:ft=apache:
-
-   ServerName ishmael.wikimedia.org
-   Redirect / "https://ishmael.wikimedia.org/";
-
-
-
-   ServerName ishmael.wikimedia.org
-
-   SSLEngine on
-   SSLProtocol -ALL +SSLv3 +TLSv1
-   SSLCipherSuite 
AES128-GCM-SHA256:RC4-SHA:RC4-MD5:DES-CBC3-SHA:AES128-SHA:AES256-SHA
-   SSLHonorCipherOrder on
-   SSLCertificateFile /etc/ssl/certs/star.wikimedia.org.pem
-   SSLCertificateKeyFile /etc/ssl/private/star.wikimedia.org.key
-
-   
-   Order allow,deny
-   Allow from all
-
-   AuthName "WMF Labs (use wiki login name not shell)"
-   AuthType Basic
-   AuthBasicProvider ldap
-   AuthLDAPBindDN cn=proxyagent,ou=profile,dc=wikimedia,dc=org
-   AuthLDAPBindPassword <%= proxypass %>
-   AuthLDAPURL "ldap://virt0.wikimedia.org 
virt1000.wikimedia.org/ou=people,dc=wikimedia,dc=org?cn"
-   Require ldap-group cn=wmf,ou=groups,dc=wikimedia,dc=org
-   #Require valid-user
-
-   ProxyPass http://ishmael.pmtpa.wmnet/
-   ProxyPassReverse http://ishmael.pmtpa.wmnet/
-   
-
-

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I02dc96298b75c4aa7cf9e46cb006c21e11cdad60
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon Liambotis 

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

[MediaWiki-commits] [Gerrit] Refactor extensions out of common module - change (wikimedia...crm)

2014-01-08 Thread Adamw (Code Review) 
Adamw has uploaded a new change for review.

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


Change subject: Refactor extensions out of common module
..

Refactor extensions out of common module

Change-Id: I3e2156c735b58e6b90464e91ec458406da62e6b7
---
R sites/all/modules/wmf_civicrm/WmfTransaction.php
R sites/all/modules/wmf_civicrm/bootstrap.inc
R sites/all/modules/wmf_civicrm/civicrm_api_check.inc
R sites/all/modules/wmf_civicrm/db_switcher.inc
R sites/all/modules/wmf_civicrm/recurring.inc
R sites/all/modules/wmf_civicrm/scripts/find_refunds.drush.inc
R sites/all/modules/wmf_civicrm/scripts/resettle.drush.inc
R sites/all/modules/wmf_civicrm/tests/Refund.test
R sites/all/modules/wmf_civicrm/tracking.inc
R sites/all/modules/wmf_civicrm/wmf_civicrm.info
R sites/all/modules/wmf_civicrm/wmf_civicrm.install
R sites/all/modules/wmf_civicrm/wmf_civicrm.module
M sites/all/modules/wmf_common/wmf_common.info
R sites/all/modules/wmf_communication/Job.php
R sites/all/modules/wmf_communication/Mailer.php
R sites/all/modules/wmf_communication/MailingTemplate.php
R sites/all/modules/wmf_communication/Recipient.php
R sites/all/modules/wmf_communication/Templating.php
R sites/all/modules/wmf_communication/Translation.php
R sites/all/modules/wmf_communication/tests/Job.test
R sites/all/modules/wmf_communication/tests/TestThankyouTemplate.php
R sites/all/modules/wmf_communication/tests/templates/html/thank_you.it.html
R 
sites/all/modules/wmf_communication/tests/templates/subject/thank_you.it.subject
R sites/all/modules/wmf_communication/tests/templates/txt/thank_you.it.txt
R sites/all/modules/wmf_communication/tests/wmf_communication_tests.info
R sites/all/modules/wmf_communication/tests/wmf_communication_tests.module
R sites/all/modules/wmf_communication/wmf_communication.drush.inc
R sites/all/modules/wmf_communication/wmf_communication.info
R sites/all/modules/wmf_communication/wmf_communication.install
R sites/all/modules/wmf_communication/wmf_communication.module
R sites/all/modules/wmf_logging/wmf_logging.info
R sites/all/modules/wmf_logging/wmf_logging.module
32 files changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/54/106454/1

diff --git a/sites/all/modules/wmf_common/WmfTransaction.php 
b/sites/all/modules/wmf_civicrm/WmfTransaction.php
similarity index 100%
rename from sites/all/modules/wmf_common/WmfTransaction.php
rename to sites/all/modules/wmf_civicrm/WmfTransaction.php
diff --git a/sites/all/modules/wmf_common/wmf_civicrm/bootstrap.inc 
b/sites/all/modules/wmf_civicrm/bootstrap.inc
similarity index 100%
rename from sites/all/modules/wmf_common/wmf_civicrm/bootstrap.inc
rename to sites/all/modules/wmf_civicrm/bootstrap.inc
diff --git a/sites/all/modules/wmf_common/wmf_civicrm/civicrm_api_check.inc 
b/sites/all/modules/wmf_civicrm/civicrm_api_check.inc
similarity index 100%
rename from sites/all/modules/wmf_common/wmf_civicrm/civicrm_api_check.inc
rename to sites/all/modules/wmf_civicrm/civicrm_api_check.inc
diff --git a/sites/all/modules/wmf_common/wmf_civicrm/db_switcher.inc 
b/sites/all/modules/wmf_civicrm/db_switcher.inc
similarity index 100%
rename from sites/all/modules/wmf_common/wmf_civicrm/db_switcher.inc
rename to sites/all/modules/wmf_civicrm/db_switcher.inc
diff --git a/sites/all/modules/wmf_common/wmf_civicrm/recurring.inc 
b/sites/all/modules/wmf_civicrm/recurring.inc
similarity index 100%
rename from sites/all/modules/wmf_common/wmf_civicrm/recurring.inc
rename to sites/all/modules/wmf_civicrm/recurring.inc
diff --git 
a/sites/all/modules/wmf_common/wmf_civicrm/scripts/find_refunds.drush.inc 
b/sites/all/modules/wmf_civicrm/scripts/find_refunds.drush.inc
similarity index 100%
rename from 
sites/all/modules/wmf_common/wmf_civicrm/scripts/find_refunds.drush.inc
rename to sites/all/modules/wmf_civicrm/scripts/find_refunds.drush.inc
diff --git 
a/sites/all/modules/wmf_common/wmf_civicrm/scripts/resettle.drush.inc 
b/sites/all/modules/wmf_civicrm/scripts/resettle.drush.inc
similarity index 100%
rename from sites/all/modules/wmf_common/wmf_civicrm/scripts/resettle.drush.inc
rename to sites/all/modules/wmf_civicrm/scripts/resettle.drush.inc
diff --git a/sites/all/modules/wmf_common/wmf_civicrm/tests/Refund.test 
b/sites/all/modules/wmf_civicrm/tests/Refund.test
similarity index 100%
rename from sites/all/modules/wmf_common/wmf_civicrm/tests/Refund.test
rename to sites/all/modules/wmf_civicrm/tests/Refund.test
diff --git a/sites/all/modules/wmf_common/wmf_civicrm/tracking.inc 
b/sites/all/modules/wmf_civicrm/tracking.inc
similarity index 100%
rename from sites/all/modules/wmf_common/wmf_civicrm/tracking.inc
rename to sites/all/modules/wmf_civicrm/tracking.inc
diff --git a/sites/all/modules/wmf_common/wmf_civicrm/wmf_civicrm.info 
b/sites/all/modules/wmf_civicrm/wmf_civicrm.info
similarity index 90%
rename from sites/all/modules/wmf_common/wmf_civicrm/wmf_civicrm.info

[MediaWiki-commits] [Gerrit] Check whether history.pushState is supported - change (mediawiki...ApiSandbox)

2014-01-08 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged.

Change subject: Check whether history.pushState is supported
..


Check whether history.pushState is supported

Bug: 45923
Change-Id: I0fa7313e0b2051b356703f9f0a5bb7bce2423f2f
---
M resources/main.js
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/resources/main.js b/resources/main.js
index 2b8b51a..ee6555b 100644
--- a/resources/main.js
+++ b/resources/main.js
@@ -577,7 +577,7 @@
 
historyEntry = '#' + url + params;
 
-   if ( window.location.hash !== historyEntry ) {
+   if ( window.location.hash !== historyEntry && history 
&& history.pushState ) {
history.pushState( null, '', historyEntry );
}
url = mw.util.wikiScript( 'api' ) + '?' + url;

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I0fa7313e0b2051b356703f9f0a5bb7bce2423f2f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ApiSandbox
Gerrit-Branch: master
Gerrit-Owner: MaxSem 
Gerrit-Reviewer: Awjrichards 
Gerrit-Reviewer: JGonera 
Gerrit-Reviewer: Jdlrobson 
Gerrit-Reviewer: Nikerabbit 
Gerrit-Reviewer: jenkins-bot

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

[MediaWiki-commits] [Gerrit] Split JS to several files for improved modularity - change (mediawiki...ApiSandbox)

2014-01-08 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged.

Change subject: Split JS to several files for improved modularity
..


Split JS to several files for improved modularity

Change-Id: I389cec418be72b3b021404abb7b0b530f71dd50f
---
M ApiSandbox.php
A resources/UiBuilder.js
A resources/apiSandbox.js
R resources/main.js
R resources/styles.css
5 files changed, 246 insertions(+), 228 deletions(-)

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



diff --git a/ApiSandbox.php b/ApiSandbox.php
index 9418788..93d5544 100644
--- a/ApiSandbox.php
+++ b/ApiSandbox.php
@@ -20,10 +20,14 @@
 $wgSpecialPageGroups['ApiSandbox'] = 'wiki';
 
 $wgResourceModules['ext.apiSandbox'] = array(
-   'scripts' => 'ext.apiSandbox.js',
-   'styles' => 'ext.apiSandbox.css',
-   'localBasePath' => __DIR__ . '/modules',
-   'remoteExtPath' => 'ApiSandbox/modules',
+   'scripts' => array(
+   'apiSandbox.js',
+   'UiBuilder.js',
+   'main.js',
+   ),
+   'styles' => 'styles.css',
+   'localBasePath' => __DIR__ . '/resources',
+   'remoteExtPath' => 'ApiSandbox/resources',
'messages' => array(
'apisb-loading',
'apisb-load-error',
diff --git a/resources/UiBuilder.js b/resources/UiBuilder.js
new file mode 100644
index 000..08d1ba0
--- /dev/null
+++ b/resources/UiBuilder.js
@@ -0,0 +1,209 @@
+/*global jQuery, mediaWiki, apiSandbox*/
+/*jslint regexp: true, browser: true, continue: true, sloppy: true, white: 
true, forin: true, plusplus: true */
+( function ( $, mw, apiSandbox, undefined ) {
+   /**
+* HTML-escapes and pretty-formats an API description string
+*
+* @param s {String} String to escape
+* @return {String}
+*/
+   var smartEscape = function( s ) {
+   if ( !s ) {
+   return ''; // @todo: fully verify paraminfo output
+   }
+   s = mw.html.escape( s );
+   if ( s.indexOf( '\n ' ) >= 0 ) {
+   // turns *-bulleted list into a HTML list
+   s = s.replace( /^(.*?)((?:\n\s+\*?[^\n]*)+)(.*?)$/m, 
'$1$2$3' ); // outer tags
+   s = s.replace( /\n\s+\*?([^\n]*)/g, '\n$1' ); 
//  around bulleted lines
+   }
+   s = s.replace( /\n(?!<)/, '\n' );
+   s = s.replace( /(?:https?:)?\/\/[^\s<>]+/g, function ( s ) {
+   // linkify URLs, input is already HTML-escaped above
+   return '' + s + '';
+   } );
+   return s;
+   };
+
+
+   /**
+* Class that creates inputs for a query and builds request data
+*
+* @constructor
+* @param $container {jQuery} Container to put UI into
+* @param info {Object} Query information
+* @param prefix {String} Additional prefix for parameter names
+*/
+   function UiBuilder( $container, info, prefix ) {
+   this.$container = $container;
+   this.info = info;
+   this.prefix = prefix + info.prefix;
+   this.params = info.parameters;
+
+   $container.addClass( 'api-sandbox-builder' ).data( 'builder', 
this );
+
+   this.createInputs();
+   }
+
+   UiBuilder.prototype = {
+   /**
+* Creates inputs and places them into container
+*/
+   createInputs: function () {
+   var $table, $tbody, i, length, param, name;
+
+   $table = $( '' )
+   .find( '> thead > tr' )
+   .append( mw.html.element( 'th', { 'class': 
'api-sandbox-params-label' }, mw.msg( 'apisb-params-param' ) ) )
+   .append( mw.html.element( 'th', { 'class': 
'api-sandbox-params-value' }, mw.msg( 'apisb-params-input' ) ) )
+   .append( mw.html.element( 'th', {}, mw.msg( 
'apisb-params-desc' ) ) )
+   .end();
+   $tbody = $table.find( '> tbody' );
+   for ( i = 0, length = this.params.length; i < length; i 
+= 1 ) {
+   param = this.params[i];
+   name = this.prefix + param.name;
+
+   $( '' )
+   .append(
+   $( '' )
+   .html( mw.html.element( 
'label',
+   { 'for': 
'param-' + name }, name )
+   )
+   )
+   .append( $( '' ).html( this.input( param, name ) ) )

[MediaWiki-commits] [Gerrit] update branch to master - change (mediawiki...Flow)

2014-01-08 Thread Bsitu (Code Review) 
Bsitu has uploaded a new change for review.

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


Change subject: update branch to master
..

update branch to master

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


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


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9c53dad5854f639754a2c19c029c2f0c808de522
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: Bsitu 

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

[MediaWiki-commits] [Gerrit] (FR #1282) Include source metadata in queue messages - change (wikimedia...SmashPig)

2014-01-08 Thread Adamw (Code Review) 
Adamw has uploaded a new change for review.

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


Change subject: (FR #1282) Include source metadata in queue messages
..

(FR #1282) Include source metadata in queue messages

Change-Id: Icac0c6e8e1d008d9b6d086b23292080b740b4146
---
M Core/DataStores/StompDataStore.php
A Maintenance/generate-version.sh
2 files changed, 35 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/SmashPig 
refs/changes/52/106452/1

diff --git a/Core/DataStores/StompDataStore.php 
b/Core/DataStores/StompDataStore.php
index 1dd45a1..01e8a66 100644
--- a/Core/DataStores/StompDataStore.php
+++ b/Core/DataStores/StompDataStore.php
@@ -110,9 +110,23 @@
);
}
 
+   global $smashpig_version;
+   if (isset($smashpig_version)) {
+   $version = $smashpig_version;
+   } else {
+   $version = "unknown";
+   }
+
$headers = array(
'persistent'=> 'true', // So the message 
doesn't disappear when the server restarts
'php-message-class' => $objClass, // Sneakyness! No 
parameter can have '-' in it's name so this is safe!
+
+   'source_name' => "SmashPig",
+   'source_type' => "listener",
+   'source_host' => gethostname(),
+   'source_run_id' => getmypid(),
+   'source_version' => $version,
+   'source_enqueued_time' => time(),
);
 
// Populate with custom keys
diff --git a/Maintenance/generate-version.sh b/Maintenance/generate-version.sh
new file mode 100755
index 000..cecf864
--- /dev/null
+++ b/Maintenance/generate-version.sh
@@ -0,0 +1,21 @@
+#!/bin/bash
+#
+# This script should be run manually before deploying to production.  When
+# run with no arguments, it will create a file SmashPig/version.php,
+# if you wish to store the output elsewhere, pass the file path as argument 1.
+#
+# Also, config.php must require the generated file.  If the version is
+# not found at runtime, the string "unknown" will be used instead.
+
+if [ "x$1" == "x" ]; then
+   root_dir="$(dirname $0)/.."
+   dest="$root_dir/version.php"
+else
+   dest="$1"
+fi
+head_rev=$(git rev-parse --verify HEAD)
+
+cat > $dest

[MediaWiki-commits] [Gerrit] Guard against no valid IPs being provided to GlobalBlocking:... - change (mediawiki...GlobalBlocking)

2014-01-08 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged.

Change subject: Guard against no valid IPs being provided to 
GlobalBlocking::checkIpsForBlock
..


Guard against no valid IPs being provided to GlobalBlocking::checkIpsForBlock

Bug: 59705
Change-Id: Iafa4f77e4aef241c4f7bd41e4f74276d818eb113
---
M GlobalBlocking.class.php
1 file changed, 5 insertions(+), 0 deletions(-)

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



diff --git a/GlobalBlocking.class.php b/GlobalBlocking.class.php
index bba1f0c..a7b5dab 100644
--- a/GlobalBlocking.class.php
+++ b/GlobalBlocking.class.php
@@ -170,6 +170,11 @@
$conds[] = $dbr->makeList( 
self::getRangeCondition( $ip ), LIST_AND );
}
}
+
+   if ( !$conds ) {
+   // No valid IPs provided so don't even make the query. 
Bug 59705
+   return array();
+   }
$conds = array( $dbr->makeList( $conds, LIST_OR ) );
 
if ( !$anon ) {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Iafa4f77e4aef241c4f7bd41e4f74276d818eb113
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/GlobalBlocking
Gerrit-Branch: master
Gerrit-Owner: Legoktm 
Gerrit-Reviewer: CSteipp 
Gerrit-Reviewer: Hoo man 
Gerrit-Reviewer: Skizzerz 
Gerrit-Reviewer: Werdna 
Gerrit-Reviewer: jenkins-bot

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

[MediaWiki-commits] [Gerrit] Removed features flagged around MW_SCAP_BETA - change (operations/puppet)

2014-01-08 Thread Ori.livneh (Code Review) 
Ori.livneh has submitted this change and it was merged.

Change subject: Removed features flagged around MW_SCAP_BETA
..


Removed features flagged around MW_SCAP_BETA

* Kept the ENV var and exports, since it might be useful later

Change-Id: I6b856b5c22d28957c74cba56c87d4bea99029a0a
---
M files/scap/scap
M files/scap/scap-2
2 files changed, 3 insertions(+), 24 deletions(-)

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



diff --git a/files/scap/scap b/files/scap/scap
index c5203bf..4c7ba37 100755
--- a/files/scap/scap
+++ b/files/scap/scap
@@ -97,11 +97,9 @@
 dsh -F30 -cM -f "$NODEFILE" -o -oSetupTimeout=10 -- "$DSH_EXPORTS 
/usr/local/bin/scap-1 \""$RSYNC_SERVERS"\""
 echo 'Finished'
 
-if [[ "$MW_SCAP_BETA" == "1" ]]; then
-   echo 'Rebuilding CDB files from /upstream...'
-   dsh -cM -g mediawiki-installation -o -oSetupTimeout=10 -- "$DSH_EXPORTS 
/usr/local/bin/scap-rebuild-cdbs"
-   echo 'Finished'
-fi
+echo 'Rebuilding CDB files from /upstream...'
+dsh -cM -g mediawiki-installation -o -oSetupTimeout=10 -- "$DSH_EXPORTS 
/usr/local/bin/scap-rebuild-cdbs"
+echo 'Finished'
 
 # Builds wikiversions.cdb and syncs it to the apaches with the dat file
 sync-wikiversions || die
diff --git a/files/scap/scap-2 b/files/scap/scap-2
index 46dfc76..7e16985 100755
--- a/files/scap/scap-2
+++ b/files/scap/scap-2
@@ -29,22 +29,3 @@
exit 1
 fi
 
-if [ "$MW_SCAP_BETA" != "1" ]; then
-   # Leave some of the cores free for apache processes
-   CPUS=`grep -c 'model name' /proc/cpuinfo`
-   THREADS=`expr $CPUS / 2`
-
-   # Only looks at certain MW version if specified
-   if [ -n "$MW_VERSIONS_SYNC" ]; then
-   mwVersions=$MW_VERSIONS_SYNC
-   else
-   mwVersions=$($BINDIR/mwversionsinuse)
-   fi
-
-   # Rebuild the CDB files from the JSON versions
-   # Regenerate the extension message file list for all active MediaWiki 
versions
-   for mwVerNum in ${mwVersions[@]}; do
-   $BINDIR/mergeCdbFileUpdates 
--directory="$MW_COMMON/php-$mwVerNum/cache/l10n" \
-   --trustmtime --threads=$THREADS
-   done
-fi

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I6b856b5c22d28957c74cba56c87d4bea99029a0a
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Aaron Schulz 
Gerrit-Reviewer: Ori.livneh 
Gerrit-Reviewer: jenkins-bot

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

[MediaWiki-commits] [Gerrit] Removing italic override for blockquotes - change (mediawiki...VectorBeta)

2014-01-08 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged.

Change subject: Removing italic override for blockquotes
..


Removing italic override for blockquotes

Forcing all blockquote text to be italic causes loss of information.
For example, in the attribution it is no longer clear what is the
author and what is the source.

Compare https://www.mediawiki.org/wiki/User:Kaldari/Sandbox with and
without the typography refresh. With the typography refresh activated,
all distinction between italicized words and non-italicized words is lost
(since everything is forced to be italics).

Change-Id: I8aa2a5fd8a893e92cfee3e193d03458b6e06d342
---
M less/screen-beta.less
1 file changed, 0 insertions(+), 1 deletion(-)

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



diff --git a/less/screen-beta.less b/less/screen-beta.less
index 0662b01..4c21a3a 100644
--- a/less/screen-beta.less
+++ b/less/screen-beta.less
@@ -1,7 +1,6 @@
 blockquote {
font-family: @content-heading-font-family;
font-size: 1.2em;
-   font-style: italic;
line-height: 1.6em;
 }
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I8aa2a5fd8a893e92cfee3e193d03458b6e06d342
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/extensions/VectorBeta
Gerrit-Branch: master
Gerrit-Owner: Kaldari 
Gerrit-Reviewer: Bartosz Dziewoński 
Gerrit-Reviewer: Jdlrobson 
Gerrit-Reviewer: Kaldari 
Gerrit-Reviewer: MarkTraceur 
Gerrit-Reviewer: Mattflaschen 
Gerrit-Reviewer: Swalling 
Gerrit-Reviewer: jenkins-bot

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

[MediaWiki-commits] [Gerrit] Removed features flagged around MW_SCAP_BETA - change (operations/puppet)

2014-01-08 Thread Aaron Schulz (Code Review) 
Aaron Schulz has uploaded a new change for review.

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


Change subject: Removed features flagged around MW_SCAP_BETA
..

Removed features flagged around MW_SCAP_BETA

* Kept the ENV var and exports, since it might be useful later

Change-Id: I6b856b5c22d28957c74cba56c87d4bea99029a0a
---
M files/scap/scap
M files/scap/scap-2
2 files changed, 3 insertions(+), 24 deletions(-)


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

diff --git a/files/scap/scap b/files/scap/scap
index c5203bf..4c7ba37 100755
--- a/files/scap/scap
+++ b/files/scap/scap
@@ -97,11 +97,9 @@
 dsh -F30 -cM -f "$NODEFILE" -o -oSetupTimeout=10 -- "$DSH_EXPORTS 
/usr/local/bin/scap-1 \""$RSYNC_SERVERS"\""
 echo 'Finished'
 
-if [[ "$MW_SCAP_BETA" == "1" ]]; then
-   echo 'Rebuilding CDB files from /upstream...'
-   dsh -cM -g mediawiki-installation -o -oSetupTimeout=10 -- "$DSH_EXPORTS 
/usr/local/bin/scap-rebuild-cdbs"
-   echo 'Finished'
-fi
+echo 'Rebuilding CDB files from /upstream...'
+dsh -cM -g mediawiki-installation -o -oSetupTimeout=10 -- "$DSH_EXPORTS 
/usr/local/bin/scap-rebuild-cdbs"
+echo 'Finished'
 
 # Builds wikiversions.cdb and syncs it to the apaches with the dat file
 sync-wikiversions || die
diff --git a/files/scap/scap-2 b/files/scap/scap-2
index 46dfc76..7e16985 100755
--- a/files/scap/scap-2
+++ b/files/scap/scap-2
@@ -29,22 +29,3 @@
exit 1
 fi
 
-if [ "$MW_SCAP_BETA" != "1" ]; then
-   # Leave some of the cores free for apache processes
-   CPUS=`grep -c 'model name' /proc/cpuinfo`
-   THREADS=`expr $CPUS / 2`
-
-   # Only looks at certain MW version if specified
-   if [ -n "$MW_VERSIONS_SYNC" ]; then
-   mwVersions=$MW_VERSIONS_SYNC
-   else
-   mwVersions=$($BINDIR/mwversionsinuse)
-   fi
-
-   # Rebuild the CDB files from the JSON versions
-   # Regenerate the extension message file list for all active MediaWiki 
versions
-   for mwVerNum in ${mwVersions[@]}; do
-   $BINDIR/mergeCdbFileUpdates 
--directory="$MW_COMMON/php-$mwVerNum/cache/l10n" \
-   --trustmtime --threads=$THREADS
-   done
-fi

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6b856b5c22d28957c74cba56c87d4bea99029a0a
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Aaron Schulz 

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

[MediaWiki-commits] [Gerrit] Added sanity check for doGetLocalCopyMulti() in Swift - change (mediawiki/core)

2014-01-08 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged.

Change subject: Added sanity check for doGetLocalCopyMulti() in Swift
..


Added sanity check for doGetLocalCopyMulti() in Swift

* This better handles the case of /tmp being full or something

Change-Id: Ibf4fed0fd053f82ef5ede46b6c2ec72feee95699
---
M includes/filebackend/SwiftFileBackend.php
1 file changed, 5 insertions(+), 2 deletions(-)

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



diff --git a/includes/filebackend/SwiftFileBackend.php 
b/includes/filebackend/SwiftFileBackend.php
index 528889b..1480662 100644
--- a/includes/filebackend/SwiftFileBackend.php
+++ b/includes/filebackend/SwiftFileBackend.php
@@ -1078,7 +1078,11 @@
$reqs = $this->http->runMulti( $reqs );
foreach ( $reqs as $path => $op ) {
list( $rcode, $rdesc, $rhdrs, $rbody, $rerr ) = 
$op['response'];
-   if ( $rcode >= 200 && $rcode <= 299 ) {
+   fclose( $op['stream'] ); // close open handle
+   if ( $rcode >= 200 && $rcode <= 299
+   // double check that the disk is not 
full/broken
+   && $tmpFile->getSize() == 
$rhdrs['content-length']
+   ) {
// good
} elseif ( $rcode === 404 ) {
$tmpFiles[$path] = false;
@@ -1087,7 +1091,6 @@
$this->onError( null, __METHOD__,
array( 'src' => $path ) + $ep, 
$rerr, $rcode, $rdesc );
}
-   fclose( $op['stream'] ); // close open handle
}
}
 

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

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

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

[MediaWiki-commits] [Gerrit] gdash: fix code deploy colors for white background - change (operations/puppet)

2014-01-08 Thread Ori.livneh (Code Review) 
Ori.livneh has submitted this change and it was merged.

Change subject: gdash: fix code deploy colors for white background
..


gdash: fix code deploy colors for white background

White on white doesn't work so well, and grey on white doesn't work
either. Switch scaps to black and sync-common-file to dashed gold
instead to match the continuous gold for sync-common-all.

It remains to be seen whether gold is a good color for displaying on a
white background.

Change-Id: I3833f390598342dd3d8f82878f25227395ffdb86
---
M templates/gdash/deploy_addon.erb
1 file changed, 2 insertions(+), 2 deletions(-)

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



diff --git a/templates/gdash/deploy_addon.erb b/templates/gdash/deploy_addon.erb
index ed3..e1bd32d 100644
--- a/templates/gdash/deploy_addon.erb
+++ b/templates/gdash/deploy_addon.erb
@@ -6,13 +6,13 @@
   [
 
 # sync-common-file
-
'alias(color(dashed(drawAsInfinite(deploy.sync-common-file)),"c0c0c080"),"sync-common-file")',
+
'alias(color(dashed(drawAsInfinite(deploy.sync-common-file)),"gold"),"sync-common-file")',
 
 # sync-common-all
 
'alias(color(lineWidth(drawAsInfinite(deploy.sync-common-all),2),"gold"),"sync-common-all")',
 
 # scap
-'alias(color(lineWidth(drawAsInfinite(deploy.scap),2),"white"),"scap 
deploy")',
+'alias(color(lineWidth(drawAsInfinite(deploy.scap),2),"black"),"scap 
deploy")',
 
   ].join('&')
 %>

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I3833f390598342dd3d8f82878f25227395ffdb86
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon Liambotis 
Gerrit-Reviewer: Faidon Liambotis 
Gerrit-Reviewer: Nemo bis 
Gerrit-Reviewer: Ori.livneh 
Gerrit-Reviewer: jenkins-bot

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

[MediaWiki-commits] [Gerrit] Added sanity check for doGetLocalCopyMulti() in Swift - change (mediawiki/core)

2014-01-08 Thread Aaron Schulz (Code Review) 
Aaron Schulz has uploaded a new change for review.

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


Change subject: Added sanity check for doGetLocalCopyMulti() in Swift
..

Added sanity check for doGetLocalCopyMulti() in Swift

* This better handles the case of /tmp being full or something

Change-Id: Ibf4fed0fd053f82ef5ede46b6c2ec72feee95699
---
M includes/filebackend/SwiftFileBackend.php
1 file changed, 5 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/50/106450/1

diff --git a/includes/filebackend/SwiftFileBackend.php 
b/includes/filebackend/SwiftFileBackend.php
index 528889b..1480662 100644
--- a/includes/filebackend/SwiftFileBackend.php
+++ b/includes/filebackend/SwiftFileBackend.php
@@ -1078,7 +1078,11 @@
$reqs = $this->http->runMulti( $reqs );
foreach ( $reqs as $path => $op ) {
list( $rcode, $rdesc, $rhdrs, $rbody, $rerr ) = 
$op['response'];
-   if ( $rcode >= 200 && $rcode <= 299 ) {
+   fclose( $op['stream'] ); // close open handle
+   if ( $rcode >= 200 && $rcode <= 299
+   // double check that the disk is not 
full/broken
+   && $tmpFile->getSize() == 
$rhdrs['content-length']
+   ) {
// good
} elseif ( $rcode === 404 ) {
$tmpFiles[$path] = false;
@@ -1087,7 +1091,6 @@
$this->onError( null, __METHOD__,
array( 'src' => $path ) + $ep, 
$rerr, $rcode, $rdesc );
}
-   fclose( $op['stream'] ); // close open handle
}
}
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibf4fed0fd053f82ef5ede46b6c2ec72feee95699
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] Track the root of a post tree explicitly - change (mediawiki...Flow)

2014-01-08 Thread EBernhardson (Code Review) 
EBernhardson has uploaded a new change for review.

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


Change subject: Track the root of a post tree explicitly
..

Track the root of a post tree explicitly

Querying the TreeRepository from the TopicHistoryIndex is open
to slave-lag issues, the just-added post may not actually
be available in the slave yet.

Anything we are saving we already know the root for, we just didn't
have the information available in the TopicHistoryIndex.  This patch
adds another field, rootPost, which is set when loading the posts. That
allows the information to make it into the TopicHistoryIndex
and remove the need for the TreeRepository there.

Change-Id: I23854ac0e36d8b892eba0d1202c1fd81dc05bd6e
---
M container.php
M includes/Block/Topic.php
M includes/Data/RevisionStorage.php
M includes/Data/RootPostLoader.php
M includes/Model/PostRevision.php
5 files changed, 41 insertions(+), 9 deletions(-)


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

diff --git a/container.php b/container.php
index 68c8b54..19fbae5 100644
--- a/container.php
+++ b/container.php
@@ -311,7 +311,7 @@
// topic history -- to keep a history by topic we have to know 
what topic every post
// belongs to, not just its parent. TopicHistoryIndex is a 
slight tweak to TopKIndex
// using TreeRepository for extra information and stuffing it 
into topic_root while indexing
-   new TopicHistoryIndex( $cache, $storage, $c['repository.tree'], 
'flow_revision:topic',
+   new TopicHistoryIndex( $cache, $storage, 'flow_revision:topic',
array( 'topic_root_id' ),
array(
'limit' => 500,
diff --git a/includes/Block/Topic.php b/includes/Block/Topic.php
index 01a3ec1..19c9b43 100644
--- a/includes/Block/Topic.php
+++ b/includes/Block/Topic.php
@@ -869,6 +869,7 @@
// looking for loadRootPost
$this->topicTitle->setChildren( array() );
$this->topicTitle->setDepth( 0 );
+   $this->topicTitle->setRootPost( $this->topicTitle );
 
if ( !$this->permissions->isAllowed( $this->topicTitle, 
'view' ) ) {
$this->topicTitle = null;
@@ -931,6 +932,7 @@
// using the path to the root post, we can know the 
post's depth
$rootPath = $this->rootLoader->treeRepo->findRootPath( 
$postId );
$post->setDepth( count( $rootPath ) - 1 );
+   $post->setRootPost( $found['root'] );
}
 
if ( $this->permissions->isAllowed( $topicTitle, 'view' )
@@ -974,13 +976,16 @@
if ( !$found ) {
throw new InvalidInputException( 'Should have found 
revisions', 'missing-revision' );
}
-   // Because storage returns a new object for every query
-   // We need to find $post in the array and replace it
$revId = $post->getRevisionId();
+   $rootPost = $post->getRootPost();
foreach ( $found as $idx => $revision ) {
if ( $revId->equals( $revision->getRevisionId() ) ) {
+   // Because storage returns a new object for 
every query
+   // We need to find $post in the array and 
replace it
$found[$idx] = $post;
-   break;
+   } else {
+   // Root post needs to propogate from $post to 
found revisions
+   $revision->setRootPost( $rootPost );
}
}
return $found;
diff --git a/includes/Data/RevisionStorage.php 
b/includes/Data/RevisionStorage.php
index 7fd0bd7..900bf89 100644
--- a/includes/Data/RevisionStorage.php
+++ b/includes/Data/RevisionStorage.php
@@ -489,26 +489,25 @@
 
protected $treeRepository;
 
-   public function __construct( BufferedCache $cache, PostRevisionStorage 
$storage, TreeRepository $treeRepo, $prefix, array $indexed, array $options = 
array() ) {
+   public function __construct( BufferedCache $cache, PostRevisionStorage 
$storage, $prefix, array $indexed, array $options = array() ) {
if ( $indexed !== array( 'topic_root_id' ) ) {
throw new \MWException( __CLASS__ . ' is hardcoded to 
only index topic_root_id: ' . print_r( $indexed, true ) );
}
parent::__construct( $cache, $storage, $prefix, $indexed, 
$options );
-   $this->treeRepository = $treeRepo;
}
 
public function onAfterInsert( $object, array $new ) {
-   $new['topic_root_id

[MediaWiki-commits] [Gerrit] Fixes Bug 58450 - change (analytics...data)

2014-01-08 Thread Milimetric (Code Review) 
Milimetric has submitted this change and it was merged.

Change subject: Fixes Bug 58450
..


Fixes Bug 58450

Change-Id: I6fa1295f7845779527e990c24150ba8dec15f801
---
M datafiles/rc_active_editors_count.csv
M datafiles/rc_new_editors_count.csv
M datafiles/rc_very_active_editors_count.csv
M datasources/rc_active_editors_count.yaml
M datasources/rc_new_editors_count.yaml
M datasources/rc_very_active_editors_count.yaml
M graphs/active_editors.json
M graphs/new_editors.json
M graphs/very_active_editors.json
M old_rc_new/input/wikilytics_in_wikistats_core_metrics.csv
10 files changed, 222 insertions(+), 141 deletions(-)

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



diff --git a/datafiles/rc_active_editors_count.csv 
b/datafiles/rc_active_editors_count.csv
index c648535..e2eea8e 100644
--- a/datafiles/rc_active_editors_count.csv
+++ b/datafiles/rc_active_editors_count.csv
@@ -1,38 +1,38 @@
-Month,Total,English,Commons,German,French,Russian,Spanish,Japanese,Italian,Chinese
-2010/11/01,77802,33905,5479,6914,4765,4152,3901,3799,2661,1556
-2010/12/01,76773,33238,5307,6742,4601,4059,3889,4001,2682,1617
-2011/01/01,85953,36696,6016,8377,5105,4699,4264,4080,3187,1710
-2011/02/01,81483,35710,5720,7544,4730,4418,3967,3853,2890,1680
-2011/03/01,84166,37592,5991,7606,5060,4482,4046,3638,2801,1625
-2011/04/01,80485,36323,5933,6973,4665,4222,3826,3579,2681,1645
-2011/05/01,81437,35963,5967,7085,4771,4227,3993,3778,2862,1612
-2011/06/01,79647,34796,6174,7019,4733,4157,4097,3482,2905,1636
-2011/07/01,79482,34564,6371,7231,4809,4009,4239,3670,2882,1876
-2011/08/01,80187,34732,6743,7135,4963,4114,4191,3976,2848,1856
-2011/09/01,80192,33844,9072,6842,4699,3957,4178,3895,2851,1675
-2011/10/01,79104,34141,6757,6898,4776,4019,4107,3850,2641,1665
-2011/11/01,78661,33536,6589,6791,4835,4056,4288,3610,2621,1647
-2011/12/01,78062,33233,6631,6691,4704,3997,4274,3618,2796,1672
-2012/01/01,83027,34210,7048,7617,5142,4523,4482,3976,3170,1899
-2012/02/01,79802,33274,6628,7109,5004,4271,4290,3809,3057,1912
-2012/03/01,80167,33702,6820,7059,4972,4424,4083,4137,2809,1861
-2012/04/01,78919,33159,6681,6780,4924,4194,4061,3909,2833,1890
-2012/05/01,80758,33574,6771,6760,5200,4363,4376,3883,3029,1957
-2012/06/01,78115,32382,6742,6644,4994,4152,4159,3849,2942,2004
-2012/07/01,80065,33328,6987,7043,5037,4158,4474,3939,3030,2268
-2012/08/01,78999,33032,6792,6836,5006,4308,4398,3941,2962,2263
-2012/09/01,81778,31001,13541,6688,4827,3986,4175,3980,2904,2042
-2012/10/01,79089,32421,7715,6763,5014,4221,4313,4186,2729,2083
-2012/11/01,78644,32091,6730,6699,5384,4326,4383,3905,2762,2119
-2012/12/01,77577,31430,6670,6587,5069,4286,4359,3929,2767,2120
-2013/01/01,84141,33296,7243,7399,5490,4591,4482,4152,3154,2271
-2013/02/01,77478,31178,6821,6838,5071,4249,4284,3994,2791,2099
-2013/03/01,81598,33189,7189,7037,5304,4346,4273,4175,2799,2150
-2013/04/01,81970,33380,7529,6657,5159,4117,4255,4123,2726,2235
-2013/05/01,82550,33085,7884,6695,5231,4118,4503,4143,2757,2303
-2013/06/01,77143,30873,7204,6454,4793,3931,4291,3988,2725,2265
-2013/07/01,76823,30872,7314,6539,4754,3846,4355,3898,2740,2380
-2013/08/01,76301,30896,7402,6372,4829,3658,4130,4002,2619,2394
-2013/09/01,76695,28747,12349,6023,4480,3363,3840,3811,2569,1970
-2013/10/01,75808,31037,7783,6137,4683,3539,3841,3918,2433,1970
-2013/11/01,74803,30653,7248,6102,4429,3522,3846,3760,2393,1968
+Month,Total,English,Commons,German,French,Russian,Spanish,Japanese,Italian,Chinese,Wikidata
+2010/11/01,77802,33905,5479,6914,4765,4152,3901,3799,2661,1556,
+2010/12/01,76773,33238,5307,6742,4601,4059,3889,4001,2682,1617,
+2011/01/01,85953,36696,6016,8377,5105,4699,4264,4080,3187,1710,
+2011/02/01,81483,35710,5720,7544,4730,4418,3967,3853,2890,1680,
+2011/03/01,84166,37592,5991,7606,5060,4482,4046,3638,2801,1625,
+2011/04/01,80485,36323,5933,6973,4665,4222,3826,3579,2681,1645,
+2011/05/01,81437,35963,5967,7085,4771,4227,3993,3778,2862,1612,
+2011/06/01,79647,34796,6174,7019,4733,4157,4097,3482,2905,1636,
+2011/07/01,79482,34564,6371,7231,4809,4009,4239,3670,2882,1876,
+2011/08/01,80187,34732,6743,7135,4963,4114,4191,3976,2848,1856,
+2011/09/01,80192,33844,9072,6842,4699,3957,4178,3895,2851,1675,
+2011/10/01,79104,34141,6757,6898,4776,4019,4107,3850,2641,1665,
+2011/11/01,78661,33536,6589,6791,4835,4056,4288,3610,2621,1647,
+2011/12/01,78062,33233,6631,6691,4704,3997,4274,3618,2796,1672,
+2012/01/01,83027,34210,7048,7617,5142,4523,4482,3976,3170,1899,
+2012/02/01,79802,33274,6628,7109,5004,4271,4290,3809,3057,1912,
+2012/03/01,80167,33702,6820,7059,4972,4424,4083,4137,2809,1861,
+2012/04/01,78919,33159,6681,6780,4924,4194,4061,3909,2833,1890,
+2012/05/01,80758,33574,6771,6760,5200,4363,4376,3883,3029,1957,
+2012/06/01,78115,32382,6742,6644,4994,4152,4159,3849,2942,2004,
+2012/07/01,80065,33328,6987,7043,5037,4158,4474,3939,3030,2268,
+2012/08/01,78999,33032,6792,6836,5006,4308,4398,3941,2962,2263,
+2012/09/01,81778,31001,13541,6688,4

[MediaWiki-commits] [Gerrit] Fixes Bug 58450 - change (analytics...data)

2014-01-08 Thread Milimetric (Code Review) 
Milimetric has uploaded a new change for review.

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


Change subject: Fixes Bug 58450
..

Fixes Bug 58450

Change-Id: I6fa1295f7845779527e990c24150ba8dec15f801
---
M datafiles/rc_active_editors_count.csv
M datafiles/rc_new_editors_count.csv
M datafiles/rc_very_active_editors_count.csv
M datasources/rc_active_editors_count.yaml
M datasources/rc_new_editors_count.yaml
M datasources/rc_very_active_editors_count.yaml
M graphs/active_editors.json
M graphs/new_editors.json
M graphs/very_active_editors.json
M old_rc_new/input/wikilytics_in_wikistats_core_metrics.csv
10 files changed, 222 insertions(+), 141 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/analytics/reportcard/data 
refs/changes/48/106448/1

diff --git a/datafiles/rc_active_editors_count.csv 
b/datafiles/rc_active_editors_count.csv
index c648535..e2eea8e 100644
--- a/datafiles/rc_active_editors_count.csv
+++ b/datafiles/rc_active_editors_count.csv
@@ -1,38 +1,38 @@
-Month,Total,English,Commons,German,French,Russian,Spanish,Japanese,Italian,Chinese
-2010/11/01,77802,33905,5479,6914,4765,4152,3901,3799,2661,1556
-2010/12/01,76773,33238,5307,6742,4601,4059,3889,4001,2682,1617
-2011/01/01,85953,36696,6016,8377,5105,4699,4264,4080,3187,1710
-2011/02/01,81483,35710,5720,7544,4730,4418,3967,3853,2890,1680
-2011/03/01,84166,37592,5991,7606,5060,4482,4046,3638,2801,1625
-2011/04/01,80485,36323,5933,6973,4665,4222,3826,3579,2681,1645
-2011/05/01,81437,35963,5967,7085,4771,4227,3993,3778,2862,1612
-2011/06/01,79647,34796,6174,7019,4733,4157,4097,3482,2905,1636
-2011/07/01,79482,34564,6371,7231,4809,4009,4239,3670,2882,1876
-2011/08/01,80187,34732,6743,7135,4963,4114,4191,3976,2848,1856
-2011/09/01,80192,33844,9072,6842,4699,3957,4178,3895,2851,1675
-2011/10/01,79104,34141,6757,6898,4776,4019,4107,3850,2641,1665
-2011/11/01,78661,33536,6589,6791,4835,4056,4288,3610,2621,1647
-2011/12/01,78062,33233,6631,6691,4704,3997,4274,3618,2796,1672
-2012/01/01,83027,34210,7048,7617,5142,4523,4482,3976,3170,1899
-2012/02/01,79802,33274,6628,7109,5004,4271,4290,3809,3057,1912
-2012/03/01,80167,33702,6820,7059,4972,4424,4083,4137,2809,1861
-2012/04/01,78919,33159,6681,6780,4924,4194,4061,3909,2833,1890
-2012/05/01,80758,33574,6771,6760,5200,4363,4376,3883,3029,1957
-2012/06/01,78115,32382,6742,6644,4994,4152,4159,3849,2942,2004
-2012/07/01,80065,33328,6987,7043,5037,4158,4474,3939,3030,2268
-2012/08/01,78999,33032,6792,6836,5006,4308,4398,3941,2962,2263
-2012/09/01,81778,31001,13541,6688,4827,3986,4175,3980,2904,2042
-2012/10/01,79089,32421,7715,6763,5014,4221,4313,4186,2729,2083
-2012/11/01,78644,32091,6730,6699,5384,4326,4383,3905,2762,2119
-2012/12/01,77577,31430,6670,6587,5069,4286,4359,3929,2767,2120
-2013/01/01,84141,33296,7243,7399,5490,4591,4482,4152,3154,2271
-2013/02/01,77478,31178,6821,6838,5071,4249,4284,3994,2791,2099
-2013/03/01,81598,33189,7189,7037,5304,4346,4273,4175,2799,2150
-2013/04/01,81970,33380,7529,6657,5159,4117,4255,4123,2726,2235
-2013/05/01,82550,33085,7884,6695,5231,4118,4503,4143,2757,2303
-2013/06/01,77143,30873,7204,6454,4793,3931,4291,3988,2725,2265
-2013/07/01,76823,30872,7314,6539,4754,3846,4355,3898,2740,2380
-2013/08/01,76301,30896,7402,6372,4829,3658,4130,4002,2619,2394
-2013/09/01,76695,28747,12349,6023,4480,3363,3840,3811,2569,1970
-2013/10/01,75808,31037,7783,6137,4683,3539,3841,3918,2433,1970
-2013/11/01,74803,30653,7248,6102,4429,3522,3846,3760,2393,1968
+Month,Total,English,Commons,German,French,Russian,Spanish,Japanese,Italian,Chinese,Wikidata
+2010/11/01,77802,33905,5479,6914,4765,4152,3901,3799,2661,1556,
+2010/12/01,76773,33238,5307,6742,4601,4059,3889,4001,2682,1617,
+2011/01/01,85953,36696,6016,8377,5105,4699,4264,4080,3187,1710,
+2011/02/01,81483,35710,5720,7544,4730,4418,3967,3853,2890,1680,
+2011/03/01,84166,37592,5991,7606,5060,4482,4046,3638,2801,1625,
+2011/04/01,80485,36323,5933,6973,4665,4222,3826,3579,2681,1645,
+2011/05/01,81437,35963,5967,7085,4771,4227,3993,3778,2862,1612,
+2011/06/01,79647,34796,6174,7019,4733,4157,4097,3482,2905,1636,
+2011/07/01,79482,34564,6371,7231,4809,4009,4239,3670,2882,1876,
+2011/08/01,80187,34732,6743,7135,4963,4114,4191,3976,2848,1856,
+2011/09/01,80192,33844,9072,6842,4699,3957,4178,3895,2851,1675,
+2011/10/01,79104,34141,6757,6898,4776,4019,4107,3850,2641,1665,
+2011/11/01,78661,33536,6589,6791,4835,4056,4288,3610,2621,1647,
+2011/12/01,78062,33233,6631,6691,4704,3997,4274,3618,2796,1672,
+2012/01/01,83027,34210,7048,7617,5142,4523,4482,3976,3170,1899,
+2012/02/01,79802,33274,6628,7109,5004,4271,4290,3809,3057,1912,
+2012/03/01,80167,33702,6820,7059,4972,4424,4083,4137,2809,1861,
+2012/04/01,78919,33159,6681,6780,4924,4194,4061,3909,2833,1890,
+2012/05/01,80758,33574,6771,6760,5200,4363,4376,3883,3029,1957,
+2012/06/01,78115,32382,6742,6644,4994,4152,4159,3849,2942,2004,
+2012/07/01,80065,33328,6987,7043,5037,4158,4474,3939,3030,2268,
+2012/08/01,78999,33032,6792,6836,

[MediaWiki-commits] [Gerrit] Fix text errors - change (wikimedia/wikimania-scholarships)

2014-01-08 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged.

Change subject: Fix text errors
..


Fix text errors

* Change form-intro-faq to link to 2014 FAQ
* Correct dates of 2014 Wikimania

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

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



diff --git a/data/i18n/en.json b/data/i18n/en.json
index 08e03d0..4ba4ac0 100644
--- a/data/i18n/en.json
+++ b/data/i18n/en.json
@@ -28,8 +28,8 @@
 
"deadline-passed": "Scholarship application deadline was February 
17, 2014, 23:59 UTC.\nWe will notify applicants in April 2014 about the 
result of their application.\nPlease see the scholarships 
page on the wiki for more details.",
 
-   "form-intro": "This is the application for sponsorship to attend http://wikimania2014.wikimedia.org\";>Wikimania 2014, the annual 
international conference centered on Wikimedia projects. Awardees will receive 
a scholarship which will cover conference registration fees, hotel, and 
roundtrip travel to Wikimania in London, 5-10 August 2014.\nThis is 
not a scholarship for university study. Applications not 
obviously related to the conference will be discarded.\nPlease carefully 
consider your financial needs before applying for a scholarship to attend 
Wikimania. There are limited funds available and many applicants do not have 
the financial means to attend Wikimania without this opportunity. Thank 
you.\nThe deadline to apply is February 17, 2014, 23:59 
UTC.",
-   "form-intro-faq": "Frequently asked questions",
+   "form-intro": "This is the application for sponsorship to attend http://wikimania2014.wikimedia.org\";>Wikimania 2014, the annual 
international conference centered on Wikimedia projects. Awardees will receive 
a scholarship which will cover conference registration fees, hotel, and 
roundtrip travel to Wikimania in London, 6-10 August 2014.\nThis is 
not a scholarship for university study. Applications not 
obviously related to the conference will be discarded.\nPlease carefully 
consider your financial needs before applying for a scholarship to attend 
Wikimania. There are limited funds available and many applicants do not have 
the financial means to attend Wikimania without this opportunity. Thank 
you.\nThe deadline to apply is February 17, 2014, 23:59 
UTC.",
+   "form-intro-faq": "Frequently asked questions",
 
"form-error": "Your form has errors.  Please correct the errors and 
submit the form again.",
"form-save-error": "There was a system error saving your application. 
Please try again.",

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic16ce8160f86ec82ad200a2faa227ff5661a1b26
Gerrit-PatchSet: 2
Gerrit-Project: wikimedia/wikimania-scholarships
Gerrit-Branch: master
Gerrit-Owner: BryanDavis 
Gerrit-Reviewer: Aude 
Gerrit-Reviewer: BryanDavis 
Gerrit-Reviewer: Chad 
Gerrit-Reviewer: jenkins-bot

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

[MediaWiki-commits] [Gerrit] Allow env/line/paragraph breaks in the middle of 'inline' de... - change (mediawiki...latex_renderer)

2014-01-08 Thread Cscott (Code Review) 
Cscott has uploaded a new change for review.

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


Change subject: Allow env/line/paragraph breaks in the middle of 'inline' 
decorations.
..

Allow env/line/paragraph breaks in the middle of 'inline' decorations.

We simply close the inline style, do the break, and then open it again.
This allows  inside of , for instance.

Change-Id: Iac9e3823b94f85ec959a9d0b6cfeacda830318a3
---
M lib/index.js
1 file changed, 19 insertions(+), 17 deletions(-)


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

diff --git a/lib/index.js b/lib/index.js
index 4e71b0e..85e7218 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -150,7 +150,7 @@
this.options = options;
this.buffer = [];
this.decorations = [];
-   this.inline = 0;
+   this.stack = []; // active inline decorations
this.pos = 0;
this.newEnv = this.newLine = this.newPara = true;
this.dir = 'ltr'; // XXX
@@ -158,6 +158,7 @@
 Formatter.prototype.flush = function() {
var deferred = when.defer();
this.envBreak();
+   console.assert(this.stack.length === 0); // all inline styles closed
this.stream.write('', 'utf8', function() {
deferred.resolve();
});
@@ -174,7 +175,6 @@
paraLevel: (this.dir==='ltr') ? ubidi.DEFAULT_LTR : 
ubidi.DEFAULT_RTL
});
 
-   var stack = [];
var emitDecoration = function(d, opts) {
switch (d.type) {
case 'start-inline':
@@ -182,15 +182,15 @@
var isStart = /^start-/.test(d.type) ^ (!!opts.invert);
if (isStart) {
if (opts.updateStack) {
-   stack.push(d);
+   this.stack.push(d);
}
this._writeRaw(d.value);
this._writeRaw(d.delimiter || '{');
} else {
if (opts.updateStack) {
-   console.assert(stack.length, 
this.decorations);
-   
console.assert(stack[stack.length-1].value === d.value);
-   stack.pop();
+   console.assert(this.stack.length, 
this.decorations);
+   
console.assert(this.stack[this.stack.length-1].value === d.value);
+   this.stack.pop();
}
this._writeRaw(d.delimiter || '}');
}
@@ -208,7 +208,7 @@
for (i=j=pos=0; i < runs; i++) {
var run = p.getVisualRun(i);
// open any decorations on stack
-   stack.forEach(function(d) { emitDecoration(d, { invert: false 
}); });
+   this.stack.forEach(function(d){ emitDecoration(d, { invert: 
false });});
// XXX FIX ME XXX do something with run.dir
var runEnd = run.logicalStart + run.length;
for (;; j++) {
@@ -226,14 +226,20 @@
this._writeRaw(texEscape(text.slice(pos, runEnd)));
pos = runEnd;
// close any decorations on the stack
-   stack.forEach(function(d) { emitDecoration(d, { invert: true 
}); });
+   this.stack.forEach(function(d) { emitDecoration(d, { invert: 
true }); });
}
-   // emit decorations at end
-   for (; jhttps://gerrit.wikimedia.org/r/106447
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iac9e3823b94f85ec959a9d0b6cfeacda830318a3
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] Automatically open/close inline decorations around bidi runs. - change (mediawiki...latex_renderer)

2014-01-08 Thread Cscott (Code Review) 
Cscott has uploaded a new change for review.

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


Change subject: Automatically open/close inline decorations around bidi runs.
..

Automatically open/close inline decorations around bidi runs.

Change-Id: I69c0be501b4e1663d2f1364048a24c2db273d244
---
M lib/index.js
1 file changed, 22 insertions(+), 13 deletions(-)


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

diff --git a/lib/index.js b/lib/index.js
index 24ef4e7..4e71b0e 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -175,18 +175,25 @@
});
 
var stack = [];
-   var emitDecoration = function(d) {
+   var emitDecoration = function(d, opts) {
switch (d.type) {
case 'start-inline':
-   stack.push(d);
-   this._writeRaw(d.value);
-   this._writeRaw(d.delimiter || '{');
-   break;
case 'end-inline':
-   console.assert(stack.length, this.decorations);
-   console.assert(stack[stack.length-1].value === d.value);
-   stack.pop();
-   this._writeRaw(d.delimiter || '}');
+   var isStart = /^start-/.test(d.type) ^ (!!opts.invert);
+   if (isStart) {
+   if (opts.updateStack) {
+   stack.push(d);
+   }
+   this._writeRaw(d.value);
+   this._writeRaw(d.delimiter || '{');
+   } else {
+   if (opts.updateStack) {
+   console.assert(stack.length, 
this.decorations);
+   
console.assert(stack[stack.length-1].value === d.value);
+   stack.pop();
+   }
+   this._writeRaw(d.delimiter || '}');
+   }
break;
case 'start-block':
case 'end-block':
@@ -200,7 +207,8 @@
var runs = p.countRuns(), pos, i, j, d;
for (i=j=pos=0; i < runs; i++) {
var run = p.getVisualRun(i);
-   // XXX open any decorations on stack
+   // open any decorations on stack
+   stack.forEach(function(d) { emitDecoration(d, { invert: false 
}); });
// XXX FIX ME XXX do something with run.dir
var runEnd = run.logicalStart + run.length;
for (;; j++) {
@@ -212,17 +220,18 @@
// write text up to this decoration
this._writeRaw(texEscape(text.slice(pos, d.pos)));
pos = d.pos;
-   emitDecoration(d);
+   emitDecoration(d, { updateStack: true });
}
// emit any trailing text
this._writeRaw(texEscape(text.slice(pos, runEnd)));
pos = runEnd;
-   // XXX close any decorations on the stack
+   // close any decorations on the stack
+   stack.forEach(function(d) { emitDecoration(d, { invert: true 
}); });
}
// emit decorations at end
for (; jhttps://gerrit.wikimedia.org/r/106446
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I69c0be501b4e1663d2f1364048a24c2db273d244
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] Fix target of Frequently asked questions link - change (wikimedia/wikimania-scholarships)

2014-01-08 Thread BryanDavis (Code Review) 
BryanDavis has uploaded a new change for review.

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


Change subject: Fix target of Frequently asked questions link
..

Fix target of Frequently asked questions link

Bug: 59839
Change-Id: Ic16ce8160f86ec82ad200a2faa227ff5661a1b26
---
M data/i18n/en.json
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/wikimania-scholarships 
refs/changes/44/106444/1

diff --git a/data/i18n/en.json b/data/i18n/en.json
index 08e03d0..3297bc3 100644
--- a/data/i18n/en.json
+++ b/data/i18n/en.json
@@ -29,7 +29,7 @@
"deadline-passed": "Scholarship application deadline was February 
17, 2014, 23:59 UTC.\nWe will notify applicants in April 2014 about the 
result of their application.\nPlease see the scholarships 
page on the wiki for more details.",
 
"form-intro": "This is the application for sponsorship to attend http://wikimania2014.wikimedia.org\";>Wikimania 2014, the annual 
international conference centered on Wikimedia projects. Awardees will receive 
a scholarship which will cover conference registration fees, hotel, and 
roundtrip travel to Wikimania in London, 5-10 August 2014.\nThis is 
not a scholarship for university study. Applications not 
obviously related to the conference will be discarded.\nPlease carefully 
consider your financial needs before applying for a scholarship to attend 
Wikimania. There are limited funds available and many applicants do not have 
the financial means to attend Wikimania without this opportunity. Thank 
you.\nThe deadline to apply is February 17, 2014, 23:59 
UTC.",
-   "form-intro-faq": "Frequently asked questions",
+   "form-intro-faq": "Frequently asked questions",
 
"form-error": "Your form has errors.  Please correct the errors and 
submit the form again.",
"form-save-error": "There was a system error saving your application. 
Please try again.",

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic16ce8160f86ec82ad200a2faa227ff5661a1b26
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/wikimania-scholarships
Gerrit-Branch: master
Gerrit-Owner: BryanDavis 
Gerrit-Reviewer: jenkins-bot

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

[MediaWiki-commits] [Gerrit] Remove ugly code duplication in ReindexForkController - change (mediawiki...CirrusSearch)

2014-01-08 Thread Chad (Code Review) 
Chad has uploaded a new change for review.

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


Change subject: Remove ugly code duplication in ReindexForkController
..

Remove ugly code duplication in ReindexForkController

Requires I2071f04b from core

Change-Id: Icf084e87dcf8cfc6bb5e314d53a02e7a08e8237e
---
M includes/ReindexForkController.php
1 file changed, 0 insertions(+), 35 deletions(-)


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

diff --git a/includes/ReindexForkController.php 
b/includes/ReindexForkController.php
index 9f2ecaa..6c24f4f 100644
--- a/includes/ReindexForkController.php
+++ b/includes/ReindexForkController.php
@@ -23,41 +23,6 @@
  * http://www.gnu.org/copyleft/gpl.html
  */
 class ReindexForkController extends ForkController {
-   /**
-* @var integer number of this child or null if this is the parent
-*/
-   var $childNumber;
-   /**
-* Fork a number of worker processes.  Have to hack ForkController to 
store
-* the child number.
-*
-* @return string
-*/
-   protected function forkWorkers( $numProcs ) {
-   $this->prepareEnvironment();
-
-   // Create the child processes
-   for ( $i = 0; $i < $numProcs; $i++ ) {
-   // Do the fork
-   $pid = pcntl_fork();
-   if ( $pid === -1 || $pid === false ) {
-   echo "Error creating child processes\n";
-   exit( 1 );
-   }
-
-   if ( !$pid ) {
-   $this->initChild();
-   $this->childNumber = $i; // Hack right here.
-   return 'child';
-   } else {
-   // This is the parent process
-   $this->children[$pid] = true;
-   }
-   }
-
-   return 'parent';
-   }
-
protected function prepareEnvironment() {
parent::prepareEnvironment();
Connection::destroySingleton();

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

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

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

[MediaWiki-commits] [Gerrit] Make it easy to get the number of the currently running child - change (mediawiki/core)

2014-01-08 Thread Chad (Code Review) 
Chad has uploaded a new change for review.

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


Change subject: Make it easy to get the number of the currently running child
..

Make it easy to get the number of the currently running child

Change-Id: I2071f04b6f01e640c850c6470cfa9f2f48f62eac
---
M includes/ForkController.php
1 file changed, 12 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/43/106443/1

diff --git a/includes/ForkController.php b/includes/ForkController.php
index 2d5aa4b..0582230 100644
--- a/includes/ForkController.php
+++ b/includes/ForkController.php
@@ -30,7 +30,7 @@
  * @ingroup Maintenance
  */
 class ForkController {
-   protected $children = array();
+   protected $children = array(), $childNumber = 0;
protected $termReceived = false;
protected $flags = 0, $procsToStart = 0;
 
@@ -137,6 +137,16 @@
return 'done';
}
 
+   /**
+* Get the number of the child currently running. Note, this
+* is not the pid, but rather which of the total number of children
+* we are
+* @return int
+*/
+   public function getChildNumber() {
+   return $this->childNumber;
+   }
+
protected function prepareEnvironment() {
global $wgMemc;
// Don't share DB, storage, or memcached connections
@@ -166,6 +176,7 @@
 
if ( !$pid ) {
$this->initChild();
+   $this->childNumber = $i;
return 'child';
} else {
// This is the parent process

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

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

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

[MediaWiki-commits] [Gerrit] Declare visibility on all properties in ForkController - change (mediawiki/core)

2014-01-08 Thread Chad (Code Review) 
Chad has uploaded a new change for review.

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


Change subject: Declare visibility on all properties in ForkController
..

Declare visibility on all properties in ForkController

Grepped all of core and extensions, and nothing uses them

Change-Id: I8e4f191aafffdbc2254e39bed81a5209cdf29795
---
M includes/ForkController.php
1 file changed, 4 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/42/106442/1

diff --git a/includes/ForkController.php b/includes/ForkController.php
index ced45af..2d5aa4b 100644
--- a/includes/ForkController.php
+++ b/includes/ForkController.php
@@ -30,11 +30,11 @@
  * @ingroup Maintenance
  */
 class ForkController {
-   var $children = array();
-   var $termReceived = false;
-   var $flags = 0, $procsToStart = 0;
+   protected $children = array();
+   protected $termReceived = false;
+   protected $flags = 0, $procsToStart = 0;
 
-   static $restartableSignals = array(
+   protected static $restartableSignals = array(
SIGFPE,
SIGILL,
SIGSEGV,

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

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

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

[MediaWiki-commits] [Gerrit] Add hook to allow extensions to modify the LonelyPages query - change (mediawiki/core)

2014-01-08 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged.

Change subject: Add hook to allow extensions to modify the LonelyPages query
..


Add hook to allow extensions to modify the LonelyPages query

First step to solving bug 3483.

Bug: 3483
Change-Id: Ie8c5765ddc6b6028836024c426a0369e6966b25e
---
M RELEASE-NOTES-1.23
M docs/hooks.txt
M includes/specials/SpecialLonelypages.php
3 files changed, 36 insertions(+), 24 deletions(-)

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



diff --git a/RELEASE-NOTES-1.23 b/RELEASE-NOTES-1.23
index 8dd9923..8dfbb5f 100644
--- a/RELEASE-NOTES-1.23
+++ b/RELEASE-NOTES-1.23
@@ -42,6 +42,8 @@
 * (bug 56033) Add content model to the page information.
 * Added Article::MissingArticleConditions hook to give extensions a chance to
   hide their (unrelated) log entries.
+* Added LonelyPagesQuery hook to let extensions modify the query used to
+  generate Special:LonelyPages.
 * Added $wgOpenSearchDefaultLimit defining the default number of entries to 
show
   on action=opensearch API call.
 * For namespaces with $wgNamespaceProtection (including the MediaWiki
diff --git a/docs/hooks.txt b/docs/hooks.txt
index ebc412b..bc09da7 100644
--- a/docs/hooks.txt
+++ b/docs/hooks.txt
@@ -1595,6 +1595,12 @@
 &$revert: string that is displayed in the UI, similar to $comment.
 $time: timestamp of the log entry (added in 1.12)
 
+'LonelyPagesQuery': Allow extensions to modify the query used by
+Special:LonelyPages.
+&$tables: tables to join in the query
+&$conds: conditions for the query
+&$joinConds: join conditions for the query
+
 'MaintenanceRefreshLinksInit': before executing the refreshLinks.php 
maintenance
 script.
 $refreshLinks: RefreshLinks object
diff --git a/includes/specials/SpecialLonelypages.php 
b/includes/specials/SpecialLonelypages.php
index 7c7771d..f533234 100644
--- a/includes/specials/SpecialLonelypages.php
+++ b/includes/specials/SpecialLonelypages.php
@@ -49,36 +49,40 @@
}
 
function getQueryInfo() {
-   return array(
-   'tables' => array(
-   'page', 'pagelinks',
-   'templatelinks'
+   $tables = array( 'page', 'pagelinks', 'templatelinks' );
+   $conds = array(
+   'pl_namespace IS NULL',
+   'page_namespace' => MWNamespace::getContentNamespaces(),
+   'page_is_redirect' => 0,
+   'tl_namespace IS NULL'
+   );
+   $joinConds = array(
+   'pagelinks' => array(
+   'LEFT JOIN', array(
+   'pl_namespace = page_namespace',
+   'pl_title = page_title'
+   )
),
+   'templatelinks' => array(
+   'LEFT JOIN', array(
+   'tl_namespace = page_namespace',
+   'tl_title = page_title'
+   )
+   )
+   );
+
+   // Allow extensions to modify the query
+   wfRunHooks( 'LonelyPagesQuery', array( &$tables, &$conds, 
&$joinConds ) );
+
+   return array(
+   'tables' => $tables,
'fields' => array(
'namespace' => 'page_namespace',
'title' => 'page_title',
'value' => 'page_title'
),
-   'conds' => array(
-   'pl_namespace IS NULL',
-   'page_namespace' => 
MWNamespace::getContentNamespaces(),
-   'page_is_redirect' => 0,
-   'tl_namespace IS NULL'
-   ),
-   'join_conds' => array(
-   'pagelinks' => array(
-   'LEFT JOIN', array(
-   'pl_namespace = page_namespace',
-   'pl_title = page_title'
-   )
-   ),
-   'templatelinks' => array(
-   'LEFT JOIN', array(
-   'tl_namespace = page_namespace',
-   'tl_title = page_title'
-   )
-   )
-   )
+   'conds' => $conds,
+   'join_conds' => $joinConds
);
}
 

-- 
To view, visit https://gerrit.wikimedia.o

[MediaWiki-commits] [Gerrit] update wmf/1.23wmf9 -> master - change (mediawiki...Flow)

2014-01-08 Thread EBernhardson (Code Review) 
EBernhardson has uploaded a new change for review.

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


Change subject: update wmf/1.23wmf9 -> master
..

update wmf/1.23wmf9 -> master

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


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


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I832485e54bb778d43f7b51ee0ba58ef1bf8e1a49
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: wmf/1.23wmf9
Gerrit-Owner: EBernhardson 

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

[MediaWiki-commits] [Gerrit] gdash: fix code deploy colors for white background - change (operations/puppet)

2014-01-08 Thread Faidon Liambotis (Code Review) 
Faidon Liambotis has uploaded a new change for review.

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


Change subject: gdash: fix code deploy colors for white background
..

gdash: fix code deploy colors for white background

White on white doesn't work so well, and grey on white doesn't work
either. Switch scaps to black and sync-common-file to dashed gold
instead to match the continuous gold for sync-common-all.

It remains to be seen whether gold is a good color for displaying on a
white background.

Change-Id: I3833f390598342dd3d8f82878f25227395ffdb86
---
M templates/gdash/deploy_addon.erb
1 file changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/40/106440/1

diff --git a/templates/gdash/deploy_addon.erb b/templates/gdash/deploy_addon.erb
index ed3..e1bd32d 100644
--- a/templates/gdash/deploy_addon.erb
+++ b/templates/gdash/deploy_addon.erb
@@ -6,13 +6,13 @@
   [
 
 # sync-common-file
-
'alias(color(dashed(drawAsInfinite(deploy.sync-common-file)),"c0c0c080"),"sync-common-file")',
+
'alias(color(dashed(drawAsInfinite(deploy.sync-common-file)),"gold"),"sync-common-file")',
 
 # sync-common-all
 
'alias(color(lineWidth(drawAsInfinite(deploy.sync-common-all),2),"gold"),"sync-common-all")',
 
 # scap
-'alias(color(lineWidth(drawAsInfinite(deploy.scap),2),"white"),"scap 
deploy")',
+'alias(color(lineWidth(drawAsInfinite(deploy.scap),2),"black"),"scap 
deploy")',
 
   ].join('&')
 %>

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I3833f390598342dd3d8f82878f25227395ffdb86
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon Liambotis 

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

[MediaWiki-commits] [Gerrit] move fundraising.wm.o from aluminium.* al-fundraising.* - change (operations/dns)

2014-01-08 Thread Jgreen (Code Review) 
Jgreen has submitted this change and it was merged.

Change subject: move fundraising.wm.o from aluminium.* al-fundraising.*
..


move fundraising.wm.o from aluminium.* al-fundraising.*

Change-Id: I5b3a8c0c0326dc8f6385ad4205d4dd7eb9a8d3b3
---
M templates/wikimedia.org
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/templates/wikimedia.org b/templates/wikimedia.org
index 9d738bc..4400785 100644
--- a/templates/wikimedia.org
+++ b/templates/wikimedia.org
@@ -628,7 +628,7 @@
 download   1H  IN CNAMEdumps
 eiximenis  1H  IN CNAMEhooper.wikimedia.org.
 etherpad   1H  IN CNAMEzirconium.wikimedia.org.
-fundraising1H  IN CNAMEaluminium
+fundraising1H  IN CNAMEal-fundraising
 ganglia1H  IN CNAMEnickel
 globalblog 1H  IN CNAMEholmium.wikimedia.org.
 ishmael1H  IN CNAMEneon

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I5b3a8c0c0326dc8f6385ad4205d4dd7eb9a8d3b3
Gerrit-PatchSet: 1
Gerrit-Project: operations/dns
Gerrit-Branch: master
Gerrit-Owner: Jgreen 
Gerrit-Reviewer: Jgreen 
Gerrit-Reviewer: jenkins-bot

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

[MediaWiki-commits] [Gerrit] move fundraising.wm.o from aluminium.* al-fundraising.* - change (operations/dns)

2014-01-08 Thread Jgreen (Code Review) 
Jgreen has uploaded a new change for review.

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


Change subject: move fundraising.wm.o from aluminium.* al-fundraising.*
..

move fundraising.wm.o from aluminium.* al-fundraising.*

Change-Id: I5b3a8c0c0326dc8f6385ad4205d4dd7eb9a8d3b3
---
M templates/wikimedia.org
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/dns 
refs/changes/39/106439/1

diff --git a/templates/wikimedia.org b/templates/wikimedia.org
index 9d738bc..4400785 100644
--- a/templates/wikimedia.org
+++ b/templates/wikimedia.org
@@ -628,7 +628,7 @@
 download   1H  IN CNAMEdumps
 eiximenis  1H  IN CNAMEhooper.wikimedia.org.
 etherpad   1H  IN CNAMEzirconium.wikimedia.org.
-fundraising1H  IN CNAMEaluminium
+fundraising1H  IN CNAMEal-fundraising
 ganglia1H  IN CNAMEnickel
 globalblog 1H  IN CNAMEholmium.wikimedia.org.
 ishmael1H  IN CNAMEneon

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I5b3a8c0c0326dc8f6385ad4205d4dd7eb9a8d3b3
Gerrit-PatchSet: 1
Gerrit-Project: operations/dns
Gerrit-Branch: master
Gerrit-Owner: Jgreen 

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

[MediaWiki-commits] [Gerrit] More 1.19 backwards compatibility fixes - change (mediawiki...Persona)

2014-01-08 Thread Parent5446 (Code Review) 
Parent5446 has submitted this change and it was merged.

Change subject: More 1.19 backwards compatibility fixes
..


More 1.19 backwards compatibility fixes

Fixed dependencies for 1.19 and made sure POST HTTP method
is uppercase since it has to be in 1.19.

Also removed {{SITENAME}} magic from JavaScript messages,
since it is way more difficult making that work in 1.19.

Bug: 55975
Change-Id: Ia8c0004242cd1ed69b69b626de6ed4d8e23790a9
---
M ApiPersona.php
M Persona.i18n.php
M Persona.php
3 files changed, 5 insertions(+), 7 deletions(-)

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



diff --git a/ApiPersona.php b/ApiPersona.php
index 4283cad..fa683f9 100644
--- a/ApiPersona.php
+++ b/ApiPersona.php
@@ -136,18 +136,18 @@
// Contact the verification server.
$assertion = $params['assertion'];
$request = MWHttpRequest::factory( 
'https://login.persona.org/verify', array(
-   'method' => 'post',
+   'method' => 'POST',
'caInfo' => __DIR__ . '/persona.crt',
'sslVerifyHost' => true,
'sslVerifyCert' => true,
-   'postData' => wfArrayToCgi( array(
+   'postData' => FormatJson::encode( array(
'assertion' => $assertion,
'audience' => wfExpandUrl( '/', $wgSecureLogin 
? PROTO_HTTPS : PROTO_HTTP )
) ),
) );
-   $request->setHeader( 'Content-Type', 
'application/x-www-form-urlencoded' );
+   $request->setHeader( 'Content-Type', 'application/json' );
 
-   $status = $request->execute();
+   $request->execute();
$response = $request->getContent();
$result = (array)FormatJson::decode( $response );
 
diff --git a/Persona.i18n.php b/Persona.i18n.php
index fca9e51..2b422a9 100644
--- a/Persona.i18n.php
+++ b/Persona.i18n.php
@@ -26,7 +26,7 @@
'persona-error-insecure' => 'Logging in over an insecure connection is 
not allowed.',
'persona-error-failure' => 'Persona failed to verify your identity.',
'persona-error-dberror' => 'An internal database error occurred.',
-   'persona-error-invaliduser' => 'There is no user on {{SITENAME}} 
matching your Persona account.',
+   'persona-error-invaliduser' => 'There is no user matching your Persona 
account.',
'persona-error-multipleusers' => 'There are multiple users with the 
same email address as your Persona account. Your account must have a unique 
email address to log in with Persona.',
 );
 
diff --git a/Persona.php b/Persona.php
index 1a67c4f..a90cfd4 100644
--- a/Persona.php
+++ b/Persona.php
@@ -57,7 +57,6 @@
'mediawiki.api',
'mediawiki.Title',
'mediawiki.notify',
-   'mediawiki.jqueryMsg',
),
'localBasePath' => __DIR__,
'remoteExtPath' => 'Persona'
@@ -76,7 +75,6 @@
'dependencies' => array(
'mediawiki.api',
'mediawiki.Title',
-   'mediawiki.notify',
'mediawiki.jqueryMsg',
),
'localBasePath' => __DIR__,

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia8c0004242cd1ed69b69b626de6ed4d8e23790a9
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/Persona
Gerrit-Branch: master
Gerrit-Owner: Parent5446 
Gerrit-Reviewer: Parent5446 
Gerrit-Reviewer: Siebrand 

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

[MediaWiki-commits] [Gerrit] deployment: switch carbon host to tungsten - change (operations/puppet)

2014-01-08 Thread Faidon Liambotis (Code Review) 
Faidon Liambotis has submitted this change and it was merged.

Change subject: deployment: switch carbon host to tungsten
..


deployment: switch carbon host to tungsten

Graphite has been moved to tungsten, switch the (newly renamed) puppet
variable from professor to tungsten and restore the "show code deploys"
Graphite feature that got broken during the transition.

Change-Id: I9ef9d6e9228e9e00a633c98e582b5ccb4f6c9186
---
M manifests/misc/deployment.pp
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/manifests/misc/deployment.pp b/manifests/misc/deployment.pp
index e162968..bfe31f7 100644
--- a/manifests/misc/deployment.pp
+++ b/manifests/misc/deployment.pp
@@ -371,7 +371,7 @@
if $::realm == 'production' {
$mw_rsync_host = 'tin.eqiad.wmnet'
 
-   $mw_carbon_host = 'professor.pmtpa.wmnet'
+   $mw_carbon_host = 'tungsten.eqiad.wmnet'
$mw_carbon_port = 2003
 
file { $mw_common_source:

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

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

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

[MediaWiki-commits] [Gerrit] deployment: s/mw_statsd/mw_carbon/ - change (operations/puppet)

2014-01-08 Thread Faidon Liambotis (Code Review) 
Faidon Liambotis has submitted this change and it was merged.

Change subject: deployment: s/mw_statsd/mw_carbon/
..


deployment: s/mw_statsd/mw_carbon/

Port 2003 is actually Carbon, not statsd, so stop lying and name the
$mw_statsd_{host,port} & MW_STATSD_{HOST,PORT} variables accordingly.

Change-Id: Iec7f90c11e18a8b5c41e004fa6676a58d6d164cf
---
M files/misc/scripts/deploy2graphite
M manifests/misc/deployment.pp
M templates/misc/mw-deployment-vars.erb
3 files changed, 10 insertions(+), 10 deletions(-)

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



diff --git a/files/misc/scripts/deploy2graphite 
b/files/misc/scripts/deploy2graphite
index d6add57..322c5df 100755
--- a/files/misc/scripts/deploy2graphite
+++ b/files/misc/scripts/deploy2graphite
@@ -9,7 +9,7 @@
echo " Expected deploy events include sync-common, sync-file, scap, 
etc."
echo " These messages can be suppressed by setting an environment 
variable $DOLOGMSGNOLOG."
echo ""
-   echo "  IF YOU'RE RUNNING THIS BY HAND, PLEASE STOP.  Go ask Asher why. 
 :)"
+   echo "  IF YOU'RE RUNNING THIS BY HAND, PLEASE STOP."
echo ""
exit
 }
@@ -19,9 +19,9 @@
 if [ -z $DOLOGMSGNOLOG ]; then
if [ "$1" ] ; then
utime="$(date +%s)"
-   echo "deploy.$1 1 $utime" | nc -w1 -q0 $MW_STATSD_HOST 
$MW_STATSD_PORT || /bin/true
-   echo "deploy.any 1 $utime" | nc -w1 -q0 $MW_STATSD_HOST 
$MW_STATSD_PORT || /bin/true
-   test -n "$2" && echo "deploy.${1}.timing:${2}000|ms" | nc -w1 
-q0 $MW_STATSD_HOST $MW_STATSD_PORT || /bin/true
+   echo "deploy.$1 1 $utime" | nc -w1 -q0 $MW_CARBON_HOST 
$MW_CARBON_PORT || /bin/true
+   echo "deploy.any 1 $utime" | nc -w1 -q0 $MW_CARBON_HOST 
$MW_CARBON_PORT || /bin/true
+   test -n "$2" && echo "deploy.${1}.timing:${2}000|ms" | nc -w1 
-q0 $MW_CARBON_HOST $MW_CARBON_PORT || /bin/true
else
usage
fi
diff --git a/manifests/misc/deployment.pp b/manifests/misc/deployment.pp
index 797e74f..e162968 100644
--- a/manifests/misc/deployment.pp
+++ b/manifests/misc/deployment.pp
@@ -371,8 +371,8 @@
if $::realm == 'production' {
$mw_rsync_host = 'tin.eqiad.wmnet'
 
-   $mw_statsd_host = 'professor.pmtpa.wmnet'
-   $mw_statsd_port = 2003
+   $mw_carbon_host = 'professor.pmtpa.wmnet'
+   $mw_carbon_port = 2003
 
file { $mw_common_source:
ensure  => directory,
@@ -384,8 +384,8 @@
} else {
$mw_rsync_host = 'deployment-bastion.pmtpa.wmflabs'
 
-   $mw_statsd_host = 'deployment-bastion.pmtpa.wmflabs'
-   $mw_statsd_port = 2003
+   $mw_carbon_host = 'deployment-bastion.pmtpa.wmflabs'
+   $mw_carbon_port = 2003
 
 # The Apache directories must belong to the mwdeploy user known on
 # deployment-bastion.pmtpa.wmflabs. That is the instance used by
diff --git a/templates/misc/mw-deployment-vars.erb 
b/templates/misc/mw-deployment-vars.erb
index 904cf65..99c07ac 100644
--- a/templates/misc/mw-deployment-vars.erb
+++ b/templates/misc/mw-deployment-vars.erb
@@ -6,5 +6,5 @@
 MW_RSYNC_HOST=<%= mw_rsync_host %>
 MW_DSH_ARGS=('-cM' '-g' 'mediawiki-installation' '-o' '-oSetupTimeout=30' 
'-F30')
 MW_RSYNC_ARGS=('-a' '--delete-delay' '--delay-updates' '--compress' '--delete' 
'--exclude=**/.svn/lock' '--exclude=**/.git/objects' 
'--exclude=**/.git/**/objects' '--exclude=**/cache/l10n/*.cdb' '--no-perms')
-MW_STATSD_HOST=<%= mw_statsd_host %>
-MW_STATSD_PORT=<%= mw_statsd_port %>
+MW_CARBON_HOST=<%= mw_carbon_host %>
+MW_CARBON_PORT=<%= mw_carbon_port %>

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

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

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

[MediaWiki-commits] [Gerrit] deployment: switch carbon host to tungsten - change (operations/puppet)

2014-01-08 Thread Faidon Liambotis (Code Review) 
Faidon Liambotis has uploaded a new change for review.

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


Change subject: deployment: switch carbon host to tungsten
..

deployment: switch carbon host to tungsten

Graphite has been moved to tungsten, switch the (newly renamed) puppet
variable from professor to tungsten and restore the "show code deploys"
Graphite feature that got broken during the transition.

Change-Id: I9ef9d6e9228e9e00a633c98e582b5ccb4f6c9186
---
M manifests/misc/deployment.pp
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/38/106438/1

diff --git a/manifests/misc/deployment.pp b/manifests/misc/deployment.pp
index e162968..bfe31f7 100644
--- a/manifests/misc/deployment.pp
+++ b/manifests/misc/deployment.pp
@@ -371,7 +371,7 @@
if $::realm == 'production' {
$mw_rsync_host = 'tin.eqiad.wmnet'
 
-   $mw_carbon_host = 'professor.pmtpa.wmnet'
+   $mw_carbon_host = 'tungsten.eqiad.wmnet'
$mw_carbon_port = 2003
 
file { $mw_common_source:

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9ef9d6e9228e9e00a633c98e582b5ccb4f6c9186
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon Liambotis 

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

[MediaWiki-commits] [Gerrit] deployment: s/mw_statsd/mw_carbon/ - change (operations/puppet)

2014-01-08 Thread Faidon Liambotis (Code Review) 
Faidon Liambotis has uploaded a new change for review.

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


Change subject: deployment: s/mw_statsd/mw_carbon/
..

deployment: s/mw_statsd/mw_carbon/

Port 2003 is actually Carbon, not statsd, so stop lying and name the
$mw_statsd_{host,port} & MW_STATSD_{HOST,PORT} variables accordingly.

Change-Id: Iec7f90c11e18a8b5c41e004fa6676a58d6d164cf
---
M files/misc/scripts/deploy2graphite
M manifests/misc/deployment.pp
M templates/misc/mw-deployment-vars.erb
3 files changed, 10 insertions(+), 10 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/37/106437/1

diff --git a/files/misc/scripts/deploy2graphite 
b/files/misc/scripts/deploy2graphite
index d6add57..322c5df 100755
--- a/files/misc/scripts/deploy2graphite
+++ b/files/misc/scripts/deploy2graphite
@@ -9,7 +9,7 @@
echo " Expected deploy events include sync-common, sync-file, scap, 
etc."
echo " These messages can be suppressed by setting an environment 
variable $DOLOGMSGNOLOG."
echo ""
-   echo "  IF YOU'RE RUNNING THIS BY HAND, PLEASE STOP.  Go ask Asher why. 
 :)"
+   echo "  IF YOU'RE RUNNING THIS BY HAND, PLEASE STOP."
echo ""
exit
 }
@@ -19,9 +19,9 @@
 if [ -z $DOLOGMSGNOLOG ]; then
if [ "$1" ] ; then
utime="$(date +%s)"
-   echo "deploy.$1 1 $utime" | nc -w1 -q0 $MW_STATSD_HOST 
$MW_STATSD_PORT || /bin/true
-   echo "deploy.any 1 $utime" | nc -w1 -q0 $MW_STATSD_HOST 
$MW_STATSD_PORT || /bin/true
-   test -n "$2" && echo "deploy.${1}.timing:${2}000|ms" | nc -w1 
-q0 $MW_STATSD_HOST $MW_STATSD_PORT || /bin/true
+   echo "deploy.$1 1 $utime" | nc -w1 -q0 $MW_CARBON_HOST 
$MW_CARBON_PORT || /bin/true
+   echo "deploy.any 1 $utime" | nc -w1 -q0 $MW_CARBON_HOST 
$MW_CARBON_PORT || /bin/true
+   test -n "$2" && echo "deploy.${1}.timing:${2}000|ms" | nc -w1 
-q0 $MW_CARBON_HOST $MW_CARBON_PORT || /bin/true
else
usage
fi
diff --git a/manifests/misc/deployment.pp b/manifests/misc/deployment.pp
index 797e74f..e162968 100644
--- a/manifests/misc/deployment.pp
+++ b/manifests/misc/deployment.pp
@@ -371,8 +371,8 @@
if $::realm == 'production' {
$mw_rsync_host = 'tin.eqiad.wmnet'
 
-   $mw_statsd_host = 'professor.pmtpa.wmnet'
-   $mw_statsd_port = 2003
+   $mw_carbon_host = 'professor.pmtpa.wmnet'
+   $mw_carbon_port = 2003
 
file { $mw_common_source:
ensure  => directory,
@@ -384,8 +384,8 @@
} else {
$mw_rsync_host = 'deployment-bastion.pmtpa.wmflabs'
 
-   $mw_statsd_host = 'deployment-bastion.pmtpa.wmflabs'
-   $mw_statsd_port = 2003
+   $mw_carbon_host = 'deployment-bastion.pmtpa.wmflabs'
+   $mw_carbon_port = 2003
 
 # The Apache directories must belong to the mwdeploy user known on
 # deployment-bastion.pmtpa.wmflabs. That is the instance used by
diff --git a/templates/misc/mw-deployment-vars.erb 
b/templates/misc/mw-deployment-vars.erb
index 904cf65..99c07ac 100644
--- a/templates/misc/mw-deployment-vars.erb
+++ b/templates/misc/mw-deployment-vars.erb
@@ -6,5 +6,5 @@
 MW_RSYNC_HOST=<%= mw_rsync_host %>
 MW_DSH_ARGS=('-cM' '-g' 'mediawiki-installation' '-o' '-oSetupTimeout=30' 
'-F30')
 MW_RSYNC_ARGS=('-a' '--delete-delay' '--delay-updates' '--compress' '--delete' 
'--exclude=**/.svn/lock' '--exclude=**/.git/objects' 
'--exclude=**/.git/**/objects' '--exclude=**/cache/l10n/*.cdb' '--no-perms')
-MW_STATSD_HOST=<%= mw_statsd_host %>
-MW_STATSD_PORT=<%= mw_statsd_port %>
+MW_CARBON_HOST=<%= mw_carbon_host %>
+MW_CARBON_PORT=<%= mw_carbon_port %>

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iec7f90c11e18a8b5c41e004fa6676a58d6d164cf
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon Liambotis 

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

[MediaWiki-commits] [Gerrit] Add ability to mark hooks as deprecated - change (mediawiki/core)

2014-01-08 Thread Aude (Code Review) 
Aude has uploaded a new change for review.

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


Change subject: Add ability to mark hooks as deprecated
..

Add ability to mark hooks as deprecated

Change-Id: I8fd29e97a2b5d02746b572a9c315fbe54faf36f2
---
M RELEASE-NOTES-1.23
M includes/GlobalFunctions.php
M includes/Hooks.php
3 files changed, 11 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/36/106436/1

diff --git a/RELEASE-NOTES-1.23 b/RELEASE-NOTES-1.23
index 13d9ff8..019491f 100644
--- a/RELEASE-NOTES-1.23
+++ b/RELEASE-NOTES-1.23
@@ -155,6 +155,7 @@
 * A page_links_updated field has been added to the page table.
 * SpecialPage::getTitle has been deprecated in favor of
   SpecialPage::getPageTitle.
+* Option to mark hooks as deprecated has been added.
 
  Removed classes 
 * TitleDependency
diff --git a/includes/GlobalFunctions.php b/includes/GlobalFunctions.php
index 3250ec8..ab737df 100644
--- a/includes/GlobalFunctions.php
+++ b/includes/GlobalFunctions.php
@@ -4026,10 +4026,12 @@
  *
  * @param string $event event name
  * @param array $args parameters passed to hook functions
+ * @param string|boolean $deprecatedVersion version when hook was deprecated
+ *
  * @return Boolean True if no handler aborted the hook
  */
-function wfRunHooks( $event, array $args = array() ) {
-   return Hooks::run( $event, $args );
+function wfRunHooks( $event, array $args = array(), $deprecatedVersion = false 
) {
+   return Hooks::run( $event, $args, $deprecatedVersion );
 }
 
 /**
diff --git a/includes/Hooks.php b/includes/Hooks.php
index db47d31..8988e0d 100644
--- a/includes/Hooks.php
+++ b/includes/Hooks.php
@@ -124,6 +124,7 @@
 *
 * @param string $event Event name
 * @param array $args  Array of parameters passed to hook functions
+* @param string|boolean $deprecatedVersion Mark hook as deprecated
 * @return bool True if no handler aborted the hook
 *
 * @since 1.22 A hook function is not required to return a value for
@@ -132,7 +133,7 @@
 * @throws MWException
 * @throws FatalError
 */
-   public static function run( $event, array $args = array() ) {
+   public static function run( $event, array $args = array(), 
$deprecatedVersion = false ) {
wfProfileIn( 'hook: ' . $event );
foreach ( self::getHandlers( $event ) as $hook ) {
// Turn non-array values into an array. (Can't use 
casting because of objects.)
@@ -196,6 +197,10 @@
wfProfileIn( $func );
set_error_handler( 'Hooks::hookErrorHandler' );
try {
+   if ( is_string( $deprecatedVersion ) ) {
+   wfDeprecated( "$event hook (used in 
$func)", $deprecatedVersion );
+   }
+
$retval = call_user_func_array( $callback, 
$hook_args );
} catch ( MWHookException $e ) {
$badhookmsg = $e->getMessage();

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

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

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

[MediaWiki-commits] [Gerrit] Modify the Special:LonelyPages query to ignore disambiguatio... - change (mediawiki...Disambiguator)

2014-01-08 Thread Kaldari (Code Review) 
Kaldari has uploaded a new change for review.

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


Change subject: Modify the Special:LonelyPages query to ignore disambiguation 
pages
..

Modify the Special:LonelyPages query to ignore disambiguation pages

Change-Id: I25f7770b04195b8305e9ad679d1df7a41548e22a
Dependencies: Ie8c5765ddc6b6028836024c426a0369e6966b25e
Bug: 3483
---
M Disambiguator.hooks.php
M Disambiguator.php
2 files changed, 15 insertions(+), 0 deletions(-)


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

diff --git a/Disambiguator.hooks.php b/Disambiguator.hooks.php
index 0f7d7e0..27e1870 100644
--- a/Disambiguator.hooks.php
+++ b/Disambiguator.hooks.php
@@ -29,6 +29,20 @@
}
 
/**
+* Modify the Special:LonelyPages query to ignore disambiguation pages
+* @param array &$tables
+* @param array &$conds
+* @param array &$joinConds
+* @return bool
+*/
+   public static function onLonelyPagesQuery( &$tables, &$conds, 
&$joinConds ) {
+   $conds[] = 'NOT EXISTS ( ' .
+   'SELECT page_props.pp_page FROM page_props WHERE 
(page.page_id = page_props.pp_page) AND pp_propname = \'disambiguation\'' .
+   ' )';
+   return true;
+   }
+
+   /**
 * Convenience function for testing whether or not a page is a 
disambiguation page
 * @param object $title Title object of a page
 * @return bool
diff --git a/Disambiguator.php b/Disambiguator.php
index 8281486..214d7db 100644
--- a/Disambiguator.php
+++ b/Disambiguator.php
@@ -51,6 +51,7 @@
 // Register hooks
 $wgHooks['GetDoubleUnderscoreIDs'][] = 
'DisambiguatorHooks::onGetDoubleUnderscoreIDs';
 $wgHooks['wgQueryPages'][] = 'DisambiguatorHooks::onwgQueryPages';
+$wgHooks['LonelyPagesQuery'][] = 'DisambiguatorHooks::onLonelyPagesQuery';
 
 // Register special pages
 $wgSpecialPages['DisambiguationPages'] = 'SpecialDisambiguationPages';

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I25f7770b04195b8305e9ad679d1df7a41548e22a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Disambiguator
Gerrit-Branch: master
Gerrit-Owner: Kaldari 
Gerrit-Reviewer: jenkins-bot

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

[MediaWiki-commits] [Gerrit] Correctly identify lead section - change (mediawiki...MobileFrontend)

2014-01-08 Thread Jdlrobson (Code Review) 
Jdlrobson has uploaded a new change for review.

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


Change subject: Correctly identify lead section
..

Correctly identify lead section

Problem Introduced by: If323ee54e831c8e6dd0c2e8e668a30767d86b8f7
Bug: 59836

Change-Id: Id5c5311dd6bcb4f30a3d1045ec784f349edfc5b5
---
M javascripts/common/application.js
A javascripts/modules/toc/toc.js
2 files changed, 28 insertions(+), 1 deletion(-)


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

diff --git a/javascripts/common/application.js 
b/javascripts/common/application.js
index b81c92d..8ca0a71 100644
--- a/javascripts/common/application.js
+++ b/javascripts/common/application.js
@@ -395,7 +395,7 @@
 * @return {Boolean}
 */
getLeadSection: function() {
-   return $( '#content div' ).eq( 0 );
+   return $( '#content > div > div' ).eq( 0 );
},
getSessionId: getSessionId,
isWideScreen: isWideScreen,
diff --git a/javascripts/modules/toc/toc.js b/javascripts/modules/toc/toc.js
new file mode 100644
index 000..dd1e39d
--- /dev/null
+++ b/javascripts/modules/toc/toc.js
@@ -0,0 +1,27 @@
+//alert('its on');
+( function( M, $ ) {
+var View = M.require( 'View' ), Heading, TableOfContents, toc;
+
+TableOfContents = View.extend( {
+   template: mw.template.get( 'modules/toc/toc' ),
+   defaults: {
+   sections: [
+   'Heading 1',
+   'Heading 2',
+   'Heading 3',
+   'Heading 4',
+   'Heading 5',
+   ]
+   }
+} );
+M.define( 'modules/toc/TableOfContents', TableOfContents );
+
+function init() {
+   var toc = new TableOfContents();
+   console.log( toc );
+   toc.appendTo( M.getLeadSection() );
+}
+$( init );
+M.on( 'page-loaded', init );
+
+}( mw.mobileFrontend, jQuery ) );

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

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

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

[MediaWiki-commits] [Gerrit] contint: support X-Forwarded-Proto for doc website - change (operations/puppet)

2014-01-08 Thread RobH (Code Review) 
RobH has submitted this change and it was merged.

Change subject: contint: support X-Forwarded-Proto for doc website
..


contint: support X-Forwarded-Proto for doc website

Change-Id: I3c38819afb48b9624ed884cbdefca7a082812481
---
M modules/contint/files/apache/doc.wikimedia.org
1 file changed, 12 insertions(+), 1 deletion(-)

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



diff --git a/modules/contint/files/apache/doc.wikimedia.org 
b/modules/contint/files/apache/doc.wikimedia.org
index 87a6fa6..df077cf 100644
--- a/modules/contint/files/apache/doc.wikimedia.org
+++ b/modules/contint/files/apache/doc.wikimedia.org
@@ -39,7 +39,18 @@
ErrorLog /var/log/apache2/doc_error.log
CustomLog /var/log/apache2/doc_access.log vhost_combined
 
-   Redirect permanent / https://doc.wikimedia.org/
+
+   # Force any request to HTTPS if not passed via https (misc web varnish)
+   RewriteEngine On
+   RewriteCond %{HTTP:X-Forwarded-Proto} !https
+   RewriteRule (.) https://doc.wikimedia.org%{REQUEST_URI} [R=301]
+
+   DocumentRoot /srv/org/wikimedia/doc
+
+   # Favicon proxy
+   RewriteEngine On
+   RewriteRule ^/favicon\.ico$ /favicon.php [L]
+
 
 
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I3c38819afb48b9624ed884cbdefca7a082812481
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Hashar 
Gerrit-Reviewer: RobH 
Gerrit-Reviewer: jenkins-bot

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

[MediaWiki-commits] [Gerrit] contint: support X-Forwarded-Proto for doc website - change (operations/puppet)

2014-01-08 Thread Hashar (Code Review) 
Hashar has uploaded a new change for review.

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


Change subject: contint: support X-Forwarded-Proto for doc website
..

contint: support X-Forwarded-Proto for doc website

Change-Id: I3c38819afb48b9624ed884cbdefca7a082812481
---
M modules/contint/files/apache/doc.wikimedia.org
1 file changed, 12 insertions(+), 1 deletion(-)


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

diff --git a/modules/contint/files/apache/doc.wikimedia.org 
b/modules/contint/files/apache/doc.wikimedia.org
index 87a6fa6..df077cf 100644
--- a/modules/contint/files/apache/doc.wikimedia.org
+++ b/modules/contint/files/apache/doc.wikimedia.org
@@ -39,7 +39,18 @@
ErrorLog /var/log/apache2/doc_error.log
CustomLog /var/log/apache2/doc_access.log vhost_combined
 
-   Redirect permanent / https://doc.wikimedia.org/
+
+   # Force any request to HTTPS if not passed via https (misc web varnish)
+   RewriteEngine On
+   RewriteCond %{HTTP:X-Forwarded-Proto} !https
+   RewriteRule (.) https://doc.wikimedia.org%{REQUEST_URI} [R=301]
+
+   DocumentRoot /srv/org/wikimedia/doc
+
+   # Favicon proxy
+   RewriteEngine On
+   RewriteRule ^/favicon\.ico$ /favicon.php [L]
+
 
 
 

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

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

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

[MediaWiki-commits] [Gerrit] Make "application agreement" questions required - change (wikimedia/wikimania-scholarships)

2014-01-08 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged.

Change subject: Make "application agreement" questions required
..


Make "application agreement" questions required

As requested by the 2014 Scholarship committee, the three questions in
the "application agreement" section must now be answered in the
affirmative before the application will be accepted.

Bug: 59819
Change-Id: If3177180d9d3839dfd27465b916ab58ab8286df3
---
M data/templates/apply.html
M src/Wikimania/Scholarship/Forms/Apply.php
2 files changed, 6 insertions(+), 6 deletions(-)

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



diff --git a/data/templates/apply.html b/data/templates/apply.html
index 9e5309c..5d40f27 100644
--- a/data/templates/apply.html
+++ b/data/templates/apply.html
@@ -121,9 +121,9 @@
 
   
 {{ wgLang.message( 'form-agree' ) }}
-{{ forms.checkbox( ctx, 'form-visa', 'willgetvisa', { 'escape':false } ) }}
-{{ forms.checkbox( ctx, 'form-incidentals', 'willpayincidentals' ) }}
-{{ forms.checkbox( ctx, 'form-travel-conditions', 
'agreestotravelconditions' ) }}
+{{ forms.checkbox( ctx, 'form-visa', 'willgetvisa', { 'required':true } ) 
}}
+{{ forms.checkbox( ctx, 'form-incidentals', 'willpayincidentals', { 
'required':true } ) }}
+{{ forms.checkbox( ctx, 'form-travel-conditions', 
'agreestotravelconditions', { 'required':true } ) }}
   
 
   
diff --git a/src/Wikimania/Scholarship/Forms/Apply.php 
b/src/Wikimania/Scholarship/Forms/Apply.php
index cba43f2..152642c 100644
--- a/src/Wikimania/Scholarship/Forms/Apply.php
+++ b/src/Wikimania/Scholarship/Forms/Apply.php
@@ -97,9 +97,9 @@
$this->expectString( 'why', array( 'required' => true ) );
 
// Application agreement
-   $this->expectBool( 'willgetvisa' );
-   $this->expectBool( 'willpayincidentals' );
-   $this->expectBool( 'agreestotravelconditions' );
+   $this->expectTrue( 'willgetvisa' );
+   $this->expectTrue( 'willpayincidentals' );
+   $this->expectTrue( 'agreestotravelconditions' );
 
// Privacy
$this->expectBool( 'chapteragree' );

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

Gerrit-MessageType: merged
Gerrit-Change-Id: If3177180d9d3839dfd27465b916ab58ab8286df3
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/wikimania-scholarships
Gerrit-Branch: master
Gerrit-Owner: BryanDavis 
Gerrit-Reviewer: Aude 
Gerrit-Reviewer: Chad 
Gerrit-Reviewer: jenkins-bot

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

[MediaWiki-commits] [Gerrit] contint: copy/paste website conf for http - change (operations/puppet)

2014-01-08 Thread RobH (Code Review) 
RobH has submitted this change and it was merged.

Change subject: contint: copy/paste website conf for http
..


contint: copy/paste website conf for http

Change-Id: I0d612ea4b7d700193153757d4fa9a7c6bbf63b20
---
M modules/contint/templates/apache/integration.wikimedia.org.erb
1 file changed, 56 insertions(+), 0 deletions(-)

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



diff --git a/modules/contint/templates/apache/integration.wikimedia.org.erb 
b/modules/contint/templates/apache/integration.wikimedia.org.erb
index ea51911..8fe94f8 100644
--- a/modules/contint/templates/apache/integration.wikimedia.org.erb
+++ b/modules/contint/templates/apache/integration.wikimedia.org.erb
@@ -17,6 +17,62 @@
RewriteCond %{HTTP:X-Forwarded-Proto} !https
RewriteRule (.) https://integration.wikimedia.org%{REQUEST_URI} [R=301]
 
+   DocumentRoot /srv/org/wikimedia/integration
+   RewriteRule ^/favicon\.ico$ /favicon.php [L]
+
+   Include *_proxy
+
+   
+   Order Deny,Allow
+   AllowOverride All
+   
+
+   
+   Options FollowSymLinks
+   AllowOverride All
+   Order allow,deny
+   allow from all
+   
+
+   
+   # Let people browse the console logs
+   Options +Indexes
+   
+
+   
+   Options +Indexes
+   IndexOptions FancyIndexing
+   IndexOptions SuppressIcon
+   IndexOptions SuppressRules
+   IndexOptions SuppressDescription
+   IndexOptions SuppressHTMLPreamble
+   IndexOptions HTMLTable
+   IndexOptions VersionSort
+   IndexOptions NameWidth=*
+
+   ServerSignature Off
+
+   IndexStyleSheet "../../nightly.css"
+   HeaderName "HEADER.html"
+   ReadmeName "README.html"
+   IndexIgnore "*.html" ".."
+   
+
+   # Generic nightly builds, no specific HTML there
+   
+   Options +Indexes
+   IndexOptions FancyIndexing
+   IndexOptions SuppressDescription
+   IndexOptions HTMLTable
+   IndexOptions VersionSort
+   IndexOptions NameWidth=*
+   
+
+   
+   IndexOrderDefault Descending Date
+   
+
+
 
 
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I0d612ea4b7d700193153757d4fa9a7c6bbf63b20
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Hashar 
Gerrit-Reviewer: RobH 
Gerrit-Reviewer: jenkins-bot

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

[MediaWiki-commits] [Gerrit] contint: copy/paste website conf for http - change (operations/puppet)

2014-01-08 Thread Hashar (Code Review) 
Hashar has uploaded a new change for review.

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


Change subject: contint: copy/paste website conf for http
..

contint: copy/paste website conf for http

Change-Id: I0d612ea4b7d700193153757d4fa9a7c6bbf63b20
---
M modules/contint/templates/apache/integration.wikimedia.org.erb
1 file changed, 56 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/32/106432/1

diff --git a/modules/contint/templates/apache/integration.wikimedia.org.erb 
b/modules/contint/templates/apache/integration.wikimedia.org.erb
index ea51911..8fe94f8 100644
--- a/modules/contint/templates/apache/integration.wikimedia.org.erb
+++ b/modules/contint/templates/apache/integration.wikimedia.org.erb
@@ -17,6 +17,62 @@
RewriteCond %{HTTP:X-Forwarded-Proto} !https
RewriteRule (.) https://integration.wikimedia.org%{REQUEST_URI} [R=301]
 
+   DocumentRoot /srv/org/wikimedia/integration
+   RewriteRule ^/favicon\.ico$ /favicon.php [L]
+
+   Include *_proxy
+
+   
+   Order Deny,Allow
+   AllowOverride All
+   
+
+   
+   Options FollowSymLinks
+   AllowOverride All
+   Order allow,deny
+   allow from all
+   
+
+   
+   # Let people browse the console logs
+   Options +Indexes
+   
+
+   
+   Options +Indexes
+   IndexOptions FancyIndexing
+   IndexOptions SuppressIcon
+   IndexOptions SuppressRules
+   IndexOptions SuppressDescription
+   IndexOptions SuppressHTMLPreamble
+   IndexOptions HTMLTable
+   IndexOptions VersionSort
+   IndexOptions NameWidth=*
+
+   ServerSignature Off
+
+   IndexStyleSheet "../../nightly.css"
+   HeaderName "HEADER.html"
+   ReadmeName "README.html"
+   IndexIgnore "*.html" ".."
+   
+
+   # Generic nightly builds, no specific HTML there
+   
+   Options +Indexes
+   IndexOptions FancyIndexing
+   IndexOptions SuppressDescription
+   IndexOptions HTMLTable
+   IndexOptions VersionSort
+   IndexOptions NameWidth=*
+   
+
+   
+   IndexOrderDefault Descending Date
+   
+
+
 
 
 

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

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

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

[MediaWiki-commits] [Gerrit] Breaking Change: All lower case excludedtitle for consistency - change (mediawiki...GettingStarted)

2014-01-08 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged.

Change subject: Breaking Change: All lower case excludedtitle for consistency
..


Breaking Change: All lower case excludedtitle for consistency

This is the standard for the MW API.  See, for example,
https://www.mediawiki.org/wiki/API:Query

Change-Id: If2835fe099ba0455c721828d579027bda1772a8a
---
M SpecialGettingStarted.php
M api/ApiGettingStartedGetPages.php
2 files changed, 5 insertions(+), 5 deletions(-)

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



diff --git a/SpecialGettingStarted.php b/SpecialGettingStarted.php
index 9f11c23..13d8707 100644
--- a/SpecialGettingStarted.php
+++ b/SpecialGettingStarted.php
@@ -43,7 +43,7 @@
array(
'action' => 'gettingstartedgetpages',
'taskname' => $taskName,
-   'excludedTitle' => $this->getRequest()->getVal( 
'exclude' ),
+   'excludedtitle' => $this->getRequest()->getVal( 
'exclude' ),
'count' => 1,
),
false // GET request
diff --git a/api/ApiGettingStartedGetPages.php 
b/api/ApiGettingStartedGetPages.php
index b1fcc22..f19b1d0 100644
--- a/api/ApiGettingStartedGetPages.php
+++ b/api/ApiGettingStartedGetPages.php
@@ -16,7 +16,7 @@
$user = $this->getUser();
 
$taskName = $this->getParameter( 'taskname' );
-   $excludedTitle = Title::newFromText( $this->getParameter( 
'excludedTitle' ) );
+   $excludedTitle = Title::newFromText( $this->getParameter( 
'excludedtitle' ) );
$count = $this->getParameter( 'count' );
 
if ( !isset( $wgGettingStartedTasks[$taskName] ) ) {
@@ -99,7 +99,7 @@
public function getParamDescription() {
return array(
'taskname' => 'Task name, for example, "copyedit"',
-   'excludedTitle' => 'Full title of a page to exclude 
from the list',
+   'excludedtitle' => 'Full title of a page to exclude 
from the list',
'count' => 'Requested count; will attempt to fetch this 
exact number, but may fetch fewer if no more are found after multiple attempts'
);
}
@@ -110,7 +110,7 @@
ApiBase::PARAM_TYPE => 'string',
ApiBase::PARAM_REQUIRED => true,
),
-   'excludedTitle' => array(
+   'excludedtitle' => array(
ApiBase::PARAM_TYPE => 'string',
ApiBase::PARAM_REQUIRED => false,
),
@@ -123,7 +123,7 @@
 
public function getExamples() {
return array(
-   
'api.php?action=gettingstartedgetpages&taskname=copyedit&excludedTitle=Earth&count=1',
+   
'api.php?action=gettingstartedgetpages&taskname=copyedit&excludedtitle=Earth&count=1',
);
}
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: If2835fe099ba0455c721828d579027bda1772a8a
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/GettingStarted
Gerrit-Branch: master
Gerrit-Owner: Mattflaschen 
Gerrit-Reviewer: JGonera 
Gerrit-Reviewer: Jdlrobson 
Gerrit-Reviewer: Kaldari 
Gerrit-Reviewer: Mattflaschen 
Gerrit-Reviewer: MaxSem 
Gerrit-Reviewer: Ori.livneh 
Gerrit-Reviewer: Phuedx 
Gerrit-Reviewer: Swalling 
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 "or other" option for stubtreshold - change (mediawiki/core)

2014-01-08 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged.

Change subject: Remove "or other" option for stubtreshold
..


Remove "or other" option for stubtreshold

People use this to set it to absolutely insane values.

Enwiki-Stats: http://p.defau.lt/?1j4omOrfCZzQvIJ_z_dOEQ
Change-Id: I88212703c69d0540f3134f661beee6c1428932a9
---
M includes/Preferences.php
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/includes/Preferences.php b/includes/Preferences.php
index 3ff99fc..8e08fc1 100644
--- a/includes/Preferences.php
+++ b/includes/Preferences.php
@@ -748,7 +748,7 @@
}
 
$defaultPreferences['stubthreshold'] = array(
-   'type' => 'selectorother',
+   'type' => 'select',
'section' => 'rendering/advancedrendering',
'options' => $stubThresholdOptions,
'size' => 20,

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I88212703c69d0540f3134f661beee6c1428932a9
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Chad 
Gerrit-Reviewer: Aaron Schulz 
Gerrit-Reviewer: Anomie 
Gerrit-Reviewer: Bartosz Dziewoński 
Gerrit-Reviewer: Chad 
Gerrit-Reviewer: Nemo bis 
Gerrit-Reviewer: Parent5446 
Gerrit-Reviewer: jenkins-bot

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

[MediaWiki-commits] [Gerrit] contint: rewrite rule needs 'RewriteEngine On' - change (operations/puppet)

2014-01-08 Thread RobH (Code Review) 
RobH has submitted this change and it was merged.

Change subject: contint: rewrite rule needs 'RewriteEngine On'
..


contint: rewrite rule needs 'RewriteEngine On'

Change-Id: If83a57bb4dec5a2c8148f31ba545559c00b6546f
---
M modules/contint/templates/apache/integration.wikimedia.org.erb
1 file changed, 1 insertion(+), 0 deletions(-)

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



diff --git a/modules/contint/templates/apache/integration.wikimedia.org.erb 
b/modules/contint/templates/apache/integration.wikimedia.org.erb
index 6341ef4..ea51911 100644
--- a/modules/contint/templates/apache/integration.wikimedia.org.erb
+++ b/modules/contint/templates/apache/integration.wikimedia.org.erb
@@ -13,6 +13,7 @@
CustomLog /var/log/apache2/integration_access.log vhost_combined
 
# Force any request to HTTPS if not passed via https (misc web varnish)
+   RewriteEngine On
RewriteCond %{HTTP:X-Forwarded-Proto} !https
RewriteRule (.) https://integration.wikimedia.org%{REQUEST_URI} [R=301]
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: If83a57bb4dec5a2c8148f31ba545559c00b6546f
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Hashar 
Gerrit-Reviewer: RobH 
Gerrit-Reviewer: jenkins-bot

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

  1   2   3   4   >