[MediaWiki-commits] [Gerrit] contint: do not cache api/json calls - change (operations/puppet)

[Alexandros Kosiaris (Code Review)]

Alexandros Kosiaris has submitted this change and it was merged.

Change subject: contint: do not cache api/json calls
..


contint: do not cache api/json calls

The Jenkins server is being the misc varnish, when creating a Jenkins
job the script we are using first verify whether it exists (which cause
a 404), then create the job and verify it got created.  That last step
is being served a 404 because of the cache.  That cause us to create
each jobs individually instead of in bulks.

More details:
http://lists.wikimedia.org/pipermail/wikitech-l/2014-February/074829.html

This patch set the header Cache-Control: no-cache,must-revalidated for
any URL matching api/json.

Live hacked on the production machine gallium and confirmed the jobs can
now be created properly.

Change-Id: I3391de4fffcbf77624ad566ef541dbd8621faa76
---
M modules/contint/files/apache/proxy_jenkins
1 file changed, 8 insertions(+), 0 deletions(-)

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



diff --git a/modules/contint/files/apache/proxy_jenkins 
b/modules/contint/files/apache/proxy_jenkins
index 9c81536..58dd452 100644
--- a/modules/contint/files/apache/proxy_jenkins
+++ b/modules/contint/files/apache/proxy_jenkins
@@ -26,4 +26,12 @@
Order deny,allow
deny from env=bad_browser
 
+   # Jenkins is behind the misc varnish, the API calls lacks cache headers
+   # and their 4xx errors ends up being cached which causes troubles when
+   #
+   # Jenkins job builder creates a job (it check whether a job exists by
+   # hitting the API, which cache a 404, then checks whether the job got
+   # successfullyy created and fails beacuse it is server the cached 404).
+   SetEnvIf Request_URI .*/api/json.* NO_CACHE
+   Header set Cache-Control no-cache,must-revalidate env=NO_CACHE
 /Proxy

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I3391de4fffcbf77624ad566ef541dbd8621faa76
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Hashar has...@free.fr
Gerrit-Reviewer: Alexandros Kosiaris akosia...@wikimedia.org
Gerrit-Reviewer: Hashar has...@free.fr
Gerrit-Reviewer: Krinkle krinklem...@gmail.com
Gerrit-Reviewer: Mark Bergsma m...@wikimedia.org
Gerrit-Reviewer: MarkTraceur mtrac...@member.fsf.org
Gerrit-Reviewer: Mwalker mwal...@wikimedia.org
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] mediawiki.debug: Migrate CSS to LESS - change (mediawiki/core)

[jenkins-bot (Code Review)]

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

Change subject: mediawiki.debug: Migrate CSS to LESS
..


mediawiki.debug: Migrate CSS to LESS

(first step to make some minor design changes to the debug toolbar)

Change-Id: I5232ebec65f5ba10a68fc531ce3647ebc4768ccb
---
M resources/Resources.php
D resources/mediawiki/mediawiki.debug.css
A resources/mediawiki/mediawiki.debug.less
3 files changed, 190 insertions(+), 184 deletions(-)

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



