date:20130911

[MediaWiki-commits] [Gerrit] add - method for scping. - change (sartoris)

2013-09-11 Thread Rfaulk (Code Review)

Rfaulk has submitted this change and it was merged.

Change subject: add - method for scping.
..


add - method for scping.

Change-Id: If89d69f76b5851573d5f3366c9897dc807a1cae0
---
M sartoris/sartoris.py
1 file changed, 40 insertions(+), 3 deletions(-)

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



diff --git a/sartoris/sartoris.py b/sartoris/sartoris.py
index ad6c1d7..fb3db55 100755
--- a/sartoris/sartoris.py
+++ b/sartoris/sartoris.py
@@ -13,13 +13,17 @@
 
 import os
 import stat
+import paramiko
+import socket
 from re import search
 import subprocess
-from dulwich.repo import Repo
-from dulwich.objects import Tag, Commit, parse_timezone
-from datetime import datetime
 import json
 from time import time
+from datetime import datetime
+
+from dulwich.repo import Repo
+from dulwich.objects import Tag, Commit, parse_timezone
+
 from config import log, configure, exit_codes
 
 
@@ -390,6 +394,39 @@
 log.info('PULL -> ' + '; '.join(
 filter(lambda x: x, proc.communicate(
 
+@staticmethod
+def scp_file(source, target, user, password, host):
+"""
+SCP files via paramiko.
+"""
+
+# Socket connection to remote host
+sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
+sock.connect((host, 22))
+
+# Build a SSH transport
+t = paramiko.Transport(sock)
+t.start_client()
+t.auth_password(user, password)
+
+# Start a scp channel
+scp_channel = t.open_session()
+
+f = file(source, 'rb')
+scp_channel.exec_command('scp -v -t %s\n'
+ % '/'.join(target.split('/')[:-1]))
+scp_channel.send('C%s %d %s\n'
+ % (oct(os.stat(source).st_mode)[-4:],
+ os.stat(source)[6],
+ target.split('/')[-1]))
+scp_channel.sendall(f.read())
+
+# Cleanup
+f.close()
+scp_channel.close()
+t.close()
+sock.close()
+
 def resync(self, args):
 """
 * write a lock file

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

Gerrit-MessageType: merged
Gerrit-Change-Id: If89d69f76b5851573d5f3366c9897dc807a1cae0
Gerrit-PatchSet: 1
Gerrit-Project: sartoris
Gerrit-Branch: master
Gerrit-Owner: Rfaulk 
Gerrit-Reviewer: Rfaulk 
Gerrit-Reviewer: jenkins-bot

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

[MediaWiki-commits] [Gerrit] add - method for scping. - change (sartoris)

2013-09-11 Thread Rfaulk (Code Review)

Rfaulk has uploaded a new change for review.

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


Change subject: add - method for scping.
..

add - method for scping.

Change-Id: If89d69f76b5851573d5f3366c9897dc807a1cae0
---
M sartoris/sartoris.py
1 file changed, 40 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/sartoris refs/changes/87/83987/1

diff --git a/sartoris/sartoris.py b/sartoris/sartoris.py
index ad6c1d7..fb3db55 100755
--- a/sartoris/sartoris.py
+++ b/sartoris/sartoris.py
@@ -13,13 +13,17 @@
 
 import os
 import stat
+import paramiko
+import socket
 from re import search
 import subprocess
-from dulwich.repo import Repo
-from dulwich.objects import Tag, Commit, parse_timezone
-from datetime import datetime
 import json
 from time import time
+from datetime import datetime
+
+from dulwich.repo import Repo
+from dulwich.objects import Tag, Commit, parse_timezone
+
 from config import log, configure, exit_codes
 
 
@@ -390,6 +394,39 @@
 log.info('PULL -> ' + '; '.join(
 filter(lambda x: x, proc.communicate(
 
+@staticmethod
+def scp_file(source, target, user, password, host):
+"""
+SCP files via paramiko.
+"""
+
+# Socket connection to remote host
+sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
+sock.connect((host, 22))
+
+# Build a SSH transport
+t = paramiko.Transport(sock)
+t.start_client()
+t.auth_password(user, password)
+
+# Start a scp channel
+scp_channel = t.open_session()
+
+f = file(source, 'rb')
+scp_channel.exec_command('scp -v -t %s\n'
+ % '/'.join(target.split('/')[:-1]))
+scp_channel.send('C%s %d %s\n'
+ % (oct(os.stat(source).st_mode)[-4:],
+ os.stat(source)[6],
+ target.split('/')[-1]))
+scp_channel.sendall(f.read())
+
+# Cleanup
+f.close()
+scp_channel.close()
+t.close()
+sock.close()
+
 def resync(self, args):
 """
 * write a lock file

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: If89d69f76b5851573d5f3366c9897dc807a1cae0
Gerrit-PatchSet: 1
Gerrit-Project: sartoris
Gerrit-Branch: master
Gerrit-Owner: Rfaulk 

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

[MediaWiki-commits] [Gerrit] add - ssh_command method. - change (sartoris)

2013-09-11 Thread Rfaulk (Code Review)

Rfaulk has submitted this change and it was merged.

Change subject: add - ssh_command method.
..


add - ssh_command method.

Change-Id: I6fb6a7464657afd00dd03eca364e12a9368df860
---
M sartoris/sartoris.py
1 file changed, 33 insertions(+), 0 deletions(-)

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



diff --git a/sartoris/sartoris.py b/sartoris/sartoris.py
index fb3db55..a3229a5 100755
--- a/sartoris/sartoris.py
+++ b/sartoris/sartoris.py
@@ -427,6 +427,39 @@
 t.close()
 sock.close()
 
+@staticmethod
+def ssh_command(cmd, host, port, user, password, nbytes=1000):
+
+# Initialize connection
+client = paramiko.Transport((host, port))
+client.connect(username=user, password=password)
+
+# Prepare stream lists, open session, exec command
+stdout_data = []
+stderr_data = []
+session = client.open_channel(kind='session')
+session.exec_command(cmd)
+
+# Read output
+while True:
+if session.recv_ready():
+stdout_data.append(session.recv(nbytes))
+if session.recv_stderr_ready():
+stderr_data.append(session.recv_stderr(nbytes))
+if session.exit_status_ready():
+break
+
+# Get exit status and close sessions
+exit_status = session.recv_exit_status()
+session.close()
+client.close()
+
+return {
+'exit_status': exit_status,
+'stdout': ''.join(stdout_data),
+'stderr': ''.join(stderr_data),
+}
+
 def resync(self, args):
 """
 * write a lock file

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I6fb6a7464657afd00dd03eca364e12a9368df860
Gerrit-PatchSet: 1
Gerrit-Project: sartoris
Gerrit-Branch: master
Gerrit-Owner: Rfaulk 
Gerrit-Reviewer: Rfaulk 
Gerrit-Reviewer: jenkins-bot

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

[MediaWiki-commits] [Gerrit] add - ssh_command method. - change (sartoris)

2013-09-11 Thread Rfaulk (Code Review)

Rfaulk has uploaded a new change for review.

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


Change subject: add - ssh_command method.
..

add - ssh_command method.

Change-Id: I6fb6a7464657afd00dd03eca364e12a9368df860
---
M sartoris/sartoris.py
1 file changed, 33 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/sartoris refs/changes/88/83988/1

diff --git a/sartoris/sartoris.py b/sartoris/sartoris.py
index fb3db55..a3229a5 100755
--- a/sartoris/sartoris.py
+++ b/sartoris/sartoris.py
@@ -427,6 +427,39 @@
 t.close()
 sock.close()
 
+@staticmethod
+def ssh_command(cmd, host, port, user, password, nbytes=1000):
+
+# Initialize connection
+client = paramiko.Transport((host, port))
+client.connect(username=user, password=password)
+
+# Prepare stream lists, open session, exec command
+stdout_data = []
+stderr_data = []
+session = client.open_channel(kind='session')
+session.exec_command(cmd)
+
+# Read output
+while True:
+if session.recv_ready():
+stdout_data.append(session.recv(nbytes))
+if session.recv_stderr_ready():
+stderr_data.append(session.recv_stderr(nbytes))
+if session.exit_status_ready():
+break
+
+# Get exit status and close sessions
+exit_status = session.recv_exit_status()
+session.close()
+client.close()
+
+return {
+'exit_status': exit_status,
+'stdout': ''.join(stdout_data),
+'stderr': ''.join(stderr_data),
+}
+
 def resync(self, args):
 """
 * write a lock file

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6fb6a7464657afd00dd03eca364e12a9368df860
Gerrit-PatchSet: 1
Gerrit-Project: sartoris
Gerrit-Branch: master
Gerrit-Owner: Rfaulk 

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

[MediaWiki-commits] [Gerrit] Remove convertPlural methods already served by CLDR plural s... - change (mediawiki/core)

2013-09-11 Thread Santhosh (Code Review)

Santhosh has uploaded a new change for review.

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


Change subject: Remove convertPlural methods already served by CLDR plural 
system
..

Remove convertPlural methods already served by CLDR plural system

There are some more language classes with convertPlural methods,
but they need some careful removal.

Change-Id: Idbcb397f750fb463608de4396018dadb6fccc9a7
---
M languages/classes/LanguageCu.php
D languages/classes/LanguageHi.php
D languages/classes/LanguageMg.php
D languages/classes/LanguageMt.php
M languages/classes/LanguagePl.php
D languages/classes/LanguageSh.php
D languages/classes/LanguageSk.php
D languages/classes/LanguageTi.php
D languages/classes/LanguageTl.php
M languages/classes/LanguageWa.php
10 files changed, 0 insertions(+), 415 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/86/83986/1

diff --git a/languages/classes/LanguageCu.php b/languages/classes/LanguageCu.php
index 454ce34..60cf2b1 100644
--- a/languages/classes/LanguageCu.php
+++ b/languages/classes/LanguageCu.php
@@ -63,24 +63,4 @@
}
return $word;
}
-
-   /**
-* @param $count int
-* @param $forms array
-* @return string
-*/
-   function convertPlural( $count, $forms ) {
-   if ( !count( $forms ) ) {
-   return '';
-   }
-   $forms = $this->preConvertPlural( $forms, 4 );
-
-   switch ( $count % 10 ) {
-   case 1: return $forms[0];
-   case 2: return $forms[1];
-   case 3:
-   case 4: return $forms[2];
-   default: return $forms[3];
-   }
-   }
 }
diff --git a/languages/classes/LanguageHi.php b/languages/classes/LanguageHi.php
deleted file mode 100644
index 6f7edb4..000
--- a/languages/classes/LanguageHi.php
+++ /dev/null
@@ -1,46 +0,0 @@
-http://www.gnu.org/copyleft/gpl.html
- *
- * @file
- * @ingroup Language
- */
-
-/**
- * Hindi (हिन्दी)
- *
- * @ingroup Language
- */
-class LanguageHi extends Language {
-   /**
-* Use singular form for zero
-*
-* @param $count int
-* @param $forms array
-*
-* @return string
-*/
-   function convertPlural( $count, $forms ) {
-   if ( !count( $forms ) ) {
-   return '';
-   }
-   $forms = $this->preConvertPlural( $forms, 2 );
-
-   return ( $count <= 1 ) ? $forms[0] : $forms[1];
-   }
-}
diff --git a/languages/classes/LanguageMg.php b/languages/classes/LanguageMg.php
deleted file mode 100644
index bf6800c..000
--- a/languages/classes/LanguageMg.php
+++ /dev/null
@@ -1,46 +0,0 @@
-http://www.gnu.org/copyleft/gpl.html
- *
- * @file
- * @ingroup Language
- */
-
-/**
- * Malagasy (Malagasy)
- *
- * @ingroup Language
- */
-class LanguageMg extends Language {
-   /**
-* Use singular form for zero
-*
-* @param $count int
-* @param $forms array
-*
-* @return string
-*/
-   function convertPlural( $count, $forms ) {
-   if ( !count( $forms ) ) {
-   return '';
-   }
-   $forms = $this->preConvertPlural( $forms, 2 );
-
-   return ( $count <= 1 ) ? $forms[0] : $forms[1];
-   }
-}
diff --git a/languages/classes/LanguageMt.php b/languages/classes/LanguageMt.php
deleted file mode 100644
index 20213a8..000
--- a/languages/classes/LanguageMt.php
+++ /dev/null
@@ -1,55 +0,0 @@
-http://www.gnu.org/copyleft/gpl.html
- *
- * @file
- * @author Niklas Laxström
- * @ingroup Language
- */
-
-/**
- * Maltese (Malti)
- *
- * @ingroup Language
- */
-class LanguageMt extends Language {
-
-   /**
-* @param $count int
-* @param $forms array
-* @return string
-*/
-   function convertPlural( $count, $forms ) {
-   if ( !count( $forms ) ) {
-   return '';
-   }
-
-   $forms = $this->preConvertPlural( $forms, 4 );
-
-   if ( $count == 1 ) {
-   $index = 0;
-   } elseif ( $count == 0 || ( $count % 100 > 1 && $count % 100 < 
11 ) ) {
-   $index = 1;
-   } elseif ( $count % 100 > 10 && $count % 100 < 20 ) {
-   $index = 2;
-   } else {
-   $index = 3;
-   }
-   return $forms[$index];
-   }
-}
diff --git a/languages/classes/LanguagePl.php b/languages/classes/LanguagePl.php
index e15c9e2..8e286c9 100644
--- a/languages/classes/LanguagePl.php
+++ b/languages/classes/LanguagePl.php
@@ -27,33 +27,6 @@
  * @ingroup Language
  */
 class LanguagePl extends Language {
-
-   /**
-* @param $count string
-

[MediaWiki-commits] [Gerrit] \SMW\FunctionHookRegistry register WebRequest object - change (mediawiki...SemanticMediaWiki)

2013-09-11 Thread Mwjames (Code Review)

Mwjames has uploaded a new change for review.

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


Change subject: \SMW\FunctionHookRegistry register WebRequest object
..

\SMW\FunctionHookRegistry register WebRequest object

This will enable hooks to decide if for example they should run during
->getVal( 'action' ) === 'edit' which doesn't make most sense because the
data object related to SMW while in 'edit' mode is empty and running object
initialization on an empty object is a waste of resources.

Each hook should check against ...->getVal( 'action' ) !== 'edit'

Change-Id: I07b969827dd671d7887a0db22e6e5cffeae24d4b
---
M includes/hooks/FunctionHookRegistry.php
M includes/hooks/InternalParseBeforeLinks.php
M tests/phpunit/includes/hooks/InternalParseBeforeLinksTest.php
3 files changed, 56 insertions(+), 14 deletions(-)


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

diff --git a/includes/hooks/FunctionHookRegistry.php 
b/includes/hooks/FunctionHookRegistry.php
index 2ed851f..5ebf72f 100644
--- a/includes/hooks/FunctionHookRegistry.php
+++ b/includes/hooks/FunctionHookRegistry.php
@@ -2,6 +2,8 @@
 
 namespace SMW;
 
+use RequestContext;
+
 /**
  * Register a function hook
  *
@@ -30,7 +32,27 @@
 * @return FunctionHook
 */
public static function register( FunctionHook $hook ) {
-   $hook->setDependencyBuilder( new SimpleDependencyBuilder( new 
SharedDependencyContainer() ) );
+
+   /**
+* @var SharedDependencyContainer $container
+*/
+   $container = new SharedDependencyContainer();
+
+   /**
+* Register a WebRequest object
+*
+* Each hook implementation should check the WebRequest for 
something
+* like getVal( 'action' ) !== 'edit' which avoids having it 
run during
+* editing where initializing of objects bears no value for the 
data
+* interface.
+*
+* @note We explicitly do not return a Context object here as 
this
+* should be available through the invoked hook itself.
+*/
+   $container->registerObject( 'WebRequest', 
RequestContext::getMain()->getRequest() );
+
+   $hook->setDependencyBuilder( new SimpleDependencyBuilder( 
$container ) );
+
return $hook;
}
 
diff --git a/includes/hooks/InternalParseBeforeLinks.php 
b/includes/hooks/InternalParseBeforeLinks.php
index 2d163c6..84ca0be 100644
--- a/includes/hooks/InternalParseBeforeLinks.php
+++ b/includes/hooks/InternalParseBeforeLinks.php
@@ -87,7 +87,13 @@
 * @return true
 */
public function process() {
-   return !$this->parser->getTitle()->isSpecialPage() ? 
$this->performUpdate( $this->parser->getTitle() ) : true;
+
+   /**
+* @var WebRequest $request
+*/
+   $request = $this->getDependencyBuilder()->newObject( 
'WebRequest' );
+
+   return !$this->parser->getTitle()->isSpecialPage() && 
$request->getVal( 'action' ) !== 'edit' ? $this->performUpdate( 
$this->parser->getTitle() ) : true;
}
 
 }
diff --git a/tests/phpunit/includes/hooks/InternalParseBeforeLinksTest.php 
b/tests/phpunit/includes/hooks/InternalParseBeforeLinksTest.php
index 426e17b..186ae1b 100644
--- a/tests/phpunit/includes/hooks/InternalParseBeforeLinksTest.php
+++ b/tests/phpunit/includes/hooks/InternalParseBeforeLinksTest.php
@@ -47,14 +47,17 @@
 *
 * @return InternalParseBeforeLinks
 */
-   public function newInstance( &$parser = null, &$text = '' ) {
+   public function newInstance( &$parser = null, &$text = '', $request = 
array() ) {
 
if ( $parser === null ) {
$parser = $this->newParser( $this->newTitle(), 
$this->getUser() );
}
 
+   $container = new SharedDependencyContainer();
+   $container->registerObject( 'WebRequest', $this->newContext( 
$request )->getRequest() );
+
$instance = new InternalParseBeforeLinks( $parser, $text );
-   $instance->setDependencyBuilder( $this->newDependencyBuilder( 
new SharedDependencyContainer() ) );
+   $instance->setDependencyBuilder( $this->newDependencyBuilder( 
$container ) );
 
return $instance;
}
@@ -74,13 +77,14 @@
 *
 * @since 1.9
 */
-   public function testProcess( $title ) {
+   public function testProcess( $title, $request ) {
 
+   $text   = '';
$parser = $this->newParser( $title, $this->getUser() );
 
$this->assertTrue(
-   $this->newInstance( $parser )->process(),
-   'asserts that process() always re

[MediaWiki-commits] [Gerrit] Move php to php-1.22wmf16 - change (operations/mediawiki-config)

2013-09-11 Thread jenkins-bot (Code Review)

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

Change subject: Move php to php-1.22wmf16
..


Move php to php-1.22wmf16

Change-Id: I5022d851772e62fc4db289da898e51398f5aa737
---
M php
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/php b/php
index 17d06a3..a9092d4 12
--- a/php
+++ b/php
@@ -1 +1 @@
-php-1.22wmf15
\ No newline at end of file
+php-1.22wmf16
\ No newline at end of file

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

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

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

[MediaWiki-commits] [Gerrit] Move php to php-1.22wmf16 - change (operations/mediawiki-config)

2013-09-11 Thread Reedy (Code Review)

Reedy has uploaded a new change for review.

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


Change subject: Move php to php-1.22wmf16
..

Move php to php-1.22wmf16

Change-Id: I5022d851772e62fc4db289da898e51398f5aa737
---
M php
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/php b/php
index 17d06a3..a9092d4 12
--- a/php
+++ b/php
@@ -1 +1 @@
-php-1.22wmf15
\ No newline at end of file
+php-1.22wmf16
\ No newline at end of file

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

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

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

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

2013-09-11 Thread Reedy (Code Review)

Reedy has submitted this change and it was merged.

Change subject: Update TemplateData to master
..


Update TemplateData to master

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

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



diff --git a/extensions/TemplateData b/extensions/TemplateData
index d66b4c6..8dc157b 16
--- a/extensions/TemplateData
+++ b/extensions/TemplateData
-Subproject commit d66b4c60905311ca9f4d28f37022dcf9ef9feab4
+Subproject commit 8dc157bc091ebb34911dfefd8bb4b483d2b7782d

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I3caa5242be5ef623146a0f50518e0e8f747b447f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.22wmf16
Gerrit-Owner: Reedy 
Gerrit-Reviewer: Reedy 

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

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

2013-09-11 Thread Reedy (Code Review)

Reedy has uploaded a new change for review.

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


Change subject: Update TemplateData to master
..

Update TemplateData to master

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


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/83/83983/1

diff --git a/extensions/TemplateData b/extensions/TemplateData
index d66b4c6..8dc157b 16
--- a/extensions/TemplateData
+++ b/extensions/TemplateData
-Subproject commit d66b4c60905311ca9f4d28f37022dcf9ef9feab4
+Subproject commit 8dc157bc091ebb34911dfefd8bb4b483d2b7782d

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I3caa5242be5ef623146a0f50518e0e8f747b447f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.22wmf16
Gerrit-Owner: Reedy 

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

[MediaWiki-commits] [Gerrit] Test gzdecode() in TemplateDataBlob::newFromDatabase() - change (mediawiki...TemplateData)

2013-09-11 Thread jenkins-bot (Code Review)

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

Change subject: Test gzdecode() in TemplateDataBlob::newFromDatabase()
..


Test gzdecode() in TemplateDataBlob::newFromDatabase()

gzdecode() has been introduced in PHP 5.4 although gzencode() has been
there for a while.  Wikimedia is still using PHP 5.3, so the
TemplateDataBlob::newFromDatabase() would trigger a fatal error whenever
it is passed compressed JSON :-(

The test does not fix the root cause (that needs a fallback function in
the TemplateData extension), but it does highlight the issue in PHP 5.3.x.

Updated a @return comment, correcting the class being returned.

bug: 54058
Change-Id: I8357b474165f4317982b9c924cf0afe68650d677
---
M TemplateDataBlob.php
M tests/TemplateDataBlobTest.php
2 files changed, 17 insertions(+), 1 deletion(-)

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



diff --git a/TemplateDataBlob.php b/TemplateDataBlob.php
index 9270c32..d41b4dd 100644
--- a/TemplateDataBlob.php
+++ b/TemplateDataBlob.php
@@ -31,7 +31,7 @@
 *
 * @param string $json
 * @throws MWException
-* @return TemplateInfo
+* @return TemplateDataBlob
 */
public static function newFromJSON( $json ) {
$tdb = new self( json_decode( $json ) );
diff --git a/tests/TemplateDataBlobTest.php b/tests/TemplateDataBlobTest.php
index 712d84a..37b371f 100644
--- a/tests/TemplateDataBlobTest.php
+++ b/tests/TemplateDataBlobTest.php
@@ -381,4 +381,20 @@
$cases['msg']
);
}
+
+   /**
+* Verify we can gzdecode() which came in PHP 5.4.0. Mediawiki needs a
+* fallback function for it.
+* If this test fail, we are most probably attempting to use gzdecode()
+* with PHP before 5.4.
+*
+* @see bug 54058
+*/
+   public function testGetJsonForDatabase() {
+   // Compress JSON to trigger the code pass in newFromDatabase 
that ends
+   // up calling gzdecode().
+   $gzJson = gzencode( '{}' );
+   $templateInfo = TemplateDataBlob::newFromDatabase( $gzJson );
+   $this->assertInstanceOf( 'TemplateDataBlob', $templateInfo );
+   }
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I8357b474165f4317982b9c924cf0afe68650d677
Gerrit-PatchSet: 6
Gerrit-Project: mediawiki/extensions/TemplateData
Gerrit-Branch: master
Gerrit-Owner: Hashar 
Gerrit-Reviewer: Reedy 
Gerrit-Reviewer: jenkins-bot

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

[MediaWiki-commits] [Gerrit] Transactions: Add trailing retainMetadata when there is trai... - change (mediawiki...VisualEditor)

2013-09-11 Thread jenkins-bot (Code Review)

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

Change subject: Transactions: Add trailing retainMetadata when there is 
trailing metadata.
..


Transactions: Add trailing retainMetadata when there is trailing metadata.

Ensure that all transactions move the cursor past the trailing
metadata, if present.

Change-Id: I869c75f8cfabe1e14bb66d8e627d0b750bde46af
---
M modules/ve/dm/ve.dm.Transaction.js
M modules/ve/test/dm/ve.dm.Transaction.test.js
2 files changed, 43 insertions(+), 23 deletions(-)

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



diff --git a/modules/ve/dm/ve.dm.Transaction.js 
b/modules/ve/dm/ve.dm.Transaction.js
index 9ba29e1..22f3fe7 100644
--- a/modules/ve/dm/ve.dm.Transaction.js
+++ b/modules/ve/dm/ve.dm.Transaction.js
@@ -30,8 +30,7 @@
  * @returns {ve.dm.Transaction} Transaction that inserts data
  */
 ve.dm.Transaction.newFromInsertion = function ( doc, offset, insertion ) {
-   var tx = new ve.dm.Transaction(),
-   data = doc.data;
+   var tx = new ve.dm.Transaction();
// Fix up the insertion
insertion = doc.fixupInsertion( insertion, offset );
// Retain up to insertion point, if needed
@@ -39,7 +38,7 @@
// Insert data
tx.pushReplace( doc, insertion.offset, insertion.remove, insertion.data 
);
// Retain to end of document, if needed (for completeness)
-   tx.pushRetain( data.getLength() - ( insertion.offset + insertion.remove 
) );
+   tx.pushFinalRetain( doc, insertion.offset + insertion.remove );
return tx;
 };
 
@@ -72,12 +71,11 @@
offset = 0,
removeStart = null,
removeEnd = null,
-   tx = new ve.dm.Transaction(),
-   data = doc.data;
+   tx = new ve.dm.Transaction();
// Validate range
if ( range.isCollapsed() ) {
// Empty range, nothing to remove, retain up to the end of the 
document (for completeness)
-   tx.pushRetain( data.getLength() );
+   tx.pushFinalRetain( doc, 0 );
return tx;
}
// Select nodes and validate selection
@@ -102,7 +100,7 @@
}
tx.pushRetain( removeStart );
tx.addSafeRemoveOps( doc, removeStart, removeEnd );
-   tx.pushRetain( data.getLength() - removeEnd );
+   tx.pushFinalRetain( doc, removeEnd );
// All done
return tx;
}
@@ -149,7 +147,7 @@
offset = removeEnd;
}
// Retain up to the end of the document
-   tx.pushRetain( data.getLength() - offset );
+   tx.pushFinalRetain( doc, offset );
return tx;
 };
 
@@ -174,7 +172,7 @@
}
tx.pushRetain( range.start );
tx.pushReplace( doc, range.start, range.end - range.start, newData );
-   tx.pushRetain( doc.data.getLength() - range.end );
+   tx.pushFinalRetain( doc, range.end );
return tx;
 };
 
@@ -212,7 +210,7 @@
);
}
// Retain to end of document
-   tx.pushRetain( data.length - offset );
+   tx.pushFinalRetain( doc, offset );
return tx;
 };
 
@@ -288,7 +286,7 @@
if ( on ) {
tx.pushStopAnnotating( method, annotation );
}
-   tx.pushRetain( data.getLength() - range.end );
+   tx.pushFinalRetain( doc, range.end );
return tx;
 };
 
@@ -320,7 +318,7 @@
// Retain up to end of metadata elements (second dimension)
tx.pushRetainMetadata( elements.length - index );
// Retain to end of document
-   tx.pushRetain( doc.data.getLength() - offset );
+   tx.pushFinalRetain( doc, offset, elements.length );
return tx;
 };
 
@@ -363,8 +361,8 @@
);
// Retain up to end of metadata elements (second dimension)
tx.pushRetainMetadata( elements.length - range.end );
-   // Retain to end of document
-   tx.pushRetain( doc.data.getLength() - offset );
+   // Retain to end of document (unless we're already off the end )
+   tx.pushFinalRetain( doc, offset, elements.length );
return tx;
 };
 
@@ -402,8 +400,8 @@
);
// Retain up to end of metadata elements (second dimension)
tx.pushRetainMetadata( elements.length - index - 1 );
-   // Retain to end of document
-   tx.pushRetain( doc.data.getLength() - offset );
+   // Retain to end of document (unless we're already off the end )
+   tx.pushFinalRetain( doc, offset, elements.length );
return tx;
 };
 
@@ -421,7 +419,6 @@
 ve.dm.Transaction.newFromContentBranchConversion = function ( doc, range, 
type, attr ) {
var i, selected, branch, branchOuterRange,
tx = new ve.dm.Transaction(),
-   data = doc.getData(),
selection = doc.selectNodes( range, 'leaves' ),

[MediaWiki-commits] [Gerrit] test gzdecode() in TemplateDataBlob::newFromDatabase() - change (mediawiki...TemplateData)

2013-09-11 Thread Hashar (Code Review)

Hashar has uploaded a new change for review.

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


Change subject: test gzdecode() in TemplateDataBlob::newFromDatabase()
..

test gzdecode() in TemplateDataBlob::newFromDatabase()

gzdecode() has been introduced in PHP 5.4 although gzencode() has been
there for a while.  Wikimedia is still using PHP 5.3, so the
TemplateDataBlob::newFromDatabase() would trigger a fatal error whenever
it is passed compressed json :-(

The test does not fix the root cause (that needs a fallback function in
MediaWiki core), but it does highlight the issue in PHP 5.3.x.

bug: 54058
Change-Id: I8357b474165f4317982b9c924cf0afe68650d677
---
M tests/TemplateDataBlobTest.php
1 file changed, 15 insertions(+), 0 deletions(-)


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

diff --git a/tests/TemplateDataBlobTest.php b/tests/TemplateDataBlobTest.php
index 712d84a..105320d 100644
--- a/tests/TemplateDataBlobTest.php
+++ b/tests/TemplateDataBlobTest.php
@@ -381,4 +381,19 @@
$cases['msg']
);
}
+
+   /**
+* Verify we can gzdecode() which came in PHP 5.4.0. Mediawiki needs a
+* fallback function for it.
+* If this test fail, we are most probably attempting to use gzdecode()
+* with PHP before 5.4.
+*
+* @see bug 54058
+*/
+   public function testGetJsonForDatabase() {
+   // Compress JSON to trigger the code pass in newFromDatabase 
that ends
+   // up calling gzdecode().
+   $gzJson = gzencode( '{}' );
+   TemplateDataBlob::newFromDatabase( $gzJson );
+   }
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I8357b474165f4317982b9c924cf0afe68650d677
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/TemplateData
Gerrit-Branch: master
Gerrit-Owner: Hashar 

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

[MediaWiki-commits] [Gerrit] Add fallback for gzdecode (only exists in PHP >= 5.4.0) - change (mediawiki...TemplateData)

2013-09-11 Thread jenkins-bot (Code Review)

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

Change subject: Add fallback for gzdecode (only exists in PHP >= 5.4.0)
..


Add fallback for gzdecode (only exists in PHP >= 5.4.0)

Bug: 54058
Change-Id: I62a843aec4657a3d4895d34535cc2be42d4552fd
---
M TemplateData.php
1 file changed, 8 insertions(+), 0 deletions(-)

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



diff --git a/TemplateData.php b/TemplateData.php
index 159729f..0dec3b1 100644
--- a/TemplateData.php
+++ b/TemplateData.php
@@ -48,3 +48,11 @@
'localBasePath' => $dir,
'remoteExtPath' => 'TemplateData',
 );
+
+// gzdecode function only exists in PHP >= 5.4.0
+// http://php.net/manual/en/function.gzdecode.php
+if ( !function_exists( 'gzdecode' ) ) {
+   function gzdecode( $data ) {
+   return gzinflate( substr( $data, 10, -8 ) );
+   }
+}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I62a843aec4657a3d4895d34535cc2be42d4552fd
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/TemplateData
Gerrit-Branch: master
Gerrit-Owner: Reedy 
Gerrit-Reviewer: Catrope 
Gerrit-Reviewer: Krinkle 
Gerrit-Reviewer: jenkins-bot

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

[MediaWiki-commits] [Gerrit] Add fallback for gzdecode (only exists >= 5.4.0) - change (mediawiki...TemplateData)

2013-09-11 Thread Reedy (Code Review)

Reedy has uploaded a new change for review.

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


Change subject: Add fallback for gzdecode (only exists >= 5.4.0)
..

Add fallback for gzdecode (only exists >= 5.4.0)

Bug: 54058
Change-Id: I62a843aec4657a3d4895d34535cc2be42d4552fd
---
M TemplateData.php
1 file changed, 8 insertions(+), 0 deletions(-)


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

diff --git a/TemplateData.php b/TemplateData.php
index 159729f..0dec3b1 100644
--- a/TemplateData.php
+++ b/TemplateData.php
@@ -48,3 +48,11 @@
'localBasePath' => $dir,
'remoteExtPath' => 'TemplateData',
 );
+
+// gzdecode function only exists in PHP >= 5.4.0
+// http://php.net/manual/en/function.gzdecode.php
+if ( !function_exists( 'gzdecode' ) ) {
+   function gzdecode( $data ) {
+   return gzinflate( substr( $data, 10, -8 ) );
+   }
+}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I62a843aec4657a3d4895d34535cc2be42d4552fd
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/TemplateData
Gerrit-Branch: master
Gerrit-Owner: Reedy 

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

[MediaWiki-commits] [Gerrit] Fix typo in the fontname of Estrangelo Edessa - change (mediawiki...UniversalLanguageSelector)

2013-09-11 Thread KartikMistry (Code Review)

KartikMistry has submitted this change and it was merged.

Change subject: Fix typo in the fontname of Estrangelo Edessa
..


Fix typo in the fontname of Estrangelo Edessa

It was Estarngelo Edessa
Bug: 47229

Change-Id: I941c8c09bedcf58428f93231936f168f993cde8f
---
R data/fontrepo/fonts/EstrangeloEdessa/SyrCOMEdessa.eot
R data/fontrepo/fonts/EstrangeloEdessa/SyrCOMEdessa.ttf
R data/fontrepo/fonts/EstrangeloEdessa/SyrCOMEdessa.woff
R data/fontrepo/fonts/EstrangeloEdessa/font.ini
M resources/js/ext.uls.webfonts.repository.js
5 files changed, 3 insertions(+), 3 deletions(-)

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



diff --git a/data/fontrepo/fonts/EstarngeloEdessa/SyrCOMEdessa.eot 
b/data/fontrepo/fonts/EstrangeloEdessa/SyrCOMEdessa.eot
similarity index 100%
rename from data/fontrepo/fonts/EstarngeloEdessa/SyrCOMEdessa.eot
rename to data/fontrepo/fonts/EstrangeloEdessa/SyrCOMEdessa.eot
Binary files differ
diff --git a/data/fontrepo/fonts/EstarngeloEdessa/SyrCOMEdessa.ttf 
b/data/fontrepo/fonts/EstrangeloEdessa/SyrCOMEdessa.ttf
similarity index 100%
rename from data/fontrepo/fonts/EstarngeloEdessa/SyrCOMEdessa.ttf
rename to data/fontrepo/fonts/EstrangeloEdessa/SyrCOMEdessa.ttf
Binary files differ
diff --git a/data/fontrepo/fonts/EstarngeloEdessa/SyrCOMEdessa.woff 
b/data/fontrepo/fonts/EstrangeloEdessa/SyrCOMEdessa.woff
similarity index 100%
rename from data/fontrepo/fonts/EstarngeloEdessa/SyrCOMEdessa.woff
rename to data/fontrepo/fonts/EstrangeloEdessa/SyrCOMEdessa.woff
Binary files differ
diff --git a/data/fontrepo/fonts/EstarngeloEdessa/font.ini 
b/data/fontrepo/fonts/EstrangeloEdessa/font.ini
similarity index 70%
rename from data/fontrepo/fonts/EstarngeloEdessa/font.ini
rename to data/fontrepo/fonts/EstrangeloEdessa/font.ini
index bf7d1ee..f1d7af4 100644
--- a/data/fontrepo/fonts/EstarngeloEdessa/font.ini
+++ b/data/fontrepo/fonts/EstrangeloEdessa/font.ini
@@ -1,6 +1,6 @@
-[Estarngelo Edessa]
+[Estrangelo Edessa]
 languages=syc*,arc*
 version=1.21
-license=Estarngelo Edessa License
+license=Estrangelo Edessa License
 licensefile=melthofontsLicense.txt
 url=http://www.bethmardutho.org/index.php/resources/fonts.html
diff --git a/resources/js/ext.uls.webfonts.repository.js 
b/resources/js/ext.uls.webfonts.repository.js
index 2925b8b..aa91315 100644
--- a/resources/js/ext.uls.webfonts.repository.js
+++ b/resources/js/ext.uls.webfonts.repository.js
@@ -1,5 +1,5 @@
 // Do not edit! This file is generated from data/fontrepo by 
