[MediaWiki-commits] [Gerrit] change to set right alt attribute - change (mediawiki...BlueSpiceExtensions)
Tweichart has uploaded a new change for review.
https://gerrit.wikimedia.org/r/188759
Change subject: change to set right alt attribute
..
change to set right alt attribute
Change-Id: I5e051f3f461240fb32f561cd375a0d71030e8eed
---
M Flexiskin/Flexiskin.class.php
1 file changed, 8 insertions(+), 1 deletion(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceExtensions
refs/changes/59/188759/1
diff --git a/Flexiskin/Flexiskin.class.php b/Flexiskin/Flexiskin.class.php
index fbc7cf9..f6f068f 100644
--- a/Flexiskin/Flexiskin.class.php
+++ b/Flexiskin/Flexiskin.class.php
@@ -335,7 +335,14 @@
if ($aConfig[1]-logo == )
return true;
$sPath = BS_DATA_PATH . /flexiskin/ . $sId .
/images/;
- $sImg = img src='.$sPath .
$aConfig[1]-logo.' /;
+ $sPageName = ;
+ global $wgSitename;
+ $oTitle = RequestContext::getMain()-getTitle();
+ if ( !is_null( $oTitle ) ) {
+ $sPageName = $oTitle-getText() . - ;
+ }
+ $sPageName .= $wgSitename;
+ $sImg = img src=' . $sPath .
$aConfig[1]-logo . ' alt=' . $sPageName . '/;
return false;
}
return true;
--
To view, visit https://gerrit.wikimedia.org/r/188759
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I5e051f3f461240fb32f561cd375a0d71030e8eed
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: REL1_22
Gerrit-Owner: Tweichart weich...@hallowelt.biz
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] change to set right alt attribute - change (mediawiki...BlueSpiceSkin)
Tweichart has uploaded a new change for review.
https://gerrit.wikimedia.org/r/188758
Change subject: change to set right alt attribute
..
change to set right alt attribute
Change-Id: I73fd975811d05b5127c893cc66d149a1ae91cc3b
---
M includes/BlueSpiceSkinHooks.php
1 file changed, 17 insertions(+), 9 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/BlueSpiceSkin
refs/changes/58/188758/1
diff --git a/includes/BlueSpiceSkinHooks.php b/includes/BlueSpiceSkinHooks.php
index b1be4c9..2fa005b 100644
--- a/includes/BlueSpiceSkinHooks.php
+++ b/includes/BlueSpiceSkinHooks.php
@@ -3,7 +3,7 @@
class BlueSpiceSkinHooks {
/**
-*
+*
* @param SkinTemplate $sktemplate
* @param BaseTemplate $tpl
* @return boolean Always true to keep Hook running
@@ -24,7 +24,7 @@
}
/**
-*
+*
* @param type $oStatebar
* @param type $aTopViews
* @param type $oUser
@@ -49,7 +49,7 @@
}
/**
-*
+*
* @param SkinTemplate $skin
* @param Title $title
* @param int $section
@@ -125,14 +125,22 @@
$bar['TOOLBOX'] = array();
return true;
}
- public static function onBSGetLogo($sImg){
- $sLogoPath = BsConfig::get('MW::LogoPath');
- if (substr($sLogoPath,0,1) != '/' substr($sLogoPath,0,4) !=
'http')
- $sLogoPath = / . $sLogoPath;
- $sImg = img src='.$sLogoPath.' alt='' /;
+ public static function onBSGetLogo( $sImg ) {
+ global $wgSitename;
+ $sLogoPath = BsConfig::get( 'MW::LogoPath' );
+ if ( substr( $sLogoPath, 0, 1 ) != '/' substr( $sLogoPath,
0, 4 ) != 'http' ) {
+ $sLogoPath = / . $sLogoPath;
+ }
+ $sPageName = ;
+ $oTitle = RequestContext::getMain()-getTitle();
+ if ( !is_null( $oTitle ) ) {
+ $sPageName = $oTitle-getText() . - ;
+ }
+ $sPageName .= $wgSitename;
+ $sImg = img src=' . $sLogoPath . ' alt=' . $sPageName . '
/;
return true;
}
-
+
public static function onVisualEditorConfig($aStandardConf,
$aDefaultConf){
global $wgStylePath, $wgServer;
if (isset($aStandardConf['content_css'])
$aStandardConf['content_css'] != )
--
To view, visit https://gerrit.wikimedia.org/r/188758
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I73fd975811d05b5127c893cc66d149a1ae91cc3b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/BlueSpiceSkin
Gerrit-Branch: REL1_22
Gerrit-Owner: Tweichart weich...@hallowelt.biz
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] tests: Add MT healthcheck for en-ru pair - change (mediawiki...cxserver)
jenkins-bot has submitted this change and it was merged. Change subject: tests: Add MT healthcheck for en-ru pair .. tests: Add MT healthcheck for en-ru pair Change-Id: Ia383969c6773b7a77dc50de8b6ad764a258d925b --- M public/translation/js/main.js 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Santhosh: Looks good to me, approved Jsahleen: Looks good to me, but someone else must approve jenkins-bot: Verified diff --git a/public/translation/js/main.js b/public/translation/js/main.js index ae296cb..fc759cd 100644 --- a/public/translation/js/main.js +++ b/public/translation/js/main.js @@ -67,6 +67,7 @@ 'en-eo': [ 'And', 'Kaj' ], 'en-gl': [ 'Only', 'Só' ], 'en-es': [ 'hello', 'hola' ], + 'en-ru': [ 'hello', 'привет' ], 'eo-en': [ 'kaj', 'and' ], 'eu-en': [ 'kaixo', 'hello' ], 'eu-es': [ 'kaixo', 'hola' ], -- To view, visit https://gerrit.wikimedia.org/r/188832 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ia383969c6773b7a77dc50de8b6ad764a258d925b Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/services/cxserver Gerrit-Branch: master Gerrit-Owner: KartikMistry kartik.mis...@gmail.com Gerrit-Reviewer: Jsahleen jsahl...@wikimedia.org Gerrit-Reviewer: Santhosh santhosh.thottin...@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-disable compact_memory cron for jessie caches - change (operations/puppet)
BBlack has uploaded a new change for review.
https://gerrit.wikimedia.org/r/188973
Change subject: re-disable compact_memory cron for jessie caches
..
re-disable compact_memory cron for jessie caches
Doesn't seem to be causing the cp1064 issues
See also: b7c51400 f8f989df
Change-Id: I2b56966a42980e3c6c6ef5e78aa82a6af74c85ef
---
M manifests/role/cache.pp
1 file changed, 8 insertions(+), 6 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/73/188973/1
diff --git a/manifests/role/cache.pp b/manifests/role/cache.pp
index f71a54e..c01219c 100644
--- a/manifests/role/cache.pp
+++ b/manifests/role/cache.pp
@@ -710,12 +710,14 @@
'labs' = ['vdb'],
}
-# This seems to prevent long term memory fragmentation issues that
-# result in XFS deadlock log spam + bad problems for varnish health
-cron { 'varnish_vm_compact_cron':
-command = 'echo 1 /proc/sys/vm/compact_memory',
-user= 'root',
-minute = '*',
+unless os_version('debian = jessie') { # testing whether we need this
for jessie's 3.16 kernel
+# This seems to prevent long term memory fragmentation issues that
+# result in XFS deadlock log spam + bad problems for varnish
health
+cron { 'varnish_vm_compact_cron':
+command = 'echo 1 /proc/sys/vm/compact_memory',
+user= 'root',
+minute = '*',
+}
}
#class { varnish::packages: version = 3.0.3plus~rc1-wm5 }
--
To view, visit https://gerrit.wikimedia.org/r/188973
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I2b56966a42980e3c6c6ef5e78aa82a6af74c85ef
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BBlack bbl...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] PEP 440 version scheme - change (pywikibot...httplib2)
John Vandenberg has uploaded a new change for review.
https://gerrit.wikimedia.org/r/188975
Change subject: PEP 440 version scheme
..
PEP 440 version scheme
Replace httplib2-0.9-pywikibot1
withhttplib2-0.9+pywikibot2
Change-Id: I3a3416edb2f3cf2433785f3cc78d066f883720bc
---
M setup.py
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/pywikibot/externals/httplib2
refs/changes/75/188975/1
diff --git a/setup.py b/setup.py
index 0cb7855..5bfac16 100755
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@
import sys
pkgdir = {'': 'python%s' % sys.version_info[0]}
-VERSION = '0.9-pywikibot1'
+VERSION = '0.9+pywikibot2'
setup(name='httplib2',
version=VERSION,
--
To view, visit https://gerrit.wikimedia.org/r/188975
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I3a3416edb2f3cf2433785f3cc78d066f883720bc
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/externals/httplib2
Gerrit-Branch: master
Gerrit-Owner: John Vandenberg jay...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] PEP 440 version scheme - change (pywikibot/core)
John Vandenberg has uploaded a new change for review.
https://gerrit.wikimedia.org/r/188976
Change subject: PEP 440 version scheme
..
PEP 440 version scheme
Travis builds are now using pip 6.0.7 instead of 1.5.6,
which is causing all builds to fail due to PEP 440
versioning problems.
Change-Id: Ied6893eab08e4a5001cc76d99ec1191cbe821160
---
M setup.py
1 file changed, 2 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core
refs/changes/76/188976/1
diff --git a/setup.py b/setup.py
index 0fb9d3a..377913b 100644
--- a/setup.py
+++ b/setup.py
@@ -14,7 +14,7 @@
test_deps = []
-dependencies = ['httplib2=0.9.0']
+dependencies = ['httplib2=0.9']
extra_deps = {
# Core library dependencies
@@ -51,7 +51,7 @@
else 'flickrapi=1.4.5')
dependency_links = [
-
'https://git.wikimedia.org/zip/?r=pywikibot/externals/httplib2.gitformat=gz#egg=httplib2-0.8-pywikibot1',
+
'https://git.wikimedia.org/zip/?r=pywikibot/externals/httplib2.gitformat=gz#egg=httplib2-0.9+pywikibot2',
'git+https://github.com/AlereDevices/lunatic-python.git#egg=lunatic-python',
]
--
To view, visit https://gerrit.wikimedia.org/r/188976
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ied6893eab08e4a5001cc76d99ec1191cbe821160
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: John Vandenberg jay...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix whitespace - change (mediawiki...ContentTranslation)
Nikerabbit has uploaded a new change for review.
https://gerrit.wikimedia.org/r/188977
Change subject: Fix whitespace
..
Fix whitespace
Change-Id: I32249c7128cb587c3b5523bc9cd18478e9c46933
---
M modules/util/ext.cx.util.js
1 file changed, 1 insertion(+), 1 deletion(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ContentTranslation
refs/changes/77/188977/1
diff --git a/modules/util/ext.cx.util.js b/modules/util/ext.cx.util.js
index 0a35eb7..c0d91a0 100644
--- a/modules/util/ext.cx.util.js
+++ b/modules/util/ext.cx.util.js
@@ -39,7 +39,7 @@
mw.cx.getSourceSection = function ( id ) {
// Sanity check, id should be either a number or prefixed with
cx
- if ( isNaN( id ) id.indexOf( 'cx') !== 0 ) {
+ if ( isNaN( id ) id.indexOf( 'cx' ) !== 0 ) {
return $( [] );
} else {
return $( document.getElementById( id ) );
--
To view, visit https://gerrit.wikimedia.org/r/188977
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I32249c7128cb587c3b5523bc9cd18478e9c46933
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ContentTranslation
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] Fix whitespace - change (mediawiki...ContentTranslation)
jenkins-bot has submitted this change and it was merged.
Change subject: Fix whitespace
..
Fix whitespace
Change-Id: I32249c7128cb587c3b5523bc9cd18478e9c46933
---
M modules/util/ext.cx.util.js
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Santhosh: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/util/ext.cx.util.js b/modules/util/ext.cx.util.js
index 0a35eb7..c0d91a0 100644
--- a/modules/util/ext.cx.util.js
+++ b/modules/util/ext.cx.util.js
@@ -39,7 +39,7 @@
mw.cx.getSourceSection = function ( id ) {
// Sanity check, id should be either a number or prefixed with
cx
- if ( isNaN( id ) id.indexOf( 'cx') !== 0 ) {
+ if ( isNaN( id ) id.indexOf( 'cx' ) !== 0 ) {
return $( [] );
} else {
return $( document.getElementById( id ) );
--
To view, visit https://gerrit.wikimedia.org/r/188977
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I32249c7128cb587c3b5523bc9cd18478e9c46933
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ContentTranslation
Gerrit-Branch: master
Gerrit-Owner: Nikerabbit niklas.laxst...@gmail.com
Gerrit-Reviewer: Santhosh santhosh.thottin...@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] Add Travis CI configuration - change (cdb)
jenkins-bot has submitted this change and it was merged. Change subject: Add Travis CI configuration .. Add Travis CI configuration Change-Id: Ibb6d3b6cb468e1655d66925a2fe8db3a361a7725 --- A .travis.yml 1 file changed, 13 insertions(+), 0 deletions(-) Approvals: Krinkle: Looks good to me, approved jenkins-bot: Verified diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 000..3d4019f --- /dev/null +++ b/.travis.yml @@ -0,0 +1,13 @@ +language: php +php: + - 5.3.3 + - 5.3 + - 5.4 + - 5.5 + - 5.6 + - hhvm +sudo: false +install: + - composer install +script: + - composer test -- To view, visit https://gerrit.wikimedia.org/r/175317 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ibb6d3b6cb468e1655d66925a2fe8db3a361a7725 Gerrit-PatchSet: 8 Gerrit-Project: cdb Gerrit-Branch: master Gerrit-Owner: BryanDavis bda...@wikimedia.org Gerrit-Reviewer: BryanDavis bda...@wikimedia.org Gerrit-Reviewer: Chad ch...@wikimedia.org Gerrit-Reviewer: Hashar has...@free.fr Gerrit-Reviewer: Krinkle krinklem...@gmail.com Gerrit-Reviewer: Legoktm legoktm.wikipe...@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] demo: Use properties instead of attributes for link - change (oojs/ui)
Krinkle has uploaded a new change for review.
https://gerrit.wikimedia.org/r/188974
Change subject: demo: Use properties instead of attributes for link
..
demo: Use properties instead of attributes for link
Follows-up 953c46c4.
Change-Id: Ib07ce37f722e8df4774553e90bae650204a2602e
---
M demos/demo.js
1 file changed, 2 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/74/188974/1
diff --git a/demos/demo.js b/demos/demo.js
index d920bdf..b5d58bd 100644
--- a/demos/demo.js
+++ b/demos/demo.js
@@ -289,8 +289,8 @@
// Add link tags
for ( i = 0, len = urls.length; i len; i++ ) {
link = document.createElement( 'link' );
- link.setAttribute( 'rel', 'stylesheet' );
- link.setAttribute( 'href', urls[ i ] );
+ link.rel = 'stylesheet';
+ link.href = urls[ i ];
links.push( link );
}
return links;
--
To view, visit https://gerrit.wikimedia.org/r/188974
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib07ce37f722e8df4774553e90bae650204a2602e
Gerrit-PatchSet: 1
Gerrit-Project: oojs/ui
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] MT: Support proxy for Yandex - change (mediawiki...cxserver)
jenkins-bot has submitted this change and it was merged.
Change subject: MT: Support proxy for Yandex
..
MT: Support proxy for Yandex
Bug: T87587
Change-Id: I3408d5d9b3150d8613a21ec0dd54cc733547c88a
---
M config.defaults.js
M mt/Yandex.js
2 files changed, 2 insertions(+), 1 deletion(-)
Approvals:
KartikMistry: Looks good to me, approved
jenkins-bot: Verified
diff --git a/config.defaults.js b/config.defaults.js
index 31a694d..347614b 100644
--- a/config.defaults.js
+++ b/config.defaults.js
@@ -3,6 +3,7 @@
module.exports = {
// CX Server port
port: 8080,
+ proxy: null,
// Log directory
logDir: 'log',
// Accept requests from the given domains. * for all domains.
diff --git a/mt/Yandex.js b/mt/Yandex.js
index c8f92c9..7e28fb9 100644
--- a/mt/Yandex.js
+++ b/mt/Yandex.js
@@ -40,6 +40,7 @@
// Language mapping that might be needed is be-tarask - be
postData = {
url: conf( 'mt.yandex.api' ) + '/api/v1.5/tr.json/translate',
+ proxy: conf( 'proxy' ),
form: {
key: key,
lang: sourceLang + '-' + targetLang,
@@ -63,7 +64,6 @@
return;
}
- console.log( ret );
if ( ret.code !== 200 ) {
deferred.reject( new Error( ret.code + ': ' +
self.getErrorName( ret.code ) ) );
}
--
To view, visit https://gerrit.wikimedia.org/r/188753
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I3408d5d9b3150d8613a21ec0dd54cc733547c88a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/cxserver
Gerrit-Branch: master
Gerrit-Owner: Santhosh santhosh.thottin...@gmail.com
Gerrit-Reviewer: Jsahleen jsahl...@wikimedia.org
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] Update to incorporate new Twitter embed code - change (mediawiki...WikiTwidget)
Daniel Friesen has uploaded a new change for review.
https://gerrit.wikimedia.org/r/188980
Change subject: Update to incorporate new Twitter embed code
..
Update to incorporate new Twitter embed code
Change-Id: I17adb65265bd1c0918fef57b5b8dddc6b78a774b
---
M README.md
M WikiTwidget.body.php
M WikiTwidget.php
M ext.wikitwidget.js
4 files changed, 41 insertions(+), 23 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikiTwidget
refs/changes/80/188980/1
diff --git a/README.md b/README.md
index d91e17e..68d4707 100644
--- a/README.md
+++ b/README.md
@@ -64,14 +64,17 @@
Wiki Compatibility
--
-WikiTwidget uses ResourceLoader, which was introduced in MW 1.17. I only have
access to a wiki running 1.19.2 and 1.21.1, so I cannot guarantee that
WikiTwidget will work on earlier versions of MediaWiki. A quick solution for
earlier MediaWikis is to add the javascript to MediaWiki:Common.js on your wiki:
+WikiTwidget uses ResourceLoader, which was introduced in MW 1.17. WikiTwidget
has been tested and runs successfully on wikis running 1.19.2, 1.21, 1.22, and
1.23.
- !function(d,s,id){var
js,fjs=d.getElementsByTagName(s)[0],p=/^http:/.test(d.location)?'http':'https';if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src=p+://platform.twitter.com/widgets.js;fjs.parentNode.insertBefore(js,fjs);}}(document,script,twitter-wjs);
Change Log
--
+v0.3.1, Jan 2015:
+
+* Updated WikiTwidget javascript to use the latest code from Twitter.
Incorporates code changes from MediaWiki Gerrit. Tested on MW 1.25alpha using
[mediawiki-vagrant](http://www.mediawiki.org/wiki/MediaWiki-Vagrant).
+
v0.3.0:
* Updated WikiTwidget to use the latest code and settings from Twitter
diff --git a/WikiTwidget.body.php b/WikiTwidget.body.php
index 136c7d4..181c60a 100644
--- a/WikiTwidget.body.php
+++ b/WikiTwidget.body.php
@@ -2,12 +2,13 @@
class WikiTwidget {
- function createWidget($input, array $args, Parser $parser, PPFrame
$frame ) { global $wgOut;
+ function createWidget($input, array $args, Parser $parser, PPFrame
$frame ) {
+ global $wgOut;
# Widget URL format
# a class=twitter-timeline
href=https://twitter.com/twitterapi; data-widget-id=YOUR-WIDGET-ID-HERE
data-theme=dark data-link-color=#cc data-related=twitterapi,twitter
data-aria-polite=assertive width=300 height=500 lang=ENTweets by
@twitterapi/a
- if (isset($args['data-widget-id']) $args['data-widget-id']){
+ if (isset($args['data-widget-id']) $args['data-widget-id']) {
$id = $args['data-widget-id'];
}
else {
@@ -32,24 +33,24 @@
## a class=twitter-timeline href=https://twitter.com/search?q=STRING;
data-widget-id=268946405488476160Tweets about STRING/a
## make sure we have a link
- if (isset($args['href']) $args['href']){
+ if (isset($args['href']) $args['href']) {
## make up a string for the link
## get rid of the 'twitter' part of the URL
- if (preg_match( '@https://twitter.com/search\?q=(.+)@',
$args['href'], $matches ))
- { ## search is for $matches[1]
+ if (preg_match( '@https://twitter.com/search\?q=(.+)@',
$args['href'], $matches )) {
+ ## search is for $matches[1]
$input = 'Tweets about ' .
htmlspecialchars($matches[1]);
}
- else if (preg_match(
'@https://twitter.com/(.+?)/favorites@', $args['href'], $matches ))
- { ## favourite tweets of $matches[1]
+ else if (preg_match(
'@https://twitter.com/(.+?)/favorites@', $args['href'], $matches )) {
+ ## favourite tweets of $matches[1]
$input = 'Favourite tweets by ' .
htmlspecialchars($matches[1]);
}
- else if (preg_match( '@https://twitter.com/(.+)@',
$args['href'], $matches ))
- { ## favourite tweets of $matches[1]
+ else if (preg_match( '@https://twitter.com/(.+)@',
$args['href'], $matches )) {
+ ## favourite tweets of $matches[1]
$input = 'Tweets by ' .
htmlspecialchars($matches[1]);
}
- else
- { ## wtf is going on with this href?!
+ else {
+ ## wtf is going on with this href?!
$input = 'Twitter timeline';
$args['href'] = 'https://twitter.com/';
}
@@
[MediaWiki-commits] [Gerrit] Add pagination navbar to top of history page as well - change (mediawiki...Flow)
Mattflaschen has uploaded a new change for review.
https://gerrit.wikimedia.org/r/188979
Change subject: Add pagination navbar to top of history page as well
..
Add pagination navbar to top of history page as well
Bug: T67088
Change-Id: I69576b522027cf3a21b9f76a1e388c7040b7cef7
---
M handlebars/compiled/flow_block_board-history.handlebars.php
M handlebars/compiled/flow_block_topic_history.handlebars.php
M handlebars/flow_block_board-history.handlebars
M handlebars/flow_block_topic_history.handlebars
4 files changed, 10 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Flow
refs/changes/79/188979/1
diff --git a/handlebars/compiled/flow_block_board-history.handlebars.php
b/handlebars/compiled/flow_block_board-history.handlebars.php
index c3d51ec..70491de 100644
--- a/handlebars/compiled/flow_block_board-history.handlebars.php
+++ b/handlebars/compiled/flow_block_board-history.handlebars.php
@@ -100,6 +100,8 @@
);
return 'div class=flow-board-history
+ '.LCRun3::ch($cx, 'html', array(array(((isset($in['navbar'])
is_array($in)) ? $in['navbar'] : null)),array()), 'encq').'
+
ul
'.LCRun3::sec($cx, ((isset($in['revisions']) is_array($in)) ?
$in['revisions'] : null), $in, true, function($cx, $in) {return '
li
span class=flow-pipelist
@@ -126,4 +128,4 @@
/div
';
}
-?
+?
\ No newline at end of file
diff --git a/handlebars/compiled/flow_block_topic_history.handlebars.php
b/handlebars/compiled/flow_block_topic_history.handlebars.php
index f320330..281c16f 100644
--- a/handlebars/compiled/flow_block_topic_history.handlebars.php
+++ b/handlebars/compiled/flow_block_topic_history.handlebars.php
@@ -28,6 +28,8 @@
return 'div class=flow-board
div class=flow-topic-histories
+ '.LCRun3::ch($cx, 'html', array(array(((isset($in['navbar'])
is_array($in)) ? $in['navbar'] : null)),array()), 'encq').'
+
ul
'.LCRun3::sec($cx, ((isset($in['revisions']) is_array($in)) ?
$in['revisions'] : null), $in, true, function($cx, $in) {return '
li
span class=flow-pipelist
@@ -66,4 +68,4 @@
/div
';
}
-?
+?
\ No newline at end of file
diff --git a/handlebars/flow_block_board-history.handlebars
b/handlebars/flow_block_board-history.handlebars
index 7f38d5c..159a8a2 100644
--- a/handlebars/flow_block_board-history.handlebars
+++ b/handlebars/flow_block_board-history.handlebars
@@ -1,4 +1,6 @@
div class=flow-board-history
+ {{html navbar}}
+
ul
{{#each revisions}}
li
diff --git a/handlebars/flow_block_topic_history.handlebars
b/handlebars/flow_block_topic_history.handlebars
index 114087b..17afb79 100644
--- a/handlebars/flow_block_topic_history.handlebars
+++ b/handlebars/flow_block_topic_history.handlebars
@@ -1,5 +1,7 @@
div class=flow-board
div class=flow-topic-histories
+ {{html navbar}}
+
ul
{{#each revisions}}
li
--
To view, visit https://gerrit.wikimedia.org/r/188979
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I69576b522027cf3a21b9f76a1e388c7040b7cef7
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: Mattflaschen mflasc...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add extension.json - change (mediawiki...ContentTranslation)
Santhosh has uploaded a new change for review.
https://gerrit.wikimedia.org/r/188970
Change subject: Add extension.json
..
Add extension.json
Follow up: I9224259a12b8
Bug: T87902
Change-Id: I29d03df2c563948e12f86f2d309181ce8edf1c53
---
A extension.json
1 file changed, 716 insertions(+), 0 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ContentTranslation
refs/changes/70/188970/1
diff --git a/extension.json b/extension.json
new file mode 100644
index 000..24ec6b4
--- /dev/null
+++ b/extension.json
@@ -0,0 +1,716 @@
+{
+ name: ContentTranslation,
+ version: 1.0.0+20150127,
+ author: [
+ Amir Aharoni,
+ David Chan,
+ Kartik Mistry,
+ Joel Sahleen,
+ Niklas Laxström,
+ Pau Giner,
+ Runa Bhattacharjee,
+ Santhosh Thottingal,
+ Siebrand Mazeland,
+ Sucheta Ghoshal
+ ],
+ url: https://www.mediawiki.org/wiki/Extension:ContentTranslation;,
+ descriptionmsg: cx-desc,
+ type: specialpage,
+ ExtensionMessagesFiles: {
+ ContentTranslationAliases: ContentTranslation.alias.php
+ },
+ Hooks: {
+ BeforePageDisplay: ContentTranslationHooks::addModules,
+ GetBetaFeaturePreferences:
ContentTranslationHooks::getPreferences,
+ ResourceLoaderGetConfigVars:
ContentTranslationHooks::addConfig,
+ SpecialContributionsBeforeMainOutput:
ContentTranslationHooks::addNewContributionButton,
+ EventLoggingRegisterSchemas:
ContentTranslationHooks::addEventLogging,
+ ResourceLoaderTestModules:
ContentTranslationHooks::onResourceLoaderTestModules,
+ ListDefinedTags:ContentTranslationHooks::registerTags,
+ ChangeTagsListActive: ContentTranslationHooks::registerTags
+ },
+ APIModules: {
+ cxpublish: ApiContentTranslationPublish,
+ cxdelete: ApiContentTranslationDelete
+ },
+ APIListModules: {
+ contenttranslation: ApiQueryContentTranslation
+ },
+ MessagesDirs: {
+ ContentTranslation: i18n
+ },
+ SpecialPages: {
+ ContentTranslation: SpecialContentTranslation,
+ ContentTranslationStats: SpecialContentTranslationStats
+ },
+ AutoloadClasses: {
+ ApiContentTranslationPublish:
api/ApiContentTranslationPublish.php,
+ ApiContentTranslationDelete:
api/ApiContentTranslationDelete.php,
+ ApiQueryContentTranslation:
api/ApiQueryContentTranslation.php,
+ ContentTranslationHooks: ContentTranslation.hooks.php,
+ ContentTranslation\\Database: includes/Database.php,
+ ContentTranslation\\Draft: includes/Draft.php,
+ ContentTranslation\\GlobalUser: includes/GlobalUser.php,
+ ContentTranslation\\SiteMapper: includes/SiteMapper.php,
+ ContentTranslation\\Stats: includes/Stats.php,
+ ContentTranslation\\Translation: includes/Translation.php,
+ ContentTranslation\\Translator: includes/Translator.php,
+ SpecialContentTranslation:
specials/SpecialContentTranslation.php,
+ SpecialContentTranslationStats:
specials/SpecialContentTranslationStats.php
+ },
+ ResourceModules: {
+ ext.cx.contributions: {
+ localBasePath: modules,
+ remoteExtPath: ContentTranslation/modules,
+ scripts: [
+ entrypoint/ext.cx.contributions.js
+ ],
+ styles: [
+ entrypoint/styles/ext.cx.contributions.less
+ ],
+ dependencies: [
+ mediawiki.util
+ ],
+ messages: [
+ cx-contributions,
+ cx-contributions-translation,
+ cx-contributions-media
+ ]
+ },
+ ext.cx.contributions.init: {
+ localBasePath: modules,
+ remoteExtPath: ContentTranslation/modules,
+ scripts: [
+ entrypoint/ext.cx.contributions.init.js
+ ],
+ dependencies: [
+ ext.cx.contributions
+ ],
+ position: top
+ },
+ ext.cx.model: {
+ localBasePath: modules,
+ remoteExtPath: ContentTranslation/modules,
+ scripts: [
+
[MediaWiki-commits] [Gerrit] New category doesn't need indent-pre nowiki protection - change (mediawiki...parsoid)
Arlolra has uploaded a new change for review.
https://gerrit.wikimedia.org/r/188971
Change subject: New category doesn't need indent-pre nowiki protection
..
New category doesn't need indent-pre nowiki protection
* Probably should be generalized to other SOL cases, if this is the
right approach.
Change-Id: Ic74170cf6746e971c4f728a2f36c5ba47142835e
---
M lib/mediawiki.WikitextSerializer.js
M tests/parserTests-blacklist.js
M tests/parserTests.txt
3 files changed, 22 insertions(+), 7 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/parsoid
refs/changes/71/188971/1
diff --git a/lib/mediawiki.WikitextSerializer.js
b/lib/mediawiki.WikitextSerializer.js
index 0ab4fd4..6834554 100644
--- a/lib/mediawiki.WikitextSerializer.js
+++ b/lib/mediawiki.WikitextSerializer.js
@@ -1072,10 +1072,11 @@
};
function stripUnnecessaryIndentPreNowikis(wt) {
- var pieces = wt.split(/(^nowiki\s+\/nowiki)([^\n]*(?:\n|$))/m);
+ var pieces =
wt.split(/^((?:!--(?:[^\-]|-(?!-))*--)*)(nowiki\s+\/nowiki)([^\n]*(?:\n|$))/m);
var out = pieces[0];
- for (var i = 1; i pieces.length; i += 3) {
- var nowiki = pieces[i], rest = pieces[i+1];
+ for (var i = 1; i pieces.length; i += 4) {
+ out += pieces[i];
+ var nowiki = pieces[i+1], rest = pieces[i+2];
// Ignore comments
var htmlTags = rest.match(/[^!][^]*/g) || [];
var reqd = true;
@@ -1091,15 +1092,20 @@
reqd = true;
break;
} else if (Consts.HTML.BlockTags.has(tagName)) {
- // Block tags on a line suppres nowikis
+ // Block tags on a line suppress nowikis
reqd = false;
}
+ }
+
+ // Just spaces and categories, huh
+ if ( reqd /^(\[\[Category\:.*\]\]|\s)*$/.test( rest ) ) {
+ reqd = false;
}
if (!reqd) {
nowiki = nowiki.replace(/^nowiki(\s+)\/nowiki/,
'$1');
}
- out = out + nowiki + rest + pieces[i+2];
+ out = out + nowiki + rest + pieces[i+3];
}
return out;
}
diff --git a/tests/parserTests-blacklist.js b/tests/parserTests-blacklist.js
index f83dded..f5c730d 100644
--- a/tests/parserTests-blacklist.js
+++ b/tests/parserTests-blacklist.js
@@ -2367,8 +2367,7 @@
add(selser, Render invalid page names as plain text (bug 51090) [2,0,3],
uy7lbslcu8mvaemi\n\n[[./../foo|bar]]\n[[foo�|bar]]\n[[foo/.|bar]]\n[[foo/..|bar]]\n[[foo~~~bar]]\n[[foobar]]\n[[foo[bar]]\n[[.]]\n[[..]]\n[[foo././bar]]\n);
add(selser, Render invalid page names as plain text (bug 51090)
[2,0,[2,0,0,0,4,0,4,0,0,0,4,0,0,0,0,0,0,0,0,0,3,0,2]],
ixtw0uq17iqtcsor\n\n[[./../foo|bar]]\n[[foo�|bar]]\n[[foo/.|bar]]\n[[foo/..|bar]]\n[[foo~~~bar]]\n[[foobar]]\n[[foo[bar]]\n[[.]]\n[[..]]\n[[foo././bar]]\n\ncjgyt6cnj124kj4i[[{{echo|./../foo}}|bar]]\n[[{{echo|foo/.}}4i3f1qev8b5u3di{{echo|foo/..}}t26yvjmagszl4n29{{echo|foobar}}]]\n[[{{echo|foobar}}3vx6jfw5gbvs4i{{echo|foo././bar}}]]\n[[{{echo|foo{bar}}]]\n[[{{echo|foo}bar}}]]\n[[{{echo|foo[bar}}]]\n[[{{echo|foo]bar}}{{echo|foobar}}nowiki3vz7g6pd5lzhncdi]]/nowiki);
add(selser, Category / paragraph interactions
[[0,3,2],0,2,4,[3,2,0],0,[2],3,0,[3],0,[3,3,4,1,4,2,3],0,3,4,0,4,3,0,0,2,0,0,0],
Foo 83zrad4tpxxkcsor Bar\n\nysekf8brayr885mi\n\nFoo
[[Category:Baz]]\nBar\n\nduknjpcnvnyzxgvi\n\nhroyapi5paqhncdi[[Category:Baz]]\nBar\n\nmsiv1cjc1q8e61orFoo\n[[Category:Baz]]
\n\nljrvpzob03tedn29[[Category:Baz]]6bqrn9ug03npcik95jcarnywu55klnmi[[Category:Baz]]\n\nik3u2lqitfomkj4i[[Category:Baz]]\nn8wwykwa78f72e29\n\n[[Category:Baz]]\n9dl89xg0l57phkt9\n
{{echo|[[Category:Baz]]}}\n[[Category:Baz]]);
-add(selser, Category / paragraph interactions
[4,0,0,0,[4,1,0],3,3,0,0,0,2,[2,0,0,1,3,0,0],0,1,3,0,2,0,2,0,0,0,4,2],
y2ksxygpidn7y14i\n\nFoo
[[Category:Baz]]\nBar\n\ntqcbbea7bmiy66r[[Category:Baz]]\nBar\n[[Category:Baz]]
Bar\nc42dqedyb3u6usor\n\ndjmvd61k80kymn29Foo\n[[Category:Baz]]\n
[[Category:Baz]][[Category:Baz]]\nBar\n\n[[Category:Baz]]\nnowiki
/nowiki[[Category:Baz]]\nvyv3u18bgs4z33di\n[[Category:Baz]]\ne98vfkx1eqld6lxr\n\n[[Category:Baz]]\n
{{echo|[[Category:Baz]]}}\nviznyhgcd9muz0k9\n\nd830mwe1qg1oflxr[[Category:Baz]]);
-add(selser, Category / paragraph interactions
[[0,1,0],0,[2,0,4],4,[0,2,4],0,1,0,0,0,0,3,0,2,0,0,2,0,3,3,0,0,0,0], Foo
[[Category:Baz]] Bar\n\n9o6ehd9bnpuba9k9Foo
[[Category:Baz]]hykpnr0z0mdvx6r\n\nwfd3z9z3ux0nqaor\n\nFoo\nts1y9gdg8f0nqaor[[Category:Baz]]8kkz36bki8tihpvi\n\nFoo\n[[Category:Baz]]
Bar\n\nnarm95sza9ssjor[[Category:Baz]]\n
[[Category:Baz]]\nd3pv2h2yewcj714i\n[[Category:Baz]]\n
{{echo|[[Category:Baz]]}}\n[[Category:Baz]]);
+add(selser,
[MediaWiki-commits] [Gerrit] Redid JS so chars left output as in Twitter. - change (mediawiki...CommunityTwitter)
RAN1 has submitted this change and it was merged.
Change subject: Redid JS so chars left output as in Twitter.
..
Redid JS so chars left output as in Twitter.
Redid the JavaScript so the chars left is displayed on the left of the tweet
button. The enclosing
strong element is now output by JS to ease future HTMLForm conversion.
Change-Id: Ief436256ddb23e05064e68cc249bca6edc6c8f64
---
M CommunityTwitter_body.php
M css/ext.CommunityTwitter.css
M js/ext.CommunityTwitter.updatecount.js
3 files changed, 15 insertions(+), 11 deletions(-)
Approvals:
RAN1: Verified; Looks good to me, approved
diff --git a/CommunityTwitter_body.php b/CommunityTwitter_body.php
index 200c7cc..94b619e 100755
--- a/CommunityTwitter_body.php
+++ b/CommunityTwitter_body.php
@@ -240,7 +240,7 @@
// Tweet textarea; javascript
ResourceLoader module enables an updating counter with button disabling if
tweet is too long (for convenience, Twitter won't allow a 140 char post
anyways)
$output-addModules(
'ext.CommunityTwitter.updatecount' );
$output-addHTML(form
action=\.$title-getLinkURL().\ method=\post\
id=\status_update_form\\n.
-
span class=\ct-tweet\.wfMsg(communitytwitter-remaining-chars).:
strong id=\stringlength\140/strongbr/\n.
+
span class=\ct-tweet\\n.
textarea tabindex=\1\ autocomplete=\off\ accesskey=\u\ name=\status\
id=\status\ rows=\2\ cols=\40\ class=\ct-tweet-input\/textarea\n.
br/input type=\submit\ id=\tweetbutton\ value=\ Tweet \/span\n.
/formbr /br /br /br /br /br /\n.
diff --git a/css/ext.CommunityTwitter.css b/css/ext.CommunityTwitter.css
index e097144..42c9378 100644
--- a/css/ext.CommunityTwitter.css
+++ b/css/ext.CommunityTwitter.css
@@ -38,6 +38,9 @@
margin: 10px 25px 10px 25px;
float: right;
}
+.ct-chars-left {
+ padding-right: 6px;
+}
table.ct-tweet-section {
width: 550px;
height: 100px;
diff --git a/js/ext.CommunityTwitter.updatecount.js
b/js/ext.CommunityTwitter.updatecount.js
index 5c3d795..791d530 100644
--- a/js/ext.CommunityTwitter.updatecount.js
+++ b/js/ext.CommunityTwitter.updatecount.js
@@ -4,8 +4,7 @@
*
* Notes for the gets: 'status_update_form' refers to the form element that
contains all relevant
* elements for updating the Twitter status, the textarea element is the
textbox for inputting the status
- * update, the strong element encloses the number of characters remaining
output (140 by default),
- * and the input element is the Tweet button.
+ * update and the input element is the Tweet button. The count is output
before the Tweet button.
*
* Notes about scope: ResourceLoader already provides a closure for JavaScript
modules, so the variables
* which are defined below are not actually in the global scope. There is no
need to rewrite them in
@@ -16,23 +15,25 @@
var ctStatusForm = document.getElementById( 'status_update_form' );
var ctStatusTextarea = ctStatusForm.getElementsByTagName( 'textarea' )[0];
-var ctCountOutput = ctStatusForm.getElementsByTagName( 'strong' )[0];
var ctTweetButton = ctStatusForm.getElementsByTagName( 'input' )[0];
-ctStatusTextarea.onkeyup = function () {
+
+// setup the count output node, insert before tweet button
+var ctStrong = document.createElement( 'strong' );
+ctStrong.setAttribute( 'class', 'ct-chars-left' );
+ctStrong.appendChild( document.createTextNode( '140' ) ); // initial value
+
+var ctCountOutput = ctTweetButton.parentNode.insertBefore( ctStrong,
ctTweetButton ); // insertBefore only works with parent
+
+ctStatusTextarea.oninput = function () {
var ctCharsLeft = 140 - ctStatusTextarea.value.length; // get the
number of characters left from the text box
// using the number of chars, change count output color and
disable/enable tweet button as needed
-
if ( ctCharsLeft 0 ) {
ctCountOutput.style.color = 'red'; // red means bad
ctTweetButton.setAttribute( 'disabled', 'disabled' ); //
disables Tweet button
} else {
ctTweetButton.removeAttribute( 'disabled' ); // enables Tweet
button
- if ( ctCharsLeft 25 ) {
- ctCountOutput.style.color = '#CC0'; // yellow
- } else {
- ctCountOutput.style.color = 'inherit'; // default
- }
+ ctCountOutput.style.color = 'inherit'; // default
}
[MediaWiki-commits] [Gerrit] Don't show the renaming guided tour when publishing to main ... - change (mediawiki...ContentTranslation)
jenkins-bot has submitted this change and it was merged.
Change subject: Don't show the renaming guided tour when publishing to main
namespace
..
Don't show the renaming guided tour when publishing to main namespace
Bug: T87618
Change-Id: I0c3040061dff22dd9d786c2bcb56081524e729ab
---
M ContentTranslation.hooks.php
1 file changed, 8 insertions(+), 1 deletion(-)
Approvals:
Santhosh: Looks good to me, approved
jenkins-bot: Verified
diff --git a/ContentTranslation.hooks.php b/ContentTranslation.hooks.php
index 7bf97da..2852d59 100644
--- a/ContentTranslation.hooks.php
+++ b/ContentTranslation.hooks.php
@@ -66,7 +66,14 @@
$out-addModules( 'ext.cx.redlink' );
}
- if ( class_exists( 'GuidedTourHooks' ) ) {
+ // The current guided tours are only for the user namespace,
+ // so load the module only there.
+ // In the future there may be guided tours in other namespaces,
+ // and then this condition should be changed.
+ if (
+ class_exists( 'GuidedTourHooks' )
+ $title-inNamespace( NS_USER )
+ ) {
$out-addModules( 'ext.guidedTour' );
}
}
--
To view, visit https://gerrit.wikimedia.org/r/186890
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I0c3040061dff22dd9d786c2bcb56081524e729ab
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/ContentTranslation
Gerrit-Branch: master
Gerrit-Owner: Amire80 amir.ahar...@mail.huji.ac.il
Gerrit-Reviewer: Nikerabbit niklas.laxst...@gmail.com
Gerrit-Reviewer: Santhosh santhosh.thottin...@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] add vm tuning params to jessie cache nodes - change (operations/puppet)
BBlack has uploaded a new change for review.
https://gerrit.wikimedia.org/r/188972
Change subject: add vm tuning params to jessie cache nodes
..
add vm tuning params to jessie cache nodes
Change-Id: Ia91dd5adfb6ab4f35dc31b8b1b4dd0539cfed393
---
M manifests/role/cache.pp
1 file changed, 11 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/72/188972/1
diff --git a/manifests/role/cache.pp b/manifests/role/cache.pp
index ad01711..f71a54e 100644
--- a/manifests/role/cache.pp
+++ b/manifests/role/cache.pp
@@ -731,9 +731,19 @@
max = 262144,
}
-# This needs newer-ish kernels, testing only on jessie+ hosts for
now
+# These tweaks were only tested on and/or only work on jessie, may
+# as well not disturb the working precise setup
if os_version('debian = jessie') {
+# RPS/RSS to spread network i/o evenly
interface::rps { 'eth0': }
+
+# flush vm more steadily in the background. helps avoid large
performance
+# spikes related to flushing out disk write cache.
+sysctl::parameters { 'cache_role_vm_settings':
+values = { 'vm.dirty_ratio' = 40, }, # default 20
+values = { 'vm.dirty_background_ratio' = 5, }, # default
10
+values = { 'vm.dirty_expire_centisecs' = 150, }, #
default 3000
+}
}
}
--
To view, visit https://gerrit.wikimedia.org/r/188972
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia91dd5adfb6ab4f35dc31b8b1b4dd0539cfed393
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BBlack bbl...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add index to speed up stats queries - change (mediawiki...ContentTranslation)
Nikerabbit has uploaded a new change for review. https://gerrit.wikimedia.org/r/188981 Change subject: Add index to speed up stats queries .. Add index to speed up stats queries Since this table is expected to be manually maintained, I did not create a patch and updater entry for it. Bug: T88538 Change-Id: I759a636b6ab107b3d6d44549d0ad0b2636277631 --- M sql/contenttranslation.sql 1 file changed, 5 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ContentTranslation refs/changes/81/188981/1 diff --git a/sql/contenttranslation.sql b/sql/contenttranslation.sql index da66445..8e9f6c9 100644 --- a/sql/contenttranslation.sql +++ b/sql/contenttranslation.sql @@ -61,6 +61,11 @@ translation_target_language ); +CREATE INDEX /*i*/cx_translation_languages ON /*_*/cx_translations ( +translation_source_language, +translation_target_language +); + CREATE UNIQUE INDEX /*i*/cx_translation_translators ON /*_*/cx_translators ( translator_user_id, translator_translation_id -- To view, visit https://gerrit.wikimedia.org/r/188981 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I759a636b6ab107b3d6d44549d0ad0b2636277631 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/ContentTranslation 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] add vm tuning params to jessie cache nodes - change (operations/puppet)
BBlack has submitted this change and it was merged.
Change subject: add vm tuning params to jessie cache nodes
..
add vm tuning params to jessie cache nodes
Change-Id: Ia91dd5adfb6ab4f35dc31b8b1b4dd0539cfed393
---
M manifests/role/cache.pp
1 file changed, 13 insertions(+), 1 deletion(-)
Approvals:
BBlack: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/role/cache.pp b/manifests/role/cache.pp
index ad01711..b50bac4 100644
--- a/manifests/role/cache.pp
+++ b/manifests/role/cache.pp
@@ -731,9 +731,21 @@
max = 262144,
}
-# This needs newer-ish kernels, testing only on jessie+ hosts for
now
+# These tweaks were only tested on and/or only work on jessie, may
+# as well not disturb the working precise setup
if os_version('debian = jessie') {
+# RPS/RSS to spread network i/o evenly
interface::rps { 'eth0': }
+
+# flush vm more steadily in the background. helps avoid large
performance
+# spikes related to flushing out disk write cache.
+sysctl::parameters { 'cache_role_vm_settings':
+values = {
+'vm.dirty_ratio'= 40, # default 20
+'vm.dirty_background_ratio' = 5, # default 10
+'vm.dirty_expire_centisecs' = 150, # default 3000
+},
+}
}
}
--
To view, visit https://gerrit.wikimedia.org/r/188972
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia91dd5adfb6ab4f35dc31b8b1b4dd0539cfed393
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BBlack bbl...@wikimedia.org
Gerrit-Reviewer: BBlack bbl...@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] re-disable compact_memory cron for jessie caches - change (operations/puppet)
BBlack has submitted this change and it was merged.
Change subject: re-disable compact_memory cron for jessie caches
..
re-disable compact_memory cron for jessie caches
Doesn't seem to be causing the cp1064 issues
See also: b7c51400 f8f989df
Change-Id: I2b56966a42980e3c6c6ef5e78aa82a6af74c85ef
---
M manifests/role/cache.pp
1 file changed, 8 insertions(+), 6 deletions(-)
Approvals:
BBlack: Verified; Looks good to me, approved
diff --git a/manifests/role/cache.pp b/manifests/role/cache.pp
index b50bac4..a2267c9 100644
--- a/manifests/role/cache.pp
+++ b/manifests/role/cache.pp
@@ -710,12 +710,14 @@
'labs' = ['vdb'],
}
-# This seems to prevent long term memory fragmentation issues that
-# result in XFS deadlock log spam + bad problems for varnish health
-cron { 'varnish_vm_compact_cron':
-command = 'echo 1 /proc/sys/vm/compact_memory',
-user= 'root',
-minute = '*',
+unless os_version('debian = jessie') { # testing whether we need this
for jessie's 3.16 kernel
+# This seems to prevent long term memory fragmentation issues that
+# result in XFS deadlock log spam + bad problems for varnish
health
+cron { 'varnish_vm_compact_cron':
+command = 'echo 1 /proc/sys/vm/compact_memory',
+user= 'root',
+minute = '*',
+}
}
#class { varnish::packages: version = 3.0.3plus~rc1-wm5 }
--
To view, visit https://gerrit.wikimedia.org/r/188973
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I2b56966a42980e3c6c6ef5e78aa82a6af74c85ef
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BBlack bbl...@wikimedia.org
Gerrit-Reviewer: BBlack bbl...@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] Add npm job to wikibase - change (integration/config)
jenkins-bot has submitted this change and it was merged.
Change subject: Add npm job to wikibase
..
Add npm job to wikibase
Change-Id: I096749565d87f1c309d05a07019cb49d6c007503
---
M jjb/wikidata.yaml
M zuul/layout.yaml
2 files changed, 6 insertions(+), 0 deletions(-)
Approvals:
Krinkle: Looks good to me, approved
jenkins-bot: Verified
diff --git a/jjb/wikidata.yaml b/jjb/wikidata.yaml
index 9ce506f..6f271f1 100644
--- a/jjb/wikidata.yaml
+++ b/jjb/wikidata.yaml
@@ -130,6 +130,10 @@
jobs:
+ - '{name}-{ext-name}-npm':
+name: 'mwext'
+ext-name: 'Wikibase'
+
- 'mwext-Wikibase-{kind}-tests':
ext-name: 'Wikibase'
kind: repo
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 2ab774c..b4c89bd 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -5911,6 +5911,7 @@
- mwext-Wikibase-repo-api-tests
- mwext-Wikibase-client-tests
- mwext-Wikibase-qunit
+ - mwext-Wikibase-npm
gate-and-submit:
- mwext-Wikibase-jslint
- mwext-Wikibase-lint
@@ -5919,6 +5920,7 @@
- mwext-Wikibase-repo-api-tests
- mwext-Wikibase-client-tests
- mwext-Wikibase-qunit
+ - mwext-Wikibase-npm
- name: mediawiki/extensions/WikibaseJavaScriptApi
template:
--
To view, visit https://gerrit.wikimedia.org/r/184592
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I096749565d87f1c309d05a07019cb49d6c007503
Gerrit-PatchSet: 5
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Adrian Lang adrian.he...@wikimedia.de
Gerrit-Reviewer: Adrian Lang adrian.he...@wikimedia.de
Gerrit-Reviewer: Hashar has...@free.fr
Gerrit-Reviewer: Jeroen De Dauw jeroended...@gmail.com
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] Drop jslint job from Wikibase - change (integration/config)
jenkins-bot has submitted this change and it was merged. Change subject: Drop jslint job from Wikibase .. Drop jslint job from Wikibase Change-Id: I405bea9d3e3710e83506873a2d480a72bddcb83d --- M zuul/layout.yaml 1 file changed, 0 insertions(+), 2 deletions(-) Approvals: Krinkle: Looks good to me, approved jenkins-bot: Verified diff --git a/zuul/layout.yaml b/zuul/layout.yaml index b4c89bd..cb03b1a 100644 --- a/zuul/layout.yaml +++ b/zuul/layout.yaml @@ -5904,7 +5904,6 @@ - mwext-Wikibase-lint - php-composer-validate test: - - mwext-Wikibase-jslint - mwext-Wikibase-lint - php-composer-validate - mwext-Wikibase-repo-tests @@ -5913,7 +5912,6 @@ - mwext-Wikibase-qunit - mwext-Wikibase-npm gate-and-submit: - - mwext-Wikibase-jslint - mwext-Wikibase-lint - php-composer-validate - mwext-Wikibase-repo-tests -- To view, visit https://gerrit.wikimedia.org/r/188522 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I405bea9d3e3710e83506873a2d480a72bddcb83d Gerrit-PatchSet: 2 Gerrit-Project: integration/config Gerrit-Branch: master Gerrit-Owner: Adrian Lang adrian.he...@wikimedia.de Gerrit-Reviewer: Hashar has...@free.fr Gerrit-Reviewer: Jeroen De Dauw jeroended...@gmail.com 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] PEP 440 version scheme - change (pywikibot/core)
jenkins-bot has submitted this change and it was merged.
Change subject: PEP 440 version scheme
..
PEP 440 version scheme
Travis builds are now using pip 6.0.7 instead of 1.5.6,
which is causing all builds to fail due to PEP 440
versioning problems.
Change-Id: Ied6893eab08e4a5001cc76d99ec1191cbe821160
---
M setup.py
1 file changed, 2 insertions(+), 2 deletions(-)
Approvals:
John Vandenberg: Looks good to me, approved
jenkins-bot: Verified
diff --git a/setup.py b/setup.py
index 0fb9d3a..377913b 100644
--- a/setup.py
+++ b/setup.py
@@ -14,7 +14,7 @@
test_deps = []
-dependencies = ['httplib2=0.9.0']
+dependencies = ['httplib2=0.9']
extra_deps = {
# Core library dependencies
@@ -51,7 +51,7 @@
else 'flickrapi=1.4.5')
dependency_links = [
-
'https://git.wikimedia.org/zip/?r=pywikibot/externals/httplib2.gitformat=gz#egg=httplib2-0.8-pywikibot1',
+
'https://git.wikimedia.org/zip/?r=pywikibot/externals/httplib2.gitformat=gz#egg=httplib2-0.9+pywikibot2',
'git+https://github.com/AlereDevices/lunatic-python.git#egg=lunatic-python',
]
--
To view, visit https://gerrit.wikimedia.org/r/188976
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ied6893eab08e4a5001cc76d99ec1191cbe821160
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: John Vandenberg jay...@gmail.com
Gerrit-Reviewer: John Vandenberg jay...@gmail.com
Gerrit-Reviewer: Ladsgroup ladsgr...@gmail.com
Gerrit-Reviewer: Merlijn van Deen valhall...@arctus.nl
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Revert Render posts against the owner page rather than topic - change (mediawiki...Flow)
jenkins-bot has submitted this change and it was merged.
Change subject: Revert Render posts against the owner page rather than topic
..
Revert Render posts against the owner page rather than topic
While implementing categories for Flow headers and topic
summaries, i realized that this means that all recorded
properties about a page must attach to the board, giving
no way to categorize or do anything else against a topic
specifically.
Talked about this in standup, it seemed agreed that while
there are good points about this patch, it would be
confusing to have only categories apply to the topic and
other properties such as links attached to the board.
This reverts commit 2a6388a7ec98f16b977933139610f67a53170b5a.
Bug: T75409
Change-Id: Ice772f6652777f5aa554ed6e65cc65a988644ece
---
M includes/Collection/AbstractCollection.php
M includes/Model/AbstractRevision.php
M includes/Parsoid/ContentFixer.php
3 files changed, 3 insertions(+), 12 deletions(-)
Approvals:
Mattflaschen: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/Collection/AbstractCollection.php
b/includes/Collection/AbstractCollection.php
index 114d2d9..4db16dc 100644
--- a/includes/Collection/AbstractCollection.php
+++ b/includes/Collection/AbstractCollection.php
@@ -220,15 +220,6 @@
}
/**
-* Returns the Title object this revision was created at.
-*
-* @return Title
-*/
- public function getOwnerTitle() {
- return $this-getWorkflow()-getOwnerTitle();
- }
-
- /**
* Returns the workflow object this collection is associated with.
*
* @return Workflow
diff --git a/includes/Model/AbstractRevision.php
b/includes/Model/AbstractRevision.php
index 1717337..f1af62a 100644
--- a/includes/Model/AbstractRevision.php
+++ b/includes/Model/AbstractRevision.php
@@ -356,7 +356,7 @@
$sourceFormat,
$format,
$raw,
- $this-getCollection()-getOwnerTitle()
+ $this-getCollection()-getTitle()
);
}
}
@@ -428,7 +428,7 @@
$inputFormat,
$storageFormat,
$content,
- $title ?:
$this-getCollection()-getOwnerTitle()
+ $title ?: $this-getCollection()-getTitle()
);
}
diff --git a/includes/Parsoid/ContentFixer.php
b/includes/Parsoid/ContentFixer.php
index cbe7a63..a4e2223 100644
--- a/includes/Parsoid/ContentFixer.php
+++ b/includes/Parsoid/ContentFixer.php
@@ -48,7 +48,7 @@
public function getContent( AbstractRevision $revision ) {
return $this-apply(
$revision-getContent( 'html' ),
- $revision-getCollection()-getOwnerTitle()
+ $revision-getCollection()-getTitle()
);
}
--
To view, visit https://gerrit.wikimedia.org/r/188253
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ice772f6652777f5aa554ed6e65cc65a988644ece
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: EBernhardson ebernhard...@wikimedia.org
Gerrit-Reviewer: Mattflaschen mflasc...@wikimedia.org
Gerrit-Reviewer: SG shah...@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] Stats: Add table for number of translators published between... - change (mediawiki...ContentTranslation)
Santhosh has uploaded a new change for review.
https://gerrit.wikimedia.org/r/188978
Change subject: Stats: Add table for number of translators published between
languages
..
Stats: Add table for number of translators published between languages
Number of unique translators published between language pairs is
an important stats to measure and analyse
Change-Id: I81c758b4ddae0318f23ae939d9e726630ae995cc
---
M Resources.php
M i18n/en.json
M i18n/qqq.json
M includes/Translation.php
M modules/stats/ext.cx.stats.js
5 files changed, 61 insertions(+), 26 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ContentTranslation
refs/changes/78/188978/1
diff --git a/Resources.php b/Resources.php
index 9f88842..c5acf68 100644
--- a/Resources.php
+++ b/Resources.php
@@ -623,6 +623,7 @@
'cx-stats-table-target-total',
'cx-stats-published-translations-title',
'cx-stats-draft-translations-title',
+ 'cx-stats-published-translators-title',
)
) + $resourcePaths;
diff --git a/i18n/en.json b/i18n/en.json
index e44e292..21829c4 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -141,5 +141,6 @@
cx-stats-table-source-total: Total (Source),
cx-stats-table-target-total: Total (Target),
cx-stats-published-translations-title: Published translations,
- cx-stats-draft-translations-title: In progress translations
+ cx-stats-draft-translations-title: In progress translations,
+ cx-stats-published-translators-title: Number of translators
}
diff --git a/i18n/qqq.json b/i18n/qqq.json
index 65aa802..3534aca 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -146,5 +146,6 @@
cx-stats-table-source-total: Header text to indicate total
translations from source language,
cx-stats-table-target-total: Header text to indicate total
translations to target language,
cx-stats-published-translations-title: Section title for published
translation stats,
- cx-stats-draft-translations-title: Section title for translations in
draft(in progress) state stats
+ cx-stats-draft-translations-title: Section title for translations in
draft(in progress) state stats,
+ cx-stats-published-translators-title: Section title for stats about
number of translators who published articles across languages
}
diff --git a/includes/Translation.php b/includes/Translation.php
index b7f5e14..ce2ff01 100644
--- a/includes/Translation.php
+++ b/includes/Translation.php
@@ -79,7 +79,8 @@
'translation_source_language',
'translation_target_language',
'translation_status',
- 'count(translation_target_language) as count',
+ 'COUNT(translation_target_language) as count',
+ 'COUNT(DISTINCT translation_started_by) AS
translators'
),
'',
'',
@@ -99,6 +100,7 @@
'targetLanguage' =
$row-translation_target_language,
'status' = $row-translation_status,
'count' = $row-count,
+ 'translators' = $row-translators,
);
}
return $result;
diff --git a/modules/stats/ext.cx.stats.js b/modules/stats/ext.cx.stats.js
index 6929d32..55f317d 100644
--- a/modules/stats/ext.cx.stats.js
+++ b/modules/stats/ext.cx.stats.js
@@ -27,11 +27,12 @@
} );
}
- function jsonToTable( records, status ) {
+ function jsonToTable( records, status, property ) {
var i, j, record,
table = [],
languages = [];
+ max = 0;
for ( i = 0; i records.length; i++ ) {
languages.push( records[ i ].sourceLanguage );
languages.push( records[ i ].targetLanguage );
@@ -45,7 +46,8 @@
for ( j = 0; j = languages.length; j++ ) {
table[ i ] = table[ i ] || [];
if ( i === 0 j === 0 ) {
- table[ 0 ][ 0 ] = mw.msg(
'cx-stats-table-source-target' );
+ table[ 0 ][ 0 ] = mw.msg(
+ 'cx-stats-table-source-target'
);
continue;
}
if ( i === 0 ) {
@@ -56,37 +58,45 @@
table[ i ][ 0 ] = languages[ i - 1 ];
continue;
}
- record =
[MediaWiki-commits] [Gerrit] Change i18n to JSON - change (mediawiki...ContributorsAddon)
Raimond Spekking has uploaded a new change for review.
https://gerrit.wikimedia.org/r/188799
Change subject: Change i18n to JSON
..
Change i18n to JSON
Change-Id: Ic1e76e967ca26343df9a1f853f6612e0fce9ed3e
---
M ContributorsAddon.i18n.php
M ContributorsAddon.php
A i18n/af.json
A i18n/ar.json
A i18n/arz.json
A i18n/ast.json
A i18n/az.json
A i18n/ba.json
A i18n/be-tarask.json
A i18n/br.json
A i18n/bs.json
A i18n/ca.json
A i18n/cs.json
A i18n/cy.json
A i18n/de.json
A i18n/dsb.json
A i18n/el.json
A i18n/en.json
A i18n/eo.json
A i18n/es.json
A i18n/eu.json
A i18n/ext.json
A i18n/fi.json
A i18n/fr.json
A i18n/gl.json
A i18n/gsw.json
A i18n/gu.json
A i18n/he.json
A i18n/hi.json
A i18n/hil.json
A i18n/hsb.json
A i18n/hu.json
A i18n/ia.json
A i18n/id.json
A i18n/ie.json
A i18n/it.json
A i18n/ja.json
A i18n/km.json
A i18n/ko.json
A i18n/ksh.json
A i18n/lb.json
A i18n/mg.json
A i18n/mk.json
A i18n/mr.json
A i18n/ms.json
A i18n/mt.json
A i18n/nb.json
A i18n/nds-nl.json
A i18n/nl.json
A i18n/nn.json
A i18n/oc.json
A i18n/pap.json
A i18n/pdt.json
A i18n/pl.json
A i18n/pms.json
A i18n/pt-br.json
A i18n/pt.json
A i18n/qqq.json
A i18n/roa-tara.json
A i18n/ru.json
A i18n/sah.json
A i18n/sk.json
A i18n/sl.json
A i18n/sq.json
A i18n/sr-ec.json
A i18n/sr-el.json
A i18n/su.json
A i18n/sv.json
A i18n/te.json
A i18n/th.json
A i18n/tl.json
A i18n/tr.json
A i18n/uk.json
A i18n/vec.json
A i18n/vi.json
A i18n/zh-hans.json
A i18n/zh-hant.json
A i18n/zh-tw.json
78 files changed, 641 insertions(+), 539 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ContributorsAddon
refs/changes/99/188799/1
diff --git a/ContributorsAddon.i18n.php b/ContributorsAddon.i18n.php
index a064c26..71db1cc 100644
--- a/ContributorsAddon.i18n.php
+++ b/ContributorsAddon.i18n.php
@@ -1,546 +1,35 @@
?php
/**
- * Internationalisation file for extension ContributorsAddon.
+ * This is a backwards-compatibility shim, generated by:
+ *
https://git.wikimedia.org/blob/mediawiki%2Fcore.git/HEAD/maintenance%2FgenerateJsonI18n.php
*
- * @file
- * @ingroup Extensions
+ * Beginning with MediaWiki 1.23, translation strings are stored in json files,
+ * and the EXTENSION.i18n.php file only exists to provide compatibility with
+ * older releases of MediaWiki. For more information about this migration, see:
+ * https://www.mediawiki.org/wiki/Requests_for_comment/Localisation_format
+ *
+ * This shim maintains compatibility back to MediaWiki 1.17.
*/
-
$messages = array();
+if ( !function_exists( 'wfJsonI18nShim42d96ddd6d9e2eb4' ) ) {
+ function wfJsonI18nShim42d96ddd6d9e2eb4( $cache, $code, $cachedData ) {
+ $codeSequence = array_merge( array( $code ),
$cachedData['fallbackSequence'] );
+ foreach ( $codeSequence as $csCode ) {
+ $fileName = dirname( __FILE__ ) .
/./i18n/$csCode.json;
+ if ( is_readable( $fileName ) ) {
+ $data = FormatJson::decode( file_get_contents(
$fileName ), true );
+ foreach ( array_keys( $data ) as $key ) {
+ if ( $key === '' || $key[0] === '@' ) {
+ unset( $data[$key] );
+ }
+ }
+ $cachedData['messages'] = array_merge( $data,
$cachedData['messages'] );
+ }
-$messages['en'] = array(
- 'contributorsaddon-desc' = 'Adds JavaScript popups to Main
contributors links',
-);
+ $cachedData['deps'][] = new FileDependency( $fileName );
+ }
+ return true;
+ }
-/** Message documentation (Message documentation)
- * @author Fryed-peach
- * @author Purodha
- * @author Siebrand
- */
-$messages['qqq'] = array(
- 'contributorsaddon-desc' = '{{desc}}
-Main contributions comes from {{msg-mw|contributors-toolbox}}.',
-);
-
-/** Afrikaans (Afrikaans)
- * @author Naudefj
- */
-$messages['af'] = array(
- 'contributorsaddon-desc' = 'Voeg Javascript-opspringe by die
Belangrikste bydraers-skakel',
-);
-
-/** Arabic (العربية)
- * @author Meno25
- */
-$messages['ar'] = array(
- 'contributorsaddon-desc' = 'يضيف منبثقات JS onMouseOver إلى وصلات
المساهمون الأساسيون',
-);
-
-/** Egyptian Spoken Arabic (مصرى)
- * @author Meno25
- */
-$messages['arz'] = array(
- 'contributorsaddon-desc' = 'يضيف منبثقات JS onMouseOver إلى وصلات
المساهمون الأساسيون',
-);
-
-/** Asturian (asturianu)
- * @author Xuacu
- */
-$messages['ast'] = array(
- 'contributorsaddon-desc' = 'Amiesta ventanes emerxentes JavaScript a
los enllaces de «Collaboradores principales»',
-);
-
-/** Azerbaijani (azərbaycanca)
- * @author Sortilegus
- */
-$messages['az'] = array(
- 'contributorsaddon-desc' = 'Əsas müəlliflər keçidi üçün üzə çıxan
JavaScript-sahəni əlavə edir',
[MediaWiki-commits] [Gerrit] tox: Set a sane line length limit - change (mediawiki...scap)
Yuvipanda has uploaded a new change for review. https://gerrit.wikimedia.org/r/188800 Change subject: tox: Set a sane line length limit .. tox: Set a sane line length limit Change-Id: I0b7c9820a85d4faf8289801bc25dd9d9aaeab42f --- M tox.ini 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/tools/scap refs/changes/00/188800/1 diff --git a/tox.ini b/tox.ini index 6130356..3a65c08 100644 --- a/tox.ini +++ b/tox.ini @@ -16,5 +16,6 @@ [testenv:flake8] commands = flake8 +max-line-length = 120 # No need to install any other dependency deps = flake8 -- To view, visit https://gerrit.wikimedia.org/r/188800 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I0b7c9820a85d4faf8289801bc25dd9d9aaeab42f Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/tools/scap Gerrit-Branch: master Gerrit-Owner: Yuvipanda yuvipa...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Exclude user interface elements in content from selection - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged.
Change subject: Exclude user interface elements in content from selection
..
Exclude user interface elements in content from selection
* Caption from the hidden TOC
* Show/hide button for extended details on image metadata
Steps to test the change:
* Open a random page in browser.
* Select all or a part of the page.
* Copy the selection to clipboard.
* Open a word processor like LibreOffice Writer.
* Paste the content of the clipboard.
Change-Id: Ic05ac226ee4985ae637928f96f1760c0b74aa7ef
---
M resources/src/mediawiki.action/mediawiki.action.view.metadata.css
M resources/src/mediawiki.legacy/shared.css
2 files changed, 11 insertions(+), 0 deletions(-)
Approvals:
Bartosz Dziewoński: Looks good to me, approved
jenkins-bot: Verified
diff --git a/resources/src/mediawiki.action/mediawiki.action.view.metadata.css
b/resources/src/mediawiki.action/mediawiki.action.view.metadata.css
index 2c8d2e6..9f786ec 100644
--- a/resources/src/mediawiki.action/mediawiki.action.view.metadata.css
+++ b/resources/src/mediawiki.action/mediawiki.action.view.metadata.css
@@ -4,3 +4,13 @@
table.collapsed tr.collapsable {
display: none;
}
+
+/*
+ * Exclude user interface elements from selection.
+ */
+.mw-metadata-show-hide-extended {
+ -moz-user-select: none;
+ -webkit-user-select: none;
+ -ms-user-select: none;
+ user-select: none;
+}
diff --git a/resources/src/mediawiki.legacy/shared.css
b/resources/src/mediawiki.legacy/shared.css
index 0604773..d9284bb 100644
--- a/resources/src/mediawiki.legacy/shared.css
+++ b/resources/src/mediawiki.legacy/shared.css
@@ -1124,6 +1124,7 @@
.mw-editsection,
.toctoggle,
+.tochidden,
#jump-to-nav {
-moz-user-select: none;
-webkit-user-select: none;
--
To view, visit https://gerrit.wikimedia.org/r/110186
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ic05ac226ee4985ae637928f96f1760c0b74aa7ef
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Gerrit Patch Uploader gerritpatchuploa...@gmail.com
Gerrit-Reviewer: Bartosz Dziewoński matma@gmail.com
Gerrit-Reviewer: Daniel Friesen dan...@nadir-seen-fire.com
Gerrit-Reviewer: Gerrit Patch Uploader gerritpatchuploa...@gmail.com
Gerrit-Reviewer: Jack Phoenix j...@countervandalism.net
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Merge branch 'wikibaseView' into entityViewInit - change (mediawiki...Wikibase)
Adrian Lang has uploaded a new change for review. https://gerrit.wikimedia.org/r/188804 Change subject: Merge branch 'wikibaseView' into entityViewInit .. Merge branch 'wikibaseView' into entityViewInit Change-Id: I910e12499704d1c098351458c8aa850691254aaa --- 0 files changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase refs/changes/04/188804/1 -- To view, visit https://gerrit.wikimedia.org/r/188804 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I910e12499704d1c098351458c8aa850691254aaa Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Wikibase Gerrit-Branch: master Gerrit-Owner: Adrian Lang adrian.he...@wikimedia.de ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] puppet-lint: ignore some var in single quoted strings - change (operations/puppet)
Hashar has uploaded a new change for review.
https://gerrit.wikimedia.org/r/188805
Change subject: puppet-lint: ignore some var in single quoted strings
..
puppet-lint: ignore some var in single quoted strings
We have some use of puppet style variables in single quote string. They
are not meant to be interpreted by puppet itself but still cause
puppet-lint to complains about it.
Use puppet-lint control comments [1] to ignore the few occurences we
have.
That fix the last puppet-lint error we had in the repository:
$ puppet-lint --error-level=error .`
$
[1] http://puppet-lint.com/controlcomments/
Bug: T87132
Change-Id: Id00e0a7844a539b7bf3aeeeb22b0887c34326693
---
M manifests/role/gerrit.pp
M modules/contint/manifests/packages/labs.pp
2 files changed, 11 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/05/188805/1
diff --git a/manifests/role/gerrit.pp b/manifests/role/gerrit.pp
index c77ac2e..7c78988 100644
--- a/manifests/role/gerrit.pp
+++ b/manifests/role/gerrit.pp
@@ -83,8 +83,11 @@
'url' = [
# Note: This is in single quotes on purpose. ${name}
is not
# expected to be expanded by puppet but rather by
gerrit
+#
+# lint:ignore:single_quote_string_with_variables
'gerritsl...@gallium.wikimedia.org:/srv/ssd/gerrit/${name}.git',
'gerritslave@lanthanum.eqiad.wmnet:/srv/ssd/gerrit/${name}.git',
+# lint:endignore
],
'threads' = '4',
'mirror' = 'true',
@@ -92,7 +95,10 @@
'gitblit' = {
# Note: This is in single quotes on purpose. ${name} is not
# expected to be expanded by puppet but rather by gerrit
+#
+# lint:ignore:single_quote_string_with_variables
'url' =
'gerritsl...@antimony.wikimedia.org:/var/lib/git/${name}.git',
+# lint:endignore
'threads' = '4',
'authGroup' = 'mediawiki-replication',
'push' = '+refs/*:refs/*',
@@ -101,7 +107,10 @@
'github' = {
# Note: This is in single quotes on purpose. ${name} is not
# expected to be expanded by puppet but rather by gerrit
+#
+# lint:ignore:single_quote_string_with_variables
'url' =
'g...@github.com:wikimedia/${name}',
+# lint:endignore
'threads' = '4',
'authGroup'= 'mediawiki-replication',
'push' = $replication_basic_push_refs,
diff --git a/modules/contint/manifests/packages/labs.pp
b/modules/contint/manifests/packages/labs.pp
index 40b51b1..c6d400e 100644
--- a/modules/contint/manifests/packages/labs.pp
+++ b/modules/contint/manifests/packages/labs.pp
@@ -15,7 +15,9 @@
apt::conf { 'unattended-upgrades-wikimedia':
priority = '51',
key = 'Unattended-Upgrade::Allowed-Origins',
+# lint:ignore:single_quote_string_with_variables
value= 'Wikimedia:${distro_codename}-wikimedia',
+# lint:endignore
}
apt::conf { 'lower-periodic-randomsleep':
priority = '51',
--
To view, visit https://gerrit.wikimedia.org/r/188805
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Id00e0a7844a539b7bf3aeeeb22b0887c34326693
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] monitoring: fix logo image location - change (operations/puppet)
Faidon Liambotis has submitted this change and it was merged.
Change subject: monitoring: fix logo image location
..
monitoring: fix logo image location
Change-Id: I2eae1c48d3e60f160c272bbc45ad0b2576d561c6
---
M modules/monitoring/manifests/host.pp
1 file changed, 3 insertions(+), 3 deletions(-)
Approvals:
Faidon Liambotis: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/monitoring/manifests/host.pp
b/modules/monitoring/manifests/host.pp
index 26e4979..2e86b56 100644
--- a/modules/monitoring/manifests/host.pp
+++ b/modules/monitoring/manifests/host.pp
@@ -56,9 +56,9 @@
target = '/etc/nagios/puppet_hostextinfo.cfg',
host_name = $title,
notes = $title,
-icon_image = ${image}.png,
-vrml_image = ${image}.png,
-statusmap_image = ${image}.gd2,
+icon_image = base/${image}.png,
+vrml_image = base/${image}.png,
+statusmap_image = base/${image}.gd2,
}
}
}
--
To view, visit https://gerrit.wikimedia.org/r/188806
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I2eae1c48d3e60f160c272bbc45ad0b2576d561c6
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon Liambotis fai...@wikimedia.org
Gerrit-Reviewer: Faidon Liambotis fai...@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] Drop dead code from TermSqlIndexTest - change (mediawiki...Wikibase)
jenkins-bot has submitted this change and it was merged. Change subject: Drop dead code from TermSqlIndexTest .. Drop dead code from TermSqlIndexTest Change-Id: I1e5ec2c5f52ef9a5504e63363e9889edeb8cf4f5 --- M repo/tests/phpunit/includes/store/sql/TermSqlIndexTest.php 1 file changed, 0 insertions(+), 2 deletions(-) Approvals: Adrian Lang: Looks good to me, approved jenkins-bot: Verified diff --git a/repo/tests/phpunit/includes/store/sql/TermSqlIndexTest.php b/repo/tests/phpunit/includes/store/sql/TermSqlIndexTest.php index 5ad6332..38e4ec0 100644 --- a/repo/tests/phpunit/includes/store/sql/TermSqlIndexTest.php +++ b/repo/tests/phpunit/includes/store/sql/TermSqlIndexTest.php @@ -131,9 +131,7 @@ new AliasGroupList() ); - $label = new Term( array( 'termType' = Term::TYPE_LABEL ) ); $labelFooEn = new Term( array( 'termLanguage' = 'en', 'termType' = Term::TYPE_LABEL, 'termText' = 'Foo' ) ); - $labelFuhDe = new Term( array( 'termLanguage' = 'de', 'termType' = Term::TYPE_LABEL, 'termText' = 'Fuh' ) ); $descriptionBarEn = new Term( array( 'termLanguage' = 'en', 'termType' = Term::TYPE_DESCRIPTION, 'termText' = 'Bar' ) ); return array( -- To view, visit https://gerrit.wikimedia.org/r/188339 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I1e5ec2c5f52ef9a5504e63363e9889edeb8cf4f5 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.he...@wikimedia.de Gerrit-Reviewer: Aude aude.w...@gmail.com Gerrit-Reviewer: Daniel Kinzler daniel.kinz...@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] Alignment: Align source title heading on target title change - change (mediawiki...ContentTranslation)
jenkins-bot has submitted this change and it was merged.
Change subject: Alignment: Align source title heading on target title change
..
Alignment: Align source title heading on target title change
Bug: T86660
Change-Id: I782e293dc17bbd802889c4c1d49e62687f243f65
---
M modules/publish/ext.cx.publish.js
M modules/util/ext.cx.util.js
2 files changed, 5 insertions(+), 3 deletions(-)
Approvals:
Jsahleen: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/publish/ext.cx.publish.js
b/modules/publish/ext.cx.publish.js
index 633773c..75c6176 100644
--- a/modules/publish/ext.cx.publish.js
+++ b/modules/publish/ext.cx.publish.js
@@ -195,7 +195,9 @@
categories: categories,
progress: JSON.stringify(
mw.cx.getProgress() )
} ).done( function () {
- $( '.cx-column--translation
h2' ).text( publishedTitle );
+ $( '.cx-column--translation
h2' )
+ .text( publishedTitle )
+ .trigger( 'input' );
mw.hook( 'mw.cx.success' )
.fire( mw.message(
'cx-publish-page-success',
$( 'a' ).attr( {
diff --git a/modules/util/ext.cx.util.js b/modules/util/ext.cx.util.js
index e0026f0..0a35eb7 100644
--- a/modules/util/ext.cx.util.js
+++ b/modules/util/ext.cx.util.js
@@ -38,8 +38,8 @@
};
mw.cx.getSourceSection = function ( id ) {
- // Sanity check
- if ( isNaN( id ) ) {
+ // Sanity check, id should be either a number or prefixed with
cx
+ if ( isNaN( id ) id.indexOf( 'cx') !== 0 ) {
return $( [] );
} else {
return $( document.getElementById( id ) );
--
To view, visit https://gerrit.wikimedia.org/r/188252
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I782e293dc17bbd802889c4c1d49e62687f243f65
Gerrit-PatchSet: 8
Gerrit-Project: mediawiki/extensions/ContentTranslation
Gerrit-Branch: master
Gerrit-Owner: Jsahleen jsahl...@wikimedia.org
Gerrit-Reviewer: Amire80 amir.ahar...@mail.huji.ac.il
Gerrit-Reviewer: Jsahleen jsahl...@wikimedia.org
Gerrit-Reviewer: Santhosh santhosh.thottin...@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] mw1018 uses www-data as its main user - change (operations/puppet)
Giuseppe Lavagetto has submitted this change and it was merged. Change subject: mw1018 uses www-data as its main user .. mw1018 uses www-data as its main user Change-Id: Idd8bc29ef9b8e2e0416e83a2be958035215367c4 --- A hieradata/hosts/mw1018.yaml 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Giuseppe Lavagetto: Looks good to me, approved jenkins-bot: Verified diff --git a/hieradata/hosts/mw1018.yaml b/hieradata/hosts/mw1018.yaml new file mode 100644 index 000..d278b6b --- /dev/null +++ b/hieradata/hosts/mw1018.yaml @@ -0,0 +1 @@ +mediawiki::users::web: www-data -- To view, visit https://gerrit.wikimedia.org/r/188797 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Idd8bc29ef9b8e2e0416e83a2be958035215367c4 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Giuseppe Lavagetto glavage...@wikimedia.org Gerrit-Reviewer: Giuseppe Lavagetto glavage...@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] Move stuff around in entityViewInit - change (mediawiki...Wikibase)
jenkins-bot has submitted this change and it was merged.
Change subject: Move stuff around in entityViewInit
..
Move stuff around in entityViewInit
This tries to separate the instantiation of entityviews and toolbarcontrollers
from those parts adding functionality around them.
Change-Id: I9dc3291195d85d17e2d42d1d014859edaf238db1
---
M repo/resources/wikibase.ui.entityViewInit.js
1 file changed, 53 insertions(+), 37 deletions(-)
Approvals:
Henning Snater: Looks good to me, approved
jenkins-bot: Verified
diff --git a/repo/resources/wikibase.ui.entityViewInit.js
b/repo/resources/wikibase.ui.entityViewInit.js
index 0dd32a4..692852e 100644
--- a/repo/resources/wikibase.ui.entityViewInit.js
+++ b/repo/resources/wikibase.ui.entityViewInit.js
@@ -8,22 +8,45 @@
'use strict';
mw.hook( 'wikipage.content' ).add( function() {
- var $entityview = $( '.wikibase-entityview' );
- if( mw.config.get( 'wbEntity' ) !== null ) {
- initToolbarController( $entityview );
-
- var entityInitializer = new wb.EntityInitializer(
'wbEntity' );
-
- entityInitializer.getEntity().done( function( entity ) {
- createEntityDom( entity, $entityview.first() );
- evaluateRestrictions();
-
- // Remove loading spinner after JavaScript has
kicked in:
- $entityview.removeClass( 'loading' );
- $( '.wb-entity-spinner' ).remove();
- } );
+ if( mw.config.get( 'wbEntity' ) === null ) {
+ return;
}
+
+ var $entityview = $( '.wikibase-entityview' );
+ var entityInitializer = new wb.EntityInitializer( 'wbEntity' );
+
+ initToolbarController( $entityview );
+
+ entityInitializer.getEntity().done( function( entity ) {
+ var viewName = createEntityView( entity,
$entityview.first() );
+
+ $entityview.on( viewName + 'afterstartediting',
function() {
+ triggerAnonymousEditWarning( entity.getType() );
+ } );
+
+ $entityview.on( viewName + 'afterstopediting',
function( event, dropValue ) {
+ updateWatchLink( dropValue );
+ } );
+
+ evaluateRestrictions();
+
+ // Remove loading spinner after JavaScript has kicked
in:
+ $entityview.removeClass( 'loading' );
+ $( '.wb-entity-spinner' ).remove();
+ } );
+
+ $entityview.on( 'labelviewchange labelviewafterstopediting',
function( event ) {
+ var $labelview = $( event.target ),
+ labelview = $labelview.data( 'labelview' ),
+ label = labelview.value().getText();
+
+ $( 'title' ).text(
+ mw.msg( 'pagetitle', label !== '' ? label :
mw.config.get( 'wgTitle' ) )
+ );
+ } );
+
+ attachCopyrightTooltip( $entityview );
} );
/**
@@ -58,9 +81,14 @@
}
};
- $entityview
- .toolbarcontroller( toolbarControllerConfig )
- .on( 'edittoolbarafterstartediting', function( event ) {
+ $entityview.toolbarcontroller( toolbarControllerConfig );
+ }
+
+ /**
+* @param {jQuery} $entityview
+*/
+ function attachCopyrightTooltip( $entityview ) {
+ $entityview.on( 'edittoolbarafterstartediting', function( event
) {
var $target = $( event.target ),
gravity = 'sw';
@@ -73,7 +101,7 @@
gravity = 'nw';
}
- showCopyrightTooltip( $entityview, $( event.target ),
gravity );
+ showCopyrightTooltip( $entityview, $target, gravity );
} );
}
@@ -104,10 +132,11 @@
/**
* @param {wikibase.datamodel.Entity} entity
* @param {jQuery} $entityview
+* @return {string} The name of the entity view widget class
*
* @throws {Error} if no widget to render the entity exists.
*/
- function createEntityDom( entity, $entityview ) {
+ function createEntityView( entity, $entityview ) {
var repoConfig = mw.config.get( 'wbRepo' );
var mwApi = wb.api.getLocationAgnosticMwApi( repoConfig.url +
repoConfig.scriptPath + '/api.php' );
var repoApi = new wb.api.RepoApi( mwApi ),
@@ -119,13
[MediaWiki-commits] [Gerrit] tox: Set a sane line length limit - change (mediawiki...scap)
jenkins-bot has submitted this change and it was merged. Change subject: tox: Set a sane line length limit .. tox: Set a sane line length limit Change-Id: I0b7c9820a85d4faf8289801bc25dd9d9aaeab42f --- M tox.ini 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Yuvipanda: Looks good to me, approved jenkins-bot: Verified diff --git a/tox.ini b/tox.ini index 6130356..3a65c08 100644 --- a/tox.ini +++ b/tox.ini @@ -16,5 +16,6 @@ [testenv:flake8] commands = flake8 +max-line-length = 120 # No need to install any other dependency deps = flake8 -- To view, visit https://gerrit.wikimedia.org/r/188800 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I0b7c9820a85d4faf8289801bc25dd9d9aaeab42f Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/tools/scap Gerrit-Branch: master Gerrit-Owner: Yuvipanda yuvipa...@gmail.com Gerrit-Reviewer: Yuvipanda yuvipa...@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] Revert tox: Set a sane line length limit - change (mediawiki...scap)
Hashar has uploaded a new change for review. https://gerrit.wikimedia.org/r/188802 Change subject: Revert tox: Set a sane line length limit .. Revert tox: Set a sane line length limit To tweak flake8 you want to add the parameter in setup.cfg [flake8] section instead. Not in tox.ini testenv definition. This reverts commit 144668356cc169042a78206c95cc3c62ab2b8e44. Change-Id: I409bbe23602e665cd534d5f8a3a5bbe76b20082a --- M tox.ini 1 file changed, 0 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/tools/scap refs/changes/02/188802/1 diff --git a/tox.ini b/tox.ini index 3a65c08..6130356 100644 --- a/tox.ini +++ b/tox.ini @@ -16,6 +16,5 @@ [testenv:flake8] commands = flake8 -max-line-length = 120 # No need to install any other dependency deps = flake8 -- To view, visit https://gerrit.wikimedia.org/r/188802 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I409bbe23602e665cd534d5f8a3a5bbe76b20082a Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/tools/scap Gerrit-Branch: master 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] Depend on python-carbon - change (operations...txstatsd)
Filippo Giunchedi has uploaded a new change for review.
https://gerrit.wikimedia.org/r/188807
Change subject: Depend on python-carbon
..
Depend on python-carbon
Change-Id: I4176d28e0a81b6b874e5702cbe8db7da576442e1
---
M debian/changelog
M debian/control
2 files changed, 7 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/debs/txstatsd
refs/changes/07/188807/1
diff --git a/debian/changelog b/debian/changelog
index 90ac1d4..0d889f6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+txstatsd (1.0.0-3) unstable; urgency=medium
+
+ * Depend on python-carbon
+
+ -- Filippo Giunchedi fili...@wikimedia.org Thu, 05 Feb 2015 14:12:43 +
+
txstatsd (1.0.0-2) unstable; urgency=medium
* Add support for line/plaintext protocol,
diff --git a/debian/control b/debian/control
index e5c9845..ca5947c 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,7 @@
Package: python-txstatsd
Architecture: all
-Depends: ${misc:Depends}, ${python:Depends}
+Depends: ${misc:Depends}, ${python:Depends}, python-carbon
Description: A network daemon for aggregating statistics
.
Twisted-based implementation of a statsd-compatible server and client.
--
To view, visit https://gerrit.wikimedia.org/r/188807
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I4176d28e0a81b6b874e5702cbe8db7da576442e1
Gerrit-PatchSet: 1
Gerrit-Project: operations/debs/txstatsd
Gerrit-Branch: master
Gerrit-Owner: Filippo Giunchedi fgiunch...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mw1018 uses www-data as its main user - change (operations/puppet)
Giuseppe Lavagetto has uploaded a new change for review. https://gerrit.wikimedia.org/r/188797 Change subject: mw1018 uses www-data as its main user .. mw1018 uses www-data as its main user Change-Id: Idd8bc29ef9b8e2e0416e83a2be958035215367c4 --- A hieradata/hosts/mw1018.yaml 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/97/188797/1 diff --git a/hieradata/hosts/mw1018.yaml b/hieradata/hosts/mw1018.yaml new file mode 100644 index 000..d278b6b --- /dev/null +++ b/hieradata/hosts/mw1018.yaml @@ -0,0 +1 @@ +mediawiki::users::web: www-data -- To view, visit https://gerrit.wikimedia.org/r/188797 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Idd8bc29ef9b8e2e0416e83a2be958035215367c4 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Giuseppe Lavagetto glavage...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Adjust puppet-lint options for 1.1.0 - change (integration/config)
jenkins-bot has submitted this change and it was merged.
Change subject: Adjust puppet-lint options for 1.1.0
..
Adjust puppet-lint options for 1.1.0
We are upgrading puppet-lint Debian packages on the CI slaves from 0.3.2
to 1.1.0. The log format %{linenumber} is now %{line}.
Change-Id: I5e9d32f4a058701a020295bb3cb10a620b0021c7
---
M jjb/macro.yaml
1 file changed, 2 insertions(+), 2 deletions(-)
Approvals:
Hashar: Looks good to me, approved
jenkins-bot: Verified
diff --git a/jjb/macro.yaml b/jjb/macro.yaml
index 670fe09..6fdc1e5 100644
--- a/jjb/macro.yaml
+++ b/jjb/macro.yaml
@@ -17,7 +17,7 @@
puppet-lint --version
set -o pipefail
puppet-lint \
---log-format '%{path}:%{linenumber} %{KIND} %{message} (%{check})'
\
+--log-format '%{path}:%{line} %{KIND} %{message} (%{check})' \
--fail-on-warnings \
. | tee puppet-lint.log
set +o pipefail
@@ -31,7 +31,7 @@
set -o pipefail
puppet-lint \
--error-level error \
---log-format '%{path}:%{linenumber} %{KIND} %{message} (%{check})'
\
+--log-format '%{path}:%{line} %{KIND} %{message} (%{check})' \
. | tee puppet-lint.log
set +o pipefail
--
To view, visit https://gerrit.wikimedia.org/r/188794
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I5e9d32f4a058701a020295bb3cb10a620b0021c7
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Hashar has...@free.fr
Gerrit-Reviewer: Hashar has...@free.fr
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 scap do things as www-data user instead of apache user - change (mediawiki...scap)
Yuvipanda has uploaded a new change for review.
https://gerrit.wikimedia.org/r/188798
Change subject: Make scap do things as www-data user instead of apache user
..
Make scap do things as www-data user instead of apache user
Bug: T78076
Change-Id: Ib80744704cc7f128e0661c1ea1f4b5672cdc1f9e
---
M scap/tasks.py
1 file changed, 4 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/tools/scap
refs/changes/98/188798/1
diff --git a/scap/tasks.py b/scap/tasks.py
index 46eb132..d248c00 100644
--- a/scap/tasks.py
+++ b/scap/tasks.py
@@ -428,21 +428,21 @@
logger.info('Updating ExtensionMessages-%s.php', version)
new_extension_messages = subprocess.check_output(
-'sudo -u apache -n -- /bin/mktemp', shell=True).strip()
-utils.sudo_check_call('apache',
+'sudo -u www-data -n -- /bin/mktemp', shell=True).strip()
+utils.sudo_check_call('www-data',
'/usr/local/bin/mwscript mergeMessageFileList.php '
'--wiki=%s --list-file=%s/wmf-config/extension-list '
'--output=%s %s' % (
wikidb, cfg['stage_dir'], new_extension_messages,
verbose_messagelist),
logger)
-utils.sudo_check_call('apache',
+utils.sudo_check_call('www-data',
'chmod 0664 %s' % new_extension_messages,
logger)
logger.debug('Copying %s to %s' % (
new_extension_messages, extension_messages))
shutil.copyfile(new_extension_messages, extension_messages)
-utils.sudo_check_call('apache', 'rm %s' % new_extension_messages, logger)
+utils.sudo_check_call('www-data', 'rm %s' % new_extension_messages,
logger)
# Update ExtensionMessages-*.php in the local copy.
deploy_dir = os.path.realpath(cfg['deploy_dir'])
--
To view, visit https://gerrit.wikimedia.org/r/188798
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib80744704cc7f128e0661c1ea1f4b5672cdc1f9e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/tools/scap
Gerrit-Branch: master
Gerrit-Owner: Yuvipanda yuvipa...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] fixed error, flexiskin now opens edit window now - change (mediawiki...BlueSpiceExtensions)
Tweichart has uploaded a new change for review.
https://gerrit.wikimedia.org/r/188801
Change subject: fixed error, flexiskin now opens edit window now
..
fixed error, flexiskin now opens edit window now
Change-Id: I983bf10040c5ad5e6736ab4b4d21e1150f0331d8
---
M Flexiskin/resources/BS.Flexiskin/Menuitems/BaseItem.js
M Flexiskin/resources/BS.Flexiskin/Menuitems/General.js
M Flexiskin/resources/BS.Flexiskin/Menuitems/Header.js
M Flexiskin/resources/BS.Flexiskin/Menuitems/Position.js
M Flexiskin/resources/BS.Flexiskin/PreviewMenu.js
M Flexiskin/resources/BS.Flexiskin/PreviewWindow.js
6 files changed, 16 insertions(+), 36 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceExtensions
refs/changes/01/188801/1
diff --git a/Flexiskin/resources/BS.Flexiskin/Menuitems/BaseItem.js
b/Flexiskin/resources/BS.Flexiskin/Menuitems/BaseItem.js
index f65b186..f858c33 100644
--- a/Flexiskin/resources/BS.Flexiskin/Menuitems/BaseItem.js
+++ b/Flexiskin/resources/BS.Flexiskin/Menuitems/BaseItem.js
@@ -1,4 +1,4 @@
-Ext.define('BS.Flexiskin.menu.BaseItem', {
+Ext.define('BS.Flexiskin.Menuitems.BaseItem', {
extend: 'Ext.Panel',
layout: 'form',
currentData: {},
diff --git a/Flexiskin/resources/BS.Flexiskin/Menuitems/General.js
b/Flexiskin/resources/BS.Flexiskin/Menuitems/General.js
index af336b5..b37f83e 100644
--- a/Flexiskin/resources/BS.Flexiskin/Menuitems/General.js
+++ b/Flexiskin/resources/BS.Flexiskin/Menuitems/General.js
@@ -1,5 +1,5 @@
Ext.define('BS.Flexiskin.Menuitems.General', {
- extend: 'BS.Flexiskin.menu.BaseItem',
+ extend: 'BS.Flexiskin.Menuitems.BaseItem',
title: mw.message('bs-flexiskin-headerGeneral').plain(),
layout: 'form',
currentData: {},
@@ -173,24 +173,5 @@
this.cgRepeatBackground.setValue(data.config.repeatBackground)
Ext.getCmp('bs-extjs-uploadCombo-background-hidden-field').setValue(data.config.backgroundImage);
$(document).trigger(BSFlexiskinMenuGeneralSetData, [this,
data]);
- },
- setColor: function(el, clr, textfield) {
- if( typeof clr == undefined || clr == null) return;
-
- var bFound = false;
- clr = clr.replace('#', );
- Ext.Array.each(el.colors, function(val) {
- if (clr == val) {
- bFound = true;
- }
- });
- if (bFound == false){
- if (textfield){
- textfield.setValue(clr);
- }
- el.clear();
- }
- else
- el.select(clr);
}
});
\ No newline at end of file
diff --git a/Flexiskin/resources/BS.Flexiskin/Menuitems/Header.js
b/Flexiskin/resources/BS.Flexiskin/Menuitems/Header.js
index 66b5caf..e558bc0 100644
--- a/Flexiskin/resources/BS.Flexiskin/Menuitems/Header.js
+++ b/Flexiskin/resources/BS.Flexiskin/Menuitems/Header.js
@@ -1,5 +1,5 @@
Ext.define('BS.Flexiskin.Menuitems.Header', {
- extend: 'BS.Flexiskin.menu.BaseItem',
+ extend: 'BS.Flexiskin.Menuitems.BaseItem',
title: mw.message('bs-flexiskin-headerHeader').plain(),
layout: 'form',
currentData: {},
@@ -20,7 +20,6 @@
$(document).trigger(BSFlexiskinMenuHeaderInitComponent,
[this, this.items]);
- this.afterInitComponent();
this.callParent(arguments);
},
btnUploadClick: function(el, form) {
diff --git a/Flexiskin/resources/BS.Flexiskin/Menuitems/Position.js
b/Flexiskin/resources/BS.Flexiskin/Menuitems/Position.js
index 00cfc9b..5fc293d 100644
--- a/Flexiskin/resources/BS.Flexiskin/Menuitems/Position.js
+++ b/Flexiskin/resources/BS.Flexiskin/Menuitems/Position.js
@@ -1,5 +1,5 @@
Ext.define('BS.Flexiskin.Menuitems.Position', {
- extend: 'BS.Flexiskin.menu.BaseItem',
+ extend: 'BS.Flexiskin.Menuitems.BaseItem',
title: mw.message('bs-flexiskin-headerPosition').plain(),
layout: 'form',
currentData: {},
diff --git a/Flexiskin/resources/BS.Flexiskin/PreviewMenu.js
b/Flexiskin/resources/BS.Flexiskin/PreviewMenu.js
index 1f0a679..11187e0 100644
--- a/Flexiskin/resources/BS.Flexiskin/PreviewMenu.js
+++ b/Flexiskin/resources/BS.Flexiskin/PreviewMenu.js
@@ -65,7 +65,7 @@
for (var i = 0; i items.length; i++) {
items[i].setData( {skinId : obj.skinId, config:
obj.config[i]} );
}
- $(document).trigger(BSFlexiskinMenuPreviewSetData, [this,
data]);
+ $(document).trigger(BSFlexiskinMenuPreviewSetData, [this,
this.items]);
//this.callParent( arguments );
},
btnSaveClick: function() {
diff --git a/Flexiskin/resources/BS.Flexiskin/PreviewWindow.js
[MediaWiki-commits] [Gerrit] beta: Remove mediawiki03 from dsh groups - change (operations/puppet)
Yuvipanda has uploaded a new change for review. https://gerrit.wikimedia.org/r/188803 Change subject: beta: Remove mediawiki03 from dsh groups .. beta: Remove mediawiki03 from dsh groups Was killed a little while ago Change-Id: Iee7234a9535326f8cf8aae714c84f4eb6d543d77 --- M modules/beta/files/dsh/group/mediawiki-installation 1 file changed, 0 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/03/188803/1 diff --git a/modules/beta/files/dsh/group/mediawiki-installation b/modules/beta/files/dsh/group/mediawiki-installation index 33448ff..3258daf 100644 --- a/modules/beta/files/dsh/group/mediawiki-installation +++ b/modules/beta/files/dsh/group/mediawiki-installation @@ -2,6 +2,5 @@ deployment-jobrunner01.eqiad.wmflabs deployment-mediawiki01.eqiad.wmflabs deployment-mediawiki02.eqiad.wmflabs -deployment-mediawiki03.eqiad.wmflabs deployment-rsync01.eqiad.wmflabs deployment-videoscaler01.eqiad.wmflabs -- To view, visit https://gerrit.wikimedia.org/r/188803 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iee7234a9535326f8cf8aae714c84f4eb6d543d77 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Yuvipanda yuvipa...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Revert tox: Set a sane line length limit - change (mediawiki...scap)
jenkins-bot has submitted this change and it was merged. Change subject: Revert tox: Set a sane line length limit .. Revert tox: Set a sane line length limit To tweak flake8 you want to add the parameter in setup.cfg [flake8] section instead. Not in tox.ini testenv definition. This reverts commit 144668356cc169042a78206c95cc3c62ab2b8e44. Change-Id: I409bbe23602e665cd534d5f8a3a5bbe76b20082a --- M tox.ini 1 file changed, 0 insertions(+), 1 deletion(-) Approvals: Hashar: Looks good to me, approved jenkins-bot: Verified diff --git a/tox.ini b/tox.ini index 3a65c08..6130356 100644 --- a/tox.ini +++ b/tox.ini @@ -16,6 +16,5 @@ [testenv:flake8] commands = flake8 -max-line-length = 120 # No need to install any other dependency deps = flake8 -- To view, visit https://gerrit.wikimedia.org/r/188802 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I409bbe23602e665cd534d5f8a3a5bbe76b20082a Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/tools/scap Gerrit-Branch: master Gerrit-Owner: Hashar has...@free.fr Gerrit-Reviewer: Hashar has...@free.fr Gerrit-Reviewer: Yuvipanda yuvipa...@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] Make UpdateRepo more robust - change (mediawiki...Wikibase)
jenkins-bot has submitted this change and it was merged.
Change subject: Make UpdateRepo more robust
..
Make UpdateRepo more robust
Jobs running within a second of the actual action were causing problems,
as due to replag etc. the API might not be aware of the changes.
To avoid that delay these jobs for the highest replag of any pooled
database server + 1 second now.
Also we only normalize page names for moves once now, and I made
UpdateRepo::createJob private as it was only used for testing.
Bug: T76545
Change-Id: Ia5c3e112c6b0ed9b1f8cc0f10dc35ecf688760ba
---
M client/includes/UpdateRepo/UpdateRepo.php
M client/includes/UpdateRepo/UpdateRepoOnMove.php
M client/tests/phpunit/includes/UpdateRepo/UpdateRepoOnDeleteTest.php
M client/tests/phpunit/includes/UpdateRepo/UpdateRepoOnMoveTest.php
M repo/includes/UpdateRepo/UpdateRepoJob.php
M repo/includes/UpdateRepo/UpdateRepoOnMoveJob.php
6 files changed, 117 insertions(+), 37 deletions(-)
Approvals:
Adrian Lang: Looks good to me, approved
jenkins-bot: Verified
diff --git a/client/includes/UpdateRepo/UpdateRepo.php
b/client/includes/UpdateRepo/UpdateRepo.php
index 4480f1a..0f0100e 100644
--- a/client/includes/UpdateRepo/UpdateRepo.php
+++ b/client/includes/UpdateRepo/UpdateRepo.php
@@ -134,7 +134,7 @@
public function injectJob( JobQueueGroup $jobQueueGroup ) {
wfProfileIn( __METHOD__ );
- $job = $this-createJob();
+ $job = $this-createJob( $jobQueueGroup );
wfProfileIn( __METHOD__ . '#push' );
$jobQueueGroup-push( $job );
@@ -146,14 +146,21 @@
/**
* Returns a new job for updating the repo.
*
+* @param JobQueueGroup $jobQueueGroup
+*
* @return IJobSpecification
*/
- public function createJob() {
+ private function createJob( JobQueueGroup $jobQueueGroup ) {
wfProfileIn( __METHOD__ );
+
+ $params = $this-getJobParameters();
+ if ( $this-delayJobs( $jobQueueGroup ) ) {
+ $params['jobReleaseTimestamp'] = time() +
$this-getJobDelay();
+ }
$job = new JobSpecification(
$this-getJobName(),
- $this-getJobParameters()
+ $params
);
wfProfileOut( __METHOD__ );
@@ -162,6 +169,31 @@
}
/**
+* @param JobQueueGroup $jobQueueGroup
+*
+* @return bool
+*/
+ private function delayJobs( JobQueueGroup $jobQueueGroup ) {
+ return $jobQueueGroup-get( $this-getJobName()
)-delayedJobsEnabled();
+ }
+
+ /**
+* Get the time (in seconds) for which the job execution should be
delayed
+* (if delayed jobs are enabled). Defaults to the max replag of any
pooled
+* DB server + 1 seconds.
+*
+* @return int
+*/
+ protected function getJobDelay() {
+ $lagArray = wfGetLB()-getMaxLag();
+ // This should be good enough, especially given that lagged
servers get
+ // less load by the load balancer, thus it's very unlikely
we'll end
+ // up on the server with the highest lag.
+ // Note: Always add at least +1 here, otherwise this can be -1
+ return $lagArray[1] + 1;
+ }
+
+ /**
* Get the parameters for creating a new IJobSpecification
*
* @return array
diff --git a/client/includes/UpdateRepo/UpdateRepoOnMove.php
b/client/includes/UpdateRepo/UpdateRepoOnMove.php
index 272ca41..319f249 100644
--- a/client/includes/UpdateRepo/UpdateRepoOnMove.php
+++ b/client/includes/UpdateRepo/UpdateRepoOnMove.php
@@ -63,5 +63,4 @@
'user' = $this-user-getName()
);
}
-
}
diff --git
a/client/tests/phpunit/includes/UpdateRepo/UpdateRepoOnDeleteTest.php
b/client/tests/phpunit/includes/UpdateRepo/UpdateRepoOnDeleteTest.php
index b566eb5..b5c2248 100644
--- a/client/tests/phpunit/includes/UpdateRepo/UpdateRepoOnDeleteTest.php
+++ b/client/tests/phpunit/includes/UpdateRepo/UpdateRepoOnDeleteTest.php
@@ -4,6 +4,7 @@
use Title;
use User;
+use JobSpecification;
use Wikibase\Client\UpdateRepo\UpdateRepoOnDelete;
use Wikibase\DataModel\Entity\ItemId;
@@ -68,20 +69,32 @@
/**
* Get a JobQueueGroup mock for the use in UpdateRepo::injectJob.
*
-* @param \Job $expectedJob The job that is expected to be pushed
-* @param bool $success Whether the push will succeed
-*
* @return object
*/
- protected function getJobQueueGroupMock( $expectedJob, $success ) {
+ protected function getJobQueueGroupMock() {
$jobQueueGroupMock = $this-getMockBuilder( '\JobQueueGroup' )
[MediaWiki-commits] [Gerrit] Fix ClaimHtmlGenerator::getHtmlForClaim signature - change (mediawiki...Wikibase)
jenkins-bot has submitted this change and it was merged.
Change subject: Fix ClaimHtmlGenerator::getHtmlForClaim signature
..
Fix ClaimHtmlGenerator::getHtmlForClaim signature
Looks like the signature of the method changed but this mock did not.
This also adds some PHPDoc tags.
Change-Id: Id25c000f72471814d47c4a2688bc923450cc556b
---
M repo/tests/phpunit/includes/View/ClaimsViewTest.php
1 file changed, 2 insertions(+), 4 deletions(-)
Approvals:
Adrian Lang: Looks good to me, approved
jenkins-bot: Verified
diff --git a/repo/tests/phpunit/includes/View/ClaimsViewTest.php
b/repo/tests/phpunit/includes/View/ClaimsViewTest.php
index 7811024..5097e0d 100644
--- a/repo/tests/phpunit/includes/View/ClaimsViewTest.php
+++ b/repo/tests/phpunit/includes/View/ClaimsViewTest.php
@@ -64,7 +64,7 @@
* @return Claim[]
*/
private function makeClaims( PropertyId $propertyId ) {
- $claims = array(
+ return array(
$this-makeClaim( new PropertyNoValueSnak(
$propertyId
) ),
@@ -88,8 +88,6 @@
new EntityIdValue( new ItemId( 'Q555' ) )
) ),
);
-
- return $claims;
}
/**
@@ -138,7 +136,7 @@
$claimHtmlGenerator-expects( $this-any() )
-method( 'getHtmlForClaim' )
- -will( $this-returnCallback( function( Claim $claim,
$htmlForEditSection ) {
+ -will( $this-returnCallback( function( Claim $claim,
$editSectionHtml = null ) {
return $claim-getGuid();
} ) );
--
To view, visit https://gerrit.wikimedia.org/r/186781
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Id25c000f72471814d47c4a2688bc923450cc556b
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Thiemo Mättig (WMDE) thiemo.maet...@wikimedia.de
Gerrit-Reviewer: Adrian Lang adrian.he...@wikimedia.de
Gerrit-Reviewer: Aude aude.w...@gmail.com
Gerrit-Reviewer: Bene benestar.wikime...@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] Drop dead code from MockTermIndex - change (mediawiki...Wikibase)
jenkins-bot has submitted this change and it was merged.
Change subject: Drop dead code from MockTermIndex
..
Drop dead code from MockTermIndex
Change-Id: I09f007f61deb53e0d641ddab416600c9b3ab6316
---
M lib/tests/phpunit/store/MockTermIndex.php
1 file changed, 0 insertions(+), 20 deletions(-)
Approvals:
Adrian Lang: Looks good to me, approved
jenkins-bot: Verified
diff --git a/lib/tests/phpunit/store/MockTermIndex.php
b/lib/tests/phpunit/store/MockTermIndex.php
index 39bf096..8d4efaf 100644
--- a/lib/tests/phpunit/store/MockTermIndex.php
+++ b/lib/tests/phpunit/store/MockTermIndex.php
@@ -324,26 +324,6 @@
}
/**
-* @param Term[] $conflicts
-* @param EntityId $excludeId
-*
-* @return Term[]
-*/
- private function filterConflictsByEntity( array $conflicts, EntityId
$excludeId ) {
- $filtered = array();
-
- foreach ( $conflicts as $key = $term ) {
- $entityId = $term-getEntityId();
-
- if ( $entityId === null || !$excludeId-equals(
$entityId ) ) {
- $filtered[$key] = $term;
- }
- }
-
- return $filtered;
- }
-
- /**
* @param Term $term
* @param Term[] $templates
*
--
To view, visit https://gerrit.wikimedia.org/r/188342
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I09f007f61deb53e0d641ddab416600c9b3ab6316
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.he...@wikimedia.de
Gerrit-Reviewer: Daniel Kinzler daniel.kinz...@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] Removed obsolete snakview.isDisabled() - change (mediawiki...Wikibase)
jenkins-bot has submitted this change and it was merged.
Change subject: Removed obsolete snakview.isDisabled()
..
Removed obsolete snakview.isDisabled()
Change-Id: I790d514121f04b8a70f25ccdd1bb27ea78d86065
---
M lib/resources/jquery.wikibase/snakview/snakview.ViewState.js
M lib/resources/jquery.wikibase/snakview/snakview.js
M lib/tests/qunit/jquery.wikibase/jquery.wikibase.snaklistview.tests.js
3 files changed, 3 insertions(+), 11 deletions(-)
Approvals:
Adrian Lang: Looks good to me, approved
jenkins-bot: Verified
diff --git a/lib/resources/jquery.wikibase/snakview/snakview.ViewState.js
b/lib/resources/jquery.wikibase/snakview/snakview.ViewState.js
index 822ac7d..5d32806 100644
--- a/lib/resources/jquery.wikibase/snakview/snakview.ViewState.js
+++ b/lib/resources/jquery.wikibase/snakview/snakview.ViewState.js
@@ -76,7 +76,7 @@
* @return {boolean}
*/
isDisabled: function() {
- return this._view.isDisabled();
+ return this._view.option( 'disabled' );
}
} );
diff --git a/lib/resources/jquery.wikibase/snakview/snakview.js
b/lib/resources/jquery.wikibase/snakview/snakview.js
index 5fd11c9..570e4b3 100644
--- a/lib/resources/jquery.wikibase/snakview/snakview.js
+++ b/lib/resources/jquery.wikibase/snakview/snakview.js
@@ -220,14 +220,6 @@
},
/**
-* @return {boolean}
-*/
- isDisabled: function() {
- // Function is required by snakview.ViewState.
- return this.option( 'disabled' );
- },
-
- /**
* Returns an input element with initialized `entityselector` for
selecting entities.
* @private
*
diff --git
a/lib/tests/qunit/jquery.wikibase/jquery.wikibase.snaklistview.tests.js
b/lib/tests/qunit/jquery.wikibase/jquery.wikibase.snaklistview.tests.js
index e22b5f1..a3abf4e 100644
--- a/lib/tests/qunit/jquery.wikibase/jquery.wikibase.snaklistview.tests.js
+++ b/lib/tests/qunit/jquery.wikibase/jquery.wikibase.snaklistview.tests.js
@@ -684,8 +684,8 @@
isEnabled = true;
for( var i = 0; i snakviews.length; i++ ) {
- isDisabled = isDisabled
snakviews[i].isDisabled();
- isEnabled = isEnabled
!snakviews[i].isDisabled();
+ isDisabled = isDisabled snakviews[i].option(
'disabled' );
+ isEnabled = isEnabled !snakviews[i].option(
'disabled' );
}
if( isDisabled !isEnabled ) {
--
To view, visit https://gerrit.wikimedia.org/r/188049
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I790d514121f04b8a70f25ccdd1bb27ea78d86065
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Henning Snater henning.sna...@wikimedia.de
Gerrit-Reviewer: Adrian Lang adrian.he...@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] monitoring: fix logo image location - change (operations/puppet)
Faidon Liambotis has uploaded a new change for review.
https://gerrit.wikimedia.org/r/188806
Change subject: monitoring: fix logo image location
..
monitoring: fix logo image location
Change-Id: I2eae1c48d3e60f160c272bbc45ad0b2576d561c6
---
M modules/monitoring/manifests/host.pp
1 file changed, 3 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/06/188806/1
diff --git a/modules/monitoring/manifests/host.pp
b/modules/monitoring/manifests/host.pp
index 26e4979..2e86b56 100644
--- a/modules/monitoring/manifests/host.pp
+++ b/modules/monitoring/manifests/host.pp
@@ -56,9 +56,9 @@
target = '/etc/nagios/puppet_hostextinfo.cfg',
host_name = $title,
notes = $title,
-icon_image = ${image}.png,
-vrml_image = ${image}.png,
-statusmap_image = ${image}.gd2,
+icon_image = base/${image}.png,
+vrml_image = base/${image}.png,
+statusmap_image = base/${image}.gd2,
}
}
}
--
To view, visit https://gerrit.wikimedia.org/r/188806
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I2eae1c48d3e60f160c272bbc45ad0b2576d561c6
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon Liambotis fai...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Depend on graphite-carbon - change (operations...txstatsd)
Filippo Giunchedi has submitted this change and it was merged.
Change subject: Depend on graphite-carbon
..
Depend on graphite-carbon
Change-Id: I4176d28e0a81b6b874e5702cbe8db7da576442e1
---
M debian/changelog
M debian/control
2 files changed, 7 insertions(+), 1 deletion(-)
Approvals:
Filippo Giunchedi: Verified; Looks good to me, approved
diff --git a/debian/changelog b/debian/changelog
index 90ac1d4..f15b72c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+txstatsd (1.0.0-3) unstable; urgency=medium
+
+ * Depend on graphite-carbon
+
+ -- Filippo Giunchedi fili...@wikimedia.org Thu, 05 Feb 2015 14:12:43 +
+
txstatsd (1.0.0-2) unstable; urgency=medium
* Add support for line/plaintext protocol,
diff --git a/debian/control b/debian/control
index e5c9845..5962187 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,7 @@
Package: python-txstatsd
Architecture: all
-Depends: ${misc:Depends}, ${python:Depends}
+Depends: ${misc:Depends}, ${python:Depends}, graphite-carbon
Description: A network daemon for aggregating statistics
.
Twisted-based implementation of a statsd-compatible server and client.
--
To view, visit https://gerrit.wikimedia.org/r/188807
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I4176d28e0a81b6b874e5702cbe8db7da576442e1
Gerrit-PatchSet: 2
Gerrit-Project: operations/debs/txstatsd
Gerrit-Branch: master
Gerrit-Owner: Filippo Giunchedi fgiunch...@wikimedia.org
Gerrit-Reviewer: Filippo Giunchedi fgiunch...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Allow a resizeable toolbar index - change (mediawiki...WikiEditor)
jenkins-bot has submitted this change and it was merged.
Change subject: Allow a resizeable toolbar index
..
Allow a resizeable toolbar index
Change-Id: I329a143e2ee0a21bee4a9b146c28e6e8df58d570
---
M modules/jquery.wikiEditor.toolbar.css
1 file changed, 1 insertion(+), 2 deletions(-)
Approvals:
Bartosz Dziewoński: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/jquery.wikiEditor.toolbar.css
b/modules/jquery.wikiEditor.toolbar.css
index 94971b5..64a3de7 100644
--- a/modules/jquery.wikiEditor.toolbar.css
+++ b/modules/jquery.wikiEditor.toolbar.css
@@ -211,6 +211,7 @@
width: 20%;
height: 125px;
overflow: auto;
+ resize: horizontal;
}
.wikiEditor-ui-toolbar .booklet .index div {
padding: 4px;
@@ -224,8 +225,6 @@
cursor: default;
}
.wikiEditor-ui-toolbar .booklet .pages {
- float: right;
- width: 80%;
height: 125px;
overflow: auto;
background-color: #FAFAFA;
--
To view, visit https://gerrit.wikimedia.org/r/187339
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I329a143e2ee0a21bee4a9b146c28e6e8df58d570
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikiEditor
Gerrit-Branch: master
Gerrit-Owner: Gerrit Patch Uploader gerritpatchuploa...@gmail.com
Gerrit-Reviewer: Bartosz Dziewoński matma@gmail.com
Gerrit-Reviewer: Fomafix
Gerrit-Reviewer: Gerrit Patch Uploader gerritpatchuploa...@gmail.com
Gerrit-Reviewer: TheDJ hartman.w...@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] Don't attach event handlers if they don't do anything - change (mediawiki...Wikibase)
jenkins-bot has submitted this change and it was merged.
Change subject: Don't attach event handlers if they don't do anything
..
Don't attach event handlers if they don't do anything
Change-Id: Idb8af78a7c75b889dfcfd34ed60ee4559f159f97
---
M repo/resources/wikibase.ui.entityViewInit.js
1 file changed, 39 insertions(+), 26 deletions(-)
Approvals:
Thiemo Mättig (WMDE): Looks good to me, approved
jenkins-bot: Verified
diff --git a/repo/resources/wikibase.ui.entityViewInit.js
b/repo/resources/wikibase.ui.entityViewInit.js
index 692852e..4cc8e39 100644
--- a/repo/resources/wikibase.ui.entityViewInit.js
+++ b/repo/resources/wikibase.ui.entityViewInit.js
@@ -21,13 +21,9 @@
entityInitializer.getEntity().done( function( entity ) {
var viewName = createEntityView( entity,
$entityview.first() );
- $entityview.on( viewName + 'afterstartediting',
function() {
- triggerAnonymousEditWarning( entity.getType() );
- } );
+ attachAnonymousEditWarningTrigger( $entityview,
viewName, entity.getType() );
- $entityview.on( viewName + 'afterstopediting',
function( event, dropValue ) {
- updateWatchLink( dropValue );
- } );
+ attachWatchLinkUpdater( $entityview, viewName );
evaluateRestrictions();
@@ -193,22 +189,26 @@
}
/**
-* @param {boolean} dropValue
+* Update the state of the watch link if the user has watchdefault
enabled.
*/
- function updateWatchLink( dropValue ) {
+ function attachWatchLinkUpdater( viewName, $entityview ) {
var update = mw.page mw.page.watch ?
mw.page.watch.updateWatchLink : null;
- if( dropValue || !update || !mw.user.options.get(
'watchdefault' ) ) {
+ if( !update || !mw.user.options.get( 'watchdefault' ) ) {
return;
}
- // All four supported skins are using the same ID, the other
selectors
- // in mediawiki.page.watch.ajax.js are undocumented and
probably legacy stuff
- var $link = $( '#ca-watch a' );
+ function updateWatchLink() {
+ // All four supported skins are using the same ID, the
other selectors
+ // in mediawiki.page.watch.ajax.js are undocumented and
probably legacy stuff
+ var $link = $( '#ca-watch a' );
- // Skip if page is already watched and there is no watch this
page link
- // Note: The exposed function fails for empty jQuery collections
- if( $link.length ) {
+ // Skip if page is already watched and there is no
watch this page link
+ // Note: The exposed function fails for empty jQuery
collections
+ if( !$link.length ) {
+ return;
+ }
+
update( $link, 'watch', 'loading' );
var api = new mw.Api(),
@@ -227,23 +227,36 @@
update( $link, 'watch' );
} );
}
+
+ $entityview.on( viewName + 'afterstopediting', function( event,
dropValue ) {
+ if( !dropValue ) {
+ updateWatchLink();
+ }
+ } );
}
/**
+* @param {jQuery.wikibase.entityview} $entityview
+* @param {string} viewName
* @param {string} entityType
*/
- function triggerAnonymousEditWarning( entityType ) {
- if(
- mw.user mw.user.isAnon()
-$.find( '.mw-notification-content' ).length
=== 0
-!$.cookie(
'wikibase-no-anonymouseditwarning' )
- ) {
- mw.notify(
- mw.msg( 'wikibase-anonymouseditwarning',
- mw.msg( 'wikibase-entity-' + entityType
)
- )
- );
+ function attachAnonymousEditWarningTrigger( $entityview, viewName,
entityType ) {
+ if( !mw.user || !mw.user.isAnon() ) {
+ return;
}
+
+ $entityview.on( viewName + 'afterstartediting', function() {
+ if(
+ $.find( '.mw-notification-content' ).length === 0
+!$.cookie(
'wikibase-no-anonymouseditwarning' )
+ ) {
+ mw.notify(
+ mw.msg(
[MediaWiki-commits] [Gerrit] beta: Remove mediawiki03 from dsh groups - change (operations/puppet)
Yuvipanda has submitted this change and it was merged. Change subject: beta: Remove mediawiki03 from dsh groups .. beta: Remove mediawiki03 from dsh groups Was killed a little while ago Change-Id: Iee7234a9535326f8cf8aae714c84f4eb6d543d77 --- M modules/beta/files/dsh/group/mediawiki-installation 1 file changed, 0 insertions(+), 1 deletion(-) Approvals: Yuvipanda: Verified; Looks good to me, approved jenkins-bot: Verified diff --git a/modules/beta/files/dsh/group/mediawiki-installation b/modules/beta/files/dsh/group/mediawiki-installation index 33448ff..3258daf 100644 --- a/modules/beta/files/dsh/group/mediawiki-installation +++ b/modules/beta/files/dsh/group/mediawiki-installation @@ -2,6 +2,5 @@ deployment-jobrunner01.eqiad.wmflabs deployment-mediawiki01.eqiad.wmflabs deployment-mediawiki02.eqiad.wmflabs -deployment-mediawiki03.eqiad.wmflabs deployment-rsync01.eqiad.wmflabs deployment-videoscaler01.eqiad.wmflabs -- To view, visit https://gerrit.wikimedia.org/r/188803 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iee7234a9535326f8cf8aae714c84f4eb6d543d77 Gerrit-PatchSet: 2 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Yuvipanda yuvipa...@gmail.com Gerrit-Reviewer: Hashar has...@free.fr Gerrit-Reviewer: Yuvipanda yuvipa...@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] Drop dead code from VariantsAwareRendererTest - change (mediawiki...Wikibase)
jenkins-bot has submitted this change and it was merged.
Change subject: Drop dead code from VariantsAwareRendererTest
..
Drop dead code from VariantsAwareRendererTest
Please double-check. I don't understand why the code was there in the
first place. Did it had a purpose? Is there an other way to fix this,
e.g. by adding a missing assertion or something?
Change-Id: Ia23147defa952c3bc59f223d54b75123c21a909b
---
M
client/tests/phpunit/includes/DataAccess/PropertyParserFunction/VariantsAwareRendererTest.php
1 file changed, 0 insertions(+), 23 deletions(-)
Approvals:
Adrian Lang: Looks good to me, approved
jenkins-bot: Verified
diff --git
a/client/tests/phpunit/includes/DataAccess/PropertyParserFunction/VariantsAwareRendererTest.php
b/client/tests/phpunit/includes/DataAccess/PropertyParserFunction/VariantsAwareRendererTest.php
index 8697822..a7c56ba 100644
---
a/client/tests/phpunit/includes/DataAccess/PropertyParserFunction/VariantsAwareRendererTest.php
+++
b/client/tests/phpunit/includes/DataAccess/PropertyParserFunction/VariantsAwareRendererTest.php
@@ -2,7 +2,6 @@
namespace Wikibase\Client\Tests\DataAccess\PropertyParserFunction;
-use Wikibase\Client\Usage\UsageAccumulator;
use Wikibase\DataAccess\PropertyParserFunction\VariantsAwareRenderer;
use Wikibase\DataModel\Entity\ItemId;
@@ -17,26 +16,6 @@
* @author Katie Filbert aude.w...@gmail.com
*/
class VariantsAwareRendererTest extends \PHPUnit_Framework_TestCase {
-
- /**
-* @return UsageAccumulator
-*/
- private function getUsageAccumulator() {
- $mock = $this-getMockBuilder(
'Wikibase\Client\Usage\UsageAccumulator' )
- -disableOriginalConstructor()
- -getMock();
-
- $mock-expects( $this-any() )
- -method( 'addLabelUsage' );
-
- $mock-expects( $this-never() )
- -method( 'addAllUsage' );
-
- $mock-expects( $this-never() )
- -method( 'addSiteLinksUsage' );
-
- return $mock;
- }
/**
* @dataProvider renderProvider
@@ -57,8 +36,6 @@
$rendererFactory-expects( $this-any() )
-method( 'getLanguageAwareRendererFromCode' )
-will( $this-returnValue( $languageRenderer ) );
-
- $usageAccumulator = $this-getUsageAccumulator();
$languageRenderers = array();
--
To view, visit https://gerrit.wikimedia.org/r/188338
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia23147defa952c3bc59f223d54b75123c21a909b
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.he...@wikimedia.de
Gerrit-Reviewer: Aude aude.w...@gmail.com
Gerrit-Reviewer: Daniel Kinzler daniel.kinz...@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] Add/fix missing imports and type hints - change (mediawiki...Wikibase)
jenkins-bot has submitted this change and it was merged.
Change subject: Add/fix missing imports and type hints
..
Add/fix missing imports and type hints
This patch fixes quite a lot closely related issues, as reported by
PHPStorm's code analysis:
* Add missing use clauses.
* Drop some unused use clauses.
* Drop unused variables.
* Fix wrong name and type of private property in ItemContent.
* Fix wrong/more specific @return types.
I tried to split this patch (see my other commits) but all the
issues left are so tiny and so obvious in my opinion that I didn't
found it worth an other split. Please tell me if you disagree.
Change-Id: Id890ab24a337834e36a92ea5c90c35d4ea841fa4
---
M
client/includes/DataAccess/PropertyParserFunction/PropertyClaimsRendererFactory.php
M client/includes/DataAccess/PropertyParserFunction/VariantsAwareRenderer.php
M client/includes/Hooks/UpdateRepoHookHandlers.php
M client/includes/LangLinkHandler.php
M client/includes/OtherProjectsSitesGenerator.php
M client/includes/parserhooks/NoLangLinkHandler.php
M client/includes/scribunto/WikibaseLuaEntityBindings.php
M client/tests/phpunit/MockClientStore.php
M lib/includes/changes/EntityChange.php
M lib/includes/store/sql/TermSqlIndex.php
M lib/tests/phpunit/store/SiteLinkTableTest.php
M repo/includes/content/ItemContent.php
M repo/includes/rdf/RdfBuilder.php
M repo/includes/store/EntityIdPager.php
M repo/includes/store/sql/EntityPerPageBuilder.php
M repo/tests/phpunit/includes/EntityParserOutputGeneratorTest.php
M repo/tests/phpunit/includes/View/TermBoxViewTest.php
17 files changed, 25 insertions(+), 24 deletions(-)
Approvals:
Adrian Lang: Looks good to me, approved
jenkins-bot: Verified
diff --git
a/client/includes/DataAccess/PropertyParserFunction/PropertyClaimsRendererFactory.php
b/client/includes/DataAccess/PropertyParserFunction/PropertyClaimsRendererFactory.php
index 7afbdab..be10b15 100644
---
a/client/includes/DataAccess/PropertyParserFunction/PropertyClaimsRendererFactory.php
+++
b/client/includes/DataAccess/PropertyParserFunction/PropertyClaimsRendererFactory.php
@@ -66,7 +66,7 @@
/**
* @param Parser $parser
*
-* @return Renderer
+* @return PropertyClaimsRenderer
*/
public function newRendererFromParser( Parser $parser ) {
$usageAccumulator = new ParserOutputUsageAccumulator(
$parser-getOutput() );
diff --git
a/client/includes/DataAccess/PropertyParserFunction/VariantsAwareRenderer.php
b/client/includes/DataAccess/PropertyParserFunction/VariantsAwareRenderer.php
index 8bf6860..0ca41ce 100644
---
a/client/includes/DataAccess/PropertyParserFunction/VariantsAwareRenderer.php
+++
b/client/includes/DataAccess/PropertyParserFunction/VariantsAwareRenderer.php
@@ -2,6 +2,7 @@
namespace Wikibase\DataAccess\PropertyParserFunction;
+use OutOfBoundsException;
use Wikibase\DataModel\Entity\EntityId;
/**
diff --git a/client/includes/Hooks/UpdateRepoHookHandlers.php
b/client/includes/Hooks/UpdateRepoHookHandlers.php
index e609901..3627ad2 100644
--- a/client/includes/Hooks/UpdateRepoHookHandlers.php
+++ b/client/includes/Hooks/UpdateRepoHookHandlers.php
@@ -2,18 +2,19 @@
namespace Wikibase\Client\Hooks;
-use JobQueueGroup;
-use User;
-use Title;
-use WikiPage;
use Content;
+use JobQueueGroup;
use ManualLogEntry;
-use Wikibase\Client\WikibaseClient;
-use Wikibase\NamespaceChecker;
-use Wikibase\Lib\Store\SiteLinkLookup;
+use MWException;
+use Title;
+use User;
use Wikibase\Client\UpdateRepo\UpdateRepo;
use Wikibase\Client\UpdateRepo\UpdateRepoOnDelete;
use Wikibase\Client\UpdateRepo\UpdateRepoOnMove;
+use Wikibase\Client\WikibaseClient;
+use Wikibase\Lib\Store\SiteLinkLookup;
+use Wikibase\NamespaceChecker;
+use WikiPage;
/**
* This class has a static interface for use with MediaWiki's hook mechanism;
the static
@@ -278,4 +279,5 @@
return true;
}
+
}
diff --git a/client/includes/LangLinkHandler.php
b/client/includes/LangLinkHandler.php
index eb2af02..3e63c10 100644
--- a/client/includes/LangLinkHandler.php
+++ b/client/includes/LangLinkHandler.php
@@ -9,6 +9,7 @@
use Wikibase\Client\Hooks\LanguageLinkBadgeDisplay;
use Wikibase\Client\Hooks\OtherProjectsSidebarGeneratorFactory;
use Wikibase\Client\Usage\ParserOutputUsageAccumulator;
+use Wikibase\DataModel\Entity\Item;
use Wikibase\DataModel\Entity\ItemId;
use Wikibase\DataModel\SiteLink;
use Wikibase\Lib\Store\EntityLookup;
diff --git a/client/includes/OtherProjectsSitesGenerator.php
b/client/includes/OtherProjectsSitesGenerator.php
index 94bc2b1..303e53c 100644
--- a/client/includes/OtherProjectsSitesGenerator.php
+++ b/client/includes/OtherProjectsSitesGenerator.php
@@ -33,7 +33,7 @@
/**
* @param SiteStore $siteStore
-* @param string localSiteId
+* @param string $localSiteId
* @param string[] $specialSiteGroups
*/
[MediaWiki-commits] [Gerrit] [FEAT] tools: redirect_method to deprecate methods - change (pywikibot/core)
XZise has uploaded a new change for review.
https://gerrit.wikimedia.org/r/188809
Change subject: [FEAT] tools: redirect_method to deprecate methods
..
[FEAT] tools: redirect_method to deprecate methods
The redirect_method function wraps around redirect_func and makes it
easier to deprecate methods (functions of a class). So instead of the
template
A = redirect_func(B, old_name='A', class_name='D')
it's reducing the duplication of A and makes sure that both are the
same:
redirect_method(D.B, 'A', D)
As the class name is known after creation of it, this call needs to be
executed afterwards instead of inside, which is why B must be defined
absolutely. It is possible to use the string name for and avoid the
duplication of D:
redirect_method('B', 'A', D)
Change-Id: Ic3ded7eba1844276b2ea28533ceb1e7bdcb71d19
---
M pywikibot/__init__.py
M pywikibot/site.py
M pywikibot/tools.py
3 files changed, 33 insertions(+), 18 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core
refs/changes/09/188809/1
diff --git a/pywikibot/__init__.py b/pywikibot/__init__.py
index b93f53f..36425da 100644
--- a/pywikibot/__init__.py
+++ b/pywikibot/__init__.py
@@ -45,7 +45,7 @@
CaptchaError, SpamfilterError, CircularRedirect, InterwikiRedirectPage,
WikiBaseError, CoordinateGlobeUnknownException,
)
-from pywikibot.tools import UnicodeMixin, redirect_func
+from pywikibot.tools import UnicodeMixin, redirect_func, redirect_method
from pywikibot.i18n import translate
from pywikibot.data.api import UploadWarning
from pywikibot.diff import PatchManager
@@ -158,9 +158,6 @@
return self.strftime(self.ISO8601Format)
-toISOformat = redirect_func(isoformat, old_name='toISOformat',
-class_name='Timestamp')
-
def totimestampformat(self):
Convert object to a MediaWiki internal timestamp.
return self.strftime(self.mediawikiTSFormat)
@@ -190,6 +187,9 @@
return newdt
+redirect_method('isoformat', 'toISOformat', Timestamp)
+
+
class Coordinate(object):
diff --git a/pywikibot/site.py b/pywikibot/site.py
index f86e430..ae54196 100644
--- a/pywikibot/site.py
+++ b/pywikibot/site.py
@@ -32,7 +32,7 @@
from pywikibot.tools import (
itergroup, UnicodeMixin, ComparableMixin, SelfCallDict, SelfCallString,
deprecated, deprecate_arg, deprecated_args, remove_last_args,
-redirect_func, manage_wrapping,
+redirect_func, redirect_method, manage_wrapping,
)
from pywikibot.tools import MediaWikiVersion
from pywikibot.throttle import Throttle
@@ -751,10 +751,6 @@
return Namespace.lookup_name(namespace, self.namespaces)
-# for backwards-compatibility
-getNamespaceIndex = redirect_func(ns_index, old_name='getNamespaceIndex',
- class_name='BaseSite')
-
@property
def namespaces(self):
Return dict of valid namespaces on this wiki.
@@ -773,11 +769,6 @@
index = self.ns_index(value)
return self.namespace(index)
-
-# for backwards-compatibility
-normalizeNamespace = redirect_func(ns_normalize,
- old_name='normalizeNamespace',
- class_name='BaseSite')
@remove_last_args(('default', ))
def redirect(self):
@@ -1078,6 +1069,11 @@
return callee
return decorator
+
+
+# for backwards-compatibility
+redirect_method('ns_index', 'getNamespaceIndex', BaseSite)
+redirect_method('ns_normalize', 'normalizeNamespace', BaseSite)
class Siteinfo(Container):
@@ -1672,10 +1668,6 @@
if sysop else LoginStatus.AS_USER)
else:
self._loginstatus = LoginStatus.NOT_LOGGED_IN # failure
-
-# alias for backward-compatibility
-forceLogin = redirect_func(login, old_name='forceLogin',
- class_name='APISite')
def logout(self):
Logout of the site and load details for the logged out user.
@@ -5189,6 +5181,10 @@
return lrgen
+# alias for backward-compatibility
+redirect_method('login', 'forceLogin', APISite)
+
+
class DataSite(APISite):
Wikibase data capable site.
diff --git a/pywikibot/tools.py b/pywikibot/tools.py
index 6037195..439b03f 100644
--- a/pywikibot/tools.py
+++ b/pywikibot/tools.py
@@ -930,6 +930,25 @@
return call
+def redirect_method(target, old_name, cls):
+
+Create a redirect with a deprecation warning to a method of a class.
+
+@param target: The target method
+@type target: str or function
+@param old_name: The old (deprecated) name of the method.
+@type old_name: str
+@param cls: The class to which the method belongs
+@type cls: class
+
+if isinstance(target, basestring):
+target = getattr(cls, target)
+# source_module is '.' because otherwise
[MediaWiki-commits] [Gerrit] Fix JSCS and formatting errors - change (mediawiki...ContentTranslation)
Jsahleen has submitted this change and it was merged.
Change subject: Fix JSCS and formatting errors
..
Fix JSCS and formatting errors
Change-Id: I469413736ac1ba8a520a7010fbe11e40fd376956
---
M modules/base/ext.cx.sitemapper.js
M modules/publish/ext.cx.publish.dialog.js
M modules/source/ext.cx.source.selector.js
M modules/tools/ext.cx.tools.reference.js
M modules/translation/ext.cx.translation.conflict.js
M modules/translation/ext.cx.translation.progress.js
6 files changed, 11 insertions(+), 12 deletions(-)
Approvals:
Jsahleen: Looks good to me, approved
diff --git a/modules/base/ext.cx.sitemapper.js
b/modules/base/ext.cx.sitemapper.js
index 704354d..1e9d867 100644
--- a/modules/base/ext.cx.sitemapper.js
+++ b/modules/base/ext.cx.sitemapper.js
@@ -127,7 +127,6 @@
return mw.util.getUrl( cxPage, queryParams );
};
-
/**
* Set CX Token in a cookie.
* This token guarantees that the translator read the license agreement
@@ -138,7 +137,7 @@
* @param {string} targetLanguage Target language
* @param {string} sourceTitle Source title
*/
- mw.cx.SiteMapper.prototype.setCXToken = function( sourceLanguage,
targetLanguage, sourceTitle ) {
+ mw.cx.SiteMapper.prototype.setCXToken = function ( sourceLanguage,
targetLanguage, sourceTitle ) {
var slug, now, name, options, domain;
now = new Date();
diff --git a/modules/publish/ext.cx.publish.dialog.js
b/modules/publish/ext.cx.publish.dialog.js
index fe273ef..6860adc 100644
--- a/modules/publish/ext.cx.publish.dialog.js
+++ b/modules/publish/ext.cx.publish.dialog.js
@@ -80,9 +80,9 @@
}
$keepButton.on( 'click', function () {
- cxPublishingDialog.$dialog.hide();
- mw.hook( 'mw.cx.publish' ).fire( false );
- } );
+ cxPublishingDialog.$dialog.hide();
+ mw.hook( 'mw.cx.publish' ).fire( false );
+ } );
$publishAnywayButton = $( 'button' )
.addClass( 'cx-publishing-dialog__buttons-publishanyway
mw-ui-button mw-ui-progressive' )
@@ -134,8 +134,8 @@
this.$trigger.height() + 20;
this.$dialog.css( {
- 'top': dialogTop,
- 'left': dialogLeft,
+ top: dialogTop,
+ left: dialogLeft,
'z-index': 100
} );
diff --git a/modules/source/ext.cx.source.selector.js
b/modules/source/ext.cx.source.selector.js
index 006174b..f7b9295 100644
--- a/modules/source/ext.cx.source.selector.js
+++ b/modules/source/ext.cx.source.selector.js
@@ -679,8 +679,8 @@
}
this.$dialog.css( {
- 'top': top,
- 'left': left,
+ top: top,
+ left: left,
'z-index': 100
} );
diff --git a/modules/tools/ext.cx.tools.reference.js
b/modules/tools/ext.cx.tools.reference.js
index c41a87e..daab04d 100644
--- a/modules/tools/ext.cx.tools.reference.js
+++ b/modules/tools/ext.cx.tools.reference.js
@@ -219,7 +219,7 @@
$targetReference.attr( 'data-mw', JSON.stringify( mwData ) );
};
- function referenceClickHandler () {
+ function referenceClickHandler() {
/*jshint validthis:true */
var $reference = $( this );
mw.hook( 'mw.cx.select.reference' ).fire(
diff --git a/modules/translation/ext.cx.translation.conflict.js
b/modules/translation/ext.cx.translation.conflict.js
index db8b6b8..d4657be 100644
--- a/modules/translation/ext.cx.translation.conflict.js
+++ b/modules/translation/ext.cx.translation.conflict.js
@@ -21,7 +21,7 @@
$columns = $( '.cx-widget__columns' );
$header = $( '.cx-header' );
$userLink = $( 'a' ).attr( {
- href: mw.util.getUrl( 'User:' +
translation.translatorName ),
+ href: mw.util.getUrl( 'User:' +
translation.translatorName )
} ).text( translation.translatorName )[ 0 ].outerHTML;
$info = $( 'div' )
.addClass( 'cx-conflict-info' )
diff --git a/modules/translation/ext.cx.translation.progress.js
b/modules/translation/ext.cx.translation.progress.js
index 2673564..88701da 100644
--- a/modules/translation/ext.cx.translation.progress.js
+++ b/modules/translation/ext.cx.translation.progress.js
@@ -53,7 +53,7 @@
* @return {number} return.mt Weight of sections with unmodified mt
content
* @return {number} return.mtSectionsCount Count of sections with
unmodified mt content
*/
- mw.cx.getProgress = function() {
+
[MediaWiki-commits] [Gerrit] redisdb: add codfw monitoring group - change (operations/puppet)
Giuseppe Lavagetto has submitted this change and it was merged.
Change subject: redisdb: add codfw monitoring group
..
redisdb: add codfw monitoring group
Add icinga monitoring group for codfw to prevent
icinga fail when we apply the role in codfw.
And to have the web ui link to them.
Bug:T86898
Change-Id: Ie12c03c26175dbe3de6d4cb7f626d57d41de93d4
---
M manifests/role/redisdb.pp
1 file changed, 4 insertions(+), 0 deletions(-)
Approvals:
Giuseppe Lavagetto: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/role/redisdb.pp b/manifests/role/redisdb.pp
index 75ed631..4bbd035 100644
--- a/manifests/role/redisdb.pp
+++ b/manifests/role/redisdb.pp
@@ -6,6 +6,10 @@
description = 'eqiad Redis',
}
+@monitoring::group { 'redis_codfw':
+description = 'codfw Redis',
+}
+
class role::db::redis (
$maxmemory = inline_template(%= (Float(memorysize.split[0]) *
0.82).round %Gb),
$redis_replication = undef,
--
To view, visit https://gerrit.wikimedia.org/r/188274
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie12c03c26175dbe3de6d4cb7f626d57d41de93d4
Gerrit-PatchSet: 4
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn dz...@wikimedia.org
Gerrit-Reviewer: Giuseppe Lavagetto glavage...@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] Remove Neil from recipient list, he is no longer on the project - change (integration/config)
Cmcmahon has uploaded a new change for review. https://gerrit.wikimedia.org/r/188818 Change subject: Remove Neil from recipient list, he is no longer on the project .. Remove Neil from recipient list, he is no longer on the project Change-Id: I349248dc64ab45740940d020ac539716d6bebb1c --- M jjb/browsertests.yaml 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/integration/config refs/changes/18/188818/1 diff --git a/jjb/browsertests.yaml b/jjb/browsertests.yaml index e0b405a..cb3fa4b 100644 --- a/jjb/browsertests.yaml +++ b/jjb/browsertests.yaml @@ -24,7 +24,7 @@ aahar...@wikimedia.org cmcma...@wikimedia.org kmis...@wikimedia.org qa-ale...@lists.wikimedia.org - UploadWizard: emails-UploadWizard -qa-ale...@lists.wikimedia.org cmcma...@wikimedia.org ne...@neilk.net +qa-ale...@lists.wikimedia.org cmcma...@wikimedia.org - VisualEditor: emails-VisualEditor cmcma...@wikimedia.org jforres...@wikimedia.org qa-ale...@lists.wikimedia.org -- To view, visit https://gerrit.wikimedia.org/r/188818 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I349248dc64ab45740940d020ac539716d6bebb1c Gerrit-PatchSet: 1 Gerrit-Project: integration/config Gerrit-Branch: master Gerrit-Owner: Cmcmahon cmcma...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] [BrowserTest] Click the editable area with .when_present - change (mediawiki...VisualEditor)
Amire80 has uploaded a new change for review.
https://gerrit.wikimedia.org/r/188778
Change subject: [BrowserTest] Click the editable area with .when_present
..
[BrowserTest] Click the editable area with .when_present
The editable area sometimes didn't appear, so a .when_present
call is added to check that it's on the screen.
Bug: T88663
Change-Id: I0c5e29a9d7f9d0a22ca8392df9f7a5b857f20d7d
---
M modules/ve-mw/tests/browser/features/step_definitions/shared_steps.rb
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor
refs/changes/78/188778/1
diff --git
a/modules/ve-mw/tests/browser/features/step_definitions/shared_steps.rb
b/modules/ve-mw/tests/browser/features/step_definitions/shared_steps.rb
index 7b40389..5c18e84 100644
--- a/modules/ve-mw/tests/browser/features/step_definitions/shared_steps.rb
+++ b/modules/ve-mw/tests/browser/features/step_definitions/shared_steps.rb
@@ -4,7 +4,7 @@
end
Given(/^I click in the editable part$/) do
- on(VisualEditorPage).content_element.send_keys('')
+ on(VisualEditorPage).content_element.when_present.send_keys('')
end
Given(/^I go to the browser specific edit page page$/) do
--
To view, visit https://gerrit.wikimedia.org/r/188778
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I0c5e29a9d7f9d0a22ca8392df9f7a5b857f20d7d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Amire80 amir.ahar...@mail.huji.ac.il
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] toollabs: Add nodejs support to webservice2 - change (operations/puppet)
Yuvipanda has uploaded a new change for review.
https://gerrit.wikimedia.org/r/188779
Change subject: toollabs: Add nodejs support to webservice2
..
toollabs: Add nodejs support to webservice2
Bug: T1102
Change-Id: Ie022190defbe72e4a211a4d4a0a089b2148f0cbc
---
A modules/toollabs/files/tool-nodejs
M modules/toollabs/files/webservice2
2 files changed, 29 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/79/188779/1
diff --git a/modules/toollabs/files/tool-nodejs
b/modules/toollabs/files/tool-nodejs
new file mode 100644
index 000..936e86c
--- /dev/null
+++ b/modules/toollabs/files/tool-nodejs
@@ -0,0 +1,25 @@
+#!/usr/bin/python
+
+NodeJS starter script for Wikimedia Tool Labs
+
+import re
+import socket
+import os
+import pwd
+
+pwd_entry = pwd.getpwuid(os.getuid()) # Use uid as reserved port for each tool
+TOOL = re.sub(r'^tools.', '', pwd_entry.pw_name) # Tool users are of form
tools.TOOLNAME
+
+PORT = os.getuid()
+
+sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
+sock.connect(('tools-webproxy', 8282))
+sock.send(.*\nhttp://%s:%s\n; % (socket.getfqdn(), PORT))
+
+os.chdir(os.path.expand('~/www/js'))
+
+env = {
+'TOOL_WEB_PORT': PORT
+}
+
+os.execle('/usr/bin/npm', 'start', env)
\ No newline at end of file
diff --git a/modules/toollabs/files/webservice2
b/modules/toollabs/files/webservice2
index 46660f7..b92e313 100644
--- a/modules/toollabs/files/webservice2
+++ b/modules/toollabs/files/webservice2
@@ -16,6 +16,8 @@
if server in ('uwsgi-python', ):
return 'webgrid-uwsgi'
+if server in ('nodejs', ):
+return 'webgrid-generic'
return 'webgrid-' + server
@@ -137,7 +139,7 @@
parser = argparse.ArgumentParser()
parser.add_argument('server', help='Type of server to start',
-choices=['lighttpd', 'tomcat', 'uwsgi-python'],
default='lighttpd', nargs='?')
+choices=['lighttpd', 'tomcat', 'uwsgi-python', 'nodejs'],
default='lighttpd', nargs='?')
parser.add_argument('action', help='Action to perform',
choices=['stop', 'start', 'restart'])
parser.add_argument('--release', help='Which Ubuntu release the node running
the webservice sould be on',
@@ -150,7 +152,7 @@
job_id = get_job_id(queue_name, job_name)
# And no precise for uwsgi, so default to trusty
-if args.server in ('uwsgi-python', ):
+if args.server in ('uwsgi-python', 'nodejs'):
args.release = 'trusty'
if args.action == 'start':
--
To view, visit https://gerrit.wikimedia.org/r/188779
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie022190defbe72e4a211a4d4a0a089b2148f0cbc
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Yuvipanda yuvipa...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: 4bab4fd..4a73b3e - change (mediawiki/extensions)
Jenkins-mwext-sync has uploaded a new change for review. https://gerrit.wikimedia.org/r/188783 Change subject: Syncronize VisualEditor: 4bab4fd..4a73b3e .. Syncronize VisualEditor: 4bab4fd..4a73b3e Change-Id: I7326b9a5601c9a910272054eb0425e14b6ce937d --- M VisualEditor 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions refs/changes/83/188783/1 diff --git a/VisualEditor b/VisualEditor index 4bab4fd..4a73b3e 16 --- a/VisualEditor +++ b/VisualEditor -Subproject commit 4bab4fd921794826d71c30536fb0799c81f7e764 +Subproject commit 4a73b3e4b1753069da9393941ae60d716453aaf3 -- To view, visit https://gerrit.wikimedia.org/r/188783 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I7326b9a5601c9a910272054eb0425e14b6ce937d 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] Syncronize VisualEditor: 4bab4fd..4a73b3e - change (mediawiki/extensions)
Jenkins-mwext-sync has submitted this change and it was merged. Change subject: Syncronize VisualEditor: 4bab4fd..4a73b3e .. Syncronize VisualEditor: 4bab4fd..4a73b3e Change-Id: I7326b9a5601c9a910272054eb0425e14b6ce937d --- 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 4bab4fd..4a73b3e 16 --- a/VisualEditor +++ b/VisualEditor -Subproject commit 4bab4fd921794826d71c30536fb0799c81f7e764 +Subproject commit 4a73b3e4b1753069da9393941ae60d716453aaf3 -- To view, visit https://gerrit.wikimedia.org/r/188783 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I7326b9a5601c9a910272054eb0425e14b6ce937d 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] [BrowserTest] Rename iframe to window_frame - change (mediawiki...VisualEditor)
jenkins-bot has submitted this change and it was merged.
Change subject: [BrowserTest] Rename iframe to window_frame
..
[BrowserTest] Rename iframe to window_frame
It's not an iframe anymore, so the name shouldn't be confusing.
Change-Id: Id93595d56d7d88871ab79ca91e1714d9a70fad17
---
M
modules/ve-mw/tests/browser/features/step_definitions/language_screenshot_steps.rb
M modules/ve-mw/tests/browser/features/support/pages/visual_editor_page.rb
2 files changed, 23 insertions(+), 23 deletions(-)
Approvals:
Zfilipin: Looks good to me, approved
jenkins-bot: Verified
diff --git
a/modules/ve-mw/tests/browser/features/step_definitions/language_screenshot_steps.rb
b/modules/ve-mw/tests/browser/features/step_definitions/language_screenshot_steps.rb
index 5836406..742a301 100644
---
a/modules/ve-mw/tests/browser/features/step_definitions/language_screenshot_steps.rb
+++
b/modules/ve-mw/tests/browser/features/step_definitions/language_screenshot_steps.rb
@@ -123,10 +123,10 @@
end
Then(/^I should see category dialog box$/) do
- on(VisualEditorPage).iframe_element.when_present.should be_visible
+ on(VisualEditorPage).window_frame_element.when_present.should be_visible
capture_screenshot(
#{@scenario.name}-#{ENV['LANGUAGE_SCREENSHOT_CODE']}.png,
-[@current_page.iframe_element]
+[@current_page.window_frame_element]
)
end
@@ -221,31 +221,31 @@
end
Then(/^I should see Special character Insertion window$/) do
- on(VisualEditorPage).iframe_element.when_present.should be_visible
+ on(VisualEditorPage).window_frame_element.when_present.should be_visible
capture_screenshot(
#{@scenario.name}-#{ENV['LANGUAGE_SCREENSHOT_CODE']}.png,
-[@current_page.iframe_element],
+[@current_page.window_frame_element],
nil,
-2
)
end
Then(/^I should see save changes dialog box$/) do
- on(VisualEditorPage).iframe_element.when_present.should be_visible
+ on(VisualEditorPage).window_frame_element.when_present.should be_visible
capture_screenshot(
#{@scenario.name}-#{ENV['LANGUAGE_SCREENSHOT_CODE']}.png,
-[@current_page.iframe_element],
+[@current_page.window_frame_element],
nil,
-2
)
end
Then(/^I should see Page settings dialog box$/) do
- on(VisualEditorPage).iframe_element.when_present.should be_visible
+ on(VisualEditorPage).window_frame_element.when_present.should be_visible
capture_screenshot(
#{@scenario.name}-#{ENV['LANGUAGE_SCREENSHOT_CODE']}.png,
-[@current_page.iframe_element],
+[@current_page.window_frame_element],
nil,
0
)
@@ -293,7 +293,7 @@
on(VisualEditorPage).link_list_element.when_present(5).should be_visible
capture_screenshot(
#{@scenario.name}-#{ENV['LANGUAGE_SCREENSHOT_CODE']}.png,
-[@current_page.link_list_element, @current_page.iframe_element,
@current_page.new_link_element],
+[@current_page.link_list_element, @current_page.window_frame_element,
@current_page.new_link_element],
nil,
0
)
@@ -308,19 +308,19 @@
end
Then(/^I should see media editing dialog box$/) do
- on(VisualEditorPage).iframe_element.when_present.should be_visible
+ on(VisualEditorPage).window_frame_element.when_present.should be_visible
capture_screenshot(
#{@scenario.name}-#{ENV['LANGUAGE_SCREENSHOT_CODE']}.png,
-[@current_page.iframe_element]
+[@current_page.window_frame_element]
)
end
Then(/^I should see media caption dialog box$/) do
- on(VisualEditorPage).iframe_element.when_present.should be_visible
+ on(VisualEditorPage).window_frame_element.when_present.should be_visible
capture_screenshot(
#{@scenario.name}-#{ENV['LANGUAGE_SCREENSHOT_CODE']}.png,
-[@current_page.iframe_element],
+[@current_page.window_frame_element],
nil,
0
)
@@ -328,15 +328,15 @@
capture_screenshot(
VisualEditor_Media_alternative_text-#{ENV['LANGUAGE_SCREENSHOT_CODE']}.png,
[@current_page.media_alternative_block_element],
-@current_page.iframe_element
+@current_page.window_frame_element
)
end
Then(/^I should see media advanced settings dialog box$/) do
- on(VisualEditorPage).iframe_element.when_present.should be_visible
+ on(VisualEditorPage).window_frame_element.when_present.should be_visible
capture_screenshot(
#{@scenario.name}-#{ENV['LANGUAGE_SCREENSHOT_CODE']}.png,
-[@current_page.iframe_element],
+[@current_page.window_frame_element],
nil,
0
)
@@ -367,10 +367,10 @@
end
Then(/^I should see Basic Reference dialog box$/) do
- on(VisualEditorPage).iframe_element.when_present.should be_visible
+ on(VisualEditorPage).window_frame_element.when_present.should be_visible
capture_screenshot(
#{@scenario.name}-#{ENV['LANGUAGE_SCREENSHOT_CODE']}.png,
-[@current_page.iframe_element]
+[@current_page.window_frame_element]
)
end
@@ -400,13 +400,13 @@
Then(/^I should see the formula insertion
[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: 4a73b3e..2e0b191 - change (mediawiki/extensions)
Jenkins-mwext-sync has uploaded a new change for review. https://gerrit.wikimedia.org/r/188784 Change subject: Syncronize VisualEditor: 4a73b3e..2e0b191 .. Syncronize VisualEditor: 4a73b3e..2e0b191 Change-Id: I2643d36b5d1a3519d983f98931f2828c2765717b --- M VisualEditor 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions refs/changes/84/188784/1 diff --git a/VisualEditor b/VisualEditor index 4a73b3e..2e0b191 16 --- a/VisualEditor +++ b/VisualEditor -Subproject commit 4a73b3e4b1753069da9393941ae60d716453aaf3 +Subproject commit 2e0b191dda1afd020dabb86a4a23d8976ad2fec9 -- To view, visit https://gerrit.wikimedia.org/r/188784 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I2643d36b5d1a3519d983f98931f2828c2765717b 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] [BrowserTest] Refactor offset_element and browser_zoom - change (mediawiki...VisualEditor)
jenkins-bot has submitted this change and it was merged.
Change subject: [BrowserTest] Refactor offset_element and browser_zoom
..
[BrowserTest] Refactor offset_element and browser_zoom
offset_element was used for iframes, and now there are no iframes,
so there is no reason to use it.
As for browser_zoom, it makes more sense to do it in a separate function
and not as a parameter to capture_screenshot.
Change-Id: Ibfce33b7a56d883cc1a6c92c19d40c499681fa47
---
M
modules/ve-mw/tests/browser/features/step_definitions/language_screenshot_steps.rb
M modules/ve-mw/tests/browser/features/support/language_screenshot.rb
2 files changed, 38 insertions(+), 64 deletions(-)
Approvals:
Zfilipin: Looks good to me, approved
jenkins-bot: Verified
diff --git
a/modules/ve-mw/tests/browser/features/step_definitions/language_screenshot_steps.rb
b/modules/ve-mw/tests/browser/features/step_definitions/language_screenshot_steps.rb
index 742a301..443c0c5 100644
---
a/modules/ve-mw/tests/browser/features/step_definitions/language_screenshot_steps.rb
+++
b/modules/ve-mw/tests/browser/features/step_definitions/language_screenshot_steps.rb
@@ -162,9 +162,7 @@
Then(/^I take screenshot of Visual Editor insert menu$/) do
capture_screenshot(
#{@scenario.name}-#{ENV['LANGUAGE_SCREENSHOT_CODE']}.png,
-[@current_page.tools_menu_element, @current_page.page_option_menu_element],
-nil,
-0
+[@current_page.tools_menu_element, @current_page.page_option_menu_element]
)
end
@@ -181,38 +179,34 @@
)
highlight @current_page.media_insert_menu_element
+
capture_screenshot(
VisualEditor_Media_Insert_Menu-#{ENV['LANGUAGE_SCREENSHOT_CODE']}.png,
-[@current_page.insert_indicator_down_element,
@current_page.insert_pull_down_element],
-nil,
-0
+[@current_page.insert_indicator_down_element,
@current_page.insert_pull_down_element]
)
highlight @current_page.media_insert_menu_element, '#FF'
highlight @current_page.template_insert_menu_element
+
capture_screenshot(
VisualEditor_Template_Insert_Menu-#{ENV['LANGUAGE_SCREENSHOT_CODE']}.png,
-[@current_page.insert_indicator_down_element,
@current_page.insert_pull_down_element],
-nil,
-0
+[@current_page.insert_indicator_down_element,
@current_page.insert_pull_down_element]
)
highlight @current_page.template_insert_menu_element, '#FF'
highlight @current_page.ref_list_insert_menu_element
+
capture_screenshot(
VisualEditor_References_List_Insert_Menu-#{ENV['LANGUAGE_SCREENSHOT_CODE']}.png,
-[@current_page.insert_indicator_down_element,
@current_page.insert_pull_down_element],
-nil,
-0
+[@current_page.insert_indicator_down_element,
@current_page.insert_pull_down_element]
)
highlight @current_page.ref_list_insert_menu_element, '#FF'
highlight @current_page.formula_insert_menu_element
+
capture_screenshot(
VisualEditor_Formula_Insert_Menu-#{ENV['LANGUAGE_SCREENSHOT_CODE']}.png,
-[@current_page.insert_indicator_down_element,
@current_page.insert_pull_down_element],
-nil,
-0
+[@current_page.insert_indicator_down_element,
@current_page.insert_pull_down_element]
)
end
@@ -222,21 +216,19 @@
Then(/^I should see Special character Insertion window$/) do
on(VisualEditorPage).window_frame_element.when_present.should be_visible
+ zoom_browser(-2)
capture_screenshot(
#{@scenario.name}-#{ENV['LANGUAGE_SCREENSHOT_CODE']}.png,
-[@current_page.window_frame_element],
-nil,
--2
+[@current_page.window_frame_element]
)
end
Then(/^I should see save changes dialog box$/) do
on(VisualEditorPage).window_frame_element.when_present.should be_visible
+ zoom_browser(-2)
capture_screenshot(
#{@scenario.name}-#{ENV['LANGUAGE_SCREENSHOT_CODE']}.png,
-[@current_page.window_frame_element],
-nil,
--2
+[@current_page.window_frame_element]
)
end
@@ -245,57 +237,46 @@
capture_screenshot(
#{@scenario.name}-#{ENV['LANGUAGE_SCREENSHOT_CODE']}.png,
-[@current_page.window_frame_element],
-nil,
-0
+[@current_page.window_frame_element]
)
capture_screenshot(
VisualEditor_Page_Settings_Redirects-#{ENV['LANGUAGE_SCREENSHOT_CODE']}.png,
-[@current_page.enable_redirect_element,
@current_page.prevent_redirect_element],
-nil,
-0
+[@current_page.enable_redirect_element,
@current_page.prevent_redirect_element]
)
capture_screenshot(
VisualEditor_Page_Settings_TOC-#{ENV['LANGUAGE_SCREENSHOT_CODE']}.png,
-[@current_page.table_of_contents_element],
-nil,
-0
+[@current_page.table_of_contents_element]
)
capture_screenshot(
VisualEditor_Page_Settings_Edit_Links-#{ENV['LANGUAGE_SCREENSHOT_CODE']}.png,
-[@current_page.page_settings_editlinks_element],
-nil,
-0
+[@current_page.page_settings_editlinks_element]
)
+
[MediaWiki-commits] [Gerrit] Fix main snak displaying in rank changes - change (mediawiki...Wikibase)
Adrian Lang has uploaded a new change for review.
https://gerrit.wikimedia.org/r/188785
Change subject: Fix main snak displaying in rank changes
..
Fix main snak displaying in rank changes
Change-Id: I7caffe5ea95d879950919eaa21f6bf078c8c61b6
---
M repo/includes/Diff/ClaimDifferenceVisualizer.php
M repo/includes/Diff/DiffOpValueFormatter.php
M repo/tests/phpunit/includes/Diff/ClaimDifferenceVisualizerTest.php
M repo/tests/phpunit/includes/Diff/DiffOpValueFormatterTest.php
4 files changed, 118 insertions(+), 78 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/85/188785/1
diff --git a/repo/includes/Diff/ClaimDifferenceVisualizer.php
b/repo/includes/Diff/ClaimDifferenceVisualizer.php
index a0ad0cd..6d65d4c 100644
--- a/repo/includes/Diff/ClaimDifferenceVisualizer.php
+++ b/repo/includes/Diff/ClaimDifferenceVisualizer.php
@@ -62,27 +62,29 @@
* @return string
*/
public function visualizeClaimChange( ClaimDifference $claimDifference,
Claim $baseClaim ) {
- $oldMainSnak = null;
+ $newestMainSnak = $baseClaim-getMainSnak();
+ $oldestMainSnak = $newestMainSnak;
$html = '';
- if ( $claimDifference-getMainSnakChange() !== null ) {
- $html .= $this-visualizeMainSnakChange(
$claimDifference-getMainSnakChange() );
- $oldMainSnak =
$claimDifference-getMainSnakChange()-getOldValue();
+ $mainSnakChange = $claimDifference-getMainSnakChange();
+ if ( $mainSnakChange !== null ) {
+ $oldestMainSnak = $mainSnakChange-getOldValue() ?:
$newestMainSnak;
+ $html .= $this-visualizeMainSnakChange(
$mainSnakChange, $oldestMainSnak, $newestMainSnak );
}
if ( $claimDifference-getRankChange() !== null ) {
$html .= $this-visualizeRankChange(
$claimDifference-getRankChange(),
- $oldMainSnak,
- $baseClaim-getMainSnak()
+ $oldestMainSnak,
+ $newestMainSnak
);
}
if ( $claimDifference-getQualifierChanges() !== null ) {
$html .= $this-visualizeQualifierChanges(
$claimDifference-getQualifierChanges(),
- $oldMainSnak,
- $baseClaim-getMainSnak()
+ $oldestMainSnak,
+ $newestMainSnak
);
}
@@ -90,8 +92,8 @@
$html .= $this-visualizeSnakListChanges(
$claimDifference-getReferenceChanges(),
wfMessage( 'wikibase-diffview-reference'
)-inLanguage( $this-languageCode ),
- $oldMainSnak,
- $baseClaim-getMainSnak()
+ $oldestMainSnak,
+ $newestMainSnak
);
}
@@ -134,22 +136,22 @@
* @since 0.4
*
* @param DiffOpChange $mainSnakChange
+* @param Snak $oldestMainSnak The old main snak, if present;
otherwise, the new main snak
+* @param Snak $newestMainSnak The new main snak, if present;
otherwise, the old main snak
*
* @return string
*/
- private function visualizeMainSnakChange( DiffOpChange $mainSnakChange
) {
- $oldSnak = $mainSnakChange-getOldValue();
- $newSnak = $mainSnakChange-getNewValue();
-
- // Does not need to show different headers for left and right
side, since the property cannot change
- $headerHtml = $this-snakVisualizer-getPropertyHeader(
$newSnak ?: $oldSnak );
-
+ private function visualizeMainSnakChange(
+ DiffOpChange $mainSnakChange,
+ Snak $oldestMainSnak,
+ Snak $newestMainSnak
+ ) {
$valueFormatter = new DiffOpValueFormatter(
- // todo: should show specific headers for each column
- $headerHtml,
+ $this-snakVisualizer-getPropertyHeader(
$oldestMainSnak ),
+ $this-snakVisualizer-getPropertyHeader(
$newestMainSnak ),
// TODO: How to highlight the actual changes inside the
snak?
- $this-snakVisualizer-getDetailedValue( $oldSnak ),
- $this-snakVisualizer-getDetailedValue( $newSnak )
+ $this-snakVisualizer-getDetailedValue(
$mainSnakChange-getOldValue() ),
+
[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: 4a73b3e..2e0b191 - change (mediawiki/extensions)
Jenkins-mwext-sync has submitted this change and it was merged. Change subject: Syncronize VisualEditor: 4a73b3e..2e0b191 .. Syncronize VisualEditor: 4a73b3e..2e0b191 Change-Id: I2643d36b5d1a3519d983f98931f2828c2765717b --- 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 4a73b3e..2e0b191 16 --- a/VisualEditor +++ b/VisualEditor -Subproject commit 4a73b3e4b1753069da9393941ae60d716453aaf3 +Subproject commit 2e0b191dda1afd020dabb86a4a23d8976ad2fec9 -- To view, visit https://gerrit.wikimedia.org/r/188784 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I2643d36b5d1a3519d983f98931f2828c2765717b 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] Link Adaptation: Adapt links if no corresponding link found - change (mediawiki...ContentTranslation)
jenkins-bot has submitted this change and it was merged.
Change subject: Link Adaptation: Adapt links if no corresponding link found
..
Link Adaptation: Adapt links if no corresponding link found
* Changes start method to look for adapted link if no corresponding link
* Changes adapt method to allow adaptation in both directions
Bug: T85989
Change-Id: I50c6289897f115dba752ec7c80910c9edd513259
---
M modules/tools/ext.cx.tools.link.js
1 file changed, 41 insertions(+), 15 deletions(-)
Approvals:
Santhosh: Looks good to me, approved
Pginer: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/modules/tools/ext.cx.tools.link.js
b/modules/tools/ext.cx.tools.link.js
index f3e95c0..4b08542 100644
--- a/modules/tools/ext.cx.tools.link.js
+++ b/modules/tools/ext.cx.tools.link.js
@@ -203,13 +203,20 @@
* @return {jQuery.Promise}
*/
LinkCard.prototype.adapt = function ( titles, language ) {
- var deferred = $.Deferred();
+ var apiLanguage,
+ deferred = $.Deferred();
if ( !$.isArray( titles ) ) {
titles = new Array( titles );
}
- this.siteMapper.getApi( mw.cx.sourceLanguage ).get( {
+ if ( language === mw.cx.sourceLanguage ) {
+ apiLanguage = mw.cx.targetLanguage;
+ } else {
+ apiLanguage = mw.cx.sourceLanguage;
+ }
+
+ this.siteMapper.getApi( apiLanguage ).get( {
action: 'query',
titles: titles.join( '|' ),
prop: 'langlinks',
@@ -605,7 +612,8 @@
* @param {string} [language] The language where the link points to.
*/
LinkCard.prototype.start = function ( link, language ) {
- var selection, title, targetTitle, sourceTitle, $targetLink,
$sourceLink;
+ var selection, title, targetTitle, sourceTitle, $targetLink,
$sourceLink,
+ self = this;
// If language is not given, use target language
language = language || mw.cx.targetLanguage;
@@ -634,7 +642,7 @@
}
this.highlightLink();
- if ( this.$link language === mw.cx.targetLanguage ) {
+ if ( language === mw.cx.targetLanguage ) {
targetTitle = title;
} else {
sourceTitle = title;
@@ -642,21 +650,39 @@
if ( !targetTitle ) {
$targetLink = this.getTargetLink();
- targetTitle = $targetLink $targetLink.attr( 'href' )
|| title;
+ if ( $targetLink ) {
+ targetTitle = $targetLink.attr( 'href' );
+ self.prepareSourceLinkCard( sourceTitle,
mw.cx.sourceLanguage );
+ self.prepareTargetLinkCard( targetTitle,
mw.cx.targetLanguage );
+ } else {
+ this.adapt( sourceTitle, mw.cx.targetLanguage )
+ .done( function ( linkPairs ) {
+ targetTitle = linkPairs[
sourceTitle ];
+ self.prepareSourceLinkCard(
sourceTitle, mw.cx.sourceLanguage );
+ self.prepareTargetLinkCard(
targetTitle, mw.cx.targetLanguage );
+ // If text is selected, and the
link clicked is source language,
+ // create a new internal link
in the translation section
+ if ( isValidSelection(
selection ) self.$link ) {
+
self.createInternalLink( selection.toString(), targetTitle, self.$link.data(
'linkid') );
+ }
+ } );
+ }
}
if ( !sourceTitle ) {
$sourceLink = this.getSourceLink();
- sourceTitle = $sourceLink cleanupLinkHref(
$sourceLink.attr( 'href' ) );
- }
-
- this.prepareSourceLinkCard( sourceTitle, mw.cx.sourceLanguage );
- this.prepareTargetLinkCard( targetTitle, mw.cx.targetLanguage );
-
- // If text is selected, and the link clicked is source
language, create a new internal link
- // in the translation section
- if ( isValidSelection( selection ) this.$link language
=== mw.cx.sourceLanguage ) {
- this.createInternalLink( selection.toString(),
targetTitle, this.$link.data(
[MediaWiki-commits] [Gerrit] toollabs: Fix errors with nodejs starter tool - change (operations/puppet)
Yuvipanda has submitted this change and it was merged.
Change subject: toollabs: Fix errors with nodejs starter tool
..
toollabs: Fix errors with nodejs starter tool
Bug: T1102
Change-Id: If57256561c61fb4ae8db94589b543f5ab6d23f52
---
M modules/toollabs/files/tool-nodejs
1 file changed, 3 insertions(+), 3 deletions(-)
Approvals:
Yuvipanda: Verified; Looks good to me, approved
diff --git a/modules/toollabs/files/tool-nodejs
b/modules/toollabs/files/tool-nodejs
index 936e86c..734716f 100644
--- a/modules/toollabs/files/tool-nodejs
+++ b/modules/toollabs/files/tool-nodejs
@@ -16,10 +16,10 @@
sock.connect(('tools-webproxy', 8282))
sock.send(.*\nhttp://%s:%s\n; % (socket.getfqdn(), PORT))
-os.chdir(os.path.expand('~/www/js'))
+os.chdir(os.path.expanduser('~/www/js'))
env = {
-'TOOL_WEB_PORT': PORT
+'TOOL_WEB_PORT': str(PORT)
}
-os.execle('/usr/bin/npm', 'start', env)
\ No newline at end of file
+os.execle('/usr/bin/npm', 'start', env)
--
To view, visit https://gerrit.wikimedia.org/r/188790
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: If57256561c61fb4ae8db94589b543f5ab6d23f52
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Yuvipanda yuvipa...@gmail.com
Gerrit-Reviewer: Yuvipanda yuvipa...@gmail.com
Gerrit-Reviewer: coren mpellet...@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] beta: Make web user be www-data instead of apache - change (operations/puppet)
Yuvipanda has submitted this change and it was merged. Change subject: beta: Make web user be www-data instead of apache .. beta: Make web user be www-data instead of apache Bug: T78076 Change-Id: Ia6f136a105abaa913c6bfa34ed4e143baa1630a9 --- M hieradata/labs/deployment-prep/common.yaml 1 file changed, 2 insertions(+), 0 deletions(-) Approvals: Yuvipanda: Verified; Looks good to me, approved diff --git a/hieradata/labs/deployment-prep/common.yaml b/hieradata/labs/deployment-prep/common.yaml index 09cbf4d..49fe272 100644 --- a/hieradata/labs/deployment-prep/common.yaml +++ b/hieradata/labs/deployment-prep/common.yaml @@ -46,3 +46,5 @@ mediawiki::jobrunner::runners_gwt: 1 role::logging::mediawiki::log_directory: /data/project/logs role::mediawiki::webserver::pool: one-pool-to-rule-them-all +mediawiki::users::web: www-data +beta::syncsiteresources::user: www-data -- To view, visit https://gerrit.wikimedia.org/r/188791 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ia6f136a105abaa913c6bfa34ed4e143baa1630a9 Gerrit-PatchSet: 2 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Yuvipanda yuvipa...@gmail.com Gerrit-Reviewer: Yuvipanda yuvipa...@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] Remove p tags from API examples - change (mediawiki...ApiSandbox)
Amire80 has uploaded a new change for review.
https://gerrit.wikimedia.org/r/188793
Change subject: Remove p tags from API examples
..
Remove p tags from API examples
Bug: T84995
Change-Id: I34069cc290661c4ba6f0d1999d52b99792398a76
---
M resources/main.js
1 file changed, 22 insertions(+), 11 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ApiSandbox
refs/changes/93/188793/1
diff --git a/resources/main.js b/resources/main.js
index a2f94c8..588d375 100644
--- a/resources/main.js
+++ b/resources/main.js
@@ -309,7 +309,8 @@
}
function updateExamples( info ) {
- var i, $list, urlRegex, count, href, text, match, prefix,
$prefix, linkText;
+ var i, $list, urlRegex, count, href, text, match, prefix,
$prefix, linkText,
+ $link, $item;
$.each( info, function ( action, actionInfo ) {
if ( actionInfo.examples === undefined ) {
@@ -322,18 +323,28 @@
for ( i = 0; i actionInfo.examples.length; i++ ) {
href = actionInfo.examples[i].query;
text = actionInfo.examples[i].description !==
'' ? actionInfo.examples[i].description : href;
+
+ // Remove line ending
prefix = text.replace( /[^\n]*$/, '' );
- $prefix = prefix.length ? $( 'b' ).text(
prefix ) : [];
- linkText = text.replace( /^.*\n/, '' );
- $( 'li' )
+
+ // Remove p tags
+ prefix = prefix.replace( /^p/, '' );
+
+ $prefix = prefix.length ? $( 'b' ).html(
prefix ) : [];
+ linkText = prefix.replace( /^.*\n/, '' );
+
+ $link = $( 'a' )
+ .attr( 'href', '#' )
+ .data( 'exampleLink', href )
+ .text( linkText )
+ .click( exampleClick );
+
+ $item = $( 'li' )
.append( $prefix )
- .append(
- $( 'a' )
- .attr( 'href', '#' )
- .data( 'exampleLink',
href )
- .text( linkText )
- .click( exampleClick )
- ).appendTo( $list );
+ .append( $link );
+
+ $list.append( $item );
+
count++;
}
$examplesButton.button( 'option', 'text', mw.msg( count
=== 1 ? 'apisb-example' : 'apisb-examples' ) );
--
To view, visit https://gerrit.wikimedia.org/r/188793
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I34069cc290661c4ba6f0d1999d52b99792398a76
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ApiSandbox
Gerrit-Branch: master
Gerrit-Owner: Amire80 amir.ahar...@mail.huji.ac.il
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] graphite/txstatsd: fix require_packages vs package - change (operations/puppet)
Filippo Giunchedi has submitted this change and it was merged.
Change subject: graphite/txstatsd: fix require_packages vs package
..
graphite/txstatsd: fix require_packages vs package
when testing a related dependency (python-twisted-core) puppet gave a
dependency cycle:
(Package[graphite-carbon] = Class[Packages::Graphite_carbon] =
Class[Graphite] = Package[python-twisted-core] =
Class[Packages::Graphite_carbon] = Package[graphite-carbon])
since this has been giving us problems already, I fixed txstatsd debian package
dependencies to include graphite-carbon and python-twisted-web as it should
have been in the first place. Thus avoiding the need to duplicate
graphite-carbon dependency and require_packages
Change-Id: I28424dd4c00a97fa5af8e4ce110282badf158227
---
M modules/graphite/manifests/init.pp
M modules/txstatsd/manifests/init.pp
2 files changed, 8 insertions(+), 12 deletions(-)
Approvals:
Filippo Giunchedi: Verified; Looks good to me, approved
Giuseppe Lavagetto: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/modules/graphite/manifests/init.pp
b/modules/graphite/manifests/init.pp
index 0dd1d45..f60fbb1 100644
--- a/modules/graphite/manifests/init.pp
+++ b/modules/graphite/manifests/init.pp
@@ -14,7 +14,7 @@
$storage_aggregation = {},
$storage_dir = '/var/lib/carbon',
) {
-require_package('graphite-carbon', 'python-whisper')
+package { ['graphite-carbon', 'python-whisper']: }
# force installation of python-twisted-core separatedly, there seem to be a
# race condition with dropin.cache generation when apt-get installing
@@ -22,7 +22,7 @@
# https://bugs.launchpad.net/graphite/+bug/833196
package { 'python-twisted-core':
ensure = installed,
-before = Class['packages::graphite_carbon'],
+before = Package['graphite-carbon'],
}
$carbon_service_defaults = {
@@ -50,24 +50,24 @@
group = '_graphite',
mode= '0755',
before = Service['carbon'],
-require = Class['packages::graphite_carbon'],
+require = Package['graphite-carbon'],
}
file { '/etc/carbon/storage-schemas.conf':
content = configparser_format($storage_schemas),
-require = Class['packages::graphite_carbon'],
+require = Package['graphite-carbon'],
notify = Service['carbon'],
}
file { '/etc/carbon/carbon.conf':
content = configparser_format($carbon_defaults, $carbon_settings),
-require = Class['packages::graphite_carbon'],
+require = Package['graphite-carbon'],
notify = Service['carbon'],
}
file { '/etc/carbon/storage-aggregation.conf':
content = configparser_format($storage_aggregation),
-require = Class['packages::graphite_carbon'],
+require = Package['graphite-carbon'],
notify = Service['carbon'],
}
diff --git a/modules/txstatsd/manifests/init.pp
b/modules/txstatsd/manifests/init.pp
index df6d162..125d175 100644
--- a/modules/txstatsd/manifests/init.pp
+++ b/modules/txstatsd/manifests/init.pp
@@ -23,7 +23,7 @@
# }
#
class txstatsd($settings) {
-require_package('python-txstatsd', 'python-twisted-web', 'graphite-carbon')
+package { 'python-txstatsd': }
file { '/etc/txstatsd':
ensure = directory,
@@ -77,11 +77,7 @@
subscribe = File['/etc/txstatsd/txstatsd.cfg'],
require = [
File[$init_file],
-Class[
- 'packages::python_txstatsd',
- 'packages::python_twisted_web',
- 'packages::graphite_carbon'
- ],
+Package['python-txstatsd'],
User['txstatsd'],
],
}
--
To view, visit https://gerrit.wikimedia.org/r/188815
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I28424dd4c00a97fa5af8e4ce110282badf158227
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Filippo Giunchedi fgiunch...@wikimedia.org
Gerrit-Reviewer: Filippo Giunchedi fgiunch...@wikimedia.org
Gerrit-Reviewer: Giuseppe Lavagetto glavage...@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] Labs: User guard manage-nfs-volumes-deamon - change (operations/puppet)
coren has uploaded a new change for review. https://gerrit.wikimedia.org/r/188817 Change subject: Labs: User guard manage-nfs-volumes-deamon .. Labs: User guard manage-nfs-volumes-deamon Make certain it can be run only as the unprivileged nfsmanager user to avoid its output files being unwritable (and thus breaking future runs). Bug: T88579 Change-Id: I00d71722eca8e1d37fbed7b9ec4bf46f5c6856a6 --- M modules/ldap/files/scripts/manage-nfs-volumes-daemon 1 file changed, 4 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/17/188817/1 diff --git a/modules/ldap/files/scripts/manage-nfs-volumes-daemon b/modules/ldap/files/scripts/manage-nfs-volumes-daemon index 2db30df..abbfe67 100755 --- a/modules/ldap/files/scripts/manage-nfs-volumes-daemon +++ b/modules/ldap/files/scripts/manage-nfs-volumes-daemon @@ -9,6 +9,7 @@ import ldapsupportlib from optparse import OptionParser import os +import pwd import socket import subprocess import sys @@ -341,6 +342,9 @@ def main(): +if pwd.getpwuid(os.getuid())[0] != 'nfsmanager': +sys.stderr.write(This daemon should only be run as the 'nfsmanager' user.\n) +sys.exit(1) volume_manager = VolumeManager() volume_manager.run() -- To view, visit https://gerrit.wikimedia.org/r/188817 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I00d71722eca8e1d37fbed7b9ec4bf46f5c6856a6 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: coren mpellet...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Labs: User guard manage-nfs-volumes-deamon - change (operations/puppet)
coren has submitted this change and it was merged. Change subject: Labs: User guard manage-nfs-volumes-deamon .. Labs: User guard manage-nfs-volumes-deamon Make certain it can be run only as the unprivileged nfsmanager user to avoid its output files being unwritable (and thus breaking future runs). Bug: T88579 Change-Id: I00d71722eca8e1d37fbed7b9ec4bf46f5c6856a6 --- M modules/ldap/files/scripts/manage-nfs-volumes-daemon 1 file changed, 4 insertions(+), 0 deletions(-) Approvals: coren: Looks good to me, approved jenkins-bot: Verified diff --git a/modules/ldap/files/scripts/manage-nfs-volumes-daemon b/modules/ldap/files/scripts/manage-nfs-volumes-daemon index 2db30df..abbfe67 100755 --- a/modules/ldap/files/scripts/manage-nfs-volumes-daemon +++ b/modules/ldap/files/scripts/manage-nfs-volumes-daemon @@ -9,6 +9,7 @@ import ldapsupportlib from optparse import OptionParser import os +import pwd import socket import subprocess import sys @@ -341,6 +342,9 @@ def main(): +if pwd.getpwuid(os.getuid())[0] != 'nfsmanager': +sys.stderr.write(This daemon should only be run as the 'nfsmanager' user.\n) +sys.exit(1) volume_manager = VolumeManager() volume_manager.run() -- To view, visit https://gerrit.wikimedia.org/r/188817 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I00d71722eca8e1d37fbed7b9ec4bf46f5c6856a6 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: coren mpellet...@wikimedia.org Gerrit-Reviewer: coren mpellet...@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] Fixups for header section redesign (make qunit pass again) - change (mediawiki...Wikibase)
jenkins-bot has submitted this change and it was merged.
Change subject: Fixups for header section redesign (make qunit pass again)
..
Fixups for header section redesign (make qunit pass again)
Change-Id: I210ca81766b2b7e9f25e59b431a291fdc1194378
---
M lib/resources/jquery.wikibase/jquery.wikibase.aliasesview.js
M lib/resources/jquery.wikibase/jquery.wikibase.descriptionview.js
M
lib/resources/jquery.wikibase/jquery.wikibase.entitytermsforlanguagelistview.js
M lib/resources/jquery.wikibase/jquery.wikibase.entitytermsview.js
M lib/resources/jquery.wikibase/jquery.wikibase.entityview.js
M lib/tests/qunit/jquery.wikibase/jquery.wikibase.descriptionview.tests.js
M
lib/tests/qunit/jquery.wikibase/jquery.wikibase.entitytermsforlanguagelistview.tests.js
M
lib/tests/qunit/jquery.wikibase/jquery.wikibase.entitytermsforlanguageview.tests.js
8 files changed, 27 insertions(+), 19 deletions(-)
Approvals:
Henning Snater: Looks good to me, approved
jenkins-bot: Verified
diff --git a/lib/resources/jquery.wikibase/jquery.wikibase.aliasesview.js
b/lib/resources/jquery.wikibase/jquery.wikibase.aliasesview.js
index 6fc659a..2f6cef2 100644
--- a/lib/resources/jquery.wikibase/jquery.wikibase.aliasesview.js
+++ b/lib/resources/jquery.wikibase/jquery.wikibase.aliasesview.js
@@ -68,7 +68,10 @@
* @inheritdoc
*/
destroy: function() {
- this.$list.removeClass( this.widgetFullName + '-input' );
+ if( this.$list ) {
+ this.$list.removeClass( this.widgetFullName + '-input'
);
+ }
+ PARENT.prototype.destroy.call( this );
},
/**
diff --git a/lib/resources/jquery.wikibase/jquery.wikibase.descriptionview.js
b/lib/resources/jquery.wikibase/jquery.wikibase.descriptionview.js
index e7fdb78..ebf5b1c 100644
--- a/lib/resources/jquery.wikibase/jquery.wikibase.descriptionview.js
+++ b/lib/resources/jquery.wikibase/jquery.wikibase.descriptionview.js
@@ -239,7 +239,7 @@
if( !dropValue ) {
this.options.value = this.value();
} else if( this.options.value.getText() === '' ) {
- this.$text.children( this.widgetFullName + '-input'
).val( '' );
+ this.$text.children( '.' + this.widgetFullName +
'-input' ).val( '' );
}
this.element.removeClass( 'wb-edit' );
@@ -295,7 +295,7 @@
var response = PARENT.prototype._setOption.call( this, key,
value );
if( key === 'disabled' this._isInEditMode ) {
- this.$text.children( this.widgetFullName + '-input'
).prop( 'disabled', value );
+ this.$text.children( '.' + this.widgetFullName +
'-input' ).prop( 'disabled', value );
}
return response;
@@ -319,7 +319,7 @@
return new wb.datamodel.Term(
this.options.value.getLanguageCode(),
- $.trim( this.$text.children( this.widgetFullName +
'-input' ).val() )
+ $.trim( this.$text.children( '.' + this.widgetFullName
+ '-input' ).val() )
);
},
@@ -328,7 +328,7 @@
*/
focus: function() {
if( this._isInEditMode ) {
- this.$text.children( this.widgetFullName + '-input'
).focus();
+ this.$text.children( '.' + this.widgetFullName +
'-input' ).focus();
} else {
this.element.focus();
}
diff --git
a/lib/resources/jquery.wikibase/jquery.wikibase.entitytermsforlanguagelistview.js
b/lib/resources/jquery.wikibase/jquery.wikibase.entitytermsforlanguagelistview.js
index 9f94836..d03a7e4 100644
---
a/lib/resources/jquery.wikibase/jquery.wikibase.entitytermsforlanguagelistview.js
+++
b/lib/resources/jquery.wikibase/jquery.wikibase.entitytermsforlanguagelistview.js
@@ -93,11 +93,14 @@
* @see jQuery.ui.TemplatedWidget.destroy
*/
destroy: function() {
- // When destroying a widget not initialized properly, listview
will not have been created.
- var listview = this.$listview.data( 'listview' );
+ // When destroying a widget not initialized properly, shortcuts
will not have been created.
+ if( this.$listview ) {
+ // When destroying a widget not initialized properly,
listview will not have been created.
+ var listview = this.$listview.data( 'listview' );
- if( listview ) {
- listview.destroy();
+ if( listview ) {
+ listview.destroy();
+ }
}
this.element.removeClass(
'wikibase-entitytermsforlanguagelistview' );
diff --git
[MediaWiki-commits] [Gerrit] Use extension registration - change (mediawiki...ContentTranslation)
Jsahleen has submitted this change and it was merged.
Change subject: Use extension registration
..
Use extension registration
Bug: T87902
Change-Id: I9224259a12b86c22fafa79b057344bd2d85c508d
---
M ContentTranslation.hooks.php
M ContentTranslation.php
2 files changed, 72 insertions(+), 0 deletions(-)
Approvals:
Jsahleen: Looks good to me, approved
diff --git a/ContentTranslation.hooks.php b/ContentTranslation.hooks.php
index da01623..20d4a30 100644
--- a/ContentTranslation.hooks.php
+++ b/ContentTranslation.hooks.php
@@ -142,4 +142,74 @@
$tags[] = 'contenttranslation';
return true;
}
+
+ /**
+* Hook: ResourceLoaderTestModules
+*/
+ public static function onResourceLoaderTestModules( array $modules ) {
+ $resourcePaths = array(
+ 'localBasePath' = __DIR__,
+ 'remoteExtPath' = 'ContentTranslation',
+ );
+
+ $modules['qunit']['ext.cx.editor.tests'] = array(
+ 'scripts' = array(
+ 'tests/qunit/editor/ext.cx.editor.test.js',
+ ),
+ 'dependencies' = array(
+ 'ext.cx.editor',
+ ),
+ ) + $resourcePaths;
+
+ $modules['qunit']['ext.cx.header.test'] = array(
+ 'scripts' = array(
+ 'tests/qunit/header/ext.cx.header.test.js',
+ ),
+ 'dependencies' = array(
+ 'ext.cx.header',
+ ),
+ ) + $resourcePaths;
+
+ $modules['qunit']['ext.cx.publish.test'] = array(
+ 'scripts' = array(
+ 'tests/qunit/publish/ext.cx.publish.test.js',
+ ),
+ 'dependencies' = array(
+ 'ext.cx.publish',
+ ),
+ ) + $resourcePaths;
+
+ $modules['qunit']['ext.cx.tools.tests'] = array(
+ 'scripts' = array(
+
'tests/qunit/tools/ext.cx.tools.template.test.js',
+
'tests/qunit/tools/ext.cx.tools.mtabuse.test.js',
+
'tests/qunit/tools/ext.cx.tools.categories.test.js',
+ ),
+ 'dependencies' = array(
+ 'ext.cx.model',
+ 'ext.cx.tools.template',
+ 'ext.cx.tools.mtabuse',
+ 'ext.cx.tools.categories',
+ ),
+ ) + $resourcePaths;
+
+ $modules['qunit']['ext.cx.translation.tests'] = array(
+ 'scripts' = array(
+
'tests/qunit/translation/ext.cx.translation.test.js',
+ ),
+ 'dependencies' = array(
+ 'ext.cx.translation',
+ ),
+ ) + $resourcePaths;
+
+ $modules['qunit']['ext.cx.sitemapper.test'] = array(
+ 'scripts' = array(
+ 'tests/qunit/base/ext.cx.sitemapper.test.js',
+ ),
+ 'dependencies' = array(
+ 'ext.cx.sitemapper',
+ ),
+ ) + $resourcePaths;
+ }
+
}
diff --git a/ContentTranslation.php b/ContentTranslation.php
index 8310ea9..5dd97ee 100644
--- a/ContentTranslation.php
+++ b/ContentTranslation.php
@@ -68,6 +68,8 @@
'ContentTranslationHooks::addNewContributionButton';
$GLOBALS['wgHooks']['ListDefinedTags'][] =
'ContentTranslationHooks::registerTags';
$GLOBALS['wgHooks']['ChangeTagsListActive'][] =
'ContentTranslationHooks::registerTags';
+$GLOBALS['wgHooks']['ResourceLoaderTestModules'][] =
+ 'ContentTranslationHooks::onResourceLoaderTestModules';
// Globals for this extension
--
To view, visit https://gerrit.wikimedia.org/r/187714
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I9224259a12b86c22fafa79b057344bd2d85c508d
Gerrit-PatchSet: 6
Gerrit-Project: mediawiki/extensions/ContentTranslation
Gerrit-Branch: master
Gerrit-Owner: Santhosh santhosh.thottin...@gmail.com
Gerrit-Reviewer: Jsahleen jsahl...@wikimedia.org
Gerrit-Reviewer: Legoktm legoktm.wikipe...@gmail.com
Gerrit-Reviewer: Nikerabbit niklas.laxst...@gmail.com
Gerrit-Reviewer: Santhosh santhosh.thottin...@gmail.com
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
[MediaWiki-commits] [Gerrit] re-enable cp1064 backend for testing - change (operations/puppet)
BBlack has submitted this change and it was merged. Change subject: re-enable cp1064 backend for testing .. re-enable cp1064 backend for testing Change-Id: Ia59f9f05b60caf08d40f1ff0e0460e10b33b268e --- M manifests/role/cache.pp 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: BBlack: Verified; Looks good to me, approved diff --git a/manifests/role/cache.pp b/manifests/role/cache.pp index 12e593b..ad01711 100644 --- a/manifests/role/cache.pp +++ b/manifests/role/cache.pp @@ -143,7 +143,7 @@ 'cp1061.eqiad.wmnet', 'cp1062.eqiad.wmnet', 'cp1063.eqiad.wmnet', -# 'cp1064.eqiad.wmnet', # out to avoid 5xx for now... +'cp1064.eqiad.wmnet', ], 'esams' = [ 'cp3003.esams.wikimedia.org', -- To view, visit https://gerrit.wikimedia.org/r/12 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ia59f9f05b60caf08d40f1ff0e0460e10b33b268e Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: BBlack bbl...@wikimedia.org Gerrit-Reviewer: BBlack bbl...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] [GlobalUserPage] Deployed on Testwikis - change (translatewiki)
Raimond Spekking has submitted this change and it was merged. Change subject: [GlobalUserPage] Deployed on Testwikis .. [GlobalUserPage] Deployed on Testwikis Important enough to add it to the main extension Add another extension, commented out, due to missing message doc Change-Id: I29c886837436aef9bd71742c0e2fb1cfab7159e8 --- M groups/MediaWiki/WikimediaMainAgg.yaml M groups/MediaWiki/mediawiki-extensions.txt 2 files changed, 4 insertions(+), 0 deletions(-) Approvals: Raimond Spekking: Verified; Looks good to me, approved diff --git a/groups/MediaWiki/WikimediaMainAgg.yaml b/groups/MediaWiki/WikimediaMainAgg.yaml index 8bc8267..a15f43a 100644 --- a/groups/MediaWiki/WikimediaMainAgg.yaml +++ b/groups/MediaWiki/WikimediaMainAgg.yaml @@ -26,6 +26,7 @@ - ext-gadgets - ext-globalblocking - ext-globalusage # 2009-11-11: commons.wikimedia.org + - ext-globaluserpage # 2015-02-05: Testwikis - ext-imagemap - ext-inputbox - ext-intersection diff --git a/groups/MediaWiki/mediawiki-extensions.txt b/groups/MediaWiki/mediawiki-extensions.txt index b686c4c..cc49205 100644 --- a/groups/MediaWiki/mediawiki-extensions.txt +++ b/groups/MediaWiki/mediawiki-extensions.txt @@ -116,6 +116,9 @@ Auto Create Category Pages +# Missing message documentation - 2015-02-04 +# Auto Proxy Block + Automatic Board Welcome AWS -- To view, visit https://gerrit.wikimedia.org/r/188890 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I29c886837436aef9bd71742c0e2fb1cfab7159e8 Gerrit-PatchSet: 1 Gerrit-Project: translatewiki Gerrit-Branch: master Gerrit-Owner: Raimond Spekking raimond.spekk...@gmail.com Gerrit-Reviewer: Raimond Spekking raimond.spekk...@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] [GlobalUserPage] Deployed on Testwikis - change (translatewiki)
Raimond Spekking has uploaded a new change for review. https://gerrit.wikimedia.org/r/188890 Change subject: [GlobalUserPage] Deployed on Testwikis .. [GlobalUserPage] Deployed on Testwikis Important enough to add it to the main extension Add another extension, commented out, due to missing message doc Change-Id: I29c886837436aef9bd71742c0e2fb1cfab7159e8 --- M groups/MediaWiki/WikimediaMainAgg.yaml M groups/MediaWiki/mediawiki-extensions.txt 2 files changed, 4 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/translatewiki refs/changes/90/188890/1 diff --git a/groups/MediaWiki/WikimediaMainAgg.yaml b/groups/MediaWiki/WikimediaMainAgg.yaml index 8bc8267..a15f43a 100644 --- a/groups/MediaWiki/WikimediaMainAgg.yaml +++ b/groups/MediaWiki/WikimediaMainAgg.yaml @@ -26,6 +26,7 @@ - ext-gadgets - ext-globalblocking - ext-globalusage # 2009-11-11: commons.wikimedia.org + - ext-globaluserpage # 2015-02-05: Testwikis - ext-imagemap - ext-inputbox - ext-intersection diff --git a/groups/MediaWiki/mediawiki-extensions.txt b/groups/MediaWiki/mediawiki-extensions.txt index b686c4c..cc49205 100644 --- a/groups/MediaWiki/mediawiki-extensions.txt +++ b/groups/MediaWiki/mediawiki-extensions.txt @@ -116,6 +116,9 @@ Auto Create Category Pages +# Missing message documentation - 2015-02-04 +# Auto Proxy Block + Automatic Board Welcome AWS -- To view, visit https://gerrit.wikimedia.org/r/188890 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I29c886837436aef9bd71742c0e2fb1cfab7159e8 Gerrit-PatchSet: 1 Gerrit-Project: translatewiki 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] Don't expose TRY_FIXING - change (mediawiki...Scribunto)
Jackmcbarn has uploaded a new change for review.
https://gerrit.wikimedia.org/r/13
Change subject: Don't expose TRY_FIXING
..
Don't expose TRY_FIXING
In new code, I don't see the value in decoding things that happen to look
like JSON but aren't actually JSON. It promotes bad code and data, and
it'll lead to not-quite-JSON ending up all over the place if anyone were
to use it.
Change-Id: Ib455813cdb39af7437c65ae7b3078afeab18b42b
---
M engines/LuaCommon/TextLibrary.php
M engines/LuaCommon/lualib/mw.text.lua
M tests/engines/LuaCommon/TextLibraryTests.lua
3 files changed, 3 insertions(+), 15 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Scribunto
refs/changes/83/13/1
diff --git a/engines/LuaCommon/TextLibrary.php
b/engines/LuaCommon/TextLibrary.php
index e6f4aa6..48aa942 100644
--- a/engines/LuaCommon/TextLibrary.php
+++ b/engines/LuaCommon/TextLibrary.php
@@ -3,8 +3,7 @@
class Scribunto_LuaTextLibrary extends Scribunto_LuaLibraryBase {
// Matches Lua mw.text constants
const JSON_PRESERVE_KEYS = 1;
- const JSON_TRY_FIXING = 2;
- const JSON_PRETTY = 4;
+ const JSON_PRETTY = 2;
function register() {
global $wgUrlProtocols;
@@ -87,11 +86,7 @@
$this-checkType( 'mw.text.jsonDecode', 1, $s, 'string' );
$this-checkTypeOptional( 'mw.text.jsonDecode', 2, $flags,
'number', 0 );
$flags = (int)$flags;
- $opts = FormatJson::FORCE_ASSOC;
- if ( $flags self::JSON_TRY_FIXING ) {
- $opts |= FormatJson::TRY_FIXING;
- }
- $status = FormatJson::parse( $s, $opts );
+ $status = FormatJson::parse( $s, FormatJson::FORCE_ASSOC );
if ( !$status-isOk() ) {
throw new Scribunto_LuaError( 'mw.text.jsonDecode: ' .
$status-getMessage()-text() );
}
diff --git a/engines/LuaCommon/lualib/mw.text.lua
b/engines/LuaCommon/lualib/mw.text.lua
index c452384..c1dba4b 100644
--- a/engines/LuaCommon/lualib/mw.text.lua
+++ b/engines/LuaCommon/lualib/mw.text.lua
@@ -324,7 +324,6 @@
-- Matches PHP Scribunto_LuaTextLibrary constants
mwtext.JSON_PRESERVE_KEYS = 1
-mwtext.JSON_TRY_FIXING = 2
-mwtext.JSON_PRETTY = 4
+mwtext.JSON_PRETTY = 2
return mwtext
diff --git a/tests/engines/LuaCommon/TextLibraryTests.lua
b/tests/engines/LuaCommon/TextLibraryTests.lua
index 522fcd2..bc8ed1e 100644
--- a/tests/engines/LuaCommon/TextLibraryTests.lua
+++ b/tests/engines/LuaCommon/TextLibraryTests.lua
@@ -466,16 +466,10 @@
args = { { [1/0] = 1 } },
expect = 'mw.text.jsonEncode: Cannot use \'inf\' as a table key'
},
-
{ name = 'json decode, invalid values (trailing comma)',
func = mw.text.jsonDecode,
args = { '{x:1,}' },
expect = 'mw.text.jsonDecode: Syntax error'
- },
- { name = 'json decode, trailing comma with JSON_TRY_FIXING',
- func = mw.text.jsonDecode,
- args = { '{x:1,}', mw.text.JSON_TRY_FIXING },
- expect = { { x = 1 } }
},
}
--
To view, visit https://gerrit.wikimedia.org/r/13
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib455813cdb39af7437c65ae7b3078afeab18b42b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Scribunto
Gerrit-Branch: master
Gerrit-Owner: Jackmcbarn jackmcb...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] re-enable cp1064 backend for testing - change (operations/puppet)
BBlack has uploaded a new change for review. https://gerrit.wikimedia.org/r/12 Change subject: re-enable cp1064 backend for testing .. re-enable cp1064 backend for testing Change-Id: Ia59f9f05b60caf08d40f1ff0e0460e10b33b268e --- M manifests/role/cache.pp 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/82/12/1 diff --git a/manifests/role/cache.pp b/manifests/role/cache.pp index 12e593b..ad01711 100644 --- a/manifests/role/cache.pp +++ b/manifests/role/cache.pp @@ -143,7 +143,7 @@ 'cp1061.eqiad.wmnet', 'cp1062.eqiad.wmnet', 'cp1063.eqiad.wmnet', -# 'cp1064.eqiad.wmnet', # out to avoid 5xx for now... +'cp1064.eqiad.wmnet', ], 'esams' = [ 'cp3003.esams.wikimedia.org', -- To view, visit https://gerrit.wikimedia.org/r/12 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ia59f9f05b60caf08d40f1ff0e0460e10b33b268e Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: BBlack bbl...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] setting mc2001-2018 mgmt entries - change (operations/dns)
RobH has uploaded a new change for review.
https://gerrit.wikimedia.org/r/14
Change subject: setting mc2001-2018 mgmt entries
..
setting mc2001-2018 mgmt entries
drac ip allocation for codfw mc servers
T88693
Change-Id: I5e967cd50b1b2aad1b5a30d3a053f6abfd6cd292
---
M templates/10.in-addr.arpa
M templates/wmnet
2 files changed, 73 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/dns
refs/changes/84/14/1
diff --git a/templates/10.in-addr.arpa b/templates/10.in-addr.arpa
index ef90009..10dee4d 100644
--- a/templates/10.in-addr.arpa
+++ b/templates/10.in-addr.arpa
@@ -3090,6 +3090,43 @@
119 1H IN PTR sterope.mgmt.codfw.wmnet.
119 1H IN PTR WMF3298.mgmt.codfw.wmnet.
+121 1H IN PTR mc2001.mgmt.codfw.wmnet.
+121 1H IN PTR WMF5739.mgmt.codfw.wmnet.
+122 1H IN PTR mc2002.mgmt.codfw.wmnet.
+122 1H IN PTR WMF5740.mgmt.codfw.wmnet.
+123 1H IN PTR mc2003.mgmt.codfw.wmnet.
+123 1H IN PTR WMF5741.mgmt.codfw.wmnet.
+124 1H IN PTR mc2004.mgmt.codfw.wmnet.
+124 1H IN PTR WMF5742.mgmt.codfw.wmnet.
+125 1H IN PTR mc2005.mgmt.codfw.wmnet.
+125 1H IN PTR WMF5743.mgmt.codfw.wmnet.
+126 1H IN PTR mc2006.mgmt.codfw.wmnet.
+126 1H IN PTR WMF5744.mgmt.codfw.wmnet.
+127 1H IN PTR mc2007.mgmt.codfw.wmnet.
+127 1H IN PTR WMF5745.mgmt.codfw.wmnet.
+128 1H IN PTR mc2008.mgmt.codfw.wmnet.
+128 1H IN PTR WMF5746.mgmt.codfw.wmnet.
+129 1H IN PTR mc2009.mgmt.codfw.wmnet.
+129 1H IN PTR WMF5747.mgmt.codfw.wmnet.
+130 1H IN PTR mc2010.mgmt.codfw.wmnet.
+130 1H IN PTR WMF5748.mgmt.codfw.wmnet.
+131 1H IN PTR mc2011.mgmt.codfw.wmnet.
+131 1H IN PTR WMF5749.mgmt.codfw.wmnet.
+132 1H IN PTR mc2012.mgmt.codfw.wmnet.
+132 1H IN PTR WMF5750.mgmt.codfw.wmnet.
+133 1H IN PTR mc2013.mgmt.codfw.wmnet.
+133 1H IN PTR WMF5751.mgmt.codfw.wmnet.
+134 1H IN PTR mc2014.mgmt.codfw.wmnet.
+134 1H IN PTR WMF5752.mgmt.codfw.wmnet.
+135 1H IN PTR mc2015.mgmt.codfw.wmnet.
+135 1H IN PTR WMF5753.mgmt.codfw.wmnet.
+136 1H IN PTR mc2016.mgmt.codfw.wmnet.
+136 1H IN PTR WMF5754.mgmt.codfw.wmnet.
+137 1H IN PTR mc2017.mgmt.codfw.wmnet.
+137 1H IN PTR WMF5837.mgmt.codfw.wmnet.
+138 1H IN PTR mc2018.mgmt.codfw.wmnet.
+138 1H IN PTR WMF5838.mgmt.codfw.wmnet.
+
; 10.195.0.0/25 - frack.codfw subnets
$ORIGIN 0.195.{{ zonename }}.
diff --git a/templates/wmnet b/templates/wmnet
index 1352f5d..47b9f1b 100644
--- a/templates/wmnet
+++ b/templates/wmnet
@@ -2263,6 +2263,24 @@
lvs2004 1H IN A10.193.1.4
lvs2005 1H IN A10.193.1.5
lvs2006 1H IN A10.193.1.6
+mc2001 1H IN A10.193.2.121
+mc2002 1H IN A10.193.2.122
+mc2003 1H IN A10.193.2.123
+mc2004 1H IN A10.193.2.124
+mc2005 1H IN A10.193.2.125
+mc2006 1H IN A10.193.2.126
+mc2007 1H IN A10.193.2.127
+mc2008 1H IN A10.193.2.128
+mc2009 1H IN A10.193.2.129
+mc2010 1H IN A10.193.2.130
+mc2011 1H IN A10.193.2.131
+mc2012 1H IN A10.193.2.132
+mc2013 1H IN A10.193.2.133
+mc2014 1H IN A10.193.2.134
+mc2015 1H IN A10.193.2.135
+mc2016 1H IN A10.193.2.136
+mc2017 1H IN A10.193.2.137
+mc2018 1H IN A10.193.2.138
ms-be2001 1H IN A10.193.1.37
ms-be2002 1H IN A10.193.1.38
ms-be2003 1H IN A10.193.1.39
@@ -2553,7 +2571,6 @@
; Servers MGMT - Alphabetical by asset tag
-
WMF3298 1H IN A10.193.2.119
WMF3612 1H IN A10.193.1.235
WMF3613 1H IN A10.193.1.236
@@ -2622,6 +2639,24 @@
WMF5727 1H IN A10.193.1.242
WMF5732 1H IN A10.193.1.239
WMF5733 1H IN A10.193.1.240
+WMF5739 1H IN A10.193.2.121
+WMF5740 1H IN A10.193.2.122
+WMF5741 1H IN A10.193.2.123
+WMF5742 1H IN A10.193.2.124
+WMF5743 1H IN A10.193.2.125
+WMF5744 1H IN A10.193.2.126
+WMF5745 1H IN A10.193.2.127
+WMF5746 1H IN A10.193.2.128
+WMF5747 1H IN A10.193.2.129
+WMF5748 1H IN A10.193.2.130
+WMF5749 1H IN A10.193.2.131
+WMF5750 1H IN A10.193.2.132
+WMF5751 1H IN A10.193.2.133
+WMF5752 1H IN A10.193.2.134
+WMF5753 1H IN A10.193.2.135
+WMF5754 1H IN A10.193.2.136
+WMF5837 1H IN A10.193.2.137
+WMF5838 1H IN A10.193.2.138
WMF5755 1H IN A10.193.1.81
WMF5757 1H IN A10.193.1.243
WMF5815 1H IN A10.192.1.10
--
To view, visit https://gerrit.wikimedia.org/r/14
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I5e967cd50b1b2aad1b5a30d3a053f6abfd6cd292
Gerrit-PatchSet: 1
Gerrit-Project: operations/dns
[MediaWiki-commits] [Gerrit] Revert Escape unsafe messages in CategoryViewer.php - change (mediawiki/core)
Jackmcbarn has uploaded a new change for review.
https://gerrit.wikimedia.org/r/188891
Change subject: Revert Escape unsafe messages in CategoryViewer.php
..
Revert Escape unsafe messages in CategoryViewer.php
This reverts commit 8fe8035da20d0f5861b51f196c7443dda06301ba.
Change-Id: I87da10e63b55c1a6c83dd497e30f65ad224e052b
---
M includes/CategoryViewer.php
1 file changed, 6 insertions(+), 12 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/91/188891/1
diff --git a/includes/CategoryViewer.php b/includes/CategoryViewer.php
index c898ec9..1a09d44 100644
--- a/includes/CategoryViewer.php
+++ b/includes/CategoryViewer.php
@@ -387,16 +387,13 @@
if ( $rescnt 0 ) {
# Showing subcategories
- $r .= Html::openElement( 'div', array( 'id' =
'mw-subcategories' ) );
- $r .= \n;
- $r .= Html::element( 'h2', array(), $this-msg(
'subcategories' )-text() );
- $r .= \n;
+ $r .= div id=\mw-subcategories\\n;
+ $r .= 'h2' . $this-msg( 'subcategories' )-text() .
/h2\n;
$r .= $countmsg;
$r .= $this-getSectionPagingLinks( 'subcat' );
$r .= $this-formatList( $this-children,
$this-children_start_char );
$r .= $this-getSectionPagingLinks( 'subcat' );
- $r .= \n;
- $r .= Html::closeElement( 'div' );
+ $r .= \n/div;
}
return $r;
}
@@ -419,16 +416,13 @@
$countmsg = $this-getCountMessage( $rescnt, $dbcnt, 'article'
);
if ( $rescnt 0 ) {
- $r .= Html::openElement( 'div', array( 'id' =
'mw-pages' ) );
- $r .= \n;
- $r .= Html::element( 'h2', array(), $this-msg(
'category_header', $ti )-text() );
- $r .= \n;
+ $r = div id=\mw-pages\\n;
+ $r .= 'h2' . $this-msg( 'category_header', $ti
)-text() . /h2\n;
$r .= $countmsg;
$r .= $this-getSectionPagingLinks( 'page' );
$r .= $this-formatList( $this-articles,
$this-articles_start_char );
$r .= $this-getSectionPagingLinks( 'page' );
- $r .= \n;
- $r .= Html::closeElement( 'div' );
+ $r .= \n/div;
}
return $r;
}
--
To view, visit https://gerrit.wikimedia.org/r/188891
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I87da10e63b55c1a6c83dd497e30f65ad224e052b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Jackmcbarn jackmcb...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Allow tooltips without links. - change (mediawiki...GraphViz)
Welterkj has uploaded a new change for review. https://gerrit.wikimedia.org/r/16 Change subject: Allow tooltips without links. .. Allow tooltips without links. DOT and HTML allow tooltips without URLs but ImageMap does not. Detect the case of a DOT tooltip without a URL and supply a dummy URL instead. Change-Id: Iae1bc04719b61c4d2baa1424e20b7bc4e9bf6683 --- M GraphViz_body.php M RELEASE-NOTES.md 2 files changed, 10 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/GraphViz refs/changes/86/16/1 diff --git a/GraphViz_body.php b/GraphViz_body.php index cf091b4..0f9b1f1 100644 --- a/GraphViz_body.php +++ b/GraphViz_body.php @@ -1496,6 +1496,15 @@ // remove map ending tag from map file contents $map = str_replace( '/map', '', $map ); + // DOT and HTML allow tooltips without URLs but ImageMap does not. + // We want to allow tooltips without URLs (hrefs) so add a dummy URL if it is missing. + // ImageMap accepts the URL http://; so use that as the dummy href. + + // detect missing hrefs and add them as needed + $map = preg_replace( '~id=([^]+)[\s\t]+title=([^]+)~', + 'id=$1 href=http://; title=$2', + $map ); + // add enclosing square brackets to URLs that don't have them and add the title $map = preg_replace( '~href=([^[][^]+).+title=([^]+)~', 'href=[$1 $2]', diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md index 83cb2b5..d92ef60 100644 --- a/RELEASE-NOTES.md +++ b/RELEASE-NOTES.md @@ -2,6 +2,7 @@ ## GraphViz 1.6.0 ## (not released yet ) * Make the category pages created by this extension optional, non-empty and do not tag “dummy” images as belonging to a category. +* Allow DOT tooltips without URLs. ## GraphViz 1.5.1 ## (2015-1-24) * Fix for [bug T75073](https://phabricator.wikimedia.org/T75073). -- To view, visit https://gerrit.wikimedia.org/r/16 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iae1bc04719b61c4d2baa1424e20b7bc4e9bf6683 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/GraphViz Gerrit-Branch: master Gerrit-Owner: Welterkj welterkj+...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] misallocated zinc to sterope, undoing - change (operations/dns)
RobH has submitted this change and it was merged. Change subject: misallocated zinc to sterope, undoing .. misallocated zinc to sterope, undoing bad allocation, just removing the bad entries T88624 Change-Id: I96ef32602c1b6601320caa3f3dfae34f0979a835 --- M templates/10.in-addr.arpa M templates/wmnet 2 files changed, 0 insertions(+), 4 deletions(-) Approvals: RobH: Looks good to me, approved jenkins-bot: Verified diff --git a/templates/10.in-addr.arpa b/templates/10.in-addr.arpa index 10dee4d..1eed763 100644 --- a/templates/10.in-addr.arpa +++ b/templates/10.in-addr.arpa @@ -3087,8 +3087,6 @@ 117 1H IN PTR procyon.mgmt.codfw.wmnet. 118 1H IN PTR rbf2002.mgmt.codfw.wmnet. 118 1H IN PTR WMF5845.mgmt.codfw.wmnet. -119 1H IN PTR sterope.mgmt.codfw.wmnet. -119 1H IN PTR WMF3298.mgmt.codfw.wmnet. 121 1H IN PTR mc2001.mgmt.codfw.wmnet. 121 1H IN PTR WMF5739.mgmt.codfw.wmnet. diff --git a/templates/wmnet b/templates/wmnet index 47b9f1b..8892a94 100644 --- a/templates/wmnet +++ b/templates/wmnet @@ -2532,7 +2532,6 @@ pollux 1H IN A10.193.1.50 procyon 1H IN A10.193.2.117 stat20011H IN A10.193.2.13 -sterope 1H IN A10.193.2.19 rbf2001 1H IN A10.193.2.116 rbf2001 1H IN A10.193.2.118 tmh2001 1H IN A10.193.1.8 @@ -2571,7 +2570,6 @@ ; Servers MGMT - Alphabetical by asset tag -WMF3298 1H IN A10.193.2.119 WMF3612 1H IN A10.193.1.235 WMF3613 1H IN A10.193.1.236 WMF3627 1H IN A10.193.1.237 -- To view, visit https://gerrit.wikimedia.org/r/19 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I96ef32602c1b6601320caa3f3dfae34f0979a835 Gerrit-PatchSet: 1 Gerrit-Project: operations/dns Gerrit-Branch: master Gerrit-Owner: RobH r...@wikimedia.org Gerrit-Reviewer: RobH r...@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] Remove useless mixinClass call from MWCategoryItemWidget - change (mediawiki...VisualEditor)
Catrope has uploaded a new change for review. https://gerrit.wikimedia.org/r/15 Change subject: Remove useless mixinClass call from MWCategoryItemWidget .. Remove useless mixinClass call from MWCategoryItemWidget The parent (ButtonWidget) already mixes in IndicatorElement. Change-Id: I49fd72514d9b177eaca2b0295192384bca9e0f97 --- M modules/ve-mw/ui/widgets/ve.ui.MWCategoryItemWidget.js 1 file changed, 0 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor refs/changes/85/15/1 diff --git a/modules/ve-mw/ui/widgets/ve.ui.MWCategoryItemWidget.js b/modules/ve-mw/ui/widgets/ve.ui.MWCategoryItemWidget.js index d854be7..ebdeb0f 100644 --- a/modules/ve-mw/ui/widgets/ve.ui.MWCategoryItemWidget.js +++ b/modules/ve-mw/ui/widgets/ve.ui.MWCategoryItemWidget.js @@ -57,8 +57,6 @@ OO.inheritClass( ve.ui.MWCategoryItemWidget, OO.ui.ButtonWidget ); -OO.mixinClass( ve.ui.MWCategoryItemWidget, OO.ui.IndicatorElement ); - /* Events */ /** -- To view, visit https://gerrit.wikimedia.org/r/15 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I49fd72514d9b177eaca2b0295192384bca9e0f97 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/VisualEditor Gerrit-Branch: master Gerrit-Owner: Catrope roan.katt...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] [WIP] Translucent toolbar on top of lead image, fading with ... - change (apps...wikipedia)
Dbrant has uploaded a new change for review. https://gerrit.wikimedia.org/r/18 Change subject: [WIP] Translucent toolbar on top of lead image, fading with scroll. .. [WIP] Translucent toolbar on top of lead image, fading with scroll. Change-Id: I59bb202cfa95c7e2d7c234d154ee99a39ec65540 --- A wikipedia/res/drawable/toolbar_lead_gradient_dark.xml A wikipedia/res/drawable/toolbar_lead_gradient_light.xml M wikipedia/res/layout/activity_main.xml M wikipedia/res/layout/fragment_page.xml M wikipedia/res/values/attrs.xml M wikipedia/res/values/styles_wikidark.xml M wikipedia/res/values/styles_wikilight.xml M wikipedia/src/main/java/org/wikipedia/page/PageActivity.java M wikipedia/src/main/java/org/wikipedia/page/PageViewFragmentInternal.java M wikipedia/src/main/java/org/wikipedia/page/ToCHandler.java M wikipedia/src/main/java/org/wikipedia/page/leadimages/LeadImagesHandler.java M wikipedia/src/main/java/org/wikipedia/search/SearchArticlesFragment.java M wikipedia/src/main/java/org/wikipedia/search/SearchBarHideHandler.java 13 files changed, 190 insertions(+), 82 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia refs/changes/88/18/1 diff --git a/wikipedia/res/drawable/toolbar_lead_gradient_dark.xml b/wikipedia/res/drawable/toolbar_lead_gradient_dark.xml new file mode 100644 index 000..af0adbd --- /dev/null +++ b/wikipedia/res/drawable/toolbar_lead_gradient_dark.xml @@ -0,0 +1,8 @@ +?xml version=1.0 encoding=utf-8? +shape xmlns:android=http://schemas.android.com/apk/res/android; +android:shape=rectangle +gradient +android:startColor=#d000 +android:endColor=# +android:angle=270/ +/shape \ No newline at end of file diff --git a/wikipedia/res/drawable/toolbar_lead_gradient_light.xml b/wikipedia/res/drawable/toolbar_lead_gradient_light.xml new file mode 100644 index 000..f4f1443 --- /dev/null +++ b/wikipedia/res/drawable/toolbar_lead_gradient_light.xml @@ -0,0 +1,8 @@ +?xml version=1.0 encoding=utf-8? +shape xmlns:android=http://schemas.android.com/apk/res/android; +android:shape=rectangle +gradient +android:startColor=#d0ff +android:endColor=#00ff +android:angle=270/ +/shape \ No newline at end of file diff --git a/wikipedia/res/layout/activity_main.xml b/wikipedia/res/layout/activity_main.xml index bd95d86..688c840 100644 --- a/wikipedia/res/layout/activity_main.xml +++ b/wikipedia/res/layout/activity_main.xml @@ -31,82 +31,111 @@ android:name=org.wikipedia.search.SearchArticlesFragment tools:layout=@layout/fragment_search/ -LinearLayout +FrameLayout android:id=@+id/main_toolbar_container android:layout_width=match_parent -android:layout_height=wrap_content -android:orientation=vertical -FrameLayout +android:layout_height=96dp +LinearLayout +android:id=@+id/main_toolbar_gradient android:layout_width=match_parent -android:layout_height=wrap_content -android.support.v7.widget.Toolbar -android:id=@+id/main_toolbar +android:layout_height=match_parent +android:background=?attr/actionbar_gradient +android:orientation=vertical +/LinearLayout +LinearLayout +android:layout_width=match_parent +android:layout_height=wrap_content +android:orientation=vertical +FrameLayout android:layout_width=match_parent -android:layout_height=?attr/actionBarSize +android:layout_height=wrap_content FrameLayout -android:id=@+id/main_toolbar_inner_container +android:id=@+id/main_toolbar_background android:layout_width=match_parent -android:layout_height=match_parent -LinearLayout -android:id=@+id/main_search_bar -android:layout_width=match_parent -android:layout_height=36dp -android:orientation=horizontal -android:layout_gravity=center_vertical -android:layout_marginLeft=4dp -android:layout_marginRight=4dp -android:paddingLeft=6dp -android:paddingRight=6dp -android:background=?attr/search_bar_shape -ImageView -android:id=@+id/main_search_bar_icon -android:layout_width=24dp -android:layout_height=24dp -android:layout_gravity=center_vertical -android:contentDescription=@string/search_hint -
[MediaWiki-commits] [Gerrit] misallocated zinc to sterope, undoing - change (operations/dns)
RobH has uploaded a new change for review. https://gerrit.wikimedia.org/r/19 Change subject: misallocated zinc to sterope, undoing .. misallocated zinc to sterope, undoing bad allocation, just removing the bad entries T88624 Change-Id: I96ef32602c1b6601320caa3f3dfae34f0979a835 --- M templates/10.in-addr.arpa M templates/wmnet 2 files changed, 0 insertions(+), 4 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/dns refs/changes/89/19/1 diff --git a/templates/10.in-addr.arpa b/templates/10.in-addr.arpa index 10dee4d..1eed763 100644 --- a/templates/10.in-addr.arpa +++ b/templates/10.in-addr.arpa @@ -3087,8 +3087,6 @@ 117 1H IN PTR procyon.mgmt.codfw.wmnet. 118 1H IN PTR rbf2002.mgmt.codfw.wmnet. 118 1H IN PTR WMF5845.mgmt.codfw.wmnet. -119 1H IN PTR sterope.mgmt.codfw.wmnet. -119 1H IN PTR WMF3298.mgmt.codfw.wmnet. 121 1H IN PTR mc2001.mgmt.codfw.wmnet. 121 1H IN PTR WMF5739.mgmt.codfw.wmnet. diff --git a/templates/wmnet b/templates/wmnet index 47b9f1b..8892a94 100644 --- a/templates/wmnet +++ b/templates/wmnet @@ -2532,7 +2532,6 @@ pollux 1H IN A10.193.1.50 procyon 1H IN A10.193.2.117 stat20011H IN A10.193.2.13 -sterope 1H IN A10.193.2.19 rbf2001 1H IN A10.193.2.116 rbf2001 1H IN A10.193.2.118 tmh2001 1H IN A10.193.1.8 @@ -2571,7 +2570,6 @@ ; Servers MGMT - Alphabetical by asset tag -WMF3298 1H IN A10.193.2.119 WMF3612 1H IN A10.193.1.235 WMF3613 1H IN A10.193.1.236 WMF3627 1H IN A10.193.1.237 -- To view, visit https://gerrit.wikimedia.org/r/19 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I96ef32602c1b6601320caa3f3dfae34f0979a835 Gerrit-PatchSet: 1 Gerrit-Project: operations/dns Gerrit-Branch: master Gerrit-Owner: RobH r...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add alias for previous project namespace (fawikibooks)\nBug:... - change (operations/mediawiki-config)
Mjbmr has uploaded a new change for review. https://gerrit.wikimedia.org/r/17 Change subject: Add alias for previous project namespace (fawikibooks)\nBug: T60655 .. Add alias for previous project namespace (fawikibooks)\nBug: T60655 Change-Id: I864aeed8cf31612f7d4b6fc405b25788c2fb09ef --- M wmf-config/InitialiseSettings.php 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/87/17/1 diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index c83aa7b..933fb82 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -2824,6 +2824,7 @@ ), '+fawikibooks' = array( 'وک' = NS_PROJECT, + 'ویکینسک' = NS_PROJECT, 'کتاب_آشپزی' = 102, 'بحث_کتاب_آشپزی' = 103, 'ویکی_کودک' = 110, -- To view, visit https://gerrit.wikimedia.org/r/17 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I864aeed8cf31612f7d4b6fc405b25788c2fb09ef Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Mjbmr mjb...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Make BoardHistoryStorage::findMulti respect order limit - change (mediawiki...Flow)
jenkins-bot has submitted this change and it was merged.
Change subject: Make BoardHistoryStorage::findMulti respect order limit
..
Make BoardHistoryStorage::findMulti respect order limit
Change-Id: I4f58bbff6a919a6495f139f0b2d74acd1496
---
M includes/Data/Storage/BoardHistoryStorage.php
1 file changed, 14 insertions(+), 2 deletions(-)
Approvals:
Mattflaschen: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/Data/Storage/BoardHistoryStorage.php
b/includes/Data/Storage/BoardHistoryStorage.php
index babf80b..e372c4f 100644
--- a/includes/Data/Storage/BoardHistoryStorage.php
+++ b/includes/Data/Storage/BoardHistoryStorage.php
@@ -23,11 +23,23 @@
if ( count( $queries ) 1 ) {
throw new DataModelException( __METHOD__ . ' expects
only one value in $queries', 'process-data' );
}
+
$merged = $this-findHeaderHistory( $queries, $options ) +
$this-findTopicListHistory( $queries, $options ) +
$this-findTopicSummaryHistory( $queries, $options );
- // newest items at the beginning of the list
- krsort( $merged );
+
+ // Having merged data from 3 sources, we now have to combine it
+ // (according to the current sort limit)
+ $order = isset( $options['ORDER BY'][0] ) preg_match(
'/ASC$/', $options['ORDER BY'][0] ) ? 'ASC' : 'DESC';
+ if ( $order === 'DESC' ) {
+ krsort( $merged );
+ } else {
+ ksort( $merged );
+ }
+
+ if ( isset( $options['LIMIT'] ) ) {
+ $merged = array_splice( $merged, 0, $options['LIMIT'] );
+ }
// Merge data from external store get rid of failures
$res = array( $merged );
--
To view, visit https://gerrit.wikimedia.org/r/187308
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I4f58bbff6a919a6495f139f0b2d74acd1496
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: Matthias Mullie mmul...@wikimedia.org
Gerrit-Reviewer: Mattflaschen mflasc...@wikimedia.org
Gerrit-Reviewer: SG shah...@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] setting mc2001-2018 mgmt entries - change (operations/dns)
RobH has submitted this change and it was merged.
Change subject: setting mc2001-2018 mgmt entries
..
setting mc2001-2018 mgmt entries
drac ip allocation for codfw mc servers
T88693
Change-Id: I5e967cd50b1b2aad1b5a30d3a053f6abfd6cd292
---
M templates/10.in-addr.arpa
M templates/wmnet
2 files changed, 73 insertions(+), 1 deletion(-)
Approvals:
RobH: Looks good to me, approved
jenkins-bot: Verified
diff --git a/templates/10.in-addr.arpa b/templates/10.in-addr.arpa
index ef90009..10dee4d 100644
--- a/templates/10.in-addr.arpa
+++ b/templates/10.in-addr.arpa
@@ -3090,6 +3090,43 @@
119 1H IN PTR sterope.mgmt.codfw.wmnet.
119 1H IN PTR WMF3298.mgmt.codfw.wmnet.
+121 1H IN PTR mc2001.mgmt.codfw.wmnet.
+121 1H IN PTR WMF5739.mgmt.codfw.wmnet.
+122 1H IN PTR mc2002.mgmt.codfw.wmnet.
+122 1H IN PTR WMF5740.mgmt.codfw.wmnet.
+123 1H IN PTR mc2003.mgmt.codfw.wmnet.
+123 1H IN PTR WMF5741.mgmt.codfw.wmnet.
+124 1H IN PTR mc2004.mgmt.codfw.wmnet.
+124 1H IN PTR WMF5742.mgmt.codfw.wmnet.
+125 1H IN PTR mc2005.mgmt.codfw.wmnet.
+125 1H IN PTR WMF5743.mgmt.codfw.wmnet.
+126 1H IN PTR mc2006.mgmt.codfw.wmnet.
+126 1H IN PTR WMF5744.mgmt.codfw.wmnet.
+127 1H IN PTR mc2007.mgmt.codfw.wmnet.
+127 1H IN PTR WMF5745.mgmt.codfw.wmnet.
+128 1H IN PTR mc2008.mgmt.codfw.wmnet.
+128 1H IN PTR WMF5746.mgmt.codfw.wmnet.
+129 1H IN PTR mc2009.mgmt.codfw.wmnet.
+129 1H IN PTR WMF5747.mgmt.codfw.wmnet.
+130 1H IN PTR mc2010.mgmt.codfw.wmnet.
+130 1H IN PTR WMF5748.mgmt.codfw.wmnet.
+131 1H IN PTR mc2011.mgmt.codfw.wmnet.
+131 1H IN PTR WMF5749.mgmt.codfw.wmnet.
+132 1H IN PTR mc2012.mgmt.codfw.wmnet.
+132 1H IN PTR WMF5750.mgmt.codfw.wmnet.
+133 1H IN PTR mc2013.mgmt.codfw.wmnet.
+133 1H IN PTR WMF5751.mgmt.codfw.wmnet.
+134 1H IN PTR mc2014.mgmt.codfw.wmnet.
+134 1H IN PTR WMF5752.mgmt.codfw.wmnet.
+135 1H IN PTR mc2015.mgmt.codfw.wmnet.
+135 1H IN PTR WMF5753.mgmt.codfw.wmnet.
+136 1H IN PTR mc2016.mgmt.codfw.wmnet.
+136 1H IN PTR WMF5754.mgmt.codfw.wmnet.
+137 1H IN PTR mc2017.mgmt.codfw.wmnet.
+137 1H IN PTR WMF5837.mgmt.codfw.wmnet.
+138 1H IN PTR mc2018.mgmt.codfw.wmnet.
+138 1H IN PTR WMF5838.mgmt.codfw.wmnet.
+
; 10.195.0.0/25 - frack.codfw subnets
$ORIGIN 0.195.{{ zonename }}.
diff --git a/templates/wmnet b/templates/wmnet
index 1352f5d..47b9f1b 100644
--- a/templates/wmnet
+++ b/templates/wmnet
@@ -2263,6 +2263,24 @@
lvs2004 1H IN A10.193.1.4
lvs2005 1H IN A10.193.1.5
lvs2006 1H IN A10.193.1.6
+mc2001 1H IN A10.193.2.121
+mc2002 1H IN A10.193.2.122
+mc2003 1H IN A10.193.2.123
+mc2004 1H IN A10.193.2.124
+mc2005 1H IN A10.193.2.125
+mc2006 1H IN A10.193.2.126
+mc2007 1H IN A10.193.2.127
+mc2008 1H IN A10.193.2.128
+mc2009 1H IN A10.193.2.129
+mc2010 1H IN A10.193.2.130
+mc2011 1H IN A10.193.2.131
+mc2012 1H IN A10.193.2.132
+mc2013 1H IN A10.193.2.133
+mc2014 1H IN A10.193.2.134
+mc2015 1H IN A10.193.2.135
+mc2016 1H IN A10.193.2.136
+mc2017 1H IN A10.193.2.137
+mc2018 1H IN A10.193.2.138
ms-be2001 1H IN A10.193.1.37
ms-be2002 1H IN A10.193.1.38
ms-be2003 1H IN A10.193.1.39
@@ -2553,7 +2571,6 @@
; Servers MGMT - Alphabetical by asset tag
-
WMF3298 1H IN A10.193.2.119
WMF3612 1H IN A10.193.1.235
WMF3613 1H IN A10.193.1.236
@@ -2622,6 +2639,24 @@
WMF5727 1H IN A10.193.1.242
WMF5732 1H IN A10.193.1.239
WMF5733 1H IN A10.193.1.240
+WMF5739 1H IN A10.193.2.121
+WMF5740 1H IN A10.193.2.122
+WMF5741 1H IN A10.193.2.123
+WMF5742 1H IN A10.193.2.124
+WMF5743 1H IN A10.193.2.125
+WMF5744 1H IN A10.193.2.126
+WMF5745 1H IN A10.193.2.127
+WMF5746 1H IN A10.193.2.128
+WMF5747 1H IN A10.193.2.129
+WMF5748 1H IN A10.193.2.130
+WMF5749 1H IN A10.193.2.131
+WMF5750 1H IN A10.193.2.132
+WMF5751 1H IN A10.193.2.133
+WMF5752 1H IN A10.193.2.134
+WMF5753 1H IN A10.193.2.135
+WMF5754 1H IN A10.193.2.136
+WMF5837 1H IN A10.193.2.137
+WMF5838 1H IN A10.193.2.138
WMF5755 1H IN A10.193.1.81
WMF5757 1H IN A10.193.1.243
WMF5815 1H IN A10.192.1.10
--
To view, visit https://gerrit.wikimedia.org/r/14
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I5e967cd50b1b2aad1b5a30d3a053f6abfd6cd292
Gerrit-PatchSet: 1
Gerrit-Project: operations/dns
Gerrit-Branch: master
Gerrit-Owner: RobH
[MediaWiki-commits] [Gerrit] Include php5-memcached on Trusty openstack-manager hosts - change (operations/puppet)
Andrew Bogott has submitted this change and it was merged.
Change subject: Include php5-memcached on Trusty openstack-manager hosts
..
Include php5-memcached on Trusty openstack-manager hosts
Change-Id: I77c726e26758548f26a4cd93aa11a14682bbfb4a
---
M modules/openstack/manifests/openstack-manager.pp
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Andrew Bogott: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/openstack/manifests/openstack-manager.pp
b/modules/openstack/manifests/openstack-manager.pp
index 8030c67..5868c07 100644
--- a/modules/openstack/manifests/openstack-manager.pp
+++ b/modules/openstack/manifests/openstack-manager.pp
@@ -29,7 +29,7 @@
ensure = present;
}
} else {
-package { [ 'php5-ldap', 'imagemagick', 'librsvg2-bin' ]:
+package { [ 'php5-ldap', 'imagemagick', 'librsvg2-bin',
'php5-memcached' ]:
ensure = present;
}
}
--
To view, visit https://gerrit.wikimedia.org/r/188893
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I77c726e26758548f26a4cd93aa11a14682bbfb4a
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott abog...@wikimedia.org
Gerrit-Reviewer: Andrew Bogott abog...@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: 2e0b191..1e4c3f8 - change (mediawiki/extensions)
Jenkins-mwext-sync has submitted this change and it was merged. Change subject: Syncronize VisualEditor: 2e0b191..1e4c3f8 .. Syncronize VisualEditor: 2e0b191..1e4c3f8 Change-Id: I1377835436d6bd040becf15cdf38307ee9a187e7 --- 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 2e0b191..1e4c3f8 16 --- a/VisualEditor +++ b/VisualEditor -Subproject commit 2e0b191dda1afd020dabb86a4a23d8976ad2fec9 +Subproject commit 1e4c3f86c656b41f83738f3662b38dd0b633a27f -- To view, visit https://gerrit.wikimedia.org/r/188894 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I1377835436d6bd040becf15cdf38307ee9a187e7 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] Allow tooltips without links. - change (mediawiki...GraphViz)
Welterkj has submitted this change and it was merged. Change subject: Allow tooltips without links. .. Allow tooltips without links. DOT and HTML allow tooltips without URLs but ImageMap does not. Detect the case of a DOT tooltip without a URL and supply a dummy URL instead. Change-Id: Iae1bc04719b61c4d2baa1424e20b7bc4e9bf6683 --- M GraphViz_body.php M RELEASE-NOTES.md 2 files changed, 10 insertions(+), 0 deletions(-) Approvals: Welterkj: Verified; Looks good to me, approved diff --git a/GraphViz_body.php b/GraphViz_body.php index cf091b4..0f9b1f1 100644 --- a/GraphViz_body.php +++ b/GraphViz_body.php @@ -1496,6 +1496,15 @@ // remove map ending tag from map file contents $map = str_replace( '/map', '', $map ); + // DOT and HTML allow tooltips without URLs but ImageMap does not. + // We want to allow tooltips without URLs (hrefs) so add a dummy URL if it is missing. + // ImageMap accepts the URL http://; so use that as the dummy href. + + // detect missing hrefs and add them as needed + $map = preg_replace( '~id=([^]+)[\s\t]+title=([^]+)~', + 'id=$1 href=http://; title=$2', + $map ); + // add enclosing square brackets to URLs that don't have them and add the title $map = preg_replace( '~href=([^[][^]+).+title=([^]+)~', 'href=[$1 $2]', diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md index 83cb2b5..d92ef60 100644 --- a/RELEASE-NOTES.md +++ b/RELEASE-NOTES.md @@ -2,6 +2,7 @@ ## GraphViz 1.6.0 ## (not released yet ) * Make the category pages created by this extension optional, non-empty and do not tag “dummy” images as belonging to a category. +* Allow DOT tooltips without URLs. ## GraphViz 1.5.1 ## (2015-1-24) * Fix for [bug T75073](https://phabricator.wikimedia.org/T75073). -- To view, visit https://gerrit.wikimedia.org/r/16 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iae1bc04719b61c4d2baa1424e20b7bc4e9bf6683 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/GraphViz Gerrit-Branch: master Gerrit-Owner: Welterkj welterkj+...@gmail.com Gerrit-Reviewer: Welterkj welterkj+...@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] Offset-id should default to end-of-rows when reverse - change (mediawiki...Flow)
jenkins-bot has submitted this change and it was merged.
Change subject: Offset-id should default to end-of-rows when reverse
..
Offset-id should default to end-of-rows when reverse
With offset-id=null and offset-dir=fwd, it makes total sense to
default to 0 (the beginning of the list of rows)
However, when offset-dir=rev, we would expect to see the last
rows, starting from last-limit up to absolute last.
Change-Id: Id0f84f563ef91d14527959ea34eb03c523eea78a
---
M includes/Data/Index/FeatureIndex.php
1 file changed, 9 insertions(+), 1 deletion(-)
Approvals:
Mattflaschen: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/Data/Index/FeatureIndex.php
b/includes/Data/Index/FeatureIndex.php
index e64b8cf..8d56cfd 100644
--- a/includes/Data/Index/FeatureIndex.php
+++ b/includes/Data/Index/FeatureIndex.php
@@ -166,7 +166,10 @@
protected function getOffsetLimit( $rows, $options ) {
$limit = isset( $options['limit'] ) ? $options['limit'] :
$this-getLimit();
- if ( !isset( $options['offset-id'] ) ) {
+ // not using isset because offset-id could also just be null
(in which
+ // case we'll still not want to fallback to 0, because
offset-dir may
+ // need to to start from the end of the rows)
+ if ( !array_key_exists( 'offset-id', $options ) ) {
$offset = isset( $options['offset'] ) ?
$options['offset'] : 0;
return array( $offset, $limit );
}
@@ -184,6 +187,11 @@
$dir = 'rev';
}
+ if ( $offsetId === null ) {
+ $offset = $dir === 'fwd' ? 0 : count( $rows ) - $limit;
+ return array( $offset, $limit );
+ }
+
$offset = $this-getOffsetFromKey( $rows, $offsetId );
$includeOffset = isset( $options['include-offset'] )
$options['include-offset'];
if ( $dir === 'fwd' ) {
--
To view, visit https://gerrit.wikimedia.org/r/187307
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Id0f84f563ef91d14527959ea34eb03c523eea78a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: Matthias Mullie mmul...@wikimedia.org
Gerrit-Reviewer: Mattflaschen mflasc...@wikimedia.org
Gerrit-Reviewer: Matthias Mullie mmul...@wikimedia.org
Gerrit-Reviewer: SG shah...@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] Syncronize VisualEditor: 2e0b191..1e4c3f8 - change (mediawiki/extensions)
Jenkins-mwext-sync has uploaded a new change for review. https://gerrit.wikimedia.org/r/188894 Change subject: Syncronize VisualEditor: 2e0b191..1e4c3f8 .. Syncronize VisualEditor: 2e0b191..1e4c3f8 Change-Id: I1377835436d6bd040becf15cdf38307ee9a187e7 --- M VisualEditor 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions refs/changes/94/188894/1 diff --git a/VisualEditor b/VisualEditor index 2e0b191..1e4c3f8 16 --- a/VisualEditor +++ b/VisualEditor -Subproject commit 2e0b191dda1afd020dabb86a4a23d8976ad2fec9 +Subproject commit 1e4c3f86c656b41f83738f3662b38dd0b633a27f -- To view, visit https://gerrit.wikimedia.org/r/188894 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I1377835436d6bd040becf15cdf38307ee9a187e7 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] Remove useless mixinClass call from MWCategoryItemWidget - change (mediawiki...VisualEditor)
jenkins-bot has submitted this change and it was merged. Change subject: Remove useless mixinClass call from MWCategoryItemWidget .. Remove useless mixinClass call from MWCategoryItemWidget The parent (ButtonWidget) already mixes in IndicatorElement. Change-Id: I49fd72514d9b177eaca2b0295192384bca9e0f97 --- M modules/ve-mw/ui/widgets/ve.ui.MWCategoryItemWidget.js 1 file changed, 0 insertions(+), 2 deletions(-) Approvals: Krinkle: Looks good to me, approved jenkins-bot: Verified diff --git a/modules/ve-mw/ui/widgets/ve.ui.MWCategoryItemWidget.js b/modules/ve-mw/ui/widgets/ve.ui.MWCategoryItemWidget.js index d854be7..ebdeb0f 100644 --- a/modules/ve-mw/ui/widgets/ve.ui.MWCategoryItemWidget.js +++ b/modules/ve-mw/ui/widgets/ve.ui.MWCategoryItemWidget.js @@ -57,8 +57,6 @@ OO.inheritClass( ve.ui.MWCategoryItemWidget, OO.ui.ButtonWidget ); -OO.mixinClass( ve.ui.MWCategoryItemWidget, OO.ui.IndicatorElement ); - /* Events */ /** -- To view, visit https://gerrit.wikimedia.org/r/15 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I49fd72514d9b177eaca2b0295192384bca9e0f97 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/VisualEditor Gerrit-Branch: master Gerrit-Owner: Catrope roan.katt...@gmail.com 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] Include php5-memcached on Trusty openstack-manager hosts - change (operations/puppet)
Andrew Bogott has uploaded a new change for review.
https://gerrit.wikimedia.org/r/188893
Change subject: Include php5-memcached on Trusty openstack-manager hosts
..
Include php5-memcached on Trusty openstack-manager hosts
Change-Id: I77c726e26758548f26a4cd93aa11a14682bbfb4a
---
M modules/openstack/manifests/openstack-manager.pp
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/93/188893/1
diff --git a/modules/openstack/manifests/openstack-manager.pp
b/modules/openstack/manifests/openstack-manager.pp
index 8030c67..5868c07 100644
--- a/modules/openstack/manifests/openstack-manager.pp
+++ b/modules/openstack/manifests/openstack-manager.pp
@@ -29,7 +29,7 @@
ensure = present;
}
} else {
-package { [ 'php5-ldap', 'imagemagick', 'librsvg2-bin' ]:
+package { [ 'php5-ldap', 'imagemagick', 'librsvg2-bin',
'php5-memcached' ]:
ensure = present;
}
}
--
To view, visit https://gerrit.wikimedia.org/r/188893
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I77c726e26758548f26a4cd93aa11a14682bbfb4a
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott abog...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