diff --git a/resources/Resources.php b/resources/Resources.php
index 7c13ea6..b1ba4b3 100644
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -759,7 +759,7 @@
),
'mediawiki.debug' = array(
'scripts' = 'resources/mediawiki/mediawiki.debug.js',
-   'styles' = 'resources/mediawiki/mediawiki.debug.css',
+   'styles' = 'resources/mediawiki/mediawiki.debug.less',
'dependencies' = 'jquery.footHovzer',
'position' = 'bottom',
),
diff --git a/resources/mediawiki/mediawiki.debug.css 
b/resources/mediawiki/mediawiki.debug.css
deleted file mode 100644
index 513cb84..000
--- a/resources/mediawiki/mediawiki.debug.css
+++ /dev/null
@@ -1,183 +0,0 @@
-.mw-debug {
-   width: 100%;
-   background-color: #eee;
-   border-top: 1px solid #aaa;
-}
-
-.mw-debug pre {
-   font-size: 11px;
-   padding: 0;
-   margin: 0;
-   background: none;
-   border: none;
-}
-
-.mw-debug table {
-   border-spacing: 0;
-   width: 100%;
-   table-layout: fixed;
-}
-
-.mw-debug table tr {
-   background-color: #fff;
-}
-
-.mw-debug table tr:nth-child(even) {
-   background-color: #f9f9f9;
-}
-
-.mw-debug table td, .mw-debug table th  {
-   padding: 4px 10px;
-}
-
-.mw-debug table td {
-   border-bottom: 1px solid #eee;
-   word-wrap: break-word;
-}
-
-.mw-debug table td.nr {
-   text-align: right;
-}
-
-.mw-debug table td span.stats {
-   color: #808080;
-}
-
-.mw-debug ul {
-   margin: 0;
-   list-style: none;
-}
-
-.mw-debug li {
-   padding: 4px 0;
-   width: 100%;
-}
-
-.mw-debug-bits {
-   text-align: center;
-   border-bottom: 1px solid #aaa;
-}
-
-.mw-debug-bit {
-   display: inline-block;
-   padding: 10px 5px;
-   font-size: 13px;
-   /* IE-hack for display: inline-block */
-   zoom: 1;
-   *display:inline;
-}
-
-.mw-debug-panelink {
-   background-color: #eee;
-   border-right: 1px solid #ccc;
-}
-
-.mw-debug-panelink:first-child {
-   border-left: 1px solid #ccc;
-}
-
-.mw-debug-panelink:hover {
-   background-color: #fefefe;
-   cursor: pointer;
-}
-.mw-debug-panelink.current {
-   background-color: #dedede;
-
-}
-a.mw-debug-panelabel,
-a.mw-debug-panelabel:visited {
-   color: #000;
-}
-
-.mw-debug-pane {
-   height: 300px;
-   overflow: scroll;
-   display: none;
-   font-size: 11px;
-   background-color: #e1eff2;
-   box-sizing: border-box;
-}
-
-#mw-debug-pane-debuglog,
-#mw-debug-pane-request {
-   padding: 20px;
-}
-
-#mw-debug-pane-request table {
-   width: 100%;
-   margin: 10px 0 30px;
-}
-
-#mw-debug-pane-request tr,
-#mw-debug-pane-request th,
-#mw-debug-pane-request td,
-#mw-debug-pane-request table {
-   border: 1px solid #D0DBB3;
-   border-collapse: collapse;
-   margin: 0;
-}
-
-#mw-debug-pane-request th,
-#mw-debug-pane-request td {
-   font-size: 12px;
-   padding: 8px 10px;
-}
-
-#mw-debug-pane-request th {
-   background-color: #F1F7E2;
-   font-weight: bold;
-}
-
-#mw-debug-pane-request td {
-   background-color: white;
-}
-
-#mw-debug-console tr td:first-child {
-   font-weight: bold;
-   vertical-align: top;
-}
-
-#mw-debug-console tr td:last-child {
-   vertical-align: top;
-}
-
-.mw-debug-console-log {
-   background-color: #add8e6;
-}
-
-.mw-debug-console-warn {
-   background-color: #ffa07a;
-}
-
-.mw-debug-console-deprecated {
-   background-color: #ffb6c1;
-}
-
-.mw-debug-backtrace {
-   padding: 5px 10px;
-   margin: 5px;
-   background-color: #dedede;
-}
-
-.mw-debug-backtrace span {
-   font-weight: bold;
-   color: #111;
-}
-
-.mw-debug-backtrace ul {
-   padding-left: 10px;
-}
-
-.mw-debug-backtrace li {
-   width: auto;
-   padding: 0;
-   color: #333;
-   font-size: 10px;
-   margin-bottom: 0;
-   line-height: 1em;
-}
-
-/* Cheapo hack to hide the first 3 lines of the backtrace */
-.mw-debug-backtrace li:nth-child(-n+3) {
-   display: none;
-}
diff --git a/resources/mediawiki/mediawiki.debug.less 
b/resources/mediawiki/mediawiki.debug.less
new file mode 100644
index 000..949c558
--- /dev/null
+++ b/resources/mediawiki/mediawiki.debug.less
@@ -0,0 +1,189 @@
+.mw-debug {
+   width: 100%;
+   

[MediaWiki-commits] [Gerrit] Fix bugs in caching for dev branch - change (mediawiki...Math)

[Physikerwelt (Code Review)]

Physikerwelt has uploaded a new change for review.

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

Change subject: Fix bugs in caching for dev branch
..

Fix bugs in caching for dev branch

* merges code for caching from master
* uses primary key for math_inputhash in math table
  to avoid problems with table prefixes (i.e. in
  the scope of unit_tests)

Change-Id: Ica752e3ae9a244c5a076a25308043749679983d6
---
M Math.hooks.php
M db/math.mysql.sql
M tests/MathDatabaseTest.php
3 files changed, 70 insertions(+), 24 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Math 
refs/changes/32/116932/1

diff --git a/Math.hooks.php b/Math.hooks.php
index e7a0fdf..e074994 100644
--- a/Math.hooks.php
+++ b/Math.hooks.php
@@ -2,25 +2,59 @@
 /**
  * MediaWiki math extension
  *
- * (c) 2002-2013 various MediaWiki contributors
+ * (c) 2002-2014 various MediaWiki contributors
  * GPLv2 license; info in main package.
  */
 
 class MathHooks {
+   const mathCacheKey = 'math=';
+
/*
-*
+* Generate a user dependent hash cache key.
+* The hash key depends on the rendering mode.
 * @param $confstr The to-be-hashed key string that is being 
constructed
+* @param User $user reference to the current user
+* @param array $forOptions userOptions used on that page
 */
-   public static function onPageRenderingHash( $confstr ) {
-   global $wgUser, $wgMathJax;
-   $user = $wgUser;
-   $confstr .= ! . $user-getOption( 'math' );
-   if ( $wgMathJax   $user-getOption( 'mathJax' ) ) {
-   $confstr .= ! . 1;
+   public static function onPageRenderingHash( $confstr, $user = false, 
$forOptions = array() ) {
+   global $wgUser;
+
+   // To be independent of the MediaWiki core version,
+   // we check if the core caching logic for math is still 
available.
+   if ( ! is_callable( 'ParserOptions::getMath' )  in_array( 
'math', $forOptions) ) {
+   if ( $user === false ) {
+   $user = $wgUser;
+   }
+
+   $mathOption = $user-getOption( 'math' );
+   // Check if the key already contains the math option 
part
+   if (
+   !preg_match(
+   '/(^|!)' . self::mathCacheKey . 
$mathOption . '(!|$)/',
+   $confstr
+   )
+   ) {
+   // The math part of cache key starts with 
math= followed by a star or a number for the math mode
+   // and the optional letter j that indicates if 
clientside MathJax rendering is used.
+   if ( preg_match( '/(^|!)' . 
self::mathCacheKey.'[*\d]m?(!|$)/', $confstr ) ) {
+   $confstr = preg_replace(
+   '/(^|!)' . self::mathCacheKey . 
'[*\d]m?(!|$)/',
+   '\1' . self::mathCacheKey . 
$mathOption . '\2',
+   $confstr
+   );
+   } else {
+   $confstr .= '!' . self::mathCacheKey . 
$mathOption;
+   }
+
+   wfDebugLog( 'Math', New cache key: $confstr );
+   } else {
+   wfDebugLog( 'Math', Cache key found $confstr 
);
+   }
}
-   wfDebugLog( 'Math', 'New cache key' . $confstr );
+
return true;
}
+
/**
 * Register the math tag with the Parser.
 *
@@ -42,19 +76,29 @@
 */
static function mathTagHook( $content, $attributes, $parser ) {
global $wgMathJax, $wgMathDisableTexFilter;
-   if ( trim( $content ) ===  ) { // bug 8372
-   return ;
+
+   if ( trim( $content ) === '' ) { // bug 8372
+   return '';
}
+
wfProfileIn( __METHOD__ );
-   $mode = (int) $parser-getUser()-getOption( 'math' );
-   $parser-getOptions()-addExtraKey( $mode );
-   $renderer = MathRenderer::getRenderer(
-   $content, $attributes, $mode
-   );
-   if ( ! $wgMathDisableTexFilter ) {
+   $mode = (int)$parser-getUser()-getOption( 'math' );
+
+   // Indicate that this page uses math.
+   // This affects the page caching behavior.
+   if ( is_callable( 'ParserOptions::getMath' ) ) {
+   

[MediaWiki-commits] [Gerrit] (bug 62248) Do not try to fix double redirects if the redire... - change (pywikibot/compat)

[Xqt (Code Review)]

Xqt has uploaded a new change for review.

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

Change subject: (bug 62248) Do not try to fix double redirects if the redirect 
source is the redirect sample from the tool bar.
..

(bug 62248) Do not try to fix double redirects if the redirect
source is the redirect sample from the tool bar.

Change-Id: I6f48d363c085ab60c6f9da89fd6bdf661c3427c3
---
M redirect.py
1 file changed, 7 insertions(+), 8 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/pywikibot/compat 
refs/changes/33/116933/1

diff --git a/redirect.py b/redirect.py
index ba411e6..f75a352 100644
--- a/redirect.py
+++ b/redirect.py
@@ -595,20 +595,19 @@
 pywikibot.output(
 u'   Links to: %s.'
 % targetPage.title(asLink=True))
-if targetPage.site.sitename() == 'wikipedia:en':
-mw_msg = targetPage.site.mediawiki_message(
-'wikieditor-toolbar-tool-redirect-example')
-if targetPage.title() == mw_msg:
-pywikibot.output(
-uSkipping toolbar example: Redirect source is 
-upotentially vandalized.)
-break
 if targetPage.site != self.site:
 pywikibot.warning(
 u'redirect target (%s) is on a different site.'
 % targetPage.title(asLink=True))
 if self.always:
 break  # skip if automatic
+mw_msg = targetPage.site.mediawiki_message(
+'wikieditor-toolbar-tool-redirect-example')
+if targetPage.title() == mw_msg:
+pywikibot.output(
+uSkipping toolbar example: Redirect source is 
+upotentially vandalized.)
+break
 # watch out for redirect loops
 if redirList.count(u'%s:%s'
% (targetPage.site.lang,

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6f48d363c085ab60c6f9da89fd6bdf661c3427c3
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/compat
Gerrit-Branch: master
Gerrit-Owner: Xqt i...@gno.de

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

[MediaWiki-commits] [Gerrit] (bug 62248) Update from compat: Do not try to fix double red... - change (pywikibot/core)

[Xqt (Code Review)]

Xqt has uploaded a new change for review.

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

Change subject: (bug 62248) Update from compat: Do not try to fix double 
redirects if the redirect source is the redirect sample from the tool bar.
..

(bug 62248) Update from compat: Do not try to fix double redirects
if the redirect source is the redirect sample from the tool bar.

Change-Id: I29cfb72ffcbad0d61fb7ec6cd7c2dceee875eb71
---
M scripts/redirect.py
1 file changed, 7 insertions(+), 8 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core 
refs/changes/34/116934/1

diff --git a/scripts/redirect.py b/scripts/redirect.py
index c50da8d..2bfae04 100755
--- a/scripts/redirect.py
+++ b/scripts/redirect.py
@@ -601,20 +601,19 @@
 pywikibot.output(
 u'   Links to: %s.'
 % targetPage.title(asLink=True))
-if targetPage.site.sitename() == 'wikipedia:en':
-mw_msg = targetPage.site.mediawiki_message(
-'wikieditor-toolbar-tool-redirect-example')
-if targetPage.title() == mw_msg:
-pywikibot.output(
-uSkipping toolbar example: Redirect source is 
-upotentially vandalized.)
-break
 if targetPage.site != self.site:
 pywikibot.warning(
 u'redirect target (%s) is on a different site.'
 % targetPage.title(asLink=True))
 if self.always:
 break  # skip if automatic
+mw_msg = targetPage.site.mediawiki_message(
+'wikieditor-toolbar-tool-redirect-example')
+if targetPage.title() == mw_msg:
+pywikibot.output(
+uSkipping toolbar example: Redirect source is 
+upotentially vandalized.)
+break
 # watch out for redirect loops
 if redirList.count(u'%s:%s'
% (targetPage.site.lang,

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I29cfb72ffcbad0d61fb7ec6cd7c2dceee875eb71
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: Xqt i...@gno.de

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

[MediaWiki-commits] [Gerrit] Fix bugs in caching for dev branch - change (mediawiki...Math)

[jenkins-bot (Code Review)]

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

Change subject: Fix bugs in caching for dev branch
..


Fix bugs in caching for dev branch

* merges code for caching from master
* uses primary key for math_inputhash in math table
  to avoid problems with table prefixes (i.e. in
  the scope of unit_tests)

Change-Id: Ica752e3ae9a244c5a076a25308043749679983d6
---
M Math.hooks.php
M db/math.mysql.sql
M tests/MathDatabaseTest.php
M tests/MathLaTeXMLTest.php
4 files changed, 76 insertions(+), 24 deletions(-)

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



diff --git a/Math.hooks.php b/Math.hooks.php
index e7a0fdf..e074994 100644
--- a/Math.hooks.php
+++ b/Math.hooks.php
@@ -2,25 +2,59 @@
 /**
  * MediaWiki math extension
  *
- * (c) 2002-2013 various MediaWiki contributors
+ * (c) 2002-2014 various MediaWiki contributors
  * GPLv2 license; info in main package.
  */
 
 class MathHooks {
+   const mathCacheKey = 'math=';
+
/*
-*
+* Generate a user dependent hash cache key.
+* The hash key depends on the rendering mode.
 * @param $confstr The to-be-hashed key string that is being 
constructed
+* @param User $user reference to the current user
+* @param array $forOptions userOptions used on that page
 */
-   public static function onPageRenderingHash( $confstr ) {
-   global $wgUser, $wgMathJax;
-   $user = $wgUser;
-   $confstr .= ! . $user-getOption( 'math' );
-   if ( $wgMathJax   $user-getOption( 'mathJax' ) ) {
-   $confstr .= ! . 1;
+   public static function onPageRenderingHash( $confstr, $user = false, 
$forOptions = array() ) {
+   global $wgUser;
+
+   // To be independent of the MediaWiki core version,
+   // we check if the core caching logic for math is still 
available.
+   if ( ! is_callable( 'ParserOptions::getMath' )  in_array( 
'math', $forOptions) ) {
+   if ( $user === false ) {
+   $user = $wgUser;
+   }
+
+   $mathOption = $user-getOption( 'math' );
+   // Check if the key already contains the math option 
part
+   if (
+   !preg_match(
+   '/(^|!)' . self::mathCacheKey . 
$mathOption . '(!|$)/',
+   $confstr
+   )
+   ) {
+   // The math part of cache key starts with 
math= followed by a star or a number for the math mode
+   // and the optional letter j that indicates if 
clientside MathJax rendering is used.
+   if ( preg_match( '/(^|!)' . 
self::mathCacheKey.'[*\d]m?(!|$)/', $confstr ) ) {
+   $confstr = preg_replace(
+   '/(^|!)' . self::mathCacheKey . 
'[*\d]m?(!|$)/',
+   '\1' . self::mathCacheKey . 
$mathOption . '\2',
+   $confstr
+   );
+   } else {
+   $confstr .= '!' . self::mathCacheKey . 
$mathOption;
+   }
+
+   wfDebugLog( 'Math', New cache key: $confstr );
+   } else {
+   wfDebugLog( 'Math', Cache key found $confstr 
);
+   }
}
-   wfDebugLog( 'Math', 'New cache key' . $confstr );
+
return true;
}
+
/**
 * Register the math tag with the Parser.
 *
@@ -42,19 +76,29 @@
 */
static function mathTagHook( $content, $attributes, $parser ) {
global $wgMathJax, $wgMathDisableTexFilter;
-   if ( trim( $content ) ===  ) { // bug 8372
-   return ;
+
+   if ( trim( $content ) === '' ) { // bug 8372
+   return '';
}
+
wfProfileIn( __METHOD__ );
-   $mode = (int) $parser-getUser()-getOption( 'math' );
-   $parser-getOptions()-addExtraKey( $mode );
-   $renderer = MathRenderer::getRenderer(
-   $content, $attributes, $mode
-   );
-   if ( ! $wgMathDisableTexFilter ) {
+   $mode = (int)$parser-getUser()-getOption( 'math' );
+
+   // Indicate that this page uses math.
+   // This affects the page caching behavior.
+   if ( is_callable( 'ParserOptions::getMath' ) ) {
+   $parser-getOptions()-getMath();
+ 

[MediaWiki-commits] [Gerrit] reprepro: import Facebook's HHVM pkgs, for Labs / Vagrant us... - change (operations/puppet)

[Faidon Liambotis (Code Review)]

Faidon Liambotis has submitted this change and it was merged.

Change subject: reprepro: import Facebook's HHVM pkgs, for Labs / Vagrant usage 
only
..


reprepro: import Facebook's HHVM pkgs, for Labs / Vagrant usage only

The current set of packages provided by Facebook have a number of issues that
Faidon (and others) have documented in Debian bug report #727085
(https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=727085). There appears to
be some momentum in the direction of repackaging HHVM and doing a proper job so
that it can be included in Debian. For this reason, these packages are not to
be installed on production hosts. They are included simply to make testing on
Labs and MediaWiki-Vagrant easier. The author of this commit vows not to use
the presence of these packages in reprepo as a fact on the ground to drive
production deployment later.

Change-Id: I6c57d34105af5bf60dcd407621ded10a364fd40d
---
M modules/install-server/files/reprepro/distributions
M modules/install-server/files/reprepro/updates
2 files changed, 10 insertions(+), 1 deletion(-)

Approvals:
  Faidon Liambotis: Verified; Looks good to me, approved



diff --git a/modules/install-server/files/reprepro/distributions 
b/modules/install-server/files/reprepro/distributions
index 1016631..38913c4 100644
--- a/modules/install-server/files/reprepro/distributions
+++ b/modules/install-server/files/reprepro/distributions
@@ -50,7 +50,7 @@
 Architectures: source amd64 i386
 Components: main universe non-free mariadb
 UDebComponents: main
-Update: ceph jenkins cloudera hwraid cassandra elasticsearch logstash
+Update: ceph jenkins cloudera hwraid cassandra elasticsearch logstash hhvm
 Description: Wikimedia specific packages for Ubuntu Precise
 SignWith: default
 DebOverride: deb-override
diff --git a/modules/install-server/files/reprepro/updates 
b/modules/install-server/files/reprepro/updates
index 1214f04..ecc037b 100644
--- a/modules/install-server/files/reprepro/updates
+++ b/modules/install-server/files/reprepro/updates
@@ -66,3 +66,12 @@
 Architectures: amd64
 VerifyRelease: D27D666CD88E42B4
 ListShellHook: grep-dctrl -X -S logstash || [ $? -eq 1 ]
+
+Name: hhvm
+Method: http://dl.hhvm.com/ubuntu/
+Components: mainmain
+UDebComponents:
+Suite: precise
+Architectures: amd64
+VerifyRelease: 5A16E7281BE7A449
+ListShellHook: grep-dctrl -X -S hhvm || [ $? -eq 1 ]

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I6c57d34105af5bf60dcd407621ded10a364fd40d
Gerrit-PatchSet: 5
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ori.livneh o...@wikimedia.org
Gerrit-Reviewer: Faidon Liambotis fai...@wikimedia.org
Gerrit-Reviewer: Mark Bergsma m...@wikimedia.org
Gerrit-Reviewer: Ori.livneh o...@wikimedia.org
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] sockpuppet: remove leftovers - change (operations/puppet)

[Matanya (Code Review)]

Matanya has uploaded a new change for review.

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

Change subject: sockpuppet: remove leftovers
..

sockpuppet: remove leftovers

followup on https://gerrit.wikimedia.org/r/#/c/115527/1

Change-Id: I7d3b44fc2f317d2cfb3f4fa0881dfe8dced100c7
---
M files/backup/disklist-daily
M files/backup/disklist-monthly
M files/backup/disklist-weekly
D modules/install-server/files/autoinstall/ssh/authorized_keys
4 files changed, 0 insertions(+), 7 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/36/116936/1

diff --git a/files/backup/disklist-daily b/files/backup/disklist-daily
index 5b44107..8d6f483 100644
--- a/files/backup/disklist-daily
+++ b/files/backup/disklist-daily
@@ -1,6 +1,4 @@
 mchenry.wikimedia.org   /root default
-sockpuppet.pmtpa.wmnet /svnroot default
-sockpuppet.pmtpa.wmnet /var/lib/puppet/ssl default
 db10.pmtpa.wmnet /a/sqldata {
default
include ./db10-bin.*
diff --git a/files/backup/disklist-monthly b/files/backup/disklist-monthly
index 0b9212d..4420288 100644
--- a/files/backup/disklist-monthly
+++ b/files/backup/disklist-monthly
@@ -1,6 +1,4 @@
 mchenry.wikimedia.org   /root default
-sockpuppet.pmtpa.wmnet /svnroot default
-sockpuppet.pmtpa.wmnet /var/lib/puppet/ssl default
 db10.pmtpa.wmnet /mnt/a default
 stat1.wikimedia.org /home default
 stat1.wikimedia.org /a/eventlogging default
diff --git a/files/backup/disklist-weekly b/files/backup/disklist-weekly
index 0b9212d..4420288 100644
--- a/files/backup/disklist-weekly
+++ b/files/backup/disklist-weekly
@@ -1,6 +1,4 @@
 mchenry.wikimedia.org   /root default
-sockpuppet.pmtpa.wmnet /svnroot default
-sockpuppet.pmtpa.wmnet /var/lib/puppet/ssl default
 db10.pmtpa.wmnet /mnt/a default
 stat1.wikimedia.org /home default
 stat1.wikimedia.org /a/eventlogging default
diff --git a/modules/install-server/files/autoinstall/ssh/authorized_keys 
b/modules/install-server/files/autoinstall/ssh/authorized_keys
deleted file mode 100644
index b9eaee2..000
--- a/modules/install-server/files/autoinstall/ssh/authorized_keys
+++ /dev/null
@@ -1 +0,0 @@
-ssh-rsa 
B3NzaC1yc2EBIwAAAgEAqWmdNQm1reC0jxfBof510S6ffw/BDIXyFM38ij3PnkYEBOE4PB3KeHJN7NxUbWaXPBILxtqq5EUnCL9XQnDx82opCC9nChNO5KAoV3VqwNAAfh2UVFPt4PKLXiJjU9k76acp+s3i7uEG0wOVlsggjmbsiBq/Jwkne9oodhA75go1GVeDrP5WsXBGYcXXdjY8uU1P901YIatJoYYQSOOsGngGRZPUbTeFrGBaaoQsRCIiE1/byWs5yUuTbWjsBYDK+FoQsmmG5C98tN2g0llLhdbHTVutDEsvRLf28s3RGTTskfYhMgHbpA3coMIKvG8f2gWuk0wgMzI6G69BO87PsdyaS0aNn/DQILRBGaWTIbZwvjecCxXhXsJx0h1fdhTeXZAHljuY2s/7r8LXLk2eLzDi7RIO4PNtUrlRMZ9DgXFupfJXQSJiE54GCMHIHJ5qqGEveJFg7GZXlyxMDm2wUPyw2YYtQcM/RamnyEjakUM7X3eF45gY4ewabp+3IpP2iqkH3gz7IE/8aXtmqwa+SHNl1KxmGZ+9FFOuByM8wvDWaV320569ZGVAy9dxaH/mClLMx+xUKDxa4JN9dn9Yi+hnKoUhOYaBYXB+aPwydjTLMzp7rr1RgrLVGNk1R9WS2RHnEOSYxDmZbAht3v81F/c4mlzBQHQmXBKnNIxdHis=
 root@sockpuppet

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I7d3b44fc2f317d2cfb3f4fa0881dfe8dced100c7
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Matanya mata...@foss.co.il

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

[MediaWiki-commits] [Gerrit] Update Schema:Echo revision to 7731316 - change (operations/mediawiki-config)

[Ori.livneh (Code Review)]

Ori.livneh has uploaded a new change for review.

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

Change subject: Update Schema:Echo revision to 7731316
..

Update Schema:Echo revision to 7731316

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


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

diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index e4e382c..5c5a8a0 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -2259,7 +2259,7 @@
 
// Eventlogging for Schema:Echo
$wgEchoConfig['eventlogging']['Echo']['enabled'] = true;
-   $wgEchoConfig['eventlogging']['Echo']['revision'] = 7572295;
+   $wgEchoConfig['eventlogging']['Echo']['revision'] = 7731316;
// Eventlogging for Schema:EchoMail
$wgEchoConfig['eventlogging']['EchoMail']['enabled'] = true;
$wgEchoConfig['eventlogging']['EchoMail']['revision'] = 5467650;

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I5277d24512c366f2747defbe4ecb6e59c47defa6
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Ori.livneh o...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] Update Schema:Echo revision to 7731316 - change (operations/mediawiki-config)

[jenkins-bot (Code Review)]

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

Change subject: Update Schema:Echo revision to 7731316
..


Update Schema:Echo revision to 7731316

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

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



diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index e4e382c..5c5a8a0 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -2259,7 +2259,7 @@
 
// Eventlogging for Schema:Echo
$wgEchoConfig['eventlogging']['Echo']['enabled'] = true;
-   $wgEchoConfig['eventlogging']['Echo']['revision'] = 7572295;
+   $wgEchoConfig['eventlogging']['Echo']['revision'] = 7731316;
// Eventlogging for Schema:EchoMail
$wgEchoConfig['eventlogging']['EchoMail']['enabled'] = true;
$wgEchoConfig['eventlogging']['EchoMail']['revision'] = 5467650;

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I5277d24512c366f2747defbe4ecb6e59c47defa6
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Ori.livneh o...@wikimedia.org
Gerrit-Reviewer: Ori.livneh o...@wikimedia.org
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] dhcpd: remove Sun-X4150 related configs - change (operations/puppet)

[Matanya (Code Review)]

Matanya has uploaded a new change for review.

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

Change subject: dhcpd: remove Sun-X4150 related configs
..

dhcpd: remove Sun-X4150 related configs

Change-Id: Iced25b8fbc040236cf425b954560d8b96e4c3c1c
---
D files/dhcpd/README
D files/dhcpd/linux-host-entries.ttyS1-9600
M modules/install-server/files/dhcpd/dhcpd.conf
3 files changed, 0 insertions(+), 7 deletions(-)


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

diff --git a/files/dhcpd/README b/files/dhcpd/README
deleted file mode 100644
index 13d2e8f..000
--- a/files/dhcpd/README
+++ /dev/null
@@ -1 +0,0 @@
-Daniel says 'any new server uses linux-host-entries.ttyS1-115200'
diff --git a/files/dhcpd/linux-host-entries.ttyS1-9600 
b/files/dhcpd/linux-host-entries.ttyS1-9600
deleted file mode 100644
index e69de29..000
--- a/files/dhcpd/linux-host-entries.ttyS1-9600
+++ /dev/null
diff --git a/modules/install-server/files/dhcpd/dhcpd.conf 
b/modules/install-server/files/dhcpd/dhcpd.conf
index 51549d1..4cf0c5f 100644
--- a/modules/install-server/files/dhcpd/dhcpd.conf
+++ b/modules/install-server/files/dhcpd/dhcpd.conf
@@ -342,12 +342,6 @@
include /etc/dhcp3/linux-host-entries.ttyS1-57600;
}
 
-   # Sun X4150s use ttyS1/com2 at 9600bps for eLOM console
-   group {
-   option pxelinux.configfile pxelinux.cfg/ttyS1-9600;
-   include /etc/dhcp3/linux-host-entries.ttyS1-9600;
-   }
-
# Dell PowerEdge RXXX Line  C2100s
group {
option pxelinux.configfile pxelinux.cfg/ttyS1-115200;

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iced25b8fbc040236cf425b954560d8b96e4c3c1c
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Matanya mata...@foss.co.il

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

[MediaWiki-commits] [Gerrit] contint: deny access to Jenkins build history - change (operations/puppet)

[Hashar (Code Review)]

Hashar has uploaded a new change for review.

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

Change subject: contint: deny access to Jenkins build history
..

contint: deny access to Jenkins build history

The build history for nodes is simply too long for Jenkins. That causes
it to starve CPU.

Bug: 61964
Change-Id: I02bf1e35991132e6e8441394eefbb30d67775963
---
M modules/contint/files/apache/proxy_jenkins
1 file changed, 7 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/39/116939/1

diff --git a/modules/contint/files/apache/proxy_jenkins 
b/modules/contint/files/apache/proxy_jenkins
index 58dd452..cd1d7e3 100644
--- a/modules/contint/files/apache/proxy_jenkins
+++ b/modules/contint/files/apache/proxy_jenkins
@@ -34,4 +34,11 @@
# successfullyy created and fails beacuse it is server the cached 404).
SetEnvIf Request_URI .*/api/json.* NO_CACHE
Header set Cache-Control no-cache,must-revalidate env=NO_CACHE
+
+   # Prevent access to certain URLs - bug 61964
+   SetEnvIf Request_URI ^/ci/computer/.*/builds DENY_BUILDS_ACCESS
+   SetEnvIf Request_URI ^/ci/user/.*/builds DENY_BUILDS_ACCESS
+   SetEnvIf Request_URI ^/ci/view/.*/builds DENY_BUILDS_ACCESS
+   Order deny,allow
+   deny from env=DENY_BUILDS_ACCESS
 /Proxy

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I02bf1e35991132e6e8441394eefbb30d67775963
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Hashar has...@free.fr

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

[MediaWiki-commits] [Gerrit] Fix SiteLinkTaregtProviderTest - change (mediawiki...Wikibase)

[Addshore (Code Review)]

Addshore has uploaded a new change for review.

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

Change subject: Fix SiteLinkTaregtProviderTest
..

Fix SiteLinkTaregtProviderTest

A change in core caused our mock to be wrong.
This change fixes this! :D

Change-Id: I1fc31c2153c29229eed2e4b202b6bed0487cee82
---
M repo/tests/phpunit/includes/api/SiteLinkTargetProviderTest.php
1 file changed, 3 insertions(+), 0 deletions(-)


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

diff --git a/repo/tests/phpunit/includes/api/SiteLinkTargetProviderTest.php 
b/repo/tests/phpunit/includes/api/SiteLinkTargetProviderTest.php
index 9b778a2..a673b61 100644
--- a/repo/tests/phpunit/includes/api/SiteLinkTargetProviderTest.php
+++ b/repo/tests/phpunit/includes/api/SiteLinkTargetProviderTest.php
@@ -70,6 +70,9 @@
$mockSite-expects( $this-any() )
-method( 'getGlobalId' )
-will( $this-returnValue( $globalId ) );
+   $mockSite-expects( $this-any() )
+   -method( 'getNavigationIds' )
+   -will( $this-returnValue( array() ) );
return $mockSite;
}
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I1fc31c2153c29229eed2e4b202b6bed0487cee82
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Addshore addshorew...@gmail.com

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

[MediaWiki-commits] [Gerrit] Updated Ruby version from 2.1.0 to 2.1.1 - change (mediawiki/selenium)

[jenkins-bot (Code Review)]

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

Change subject: Updated Ruby version from 2.1.0 to 2.1.1
..


Updated Ruby version from 2.1.0 to 2.1.1

Bug: 62152
Change-Id: I57c4b7bce4b139c39c00f4619aa35d8559497c05
---
M Gemfile
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/Gemfile b/Gemfile
index 95cc005..7d15ee1 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,2 +1,2 @@
-#ruby=ruby-2.1.0
+#ruby=ruby-2.1.1
 #ruby-gemset=mediawiki_selenium

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I57c4b7bce4b139c39c00f4619aa35d8559497c05
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/selenium
Gerrit-Branch: master
Gerrit-Owner: Vikassy vikasyaligar...@gmail.com
Gerrit-Reviewer: Zfilipin zfili...@wikimedia.org
Gerrit-Reviewer: jenkins-bot 

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

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

[Jenkins-mwext-sync (Code Review)]

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

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

Change subject: Syncronize VisualEditor: f804838..d7eaf9e
..

Syncronize VisualEditor: f804838..d7eaf9e

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


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

diff --git a/VisualEditor b/VisualEditor
index f804838..d7eaf9e 16
--- a/VisualEditor
+++ b/VisualEditor
-Subproject commit f804838f4966df921ca2adb211b4082d6ef74898
+Subproject commit d7eaf9ea1b01b9f9176754c3484fef6ee632ebf7

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I73edc7ae2daf3b554fba18eaf3e5245548cfd145
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions
Gerrit-Branch: master
Gerrit-Owner: Jenkins-mwext-sync jenkins-...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] [Browser tests] Updated Ruby version from 2.1.0 to 2.1.1 - change (mediawiki...VisualEditor)

[jenkins-bot (Code Review)]

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

Change subject: [Browser tests] Updated Ruby version from 2.1.0 to 2.1.1
..


[Browser tests] Updated Ruby version from 2.1.0 to 2.1.1

Bug: 62152
Change-Id: I61cbb10749fcc568429c626497a76c41074368e8
---
M modules/ve-mw/test/browser/Gemfile
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/modules/ve-mw/test/browser/Gemfile 
b/modules/ve-mw/test/browser/Gemfile
index 33b6d6d..316fff2 100755
--- a/modules/ve-mw/test/browser/Gemfile
+++ b/modules/ve-mw/test/browser/Gemfile
@@ -1,4 +1,4 @@
-#ruby=ruby-2.1.0
+#ruby=ruby-2.1.1
 #ruby-gemset=VisualEditor
 
 source https://rubygems.org;

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I61cbb10749fcc568429c626497a76c41074368e8
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Vikassy vikasyaligar...@gmail.com
Gerrit-Reviewer: Zfilipin zfili...@wikimedia.org
Gerrit-Reviewer: jenkins-bot 

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

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

[Jenkins-mwext-sync (Code Review)]

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

Change subject: Syncronize VisualEditor: f804838..d7eaf9e
..


Syncronize VisualEditor: f804838..d7eaf9e

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

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



diff --git a/VisualEditor b/VisualEditor
index f804838..d7eaf9e 16
--- a/VisualEditor
+++ b/VisualEditor
-Subproject commit f804838f4966df921ca2adb211b4082d6ef74898
+Subproject commit d7eaf9ea1b01b9f9176754c3484fef6ee632ebf7

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I73edc7ae2daf3b554fba18eaf3e5245548cfd145
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions
Gerrit-Branch: master
Gerrit-Owner: Jenkins-mwext-sync jenkins-...@wikimedia.org
Gerrit-Reviewer: Jenkins-mwext-sync jenkins-...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] Updated Ruby version from 2.1.0 to 2.1.1 - change (mediawiki...ZeroRatedMobileAccess)

[jenkins-bot (Code Review)]

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

Change subject: Updated Ruby version from 2.1.0 to 2.1.1
..


Updated Ruby version from 2.1.0 to 2.1.1

Bug: 62152
Change-Id: Ibfb2a3e8806fc2a04560174c7da3f1727c500d0f
---
M tests/browser/Gemfile
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/tests/browser/Gemfile b/tests/browser/Gemfile
index 5544af8..cda9754 100755
--- a/tests/browser/Gemfile
+++ b/tests/browser/Gemfile
@@ -1,4 +1,4 @@
-#ruby=ruby-2.1.0
+#ruby=ruby-2.1.1
 #ruby-gemset=ZeroRatedMobileAccess
 
 source https://rubygems.org;

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ibfb2a3e8806fc2a04560174c7da3f1727c500d0f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ZeroRatedMobileAccess
Gerrit-Branch: master
Gerrit-Owner: Vikassy vikasyaligar...@gmail.com
Gerrit-Reviewer: Zfilipin zfili...@wikimedia.org
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 Ruby version from 2.1.0 to 2.1.1 - change (qa/browsertests)

[jenkins-bot (Code Review)]

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

Change subject: Updated Ruby version from 2.1.0 to 2.1.1
..


Updated Ruby version from 2.1.0 to 2.1.1

Bug: 62152
Change-Id: Ib0f7ee5e3105e669d7f81697c77c8eaec4d114eb
---
M tests/browser/Gemfile
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/tests/browser/Gemfile b/tests/browser/Gemfile
index f7ea33d..d3d93be 100755
--- a/tests/browser/Gemfile
+++ b/tests/browser/Gemfile
@@ -1,4 +1,4 @@
-#ruby=ruby-2.1.0
+#ruby=ruby-2.1.1
 #ruby-gemset=browsertests
 
 source https://rubygems.org;

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib0f7ee5e3105e669d7f81697c77c8eaec4d114eb
Gerrit-PatchSet: 2
Gerrit-Project: qa/browsertests
Gerrit-Branch: master
Gerrit-Owner: Vikassy vikasyaligar...@gmail.com
Gerrit-Reviewer: Zfilipin zfili...@wikimedia.org
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 Ruby version from 2.1.0 to 2.1.1 - change (mediawiki...WikiLove)

[jenkins-bot (Code Review)]

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

Change subject: Updated Ruby version from 2.1.0 to 2.1.1
..


Updated Ruby version from 2.1.0 to 2.1.1

Bug: 62152
Change-Id: I7bc534eb6a3f883b870958f9d28ff8c38b1174ed
---
M tests/browser/Gemfile
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/tests/browser/Gemfile b/tests/browser/Gemfile
index ea8a982..36f43a4 100755
--- a/tests/browser/Gemfile
+++ b/tests/browser/Gemfile
@@ -1,4 +1,4 @@
-#ruby=ruby-2.1.0
+#ruby=ruby-2.1.1
 #ruby-gemset=WikiLove
 
 source https://rubygems.org;

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I7bc534eb6a3f883b870958f9d28ff8c38b1174ed
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikiLove
Gerrit-Branch: master
Gerrit-Owner: Vikassy vikasyaligar...@gmail.com
Gerrit-Reviewer: Zfilipin zfili...@wikimedia.org
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 Ruby version from 2.1.0 to 2.1.1 - change (mediawiki...UploadWizard)

[jenkins-bot (Code Review)]

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

Change subject: Updated Ruby version from 2.1.0 to 2.1.1
..


Updated Ruby version from 2.1.0 to 2.1.1

Bug: 62152
Change-Id: Ibcc80682e5315a2ee49048c42f5445f0793aba76
---
M tests/browser/Gemfile
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/tests/browser/Gemfile b/tests/browser/Gemfile
index 8c620ac..65b1002 100755
--- a/tests/browser/Gemfile
+++ b/tests/browser/Gemfile
@@ -1,4 +1,4 @@
-#ruby=ruby-2.1.0
+#ruby=ruby-2.1.1
 #ruby-gemset=UploadWizard
 
 source https://rubygems.org;

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ibcc80682e5315a2ee49048c42f5445f0793aba76
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/UploadWizard
Gerrit-Branch: master
Gerrit-Owner: Vikassy vikasyaligar...@gmail.com
Gerrit-Reviewer: Zfilipin zfili...@wikimedia.org
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 Ruby version from 2.1.0 to 2.1.1 - change (mediawiki...UniversalLanguageSelector)

[jenkins-bot (Code Review)]

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

Change subject: Updated Ruby version from 2.1.0 to 2.1.1
..


Updated Ruby version from 2.1.0 to 2.1.1

Bug: 62152
Change-Id: I2f73432017b90af70fb2fb453b02f832a8bcb196
---
M tests/browser/Gemfile
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/tests/browser/Gemfile b/tests/browser/Gemfile
index 8012645..06b8e90 100755
--- a/tests/browser/Gemfile
+++ b/tests/browser/Gemfile
@@ -1,4 +1,4 @@
-#ruby=ruby-2.1.0
+#ruby=ruby-2.1.1
 #ruby-gemset=UniversalLanguageSelector
 
 source https://rubygems.org;

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I2f73432017b90af70fb2fb453b02f832a8bcb196
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/UniversalLanguageSelector
Gerrit-Branch: master
Gerrit-Owner: Vikassy vikasyaligar...@gmail.com
Gerrit-Reviewer: Zfilipin zfili...@wikimedia.org
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 Ruby version from 2.1.0 to 2.1.1 - change (mediawiki...TwnMainPage)

[jenkins-bot (Code Review)]

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

Change subject: Updated Ruby version from 2.1.0 to 2.1.1
..


Updated Ruby version from 2.1.0 to 2.1.1

Bug: 62152
Change-Id: Ifd35a5b9ad8191d48dd4d3c5ed2985199df40d2d
---
M tests/browser/Gemfile
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/tests/browser/Gemfile b/tests/browser/Gemfile
index 7b27c26..6ebd04d 100755
--- a/tests/browser/Gemfile
+++ b/tests/browser/Gemfile
@@ -1,4 +1,4 @@
-#ruby=ruby-2.1.0
+#ruby=ruby-2.1.1
 #ruby-gemset=TwnMainPage
 
 source https://rubygems.org;

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ifd35a5b9ad8191d48dd4d3c5ed2985199df40d2d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/TwnMainPage
Gerrit-Branch: master
Gerrit-Owner: Vikassy vikasyaligar...@gmail.com
Gerrit-Reviewer: Zfilipin zfili...@wikimedia.org
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 Ruby version from 2.1.0 to 2.1.1 - change (mediawiki...MultimediaViewer)

[jenkins-bot (Code Review)]

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

Change subject: Updated Ruby version from 2.1.0 to 2.1.1
..


Updated Ruby version from 2.1.0 to 2.1.1

Bug: 62152
Change-Id: I9c67d6a60294e155b7c75df1862d7a080c0716fc
---
M tests/browser/Gemfile
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/tests/browser/Gemfile b/tests/browser/Gemfile
index a7e239d..c77b358 100755
--- a/tests/browser/Gemfile
+++ b/tests/browser/Gemfile
@@ -1,4 +1,4 @@
-#ruby=ruby-2.1.0
+#ruby=ruby-2.1.1
 #ruby-gemset=MultimediaViewer
 
 source https://rubygems.org;

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I9c67d6a60294e155b7c75df1862d7a080c0716fc
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MultimediaViewer
Gerrit-Branch: master
Gerrit-Owner: Vikassy vikasyaligar...@gmail.com
Gerrit-Reviewer: Zfilipin zfili...@wikimedia.org
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 Ruby version from 2.1.0 to 2.1.1 - change (mediawiki...Translate)

[jenkins-bot (Code Review)]

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

Change subject: Updated Ruby version from 2.1.0 to 2.1.1
..


Updated Ruby version from 2.1.0 to 2.1.1

Bug: 62152
Change-Id: If827a5b9bbfb49d96b534f91b4a640e098b6630e
---
M tests/browser/Gemfile
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/tests/browser/Gemfile b/tests/browser/Gemfile
index fd39224..9c307ee 100755
--- a/tests/browser/Gemfile
+++ b/tests/browser/Gemfile
@@ -1,4 +1,4 @@
-#ruby=ruby-2.1.0
+#ruby=ruby-2.1.1
 #ruby-gemset=Translate
 
 source https://rubygems.org;

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

Gerrit-MessageType: merged
Gerrit-Change-Id: If827a5b9bbfb49d96b534f91b4a640e098b6630e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Translate
Gerrit-Branch: master
Gerrit-Owner: Vikassy vikasyaligar...@gmail.com
Gerrit-Reviewer: Zfilipin zfili...@wikimedia.org
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 SiteLinkTaregtProviderTest - change (mediawiki...Wikibase)

[Addshore (Code Review)]

Addshore has submitted this change and it was merged.

Change subject: Fix SiteLinkTaregtProviderTest
..


Fix SiteLinkTaregtProviderTest

A change in core caused our mock to be wrong.
This change fixes this! :D

Change-Id: I1fc31c2153c29229eed2e4b202b6bed0487cee82
---
M repo/tests/phpunit/includes/api/SiteLinkTargetProviderTest.php
1 file changed, 3 insertions(+), 0 deletions(-)

Approvals:
  Tobias Gritschacher: Looks good to me, approved
  WikidataJenkins: Verified



diff --git a/repo/tests/phpunit/includes/api/SiteLinkTargetProviderTest.php 
b/repo/tests/phpunit/includes/api/SiteLinkTargetProviderTest.php
index 9b778a2..a673b61 100644
--- a/repo/tests/phpunit/includes/api/SiteLinkTargetProviderTest.php
+++ b/repo/tests/phpunit/includes/api/SiteLinkTargetProviderTest.php
@@ -70,6 +70,9 @@
$mockSite-expects( $this-any() )
-method( 'getGlobalId' )
-will( $this-returnValue( $globalId ) );
+   $mockSite-expects( $this-any() )
+   -method( 'getNavigationIds' )
+   -will( $this-returnValue( array() ) );
return $mockSite;
}
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I1fc31c2153c29229eed2e4b202b6bed0487cee82
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Addshore addshorew...@gmail.com
Gerrit-Reviewer: Addshore addshorew...@gmail.com
Gerrit-Reviewer: Tobias Gritschacher tobias.gritschac...@wikimedia.de
Gerrit-Reviewer: WikidataJenkins wikidata-servi...@wikimedia.de
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] contint: deny access to Jenkins build history - change (operations/puppet)

[Ori.livneh (Code Review)]

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

Change subject: contint: deny access to Jenkins build history
..


contint: deny access to Jenkins build history

The build history for nodes is simply too long for Jenkins. That causes
it to starve CPU.

Bug: 61964
Change-Id: I02bf1e35991132e6e8441394eefbb30d67775963
---
M modules/contint/files/apache/proxy_jenkins
1 file changed, 7 insertions(+), 0 deletions(-)

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



diff --git a/modules/contint/files/apache/proxy_jenkins 
b/modules/contint/files/apache/proxy_jenkins
index 58dd452..cd1d7e3 100644
--- a/modules/contint/files/apache/proxy_jenkins
+++ b/modules/contint/files/apache/proxy_jenkins
@@ -34,4 +34,11 @@
# successfullyy created and fails beacuse it is server the cached 404).
SetEnvIf Request_URI .*/api/json.* NO_CACHE
Header set Cache-Control no-cache,must-revalidate env=NO_CACHE
+
+   # Prevent access to certain URLs - bug 61964
+   SetEnvIf Request_URI ^/ci/computer/.*/builds DENY_BUILDS_ACCESS
+   SetEnvIf Request_URI ^/ci/user/.*/builds DENY_BUILDS_ACCESS
+   SetEnvIf Request_URI ^/ci/view/.*/builds DENY_BUILDS_ACCESS
+   Order deny,allow
+   deny from env=DENY_BUILDS_ACCESS
 /Proxy

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I02bf1e35991132e6e8441394eefbb30d67775963
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Hashar has...@free.fr
Gerrit-Reviewer: Matanya mata...@foss.co.il
Gerrit-Reviewer: Ori.livneh o...@wikimedia.org
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 Ruby version from 2.1.0 to 2.1.1 - change (mediawiki...ContentTranslation)

[jenkins-bot (Code Review)]

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

Change subject: Updated Ruby version from 2.1.0 to 2.1.1
..


Updated Ruby version from 2.1.0 to 2.1.1

Bug: 62152
Change-Id: I33cea80bcc6743f9cc4139a1d0fe24f183c0bd9e
---
M tests/browser/Gemfile
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/tests/browser/Gemfile b/tests/browser/Gemfile
index d73d5ce..e2eb3c7 100755
--- a/tests/browser/Gemfile
+++ b/tests/browser/Gemfile
@@ -1,4 +1,4 @@
-#ruby=ruby-2.1.0
+#ruby=ruby-2.1.1
 #ruby-gemset=ContentTranslation
 
 source https://rubygems.org;

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I33cea80bcc6743f9cc4139a1d0fe24f183c0bd9e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ContentTranslation
Gerrit-Branch: master
Gerrit-Owner: Vikassy vikasyaligar...@gmail.com
Gerrit-Reviewer: Zfilipin zfili...@wikimedia.org
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 Ruby version from 2.1.0 to 2.1.1 - change (mediawiki...Flow)

[jenkins-bot (Code Review)]

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

Change subject: Updated Ruby version from 2.1.0 to 2.1.1
..


Updated Ruby version from 2.1.0 to 2.1.1

Bug: 62152
Change-Id: I4db58129b3e9625ec6b93b67fa012f0376e41934
---
M tests/browser/Gemfile
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/tests/browser/Gemfile b/tests/browser/Gemfile
index d47f86c..bfb4558 100755
--- a/tests/browser/Gemfile
+++ b/tests/browser/Gemfile
@@ -1,4 +1,4 @@
-#ruby=ruby-2.1.0
+#ruby=ruby-2.1.1
 #ruby-gemset=Flow
 
 source https://rubygems.org;

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I4db58129b3e9625ec6b93b67fa012f0376e41934
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: Vikassy vikasyaligar...@gmail.com
Gerrit-Reviewer: Zfilipin zfili...@wikimedia.org
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] mediawiki.page.ajax.watch: Clean up and simplify code - change (mediawiki/core)

[jenkins-bot (Code Review)]

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

Change subject: mediawiki.page.ajax.watch: Clean up and simplify code
..


mediawiki.page.ajax.watch: Clean up and simplify code

Change-Id: Ie66d08b84a39ad260866de6e0ff821e356133ad0
---
M resources/mediawiki.page/mediawiki.page.watch.ajax.js
1 file changed, 33 insertions(+), 38 deletions(-)

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



diff --git a/resources/mediawiki.page/mediawiki.page.watch.ajax.js 
b/resources/mediawiki.page/mediawiki.page.watch.ajax.js
index 9489403..a491c6a 100644
--- a/resources/mediawiki.page/mediawiki.page.watch.ajax.js
+++ b/resources/mediawiki.page/mediawiki.page.watch.ajax.js
@@ -72,7 +72,7 @@
actionPaths = mw.config.get( 'wgActionPaths' );
 
// TODO: Does MediaWiki give action path or query param
-   // precedence ? If the former, move this to the bottom
+   // precedence? If the former, move this to the bottom
action = mw.util.getParamValue( 'action', url );
if ( action !== null ) {
return action;
@@ -81,7 +81,7 @@
for ( key in actionPaths ) {
if ( actionPaths.hasOwnProperty( key ) ) {
parts = actionPaths[key].split( '$1' );
-   for ( i = 0; i  parts.length; i += 1 ) {
+   for ( i = 0; i  parts.length; i++ ) {
parts[i] = $.escapeRE( parts[i] );
}
m = new RegExp( parts.join( '(.+)' ) ).exec( 
url );
@@ -129,46 +129,41 @@
updateWatchLink( $link, action, 'loading' );
 
api = new mw.Api();
+
api[action]( title )
-   .done( function ( watchResponse ) {
-   var otherAction;
+   .done( function ( watchResponse ) {
+   var otherAction = action === 'watch' ? 
'unwatch' : 'watch';
 
-   otherAction = action === 'watch' ? 'unwatch' : 
'watch';
+   mw.notify( $.parseHTML( 
watchResponse.message ), {
+   tag: 'watch-self'
+   } );
 
-   mw.notify( $.parseHTML( watchResponse.message 
), {
-   tag: 'watch-self'
+   // Set link to opposite
+   updateWatchLink( $link, otherAction );
+
+   // Update the Watch this page 
checkbox on action=edit when the
+   // page is watched or unwatched via the 
tab (bug 12395).
+   $( '#wpWatchthis' ).prop( 'checked', 
watchResponse.watched !== undefined );
+   } )
+   .fail( function () {
+   var cleanTitle, msg, link;
+
+   // Reset link to non-loading mode
+   updateWatchLink( $link, action );
+
+   // Format error message
+   cleanTitle = title.replace( /_/g, ' ' );
+   link = mw.html.element(
+   'a', {
+   href: mw.util.getUrl( 
title ),
+   title: cleanTitle
+   }, cleanTitle
+   );
+   msg = mw.message( 'watcherrortext', 
link );
+
+   // Report to user about the error
+   mw.notify( msg, { tag: 'watch-self' } );
} );
-
-   // Set link to opposite
-   updateWatchLink( $link, otherAction );
-
-   // Bug 12395 - update the watch checkbox on 
edit pages when the
-   // page is watched or unwatched via the tab.
-   if ( watchResponse.watched !== undefined ) {
-   $( '#wpWatchthis' ).prop( 'checked', 
true );
-   } else {
-   $( '#wpWatchthis' ).prop( 'checked', 
false );
-   }
-   } )
-   .fail( function () {
-   var cleanTitle, 

[MediaWiki-commits] [Gerrit] Fix HTTPS protocol detection - change (mediawiki/core)

[Yarda (Code Review)]

Yarda has uploaded a new change for review.

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

Change subject: Fix HTTPS protocol detection
..

Fix HTTPS protocol detection

According to PHP documentation:
http://www.php.net/manual/en/reserved.variables.server.php
The $_SERVER['HTTPS'] is set to a non-empty value if the script was queried
through the HTTPS protocol. There is also note that for ISAPI with IIS, the
value is set to 'off' if the request was not made through the HTTPS protocol.

To follow the PHP documentation the $_SERVER['HTTPS'] == 'on' doesn't seem
to be the correct way how to detect the HTTPS protocol (there maybe e.g. '1'
instead of 'on').

Bug: 46511
Change-Id: I5675fed9b7d54711b96b25702181112ef3692f3c
---
M includes/WebRequest.php
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/includes/WebRequest.php b/includes/WebRequest.php
index 399facf..877e4c5 100644
--- a/includes/WebRequest.php
+++ b/includes/WebRequest.php
@@ -203,7 +203,7 @@
 * @return array
 */
public static function detectProtocol() {
-   if ( ( isset( $_SERVER['HTTPS'] )  $_SERVER['HTTPS'] == 'on' 
) ||
+   if ( ( isset( $_SERVER['HTTPS'] )  $_SERVER['HTTPS'] != ''  
$_SERVER['HTTPS'] != 'off' ) ||
( isset( $_SERVER['HTTP_X_FORWARDED_PROTO'] ) 
$_SERVER['HTTP_X_FORWARDED_PROTO'] == 'https' ) ) {
return 'https';

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I5675fed9b7d54711b96b25702181112ef3692f3c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Yarda jskar...@redhat.com

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

[MediaWiki-commits] [Gerrit] contint: Icinga now notify on contint related stuff - change (operations/puppet)

[Hashar (Code Review)]

Hashar has uploaded a new change for review.

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

Change subject: contint: Icinga now notify on contint related stuff
..

contint: Icinga now notify on contint related stuff

Commit 5b2ed161cc added an Icinga contact group 'contint' which we can
use to notify on jenkins/zuul issues (RT #6966).

Adding the contact group for:
- zuul process
- zuul gearman daemon
- jenkins process

Change-Id: I12fe316808c4b60d420bee0a0683ce82cb10e3f3
---
M manifests/zuul.pp
M modules/jenkins/manifests/init.pp
2 files changed, 7 insertions(+), 3 deletions(-)


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

diff --git a/manifests/zuul.pp b/manifests/zuul.pp
index e2ca376..99e0486 100644
--- a/manifests/zuul.pp
+++ b/manifests/zuul.pp
@@ -46,14 +46,17 @@
 
 # nagios/icinga monitoring
 nrpe::monitor_service { 'zuul':
-description  = 'zuul_service_running',
+description   = 'zuul_service_running',
+contact_group = 'contint',
 # Zuul has a main process and a fork which is the gearman
 # server. Thus we need two process running.
 nrpe_command = /usr/lib/nagios/plugins/check_procs -w 2:2 -c 2:2 
--ereg-argument-array '^/usr/bin/python /usr/local/bin/zuul-server',
 }
+
 nrpe::monitor_service { 'zuul_gearman':
-description  = 'zuul_gearman_service',
-nrpe_command = '/usr/lib/nagios/plugins/check_tcp -H 127.0.0.1 -p 
4730 --timeout=2',
+description   = 'zuul_gearman_service',
+contact_group = 'contint',
+nrpe_command  = '/usr/lib/nagios/plugins/check_tcp -H 127.0.0.1 
-p 4730 --timeout=2',
 }
 
 # Deploy Wikimedia Zuul configuration files.
diff --git a/modules/jenkins/manifests/init.pp 
b/modules/jenkins/manifests/init.pp
index ed07211..fbbe6cf 100644
--- a/modules/jenkins/manifests/init.pp
+++ b/modules/jenkins/manifests/init.pp
@@ -34,6 +34,7 @@
   # nagios monitoring
   nrpe::monitor_service { 'jenkins':
 description   = 'jenkins_service_running',
+contact_group = 'contint',
 nrpe_command  = /usr/lib/nagios/plugins/check_procs -w 1:1 -c 1:1 
--ereg-argument-array '^/usr/bin/java .*-jar /usr/share/jenkins/jenkins.war'
   }
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I12fe316808c4b60d420bee0a0683ce82cb10e3f3
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Hashar has...@free.fr

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

[MediaWiki-commits] [Gerrit] icinga: update check_mysql-replication to v 0.2.6 - change (operations/puppet)

[Matanya (Code Review)]

Matanya has uploaded a new change for review.

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

Change subject: icinga: update check_mysql-replication to v 0.2.6
..

icinga: update check_mysql-replication to v 0.2.6

See changelog in file for updates

Change-Id: I86aa1868d0ec83b10bb9f493d5115c9b8bfb6df3
---
M files/icinga/check_mysql-replication.pl
1 file changed, 118 insertions(+), 62 deletions(-)


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

diff --git a/files/icinga/check_mysql-replication.pl 
b/files/icinga/check_mysql-replication.pl
index 211403b..db080d2 100755
--- a/files/icinga/check_mysql-replication.pl
+++ b/files/icinga/check_mysql-replication.pl
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/perl -w
 
 #  ---
 # -=- check_mysql-replication.pl -=-
@@ -7,7 +7,11 @@
 #  Description : yet another plugin to check your mysql
 #  replication threads and your lag synchronisation
 #
-#  Version : 0.1
+#  Just want to thank Bartlomiej 'guzik' Syryjczyk,
+#  Brian Rudy, Leif Neland, Christoph Maser and Peter Lecki
+#  to help me to improve this little script
+#
+#  Version : 0.2.6
 #  ---
 #  In :
 # - see the How to use section
@@ -21,6 +25,7 @@
 #  Fix Me/Todo :
 # - too many things ;) but let me know what do you think about it
 # - what about a comparaison with the master status ?
+# - use the Nagios lib for the return code
 #
 # 
 
@@ -46,16 +51,44 @@
 #
 # 1 - first you have to create an user with the REPLICATION CLIENT
 # (or you can just grant this privilege)
-# mysql GRANT REPLICATION CLIENT ON *.* TO 'replicateur'@'localhost'
+# mysql GRANT REPLICATION CLIENT TO 'replicateur'@'localhost' IDENTIFIED
+#BY 'password';
+# or
+# mysql GRANT REPLICATION CLIENT TO 'replicateur'@'localhost'
 #
 # 2 - then just run the script :
-# $./check_mysql-replication.pl --help
+# $ ./check_mysql-replication.pl --help
 # 
 
 # 
 # Changelog :
 # ---
-#
+#   Date:30/04/2013   Version:0.2.6 Author:Erwan Ben Souiden
+#Fix http://yoolink.to/DWq
+# 
+#   Date:24/07/2012   Version:0.2.5 Author:Erwan Ben Souiden
+#Little fix by Peter Lecki to return exit code 2 when lag value
+#   is null for lag action
+# 
+#   Date:25/03/2010   Version:0.2.4 Author:Christoph Maser
+#Add a little check if replication is up otherwise 
+#   $result-{Slave_IO_State} is undefined.
+# 
+#   Date:18/03/2010   Version:0.2.3 Author:Erwan Ben Souiden
+#Bugfix to catch condition when lag check is run and 
+#   relication is not running. Minor Perl synax fixes for ePN. 
+#   from Brian Rudy (brud...@spampraecogito.com)
+# 
+#   Date:09/03/2010   Version:0.2.2 Author:Erwan Ben Souiden
+#Updates to allow both process and lag checks in one pass
+#   from Brian Rudy (brud...@spampraecogito.com)
+# 
+#   Date:15/02/2010   Version:0.2.1 Author:Erwan Ben Souiden
+#little security update in DSN thank to Leif Neland
+# 
+#   Date:22/10/2009   Version:0.2 Author:Erwan Ben Souiden
+#little update thank to Bartlomiej 'guzik' Syryjczyk
+#   for now, no database is needed in DSN
 # 
 #   Date:22/06/2009   Version:0.1 Author:Erwan Ben Souiden
 #creation
@@ -72,7 +105,7 @@
 
 # Generic variables
 # -
-my $version = '0.1';
+my $version = '0.2.6';
 my $author = 'Erwan Labynocle Ben Souiden';
 my $a_mail = 'er...@aleikoum.net';
 my $script_name = 'check_mysql-replication.pl';
@@ -97,8 +130,8 @@
 'slave-port=i' = \ $slave_port,
 'sl=s' = \ $slave_login,
 'slave-login=s' = \ $slave_login,
-'spd=s' = \ $slave_pwd,
-'slave-password=s' = \ $slave_pwd,
+'spd:s' = \ $slave_pwd,
+'slave-password:s' = \ $slave_pwd,
 'w=i' = \ $warning,
 'warning=i' = \ $warning,
 'c=i' = \ $critical,
@@ -120,8 +153,8 @@
 'verbose' = \ $verbose_value
 );
 
-print_usage() if ($help_value);
-print_version() if ($version_value);
+print_usage() if ($help_value);
+print_version() if ($version_value);
 
 
 # Syntax check of your specified options
@@ -151,61 +184,83 @@
 
 print DEBUG : action = $action\n if ($verbose_value);
 
-# process action
-# --

[MediaWiki-commits] [Gerrit] Deprecated window.$j - change (mediawiki/core)

[01tonythomas (Code Review)]

01tonythomas has uploaded a new change for review.

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

Change subject: Deprecated window.$j
..

Deprecated window.$j

Change-Id: I871a0906730a1038311256e3e6e8ce3a293bd9ca
---
M resources/mediawiki/mediawiki.js
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/46/116946/1

diff --git a/resources/mediawiki/mediawiki.js b/resources/mediawiki/mediawiki.js
index 8a50363..cb00b2c 100644
--- a/resources/mediawiki/mediawiki.js
+++ b/resources/mediawiki/mediawiki.js
@@ -2352,7 +2352,7 @@
 }( jQuery ) );
 
 // Alias $j to jQuery for backwards compatibility
-window.$j = jQuery;
+mw.log.deprecate( window, '$j', jQuery, 'Use $ or jQuery instead.' );
 
 // Attach to window and globally alias
 window.mw = window.mediaWiki = mw;

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I871a0906730a1038311256e3e6e8ce3a293bd9ca
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: 01tonythomas 01tonytho...@gmail.com

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

[MediaWiki-commits] [Gerrit] contint: install hhvm on labs slaves - change (operations/puppet)

[Hashar (Code Review)]

Hashar has uploaded a new change for review.

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

Change subject: contint: install hhvm on labs slaves
..

contint: install hhvm on labs slaves

Will let us run the MediaWiki core test suite :-]

Change-Id: I7db6e70ff3d06b3491a4ebbf8a5460473d1c13b7
---
M modules/contint/manifests/packages/labs.pp
1 file changed, 3 insertions(+), 0 deletions(-)


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

diff --git a/modules/contint/manifests/packages/labs.pp 
b/modules/contint/manifests/packages/labs.pp
index d5382a5..8605ad8 100644
--- a/modules/contint/manifests/packages/labs.pp
+++ b/modules/contint/manifests/packages/labs.pp
@@ -25,6 +25,9 @@
 ]: ensure = present,
 }
 
+# Facebook Hiphop virtual machine
+package { 'hhvm': ensure = present }
+
 # Bring tox/virtualenv... from pip  bug 3
 # TODO: Reevaluate this once we switch to trusty. Maybe provider being apt
 # would be better then

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I7db6e70ff3d06b3491a4ebbf8a5460473d1c13b7
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Hashar has...@free.fr

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

[MediaWiki-commits] [Gerrit] icinga: remove ksnider from contact groups - change (operations/puppet)

[Matanya (Code Review)]

Matanya has uploaded a new change for review.

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

Change subject: icinga: remove ksnider from contact groups
..

icinga: remove ksnider from contact groups

Change-Id: I52edb287908e1a353e18151864c53494d4a9eed7
---
M files/icinga/contactgroups.cfg
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/48/116948/1

diff --git a/files/icinga/contactgroups.cfg b/files/icinga/contactgroups.cfg
index ba5924a..0472f8e 100644
--- a/files/icinga/contactgroups.cfg
+++ b/files/icinga/contactgroups.cfg
@@ -6,7 +6,7 @@
 
 define contactgroup {
contactgroup_name   sms
-   members 
akosiaris,ariel,bblack,cmjohnson,dzahn,faidon,gage,jgreen,ksnider,mark,rkattouw,robh,springle,tstarling,mpelletier
+   members 
akosiaris,ariel,bblack,cmjohnson,dzahn,faidon,gage,jgreen,mark,rkattouw,robh,springle,tstarling,mpelletier
 }
 
  define contactgroup {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I52edb287908e1a353e18151864c53494d4a9eed7
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Matanya mata...@foss.co.il

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

[MediaWiki-commits] [Gerrit] Browser test for the entry point of Content Translation - change (mediawiki...ContentTranslation)

[SuchetaG (Code Review)]

SuchetaG has uploaded a new change for review.

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

Change subject: Browser test for the entry point of Content Translation
..

Browser test for the entry point of Content Translation

Change-Id: I482e2a61329cabcbbe701096d386f358b3e8ec0e
---
A tests/browser/features/special_content_translation_entry.feature
1 file changed, 16 insertions(+), 0 deletions(-)


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

diff --git a/tests/browser/features/special_content_translation_entry.feature 
b/tests/browser/features/special_content_translation_entry.feature
new file mode 100644
index 000..390bbfe
--- /dev/null
+++ b/tests/browser/features/special_content_translation_entry.feature
@@ -0,0 +1,16 @@
+Feature: New translation from interlanguage link
+
+  As a wiki editor 
+  I can initiate a translation directly from the content page, 
+  so that I can immediately discover how to contribute.
+
+  Design: 
+  - http://pauginer.github.io/prototype-uls/#mies
+
+  These scenarios check the main entry point to the Special:ContentTranslation 
page.
+
+  Scenario:
+Given I am at a random page
+  And I see a red link in the list of interlanguage links
+When I click on the red link
+Then I see a dialogue

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I482e2a61329cabcbbe701096d386f358b3e8ec0e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ContentTranslation
Gerrit-Branch: master
Gerrit-Owner: SuchetaG sucheta.ghos...@gmail.com

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

[MediaWiki-commits] [Gerrit] Use javascript:void() as href for CharInsert - change (mediawiki...CharInsert)

[01tonythomas (Code Review)]

01tonythomas has uploaded a new change for review.

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

Change subject: Use javascript:void() as href for CharInsert
..

Use javascript:void() as href for CharInsert

Bug: 62223
Change-Id: Ied9d7058d80d2a8c8c9d2ab40f18fda08d823988
---
M CharInsert.php
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CharInsert 
refs/changes/50/116950/1

diff --git a/CharInsert.php b/CharInsert.php
index 359f610..eb0254e 100644
--- a/CharInsert.php
+++ b/CharInsert.php
@@ -97,7 +97,7 @@
return Xml::element( 'a',
array(
'onclick' = insertTags('$estart','$eend','');return 
false,
-   'href'= '#' ),
+   'href'= javascript:void() ),
$inline );
 }
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ied9d7058d80d2a8c8c9d2ab40f18fda08d823988
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CharInsert
Gerrit-Branch: master
Gerrit-Owner: 01tonythomas 01tonytho...@gmail.com
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] code-quality: Special:PrefixIndex is transcludable - change (mediawiki/core)

[jenkins-bot (Code Review)]

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

Change subject: code-quality: Special:PrefixIndex is transcludable
..


code-quality: Special:PrefixIndex is transcludable

Replacing 'id' attribute with 'class' to prevent pages' HTML from
becoming invalid due to using the same id.

Change-Id: Ibf561318a5005424e8920e693a62ccdb05bbd765
---
M RELEASE-NOTES-1.23
M includes/specials/SpecialPrefixindex.php
M resources/mediawiki.special/mediawiki.special.css
M tests/parser/parserTests.txt
4 files changed, 9 insertions(+), 5 deletions(-)

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



diff --git a/RELEASE-NOTES-1.23 b/RELEASE-NOTES-1.23
index 382b54f..e7ae193 100644
--- a/RELEASE-NOTES-1.23
+++ b/RELEASE-NOTES-1.23
@@ -265,6 +265,9 @@
 * The jquery.delayedBind ResourceLoader module was deprecated in favor of the
   jquery.throttle-debounce module. It will be removed in MediaWiki 1.24.
 * mw.user.bucket has been deprecated.
+* On Special:PrefixIndex, a table#mw-prefixindex-list-table was changed to
+  table.mw-prefixindex-list-table to avoid duplicate ids when the special page
+  is transcluded.
 
  Removed classes 
 * FakeMemCachedClient (deprecated in 1.18)
diff --git a/includes/specials/SpecialPrefixindex.php 
b/includes/specials/SpecialPrefixindex.php
index 4548b63..8137651 100644
--- a/includes/specials/SpecialPrefixindex.php
+++ b/includes/specials/SpecialPrefixindex.php
@@ -203,7 +203,7 @@
 
$n = 0;
if ( $res-numRows()  0 ) {
-   $out = Xml::openElement( 'table', array( 'id' 
= 'mw-prefixindex-list-table' ) );
+   $out = Xml::openElement( 'table', array( 
'class' = 'mw-prefixindex-list-table' ) );
 
$prefixLength = strlen( $prefix );
while ( ( $n  $this-maxPerPage )  ( $s = 
$res-fetchObject() ) ) {
diff --git a/resources/mediawiki.special/mediawiki.special.css 
b/resources/mediawiki.special/mediawiki.special.css
index ee4fc06..a877b74 100644
--- a/resources/mediawiki.special/mediawiki.special.css
+++ b/resources/mediawiki.special/mediawiki.special.css
@@ -66,7 +66,8 @@
 }
 
 / Special:Prefixindex /
-table#mw-prefixindex-list-table,
+table#mw-prefixindex-list-table, /* HTML backwards-compatibility, to be 
removed before 1.23 */
+table.mw-prefixindex-list-table,
 table#mw-prefixindex-nav-table {
width: 98%;
 }
diff --git a/tests/parser/parserTests.txt b/tests/parser/parserTests.txt
index a868214..02863c8 100644
--- a/tests/parser/parserTests.txt
+++ b/tests/parser/parserTests.txt
@@ -13163,7 +13163,7 @@
 !! input
 {{Special:Prefixindex/Xyzzyx}}
 !! result
-table id=mw-prefixindex-list-tabletrtda href=/wiki/Xyzzyx 
title=XyzzyxXyzzyx/a/td/tr/table
+table class=mw-prefixindex-list-tabletrtda href=/wiki/Xyzzyx 
title=XyzzyxXyzzyx/a/td/tr/table
 
 !! end
 
@@ -13174,8 +13174,8 @@
 {{Special:Prefixindex/Xyzzyx}}
 {{Special:Prefixindex/Xyzzyx}}
 !! result
-table id=mw-prefixindex-list-tabletrtda href=/wiki/Xyzzyx 
title=XyzzyxXyzzyx/a/td/tr/table
-table id=mw-prefixindex-list-tabletrtda href=/wiki/Xyzzyx 
title=XyzzyxXyzzyx/a/td/tr/table
+table class=mw-prefixindex-list-tabletrtda href=/wiki/Xyzzyx 
title=XyzzyxXyzzyx/a/td/tr/table
+table class=mw-prefixindex-list-tabletrtda href=/wiki/Xyzzyx 
title=XyzzyxXyzzyx/a/td/tr/table
 
 !! end
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ibf561318a5005424e8920e693a62ccdb05bbd765
Gerrit-PatchSet: 5
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Danny B. dann...@email.cz
Gerrit-Reviewer: Bartosz Dziewoński matma@gmail.com
Gerrit-Reviewer: Brian Wolff bawolff...@gmail.com
Gerrit-Reviewer: Danny B. dann...@email.cz
Gerrit-Reviewer: Jack Phoenix j...@countervandalism.net
Gerrit-Reviewer: Krinkle krinklem...@gmail.com
Gerrit-Reviewer: Reedy re...@wikimedia.org
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] Fix for unfriending not working properly (due to an undefine... - change (mediawiki...SocialProfile)

[Jack Phoenix (Code Review)]

Jack Phoenix has uploaded a new change for review.

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

Change subject: Fix for unfriending not working properly (due to an undefined 
variable).
..

Fix for unfriending not working properly (due to an undefined variable).

Spotted by MediaWiki.org user Krusher.

Change-Id: I66ff99b2a4a8ca7547012ab7b7e079db1268caad
---
M UserRelationship/SpecialRemoveRelationship.php
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/SocialProfile 
refs/changes/51/116951/1

diff --git a/UserRelationship/SpecialRemoveRelationship.php 
b/UserRelationship/SpecialRemoveRelationship.php
index 3f54f32..cf21065 100644
--- a/UserRelationship/SpecialRemoveRelationship.php
+++ b/UserRelationship/SpecialRemoveRelationship.php
@@ -38,7 +38,7 @@
// Add CSS
$out-addModules( 'ext.socialprofile.userrelationship.css' );
 
-   $usertitle = Title::newFromDBkey( $request-getVal( 'user' ) );
+   $usertitle = Title::newFromDBkey( $this-getRequest()-getVal( 
'user' ) );
if ( !$usertitle ) {
$ot-setPageTitle( $this-msg( 'ur-error-title' 
)-plain() );
$out-addWikiMsg( 'ur-add-no-user' );

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I66ff99b2a4a8ca7547012ab7b7e079db1268caad
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SocialProfile
Gerrit-Branch: master
Gerrit-Owner: Jack Phoenix j...@countervandalism.net

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

[MediaWiki-commits] [Gerrit] Fix for unfriending not working properly (due to an undefine... - change (mediawiki...SocialProfile)

[Jack Phoenix (Code Review)]

Jack Phoenix has submitted this change and it was merged.

Change subject: Fix for unfriending not working properly (due to an undefined 
variable).
..


Fix for unfriending not working properly (due to an undefined variable).

Spotted by MediaWiki.org user Krusher.

Change-Id: I66ff99b2a4a8ca7547012ab7b7e079db1268caad
---
M UserRelationship/SpecialRemoveRelationship.php
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Jack Phoenix: Verified; Looks good to me, approved



diff --git a/UserRelationship/SpecialRemoveRelationship.php 
b/UserRelationship/SpecialRemoveRelationship.php
index 3f54f32..cf21065 100644
--- a/UserRelationship/SpecialRemoveRelationship.php
+++ b/UserRelationship/SpecialRemoveRelationship.php
@@ -38,7 +38,7 @@
// Add CSS
$out-addModules( 'ext.socialprofile.userrelationship.css' );
 
-   $usertitle = Title::newFromDBkey( $request-getVal( 'user' ) );
+   $usertitle = Title::newFromDBkey( $this-getRequest()-getVal( 
'user' ) );
if ( !$usertitle ) {
$ot-setPageTitle( $this-msg( 'ur-error-title' 
)-plain() );
$out-addWikiMsg( 'ur-add-no-user' );

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I66ff99b2a4a8ca7547012ab7b7e079db1268caad
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SocialProfile
Gerrit-Branch: master
Gerrit-Owner: Jack Phoenix j...@countervandalism.net
Gerrit-Reviewer: Jack Phoenix j...@countervandalism.net

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

[MediaWiki-commits] [Gerrit] Fix for Mails being sent as HTML instead of text. - change (mediawiki...SocialProfile)

[Jack Phoenix (Code Review)]

Jack Phoenix has uploaded a new change for review.

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

Change subject: Fix for Mails being sent as HTML instead of text.
..

Fix for Mails being sent as HTML instead of text.

Patch by MediaWiki.org user Krusher.

Change-Id: I31596a2a58384ec652aad088fa69c5211d3e1364
---
M UserBoard/UserBoardClass.php
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/SocialProfile 
refs/changes/52/116952/1

diff --git a/UserBoard/UserBoardClass.php b/UserBoard/UserBoardClass.php
index 61219cd..1f03ef1 100644
--- a/UserBoard/UserBoardClass.php
+++ b/UserBoard/UserBoardClass.php
@@ -83,7 +83,7 @@
$user_from,
$board_link-escapeFullURL(),
$update_profile_link-escapeFullURL()
-   )-parse();
+   )-text();
$user-sendMail( $subject, $body );
}
}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I31596a2a58384ec652aad088fa69c5211d3e1364
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SocialProfile
Gerrit-Branch: master
Gerrit-Owner: Jack Phoenix j...@countervandalism.net

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

[MediaWiki-commits] [Gerrit] Fix for Mails being sent as HTML instead of text. - change (mediawiki...SocialProfile)

[Jack Phoenix (Code Review)]

Jack Phoenix has submitted this change and it was merged.

Change subject: Fix for Mails being sent as HTML instead of text.
..


Fix for Mails being sent as HTML instead of text.

Patch by MediaWiki.org user Krusher.

Change-Id: I31596a2a58384ec652aad088fa69c5211d3e1364
---
M UserBoard/UserBoardClass.php
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Jack Phoenix: Verified; Looks good to me, approved



diff --git a/UserBoard/UserBoardClass.php b/UserBoard/UserBoardClass.php
index 61219cd..1f03ef1 100644
--- a/UserBoard/UserBoardClass.php
+++ b/UserBoard/UserBoardClass.php
@@ -83,7 +83,7 @@
$user_from,
$board_link-escapeFullURL(),
$update_profile_link-escapeFullURL()
-   )-parse();
+   )-text();
$user-sendMail( $subject, $body );
}
}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I31596a2a58384ec652aad088fa69c5211d3e1364
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SocialProfile
Gerrit-Branch: master
Gerrit-Owner: Jack Phoenix j...@countervandalism.net
Gerrit-Reviewer: Jack Phoenix j...@countervandalism.net

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

[MediaWiki-commits] [Gerrit] Fixed globals in respect to composer classloading - change (mediawiki...SideBarMenu)

[Netbrain (Code Review)]

Netbrain has uploaded a new change for review.

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

Change subject: Fixed globals in respect to composer classloading
..

Fixed globals in respect to composer classloading

Change-Id: Iecec97b0e100b401ff08a0f57ff54887bfa6f2c6
---
M SideBarMenu.php
1 file changed, 2 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/SideBarMenu 
refs/changes/54/116954/1

diff --git a/SideBarMenu.php b/SideBarMenu.php
index 8e27064..d6c3c7a 100644
--- a/SideBarMenu.php
+++ b/SideBarMenu.php
@@ -12,6 +12,8 @@
include_once( __DIR__ . '/vendor/autoload.php' );
 }
 
+global $wgExtensionFunctions,$wgExtensionMessagesFiles, $wgExtensionCredits, 
$wgHooks, $wgResourceModules;
+
 //SideBarMenu constants
 const SBM_EXPANDED = 'expanded';
 const SBM_CONTROLS_SHOW = 'show';

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iecec97b0e100b401ff08a0f57ff54887bfa6f2c6
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SideBarMenu
Gerrit-Branch: master
Gerrit-Owner: Netbrain k...@heldig.org

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

[MediaWiki-commits] [Gerrit] Fixed globals in respect to composer classloading - change (mediawiki...SideBarMenu)

[Netbrain (Code Review)]

Netbrain has submitted this change and it was merged.

Change subject: Fixed globals in respect to composer classloading
..


Fixed globals in respect to composer classloading

Change-Id: Iecec97b0e100b401ff08a0f57ff54887bfa6f2c6
---
M SideBarMenu.php
1 file changed, 2 insertions(+), 0 deletions(-)

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



diff --git a/SideBarMenu.php b/SideBarMenu.php
index 8e27064..d6c3c7a 100644
--- a/SideBarMenu.php
+++ b/SideBarMenu.php
@@ -12,6 +12,8 @@
include_once( __DIR__ . '/vendor/autoload.php' );
 }
 
+global $wgExtensionFunctions,$wgExtensionMessagesFiles, $wgExtensionCredits, 
$wgHooks, $wgResourceModules;
+
 //SideBarMenu constants
 const SBM_EXPANDED = 'expanded';
 const SBM_CONTROLS_SHOW = 'show';

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Iecec97b0e100b401ff08a0f57ff54887bfa6f2c6
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SideBarMenu
Gerrit-Branch: master
Gerrit-Owner: Netbrain k...@heldig.org
Gerrit-Reviewer: Netbrain k...@heldig.org
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] icinga: remove ksnider from contact groups - change (operations/puppet)

[Faidon Liambotis (Code Review)]

Faidon Liambotis has submitted this change and it was merged.

Change subject: icinga: remove ksnider from contact groups
..


icinga: remove ksnider from contact groups

Change-Id: I52edb287908e1a353e18151864c53494d4a9eed7
---
M files/icinga/contactgroups.cfg
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/files/icinga/contactgroups.cfg b/files/icinga/contactgroups.cfg
index ba5924a..0472f8e 100644
--- a/files/icinga/contactgroups.cfg
+++ b/files/icinga/contactgroups.cfg
@@ -6,7 +6,7 @@
 
 define contactgroup {
contactgroup_name   sms
-   members 
akosiaris,ariel,bblack,cmjohnson,dzahn,faidon,gage,jgreen,ksnider,mark,rkattouw,robh,springle,tstarling,mpelletier
+   members 
akosiaris,ariel,bblack,cmjohnson,dzahn,faidon,gage,jgreen,mark,rkattouw,robh,springle,tstarling,mpelletier
 }
 
  define contactgroup {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I52edb287908e1a353e18151864c53494d4a9eed7
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Matanya mata...@foss.co.il
Gerrit-Reviewer: Alexandros Kosiaris akosia...@wikimedia.org
Gerrit-Reviewer: Andrew Bogott abog...@wikimedia.org
Gerrit-Reviewer: Dzahn dz...@wikimedia.org
Gerrit-Reviewer: Faidon Liambotis fai...@wikimedia.org
Gerrit-Reviewer: Gage jger...@wikimedia.org
Gerrit-Reviewer: Mark Bergsma m...@wikimedia.org
Gerrit-Reviewer: Ori.livneh o...@wikimedia.org
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] mediawiki.api: Use Promise.then instead of manual Deferred w... - change (mediawiki/core)

[Krinkle (Code Review)]

Krinkle has uploaded a new change for review.

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

Change subject: mediawiki.api: Use Promise.then instead of manual Deferred 
wrapping
..

mediawiki.api: Use Promise.then instead of manual Deferred wrapping

This is exactly what Promise.then is built for.

As a nice bonus, this way the fail/reject handler is transferred
automatically, and we don't need to call resolve() manually
since the return value from then(Function done) is the resolved
value (or another promise).

Minor clean up:

* category: Fix type documentation (primitive string instead of String object).
* category: Use simple boolean check to assert value is no longer false.
* parse: Fix bug where in theory the deferred was never be resolved if the
   condition evaluated to false.
* watch: Add missing @static.
* watch: Simplify params/$.extend logic.

Change-Id: Iedbc70b2573c4f6b0d9e133c6f31e8f0b19c6f5e
---
M resources/mediawiki.api/mediawiki.api.category.js
M resources/mediawiki.api/mediawiki.api.parse.js
M resources/mediawiki.api/mediawiki.api.watch.js
3 files changed, 70 insertions(+), 81 deletions(-)


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

diff --git a/resources/mediawiki.api/mediawiki.api.category.js 
b/resources/mediawiki.api/mediawiki.api.category.js
index 57eda3d..c947cd6 100644
--- a/resources/mediawiki.api/mediawiki.api.category.js
+++ b/resources/mediawiki.api/mediawiki.api.category.js
@@ -15,21 +15,19 @@
 * @return {boolean} return.done.isCategory Whether the 
category exists.
 */
isCategory: function ( title, ok, err ) {
-   var d = $.Deferred(),
-   apiPromise;
+   var apiPromise = this.get( {
+   prop: 'categoryinfo',
+   titles: title.toString()
+   } );
 
// Backwards compatibility ( MW 1.20)
if ( ok || err ) {
mw.track( 'mw.deprecate', 'api.cbParam' );
mw.log.warn( msg );
-   d.done( ok ).fail( err );
}
 
-   apiPromise = this.get( {
-   prop: 'categoryinfo',
-   titles: title.toString()
-   } )
-   .done( function ( data ) {
+   return apiPromise
+   .then( function ( data ) {
var exists = false;
if ( data.query  data.query.pages ) {
$.each( data.query.pages, 
function ( id, page ) {
@@ -38,52 +36,52 @@
}
} );
}
-   d.resolve( exists );
+   return exists;
} )
-   .fail( d.reject );
-
-   return d.promise( { abort: apiPromise.abort } );
+   .done( ok )
+   .fail( err )
+   .promise( { abort: apiPromise.abort } );
},
 
/**
 * Get a list of categories that match a certain prefix.
-*   e.g. given Foo, return Food, Foolish people, 
Foosball tables ...
+*
+* E.g. given Foo, return Food, Foolish people, Foosball 
tables ...
+*
 * @param {string} prefix Prefix to match.
 * @param {Function} [ok] Success callback (deprecated)
 * @param {Function} [err] Error callback (deprecated)
 * @return {jQuery.Promise}
 * @return {Function} return.done
-* @return {String[]} return.done.categories Matched categories
+* @return {string[]} return.done.categories Matched categories
 */
getCategoriesByPrefix: function ( prefix, ok, err ) {
-   var d = $.Deferred(),
-   apiPromise;
+   var apiPromise = this.get( {
+   list: 'allpages',
+   apprefix: prefix,
+   apnamespace: mw.config.get( 'wgNamespaceIds' 
).category
+   } );
 
// Backwards compatibility ( MW 1.20)
if ( ok || err ) {
mw.track( 'mw.deprecate', 'api.cbParam' );

[MediaWiki-commits] [Gerrit] Clean up ExportDemoTest - change (mediawiki/core)

[Addshore (Code Review)]

Addshore has uploaded a new change for review.

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

Change subject: Clean up ExportDemoTest
..

Clean up ExportDemoTest

Change-Id: I28574b6c83cbd1128ad97b4868cc365336a7d4b8
---
M tests/phpunit/docs/ExportDemoTest.php
1 file changed, 16 insertions(+), 24 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/55/116955/1

diff --git a/tests/phpunit/docs/ExportDemoTest.php 
b/tests/phpunit/docs/ExportDemoTest.php
index b09487a..8288cae 100644
--- a/tests/phpunit/docs/ExportDemoTest.php
+++ b/tests/phpunit/docs/ExportDemoTest.php
@@ -1,39 +1,31 @@
 ?php
+
 /**
- * Test for the demo xml
+ * Test making sure the demo export xml is valid.
+ * This is NOT a unit test
  *
  * @group Dump
+ * @group large
  */
 class ExportDemoTest extends DumpTestCase {
 
-   /**
-* @group large
-*/
-   function testExportDemo() {
-   $this-validateXmlFileAgainstXsd( ../../docs/export-demo.xml 
);
-   }
-
-   /**
-* Validates a xml file against the xsd.
-*
-* The validation is slow, because php has to read the xsd on each call.
-*
-* @param $fname string: name of file to validate
-*/
-   protected function validateXmlFileAgainstXsd( $fname ) {
+   public function testExportDemo() {
+   $fname = ../../docs/export-demo.xml;
$version = WikiExporter::schemaVersion();
-
$dom = new DomDocument();
$dom-load( $fname );
 
// Ensure, the demo is for the current version
-   $this-assertEquals( $dom-documentElement-getAttribute( 
'version' ), $version, 'export-demo.xml should have the current version' );
+   $this-assertEquals(
+   $dom-documentElement-getAttribute( 'version' ),
+   $version,
+   'export-demo.xml should have the current version'
+   );
 
-   try {
-   $this-assertTrue( $dom-schemaValidate( 
../../docs/export- . $version . .xsd ),
-   schemaValidate has found an error );
-   } catch ( Exception $e ) {
-   $this-fail( xml not valid against xsd:  . 
$e-getMessage() );
-   }
+   $this-assertTrue(
+   $dom-schemaValidate( ../../docs/export- . $version . 
.xsd ),
+   schemaValidate has found an error
+   );
}
+
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I28574b6c83cbd1128ad97b4868cc365336a7d4b8
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Addshore addshorew...@gmail.com
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 typo - change (mediawiki...PageBlock)

[Raimond Spekking (Code Review)]

Raimond Spekking has uploaded a new change for review.

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

Change subject: Fix typo
..

Fix typo

Follow up to I9241a852285c152283c2e61b7faf3a62e850cf28

Change-Id: Id95f139023a9ca29ac165b3d0c197e3d857b5dd4
---
M PageBlock.alias.php
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/PageBlock.alias.php b/PageBlock.alias.php
index 14ae57c..a11c6d4 100644
--- a/PageBlock.alias.php
+++ b/PageBlock.alias.php
@@ -10,5 +10,5 @@
 
 /** English (English) */
 $specialPageAliases['en'] = array(
-   'PageBlock' = array( 'Page Block' ),
+   'PageBlock' = array( 'PageBlock' ),
 );
\ No newline at end of file

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id95f139023a9ca29ac165b3d0c197e3d857b5dd4
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/PageBlock
Gerrit-Branch: master
Gerrit-Owner: Raimond Spekking raimond.spekk...@gmail.com

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

[MediaWiki-commits] [Gerrit] Deprecate window.$j - change (mediawiki/core)

[jenkins-bot (Code Review)]

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

Change subject: Deprecate window.$j
..


Deprecate window.$j

Bug: 62198
Change-Id: I871a0906730a1038311256e3e6e8ce3a293bd9ca
---
M RELEASE-NOTES-1.23
M resources/mediawiki/mediawiki.js
2 files changed, 2 insertions(+), 1 deletion(-)

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



diff --git a/RELEASE-NOTES-1.23 b/RELEASE-NOTES-1.23
index 63e1b28..bb807d9 100644
--- a/RELEASE-NOTES-1.23
+++ b/RELEASE-NOTES-1.23
@@ -271,6 +271,7 @@
 * On Special:PrefixIndex, a table#mw-prefixindex-list-table was changed to
   table.mw-prefixindex-list-table to avoid duplicate ids when the special page
   is transcluded.
+* (bug 62198) window.$j has been deprecated.
 
  Removed classes 
 * FakeMemCachedClient (deprecated in 1.18)
diff --git a/resources/mediawiki/mediawiki.js b/resources/mediawiki/mediawiki.js
index 9bb86af..26f84f5 100644
--- a/resources/mediawiki/mediawiki.js
+++ b/resources/mediawiki/mediawiki.js
@@ -2355,7 +2355,7 @@
 }( jQuery ) );
 
 // Alias $j to jQuery for backwards compatibility
-window.$j = jQuery;
+mw.log.deprecate( window, '$j', jQuery, 'Use $ or jQuery instead.' );
 
 // Attach to window and globally alias
 window.mw = window.mediaWiki = mw;

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I871a0906730a1038311256e3e6e8ce3a293bd9ca
Gerrit-PatchSet: 5
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: 01tonythomas 01tonytho...@gmail.com
Gerrit-Reviewer: Bartosz Dziewoński matma@gmail.com
Gerrit-Reviewer: Catrope roan.katt...@gmail.com
Gerrit-Reviewer: Helder.wiki helder.w...@gmail.com
Gerrit-Reviewer: Jack Phoenix j...@countervandalism.net
Gerrit-Reviewer: Krinkle krinklem...@gmail.com
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] Re-sync OOjs and OOjs UI update scripts - change (mediawiki/core)

[jenkins-bot (Code Review)]

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

Change subject: Re-sync OOjs and OOjs UI update scripts
..


Re-sync OOjs and OOjs UI update scripts

Import the changes in 674b2458a25 in the VisualEditor repository where these 
scripts
were first created (and are still run for non-MediaWiki users).

Commit message in that repo justifies.

Change-Id: I711f3c88cbc1916f3b782771095304b186f7405f
---
M resources/oojs-ui/update-oojs-ui.sh
M resources/oojs/update-oojs.sh
2 files changed, 14 insertions(+), 2 deletions(-)

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



diff --git a/resources/oojs-ui/update-oojs-ui.sh 
b/resources/oojs-ui/update-oojs-ui.sh
index 66536bb..0761edb 100755
--- a/resources/oojs-ui/update-oojs-ui.sh
+++ b/resources/oojs-ui/update-oojs-ui.sh
@@ -37,6 +37,11 @@
 # Undo any changes in the oojs-ui directory
 git reset resources/oojs-ui/
 git checkout resources/oojs-ui/
+
+git fetch origin
+# Create a branch of MW if needed, and reset it to master
+git checkout -B update-oojsui origin/master
+
 # Get the old oojs-ui version
 OLDVERSION=$(oojsuihash)
 if [ x$OLDVERSION == x ]
@@ -64,7 +69,8 @@
exit 0
 fi
 # Build the distribution
-grunt
+npm install || exit 1
+grunt || exit 1
 # Get the list of changes
 NEWCHANGES=$(git log $OLDVERSION.. --oneline --no-merges --reverse 
--color=never)
 NEWCHANGESDISPLAY=$(git log $OLDVERSION.. --oneline --no-merges --reverse 
--color=always)
diff --git a/resources/oojs/update-oojs.sh b/resources/oojs/update-oojs.sh
index 0bdea23..57c7625 100755
--- a/resources/oojs/update-oojs.sh
+++ b/resources/oojs/update-oojs.sh
@@ -37,6 +37,11 @@
 # Undo any changes in the oojs directory
 git reset resources/oojs/
 git checkout resources/oojs/
+
+git fetch origin
+# Create a branch of MW if needed, and reset it to master
+git checkout -B update-oojs origin/master
+
 # Get the old oojs version
 OLDVERSION=$(oojshash)
 if [ x$OLDVERSION == x ]
@@ -64,7 +69,8 @@
exit 0
 fi
 # Build the distribution
-grunt
+npm install || exit 1
+grunt || exit 1
 # Get the list of changes
 NEWCHANGES=$(git log $OLDVERSION.. --oneline --no-merges --reverse 
--color=never)
 NEWCHANGESDISPLAY=$(git log $OLDVERSION.. --oneline --no-merges --reverse 
--color=always)

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I711f3c88cbc1916f3b782771095304b186f7405f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Jforrester jforres...@wikimedia.org
Gerrit-Reviewer: Catrope roan.katt...@gmail.com
Gerrit-Reviewer: Jack Phoenix j...@countervandalism.net
Gerrit-Reviewer: Jforrester jforres...@wikimedia.org
Gerrit-Reviewer: Krinkle krinklem...@gmail.com
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 typo - change (mediawiki...PageBlock)

[Legoktm (Code Review)]

Legoktm has submitted this change and it was merged.

Change subject: Fix typo
..


Fix typo

Follow up to I9241a852285c152283c2e61b7faf3a62e850cf28

Change-Id: Id95f139023a9ca29ac165b3d0c197e3d857b5dd4
---
M PageBlock.alias.php
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/PageBlock.alias.php b/PageBlock.alias.php
index 14ae57c..a11c6d4 100644
--- a/PageBlock.alias.php
+++ b/PageBlock.alias.php
@@ -10,5 +10,5 @@
 
 /** English (English) */
 $specialPageAliases['en'] = array(
-   'PageBlock' = array( 'Page Block' ),
+   'PageBlock' = array( 'PageBlock' ),
 );
\ No newline at end of file

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Id95f139023a9ca29ac165b3d0c197e3d857b5dd4
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/PageBlock
Gerrit-Branch: master
Gerrit-Owner: Raimond Spekking raimond.spekk...@gmail.com
Gerrit-Reviewer: Legoktm legoktm.wikipe...@gmail.com

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

[MediaWiki-commits] [Gerrit] Add rmf due expectation of getting translators soon - change (translatewiki)

[Nikerabbit (Code Review)]

Nikerabbit has uploaded a new change for review.

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

Change subject: Add rmf due expectation of getting translators soon
..

Add rmf due expectation of getting translators soon

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


  git pull ssh://gerrit.wikimedia.org:29418/translatewiki 
refs/changes/60/116960/1

diff --git a/TranslatewikiSettings.php b/TranslatewikiSettings.php
index dc76972..969e028 100644
--- a/TranslatewikiSettings.php
+++ b/TranslatewikiSettings.php
@@ -306,6 +306,7 @@
 $wgExtraLanguageNames['ses'] = 'Koyraboro Senni'; # Koyraboro Senni Songhay / 
Siebrand 2013-10-07
 $wgExtraLanguageNames['sdh'] = 'کوردی خوارگ'; # Southern Kurdish / Siebrand 
2013-10-07
 $wgExtraLanguageNames['mww-latn'] = 'Hmoob Dawb'; # Hmong Daw / Siebrand 
2013-12-02
+$wgExtraLanguageNames['rmf'] = 'kaalengo tšimb'; # Romani language spoken in 
Finland / Nike 2014-03-05
 
 $wgExtraLanguageNames['nl-be'] = 'nl-be'; # Nikerabbit 2008-xx-xx - For 
FreeCol
 $wgExtraLanguageNames['qqq']   = 'Message documentation'; # No linguistic 
content. Used for documenting messages

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I0320c2b4fd0a23febef532c2d6476297dc89
Gerrit-PatchSet: 1
Gerrit-Project: translatewiki
Gerrit-Branch: master
Gerrit-Owner: Nikerabbit niklas.laxst...@gmail.com

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

[MediaWiki-commits] [Gerrit] Update es6-shim to 0.10.0. - change (mediawiki...parsoid)

[Cscott (Code Review)]

Cscott has uploaded a new change for review.

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

Change subject: Update es6-shim to 0.10.0.
..

Update es6-shim to 0.10.0.

Bug fixes and new ES6 methods and classes, including Promise.

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


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

diff --git a/package.json b/package.json
index baaf453..7f45e3a 100644
--- a/package.json
+++ b/package.json
@@ -14,7 +14,7 @@
express: ~2.5.11,
html5-entities: ~0.5.0,
html5: ~0.3.15,
-   es6-shim: ~0.9.1
+   es6-shim: ~0.10.0
},
devDependencies: {
colors: ~0.6.2,

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ifc1f17c1f47a0e9a606e6bbc40a67c7555c1fbb0
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/parsoid
Gerrit-Branch: master
Gerrit-Owner: Cscott canan...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] New image test cases. - change (mediawiki...parsoid)

[Cscott (Code Review)]

Cscott has uploaded a new change for review.

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

Change subject: New image test cases.
..

New image test cases.

Fork the php-only test cases and add proper parsoid output.

A few of the tests omit the html2wt mode because without data-parsoid
there is not enough information to get the image options ordered
correctly.

Change-Id: Ieddcd96e2debb824ef0de911d84d76204a454c8d
---
M tests/parserTests-blacklist.js
M tests/parserTests.txt
2 files changed, 84 insertions(+), 32 deletions(-)


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

diff --git a/tests/parserTests-blacklist.js b/tests/parserTests-blacklist.js
index 89389a0..c1b05f7 100644
--- a/tests/parserTests-blacklist.js
+++ b/tests/parserTests-blacklist.js
@@ -219,13 +219,6 @@
 add(wt2html, Image with link parameter, wgNoFollowLinks set to false, p 
data-parsoid='{\dsr\:[0,45,0,0]}'span class=\mw-default-size\ 
typeof=\mw:Image\ 
data-parsoid='{\optList\:[{\ck\:\link\,\ak\:\link=http://example.com/\}],\dsr\:[0,45,null,null]}'a
 href=\http://example.com/\; data-parsoid=\{}\img 
resource=\./File:Foobar.jpg\ src=\//example.com/images/3/3a/Foobar.jpg\ 
height=\220\ width=\1941\ 
data-parsoid='{\a\:{\resource\:\./File:Foobar.jpg\,\height\:\220\,\width\:\1941\},\sa\:{\resource\:\Image:foobar.jpg\}}'//a/span/p);
 add(wt2html, Image with link parameter, wgNoFollowDomainExceptions, p 
data-parsoid='{\dsr\:[0,45,0,0]}'span class=\mw-default-size\ 
typeof=\mw:Image\ 
data-parsoid='{\optList\:[{\ck\:\link\,\ak\:\link=http://example.com/\}],\dsr\:[0,45,null,null]}'a
 href=\http://example.com/\; data-parsoid=\{}\img 
resource=\./File:Foobar.jpg\ src=\//example.com/images/3/3a/Foobar.jpg\ 
height=\220\ width=\1941\ 
data-parsoid='{\a\:{\resource\:\./File:Foobar.jpg\,\height\:\220\,\width\:\1941\},\sa\:{\resource\:\Image:foobar.jpg\}}'//a/span/p);
 add(wt2html, Image with link parameter, wgExternalLinkTarget, unnamed 
parameter, p data-parsoid='{\dsr\:[0,51,0,0]}'span 
class=\mw-default-size\ typeof=\mw:Image\ data-mw='{\caption\:\Title\}' 
data-parsoid='{\optList\:[{\ck\:\link\,\ak\:\link=http://example.com/\},{\ck\:\caption\,\ak\:\Title\}],\dsr\:[0,51,null,null]}'a
 href=\http://example.com/\; data-parsoid=\{}\img 
resource=\./File:Foobar.jpg\ src=\//example.com/images/3/3a/Foobar.jpg\ 
height=\220\ width=\1941\ 
data-parsoid='{\a\:{\resource\:\./File:Foobar.jpg\,\height\:\220\,\width\:\1941\},\sa\:{\resource\:\Image:foobar.jpg\}}'//a/span/p);
-add(wt2html, Image with frame and link, figure class=\mw-default-size 
mw-halign-left\ typeof=\mw:Image/Frame\ 
data-parsoid='{\optList\:[{\ck\:\framed\,\ak\:\frame\},{\ck\:\left\,\ak\:\left\},{\ck\:\caption\,\ak\:\This
 is a test image [[Main Page]]\}],\dsr\:[0,66,2,2]}'a 
href=\./File:Foobar.jpg\ 
data-parsoid='{\a\:{\href\:\./File:Foobar.jpg\},\dsr\:[2,null,null,null]}'img
 resource=\./File:Foobar.jpg\ src=\//example.com/images/3/3a/Foobar.jpg\ 
height=\220\ width=\1941\ 
data-parsoid='{\a\:{\resource\:\./File:Foobar.jpg\,\height\:\220\,\width\:\1941\},\sa\:{\resource\:\Image:Foobar.jpg\}}'//afigcaption
 data-parsoid='{\dsr\:[null,64,null,null]}'This is a test image a 
rel=\mw:WikiLink\ href=\./Main_Page\ 
data-parsoid='{\stx\:\simple\,\a\:{\href\:\./Main_Page\},\sa\:{\href\:\Main
 Page\},\dsr\:[51,64,2,2]}'Main Page/a/figcaption/figure);
-add(wt2html, Image with frame and link and explicit alt, figure 
class=\mw-default-size mw-halign-left\ typeof=\mw:Image/Frame\ 
data-parsoid='{\optList\:[{\ck\:\framed\,\ak\:\frame\},{\ck\:\left\,\ak\:\left\},{\ck\:\caption\,\ak\:\This
 is a test image [[Main 
Page]]\},{\ck\:\alt\,\ak\:\alt=Altitude\}],\dsr\:[0,79,2,2]}'a 
href=\./File:Foobar.jpg\ 
data-parsoid='{\a\:{\href\:\./File:Foobar.jpg\},\dsr\:[2,null,null,null]}'img
 alt=\Altitude\ resource=\./File:Foobar.jpg\ 
src=\//example.com/images/3/3a/Foobar.jpg\ height=\220\ width=\1941\ 
data-parsoid='{\a\:{\alt\:\Altitude\,\resource\:\./File:Foobar.jpg\,\height\:\220\,\width\:\1941\},\sa\:{\alt\:\alt=Altitude\,\resource\:\Image:Foobar.jpg\}}'//afigcaption
 data-parsoid='{\dsr\:[null,77,null,null]}'This is a test image a 
rel=\mw:WikiLink\ href=\./Main_Page\ 
data-parsoid='{\stx\:\simple\,\a\:{\href\:\./Main_Page\},\sa\:{\href\:\Main
 Page\},\dsr\:[51,64,2,2]}'Main Page/a/figcaption/figure);
-add(wt2html, Image with wiki markup in implicit alt, p 
data-parsoid='{\dsr\:[0,46,0,0]}'span class=\mw-default-size\ 
typeof=\mw:Image\ data-mw=\{quot;captionquot;:quot;testing '''bold''' in 
altquot;}\ data-parsoid='{\optList\:[{\ck\:\caption\,\ak\:\testing 
#39;#39;#39;bold#39;#39;#39; in alt\}],\dsr\:[0,46,null,null]}'a 
href=\./File:Foobar.jpg\ 
data-parsoid='{\a\:{\href\:\./File:Foobar.jpg\}}'img 
resource=\./File:Foobar.jpg\ src=\//example.com/images/3/3a/Foobar.jpg\ 
height=\220\ width=\1941\ 

[MediaWiki-commits] [Gerrit] dhcpd: remove Sun-X4150 related configs - change (operations/puppet)

[Alexandros Kosiaris (Code Review)]

Alexandros Kosiaris has submitted this change and it was merged.

Change subject: dhcpd: remove Sun-X4150 related configs
..


dhcpd: remove Sun-X4150 related configs

Change-Id: Iced25b8fbc040236cf425b954560d8b96e4c3c1c
---
D files/dhcpd/README
D files/dhcpd/linux-host-entries.ttyS1-9600
M modules/install-server/files/dhcpd/dhcpd.conf
3 files changed, 1 insertion(+), 2 deletions(-)

Approvals:
  Alexandros Kosiaris: Verified; Looks good to me, approved



diff --git a/files/dhcpd/README b/files/dhcpd/README
deleted file mode 100644
index 13d2e8f..000
--- a/files/dhcpd/README
+++ /dev/null
@@ -1 +0,0 @@
-Daniel says 'any new server uses linux-host-entries.ttyS1-115200'
diff --git a/files/dhcpd/linux-host-entries.ttyS1-9600 
b/files/dhcpd/linux-host-entries.ttyS1-9600
deleted file mode 100644
index e69de29..000
--- a/files/dhcpd/linux-host-entries.ttyS1-9600
+++ /dev/null
diff --git a/modules/install-server/files/dhcpd/dhcpd.conf 
b/modules/install-server/files/dhcpd/dhcpd.conf
index 51549d1..fd164c9 100644
--- a/modules/install-server/files/dhcpd/dhcpd.conf
+++ b/modules/install-server/files/dhcpd/dhcpd.conf
@@ -342,7 +342,7 @@
include /etc/dhcp3/linux-host-entries.ttyS1-57600;
}
 
-   # Sun X4150s use ttyS1/com2 at 9600bps for eLOM console
+   # For future use, if we will have a ttyS1/com2 at 9600bps for eLOM 
console
group {
option pxelinux.configfile pxelinux.cfg/ttyS1-9600;
include /etc/dhcp3/linux-host-entries.ttyS1-9600;

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Iced25b8fbc040236cf425b954560d8b96e4c3c1c
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Matanya mata...@foss.co.il
Gerrit-Reviewer: Alexandros Kosiaris akosia...@wikimedia.org
Gerrit-Reviewer: Andrew Bogott abog...@wikimedia.org
Gerrit-Reviewer: ArielGlenn ar...@wikimedia.org
Gerrit-Reviewer: Dzahn dz...@wikimedia.org
Gerrit-Reviewer: Faidon Liambotis fai...@wikimedia.org
Gerrit-Reviewer: Ori.livneh o...@wikimedia.org
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] Support platform specific message in keyboard shortcuts dialog - change (VisualEditor/VisualEditor)

[Esanders (Code Review)]

Esanders has uploaded a new change for review.

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

Change subject: Support platform specific message in keyboard shortcuts dialog
..

Support platform specific message in keyboard shortcuts dialog

Provide platform specific codes and use command#getMessage
to format correctly.

Change-Id: Ic9896b63f738cfc5d81f236ae270b037a241d199
---
M modules/ve/ui/dialogs/ve.ui.CommandHelpDialog.js
M modules/ve/ui/ve.ui.Trigger.js
2 files changed, 45 insertions(+), 12 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/VisualEditor/VisualEditor 
refs/changes/64/116964/1

diff --git a/modules/ve/ui/dialogs/ve.ui.CommandHelpDialog.js 
b/modules/ve/ui/dialogs/ve.ui.CommandHelpDialog.js
index c2c1ab6..6d7faf5 100644
--- a/modules/ve/ui/dialogs/ve.ui.CommandHelpDialog.js
+++ b/modules/ve/ui/dialogs/ve.ui.CommandHelpDialog.js
@@ -45,23 +45,31 @@
// Parent method
ve.ui.Dialog.prototype.initialize.call( this );
 
-   var i, j, jLen, shortcut, commands, $list,
+   var i, j, jLen, trigger, commands, $list,
+   platform = ve.init.platform.getSystemPlatform(),
+   platformKey = platform === 'mac' ? 'mac' : 'pc',
commandGroups = this.constructor.static.getCommandGroups(),
contentLayout = new OO.ui.PanelLayout( {
'$': this.$,
'scrollable': true,
'padded': true
} ),
-   $container = this.$( 'div' ).addClass( 
've-ui-commandHelpDialog-container' ),
-   triggers = this.surface.getTriggers();
+   $container = this.$( 'div' ).addClass( 
've-ui-commandHelpDialog-container' );
 
for ( i in commandGroups ) {
commands = commandGroups[i].commands;
$list = this.$( 'dl' ).addClass( 
've-ui-commandHelpDialog-list' );
for ( j = 0, jLen = commands.length; j  jLen; j++ ) {
-   shortcut = commands[j].shortcut ? commands[j].shortcut 
: triggers[commands[j].name].getMessage();
+   if ( commands[j].name ) {
+   trigger = ve.ui.triggerRegistry.lookup( 
commands[j].name );
+   } else {
+   trigger = new ve.ui.Trigger(
+   ve.isPlainObject( commands[j].shortcut 
) ? commands[j].shortcut[platformKey] : commands[j].shortcut,
+   true
+   );
+   }
$list.append(
-   this.$( 'dt' ).text( shortcut.replace( /\+/g, 
' + ' ) ),
+   this.$( 'dt' ).text( 
trigger.getMessage().replace( /\+/g, ' + ' ) ),
this.$( 'dd' ).text( ve.msg( commands[j].msg 
) )
);
}
@@ -105,7 +113,13 @@
'title': 'visualeditor-shortcuts-formatting',
'commands': [
{ 'name': 'paragraph', 'msg': 
'visualeditor-formatdropdown-format-paragraph' },
-   { 'shortcut': 'CTRL+(1-6)', 'msg': 
'visualeditor-formatdropdown-format-heading-label' },
+   {
+   'shortcut': {
+   'mac': 'cmd+(1-6)',
+   'pc': 'ctrl+(1-6)'
+   },
+   'msg': 
'visualeditor-formatdropdown-format-heading-label'
+   },
{ 'name': 'preformatted', 'msg': 
'visualeditor-formatdropdown-format-preformatted' },
{ 'name': 'indent', 'msg': 
'visualeditor-indentationbutton-indent-tooltip' },
{ 'name': 'outdent', 'msg': 
'visualeditor-indentationbutton-outdent-tooltip' }
@@ -121,9 +135,27 @@
'clipboard': {
'title': 'visualeditor-shortcuts-clipboard',
'commands': [
-   { 'shortcut': 'CTRL+X', 'msg': 
'visualeditor-clipboard-cut' },
-   { 'shortcut': 'CTRL+C', 'msg': 
'visualeditor-clipboard-copy' },
-   { 'shortcut': 'CTRL+V', 'msg': 
'visualeditor-clipboard-paste' },
+   {
+   'shortcut': {
+   'mac': 'cmd+x',
+   'pc': 'ctrl+x'
+   },
+   'msg': 'visualeditor-clipboard-cut'
+   },
+   {
+   

[MediaWiki-commits] [Gerrit] Support multiple shortcuts per trigger - change (VisualEditor/VisualEditor)

[Esanders (Code Review)]

Esanders has uploaded a new change for review.

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

Change subject: Support multiple shortcuts per trigger
..

Support multiple shortcuts per trigger

Change-Id: I59a10957f5aba05eb45fe00f6d4c9c5854a0a7b8
---
M modules/ve/ui/dialogs/ve.ui.CommandHelpDialog.js
M modules/ve/ui/styles/ve.ui.Dialog.css
M modules/ve/ui/ve.ui.Surface.js
M modules/ve/ui/ve.ui.Toolbar.js
M modules/ve/ui/ve.ui.TriggerRegistry.js
5 files changed, 111 insertions(+), 72 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/VisualEditor/VisualEditor 
refs/changes/65/116965/1

diff --git a/modules/ve/ui/dialogs/ve.ui.CommandHelpDialog.js 
b/modules/ve/ui/dialogs/ve.ui.CommandHelpDialog.js
index 6d7faf5..3acd475 100644
--- a/modules/ve/ui/dialogs/ve.ui.CommandHelpDialog.js
+++ b/modules/ve/ui/dialogs/ve.ui.CommandHelpDialog.js
@@ -45,9 +45,10 @@
// Parent method
ve.ui.Dialog.prototype.initialize.call( this );
 
-   var i, j, jLen, trigger, commands, $list,
+   var i, j, jLen, k, kLen, triggerList, commands, shortcut,
platform = ve.init.platform.getSystemPlatform(),
platformKey = platform === 'mac' ? 'mac' : 'pc',
+   $list, $shortcut,
commandGroups = this.constructor.static.getCommandGroups(),
contentLayout = new OO.ui.PanelLayout( {
'$': this.$,
@@ -60,16 +61,28 @@
commands = commandGroups[i].commands;
$list = this.$( 'dl' ).addClass( 
've-ui-commandHelpDialog-list' );
for ( j = 0, jLen = commands.length; j  jLen; j++ ) {
-   if ( commands[j].name ) {
-   trigger = ve.ui.triggerRegistry.lookup( 
commands[j].name );
+   if ( commands[j].trigger ) {
+   triggerList = ve.ui.triggerRegistry.lookup( 
commands[j].trigger );
} else {
-   trigger = new ve.ui.Trigger(
-   ve.isPlainObject( commands[j].shortcut 
) ? commands[j].shortcut[platformKey] : commands[j].shortcut,
-   true
-   );
+   triggerList = [];
+   for ( k = 0, kLen = 
commands[j].shortcuts.length; k  kLen; k++ ) {
+   shortcut = commands[j].shortcuts[k];
+   triggerList.push(
+   new ve.ui.Trigger(
+   ve.isPlainObject( 
shortcut ) ? shortcut[platformKey] : shortcut,
+   true
+   )
+   );
+   }
+   }
+   $shortcut = this.$( 'dt' );
+   for ( k = 0, kLen = triggerList.length; k  kLen; k++ ) 
{
+   $shortcut.append( this.$( 'div' ).text(
+   triggerList[k].getMessage().replace( 
/\+/g, ' + ' )
+   ) );
}
$list.append(
-   this.$( 'dt' ).text( 
trigger.getMessage().replace( /\+/g, ' + ' ) ),
+   $shortcut,
this.$( 'dd' ).text( ve.msg( commands[j].msg 
) )
);
}
@@ -100,69 +113,69 @@
'textStyle': {
'title': 'visualeditor-shortcuts-text-style',
'commands': [
-   { 'name': 'bold', 'msg': 
'visualeditor-annotationbutton-bold-tooltip' },
-   { 'name': 'italic', 'msg': 
'visualeditor-annotationbutton-italic-tooltip' },
-   { 'name': 'link', 'msg': 
'visualeditor-annotationbutton-link-tooltip' },
-   { 'name': 'subscript', 'msg': 
'visualeditor-annotationbutton-subscript-tooltip' },
-   { 'name': 'superscript', 'msg': 
'visualeditor-annotationbutton-superscript-tooltip' },
-   { 'name': 'underline', 'msg': 
'visualeditor-annotationbutton-underline-tooltip' },
-   { 'name': 'clear', 'msg': 
'visualeditor-clearbutton-tooltip' }
+   { 'trigger': 'bold', 'msg': 
'visualeditor-annotationbutton-bold-tooltip' },
+   { 'trigger': 'italic', 'msg': 
'visualeditor-annotationbutton-italic-tooltip' },
+   { 'trigger': 'link', 'msg': 
'visualeditor-annotationbutton-link-tooltip' },
+   { 'trigger': 'subscript', 'msg': 

[MediaWiki-commits] [Gerrit] Add cmd/ctrl+m as alternative shortcut for clear formatting - change (VisualEditor/VisualEditor)

[Esanders (Code Review)]

Esanders has uploaded a new change for review.

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

Change subject: Add cmd/ctrl+m as alternative shortcut for clear formatting
..

Add cmd/ctrl+m as alternative shortcut for clear formatting

Ctrl+M is used by LibreOffice.

Bug: 56453
Change-Id: I529dead75aa4015641cef667fe51eef2452c94ab
---
M modules/ve/ui/ve.ui.TriggerRegistry.js
1 file changed, 10 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/VisualEditor/VisualEditor 
refs/changes/67/116967/1

diff --git a/modules/ve/ui/ve.ui.TriggerRegistry.js 
b/modules/ve/ui/ve.ui.TriggerRegistry.js
index fc8ef43..a86ad79 100644
--- a/modules/ve/ui/ve.ui.TriggerRegistry.js
+++ b/modules/ve/ui/ve.ui.TriggerRegistry.js
@@ -91,7 +91,16 @@
'link', { 'mac': new ve.ui.Trigger( 'cmd+k' ), 'pc': new ve.ui.Trigger( 
'ctrl+k' ) }
 );
 ve.ui.triggerRegistry.register(
-   'clear', { 'mac': new ve.ui.Trigger( 'cmd+\\' ), 'pc': new 
ve.ui.Trigger( 'ctrl+\\' ) }
+   'clear', {
+   'mac': [
+   new ve.ui.Trigger( 'cmd+\\' ),
+   new ve.ui.Trigger( 'cmd+m' )
+   ],
+   'pc': [
+   new ve.ui.Trigger( 'ctrl+\\' ),
+   new ve.ui.Trigger( 'ctrl+m' )
+   ]
+   }
 );
 ve.ui.triggerRegistry.register(
'underline', { 'mac': new ve.ui.Trigger( 'cmd+u' ), 'pc': new 
ve.ui.Trigger( 'ctrl+u' ) }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I529dead75aa4015641cef667fe51eef2452c94ab
Gerrit-PatchSet: 1
Gerrit-Project: VisualEditor/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders esand...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] Update MWCommandHelpDialog now core supports multiple shortcuts - change (mediawiki...VisualEditor)

[Esanders (Code Review)]

Esanders has uploaded a new change for review.

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

Change subject: Update MWCommandHelpDialog now core supports multiple shortcuts
..

Update MWCommandHelpDialog now core supports multiple shortcuts

Depends on I59a10957f5a in core.

Change-Id: I37b44df84bd2551fc0983743b7b32c6c69521607
---
M lib/ve
M modules/ve-mw/ui/dialogs/ve.ui.MWCommandHelpDialog.js
2 files changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/lib/ve b/lib/ve
index f93e960..b975f45 16
--- a/lib/ve
+++ b/lib/ve
-Subproject commit f93e960e3572f38225cc085e9010bc2ce32149d0
+Subproject commit b975f45c7e7847a57005e6229ab066d0a0f6311d
diff --git a/modules/ve-mw/ui/dialogs/ve.ui.MWCommandHelpDialog.js 
b/modules/ve-mw/ui/dialogs/ve.ui.MWCommandHelpDialog.js
index 465f7e2..8cb349d 100644
--- a/modules/ve-mw/ui/dialogs/ve.ui.MWCommandHelpDialog.js
+++ b/modules/ve-mw/ui/dialogs/ve.ui.MWCommandHelpDialog.js
@@ -37,7 +37,7 @@
if ( save !== '-'  save !== '' ) {
commandGroups.other.commands.push(
{
-   'shortcut': accessKeyPrefix + 
save.toUpperCase(),
+   'shortcuts': [ accessKeyPrefix + 
save.toUpperCase() ],
'msg': 'visualeditor-savedialog-label-save'
}
);

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I37b44df84bd2551fc0983743b7b32c6c69521607
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders esand...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] Add cmd/ctrl+y as alternative shortcut for redo - change (VisualEditor/VisualEditor)

[Esanders (Code Review)]

Esanders has uploaded a new change for review.

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

Change subject: Add cmd/ctrl+y as alternative shortcut for redo
..

Add cmd/ctrl+y as alternative shortcut for redo

Bug: 52140

Change-Id: Id8d02be30e160f2a1c2cc3c72ed4d339b3945d32
---
M modules/ve/ui/ve.ui.TriggerRegistry.js
1 file changed, 10 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/VisualEditor/VisualEditor 
refs/changes/66/116966/1

diff --git a/modules/ve/ui/ve.ui.TriggerRegistry.js 
b/modules/ve/ui/ve.ui.TriggerRegistry.js
index 0a06957..fc8ef43 100644
--- a/modules/ve/ui/ve.ui.TriggerRegistry.js
+++ b/modules/ve/ui/ve.ui.TriggerRegistry.js
@@ -70,7 +70,16 @@
'undo', { 'mac': new ve.ui.Trigger( 'cmd+z' ), 'pc': new ve.ui.Trigger( 
'ctrl+z' ) }
 );
 ve.ui.triggerRegistry.register(
-   'redo', { 'mac': new ve.ui.Trigger( 'cmd+shift+z' ), 'pc': new 
ve.ui.Trigger( 'ctrl+shift+z' ) }
+   'redo', {
+   'mac': [
+   new ve.ui.Trigger( 'cmd+shift+z' ),
+   new ve.ui.Trigger( 'cmd+y' )
+   ],
+   'pc': [
+   new ve.ui.Trigger( 'ctrl+shift+z' ),
+   new ve.ui.Trigger( 'ctrl+y' )
+   ]
+   }
 );
 ve.ui.triggerRegistry.register(
'bold', { 'mac': new ve.ui.Trigger( 'cmd+b' ), 'pc': new ve.ui.Trigger( 
'ctrl+b' ) }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id8d02be30e160f2a1c2cc3c72ed4d339b3945d32
Gerrit-PatchSet: 1
Gerrit-Project: VisualEditor/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders esand...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] Icon tweaks - change (mediawiki...GuidedTour)

[Phuedx (Code Review)]

Phuedx has uploaded a new change for review.

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

Change subject: Icon tweaks
..

Icon tweaks

Use an SVG icon with a PNG fallback for the close button.

Change-Id: Id79c40046f7596f035f4263caf6ecbf4abb40263
---
M modules/ext.guidedTour.less
A modules/ext.guidedTour.x.png
A modules/ext.guidedTour.x.svg
3 files changed, 11 insertions(+), 0 deletions(-)


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

diff --git a/modules/ext.guidedTour.less b/modules/ext.guidedTour.less
index 4ba3c31..4028c77 100644
--- a/modules/ext.guidedTour.less
+++ b/modules/ext.guidedTour.less
@@ -37,6 +37,10 @@
 
 .guider_close {
padding: 0;
+
+   .x_button {
+   .background-image-svg('ext.guidedTour.x.svg', 
'ext.guidedTour.x.png');
+   }
 }
 
 .guider_arrow {
diff --git a/modules/ext.guidedTour.x.png b/modules/ext.guidedTour.x.png
new file mode 100644
index 000..8849daa
--- /dev/null
+++ b/modules/ext.guidedTour.x.png
Binary files differ
diff --git a/modules/ext.guidedTour.x.svg b/modules/ext.guidedTour.x.svg
new file mode 100644
index 000..938fd51
--- /dev/null
+++ b/modules/ext.guidedTour.x.svg
@@ -0,0 +1,7 @@
+?xml version=1.0 encoding=utf-8?
+!-- Generator: Adobe Illustrator 17.1.0, SVG Export Plug-In . SVG Version: 
6.00 Build 0)  --
+!DOCTYPE svg PUBLIC -//W3C//DTD SVG 1.1//EN 
http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd;
+svg version=1.1 id=Layer_1 xmlns=http://www.w3.org/2000/svg; 
xmlns:xlink=http://www.w3.org/1999/xlink; x=0px y=0px
+viewBox=0 0 96 96 enable-background=new 0 0 96 96 
xml:space=preserve
+polygon fill=#AB points=96,14 82,0 48,34 14,0 0,14 34,48 0,82 14,96 
48,62 82,96 96,82 62,48 /
+/svg

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id79c40046f7596f035f4263caf6ecbf4abb40263
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/GuidedTour
Gerrit-Branch: master
Gerrit-Owner: Phuedx g...@samsmith.io

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

[MediaWiki-commits] [Gerrit] Icon tweaks - change (mediawiki...GettingStarted)

[Phuedx (Code Review)]

Phuedx has uploaded a new change for review.

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

Change subject: Icon tweaks
..

Icon tweaks

Use an SVG icon with a PNG fallback for the following buttons:

* Close
* The Edit this page primary CTA
* The Find pages that need easy fixes primary and secondary CTAs

Change-Id: I02fab6603fc7802833b4fe32f6a66765b4718172
---
M resources/ext.gettingstarted.return.js
M resources/ext.gettingstarted.return.less
A resources/images/light_bulb_darkgray.png
A resources/images/light_bulb_darkgray.svg
A resources/images/light_bulb_white.png
A resources/images/light_bulb_white.svg
D resources/images/lightbulb.png
D resources/images/lightbulb_dark.png
D resources/images/pencil.png
D resources/images/pencil_dark.png
A resources/images/pencil_white.png
A resources/images/pencil_white.svg
D resources/images/source/lightbulb.svg
D resources/images/source/lightbulb_dark.svg
D resources/images/source/pencil.svg
D resources/images/source/pencil_dark.svg
A resources/images/x.png
A resources/images/x.svg
18 files changed, 74 insertions(+), 63 deletions(-)


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

diff --git a/resources/ext.gettingstarted.return.js 
b/resources/ext.gettingstarted.return.js
index 6392e30..5550b81 100644
--- a/resources/ext.gettingstarted.return.js
+++ b/resources/ext.gettingstarted.return.js
@@ -117,10 +117,11 @@
} );
 
 
-   $icon = $( 'img' ).attr( {
-   src: imagePath + spec.icon,
-   'class': 'mw-gettingstarted-cta-button-icon'
+   $icon = $( 'div' ).attr( {
+   'aria-role': 'img'
} );
+   $icon.addClass( 'mw-gettingstarted-cta-button-icon' );
+   $icon.addClass( 'mw-gettingstarted-cta-button-icon-' + 
spec.action );
 
$mainText = $( 'span' )
.attr( 'class', 'mw-gettingstarted-cta-button-main' )
@@ -225,27 +226,27 @@
// The possible CTA dialogs have similar but different 
buttons.
editCurrentPrimaryButton = {
id: 'mw-gettingstarted-editable-main-edit-page',
-   icon: 'pencil.png',
isPrimary: true,
mainText: mw.message( 
'gettingstarted-cta-edit-page' ).text(),
subText: mw.message( 
'gettingstarted-cta-edit-page-sub' ).text(),
-   click: doEditThisPage
+   click: doEditThisPage,
+   action: 'edit'
};
 
suggestionSecondaryButton = {
id: 'mw-gettingstarted-editable-main-fix-pages',
-   icon: 'lightbulb_dark.png',
mainText: mw.message( 
'gettingstarted-cta-fix-pages' ).text(),
-   click: doFixPages
+   click: doFixPages,
+   action: 'copyedit'
};
 
suggestionPrimaryButton = {
id: 'mw-gettingstarted-other-fix-pages',
-   icon: 'lightbulb.png',
isPrimary: true,
mainText: mw.msg( 
'gettingstarted-cta-fix-pages' ),
subText: mw.message( 
'gettingstarted-cta-fix-pages-sub' ).text(),
-   click: doFixPages
+   click: doFixPages,
+   action: 'copyedit'
};
 
if ( pageKind === 'editablemain' ) {
@@ -352,7 +353,6 @@
title: closeText,
'aria-label': closeText
} )
-   .text( '×' )
.click( closeDialogByClick );
 
$heading = $( 'div' )
diff --git a/resources/ext.gettingstarted.return.less 
b/resources/ext.gettingstarted.return.less
index 97df0e8..7e9524e 100644
--- a/resources/ext.gettingstarted.return.less
+++ b/resources/ext.gettingstarted.return.less
@@ -1,3 +1,5 @@
+@import 'mediawiki.mixins'
+
 /* Specific elements */
 #mw-gettingstarted-cta-editable-main-page {
width: 510px;
@@ -115,7 +117,9 @@
 
 .mw-gettingstarted-cta-close {
float: right;
-   color: #aaa;
+   width: 13px;
+   height: 13px;
+   .background-image-svg('images/x.svg', 'images/x.png');
 }
 
 .mw-gettingstarted-cta-heading {
@@ -134,10 +138,29 @@
font-size: 0.8em;
 }
 
+/* Button icons */
 .mw-gettingstarted-cta-button-icon {
float: left;

[MediaWiki-commits] [Gerrit] Changing replica_lag_max_messages and replica_lag_time_max_ms - change (operations/puppet)

[Ottomata (Code Review)]

Ottomata has submitted this change and it was merged.

Change subject: Changing replica_lag_max_messages and replica_lag_time_max_ms
..


Changing replica_lag_max_messages and replica_lag_time_max_ms

This should reduce ISRShrinks/ISRExpands even further.

Change-Id: I577d5118e5da37b977c75f998081efccfa1e466a
---
M manifests/role/analytics/kafka.pp
1 file changed, 11 insertions(+), 1 deletion(-)

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



diff --git a/manifests/role/analytics/kafka.pp 
b/manifests/role/analytics/kafka.pp
index 98c1060..d894eec 100644
--- a/manifests/role/analytics/kafka.pp
+++ b/manifests/role/analytics/kafka.pp
@@ -118,7 +118,17 @@
 # Setting this larger so that it is sure to be bigger
 # than batch size from varnishkafka.
 # See: https://issues.apache.org/jira/browse/KAFKA-766
-replica_lag_max_messages= 1,
+# webrequest_bits is about 50k msgs/sec, and has 10 partitions.
+# That's 5000 msgs/second/partition, so this should allow
+# a partition to get behind by up to 10 seconds before
+# removing it from the ISR.  This will be longer for
+# less voluminous topics.
+replica_lag_max_messages= 5,
+# Setting this to a value according to 
https://cwiki.apache.org/confluence/display/KAFKA/FAQ#FAQ-HowtoreducechurnsinISR?WhendoesabrokerleavetheISR?
+# 1 / MinFetcHRate * 1000.  I assume this result to be in seconds, 
since the default for max_ms is 1.
+# MinFetchRate ~= 45. 1/45*1000 ~= 22.  Setting this to 30 seconds to 
overcompensate.
+# See also: 
http://ganglia.wikimedia.org/latest/graph_all_periods.php?title=vl=x=n=hreg%5B%5D=analytics102%5B12%5D.*mreg%5B%5D=kafka.server.ReplicaFetcherManager.Replica-MinFetchRate.Valuegtype=lineglegend=showaggregate=1
+replica_lag_time_max_ms = 3,
 }
 
 # Generate icinga alert if Kafka Server is not running.

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I577d5118e5da37b977c75f998081efccfa1e466a
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ottomata o...@wikimedia.org
Gerrit-Reviewer: Ottomata o...@wikimedia.org
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: Correct mode for LaTeXML-SVG - change (mediawiki...Math)

[Physikerwelt (Code Review)]

Physikerwelt has uploaded a new change for review.

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

Change subject: Fix: Correct mode for LaTeXML-SVG
..

Fix: Correct mode for LaTeXML-SVG

In the HTML-output the MathJax SVG output was displayed
and not the LaTeXML svg if the page was viewed in LaTeXML mode.

Change-Id: I39ab18e624daf28093931fe6db6c045e7201dd34
---
M Math.hooks.php
M MathLaTeXML.php
2 files changed, 3 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Math 
refs/changes/71/116971/1

diff --git a/Math.hooks.php b/Math.hooks.php
index e074994..22c6407 100644
--- a/Math.hooks.php
+++ b/Math.hooks.php
@@ -103,10 +103,10 @@
}
}
if ( $renderer-render() ) {
-   wfDebugLog( Math , Rendering successfull. Writing 
output );
+   wfDebugLog( Math , Rendering successful. Writing 
output );
$renderedMath = $renderer-getHtmlOutput();
} else {
-   wfDebugLog( Math , Rendering failed. Prining error 
message. );
+   wfDebugLog( Math , Rendering failed. Printing error 
message. );
return $renderer-getLastError();
}
wfRunHooks( 'MathFormulaRendered',
diff --git a/MathLaTeXML.php b/MathLaTeXML.php
index 08a7b53..9076b0b 100644
--- a/MathLaTeXML.php
+++ b/MathLaTeXML.php
@@ -20,6 +20,7 @@
global $wgMathLaTeXMLUrl;
parent::__construct( $tex, $params );
$this-hosts = $wgMathLaTeXMLUrl;
+   $this-setMode( MW_MATH_LATEXML );
}
/**
 * Converts an array with LaTeXML settings to a URL encoded String.

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I39ab18e624daf28093931fe6db6c045e7201dd34
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Math
Gerrit-Branch: dev
Gerrit-Owner: Physikerwelt w...@physikerwelt.de

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

[MediaWiki-commits] [Gerrit] Use setMwGlobals in ApiEditPageTest - change (mediawiki/core)

[Addshore (Code Review)]

Addshore has uploaded a new change for review.

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

Change subject: Use setMwGlobals in ApiEditPageTest
..

Use setMwGlobals in ApiEditPageTest

Change-Id: If2b23d82816c87e454bfc2348e316bdb92d2809f
---
M tests/phpunit/includes/api/ApiEditPageTest.php
1 file changed, 16 insertions(+), 13 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/56/116956/2

diff --git a/tests/phpunit/includes/api/ApiEditPageTest.php 
b/tests/phpunit/includes/api/ApiEditPageTest.php
index 0a6607e..785ed68 100644
--- a/tests/phpunit/includes/api/ApiEditPageTest.php
+++ b/tests/phpunit/includes/api/ApiEditPageTest.php
@@ -18,6 +18,13 @@
 
parent::setUp();
 
+   $this-setMwGlobals( array(
+   'wgExtraNamespaces' = $wgExtraNamespaces,
+   'wgNamespaceContentModels' = $wgNamespaceContentModels,
+   'wgContentHandlers' = $wgContentHandlers,
+   'wgContLang' = $wgContLang,
+   ) );
+
$wgExtraNamespaces[12312] = 'Dummy';
$wgExtraNamespaces[12313] = 'Dummy_talk';
 
@@ -31,17 +38,7 @@
}
 
protected function tearDown() {
-   global $wgExtraNamespaces, $wgNamespaceContentModels, 
$wgContentHandlers, $wgContLang;
-
-   unset( $wgExtraNamespaces[12312] );
-   unset( $wgExtraNamespaces[12313] );
-
-   unset( $wgNamespaceContentModels[12312] );
-   unset( $wgContentHandlers[testing] );
-
MWNamespace::getCanonicalNamespaces( true ); # reset namespace 
cache
-   $wgContLang-resetNamespaces(); # reset namespace cache
-
parent::tearDown();
}
 
@@ -215,7 +212,9 @@
'text' = ==section 1==\nnew content 1,
) );
$this-assertEquals( 'Success', $re['edit']['result'] );
-   $newtext = WikiPage::factory( Title::newFromText( $name ) 
)-getContent( Revision::RAW )-getNativeData();
+   $newtext = WikiPage::factory( Title::newFromText( $name ) )
+   -getContent( Revision::RAW )
+   -getNativeData();
$this-assertEquals( $newtext, ==section 1==\nnew content 
1\n\n==section 2==\ncontent2 );
 
// Test that we raise a 'nosuchsection' error
@@ -253,7 +252,9 @@
 
$this-assertEquals( 'Success', $re['edit']['result'] );
// Check the page text is correct
-   $text = WikiPage::factory( Title::newFromText( $name ) 
)-getContent( Revision::RAW )-getNativeData();
+   $text = WikiPage::factory( Title::newFromText( $name ) )
+   -getContent( Revision::RAW )
+   -getNativeData();
$this-assertEquals( $text, == header ==\n\ntest );
 
// Now on one that does
@@ -267,7 +268,9 @@
));
 
$this-assertEquals( 'Success', $re2['edit']['result'] );
-   $text = WikiPage::factory( Title::newFromText( $name ) 
)-getContent( Revision::RAW )-getNativeData();
+   $text = WikiPage::factory( Title::newFromText( $name ) )
+   -getContent( Revision::RAW )
+   -getNativeData();
$this-assertEquals( $text, == header ==\n\ntest\n\n== header 
==\n\ntest );
}
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: If2b23d82816c87e454bfc2348e316bdb92d2809f
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Addshore addshorew...@gmail.com
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] Moved Jenkins documentation to jenkins-job-builder-config[1]... - change (mediawiki/selenium)

[Zfilipin (Code Review)]

Zfilipin has uploaded a new change for review.

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

Change subject: Moved Jenkins documentation to jenkins-job-builder-config[1] 
repository
..

Moved Jenkins documentation to jenkins-job-builder-config[1] repository

Change-Id: Ib25f3334b85a3519d0db641b551af8cc524de91f
1: https://github.com/zeljkofilipin/jenkins-job-builder-config
---
D jenkins/jenkins.md
D jenkins/mail.template
D jenkins/view.md
3 files changed, 0 insertions(+), 132 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/selenium 
refs/changes/72/116972/1

diff --git a/jenkins/jenkins.md b/jenkins/jenkins.md
deleted file mode 100644
index e92b180..000
--- a/jenkins/jenkins.md
+++ /dev/null
@@ -1,32 +0,0 @@
-# Jenkins
-
-## Plugins
-
-- Jenkins  Manage Jenkins  Manage Plugins  Available  ChuckNorris Plugin, 
Green Balls, Jenkins Email Extension Plugin, Jenkins instant-messaging plugin, 
Jenkins IRC Plugin, Jenkins Job Configuration History Plugin
-
-## IRC Notification
-
-- Jenkins  Manage Jenkins  Configure System
-- Enable IRC Notification  check
-- Hostname: irc.freenode.net
-- Port: 6667
-- Channels
-  - Name: #wikimedia-qa
-  - Notification only: check
-- Advanced...
-  - Nickname: wmf-selenium-bot
-  - Login: wmf-selenium-bot
-  - nickname and login have to be the same
-
-## Environment variables
-
-- Jenkins  Manage Jenkins  Configure System  Global properties  
Environment variables  List of key-value pairs
-  - name
-- MEDIAWIKI_PASSWORD_BTTESTING_WMFLABS_ORG
-- MEDIAWIKI_PASSWORD_SELENIUM_SANDBOX_TRANSLATEWIKI_NET
-- MEDIAWIKI_PASSWORD_SELENIUM_TRANSLATE_SANDBOX_TRANSLATEWIKI_NET
-- MEDIAWIKI_PASSWORD_SELENIUM_USER_WIKIPEDIA_ORG
-- MEDIAWIKI_PASSWORD_SELENIUM_USER_WMFLABS_ORG
-- MEDIAWIKI_PASSWORD_ULS_WMFLABS_ORG
-- SAUCE_ONDEMAND_ACCESS_KEY
-- SAUCE_ONDEMAND_USERNAME
diff --git a/jenkins/mail.template b/jenkins/mail.template
deleted file mode 100644
index 0bf10d9..000
--- a/jenkins/mail.template
+++ /dev/null
@@ -1,89 +0,0 @@
-STYLE
-   BODY, TABLE, TD, TH, P {
-   font-family: Verdana, Helvetica, sans serif;
-   font-size: 11px;
-   color: black;
-   }
-   h1 {
-   color: black;
-   }
-   h2 {
-   color: black;
-   }
-   h3 {
-   color: black;
-   }
-   TD.bg1 {
-   font-size: 120%
-   }
-   TD.bg2 {
-   font-size: 110%
-   }
-   TD.bg3 {
-   }
-   TD.test_passed {
-   color: blue;
-   }
-   TD.test_failed {
-   color: red;
-   }
-   TD.console {
-   font-family: Courier New;
-   }
-/STYLE
-BODY
-   TABLE
-   TR
-   TD align=leftB style=font-size: 250%; span 
style=color:%= build.result.toString() == 'SUCCESS' ? 'blue' : 
build.result.toString() == 'FAILURE' ? 'red' : 'yellow' 
%${build.result}:/span ${project.name} Build #A 
href=${rooturl}${build.url}${build.number}/A 
(${it.timestampString})/B/TD
-   /TR
-   /TABLE
-   BR/
-
-   !-- JUnit TEMPLATE --
-
-   % def junitResultList = it.JUnitTestResult
-   if (junitResultList.size()  0) { %
-   TDH1A href=${rooturl}${build.url}testReport/BTest 
Result/B/A/H1
-   DIV
-   DIV
-   ${build.testResultAction.getFailCount()} failed, 
${build.testResultAction.getSkipCount()} skipped
-   /DIV
-   div style=width:100%; height:1em; background-color: #729FCF
-   div style=width:${ 
build.testResultAction.getFailCount() / build.testResultAction.getTotalCount() 
* 100 }%; height: 1em; background-color: #EF2929; float: left/divdiv 
style=width:${ build.testResultAction.getSkipCount() / 
build.testResultAction.getTotalCount() * 100 }%; height: 1em; background-color: 
#FCE94F; float: left/div
-   /div
-   h2Failed Tests/h2
-   Table border=1 style=border-collapse: collapse; 
border-spacing: 2px; border-color: gray; white-space: nowrap; width: 100%;
-   tr
-   TdbTest Name/B/tdtd 
style=width:5mBDuration/B/tdTd style=width:5embAge/b/td
-   /tr
-   % it.JUnitTestResult.each { junitResult -
-   junitResult.getChildren().each { packageResult - %
-
-   % packageResult.getFailedTests().each{ failed_test - 
%
-   tr
-   TdA 
href=${rooturl}${build.url}testReport${failed_test.getUrl()}${failed_test.getFullName()}/A/tdtd${failed_test.getDurationString()}/tdTdA
 href=${rooturl}${project.url}${build.number - 
failed_test.getAge()}/${failed_test.getAge()}/A/td
-   /tr
-   % } %
-
-   %  }
-   } %
-  

[MediaWiki-commits] [Gerrit] ganglia: remove lookupvar and replace with top scope @ var - change (operations/puppet)

[Matanya (Code Review)]

Matanya has uploaded a new change for review.

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

Change subject: ganglia: remove lookupvar and replace with top scope @ var
..

ganglia: remove lookupvar and replace with top scope @ var

Change-Id: I1bc00c479c8611bc090198be326460f9b1a1f0fa
---
M templates/ganglia/gmetad.conf.erb
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/73/116973/1

diff --git a/templates/ganglia/gmetad.conf.erb 
b/templates/ganglia/gmetad.conf.erb
index 142105e..afec249 100644
--- a/templates/ganglia/gmetad.conf.erb
+++ b/templates/ganglia/gmetad.conf.erb
@@ -36,7 +36,7 @@
 # data_source my grid 50 1.3.4.7:8655 grid.org:8651 grid-backup.org:8651
 # data_source another source 1.3.4.7:8655  1.3.4.8
 
-% if realm == labs then %
+% if @realm == labs then %
 # BEGIN AUTOGEN FROM CRON
 # END AUTOGEN FROM CRON
 % end %

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I1bc00c479c8611bc090198be326460f9b1a1f0fa
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Matanya mata...@foss.co.il

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

[MediaWiki-commits] [Gerrit] Fix: Correct mode for LaTeXML-SVG - change (mediawiki...Math)

[Physikerwelt (Code Review)]

Physikerwelt has submitted this change and it was merged.

Change subject: Fix: Correct mode for LaTeXML-SVG
..


Fix: Correct mode for LaTeXML-SVG

In the HTML-output the MathJax SVG output was displayed
and not the LaTeXML svg if the page was viewed in LaTeXML mode.

Change-Id: I39ab18e624daf28093931fe6db6c045e7201dd34
---
M Math.hooks.php
M MathLaTeXML.php
2 files changed, 3 insertions(+), 2 deletions(-)

Approvals:
  Physikerwelt: Looks good to me, approved



diff --git a/Math.hooks.php b/Math.hooks.php
index e074994..22c6407 100644
--- a/Math.hooks.php
+++ b/Math.hooks.php
@@ -103,10 +103,10 @@
}
}
if ( $renderer-render() ) {
-   wfDebugLog( Math , Rendering successfull. Writing 
output );
+   wfDebugLog( Math , Rendering successful. Writing 
output );
$renderedMath = $renderer-getHtmlOutput();
} else {
-   wfDebugLog( Math , Rendering failed. Prining error 
message. );
+   wfDebugLog( Math , Rendering failed. Printing error 
message. );
return $renderer-getLastError();
}
wfRunHooks( 'MathFormulaRendered',
diff --git a/MathLaTeXML.php b/MathLaTeXML.php
index 08a7b53..9076b0b 100644
--- a/MathLaTeXML.php
+++ b/MathLaTeXML.php
@@ -20,6 +20,7 @@
global $wgMathLaTeXMLUrl;
parent::__construct( $tex, $params );
$this-hosts = $wgMathLaTeXMLUrl;
+   $this-setMode( MW_MATH_LATEXML );
}
/**
 * Converts an array with LaTeXML settings to a URL encoded String.

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I39ab18e624daf28093931fe6db6c045e7201dd34
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Math
Gerrit-Branch: dev
Gerrit-Owner: Physikerwelt w...@physikerwelt.de
Gerrit-Reviewer: Physikerwelt w...@physikerwelt.de
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] ldap: remove lookupvar and replace with top scope @ var - change (operations/puppet)

[Matanya (Code Review)]

Matanya has uploaded a new change for review.

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

Change subject: ldap: remove lookupvar and replace with top scope @ var
..

ldap: remove lookupvar and replace with top scope @ var

Change-Id: I045ef3a9c5ac808529eb850b3b5280b6de9ab7fa
---
M modules/ldap/manifests/client.pp
M modules/ldap/manifests/role/config.pp
M modules/ldap/templates/nslcd.conf.erb
3 files changed, 6 insertions(+), 6 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/75/116975/1

diff --git a/modules/ldap/manifests/client.pp b/modules/ldap/manifests/client.pp
index 51e0192..e289c04 100644
--- a/modules/ldap/manifests/client.pp
+++ b/modules/ldap/manifests/client.pp
@@ -228,7 +228,7 @@
 content = template('ldap/scriptconfig.py.erb'),
 }
 
-if ( $realm != 'labs' ) {
+if ( $::realm != 'labs' ) {
 file { '/etc/ldap/.ldapscriptrc':
 owner   = 'root',
 group   = 'root',
@@ -261,7 +261,7 @@
 
 class ldap::client::autofs($ldapconfig) {
 # TODO: parametize this.
-if $realm == 'labs' {
+if $::realm == 'labs' {
 $homedir_location = /export/home/${instanceproject}
 $nfs_server_name = $instanceproject ? {
 default = 'labs-nfs1',
@@ -360,7 +360,7 @@
 }
 }
 
-if $realm == 'labs' {
+if $::realm == 'labs' {
 if $managehome {
 $ircecho_logs = { /var/log/manage-exports.log = 
#wikimedia-labs }
 $ircecho_nick = labs-home-wm
diff --git a/modules/ldap/manifests/role/config.pp 
b/modules/ldap/manifests/role/config.pp
index 5843be7..29ded25 100644
--- a/modules/ldap/manifests/role/config.pp
+++ b/modules/ldap/manifests/role/config.pp
@@ -6,7 +6,7 @@
 'pmtpa' = [ 'virt0.wikimedia.org', 'virt1000.wikimedia.org' ],
 'eqiad' = [ 'virt1000.wikimedia.org', 'virt0.wikimedia.org' ]
 }
-$sudobasedn = $realm ? {
+$sudobasedn = $::realm ? {
 'labs'   = 
ou=sudoers,cn=${instanceproject},ou=projects,${basedn},
 'production' = ou=sudoers,${basedn}
 }
diff --git a/modules/ldap/templates/nslcd.conf.erb 
b/modules/ldap/templates/nslcd.conf.erb
index 4f1e661..ee78973 100644
--- a/modules/ldap/templates/nslcd.conf.erb
+++ b/modules/ldap/templates/nslcd.conf.erb
@@ -16,11 +16,11 @@
 base shadow %= ldapconfig[users_rdn] %,%= ldapconfig[basedn] %
 base group %= ldapconfig[groups_rdn] %,%= ldapconfig[basedn] %
 
-% if site == eqiad -%
+% if @site == eqiad -%
 base passwd %= ldapconfig[users_rdn] %,ou=servicegroups,%= 
ldapconfig[basedn] %
 base shadow %= ldapconfig[users_rdn] %,ou=servicegroups,%= 
ldapconfig[basedn] %
 base group ou=servicegroups,%= ldapconfig[basedn] %
-% elsif realm == labs -%
+% elsif @realm == labs -%
 % if has_variable?(instanceproject) then -%
 base passwd %= ldapconfig[users_rdn] %,cn=%= instanceproject 
%,ou=projects,%= ldapconfig[basedn] %
 base shadow %= ldapconfig[users_rdn] %,cn=%= instanceproject 
%,ou=projects,%= ldapconfig[basedn] %

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I045ef3a9c5ac808529eb850b3b5280b6de9ab7fa
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Matanya mata...@foss.co.il

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

[MediaWiki-commits] [Gerrit] openstack: remove var and replace with top scope ::var - change (operations/puppet)

[Matanya (Code Review)]

Matanya has uploaded a new change for review.

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

Change subject: openstack: remove var and replace with top scope ::var
..

openstack: remove var and replace with top scope ::var

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


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/76/116976/1

diff --git a/manifests/openstack.pp b/manifests/openstack.pp
index 1d5c237..9b12769 100644
--- a/manifests/openstack.pp
+++ b/manifests/openstack.pp
@@ -793,7 +793,7 @@
 class { openstack::repo: openstack_version = $openstack_version }
 }
 
-if ( $realm == production ) {
+if ( $::realm == production ) {
 $certname = virt-star.${site}.wmnet
 install_certificate{ ${certname}: }
 install_additional_key{ ${certname}: key_loc = /var/lib/nova, 
owner = nova, group = libvirtd, require = Package[nova-common] }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I73919d9c8e67c77d854eff552e708707043ceb0a
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Matanya mata...@foss.co.il

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

[MediaWiki-commits] [Gerrit] Setup jenkins configuration - change (mediawiki...CirrusSearch)

[jenkins-bot (Code Review)]

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

Change subject: Setup jenkins configuration
..


Setup jenkins configuration

Add @clean to all tests because they should all run on a clean install.

Change-Id: I8ab4ae49fba1e71aa13c151559347e065f47a2c7
---
M CirrusSearch.php
M tests/browser/features/bad_syntax.feature
M tests/browser/features/boolean_operators.feature
M tests/browser/features/boost_template.feature
M tests/browser/features/combined_filters.feature
M tests/browser/features/did_you_mean.feature
M tests/browser/features/elasticsearch_on_special_version.feature
M tests/browser/features/exact_quotes.feature
M tests/browser/features/full_text.feature
M tests/browser/features/full_text_advanced.feature
M tests/browser/features/fuzzy.feature
M tests/browser/features/go.feature
M tests/browser/features/hastemplate.feature
M tests/browser/features/highlighting.feature
M tests/browser/features/incategory.feature
M tests/browser/features/intitle.feature
M tests/browser/features/prefer_recent.feature
M tests/browser/features/prefix.feature
M tests/browser/features/prefix_search.feature
M tests/browser/features/step_definitions/page_steps.rb
M tests/browser/features/support/articles/some.css
M tests/browser/features/update_general.feature
M tests/browser/features/update_non_existant.feature
M tests/browser/features/update_redirect_loop.feature
M tests/browser/features/update_weight.feature
M tests/browser/features/wildcard.feature
A tests/jenkins/Jenkins.php
A tests/jenkins/cleanSetup.php
28 files changed, 177 insertions(+), 4 deletions(-)

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



diff --git a/CirrusSearch.php b/CirrusSearch.php
index 68146a7..958095e 100644
--- a/CirrusSearch.php
+++ b/CirrusSearch.php
@@ -268,6 +268,7 @@
 $wgAutoloadClasses['CirrusSearch\Connection'] = $includes . 'Connection.php';
 $wgAutoloadClasses['CirrusSearch\DeletePagesJob'] = $includes . 
'DeletePagesJob.php';
 $wgAutoloadClasses['CirrusSearch\ElasticsearchIntermediary'] = $includes . 
'ElasticsearchIntermediary.php';
+$wgAutoloadClasses['CirrusSearch\ForceSearchIndex'] = __DIR__ . 
'/maintenance/forceSearchIndex.php';
 $wgAutoloadClasses['CirrusSearch\Hooks'] = $includes . 'Hooks.php';
 $wgAutoloadClasses['CirrusSearch\LinksUpdateJob'] = $includes . 
'LinksUpdateJob.php';
 $wgAutoloadClasses['CirrusSearch\LinksUpdateSecondaryJob'] = $includes . 
'LinksUpdateSecondaryJob.php';
@@ -319,3 +320,13 @@
 $wgJobClasses[ 'cirrusSearchLinksUpdateSecondary' ] = 
'CirrusSearch\LinksUpdateSecondaryJob';
 $wgJobClasses[ 'cirrusSearchMassIndex' ] = 'CirrusSearch\MassIndexJob';
 $wgJobClasses[ 'cirrusSearchOtherIndex' ] = 'CirrusSearch\OtherIndexJob';
+
+/**
+ * Jenkins configuration required to get all the browser tests passing cleanly.
+ * Note that it is only hooked for browser tests.
+ */
+if ( isset( $wgWikimediaJenkinsCI )  $wgWikimediaJenkinsCI === true  (
+   PHP_SAPI !== 'cli' ||// If we're not in the CLI then this 
is certainly a browser test
+   strpos( getenv( 'JOB_NAME' ), 'browsertests' ) !== false ) ) {
+   require( __DIR__ . '/tests/jenkins/Jenkins.php' );
+}
diff --git a/tests/browser/features/bad_syntax.feature 
b/tests/browser/features/bad_syntax.feature
index 9ad7959..2112016 100644
--- a/tests/browser/features/bad_syntax.feature
+++ b/tests/browser/features/bad_syntax.feature
@@ -1,3 +1,4 @@
+@clean
 Feature: Searches with syntax errors
   Background:
 Given I am at a random page
diff --git a/tests/browser/features/boolean_operators.feature 
b/tests/browser/features/boolean_operators.feature
index 25cb0a9..812bb15 100644
--- a/tests/browser/features/boolean_operators.feature
+++ b/tests/browser/features/boolean_operators.feature
@@ -1,3 +1,4 @@
+ @clean
 Feature: Searches with boolean operators
   Background:
 Given I am at a random page
diff --git a/tests/browser/features/boost_template.feature 
b/tests/browser/features/boost_template.feature
index 0417412..5ce34b7 100644
--- a/tests/browser/features/boost_template.feature
+++ b/tests/browser/features/boost_template.feature
@@ -1,3 +1,4 @@
+@clean
 Feature: Searches with the boost-template operator
   Background:
 Given I am at a random page
diff --git a/tests/browser/features/combined_filters.feature 
b/tests/browser/features/combined_filters.feature
index 9cd54d6..42d78ba 100644
--- a/tests/browser/features/combined_filters.feature
+++ b/tests/browser/features/combined_filters.feature
@@ -1,3 +1,4 @@
+@clean
 Feature: Searches with combined filters
   Background:
 Given I am at a random page
diff --git a/tests/browser/features/did_you_mean.feature 
b/tests/browser/features/did_you_mean.feature
index fe0fa4c..2621eee 100644
--- a/tests/browser/features/did_you_mean.feature
+++ b/tests/browser/features/did_you_mean.feature
@@ -1,3 +1,4 @@
+@clean
 Feature: Did you mean
   Background:
 Given I am at a random 

[MediaWiki-commits] [Gerrit] Cleanup MediawikiTestCase - change (mediawiki/core)

[Addshore (Code Review)]

Addshore has uploaded a new change for review.

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

Change subject: Cleanup MediawikiTestCase
..

Cleanup MediawikiTestCase

Remove some unused vars
Remove compatibility methods where the actual method
  was implemented in phpunit 3.5.0

Change-Id: I80d542196a0f2265aacdd8ae89f919773832c14c
---
M tests/phpunit/MediaWikiTestCase.php
1 file changed, 57 insertions(+), 77 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/74/116974/2

diff --git a/tests/phpunit/MediaWikiTestCase.php 
b/tests/phpunit/MediaWikiTestCase.php
index 9ca1cab..6926ab0 100644
--- a/tests/phpunit/MediaWikiTestCase.php
+++ b/tests/phpunit/MediaWikiTestCase.php
@@ -1,9 +1,6 @@
 ?php
 
 abstract class MediaWikiTestCase extends PHPUnit_Framework_TestCase {
-   public $suite;
-   public $regex = '';
-   public $runDisabled = false;
 
/**
 * $called tracks whether the setUp and tearDown method has been called.
@@ -20,7 +17,7 @@
private $called = array();
 
/**
-* @var Array of TestUser
+* @var TestUser[]
 */
public static $users;
 
@@ -48,7 +45,7 @@
 *
 * @var array
 */
-   private $tmpfiles = array();
+   private $tmpFiles = array();
 
/**
 * Holds original values of MediaWiki configuration settings
@@ -71,14 +68,14 @@
'oracle'
);
 
-   function __construct( $name = null, array $data = array(), $dataName = 
'' ) {
+   public function __construct( $name = null, array $data = array(), 
$dataName = '' ) {
parent::__construct( $name, $data, $dataName );
 
$this-backupGlobals = false;
$this-backupStaticAttributes = false;
}
 
-   function run( PHPUnit_Framework_TestResult $result = null ) {
+   public function run( PHPUnit_Framework_TestResult $result = null ) {
/* Some functions require some kind of caching, and will end up 
using the db,
 * which we can't allow, as that would open a new connection 
for mysql.
 * Replace with a HashBag. They would not be going to persist 
anyway.
@@ -130,22 +127,22 @@
}
}
 
-   function usesTemporaryTables() {
+   public function usesTemporaryTables() {
return self::$useTemporaryTables;
}
 
/**
-* obtains a new temporary file name
+* Obtains a new temporary file name
 *
 * The obtained filename is enlisted to be removed upon tearDown
 *
-* @return string: absolute name of the temporary file
+* @return string absolute name of the temporary file
 */
protected function getNewTempFile() {
-   $fname = tempnam( wfTempDir(), 'MW_PHPUnit_' . get_class( $this 
) . '_' );
-   $this-tmpfiles[] = $fname;
+   $fileName = tempnam( wfTempDir(), 'MW_PHPUnit_' . get_class( 
$this ) . '_' );
+   $this-tmpFiles[] = $fileName;
 
-   return $fname;
+   return $fileName;
}
 
/**
@@ -154,26 +151,22 @@
 * The obtained directory is enlisted to be removed (recursively with 
all its contained
 * files) upon tearDown.
 *
-* @return string: absolute name of the temporary directory
+* @return string absolute name of the temporary directory
 */
protected function getNewTempDirectory() {
// Starting of with a temporary /file/.
-   $fname = $this-getNewTempFile();
+   $fileName = $this-getNewTempFile();
 
// Converting the temporary /file/ to a /directory/
//
// The following is not atomic, but at least we now have a 
single place,
// where temporary directory creation is bundled and can be 
improved
-   unlink( $fname );
-   $this-assertTrue( wfMkdirParents( $fname ) );
+   unlink( $fileName );
+   $this-assertTrue( wfMkdirParents( $fileName ) );
 
-   return $fname;
+   return $fileName;
}
 
-   /**
-* setUp and tearDown should (where significant)
-* happen in reverse order.
-*/
protected function setUp() {
wfProfileIn( __METHOD__ );
parent::setUp();
@@ -181,23 +174,12 @@
 
$this-phpErrorLevel = intval( ini_get( 'error_reporting' ) );
 
-   /*
-   // @todo global variables to restore for *every* test
-   array(
-   'wgLang',
-   'wgContLang',
-   'wgLanguageCode',
-   'wgUser',
-   'wgTitle',
-   );
-   */
-
// Cleaning up 

[MediaWiki-commits] [Gerrit] Use user-defined animation duration instead of fixed time - change (mediawiki...Wikibase)

[jenkins-bot (Code Review)]

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

Change subject: Use user-defined animation duration instead of fixed time
..


Use user-defined animation duration instead of fixed time

jQuery supports 'slow' (defaults to 600 ms), 'fast' (defaults to
200 ms) and default (400 ms). The importand advantage is: These can
be changed by the user. A constant number can not.

Change-Id: I590a7d16062bd7c89692ca14e9da8f7f927ddef2
---
M 
lib/resources/jquery.wikibase/jquery.wikibase.snakview/snakview.variations.Value.js
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Tobias Gritschacher: Looks good to me, approved
  WikidataJenkins: Verified
  jenkins-bot: Verified



diff --git 
a/lib/resources/jquery.wikibase/jquery.wikibase.snakview/snakview.variations.Value.js
 
b/lib/resources/jquery.wikibase/jquery.wikibase.snakview/snakview.variations.Value.js
index b2c7851..0822312 100644
--- 
a/lib/resources/jquery.wikibase/jquery.wikibase.snakview/snakview.variations.Value.js
+++ 
b/lib/resources/jquery.wikibase/jquery.wikibase.snakview/snakview.variations.Value.js
@@ -210,7 +210,7 @@
{ height: newHeight },
{
queue: 
heightAnimationQueue,
-   duration: 250,
+   duration: 'fast', 
//defaults to 200
progress: function( 
animation, progress, remainingMs ) {

$.ui.inputextender.redrawVisibleExtensions();
}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I590a7d16062bd7c89692ca14e9da8f7f927ddef2
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Thiemo Mättig (WMDE) thiemo.maet...@wikimedia.de
Gerrit-Reviewer: Adrian Lang adrian.l...@wikimedia.de
Gerrit-Reviewer: Henning Snater henning.sna...@wikimedia.de
Gerrit-Reviewer: Tobias Gritschacher tobias.gritschac...@wikimedia.de
Gerrit-Reviewer: WikidataJenkins wikidata-servi...@wikimedia.de
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] Truncate search suggestions similar to mediawiki.searchSuggest - change (mediawiki...Wikibase)

[jenkins-bot (Code Review)]

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

Change subject: Truncate search suggestions similar to mediawiki.searchSuggest
..


Truncate search suggestions similar to mediawiki.searchSuggest

The containing... entry at the bottom of the search suggestions
popup was not truncated like it is in the original MediaWiki
module, which is not used in Wikibase.

Additionally I moved the code a little bit to make it look like the
original code in mediawiki.searchSuggest.js.

Change-Id: If4a2893176067d723372b01fc0d35c3e7f760999
---
M 
lib/resources/jquery.wikibase/themes/default/jquery.wikibase.entityselector.css
M repo/resources/themes/default/wikibase.ui.entitysearch.css
M repo/resources/wikibase.ui.entitysearch.js
3 files changed, 20 insertions(+), 9 deletions(-)

Approvals:
  Tobias Gritschacher: Looks good to me, approved
  WikidataJenkins: Verified
  jenkins-bot: Verified



diff --git 
a/lib/resources/jquery.wikibase/themes/default/jquery.wikibase.entityselector.css
 
b/lib/resources/jquery.wikibase/themes/default/jquery.wikibase.entityselector.css
index 23d04d8..0beed8c 100644
--- 
a/lib/resources/jquery.wikibase/themes/default/jquery.wikibase.entityselector.css
+++ 
b/lib/resources/jquery.wikibase/themes/default/jquery.wikibase.entityselector.css
@@ -25,8 +25,9 @@
 .ui-entityselector-list .ui-entityselector-aliases {
display: block;
overflow: hidden;
-   white-space: nowrap;
+   -o-text-overflow: ellipsis; /* Opera 9 to 10 */
text-overflow: ellipsis;
+   white-space: nowrap;
 }
 
 .ui-entityselector-list .ui-entityselector-section-container {
diff --git a/repo/resources/themes/default/wikibase.ui.entitysearch.css 
b/repo/resources/themes/default/wikibase.ui.entitysearch.css
index ec5b881..0494ec0 100644
--- a/repo/resources/themes/default/wikibase.ui.entitysearch.css
+++ b/repo/resources/themes/default/wikibase.ui.entitysearch.css
@@ -12,13 +12,20 @@
 }
 
 .ui-entityselector-list .wb-entitysearch-suggestions .suggestions-special {
-   display: block;
-   border: none;
background-color: transparent;
+   border: 0;
+   display: block;
margin: 0;
padding: 0;
 }
 
+.ui-entityselector-list .wb-entitysearch-suggestions .special-query {
+   overflow: hidden;
+   -o-text-overflow: ellipsis; /* Opera 9 to 10 */
+   text-overflow: ellipsis;
+   white-space: nowrap;
+}
+
 .ui-entityselector-list .wb-entitysearch-suggestions .ui-state-hover div {
-   color: #FF;
+   color: #FFF;
 }
diff --git a/repo/resources/wikibase.ui.entitysearch.js 
b/repo/resources/wikibase.ui.entitysearch.js
index 7164afb..8225389 100644
--- a/repo/resources/wikibase.ui.entitysearch.js
+++ b/repo/resources/wikibase.ui.entitysearch.js
@@ -51,11 +51,14 @@
url: mw.config.get( 'wgServer' ) + mw.config.get( 
'wgScriptPath' ) + '/api.php',
emulateSearchBox: true,
customListItem: {
-   content: $( 'div/' ).addClass( 
'suggestions-special' )
-   .append( $( 'div/' ).addClass( 
'special-label ' ).text(
-   mw.msg( 
'searchsuggest-containing' ) )
-   )
-   .append( $( 'div/' ).addClass( 
'special-query' )
+   content: $( 'div' )
+   .addClass( 'suggestions-special' )
+   .append(
+   $( 'div' )
+   .addClass( 
'special-label' )
+   .text( mw.msg( 
'searchsuggest-containing' ) ),
+   $( 'div' )
+   .addClass( 
'special-query' )
),
action: function( event, entityselector ) {
$form.submit();

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

Gerrit-MessageType: merged
Gerrit-Change-Id: If4a2893176067d723372b01fc0d35c3e7f760999
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Thiemo Mättig (WMDE) thiemo.maet...@wikimedia.de
Gerrit-Reviewer: Adrian Lang adrian.l...@wikimedia.de
Gerrit-Reviewer: Henning Snater henning.sna...@wikimedia.de
Gerrit-Reviewer: Tobias Gritschacher tobias.gritschac...@wikimedia.de
Gerrit-Reviewer: WikidataJenkins wikidata-servi...@wikimedia.de
Gerrit-Reviewer: jenkins-bot 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org

[MediaWiki-commits] [Gerrit] Add @deprecated hint to $j - change (mediawiki/core)

[Umherirrender (Code Review)]

Umherirrender has uploaded a new change for review.

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

Change subject: Add @deprecated hint to $j
..

Add @deprecated hint to $j

Change-Id: I0d9204ea354316ca11f568c81ad38f4089c91e80
---
M resources/mediawiki/mediawiki.js
1 file changed, 4 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/77/116977/1

diff --git a/resources/mediawiki/mediawiki.js b/resources/mediawiki/mediawiki.js
index 26f84f5..7b178bb 100644
--- a/resources/mediawiki/mediawiki.js
+++ b/resources/mediawiki/mediawiki.js
@@ -2354,7 +2354,10 @@
 
 }( jQuery ) );
 
-// Alias $j to jQuery for backwards compatibility
+/**
+ * Alias $j to jQuery for backwards compatibility
+ * @deprecated since 1.23 Use $ or jQuery instead
+ */
 mw.log.deprecate( window, '$j', jQuery, 'Use $ or jQuery instead.' );
 
 // Attach to window and globally alias

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I0d9204ea354316ca11f568c81ad38f4089c91e80
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Umherirrender umherirrender_de...@web.de

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

[MediaWiki-commits] [Gerrit] Fix ruby stability hash issue in recursor.conf - change (operations/puppet)

[Alexandros Kosiaris (Code Review)]

Alexandros Kosiaris has uploaded a new change for review.

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

Change subject: Fix ruby stability hash issue in recursor.conf
..

Fix ruby stability hash issue in recursor.conf

Using the de-facto standard of sort.map on a hash we avoid an issue
with ruby hashes not having their key/value pairs consistently placed
and the resulting file changing every few invocations

Change-Id: I870e546e3da420e4924afa04bb5815ccbd4a9bab
---
M templates/powerdns/recursor.conf.erb
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/templates/powerdns/recursor.conf.erb 
b/templates/powerdns/recursor.conf.erb
index e6a198d..f265bf8 100644
--- a/templates/powerdns/recursor.conf.erb
+++ b/templates/powerdns/recursor.conf.erb
@@ -6,7 +6,7 @@
result = []
 
if ips.is_a?(Hash) then
-   ips.values.each do |v|
+   ips.sort.map do |k, v|
result += flatten_ips(v)
end
elsif ips.is_a?(Array) then

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I870e546e3da420e4924afa04bb5815ccbd4a9bab
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alexandros Kosiaris akosia...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] Add rmf, expecting to get translators soon - change (translatewiki)

[jenkins-bot (Code Review)]

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

Change subject: Add rmf, expecting to get translators soon
..


Add rmf, expecting to get translators soon

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

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



diff --git a/TranslatewikiSettings.php b/TranslatewikiSettings.php
index dc76972..969e028 100644
--- a/TranslatewikiSettings.php
+++ b/TranslatewikiSettings.php
@@ -306,6 +306,7 @@
 $wgExtraLanguageNames['ses'] = 'Koyraboro Senni'; # Koyraboro Senni Songhay / 
Siebrand 2013-10-07
 $wgExtraLanguageNames['sdh'] = 'کوردی خوارگ'; # Southern Kurdish / Siebrand 
2013-10-07
 $wgExtraLanguageNames['mww-latn'] = 'Hmoob Dawb'; # Hmong Daw / Siebrand 
2013-12-02
+$wgExtraLanguageNames['rmf'] = 'kaalengo tšimb'; # Romani language spoken in 
Finland / Nike 2014-03-05
 
 $wgExtraLanguageNames['nl-be'] = 'nl-be'; # Nikerabbit 2008-xx-xx - For 
FreeCol
 $wgExtraLanguageNames['qqq']   = 'Message documentation'; # No linguistic 
content. Used for documenting messages

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I0320c2b4fd0a23febef532c2d6476297dc89
Gerrit-PatchSet: 2
Gerrit-Project: translatewiki
Gerrit-Branch: master
Gerrit-Owner: Nikerabbit niklas.laxst...@gmail.com
Gerrit-Reviewer: Nemo bis federicol...@tiscali.it
Gerrit-Reviewer: Nikerabbit niklas.laxst...@gmail.com
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] ve.ce.Node: Clean up whitespace in rgba?() syntax - change (VisualEditor/VisualEditor)

[Krinkle (Code Review)]

Krinkle has uploaded a new change for review.

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

Change subject: ve.ce.Node: Clean up whitespace in rgba?() syntax
..

ve.ce.Node: Clean up whitespace in rgba?() syntax

Change-Id: Id73ea3fd1248490e29daee83594f02d544f457cb
---
M modules/ve/ce/styles/ve.ce.Node.css
1 file changed, 3 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/VisualEditor/VisualEditor 
refs/changes/79/116979/1

diff --git a/modules/ve/ce/styles/ve.ce.Node.css 
b/modules/ve/ce/styles/ve.ce.Node.css
index d0fb881..87e0d12 100644
--- a/modules/ve/ce/styles/ve.ce.Node.css
+++ b/modules/ve/ce/styles/ve.ce.Node.css
@@ -62,7 +62,7 @@
 
 .ve-ce-protectedNode-phantom {
position: absolute;
-   background-color: rgba(104,171,255,0.1);
+   background-color: rgba(104, 171, 255, 0.1);
box-shadow: inset 0 0 0 1px #68abff;
cursor: default;
 }
@@ -78,7 +78,7 @@
 
 .ve-ce-resizableNode-handles {
position: absolute;
-   box-shadow: inset 0 0 0 1px rgba(0,0,0,.25);
+   box-shadow: inset 0 0 0 1px rgba(0, 0, 0, 0.25);
-webkit-box-sizing: border-box;
-moz-box-sizing: border-box;
box-sizing: border-box;
@@ -157,7 +157,7 @@
 }
 
 .ve-ce-relocatableNode-marker.relocating {
-   background: rgba(0,0,0,1);
+   background: rgba(0, 0, 0, 1);
 }
 
 /* ve.ce.GeneratedContentNode */

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id73ea3fd1248490e29daee83594f02d544f457cb
Gerrit-PatchSet: 1
Gerrit-Project: VisualEditor/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Krinkle krinklem...@gmail.com

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

[MediaWiki-commits] [Gerrit] (Hotfix) Make mw.wikibase.getEntityObject() actually return ... - change (mediawiki...Wikibase)

[Hoo man (Code Review)]

Hoo man has uploaded a new change for review.

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

Change subject: (Hotfix) Make mw.wikibase.getEntityObject() actually return 
non-Legacy data
..

(Hotfix) Make mw.wikibase.getEntityObject() actually return non-Legacy data

Also fixed the module to no longer guard against this, so that
the integration tests will catch this in the future.

Change-Id: Ie52d887b9a2dda98187cc23ce400614ca1bf2fac
(cherry picked from commit 8d526f9af33476649037097f0aab0ecf81753c89)
---
M client/includes/scribunto/Scribunto_LuaWikibaseLibrary.php
M client/includes/scribunto/mw.wikibase.entity.lua
2 files changed, 3 insertions(+), 5 deletions(-)


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

diff --git a/client/includes/scribunto/Scribunto_LuaWikibaseLibrary.php 
b/client/includes/scribunto/Scribunto_LuaWikibaseLibrary.php
index 68d2e05..366c123 100644
--- a/client/includes/scribunto/Scribunto_LuaWikibaseLibrary.php
+++ b/client/includes/scribunto/Scribunto_LuaWikibaseLibrary.php
@@ -75,7 +75,7 @@
 * @throws ScribuntoException
 * @return array
 */
-   public function getEntity( $prefixedEntityId = null, $legacyStyle = 
true ) {
+   public function getEntity( $prefixedEntityId = null, $legacyStyle = 
false ) {
$this-checkType( 'getEntity', 1, $prefixedEntityId, 'string' );
$this-checkType( 'getEntity', 2, $legacyStyle, 'boolean' );
try {
diff --git a/client/includes/scribunto/mw.wikibase.entity.lua 
b/client/includes/scribunto/mw.wikibase.entity.lua
index e53467b..ed18c2d 100644
--- a/client/includes/scribunto/mw.wikibase.entity.lua
+++ b/client/includes/scribunto/mw.wikibase.entity.lua
@@ -95,10 +95,8 @@
 
local n = 0
for k, v in pairs( entity.claims ) do
-   if string.match( k, '^%u%d+' ) ~= nil then
-   n = n + 1
-   properties[n] = k
-   end
+   n = n + 1
+   properties[n] = k
end
 
return properties

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie52d887b9a2dda98187cc23ce400614ca1bf2fac
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: mw1.23-wmf17
Gerrit-Owner: Hoo man h...@online.de

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

[MediaWiki-commits] [Gerrit] [WIP]Added a global variable to enable compact links beta fe... - change (mediawiki...UniversalLanguageSelector)

[Niharika29 (Code Review)]

Niharika29 has uploaded a new change for review.

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

Change subject: [WIP]Added a global variable to enable compact links beta 
feature and prevented enabling of feature when ULS position is personal
..

[WIP]Added a global variable to enable compact links beta feature and prevented 
enabling of feature when ULS position is personal

Change-Id: I710705c129acb77442aa15ea18164434901d76ed
---
M Resources.php
M UniversalLanguageSelector.hooks.php
M UniversalLanguageSelector.php
3 files changed, 23 insertions(+), 4 deletions(-)


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

diff --git a/Resources.php b/Resources.php
index 1d07332..8f41a9c 100644
--- a/Resources.php
+++ b/Resources.php
@@ -155,6 +155,10 @@
'jquery.uls.compact',
'mediawiki.ui.button',
),
+   'messages' = array(
+   'uls-betafeature-label',
+   'uls-betafeature-desc',
+   ),
 ) + $resourcePaths;
 
 $wgResourceModules['ext.uls.webfonts'] = array(
diff --git a/UniversalLanguageSelector.hooks.php 
b/UniversalLanguageSelector.hooks.php
index f740f52..1d7958c 100644
--- a/UniversalLanguageSelector.hooks.php
+++ b/UniversalLanguageSelector.hooks.php
@@ -45,7 +45,8 @@
 * Hook: BeforePageDisplay
 */
public static function addModules( $out, $skin ) {
-   global $wgULSPosition, $wgULSGeoService, $wgULSEventLogging;
+   global $wgULSPosition, $wgULSGeoService, $wgULSEventLogging,
+   $wgULSCompactInterlanguageLinks;
 
// Load the style for users without JS, to hide the useless 
links
$out-addModuleStyles( 'ext.uls.nojs' );
@@ -62,8 +63,13 @@
// If the extension is enabled, basic features (API, language 
data) available.
$out-addModules( 'ext.uls.init' );
 
+   // If compacting interlanguage links is enabled on wiki
+   if( $wgULSCompactInterlanguageLinks  $wgULSPosition === 
'interlanguage' ) {
+   $out-addModules( 'ext.uls.compactlinks' );
+   }
// If compact ULS beta feature is enabled
-   if ( class_exists( 'BetaFeatures' ) 
+   else if ( $wgULSPosition === 'interlanguage' 
+   class_exists( 'BetaFeatures' ) 
BetaFeatures::isFeatureEnabled( $out-getUser(), 
'uls-compact-links' )
) {
$out-addModules( 'ext.uls.compactlinks' );
@@ -273,7 +279,8 @@
$wgULSIMEEnabled, $wgULSWebfontsEnabled,
$wgULSPosition, $wgULSNoWebfontsSelectors,
$wgULSAnonCanChangeLanguage, $wgULSEventLogging, 
$wgULSImeSelectors,
-   $wgULSNoImeSelectors, $wgULSFontRepositoryBasePath, 
$wgExtensionAssetsPath;
+   $wgULSNoImeSelectors, $wgULSFontRepositoryBasePath, 
$wgExtensionAssetsPath,
+   $wgULSCompactInterlanguageLinks;
 
// Place constant stuff here (not depending on request context)
if ( is_string( $wgULSGeoService ) ) {
@@ -288,6 +295,7 @@
$vars['wgULSImeSelectors'] = $wgULSImeSelectors;
$vars['wgULSNoImeSelectors'] = $wgULSNoImeSelectors;
$vars['wgULSNoWebfontsSelectors'] = $wgULSNoWebfontsSelectors;
+   $vars['wgULSCompactInterlanguageLinks'] = 
$wgULSCompactInterlanguageLinks;
 
if ( is_string( $wgULSFontRepositoryBasePath ) ) {
$vars['wgULSFontRepositoryBasePath'] = 
$wgULSFontRepositoryBasePath;
diff --git a/UniversalLanguageSelector.php b/UniversalLanguageSelector.php
index 7f9ec45..0d7f6bf 100644
--- a/UniversalLanguageSelector.php
+++ b/UniversalLanguageSelector.php
@@ -127,7 +127,7 @@
  *
  * @since 2013.04
  */
-$GLOBALS['wgULSPosition'] = 'personal';
+$GLOBALS['wgULSPosition'] = 'interlanguage';
 
 /**
  * Whether to use EventLogging. The EventLogging extension must be installed
@@ -172,6 +172,13 @@
  */
 $GLOBALS['wgULSFontRepositoryBasePath'] = false;
 
+/**
+ * Enable compacting-interlanguage-links Beta Feature for all users by default
+ * Can be controlled by users under the Beta Features tab
+ * @since 2014.03
+ */
+$GLOBALS['wgULSCompactInterlanguageLinks'] = true;
+
 // Internationalization
 $GLOBALS['wgExtensionMessagesFiles']['UniversalLanguageSelector'] =
__DIR__ . '/UniversalLanguageSelector.i18n.php';

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

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

[MediaWiki-commits] [Gerrit] (Hotfix) Make mw.wikibase.getEntityObject() actually return ... - change (mediawiki...Wikibase)

[Addshore (Code Review)]

Addshore has submitted this change and it was merged.

Change subject: (Hotfix) Make mw.wikibase.getEntityObject() actually return 
non-Legacy data
..


(Hotfix) Make mw.wikibase.getEntityObject() actually return non-Legacy data

Also fixed the module to no longer guard against this, so that
the integration tests will catch this in the future.

Change-Id: Ie52d887b9a2dda98187cc23ce400614ca1bf2fac
(cherry picked from commit 8d526f9af33476649037097f0aab0ecf81753c89)
---
M client/includes/scribunto/Scribunto_LuaWikibaseLibrary.php
M client/includes/scribunto/mw.wikibase.entity.lua
2 files changed, 3 insertions(+), 5 deletions(-)

Approvals:
  WikidataJenkins: Verified
  Addshore: Looks good to me, approved



diff --git a/client/includes/scribunto/Scribunto_LuaWikibaseLibrary.php 
b/client/includes/scribunto/Scribunto_LuaWikibaseLibrary.php
index 68d2e05..366c123 100644
--- a/client/includes/scribunto/Scribunto_LuaWikibaseLibrary.php
+++ b/client/includes/scribunto/Scribunto_LuaWikibaseLibrary.php
@@ -75,7 +75,7 @@
 * @throws ScribuntoException
 * @return array
 */
-   public function getEntity( $prefixedEntityId = null, $legacyStyle = 
true ) {
+   public function getEntity( $prefixedEntityId = null, $legacyStyle = 
false ) {
$this-checkType( 'getEntity', 1, $prefixedEntityId, 'string' );
$this-checkType( 'getEntity', 2, $legacyStyle, 'boolean' );
try {
diff --git a/client/includes/scribunto/mw.wikibase.entity.lua 
b/client/includes/scribunto/mw.wikibase.entity.lua
index e53467b..ed18c2d 100644
--- a/client/includes/scribunto/mw.wikibase.entity.lua
+++ b/client/includes/scribunto/mw.wikibase.entity.lua
@@ -95,10 +95,8 @@
 
local n = 0
for k, v in pairs( entity.claims ) do
-   if string.match( k, '^%u%d+' ) ~= nil then
-   n = n + 1
-   properties[n] = k
-   end
+   n = n + 1
+   properties[n] = k
end
 
return properties

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie52d887b9a2dda98187cc23ce400614ca1bf2fac
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: mw1.23-wmf17
Gerrit-Owner: Hoo man h...@online.de
Gerrit-Reviewer: Addshore addshorew...@gmail.com
Gerrit-Reviewer: Hoo man h...@online.de
Gerrit-Reviewer: WikidataJenkins wikidata-servi...@wikimedia.de
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] Make jqueryMsg a dependency of ext.uls.interface - change (mediawiki...UniversalLanguageSelector)

[jenkins-bot (Code Review)]

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

Change subject: Make jqueryMsg a dependency of ext.uls.interface
..


Make jqueryMsg a dependency of ext.uls.interface

The message ext-uls-undo-language-tooltip-text uses GRAMMAR,
so it needs jqueryMsg.

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

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



diff --git a/Resources.php b/Resources.php
index 1d07332..6068431 100644
--- a/Resources.php
+++ b/Resources.php
@@ -111,6 +111,7 @@
'dependencies' = array(
'ext.uls.init',
'jquery.tipsy',
+   'mediawiki.jqueryMsg',
'mediawiki.user',
// We can not delay webfonts loading since it is required
// immediately after page load

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I40225fa72ac0049163cc1ef29e8cbc086831e3d1
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/UniversalLanguageSelector
Gerrit-Branch: master
Gerrit-Owner: Amire80 amir.ahar...@mail.huji.ac.il
Gerrit-Reviewer: Amire80 amir.ahar...@mail.huji.ac.il
Gerrit-Reviewer: KartikMistry kartik.mis...@gmail.com
Gerrit-Reviewer: Nikerabbit niklas.laxst...@gmail.com
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] beta: vary deployment-bastion by ::site - change (operations/puppet)

[Hashar (Code Review)]

Hashar has uploaded a new change for review.

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

Change subject: beta: vary deployment-bastion by ::site
..

beta: vary deployment-bastion by ::site

I am recreating the betacluster on eqiad, need to get some hardcoded
deployment-bastion.pmtpa.wmflabs to use 'eqiad'.

Change-Id: I47fbf7576bfc61a35fb032f48db68a64e3b3b0f3
---
M manifests/misc/deployment.pp
M manifests/role/applicationserver.pp
M modules/base/manifests/init.pp
M modules/beta/files/monitor_fatals.rb
4 files changed, 7 insertions(+), 7 deletions(-)


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

diff --git a/manifests/misc/deployment.pp b/manifests/misc/deployment.pp
index 0a732f8..57c9a4d 100644
--- a/manifests/misc/deployment.pp
+++ b/manifests/misc/deployment.pp
@@ -370,14 +370,14 @@
mode= '0775',
}
} else {
-   $mw_rsync_host = 'deployment-bastion.pmtpa.wmflabs'
+   $mw_rsync_host = deployment-bastion.${::site}.wmflabs
 
-   $mw_carbon_host = 'deployment-bastion.pmtpa.wmflabs'
+   $mw_carbon_host = deployment-bastion.${::site}.wmflabs
$mw_carbon_port = 2003
 
 # The Apache directories must belong to the mwdeploy user known on
-# deployment-bastion.pmtpa.wmflabs. That is the instance used by
-# Jenkins to deploy and updte the code.
+# deployment-bastion.{eqiad,pmtpa}.wmflabs. They are the instances used
+# by Jenkins to deploy and updte the code.
 # Since /data/project is shared and 'mwdeploy' can have a different uid
 # on each instance, running owner = mwdeploy would change the UID and
 # break Jenkins job with some permission denied.
diff --git a/manifests/role/applicationserver.pp 
b/manifests/role/applicationserver.pp
index f0e370d..bdb82fe 100644
--- a/manifests/role/applicationserver.pp
+++ b/manifests/role/applicationserver.pp
@@ -18,7 +18,7 @@
 
$mediawiki_log_aggregator = $::realm ? {
'production' = 'fluorine.eqiad.wmnet:8420',
-   'labs'   = 'deployment-bastion.pmtpa.wmflabs:8420',
+   'labs'   = deployment-bastion.${::site}.wmflabs:8420,
}
 
class configuration::php {
diff --git a/modules/base/manifests/init.pp b/modules/base/manifests/init.pp
index 891d751..d26bb7d 100644
--- a/modules/base/manifests/init.pp
+++ b/modules/base/manifests/init.pp
@@ -276,7 +276,7 @@
 # Per labs project syslog:
 case $::instanceproject {
 'deployment-prep': {
-$syslog_remote_real = 
'deployment-bastion.pmtpa.wmflabs'
+$syslog_remote_real = 
deployment-bastion.${::site}.wmflabs
 }
 default: {
 $syslog_remote_real = 'i-03a9.pmtpa.wmflabs:5544'
diff --git a/modules/beta/files/monitor_fatals.rb 
b/modules/beta/files/monitor_fatals.rb
index 353e7be..e27bd41 100755
--- a/modules/beta/files/monitor_fatals.rb
+++ b/modules/beta/files/monitor_fatals.rb
@@ -15,7 +15,7 @@
 
 The file at /data/project/logs/fatal.log on the deployment cluster has a new
 entry within the last twelve hours.  You should check it out by connecting on
-any instance on the beta cluster (ie: deployment-bastion.pmtpa.wmflabs ).
+any instance on the beta cluster (ie: deployment-bastion).
 
 You can also look at logstash:
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I47fbf7576bfc61a35fb032f48db68a64e3b3b0f3
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Hashar has...@free.fr

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

[MediaWiki-commits] [Gerrit] WIP: Match PHP parser behavior for image `frame` option. - change (mediawiki...parsoid)

[Cscott (Code Review)]

Cscott has uploaded a new change for review.

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

Change subject: WIP: Match PHP parser behavior for image `frame` option.
..

WIP: Match PHP parser behavior for image `frame` option.

The PHP parser behavior is probably buggy; see
https://bugzilla.wikimedia.org/show_bug.cgi?id=62258

But with this patch we document the current behavior and match it.
If/when the PHP parser is fixed, parsoid should be adjusted to match.

Bug: 53514
Change-Id: I29d01e2732e02a9c356b645476f134c601e8d1dd
---
M tests/parserTests.txt
1 file changed, 147 insertions(+), 0 deletions(-)


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

diff --git a/tests/parserTests.txt b/tests/parserTests.txt
index b069852..0b2badb 100644
--- a/tests/parserTests.txt
+++ b/tests/parserTests.txt
@@ -10536,6 +10536,153 @@
 pspan class=mw-default-size typeof=mw:Imagea 
href=File:Foobar.jpgimg alt=testing bold in alt 
resource=./File:Foobar.jpg src=//example.com/images/3/3a/Foobar.jpg 
height=220 width=1941//a/span/p
 !! end
 
+###
+# Image sizing.
+# See https://www.mediawiki.org/wiki/Help:Images#Size_and_frame
+# and https://bugzilla.wikimedia.org/show_bug.cgi?id=62258
+# Foobar has actual size of 1941x220
+# 1. Thumbs  frameless always reduce, can't be enlarged
+# 2. Framed images ignore width; always render at default size.
+#If given a height, they respect height but continue to ignore width.
+
+!! test
+Image: thumbs reduce (php)
+!! options
+php
+!! input
+[[File:Foobar.jpg|thumb|50px]]
+!! result
+div class=thumb trightdiv class=thumbinner style=width:52px;a 
href=/wiki/File:Foobar.jpg class=imageimg alt=Foobar.jpg 
src=http://example.com/images/thumb/3/3a/Foobar.jpg/50px-Foobar.jpg; 
width=50 height=6 class=thumbimage 
srcset=http://example.com/images/thumb/3/3a/Foobar.jpg/75px-Foobar.jpg 1.5x, 
http://example.com/images/thumb/3/3a/Foobar.jpg/100px-Foobar.jpg 2x //a  
div class=thumbcaptiondiv class=magnifya href=/wiki/File:Foobar.jpg 
class=internal title=Enlargeimg 
src=/skins/common/images/magnify-clip.png width=15 height=11 alt= 
//a/div/div/div/div
+
+!! end
+
+!! test
+Image: thumbs reduce (parsoid)
+!! options
+parsoid=wt2html,wt2wt,html2html
+!! input
+[[File:Foobar.jpg|thumb|50px]]
+!! result
+figure typeof=mw:Image/Thumba href=File:Foobar.jpgimg 
resource=./File:Foobar.jpg src=//example.com/images/3/3a/Foobar.jpg 
height=6 width=50//a/figure
+!! end
+
+!! test
+Image: thumbs can't be enlarged past original size (php)
+!! options
+php
+!! input
+[[File:Foobar.jpg|thumb|2000px]]
+!! result
+div class=thumb trightdiv class=thumbinner style=width:1943px;a 
href=/wiki/File:Foobar.jpg class=imageimg alt=Foobar.jpg 
src=http://example.com/images/3/3a/Foobar.jpg; width=1941 height=220 
class=thumbimage //a  div class=thumbcaptiondiv class=magnifya 
href=/wiki/File:Foobar.jpg class=internal title=Enlargeimg 
src=/skins/common/images/magnify-clip.png width=15 height=11 alt= 
//a/div/div/div/div
+
+!! end
+
+!! test
+Image: thumbs can't be enlarged past original size (parsoid)
+!! options
+parsoid
+!! input
+[[File:Foobar.jpg|thumb|2000px]]
+!! result
+figure typeof=mw:Image/Thumba href=File:Foobar.jpgimg 
resource=./File:Foobar.jpg src=//example.com/images/3/3a/Foobar.jpg 
height=220 width=1941//a/figure
+!! end
+
+!! test
+Image: frameless can reduce in size (php)
+!! options
+php
+!! input
+[[File:Foobar.jpg|frameless|50px]]
+!! result
+pa href=/wiki/File:Foobar.jpg class=imageimg alt=Foobar.jpg 
src=http://example.com/images/thumb/3/3a/Foobar.jpg/50px-Foobar.jpg; 
width=50 height=6 
srcset=http://example.com/images/thumb/3/3a/Foobar.jpg/75px-Foobar.jpg 1.5x, 
http://example.com/images/thumb/3/3a/Foobar.jpg/100px-Foobar.jpg 2x //a
+/p
+!! end
+
+!! test
+Image: frameless can reduce in size (parsoid)
+!! options
+parsoid=wt2html,wt2wt,html2html
+!! input
+[[File:Foobar.jpg|frameless|50px]]
+!! result
+pspan typeof=mw:Image/Framelessa href=File:Foobar.jpgimg 
resource=./File:Foobar.jpg src=//example.com/images/3/3a/Foobar.jpg 
height=6 width=50//a/span/p
+!! end
+
+!! test
+Image: frameless can't be enlarged past original size (php)
+!! options
+php
+!! input
+[[File:Foobar.jpg|frameless|2000px]]
+!! result
+pa href=/wiki/File:Foobar.jpg class=imageimg alt=Foobar.jpg 
src=http://example.com/images/3/3a/Foobar.jpg; width=1941 height=220 //a
+/p
+!! end
+
+!! test
+Image: frameless can't be enlarged past original size (parsoid)
+!! options
+parsoid
+!! input
+[[File:Foobar.jpg|frameless|2000px]]
+!! result
+pspan typeof=mw:Image/Framelessa href=File:Foobar.jpgimg 
resource=./File:Foobar.jpg src=//example.com/images/3/3a/Foobar.jpg 
height=220 width=1941//a/span/p
+!! end
+
+!! test
+Image: framed images ignore size if only width is given (php)
+!! options
+php
+!! input
+[[File:Foobar.jpg|frame]]
+
+[[File:Foobar.jpg|frame|50px]]
+
+[[File:Foobar.jpg|frame|2000px]]
+!! 

[MediaWiki-commits] [Gerrit] Config changes for Elasticsearch - change (operations/puppet)

[Ottomata (Code Review)]

Ottomata has submitted this change and it was merged.

Change subject: Config changes for Elasticsearch
..


Config changes for Elasticsearch

1. Set up rack/row attributes but do not turn on awareness (yet)
2. Set the expected nodes correctly for the cluster size
3. Add elastic1013 as a ganglia aggregator.

Number 1 is kind of cool because Elasticsearch will actually try to fulfill
searches in the same rack/row if possible.  We'll turn on cluster row
awareness after 1.0 is settled.

Change-Id: I899ab89443c39a6b24e38e2899feb86a26201022
---
M manifests/role/elasticsearch.pp
M manifests/site.pp
M modules/elasticsearch/manifests/init.pp
M modules/elasticsearch/templates/elasticsearch.yml.erb
4 files changed, 47 insertions(+), 15 deletions(-)

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



diff --git a/manifests/role/elasticsearch.pp b/manifests/role/elasticsearch.pp
index a245f7b..7598a95 100644
--- a/manifests/role/elasticsearch.pp
+++ b/manifests/role/elasticsearch.pp
@@ -5,9 +5,12 @@
 class role::elasticsearch::config {
 # Config
 if ($::realm == 'labs') {
-$multicast_group= '224.2.2.4'
-$master_eligible= true
-$recover_after_time = '1m'
+$multicast_group  = '224.2.2.4'
+$master_eligible  = true
+$recover_after_time   = '1m'
+$awareness_attributes = undef
+$row  = undef
+$rack = undef
 if ($::hostname =~ /^deployment-/) {
 # Beta
 # Has four nodes all of which can be master
@@ -44,22 +47,31 @@
 'pmtpa' = '224.2.2.6',
 }
 $master_eligible = $::hostname ? {
-/^elastic1001/= true,  # Rack A3
-/^elastic1008/= true,  # Rack C5
-# TODO Move this when we get machines on another row/rack
-/^elastic1012/= true,  # Rack C5
-default   = false,
+'elastic1001' = true,
+'elastic1008' = true,
+'elastic1013' = true,
+default   = false,
 }
 $minimum_master_nodes = 2
 $cluster_name = production-search-${::site}
 $heap_memory  = '30G'
-$expected_nodes   = 12
-# We're pretty tight on space on the cluster right now so we really
-# can't get away with running without almost all the nodes.
+$expected_nodes   = 16
+# We should be able to run OK with 10 servers.
 $recover_after_nodes  = 10
-# We really do want all the nodes to come back properly so lets give
-# them quite a bit of time.
+# But it'd save time if we just waited for all of them to come back so
+# lets give them plenty of time to restart.
 $recover_after_time   = '20m'
+$rack = $::hostname ? {
+/^elastic100[0-6]/  = 'A3',
+/^elastic10(0[7-9]|1[0-2])/ = 'C5',
+/^elastic101[3-6]/  = 'D3',
+default = fail(Don't know rack for $::host),
+}
+$row  = regsubst($rack, '^(.).$', '\1' )
+# We're not turning on awareness_attributes right yet.  We'll do that
+# with the setting update API after things settle down with the 1.0
+# release then we'll update puppet.
+$awareness_attributes = undef
 }
 }
 
@@ -80,6 +92,9 @@
 expected_nodes   = $expected_nodes,
 recover_after_nodes  = $recover_after_nodes,
 recover_after_time   = $recover_after_time,
+awareness_attributes = $awareness_attributes,
+row  = $row,
+rack = $rack,
 }
 deployment::target { 'elasticsearchplugins': }
 
diff --git a/manifests/site.pp b/manifests/site.pp
index 1772519..089af9b 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -2676,7 +2676,7 @@
 node /^elastic10(0[1-9]|1[0-6])\.eqiad\.wmnet/ {
 # ganglia cluster name.
 $cluster = 'elasticsearch'
-if $::hostname =~ /^elastic100[17]/ {
+if $::hostname =~ /^elastic10(0[17]|13)/ {
 $ganglia_aggregator = true
 }
 
diff --git a/modules/elasticsearch/manifests/init.pp 
b/modules/elasticsearch/manifests/init.pp
index 8e1d16f..1aac4a5 100644
--- a/modules/elasticsearch/manifests/init.pp
+++ b/modules/elasticsearch/manifests/init.pp
@@ -36,6 +36,12 @@
 # - $recover_after_time: see $recover_after_nodes.  Defaults to a minute
 #   because that feels like a decent amount of time to wait for the
 #   remaining nodes to catch up.
+# - $awareness_attributes: attributes used for allocation awareness, comma
+#   separated.  Defaults to undef meaning none.
+# - $row: row this node is on.  Can be used for allocation awareness.  Defaults
+#   to undef meaning don't set it.
+# - $rack: rack this node is on.  Can be used for allocation 

[MediaWiki-commits] [Gerrit] Support insertables with numbers in the end - change (mediawiki...Translate)

[jenkins-bot (Code Review)]

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

Change subject: Support insertables with numbers in the end
..


Support insertables with numbers in the end

Change-Id: Ic339bd2db56b510f74ebf2858edd18f2a6a4af62
---
M insertables/TranslatablePageInsertablesSuggester.php
M tests/phpunit/insertables/TranslatablePageInsertablesSuggesterTest.php
2 files changed, 17 insertions(+), 7 deletions(-)

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



diff --git a/insertables/TranslatablePageInsertablesSuggester.php 
b/insertables/TranslatablePageInsertablesSuggester.php
index 02a3ea7..25d9644 100644
--- a/insertables/TranslatablePageInsertablesSuggester.php
+++ b/insertables/TranslatablePageInsertablesSuggester.php
@@ -17,7 +17,8 @@
// allowed in a variable name, but here we are stricter to 
avoid too many
// false positives.
$matches = array();
-   preg_match_all( '/\$([a-zA-Z0-9-])+/', $text, $matches, 
PREG_SET_ORDER );
+   preg_match_all( '/\$([a-zA-Z0-9-]+)/', $text, $matches, 
PREG_SET_ORDER );
+
$new = array_map( function ( $match ) {
// Numerical ones are already handled by parent
if ( ctype_digit( $match[1] ) ) {
diff --git 
a/tests/phpunit/insertables/TranslatablePageInsertablesSuggesterTest.php 
b/tests/phpunit/insertables/TranslatablePageInsertablesSuggesterTest.php
index 81a5326..c508987 100644
--- a/tests/phpunit/insertables/TranslatablePageInsertablesSuggesterTest.php
+++ b/tests/phpunit/insertables/TranslatablePageInsertablesSuggesterTest.php
@@ -18,12 +18,21 @@
 
public function getInsertablesProvider() {
return array(
-   array( 'Hi $1, I am $myname $my-middle-name 
$myLastName.', array(
-   new Insertable( '$1', '$1', '' ),
-   new Insertable( '$myname', '$myname', '' ),
-   new Insertable( '$my-middle-name', 
'$my-middle-name', '' ),
-   new Insertable( '$myLastName', '$myLastName', 
'' ),
-   ) ),
+   array(
+   'Hi $1, I am $myname $myLastName.',
+   array(
+   new Insertable( '$1', '$1', '' ),
+   new Insertable( '$myname', '$myname', 
'' ),
+   new Insertable( '$myLastName', 
'$myLastName', '' ),
+   )
+   ),
+   array(
+   'Insertables can $have-hyphens and $number9',
+   array(
+   new Insertable( '$have-hyphens', 
'$have-hyphens', '' ),
+   new Insertable( '$number9', '$number9', 
'' ),
+   )
+   ),
);
}
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic339bd2db56b510f74ebf2858edd18f2a6a4af62
Gerrit-PatchSet: 5
Gerrit-Project: mediawiki/extensions/Translate
Gerrit-Branch: master
Gerrit-Owner: Amire80 amir.ahar...@mail.huji.ac.il
Gerrit-Reviewer: Nikerabbit niklas.laxst...@gmail.com
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] Reads should be done against DB_SLAVE - change (mediawiki...Flow)

[Matthias Mullie (Code Review)]

Matthias Mullie has uploaded a new change for review.

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

Change subject: Reads should be done against DB_SLAVE
..

Reads should be done against DB_SLAVE

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


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

diff --git a/includes/Data/RevisionStorage.php 
b/includes/Data/RevisionStorage.php
index 93cbb53..4889ab1 100644
--- a/includes/Data/RevisionStorage.php
+++ b/includes/Data/RevisionStorage.php
@@ -58,7 +58,7 @@
}
 
protected function findInternal( array $attributes, array $options = 
array() ) {
-   $dbr = $this-dbFactory-getDB( DB_MASTER );
+   $dbr = $this-dbFactory-getDB( DB_SLAVE );
 
if ( ! $this-validateOptions( $options ) ) {
throw new MWException( Validation error in database 
options );
@@ -148,7 +148,7 @@
$duplicator-add( UUID::convertUUIDs( $query ), $idx );
}
 
-   $dbr = $this-dbFactory-getDB( DB_MASTER );
+   $dbr = $this-dbFactory-getDB( DB_SLAVE );
$res = $dbr-select(
$this-joinTable(),
array( $joinField = MAX( {$this-joinField()} ) ),

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I87be99c854d02c86223ab21fc2c03af1f4b835c9
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: Matthias Mullie mmul...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] mw.language: Fix exceptions and add tests - change (mediawiki...Scribunto)

[Anomie (Code Review)]

Anomie has uploaded a new change for review.

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

Change subject: mw.language: Fix exceptions and add tests
..

mw.language: Fix exceptions and add tests

Various methods are throwing exceptions when passed invalid language
codes. Those need to be caught.

And we should really add unit tests for the mw.language library, too.
Doing so exposed another bug (in lang:gender), which is also fixed here.

Bug: 62242
Change-Id: Ib7d257cbb1ce179c510273526910d6ac5f3cac5d
---
M engines/LuaCommon/LanguageLibrary.php
A tests/engines/LuaCommon/LanguageLibraryTest.php
A tests/engines/LuaCommon/LanguageLibraryTests.lua
3 files changed, 458 insertions(+), 3 deletions(-)


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

diff --git a/engines/LuaCommon/LanguageLibrary.php 
b/engines/LuaCommon/LanguageLibrary.php
index 4ddf900..1b99017 100644
--- a/engines/LuaCommon/LanguageLibrary.php
+++ b/engines/LuaCommon/LanguageLibrary.php
@@ -60,7 +60,12 @@
 
function isSupportedLanguage( $code ) {
$this-checkType( 'isSupportedLanguage', 1, $code, 'string' );
-   return array( Language::isSupportedLanguage( $code ) );
+   try {
+   // There's no good reason this should throw, but it 
does. Sigh.
+   return array( Language::isSupportedLanguage( $code ) );
+   } catch ( MWException $ex ) {
+   return array( false );
+   }
}
 
function isKnownLanguageTag( $code ) {
@@ -110,7 +115,11 @@
if ( count( $this-langCache )  
self::MAX_LANG_CACHE_SIZE ) {
throw new Scribunto_LuaError( 'too many 
language codes requested' );
}
-   $this-langCache[$code] = Language::factory( $code );
+   try {
+   $this-langCache[$code] = Language::factory( 
$code );
+   } catch ( MWException $ex ) {
+   throw new Scribunto_LuaError( language code 
'$code' is invalid );
+   }
}
$lang = $this-langCache[$code];
switch ( $name ) {
@@ -170,7 +179,7 @@
 */
function gender( $lang, $args ) {
$this-checkType( 'gender', 1, $args[0], 'string' );
-   $username = trim( array_shift( $args[0] ) );
+   $username = trim( array_shift( $args ) );
 
if ( is_array( $args[0] ) ) {
$args = $args[0];
diff --git a/tests/engines/LuaCommon/LanguageLibraryTest.php 
b/tests/engines/LuaCommon/LanguageLibraryTest.php
new file mode 100644
index 000..69420b3
--- /dev/null
+++ b/tests/engines/LuaCommon/LanguageLibraryTest.php
@@ -0,0 +1,11 @@
+?php
+
+class Scribunto_LuaLanguageLibraryTests extends Scribunto_LuaEngineTestBase {
+   protected static $moduleName = 'LanguageLibraryTests';
+
+   function getTestModules() {
+   return parent::getTestModules() + array(
+   'LanguageLibraryTests' = __DIR__ . 
'/LanguageLibraryTests.lua',
+   );
+   }
+}
diff --git a/tests/engines/LuaCommon/LanguageLibraryTests.lua 
b/tests/engines/LuaCommon/LanguageLibraryTests.lua
new file mode 100644
index 000..3604cc5
--- /dev/null
+++ b/tests/engines/LuaCommon/LanguageLibraryTests.lua
@@ -0,0 +1,435 @@
+local testframework = require 'Module:TestFramework'
+
+local langs = nil
+local function getLangs()
+   if langs == nil then
+   langs = {
+   mw.language.new( 'en' ),
+   mw.language.new( 'kaa' ),
+   mw.language.new( 'fa' ),
+   mw.language.new( '[[bogus]]' ),
+   }
+   end
+   return langs
+end
+
+local function test_method( func, ... )
+   local langs = getLangs()
+
+   local ret = {}
+   for i = 1, #langs do
+   local got = { pcall( langs[i][func], langs[i], ... ) }
+   if table.remove( got, 1 ) then
+   ret[i] = got
+   else
+   ret[i] = string.gsub( got[1], '^%S+:%d+: ', '' )
+   end
+   end
+   return unpack( ret )
+end
+
+local function test_method_lang( lang, func, ... )
+   local obj = mw.language.new( lang )
+   return obj[func]( obj, ... )
+end
+
+local function test_plural( lang )
+   local obj = mw.language.new( lang )
+   local ret1, ret2 = '', ''
+   local ret3, ret4 = '', ''
+   for i = 0, 29 do
+   ret1 = ret1 .. obj:convertPlural( i, 'a', 'b', 'c', 'd', 'e' )
+   ret2 = ret2 .. obj:convertPlural( i, { 'a', 'b', 'c', 'd', 'e' 
} )
+   ret3 = ret3 .. obj:plural( i, 'a', 'b', 'c', 'd', 'e' )
+   

[MediaWiki-commits] [Gerrit] Workaround for CSSJanus bug 61440 - change (mediawiki...Translate)

[jenkins-bot (Code Review)]

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

Change subject: Workaround for CSSJanus bug 61440
..


Workaround for CSSJanus bug 61440

Using another way to reach highest specifity.

Change-Id: Ic5c575068d91178863dcdc8f302100c3d7356e24
---
M resources/css/ext.translate.editor.css
1 file changed, 8 insertions(+), 0 deletions(-)

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



diff --git a/resources/css/ext.translate.editor.css 
b/resources/css/ext.translate.editor.css
index 6990451..6698734 100644
--- a/resources/css/ext.translate.editor.css
+++ b/resources/css/ext.translate.editor.css
@@ -212,7 +212,15 @@
border-left: 2px solid #3366BB;
padding: 5px 5px 5px 10px;
background-color: #f5f5f5;
+   /* CSSJanus fails to flip this. Bug 61440
margin: 0 5px 3px -5px !important;
+   */
+}
+
+/* Workaround for the above */
+.grid .row .row .tm-suggestion,
+.grid .row .row .in-other-language {
+   margin: 0 5px 3px -5px;
 }
 
 .tm-suggestion:hover,

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic5c575068d91178863dcdc8f302100c3d7356e24
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Translate
Gerrit-Branch: master
Gerrit-Owner: Nikerabbit niklas.laxst...@gmail.com
Gerrit-Reviewer: Amire80 amir.ahar...@mail.huji.ac.il
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] (bug 61911) use localized number patterns. - change (mediawiki...Wikibase)

[Daniel Kinzler (Code Review)]

Daniel Kinzler has uploaded a new change for review.

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

Change subject: (bug 61911) use localized number patterns.
..

(bug 61911) use localized number patterns.

When splitting quantitiy strings, use regex patterns derived from
MediaWiki language objects.

IMPORTANT: needs https://github.com/DataValues/Number/pull/2 (that is,
it needs the yet-to-be-released version 0.3 of data-values/numbers).

Change-Id: If2345c45b5da77ca83437aa925e4b36631fafd15
---
M composer.json
M lib/includes/formatters/MediaWikiNumberLocalizer.php
M lib/includes/formatters/WikibaseValueFormatterBuilders.php
M lib/includes/parsers/MediaWikiNumberUnlocalizer.php
M lib/tests/phpunit/parsers/MediaWikiNumberUnlocalizerTest.php
M repo/Wikibase.php
6 files changed, 176 insertions(+), 34 deletions(-)


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

diff --git a/composer.json b/composer.json
index feab4b8..f62590c 100644
--- a/composer.json
+++ b/composer.json
@@ -27,7 +27,7 @@
data-values/data-values: ~0.1.0,
data-values/common: ~0.2.0,
data-values/geo: ~0.1.0,
-   data-values/number: ~0.2.0,
+   data-values/number: ~0.2.0, // should be ~0.3.0, once 
that is released.
data-values/time: ~0.2.0,
data-values/validators: ~0.1.0,
data-values/data-types: ~0.1.0,
diff --git a/lib/includes/formatters/MediaWikiNumberLocalizer.php 
b/lib/includes/formatters/MediaWikiNumberLocalizer.php
index dbf162d..14a23b9 100644
--- a/lib/includes/formatters/MediaWikiNumberLocalizer.php
+++ b/lib/includes/formatters/MediaWikiNumberLocalizer.php
@@ -18,21 +18,29 @@
 class MediaWikiNumberLocalizer implements Localizer {
 
/**
+* @var Language
+*/
+   protected $language;
+
+   /**
+* @param Language $language
+*/
+   public function __construct( Language $language ) {
+   $this-language = $language;
+   }
+
+   /**
 * @see Localizer::localize()
 *
 * @since 0.5
 *
 * @param string $number a numeric string
-* @param string $language a language code
-* @param FormatterOptions $options
 *
 * @return string
 * @throws InvalidArgumentException
 */
-   public function localize( $number, $language, FormatterOptions $options 
) {
-   $language = Language::factory( $language );
-
-   $localiezdNumber = $language-formatNum( $number );
+   public function localizeNumber( $number ) {
+   $localiezdNumber = $this-language-formatNum( $number );
return $localiezdNumber;
}
 }
diff --git a/lib/includes/formatters/WikibaseValueFormatterBuilders.php 
b/lib/includes/formatters/WikibaseValueFormatterBuilders.php
index 7fe9fb8..68b06da 100644
--- a/lib/includes/formatters/WikibaseValueFormatterBuilders.php
+++ b/lib/includes/formatters/WikibaseValueFormatterBuilders.php
@@ -487,7 +487,8 @@
 */
protected static function newQuantityFormatter( FormatterOptions 
$options, $builders ) {
//TODO: use a builder for this DecimalFormatter
-   $localizer = new MediaWikiNumberLocalizer();
+   $language = Language::factory( $options-getOption( 
ValueFormatter::OPT_LANG ) );
+   $localizer = new MediaWikiNumberLocalizer( $language );
$decimalFormatter = new DecimalFormatter( $options, $localizer 
);
return new QuantityFormatter( $decimalFormatter, $options );
}
diff --git a/lib/includes/parsers/MediaWikiNumberUnlocalizer.php 
b/lib/includes/parsers/MediaWikiNumberUnlocalizer.php
index b802bf3..d690b64 100644
--- a/lib/includes/parsers/MediaWikiNumberUnlocalizer.php
+++ b/lib/includes/parsers/MediaWikiNumberUnlocalizer.php
@@ -2,8 +2,7 @@
 
 namespace Wikibase\Lib;
 use Language;
-use ValueParsers\ParserOptions;
-use ValueParsers\Unlocalizer;
+use ValueParsers\BasicUnlocalizer;
 
 /**
  * MediaWikiNumberUnlocalizer
@@ -13,21 +12,68 @@
  * @license GPL 2+
  * @author Daniel Kinzler
  */
-class MediaWikiNumberUnlocalizer implements Unlocalizer {
+class MediaWikiNumberUnlocalizer extends BasicUnlocalizer {
+
+   /**
+* @var Language
+*/
+   protected $language;
+
+   /**
+* @param Language $language
+*/
+   public function __construct( Language $language ) {
+   $this-language = $language;
+   }
 
/**
 * @see Unlocalizer::unlocalize()
 *
 * @param string $number string to process
-* @param string $language language code
-* @param ParserOptions $options
 *
 * @return string unlocalized string
 */
-   public function unlocalize( $number, $language, ParserOptions 

[MediaWiki-commits] [Gerrit] beta: on eqiad mount /srv using labs_lvm - change (operations/puppet)

[Hashar (Code Review)]

Hashar has uploaded a new change for review.

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

Change subject: beta: on eqiad mount /srv using labs_lvm
..

beta: on eqiad mount /srv using labs_lvm

There is no /dev/vdb on eqiad labs, we need to use lvm to create a
partition for us.

/srv is/will be used by git-deploy/Trebuchet/Sartoris..

Change-Id: I6d6670db766c381e8a5915415cfa464445f73e42
---
M manifests/role/applicationserver.pp
1 file changed, 19 insertions(+), 12 deletions(-)


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

diff --git a/manifests/role/applicationserver.pp 
b/manifests/role/applicationserver.pp
index bdb82fe..e76fb89 100644
--- a/manifests/role/applicationserver.pp
+++ b/manifests/role/applicationserver.pp
@@ -66,19 +66,26 @@
if $::realm == 'labs' {
# MediaWiki configuration specific to labs instances 
('beta' project)
class { mediawiki: twemproxy = false }
-   # Umount /dev/vdb from /mnt ...
-   mount { '/mnt':
-   name = '/mnt',
-   ensure = absent,
-   }
 
-   # ... and mount it on /srv
-   mount { '/srv':
-   ensure = mounted,
-   device = '/dev/vdb',
-   fstype = 'auto',
-   options = 
'defaults,nobootwait,comment=cloudconfig',
-   require = Mount['/mnt'],
+   if $::site == 'pmtpa' {
+   # Umount /dev/vdb from /mnt ...
+   mount { '/mnt':
+   name = '/mnt',
+   ensure = absent,
+   }
+
+   # ... and mount it on /srv
+   mount { '/srv':
+   ensure = mounted,
+   device = '/dev/vdb',
+   fstype = 'auto',
+   options = 
'defaults,nobootwait,comment=cloudconfig',
+   require = Mount['/mnt'],
+   }
+   } elsif $::site == 'eqiad' {
+   # Does not come with /dev/vdb, we need to mount 
it using lvm
+   include labs_lvm
+   labs_lvm::volume { 'second-local-disk': mountat 
= '/srv' }
}
}
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6d6670db766c381e8a5915415cfa464445f73e42
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Hashar has...@free.fr

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

[MediaWiki-commits] [Gerrit] New Wikidata Build - 05/03/2014 17:00 - change (mediawiki...Wikidata)

[WikidataBuilder (Code Review)]

WikidataBuilder has uploaded a new change for review.

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

Change subject: New Wikidata Build - 05/03/2014 17:00
..

New Wikidata Build - 05/03/2014 17:00

Change-Id: Id124878640e9c0eadbd740ca65315f788fc9cb76
---
M composer.lock
M 
extensions/Wikibase/lib/resources/jquery.wikibase/themes/default/jquery.wikibase.entityselector.css
M extensions/Wikibase/repo/resources/themes/default/wikibase.ui.entitysearch.css
M extensions/Wikibase/repo/resources/wikibase.ui.entitysearch.js
M vendor/autoload.php
M vendor/composer/autoload_real.php
M vendor/composer/installed.json
7 files changed, 34 insertions(+), 23 deletions(-)


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

diff --git a/composer.lock b/composer.lock
index aa70b61..7cb03c0 100644
--- a/composer.lock
+++ b/composer.lock
@@ -851,12 +851,12 @@
 source: {
 type: git,
 url: 
https://github.com/wikimedia/mediawiki-extensions-Wikibase.git;,
-reference: 578cff2cec37324d4ea7e24908ad476405bca560
+reference: 5efd64371d362fc7b34cb37b3b5a4321b480d11a
 },
 dist: {
 type: zip,
-url: 
https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/578cff2cec37324d4ea7e24908ad476405bca560;,
-reference: 578cff2cec37324d4ea7e24908ad476405bca560,
+url: 
https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/5efd64371d362fc7b34cb37b3b5a4321b480d11a;,
+reference: 5efd64371d362fc7b34cb37b3b5a4321b480d11a,
 shasum: 
 },
 require: {
@@ -915,7 +915,7 @@
 wikibaserepo,
 wikidata
 ],
-time: 2014-03-05 10:44:24
+time: 2014-03-05 15:20:32
 }
 ],
 packages-dev: [
diff --git 
a/extensions/Wikibase/lib/resources/jquery.wikibase/themes/default/jquery.wikibase.entityselector.css
 
b/extensions/Wikibase/lib/resources/jquery.wikibase/themes/default/jquery.wikibase.entityselector.css
index 23d04d8..0beed8c 100644
--- 
a/extensions/Wikibase/lib/resources/jquery.wikibase/themes/default/jquery.wikibase.entityselector.css
+++ 
b/extensions/Wikibase/lib/resources/jquery.wikibase/themes/default/jquery.wikibase.entityselector.css
@@ -25,8 +25,9 @@
 .ui-entityselector-list .ui-entityselector-aliases {
display: block;
overflow: hidden;
-   white-space: nowrap;
+   -o-text-overflow: ellipsis; /* Opera 9 to 10 */
text-overflow: ellipsis;
+   white-space: nowrap;
 }
 
 .ui-entityselector-list .ui-entityselector-section-container {
diff --git 
a/extensions/Wikibase/repo/resources/themes/default/wikibase.ui.entitysearch.css
 
b/extensions/Wikibase/repo/resources/themes/default/wikibase.ui.entitysearch.css
index ec5b881..0494ec0 100644
--- 
a/extensions/Wikibase/repo/resources/themes/default/wikibase.ui.entitysearch.css
+++ 
b/extensions/Wikibase/repo/resources/themes/default/wikibase.ui.entitysearch.css
@@ -12,13 +12,20 @@
 }
 
 .ui-entityselector-list .wb-entitysearch-suggestions .suggestions-special {
-   display: block;
-   border: none;
background-color: transparent;
+   border: 0;
+   display: block;
margin: 0;
padding: 0;
 }
 
+.ui-entityselector-list .wb-entitysearch-suggestions .special-query {
+   overflow: hidden;
+   -o-text-overflow: ellipsis; /* Opera 9 to 10 */
+   text-overflow: ellipsis;
+   white-space: nowrap;
+}
+
 .ui-entityselector-list .wb-entitysearch-suggestions .ui-state-hover div {
-   color: #FF;
+   color: #FFF;
 }
diff --git a/extensions/Wikibase/repo/resources/wikibase.ui.entitysearch.js 
b/extensions/Wikibase/repo/resources/wikibase.ui.entitysearch.js
index 7164afb..8225389 100644
--- a/extensions/Wikibase/repo/resources/wikibase.ui.entitysearch.js
+++ b/extensions/Wikibase/repo/resources/wikibase.ui.entitysearch.js
@@ -51,11 +51,14 @@
url: mw.config.get( 'wgServer' ) + mw.config.get( 
'wgScriptPath' ) + '/api.php',
emulateSearchBox: true,
customListItem: {
-   content: $( 'div/' ).addClass( 
'suggestions-special' )
-   .append( $( 'div/' ).addClass( 
'special-label ' ).text(
-   mw.msg( 
'searchsuggest-containing' ) )
-   )
-   .append( $( 'div/' ).addClass( 
'special-query' )
+   content: $( 'div' )
+   .addClass( 'suggestions-special' )
+   .append(
+   $( 'div' )
+

[MediaWiki-commits] [Gerrit] Temporarily changing install server for row a eqiad to brewster - change (operations/puppet)

[Cmjohnson (Code Review)]

Cmjohnson has uploaded a new change for review.

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

Change subject: Temporarily changing install server for row a eqiad to brewster
..

Temporarily changing install server for row a eqiad to brewster

Change-Id: Iea8293aacf9d0e97b842efd82e285f6a51662ccf
---
M modules/install-server/files/dhcpd/dhcpd.conf
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/modules/install-server/files/dhcpd/dhcpd.conf 
b/modules/install-server/files/dhcpd/dhcpd.conf
index fd164c9..a0860ae 100644
--- a/modules/install-server/files/dhcpd/dhcpd.conf
+++ b/modules/install-server/files/dhcpd/dhcpd.conf
@@ -109,7 +109,7 @@
option routers 208.80.154.1;
option domain-name wikimedia.org;
 
-   next-server 208.80.154.10; # carbon (tftp server)
+   next-server 208.80.152.171; # brewster (tftp server)
 }
 
 # public1-b-eqiad

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iea8293aacf9d0e97b842efd82e285f6a51662ccf
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Cmjohnson cmjohn...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] Temporarily changing install server for row a eqiad to brewster - change (operations/puppet)

[Cmjohnson (Code Review)]

Cmjohnson has submitted this change and it was merged.

Change subject: Temporarily changing install server for row a eqiad to brewster
..


Temporarily changing install server for row a eqiad to brewster

Change-Id: Iea8293aacf9d0e97b842efd82e285f6a51662ccf
---
M modules/install-server/files/dhcpd/dhcpd.conf
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/modules/install-server/files/dhcpd/dhcpd.conf 
b/modules/install-server/files/dhcpd/dhcpd.conf
index fd164c9..a0860ae 100644
--- a/modules/install-server/files/dhcpd/dhcpd.conf
+++ b/modules/install-server/files/dhcpd/dhcpd.conf
@@ -109,7 +109,7 @@
option routers 208.80.154.1;
option domain-name wikimedia.org;
 
-   next-server 208.80.154.10; # carbon (tftp server)
+   next-server 208.80.152.171; # brewster (tftp server)
 }
 
 # public1-b-eqiad

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Iea8293aacf9d0e97b842efd82e285f6a51662ccf
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Cmjohnson cmjohn...@wikimedia.org
Gerrit-Reviewer: Cmjohnson cmjohn...@wikimedia.org
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] Give Cirrus to all Wikiquotes - change (operations/mediawiki-config)

[jenkins-bot (Code Review)]

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

Change subject: Give Cirrus to all Wikiquotes
..


Give Cirrus to all Wikiquotes

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

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



diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index 0d0ed21..43108e3 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -12726,6 +12726,7 @@
'wikibooks' = true,
'wikinews' = true,
'wikimedia' = true,
+   'wikiquote' = true,
'wikisource' = true,
'wikiversity' = true,
'wiktionary' = true,
@@ -12733,6 +12734,8 @@
 
 'wmgCirrusIsBuilding' = array(
'default' = false,
+   'wikiquote' = true,
+   'itwikiquote' = false,
 ),
 
 'wmgCirrusSearchPreferRecentDefaultDecayPortion' = array(

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib20a7f9d5081291cd2ed329cdec65848c119acae
Gerrit-PatchSet: 2
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Chad ch...@wikimedia.org
Gerrit-Reviewer: Chad ch...@wikimedia.org
Gerrit-Reviewer: Deskana dga...@wikimedia.org
Gerrit-Reviewer: Manybubbles never...@wikimedia.org
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] Collapse block slugs and expand on hover/focus - change (VisualEditor/VisualEditor)

[jenkins-bot (Code Review)]

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

Change subject: Collapse block slugs and expand on hover/focus
..


Collapse block slugs and expand on hover/focus

By default collapse the height of block slugs to about half the height
and expand on hover or focus with CSS. Show a dotted outline on hover
to make it clear you are inserting a new paragraph.

As the :focus psuedo class doesn't work on contenteditable's children,
toggle a class in the slug detecting code of SurfaceObserver.

Bug: 47790
Change-Id: Iab25fc6d5e21d0014482913e148c53b32d9652c4
---
M modules/ve/ce/styles/ve.ce.Node.css
M modules/ve/ce/ve.ce.BranchNode.js
M modules/ve/ce/ve.ce.SurfaceObserver.js
3 files changed, 48 insertions(+), 5 deletions(-)

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



diff --git a/modules/ve/ce/styles/ve.ce.Node.css 
b/modules/ve/ce/styles/ve.ce.Node.css
index f3d112f..c263a4e 100644
--- a/modules/ve/ce/styles/ve.ce.Node.css
+++ b/modules/ve/ce/styles/ve.ce.Node.css
@@ -211,8 +211,37 @@
 
 /* ve.ce.BranchNode */
 
-.ve-ce-branchNode-blockSlug {
-   display: block;
+.ve-ce-branchNode-blockSlugWrapper-unfocussed {
+   margin: 0 0 -0.2em 0;
+}
+
+.ve-ce-branchNode-blockSlugWrapper {
+   background-color: transparent;
+   outline: transparent dashed 1px;
+   -webkit-transition: outline-color 400ms ease-out, background-color 
400ms ease-out;
+   -moz-transition: outline-color 400ms ease-out, background-color 400ms 
ease-out;
+   -o-transition: outline-color 400ms ease-out, background-color 400ms 
ease-out;
+   transition: outline-color 400ms ease-out, background-color 400ms 
ease-out;
+}
+
+.ve-ce-branchNode-blockSlugWrapper-unfocussed:hover {
+   outline-color: #bbb;
+   background-color: rgba(0, 0, 0, 0.025);
+}
+
+.ve-ce-branchNode-blockSlugWrapper-unfocussed .ve-ce-branchNode-blockSlug {
+   height: 1em;
+   font-size: 0.7em;
+   margin: 0.2em 0;
+   padding: 0.25em 0;
+}
+
+.ve-ce-branchNode-blockSlugWrapper .ve-ce-branchNode-blockSlug {
+   overflow: hidden;
+   -webkit-transition: height 200ms ease-out, font-size 200ms ease-out, 
margin 200ms ease-out, padding 200ms ease-out;
+   -moz-transition: height 200ms ease-out, font-size 200ms ease-out, 
margin 200ms ease-out, padding 200ms ease-out;
+   -o-transition: height 200ms ease-out, font-size 200ms ease-out, margin 
200ms ease-out, padding 200ms ease-out;
+   transition: height 200ms ease-out, font-size 200ms ease-out, margin 
200ms ease-out, padding 200ms ease-out;
 }
 
 /* ve.ce.PreformattedNode */
diff --git a/modules/ve/ce/ve.ce.BranchNode.js 
b/modules/ve/ce/ve.ce.BranchNode.js
index 5c0079d..8d207f2 100644
--- a/modules/ve/ce/ve.ce.BranchNode.js
+++ b/modules/ve/ce/ve.ce.BranchNode.js
@@ -72,9 +72,13 @@
  * @static
  * @property {jQuery}
  */
-ve.ce.BranchNode.$blockSlugTemplate = $( 'span' )
-   .addClass( 've-ce-branchNode-slug ve-ce-branchNode-blockSlug' )
-   .html( $.browser.msie ? 'nbsp;' : '#xFEFF;' );
+ve.ce.BranchNode.$blockSlugTemplate = $( 'div' )
+   .addClass( 've-ce-branchNode-blockSlugWrapper 
ve-ce-branchNode-blockSlugWrapper-unfocussed' )
+   .append(
+   $( 'p' )
+   .addClass( 've-ce-branchNode-slug 
ve-ce-branchNode-blockSlug' )
+   .html( $.browser.msie ? 'nbsp;' : '#xFEFF;' )
+   );
 
 /* Methods */
 
diff --git a/modules/ve/ce/ve.ce.SurfaceObserver.js 
b/modules/ve/ce/ve.ce.SurfaceObserver.js
index bd36f47..cdbe7c5 100644
--- a/modules/ve/ce/ve.ce.SurfaceObserver.js
+++ b/modules/ve/ce/ve.ce.SurfaceObserver.js
@@ -190,8 +190,18 @@
$nodeOrSlug = $( rangyRange.anchorNode ).closest( 
'.ve-ce-branchNode, .ve-ce-branchNode-slug' );
if ( $nodeOrSlug.length ) {
range = rangyRange.getRange();
+   if ( this.$slugWrapper ) {
+   this.$slugWrapper
+   .addClass( 
've-ce-branchNode-blockSlugWrapper-unfocussed' )
+   .removeClass( 
've-ce-branchNode-blockSlugWrapper-focussed' );
+   this.$slugWrapper = null;
+   }
if ( !$nodeOrSlug.hasClass( 've-ce-branchNode-slug' ) ) 
{
node = $nodeOrSlug.data( 'view' );
+   } else {
+   this.$slugWrapper = $nodeOrSlug.closest( 
'.ve-ce-branchNode-blockSlugWrapper' )
+   .addClass( 
've-ce-branchNode-blockSlugWrapper-focussed' )
+   .removeClass( 
've-ce-branchNode-blockSlugWrapper-unfocussed' );
}
}
}

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

[MediaWiki-commits] [Gerrit] Make mw.wikibase.getEntityObject() actually return non-Legac... - change (mediawiki...Wikidata)

[Addshore (Code Review)]

Addshore has uploaded a new change for review.

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

Change subject: Make mw.wikibase.getEntityObject() actually return 
non-Legacydata
..

Make mw.wikibase.getEntityObject() actually return non-Legacydata

Change-Id: Ibea9a650c70cb983d1b9dad1605c8657043fb05a
---
M composer.json
M composer.lock
M extensions/Wikibase/client/includes/scribunto/Scribunto_LuaWikibaseLibrary.php
M extensions/Wikibase/client/includes/scribunto/mw.wikibase.entity.lua
M vendor/autoload.php
M vendor/composer/autoload_classmap.php
M vendor/composer/autoload_real.php
M vendor/composer/installed.json
8 files changed, 23 insertions(+), 190 deletions(-)


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

diff --git a/composer.json b/composer.json
index 2541b8f..bfa2e98 100644
--- a/composer.json
+++ b/composer.json
@@ -1,7 +1,7 @@
 {
 require: {
 php: =5.3.0,
-wikibase/wikibase: dev-master
+wikibase/wikibase: dev-mw1.23-wmf17
 },
 config:{
 github-oauth:{
diff --git a/composer.lock b/composer.lock
index aa70b61..c56ef19 100644
--- a/composer.lock
+++ b/composer.lock
@@ -3,7 +3,7 @@
 This file locks the dependencies of your project to a known state,
 Read more about it at 
http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file;
 ],
-hash: 8e4f22bbedb9cd631ca304098ea9177c,
+hash: d9a578a08cd4843013eb843677b20b4c,
 packages: [
 {
 name: composer/installers,
@@ -847,16 +847,16 @@
 },
 {
 name: wikibase/wikibase,
-version: dev-master,
+version: dev-mw1.23-wmf17,
 source: {
 type: git,
 url: 
https://github.com/wikimedia/mediawiki-extensions-Wikibase.git;,
-reference: 578cff2cec37324d4ea7e24908ad476405bca560
+reference: 69eff3f60cd0116e6c78c9052e55877c5b5c9388
 },
 dist: {
 type: zip,
-url: 
https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/578cff2cec37324d4ea7e24908ad476405bca560;,
-reference: 578cff2cec37324d4ea7e24908ad476405bca560,
+url: 
https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/69eff3f60cd0116e6c78c9052e55877c5b5c9388;,
+reference: 69eff3f60cd0116e6c78c9052e55877c5b5c9388,
 shasum: 
 },
 require: {
@@ -915,7 +915,7 @@
 wikibaserepo,
 wikidata
 ],
-time: 2014-03-05 10:44:24
+time: 2014-03-05 16:06:26
 }
 ],
 packages-dev: [
diff --git 
a/extensions/Wikibase/client/includes/scribunto/Scribunto_LuaWikibaseLibrary.php
 
b/extensions/Wikibase/client/includes/scribunto/Scribunto_LuaWikibaseLibrary.php
index 68d2e05..366c123 100644
--- 
a/extensions/Wikibase/client/includes/scribunto/Scribunto_LuaWikibaseLibrary.php
+++ 
b/extensions/Wikibase/client/includes/scribunto/Scribunto_LuaWikibaseLibrary.php
@@ -75,7 +75,7 @@
 * @throws ScribuntoException
 * @return array
 */
-   public function getEntity( $prefixedEntityId = null, $legacyStyle = 
true ) {
+   public function getEntity( $prefixedEntityId = null, $legacyStyle = 
false ) {
$this-checkType( 'getEntity', 1, $prefixedEntityId, 'string' );
$this-checkType( 'getEntity', 2, $legacyStyle, 'boolean' );
try {
diff --git 
a/extensions/Wikibase/client/includes/scribunto/mw.wikibase.entity.lua 
b/extensions/Wikibase/client/includes/scribunto/mw.wikibase.entity.lua
index e53467b..ed18c2d 100644
--- a/extensions/Wikibase/client/includes/scribunto/mw.wikibase.entity.lua
+++ b/extensions/Wikibase/client/includes/scribunto/mw.wikibase.entity.lua
@@ -95,10 +95,8 @@
 
local n = 0
for k, v in pairs( entity.claims ) do
-   if string.match( k, '^%u%d+' ) ~= nil then
-   n = n + 1
-   properties[n] = k
-   end
+   n = n + 1
+   properties[n] = k
end
 
return properties
diff --git a/vendor/autoload.php b/vendor/autoload.php
index 3718ba5..65e4e02 100644
--- a/vendor/autoload.php
+++ b/vendor/autoload.php
@@ -4,4 +4,4 @@
 
 require_once __DIR__ . '/composer' . '/autoload_real.php';
 
-return ComposerAutoloaderInit0e113fd84f04f6d81533adba7117a202::getLoader();
+return ComposerAutoloaderInit0027075d4f3649b441519a800b8f386b::getLoader();
diff --git a/vendor/composer/autoload_classmap.php 
b/vendor/composer/autoload_classmap.php
index 3add819..99a8183 100644
--- a/vendor/composer/autoload_classmap.php
+++ b/vendor/composer/autoload_classmap.php
@@ -7,67 +7,9 @@
 
 return array(
 'Comparable' = $vendorDir . 

[MediaWiki-commits] [Gerrit] Slightly strong shading on slug hover target - change (VisualEditor/VisualEditor)

[Esanders (Code Review)]

Esanders has uploaded a new change for review.

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

Change subject: Slightly strong shading on slug hover target
..

Slightly strong shading on slug hover target

Change-Id: I9bbcf17708e11a888c476a22d3d59a9e852758fc
---
M modules/ve/ce/styles/ve.ce.Node.css
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/VisualEditor/VisualEditor 
refs/changes/93/116993/1

diff --git a/modules/ve/ce/styles/ve.ce.Node.css 
b/modules/ve/ce/styles/ve.ce.Node.css
index c263a4e..8543dd0 100644
--- a/modules/ve/ce/styles/ve.ce.Node.css
+++ b/modules/ve/ce/styles/ve.ce.Node.css
@@ -226,7 +226,7 @@
 
 .ve-ce-branchNode-blockSlugWrapper-unfocussed:hover {
outline-color: #bbb;
-   background-color: rgba(0, 0, 0, 0.025);
+   background-color: rgba(0, 0, 0, 0.035);
 }
 
 .ve-ce-branchNode-blockSlugWrapper-unfocussed .ve-ce-branchNode-blockSlug {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9bbcf17708e11a888c476a22d3d59a9e852758fc
Gerrit-PatchSet: 1
Gerrit-Project: VisualEditor/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders esand...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] Wikiquotes no longer building - change (operations/mediawiki-config)

[Chad (Code Review)]

Chad has uploaded a new change for review.

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

Change subject: Wikiquotes no longer building
..

Wikiquotes no longer building

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


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

diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index 43108e3..df0c708 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -12718,7 +12718,6 @@
'frwiki' = true,
'guwiki' = true,
'huwiki' = true,
-   'itwikiquote' = true,
'nlwiki' = true,
'ptwiki' = true,
'ruwiki' = true,
@@ -12734,8 +12733,6 @@
 
 'wmgCirrusIsBuilding' = array(
'default' = false,
-   'wikiquote' = true,
-   'itwikiquote' = false,
 ),
 
 'wmgCirrusSearchPreferRecentDefaultDecayPortion' = array(

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I1315496f90da8dcf34bffeb30469d73b74666b48
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Chad ch...@wikimedia.org

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