data/fontrepo/scripts/compile.php
 ( function ( $ ) {
$.webfonts = $.webfonts || {};
-   $.webfonts.repository = 
{"base":"..\/data\/fontrepo\/fonts\/","languages":{"af":["system","OpenDyslexic"],"ahr":["Lohit
 
Marathi"],"akk":["Akkadian"],"am":["AbyssinicaSIL"],"ang":["system","Junicode"],"ar":["Amiri"],"arb":["Amiri"],"arc":["Estarngelo
 Edessa","East Syriac Adiabene","SertoUrhoy"],"as":["system","Lohit 
Assamese"],"bh":["Lohit Devanagari"],"bho":["Lohit 
Devanagari"],"bk":["system","OpenDyslexic"],"bn":["Siyam Rupali","Lohit 
Bengali"],"bo":["Jomolhari"],"bpy":["Siyam Rupali","Lohit 
Bengali"],"bug":["Saweri"],"ca":["system","OpenDyslexic"],"cdo":["CharisSIL"],"cr":["OskiEast"],"cy":["system","OpenDyslexic"],"da":["system","OpenDyslexic"],"de":["system","OpenDyslexic"],"dv":["FreeFont-Thaana"],"dz":["Jomolhari"],"en":["system","OpenDyslexic"],"es":["system","OpenDyslexic"],"et":["system","OpenDyslexic"],"fa":["system","Iranian
 
Sans","Nazli","Amiri"],"fi":["system","OpenDyslexic"],"fo":["system","OpenDyslexic"],"fr":["system","OpenDyslexic"],"fy":["system","OpenDyslexic"],"ga":["system","OpenDyslexic"],"gd":["system","OpenDyslexic"],"gl":["system","OpenDyslexic"],"gom":["Lohit
 Devanagari"],"grc":["system","GentiumPlus"],"gu":["Lohit 
Gujarati"],"hbo":["Taamey Frank CLM","Alef"],"he":["system","Alef","Miriam 
CLM","Taamey Frank CLM"],"hi":["Lohit 
Devanagari"],"hu":["system","OpenDyslexic"],"id":["system","OpenDyslexic"],"ii":["Nuosu
 
SIL"],"is":["system","OpenDyslexic"],"it":["system","OpenDyslexic"],"iu":["system","OskiEast"],"jv":["system","Tuladha
 Jejeg"],"jv-java":["Tuladha 
Jejeg"],"km":["KhmerOSbattambang","KhmerOS","KhmerOSbokor","KhmerOSfasthand","KhmerOSfreehand","KhmerOSmuol","KhmerOSmuollight","KhmerOSmuolpali","KhmerOSsiemreap"],"kn":["Lohit
 Kannada","Gubbi"],"kok":["Lohit 
Devanagari"],"lb":["system","OpenDyslexic"],"li":["system","OpenDyslexic"],"lo":["Phetsarath"],"mai":["Lohit
 
Devanagari"],"mak":["Saweri"],"mi":["system","OpenDyslexic"],"ml":["system","AnjaliOldLipi","Meera"],"mr":["Lohit
 
Marathi"],"ms":["system","OpenDyslexic"],"my":["TharLon","Myanmar3","Padauk"],"nan":["Doulos
 SIL","CharisSIL"],"nb":["system","OpenDyslexic"],"ne":["Lohit 
Nepali","Madan"],"nl":["system","OpenDyslexic"],"oc":["system","OpenDyslexic"],"or":["Lohit
 Oriya","Utkal"],"pa":["Lohit 
Punjabi","Saab"],"pal":["Shapour"],"peo":["Xerxes"],"pt":["system","Ope

[MediaWiki-commits] [Gerrit] Clean up CentralNotice Translation Metadata - change (mediawiki...CentralNotice)

2013-09-11 Thread Mwalker (Code Review)

Mwalker has uploaded a new change for review.

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


Change subject: Clean up CentralNotice Translation Metadata
..

Clean up CentralNotice Translation Metadata

Right now the translation metadata job is running very slowly --
part of this problem is that there is a lot of junk metadata
that we have to process.

So... the maintenance script cleans things up. And I'm now putting
the banner id in with the revtag object so that we can eventually
look to see if the banner is archived or attached only to archived
campaigns or something.

Bug: 53769
Bug: 53792
Change-Id: If9ae70977ee0f008f65ef8f742acafb991b4d221
---
M includes/Banner.php
A maintenance/CleanCNTranslateMetadata.php
2 files changed, 139 insertions(+), 5 deletions(-)


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

diff --git a/includes/Banner.php b/includes/Banner.php
index 5cdbe59..9319485 100644
--- a/includes/Banner.php
+++ b/includes/Banner.php
@@ -842,7 +842,7 @@
$fields = $this->extractMessageFields( 
$this->bodyContent );
if ( count( $fields ) > 0 ) {
// Tag the banner for 
translation
-   Banner::addTag( 
'banner:translate', $revisionId, $pageId );
+   Banner::addTag( 
'banner:translate', $revisionId, $pageId, $this->getId() );
$this->runTranslateJob = true;
}
}
@@ -1147,25 +1147,27 @@
 * @param string $tag The name of the tag
 * @param integer $revisionId ID of the revision
 * @param integer $pageId ID of the MediaWiki page for the banner
-* @param string $value Value to store for the tag
+* @param string $bannerId ID of banner this revtag belongs to
 * @throws MWException
 */
-   static function addTag( $tag, $revisionId, $pageId, $value = null ) {
+   static function addTag( $tag, $revisionId, $pageId, $bannerId ) {
$dbw = CNDatabase::getDb();
 
if ( is_object( $revisionId ) ) {
throw new MWException( 'Got object, excepted id' );
}
 
+   // There should only ever be one tag applied to a banner object
+   Banner::removeTag( $tag, $pageId );
+
$conds = array(
'rt_page' => $pageId,
'rt_type' => RevTag::getType( $tag ),
'rt_revision' => $revisionId
);
-   $dbw->delete( 'revtag', $conds, __METHOD__ );
 
if ( $value !== null ) {
-   $conds['rt_value'] = serialize( implode( '|', $value ) 
);
+   $conds['rt_value'] = $bannerId;
}
 
$dbw->insert( 'revtag', $conds, __METHOD__ );
diff --git a/maintenance/CleanCNTranslateMetadata.php 
b/maintenance/CleanCNTranslateMetadata.php
new file mode 100644
index 000..6c6aa53
--- /dev/null
+++ b/maintenance/CleanCNTranslateMetadata.php
@@ -0,0 +1,132 @@
+ttag = RevTag::getType( 'banner:translate' );
+
+   $this->cleanDuplicates();
+   $this->populateIDs();
+   $this->deleteOrphans();
+   }
+
+   /**
+* Remove duplicated revtags
+*/
+   protected function cleanDuplicates() {
+   $this->output( "Cleaning duplicates\n" );
+
+   $db = CNDatabase::getDb( DB_MASTER );
+
+   $res = $db->select(
+   'revtag',
+   array( 'rt_page', 'max(rt_revision) as maxrev', 
'count(*) as count' ),
+   array( 'rt_type' => $this->ttag ),
+   __METHOD__,
+   array( 'GROUP BY' => 'rt_page' )
+   );
+
+   foreach ( $res as $row ) {
+   if ( (int)$row->count === 1 ) continue;
+
+   $db->delete(
+   'revtag',
+   array(
+'rt_type' => $this->ttag,
+'rt_page' => $row->rt_page,
+"rt_revision != {$row->maxrev}"
+   ),
+   __METHOD__
+   );
+   $numRows = $db->affectedRows();
+   $this->output( " -- Deleted {$numRows} rows for banner 
with page id {$row->rt_page}\n" );
+   }
+   }
+
+   /**
+* Attach a banner ID with a orphan metadata line
+*/
+   protected function populateIDs() {
+   $this->outpu

[MediaWiki-commits] [Gerrit] Added py script to check for overlapping IP ranges on META - change (mediawiki...ZeroRatedMobileAccess)

2013-09-11 Thread Yurik (Code Review)

Yurik has uploaded a new change for review.

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


Change subject: Added py script to check for overlapping IP ranges on META
..

Added py script to check for overlapping IP ranges on META

Change-Id: I1c41b6d45bb6f34d2dcda7f64f743ab2757819db
---
A maintenance/checkips.py
1 file changed, 21 insertions(+), 0 deletions(-)


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

diff --git a/maintenance/checkips.py b/maintenance/checkips.py
new file mode 100644
index 000..8cccd71
--- /dev/null
+++ b/maintenance/checkips.py
@@ -0,0 +1,21 @@
+import netaddr
+import utils
+
+if __name__ == '__main__':
+
+confs = utils.getAllConfigs()
+sets = {}
+errors = False
+for id in confs:
+conf = confs[id]
+vals = netaddr.cidr_merge([netaddr.IPNetwork(v) for v in conf['ips']])
+newSet = netaddr.IPSet(vals)
+for sId, sVal in sets.items():
+if not newSet.isdisjoint(sVal):
+errors = True
+print("*** '%s' has IPs that are also in '%s':" % (id, sId))
+for v in netaddr.cidr_merge((newSet & sVal)):
+print('   %s' % v)
+sets[id] = newSet
+if errors:
+exit(1)

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I1c41b6d45bb6f34d2dcda7f64f743ab2757819db
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ZeroRatedMobileAccess
Gerrit-Branch: master
Gerrit-Owner: Yurik 

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

[MediaWiki-commits] [Gerrit] Move text style tools out of experimental - change (mediawiki...VisualEditor)

2013-09-11 Thread jenkins-bot (Code Review)

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

Change subject: Move text style tools out of experimental
..


Move text style tools out of experimental

These were meant to have been de-experimental-ised with the toolbar
commit; oh well. This moves the following text styles from being in
"experimental" mode to being regular annotations:

* Code
* Strikethrough
* Subscript
* Superscript
* Underline

Change-Id: I21be2dc844b47b825d7a1e48a592067166ecd122
---
M VisualEditor.php
M modules/ve/ui/tools/ve.ui.AnnotationTool.js
M modules/ve/ui/tools/ve.ui.ExperimentalTool.js
3 files changed, 114 insertions(+), 114 deletions(-)

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



diff --git a/VisualEditor.php b/VisualEditor.php
index 1253a1a..b9e950b 100644
--- a/VisualEditor.php
+++ b/VisualEditor.php
@@ -559,6 +559,10 @@
'visualeditor-annotationbutton-code-tooltip',
'visualeditor-annotationbutton-italic-tooltip',
'visualeditor-annotationbutton-link-tooltip',
+   'visualeditor-annotationbutton-strikethrough-tooltip',
+   'visualeditor-annotationbutton-subscript-tooltip',
+   'visualeditor-annotationbutton-superscript-tooltip',
+   'visualeditor-annotationbutton-underline-tooltip',
'visualeditor-beta-label',
'visualeditor-beta-warning',
'visualeditor-browserwarning',
@@ -725,10 +729,6 @@
'visualeditor-languageinspector-block-tooltip',

'visualeditor-languageinspector-block-tooltip-rtldirection',
'visualeditor-annotationbutton-language-tooltip',
-   'visualeditor-annotationbutton-strikethrough-tooltip',
-   'visualeditor-annotationbutton-subscript-tooltip',
-   'visualeditor-annotationbutton-superscript-tooltip',
-   'visualeditor-annotationbutton-underline-tooltip',
'visualeditor-mwalienextensioninspector-title',
'visualeditor-mwhieroinspector-title',
'visualeditor-mwmathinspector-title',
diff --git a/modules/ve/ui/tools/ve.ui.AnnotationTool.js 
b/modules/ve/ui/tools/ve.ui.AnnotationTool.js
index ab3d526..82fe82c 100644
--- a/modules/ve/ui/tools/ve.ui.AnnotationTool.js
+++ b/modules/ve/ui/tools/ve.ui.AnnotationTool.js
@@ -153,3 +153,113 @@
 ve.ui.ItalicAnnotationTool.static.titleMessage = 
'visualeditor-annotationbutton-italic-tooltip';
 ve.ui.ItalicAnnotationTool.static.annotation = { 'name': 'textStyle/italic' };
 ve.ui.toolFactory.register( ve.ui.ItalicAnnotationTool );
+
+/**
+ * UserInterface code tool.
+ *
+ * @class
+ * @extends ve.ui.AnnotationTool
+ * @constructor
+ * @param {ve.ui.SurfaceToolbar} toolbar
+ * @param {Object} [config] Config options
+ */
+ve.ui.CodeAnnotationTool = function VeUiCodeAnnotationTool( toolbar, config ) {
+   ve.ui.AnnotationTool.call( this, toolbar, config );
+};
+ve.inheritClass( ve.ui.CodeAnnotationTool, ve.ui.AnnotationTool );
+ve.ui.CodeAnnotationTool.static.name = 'code';
+ve.ui.CodeAnnotationTool.static.group = 'textStyle';
+ve.ui.CodeAnnotationTool.static.icon = 'code';
+ve.ui.CodeAnnotationTool.static.titleMessage = 
'visualeditor-annotationbutton-code-tooltip';
+ve.ui.CodeAnnotationTool.static.annotation = { 'name': 'textStyle/code' };
+ve.ui.toolFactory.register( ve.ui.CodeAnnotationTool );
+
+/**
+ * UserInterface strikethrough tool.
+ *
+ * @class
+ * @extends ve.ui.AnnotationTool
+ * @constructor
+ * @param {ve.ui.SurfaceToolbar} toolbar
+ * @param {Object} [config] Config options
+ */
+ve.ui.StrikethroughAnnotationTool = function VeUiStrikethroughAnnotationTool( 
toolbar, config ) {
+   ve.ui.AnnotationTool.call( this, toolbar, config );
+};
+ve.inheritClass( ve.ui.StrikethroughAnnotationTool, ve.ui.AnnotationTool );
+ve.ui.StrikethroughAnnotationTool.static.name = 'strikethrough';
+ve.ui.StrikethroughAnnotationTool.static.group = 'textStyle';
+ve.ui.StrikethroughAnnotationTool.static.icon = {
+   'default': 'strikethrough-a',
+   'en': 'strikethrough-s'
+};
+ve.ui.StrikethroughAnnotationTool.static.titleMessage =
+   'visualeditor-annotationbutton-strikethrough-tooltip';
+ve.ui.StrikethroughAnnotationTool.static.annotation = { 'name': 
'textStyle/strike' };
+ve.ui.toolFactory.register( ve.ui.StrikethroughAnnotationTool );
+
+/**
+ * UserInterface underline tool.
+ *
+ * @class
+ * @extends ve.ui.AnnotationTool
+ * @constructor
+ * @param {ve.ui.SurfaceToolbar} toolbar
+ * @param {Object} [config] Config options
+ */
+ve.ui.UnderlineAnnotationTool = function VeUiUnderlineAnnotationTool( toolbar, 
config ) {
+   ve.ui.AnnotationTool.call( this, toolbar, config );
+};
+ve.inheritClass( ve.ui.UnderlineAnn

[MediaWiki-commits] [Gerrit] Fix English gender-unknown message - change (mediawiki/core)

2013-09-11 Thread Tim Starling (Code Review)

Tim Starling has uploaded a new change for review.

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


Change subject: Fix English gender-unknown message
..

Fix English gender-unknown message

Fix for I81f02f03: the verb "detail" means to give details, i.e. to
say more than a single word in response to a question. It does not make
sense in this context.

Change-Id: Ifddf5c9a07dc62bc22dd0a3d2986e41a55b8ef33
---
M languages/messages/MessagesEn.php
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/78/83978/1

diff --git a/languages/messages/MessagesEn.php 
b/languages/messages/MessagesEn.php
index a63d1f8..9e7d4c2 100644
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@ -1979,7 +1979,7 @@
 'badsiglength'  => 'Your signature is too long.
 It must not be more than $1 {{PLURAL:$1|character|characters}} long.',
 'yourgender'=> 'How do you prefer to be described?',
-'gender-unknown'=> 'I prefer not to detail',
+'gender-unknown'=> 'I prefer not to say',
 'gender-male'   => 'He edits wiki pages',
 'gender-female' => 'She edits wiki pages',
 'prefs-help-gender' => 'Setting this preference is optional.

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ifddf5c9a07dc62bc22dd0a3d2986e41a55b8ef33
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Tim Starling 

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

[MediaWiki-commits] [Gerrit] Fix pawn on pre-annotation and keypress - change (mediawiki...VisualEditor)

2013-09-11 Thread jenkins-bot (Code Review)

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

Change subject: Fix pawn on pre-annotation and keypress
..


Fix pawn on pre-annotation and keypress

modules/ve/ce/ve.ce.SurfaceObserver.js
* pollOnceNoEmit method to update SurfaceObserver's benchmark text

modules/ve/ce/ve.ce.Surface.js
* pollOnceNoEmit from onUnlock

Change-Id: Idb14a6aea723c42109b3825478766799d4abef22
---
M modules/ve/ce/ve.ce.Surface.js
M modules/ve/ce/ve.ce.SurfaceObserver.js
2 files changed, 45 insertions(+), 14 deletions(-)

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



diff --git a/modules/ve/ce/ve.ce.Surface.js b/modules/ve/ce/ve.ce.Surface.js
index fbefcf3..99c59ff 100644
--- a/modules/ve/ce/ve.ce.Surface.js
+++ b/modules/ve/ce/ve.ce.Surface.js
@@ -1158,7 +1158,7 @@
  */
 ve.ce.Surface.prototype.onUnlock = function () {
this.surfaceObserver.locked = false;
-   // TODO: should we pollOnce?
+   this.surfaceObserver.pollOnceNoEmit();
 };
 
 /*! Relocation */
diff --git a/modules/ve/ce/ve.ce.SurfaceObserver.js 
b/modules/ve/ce/ve.ce.SurfaceObserver.js
index 0e114e1..d0637be 100644
--- a/modules/ve/ce/ve.ce.SurfaceObserver.js
+++ b/modules/ve/ce/ve.ce.SurfaceObserver.js
@@ -125,8 +125,6 @@
 /**
  * Poll for changes.
  *
- * If `postpone` is false or undefined then polling will occcur immediately.
- *
  * TODO: fixing selection in certain cases, handling selection across multiple 
nodes in Firefox
  *
  * FIXME: Does not work well (selectionChange is not emitted) when cursor is 
placed inside a slug
@@ -137,6 +135,34 @@
  * @emits selectionChange
  */
 ve.ce.SurfaceObserver.prototype.pollOnce = function () {
+   this.pollOnceInternal( true );
+};
+
+/**
+ * Poll to update SurfaceObserver, but don't emit change events
+ *
+ * @method
+ */
+
+ve.ce.SurfaceObserver.prototype.pollOnceNoEmit = function () {
+   this.pollOnceInternal( false );
+};
+
+/**
+ * Poll for changes.
+ *
+ * TODO: fixing selection in certain cases, handling selection across multiple 
nodes in Firefox
+ *
+ * FIXME: Does not work well (selectionChange is not emitted) when cursor is 
placed inside a slug
+ * with a mouse.
+ *
+ * @method
+ * @private
+ * @param {boolean} emitChanges Emit change events if selection changed
+ * @emits contentChange
+ * @emits selectionChange
+ */
+ve.ce.SurfaceObserver.prototype.pollOnceInternal = function ( emitChanges ) {
var $nodeOrSlug, node, text, hash, range, rangyRange;
 
range = this.range;
@@ -169,12 +195,15 @@
text = ve.ce.getDomText( node.$[0] );
hash = ve.ce.getDomHash( node.$[0] );
if ( this.text !== text || this.hash !== hash ) {
-   this.emit(
-   'contentChange',
-   node,
-   { 'text': this.text, 'hash': this.hash, 
'range': this.range },
-   { 'text': text, 'hash': hash, 'range': range }
-   );
+   if ( emitChanges ) {
+   this.emit(
+   'contentChange',
+   node,
+   { 'text': this.text, 'hash': this.hash,
+   'range': this.range },
+   { 'text': text, 'hash': hash, 'range': 
range }
+   );
+   }
this.text = text;
this.hash = hash;
}
@@ -182,11 +211,13 @@
 
// Only emit selectionChange event if there's a meaningful range 
difference
if ( ( this.range && range ) ? !this.range.equals( range ) : ( 
this.range !== range ) ) {
-   this.emit(
-   'selectionChange',
-   this.range,
-   range
-   );
+   if ( emitChanges ) {
+   this.emit(
+   'selectionChange',
+   this.range,
+   range
+   );
+   }
this.range = range;
}
 };

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Idb14a6aea723c42109b3825478766799d4abef22
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Divec 
Gerrit-Reviewer: Catrope 
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 pawn on pre-annotation and keypress - change (mediawiki...VisualEditor)

2013-09-11 Thread Divec (Code Review)

Divec has uploaded a new change for review.

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


Change subject: Fix pawn on pre-annotation and keypress
..

Fix pawn on pre-annotation and keypress

modules/ve/ce/ve.ce.SurfaceObserver.js
* pollOnceNoEmit method to update SurfaceObserver's benchmark text

modules/ve/ce/ve.ce.Surface.js
* pollOnceNoEmit from onUnlock

Change-Id: Idb14a6aea723c42109b3825478766799d4abef22
---
M modules/ve/ce/ve.ce.Surface.js
M modules/ve/ce/ve.ce.SurfaceObserver.js
2 files changed, 45 insertions(+), 14 deletions(-)


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

diff --git a/modules/ve/ce/ve.ce.Surface.js b/modules/ve/ce/ve.ce.Surface.js
index fbefcf3..99c59ff 100644
--- a/modules/ve/ce/ve.ce.Surface.js
+++ b/modules/ve/ce/ve.ce.Surface.js
@@ -1158,7 +1158,7 @@
  */
 ve.ce.Surface.prototype.onUnlock = function () {
this.surfaceObserver.locked = false;
-   // TODO: should we pollOnce?
+   this.surfaceObserver.pollOnceNoEmit();
 };
 
 /*! Relocation */
diff --git a/modules/ve/ce/ve.ce.SurfaceObserver.js 
b/modules/ve/ce/ve.ce.SurfaceObserver.js
index 0e114e1..d0637be 100644
--- a/modules/ve/ce/ve.ce.SurfaceObserver.js
+++ b/modules/ve/ce/ve.ce.SurfaceObserver.js
@@ -125,8 +125,6 @@
 /**
  * Poll for changes.
  *
- * If `postpone` is false or undefined then polling will occcur immediately.
- *
  * TODO: fixing selection in certain cases, handling selection across multiple 
nodes in Firefox
  *
  * FIXME: Does not work well (selectionChange is not emitted) when cursor is 
placed inside a slug
@@ -137,6 +135,34 @@
  * @emits selectionChange
  */
 ve.ce.SurfaceObserver.prototype.pollOnce = function () {
+   this.pollOnceInternal( true );
+};
+
+/**
+ * Poll to update SurfaceObserver, but don't emit change events
+ *
+ * @method
+ */
+
+ve.ce.SurfaceObserver.prototype.pollOnceNoEmit = function () {
+   this.pollOnceInternal( false );
+};
+
+/**
+ * Poll for changes.
+ *
+ * TODO: fixing selection in certain cases, handling selection across multiple 
nodes in Firefox
+ *
+ * FIXME: Does not work well (selectionChange is not emitted) when cursor is 
placed inside a slug
+ * with a mouse.
+ *
+ * @method
+ * @private
+ * @param {boolean} emitChanges Emit change events if selection changed
+ * @emits contentChange
+ * @emits selectionChange
+ */
+ve.ce.SurfaceObserver.prototype.pollOnceInternal = function ( emitChanges ) {
var $nodeOrSlug, node, text, hash, range, rangyRange;
 
range = this.range;
@@ -169,12 +195,15 @@
text = ve.ce.getDomText( node.$[0] );
hash = ve.ce.getDomHash( node.$[0] );
if ( this.text !== text || this.hash !== hash ) {
-   this.emit(
-   'contentChange',
-   node,
-   { 'text': this.text, 'hash': this.hash, 
'range': this.range },
-   { 'text': text, 'hash': hash, 'range': range }
-   );
+   if ( emitChanges ) {
+   this.emit(
+   'contentChange',
+   node,
+   { 'text': this.text, 'hash': this.hash,
+   'range': this.range },
+   { 'text': text, 'hash': hash, 'range': 
range }
+   );
+   }
this.text = text;
this.hash = hash;
}
@@ -182,11 +211,13 @@
 
// Only emit selectionChange event if there's a meaningful range 
difference
if ( ( this.range && range ) ? !this.range.equals( range ) : ( 
this.range !== range ) ) {
-   this.emit(
-   'selectionChange',
-   this.range,
-   range
-   );
+   if ( emitChanges ) {
+   this.emit(
+   'selectionChange',
+   this.range,
+   range
+   );
+   }
this.range = range;
}
 };

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

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

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

[MediaWiki-commits] [Gerrit] Wikipedia to 1.22wmf16 - change (operations/mediawiki-config)

2013-09-11 Thread jenkins-bot (Code Review)

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

Change subject: Wikipedia to 1.22wmf16
..


Wikipedia to 1.22wmf16

Change-Id: I35360c174b6c2d1c849e3a4ebe11d28644139981
---
M wikiversions.dat
1 file changed, 287 insertions(+), 287 deletions(-)

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



diff --git a/wikiversions.dat b/wikiversions.dat
index 725a329..2277a6c 100644
--- a/wikiversions.dat
+++ b/wikiversions.dat
@@ -1,200 +1,200 @@
 aawikibooks php-1.22wmf16 *
-aawiki php-1.22wmf15 *
+aawiki php-1.22wmf16 *
 aawiktionary php-1.22wmf16 *
-abwiki php-1.22wmf15 *
+abwiki php-1.22wmf16 *
 abwiktionary php-1.22wmf16 *
-acewiki php-1.22wmf15 *
+acewiki php-1.22wmf16 *
 advisorywiki php-1.22wmf16 *
 afwikibooks php-1.22wmf16 *
-afwiki php-1.22wmf15 *
+afwiki php-1.22wmf16 *
 afwikiquote php-1.22wmf16 *
 afwiktionary php-1.22wmf16 *
 akwikibooks php-1.22wmf16 *
-akwiki php-1.22wmf15 *
+akwiki php-1.22wmf16 *
 akwiktionary php-1.22wmf16 *
 alswikibooks php-1.22wmf16 *
-alswiki php-1.22wmf15 *
+alswiki php-1.22wmf16 *
 alswikiquote php-1.22wmf16 *
 alswiktionary php-1.22wmf16 *
-amwiki php-1.22wmf15 *
+amwiki php-1.22wmf16 *
 amwikiquote php-1.22wmf16 *
 amwiktionary php-1.22wmf16 *
 angwikibooks php-1.22wmf16 *
-angwiki php-1.22wmf15 *
+angwiki php-1.22wmf16 *
 angwikiquote php-1.22wmf16 *
 angwikisource php-1.22wmf16 *
 angwiktionary php-1.22wmf16 *
-anwiki php-1.22wmf15 *
+anwiki php-1.22wmf16 *
 anwiktionary php-1.22wmf16 *
 arbcom_dewiki php-1.22wmf16 *
 arbcom_enwiki php-1.22wmf16 *
 arbcom_fiwiki php-1.22wmf16 *
 arbcom_nlwiki php-1.22wmf16 *
-arcwiki php-1.22wmf15 *
+arcwiki php-1.22wmf16 *
 arwikibooks php-1.22wmf16 *
 arwikimedia php-1.22wmf16 *
 arwikinews php-1.22wmf16 *
-arwiki php-1.22wmf15 *
+arwiki php-1.22wmf16 *
 arwikiquote php-1.22wmf16 *
 arwikisource php-1.22wmf16 *
 arwikiversity php-1.22wmf16 *
 arwiktionary php-1.22wmf16 *
-arzwiki php-1.22wmf15 *
+arzwiki php-1.22wmf16 *
 astwikibooks php-1.22wmf16 *
-astwiki php-1.22wmf15 *
+astwiki php-1.22wmf16 *
 astwikiquote php-1.22wmf16 *
 astwiktionary php-1.22wmf16 *
 aswikibooks php-1.22wmf16 *
-aswiki php-1.22wmf15 *
+aswiki php-1.22wmf16 *
 aswikisource php-1.22wmf16 *
 aswiktionary php-1.22wmf16 *
 auditcomwiki php-1.22wmf16 *
-avwiki php-1.22wmf15 *
+avwiki php-1.22wmf16 *
 avwiktionary php-1.22wmf16 *
 aywikibooks php-1.22wmf16 *
-aywiki php-1.22wmf15 *
+aywiki php-1.22wmf16 *
 aywiktionary php-1.22wmf16 *
 azwikibooks php-1.22wmf16 *
-azwiki php-1.22wmf15 *
+azwiki php-1.22wmf16 *
 azwikiquote php-1.22wmf16 *
 azwikisource php-1.22wmf16 *
 azwiktionary php-1.22wmf16 *
-barwiki php-1.22wmf15 *
-bat_smgwiki php-1.22wmf15 *
+barwiki php-1.22wmf16 *
+bat_smgwiki php-1.22wmf16 *
 bawikibooks php-1.22wmf16 *
-bawiki php-1.22wmf15 *
-bclwiki php-1.22wmf15 *
+bawiki php-1.22wmf16 *
+bclwiki php-1.22wmf16 *
 bdwikimedia php-1.22wmf16 *
 betawikiversity php-1.22wmf16 *
 bewikibooks php-1.22wmf16 *
 bewikimedia php-1.22wmf16 *
-bewiki php-1.22wmf15 *
+bewiki php-1.22wmf16 *
 bewikiquote php-1.22wmf16 *
 bewikisource php-1.22wmf16 *
 bewiktionary php-1.22wmf16 *
-be_x_oldwiki php-1.22wmf15 *
+be_x_oldwiki php-1.22wmf16 *
 bgwikibooks php-1.22wmf16 *
 bgwikinews php-1.22wmf16 *
-bgwiki php-1.22wmf15 *
+bgwiki php-1.22wmf16 *
 bgwikiquote php-1.22wmf16 *
 bgwikisource php-1.22wmf16 *
 bgwiktionary php-1.22wmf16 *
-bhwiki php-1.22wmf15 *
+bhwiki php-1.22wmf16 *
 bhwiktionary php-1.22wmf16 *
 biwikibooks php-1.22wmf16 *
-biwiki php-1.22wmf15 *
+biwiki php-1.22wmf16 *
 biwiktionary php-1.22wmf16 *
-bjnwiki php-1.22wmf15 *
+bjnwiki php-1.22wmf16 *
 bmwikibooks php-1.22wmf16 *
-bmwiki php-1.22wmf15 *
+bmwiki php-1.22wmf16 *
 bmwikiquote php-1.22wmf16 *
 bmwiktionary php-1.22wmf16 *
 bnwikibooks php-1.22wmf16 *
-bnwiki php-1.22wmf15 *
+bnwiki php-1.22wmf16 *
 bnwikisource php-1.22wmf16 *
 bnwiktionary php-1.22wmf16 *
 boardgovcomwiki php-1.22wmf16 *
 boardwiki php-1.22wmf16 *
 bowikibooks php-1.22wmf16 *
-bowiki php-1.22wmf15 *
+bowiki php-1.22wmf16 *
 bowiktionary php-1.22wmf16 *
-bpywiki php-1.22wmf15 *
+bpywiki php-1.22wmf16 *
 brwikimedia php-1.22wmf16 *
-brwiki php-1.22wmf15 *
+brwiki php-1.22wmf16 *
 brwikiquote php-1.22wmf16 *
 brwikisource php-1.22wmf16 *
 brwiktionary php-1.22wmf16 *
 bswikibooks php-1.22wmf16 *
 bswikinews php-1.22wmf16 *
-bswiki php-1.22wmf15 *
+bswiki php-1.22wmf16 *
 bswikiquote php-1.22wmf16 *
 bswikisource php-1.22wmf16 *
 bswiktionary php-1.22wmf16 *
-bugwiki php-1.22wmf15 *
-bxrwiki php-1.22wmf15 *
+bugwiki php-1.22wmf16 *
+bxrwiki php-1.22wmf16 *
 cawikibooks php-1.22wmf16 *
 cawikinews php-1.22wmf16 *
-cawiki php-1.22wmf15 *
+cawiki php-1.22wmf16 *
 cawikiquote php-1.22wmf16 *
 cawikisource php-1.22wmf16 *
 cawiktionary php-1.22wmf16 *
-cbk_zamwiki php-1.22wmf15 *
-cdowiki php-1.22wmf15 *
-cebwiki php-1.22wmf15 *
-cewiki php-1.22wmf15 *
+cbk_zamwiki php-1.22wmf16 *
+cdowiki php-1.22wmf16 *
+cebwiki php-1.22wmf16 *
+cewiki

[MediaWiki-commits] [Gerrit] Wikipedia to 1.22wmf16 - change (operations/mediawiki-config)

2013-09-11 Thread Reedy (Code Review)

Reedy has uploaded a new change for review.

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


Change subject: Wikipedia to 1.22wmf16
..

Wikipedia to 1.22wmf16

Change-Id: I35360c174b6c2d1c849e3a4ebe11d28644139981
---
M wikiversions.dat
1 file changed, 287 insertions(+), 287 deletions(-)


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

diff --git a/wikiversions.dat b/wikiversions.dat
index 725a329..2277a6c 100644
--- a/wikiversions.dat
+++ b/wikiversions.dat
@@ -1,200 +1,200 @@
 aawikibooks php-1.22wmf16 *
-aawiki php-1.22wmf15 *
+aawiki php-1.22wmf16 *
 aawiktionary php-1.22wmf16 *
-abwiki php-1.22wmf15 *
+abwiki php-1.22wmf16 *
 abwiktionary php-1.22wmf16 *
-acewiki php-1.22wmf15 *
+acewiki php-1.22wmf16 *
 advisorywiki php-1.22wmf16 *
 afwikibooks php-1.22wmf16 *
-afwiki php-1.22wmf15 *
+afwiki php-1.22wmf16 *
 afwikiquote php-1.22wmf16 *
 afwiktionary php-1.22wmf16 *
 akwikibooks php-1.22wmf16 *
-akwiki php-1.22wmf15 *
+akwiki php-1.22wmf16 *
 akwiktionary php-1.22wmf16 *
 alswikibooks php-1.22wmf16 *
-alswiki php-1.22wmf15 *
+alswiki php-1.22wmf16 *
 alswikiquote php-1.22wmf16 *
 alswiktionary php-1.22wmf16 *
-amwiki php-1.22wmf15 *
+amwiki php-1.22wmf16 *
 amwikiquote php-1.22wmf16 *
 amwiktionary php-1.22wmf16 *
 angwikibooks php-1.22wmf16 *
-angwiki php-1.22wmf15 *
+angwiki php-1.22wmf16 *
 angwikiquote php-1.22wmf16 *
 angwikisource php-1.22wmf16 *
 angwiktionary php-1.22wmf16 *
-anwiki php-1.22wmf15 *
+anwiki php-1.22wmf16 *
 anwiktionary php-1.22wmf16 *
 arbcom_dewiki php-1.22wmf16 *
 arbcom_enwiki php-1.22wmf16 *
 arbcom_fiwiki php-1.22wmf16 *
 arbcom_nlwiki php-1.22wmf16 *
-arcwiki php-1.22wmf15 *
+arcwiki php-1.22wmf16 *
 arwikibooks php-1.22wmf16 *
 arwikimedia php-1.22wmf16 *
 arwikinews php-1.22wmf16 *
-arwiki php-1.22wmf15 *
+arwiki php-1.22wmf16 *
 arwikiquote php-1.22wmf16 *
 arwikisource php-1.22wmf16 *
 arwikiversity php-1.22wmf16 *
 arwiktionary php-1.22wmf16 *
-arzwiki php-1.22wmf15 *
+arzwiki php-1.22wmf16 *
 astwikibooks php-1.22wmf16 *
-astwiki php-1.22wmf15 *
+astwiki php-1.22wmf16 *
 astwikiquote php-1.22wmf16 *
 astwiktionary php-1.22wmf16 *
 aswikibooks php-1.22wmf16 *
-aswiki php-1.22wmf15 *
+aswiki php-1.22wmf16 *
 aswikisource php-1.22wmf16 *
 aswiktionary php-1.22wmf16 *
 auditcomwiki php-1.22wmf16 *
-avwiki php-1.22wmf15 *
+avwiki php-1.22wmf16 *
 avwiktionary php-1.22wmf16 *
 aywikibooks php-1.22wmf16 *
-aywiki php-1.22wmf15 *
+aywiki php-1.22wmf16 *
 aywiktionary php-1.22wmf16 *
 azwikibooks php-1.22wmf16 *
-azwiki php-1.22wmf15 *
+azwiki php-1.22wmf16 *
 azwikiquote php-1.22wmf16 *
 azwikisource php-1.22wmf16 *
 azwiktionary php-1.22wmf16 *
-barwiki php-1.22wmf15 *
-bat_smgwiki php-1.22wmf15 *
+barwiki php-1.22wmf16 *
+bat_smgwiki php-1.22wmf16 *
 bawikibooks php-1.22wmf16 *
-bawiki php-1.22wmf15 *
-bclwiki php-1.22wmf15 *
+bawiki php-1.22wmf16 *
+bclwiki php-1.22wmf16 *
 bdwikimedia php-1.22wmf16 *
 betawikiversity php-1.22wmf16 *
 bewikibooks php-1.22wmf16 *
 bewikimedia php-1.22wmf16 *
-bewiki php-1.22wmf15 *
+bewiki php-1.22wmf16 *
 bewikiquote php-1.22wmf16 *
 bewikisource php-1.22wmf16 *
 bewiktionary php-1.22wmf16 *
-be_x_oldwiki php-1.22wmf15 *
+be_x_oldwiki php-1.22wmf16 *
 bgwikibooks php-1.22wmf16 *
 bgwikinews php-1.22wmf16 *
-bgwiki php-1.22wmf15 *
+bgwiki php-1.22wmf16 *
 bgwikiquote php-1.22wmf16 *
 bgwikisource php-1.22wmf16 *
 bgwiktionary php-1.22wmf16 *
-bhwiki php-1.22wmf15 *
+bhwiki php-1.22wmf16 *
 bhwiktionary php-1.22wmf16 *
 biwikibooks php-1.22wmf16 *
-biwiki php-1.22wmf15 *
+biwiki php-1.22wmf16 *
 biwiktionary php-1.22wmf16 *
-bjnwiki php-1.22wmf15 *
+bjnwiki php-1.22wmf16 *
 bmwikibooks php-1.22wmf16 *
-bmwiki php-1.22wmf15 *
+bmwiki php-1.22wmf16 *
 bmwikiquote php-1.22wmf16 *
 bmwiktionary php-1.22wmf16 *
 bnwikibooks php-1.22wmf16 *
-bnwiki php-1.22wmf15 *
+bnwiki php-1.22wmf16 *
 bnwikisource php-1.22wmf16 *
 bnwiktionary php-1.22wmf16 *
 boardgovcomwiki php-1.22wmf16 *
 boardwiki php-1.22wmf16 *
 bowikibooks php-1.22wmf16 *
-bowiki php-1.22wmf15 *
+bowiki php-1.22wmf16 *
 bowiktionary php-1.22wmf16 *
-bpywiki php-1.22wmf15 *
+bpywiki php-1.22wmf16 *
 brwikimedia php-1.22wmf16 *
-brwiki php-1.22wmf15 *
+brwiki php-1.22wmf16 *
 brwikiquote php-1.22wmf16 *
 brwikisource php-1.22wmf16 *
 brwiktionary php-1.22wmf16 *
 bswikibooks php-1.22wmf16 *
 bswikinews php-1.22wmf16 *
-bswiki php-1.22wmf15 *
+bswiki php-1.22wmf16 *
 bswikiquote php-1.22wmf16 *
 bswikisource php-1.22wmf16 *
 bswiktionary php-1.22wmf16 *
-bugwiki php-1.22wmf15 *
-bxrwiki php-1.22wmf15 *
+bugwiki php-1.22wmf16 *
+bxrwiki php-1.22wmf16 *
 cawikibooks php-1.22wmf16 *
 cawikinews php-1.22wmf16 *
-cawiki php-1.22wmf15 *
+cawiki php-1.22wmf16 *
 cawikiquote php-1.22wmf16 *
 cawikisource php-1.22wmf16 *
 cawiktionary php-1.22wmf16 *
-cbk_zamwiki php-1.22wmf15 *
-cdowiki php-1.22wmf15 *
-cebwiki php-1.22wmf15 *
-cewiki php-1.22wmf15 *
+cbk_zamwiki php-1.22wmf16 *
+cdow

[MediaWiki-commits] [Gerrit] Move text style tools out of experimental - change (mediawiki...VisualEditor)

2013-09-11 Thread Jforrester (Code Review)

Jforrester has uploaded a new change for review.

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


Change subject: Move text style tools out of experimental
..

Move text style tools out of experimental

These were meant to have been de-experimental-ised with the toolbar
commit; oh well. This moves the following text styles from being in
"experimental" mode to being regular annotations:

* Code
* Strikethrough
* Subscript
* Superscript
* Underline

Change-Id: I21be2dc844b47b825d7a1e48a592067166ecd122
---
M VisualEditor.php
M modules/ve/ui/tools/ve.ui.AnnotationTool.js
M modules/ve/ui/tools/ve.ui.ExperimentalTool.js
3 files changed, 114 insertions(+), 114 deletions(-)


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

diff --git a/VisualEditor.php b/VisualEditor.php
index 1253a1a..b9e950b 100644
--- a/VisualEditor.php
+++ b/VisualEditor.php
@@ -559,6 +559,10 @@
'visualeditor-annotationbutton-code-tooltip',
'visualeditor-annotationbutton-italic-tooltip',
'visualeditor-annotationbutton-link-tooltip',
+   'visualeditor-annotationbutton-strikethrough-tooltip',
+   'visualeditor-annotationbutton-subscript-tooltip',
+   'visualeditor-annotationbutton-superscript-tooltip',
+   'visualeditor-annotationbutton-underline-tooltip',
'visualeditor-beta-label',
'visualeditor-beta-warning',
'visualeditor-browserwarning',
@@ -725,10 +729,6 @@
'visualeditor-languageinspector-block-tooltip',

'visualeditor-languageinspector-block-tooltip-rtldirection',
'visualeditor-annotationbutton-language-tooltip',
-   'visualeditor-annotationbutton-strikethrough-tooltip',
-   'visualeditor-annotationbutton-subscript-tooltip',
-   'visualeditor-annotationbutton-superscript-tooltip',
-   'visualeditor-annotationbutton-underline-tooltip',
'visualeditor-mwalienextensioninspector-title',
'visualeditor-mwhieroinspector-title',
'visualeditor-mwmathinspector-title',
diff --git a/modules/ve/ui/tools/ve.ui.AnnotationTool.js 
b/modules/ve/ui/tools/ve.ui.AnnotationTool.js
index ab3d526..82fe82c 100644
--- a/modules/ve/ui/tools/ve.ui.AnnotationTool.js
+++ b/modules/ve/ui/tools/ve.ui.AnnotationTool.js
@@ -153,3 +153,113 @@
 ve.ui.ItalicAnnotationTool.static.titleMessage = 
'visualeditor-annotationbutton-italic-tooltip';
 ve.ui.ItalicAnnotationTool.static.annotation = { 'name': 'textStyle/italic' };
 ve.ui.toolFactory.register( ve.ui.ItalicAnnotationTool );
+
+/**
+ * UserInterface code tool.
+ *
+ * @class
+ * @extends ve.ui.AnnotationTool
+ * @constructor
+ * @param {ve.ui.SurfaceToolbar} toolbar
+ * @param {Object} [config] Config options
+ */
+ve.ui.CodeAnnotationTool = function VeUiCodeAnnotationTool( toolbar, config ) {
+   ve.ui.AnnotationTool.call( this, toolbar, config );
+};
+ve.inheritClass( ve.ui.CodeAnnotationTool, ve.ui.AnnotationTool );
+ve.ui.CodeAnnotationTool.static.name = 'code';
+ve.ui.CodeAnnotationTool.static.group = 'textStyle';
+ve.ui.CodeAnnotationTool.static.icon = 'code';
+ve.ui.CodeAnnotationTool.static.titleMessage = 
'visualeditor-annotationbutton-code-tooltip';
+ve.ui.CodeAnnotationTool.static.annotation = { 'name': 'textStyle/code' };
+ve.ui.toolFactory.register( ve.ui.CodeAnnotationTool );
+
+/**
+ * UserInterface strikethrough tool.
+ *
+ * @class
+ * @extends ve.ui.AnnotationTool
+ * @constructor
+ * @param {ve.ui.SurfaceToolbar} toolbar
+ * @param {Object} [config] Config options
+ */
+ve.ui.StrikethroughAnnotationTool = function VeUiStrikethroughAnnotationTool( 
toolbar, config ) {
+   ve.ui.AnnotationTool.call( this, toolbar, config );
+};
+ve.inheritClass( ve.ui.StrikethroughAnnotationTool, ve.ui.AnnotationTool );
+ve.ui.StrikethroughAnnotationTool.static.name = 'strikethrough';
+ve.ui.StrikethroughAnnotationTool.static.group = 'textStyle';
+ve.ui.StrikethroughAnnotationTool.static.icon = {
+   'default': 'strikethrough-a',
+   'en': 'strikethrough-s'
+};
+ve.ui.StrikethroughAnnotationTool.static.titleMessage =
+   'visualeditor-annotationbutton-strikethrough-tooltip';
+ve.ui.StrikethroughAnnotationTool.static.annotation = { 'name': 
'textStyle/strike' };
+ve.ui.toolFactory.register( ve.ui.StrikethroughAnnotationTool );
+
+/**
+ * UserInterface underline tool.
+ *
+ * @class
+ * @extends ve.ui.AnnotationTool
+ * @constructor
+ * @param {ve.ui.SurfaceToolbar} toolbar
+ * @param {Object} [config] Config options
+ */
+ve.ui.UnderlineAnnotationTool = function VeUiUnderlineAnnotationTool( toolbar, 
config ) {
+   ve.ui.AnnotationTool.call( this

[MediaWiki-commits] [Gerrit] Add way of including all stderr output when executing command - change (mediawiki/core)

2013-09-11 Thread Brian Wolff (Code Review)

Brian Wolff has uploaded a new change for review.

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


Change subject: Add way of including all stderr output when executing command
..

Add way of including all stderr output when executing command

This adds an option to wfShellExec (and convenience function
wfShellExecWithStderr), to make sure all stderr is duplicated
to stdout. The previous method of doing this was to include
2>&1 on the command line. However this did not redirect errors
from limit.sh (For example cgroups not set up, or if a command
reached the file size limit set by ulimit).

Not sure if this is the best approach, but it seems to work well,
and compared to most other approaches I considered, actually gets
the ulimit errors redirected too.

Currently some files fail to render with no error whatsoever,
hopefully this patch will make what went wrong more obvious.

Also fix a comment in wfShellExec that was incorrect (trailing \n),
and make the initial value of the return value variable be 200, so
if there's ever a bug in php where its not being set properly, it
would be immediately obvious what is happening.

Bug: 53824
Change-Id: I833aeb3ab9da726ecb97331369ea187daad7e795
---
M includes/GlobalFunctions.php
M includes/media/Bitmap.php
M includes/media/Jpeg.php
M includes/media/SVG.php
4 files changed, 40 insertions(+), 13 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/74/83974/1

diff --git a/includes/GlobalFunctions.php b/includes/GlobalFunctions.php
index bed2c44..7db9daa 100644
--- a/includes/GlobalFunctions.php
+++ b/includes/GlobalFunctions.php
@@ -2759,9 +2759,10 @@
  * added to the executed command environment.
  * @param array $limits optional array with limits(filesize, memory, time, 
walltime)
  * this overwrites the global wgShellMax* limits.
- * @return string collected stdout as a string (trailing newlines stripped)
+ * @param Boolean $includeStderr duplicate standard error to stdin (including 
limit.sh errors)
+ * @return string collected stdout as a string
  */
-function wfShellExec( $cmd, &$retval = null, $environ = array(), $limits = 
array() ) {
+function wfShellExec( $cmd, &$retval = null, $environ = array(), $limits = 
array(), $includeStderr = false ) {
global $IP, $wgMaxShellMemory, $wgMaxShellFileSize, $wgMaxShellTime,
$wgMaxShellWallClockTime, $wgShellCgroup;
 
@@ -2795,6 +2796,10 @@
$cmd = $envcmd . $cmd;
 
if ( php_uname( 's' ) == 'Linux' ) {
+   $stderrDuplication = '';
+   if ( $includeStderr ) {
+   $stderrDuplication = 'exec 2>&1; ';
+   }
$time = intval ( isset( $limits['time'] ) ? $limits['time'] : 
$wgMaxShellTime );
if ( isset( $limits['walltime'] ) ) {
$wallTime = intval( $limits['walltime'] );
@@ -2810,17 +2815,21 @@
$cmd = '/bin/bash ' . escapeshellarg( 
"$IP/includes/limit.sh" ) . ' ' .
escapeshellarg( $cmd ) . ' ' .
escapeshellarg(
+   $stderrDuplication .
"MW_CPU_LIMIT=$time; " .
'MW_CGROUP=' . escapeshellarg( 
$wgShellCgroup ) . '; ' .
"MW_MEM_LIMIT=$mem; " .
"MW_FILE_SIZE_LIMIT=$filesize; " .
"MW_WALL_CLOCK_LIMIT=$wallTime"
);
+   } else {
+   $cmd .= ' 2>&1';
}
+   } elseif ( $includeStderr ) {
+   $cmd .= ' 2>&1';
}
wfDebug( "wfShellExec: $cmd\n" );
-
-   $retval = 1; // error by default?
+   $retval = 200; // Default to an odd value that shouldn't happen 
naturally.
ob_start();
passthru( $cmd, $retval );
$output = ob_get_contents();
@@ -2833,6 +2842,24 @@
 }
 
 /**
+ * Execute a shell command, returning both stdout and stderr. Convenience
+ * function, as all the arguments to wfShellExec can become unwieldy.
+ *
+ * @note This also includes errors from limit.sh, e.g. if $wgMaxShellFileSize 
is exceeded.
+ * @param string $cmd Command line, properly escaped for shell.
+ * @param &$retval null|Mixed optional, will receive the program's exit code.
+ * (non-zero is usually failure)
+ * @param array $environ optional environment variables which should be
+ * added to the executed command environment.
+ * @param array $limits optional array with limits(filesize, memory, time, 
walltime)
+ * this overwrites the global wgShellMax* limits.
+ * @return string collected stdout and stderr as a string
+ */
+function wfShellExecWithStderr( $cmd, &$retval = null, $environ = array

[MediaWiki-commits] [Gerrit] Fix typo in the fontname of Estrangelo Edessa - change (mediawiki...UniversalLanguageSelector)

2013-09-11 Thread Santhosh (Code Review)

Santhosh has uploaded a new change for review.

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


Change subject: Fix typo in the fontname of Estrangelo Edessa
..

Fix typo in the fontname of Estrangelo Edessa

It was Estarngelo Edessa
Bug: 47229

Change-Id: I941c8c09bedcf58428f93231936f168f993cde8f
---
R data/fontrepo/fonts/EstrangeloEdessa/SyrCOMEdessa.eot
R data/fontrepo/fonts/EstrangeloEdessa/SyrCOMEdessa.ttf
R data/fontrepo/fonts/EstrangeloEdessa/SyrCOMEdessa.woff
R data/fontrepo/fonts/EstrangeloEdessa/font.ini
M resources/js/ext.uls.webfonts.repository.js
5 files changed, 3 insertions(+), 3 deletions(-)


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

diff --git a/data/fontrepo/fonts/EstarngeloEdessa/SyrCOMEdessa.eot 
b/data/fontrepo/fonts/EstrangeloEdessa/SyrCOMEdessa.eot
similarity index 100%
rename from data/fontrepo/fonts/EstarngeloEdessa/SyrCOMEdessa.eot
rename to data/fontrepo/fonts/EstrangeloEdessa/SyrCOMEdessa.eot
Binary files differ
diff --git a/data/fontrepo/fonts/EstarngeloEdessa/SyrCOMEdessa.ttf 
b/data/fontrepo/fonts/EstrangeloEdessa/SyrCOMEdessa.ttf
similarity index 100%
rename from data/fontrepo/fonts/EstarngeloEdessa/SyrCOMEdessa.ttf
rename to data/fontrepo/fonts/EstrangeloEdessa/SyrCOMEdessa.ttf
Binary files differ
diff --git a/data/fontrepo/fonts/EstarngeloEdessa/SyrCOMEdessa.woff 
b/data/fontrepo/fonts/EstrangeloEdessa/SyrCOMEdessa.woff
similarity index 100%
rename from data/fontrepo/fonts/EstarngeloEdessa/SyrCOMEdessa.woff
rename to data/fontrepo/fonts/EstrangeloEdessa/SyrCOMEdessa.woff
Binary files differ
diff --git a/data/fontrepo/fonts/EstarngeloEdessa/font.ini 
b/data/fontrepo/fonts/EstrangeloEdessa/font.ini
similarity index 70%
rename from data/fontrepo/fonts/EstarngeloEdessa/font.ini
rename to data/fontrepo/fonts/EstrangeloEdessa/font.ini
index bf7d1ee..f1d7af4 100644
--- a/data/fontrepo/fonts/EstarngeloEdessa/font.ini
+++ b/data/fontrepo/fonts/EstrangeloEdessa/font.ini
@@ -1,6 +1,6 @@
-[Estarngelo Edessa]
+[Estrangelo Edessa]
 languages=syc*,arc*
 version=1.21
-license=Estarngelo Edessa License
+license=Estrangelo Edessa License
 licensefile=melthofontsLicense.txt
 url=http://www.bethmardutho.org/index.php/resources/fonts.html
diff --git a/resources/js/ext.uls.webfonts.repository.js 
b/resources/js/ext.uls.webfonts.repository.js
index 2925b8b..aa91315 100644
--- a/resources/js/ext.uls.webfonts.repository.js
+++ b/resources/js/ext.uls.webfonts.repository.js
@@ -1,5 +1,5 @@
 // Do not edit! This file is generated from data/fontrepo by 
data/fontrepo/scripts/compile.php
 ( function ( $ ) {
$.webfonts = $.webfonts || {};
-   $.webfonts.repository = 
{"base":"..\/data\/fontrepo\/fonts\/","languages":{"af":["system","OpenDyslexic"],"ahr":["Lohit
 
Marathi"],"akk":["Akkadian"],"am":["AbyssinicaSIL"],"ang":["system","Junicode"],"ar":["Amiri"],"arb":["Amiri"],"arc":["Estarngelo
 Edessa","East Syriac Adiabene","SertoUrhoy"],"as":["system","Lohit 
Assamese"],"bh":["Lohit Devanagari"],"bho":["Lohit 
Devanagari"],"bk":["system","OpenDyslexic"],"bn":["Siyam Rupali","Lohit 
Bengali"],"bo":["Jomolhari"],"bpy":["Siyam Rupali","Lohit 
Bengali"],"bug":["Saweri"],"ca":["system","OpenDyslexic"],"cdo":["CharisSIL"],"cr":["OskiEast"],"cy":["system","OpenDyslexic"],"da":["system","OpenDyslexic"],"de":["system","OpenDyslexic"],"dv":["FreeFont-Thaana"],"dz":["Jomolhari"],"en":["system","OpenDyslexic"],"es":["system","OpenDyslexic"],"et":["system","OpenDyslexic"],"fa":["system","Iranian
 
Sans","Nazli","Amiri"],"fi":["system","OpenDyslexic"],"fo":["system","OpenDyslexic"],"fr":["system","OpenDyslexic"],"fy":["system","OpenDyslexic"],"ga":["system","OpenDyslexic"],"gd":["system","OpenDyslexic"],"gl":["system","OpenDyslexic"],"gom":["Lohit
 Devanagari"],"grc":["system","GentiumPlus"],"gu":["Lohit 
Gujarati"],"hbo":["Taamey Frank CLM","Alef"],"he":["system","Alef","Miriam 
CLM","Taamey Frank CLM"],"hi":["Lohit 
Devanagari"],"hu":["system","OpenDyslexic"],"id":["system","OpenDyslexic"],"ii":["Nuosu
 
SIL"],"is":["system","OpenDyslexic"],"it":["system","OpenDyslexic"],"iu":["system","OskiEast"],"jv":["system","Tuladha
 Jejeg"],"jv-java":["Tuladha 
Jejeg"],"km":["KhmerOSbattambang","KhmerOS","KhmerOSbokor","KhmerOSfasthand","KhmerOSfreehand","KhmerOSmuol","KhmerOSmuollight","KhmerOSmuolpali","KhmerOSsiemreap"],"kn":["Lohit
 Kannada","Gubbi"],"kok":["Lohit 
Devanagari"],"lb":["system","OpenDyslexic"],"li":["system","OpenDyslexic"],"lo":["Phetsarath"],"mai":["Lohit
 
Devanagari"],"mak":["Saweri"],"mi":["system","OpenDyslexic"],"ml":["system","AnjaliOldLipi","Meera"],"mr":["Lohit
 
Marathi"],"ms":["system","OpenDyslexic"],"my":["TharLon","Myanmar3","Padauk"],"nan":["Doulos
 SIL","CharisSIL"],"nb":["system","OpenDyslexic"],"ne":["Lohit 
Nepali","Madan"],"nl":["system","OpenDyslexic"],"oc":["system","OpenDyslexic"],"or":["Lohit
 Oriya","Utkal"],"pa":["Lohit 
Punjabi","Saa

[MediaWiki-commits] [Gerrit] WIP monospace fix - change (mediawiki...UniversalLanguageSelector)

2013-09-11 Thread Santhosh (Code Review)

Santhosh has uploaded a new change for review.

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


Change subject: WIP monospace fix
..

WIP monospace fix

Change-Id: I58c9c3fb74774e26e0f680cec0b0f9b2d3b2c11c
---
M lib/jquery.webfonts.js
1 file changed, 11 insertions(+), 7 deletions(-)


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

diff --git a/lib/jquery.webfonts.js b/lib/jquery.webfonts.js
index b4c0b5e..5daa220 100644
--- a/lib/jquery.webfonts.js
+++ b/lib/jquery.webfonts.js
@@ -206,16 +206,20 @@
}
 
// Load and apply fonts for other language 
tagged elements (batched)
-   if ( element.lang && element.lang !== 
webfonts.language ) {
+   if ( element.lang ) {
// Child element's language differs 
from parent.
-   fontFamily = webfonts.getFont( 
element.lang );
+   // If there is no explicit font for 
this language, it will
+   // inherit the webfont for the parent.  
But that is undesirable here
+   // since language is different. So 
inherit the original font of the
+   // element. Define it explicitly so 
that inheritance is broken.
 
+   // If the language has a font, use it.
+   // If not, try to retain the elements 
style
+   // even if it is not present use 
original font
+   // of the element to which this 
extension is applied.
+   fontFamily = webfonts.getFont( 
element.lang );
if ( !fontFamily ) {
-   // If there is no explicit font 
for this language, it will
-   // inherit the webfont for the 
parent.  But that is undesirable here
-   // since language is different. 
So inherit the original font of the
-   // element. Define it 
explicitly so that inheritance is broken.
-   fontFamily = 
webfonts.originalFontFamily;
+   fontFamily = ( fontFamilyStyle 
=== 'monospace' ) ? fontFamilyStyle: webfonts.originalFontFamily;
}
// We do not have fonts for all 
languages
if ( fontFamily !== null ) {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I58c9c3fb74774e26e0f680cec0b0f9b2d3b2c11c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/UniversalLanguageSelector
Gerrit-Branch: master
Gerrit-Owner: Santhosh 

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

[MediaWiki-commits] [Gerrit] Adding first test for RevertRate metric. - change (analytics/wikimetrics)

2013-09-11 Thread Milimetric (Code Review)

Milimetric has submitted this change and it was merged.

Change subject: Adding first test for RevertRate metric.
..


Adding first test for RevertRate metric.

Change-Id: I54bd07ff47fdcccd396ed353655bf247f29f0fea
---
A tests/test_metrics/test_revert_rate.py
M wikimetrics/metrics/revert_rate.py
2 files changed, 67 insertions(+), 9 deletions(-)

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



diff --git a/tests/test_metrics/test_revert_rate.py 
b/tests/test_metrics/test_revert_rate.py
new file mode 100644
index 000..70398d6
--- /dev/null
+++ b/tests/test_metrics/test_revert_rate.py
@@ -0,0 +1,58 @@
+from datetime import datetime
+from nose.tools import assert_true, assert_equal
+from tests.fixtures import DatabaseWithCohortTest, QueueDatabaseTest, 
DatabaseTest
+
+from wikimetrics.metrics import RevertRate, TimeseriesChoices
+from wikimetrics.models import Cohort, MetricReport
+
+
+
+class RevertRateTest(DatabaseTest):
+
+def setUp(self):
+DatabaseTest.setUp(self)
+self.create_test_cohort(
+editor_count=2,
+revisions_per_editor=3,
+revision_timestamps=[
+[2012123123, 20130101003000, 2013010101],
+[2013010112, 2013010200, 2013010212],
+],
+revision_lengths=[
+[1, 2, 3],  # User A makes some edits.
+[2, 4, 5],  # User B reverts user A's edit #3 back to edit #2.
+],
+)
+
+def test_single_revert(self):
+metric = RevertRate(
+# namespaces=[0],
+start_date='2012-12-31 00:00:00',
+end_date='2014-01-02 00:00:00',
+timeseries=TimeseriesChoices.DAY,
+)
+results = metric(list(self.cohort), self.mwSession)
+
+results_should_be = {
+# User A had one revert
+self.editors[0].user_id: {
+'edits': 3,
+'reverts': 1,
+'revert_rate': float(1)/float(3),
+},
+# User B had no reverts
+self.editors[1].user_id: {
+'edits': 3,
+'reverts': 0,
+'revert_rate': 0,
+},
+}
+
+# check user A's results
+assert_equal(results[self.editors[0].user_id], 
results_should_be[self.editors[0].user_id])
+
+# check user B's results
+assert_equal(results[self.editors[1].user_id], 
results_should_be[self.editors[0].user_id])
+
+
+
diff --git a/wikimetrics/metrics/revert_rate.py 
b/wikimetrics/metrics/revert_rate.py
index 939e7fe..05cbbb0 100644
--- a/wikimetrics/metrics/revert_rate.py
+++ b/wikimetrics/metrics/revert_rate.py
@@ -47,13 +47,13 @@
 description='0, 2, 4, etc.',
 )
 
-#def __call__(self, user_ids, session):
-#"""
-#Parameters:
-#user_ids: list of mediawiki user ids to find edit reverts for
-#session : sqlalchemy session open on a mediawiki database
+def __call__(self, user_ids, session):
+"""
+Parameters:
+user_ids: list of mediawiki user ids to find edit reverts for
+session : sqlalchemy session open on a mediawiki database
 
-#Returns:
-#dictionary from user ids to the number of edit reverts found.
-#"""
-#return {user: None for user in user_ids}
+Returns:
+dictionary from user ids to the number of edit reverts found.
+"""
+return {user: None for user in user_ids}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I54bd07ff47fdcccd396ed353655bf247f29f0fea
Gerrit-PatchSet: 1
Gerrit-Project: analytics/wikimetrics
Gerrit-Branch: master
Gerrit-Owner: Ottomata 
Gerrit-Reviewer: Milimetric 

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

[MediaWiki-commits] [Gerrit] Adding first test for RevertRate metric. - change (analytics/wikimetrics)

2013-09-11 Thread Ottomata (Code Review)

Ottomata has uploaded a new change for review.

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


Change subject: Adding first test for RevertRate metric.
..

Adding first test for RevertRate metric.

Change-Id: I54bd07ff47fdcccd396ed353655bf247f29f0fea
---
A tests/test_metrics/test_revert_rate.py
M wikimetrics/metrics/revert_rate.py
2 files changed, 67 insertions(+), 9 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/analytics/wikimetrics 
refs/changes/71/83971/1

diff --git a/tests/test_metrics/test_revert_rate.py 
b/tests/test_metrics/test_revert_rate.py
new file mode 100644
index 000..70398d6
--- /dev/null
+++ b/tests/test_metrics/test_revert_rate.py
@@ -0,0 +1,58 @@
+from datetime import datetime
+from nose.tools import assert_true, assert_equal
+from tests.fixtures import DatabaseWithCohortTest, QueueDatabaseTest, 
DatabaseTest
+
+from wikimetrics.metrics import RevertRate, TimeseriesChoices
+from wikimetrics.models import Cohort, MetricReport
+
+
+
+class RevertRateTest(DatabaseTest):
+
+def setUp(self):
+DatabaseTest.setUp(self)
+self.create_test_cohort(
+editor_count=2,
+revisions_per_editor=3,
+revision_timestamps=[
+[2012123123, 20130101003000, 2013010101],
+[2013010112, 2013010200, 2013010212],
+],
+revision_lengths=[
+[1, 2, 3],  # User A makes some edits.
+[2, 4, 5],  # User B reverts user A's edit #3 back to edit #2.
+],
+)
+
+def test_single_revert(self):
+metric = RevertRate(
+# namespaces=[0],
+start_date='2012-12-31 00:00:00',
+end_date='2014-01-02 00:00:00',
+timeseries=TimeseriesChoices.DAY,
+)
+results = metric(list(self.cohort), self.mwSession)
+
+results_should_be = {
+# User A had one revert
+self.editors[0].user_id: {
+'edits': 3,
+'reverts': 1,
+'revert_rate': float(1)/float(3),
+},
+# User B had no reverts
+self.editors[1].user_id: {
+'edits': 3,
+'reverts': 0,
+'revert_rate': 0,
+},
+}
+
+# check user A's results
+assert_equal(results[self.editors[0].user_id], 
results_should_be[self.editors[0].user_id])
+
+# check user B's results
+assert_equal(results[self.editors[1].user_id], 
results_should_be[self.editors[0].user_id])
+
+
+
diff --git a/wikimetrics/metrics/revert_rate.py 
b/wikimetrics/metrics/revert_rate.py
index 939e7fe..05cbbb0 100644
--- a/wikimetrics/metrics/revert_rate.py
+++ b/wikimetrics/metrics/revert_rate.py
@@ -47,13 +47,13 @@
 description='0, 2, 4, etc.',
 )
 
-#def __call__(self, user_ids, session):
-#"""
-#Parameters:
-#user_ids: list of mediawiki user ids to find edit reverts for
-#session : sqlalchemy session open on a mediawiki database
+def __call__(self, user_ids, session):
+"""
+Parameters:
+user_ids: list of mediawiki user ids to find edit reverts for
+session : sqlalchemy session open on a mediawiki database
 
-#Returns:
-#dictionary from user ids to the number of edit reverts found.
-#"""
-#return {user: None for user in user_ids}
+Returns:
+dictionary from user ids to the number of edit reverts found.
+"""
+return {user: None for user in user_ids}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I54bd07ff47fdcccd396ed353655bf247f29f0fea
Gerrit-PatchSet: 1
Gerrit-Project: analytics/wikimetrics
Gerrit-Branch: master
Gerrit-Owner: Ottomata 

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

[MediaWiki-commits] [Gerrit] Update Elastica from 04d676299e to db7c85f5af - change (mediawiki...CirrusSearch)

2013-09-11 Thread Reedy (Code Review)

Reedy has uploaded a new change for review.

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


Change subject: Update Elastica from 04d676299e to db7c85f5af
..

Update Elastica from 04d676299e to db7c85f5af

Change-Id: I2338eb1ad88b1ada2eaf2ab14db5d5fb07df033e
---
M Elastica
1 file changed, 0 insertions(+), 0 deletions(-)


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

diff --git a/Elastica b/Elastica
index 04d6762..db7c85f 16
--- a/Elastica
+++ b/Elastica
-Subproject commit 04d676299efc91372f23919bf878652380fb0d77
+Subproject commit db7c85f5af0d85f04b1fe955c8202fd69b417901

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

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

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

[MediaWiki-commits] [Gerrit] Improve method parameter type hints - change (mediawiki...CirrusSearch)

2013-09-11 Thread Reedy (Code Review)

Reedy has uploaded a new change for review.

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


Change subject: Improve method parameter type hints
..

Improve method parameter type hints

Change-Id: Ibcb501b9ea1300dcf780ae2e48bf5d1a8ad583b7
---
M CirrusSearch.body.php
M CirrusSearchSearcher.php
M CirrusSearchTextSanitizer.php
M CirrusSearchUpdater.php
4 files changed, 73 insertions(+), 6 deletions(-)


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

diff --git a/CirrusSearch.body.php b/CirrusSearch.body.php
index 0771f8a..6d1d8e4 100644
--- a/CirrusSearch.body.php
+++ b/CirrusSearch.body.php
@@ -28,6 +28,11 @@
$this->namespaces, $this->showRedirects );
}
 
+   /**
+* @param int $id
+* @param String $title
+* @param String $text
+*/
public function update( $id, $title, $text ) {
if ( $text === false || $text === null ) { // Can't just check 
falsy text because empty string is ok!
wfLogWarning( "Search update called with false or null 
text for $title.  Ignoring search update." );
@@ -36,6 +41,10 @@
CirrusSearchUpdater::updateFromTitleAndText( $id, $title, $text 
);
}
 
+   /**
+* @param int $id
+* @param String $title
+*/
public function updateTitle( $id, $title ) {
$loadedTitle = Title::newFromID( $id );
if ( $loadedTitle === null ) {
@@ -45,10 +54,19 @@
CirrusSearchUpdater::updateFromTitle( $loadedTitle );
}
 
+   /**
+* @param int $id
+* @param String $title
+*/
public function delete( $id, $title ) {
CirrusSearchUpdater::deletePages( array( $id ) );
}
 
+   /**
+* @param Title $t
+* @param Content $c
+* @return mixed|string
+*/
public function getTextFromContent( Title $t, Content $c = null ) {
$text = parent::getTextFromContent( $t, $c );
if( $c ) {
@@ -64,6 +82,9 @@
return $text;
}
 
+   /**
+* @return bool
+*/
public function textAlreadyUpdatedForIndex() {
return true;
}
diff --git a/CirrusSearchSearcher.php b/CirrusSearchSearcher.php
index 0aefbe2..ddd5147 100644
--- a/CirrusSearchSearcher.php
+++ b/CirrusSearchSearcher.php
@@ -48,7 +48,6 @@
$query->setLimit( $limit );
$mainFilter = new \Elastica\Filter\Bool();
$mainFilter->addMust( self::buildNamespaceFilter( $ns ) );
-   $prefixFilterQuery = new \Elastica\Filter\Query();
$match = new \Elastica\Query\Match();
$match->setField( 'title.prefix', array(
'query' => substr( $search, 0, self::MAX_PREFIX_SEARCH 
),
@@ -340,7 +339,7 @@
/**
 * Wrap query in link based boosts.
 * @param $query null|Elastica\Query optional query to boost.  if null 
the match_all is assumed
-* @return query that will run $query and boost results based on links
+* @return \Elastica\Query\AbstractQuery that will run $query and boost 
results based on links
 */
private static function boostQuery( $query = null ) {
return new \Elastica\Query\CustomScore( "_score * 
log10(doc['links'].value + doc['redirect_links'].value + 2)", $query );
@@ -382,6 +381,9 @@
return $this->suggestionQuery;
}
 
+   /**
+* @return bool
+*/
public function hasResults() {
return $this->totalHits > 0;
}
@@ -394,6 +396,9 @@
return $this->hits;
}
 
+   /**
+* @return bool
+*/
public function hasSuggestion() {
return $this->suggestionQuery !== null;
}
@@ -488,6 +493,9 @@
return Title::makeTitleSafe( $redirect[ 'namespace' ], 
$redirect[ 'title' ] );
}
 
+   /**
+* @return Title
+*/
private function findSectionTitle() {
$heading = $this->stripHighlighting( $this->sectionSnippet );
return Title::makeTitle(
@@ -497,31 +505,56 @@
);
}
 
+   /**
+* @param $highlighted string
+* @return string
+*/
private function stripHighlighting( $highlighted ) {
$markers = array( CirrusSearchSearcher::HIGHLIGHT_PRE, 
CirrusSearchSearcher::HIGHLIGHT_POST );
return str_replace( $markers, '', $highlighted );
}
 
+   /**
+* @param array $terms
+* @return String
+*/
public function getTitleSnippet( $terms ) {
return $this->titleSnippet;
}
 
+   /**
+* @return null|Title
+*/
public func

[MediaWiki-commits] [Gerrit] Merge normalizeTargets and normalizeSpamList together - change (mediawiki...MassMessage)

2013-09-11 Thread jenkins-bot (Code Review)

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

Change subject: Merge normalizeTargets and normalizeSpamList together
..


Merge normalizeTargets and normalizeSpamList together

Change-Id: I9bd829018fb9585518f480e8901f919b63ea16d3
---
M MassMessage.body.php
M SpecialMassMessage.php
M tests/MassMessageTest.php
3 files changed, 35 insertions(+), 45 deletions(-)

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



diff --git a/MassMessage.body.php b/MassMessage.body.php
index c9be8e0..c3671c1 100644
--- a/MassMessage.body.php
+++ b/MassMessage.body.php
@@ -111,57 +111,38 @@
}
 
/**
-* Normalizes an array of page/site combos
-* Also removes some dupes
-* @param  array $pages
-* @return array
-* @fixme Follow redirects on other sites
-*/
-   public static function normalizeSpamList( $pages ) {
-   global $wgDBname;
-   $data = array();
-   foreach ( $pages as $page ) {
-
-   if ( !isset( $page['dbname'] ) ) {
-   $dbname = self::getDBName( $page['site'] );
-   if ( $dbname == null ) { // Not set in $wgConf?
-   continue;
-   }
-   $page['dbname'] = $dbname;
-   }
-
-   if ( $page['dbname'] == $wgDBname ) {
-   $title = Title::newFromText( $page['title'] );
-   $title = self::followRedirect( $title );
-   if ( $title == null ) {
-   continue; // Interwiki redirect
-   }
-   $page['title'] = $title->getFullText();
-   }
-
-   // Use an assoc array to clear dupes
-   $data[$page['title'] . $page['dbname']] = $page;
-   }
-
-   return $data;
-   }
-
-   /**
 * Perform various normalization functions on the target data
 * @param  array $data
 * @return array
 */
public static function normalizeTargets( $data ) {
+   global $wgDBname;
$targets = array();
foreach ( $data as $target ) {
-   // Check invalid titles
-   $title = Title::newFromText( $target['title'] );
-   if ( $title === null ) {
-   // This checks against the local wiki's invalid 
list, not foreign wiki
-   continue;
+
+   if ( !isset( $target['dbname'] ) ) {
+   $dbname = self::getDBName( $target['site'] );
+   if ( $dbname == null ) {
+   // Not set in $wgConf
+   continue;
+   }
+   $target['dbname'] = $dbname;
}
 
-   $targets[] = $target;
+   if ( $target['dbname'] == $wgDBname ) {
+   $title = Title::newFromText( $target['title'] );
+   if ( $title === null ) {
+   continue;
+   }
+   $title = self::followRedirect( $title );
+   if ( $title === null ) {
+   continue; // Interwiki redirect
+   }
+   $target['title'] = $title->getPrefixedText();
+   }
+
+   // Use an assoc array to clear dupes
+   $targets[$target['title'] . $target['dbname']] = 
$target;
}
 
return $targets;
diff --git a/SpecialMassMessage.php b/SpecialMassMessage.php
index 3113b20..cc87b87 100644
--- a/SpecialMassMessage.php
+++ b/SpecialMassMessage.php
@@ -280,7 +280,6 @@
$this->status->fatal( $pages );
return $this->status;
}
-   $pages = MassMessage::normalizeSpamList( $pages );
foreach ( $pages as $page ) {
$title = Title::newFromText( $page['title'] );
$job = new MassMessageJob( $title, $data );
diff --git a/tests/MassMessageTest.php b/tests/MassMessageTest.php
index 6b3d203..4064224 100644
--- a/tests/MassMessageTest.php
+++ b/tests/MassMessageTest.php
@@ -15,6 +15,12 @@
),
);
$wgLocalDatabases =& $wgConf->getLocalDatabases();
+
+   // Create a redirect
+   $r = Title::newFromTe

[MediaWiki-commits] [Gerrit] Merge normalizeTargets and normalizeSpamList together - change (mediawiki...MassMessage)

2013-09-11 Thread Legoktm (Code Review)

Legoktm has uploaded a new change for review.

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


Change subject: Merge normalizeTargets and normalizeSpamList together
..

Merge normalizeTargets and normalizeSpamList together

Change-Id: I9bd829018fb9585518f480e8901f919b63ea16d3
---
M MassMessage.body.php
M SpecialMassMessage.php
M tests/MassMessageTest.php
3 files changed, 35 insertions(+), 45 deletions(-)


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

diff --git a/MassMessage.body.php b/MassMessage.body.php
index c9be8e0..c3671c1 100644
--- a/MassMessage.body.php
+++ b/MassMessage.body.php
@@ -111,57 +111,38 @@
}
 
/**
-* Normalizes an array of page/site combos
-* Also removes some dupes
-* @param  array $pages
-* @return array
-* @fixme Follow redirects on other sites
-*/
-   public static function normalizeSpamList( $pages ) {
-   global $wgDBname;
-   $data = array();
-   foreach ( $pages as $page ) {
-
-   if ( !isset( $page['dbname'] ) ) {
-   $dbname = self::getDBName( $page['site'] );
-   if ( $dbname == null ) { // Not set in $wgConf?
-   continue;
-   }
-   $page['dbname'] = $dbname;
-   }
-
-   if ( $page['dbname'] == $wgDBname ) {
-   $title = Title::newFromText( $page['title'] );
-   $title = self::followRedirect( $title );
-   if ( $title == null ) {
-   continue; // Interwiki redirect
-   }
-   $page['title'] = $title->getFullText();
-   }
-
-   // Use an assoc array to clear dupes
-   $data[$page['title'] . $page['dbname']] = $page;
-   }
-
-   return $data;
-   }
-
-   /**
 * Perform various normalization functions on the target data
 * @param  array $data
 * @return array
 */
public static function normalizeTargets( $data ) {
+   global $wgDBname;
$targets = array();
foreach ( $data as $target ) {
-   // Check invalid titles
-   $title = Title::newFromText( $target['title'] );
-   if ( $title === null ) {
-   // This checks against the local wiki's invalid 
list, not foreign wiki
-   continue;
+
+   if ( !isset( $target['dbname'] ) ) {
+   $dbname = self::getDBName( $target['site'] );
+   if ( $dbname == null ) {
+   // Not set in $wgConf
+   continue;
+   }
+   $target['dbname'] = $dbname;
}
 
-   $targets[] = $target;
+   if ( $target['dbname'] == $wgDBname ) {
+   $title = Title::newFromText( $target['title'] );
+   if ( $title === null ) {
+   continue;
+   }
+   $title = self::followRedirect( $title );
+   if ( $title === null ) {
+   continue; // Interwiki redirect
+   }
+   $target['title'] = $title->getPrefixedText();
+   }
+
+   // Use an assoc array to clear dupes
+   $targets[$target['title'] . $target['dbname']] = 
$target;
}
 
return $targets;
diff --git a/SpecialMassMessage.php b/SpecialMassMessage.php
index 3113b20..cc87b87 100644
--- a/SpecialMassMessage.php
+++ b/SpecialMassMessage.php
@@ -280,7 +280,6 @@
$this->status->fatal( $pages );
return $this->status;
}
-   $pages = MassMessage::normalizeSpamList( $pages );
foreach ( $pages as $page ) {
$title = Title::newFromText( $page['title'] );
$job = new MassMessageJob( $title, $data );
diff --git a/tests/MassMessageTest.php b/tests/MassMessageTest.php
index 6b3d203..4064224 100644
--- a/tests/MassMessageTest.php
+++ b/tests/MassMessageTest.php
@@ -15,6 +15,12 @@
),
);
$wgLocalDatabases =& $wgConf->getLocalDatabases();
+
+   /

[MediaWiki-commits] [Gerrit] Add a README - change (mediawiki...MassMessage)

2013-09-11 Thread jenkins-bot (Code Review)

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

Change subject: Add a README
..


Add a README

Change-Id: I2b60e4785d5e4d189be409e0cefa0771a7f8e458
---
A README.md
1 file changed, 71 insertions(+), 0 deletions(-)

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



diff --git a/README.md b/README.md
new file mode 100644
index 000..a29a729
--- /dev/null
+++ b/README.md
@@ -0,0 +1,71 @@
+# MassMessage
+
+MassMessage is a [MediaWiki](https://www.mediawiki.org/) extension that lets 
you easily send a talk page message to a large number of users at once. The 
extension also works over "wikifarm" setups.
+
+## Configuration
+
+`
+$wgNamespacesToPostIn = array( NS_PROJECT, NS_USER_TALK );
+`
+
+This limits the bot to only posting in the Project: and User talk: namespaces.
+
+`
+$wgNamespacesToConvert = array( NS_USER => NS_USER_TALK );
+`
+
+This allows a user to specify a page in the User: namespace, and the bot will 
automatically convert it to the User talk: namespace.
+
+`
+$wgMassMessageAccountUsername = 'MessengerBot';
+`
+
+The account name that the bot will post with. If this is an existing account, 
the extension will automatically take it over.
+
+Messages are delivered using the [job 
queue](https://www.mediawiki.org/wiki/Manual:Job_queue). It is recommended that 
you set up a cron job to empty the queue rather than relying on web requests. 
You can view how many MassMessage jobs are still queued by visiting 
`Special:Version` on your wiki.
+
+
+## Usage
+
+Messages are delivered using Special:MassMessage, and can be used by anyone 
with the `massmessage` userright, which is given to the sysop group by default.
+
+You will be allowed to preview how your message will look, after which a 
"Submit" button will appear.
+
+The form requires three different fields:
+
+### Input list
+
+The input list provided to the special page must be formatted using a custom 
parser function.
+
+
+`
+{{#target:Project:Noticeboard}}
+`
+
+In this example, the target page is `[[Project:Noticeboard]]` on your local 
site.
+
+`
+{{#target:User talk:Example|en.wikipedia.org}}
+`
+
+In this one, the target is `[[User talk:Example]]` on the "en.wikipedia.org" 
domain.
+
+### Subject
+
+The subject line will become the header of your message, and is also used as 
the edit summary. For this reason, it is limited to 240 bytes.
+
+### Body
+
+The body is the main text of the message. You will be automatically warned if 
your message is detected to have unclosed , but it will not prevent 
message delivery.
+
+Wikis can choose to add an enforced footer by editing the 
`massmessage-message-footer` message. In addition to that, a hidden comment 
will be added containing the user who sent the message, what project it was 
sent from, and the input list that was used. That comment can be modified by 
editing the `massmessage-hidden-comment` on the target site.
+
+## License
+
+MassMessage is licensed under the GNU General Public License 2.0 or any later 
version. You may obtain a copy of this license at 
.
+
+## Credits
+
+A full list of contributors can be found in the version control history. The 
MassMessage extension is based off of code from the [TranslationNotifications 
extension](https://mediawiki.org/wiki/Extension:TranslationNotifications). 
Thank you to [MZMcBride](https://en.wikipedia.org/wiki/User:MZMcBride) for 
helping with the design and implementation of this extension.
+
+Many thanks to the users on [TranslateWiki](https://translatewiki.net) who 
translated the extension.

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I2b60e4785d5e4d189be409e0cefa0771a7f8e458
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/MassMessage
Gerrit-Branch: master
Gerrit-Owner: Legoktm 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: MZMcBride 
Gerrit-Reviewer: Siebrand 
Gerrit-Reviewer: jenkins-bot

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

[MediaWiki-commits] [Gerrit] Migrating all use of M.pageApi.getPageUrl to mw.util.wikiGet... - change (mediawiki...MobileFrontend)

2013-09-11 Thread Kaldari (Code Review)

Kaldari has uploaded a new change for review.

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


Change subject: Migrating all use of M.pageApi.getPageUrl to mw.util.wikiGetlink
..

Migrating all use of M.pageApi.getPageUrl to mw.util.wikiGetlink

mediawiki.util is loaded by deafult on mobile in the head, so there's
no reason we need to have our own function for URL retrieval.

Explicitly declaring dependancy in mobile.stable.common (although
it's loaded anyway).

Marking M.pageApi.getPageUrl as deprecated (should be removed at some
point along with related unit tests).

Change-Id: Ib3685d297fe8d6c175c5b42902e4eacac072dcec
Dependency: I5224a0910
---
M includes/Resources.php
M javascripts/common/CtaDrawer.js
M javascripts/common/PageApi.js
M javascripts/common/history-alpha.js
M javascripts/common/languages/LanguageOverlay.js
M javascripts/modules/nearby/NearbyApi.js
M javascripts/modules/search/search.js
M javascripts/specials/overlays/PagePreviewOverlay.js
M tests/javascripts/common/test_PageApi.js
9 files changed, 8 insertions(+), 30 deletions(-)


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

diff --git a/includes/Resources.php b/includes/Resources.php
index c2fd164..15071df 100644
--- a/includes/Resources.php
+++ b/includes/Resources.php
@@ -398,6 +398,7 @@
'mobile.stable.plumbing',
'mobile.toast.styles',
'mediawiki.jqueryMsg',
+   'mediawiki.util',
),
'scripts' => array(
'javascripts/common/View.js',
diff --git a/javascripts/common/CtaDrawer.js b/javascripts/common/CtaDrawer.js
index 88b32b1..0201dd6 100644
--- a/javascripts/common/CtaDrawer.js
+++ b/javascripts/common/CtaDrawer.js
@@ -19,8 +19,8 @@
returnto: options.returnTo || mw.config.get( 
'wgPageName' )
}, options.queryParams );
 
-   options.loginUrl = M.pageApi.getPageUrl( 
'Special:UserLogin', params );
-   options.signupUrl = M.pageApi.getPageUrl( 
'Special:UserLogin', $.extend( params, { type: 'signup' } ) );
+   options.loginUrl = mw.util.wikiGetlink( 
'Special:UserLogin', params );
+   options.signupUrl = mw.util.wikiGetlink( 
'Special:UserLogin', $.extend( params, { type: 'signup' } ) );
}
} );
 
diff --git a/javascripts/common/PageApi.js b/javascripts/common/PageApi.js
index 7b32fcc..b2103a3 100644
--- a/javascripts/common/PageApi.js
+++ b/javascripts/common/PageApi.js
@@ -28,22 +28,6 @@
},
 
/**
-* Generate a URL for a given page title.
-*
-* @param {string} title Title of the page to generate link for.
-* @param {Object} params A mapping of query parameter names to 
values,
-* e.g. { action: 'edit' }.
-* @return {string}
-*/
-   getPageUrl: function( title, params ) {
-   var url = mw.config.get( 'wgArticlePath' ).replace( 
'$1', M.prettyEncodeTitle( title ) );
-   if ( !$.isEmptyObject( params ) ) {
-   url += '?' + $.param( params );
-   }
-   return url;
-   },
-
-   /**
 * Retrieve a page from the api
 *
 * @param {string} title the title of the page to be retrieved
diff --git a/javascripts/common/history-alpha.js 
b/javascripts/common/history-alpha.js
index 0635c20..dff36d4 100644
--- a/javascripts/common/history-alpha.js
+++ b/javascripts/common/history-alpha.js
@@ -42,7 +42,7 @@
 * @param {String} pageTitle String representing the title of a 
page that should be loaded in the browser
 */
function navigateToPage( title ) {
-   History.pushState( null, title, M.pageApi.getPageUrl( 
title ) );
+   History.pushState( null, title, mw.util.wikiGetlink( 
title ) );
}
 
/**
diff --git a/javascripts/common/languages/LanguageOverlay.js 
b/javascripts/common/languages/LanguageOverlay.js
index 7f7abb6..3eb6163 100644
--- a/javascripts/common/languages/LanguageOverlay.js
+++ b/javascripts/common/languages/LanguageOverlay.js
@@ -5,7 +5,7 @@
 
LanguageOverlay = Overlay.extend( {
defaults: {
-   languagesLink: M.pageApi.getPageUrl( 
'Special:MobileOptions/Language' ),
+   languagesLink: mw.util.wikiGetlink( 
'Special:MobileOptions/Language' ),
languagesText: mw.msg( 
'mobile-frontend-language-footer' ),
placeholder: mw.msg( 
'mobile-frontend-language-site-choose' )

[MediaWiki-commits] [Gerrit] The first test for typing in the VisualEditor - change (mediawiki...VisualEditor)

2013-09-11 Thread Amire80 (Code Review)

Amire80 has uploaded a new change for review.

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


Change subject: The first test for typing in the VisualEditor
..

The first test for typing in the VisualEditor

Change-Id: I2691fa325cef3d7c9cc03abca57b8f74ca7b0a38
---
A modules/ve-mw/test/browser/features/devanagari_typing.feature
A 
modules/ve-mw/test/browser/features/step_definitions/devanagari_typing_steps.rb
M modules/ve-mw/test/browser/features/support/env.rb
A modules/ve-mw/test/browser/features/support/pages/new_page.rb
M modules/ve-mw/test/browser/features/support/pages/visual_editor_page.rb
5 files changed, 30 insertions(+), 1 deletion(-)


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

diff --git a/modules/ve-mw/test/browser/features/devanagari_typing.feature 
b/modules/ve-mw/test/browser/features/devanagari_typing.feature
new file mode 100644
index 000..9dcc63e
--- /dev/null
+++ b/modules/ve-mw/test/browser/features/devanagari_typing.feature
@@ -0,0 +1,8 @@
+@ie6-bug  @ie7-bug  @ie8-bug @ie9-bug @ie10-bug @en.wikipedia.beta.wmflabs.org 
@login
+Feature: VisualEditor typing in Devanagari
+
+  Background:
+Given I am logged in
+  And I am editing a new page
+When I type अंग्रेज़ी
+Then I should see अंग्रेज़ी on the page
diff --git 
a/modules/ve-mw/test/browser/features/step_definitions/devanagari_typing_steps.rb
 
b/modules/ve-mw/test/browser/features/step_definitions/devanagari_typing_steps.rb
new file mode 100644
index 000..ae3ddcf
--- /dev/null
+++ 
b/modules/ve-mw/test/browser/features/step_definitions/devanagari_typing_steps.rb
@@ -0,0 +1,12 @@
+Given(/^I am editing a new page$/) do
+  visit(NewPage, using_params: {page_name: 
@random_string}).create_element.click
+  on(VisualEditorPage).beta_warning_element.when_present.click
+end
+
+When(/^I type (.+)$/) do |text|
+  on(VisualEditorPage).content_element.send_keys(text)
+end
+
+Then(/^I should see (.+) on the page$/) do |text|
+  on(VisualEditorPage).content_element.text.should == text
+end
diff --git a/modules/ve-mw/test/browser/features/support/env.rb 
b/modules/ve-mw/test/browser/features/support/env.rb
index 75f62b5..958ecdf 100644
--- a/modules/ve-mw/test/browser/features/support/env.rb
+++ b/modules/ve-mw/test/browser/features/support/env.rb
@@ -120,7 +120,7 @@
 
 Before do |scenario|
   @config = config
-  @does_not_exist_page_name = Random.new.rand.to_s
+  @random_string = Random.new.rand.to_s
   @mediawiki_username = mediawiki_username
   @mediawiki_password = mediawiki_password
   unless @language
diff --git a/modules/ve-mw/test/browser/features/support/pages/new_page.rb 
b/modules/ve-mw/test/browser/features/support/pages/new_page.rb
new file mode 100644
index 000..c40de21
--- /dev/null
+++ b/modules/ve-mw/test/browser/features/support/pages/new_page.rb
@@ -0,0 +1,8 @@
+class NewPage
+  include PageObject
+
+  include URL
+  page_url URL.url('<%=params[:page_name]%>')
+
+  li(:create, id: 'ca-ve-edit')
+end
diff --git 
a/modules/ve-mw/test/browser/features/support/pages/visual_editor_page.rb 
b/modules/ve-mw/test/browser/features/support/pages/visual_editor_page.rb
index cd8ee22..e177d4c 100644
--- a/modules/ve-mw/test/browser/features/support/pages/visual_editor_page.rb
+++ b/modules/ve-mw/test/browser/features/support/pages/visual_editor_page.rb
@@ -48,6 +48,7 @@
 span(:add_parameter, class: 've-ui-mwParameterResultWidget-name', frame: 
frame)
 span(:add_template, text: 'Add template', frame: frame)
 span(:apply_changes, text: 'Apply changes', frame: frame)
+a(:beta_warning, title: 'Close', frame: frame)
 text_field(:content_box, index: 0, frame: frame)
 span(:create_new, text:'Insert reference', frame: frame)
 span(:heading, text: 'Heading')

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

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

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

[MediaWiki-commits] [Gerrit] Add "category name" parameter - change (mediawiki...InlineCategorizer)

2013-09-11 Thread Krinkle (Code Review)

Krinkle has submitted this change and it was merged.

Change subject: Add "category name" parameter
..


Add "category name" parameter

Because the messages "inlinecategorizer-edit-category-error" and
"inlinecategorizer-remove-category-error" contain "$1"

Change-Id: If9fe7479e26cd3fba18c87a3851e2b0568975dec
---
M modules/ext.inlineCategorizer.core.js
1 file changed, 2 insertions(+), 2 deletions(-)

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



diff --git a/modules/ext.inlineCategorizer.core.js 
b/modules/ext.inlineCategorizer.core.js
index e934dae..8039c9a 100644
--- a/modules/ext.inlineCategorizer.core.js
+++ b/modules/ext.inlineCategorizer.core.js
@@ -621,7 +621,7 @@
 
// Old cat wasn't found, likely to be 
transcluded
if ( !$.isArray( matches ) ) {
-   ajaxcat.showError( mw.msg( 
'inlinecategorizer-edit-category-error' ) );
+   ajaxcat.showError( mw.msg( 
'inlinecategorizer-edit-category-error', oldCatName ) );
return false;
}
 
@@ -795,7 +795,7 @@
newText = newText.replace( categoryRegex, '' );
 
if ( newText === oldText ) {
-   ajaxcat.showError( mw.msg( 
'inlinecategorizer-remove-category-error' ) );
+   ajaxcat.showError( mw.msg( 
'inlinecategorizer-remove-category-error', category ) );
return false;
}
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: If9fe7479e26cd3fba18c87a3851e2b0568975dec
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/extensions/InlineCategorizer
Gerrit-Branch: master
Gerrit-Owner: Shirayuki 
Gerrit-Reviewer: Krinkle 
Gerrit-Reviewer: Nemo bis 
Gerrit-Reviewer: Shirayuki 

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

[MediaWiki-commits] [Gerrit] Reverting change I6deb26c1 since the core change hadn't been... - change (mediawiki...MobileFrontend)

2013-09-11 Thread jenkins-bot (Code Review)

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

Change subject: Reverting change I6deb26c1 since the core change hadn't been 
merged
..


Reverting change I6deb26c1 since the core change hadn't been merged

Change-Id: I6eb6c4973f66ccd60eab6626b06d2a698a338267
---
M includes/Resources.php
M javascripts/common/CtaDrawer.js
M javascripts/common/PageApi.js
M javascripts/common/history-alpha.js
M javascripts/common/languages/LanguageOverlay.js
M javascripts/modules/nearby/NearbyApi.js
M javascripts/modules/search/search.js
M javascripts/specials/overlays/PagePreviewOverlay.js
M tests/javascripts/common/test_PageApi.js
9 files changed, 30 insertions(+), 8 deletions(-)

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



diff --git a/includes/Resources.php b/includes/Resources.php
index 15071df..c2fd164 100644
--- a/includes/Resources.php
+++ b/includes/Resources.php
@@ -398,7 +398,6 @@
'mobile.stable.plumbing',
'mobile.toast.styles',
'mediawiki.jqueryMsg',
-   'mediawiki.util',
),
'scripts' => array(
'javascripts/common/View.js',
diff --git a/javascripts/common/CtaDrawer.js b/javascripts/common/CtaDrawer.js
index 0201dd6..88b32b1 100644
--- a/javascripts/common/CtaDrawer.js
+++ b/javascripts/common/CtaDrawer.js
@@ -19,8 +19,8 @@
returnto: options.returnTo || mw.config.get( 
'wgPageName' )
}, options.queryParams );
 
-   options.loginUrl = mw.util.wikiGetlink( 
'Special:UserLogin', params );
-   options.signupUrl = mw.util.wikiGetlink( 
'Special:UserLogin', $.extend( params, { type: 'signup' } ) );
+   options.loginUrl = M.pageApi.getPageUrl( 
'Special:UserLogin', params );
+   options.signupUrl = M.pageApi.getPageUrl( 
'Special:UserLogin', $.extend( params, { type: 'signup' } ) );
}
} );
 
diff --git a/javascripts/common/PageApi.js b/javascripts/common/PageApi.js
index b2103a3..7b32fcc 100644
--- a/javascripts/common/PageApi.js
+++ b/javascripts/common/PageApi.js
@@ -28,6 +28,22 @@
},
 
/**
+* Generate a URL for a given page title.
+*
+* @param {string} title Title of the page to generate link for.
+* @param {Object} params A mapping of query parameter names to 
values,
+* e.g. { action: 'edit' }.
+* @return {string}
+*/
+   getPageUrl: function( title, params ) {
+   var url = mw.config.get( 'wgArticlePath' ).replace( 
'$1', M.prettyEncodeTitle( title ) );
+   if ( !$.isEmptyObject( params ) ) {
+   url += '?' + $.param( params );
+   }
+   return url;
+   },
+
+   /**
 * Retrieve a page from the api
 *
 * @param {string} title the title of the page to be retrieved
diff --git a/javascripts/common/history-alpha.js 
b/javascripts/common/history-alpha.js
index dff36d4..0635c20 100644
--- a/javascripts/common/history-alpha.js
+++ b/javascripts/common/history-alpha.js
@@ -42,7 +42,7 @@
 * @param {String} pageTitle String representing the title of a 
page that should be loaded in the browser
 */
function navigateToPage( title ) {
-   History.pushState( null, title, mw.util.wikiGetlink( 
title ) );
+   History.pushState( null, title, M.pageApi.getPageUrl( 
title ) );
}
 
/**
diff --git a/javascripts/common/languages/LanguageOverlay.js 
b/javascripts/common/languages/LanguageOverlay.js
index 3eb6163..7f7abb6 100644
--- a/javascripts/common/languages/LanguageOverlay.js
+++ b/javascripts/common/languages/LanguageOverlay.js
@@ -5,7 +5,7 @@
 
LanguageOverlay = Overlay.extend( {
defaults: {
-   languagesLink: mw.util.wikiGetlink( 
'Special:MobileOptions/Language' ),
+   languagesLink: M.pageApi.getPageUrl( 
'Special:MobileOptions/Language' ),
languagesText: mw.msg( 
'mobile-frontend-language-footer' ),
placeholder: mw.msg( 
'mobile-frontend-language-site-choose' )
},
diff --git a/javascripts/modules/nearby/NearbyApi.js 
b/javascripts/modules/nearby/NearbyApi.js
index a0a1a6a..1313849 100644
--- a/javascripts/modules/nearby/NearbyApi.js
+++ b/javascripts/modules/nearby/NearbyApi.js
@@ -101,7 +101,7 @@
page.pageimageClass = 
'needsPhoto';
}

[MediaWiki-commits] [Gerrit] Reverting change I6deb26c1 since the core change hadn't been... - change (mediawiki...MobileFrontend)

2013-09-11 Thread Kaldari (Code Review)

Kaldari has uploaded a new change for review.

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


Change subject: Reverting change I6deb26c1 since the core change hadn't been 
merged
..

Reverting change I6deb26c1 since the core change hadn't been merged

Change-Id: I6eb6c4973f66ccd60eab6626b06d2a698a338267
---
M includes/Resources.php
M javascripts/common/CtaDrawer.js
M javascripts/common/PageApi.js
M javascripts/common/history-alpha.js
M javascripts/common/languages/LanguageOverlay.js
M javascripts/modules/nearby/NearbyApi.js
M javascripts/modules/search/search.js
M javascripts/specials/overlays/PagePreviewOverlay.js
M tests/javascripts/common/test_PageApi.js
9 files changed, 30 insertions(+), 8 deletions(-)


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

diff --git a/includes/Resources.php b/includes/Resources.php
index 15071df..c2fd164 100644
--- a/includes/Resources.php
+++ b/includes/Resources.php
@@ -398,7 +398,6 @@
'mobile.stable.plumbing',
'mobile.toast.styles',
'mediawiki.jqueryMsg',
-   'mediawiki.util',
),
'scripts' => array(
'javascripts/common/View.js',
diff --git a/javascripts/common/CtaDrawer.js b/javascripts/common/CtaDrawer.js
index 0201dd6..88b32b1 100644
--- a/javascripts/common/CtaDrawer.js
+++ b/javascripts/common/CtaDrawer.js
@@ -19,8 +19,8 @@
returnto: options.returnTo || mw.config.get( 
'wgPageName' )
}, options.queryParams );
 
-   options.loginUrl = mw.util.wikiGetlink( 
'Special:UserLogin', params );
-   options.signupUrl = mw.util.wikiGetlink( 
'Special:UserLogin', $.extend( params, { type: 'signup' } ) );
+   options.loginUrl = M.pageApi.getPageUrl( 
'Special:UserLogin', params );
+   options.signupUrl = M.pageApi.getPageUrl( 
'Special:UserLogin', $.extend( params, { type: 'signup' } ) );
}
} );
 
diff --git a/javascripts/common/PageApi.js b/javascripts/common/PageApi.js
index b2103a3..7b32fcc 100644
--- a/javascripts/common/PageApi.js
+++ b/javascripts/common/PageApi.js
@@ -28,6 +28,22 @@
},
 
/**
+* Generate a URL for a given page title.
+*
+* @param {string} title Title of the page to generate link for.
+* @param {Object} params A mapping of query parameter names to 
values,
+* e.g. { action: 'edit' }.
+* @return {string}
+*/
+   getPageUrl: function( title, params ) {
+   var url = mw.config.get( 'wgArticlePath' ).replace( 
'$1', M.prettyEncodeTitle( title ) );
+   if ( !$.isEmptyObject( params ) ) {
+   url += '?' + $.param( params );
+   }
+   return url;
+   },
+
+   /**
 * Retrieve a page from the api
 *
 * @param {string} title the title of the page to be retrieved
diff --git a/javascripts/common/history-alpha.js 
b/javascripts/common/history-alpha.js
index dff36d4..0635c20 100644
--- a/javascripts/common/history-alpha.js
+++ b/javascripts/common/history-alpha.js
@@ -42,7 +42,7 @@
 * @param {String} pageTitle String representing the title of a 
page that should be loaded in the browser
 */
function navigateToPage( title ) {
-   History.pushState( null, title, mw.util.wikiGetlink( 
title ) );
+   History.pushState( null, title, M.pageApi.getPageUrl( 
title ) );
}
 
/**
diff --git a/javascripts/common/languages/LanguageOverlay.js 
b/javascripts/common/languages/LanguageOverlay.js
index 3eb6163..7f7abb6 100644
--- a/javascripts/common/languages/LanguageOverlay.js
+++ b/javascripts/common/languages/LanguageOverlay.js
@@ -5,7 +5,7 @@
 
LanguageOverlay = Overlay.extend( {
defaults: {
-   languagesLink: mw.util.wikiGetlink( 
'Special:MobileOptions/Language' ),
+   languagesLink: M.pageApi.getPageUrl( 
'Special:MobileOptions/Language' ),
languagesText: mw.msg( 
'mobile-frontend-language-footer' ),
placeholder: mw.msg( 
'mobile-frontend-language-site-choose' )
},
diff --git a/javascripts/modules/nearby/NearbyApi.js 
b/javascripts/modules/nearby/NearbyApi.js
index a0a1a6a..1313849 100644
--- a/javascripts/modules/nearby/NearbyApi.js
+++ b/javascripts/modules/nearby/NearbyApi.js
@@ -101,7 +101,7 @@
page.pageimageClass = 
'needsPhoto';

[MediaWiki-commits] [Gerrit] RT #4671, RT #5681, remove quickipedia.org - change (operations/dns)

2013-09-11 Thread Dzahn (Code Review)

Dzahn has submitted this change and it was merged.

Change subject: RT #4671, RT #5681, remove quickipedia.org
..


RT #4671, RT #5681, remove quickipedia.org

Change-Id: Iec53b185e0ce850c5b82b35bf6ff80e67d52830f
---
D templates/quickipedia.org
1 file changed, 0 insertions(+), 1 deletion(-)

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



diff --git a/templates/quickipedia.org b/templates/quickipedia.org
deleted file mode 12
index f8431e2..000
--- a/templates/quickipedia.org
+++ /dev/null
@@ -1 +0,0 @@
-wikipedia.org
\ No newline at end of file

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Iec53b185e0ce850c5b82b35bf6ff80e67d52830f
Gerrit-PatchSet: 2
Gerrit-Project: operations/dns
Gerrit-Branch: master
Gerrit-Owner: Dzahn 
Gerrit-Reviewer: Dzahn 
Gerrit-Reviewer: jenkins-bot

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

[MediaWiki-commits] [Gerrit] remove vikipedio.org and vikipedio.com, RT #4673, RT #4674, ... - change (operations/dns)

2013-09-11 Thread Dzahn (Code Review)

Dzahn has submitted this change and it was merged.

Change subject: remove vikipedio.org and vikipedio.com, RT #4673, RT #4674, RT 
#5681
..


remove vikipedio.org and vikipedio.com, RT #4673, RT #4674, RT #5681

also see comments by legal on the older RT tickets, they were low prio,
nobody seemed to care, but we must have had them at some time in the past
or they wouldn't be here

Change-Id: Ibba1f883311edad036ec68ee72e635ceca6fedab
---
D templates/vikipedio.com
D templates/vikipedio.org
2 files changed, 0 insertions(+), 2 deletions(-)

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



diff --git a/templates/vikipedio.com b/templates/vikipedio.com
deleted file mode 12
index f8431e2..000
--- a/templates/vikipedio.com
+++ /dev/null
@@ -1 +0,0 @@
-wikipedia.org
\ No newline at end of file
diff --git a/templates/vikipedio.org b/templates/vikipedio.org
deleted file mode 12
index f8431e2..000
--- a/templates/vikipedio.org
+++ /dev/null
@@ -1 +0,0 @@
-wikipedia.org
\ No newline at end of file

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ibba1f883311edad036ec68ee72e635ceca6fedab
Gerrit-PatchSet: 3
Gerrit-Project: operations/dns
Gerrit-Branch: master
Gerrit-Owner: Dzahn 
Gerrit-Reviewer: Dzahn 
Gerrit-Reviewer: jenkins-bot

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

[MediaWiki-commits] [Gerrit] Adding nagios/icinga plugin and check for elasticsearch. - change (operations/puppet)

2013-09-11 Thread Ottomata (Code Review)

Ottomata has submitted this change and it was merged.

Change subject: Adding nagios/icinga plugin and check for elasticsearch.
..


Adding nagios/icinga plugin and check for elasticsearch.

Plugin swiped from: https://github.com/orthecreedence/check_elasticsearch

Change-Id: I5343ce236973fed0f590013cc5a68a26e1faba51
---
M manifests/misc/icinga.pp
M manifests/role/elasticsearch.pp
A modules/elasticsearch/files/nagios/check_elasticsearch
A modules/elasticsearch/manifests/nagios/check.pp
A modules/elasticsearch/manifests/nagios/plugin.pp
M templates/icinga/checkcommands.cfg.erb
6 files changed, 195 insertions(+), 0 deletions(-)

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



diff --git a/manifests/misc/icinga.pp b/manifests/misc/icinga.pp
index 9f84c43..498e793 100644
--- a/manifests/misc/icinga.pp
+++ b/manifests/misc/icinga.pp
@@ -599,6 +599,9 @@
   mode => '0755';
   }
 
+  # Include check_elasticsearch from elasticsearch module
+  include elasticsearch::nagios::plugin
+
   # some default configuration files conflict and should be removed
 
   file {
diff --git a/manifests/role/elasticsearch.pp b/manifests/role/elasticsearch.pp
index 35d6b5f..1460b43 100644
--- a/manifests/role/elasticsearch.pp
+++ b/manifests/role/elasticsearch.pp
@@ -14,6 +14,7 @@
 multicast_group => $multicast_group
 }
 include elasticsearch::ganglia
+include elasticsearch::nagios::check
 }
 
 # = Class: role::elasticsearch::beta
@@ -26,6 +27,7 @@
 heap_memory  => '4G',
 }
 include elasticsearch::ganglia
+include elasticsearch::nagios::check
 }
 
 # = Class: role::elasticsearch::labs
@@ -41,4 +43,5 @@
 cluster_name => $::elasticsearch_cluster_name,
 }
 include elasticsearch::ganglia
+include elasticsearch::nagios::check
 }
diff --git a/modules/elasticsearch/files/nagios/check_elasticsearch 
b/modules/elasticsearch/files/nagios/check_elasticsearch
new file mode 100644
index 000..10f7fec
--- /dev/null
+++ b/modules/elasticsearch/files/nagios/check_elasticsearch
@@ -0,0 +1,161 @@
+#!/bin/sh
+
+# Note: This file is managed by Puppet.
+
+#   This program is free software; you can redistribute it and/or modify
+#   it under the terms of the GNU General Public License as published by
+#   the Free Software Foundation; either version 2 of the License, or
+#   (at your option) any later version.
+#
+#   This program is distributed in the hope that it will be useful,
+#   but WITHOUT ANY WARRANTY; without even the implied warranty of
+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#   GNU General Public License for more details.
+#
+#   You should have received a copy of the GNU General Public License
+#   along with this program; if not, write to the Free Software
+#   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
+PROGNAME=`basename $0`
+VERSION="Version 0.2.0,"
+AUTHOR="Andrew Lyon, Based on Mike Adolphs (http://www.matejunkie.com/) 
check_nginx.sh code"
+
+
+ST_OK=0
+ST_WR=1
+ST_CR=2
+ST_UK=3
+hostname="localhost"
+port=9200
+status_page="/_cluster/health"
+output_dir=/tmp
+secure=0
+
+print_version() {
+echo "$VERSION $AUTHOR"
+}
+
+print_help() {
+print_version $PROGNAME $VERSION
+echo ""
+echo "$PROGNAME is a Nagios plugin to check the cluster status of 
elasticsearch."
+   echo "It also parses the status page to get a few useful variables out, 
and return"
+   echo "them in the output."
+echo ""
+echo "$PROGNAME -H localhost -P 9200 -o /tmp"
+echo ""
+echo "Options:"
+echo "  -H/--hostname)"
+echo " Defines the hostname. Default is: localhost"
+echo "  -P/--port)"
+echo " Defines the port. Default is: 9200"
+echo "  -o/--output-directory)"
+echo " Specifies where to write the tmp-file that the check creates."
+echo " Default is: /tmp"
+exit $ST_UK
+}
+
+while test -n "$1"; do
+case "$1" in
+-help|-h)
+print_help
+exit $ST_UK
+;;
+--version|-v)
+print_version $PROGNAME $VERSION
+exit $ST_UK
+;;
+--hostname|-H)
+hostname=$2
+shift
+;;
+--port|-P)
+port=$2
+shift
+;;
+--output-directory|-o)
+output_dir=$2
+shift
+;;
+*)
+echo "Unknown argument: $1"
+print_help
+exit $ST_UK
+;;
+esac
+shift
+done
+
+get_status() {
+filename=${PROGNAME}-${hostname}-${status_page}.1
+filename=`echo $filename | tr -d '\/'`
+filename=${output_dir}/${filename}
+   wget -q --header Host:stats -t 3 -T 3 
http://${hostname}:${port}/${status_page}?pretty=true -O ${filename}
+}
+
+get_vals() {
+   name=`grep cluster_name ${filename} | awk '{print $3}' | sed 
's|[",]|

[MediaWiki-commits] [Gerrit] Add proper star.wmflabs.org public cert - change (operations/puppet)

2013-09-11 Thread Ryan Lane (Code Review)

Ryan Lane has submitted this change and it was merged.

Change subject: Add proper star.wmflabs.org public cert
..


Add proper star.wmflabs.org public cert

Change-Id: I23f9508578034d82e335053d3bcd634f33d40327
---
M files/ssl/star.wmflabs.org.pem
1 file changed, 28 insertions(+), 16 deletions(-)

Approvals:
  Ryan Lane: Verified; Looks good to me, approved



diff --git a/files/ssl/star.wmflabs.org.pem b/files/ssl/star.wmflabs.org.pem
index 0e67238..e80e59e 100644
--- a/files/ssl/star.wmflabs.org.pem
+++ b/files/ssl/star.wmflabs.org.pem
@@ -1,18 +1,30 @@
 -BEGIN CERTIFICATE-
-MIIC1zCCAkACCQDLATIiYciIDjANBgkqhkiG9w0BAQUFADBrMQswCQYDVQQGEwJV
-UzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2FuIEZyYW5jaXNjbzEd
-MBsGA1UEChMUV2lraW1lZGlhIEZvdW5kYXRpb24xEDAOBgNVBAMTB0xhYnMgQ0Ew
-HhcNMTExMTE1MDE0NzAwWhcNMTYxMTEzMDE0NzAwWjBxMQswCQYDVQQGEwJVUzET
-MBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2FuIEZyYW5jaXNjbzEdMBsG
-A1UEChMUV2lraW1lZGlhIEZvdW5kYXRpb24xFjAUBgNVBAMUDSoud21mbGFicy5v
-cmcwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCWzAK4LBeyx3KeS6HD
-KFVq3Rs7RREAyJffDRzuwy54TnRhmyb0phdEkMZpxVssmzJ8ECBQm3afmXbzc5Mg
-rpQ/DKfo5Ax30LMh6iwfgXcQP93bP6KfYEQif9gGRF1+rmSr/HSR6kTTKfrCvLUQ
-Ek4uo2ImHQohYOeTqgCaD86qbB6D99AxUG1r9KyTfRBvVfXhIYJbAaZ2IL2RyCkl
-DGUDcZdUK7WH40X9lfGSy5TCDedj86qy6qXiIr80zky8P6Djg2YRjWh6Auk2Cbnp
-a4vKqmrd6zdgXL7L85fb4gFqdjG4AqtC3X9zkIK/sAubY9SZn/rU4J0e4NLsnZEM
-QpLrAgMBAAEwDQYJKoZIhvcNAQEFBQADgYEAzH6Hx3Kj29MKUxZVEgQaQL/Pc9gl
-2i9eYpeW6Dq8FrqCeEq0bRe008HIQPE1PshQAyFg/iC0btuuR1RAtspxhcDSDP0O
-yRSvBLoqovFaXa1TA6XktmKFtz13j3OUbWqrohJ0OdA5Y6c0gIUN6DRM6+RvaDNR
-Y8P0iKERxxbsvqg=
+MIIFLTCCBBWgAwIBAgIDDfIOMA0GCSqGSIb3DQEBBQUAMDwxCzAJBgNVBAYTAlVT
+MRcwFQYDVQQKEw5HZW9UcnVzdCwgSW5jLjEUMBIGA1UEAxMLUmFwaWRTU0wgQ0Ew
+HhcNMTMwOTEwMjAzMjI0WhcNMTUwOTEzMTgzMDAxWjCBvDEpMCcGA1UEBRMgVmxR
+SjFTRkxRbWlRa2Zickx2eXZLSEd2eGxrWHBUZW8xEzARBgNVBAsTCkdUMTcxMzQ4
+NDExMTAvBgNVBAsTKFNlZSB3d3cucmFwaWRzc2wuY29tL3Jlc291cmNlcy9jcHMg
+KGMpMTMxLzAtBgNVBAsTJkRvbWFpbiBDb250cm9sIFZhbGlkYXRlZCAtIFJhcGlk
+U1NMKFIpMRYwFAYDVQQDDA0qLndtZmxhYnMub3JnMIIBIjANBgkqhkiG9w0BAQEF
+AAOCAQ8AMIIBCgKCAQEArhv8QwEr6CKHYMK6alGyuh5zADmZOy2caCNagoYgJRhR
+6ZLnGlMwxIuy5wksYZCbzrhb9rB+mFJtRoUWuScHm7VGxUttvr2/B36hRiRwSNmJ
+j26YywBoIcw8MOWfBZpo0MXhct3xpmMzIilllyXe6axaEZHo5cpEDSnn/js1JRU4
+AHn1oYEyEfMvRxSQ/GY5fFVjYvZC0qutp/KEi3RqQW2d2T/yFu0CsoGJC1GmSZgB
+IroME+/EWkykd/s/fv7ZMQHH0ixbcZZMtzCcKLJGlZOmDx3kaEt/Patx18BSy7SM
+xv/FzjQBOP3xdBhVHUdSmnqHfWWS7lF8ndp4YAHQdQIDAQABo4IBtTCCAbEwHwYD
+VR0jBBgwFoAUa2k9ahhCSt2PAmU5/TUkhniRFjAwDgYDVR0PAQH/BAQDAgWgMB0G
+A1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAlBgNVHREEHjAcgg0qLndtZmxh
+YnMub3Jnggt3bWZsYWJzLm9yZzBDBgNVHR8EPDA6MDigNqA0hjJodHRwOi8vcmFw
+aWRzc2wtY3JsLmdlb3RydXN0LmNvbS9jcmxzL3JhcGlkc3NsLmNybDAdBgNVHQ4E
+FgQUzQ4ZPrG+zWKpaOenys4HVzIPRZ0wDAYDVR0TAQH/BAIwADB4BggrBgEFBQcB
+AQRsMGowLQYIKwYBBQUHMAGGIWh0dHA6Ly9yYXBpZHNzbC1vY3NwLmdlb3RydXN0
+LmNvbTA5BggrBgEFBQcwAoYtaHR0cDovL3JhcGlkc3NsLWFpYS5nZW90cnVzdC5j
+b20vcmFwaWRzc2wuY3J0MEwGA1UdIARFMEMwQQYKYIZIAYb4RQEHNjAzMDEGCCsG
+AQUFBwIBFiVodHRwOi8vd3d3Lmdlb3RydXN0LmNvbS9yZXNvdXJjZXMvY3BzMA0G
+CSqGSIb3DQEBBQUAA4IBAQCDeVBIDNUrtGPSzwCDXVFHnRx7gilCqe55KEycKbFM
+VLqMMLhgWMqilZjrREgExnGHnDABsqd0EeU3InL0onFcqJ3lvNhy51OqkP81i8T4
+aH6kSsygUhbfjnDK7zXFNaSCNaY9jTuGXWMI4WDuAm6YVYENpwW/zMyL48Y/ilyP
+majOXSkbKm2khWD2+3ucLn7ZHgm4HL1/TvpFXa8YZR6L5h4U8DmNfXw0WJDcb2bE
+GmLnfETTgEoAXr4L2vT5eb7AyYRbQZxbemcv0aIJcDzB+dddYqFWQYgKOb2sHrtO
+wCLUYmmpk8y9JMLjEH6YfspDOI+BY+zbfWF+7D7NFHbN
 -END CERTIFICATE-

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I23f9508578034d82e335053d3bcd634f33d40327
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ryan Lane 
Gerrit-Reviewer: Ryan Lane 

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

[MediaWiki-commits] [Gerrit] Add proper star.wmflabs.org public cert - change (operations/puppet)

2013-09-11 Thread Ryan Lane (Code Review)

Ryan Lane has uploaded a new change for review.

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


Change subject: Add proper star.wmflabs.org public cert
..

Add proper star.wmflabs.org public cert

Change-Id: I23f9508578034d82e335053d3bcd634f33d40327
---
M files/ssl/star.wmflabs.org.pem
1 file changed, 28 insertions(+), 16 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/64/83964/1

diff --git a/files/ssl/star.wmflabs.org.pem b/files/ssl/star.wmflabs.org.pem
index 0e67238..e80e59e 100644
--- a/files/ssl/star.wmflabs.org.pem
+++ b/files/ssl/star.wmflabs.org.pem
@@ -1,18 +1,30 @@
 -BEGIN CERTIFICATE-
-MIIC1zCCAkACCQDLATIiYciIDjANBgkqhkiG9w0BAQUFADBrMQswCQYDVQQGEwJV
-UzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2FuIEZyYW5jaXNjbzEd
-MBsGA1UEChMUV2lraW1lZGlhIEZvdW5kYXRpb24xEDAOBgNVBAMTB0xhYnMgQ0Ew
-HhcNMTExMTE1MDE0NzAwWhcNMTYxMTEzMDE0NzAwWjBxMQswCQYDVQQGEwJVUzET
-MBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2FuIEZyYW5jaXNjbzEdMBsG
-A1UEChMUV2lraW1lZGlhIEZvdW5kYXRpb24xFjAUBgNVBAMUDSoud21mbGFicy5v
-cmcwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCWzAK4LBeyx3KeS6HD
-KFVq3Rs7RREAyJffDRzuwy54TnRhmyb0phdEkMZpxVssmzJ8ECBQm3afmXbzc5Mg
-rpQ/DKfo5Ax30LMh6iwfgXcQP93bP6KfYEQif9gGRF1+rmSr/HSR6kTTKfrCvLUQ
-Ek4uo2ImHQohYOeTqgCaD86qbB6D99AxUG1r9KyTfRBvVfXhIYJbAaZ2IL2RyCkl
-DGUDcZdUK7WH40X9lfGSy5TCDedj86qy6qXiIr80zky8P6Djg2YRjWh6Auk2Cbnp
-a4vKqmrd6zdgXL7L85fb4gFqdjG4AqtC3X9zkIK/sAubY9SZn/rU4J0e4NLsnZEM
-QpLrAgMBAAEwDQYJKoZIhvcNAQEFBQADgYEAzH6Hx3Kj29MKUxZVEgQaQL/Pc9gl
-2i9eYpeW6Dq8FrqCeEq0bRe008HIQPE1PshQAyFg/iC0btuuR1RAtspxhcDSDP0O
-yRSvBLoqovFaXa1TA6XktmKFtz13j3OUbWqrohJ0OdA5Y6c0gIUN6DRM6+RvaDNR
-Y8P0iKERxxbsvqg=
+MIIFLTCCBBWgAwIBAgIDDfIOMA0GCSqGSIb3DQEBBQUAMDwxCzAJBgNVBAYTAlVT
+MRcwFQYDVQQKEw5HZW9UcnVzdCwgSW5jLjEUMBIGA1UEAxMLUmFwaWRTU0wgQ0Ew
+HhcNMTMwOTEwMjAzMjI0WhcNMTUwOTEzMTgzMDAxWjCBvDEpMCcGA1UEBRMgVmxR
+SjFTRkxRbWlRa2Zickx2eXZLSEd2eGxrWHBUZW8xEzARBgNVBAsTCkdUMTcxMzQ4
+NDExMTAvBgNVBAsTKFNlZSB3d3cucmFwaWRzc2wuY29tL3Jlc291cmNlcy9jcHMg
+KGMpMTMxLzAtBgNVBAsTJkRvbWFpbiBDb250cm9sIFZhbGlkYXRlZCAtIFJhcGlk
+U1NMKFIpMRYwFAYDVQQDDA0qLndtZmxhYnMub3JnMIIBIjANBgkqhkiG9w0BAQEF
+AAOCAQ8AMIIBCgKCAQEArhv8QwEr6CKHYMK6alGyuh5zADmZOy2caCNagoYgJRhR
+6ZLnGlMwxIuy5wksYZCbzrhb9rB+mFJtRoUWuScHm7VGxUttvr2/B36hRiRwSNmJ
+j26YywBoIcw8MOWfBZpo0MXhct3xpmMzIilllyXe6axaEZHo5cpEDSnn/js1JRU4
+AHn1oYEyEfMvRxSQ/GY5fFVjYvZC0qutp/KEi3RqQW2d2T/yFu0CsoGJC1GmSZgB
+IroME+/EWkykd/s/fv7ZMQHH0ixbcZZMtzCcKLJGlZOmDx3kaEt/Patx18BSy7SM
+xv/FzjQBOP3xdBhVHUdSmnqHfWWS7lF8ndp4YAHQdQIDAQABo4IBtTCCAbEwHwYD
+VR0jBBgwFoAUa2k9ahhCSt2PAmU5/TUkhniRFjAwDgYDVR0PAQH/BAQDAgWgMB0G
+A1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAlBgNVHREEHjAcgg0qLndtZmxh
+YnMub3Jnggt3bWZsYWJzLm9yZzBDBgNVHR8EPDA6MDigNqA0hjJodHRwOi8vcmFw
+aWRzc2wtY3JsLmdlb3RydXN0LmNvbS9jcmxzL3JhcGlkc3NsLmNybDAdBgNVHQ4E
+FgQUzQ4ZPrG+zWKpaOenys4HVzIPRZ0wDAYDVR0TAQH/BAIwADB4BggrBgEFBQcB
+AQRsMGowLQYIKwYBBQUHMAGGIWh0dHA6Ly9yYXBpZHNzbC1vY3NwLmdlb3RydXN0
+LmNvbTA5BggrBgEFBQcwAoYtaHR0cDovL3JhcGlkc3NsLWFpYS5nZW90cnVzdC5j
+b20vcmFwaWRzc2wuY3J0MEwGA1UdIARFMEMwQQYKYIZIAYb4RQEHNjAzMDEGCCsG
+AQUFBwIBFiVodHRwOi8vd3d3Lmdlb3RydXN0LmNvbS9yZXNvdXJjZXMvY3BzMA0G
+CSqGSIb3DQEBBQUAA4IBAQCDeVBIDNUrtGPSzwCDXVFHnRx7gilCqe55KEycKbFM
+VLqMMLhgWMqilZjrREgExnGHnDABsqd0EeU3InL0onFcqJ3lvNhy51OqkP81i8T4
+aH6kSsygUhbfjnDK7zXFNaSCNaY9jTuGXWMI4WDuAm6YVYENpwW/zMyL48Y/ilyP
+majOXSkbKm2khWD2+3ucLn7ZHgm4HL1/TvpFXa8YZR6L5h4U8DmNfXw0WJDcb2bE
+GmLnfETTgEoAXr4L2vT5eb7AyYRbQZxbemcv0aIJcDzB+dddYqFWQYgKOb2sHrtO
+wCLUYmmpk8y9JMLjEH6YfspDOI+BY+zbfWF+7D7NFHbN
 -END CERTIFICATE-

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I23f9508578034d82e335053d3bcd634f33d40327
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ryan Lane 

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

[MediaWiki-commits] [Gerrit] increment graphite pkg version - change (operations/puppet)

2013-09-11 Thread Asher (Code Review)

Asher has submitted this change and it was merged.

Change subject: increment graphite pkg version
..


increment graphite pkg version

Change-Id: I79e7e18434a5aa7ca8316f49ed63cd10ab15b0a4
---
M manifests/misc/graphite.pp
1 file changed, 4 insertions(+), 2 deletions(-)

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



diff --git a/manifests/misc/graphite.pp b/manifests/misc/graphite.pp
index cc0e628..ef184cf 100644
--- a/manifests/misc/graphite.pp
+++ b/manifests/misc/graphite.pp
@@ -9,8 +9,10 @@
ensure => present;
}
 
-   package { [ "python-carbon", "python-graphite-web", "python-whisper" ]:
-   ensure => "0.9.9-1";
+   if versioncmp($::lsbdistrelease, "12.04") >= 0 {
+   package { [ "python-carbon", "python-graphite-web", 
"python-whisper" ]:
+   ensure => "0.9.10";
+   }
}
 
file {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I79e7e18434a5aa7ca8316f49ed63cd10ab15b0a4
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Asher 
Gerrit-Reviewer: Asher 
Gerrit-Reviewer: jenkins-bot

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

[MediaWiki-commits] [Gerrit] increment graphite pkg version - change (operations/puppet)

2013-09-11 Thread Asher (Code Review)

Asher has uploaded a new change for review.

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


Change subject: increment graphite pkg version
..

increment graphite pkg version

Change-Id: I79e7e18434a5aa7ca8316f49ed63cd10ab15b0a4
---
M manifests/misc/graphite.pp
1 file changed, 4 insertions(+), 2 deletions(-)


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

diff --git a/manifests/misc/graphite.pp b/manifests/misc/graphite.pp
index cc0e628..b8855c4 100644
--- a/manifests/misc/graphite.pp
+++ b/manifests/misc/graphite.pp
@@ -9,8 +9,10 @@
ensure => present;
}
 
-   package { [ "python-carbon", "python-graphite-web", "python-whisper" ]:
-   ensure => "0.9.9-1";
+   if versioncmp($::lsbdistrelease, "12.04") >= 0 {
+   package { [ "python-carbon", "python-graphite-web", 
"python-whisper" ]:
+   ensure => "0.9.9-1";
+   }
}
 
file {

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

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

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

[MediaWiki-commits] [Gerrit] Use the star.wmflabs.org certificate for dynamic proxy - change (operations/puppet)

2013-09-11 Thread Ryan Lane (Code Review)

Ryan Lane has submitted this change and it was merged.

Change subject: Use the star.wmflabs.org certificate for dynamic proxy
..


Use the star.wmflabs.org certificate for dynamic proxy

Change-Id: Ibe8ebf8d18627d8ce09383cc88b08010d74534fe
---
M manifests/role/labsproxy.pp
1 file changed, 4 insertions(+), 1 deletion(-)

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



diff --git a/manifests/role/labsproxy.pp b/manifests/role/labsproxy.pp
index 3ef83e9..7a23839 100644
--- a/manifests/role/labsproxy.pp
+++ b/manifests/role/labsproxy.pp
@@ -60,7 +60,10 @@
 
 # A dynamic HTTP routing proxy, based on nginx+lua+redis
 class role::proxy-project {
+install_certificate{ 'star.wmflabs.org':
+privatekey => false
+}
 class { '::dynamicproxy':
-ssl_certificate_name => 'ssl-cert-snakeoil'
+ssl_certificate_name => 'star.wmflabs.org'
 }
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ibe8ebf8d18627d8ce09383cc88b08010d74534fe
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Yuvipanda 
Gerrit-Reviewer: Dzahn 
Gerrit-Reviewer: Ryan Lane 
Gerrit-Reviewer: coren 
Gerrit-Reviewer: jenkins-bot

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

[MediaWiki-commits] [Gerrit] install_certificate: change the behaviour for $privatekey=tr... - change (operations/puppet)

2013-09-11 Thread Ryan Lane (Code Review)

Ryan Lane has submitted this change and it was merged.

Change subject: install_certificate: change the behaviour for 
$privatekey=true/false.
..


install_certificate: change the behaviour for $privatekey=true/false.

before it used $privatekey to make a decision about the location
of the private key. it was either files/ssl/ or private/ssl.

the files/ssl part doesn't exist anymore, but instead we need an option
to just skip installing the key entirely. This allows it to be used in
labs where we want to install the public cert but not the key.

so just re-using $privatekey and only installing the key if this != "false".

also don't quote the booleans

make the Exec creating the pkcs12 run "onlyif" the key file is not empty

Change-Id: If507d39b0f51ac1de922cc80de89ce244832ba97
---
M manifests/certs.pp
1 file changed, 24 insertions(+), 14 deletions(-)

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



diff --git a/manifests/certs.pp b/manifests/certs.pp
index fe166f3..00483b3 100644
--- a/manifests/certs.pp
+++ b/manifests/certs.pp
@@ -19,6 +19,7 @@
"${name}_create_pkcs12":
creates => "${location}/${certname}.p12",
command => "/usr/bin/openssl pkcs12 -export -name 
\"${certalias}\" -passout pass:${defaultpassword} -in 
/etc/ssl/certs/${certname}.pem -inkey /etc/ssl/private/${certname}.key -out 
${location}/${certname}.p12",
+   onlyif  => "/usr/bin/test -s 
/etc/ssl/private/${certname}.key",
require => [Package["openssl"], 
File["/etc/ssl/private/${certname}.key", "/etc/ssl/certs/${certname}.pem"]];
}
 
@@ -78,18 +79,12 @@
}
 }
 
-define install_certificate( $group="ssl-cert", $ca="", $privatekey="true" ) {
+define install_certificate( $group="ssl-cert", $ca="", $privatekey=true ) {
 
require certificates::packages,
certificates::rapidssl_ca,
certificates::digicert_ca,
certificates::wmf_ca
-
-   if ( $privatekey == "false" ) {
-   $key_loc = "puppet:///files/ssl/${name}"
-   } else {
-   $key_loc = "puppet:///private/ssl/${name}"
-   }
 
file {
# Public key
@@ -99,13 +94,28 @@
mode => 0444,
source => "puppet:///files/ssl/${name}.pem",
require => Package["openssl"];
-   # Private key
-   "/etc/ssl/private/${name}.key":
-   owner => root,
-   group => $group,
-   mode => 0440,
-   source => "${key_loc}.key",
-   require => Package["openssl"];
+   }
+
+
+   if ( $privatekey == true ) {
+
+   file {
+   # Private key
+   "/etc/ssl/private/${name}.key":
+   owner => root,
+   group => $group,
+   mode => 0440,
+   source => $keysource,
+   require => Package["openssl"];
+   }
+
+   } else {
+
+   file {
+   # empty Private key
+   "/etc/ssl/private/${name}.key":
+   ensure => present;
+   }
}
 
exec {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: If507d39b0f51ac1de922cc80de89ce244832ba97
Gerrit-PatchSet: 6
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn 
Gerrit-Reviewer: Andrew Bogott 
Gerrit-Reviewer: Ryan Lane 
Gerrit-Reviewer: Yuvipanda 
Gerrit-Reviewer: jenkins-bot

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

[MediaWiki-commits] [Gerrit] Assert mobile mode in media viewer - change (mediawiki...MobileFrontend)

2013-09-11 Thread jenkins-bot (Code Review)

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

Change subject: Assert mobile mode in media viewer
..


Assert mobile mode in media viewer

Change-Id: Iace78ef03efc43acb30a4c84cfbdd8a9df541092
---
M javascripts/modules/mediaViewer.js
1 file changed, 2 insertions(+), 0 deletions(-)

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



diff --git a/javascripts/modules/mediaViewer.js 
b/javascripts/modules/mediaViewer.js
index 28c77de..419e927 100644
--- a/javascripts/modules/mediaViewer.js
+++ b/javascripts/modules/mediaViewer.js
@@ -1,4 +1,6 @@
 ( function( M, $ ) {
+   M.assertMode( [ 'alpha' ] );
+
var Overlay = M.require( 'Overlay' ),
Api = M.require( 'api' ).Api,
ImageApi, ImageOverlay, api;

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Iace78ef03efc43acb30a4c84cfbdd8a9df541092
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: JGonera 
Gerrit-Reviewer: Jdlrobson 
Gerrit-Reviewer: jenkins-bot

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

[MediaWiki-commits] [Gerrit] Migrating all use of M.pageApi.getPageUrl to mw.util.wikiGet... - change (mediawiki...MobileFrontend)

2013-09-11 Thread jenkins-bot (Code Review)

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

Change subject: Migrating all use of M.pageApi.getPageUrl to mw.util.wikiGetlink
..


Migrating all use of M.pageApi.getPageUrl to mw.util.wikiGetlink

mediawiki.util is loaded by deafult on mobile in the head, so there's
no reason we need to have our own function for URL retrieval.

Explicitly declaring dependancy in mobile.stable.common (although
it's loaded anyway).

Marking M.pageApi.getPageUrl as deprecated (should be removed at some
point along with related unit tests).

Change-Id: I6deb26c10fa354f6b07b7afe52eae1034a4c0a03
Dependency: I5224a0910
---
M includes/Resources.php
M javascripts/common/CtaDrawer.js
M javascripts/common/PageApi.js
M javascripts/common/history-alpha.js
M javascripts/common/languages/LanguageOverlay.js
M javascripts/modules/nearby/NearbyApi.js
M javascripts/modules/search/search.js
M javascripts/specials/overlays/PagePreviewOverlay.js
M tests/javascripts/common/test_PageApi.js
9 files changed, 13 insertions(+), 30 deletions(-)

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



diff --git a/includes/Resources.php b/includes/Resources.php
index c2fd164..15071df 100644
--- a/includes/Resources.php
+++ b/includes/Resources.php
@@ -398,6 +398,7 @@
'mobile.stable.plumbing',
'mobile.toast.styles',
'mediawiki.jqueryMsg',
+   'mediawiki.util',
),
'scripts' => array(
'javascripts/common/View.js',
diff --git a/javascripts/common/CtaDrawer.js b/javascripts/common/CtaDrawer.js
index bd6bcf5..0201dd6 100644
--- a/javascripts/common/CtaDrawer.js
+++ b/javascripts/common/CtaDrawer.js
@@ -1,3 +1,8 @@
+/**
+ * This creates the drawer at the bottom of the screen that appears when an 
anonymous
+ * user tries to perform an action that requires being logged in. It presents 
the user
+ * with options to log in or sign up for a new account.
+ */
 ( function( M, $ ) {
 var Drawer = M.require( 'Drawer' ),
CtaDrawer = Drawer.extend( {
@@ -14,8 +19,8 @@
returnto: options.returnTo || mw.config.get( 
'wgPageName' )
}, options.queryParams );
 
-   options.loginUrl = M.pageApi.getPageUrl( 
'Special:UserLogin', params );
-   options.signupUrl = M.pageApi.getPageUrl( 
'Special:UserLogin', $.extend( params, { type: 'signup' } ) );
+   options.loginUrl = mw.util.wikiGetlink( 
'Special:UserLogin', params );
+   options.signupUrl = mw.util.wikiGetlink( 
'Special:UserLogin', $.extend( params, { type: 'signup' } ) );
}
} );
 
diff --git a/javascripts/common/PageApi.js b/javascripts/common/PageApi.js
index 7b32fcc..b2103a3 100644
--- a/javascripts/common/PageApi.js
+++ b/javascripts/common/PageApi.js
@@ -28,22 +28,6 @@
},
 
/**
-* Generate a URL for a given page title.
-*
-* @param {string} title Title of the page to generate link for.
-* @param {Object} params A mapping of query parameter names to 
values,
-* e.g. { action: 'edit' }.
-* @return {string}
-*/
-   getPageUrl: function( title, params ) {
-   var url = mw.config.get( 'wgArticlePath' ).replace( 
'$1', M.prettyEncodeTitle( title ) );
-   if ( !$.isEmptyObject( params ) ) {
-   url += '?' + $.param( params );
-   }
-   return url;
-   },
-
-   /**
 * Retrieve a page from the api
 *
 * @param {string} title the title of the page to be retrieved
diff --git a/javascripts/common/history-alpha.js 
b/javascripts/common/history-alpha.js
index 0635c20..dff36d4 100644
--- a/javascripts/common/history-alpha.js
+++ b/javascripts/common/history-alpha.js
@@ -42,7 +42,7 @@
 * @param {String} pageTitle String representing the title of a 
page that should be loaded in the browser
 */
function navigateToPage( title ) {
-   History.pushState( null, title, M.pageApi.getPageUrl( 
title ) );
+   History.pushState( null, title, mw.util.wikiGetlink( 
title ) );
}
 
/**
diff --git a/javascripts/common/languages/LanguageOverlay.js 
b/javascripts/common/languages/LanguageOverlay.js
index 7f7abb6..3eb6163 100644
--- a/javascripts/common/languages/LanguageOverlay.js
+++ b/javascripts/common/languages/LanguageOverlay.js
@@ -5,7 +5,7 @@
 
LanguageOverlay = Overlay.extend( {
defaults: {
-   languagesLink: M.pageApi.getPageUrl( 
'Special:M

[MediaWiki-commits] [Gerrit] Replace logging with a simple throw - change (mediawiki...MobileFrontend)

2013-09-11 Thread jenkins-bot (Code Review)

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

Change subject: Replace logging with a simple throw
..


Replace logging with a simple throw

This way, configuration problems will be mch easier to notice.

Change-Id: I1172a75967b150a6dc3001b8a8ff354317e2e434
---
M includes/formatters/HtmlFormatter.php
1 file changed, 1 insertion(+), 2 deletions(-)

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



diff --git a/includes/formatters/HtmlFormatter.php 
b/includes/formatters/HtmlFormatter.php
index 7ae2432..8ca1359 100644
--- a/includes/formatters/HtmlFormatter.php
+++ b/includes/formatters/HtmlFormatter.php
@@ -276,8 +276,7 @@
$type = 'TAG';
$rawName = $selector;
} else {
-   wfDebugLog( 'mobile', __METHOD__ . ": unrecognized 
selector '$selector'" );
-   return false;
+   throw new MWException( __METHOD__ . "(): unrecognized 
selector '$selector'" );
}
 
return true;

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I1172a75967b150a6dc3001b8a8ff354317e2e434
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: MaxSem 
Gerrit-Reviewer: JGonera 
Gerrit-Reviewer: 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] Add test data for unit-tests - change (analytics/kraken)

2013-09-11 Thread Diederik (Code Review)

Diederik has submitted this change and it was merged.

Change subject: Add test data for unit-tests
..


Add test data for unit-tests

Change-Id: I0038c1c5ea7ad08fecf33710ba12791fac67f4e0
---
M .gitignore
A kraken-pig/src/test/resources/testdata_desktop.csv
A kraken-pig/src/test/resources/testdata_mobile.csv
A kraken-pig/src/test/resources/testdata_session.csv
4 files changed, 53 insertions(+), 1 deletion(-)

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



diff --git a/.gitignore b/.gitignore
index 123ae76..c5ebe20 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,7 +17,7 @@
 doc/
 
 deploy.sh
-testdata*
+testdata.csv
 kraken-dclass/src/main/java/org/openddr/
 *.gz
 tmp/
diff --git a/kraken-pig/src/test/resources/testdata_desktop.csv 
b/kraken-pig/src/test/resources/testdata_desktop.csv
new file mode 100644
index 000..bc96671
--- /dev/null
+++ b/kraken-pig/src/test/resources/testdata_desktop.csv
@@ -0,0 +1,25 @@
+knsq24.knams.wikimedia.org 560388694   2013-02-13T07:05:54.593 0   
10.180.33.0 TCP_MEM_HIT/200 5041GET 
http://commons.wikimedia.org/w/index.php?title=MediaWiki:TextCleaner.js&action=raw&ctype=text/javascript
NONE/-  text/javascript 
http://commons.wikimedia.org/wiki/File:Victoria_(Seychelles).jpg?uselang=ru 
-   
Mozilla/5.0%20(Windows%20NT%206.1;%20WOW64)%20AppleWebKit/537.17%20(KHTML,%20like%20Gecko)%20Chrome/24.0.1312.57%20Safari/537.17
ru-RU,ru;q=0.8,en-US;q=0.6,en;q=0.4 -
+cp1036.eqiad.wmnet 1987998022  2013-02-13T07:05:54 0.001018524 
10.167.250.0miss/3040   GET 
http://upload.wikimedia.org/wikipedia/commons/thumb/2/2c/PPD-34_and_PPD-34_38.JPG/200px-PPD-34_and_PPD-34_38.JPG
-   image/jpeg  
http://en.wikipedia.org/wiki/List_of_Russian_weaponry   -   
Mozilla/4.0%20(compatible;%20MSIE%208.0;%20Windows%20NT%206.1;%20Trident/4.0;%20%20SLCC2;%20.NET%20CLR%202.0.50727;%20.NET%20CLR%203.5.30729;%20.NET%20CLR%203.0.30729;%20Media%20Center%20PC%206.0;%20.NET4.0C;%20.NET4.0E;%20)
en-US   -
+cp1012.eqiad.wmnet 839078746   2013-02-13T07:05:54.672 0   
10.185.212.0TCP_MEM_HIT/200 489 GET 
http://meta.wikimedia.org/wiki/Special:RecordImpression?banner=B13_BlankA_FR&campaign=C13_wpnd_mlWW_FR&result=show&country=AR&userlang=es&project=wikipedia&db=eswiki&sitename=Wikipedia&bucket=0
   NONE/-  image/png   
http://es.wikipedia.org/wiki/D%C3%ADa_de_San_Valent%C3%ADn  -   
Mozilla/5.0%20(Windows%20NT%205.1)%20AppleWebKit/537.17%20(KHTML,%20like%20Gecko)%20Chrome/24.0.1312.57%20Safari/537.17
 es-ES,es;q=0.8  -
+cp1021.eqiad.wmnet 1978892196  2013-02-13T07:05:54 0.40531 
10.49.217.0 hit/200 5738GET 
http://upload.wikimedia.org/wikipedia/commons/thumb/3/3d/Mediawiki-logo.png/35px-Mediawiki-logo.png
 -   image/png   http://en.wikipedia.org/wiki/Main_Page  -   
Mozilla/5.0%20(Windows%20NT%205.1)%20AppleWebKit/537.17%20(KHTML,%20like%20Gecko)%20Chrome/24.0.1312.57%20Safari/537.17
 en-US,en;q=0.8  -
+amssq57.esams.wikimedia.org825729523   2013-02-13T07:05:54.661 15  
10.138.51.0 TCP_MISS/20047879   GET 
http://upload.wikimedia.org/wikipedia/commons/thumb/6/60/Wiki-mam-intcs.png/220px-Wiki-mam-intcs.png
CARP/91.198.174.57  image/png   
http://de.wikipedia.org/wiki/Cumshot-   
Mozilla/4.0%20(compatible;%20MSIE%208.0;%20Windows%20NT%205.2;%20Trident/4.0;%20.NET%20CLR%201.1.4322;%20.NET%20CLR%202.0.50727;%20.NET%20CLR%203.0.4506.2152;%20.NET%20CLR%203.5.30729;%20.NET4.0C;%20.NET4.0E;%20OfficeLiveConnector.1.5;%20OfficeLivePatch.1.3)
  de  -
+cp3010.esams.wikimedia.org 3167536827  2013-02-13T07:05:54 
0.55790 10.123.230.0hit/200 508 GET 
http://upload.wikimedia.org/wikipedia/commons/thumb/3/3e/Flag_of_New_Zealand.svg/22px-Flag_of_New_Zealand.svg.png
   -   image/png   http://ru.wikipedia.org/wiki/Bell_UH-1_Iroquois 
-   
Opera/9.80%20(Windows%20NT%206.1;%20WOW64;%20U;%20ru)%20Presto/2.10.289%20Version/12.00
 ru-RU,ru;q=0.9,en;q=0.8 -
+cp1013.eqiad.wmnet 841173907   2013-02-13T07:05:54.739 1   
10.43.19.0  TCP_MISS/20014279   GET 
http://ja.wikipedia.org/wiki/%E3%83%AD%E3%82%B7%E3%82%A2%E8%AA%9E%E4%BC%9A%E8%A9%B1
 CARP/10.64.0.133text/html   
http://www.google.co.jp/url?sa=t&rct=j&q=%E3%83%AD%E3%82%B7%E3%82%A2%E8%AA%9E%E3%80%80%E8%AC%9B%E5%BA%A7%E3%80%80%E3%82%BF%E3%83%AC%E3%83%B3%E3%83%88&source=web&cd=1&ved=0CDAQFjAA&url=http%3A%2F%2Fja.wikipedia.org%2Fwiki%2F%25E3%2583%25AD%25E3%2582%25B7%25E3%2582%25A2%25E8%25AA%259E%25E4%25BC%259A%25E8%25A9%25B1&ei=JjsbUfjkKeTAmQWNj4CoBA&usg=AFQjCNHIxiPlFmQzx2Rr1-tCquUoSRfY1w&bvm=bv.42261806,d.dGY
-   
Mozilla/5.0%20(compatible;%20MSIE%209.0;%20Windows%20NT%206.1;%20Trident/5.0)   
ja-JP   -
+amssq36.esams.wikimedia.org558274766   2013-02-13T

[MediaWiki-commits] [Gerrit] Add test data for unit-tests - change (analytics/kraken)

2013-09-11 Thread Diederik (Code Review)

Diederik has uploaded a new change for review.

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


Change subject: Add test data for unit-tests
..

Add test data for unit-tests

Change-Id: I0038c1c5ea7ad08fecf33710ba12791fac67f4e0
---
M .gitignore
A kraken-pig/src/test/resources/testdata_desktop.csv
A kraken-pig/src/test/resources/testdata_mobile.csv
A kraken-pig/src/test/resources/testdata_session.csv
4 files changed, 53 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/analytics/kraken 
refs/changes/62/83962/1

diff --git a/.gitignore b/.gitignore
index 123ae76..c5ebe20 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,7 +17,7 @@
 doc/
 
 deploy.sh
-testdata*
+testdata.csv
 kraken-dclass/src/main/java/org/openddr/
 *.gz
 tmp/
diff --git a/kraken-pig/src/test/resources/testdata_desktop.csv 
b/kraken-pig/src/test/resources/testdata_desktop.csv
new file mode 100644
index 000..bc96671
--- /dev/null
+++ b/kraken-pig/src/test/resources/testdata_desktop.csv
@@ -0,0 +1,25 @@
+knsq24.knams.wikimedia.org 560388694   2013-02-13T07:05:54.593 0   
10.180.33.0 TCP_MEM_HIT/200 5041GET 
http://commons.wikimedia.org/w/index.php?title=MediaWiki:TextCleaner.js&action=raw&ctype=text/javascript
NONE/-  text/javascript 
http://commons.wikimedia.org/wiki/File:Victoria_(Seychelles).jpg?uselang=ru 
-   
Mozilla/5.0%20(Windows%20NT%206.1;%20WOW64)%20AppleWebKit/537.17%20(KHTML,%20like%20Gecko)%20Chrome/24.0.1312.57%20Safari/537.17
ru-RU,ru;q=0.8,en-US;q=0.6,en;q=0.4 -
+cp1036.eqiad.wmnet 1987998022  2013-02-13T07:05:54 0.001018524 
10.167.250.0miss/3040   GET 
http://upload.wikimedia.org/wikipedia/commons/thumb/2/2c/PPD-34_and_PPD-34_38.JPG/200px-PPD-34_and_PPD-34_38.JPG
-   image/jpeg  
http://en.wikipedia.org/wiki/List_of_Russian_weaponry   -   
Mozilla/4.0%20(compatible;%20MSIE%208.0;%20Windows%20NT%206.1;%20Trident/4.0;%20%20SLCC2;%20.NET%20CLR%202.0.50727;%20.NET%20CLR%203.5.30729;%20.NET%20CLR%203.0.30729;%20Media%20Center%20PC%206.0;%20.NET4.0C;%20.NET4.0E;%20)
en-US   -
+cp1012.eqiad.wmnet 839078746   2013-02-13T07:05:54.672 0   
10.185.212.0TCP_MEM_HIT/200 489 GET 
http://meta.wikimedia.org/wiki/Special:RecordImpression?banner=B13_BlankA_FR&campaign=C13_wpnd_mlWW_FR&result=show&country=AR&userlang=es&project=wikipedia&db=eswiki&sitename=Wikipedia&bucket=0
   NONE/-  image/png   
http://es.wikipedia.org/wiki/D%C3%ADa_de_San_Valent%C3%ADn  -   
Mozilla/5.0%20(Windows%20NT%205.1)%20AppleWebKit/537.17%20(KHTML,%20like%20Gecko)%20Chrome/24.0.1312.57%20Safari/537.17
 es-ES,es;q=0.8  -
+cp1021.eqiad.wmnet 1978892196  2013-02-13T07:05:54 0.40531 
10.49.217.0 hit/200 5738GET 
http://upload.wikimedia.org/wikipedia/commons/thumb/3/3d/Mediawiki-logo.png/35px-Mediawiki-logo.png
 -   image/png   http://en.wikipedia.org/wiki/Main_Page  -   
Mozilla/5.0%20(Windows%20NT%205.1)%20AppleWebKit/537.17%20(KHTML,%20like%20Gecko)%20Chrome/24.0.1312.57%20Safari/537.17
 en-US,en;q=0.8  -
+amssq57.esams.wikimedia.org825729523   2013-02-13T07:05:54.661 15  
10.138.51.0 TCP_MISS/20047879   GET 
http://upload.wikimedia.org/wikipedia/commons/thumb/6/60/Wiki-mam-intcs.png/220px-Wiki-mam-intcs.png
CARP/91.198.174.57  image/png   
http://de.wikipedia.org/wiki/Cumshot-   
Mozilla/4.0%20(compatible;%20MSIE%208.0;%20Windows%20NT%205.2;%20Trident/4.0;%20.NET%20CLR%201.1.4322;%20.NET%20CLR%202.0.50727;%20.NET%20CLR%203.0.4506.2152;%20.NET%20CLR%203.5.30729;%20.NET4.0C;%20.NET4.0E;%20OfficeLiveConnector.1.5;%20OfficeLivePatch.1.3)
  de  -
+cp3010.esams.wikimedia.org 3167536827  2013-02-13T07:05:54 
0.55790 10.123.230.0hit/200 508 GET 
http://upload.wikimedia.org/wikipedia/commons/thumb/3/3e/Flag_of_New_Zealand.svg/22px-Flag_of_New_Zealand.svg.png
   -   image/png   http://ru.wikipedia.org/wiki/Bell_UH-1_Iroquois 
-   
Opera/9.80%20(Windows%20NT%206.1;%20WOW64;%20U;%20ru)%20Presto/2.10.289%20Version/12.00
 ru-RU,ru;q=0.9,en;q=0.8 -
+cp1013.eqiad.wmnet 841173907   2013-02-13T07:05:54.739 1   
10.43.19.0  TCP_MISS/20014279   GET 
http://ja.wikipedia.org/wiki/%E3%83%AD%E3%82%B7%E3%82%A2%E8%AA%9E%E4%BC%9A%E8%A9%B1
 CARP/10.64.0.133text/html   
http://www.google.co.jp/url?sa=t&rct=j&q=%E3%83%AD%E3%82%B7%E3%82%A2%E8%AA%9E%E3%80%80%E8%AC%9B%E5%BA%A7%E3%80%80%E3%82%BF%E3%83%AC%E3%83%B3%E3%83%88&source=web&cd=1&ved=0CDAQFjAA&url=http%3A%2F%2Fja.wikipedia.org%2Fwiki%2F%25E3%2583%25AD%25E3%2582%25B7%25E3%2582%25A2%25E8%25AA%259E%25E4%25BC%259A%25E8%25A9%25B1&ei=JjsbUfjkKeTAmQWNj4CoBA&usg=AFQjCNHIxiPlFmQzx2Rr1-tCquUoSRfY1w&bvm=bv.42261806,d.dGY
-   
Mozilla/5.0%20(compatible;%20MSIE%209.0;%20Windows%20NT%206.1;%20Trident/5.0)   
ja-JP   -
+

[MediaWiki-commits] [Gerrit] Tool Labs: add package python-wikitools - change (operations/puppet)

2013-09-11 Thread coren (Code Review)

coren has submitted this change and it was merged.

Change subject: Tool Labs: add package python-wikitools
..


Tool Labs: add package python-wikitools

So that it is properly installed rather than manually
on a random set of nodes.

Change-Id: I871ada36575c06f243e3f0686ff538ab51592003
---
M modules/toollabs/manifests/exec_environ.pp
1 file changed, 1 insertion(+), 0 deletions(-)

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



diff --git a/modules/toollabs/manifests/exec_environ.pp 
b/modules/toollabs/manifests/exec_environ.pp
index 3a701c4..3261f59 100644
--- a/modules/toollabs/manifests/exec_environ.pp
+++ b/modules/toollabs/manifests/exec_environ.pp
@@ -126,6 +126,7 @@
   'python-wadllib',
   'python-webpy',
   'python-werkzeug',
+  'python-wikitools',
   'python-zmq',
 
   # PHP libraries

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

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

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

[MediaWiki-commits] [Gerrit] Tool Labs: add package python-wikitools - change (operations/puppet)

2013-09-11 Thread coren (Code Review)

coren has uploaded a new change for review.

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


Change subject: Tool Labs: add package python-wikitools
..

Tool Labs: add package python-wikitools

So that it is properly installed rather than manually
on a random set of nodes.

Change-Id: I871ada36575c06f243e3f0686ff538ab51592003
---
M modules/toollabs/manifests/exec_environ.pp
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/61/83961/1

diff --git a/modules/toollabs/manifests/exec_environ.pp 
b/modules/toollabs/manifests/exec_environ.pp
index 3a701c4..3261f59 100644
--- a/modules/toollabs/manifests/exec_environ.pp
+++ b/modules/toollabs/manifests/exec_environ.pp
@@ -126,6 +126,7 @@
   'python-wadllib',
   'python-webpy',
   'python-werkzeug',
+  'python-wikitools',
   'python-zmq',
 
   # PHP libraries

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

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

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

[MediaWiki-commits] [Gerrit] Creating new dclass module. - change (operations/puppet)

2013-09-11 Thread Ottomata (Code Review)

Ottomata has uploaded a new change for review.

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


Change subject: Creating new dclass module.
..

Creating new dclass module.

This very simple module mostly just installs desired dclass packages.
I decided to make a new module for this because I needed to make sure the
/usr/lib symlinks are created so that Java 6 knows where to find the .so files.
Anyone who uses dclass java stuff (analytics, contint, etc.) needs to create
these symlinks.

Change-Id: Ia977343c140219e79012803e80b24a7dae3061e0
---
M manifests/role/analytics.pp
M modules/contint/manifests/packages.pp
A modules/dclass/manifests/data.pp
A modules/dclass/manifests/dev.pp
A modules/dclass/manifests/init.pp
A modules/dclass/manifests/java.pp
6 files changed, 52 insertions(+), 29 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/60/83960/1

diff --git a/manifests/role/analytics.pp b/manifests/role/analytics.pp
index 77520e6..307a42b 100644
--- a/manifests/role/analytics.pp
+++ b/manifests/role/analytics.pp
@@ -98,24 +98,7 @@
 
 
 class role::analytics::dclass {
-# install dclass JNI package
-# for device classification.
-if !defined(Package['libdclass-java']) {
-package { 'libdclass-java':
-ensure  => 'installed',
-require => Class['role::analytics::java'],
-}
-}
-# Symlink libdclass* .so into /usr/lib.
-# (Oracle java does not support multiarch.)
-file { '/usr/lib/libdclass.so':
-ensure => 'link',
-target => '/usr/lib/x86_64-linux-gnu/libdclass.so.0',
-require => Package['libdclass-java'],
-}
-file { '/usr/lib/libdclassjni.so':
-ensure => 'link',
-target => '/usr/lib/x86_64-linux-gnu/jni/libdclassjni.so',
-require => Package['libdclass-java'],
-}
+include dclass,
+  dclass::java,
+  dclass::data
 }
diff --git a/modules/contint/manifests/packages.pp 
b/modules/contint/manifests/packages.pp
index c63457b..aeef904 100644
--- a/modules/contint/manifests/packages.pp
+++ b/modules/contint/manifests/packages.pp
@@ -105,15 +105,10 @@
   }
 
   # Used for mobile device classification in Kraken:
-  package { [
-'libdclass0',
-'libdclass0-dev',
-'libdclass-jni',
-'libdclass-java',
-'libdclass-data',
-  ]:
-ensure => 'installed',
-  }
+  include dclass,
+dclass::dev,
+dclass::java,
+dclass::data
 
   # these packages are used by the tests for wikistats to parse the
   # generated reports to see if they are correct
diff --git a/modules/dclass/manifests/data.pp b/modules/dclass/manifests/data.pp
new file mode 100644
index 000..17f65f5
--- /dev/null
+++ b/modules/dclass/manifests/data.pp
@@ -0,0 +1,8 @@
+# == Class dclass::data
+#
+class dclass::data {
+require dclass
+
+# Used for mobile device classification in Kraken:
+package { 'libdclass-data': ensure => 'installed' }
+}
\ No newline at end of file
diff --git a/modules/dclass/manifests/dev.pp b/modules/dclass/manifests/dev.pp
new file mode 100644
index 000..7de999c
--- /dev/null
+++ b/modules/dclass/manifests/dev.pp
@@ -0,0 +1,8 @@
+# == Class dclass::dev
+# Installs libdclass0-dev development header package
+#
+class dclass::dev {
+require dclass
+
+package { 'libdclass0-dev': ensure => 'installed' }
+}
\ No newline at end of file
diff --git a/modules/dclass/manifests/init.pp b/modules/dclass/manifests/init.pp
new file mode 100644
index 000..8b44279
--- /dev/null
+++ b/modules/dclass/manifests/init.pp
@@ -0,0 +1,6 @@
+# == Class dclass
+# Installs libdclass0 library
+#
+class dclass {
+package { 'libdclass0': ensure => 'installed' }
+}
diff --git a/modules/dclass/manifests/java.pp b/modules/dclass/manifests/java.pp
new file mode 100644
index 000..3fbfa53
--- /dev/null
+++ b/modules/dclass/manifests/java.pp
@@ -0,0 +1,23 @@
+# == Class dclass::java
+#
+class dclass::java {
+require dclass
+
+# Used for mobile device classification in Kraken:
+package { ['libdclass-jni', 'libdclass-java']:
+  ensure => 'installed',
+}
+
+# Symlink libdclass* .so into /usr/lib.
+# Our java does not support multiarch.
+file { '/usr/lib/libdclass.so':
+ensure => 'link',
+target => '/usr/lib/x86_64-linux-gnu/libdclass.so.0',
+require => Package['libdclass0'],
+}
+file { '/usr/lib/libdclassjni.so':
+ensure => 'link',
+target => '/usr/lib/x86_64-linux-gnu/jni/libdclassjni.so',
+require => Package['libdclass-jni'],
+}
+}
\ No newline at end of file

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

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

___

[MediaWiki-commits] [Gerrit] Assert mobile mode in media viewer - change (mediawiki...MobileFrontend)

2013-09-11 Thread JGonera (Code Review)

JGonera has uploaded a new change for review.

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


Change subject: Assert mobile mode in media viewer
..

Assert mobile mode in media viewer

Change-Id: Iace78ef03efc43acb30a4c84cfbdd8a9df541092
---
M javascripts/modules/mediaViewer.js
1 file changed, 2 insertions(+), 0 deletions(-)


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

diff --git a/javascripts/modules/mediaViewer.js 
b/javascripts/modules/mediaViewer.js
index 28c77de..419e927 100644
--- a/javascripts/modules/mediaViewer.js
+++ b/javascripts/modules/mediaViewer.js
@@ -1,4 +1,6 @@
 ( function( M, $ ) {
+   M.assertMode( [ 'alpha' ] );
+
var Overlay = M.require( 'Overlay' ),
Api = M.require( 'api' ).Api,
ImageApi, ImageOverlay, api;

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

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

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

[MediaWiki-commits] [Gerrit] Load talk overlay dynamically - change (mediawiki...MobileFrontend)

2013-09-11 Thread JGonera (Code Review)

JGonera has uploaded a new change for review.

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


Change subject: Load talk overlay dynamically
..

Load talk overlay dynamically

Only when talk icon is clicked.
Initial page load (beta, desktop Chrome) before: 339KB, after: 332KB.

Change-Id: I4aa7976e88dbb214e37c7c6aae082a82623d3a3d
---
M includes/Resources.php
R javascripts/modules/talk/TalkOverlay.js
A javascripts/modules/talk/talk.js
3 files changed, 83 insertions(+), 56 deletions(-)


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

diff --git a/includes/Resources.php b/includes/Resources.php
index fbd1bfc..18bec83 100644
--- a/includes/Resources.php
+++ b/includes/Resources.php
@@ -263,10 +263,6 @@
'templates' => array(
// notifications.js
'overlays/notifications',
-   // talk.js
-   'overlays/talk',
-   'overlays/talkSectionAdd',
-   'talkSection',
// page.js
'pageActionTutorial',
),
@@ -301,8 +297,7 @@
'scripts' => array(
'javascripts/modules/mf-toggle-dynamic.js',
'javascripts/modules/notifications.js',
-   'javascripts/modules/talk/TalkSectionOverlay.js',
-   'javascripts/modules/talk.js',
+   'javascripts/modules/talk/talk.js',
'javascripts/modules/search/pageImages.js',
'javascripts/modules/languages/preferred.js',
'javascripts/modules/tutorials/PageActionOverlay.js',
@@ -321,10 +316,39 @@
'mobile-frontend-editor-tutorial-confirm',
 
// for talk.js
+   'mobile-frontend-talk-overlay-header',
+
+   // notifications.js (defined in Echo)
+   'echo-none',
+   'notifications',
+   ),
+   ),
+
+   'mobile.dynamic.talk' => $wgMFMobileResourceBoilerplate + array(
+   'dependencies' => array(
+   'mobile.beta',
+   'mobile.dynamic.talk.plumbing',
+   ),
+   'scripts' => array(
+   'javascripts/modules/talk/TalkSectionOverlay.js',
+   'javascripts/modules/talk/TalkOverlay.js',
+   ),
+   ),
+
+   'mobile.dynamic.talk.plumbing' => array(
+   'class' => 'MFResourceLoaderModule',
+   'localBasePath' => $localBasePath,
+   'localTemplateBasePath' => $localBasePath . '/templates',
+   'templates' => array(
+   // talk.js
+   'overlays/talk',
+   'overlays/talkSectionAdd',
+   'talkSection',
+   ),
+   'messages' => array(
'mobile-frontend-talk-explained',
'mobile-frontend-talk-explained-empty',
'mobile-frontend-talk-overlay-lead-header',
-   'mobile-frontend-talk-overlay-header',
'mobile-frontend-talk-add-overlay-subject-placeholder',
'mobile-frontend-talk-add-overlay-content-placeholder',
'mobile-frontend-talk-edit-summary',
@@ -332,10 +356,6 @@
'mobile-frontend-talk-reply-success',
'mobile-frontend-talk-reply',
'mobile-frontend-talk-reply-info',
-
-   // notifications.js (defined in Echo)
-   'echo-none',
-   'notifications',
),
),
 
diff --git a/javascripts/modules/talk.js 
b/javascripts/modules/talk/TalkOverlay.js
similarity index 71%
rename from javascripts/modules/talk.js
rename to javascripts/modules/talk/TalkOverlay.js
index ee8a332..5e7fea3 100644
--- a/javascripts/modules/talk.js
+++ b/javascripts/modules/talk/TalkOverlay.js
@@ -5,7 +5,6 @@
Overlay = M.require( 'Overlay' ),
TalkSectionOverlay = M.require( 
'modules/talk/TalkSectionOverlay' ),
api = M.require( 'api' ),
-   leadHeading = mw.msg( 
'mobile-frontend-talk-overlay-lead-header' ),
TalkSectionAddOverlay = Overlay.extend( {
defaults: {
cancelMsg: mw.msg( 
'mobile-frontend-editor-cancel' ),
@@ -64,6 +63,10 @@
TalkOverlay = Overlay.extend( {
template: M.template.get( 'overlays/talk' ),
className: 'mw-mf-overlay list-overlay',
+   defaults: {
+   heading: mw

[MediaWiki-commits] [Gerrit] Optimize Parser::doQuotes(). - change (mediawiki/core)

2013-09-11 Thread jenkins-bot (Code Review)

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

Change subject: Optimize Parser::doQuotes().
..


Optimize Parser::doQuotes().

Performance improvements to doQuotes(), since it is a hot function.

Co-authored-by: Tyler Anthony Romeo 
Change-Id: If78d4372a2acd78d58b020385da400978716cbf5
---
M includes/parser/Parser.php
1 file changed, 20 insertions(+), 12 deletions(-)

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



diff --git a/includes/parser/Parser.php b/includes/parser/Parser.php
index 170148c..fd69bfc 100644
--- a/includes/parser/Parser.php
+++ b/includes/parser/Parser.php
@@ -1414,7 +1414,8 @@
 */
public function doQuotes( $text ) {
$arr = preg_split( "/(''+)/", $text, -1, 
PREG_SPLIT_DELIM_CAPTURE );
-   if ( count( $arr ) == 1 ) {
+   $countarr = count( $arr );
+   if ( $countarr == 1 ) {
return $text;
}
 
@@ -1423,26 +1424,29 @@
// of bold and italics mark-ups.
$numbold = 0;
$numitalics = 0;
-   for ( $i = 1; $i < count( $arr ); $i += 2 ) {
+   for ( $i = 1; $i < $countarr; $i += 2 ) {
+   $thislen = strlen( $arr[$i] );
// If there are ever four apostrophes, assume the first 
is supposed to
// be text, and the remaining three constitute mark-up 
for bold text.
// (bug 13227: foo turns into ' ''' foo ' ''')
-   if ( strlen( $arr[$i] ) == 4 ) {
+   if ( $thislen == 4 ) {
$arr[$i - 1] .= "'";
$arr[$i] = "'''";
-   } elseif ( strlen( $arr[$i] ) > 5 ) {
+   $thislen = 3;
+   } elseif ( $thislen > 5 ) {
// If there are more than 5 apostrophes in a 
row, assume they're all
// text except for the last 5.
// (bug 13227: ''foo'' turns into ' 
' foo ' ')
-   $arr[$i - 1] .= str_repeat( "'", strlen( 
$arr[$i] ) - 5 );
+   $arr[$i - 1] .= str_repeat( "'", $thislen - 5 );
$arr[$i] = "'";
+   $thislen = 5;
}
// Count the number of occurrences of bold and italics 
mark-ups.
-   if ( strlen( $arr[$i] ) == 2 ) {
+   if ( $thislen == 2 ) {
$numitalics++;
-   } elseif ( strlen( $arr[$i] ) == 3 ) {
+   } elseif ( $thislen == 3 ) {
$numbold++;
-   } elseif ( strlen( $arr[$i] ) == 5 ) {
+   } elseif ( $thislen == 5 ) {
$numitalics++;
$numbold++;
}
@@ -1456,7 +1460,7 @@
$firstsingleletterword = -1;
$firstmultiletterword = -1;
$firstspace = -1;
-   for ( $i = 1; $i < count( $arr ); $i += 2 ) {
+   for ( $i = 1; $i < $countarr; $i += 2 ) {
if ( strlen( $arr[$i] ) == 3 ) {
$x1 = substr( $arr[$i - 1], -1 );
$x2 = substr( $arr[$i - 1], -2, 1 );
@@ -1467,6 +1471,9 @@
} elseif ( $x2 === ' ' ) {
if ( $firstsingleletterword == 
-1 ) {
$firstsingleletterword 
= $i;
+   // if 
$firstsingleletterword is set, we don't
+   // look at the other 
options, so we can bail early.
+   break;
}
} else {
if ( $firstmultiletterword == 
-1 ) {
@@ -1506,7 +1513,8 @@
$output .= $r;
}
} else {
-   if ( strlen( $r ) == 2 ) {
+   $thislen = strlen( $r );
+   if ( $thislen == 2 ) {
if ( $state === 'i' ) {
$output .= '';
$state = '';
@@ -1523,7 +1531,7 @@

[MediaWiki-commits] [Gerrit] Run TranslateGroup job Async for CentralNotice - change (operations/mediawiki-config)

2013-09-11 Thread Mwalker (Code Review)

Mwalker has submitted this change and it was merged.

Change subject: Run TranslateGroup job Async for CentralNotice
..


Run TranslateGroup job Async for CentralNotice

This prevents timeouts on banner saving because CN abuses translate.

This will be not required when I start tracking translate groups more
intelligently in CentralNotice.

Change-Id: Ifa59116d203d6514254ea833179dac9afeafe800
---
M wmf-config/CommonSettings.php
1 file changed, 1 insertion(+), 0 deletions(-)

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



diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index 55a39ff..0ce070e 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -1443,6 +1443,7 @@
'right' => 'centralnotice-admin',
),
);
+   $wgNoticeRunMessageIndexRebuildJobImmediately = false;
 
// Bug 49905
$wgNoticeUseLanguageConversion = true;

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ifa59116d203d6514254ea833179dac9afeafe800
Gerrit-PatchSet: 2
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Mwalker 
Gerrit-Reviewer: Mwalker 
Gerrit-Reviewer: jenkins-bot

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

[MediaWiki-commits] [Gerrit] Run TranslateGroup job Async for CentralNotice - change (operations/mediawiki-config)

2013-09-11 Thread Mwalker (Code Review)

Mwalker has uploaded a new change for review.

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


Change subject: Run TranslateGroup job Async for CentralNotice
..

Run TranslateGroup job Async for CentralNotice

This prevents timeouts on banner saving because CN abuses translate.

This will be not required when I start tracking translate groups more
intelligently in CentralNotice.

Change-Id: Ifa59116d203d6514254ea833179dac9afeafe800
---
M wmf-config/CommonSettings.php
1 file changed, 1 insertion(+), 0 deletions(-)


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

diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index 55a39ff..436b9ba 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -1443,6 +1443,7 @@
'right' => 'centralnotice-admin',
),
);
+   $wgNoticeRunMessageIndexRebuildJobImmediately = true;
 
// Bug 49905
$wgNoticeUseLanguageConversion = true;

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

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

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

[MediaWiki-commits] [Gerrit] Adding nagios/icinga plugin and check for elasticsearch. - change (operations/puppet)

2013-09-11 Thread Ottomata (Code Review)

Ottomata has uploaded a new change for review.

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


Change subject: Adding nagios/icinga plugin and check for elasticsearch.
..

Adding nagios/icinga plugin and check for elasticsearch.

Plugin swiped from: https://github.com/orthecreedence/check_elasticsearch

Change-Id: I5343ce236973fed0f590013cc5a68a26e1faba51
---
M manifests/misc/icinga.pp
M manifests/role/elasticsearch.pp
A modules/elasticsearch/files/nagios/check_elasticsearch
A modules/elasticsearch/manifests/nagios/check.pp
A modules/elasticsearch/manifests/nagios/plugin.pp
M templates/icinga/checkcommands.cfg.erb
6 files changed, 195 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/56/83956/1

diff --git a/manifests/misc/icinga.pp b/manifests/misc/icinga.pp
index 9f84c43..498e793 100644
--- a/manifests/misc/icinga.pp
+++ b/manifests/misc/icinga.pp
@@ -599,6 +599,9 @@
   mode => '0755';
   }
 
+  # Include check_elasticsearch from elasticsearch module
+  include elasticsearch::nagios::plugin
+
   # some default configuration files conflict and should be removed
 
   file {
diff --git a/manifests/role/elasticsearch.pp b/manifests/role/elasticsearch.pp
index 35d6b5f..1460b43 100644
--- a/manifests/role/elasticsearch.pp
+++ b/manifests/role/elasticsearch.pp
@@ -14,6 +14,7 @@
 multicast_group => $multicast_group
 }
 include elasticsearch::ganglia
+include elasticsearch::nagios::check
 }
 
 # = Class: role::elasticsearch::beta
@@ -26,6 +27,7 @@
 heap_memory  => '4G',
 }
 include elasticsearch::ganglia
+include elasticsearch::nagios::check
 }
 
 # = Class: role::elasticsearch::labs
@@ -41,4 +43,5 @@
 cluster_name => $::elasticsearch_cluster_name,
 }
 include elasticsearch::ganglia
+include elasticsearch::nagios::check
 }
diff --git a/modules/elasticsearch/files/nagios/check_elasticsearch 
b/modules/elasticsearch/files/nagios/check_elasticsearch
new file mode 100644
index 000..10f7fec
--- /dev/null
+++ b/modules/elasticsearch/files/nagios/check_elasticsearch
@@ -0,0 +1,161 @@
+#!/bin/sh
+
+# Note: This file is managed by Puppet.
+
+#   This program is free software; you can redistribute it and/or modify
+#   it under the terms of the GNU General Public License as published by
+#   the Free Software Foundation; either version 2 of the License, or
+#   (at your option) any later version.
+#
+#   This program is distributed in the hope that it will be useful,
+#   but WITHOUT ANY WARRANTY; without even the implied warranty of
+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#   GNU General Public License for more details.
+#
+#   You should have received a copy of the GNU General Public License
+#   along with this program; if not, write to the Free Software
+#   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
+PROGNAME=`basename $0`
+VERSION="Version 0.2.0,"
+AUTHOR="Andrew Lyon, Based on Mike Adolphs (http://www.matejunkie.com/) 
check_nginx.sh code"
+
+
+ST_OK=0
+ST_WR=1
+ST_CR=2
+ST_UK=3
+hostname="localhost"
+port=9200
+status_page="/_cluster/health"
+output_dir=/tmp
+secure=0
+
+print_version() {
+echo "$VERSION $AUTHOR"
+}
+
+print_help() {
+print_version $PROGNAME $VERSION
+echo ""
+echo "$PROGNAME is a Nagios plugin to check the cluster status of 
elasticsearch."
+   echo "It also parses the status page to get a few useful variables out, 
and return"
+   echo "them in the output."
+echo ""
+echo "$PROGNAME -H localhost -P 9200 -o /tmp"
+echo ""
+echo "Options:"
+echo "  -H/--hostname)"
+echo " Defines the hostname. Default is: localhost"
+echo "  -P/--port)"
+echo " Defines the port. Default is: 9200"
+echo "  -o/--output-directory)"
+echo " Specifies where to write the tmp-file that the check creates."
+echo " Default is: /tmp"
+exit $ST_UK
+}
+
+while test -n "$1"; do
+case "$1" in
+-help|-h)
+print_help
+exit $ST_UK
+;;
+--version|-v)
+print_version $PROGNAME $VERSION
+exit $ST_UK
+;;
+--hostname|-H)
+hostname=$2
+shift
+;;
+--port|-P)
+port=$2
+shift
+;;
+--output-directory|-o)
+output_dir=$2
+shift
+;;
+*)
+echo "Unknown argument: $1"
+print_help
+exit $ST_UK
+;;
+esac
+shift
+done
+
+get_status() {
+filename=${PROGNAME}-${hostname}-${status_page}.1
+filename=`echo $filename | tr -d '\/'`
+filename=${output_dir}/${filename}
+   wget -q --header Host:stats -t 3 -T 3 
http://${hostname}:${port}/${status_page}?pretty=true -O ${filename}
+}
+
+get_vals() {
+   name=`grep cluster_name $

[MediaWiki-commits] [Gerrit] Update Bugzilla URLs to reflect change in taxonomy - change (mediawiki/vagrant)

2013-09-11 Thread jenkins-bot (Code Review)

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

Change subject: Update Bugzilla URLs to reflect change in taxonomy
..


Update Bugzilla URLs to reflect change in taxonomy

MediaWiki-Vagrant is now a top-level product on MediaWiki Bugzilla rather than
a subentry of the 'tools' product.

Bug: 54041
Change-Id: I918b8a1ccd5d718089967ebf30dad5f53d37ea58
---
M README
M Vagrantfile
2 files changed, 2 insertions(+), 2 deletions(-)

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



diff --git a/README b/README
index 0033ca7..dcef127 100644
--- a/README
+++ b/README
@@ -77,7 +77,7 @@
  * irc://chat.freenode.net/#mediawiki
 
 Please report any bugs on Wikimedia's Bugzilla:
-https://bugzilla.wikimedia.org/enter_bug.cgi?product=Tools&component=Vagrant
+https://bugzilla.wikimedia.org/enter_bug.cgi?product=MediaWiki-Vagrant
 
 Patches and contributions are welcome!
 See  for 
details.
diff --git a/Vagrantfile b/Vagrantfile
index 089ad9e..7b5a13c 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -18,7 +18,7 @@
 # any values in this file. 'Vagrantfile-extra.rb' is ignored by git.
 #
 # Please report bugs in this file on Wikimedia's Bugzilla:
-# https://bugzilla.wikimedia.org/enter_bug.cgi?product=Tools&component=Vagrant
+# https://bugzilla.wikimedia.org/enter_bug.cgi?product=MediaWiki-Vagrant
 #
 # Patches and contributions are welcome!
 # http://www.mediawiki.org/wiki/How_to_become_a_MediaWiki_hacker

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I918b8a1ccd5d718089967ebf30dad5f53d37ea58
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: Ori.livneh 
Gerrit-Reviewer: Ori.livneh 
Gerrit-Reviewer: jenkins-bot

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

[MediaWiki-commits] [Gerrit] Update Bugzilla URLs to reflect change in taxonomy - change (mediawiki/vagrant)

2013-09-11 Thread Ori.livneh (Code Review)

Ori.livneh has uploaded a new change for review.

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


Change subject: Update Bugzilla URLs to reflect change in taxonomy
..

Update Bugzilla URLs to reflect change in taxonomy

MediaWiki-Vagrant is now a top-level product on MediaWiki Bugzilla rather than
a subentry of tools.

Bug: 54041
Change-Id: I918b8a1ccd5d718089967ebf30dad5f53d37ea58
---
M README
M Vagrantfile
2 files changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant 
refs/changes/55/83955/1

diff --git a/README b/README
index 0033ca7..dcef127 100644
--- a/README
+++ b/README
@@ -77,7 +77,7 @@
  * irc://chat.freenode.net/#mediawiki
 
 Please report any bugs on Wikimedia's Bugzilla:
-https://bugzilla.wikimedia.org/enter_bug.cgi?product=Tools&component=Vagrant
+https://bugzilla.wikimedia.org/enter_bug.cgi?product=MediaWiki-Vagrant
 
 Patches and contributions are welcome!
 See  for 
details.
diff --git a/Vagrantfile b/Vagrantfile
index 089ad9e..7b5a13c 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -18,7 +18,7 @@
 # any values in this file. 'Vagrantfile-extra.rb' is ignored by git.
 #
 # Please report bugs in this file on Wikimedia's Bugzilla:
-# https://bugzilla.wikimedia.org/enter_bug.cgi?product=Tools&component=Vagrant
+# https://bugzilla.wikimedia.org/enter_bug.cgi?product=MediaWiki-Vagrant
 #
 # Patches and contributions are welcome!
 # http://www.mediawiki.org/wiki/How_to_become_a_MediaWiki_hacker

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I918b8a1ccd5d718089967ebf30dad5f53d37ea58
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: 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] enumerate unused dbs outside of an ugly regex, testing graph... - change (operations/puppet)

2013-09-11 Thread Asher (Code Review)

Asher has submitted this change and it was merged.

Change subject: enumerate unused dbs outside of an ugly regex, testing graphite 
0.910 on db1014
..


enumerate unused dbs outside of an ugly regex, testing graphite 0.910 on db1014

Change-Id: Ic90ef430ed5bc5ec6ed27e8f617ed9eae42b12ba
---
M manifests/misc/graphite.pp
M manifests/site.pp
2 files changed, 40 insertions(+), 22 deletions(-)

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



diff --git a/manifests/misc/graphite.pp b/manifests/misc/graphite.pp
index f1ff857..cc0e628 100644
--- a/manifests/misc/graphite.pp
+++ b/manifests/misc/graphite.pp
@@ -14,6 +14,11 @@
}
 
file {
+   "/a/graphite":
+   owner => "www-data",
+   group => "www-data",
+   mode => 0755,
+   ensure => directory;
"/etc/apache2/sites-available/graphite":
owner => "root",
group => "root",
@@ -66,27 +71,27 @@
 
class { "varnish::monitoring::ganglia": varnish_instances => [ 
"graphite" ] }
 
-   varnish::instance { "graphite":
-   name => "",
-   vcl => "graphite",
-   port => 81,
-   admin_port => 6082,
-   storage => "-s malloc,256M",
-   backends => [ 'localhost' ],
-   directors => { 'backend' => [ 'localhost' ] },
-   vcl_config => {
-   'retry5xx' => 0
-   },
-   backend_options => {
-   'port' => 80,
-   'connect_timeout' => "5s",
-   'first_byte_timeout' => "35s",
-   'between_bytes_timeout' => "4s",
-   'max_connections' => 100,
-   'probe' => "options",
-   },
-   xff_sources => $network::constants::all_networks
-   }
+   #varnish::instance { "graphite":
+   #   name => "",
+   #   vcl => "graphite",
+   #   port => 81,
+   #   admin_port => 6082,
+   #   storage => "-s malloc,256M",
+   #   backends => [ 'localhost' ],
+   #   directors => { 'backend' => [ 'localhost' ] },
+   #   vcl_config => {
+   #   'retry5xx' => 0
+   #   },
+   #   backend_options => {
+   #   'port' => 80,
+   #   'connect_timeout' => "5s",
+   #   'first_byte_timeout' => "35s",
+   #   'between_bytes_timeout' => "4s",
+   #   'max_connections' => 100,
+   #   'probe' => "options",
+   #   },
+   #   xff_sources => $network::constants::all_networks
+   #}
 }
 
 class misc::graphite::gdash {
diff --git a/manifests/site.pp b/manifests/site.pp
index 8f13005..167d90b 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -741,10 +741,23 @@
 
 ## 2013-04-10: py using db101[45] and db1023 and db1033 for testing
 ## not currently in production and/or hardware issues
-node /^db10(1[45]|2[3]|3[367]|44)\.eqiad\.wmnet/ {
+# db1015
+# db1023
+# db1033
+# db1036
+# db1037
+# db1044
+node /^db10(15|2[3]|3[367]|44)\.eqiad\.wmnet/ {
 include standard
 }
 
+node "db1014.eqiad.wmnet" {
+$cluster = "misc"
+include standard,
+   misc::graphite,
+udpprofile::collector
+}
+
 # 2013-09-11: sp testing delayed slave mariadb 10
 node "db1045.eqiad.wmnet" {
 include standard

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic90ef430ed5bc5ec6ed27e8f617ed9eae42b12ba
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Asher 
Gerrit-Reviewer: Asher 
Gerrit-Reviewer: jenkins-bot

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

[MediaWiki-commits] [Gerrit] Use the star.wmflabs.org certificate for dynamic proxy - change (operations/puppet)

2013-09-11 Thread Yuvipanda (Code Review)

Yuvipanda has uploaded a new change for review.

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


Change subject: Use the star.wmflabs.org certificate for dynamic proxy
..

Use the star.wmflabs.org certificate for dynamic proxy

Change-Id: Ibe8ebf8d18627d8ce09383cc88b08010d74534fe
---
M manifests/role/labsproxy.pp
1 file changed, 2 insertions(+), 1 deletion(-)


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

diff --git a/manifests/role/labsproxy.pp b/manifests/role/labsproxy.pp
index 3ef83e9..7a7b81f 100644
--- a/manifests/role/labsproxy.pp
+++ b/manifests/role/labsproxy.pp
@@ -60,7 +60,8 @@
 
 # A dynamic HTTP routing proxy, based on nginx+lua+redis
 class role::proxy-project {
+install_certificate{ 'star.wmflabs.org': }
 class { '::dynamicproxy':
-ssl_certificate_name => 'ssl-cert-snakeoil'
+ssl_certificate_name => 'star.wmflabs.org'
 }
 }

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

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

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

[MediaWiki-commits] [Gerrit] enumerate unused dbs outside of an ugly regex, testing graph... - change (operations/puppet)

2013-09-11 Thread Asher (Code Review)

Asher has uploaded a new change for review.

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


Change subject: enumerate unused dbs outside of an ugly regex, testing graphite 
0.910 on db1014
..

enumerate unused dbs outside of an ugly regex, testing graphite 0.910 on db1014

Change-Id: Ic90ef430ed5bc5ec6ed27e8f617ed9eae42b12ba
---
M manifests/misc/graphite.pp
M manifests/site.pp
2 files changed, 17 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/53/83953/1

diff --git a/manifests/misc/graphite.pp b/manifests/misc/graphite.pp
index f1ff857..8a511a8 100644
--- a/manifests/misc/graphite.pp
+++ b/manifests/misc/graphite.pp
@@ -14,6 +14,11 @@
}
 
file {
+   "/a/graphite":
+   owner => "www-data",
+   group => "www-data",
+   mode => 0755,
+   ensure => directory;
"/etc/apache2/sites-available/graphite":
owner => "root",
group => "root",
diff --git a/manifests/site.pp b/manifests/site.pp
index 8f13005..46eca20 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -741,10 +741,21 @@
 
 ## 2013-04-10: py using db101[45] and db1023 and db1033 for testing
 ## not currently in production and/or hardware issues
-node /^db10(1[45]|2[3]|3[367]|44)\.eqiad\.wmnet/ {
+# db1015
+# db1023
+# db1033
+# db1036
+# db1037
+# db1044
+node /^db10(15|2[3]|3[367]|44)\.eqiad\.wmnet/ {
 include standard
 }
 
+node "db1014.eqiad.wmnet" {
+include standard,
+   misc::graphite
+}
+
 # 2013-09-11: sp testing delayed slave mariadb 10
 node "db1045.eqiad.wmnet" {
 include standard

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

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

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

[MediaWiki-commits] [Gerrit] Updating Translate and CentralNotice to master - change (mediawiki/core)

2013-09-11 Thread jenkins-bot (Code Review)

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

Change subject: Updating Translate and CentralNotice to master
..


Updating Translate and CentralNotice to master

Change-Id: Ief9dc24b314a48b7b1923bcc57d15eaf6ee1c2fa
---
M extensions/CentralNotice
M extensions/Translate
2 files changed, 0 insertions(+), 0 deletions(-)

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



diff --git a/extensions/CentralNotice b/extensions/CentralNotice
index 31e1e68..e267943 16
--- a/extensions/CentralNotice
+++ b/extensions/CentralNotice
-Subproject commit 31e1e68c3181145304e2bc370b3aeeeb6a53702c
+Subproject commit e267943ef9906097bea2805693be45a2efb75c55
diff --git a/extensions/Translate b/extensions/Translate
index 6a06ad3..2b735d2 16
--- a/extensions/Translate
+++ b/extensions/Translate
-Subproject commit 6a06ad3e7a717925b824b80cacbc426989cbab18
+Subproject commit 2b735d20e806e76b12776cecbcdb765dd27d80a7

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ief9dc24b314a48b7b1923bcc57d15eaf6ee1c2fa
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.22wmf16
Gerrit-Owner: Mwalker 
Gerrit-Reviewer: Mwalker 
Gerrit-Reviewer: jenkins-bot

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

[MediaWiki-commits] [Gerrit] Add events on tutorial actions - change (mediawiki...UploadWizard)

2013-09-11 Thread jenkins-bot (Code Review)

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

Change subject: Add events on tutorial actions
..


Add events on tutorial actions

Uses EventLogging, but falls back gracefully.

Change-Id: I6a2ae455e210bafd60568021933d498805639380
---
M UploadWizard.php
M UploadWizardHooks.php
M includes/UploadWizardTutorial.php
A resources/ext.UploadWizardEvent.js
M resources/mw.UploadWizard.js
5 files changed, 111 insertions(+), 2 deletions(-)

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



diff --git a/UploadWizard.php b/UploadWizard.php
index 3441b6e..fd68f33 100644
--- a/UploadWizard.php
+++ b/UploadWizard.php
@@ -120,6 +120,12 @@
'dependencies' => 'mediawiki.ui'
 ) + $uploadWizardModuleInfo;
 
+$wgResourceModules['schema.UploadWizardTutorialActions'] = array(
+   'class'  => 'ResourceLoaderSchemaModule',
+   'schema' => 'UploadWizardTutorialActions',
+   'revision' => 5803466,
+);
+
 // Campaign hook handlers
 $wgHooks[ 'BeforePageDisplay' ][] = 'CampaignHooks::onBeforePageDisplay';
 $wgHooks[ 'EditFilterMerged' ][] = 'CampaignHooks::onEditFilterMerged';
diff --git a/UploadWizardHooks.php b/UploadWizardHooks.php
index a1db49d..0ac2149 100644
--- a/UploadWizardHooks.php
+++ b/UploadWizardHooks.php
@@ -39,6 +39,7 @@
'mediawiki.feedback',
'ext.uploadWizard.apiUploadHandler',
'ext.uploadWizard.apiUploadFormDataHandler',
+   'ext.uploadWizard.events',
),
'scripts' => array(
// jquery interface helpers
@@ -472,6 +473,12 @@
'jquery.ui.button',
),
),
+
+   'ext.uploadWizard.events' => array(
+   'scripts' => array(
+   'resources/ext.UploadWizardEvent.js',
+   ),
+   ),
);
 
/**
@@ -480,12 +487,18 @@
 * Adds modules to ResourceLoader
 */
public static function resourceLoaderRegisterModules( &$resourceLoader 
) {
-   global $wgExtensionAssetsPath, $wgAPIModules;
+   global $wgExtensionAssetsPath, $wgAPIModules, 
$wgResourceModules;
 
$localpath = dirname( __FILE__ );
$remotepath = "$wgExtensionAssetsPath/UploadWizard";
if ( array_key_exists( 'titleblacklist', $wgAPIModules ) ) {
self::$modules['ext.uploadWizard']['dependencies'][] = 
'mediawiki.api.titleblacklist';
+   }
+   if ( array_key_exists( 'ext.eventLogging', $wgResourceModules ) 
) {
+   
self::$modules['ext.uploadWizard.events']['dependencies'] = array(
+   'ext.eventLogging',
+   'schema.UploadWizardTutorialActions',
+   );
}
foreach ( self::$modules as $name => $resources ) {
$resourceLoader->register(
@@ -493,6 +506,7 @@
new ResourceLoaderFileModule( $resources, 
$localpath, $remotepath )
);
}
+
return true;
}
 
diff --git a/includes/UploadWizardTutorial.php 
b/includes/UploadWizardTutorial.php
index f84748a..566058a 100644
--- a/includes/UploadWizardTutorial.php
+++ b/includes/UploadWizardTutorial.php
@@ -138,7 +138,8 @@
'coords' => $buttonCoords,
'href' => $helpDeskHref,
'alt' => $areaAltText,
-   'title' => $areaAltText
+   'title' => $areaAltText,
+   'id' => 'mwe-upwiz-tutorial-helpdesk',
) );
 
$imgHtml = Html::rawElement(
diff --git a/resources/ext.UploadWizardEvent.js 
b/resources/ext.UploadWizardEvent.js
new file mode 100644
index 000..d5829d1
--- /dev/null
+++ b/resources/ext.UploadWizardEvent.js
@@ -0,0 +1,71 @@
+( function ( mw, $ ) {
+   /**
+* @class mw.UploadWizardEvent
+* Represents an event to be logged. Used for EventLogging.
+* @constructor
+*/
+   mw.UploadWizardEvent = function () {
+   };
+
+   /**
+* @member {string} schemaName
+*/
+   mw.UploadWizardEvent.prototype.schemaName = 'UploadWizardAction';
+
+   /**
+* @member {string} schemaVersion
+*/
+   mw.UploadWizardEvent.prototype.schemaVersion = 0;
+
+   /**
+* @member {Object} payload
+*/
+   mw.UploadWizardEvent.prototype.payload = null;
+
+   /**
+* Run initialisation tasks.
+*/
+   mw.UploadWizardEvent.prototype.init = function ()

[MediaWiki-commits] [Gerrit] Remove ReplaceText, no progress made (bug or whatever) towar... - change (operations/mediawiki-config)

2013-09-11 Thread Reedy (Code Review)

Reedy has submitted this change and it was merged.

Change subject: Remove ReplaceText, no progress made (bug or whatever) towards 
enabling it
..


Remove ReplaceText, no progress made (bug or whatever) towards enabling it

Change-Id: I45674722e69e923007225822d7a71ef51246d7ae
---
M wmf-config/CommonSettings.php
M wmf-config/InitialiseSettings.php
2 files changed, 0 insertions(+), 10 deletions(-)

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



diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index 2ec578b..55a39ff 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -2378,10 +2378,6 @@
$wgGettingStartedExcludedCategories = 
$wmgGettingStartedExcludedCategories;
 }
 
-if ( $wmgUseReplaceText ) {
-   require_once( "$IP/extensions/ReplaceText/ReplaceText.php" );
-}
-
 if ( $wmgUseGeoCrumbs ) {
require_once( "$IP/extensions/GeoCrumbs/GeoCrumbs.php" );
 }
diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index 5488027..737edf5 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -12170,12 +12170,6 @@
'wikivoyage' => false,
 ),
 
-// DO NOT USE. Not currently branched
-'wmgUseReplaceText' => array(
-   'default' => false,
-   //'wikivoyage' => true,
-),
-
 'wmgUseGeoCrumbs' => array(
'default' => false,
'incubatorwiki' => true, // bug 44725

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I45674722e69e923007225822d7a71ef51246d7ae
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Reedy 
Gerrit-Reviewer: Reedy 

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

[MediaWiki-commits] [Gerrit] Remove ReplaceText, no progress made (bug or whatever) towar... - change (operations/mediawiki-config)

2013-09-11 Thread Reedy (Code Review)

Reedy has uploaded a new change for review.

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


Change subject: Remove ReplaceText, no progress made (bug or whatever) towards 
enabling it
..

Remove ReplaceText, no progress made (bug or whatever) towards enabling it

Change-Id: I45674722e69e923007225822d7a71ef51246d7ae
---
M wmf-config/CommonSettings.php
M wmf-config/InitialiseSettings.php
2 files changed, 0 insertions(+), 10 deletions(-)


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

diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index 2ec578b..55a39ff 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -2378,10 +2378,6 @@
$wgGettingStartedExcludedCategories = 
$wmgGettingStartedExcludedCategories;
 }
 
-if ( $wmgUseReplaceText ) {
-   require_once( "$IP/extensions/ReplaceText/ReplaceText.php" );
-}
-
 if ( $wmgUseGeoCrumbs ) {
require_once( "$IP/extensions/GeoCrumbs/GeoCrumbs.php" );
 }
diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index 5488027..737edf5 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -12170,12 +12170,6 @@
'wikivoyage' => false,
 ),
 
-// DO NOT USE. Not currently branched
-'wmgUseReplaceText' => array(
-   'default' => false,
-   //'wikivoyage' => true,
-),
-
 'wmgUseGeoCrumbs' => array(
'default' => false,
'incubatorwiki' => true, // bug 44725

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

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

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

[MediaWiki-commits] [Gerrit] Moved RandomTest to phpunit where it belongs, started cleanup - change (mediawiki/core)

2013-09-11 Thread Chad (Code Review)

Chad has uploaded a new change for review.

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


Change subject: Moved RandomTest to phpunit where it belongs, started cleanup
..

Moved RandomTest to phpunit where it belongs, started cleanup

Change-Id: I8fc028ca6cae7fd9f805030bbb540b2502039498
---
D includes/normal/RandomTest.php
A tests/phpunit/includes/normal/RandomTest.php
2 files changed, 69 insertions(+), 102 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/44/83944/1

diff --git a/includes/normal/RandomTest.php b/includes/normal/RandomTest.php
deleted file mode 100644
index 0602986..000
--- a/includes/normal/RandomTest.php
+++ /dev/null
@@ -1,102 +0,0 @@
-
- * http://www.mediawiki.org/
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- * http://www.gnu.org/copyleft/gpl.html
- *
- * @file
- * @ingroup UtfNormal
- */
-
-if( PHP_SAPI != 'cli' ) {
-   die( "Run me from the command line please.\n" );
-}
-
-/** */
-require_once 'UtfNormal.php';
-require_once '../diff/DifferenceEngine.php';
-
-dl( 'php_utfnormal.so' );
-
-# mt_srand( 9 );
-
-function randomString( $length, $nullOk, $ascii = false ) {
-   $out = '';
-   for( $i = 0; $i < $length; $i++ )
-   $out .= chr( mt_rand( $nullOk ? 0 : 1, $ascii ? 127 : 255 ) );
-   return $out;
-}
-
-/* Duplicate of the cleanUp() path for ICU usage */
-function donorm( $str ) {
-   # We exclude a few chars that ICU would not.
-   $str = preg_replace( '/[\x00-\x08\x0b\x0c\x0e-\x1f]/', 
UTF8_REPLACEMENT, $str );
-   $str = str_replace( UTF8_FFFE, UTF8_REPLACEMENT, $str );
-   $str = str_replace( UTF8_, UTF8_REPLACEMENT, $str );
-
-   # UnicodeString constructor fails if the string ends with a head byte.
-   # Add a junk char at the end, we'll strip it off
-   return rtrim( utf8_normalize( $str . "\x01", UtfNormal::UNORM_NFC ), 
"\x01" );
-}
-
-function showDiffs( $a, $b ) {
-   $ota = explode( "\n", str_replace( "\r\n", "\n", $a ) );
-   $nta = explode( "\n", str_replace( "\r\n", "\n", $b ) );
-
-   $diffs = new Diff( $ota, $nta );
-   $formatter = new TableDiffFormatter();
-   $funky = $formatter->format( $diffs );
-   $matches = array();
-   preg_match_all( '/<(?:ins|del) 
class="diffchange">(.*?)<\/(?:ins|del)>/', $funky, $matches );
-   foreach( $matches[1] as $bit ) {
-   $hex = bin2hex( $bit );
-   echo "\t$hex\n";
-   }
-}
-
-$size = 16;
-$n = 0;
-while( true ) {
-   $n++;
-   echo "$n\n";
-
-   $str = randomString( $size, true);
-   $clean = UtfNormal::cleanUp( $str );
-   $norm = donorm( $str );
-
-   echo strlen( $clean ) . ", " . strlen( $norm );
-   if( $clean == $norm ) {
-   echo " (match)\n";
-   } else {
-   echo " (FAIL)\n";
-   echo "\traw: " . bin2hex( $str ) . "\n" .
-"\tphp: " . bin2hex( $clean ) . "\n" .
-"\ticu: " . bin2hex( $norm ) . "\n";
-   echo "\n\tdiffs:\n";
-   showDiffs( $clean, $norm );
-   die();
-   }
-
-
-   $str = '';
-   $clean = '';
-   $norm = '';
-}
diff --git a/tests/phpunit/includes/normal/RandomTest.php 
b/tests/phpunit/includes/normal/RandomTest.php
new file mode 100644
index 000..52267fb
--- /dev/null
+++ b/tests/phpunit/includes/normal/RandomTest.php
@@ -0,0 +1,69 @@
+
+ * http://www.mediawiki.org/
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * http://www.gnu.org/copyleft/gpl.html
+ *
+

[MediaWiki-commits] [Gerrit] Updating Translate and CentralNotice to master - change (mediawiki/core)

2013-09-11 Thread Mwalker (Code Review)

Mwalker has submitted this change and it was merged.

Change subject: Updating Translate and CentralNotice to master
..


Updating Translate and CentralNotice to master

Change-Id: Id7f202178e9f7ab89be466ad3ff5f43f74f7ab8c
---
M extensions/CentralNotice
M extensions/Translate
2 files changed, 0 insertions(+), 0 deletions(-)

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



diff --git a/extensions/CentralNotice b/extensions/CentralNotice
index 31e1e68..e267943 16
--- a/extensions/CentralNotice
+++ b/extensions/CentralNotice
-Subproject commit 31e1e68c3181145304e2bc370b3aeeeb6a53702c
+Subproject commit e267943ef9906097bea2805693be45a2efb75c55
diff --git a/extensions/Translate b/extensions/Translate
index 6e86d4d..2b735d2 16
--- a/extensions/Translate
+++ b/extensions/Translate
-Subproject commit 6e86d4de1a9d7a8943b33ab20dc788a4789a36db
+Subproject commit 2b735d20e806e76b12776cecbcdb765dd27d80a7

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Id7f202178e9f7ab89be466ad3ff5f43f74f7ab8c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.22wmf15
Gerrit-Owner: Mwalker 
Gerrit-Reviewer: Mwalker 
Gerrit-Reviewer: jenkins-bot

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

[MediaWiki-commits] [Gerrit] change jenkins gid to www-data on civicrm server - change (operations/puppet)

2013-09-11 Thread Jgreen (Code Review)

Jgreen has uploaded a new change for review.

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


Change subject: change jenkins gid to www-data on civicrm server
..

change jenkins gid to www-data on civicrm server

Change-Id: Id5aa07f4d1569e134053d1b9605ff47885aa8071
---
M manifests/misc/fundraising.pp
1 file changed, 2 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/45/83945/1

diff --git a/manifests/misc/fundraising.pp b/manifests/misc/fundraising.pp
index 743e0cf..f53eef5 100644
--- a/manifests/misc/fundraising.pp
+++ b/manifests/misc/fundraising.pp
@@ -377,7 +377,8 @@
 
user { jenkins:
name => 'jenkins',
-   groups => [ 'wikidev' ];
+   gid => 'www-data',
+   groups => [ 'wikidev', 'backupmover' ];
}
 
service { 'jenkins':

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

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

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

[MediaWiki-commits] [Gerrit] Updating Translate and CentralNotice to master - change (mediawiki/core)

2013-09-11 Thread Mwalker (Code Review)

Mwalker has uploaded a new change for review.

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


Change subject: Updating Translate and CentralNotice to master
..

Updating Translate and CentralNotice to master

Change-Id: Ief9dc24b314a48b7b1923bcc57d15eaf6ee1c2fa
---
M extensions/CentralNotice
M extensions/Translate
2 files changed, 0 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/51/83951/1

diff --git a/extensions/CentralNotice b/extensions/CentralNotice
index 31e1e68..e267943 16
--- a/extensions/CentralNotice
+++ b/extensions/CentralNotice
-Subproject commit 31e1e68c3181145304e2bc370b3aeeeb6a53702c
+Subproject commit e267943ef9906097bea2805693be45a2efb75c55
diff --git a/extensions/Translate b/extensions/Translate
index 6a06ad3..2b735d2 16
--- a/extensions/Translate
+++ b/extensions/Translate
-Subproject commit 6a06ad3e7a717925b824b80cacbc426989cbab18
+Subproject commit 2b735d20e806e76b12776cecbcdb765dd27d80a7

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ief9dc24b314a48b7b1923bcc57d15eaf6ee1c2fa
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.22wmf16
Gerrit-Owner: Mwalker 

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

[MediaWiki-commits] [Gerrit] adding ulsfo.wmnet to search domains on iron - change (operations/puppet)

2013-09-11 Thread RobH (Code Review)

RobH has uploaded a new change for review.

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


Change subject: adding ulsfo.wmnet to search domains on iron
..

adding ulsfo.wmnet to search domains on iron

Change-Id: Ic7f2d4948c77a02c4b8a115c3b1603af3c88a3e1
---
M manifests/site.pp
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/50/83950/1

diff --git a/manifests/site.pp b/manifests/site.pp
index 8f13005..df3bcd4 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1167,7 +1167,7 @@
 node "iron.wikimedia.org" {
 system_role { "misc": description => "Operations Bastion" }
 $cluster = "misc"
-$domain_search = "wikimedia.org eqiad.wmnet pmtpa.wmnet 
esams.wikimedia.org"
+$domain_search = "wikimedia.org eqiad.wmnet pmtpa.wmnet  ulsfo.wmnet 
esams.wikimedia.org"
 
 include standard,
 admins::roots,

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

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

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

[MediaWiki-commits] [Gerrit] Fix processing of double metadata replacements - change (mediawiki...VisualEditor)

2013-09-11 Thread Catrope (Code Review)

Catrope has uploaded a new change for review.

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


Change subject: Fix processing of double metadata replacements
..

Fix processing of double metadata replacements

Transactions that replaced metadata twice at the same offset
(with retainMeta-replaceMeta-retainMeta-replaceMeta) were broken
because the processor for replaceMetadata didn't advance the
metadata cursor.

Change-Id: I7ad24e7ffb4c39b40ec9c347db301f8e28f3692d
---
M modules/ve/dm/ve.dm.TransactionProcessor.js
M modules/ve/test/dm/ve.dm.TransactionProcessor.test.js
2 files changed, 16 insertions(+), 0 deletions(-)


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

diff --git a/modules/ve/dm/ve.dm.TransactionProcessor.js 
b/modules/ve/dm/ve.dm.TransactionProcessor.js
index 9eabb48..0ce4ebc 100644
--- a/modules/ve/dm/ve.dm.TransactionProcessor.js
+++ b/modules/ve/dm/ve.dm.TransactionProcessor.js
@@ -497,4 +497,5 @@
insert = this.reversed ? op.remove : op.insert;
 
this.document.spliceMetadata( this.cursor, this.metadataCursor, 
remove.length, insert );
+   this.metadataCursor += insert.length;
 };
diff --git a/modules/ve/test/dm/ve.dm.TransactionProcessor.test.js 
b/modules/ve/test/dm/ve.dm.TransactionProcessor.test.js
index c420b05..cc996b0 100644
--- a/modules/ve/test/dm/ve.dm.TransactionProcessor.test.js
+++ b/modules/ve/test/dm/ve.dm.TransactionProcessor.test.js
@@ -305,6 +305,21 @@
data.splice( 27, 2, metaElementInsert, 
metaElementInsertClose );
}
},
+   'replacing metadata twice at the same offset': {
+   'data': ve.dm.example.withMeta,
+   'calls': [
+   [ 'pushRetain', 11 ],
+   [ 'pushRetainMetadata', 1 ],
+   [ 'pushReplaceMetadata', [ 
ve.dm.example.withMetaMetaData[11][1] ], [ metaElementInsert ] ],
+   [ 'pushRetainMetadata', 1 ],
+   [ 'pushReplaceMetadata', [ 
ve.dm.example.withMetaMetaData[11][3] ], [ metaElementInsert ] ],
+   [ 'pushRetain', 1 ]
+   ],
+   'expected': function ( data ) {
+   data.splice( 23, 2, metaElementInsert, 
metaElementInsertClose );
+   data.splice( 27, 2, metaElementInsert, 
metaElementInsertClose );
+   }
+   },
'removing data from between metadata merges metadata': {
'data': ve.dm.example.withMeta,
'calls': [

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

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

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

[MediaWiki-commits] [Gerrit] Add SSL support to the proxy - change (operations/puppet)

2013-09-11 Thread Ryan Lane (Code Review)

Ryan Lane has submitted this change and it was merged.

Change subject: Add SSL support to the proxy
..


Add SSL support to the proxy

Change-Id: I7cb82ceeec961dc181c143795be8f3f25204c74e
---
M manifests/role/labsproxy.pp
D modules/dynamicproxy/files/proxy.conf
M modules/dynamicproxy/manifests/init.pp
A modules/dynamicproxy/templates/proxy.conf
4 files changed, 53 insertions(+), 27 deletions(-)

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



diff --git a/manifests/role/labsproxy.pp b/manifests/role/labsproxy.pp
index 295f5c2..3ef83e9 100644
--- a/manifests/role/labsproxy.pp
+++ b/manifests/role/labsproxy.pp
@@ -60,5 +60,7 @@
 
 # A dynamic HTTP routing proxy, based on nginx+lua+redis
 class role::proxy-project {
-class { '::dynamicproxy': }
+class { '::dynamicproxy':
+ssl_certificate_name => 'ssl-cert-snakeoil'
+}
 }
diff --git a/modules/dynamicproxy/files/proxy.conf 
b/modules/dynamicproxy/files/proxy.conf
deleted file mode 100644
index f539374..000
--- a/modules/dynamicproxy/files/proxy.conf
+++ /dev/null
@@ -1,24 +0,0 @@
-lua_package_path "/etc/nginx/lua/?.lua";
-
-map $http_upgrade $connection_upgrade {
-default upgrade;
-''  close;
-}
-
-server {
-resolver 10.4.0.1;
-
-location / {
-set $backend '';
-set $vhost '';
-
-access_by_lua_file /etc/nginx/lua/proxy.lua;
-
-proxy_pass $backend;
-proxy_set_header Host $vhost;
-
-proxy_http_version 1.1;
-proxy_set_header Upgrade $http_upgrade;
-proxy_set_header Connection $connection_upgrade;
-}
-}
diff --git a/modules/dynamicproxy/manifests/init.pp 
b/modules/dynamicproxy/manifests/init.pp
index 644eb52..7bc5e8b 100644
--- a/modules/dynamicproxy/manifests/init.pp
+++ b/modules/dynamicproxy/manifests/init.pp
@@ -1,4 +1,7 @@
-class dynamicproxy ($redis_maxmemory="512MB") {
+class dynamicproxy (
+$redis_maxmemory="512MB",
+$ssl_certificate_name
+) {
 class { '::redis':
 persist   => "aof",
 dir   => "/var/lib/redis",
@@ -14,7 +17,7 @@
 
 file { '/etc/nginx/sites-available/default':
 ensure  => 'file',
-source  => 'puppet:///modules/dynamicproxy/proxy.conf',
+content => template('dynamicproxy/proxy.conf'),
 require => Package['nginx-extras'],
 notify  => Service['nginx']
 }
diff --git a/modules/dynamicproxy/templates/proxy.conf 
b/modules/dynamicproxy/templates/proxy.conf
new file mode 100644
index 000..244d3e4
--- /dev/null
+++ b/modules/dynamicproxy/templates/proxy.conf
@@ -0,0 +1,45 @@
+lua_package_path "/etc/nginx/lua/?.lua";
+
+map $http_upgrade $connection_upgrade {
+default upgrade;
+''  close;
+}
+
+server {
+resolver 10.4.0.1;
+
+# Serve both HTTP and HTTPS
+listen 80;
+listen 443 default_server ssl;
+
+ssl_certificate /etc/ssl/certs/<%= @ssl_certificate_name %>.pem;
+ssl_certificate_key /etc/ssl/private/<%= @ssl_certificate_name %>.key;
+
+# Copied from templates/nginx/nginx.conf.erb. Eugh
+# Enable a shared cache, since it is defined at this level
+# it will be used for all virtual hosts. 1m = 4000 active sessions,
+# so we are allowing 200,000 active sessions.
+ssl_session_cache shared:SSL:50m;
+# SSLv2 is insecure, only allow SSLv3 and TLSv1
+ssl_protocols SSLv3 TLSv1 TLSv1.1 TLSv1.2;
+# Limit ciphers allowed
+ssl_ciphers AES128-GCM-SHA256:RC4-SHA:RC4-MD5:AES128-SHA:AES256-SHA;
+# Prefer server ciphers (Prefer RC4 first to combat BEAST)
+ssl_prefer_server_ciphers on;
+
+location / {
+set $backend '';
+set $vhost '';
+
+access_by_lua_file /etc/nginx/lua/proxy.lua;
+
+proxy_pass $backend;
+proxy_set_header Host $vhost;
+
+proxy_set_header X-Forwarded-Proto $scheme;
+
+proxy_http_version 1.1;
+proxy_set_header Upgrade $http_upgrade;
+proxy_set_header Connection $connection_upgrade;
+}
+}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I7cb82ceeec961dc181c143795be8f3f25204c74e
Gerrit-PatchSet: 7
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Yuvipanda 
Gerrit-Reviewer: Dzahn 
Gerrit-Reviewer: Ryan Lane 
Gerrit-Reviewer: jenkins-bot

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

[MediaWiki-commits] [Gerrit] Load editor conditionally - change (mediawiki...MobileFrontend)

2013-09-11 Thread JGonera (Code Review)

JGonera has uploaded a new change for review.

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


Change subject: Load editor conditionally
..

Load editor conditionally

Don't load it on every page load, only when the edit icon is clicked.

Bug: 48718
Change-Id: I315f8d0404a7b2edaa0579dd747f9143aa5d3c38
---
M MobileFrontend.i18n.php
M includes/Resources.php
A javascripts/common/LoadingOverlay.js
M javascripts/modules/editor/editor.js
M javascripts/specials/overlays/PagePreviewOverlay.js
A templates/LoadingOverlay.html
D templates/overlays/loading.html
7 files changed, 74 insertions(+), 47 deletions(-)


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

diff --git a/MobileFrontend.i18n.php b/MobileFrontend.i18n.php
index 2e0a972..4ed32e0 100644
--- a/MobileFrontend.i18n.php
+++ b/MobileFrontend.i18n.php
@@ -120,7 +120,6 @@
'mobile-frontend-meta-data-issues-header' => 'Issues',
'mobile-frontend-meta-data-issues' => 'This page has some issues',
 
-   'mobile-frontend-ajax-preview-loading' => 'Loading page preview',
'mobile-frontend-page-saving' => 'Saving $1',
 
'mobile-frontend-user-cta' => 'Please login or sign up to see your 
notifications.',
diff --git a/includes/Resources.php b/includes/Resources.php
index c2fd164..fbd1bfc 100644
--- a/includes/Resources.php
+++ b/includes/Resources.php
@@ -178,31 +178,13 @@
'mobile-frontend-editor-unavailable',
'mobile-frontend-editor-cta',
'mobile-frontend-editor-edit',
-   // modules/editor/EditorOverlay.js
-   'mobile-frontend-editor-continue',
-   'mobile-frontend-editor-cancel',
-   'mobile-frontend-editor-keep-editing',
-   'mobile-frontend-editor-license' => array( 'parse' ),
-   'mobile-frontend-editor-placeholder',
-   'mobile-frontend-editor-summary-placeholder',
-   'mobile-frontend-editor-cancel-confirm',
-   'mobile-frontend-editor-wait',
-   'mobile-frontend-editor-guider',
-   'mobile-frontend-editor-success',
-   'mobile-frontend-editor-success-landmark-1' => array( 
'parse' ),
-   'mobile-frontend-editor-refresh',
-   'mobile-frontend-editor-error',
-   'mobile-frontend-editor-error-conflict',
-   'mobile-frontend-editor-error-loading',
-   'mobile-frontend-editor-preview-header',
-   'mobile-frontend-editor-error-preview',
// modules/editor/EditorOverlay.js and modules/talk.js
'mobile-frontend-editor-save',
),
'localBasePath' => $localBasePath,
'localTemplateBasePath' => $localBasePath . '/templates',
'templates' => array(
-   'overlays/editor',
+   'LoadingOverlay',
'section',
'wikitext/commons-upload',
// LanguageOverlay.js
@@ -233,6 +215,46 @@
'ReferencesDrawer',
),
'class' => 'MFResourceLoaderModule',
+   ),
+
+   'mobile.dynamic.editor' => $wgMFMobileResourceBoilerplate + array(
+   'dependencies' => array(
+   'mobile.stable',
+   'mobile.dynamic.editor.plumbing',
+   ),
+   'scripts' => array(
+   'javascripts/modules/editor/EditorApi.js',
+   'javascripts/modules/editor/EditorOverlay.js',
+   ),
+   ),
+
+   'mobile.dynamic.editor.plumbing' => array(
+   'class' => 'MFResourceLoaderModule',
+   'localBasePath' => $localBasePath,
+   'localTemplateBasePath' => $localBasePath . '/templates',
+   'templates' => array(
+   'overlays/editor',
+   ),
+   'messages' => array(
+   // modules/editor/EditorOverlay.js
+   'mobile-frontend-editor-continue',
+   'mobile-frontend-editor-cancel',
+   'mobile-frontend-editor-keep-editing',
+   'mobile-frontend-editor-license' => array( 'parse' ),
+   'mobile-frontend-editor-placeholder',
+   'mobile-frontend-editor-summary-placeholder',
+   'mobile-frontend-editor-cancel-confirm',
+   'mobile-frontend-editor-wait',
+   'mobile-frontend-editor-guider',
+   'mobile-frontend-editor-success',
+   'mob

[MediaWiki-commits] [Gerrit] Updating Translate and CentralNotice to master - change (mediawiki/core)

2013-09-11 Thread Mwalker (Code Review)

Mwalker has uploaded a new change for review.

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


Change subject: Updating Translate and CentralNotice to master
..

Updating Translate and CentralNotice to master

Change-Id: Id7f202178e9f7ab89be466ad3ff5f43f74f7ab8c
---
M extensions/CentralNotice
M extensions/Translate
2 files changed, 0 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/48/83948/1

diff --git a/extensions/CentralNotice b/extensions/CentralNotice
index 31e1e68..e267943 16
--- a/extensions/CentralNotice
+++ b/extensions/CentralNotice
-Subproject commit 31e1e68c3181145304e2bc370b3aeeeb6a53702c
+Subproject commit e267943ef9906097bea2805693be45a2efb75c55
diff --git a/extensions/Translate b/extensions/Translate
index 6e86d4d..2b735d2 16
--- a/extensions/Translate
+++ b/extensions/Translate
-Subproject commit 6e86d4de1a9d7a8943b33ab20dc788a4789a36db
+Subproject commit 2b735d20e806e76b12776cecbcdb765dd27d80a7

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id7f202178e9f7ab89be466ad3ff5f43f74f7ab8c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.22wmf15
Gerrit-Owner: Mwalker 

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

[MediaWiki-commits] [Gerrit] Fix a mysteriously-not-broken case typo. - change (mediawiki...OpenStackManager)

2013-09-11 Thread Andrew Bogott (Code Review)

Andrew Bogott has uploaded a new change for review.

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


Change subject: Fix a mysteriously-not-broken case typo.
..

Fix a mysteriously-not-broken case typo.

Change-Id: Ib158c91b4ed4ba5c009633324ee37ac57e0a4122
---
M special/SpecialNovaAddress.php
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/OpenStackManager 
refs/changes/47/83947/1

diff --git a/special/SpecialNovaAddress.php b/special/SpecialNovaAddress.php
index c5baffe..1b3c7e6 100644
--- a/special/SpecialNovaAddress.php
+++ b/special/SpecialNovaAddress.php
@@ -48,7 +48,7 @@
} elseif ( $action === "addhost" ) {
$this->addHost();
} elseif ( $action === "removehost" ) {
-   $this->removehost();
+   $this->removeHost();
} else {
$this->listAddresses();
}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib158c91b4ed4ba5c009633324ee37ac57e0a4122
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/OpenStackManager
Gerrit-Branch: master
Gerrit-Owner: Andrew Bogott 

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

[MediaWiki-commits] [Gerrit] Rename labsproxy module to dynamicproxy - change (operations/puppet)

2013-09-11 Thread Ryan Lane (Code Review)

Ryan Lane has submitted this change and it was merged.

Change subject: Rename labsproxy module to dynamicproxy
..


Rename labsproxy module to dynamicproxy

Because that is what it does. Also same module should be
customized for both general labsproxy as well as a toollabs
specific proxy

Change-Id: If4944db7518b0d6a10aece82fb1b8811b5832069
---
M manifests/role/labs.pp
M manifests/role/labsproxy.pp
R modules/dynamicproxy/files/proxy.conf
R modules/dynamicproxy/files/proxy.lua
R modules/dynamicproxy/files/redis.lua
R modules/dynamicproxy/manifests/init.pp
6 files changed, 6 insertions(+), 6 deletions(-)

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



diff --git a/manifests/role/labs.pp b/manifests/role/labs.pp
index f79fc72..b741cc5 100644
--- a/manifests/role/labs.pp
+++ b/manifests/role/labs.pp
@@ -51,7 +51,7 @@
 
   class proxy inherits role::labs::tools::config {
   system_role { "role::labs::tools::proxy": description => "Tool labs 
generic web proxy" }
-  class { '::labsproxy': }
+  class { '::dynamicproxy': }
   class { 'toollabs::infrastructure': }
   }
 
diff --git a/manifests/role/labsproxy.pp b/manifests/role/labsproxy.pp
index 66e7248..295f5c2 100644
--- a/manifests/role/labsproxy.pp
+++ b/manifests/role/labsproxy.pp
@@ -60,5 +60,5 @@
 
 # A dynamic HTTP routing proxy, based on nginx+lua+redis
 class role::proxy-project {
-class { '::labsproxy': }
+class { '::dynamicproxy': }
 }
diff --git a/modules/labsproxy/files/proxy.conf 
b/modules/dynamicproxy/files/proxy.conf
similarity index 100%
rename from modules/labsproxy/files/proxy.conf
rename to modules/dynamicproxy/files/proxy.conf
diff --git a/modules/labsproxy/files/proxy.lua 
b/modules/dynamicproxy/files/proxy.lua
similarity index 100%
rename from modules/labsproxy/files/proxy.lua
rename to modules/dynamicproxy/files/proxy.lua
diff --git a/modules/labsproxy/files/redis.lua 
b/modules/dynamicproxy/files/redis.lua
similarity index 100%
rename from modules/labsproxy/files/redis.lua
rename to modules/dynamicproxy/files/redis.lua
diff --git a/modules/labsproxy/manifests/init.pp 
b/modules/dynamicproxy/manifests/init.pp
similarity index 79%
rename from modules/labsproxy/manifests/init.pp
rename to modules/dynamicproxy/manifests/init.pp
index ed233f0..644eb52 100644
--- a/modules/labsproxy/manifests/init.pp
+++ b/modules/dynamicproxy/manifests/init.pp
@@ -1,4 +1,4 @@
-class labsproxy ($redis_maxmemory="512MB") {
+class dynamicproxy ($redis_maxmemory="512MB") {
 class { '::redis':
 persist   => "aof",
 dir   => "/var/lib/redis",
@@ -14,7 +14,7 @@
 
 file { '/etc/nginx/sites-available/default':
 ensure  => 'file',
-source  => 'puppet:///modules/labsproxy/proxy.conf',
+source  => 'puppet:///modules/dynamicproxy/proxy.conf',
 require => Package['nginx-extras'],
 notify  => Service['nginx']
 }
@@ -26,7 +26,7 @@
 
 file { '/etc/nginx/lua/proxy.lua':
 ensure  => 'file',
-source  => 'puppet:///modules/labsproxy/proxy.lua',
+source  => 'puppet:///modules/dynamicproxy/proxy.lua',
 require => File['/etc/nginx/lua'],
 notify  => Service['nginx']
 }
@@ -39,6 +39,6 @@
 file { '/etc/nginx/lua/resty/redis.lua':
 ensure  => 'file',
 require => File['/etc/nginx/lua/resty'],
-source  => 'puppet:///modules/labsproxy/redis.lua'
+source  => 'puppet:///modules/dynamicproxy/redis.lua'
 }
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: If4944db7518b0d6a10aece82fb1b8811b5832069
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Yuvipanda 
Gerrit-Reviewer: Ryan Lane 
Gerrit-Reviewer: coren 
Gerrit-Reviewer: jenkins-bot

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

[MediaWiki-commits] [Gerrit] Merge branch 'master' into wmf_deploy - change (mediawiki...CentralNotice)

2013-09-11 Thread jenkins-bot (Code Review)

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

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


Merge branch 'master' into wmf_deploy

* master:
  Localisation updates from http://translatewiki.net.
  Add getKeys optimization to BannerMessageGroup
  Localisation updates from http://translatewiki.net.

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

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




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

Gerrit-MessageType: merged
Gerrit-Change-Id: I2b158e845168a63ee4a35b78eb87ce53fb427cb0
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CentralNotice
Gerrit-Branch: wmf_deploy
Gerrit-Owner: Mwalker 
Gerrit-Reviewer: Mwalker 
Gerrit-Reviewer: jenkins-bot

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

[MediaWiki-commits] [Gerrit] Use SQL that SQLite 3.7.8 understands - change (mediawiki...PageTriage)

2013-09-11 Thread jenkins-bot (Code Review)

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

Change subject: Use SQL that SQLite 3.7.8 understands
..


Use SQL that SQLite 3.7.8 understands

When attempting to install the current extension code to a Wiki using a
SQLite database version 3.7.8, installation will fail while running
update.php because this SQLite version is unable to insert multiple
rows - using the VALUES keyword - at once.

Bug: 54013
Change-Id: I90b0cc01fc747cb20f9bf9c79eebb2ada5b8fa5e
---
M sql/PageTriageTags.sql
1 file changed, 33 insertions(+), 18 deletions(-)

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



diff --git a/sql/PageTriageTags.sql b/sql/PageTriageTags.sql
index a352824..229ea4a 100644
--- a/sql/PageTriageTags.sql
+++ b/sql/PageTriageTags.sql
@@ -8,21 +8,36 @@
 CREATE UNIQUE INDEX /*i*/ptrt_tag_id ON /*_*/pagetriage_tags (ptrt_tag_name);
 
 INSERT INTO /*_*/pagetriage_tags (ptrt_tag_name, ptrt_tag_desc) 
-VALUES 
-('linkcount', 'Number of inbound links'),
-('category_count', 'Category mapping count'), 
-('csd_status', 'CSD status'),
-('prod_status', 'PROD status'),
-('blp_prod_status', 'BLP PROD status'),
-('afd_status', 'AFD status'),
-('rev_count', 'Number of edits to the article'),
-('page_len', 'Number of bytes of article'),
-('snippet', 'Beginning of article snippet'),
-('user_name', 'User name'),
-('user_editcount', 'User total edit'),
-('user_creation_date', 'User registration date'),
-('user_autoconfirmed', 'Check if user is autoconfirmed' ),
-('user_bot', 'Check if user is in bot group'),
-('user_block_status', 'User block status'),
-('user_id', 'User id'),
-('reference', 'Check if page has references');
+VALUES ('linkcount', 'Number of inbound links');
+INSERT INTO /*_*/pagetriage_tags (ptrt_tag_name, ptrt_tag_desc) 
+VALUES ('category_count', 'Category mapping count');
+INSERT INTO /*_*/pagetriage_tags (ptrt_tag_name, ptrt_tag_desc)
+VALUES ('csd_status', 'CSD status');
+INSERT INTO /*_*/pagetriage_tags (ptrt_tag_name, ptrt_tag_desc) 
+VALUES ('prod_status', 'PROD status');
+INSERT INTO /*_*/pagetriage_tags (ptrt_tag_name, ptrt_tag_desc) 
+VALUES ('blp_prod_status', 'BLP PROD status');
+INSERT INTO /*_*/pagetriage_tags (ptrt_tag_name, ptrt_tag_desc) 
+VALUES ('afd_status', 'AFD status');
+INSERT INTO /*_*/pagetriage_tags (ptrt_tag_name, ptrt_tag_desc) 
+VALUES ('rev_count', 'Number of edits to the article');
+INSERT INTO /*_*/pagetriage_tags (ptrt_tag_name, ptrt_tag_desc) 
+VALUES ('page_len', 'Number of bytes of article');
+INSERT INTO /*_*/pagetriage_tags (ptrt_tag_name, ptrt_tag_desc) 
+VALUES ('snippet', 'Beginning of article snippet');
+INSERT INTO /*_*/pagetriage_tags (ptrt_tag_name, ptrt_tag_desc) 
+VALUES ('user_name', 'User name');
+INSERT INTO /*_*/pagetriage_tags (ptrt_tag_name, ptrt_tag_desc) 
+VALUES ('user_editcount', 'User total edit');
+INSERT INTO /*_*/pagetriage_tags (ptrt_tag_name, ptrt_tag_desc) 
+VALUES ('user_creation_date', 'User registration date');
+INSERT INTO /*_*/pagetriage_tags (ptrt_tag_name, ptrt_tag_desc) 
+VALUES ('user_autoconfirmed', 'Check if user is autoconfirmed' );
+INSERT INTO /*_*/pagetriage_tags (ptrt_tag_name, ptrt_tag_desc) 
+VALUES ('user_bot', 'Check if user is in bot group');
+INSERT INTO /*_*/pagetriage_tags (ptrt_tag_name, ptrt_tag_desc) 
+VALUES ('user_block_status', 'User block status');
+INSERT INTO /*_*/pagetriage_tags (ptrt_tag_name, ptrt_tag_desc) 
+VALUES ('user_id', 'User id');
+INSERT INTO /*_*/pagetriage_tags (ptrt_tag_name, ptrt_tag_desc) 
+VALUES ('reference', 'Check if page has references');

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I90b0cc01fc747cb20f9bf9c79eebb2ada5b8fa5e
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/PageTriage
Gerrit-Branch: master
Gerrit-Owner: Rillke 
Gerrit-Reviewer: Kaldari 
Gerrit-Reviewer: Reedy 
Gerrit-Reviewer: Rillke 
Gerrit-Reviewer: jenkins-bot

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

[MediaWiki-commits] [Gerrit] Merge branch 'master' into wmf_deploy - change (mediawiki...CentralNotice)

2013-09-11 Thread Mwalker (Code Review)

Mwalker has uploaded a new change for review.

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


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

Merge branch 'master' into wmf_deploy

* master:
  Localisation updates from http://translatewiki.net.
  Add getKeys optimization to BannerMessageGroup
  Localisation updates from http://translatewiki.net.

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


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


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2b158e845168a63ee4a35b78eb87ce53fb427cb0
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CentralNotice
Gerrit-Branch: wmf_deploy
Gerrit-Owner: Mwalker 

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

[MediaWiki-commits] [Gerrit] change jenkins gid to www-data on civicrm server - change (operations/puppet)

2013-09-11 Thread Jgreen (Code Review)

Jgreen has submitted this change and it was merged.

Change subject: change jenkins gid to www-data on civicrm server
..


change jenkins gid to www-data on civicrm server

Change-Id: Id5aa07f4d1569e134053d1b9605ff47885aa8071
---
M manifests/misc/fundraising.pp
1 file changed, 2 insertions(+), 1 deletion(-)

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



diff --git a/manifests/misc/fundraising.pp b/manifests/misc/fundraising.pp
index 743e0cf..f53eef5 100644
--- a/manifests/misc/fundraising.pp
+++ b/manifests/misc/fundraising.pp
@@ -377,7 +377,8 @@
 
user { jenkins:
name => 'jenkins',
-   groups => [ 'wikidev' ];
+   gid => 'www-data',
+   groups => [ 'wikidev', 'backupmover' ];
}
 
service { 'jenkins':

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Id5aa07f4d1569e134053d1b9605ff47885aa8071
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
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] Made HTMLForm wrap the submit buttons in a container for sty... - change (mediawiki/core)

2013-09-11 Thread jenkins-bot (Code Review)

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

Change subject: Made HTMLForm wrap the submit buttons in a container for styling
..


Made HTMLForm wrap the submit buttons in a container for styling

Change-Id: I6510493a80c18ba5a466a16e3ca39396f9a60f60
---
M includes/HTMLForm.php
1 file changed, 3 insertions(+), 1 deletion(-)

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



diff --git a/includes/HTMLForm.php b/includes/HTMLForm.php
index ed9440c..5de34d6 100644
--- a/includes/HTMLForm.php
+++ b/includes/HTMLForm.php
@@ -700,7 +700,7 @@
 * @return String HTML.
 */
function getButtons() {
-   $html = '';
+   $html = '';
 
if ( $this->mShowSubmit ) {
$attribs = array();
@@ -750,6 +750,8 @@
$html .= Html::element( 'input', $attrs );
}
 
+   $html .= '';
+
return $html;
}
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I6510493a80c18ba5a466a16e3ca39396f9a60f60
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz 
Gerrit-Reviewer: Chad 
Gerrit-Reviewer: Daniel Friesen 
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 HTMLForm wrap the submit buttons in a container for sty... - change (mediawiki/core)

2013-09-11 Thread Aaron Schulz (Code Review)

Aaron Schulz has uploaded a new change for review.

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


Change subject: Made HTMLForm wrap the submit buttons in a container for styling
..

Made HTMLForm wrap the submit buttons in a container for styling

Change-Id: I6510493a80c18ba5a466a16e3ca39396f9a60f60
---
M includes/HTMLForm.php
1 file changed, 3 insertions(+), 1 deletion(-)


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

diff --git a/includes/HTMLForm.php b/includes/HTMLForm.php
index ed9440c..5de34d6 100644
--- a/includes/HTMLForm.php
+++ b/includes/HTMLForm.php
@@ -700,7 +700,7 @@
 * @return String HTML.
 */
function getButtons() {
-   $html = '';
+   $html = '';
 
if ( $this->mShowSubmit ) {
$attribs = array();
@@ -750,6 +750,8 @@
$html .= Html::element( 'input', $attrs );
}
 
+   $html .= '';
+
return $html;
}
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6510493a80c18ba5a466a16e3ca39396f9a60f60
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] Bug 52350: Allow sections to be indented and outdented - change (mediawiki...BookManagerv2)

2013-09-11 Thread jenkins-bot (Code Review)

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

Change subject: Bug 52350: Allow sections to be indented and outdented
..


Bug 52350: Allow sections to be indented and outdented

This updates the schema so it can record the indentation position,
and also adds x-positioning to the sortable sections. Sections can
be indented up to five levels.
Change-Id: Ide9a63b09209887b5cdc35b016a1b29e7e012525
---
M BookManagerv2.hooks.php
M BookManagerv2.php
M JsonEditor.php
M modules/ext.BookManagerv2.css
M modules/ext.BookManagerv2.editor.css
M modules/ext.BookManagerv2.editor.js
M modules/ext.BookManagerv2.editorjs.css
M schemas/bookschema.json
8 files changed, 135 insertions(+), 12 deletions(-)

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



diff --git a/BookManagerv2.hooks.php b/BookManagerv2.hooks.php
index e3c3f43..3fbbdf8 100644
--- a/BookManagerv2.hooks.php
+++ b/BookManagerv2.hooks.php
@@ -345,7 +345,9 @@
$html .= Html::openElement( 'ol', array() );
foreach ( $sections as $key => $val ) {
if ( $val->link !== $currentPageTitle ) {
-   $html .= Html::openElement( 'li', array() )
+   $html .= Html::openElement( 'li', array(
+   'class' => 'indent-' . 
(string)$val->indentation
+   ) )
. Linker::link(
Title::newFromText( $val->link 
),
$val->name
diff --git a/BookManagerv2.php b/BookManagerv2.php
index 6f9acc7..7866d88 100644
--- a/BookManagerv2.php
+++ b/BookManagerv2.php
@@ -27,12 +27,12 @@
  */
 
 $wgExtensionCredits['parserhook'][] = array(
-   'path'  => __FILE__,
-   'name'  => 'BookManagerv2',
-   'author'=> array( 'Molly White', 'Ori Livneh' ),
-   'version'=> '0.0.1',
-   'url'=> 
'http://www.mediawiki.org/wiki/Extension:BookManagerv2',
-   'descriptionmsg' => 'bookmanagerv2-desc',
+   'path'  => __FILE__,
+   'name'  => 'BookManagerv2',
+   'author'=> array( 'Molly White', 'Ori Livneh' ),
+   'version'   => '0.0.1',
+   'url'   => 
'http://www.mediawiki.org/wiki/Extension:BookManagerv2',
+   'descriptionmsg'=> 'bookmanagerv2-desc',
 );
 
 // Declare namespace & associated content handler.
diff --git a/JsonEditor.php b/JsonEditor.php
index dd4c4b5..f71a1ab 100644
--- a/JsonEditor.php
+++ b/JsonEditor.php
@@ -357,8 +357,19 @@
$sectionLinkTitle = wfMessage(
'bookmanagerv2-create-title' 
)->escaped();
}
+   $indentClass = '';
+   $indentation = 0;
+   if ( isset( $section->indentation ) ) {
+   $indentation = 
(int)$section->indentation;
+   if ( $indentation > 0 && $indentation 
<= 5 ) {
+   $indentClass = 'indent-' . 
(string)$indentation;
+   }
+   }
$html .= Html::openElement( 'li', array(
-   'class' => 'mw-bookmanagerv2-section',
+   'class' => array(
+   
'mw-bookmanagerv2-section',
+   $indentClass
+   ),
'id' => 'section-' . (string)$index,
'tabindex' => $tabindex++
) )
diff --git a/modules/ext.BookManagerv2.css b/modules/ext.BookManagerv2.css
index 278267e..7d72747 100644
--- a/modules/ext.BookManagerv2.css
+++ b/modules/ext.BookManagerv2.css
@@ -68,3 +68,23 @@
list-style: none;
margin: 0;
 }
+
+ol li.indent-1 {
+   margin-left: 10px;
+}
+
+ol li.indent-2 {
+   margin-left: 20px;
+}
+
+ol li.indent-3 {
+   margin-left: 30px;
+}
+
+ol li.indent-4 {
+   margin-left: 40px;
+}
+
+ol li.indent-5 {
+   margin-left: 50px;
+}
diff --git a/modules/ext.BookManagerv2.editor.css 
b/modules/ext.BookManagerv2.editor.css
index 1eeec7b..9bb49b0 100644
--- a/modules/ext.BookManagerv2.editor.css
+++ b/modules/ext.BookManagerv2.editor.css
@@ -40,6 +40,7 @@
 ul.mw-bookmanagerv2-section-list {
list-style: none;
margin: 0;
+   width: 850px;
 }
 
 li.mw-bookmanagerv2-section,
diff --git a/modules/ext.BookManagerv2.editor.js 
b/modules/ext.BookManagerv2.editor.js
index ee268c9..3134

[MediaWiki-commits] [Gerrit] API: Enforce limit max in ApiQueryBacklinks - change (mediawiki/core)

2013-09-11 Thread Anomie (Code Review)

Anomie has uploaded a new change for review.

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


Change subject: API: Enforce limit max in ApiQueryBacklinks
..

API: Enforce limit max in ApiQueryBacklinks

Change-Id: Id0f0943771e3593c30563469df4820437ded9a99
---
M includes/api/ApiQueryBacklinks.php
1 file changed, 3 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/35/83935/1

diff --git a/includes/api/ApiQueryBacklinks.php 
b/includes/api/ApiQueryBacklinks.php
index e39c25a..2d1089a 100644
--- a/includes/api/ApiQueryBacklinks.php
+++ b/includes/api/ApiQueryBacklinks.php
@@ -255,6 +255,9 @@
if ( $this->params['limit'] == 'max' ) {
$this->params['limit'] = 
$this->getMain()->canApiHighLimits() ? $botMax : $userMax;
$result->setParsedLimit( $this->getModuleName(), 
$this->params['limit'] );
+   } else {
+   $this->params['limit'] = intval( $this->params['limit'] 
);
+   $this->validateLimit( 'limit', $this->params['limit'], 
1, $userMax, $botMax );
}
 
$this->processContinue();

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

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

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

[MediaWiki-commits] [Gerrit] 175 -> 192MB memory - change (operations/mediawiki-config)

2013-09-11 Thread jenkins-bot (Code Review)

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

Change subject: 175 -> 192MB memory
..


175 -> 192MB memory

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

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



diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index dff245b..5488027 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -11841,7 +11841,6 @@
 
 'wmgUseTranslationMemory' => array(
'default' => true,
-   'testwiki' => true,
 ),
 'wmgUseTranslationNotifications' => array(
'default' => false,
@@ -11913,7 +11912,7 @@
 ),
 
 'wmgMemoryLimit' => array(
-   'default' => 175 * 1024 * 1024, // 175MB
+   'default' => 192 * 1024 * 1024, // 192MB
 
# 200MB - Extra for zh wikis for converter tables
'zhwiki' => 200 * 1024 * 1024,

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

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

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

[MediaWiki-commits] [Gerrit] API: Enforce limit max in ApiQueryBacklinks - change (mediawiki/core)

2013-09-11 Thread jenkins-bot (Code Review)

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

Change subject: API: Enforce limit max in ApiQueryBacklinks
..


API: Enforce limit max in ApiQueryBacklinks

Change-Id: Id0f0943771e3593c30563469df4820437ded9a99
---
M includes/api/ApiQueryBacklinks.php
1 file changed, 3 insertions(+), 0 deletions(-)

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



diff --git a/includes/api/ApiQueryBacklinks.php 
b/includes/api/ApiQueryBacklinks.php
index e39c25a..2d1089a 100644
--- a/includes/api/ApiQueryBacklinks.php
+++ b/includes/api/ApiQueryBacklinks.php
@@ -255,6 +255,9 @@
if ( $this->params['limit'] == 'max' ) {
$this->params['limit'] = 
$this->getMain()->canApiHighLimits() ? $botMax : $userMax;
$result->setParsedLimit( $this->getModuleName(), 
$this->params['limit'] );
+   } else {
+   $this->params['limit'] = intval( $this->params['limit'] 
);
+   $this->validateLimit( 'limit', $this->params['limit'], 
1, $userMax, $botMax );
}
 
$this->processContinue();

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Id0f0943771e3593c30563469df4820437ded9a99
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Anomie 
Gerrit-Reviewer: Aaron Schulz 
Gerrit-Reviewer: Catrope 
Gerrit-Reviewer: Yurik 
Gerrit-Reviewer: jenkins-bot

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

[MediaWiki-commits] [Gerrit] Replace logging with a simple throw - change (mediawiki...MobileFrontend)

2013-09-11 Thread MaxSem (Code Review)

MaxSem has uploaded a new change for review.

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


Change subject: Replace logging with a simple throw
..

Replace logging with a simple throw

This way, configuration problems will be mch easier to notice.

Change-Id: I1172a75967b150a6dc3001b8a8ff354317e2e434
---
M includes/formatters/HtmlFormatter.php
1 file changed, 1 insertion(+), 2 deletions(-)


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

diff --git a/includes/formatters/HtmlFormatter.php 
b/includes/formatters/HtmlFormatter.php
index 7ae2432..8ca1359 100644
--- a/includes/formatters/HtmlFormatter.php
+++ b/includes/formatters/HtmlFormatter.php
@@ -276,8 +276,7 @@
$type = 'TAG';
$rawName = $selector;
} else {
-   wfDebugLog( 'mobile', __METHOD__ . ": unrecognized 
selector '$selector'" );
-   return false;
+   throw new MWException( __METHOD__ . "(): unrecognized 
selector '$selector'" );
}
 
return true;

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

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

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

[MediaWiki-commits] [Gerrit] add a wikitable output format to otrs idle_agent_report - change (operations/puppet)

2013-09-11 Thread Jgreen (Code Review)

Jgreen has submitted this change and it was merged.

Change subject: add a wikitable output format to otrs idle_agent_report
..


add a wikitable output format to otrs idle_agent_report

Change-Id: I8386130a96103bfd64e1c4aaa059ca7657d46385
---
M files/otrs/idle_agent_report
1 file changed, 27 insertions(+), 2 deletions(-)

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



diff --git a/files/otrs/idle_agent_report b/files/otrs/idle_agent_report
index b427770..1cfca1f 100755
--- a/files/otrs/idle_agent_report
+++ b/files/otrs/idle_agent_report
@@ -49,7 +49,7 @@
 
 # I use CGI.pm here instead of the built in stuff to avoid tangling with the
 # OTRS UI libaries. CGI.pm is quick and dirty way to select query and (below)
-# whether or not to output a csv file
+# whether or not to output csv or wikitable content
 my $q = CGI->new;
 my $params = $q->Vars;
 my $qn = (defined $query->{$params->{'qn'}}) ? $params->{'qn'} : 1;
@@ -156,6 +156,30 @@
print join(',', sort keys %{$Users->{$UserID}->{'queues'}}) . 
"\n";
}
 
+} elsif (defined $params->{'wikitable'}) {
+
+   # Valid session, group membership, and successful db connection.
+   # CGI request for wikitable format. Proceed.
+
+   print "Content-type: text/plain\n\n" .
+   "== $query->{$qn}->{'desc'} ==\n" .
+   "{| class=\"wikitable sortable\"\n" .
+   "|-\n";
+   for (@{$query->{$qn}->{'cols'}},'queues') {
+   print "!$_\n";
+   }
+   print "listitem";
+   # fetch and format the user data
+   my $Users = GetUsers();
+   for my $UserID (sort { $Users->{$a}->{'row'} <=> $Users->{$b}->{'row'}} 
keys %{$Users}) {
+   print "\n{{../row";
+   for my $c (@{$query->{$qn}->{'cols'}}) {
+   print " | $c = $Users->{$UserID}->{$c}";
+   }
+   print " | queues = " . join(',', sort keys 
%{$Users->{$UserID}->{'queues'}}) . "}}";
+   }
+   print "\n|}\n";
+
 } else {
 
# Valid session, group membership, and successful db connection. 
Proceed.
@@ -181,7 +205,8 @@
print ">$query->{$n}->{'desc'}\n";
}
print "\n\n" .
-   "" .
+   "\n" .
+   "\n" .
"\n";
 
# the report table

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I8386130a96103bfd64e1c4aaa059ca7657d46385
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
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] Add separate binary 'vnm_validate' - change (operations...libvmod-netmapper)

2013-09-11 Thread BBlack (Code Review)

BBlack has uploaded a new change for review.

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


Change subject: Add separate binary 'vnm_validate'
..

Add separate binary 'vnm_validate'

Re-uses same code as the vmod itself, validates that a given
JSON input file parses and loads successfully on the commandline
as a pre-check to be executed before updating the vmod's config.

Change-Id: Id9f5e5b45bcd90b933f75a97d621a7c2a1deb537
---
M .gitignore
M acaux/.gitignore
M configure.ac
M src/Makefile.am
M src/vnm.c
A src/vnm_validate.c
6 files changed, 69 insertions(+), 13 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/operations/software/varnish/libvmod-netmapper 
refs/changes/24/83924/1

diff --git a/.gitignore b/.gitignore
index 748ee22..34eb8bd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -31,3 +31,6 @@
 
 # Generated manpages
 *.[0-9]
+
+# built binary
+vnm_validate
diff --git a/acaux/.gitignore b/acaux/.gitignore
index c470f5d..f7b4f5a 100644
--- a/acaux/.gitignore
+++ b/acaux/.gitignore
@@ -6,3 +6,4 @@
 ltmain.sh
 missing
 test-driver
+compile
diff --git a/configure.ac b/configure.ac
index 4a75a1c..eaa87b7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -18,6 +18,7 @@
AC_MSG_ERROR([Could not find a C99 compatible compiler])
 fi
 AC_PROG_CPP
+AM_PROG_CC_C_O
 
 AC_PROG_INSTALL
 AC_PROG_LIBTOOL
@@ -71,6 +72,8 @@
 [AC_MSG_FAILURE([varnishtest binary "$VARNISHTEST" does not exist])]
 )
 
+XLIBS=$LIBS
+
 # userspace-rcu for lockless netmap reload
 AC_CHECK_HEADER(urcu-qsbr.h,[
  AC_CHECK_LIB([urcu-qsbr],[perror],[],AC_MSG_ERROR("liburcu-qsbr 
missing!"))
@@ -81,6 +84,8 @@
  AC_CHECK_LIB([jansson],[json_object_update],[],AC_MSG_ERROR("libjansson 
missing!"))
 ], AC_MSG_ERROR("jansson.h missing!"))
 
+LIBS=$XLIBS
+
 AC_CONFIG_FILES([
Makefile
src/Makefile
diff --git a/src/Makefile.am b/src/Makefile.am
index 79c9992..0668585 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,14 +1,6 @@
 AM_CPPFLAGS = -I$(VARNISHSRC)/include -I$(VARNISHSRC) -I$(srcdir)/nlt
 
-vmoddir = $(libdir)/varnish/vmods
-vmod_LTLIBRARIES = libvmod_netmapper.la
-
-libvmod_netmapper_la_LDFLAGS = -module -export-dynamic -avoid-version -shared
-libvmod_netmapper_la_LIBS = -lurcu-qsbr -ljansson
-libvmod_netmapper_la_SOURCES = \
-   vcc_if.c \
-   vcc_if.h \
-   vmod_netmapper.c \
+COMMON_SRC = \
vnm.c \
vnm.h \
vnm_strdb.c \
@@ -21,6 +13,18 @@
 vcc_if.c vcc_if.h: $(VARNISHSRC)/lib/libvmod_std/vmod.py 
$(top_srcdir)/src/vmod_netmapper.vcc
@PYTHON@ $(VARNISHSRC)/lib/libvmod_std/vmod.py 
$(top_srcdir)/src/vmod_netmapper.vcc
 
+vmoddir = $(libdir)/varnish/vmods
+vmod_LTLIBRARIES = libvmod_netmapper.la
+
+libvmod_netmapper_la_LDFLAGS = -module -export-dynamic -avoid-version -shared
+libvmod_netmapper_la_LIBADD = -lurcu-qsbr -ljansson
+libvmod_netmapper_la_SOURCES = vcc_if.c vcc_if.h vmod_netmapper.c $(COMMON_SRC)
+
+bin_PROGRAMS = vnm_validate
+vnm_validate_CPPFLAGS = $(AM_CPPFLAGS) -DNO_VARNISH
+vnm_validate_LDADD = -ljansson
+vnm_validate_SOURCES = vnm_validate.c $(COMMON_SRC)
+
 VMOD_TDATA = tests/*.json
 VMOD_TESTS = tests/*.vtc
 .PHONY: $(VMOD_TESTS) $(VMOD_TDATA)
diff --git a/src/vnm.c b/src/vnm.c
index 53a2588..1efd09f 100644
--- a/src/vnm.c
+++ b/src/vnm.c
@@ -17,7 +17,13 @@
  *
  */
 
+#ifdef NO_VARNISH
+#define ERR(fmt,...) fprintf(stderr, fmt "\n", ##__VA_ARGS__)
+#else
 #include "bin/varnishd/cache.h"
+#define ERR(fmt,...) VSL(SLT_Error, 0, "vmod_netmapper: " fmt, ##__VA_ARGS__)
+#endif
+
 #include "vnm.h"
 
 #include 
@@ -39,8 +45,6 @@
 #include "vnm_strdb.h"
 #include "ntree.h"
 #include "nlist.h"
-
-#define ERR(fmt,...) VSL(SLT_Error, 0, "vmod_netmapper: " fmt, ##__VA_ARGS__)
 
 struct _vnm_db_struct {
 ntree_t* tree;
@@ -146,7 +150,7 @@
 }
 
 vnm_db_t* vnm_db_parse(const char* fn, struct stat* db_stat) {
-assert(fn); assert(db_stat);
+assert(fn);
 
 struct stat db_stat_precheck;
 if(stat(fn, &db_stat_precheck)) {
@@ -245,7 +249,8 @@
 json_decref(toplevel);
 
 // copy out stat data for future checks
-memcpy(db_stat, &db_stat_postcheck, sizeof(struct stat));
+if(db_stat)
+memcpy(db_stat, &db_stat_postcheck, sizeof(struct stat));
 
 return d;
 }
diff --git a/src/vnm_validate.c b/src/vnm_validate.c
new file mode 100644
index 000..6823a9d
--- /dev/null
+++ b/src/vnm_validate.c
@@ -0,0 +1,38 @@
+/* Copyright © 2013 Brandon L Black 
+ *
+ * This file is part of libvmod-netmapper.
+ *
+ * libvmod-netmapper is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * libvmod-netmapper is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  Se

[MediaWiki-commits] [Gerrit] Updated Zero ext to master - change (mediawiki/core)

2013-09-11 Thread Yurik (Code Review)

Yurik has submitted this change and it was merged.

Change subject: Updated Zero ext to master
..


Updated Zero ext to master

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

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



diff --git a/extensions/ZeroRatedMobileAccess b/extensions/ZeroRatedMobileAccess
index d05049b..37bb0cc 16
--- a/extensions/ZeroRatedMobileAccess
+++ b/extensions/ZeroRatedMobileAccess
-Subproject commit d05049bd79cc84918953a03a7cafd1f78169393e
+Subproject commit 37bb0cc21d0b2f003fd0e07ed00fc25a8f90111e

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ifabe35430e57bf5de9d25a1e68981ab63db6a45d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.22wmf16
Gerrit-Owner: Yurik 
Gerrit-Reviewer: Yurik 
Gerrit-Reviewer: jenkins-bot

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

[MediaWiki-commits] [Gerrit] Updated Zero ext to master - change (mediawiki/core)

2013-09-11 Thread Yurik (Code Review)

Yurik has submitted this change and it was merged.

Change subject: Updated Zero ext to master
..


Updated Zero ext to master

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

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



diff --git a/extensions/ZeroRatedMobileAccess b/extensions/ZeroRatedMobileAccess
index 482746b..37bb0cc 16
--- a/extensions/ZeroRatedMobileAccess
+++ b/extensions/ZeroRatedMobileAccess
-Subproject commit 482746b72a9721963281ad00864e5edb3ef4bc4f
+Subproject commit 37bb0cc21d0b2f003fd0e07ed00fc25a8f90111e

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

Gerrit-MessageType: merged
Gerrit-Change-Id: If1278a17948d9fa6a1b579d968ba0e7759d2b4a4
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.22wmf15
Gerrit-Owner: Yurik 
Gerrit-Reviewer: Yurik 
Gerrit-Reviewer: jenkins-bot

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

[MediaWiki-commits] [Gerrit] Updated Zero ext to master - change (mediawiki/core)

2013-09-11 Thread Yurik (Code Review)

Yurik has uploaded a new change for review.

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


Change subject: Updated Zero ext to master
..

Updated Zero ext to master

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


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/41/83941/1

diff --git a/extensions/ZeroRatedMobileAccess b/extensions/ZeroRatedMobileAccess
index 482746b..37bb0cc 16
--- a/extensions/ZeroRatedMobileAccess
+++ b/extensions/ZeroRatedMobileAccess
-Subproject commit 482746b72a9721963281ad00864e5edb3ef4bc4f
+Subproject commit 37bb0cc21d0b2f003fd0e07ed00fc25a8f90111e

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: If1278a17948d9fa6a1b579d968ba0e7759d2b4a4
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.22wmf15
Gerrit-Owner: Yurik 

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

[MediaWiki-commits] [Gerrit] release 1.2 - change (operations...libvmod-netmapper)

2013-09-11 Thread BBlack (Code Review)

BBlack has uploaded a new change for review.

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


Change subject: release 1.2
..

release 1.2

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


  git pull 
ssh://gerrit.wikimedia.org:29418/operations/software/varnish/libvmod-netmapper 
refs/changes/28/83928/1

diff --git a/NEWS b/NEWS
index 560ab81..024ff42 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,9 @@
+1.2 - 2013-09-11
+   Added vnm_validate cmdline tool - checks JSON validity, also
+ does IP lookup for debugging purposes
+   Added support for single IPs in the network list (implicit all-1's)
+   Bugfix: fixed a memory error with vnm internal stuff
+
 1.1 - 2013-07-03
Changed the API slightly from 1.0 - now supports multiple databases
  in a single VCL, which are differentiated by a text label.  VCL context
diff --git a/configure.ac b/configure.ac
index eaa87b7..aa0a8fd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
 AC_PREREQ(2.59)
 AC_COPYRIGHT([Copyright (c) 2013 Brandon Black ])
-AC_INIT([libvmod-netmapper],[1.1],[bbl...@wikimedia.org],[libvmod-netmapper],[https://git.wikimedia.org/summary/operations%2Fsoftware%2Fvarnish%2Flibvmod-netmapper])
+AC_INIT([libvmod-netmapper],[1.2],[bbl...@wikimedia.org],[libvmod-netmapper],[https://git.wikimedia.org/summary/operations%2Fsoftware%2Fvarnish%2Flibvmod-netmapper])
 AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_AUX_DIR([acaux])
 AC_CONFIG_SRCDIR(src/vmod_netmapper.vcc)

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: If4ec81bb7a1be6e4487bd9157f1d9c61bde33452
Gerrit-PatchSet: 1
Gerrit-Project: operations/software/varnish/libvmod-netmapper
Gerrit-Branch: master
Gerrit-Owner: BBlack 

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

1 2 3 >

1 - 100 of 285 matches

Mail list logo