[MediaWiki-commits] [Gerrit] Test to check that events are not trapped after the viewer i... - change (mediawiki...MultimediaViewer)
jenkins-bot has submitted this change and it was merged.
Change subject: Test to check that events are not trapped after the viewer is
closed
..
Test to check that events are not trapped after the viewer is closed
Also fixes overeager preventDefault in the interface
Change-Id: I5e3b05c8546e24772016b72343e241caa2e6ef0e
Mingle: https://wikimedia.mingle.thoughtworks.com/projects/multimedia/cards/274
---
M resources/mmv/mmv.lightboxinterface.js
M tests/qunit/mmv/mmv.test.js
2 files changed, 70 insertions(+), 2 deletions(-)
Approvals:
Gilles: Looks good to me, approved
jenkins-bot: Verified
diff --git a/resources/mmv/mmv.lightboxinterface.js
b/resources/mmv/mmv.lightboxinterface.js
index 08875ca..d7c5d8b 100644
--- a/resources/mmv/mmv.lightboxinterface.js
+++ b/resources/mmv/mmv.lightboxinterface.js
@@ -390,8 +390,6 @@
return;
}
- e.preventDefault();
-
switch ( e.which ) {
case 37:
// Left arrow
@@ -400,6 +398,7 @@
} else {
this.viewer.prevImage();
}
+ e.preventDefault();
break;
case 39:
// Right arrow
@@ -408,6 +407,7 @@
} else {
this.viewer.nextImage();
}
+ e.preventDefault();
break;
}
};
diff --git a/tests/qunit/mmv/mmv.test.js b/tests/qunit/mmv/mmv.test.js
index 1b2f0db..c986e90 100644
--- a/tests/qunit/mmv/mmv.test.js
+++ b/tests/qunit/mmv/mmv.test.js
@@ -369,4 +369,72 @@
cleanNewViewer();
} );
+
+ QUnit.test( 'Events are not trapped after the viewer is closed', 0,
function( assert ) {
+ var i, j, k, eventParameters,
+ viewer = new mw.mmv.MultimediaViewer(),
+ $document = $( document ),
+ $qf = $( '#qunit-fixture' ),
+ eventTypes = [ 'keydown', 'keyup', 'keypress', 'click',
'mousedown', 'mouseup' ],
+ modifiers = [ undefined, 'altKey', 'ctrlKey',
'shiftKey', 'metaKey' ];
+
+ viewer.imageProvider.get = function() { return
$.Deferred().reject(); };
+ viewer.imageInfoProvider.get = function() { return
$.Deferred().reject(); };
+ viewer.thumbnailInfoProvider.get = function() { return
$.Deferred().reject(); };
+ viewer.imageUsageProvider.get = function() { return
$.Deferred().reject(); };
+ viewer.fileRepoInfoProvider.get = function() { return
$.Deferred().reject(); };
+
+ viewer.preloadFullscreenThumbnail = $.noop;
+ viewer.initWithThumbs( [] );
+
+ viewer.loadImage( { filePageTitle : new mw.Title(
'File:Stuff.jpg' ),
+ thumbnail : new mw.mmv.model.Thumbnail( 'foo', 10, 10 )
},
+ new Image() );
+
+ viewer.lightbox.iface.$closeButton.click();
+
+ function eventHandler ( e ) {
+ if ( e.isDefaultPrevented() ) {
+ assert.ok( false, 'Event was incorrectly
trapped : ' + e.which );
+ }
+
+ e.preventDefault();
+
+ // Wait for the last event
+ if ( e.which === 32 e.type === 'mouseup' ) {
+ $document.off( '.mmvtest' );
+ QUnit.start();
+ }
+ }
+
+ // Events are async, we need to wait for the last event to be
caught before ending the test
+ QUnit.stop();
+
+ for ( j = 0; j eventTypes.length; j++ ) {
+ $document.on( eventTypes[ j ] + '.mmvtest',
eventHandler );
+
+ eventloop:
+ for ( i = 0; i 256; i++ ) {
+ // Save some time by not testing unlikely
values for mouse events
+ if ( i 32 ) {
+ switch ( eventTypes[ j ] ) {
+ case 'click':
+ case 'mousedown':
+ case 'mouseup':
+ break eventloop;
+ }
+ }
+
+ for ( k = 0; k modifiers.length; k++ ) {
+ eventParameters = { which : i };
+
[MediaWiki-commits] [Gerrit] Added missing space to error message - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged.
Change subject: Added missing space to error message
..
Added missing space to error message
Change-Id: I9c2feda19b6c959e125af272c0e64b646584769d
---
M includes/PoolCounter.php
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Ori.livneh: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/PoolCounter.php b/includes/PoolCounter.php
index b4f14c2..3d4c464 100644
--- a/includes/PoolCounter.php
+++ b/includes/PoolCounter.php
@@ -186,7 +186,7 @@
* @return void
*/
function logError( $status ) {
- wfDebugLog( 'poolcounter', Pool key '{$this-key}':
+ wfDebugLog( 'poolcounter', Pool key '{$this-key}':
. $status-getMessage()-inLanguage( 'en'
)-useDatabase( false )-text() );
}
--
To view, visit https://gerrit.wikimedia.org/r/116724
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I9c2feda19b6c959e125af272c0e64b646584769d
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz asch...@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] geoip.inc.vcl: don't increment loop counter twice - change (operations/puppet)
Faidon Liambotis has submitted this change and it was merged.
Change subject: geoip.inc.vcl: don't increment loop counter twice
..
geoip.inc.vcl: don't increment loop counter twice
Fixes a bug introduced in I0038f675f.
Change-Id: Ic71910b12b12d041f075d19ae215efbfc9cc1bd9
---
M templates/varnish/geoip.inc.vcl.erb
1 file changed, 7 insertions(+), 14 deletions(-)
Approvals:
Faidon Liambotis: Looks good to me, approved
jenkins-bot: Verified
diff --git a/templates/varnish/geoip.inc.vcl.erb
b/templates/varnish/geoip.inc.vcl.erb
index b7c9986..380008b 100644
--- a/templates/varnish/geoip.inc.vcl.erb
+++ b/templates/varnish/geoip.inc.vcl.erb
@@ -67,23 +67,16 @@
}
/*
-* Make a string safe to use as a cookie value in a Set-Cookie header by
-* replacing characters that are disallowed by RFC 6265 with
underscores.
-* Note: we could do better by using the standard iconv library to
-* convert from ISO-8859-1 to ASCII//TRANSLIT, so that e.g. Genève
-* becomes Geneve instead of Gen_ve, but I'm unsure as to whether
-* it's worth the complexity/performance hit.
+* Make a string safe to use as a cookie value in a Set-Cookie header
+* by replacing CTLs, DEL, 8-bit characters, space, double-quote,
+* comma, semicolon, and backslash with an underscore.
*/
char *
geo_sanitize_for_cookie(char *string) {
- if (string) {
- char *ptr;
- for (ptr = string; *ptr; ptr++) {
- /* This disallows CTLs, DEL, 8-bit chars, space,
-* double-quote, comma, semicolon, and
backslash */
- if(*ptr 0x21 || *ptr 0x7E ||
strchr(\,;\\, *ptr))
- *ptr = '_';
- ptr++;
+ char *ptr;
+ for (ptr = string; ptr *ptr; ptr++) {
+ if (*ptr 0x21 || *ptr 0x7E || strchr(\,;\\,
*ptr)) {
+ *ptr = '_';
}
}
return string;
--
To view, visit https://gerrit.wikimedia.org/r/116469
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ic71910b12b12d041f075d19ae215efbfc9cc1bd9
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ori.livneh o...@wikimedia.org
Gerrit-Reviewer: BBlack bbl...@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] Enable GeoIP cookie on Labs - change (operations/puppet)
Faidon Liambotis has submitted this change and it was merged.
Change subject: Enable GeoIP cookie on Labs
..
Enable GeoIP cookie on Labs
Change-Id: Id13f23cef9cbf6d5f368d9a47d761919f1f6b431
---
M manifests/role/cache.pp
1 file changed, 3 insertions(+), 1 deletion(-)
Approvals:
Faidon Liambotis: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/role/cache.pp b/manifests/role/cache.pp
index 1a4cb3c..351331c 100644
--- a/manifests/role/cache.pp
+++ b/manifests/role/cache.pp
@@ -645,6 +645,8 @@
wikimedia_networks = $wikimedia_networks,
}
+$text_enable_geo = ( $::realm == 'labs' )
+
varnish::instance { text-frontend:
name = frontend,
vcl = text-frontend,
@@ -674,7 +676,7 @@
'weight' = $backend_weight,
}],
cluster_options = {
-'enable_geoiplookup' = false,
+'enable_geoiplookup' = $text_enable_geo,
},
}
--
To view, visit https://gerrit.wikimedia.org/r/116719
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Id13f23cef9cbf6d5f368d9a47d761919f1f6b431
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ori.livneh o...@wikimedia.org
Gerrit-Reviewer: Faidon Liambotis fai...@wikimedia.org
Gerrit-Reviewer: Hashar has...@free.fr
Gerrit-Reviewer: Ori.livneh o...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Updated Ruby version from 2.1.0 to 2.1.1 - change (mediawiki...Wikibase)
jenkins-bot has submitted this change and it was merged. Change subject: Updated Ruby version from 2.1.0 to 2.1.1 .. Updated Ruby version from 2.1.0 to 2.1.1 Bug: 62152 Change-Id: I59e2dd3124efc86a0464f45a2229675701f97283 --- M tests/browser/Gemfile 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Tobias Gritschacher: Looks good to me, approved WikidataJenkins: Verified jenkins-bot: Verified diff --git a/tests/browser/Gemfile b/tests/browser/Gemfile index a85dae3..6d869ab 100644 --- a/tests/browser/Gemfile +++ b/tests/browser/Gemfile @@ -1,4 +1,4 @@ -#ruby=ruby-2.1.0 +#ruby=ruby-2.1.1 #ruby-gemset=Wikibase source https://rubygems.org; -- To view, visit https://gerrit.wikimedia.org/r/116713 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I59e2dd3124efc86a0464f45a2229675701f97283 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Wikibase Gerrit-Branch: master Gerrit-Owner: Vikassy vikasyaligar...@gmail.com Gerrit-Reviewer: Tobias Gritschacher tobias.gritschac...@wikimedia.de Gerrit-Reviewer: WikidataJenkins wikidata-servi...@wikimedia.de Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] contint: slaves now have openjdk-{6, 7}-jdk - change (operations/puppet)
Alexandros Kosiaris has submitted this change and it was merged.
Change subject: contint: slaves now have openjdk-{6,7}-jdk
..
contint: slaves now have openjdk-{6,7}-jdk
analytics/kraken needs the jdk to build (javac).
Change-Id: Ibda08e5d7c82433a0df079cfcbf4422b32844229
---
M modules/contint/manifests/packages.pp
1 file changed, 4 insertions(+), 4 deletions(-)
Approvals:
Matanya: Looks good to me, but someone else must approve
Alexandros Kosiaris: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/contint/manifests/packages.pp
b/modules/contint/manifests/packages.pp
index 8a3b6d2..f4d7f09 100644
--- a/modules/contint/manifests/packages.pp
+++ b/modules/contint/manifests/packages.pp
@@ -13,10 +13,10 @@
# applications.
# (openjdk is the default distribution for the java define.
# The java define is found in modules/java/manifests/init.pp )
-package { 'openjdk-6-jre':
-ensure = present,
-}
-package { 'openjdk-7-jre':
+package { [
+'openjdk-6-jdk',
+'openjdk-7-jdk',
+]:
ensure = present,
}
--
To view, visit https://gerrit.wikimedia.org/r/114619
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ibda08e5d7c82433a0df079cfcbf4422b32844229
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Hashar has...@free.fr
Gerrit-Reviewer: Alexandros Kosiaris akosia...@wikimedia.org
Gerrit-Reviewer: ArielGlenn ar...@wikimedia.org
Gerrit-Reviewer: Faidon Liambotis fai...@wikimedia.org
Gerrit-Reviewer: Hashar has...@free.fr
Gerrit-Reviewer: Mark Bergsma m...@wikimedia.org
Gerrit-Reviewer: Matanya mata...@foss.co.il
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Compacting the interlanguage links with the ULS - change (mediawiki...UniversalLanguageSelector)
Pginer has uploaded a new change for review.
https://gerrit.wikimedia.org/r/116726
Change subject: Compacting the interlanguage links with the ULS
..
Compacting the interlanguage links with the ULS
Change-Id: I109bfb10f6181b6408aab170db5e8ca32493d657
---
M Resources.php
M UniversalLanguageSelector.hooks.php
M UniversalLanguageSelector.i18n.php
M UniversalLanguageSelector.php
M i18n/en.json
M i18n/qqq.json
A resources/css/ext.uls.compactlinks.css
A resources/images/compact-links-ltr.png
A resources/images/compact-links-ltr.svg
A resources/images/compact-links-rtl.png
A resources/images/compact-links-rtl.svg
A resources/js/ext.uls.compactlinks.js
12 files changed, 313 insertions(+), 3 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/UniversalLanguageSelector
refs/changes/26/116726/1
diff --git a/Resources.php b/Resources.php
index cb01d80..1d07332 100644
--- a/Resources.php
+++ b/Resources.php
@@ -146,6 +146,17 @@
),
) + $resourcePaths;
+$wgResourceModules['ext.uls.compactlinks'] = array(
+ 'scripts' = 'resources/js/ext.uls.compactlinks.js',
+ 'styles' = 'resources/css/ext.uls.compactlinks.css',
+ 'dependencies' = array(
+ 'ext.uls.mediawiki',
+ 'ext.uls.init',
+ 'jquery.uls.compact',
+ 'mediawiki.ui.button',
+ ),
+) + $resourcePaths;
+
$wgResourceModules['ext.uls.webfonts'] = array(
'scripts' = 'resources/js/ext.uls.webfonts.js',
'dependencies' = array(
diff --git a/UniversalLanguageSelector.hooks.php
b/UniversalLanguageSelector.hooks.php
index 9315718..f740f52 100644
--- a/UniversalLanguageSelector.hooks.php
+++ b/UniversalLanguageSelector.hooks.php
@@ -62,6 +62,13 @@
// If the extension is enabled, basic features (API, language
data) available.
$out-addModules( 'ext.uls.init' );
+ // If compact ULS beta feature is enabled
+ if ( class_exists( 'BetaFeatures' )
+ BetaFeatures::isFeatureEnabled( $out-getUser(),
'uls-compact-links' )
+ ) {
+ $out-addModules( 'ext.uls.compactlinks' );
+ }
+
if ( is_string( $wgULSGeoService ) ) {
$out-addModules( 'ext.uls.geoclient' );
}
@@ -327,6 +334,20 @@
return true;
}
+ public static function onGetBetaFeaturePreferences( $user, $prefs ) {
+ global $wgExtensionAssetsPath;
+ $prefs['uls-compact-links'] = array(
+ 'label-message' = 'uls-betafeature-label',
+ 'desc-message' = 'uls-betafeature-desc',
+ 'screenshot' = $wgExtensionAssetsPath .
+
'/UniversalLanguageSelector/resources/images/compact-links-ltr.png',
+ 'info-link' =
+
'https://www.mediawiki.org/wiki/Universal_Language_Selector/Design/Interlanguage_links',
+ 'discussion-link' =
+
'https://www.mediawiki.org/wiki/Talk:Universal_Language_Selector/Design/Interlanguage_links',
+ );
+ }
+
/**
* Hook: SkinTemplateOutputPageBeforeExec
* @param Skin $skin
diff --git a/UniversalLanguageSelector.i18n.php
b/UniversalLanguageSelector.i18n.php
index c12250d..5941686 100644
--- a/UniversalLanguageSelector.i18n.php
+++ b/UniversalLanguageSelector.i18n.php
@@ -26,6 +26,7 @@
* @author Amire80
* @author Nike
* @author Kunal Mehta
+ * @author Niharika
*/
$messages['en'] = array(
'UniversalLanguageSelector' = 'Universal Language Selector',
@@ -36,6 +37,8 @@
'ext-uls-select-language-settings-icon-tooltip' = 'Language settings',
'ext-uls-undo-language-tooltip-text' = 'Language changed from $1',
'ext-uls-language-settings-preferences-link' = 'More language
settings',
+ 'uls-betafeature-label' = 'Compacting interlanguage links',
+ 'uls-betafeature-desc' = 'Displays a shorter version of the language
list with the languages that are more relevant to you.',
);
/** Message documentation (Message documentation)
@@ -58,6 +61,8 @@
'ext-uls-undo-language-tooltip-text' = 'Text for the tooltip appearing
when language is changed. Parameters:
* $1 - the previous language acronym',
'ext-uls-language-settings-preferences-link' = 'Text for the link
showin in user preference screen',
+ 'uls-betafeature-label' = 'Title for the compact interlanguage links
beta feature',
+ 'uls-betafeature-desc' = 'Description for the compact interlanguage
links beta feature'
);
/** Arabic (العربية)
diff --git a/UniversalLanguageSelector.php b/UniversalLanguageSelector.php
index 85178ac..7f9ec45 100644
--- a/UniversalLanguageSelector.php
+++ b/UniversalLanguageSelector.php
@@
[MediaWiki-commits] [Gerrit] Compacting the interlanguage links with the ULS - change (mediawiki...UniversalLanguageSelector)
jenkins-bot has submitted this change and it was merged.
Change subject: Compacting the interlanguage links with the ULS
..
Compacting the interlanguage links with the ULS
Displays a shorter version of the language list with the languages that are
more relevant to you.
More info at
https://www.mediawiki.org/wiki/Universal_Language_Selector/Design/Interlanguage_links
Due to a problem with duplicate patchsets we had to create a new one.
The history and info on code and security revisions is available at
https://gerrit.wikimedia.org/r/#/c/104793/
Change-Id: I109bfb10f6181b6408aab170db5e8ca32493d657
---
M Resources.php
M UniversalLanguageSelector.hooks.php
M UniversalLanguageSelector.i18n.php
M UniversalLanguageSelector.php
M i18n/en.json
M i18n/qqq.json
A resources/css/ext.uls.compactlinks.css
A resources/images/compact-links-ltr.png
A resources/images/compact-links-ltr.svg
A resources/images/compact-links-rtl.png
A resources/images/compact-links-rtl.svg
A resources/js/ext.uls.compactlinks.js
12 files changed, 313 insertions(+), 3 deletions(-)
Approvals:
KartikMistry: Looks good to me, but someone else must approve
Pginer: Looks good to me, approved
jenkins-bot: Verified
diff --git a/Resources.php b/Resources.php
index cb01d80..1d07332 100644
--- a/Resources.php
+++ b/Resources.php
@@ -146,6 +146,17 @@
),
) + $resourcePaths;
+$wgResourceModules['ext.uls.compactlinks'] = array(
+ 'scripts' = 'resources/js/ext.uls.compactlinks.js',
+ 'styles' = 'resources/css/ext.uls.compactlinks.css',
+ 'dependencies' = array(
+ 'ext.uls.mediawiki',
+ 'ext.uls.init',
+ 'jquery.uls.compact',
+ 'mediawiki.ui.button',
+ ),
+) + $resourcePaths;
+
$wgResourceModules['ext.uls.webfonts'] = array(
'scripts' = 'resources/js/ext.uls.webfonts.js',
'dependencies' = array(
diff --git a/UniversalLanguageSelector.hooks.php
b/UniversalLanguageSelector.hooks.php
index 9315718..f740f52 100644
--- a/UniversalLanguageSelector.hooks.php
+++ b/UniversalLanguageSelector.hooks.php
@@ -62,6 +62,13 @@
// If the extension is enabled, basic features (API, language
data) available.
$out-addModules( 'ext.uls.init' );
+ // If compact ULS beta feature is enabled
+ if ( class_exists( 'BetaFeatures' )
+ BetaFeatures::isFeatureEnabled( $out-getUser(),
'uls-compact-links' )
+ ) {
+ $out-addModules( 'ext.uls.compactlinks' );
+ }
+
if ( is_string( $wgULSGeoService ) ) {
$out-addModules( 'ext.uls.geoclient' );
}
@@ -327,6 +334,20 @@
return true;
}
+ public static function onGetBetaFeaturePreferences( $user, $prefs ) {
+ global $wgExtensionAssetsPath;
+ $prefs['uls-compact-links'] = array(
+ 'label-message' = 'uls-betafeature-label',
+ 'desc-message' = 'uls-betafeature-desc',
+ 'screenshot' = $wgExtensionAssetsPath .
+
'/UniversalLanguageSelector/resources/images/compact-links-ltr.png',
+ 'info-link' =
+
'https://www.mediawiki.org/wiki/Universal_Language_Selector/Design/Interlanguage_links',
+ 'discussion-link' =
+
'https://www.mediawiki.org/wiki/Talk:Universal_Language_Selector/Design/Interlanguage_links',
+ );
+ }
+
/**
* Hook: SkinTemplateOutputPageBeforeExec
* @param Skin $skin
diff --git a/UniversalLanguageSelector.i18n.php
b/UniversalLanguageSelector.i18n.php
index c12250d..5941686 100644
--- a/UniversalLanguageSelector.i18n.php
+++ b/UniversalLanguageSelector.i18n.php
@@ -26,6 +26,7 @@
* @author Amire80
* @author Nike
* @author Kunal Mehta
+ * @author Niharika
*/
$messages['en'] = array(
'UniversalLanguageSelector' = 'Universal Language Selector',
@@ -36,6 +37,8 @@
'ext-uls-select-language-settings-icon-tooltip' = 'Language settings',
'ext-uls-undo-language-tooltip-text' = 'Language changed from $1',
'ext-uls-language-settings-preferences-link' = 'More language
settings',
+ 'uls-betafeature-label' = 'Compacting interlanguage links',
+ 'uls-betafeature-desc' = 'Displays a shorter version of the language
list with the languages that are more relevant to you.',
);
/** Message documentation (Message documentation)
@@ -58,6 +61,8 @@
'ext-uls-undo-language-tooltip-text' = 'Text for the tooltip appearing
when language is changed. Parameters:
* $1 - the previous language acronym',
'ext-uls-language-settings-preferences-link' = 'Text for the link
showin in user preference screen',
+
[MediaWiki-commits] [Gerrit] Add upper bound to diff version range - change (mediawiki...Wikibase)
Jeroen De Dauw has uploaded a new change for review.
https://gerrit.wikimedia.org/r/116728
Change subject: Add upper bound to diff version range
..
Add upper bound to diff version range
Change-Id: I711003e1c0f3c24c3e782c6b60a29d057edaf695
---
M composer.json
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/28/116728/1
diff --git a/composer.json b/composer.json
index 042405e..af02f0a 100644
--- a/composer.json
+++ b/composer.json
@@ -35,7 +35,7 @@
data-values/javascript: ~0.3.0,
data-values/value-view: ~0.3.3,
wikibase/data-model: ~0.6.0,
- diff/diff: =0.9,
+ diff/diff: ~0.9,
wikibase/easyrdf_lite: *
},
autoload: {
--
To view, visit https://gerrit.wikimedia.org/r/116728
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I711003e1c0f3c24c3e782c6b60a29d057edaf695
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Jeroen De Dauw jeroended...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Specify version of easyrdf to use - change (mediawiki...Wikibase)
Jeroen De Dauw has uploaded a new change for review.
https://gerrit.wikimedia.org/r/116729
Change subject: Specify version of easyrdf to use
..
Specify version of easyrdf to use
Change-Id: Ib0bcf67d2104f8e09f939177cc2caa53fa75223b
---
M composer.json
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/29/116729/1
diff --git a/composer.json b/composer.json
index 042405e..c4a413d 100644
--- a/composer.json
+++ b/composer.json
@@ -36,7 +36,7 @@
data-values/value-view: ~0.3.3,
wikibase/data-model: ~0.6.0,
diff/diff: =0.9,
- wikibase/easyrdf_lite: *
+ wikibase/easyrdf_lite: ~0.8.1
},
autoload: {
files : [
--
To view, visit https://gerrit.wikimedia.org/r/116729
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib0bcf67d2104f8e09f939177cc2caa53fa75223b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Jeroen De Dauw jeroended...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add upper bound to diff version range - change (mediawiki...Wikibase)
jenkins-bot has submitted this change and it was merged.
Change subject: Add upper bound to diff version range
..
Add upper bound to diff version range
Change-Id: I711003e1c0f3c24c3e782c6b60a29d057edaf695
---
M composer.json
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Hoo man: Looks good to me, approved
jenkins-bot: Verified
diff --git a/composer.json b/composer.json
index 042405e..af02f0a 100644
--- a/composer.json
+++ b/composer.json
@@ -35,7 +35,7 @@
data-values/javascript: ~0.3.0,
data-values/value-view: ~0.3.3,
wikibase/data-model: ~0.6.0,
- diff/diff: =0.9,
+ diff/diff: ~0.9,
wikibase/easyrdf_lite: *
},
autoload: {
--
To view, visit https://gerrit.wikimedia.org/r/116728
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I711003e1c0f3c24c3e782c6b60a29d057edaf695
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Jeroen De Dauw jeroended...@gmail.com
Gerrit-Reviewer: Hoo man h...@online.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] Specify version of easyrdf to use - change (mediawiki...Wikibase)
Jeroen De Dauw has submitted this change and it was merged.
Change subject: Specify version of easyrdf to use
..
Specify version of easyrdf to use
Change-Id: Ib0bcf67d2104f8e09f939177cc2caa53fa75223b
---
M composer.json
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Jeroen De Dauw: Verified; Looks good to me, approved
jenkins-bot: Checked
diff --git a/composer.json b/composer.json
index af02f0a..feab4b8 100644
--- a/composer.json
+++ b/composer.json
@@ -36,7 +36,7 @@
data-values/value-view: ~0.3.3,
wikibase/data-model: ~0.6.0,
diff/diff: ~0.9,
- wikibase/easyrdf_lite: *
+ wikibase/easyrdf_lite: ~0.8.1
},
autoload: {
files : [
--
To view, visit https://gerrit.wikimedia.org/r/116729
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib0bcf67d2104f8e09f939177cc2caa53fa75223b
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Jeroen De Dauw jeroended...@gmail.com
Gerrit-Reviewer: Hoo man h...@online.de
Gerrit-Reviewer: Jeroen De Dauw jeroended...@gmail.com
Gerrit-Reviewer: WikidataJenkins wikidata-servi...@wikimedia.de
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add site by navigation id feature to SiteList - change (mediawiki/core)
Bene has uploaded a new change for review.
https://gerrit.wikimedia.org/r/116730
Change subject: Add site by navigation id feature to SiteList
..
Add site by navigation id feature to SiteList
There are some places especially in Wikibase where we need to get a site
based on the local navigation id. This feature really should go into core.
Change-Id: I02eb1673bea58f79d02db2e1ecd21cbc5b8cb0d1
---
M includes/site/SiteList.php
M tests/phpunit/includes/site/SiteListTest.php
2 files changed, 103 insertions(+), 10 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/30/116730/1
diff --git a/includes/site/SiteList.php b/includes/site/SiteList.php
index b0d1f95..c086aa2 100644
--- a/includes/site/SiteList.php
+++ b/includes/site/SiteList.php
@@ -42,9 +42,19 @@
*
* @since 1.21
*
-* @var array of string
+* @var array of integer
*/
protected $byGlobalId = array();
+
+ /**
+* Navigational site identifiers alias inter-language prefixes
+* pointing to their sites offset value.
+*
+* @since 1.23
+*
+* @var array of integer
+*/
+ protected $byNavigationId = array();
/**
* @see GenericArrayObject::getObjectType
@@ -75,6 +85,11 @@
$this-byGlobalId[$site-getGlobalId()] = $index;
$this-byInternalId[$site-getInternalId()] = $index;
+ $ids = $site-getNavigationIds();
+ foreach ( $ids as $navId ) {
+ $this-byNavigationId[$navId] = $index;
+ }
+
return true;
}
@@ -94,6 +109,11 @@
unset( $this-byGlobalId[$site-getGlobalId()] );
unset( $this-byInternalId[$site-getInternalId()] );
+
+ $ids = $site-getNavigationIds();
+ foreach ( $ids as $navId ) {
+ unset( $this-byNavigationId[$navId] );
+ }
}
parent::offsetUnset( $index );
@@ -197,6 +217,43 @@
}
/**
+* Returns if the list contains the site with the provided navigational
site id.
+*
+* @param string $id
+*
+* @return boolean
+*/
+ public function hasNavigationId( $id ) {
+ return array_key_exists( $id, $this-byNavigationId );
+ }
+
+ /**
+* Returns the Site with the provided navigational site id.
+* The site needs to exist, so if not sure, call has first.
+*
+* @since 1.23
+*
+* @param string $id
+*
+* @return Site
+*/
+ public function getSiteByNavigationId( $id ) {
+ return $this-offsetGet( $this-byNavigationId[$id] );
+ }
+
+ /**
+* Removes the site with the specified navigational site id.
+* The site needs to exist, so if not sure, call has first.
+*
+* @since 1.23
+*
+* @param string $id
+*/
+ public function removeSiteByNavigationId( $id ) {
+ $this-offsetUnset( $this-byNavigationId[$id] );
+ }
+
+ /**
* Sets a site in the list. If the site was not there,
* it will be added. If it was, it will be updated.
*
diff --git a/tests/phpunit/includes/site/SiteListTest.php
b/tests/phpunit/includes/site/SiteListTest.php
index 8af2fc1..b41f647 100644
--- a/tests/phpunit/includes/site/SiteListTest.php
+++ b/tests/phpunit/includes/site/SiteListTest.php
@@ -80,16 +80,14 @@
* @covers SiteList::getSite
*/
public function testGetSiteByGlobalId( SiteList $sites ) {
- if ( $sites-isEmpty() ) {
- $this-assertTrue( true );
- } else {
- /**
-* @var Site $site
-*/
- foreach ( $sites as $site ) {
- $this-assertEquals( $site, $sites-getSite(
$site-getGlobalId() ) );
- }
+ /**
+* @var Site $site
+*/
+ foreach ( $sites as $site ) {
+ $this-assertEquals( $site, $sites-getSite(
$site-getGlobalId() ) );
}
+
+ $this-assertTrue( true );
}
/**
@@ -104,6 +102,25 @@
foreach ( $sites as $site ) {
if ( is_integer( $site-getInternalId() ) ) {
$this-assertEquals( $site,
$sites-getSiteByInternalId( $site-getInternalId() ) );
+ }
+ }
+
+ $this-assertTrue( true );
+ }
+
+ /**
+* @dataProvider siteListProvider
+* @param SiteList $sites
+* @covers
[MediaWiki-commits] [Gerrit] remove unused sys import - change (pywikibot/core)
Xqt has uploaded a new change for review. https://gerrit.wikimedia.org/r/116732 Change subject: remove unused sys import .. remove unused sys import Change-Id: I9a5926c86d3e8f702b7449b8ccf36053f32225b2 --- M scripts/maintenance/wikimedia_sites.py 1 file changed, 0 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core refs/changes/32/116732/1 diff --git a/scripts/maintenance/wikimedia_sites.py b/scripts/maintenance/wikimedia_sites.py index a3be22f..efd922b 100644 --- a/scripts/maintenance/wikimedia_sites.py +++ b/scripts/maintenance/wikimedia_sites.py @@ -12,7 +12,6 @@ __version__ = '$Id$' # -import sys import re import codecs import urllib -- To view, visit https://gerrit.wikimedia.org/r/116732 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I9a5926c86d3e8f702b7449b8ccf36053f32225b2 Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Xqt i...@gno.de ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Get rid of global viewer instance - change (mediawiki...MultimediaViewer)
Gilles has uploaded a new change for review.
https://gerrit.wikimedia.org/r/116731
Change subject: Get rid of global viewer instance
..
Get rid of global viewer instance
- split event handler setup out of bootstrap and viewer creation
- simplify the tests setup/teardown
Change-Id: Icde1db81efd6191207ba35757192c800ea2d2e91
Mingle: https://wikimedia.mingle.thoughtworks.com/projects/multimedia/cards/278
---
M resources/mmv/mmv.bootstrap.js
M resources/mmv/mmv.js
M tests/qunit/mmv/mmv.bootstrap.test.js
M tests/qunit/mmv/mmv.lightboxinterface.test.js
M tests/qunit/mmv/mmv.test.js
M tests/qunit/mmv/ui/mmv.ui.buttons.test.js
6 files changed, 127 insertions(+), 161 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MultimediaViewer
refs/changes/31/116731/1
diff --git a/resources/mmv/mmv.bootstrap.js b/resources/mmv/mmv.bootstrap.js
index dfe7a8d..2a142f0 100755
--- a/resources/mmv/mmv.bootstrap.js
+++ b/resources/mmv/mmv.bootstrap.js
@@ -24,8 +24,6 @@
* @class mw.mmv.MultimediaViewerBootstrap
*/
function MultimediaViewerBootstrap () {
- var self = this;
-
this.validExtensions = {
'jpg' : true,
'jpeg' : true,
@@ -43,14 +41,6 @@
// Exposed for tests
this.readinessCSSClass = 'mw-mmv-has-been-loaded';
this.readinessWaitDuration = 100;
-
- $( window ).hashchange( function () {
- self.hash();
- } ).hashchange();
-
- $( document ).on( 'mmv.hash', function ( e ) {
- self.internalHashChange( e );
- } );
}
MMVB = MultimediaViewerBootstrap.prototype;
@@ -94,7 +84,7 @@
if ( $dummy.css( 'display' ) === 'inline' ) {
// Let's be clean and remove the test item before
resolving the deferred
$dummy.remove();
- deferred.resolve( mw.mmv.mediaViewer );
+ deferred.resolve( bs.getViewer() );
} else {
$dummy.remove();
setTimeout( function () { bs.isCSSReady( deferred ); },
this.readinessWaitDuration );
@@ -219,7 +209,42 @@
window.location.hash = e.hash;
};
+ /**
+* Instantiates a new viewer if necessary
+* @returns {mw.mmv.MultimediaViewer}
+*/
+ MMVB.getViewer = function () {
+ if ( this.viewer === undefined ) {
+ this.viewer = new mw.mmv.MultimediaViewer();
+ this.viewer.setupEventHandlers();
+ }
+
+ return this.viewer;
+ };
+
+ /**
+* Listens to events on the window/document
+*/
+ MMVB.setupEventHandlers = function () {
+ var self = this;
+
+ $( window ).hashchange( function () {
+ self.hash();
+ } ).hashchange();
+
+ $( document ).on( 'mmv.hash', function ( e ) {
+ self.internalHashChange( e );
+ } );
+ };
+
mw.mmv.MultimediaViewerBootstrap = MultimediaViewerBootstrap;
bootstrap = new MultimediaViewerBootstrap();
+
+ // This is the only remaining event-handling code that runs with
pageload
+ // In testing context we don't want that to happen because it can only
cause
+ // interference between tests
+ if ( window.QUnit === undefined ) {
+ bootstrap.setupEventHandlers();
+ }
}( mediaWiki, jQuery ) );
diff --git a/resources/mmv/mmv.js b/resources/mmv/mmv.js
index 03ca5b3..c8d49ce 100755
--- a/resources/mmv/mmv.js
+++ b/resources/mmv/mmv.js
@@ -92,8 +92,6 @@
//this.globalUsageProvider = new mw.mmv.provider.GlobalUsage(
// new mw.mmv.Api( {ajax: { url:
'http://commons.wikimedia.org/w/api.php', dataType: 'jsonp' } } )
//);
-
- this.setupEventHandlers();
}
MMVP = MultimediaViewer.prototype;
@@ -104,7 +102,8 @@
* @param {Object[]} thumbs Complex structure...TODO, document this
better.
*/
MMVP.initWithThumbs = function ( thumbs ) {
- var i, thumb;
+ var i, thumb,
+ self = this;
// Only if we find legit images, create a MultiLightbox object
this.lightbox = new mw.mmv.MultiLightbox( 0,
mw.mmv.LightboxInterface, this );
@@ -114,7 +113,7 @@
for ( i = 0; i this.thumbs.length; i++ ) {
thumb = this.thumbs[ i ];
// Create a LightboxImage object for each legit image
- thumb.image = mw.mmv.mediaViewer.createNewImage(
thumb.$thumb.prop( 'src' ),
+
[MediaWiki-commits] [Gerrit] Script to calculate MLEB download statistics - change (translatewiki)
Nikerabbit has uploaded a new change for review.
https://gerrit.wikimedia.org/r/116733
Change subject: Script to calculate MLEB download statistics
..
Script to calculate MLEB download statistics
Change-Id: Iebb2cc23edad35fb5de9ed5e862499a7124be091
---
A bin/mlebstats.php
M puppet/modules/awstats/files/awstats.cron
2 files changed, 189 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/translatewiki
refs/changes/33/116733/1
diff --git a/bin/mlebstats.php b/bin/mlebstats.php
new file mode 100755
index 000..a6c017b
--- /dev/null
+++ b/bin/mlebstats.php
@@ -0,0 +1,188 @@
+?php
+
+/*
+ * To print stats:
+ * mlebstats /var/lib/awstats
+ * To email stats:
+ * mlebstats /var/lib/awstats email1 email2...
+ */
+
+$awstatsDir = $argv[1];
+
+$emails = array_slice( $argv, 2 );
+
+function startsWith( $haystack, $needle ) {
+ return substr( $haystack, 0, strlen( $needle ) ) === $needle;
+}
+
+function endsWith( $haystack, $needle ) {
+ if ( $needle === '' ) {
+ return;
+ }
+ return substr( $haystack, -strlen( $needle ) ) === $needle;
+}
+
+
+function getStatsFromFile( $path ) {
+ $offsetToDownloads = 0;
+ $stats = array(
+ // filename = downloads
+ );
+
+ $file = new SplFileObject( $path );
+ $file-setFlags(
+ SplFileObject::READ_AHEAD
+ | SplFileObject::DROP_NEW_LINE
+ | SplFileObject::SKIP_EMPTY
+ );
+
+ while ( !$file-eof() ) {
+ $line = $file-current();
+
+ if ( startsWith( $line, 'POS_DOWNLOADS ' ) ) {
+ $spaceInTheMidle = stripos( $line, ' ' );
+ $offsetToDownloads = (int)substr( $line,
$spaceInTheMidle + 1 );
+ break;
+ }
+
+ if ( $line === 'END_MAP' ) {
+ throw new Exception( Unable to parse file $path );
+ }
+
+ $file-next();
+ }
+
+ $file-fseek( $offsetToDownloads );
+
+ while ( !$file-eof() ) {
+ $line = $file-current();
+ if ( startsWith( $line, '/mleb/' ) ) {
+ list( $filename, $downloads, $hits, $size ) = explode(
' ', $line );
+ if ( endsWith( $filename, '.tar.bz2' ) ) {
+ $stats[$filename] = $downloads;
+ }
+ }
+
+ if ( $line === 'END_DOWNLOADS' ) {
+ break;
+ }
+
+ $file-next();
+ }
+
+ return $stats;
+}
+
+function getFiles( $dir ) {
+ return glob( $dir/awstats*.txt );
+}
+
+function getCuteName( $filename ) {
+ $matches = null;
+ preg_match( '/MediaWikiLanguageExtensionBundle-(\d{4}.\d\d)/',
$filename, $matches );
+ return $matches[1];
+}
+
+function arrayToList( $array ) {
+ array_walk( $array, function( $value, $key ) {
+ $value = array( $key, $value );
+ } );
+ return array_values( $array );
+}
+
+function printAllTime( $stats ) {
+ $combined = array();
+ foreach ( $stats as $month ) {
+ foreach ( $month as $file = $downloads ) {
+ if ( !isset( $combined[$file] ) ) {
+ $combined[$file] = 0;
+ }
+ $combined[$file] += $downloads;
+ }
+ }
+
+ // Awful hack to able to iterate both arrays at once
+ arsort( $combined );
+ $popular = arrayToList( $combined );
+ ksort( $combined );
+ $sorted = arrayToList( $combined );
+
+
+ printf( %-13s | %-13s\n, 'Most popular', 'In order' );
+ echo -\n;
+ $len = count( $combined );
+ for ( $i = 0; $i $len; $i++ ) {
+ list( $pk, $pv ) = $popular[$i];
+ list( $sk, $sv ) = $sorted[$i];
+
+ printf(
+ %7s %5d | %7s %5d \n,
+ getCuteName( $pk ),
+ $pv,
+ getCuteName( $sk ),
+ $sv
+ );
+ }
+}
+
+function printMonth( $stats ) {
+ $total = 0;
+ foreach ( $stats as $filename = $downloads ) {
+ $total += $downloads;
+ printf( %7s %5d\n, getCuteName( $filename ), $downloads );
+ }
+}
+
+ob_start();
+
+$skipped = array();
+$stats = array();
+
+foreach ( getFiles( $awstatsDir ) as $path ) {
+ $file = basename( $path );
+ $year = (int)substr( $file, 9, 4 );
+ $month = (int)substr( $file, 7, 2 );
+
+ if ( $year 2013 || ( $year === 2013 $month 10 ) ) {
+ // No download stats in expected format available
+ continue;
+ }
+
+ try {
+ $stats[$year-$month] =
[MediaWiki-commits] [Gerrit] Useless change to check jenkins+qunit sanity - change (mediawiki...MultimediaViewer)
Gilles has uploaded a new change for review. https://gerrit.wikimedia.org/r/116734 Change subject: Useless change to check jenkins+qunit sanity .. Useless change to check jenkins+qunit sanity Seeing strange things in https://gerrit.wikimedia.org/r/#/c/116731/ So I'm checking if something changed on the production testing environment Change-Id: I65cedcb5ded04eecbe063ec9c8b4045357083882 --- M tests/qunit/mmv/mmv.test.js 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MultimediaViewer refs/changes/34/116734/1 diff --git a/tests/qunit/mmv/mmv.test.js b/tests/qunit/mmv/mmv.test.js index 1b2f0db..0dc9d0e 100644 --- a/tests/qunit/mmv/mmv.test.js +++ b/tests/qunit/mmv/mmv.test.js @@ -369,4 +369,5 @@ cleanNewViewer(); } ); + }( mediaWiki, jQuery ) ); -- To view, visit https://gerrit.wikimedia.org/r/116734 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I65cedcb5ded04eecbe063ec9c8b4045357083882 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/MultimediaViewer Gerrit-Branch: master Gerrit-Owner: Gilles gdu...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] [WIP] Add a framework to validate resources - change (mediawiki/core)
Phuedx has uploaded a new change for review.
https://gerrit.wikimedia.org/r/116735
Change subject: [WIP] Add a framework to validate resources
..
[WIP] Add a framework to validate resources
Generalise the checkLess.php maintenance script to the validation of
resources with the following classes:
* A ResourceValidationResult represents the result of validating one or
more resources
* A ResourceValidator validates one or more resources, or a
ResourceLoaderModule and returns a ResourceValidationResult
Bug: 54665
Change-Id: I00810afbce92a7b871abd0cdaec808c65e99f873
---
M includes/AutoLoader.php
M includes/resourceloader/ResourceLoaderFileModule.php
A includes/resourcevalidator/LESSResourceValidator.php
A includes/resourcevalidator/ResourceValidationResult.php
A includes/resourcevalidator/ResourceValidator.php
A tests/phpunit/includes/resourcevalidator/LESSResourceValidatorTest.php
A tests/phpunit/includes/resourcevalidator/ResourceValidationResultTest.php
7 files changed, 307 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/35/116735/1
diff --git a/includes/AutoLoader.php b/includes/AutoLoader.php
index 359fd8b..22a1247 100644
--- a/includes/AutoLoader.php
+++ b/includes/AutoLoader.php
@@ -872,6 +872,11 @@
'includes/resourceloader/ResourceLoaderLanguageDataModule.php',
'ResourceLoaderWikiModule' =
'includes/resourceloader/ResourceLoaderWikiModule.php',
+# includes/resourcevalidator
+'LESSResourceValidator' =
'includes/resourcevalidator/LESSResourceValidator.php',
+'ResourceValidator' =
'includes/resourcevalidator/ResourceValidator.php',
+'ResourceValidationResult' =
'includes/resourcevalidator/ResourceValidationResult.php',
+
# includes/revisiondelete
'RevDel_ArchivedFileItem' =
'includes/revisiondelete/RevisionDelete.php',
'RevDel_ArchivedFileList' =
'includes/revisiondelete/RevisionDelete.php',
diff --git a/includes/resourceloader/ResourceLoaderFileModule.php
b/includes/resourceloader/ResourceLoaderFileModule.php
index 23d5825..8a6b368 100644
--- a/includes/resourceloader/ResourceLoaderFileModule.php
+++ b/includes/resourceloader/ResourceLoaderFileModule.php
@@ -636,6 +636,18 @@
return $files;
}
+ public function getAllStyleFilesByLang( $lang ) {
+ $files = array();
+
+ foreach ( $this-getAllStyleFiles() as $file ) {
+ if ( $this-getStyleSheetLang( $file ) === $lang ) {
+ $files[] = $file;
+ }
+ }
+
+ return $files;
+ }
+
/**
* Gets the contents of a list of JavaScript files.
*
diff --git a/includes/resourcevalidator/LESSResourceValidator.php
b/includes/resourcevalidator/LESSResourceValidator.php
new file mode 100644
index 000..f7235a1
--- /dev/null
+++ b/includes/resourcevalidator/LESSResourceValidator.php
@@ -0,0 +1,44 @@
+?php
+
+class LESSResourceValidator implements ResourceValidator {
+ protected $lessCompiler;
+
+ public function __construct( lessc $lessCompiler ) {
+ $this-lessCompiler = $lessCompiler;
+ }
+
+ public function validateResource( $resource ) {
+ try {
+ $this-lessCompiler-compileFile( $resource );
+ } catch ( Exception $e ) {
+ return ResourceValidationResult::failure( array(
$resource = $e ) );
+ }
+
+ return ResourceValidationResult::success();
+ }
+
+ public function validateResources( $resources ) {
+ $result = ResourceValidationResult::success();
+
+ foreach ( (array)$resources as $resource ) {
+ $result = $result-merge( $this-validateResource(
$resource ) );
+ }
+
+ return $result;
+ }
+
+ public function accept( ResourceLoaderModule $resourceLoaderModule ) {
+ if ( !( $resourceLoaderModule instanceof
ResourceLoaderFileModule ) ) {
+ return false;
+ }
+ return (bool) $resourceLoaderModule-getAllStyleFilesByLang(
'less' );
+ }
+
+ public function validateResourceLoaderModule( ResourceLoaderModule
$resourceLoaderModule ) {
+ if ( !( $resourceLoaderModule instanceof
ResourceLoaderFileModule ) ) {
+ return false;
+ }
+ $styleFiles = $resourceLoaderModule-getAllStyleFilesByLang(
'less' );
+ return $this-validateResources( $styleFiles );
+ }
+}
diff --git a/includes/resourcevalidator/ResourceValidationResult.php
b/includes/resourcevalidator/ResourceValidationResult.php
new file mode 100644
index 000..4ceca18
--- /dev/null
+++
[MediaWiki-commits] [Gerrit] Add title to list item of language link - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged.
Change subject: Add title to list item of language link
..
Add title to list item of language link
The key itemtitle can be used to set the title of the actual list item
element. This is useful for article badges as it is already done by the js
hack to add a title for the icon.
Bug: 60717
Change-Id: Ic05c7535d7a35d9ee523373e1e3620e72887459d
---
M includes/SkinTemplate.php
A tests/phpunit/includes/SkinTemplateTest.php
2 files changed, 45 insertions(+), 3 deletions(-)
Approvals:
Daniel Kinzler: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/SkinTemplate.php b/includes/SkinTemplate.php
index 35183ce..e3e79e1 100644
--- a/includes/SkinTemplate.php
+++ b/includes/SkinTemplate.php
@@ -1838,7 +1838,7 @@
*
* @param $key string, usually a key from the list you are generating
this link from.
* @param $item array, of list item data containing some of a specific
set of keys.
-* The id and class keys will be used as attributes for the list
item,
+* The id, class and itemtitle keys will be used as attributes
for the list item,
* if active contains a value of true a active class will also be
appended to class.
*
* @param $options array
@@ -1855,7 +1855,8 @@
* list item directly so they will not be passed to makeLink
* (however the link will still support a tooltip and accesskey from it)
* If you need an id or class on a single link you should include a
links
-* array with just one link item inside of it.
+* array with just one link item inside of it. If you want to add a
title
+* to the list item itself, you can set itemtitle to the value.
* $options is also passed on to makeLink calls
*
* @return string
@@ -1869,7 +1870,7 @@
} else {
$link = $item;
// These keys are used by makeListItem and shouldn't be
passed on to the link
- foreach ( array( 'id', 'class', 'active', 'tag' ) as $k
) {
+ foreach ( array( 'id', 'class', 'active', 'tag',
'itemtitle' ) as $k ) {
unset( $link[$k] );
}
if ( isset( $item['id'] ) !isset( $item['single-id']
) ) {
@@ -1894,6 +1895,9 @@
$attrs['class'] .= ' active';
$attrs['class'] = trim( $attrs['class'] );
}
+ if ( isset( $item['itemtitle'] ) ) {
+ $attrs['title'] = $item['itemtitle'];
+ }
return Html::rawElement( isset( $options['tag'] ) ?
$options['tag'] : 'li', $attrs, $html );
}
diff --git a/tests/phpunit/includes/SkinTemplateTest.php
b/tests/phpunit/includes/SkinTemplateTest.php
new file mode 100644
index 000..8f54714
--- /dev/null
+++ b/tests/phpunit/includes/SkinTemplateTest.php
@@ -0,0 +1,38 @@
+?php
+
+/**
+ * @covers SkinTemplate
+ *
+ * @group Output
+ *
+ * @licence GNU GPL v2+
+ * @author Bene* benestar.wikime...@gmail.com
+ */
+
+class SkinTemplateTest extends MediaWikiTestCase {
+
+ /**
+* @dataProvider makeListItemProvider
+*/
+ public function testMakeListItem( $expected, $key, $item, $options,
$message ) {
+ $template = $this-getMockForAbstractClass( 'BaseTemplate' );
+
+ $this-assertEquals(
+ $expected,
+ $template-makeListItem( $key, $item, $options ),
+ $message
+ );
+ }
+
+ public function makeListItemProvider() {
+ return array(
+ array(
+ 'li class=class title=itemtitlea
href=url title=titletext/a/li',
+ '',
+ array( 'class' = 'class', 'itemtitle' =
'itemtitle', 'href' = 'url', 'title' = 'title', 'text' = 'text' ),
+ array(),
+ 'Test makteListItem with normal values'
+ )
+ );
+ }
+}
--
To view, visit https://gerrit.wikimedia.org/r/59
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ic05c7535d7a35d9ee523373e1e3620e72887459d
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Bene benestar.wikime...@googlemail.com
Gerrit-Reviewer: Aude aude.w...@gmail.com
Gerrit-Reviewer: Bene benestar.wikime...@googlemail.com
Gerrit-Reviewer: Daniel Kinzler daniel.kinz...@wikimedia.de
Gerrit-Reviewer: Hoo man h...@online.de
Gerrit-Reviewer: Jack Phoenix j...@countervandalism.net
Gerrit-Reviewer: Lydia Pintscher lydia.pintsc...@wikimedia.de
Gerrit-Reviewer: Waldir
[MediaWiki-commits] [Gerrit] Stop overflowing text from hitting the border - change (mediawiki...Popups)
Prtksxna has uploaded a new change for review.
https://gerrit.wikimedia.org/r/116736
Change subject: Stop overflowing text from hitting the border
..
Stop overflowing text from hitting the border
Bug: 62194
Change-Id: Id055274b6f1cd2ecdc826b2bb4f3b3fb8f89dc65
---
M resources/ext.popups.core.less
1 file changed, 3 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Popups
refs/changes/36/116736/1
diff --git a/resources/ext.popups.core.less b/resources/ext.popups.core.less
index 1dc9d31..4a39872 100644
--- a/resources/ext.popups.core.less
+++ b/resources/ext.popups.core.less
@@ -35,7 +35,8 @@
}
div {
- padding: 16px;
+ padding: 0;
+ margin: 16px;
padding-bottom: 48px;
div.mwe-popups-redirect {
@@ -154,7 +155,7 @@
}
.mwe-popups-extract {
- margin-top: 190px;
+ margin-top: 206px;
}
a svg {
--
To view, visit https://gerrit.wikimedia.org/r/116736
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Id055274b6f1cd2ecdc826b2bb4f3b3fb8f89dc65
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Popups
Gerrit-Branch: master
Gerrit-Owner: Prtksxna psax...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Consistency tweaks in preparation for adding extension to tr... - change (mediawiki...AccountInfo)
Raimond Spekking has uploaded a new change for review. https://gerrit.wikimedia.org/r/116737 Change subject: Consistency tweaks in preparation for adding extension to translatewiki.net .. Consistency tweaks in preparation for adding extension to translatewiki.net * Add header Change-Id: Id3779fbfb2d3f5c401ac3611b12b3193596ab16a --- M AccountInfo.i18n.php 1 file changed, 7 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/AccountInfo refs/changes/37/116737/1 diff --git a/AccountInfo.i18n.php b/AccountInfo.i18n.php index e0ebdd0..067de1d 100644 --- a/AccountInfo.i18n.php +++ b/AccountInfo.i18n.php @@ -1,4 +1,11 @@ ?php +/** + * AccountInfo extension + * + * @file + * @ingroup Extensions + * @license GPL v2+ + */ $messages = array(); -- To view, visit https://gerrit.wikimedia.org/r/116737 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id3779fbfb2d3f5c401ac3611b12b3193596ab16a Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/AccountInfo 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] Consistency tweaks in preparation for adding extension to tr... - change (mediawiki...AccountInfo)
Raimond Spekking has submitted this change and it was merged. Change subject: Consistency tweaks in preparation for adding extension to translatewiki.net .. Consistency tweaks in preparation for adding extension to translatewiki.net * Add header Change-Id: Id3779fbfb2d3f5c401ac3611b12b3193596ab16a --- M AccountInfo.i18n.php 1 file changed, 7 insertions(+), 0 deletions(-) Approvals: Raimond Spekking: Verified; Looks good to me, approved diff --git a/AccountInfo.i18n.php b/AccountInfo.i18n.php index e0ebdd0..067de1d 100644 --- a/AccountInfo.i18n.php +++ b/AccountInfo.i18n.php @@ -1,4 +1,11 @@ ?php +/** + * AccountInfo extension + * + * @file + * @ingroup Extensions + * @license GPL v2+ + */ $messages = array(); -- To view, visit https://gerrit.wikimedia.org/r/116737 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Id3779fbfb2d3f5c401ac3611b12b3193596ab16a Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/AccountInfo Gerrit-Branch: master Gerrit-Owner: Raimond Spekking raimond.spekk...@gmail.com Gerrit-Reviewer: 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] [AccountInfo] Register extension - change (translatewiki)
Raimond Spekking has uploaded a new change for review. https://gerrit.wikimedia.org/r/116738 Change subject: [AccountInfo] Register extension .. [AccountInfo] Register extension Change-Id: I5b598170d0463727513cb9d402cdae8e9673bdb9 --- M groups/MediaWiki/mediawiki-defines.txt 1 file changed, 4 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/translatewiki refs/changes/38/116738/1 diff --git a/groups/MediaWiki/mediawiki-defines.txt b/groups/MediaWiki/mediawiki-defines.txt index 6283b4c..a873972 100644 --- a/groups/MediaWiki/mediawiki-defines.txt +++ b/groups/MediaWiki/mediawiki-defines.txt @@ -11,6 +11,10 @@ Account Audit +Account Info +aliasfile = AccountInfo/AccountInfo.alias.php +ignored=accountinfo-none + # Active Abstract : No real extension. Plugin for dumpBackup.php Ad Manager -- To view, visit https://gerrit.wikimedia.org/r/116738 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I5b598170d0463727513cb9d402cdae8e9673bdb9 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] [AccountInfo] Register extension - change (translatewiki)
Raimond Spekking has submitted this change and it was merged. Change subject: [AccountInfo] Register extension .. [AccountInfo] Register extension Change-Id: I5b598170d0463727513cb9d402cdae8e9673bdb9 --- M groups/MediaWiki/mediawiki-defines.txt 1 file changed, 4 insertions(+), 0 deletions(-) Approvals: Raimond Spekking: Verified; Looks good to me, approved jenkins-bot: Checked diff --git a/groups/MediaWiki/mediawiki-defines.txt b/groups/MediaWiki/mediawiki-defines.txt index 6283b4c..a873972 100644 --- a/groups/MediaWiki/mediawiki-defines.txt +++ b/groups/MediaWiki/mediawiki-defines.txt @@ -11,6 +11,10 @@ Account Audit +Account Info +aliasfile = AccountInfo/AccountInfo.alias.php +ignored=accountinfo-none + # Active Abstract : No real extension. Plugin for dumpBackup.php Ad Manager -- To view, visit https://gerrit.wikimedia.org/r/116738 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I5b598170d0463727513cb9d402cdae8e9673bdb9 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] Deprecates $wgRateLimitLog in favor of debug log - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged.
Change subject: Deprecates $wgRateLimitLog in favor of debug log
..
Deprecates $wgRateLimitLog in favor of debug log
$wgRateLimitLog is meant to log rate limiting occuring in MediaWiki. The
feature was introduced by e46d19e72d3 / r9202 in 2005. We might not
have wfDebugLog() at that time and we used error_log() with the global
pointing to a file. A later patch converted to file_put_contents().
On Wikimedia production the variable is set to a udp:// URL, I am not
sure file_put_contents() can write to it. Additionally the warning are
suppressed which I tend to hate.
Instead use the log bucket 'ratelimit'.
For backcompabitilibity purposes, if $wgRateLmitLog is still set:
attempt to set $wgDebugLogGroup['ratelimit'] with its value.
Change-Id: I86131c4a8053800afd9f41fa1906c998a88736c6
---
M includes/DefaultSettings.php
M includes/Setup.php
M includes/User.php
3 files changed, 9 insertions(+), 7 deletions(-)
Approvals:
IAlex: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index 1dae5e7..4ad2188 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -4739,6 +4739,8 @@
/**
* Set to a filename to log rate limiter hits.
+ *
+ * @deprecated since 1.23, use $wgDebugLogGroups['ratelimit'] instead
*/
$wgRateLimitLog = null;
diff --git a/includes/Setup.php b/includes/Setup.php
index 0ae6e9b..209edef 100644
--- a/includes/Setup.php
+++ b/includes/Setup.php
@@ -452,6 +452,11 @@
);
}
+// Back compatibility for $wgRateLimitLog deprecated with 1.23
+if ( $wgRateLimitLog ! array_key_exists( 'ratelimit', $wgDebugLogGroups ) )
{
+ $wgDebugLogGroups['ratelimit'] = $wgRateLimitLog;
+}
+
wfProfileOut( $fname . '-defaults2' );
wfProfileIn( $fname . '-misc1' );
diff --git a/includes/User.php b/includes/User.php
index 0b28f66..e728323 100644
--- a/includes/User.php
+++ b/includes/User.php
@@ -1602,7 +1602,7 @@
return false;
}
- global $wgMemc, $wgRateLimitLog;
+ global $wgMemc;
wfProfileIn( __METHOD__ );
$limits = $wgRateLimits[$action];
@@ -1665,12 +1665,7 @@
// Already pinged?
if ( $count ) {
if ( $count = $max ) {
- wfDebug( __METHOD__ . : tripped! $key
at $count $summary\n );
- if ( $wgRateLimitLog ) {
- wfSuppressWarnings();
- file_put_contents(
$wgRateLimitLog, wfTimestamp( TS_MW ) . ' ' . wfWikiID() . ': ' .
$this-getName() . tripped $key at $count $summary\n, FILE_APPEND );
- wfRestoreWarnings();
- }
+ wfDebugLog( 'ratelimit',
$this-getName() . tripped! $key at $count $summary);
$triggered = true;
} else {
wfDebug( __METHOD__ . : ok. $key at
$count $summary\n );
--
To view, visit https://gerrit.wikimedia.org/r/115902
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I86131c4a8053800afd9f41fa1906c998a88736c6
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Hashar has...@free.fr
Gerrit-Reviewer: Aaron Schulz asch...@wikimedia.org
Gerrit-Reviewer: Alex Monk kren...@gmail.com
Gerrit-Reviewer: CSteipp cste...@wikimedia.org
Gerrit-Reviewer: Hashar has...@free.fr
Gerrit-Reviewer: IAlex coderev...@emsenhuber.ch
Gerrit-Reviewer: Matanya mata...@foss.co.il
Gerrit-Reviewer: Reedy re...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Split date and time in message 'rclistfrom' - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged.
Change subject: Split date and time in message 'rclistfrom'
..
Split date and time in message 'rclistfrom'
Some languages need a split of date and time to make better translation.
Added a new parameters for 'rclistfrom', converted the whole message
to a link, updated Qqq entries.
Bug: 19104
Change-Id: Id9127cf022be2394b2a4843572088e0ba8a888a8
---
M includes/specials/SpecialRecentchanges.php
M languages/messages/MessagesEn.php
M languages/messages/MessagesQqq.php
3 files changed, 12 insertions(+), 8 deletions(-)
Approvals:
Bartosz Dziewoński: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/specials/SpecialRecentchanges.php
b/includes/specials/SpecialRecentchanges.php
index f5a5206..a5710a9 100644
--- a/includes/specials/SpecialRecentchanges.php
+++ b/includes/specials/SpecialRecentchanges.php
@@ -753,13 +753,15 @@
// show from this onward link
$timestamp = wfTimestampNow();
$now = $lang-userTimeAndDate( $timestamp, $user );
- $tl = $this-makeOptionsLink(
- $now, array( 'from' = $timestamp ), $nondefaults
- );
-
+ $timenow = $lang-userTime( $timestamp, $user );
+ $datenow = $lang-userDate( $timestamp, $user );
$rclinks = $this-msg( 'rclinks' )-rawParams( $cl, $dl,
$lang-pipeList( $links ) )
-parse();
- $rclistfrom = $this-msg( 'rclistfrom' )-rawParams( $tl
)-parse();
+ $rclistfrom = $this-makeOptionsLink(
+ $this-msg( 'rclistfrom' )-rawParams( $now, $timenow,
$datenow )-parse(),
+ array( 'from' = $timestamp ),
+ $nondefaults
+ );
return {$note}$rclinksbr /$rclistfrom;
}
diff --git a/languages/messages/MessagesEn.php
b/languages/messages/MessagesEn.php
index 7a4b400..b3fa47b 100644
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@ -2207,7 +2207,7 @@
'recentchanges-legend-newpage' = '(also see [[Special:NewPages|list of
new pages]])',
'recentchanges-legend-plusminus'= '(em±123/em)', # only translate
this message to other languages if you have to change it
'rcnotefrom'= 'Below are the changes since
strong$2/strong (up to strong$1/strong shown).',
-'rclistfrom'= 'Show new changes starting from $1',
+'rclistfrom'= 'Show new changes starting from $2, $3',
'rcshowhideminor' = '$1 minor edits',
'rcshowhideminor-show' = 'Show',
'rcshowhideminor-hide' = 'Hide',
diff --git a/languages/messages/MessagesQqq.php
b/languages/messages/MessagesQqq.php
index fc8ecf7..45b0e2e 100644
--- a/languages/messages/MessagesQqq.php
+++ b/languages/messages/MessagesQqq.php
@@ -3682,7 +3682,7 @@
A plus/minus sign with a number for the legend.',
'rcnotefrom' = 'This message is displayed at [[Special:RecentChanges]] when
viewing recentchanges from some specific time.
-The corresponding message is {{msg-mw|Rclistfrom}} (without split of date and
time, [[bugzilla:19104|Bug 19104]]).
+The corresponding message is {{msg-mw|Rclistfrom}} (split into date and time).
Parameters:
* $1 - the maximum number of changes that are displayed
@@ -3692,7 +3692,9 @@
'rclistfrom' = 'Used on [[Special:RecentChanges]].
Parameters:
-* $1 - a link to the revision of a specific date and time. The date and the
time are the link description (without split of date and time,
[[bugzilla:19104|Bug 19104]]).
+* $1 - Revision of a specific date and time. The date and the time adds to the
rclistfrom description. No longer used.
+* $2 - Revision of a specific time. The time adds to the rclistfrom link
description (with split of date and time).
+* $3 - Revision of a specific date. The date adds to the rclistfrom link
description (with split of date and time).
The corresponding message is {{msg-mw|Rcnotefrom}}.',
'rcshowhideminor' = 'Option text in [[Special:RecentChanges]]. Parameters:
--
To view, visit https://gerrit.wikimedia.org/r/107360
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Id9127cf022be2394b2a4843572088e0ba8a888a8
Gerrit-PatchSet: 7
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: 01tonythomas 01tonytho...@gmail.com
Gerrit-Reviewer: 01tonythomas 01tonytho...@gmail.com
Gerrit-Reviewer: Bartosz Dziewoński matma@gmail.com
Gerrit-Reviewer: Hoo man h...@online.de
Gerrit-Reviewer: MarkTraceur mtrac...@member.fsf.org
Gerrit-Reviewer: Nemo bis federicol...@tiscali.it
Gerrit-Reviewer: Nikerabbit niklas.laxst...@gmail.com
Gerrit-Reviewer: Siebrand siebr...@wikimedia.org
Gerrit-Reviewer: Umherirrender umherirrender_de...@web.de
[MediaWiki-commits] [Gerrit] Add i18n file - change (mediawiki...FundraisingChart)
Raimond Spekking has uploaded a new change for review.
https://gerrit.wikimedia.org/r/116739
Change subject: Add i18n file
..
Add i18n file
Change-Id: Id102daa3f1413758559c4219b1995d2741cee532
---
A FundraisingChart.i18n.php
M FundraisingChart.php
2 files changed, 19 insertions(+), 1 deletion(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/FundraisingChart
refs/changes/39/116739/1
diff --git a/FundraisingChart.i18n.php b/FundraisingChart.i18n.php
new file mode 100644
index 000..b32584e
--- /dev/null
+++ b/FundraisingChart.i18n.php
@@ -0,0 +1,17 @@
+?php
+/**
+ * Fundraising Chart extension
+ *
+ * @file
+ * @ingroup Extensions
+ */
+
+$messages = array();
+
+$messages['en'] = array(
+ 'fundraisingchart-desc' = 'A tag that affords JavaScript chart
embedding for fundraising datasets',
+);
+
+$messages['qqq'] = array(
+ 'fundraisingchart-desc' =
'{{desc|name=FundraisingChart|url=https://www.mediawiki.org/wiki/Extension:FundraisingChart}}',
+);
diff --git a/FundraisingChart.php b/FundraisingChart.php
index 384b7a7..c721275 100644
--- a/FundraisingChart.php
+++ b/FundraisingChart.php
@@ -1,10 +1,11 @@
?php
$wgExtensionCredits['parserhook'][] = array(
+ 'path' = __FILE__,
'name' = 'Fundraising Chart',
'author' = 'Sherah Smith',
'version' = '1.0.0',
- 'description' = 'A tag that affords javascript chart embedding for
fundraising datasets.',
+ 'descriptionmsg' = 'fundraisingchart-desc',
'url' = 'https://www.mediawiki.org/wiki/Extension:FundraisingChart',
);
--
To view, visit https://gerrit.wikimedia.org/r/116739
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Id102daa3f1413758559c4219b1995d2741cee532
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/FundraisingChart
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] [Core] Add new optional time parameter - change (translatewiki)
Raimond Spekking has submitted this change and it was merged. Change subject: [Core] Add new optional time parameter .. [Core] Add new optional time parameter https://gerrit.wikimedia.org/r/#/c/107360/7/languages/messages/MessagesEn.php,unified Change-Id: I5fc6b3a3efb730a1840ab4f6822a17db1713515b --- M groups/check-blacklist.php 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Raimond Spekking: Verified; Looks good to me, approved diff --git a/groups/check-blacklist.php b/groups/check-blacklist.php index f60927b..20237f9 100644 --- a/groups/check-blacklist.php +++ b/groups/check-blacklist.php @@ -92,6 +92,7 @@ 'prefs-memberingroups-type', // Optional parameter for group name 'prefs-registration-date-time', // Optional time parameters 'protect-expiring', // Optional time parameters + 'rclistfrom', // Optional time parameter 'rcnotefrom', // Optional time parameters 'revision-info', // Optional time parameters 'revisionasof', // Optional time parameters -- To view, visit https://gerrit.wikimedia.org/r/116740 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I5fc6b3a3efb730a1840ab4f6822a17db1713515b 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] [Core] Add new optional time parameter - change (translatewiki)
Raimond Spekking has uploaded a new change for review. https://gerrit.wikimedia.org/r/116740 Change subject: [Core] Add new optional time parameter .. [Core] Add new optional time parameter https://gerrit.wikimedia.org/r/#/c/107360/7/languages/messages/MessagesEn.php,unified Change-Id: I5fc6b3a3efb730a1840ab4f6822a17db1713515b --- M groups/check-blacklist.php 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/translatewiki refs/changes/40/116740/1 diff --git a/groups/check-blacklist.php b/groups/check-blacklist.php index f60927b..20237f9 100644 --- a/groups/check-blacklist.php +++ b/groups/check-blacklist.php @@ -92,6 +92,7 @@ 'prefs-memberingroups-type', // Optional parameter for group name 'prefs-registration-date-time', // Optional time parameters 'protect-expiring', // Optional time parameters + 'rclistfrom', // Optional time parameter 'rcnotefrom', // Optional time parameters 'revision-info', // Optional time parameters 'revisionasof', // Optional time parameters -- To view, visit https://gerrit.wikimedia.org/r/116740 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I5fc6b3a3efb730a1840ab4f6822a17db1713515b 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] Create an autopatrolled group on itwikiquote - change (operations/mediawiki-config)
jenkins-bot has submitted this change and it was merged. Change subject: Create an autopatrolled group on itwikiquote .. Create an autopatrolled group on itwikiquote Per community vote: https://it.wikiquote.org/w/index.php?oldid=623905#Votazione (just as it is on it.wiki). Bug: 62200 Change-Id: I62b32888b1b5c7d4ad58a62488513ef384e2640e --- M wmf-config/InitialiseSettings.php 1 file changed, 7 insertions(+), 0 deletions(-) Approvals: Hoo man: Looks good to me, approved jenkins-bot: Verified diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index cc877f0..0120528 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -7009,6 +7009,7 @@ 'itwikinews' = array( 'autoconfirmed' = array( 'patrol' = true ) ), 'itwikiquote' = array( 'autoconfirmed' = array( 'patrol' = true ), + 'autopatrolled' = array( 'autopatrol' = true ), 'sysop' = array( 'autopatrol' = true ), ), 'itwikivoyage' = array( @@ -7918,6 +7919,9 @@ '+itwikibooks' = array( 'sysop' = array( 'autopatrolled', 'patroller' ), ), + '+itwikiquote' = array( + 'sysop' = array( 'autopatrolled' ), + ), '+itwikivoyage' = array( 'sysop' = array( 'autopatrolled', 'patroller' ), // Bug 43327 and 45638 ), @@ -8404,6 +8408,9 @@ '+itwikibooks' = array( 'sysop' = array( 'autopatrolled', 'patroller', 'flooder' ), // Flooder added per bug 39569 ), + '+itwikiquote' = array( + 'bureaucrat' = array( 'autopatrolled' ), + ), '+itwikisource' = array( 'bureaucrat' = array( 'flood' ), // Bug 36600 ), -- To view, visit https://gerrit.wikimedia.org/r/114945 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I62b32888b1b5c7d4ad58a62488513ef384e2640e Gerrit-PatchSet: 4 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Ricordisamoa ricordisa...@live.it Gerrit-Reviewer: Hoo man h...@online.de Gerrit-Reviewer: Nemo bis federicol...@tiscali.it Gerrit-Reviewer: Reedy re...@wikimedia.org Gerrit-Reviewer: Ricordisamoa ricordisa...@live.it Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Rename CXDataModelManager.prototype.updateVersion - change (mediawiki...ContentTranslation)
Nikerabbit has uploaded a new change for review.
https://gerrit.wikimedia.org/r/116741
Change subject: Rename CXDataModelManager.prototype.updateVersion
..
Rename CXDataModelManager.prototype.updateVersion
Change-Id: I6e70ac230c605d9e2931ae735bbb432008f8e3f1
---
M server/models/DataModelManager.js
1 file changed, 3 insertions(+), 3 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ContentTranslation
refs/changes/41/116741/1
diff --git a/server/models/DataModelManager.js
b/server/models/DataModelManager.js
index da64a85..65b55bc 100644
--- a/server/models/DataModelManager.js
+++ b/server/models/DataModelManager.js
@@ -76,13 +76,13 @@
dataModelManager.context.pub.publish( 'cx', data );
} );
console.log( '[CX] Sending data. Version: ' + this.dataModel.version );
- this.updateVersion();
+ this.incrementVersionNumber();
};
/**
- * Update the version
+ * Update the version number of the model
*/
-CXDataModelManager.prototype.updateVersion = function () {
+CXDataModelManager.prototype.incrementVersionNumber = function () {
this.dataModel.version += 1;
};
--
To view, visit https://gerrit.wikimedia.org/r/116741
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I6e70ac230c605d9e2931ae735bbb432008f8e3f1
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] Vector style tweaks for collapsible slugs - change (mediawiki...VisualEditor)
Esanders has uploaded a new change for review.
https://gerrit.wikimedia.org/r/116742
Change subject: Vector style tweaks for collapsible slugs
..
Vector style tweaks for collapsible slugs
Depends on Iab25fc6d5e21 in core.
Bug: 47790
Change-Id: Ie3861163fdb9b2414f150b2b0c69cd2e89e6f537
---
M lib/ve
M modules/ve-mw/init/styles/ve.init.mw.ViewPageTarget-vector.css
2 files changed, 4 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor
refs/changes/42/116742/1
diff --git a/lib/ve b/lib/ve
index f93e960..573bf7f 16
--- a/lib/ve
+++ b/lib/ve
-Subproject commit f93e960e3572f38225cc085e9010bc2ce32149d0
+Subproject commit 573bf7f2eab957d5098248292ce9b9e38fd7bb8e
diff --git a/modules/ve-mw/init/styles/ve.init.mw.ViewPageTarget-vector.css
b/modules/ve-mw/init/styles/ve.init.mw.ViewPageTarget-vector.css
index 5fc21e1..729a6bf 100644
--- a/modules/ve-mw/init/styles/ve.init.mw.ViewPageTarget-vector.css
+++ b/modules/ve-mw/init/styles/ve.init.mw.ViewPageTarget-vector.css
@@ -18,6 +18,10 @@
font-size: 0.8em;
}
+.ve-init-mw-viewPageTarget-surface .ve-ce-branchNode-blockSlugWrapper-focussed
.ve-ce-branchNode-blockSlug {
+ margin-top: 0;
+}
+
.ve-init-mw-viewPageTarget-toolbar {
margin: -1em -1em 1em -1em;
-webkit-transition: margin 200ms ease-out;
--
To view, visit https://gerrit.wikimedia.org/r/116742
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie3861163fdb9b2414f150b2b0c69cd2e89e6f537
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders esand...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Require config file for staring Elasticsearch - change (operations/puppet)
Manybubbles has uploaded a new change for review.
https://gerrit.wikimedia.org/r/116743
Change subject: Require config file for staring Elasticsearch
..
Require config file for staring Elasticsearch
This should help prevent Elasticsearch from coming up with garbage config.
It isn't so bad if it comes up with default config files because it won't
join the cluster and cause it trouble but if it comes up with half the
config files changed then it'll join the cluster without enough heap space
and cause havoc. This should prevent that, if not the service starting
with default configuration.
Change-Id: I03f260440b06078d7d6c51758297dcd94f1e6d2d
---
M modules/elasticsearch/manifests/init.pp
1 file changed, 6 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/43/116743/1
diff --git a/modules/elasticsearch/manifests/init.pp
b/modules/elasticsearch/manifests/init.pp
index 3780134..8e1d16f 100644
--- a/modules/elasticsearch/manifests/init.pp
+++ b/modules/elasticsearch/manifests/init.pp
@@ -101,7 +101,12 @@
service { 'elasticsearch':
ensure = running,
enable = true,
-require = Package['elasticsearch'],
+require = [
+Package['elasticsearch'],
+File['/etc/elasticsearch/elasticsearch.yml'],
+File['/etc/elasticsearch/logging.yml'],
+File['/etc/default/elasticsearch'],
+],
}
# Make sure that some pesky, misleading log files aren't kept around
--
To view, visit https://gerrit.wikimedia.org/r/116743
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I03f260440b06078d7d6c51758297dcd94f1e6d2d
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Manybubbles never...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Enable ES3 option in jshint - change (mediawiki...GettingStarted)
jenkins-bot has submitted this change and it was merged. Change subject: Enable ES3 option in jshint .. Enable ES3 option in jshint Prevents breakage in older Internet Explorer Change-Id: Ie801aeddb32e94e5bb521e54401c9170fe3f0400 --- M .jshintrc 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Phuedx: Looks good to me, approved jenkins-bot: Verified diff --git a/.jshintrc b/.jshintrc index 7fa138d..c6a55a0 100644 --- a/.jshintrc +++ b/.jshintrc @@ -4,7 +4,7 @@ jQuery, QUnit ], - + es3: true, bitwise: true, camelcase: true, curly: true, -- To view, visit https://gerrit.wikimedia.org/r/116531 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ie801aeddb32e94e5bb521e54401c9170fe3f0400 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/GettingStarted Gerrit-Branch: master Gerrit-Owner: Mattflaschen mflasc...@wikimedia.org Gerrit-Reviewer: Ori.livneh o...@wikimedia.org Gerrit-Reviewer: Phuedx g...@samsmith.io Gerrit-Reviewer: Swalling swall...@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 maintenance timeout which is super long - change (mediawiki...CirrusSearch)
Manybubbles has uploaded a new change for review.
https://gerrit.wikimedia.org/r/116744
Change subject: Add maintenance timeout which is super long
..
Add maintenance timeout which is super long
We can't clear the timeout altogether for maintenance actions because
Elastica doesn't allow that but we can set it to an hour.
Bug: 62158
Change-Id: Ibfb5f60ef6857c4fa37aab00cbc934570f27dfa9
---
M CirrusSearch.php
M includes/Updater.php
M maintenance/forceSearchIndex.php
M maintenance/updateOneSearchIndexConfig.php
4 files changed, 25 insertions(+), 12 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CirrusSearch
refs/changes/44/116744/1
diff --git a/CirrusSearch.php b/CirrusSearch.php
index 3de1938..68146a7 100644
--- a/CirrusSearch.php
+++ b/CirrusSearch.php
@@ -110,6 +110,11 @@
// partial results. Defaults to 20 seconds.
$wgCirrusSearchClientSideSearchTimeout = 40;
+// Client side timeout for maintanance operations. We can't disable the
timeout
+// all together so we set it to one hour for really long running operations
+// like optimize.
+$wgCirrusSearchMaintenanceTimeout = 3600;
+
// Is it ok if the prefix starts on any word in the title or just the first
word?
// Defaults to false (first word only) because that is the wikipedia behavior
and so
// what we expect users to expect. Does not effect the prefix: search filter
or
diff --git a/includes/Updater.php b/includes/Updater.php
index 013c9bb..806acfd 100644
--- a/includes/Updater.php
+++ b/includes/Updater.php
@@ -140,17 +140,15 @@
* shard. Defaults to null, meaning don't wait. Null is more
efficient when sending
* multiple pages because Cirrus will use Elasticsearch's bulk API.
Timeout is in
* Elasticsearch's time format.
-* @param $clientSideTimeout null|int Timeout in seconds to update
pages or null if using
-* the Elastica default which is 300 seconds.
+* @param $clientSideTimeout null|int timeout in seconds to update
pages or null to not
+* change the configured timeout which defaults to 300 seconds.
* @param $flags int Bitfield containing instructions about how the
document should be built
* and sent to Elasticsearch.
*/
public function updatePages( $pages, $checkFreshness, $shardTimeout,
$clientSideTimeout, $flags ) {
$profiler = new ProfileSection( __METHOD__ );
- if ( $clientSideTimeout === null ) {
- Connection::setTimeout( null );
- } else {
+ if ( $clientSideTimeout !== null ) {
Connection::setTimeout( $clientSideTimeout );
}
if ( $checkFreshness ) {
@@ -187,17 +185,15 @@
*
* @param $titles array(Title) of titles to delete
* @param $ids array(integer) of ids to delete
-* @param $clientSideTimeout timeout in seconds to update pages or null
if using
-* the Elastica default which is 300 seconds.
+* @param $clientSideTimeout null|int timeout in seconds to update
pages or null to not
+* change the configured timeout which defaults to 300 seconds.
*/
public function deletePages( $titles, $ids, $clientSideTimeout = null )
{
$profiler = new ProfileSection( __METHOD__ );
OtherIndexJob::queueIfRequired( $titles, false );
- if ( $clientSideTimeout === null ) {
- Connection::setTimeout( null );
- } else {
+ if ( $clientSideTimeout !== null ) {
Connection::setTimeout( $clientSideTimeout );
}
$this-sendDeletes( $ids );
diff --git a/maintenance/forceSearchIndex.php b/maintenance/forceSearchIndex.php
index 3329628..e1ae571 100644
--- a/maintenance/forceSearchIndex.php
+++ b/maintenance/forceSearchIndex.php
@@ -86,7 +86,11 @@
}
public function execute() {
- global $wgPoolCounterConf;
+ global $wgPoolCounterConf,
+ $wgCirrusSearchMaintenanceTimeout;
+
+ // Set the timeout for maintenance actions
+ Connection::setTimeout( $wgCirrusSearchMaintenanceTimeout );
$profiler = new ProfileSection( __METHOD__ );
diff --git a/maintenance/updateOneSearchIndexConfig.php
b/maintenance/updateOneSearchIndexConfig.php
index 3bad9fa..16d9207 100644
--- a/maintenance/updateOneSearchIndexConfig.php
+++ b/maintenance/updateOneSearchIndexConfig.php
@@ -160,10 +160,13 @@
$wgLanguageCode,
$wgCirrusSearchPhraseUseText,
$wgCirrusSearchPrefixSearchStartsWithAnyWord,
- $wgCirrusSearchUseAggressiveSplitting;
+ $wgCirrusSearchUseAggressiveSplitting,
+
[MediaWiki-commits] [Gerrit] WIP Reset preferences before running the tests - change (mediawiki...Translate)
Zfilipin has uploaded a new change for review. https://gerrit.wikimedia.org/r/116745 Change subject: WIP Reset preferences before running the tests .. WIP Reset preferences before running the tests Paired with Amir. Change-Id: I0299b7363da0e502371c831a86dcb569d1addd98 --- M tests/browser/features/translation_stash.feature 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Translate refs/changes/45/116745/1 diff --git a/tests/browser/features/translation_stash.feature b/tests/browser/features/translation_stash.feature index 8700b43..e642030 100644 --- a/tests/browser/features/translation_stash.feature +++ b/tests/browser/features/translation_stash.feature @@ -14,6 +14,7 @@ Background: Given I am logged in + And I have reset my preferences And I am a sandboxed user on the stash page Scenario: Can select a language to translate into -- To view, visit https://gerrit.wikimedia.org/r/116745 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I0299b7363da0e502371c831a86dcb569d1addd98 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Translate Gerrit-Branch: master Gerrit-Owner: Zfilipin zfili...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] DNM Use SiteList::getSiteByNavigationId in LangLinkHandler - change (mediawiki...Wikibase)
Bene has uploaded a new change for review.
https://gerrit.wikimedia.org/r/116746
Change subject: DNM Use SiteList::getSiteByNavigationId in LangLinkHandler
..
DNM Use SiteList::getSiteByNavigationId in LangLinkHandler
This patch uses the new feature introduced in
https://gerrit.wikimedia.org/r/#/c/116730/
Do not merge this patch until the other one got merged.
Change-Id: Ic09c2593f7c0844a1ecd34d5283772e195e2b5cd
---
M client/includes/LangLinkHandler.php
1 file changed, 8 insertions(+), 40 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/46/116746/1
diff --git a/client/includes/LangLinkHandler.php
b/client/includes/LangLinkHandler.php
index 2343f4b..cce1742 100644
--- a/client/includes/LangLinkHandler.php
+++ b/client/includes/LangLinkHandler.php
@@ -172,14 +172,13 @@
return array();
}
- $site = $this-getSiteByNavigationId( $code );
+ $siteList = $this-sites-getSites();
- if ( $site === false ) {
- continue;
+ if ( $siteList-hasNavigationId( $code ) ) {
+ $site = $siteList-getSiteByNavigationId( $code
);
+ $wiki = $site-getGlobalId();
+ unset( $repoLinks[$wiki] );
}
-
- $wiki = $site-getGlobalId();
- unset( $repoLinks[$wiki] );
}
unset( $repoLinks[$this-siteId] ); // remove self-link
@@ -272,38 +271,6 @@
}
/**
-* Returns a Site object for the given navigational ID (alias
inter-language prefix).
-*
-* @since 0.4
-*
-* @todo: move this functionality into Sites/SiteList/SiteArray!
-*
-* @param string $id The navigation ID to find a site for.
-*
-* @return bool|Site The site with the given navigational ID, or false
if not found.
-*/
- protected function getSiteByNavigationId( $id ) {
- wfProfileIn( __METHOD__ );
-
- //FIXME: this needs to be moved into core, into SiteList resp.
SiteArray!
- if ( $this-sitesByNavigationId === null ) {
- $this-sitesByNavigationId = array();
-
- /* @var Site $site */
- foreach ( $this-sites-getSites() as $site ) {
- $ids = $site-getNavigationIds();
-
- foreach ( $ids as $navId ) {
- $this-sitesByNavigationId[$navId] =
$site;
- }
- }
- }
-
- wfProfileOut( __METHOD__ );
- return isset( $this-sitesByNavigationId[$id] ) ?
$this-sitesByNavigationId[$id] : false;
- }
-
- /**
* Converts a list of interwiki links into an associative array that
maps
* global site IDs to the respective target pages on the designated
wikis.
*
@@ -326,9 +293,10 @@
$lang = $parts[0];
$page = $parts[1];
- $site = $this-getSiteByNavigationId( $lang );
+ $siteList = $this-sites-getSites();
- if ( $site ) {
+ if ( $siteList-hasNavigationId( $lang ) ) {
+ $site =
$siteList-getSiteByNavigationId( $lang );
$wiki = $site-getGlobalId();
$links[$wiki] = $page;
} else {
--
To view, visit https://gerrit.wikimedia.org/r/116746
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic09c2593f7c0844a1ecd34d5283772e195e2b5cd
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Bene benestar.wikime...@googlemail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Enable ES3 option in jshint - change (mediawiki...GuidedTour)
Phuedx has submitted this change and it was merged. Change subject: Enable ES3 option in jshint .. Enable ES3 option in jshint Prevents breakage in older Internet Explorer Change-Id: I2b7f2f957917664422b53eff01c9f0131b97d5bf --- M .jshintrc 1 file changed, 2 insertions(+), 1 deletion(-) Approvals: Phuedx: Looks good to me, approved diff --git a/.jshintrc b/.jshintrc index 6d0ff43..7d1d5f9 100755 --- a/.jshintrc +++ b/.jshintrc @@ -36,5 +36,6 @@ mediaWiki, jQuery, QUnit - ] + ], + es3: true } -- To view, visit https://gerrit.wikimedia.org/r/116532 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I2b7f2f957917664422b53eff01c9f0131b97d5bf Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/GuidedTour Gerrit-Branch: master Gerrit-Owner: Mattflaschen mflasc...@wikimedia.org Gerrit-Reviewer: Phuedx g...@samsmith.io Gerrit-Reviewer: Swalling swall...@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] Change No thanks to Dismiss for Wikipedia Zero dialog. - change (apps...wikipedia)
Yuvipanda has submitted this change and it was merged.
Change subject: Change No thanks to Dismiss for Wikipedia Zero dialog.
..
Change No thanks to Dismiss for Wikipedia Zero dialog.
Change-Id: Ie9095712d4eb7d2a5f0c990bc7c2054b5b0db34c
---
M wikipedia/res/values/strings.xml
M wikipedia/src/main/java/org/wikipedia/page/PageActivity.java
2 files changed, 2 insertions(+), 2 deletions(-)
Approvals:
Yuvipanda: Verified; Looks good to me, approved
diff --git a/wikipedia/res/values/strings.xml b/wikipedia/res/values/strings.xml
index cdec656..da03adb 100644
--- a/wikipedia/res/values/strings.xml
+++ b/wikipedia/res/values/strings.xml
@@ -108,7 +108,7 @@
string name=zero_interstitial_cancelCancel/string
string name=zero_learn_moreWant to learn about Wikipedia Zero?/string
string name=zero_learn_more_learn_moreLearn more/string
-string name=zero_learn_more_no_thanksNo thanks/string
+string name=zero_learn_more_dismissDismiss/string
string name=zero_settingsSettings/string
string name=zero_settings_devmodeZero Devmode/string
string name=zero_settings_devmode_summaryDuring development this
enables code execution of W0 things./string
diff --git a/wikipedia/src/main/java/org/wikipedia/page/PageActivity.java
b/wikipedia/src/main/java/org/wikipedia/page/PageActivity.java
index fb881d1..c51f42c 100644
--- a/wikipedia/src/main/java/org/wikipedia/page/PageActivity.java
+++ b/wikipedia/src/main/java/org/wikipedia/page/PageActivity.java
@@ -169,7 +169,7 @@
visitExternalLink(Uri.parse(getString(R.string.zero_webpage_url)));
}
});
-
alert.setNegativeButton(getString(R.string.zero_learn_more_no_thanks), new
DialogInterface.OnClickListener() {
+
alert.setNegativeButton(getString(R.string.zero_learn_more_dismiss), new
DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog, int id) {
dialog.dismiss();
}
--
To view, visit https://gerrit.wikimedia.org/r/116668
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie9095712d4eb7d2a5f0c990bc7c2054b5b0db34c
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Dr0ptp4kt ab...@wikimedia.org
Gerrit-Reviewer: Brion VIBBER br...@wikimedia.org
Gerrit-Reviewer: Yuvipanda yuvipa...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Require config file for staring Elasticsearch - change (operations/puppet)
Ottomata has submitted this change and it was merged.
Change subject: Require config file for staring Elasticsearch
..
Require config file for staring Elasticsearch
This should help prevent Elasticsearch from coming up with garbage config.
It isn't so bad if it comes up with default config files because it won't
join the cluster and cause it trouble but if it comes up with half the
config files changed then it'll join the cluster without enough heap space
and cause havoc. This should prevent that, if not the service starting
with default configuration.
Change-Id: I03f260440b06078d7d6c51758297dcd94f1e6d2d
---
M modules/elasticsearch/manifests/init.pp
1 file changed, 6 insertions(+), 1 deletion(-)
Approvals:
Ottomata: Verified; Looks good to me, approved
Matanya: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/modules/elasticsearch/manifests/init.pp
b/modules/elasticsearch/manifests/init.pp
index 3780134..8e1d16f 100644
--- a/modules/elasticsearch/manifests/init.pp
+++ b/modules/elasticsearch/manifests/init.pp
@@ -101,7 +101,12 @@
service { 'elasticsearch':
ensure = running,
enable = true,
-require = Package['elasticsearch'],
+require = [
+Package['elasticsearch'],
+File['/etc/elasticsearch/elasticsearch.yml'],
+File['/etc/elasticsearch/logging.yml'],
+File['/etc/default/elasticsearch'],
+],
}
# Make sure that some pesky, misleading log files aren't kept around
--
To view, visit https://gerrit.wikimedia.org/r/116743
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I03f260440b06078d7d6c51758297dcd94f1e6d2d
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Manybubbles never...@wikimedia.org
Gerrit-Reviewer: Chad ch...@wikimedia.org
Gerrit-Reviewer: Matanya mata...@foss.co.il
Gerrit-Reviewer: Ottomata o...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] contint: do not cache api/json calls - change (operations/puppet)
Hashar has uploaded a new change for review. https://gerrit.wikimedia.org/r/116748 Change subject: contint: do not cache api/json calls .. contint: do not cache api/json calls The Jenkins server is being the misc varnish, when creating a Jenkins job the script we are using first verify whether it exists (which cause a 404), then create the job and verify it got created. That last step is being served a 404 because of the cache. That cause us to create each jobs individually instead of in bulks. More details: http://lists.wikimedia.org/pipermail/wikitech-l/2014-February/074829.html This patch set the header Cache-Control: no-cache,must-revalidated for any URL matching api/json. Live hacked on the production machine gallium and confirmed the jobs can now be created properly. Change-Id: I3391de4fffcbf77624ad566ef541dbd8621faa76 --- M modules/contint/files/apache/proxy_jenkins 1 file changed, 8 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/48/116748/1 diff --git a/modules/contint/files/apache/proxy_jenkins b/modules/contint/files/apache/proxy_jenkins index 9c81536..58dd452 100644 --- a/modules/contint/files/apache/proxy_jenkins +++ b/modules/contint/files/apache/proxy_jenkins @@ -26,4 +26,12 @@ Order deny,allow deny from env=bad_browser + # Jenkins is behind the misc varnish, the API calls lacks cache headers + # and their 4xx errors ends up being cached which causes troubles when + # + # Jenkins job builder creates a job (it check whether a job exists by + # hitting the API, which cache a 404, then checks whether the job got + # successfullyy created and fails beacuse it is server the cached 404). + SetEnvIf Request_URI .*/api/json.* NO_CACHE + Header set Cache-Control no-cache,must-revalidate env=NO_CACHE /Proxy -- To view, visit https://gerrit.wikimedia.org/r/116748 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I3391de4fffcbf77624ad566ef541dbd8621faa76 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] Updated Ruby version from 2.1.0 to 2.1.1 in tests/browser - change (mediawiki...CirrusSearch)
jenkins-bot has submitted this change and it was merged. Change subject: Updated Ruby version from 2.1.0 to 2.1.1 in tests/browser .. Updated Ruby version from 2.1.0 to 2.1.1 in tests/browser Bug: 62152 Change-Id: Iecb09726255f24722429aad68dd82ff27796e7d9 --- M tests/browser/Gemfile 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Manybubbles: Looks good to me, approved jenkins-bot: Verified diff --git a/tests/browser/Gemfile b/tests/browser/Gemfile index 56436a5..e33d9cc 100644 --- a/tests/browser/Gemfile +++ b/tests/browser/Gemfile @@ -1,4 +1,4 @@ -#ruby=ruby-2.1.0 +#ruby=ruby-2.1.1 #ruby-gemset=CirrusSearch source https://rubygems.org; -- To view, visit https://gerrit.wikimedia.org/r/116700 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iecb09726255f24722429aad68dd82ff27796e7d9 Gerrit-PatchSet: 3 Gerrit-Project: mediawiki/extensions/CirrusSearch Gerrit-Branch: master Gerrit-Owner: Vikassy vikasyaligar...@gmail.com Gerrit-Reviewer: Manybubbles never...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix mediawiki-selenium-gembuild gemspec name - change (integration/jenkins-job-builder-config)
Hashar has uploaded a new change for review. https://gerrit.wikimedia.org/r/116749 Change subject: Fix mediawiki-selenium-gembuild gemspec name .. Fix mediawiki-selenium-gembuild gemspec name Change-Id: I4b8fd09b08c27b4138662d196811b7cba52fd0b7 --- M mediawiki-misc.yaml 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/integration/jenkins-job-builder-config refs/changes/49/116749/1 diff --git a/mediawiki-misc.yaml b/mediawiki-misc.yaml index a6dfe9f..0cd698b 100644 --- a/mediawiki-misc.yaml +++ b/mediawiki-misc.yaml @@ -4,7 +4,7 @@ triggers: - zuul builders: - - shell: gem build mediawiki-selenium.gemspec + - shell: gem build mediawiki_selenium.gemspec publishers: - archive: artifacts: '*.gem' -- To view, visit https://gerrit.wikimedia.org/r/116749 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I4b8fd09b08c27b4138662d196811b7cba52fd0b7 Gerrit-PatchSet: 1 Gerrit-Project: integration/jenkins-job-builder-config 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] Fix mediawiki-selenium-gembuild gemspec name - change (integration/jenkins-job-builder-config)
jenkins-bot has submitted this change and it was merged. Change subject: Fix mediawiki-selenium-gembuild gemspec name .. Fix mediawiki-selenium-gembuild gemspec name Change-Id: I4b8fd09b08c27b4138662d196811b7cba52fd0b7 --- M mediawiki-misc.yaml 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Hashar: Looks good to me, approved jenkins-bot: Verified diff --git a/mediawiki-misc.yaml b/mediawiki-misc.yaml index a6dfe9f..0cd698b 100644 --- a/mediawiki-misc.yaml +++ b/mediawiki-misc.yaml @@ -4,7 +4,7 @@ triggers: - zuul builders: - - shell: gem build mediawiki-selenium.gemspec + - shell: gem build mediawiki_selenium.gemspec publishers: - archive: artifacts: '*.gem' -- To view, visit https://gerrit.wikimedia.org/r/116749 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I4b8fd09b08c27b4138662d196811b7cba52fd0b7 Gerrit-PatchSet: 1 Gerrit-Project: integration/jenkins-job-builder-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] Add more flowchart groupings for clarity of stages - change (mediawiki...releng)
Greg Grossmeier has uploaded a new change for review.
https://gerrit.wikimedia.org/r/116750
Change subject: Add more flowchart groupings for clarity of stages
..
Add more flowchart groupings for clarity of stages
Added more groupings to show the stages/parts of the flowchart. Also forced
some 'linebreaks' ([folded] in blockdiag speak).
Change-Id: I5dbfdec87459951675265587eeb1d29e7a808939
---
M source/devdeployflow/devdeployflow.diag
1 file changed, 34 insertions(+), 16 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/tools/releng
refs/changes/50/116750/1
diff --git a/source/devdeployflow/devdeployflow.diag
b/source/devdeployflow/devdeployflow.diag
index 2d32cff..6cc6e4f 100644
--- a/source/devdeployflow/devdeployflow.diag
+++ b/source/devdeployflow/devdeployflow.diag
@@ -44,12 +44,12 @@
sec_bug_report - sec_dev
sec_dev - sec_patch_in_BZ
sec_patch_in_BZ - sec_patch_review
-sec_patch_review - sec_coord_deploy
+sec_patch_review - sec_coord_deploy [folded];
sec_coord_deploy - sec_deploy
sec_deploy - sec_get_cve
sec_get_cve - sec_coord_release
sec_coord_release - sec_release
-sec_release - sec_merge_master
+sec_release - sec_merge_master [folded];
group security_group {
fontsize = 16
@@ -59,13 +59,18 @@
}
// Bug stages
-report_bug [label = Report bug];
bug_reported [label = Bug reported];
bug_languish [label = Languish, color = red];
bug_reviewed [label = Reviewed/\nprioritized];
bug_assigned [label = BZ Status:\nAssigned\n(Optional)];
bug_patch [label = BZ Status:\nPatch in Gerrit];
-//bug_resolved [label = BZ Status:\nResolved/Fixed];
+
+group bug_group {
+fontsize = 16
+label = Bug Tracker
+color = grey
+bug_reported; bug_languish; bug_reviewed; bug_assigned;
+}
// Development stages
@@ -78,18 +83,27 @@
master [label = Code committed\n in master\n(+2)];
unit_tests_postcommit [label = Post-commit\nunit tests];
-beta_cluster [label = Code on Beta Cluster];
+group dev_group {
+fontsize = 16
+label = Development
+color = aqua
+dev; dev_labs_instance; patch_submission; code_reviews;
unit_tests_precommit; manual_testing_presubmit; master; unit_tests_postcommit;
+}
+
+
+beta_cluster [label = Beta Cluster\nupdated with\ncode];
manual_testing_beta [label = Manual testing\n(Beta Cluster)];
browser_tests_beta [label = Beta Cluster\nbrowser tests];
review_browsertest_beta [label = Manual review of \nBeta Cluster\nbrowser
tests];
verified_beta_breakage_cond [label = Verified\nbreakage\nin
Beta\nCluster?, shape = flowchart.condition, height = 100];
revert_beta [label = Revert offending commit];
+report_bug_beta [label = Report bug];
group beta_group {
fontsize = 16
label = Beta Cluster
color = lightgreen
-beta_cluster; manual_testing_beta; browser_tests_beta;
review_browsertest_beta; verified_beta_breakage_cond; revert_beta;
+beta_cluster; manual_testing_beta; browser_tests_beta;
review_browsertest_beta; verified_beta_breakage_cond; revert_beta;
report_bug_beta;
}
// Deployment stages
@@ -105,13 +119,14 @@
review_browsertest_prod [label = Manual review of\nproduction browser
tests];
verified_prod_breakage_cond [label = Verified\nbreakage?, shape =
flowchart.condition];
+
+success [label = Success!, color = green];
prod_fix_quick_cond [label = Fix production quickly?];
fix_prod [label = Fix production!];
backport_master [label = Backport fix\nto master];
prod_revert [label = Revert broken code];
-
-success [label = Success!, color = green];
+report_bug [label = Report bug];
//
// Connections / edges
@@ -122,7 +137,7 @@
// bug flow
bug_reported - bug_reviewed, bug_languish
bug_reviewed - bug_assigned
-bug_assigned - dev
+bug_assigned - dev [folded];
// dev flow
dev - dev_labs_instance
@@ -132,16 +147,18 @@
patch_submission - unit_tests_precommit [folded]
unit_tests_precommit - code_reviews
code_reviews - master
-master - beta_cluster, unit_tests_postcommit
+master - unit_tests_postcommit
+master - beta_cluster [folded];
-beta_cluster - manual_testing_beta, browser_tests_beta
+beta_cluster - browser_tests_beta
+beta_cluster - manual_testing_beta [folded];
browser_tests_beta - review_browsertest_beta
manual_testing_beta, review_browsertest_beta - verified_beta_breakage_cond
verified_beta_breakage_cond - revert_beta [label = Yes, textcolor=red]
verified_beta_breakage_cond - create_wmf_branch [label = No, textcolor
= green, folded];
-revert_beta - report_bug
+revert_beta - report_bug_beta
-create_wmf_branch - wmf_deploy_p0
+create_wmf_branch -
[MediaWiki-commits] [Gerrit] Check leading and trailing whitespace - change (mediawiki...Wikibase)
Daniel Kinzler has uploaded a new change for review.
https://gerrit.wikimedia.org/r/116751
Change subject: Check leading and trailing whitespace
..
Check leading and trailing whitespace
Change-Id: I16f9fbc7214cc4079d5bbabb1e937ba8e71defdd
---
M lib/tests/phpunit/WikibaseDataTypeBuildersTest.php
1 file changed, 7 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/51/116751/1
diff --git a/lib/tests/phpunit/WikibaseDataTypeBuildersTest.php
b/lib/tests/phpunit/WikibaseDataTypeBuildersTest.php
index 7063ed0..0582ff1 100644
--- a/lib/tests/phpunit/WikibaseDataTypeBuildersTest.php
+++ b/lib/tests/phpunit/WikibaseDataTypeBuildersTest.php
@@ -68,7 +68,8 @@
array( 'commonsMedia', new StringValue( 'Foo/bar.jpg'
), false, 'illegal character: slash' ),
array( 'commonsMedia', new StringValue( 'Foo\bar.jpg'
), false, 'illegal character: backslash' ),
array( 'commonsMedia', new StringValue( 'Äöü.jpg' ),
true, 'Unicode support' ),
- array( 'commonsMedia', new StringValue( ' Foo.jpg ' ),
false, 'Untrimmed input is forbidden' ),
+ array( 'commonsMedia', new StringValue( ' Foo.jpg' ),
false, 'media name with leading space' ),
+ array( 'commonsMedia', new StringValue( 'Foo.jpg ' ),
false, 'media name with trailing space' ),
//string
array( 'string', 'Foo', false, 'StringValue expected,
string supplied' ),
@@ -78,7 +79,8 @@
array( 'string', new StringValue( 'Äöü' ), true,
'Unicode support' ),
array( 'string', new StringValue( str_repeat('x', 390)
), true, 'long, but not too long' ),
array( 'string', new StringValue( str_repeat('x', 401)
), false, 'too long' ),
- array( 'string', new StringValue( ' Foo ' ), false,
'Untrimmed' ),
+ array( 'string', new StringValue( ' Foo' ), false,
'string with leading space' ),
+ array( 'string', new StringValue( 'Foo ' ), false,
'string with trailing space' ),
//time
array( 'time', 'Foo', false, 'TimeValue expected,
string supplied' ),
@@ -153,6 +155,9 @@
array( 'url', new StringValue(
'javascript:alert(evil)' ), false, 'JavaScript URL' ),
array( 'url', new StringValue( 'http://' ), false, 'bad
http URL' ),
array( 'url', new StringValue( 'http://' .
str_repeat('x', 505) ), false, 'URL too long' ),
+
+ array( 'url', new StringValue( ' http://acme.com' ),
false, 'URL with leading space' ),
+ array( 'url', new StringValue( 'http://acme.com ' ),
false, 'URL with trailing space' ),
);
if ( defined( 'WB_EXPERIMENTAL_FEATURES' )
WB_EXPERIMENTAL_FEATURES ) {
--
To view, visit https://gerrit.wikimedia.org/r/116751
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I16f9fbc7214cc4079d5bbabb1e937ba8e71defdd
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Daniel Kinzler daniel.kinz...@wikimedia.de
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Revert Cleanup webviews when we no longer require them - change (apps...wikipedia)
Yuvipanda has uploaded a new change for review.
https://gerrit.wikimedia.org/r/116752
Change subject: Revert Cleanup webviews when we no longer require them
..
Revert Cleanup webviews when we no longer require them
Was causing crashes when back button was pressed. Needs
a better longer term memory management solution instead.
This reverts commit 488bece3e5fd6985822ec7b404ade1cf16f3bc36.
Change-Id: I54503cac5640eeaaf3e5658ae3b2bbe35175dac0
---
M wikipedia/src/main/java/org/wikipedia/page/PageViewFragment.java
1 file changed, 0 insertions(+), 6 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia
refs/changes/52/116752/1
diff --git a/wikipedia/src/main/java/org/wikipedia/page/PageViewFragment.java
b/wikipedia/src/main/java/org/wikipedia/page/PageViewFragment.java
index c8da5b7..8b0552f 100644
--- a/wikipedia/src/main/java/org/wikipedia/page/PageViewFragment.java
+++ b/wikipedia/src/main/java/org/wikipedia/page/PageViewFragment.java
@@ -327,10 +327,4 @@
}
return false;
}
-
-@Override
-public void onDestroyView() {
-super.onDestroyView();
-webView.destroy();
-}
}
--
To view, visit https://gerrit.wikimedia.org/r/116752
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I54503cac5640eeaaf3e5658ae3b2bbe35175dac0
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
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] Revert Cleanup webviews when we no longer require them - change (apps...wikipedia)
Brion VIBBER has submitted this change and it was merged.
Change subject: Revert Cleanup webviews when we no longer require them
..
Revert Cleanup webviews when we no longer require them
Was causing crashes when back button was pressed. Needs
a better longer term memory management solution instead.
This reverts commit 488bece3e5fd6985822ec7b404ade1cf16f3bc36.
Change-Id: I54503cac5640eeaaf3e5658ae3b2bbe35175dac0
---
M wikipedia/src/main/java/org/wikipedia/page/PageViewFragment.java
1 file changed, 0 insertions(+), 6 deletions(-)
Approvals:
Brion VIBBER: Verified; Looks good to me, approved
diff --git a/wikipedia/src/main/java/org/wikipedia/page/PageViewFragment.java
b/wikipedia/src/main/java/org/wikipedia/page/PageViewFragment.java
index c8da5b7..8b0552f 100644
--- a/wikipedia/src/main/java/org/wikipedia/page/PageViewFragment.java
+++ b/wikipedia/src/main/java/org/wikipedia/page/PageViewFragment.java
@@ -327,10 +327,4 @@
}
return false;
}
-
-@Override
-public void onDestroyView() {
-super.onDestroyView();
-webView.destroy();
-}
}
--
To view, visit https://gerrit.wikimedia.org/r/116752
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I54503cac5640eeaaf3e5658ae3b2bbe35175dac0
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Yuvipanda yuvipa...@gmail.com
Gerrit-Reviewer: Brion VIBBER br...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Make comment(n) link scroll to and focus reply form, instead... - change (mediawiki...Flow)
SG has uploaded a new change for review.
https://gerrit.wikimedia.org/r/116753
Change subject: Make comment(n) link scroll to and focus reply form, instead of
jumping Bug: 61344
..
Make comment(n) link scroll to and focus reply form, instead of jumping
Bug: 61344
Change-Id: I60ef74dfa061126697bcadb8e83844a60e0aa55a
---
M modules/discussion/ui.js
1 file changed, 35 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Flow
refs/changes/53/116753/1
diff --git a/modules/discussion/ui.js b/modules/discussion/ui.js
index 287c24d..ba121fc 100644
--- a/modules/discussion/ui.js
+++ b/modules/discussion/ui.js
@@ -57,6 +57,30 @@
},
/**
+* Scrolls to $anchor.href's hash target element (a div),
+* and then focus onto the textarea within it.
+* @param {jQuery} $anchor
+*/
+ followFormAnchor: function ( $anchor ) {
+ var target = $anchor.attr( 'href' ),
+ index = target.indexOf('#'),
+ $target;
+
+ // Does this href contain a hash?
+ if ( index -1 ) {
+ $target = this.$container.find(
target.substr(index) );
+ // Does this element exist within our container?
+ if ( $target.length ) {
+ // Great, scroll to it and then focus.
+
$target.conditionalScrollIntoView().queue( function () {
+ mw.flow.editor.focus( $( this
).find( 'textarea' ) );
+ $( this ).dequeue();
+ } );
+ }
+ }
+ },
+
+ /**
* Initializes Tipsy on Flow
*/
setupTipsy: function () {
@@ -302,12 +326,19 @@
var ignore = [
'.flow-edit-title-form',
'.flow-actions',
- '.flow-icon-watchlist',
- '.flow-topic-comments-link'
+ '.flow-icon-watchlist'
].join( ',' ),
- $topicContainer, $topicContainerChildren;
+ $topicContainer, $topicContainerChildren,
+ $target = $( event.target );
- if ( $( event.target ).is( ignore ) || $( event.target
).closest( ignore ).length ) {
+ // If the clicked element is the comment count link, go
to the form and focus it
+ if ( $target.is( '.flow-topic-comments-link' ) ) {
+ event.preventDefault();
+ mw.flow.discussion.followFormAnchor( $target );
+ return;
+ }
+
+ if ( $target.is( ignore ) || $target.closest( ignore
).length ) {
return;
}
--
To view, visit https://gerrit.wikimedia.org/r/116753
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I60ef74dfa061126697bcadb8e83844a60e0aa55a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: SG shah...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] i18n: Use int: in message resetpass-expired-soft - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged.
Change subject: i18n: Use int: in message resetpass-expired-soft
..
i18n: Use int: in message resetpass-expired-soft
Spotted by Siddhartha Ghai
https://translatewiki.net/wiki/Thread:Support/About_MediaWiki:Resetpass-expired-soft/en
Also replaced to login with to log in in message resetpass-expired.
Follows-up 01c8c421f8bc.
Change-Id: I8fc039ab1867a5bc5a0ade94daad49d9d85edd98
---
M languages/messages/MessagesEn.php
1 file changed, 2 insertions(+), 2 deletions(-)
Approvals:
CSteipp: Looks good to me, approved
jenkins-bot: Verified
diff --git a/languages/messages/MessagesEn.php
b/languages/messages/MessagesEn.php
index fd2b47f..9674e68 100644
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@ -1287,8 +1287,8 @@
To finish logging in, you must set a new password here:',
'resetpass-temp-password' = 'Temporary password:',
'resetpass-abort-generic' = 'Password change has been aborted by an
extension.',
-'resetpass-expired' = 'Your password has expired. Please set a new
password to login.',
-'resetpass-expired-soft'= 'Your password has expired, and needs to be
reset. Please choose a new password now, or click cancel to reset it later.',
+'resetpass-expired' = 'Your password has expired. Please set a new
password to log in.',
+'resetpass-expired-soft'= 'Your password has expired and needs to be
reset. Please choose a new password now, or click
{{int:resetpass-submit-cancel}} to reset it later.',
# Special:PasswordReset
'passwordreset'= 'Reset password',
--
To view, visit https://gerrit.wikimedia.org/r/116720
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I8fc039ab1867a5bc5a0ade94daad49d9d85edd98
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: PleaseStand pleasest...@live.com
Gerrit-Reviewer: Aaron Schulz asch...@wikimedia.org
Gerrit-Reviewer: CSteipp cste...@wikimedia.org
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] Use previous breakpoint's range when undoing - change (VisualEditor/VisualEditor)
Esanders has uploaded a new change for review.
https://gerrit.wikimedia.org/r/116754
Change subject: Use previous breakpoint's range when undoing
..
Use previous breakpoint's range when undoing
We store ranges in breakpoints and apply them directly when redoing.
However when undoing we take the range and use Transaction#translateRange
to calculate the previous range. Apart from being buggy because
translateRange is theoretically impossible to do properly (e.g. when
ranges collapse to zero width then expand again) this is also overly
complex as we can just get the range from the previous breakpoint
(or use [1,1] if this is the first breakpoint).
Bonus:
* Correct offset in purgeHistory (although this method is never used)
* Remove unused param from breakpoint()
Bug: 62088
Change-Id: Ic19ef19cfbb1fabac9153bc0c4cd56e5dffdc2c4
---
M modules/ve/dm/ve.dm.Surface.js
1 file changed, 9 insertions(+), 9 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/VisualEditor/VisualEditor
refs/changes/54/116754/1
diff --git a/modules/ve/dm/ve.dm.Surface.js b/modules/ve/dm/ve.dm.Surface.js
index 4a741f0..3227a0f 100644
--- a/modules/ve/dm/ve.dm.Surface.js
+++ b/modules/ve/dm/ve.dm.Surface.js
@@ -131,7 +131,7 @@
if ( !this.enabled ) {
return;
}
- this.selection = new ve.Range( 0, 0 );
+ this.selection = new ve.Range( 1, 1 );
this.newTransactions = [];
this.undoStack = [];
this.undoIndex = 0;
@@ -521,18 +521,17 @@
* Set a history state breakpoint.
*
* @method
- * @param {ve.Range} selection New selection range
* @fires history
* @returns {boolean} A breakpoint was added
*/
-ve.dm.Surface.prototype.breakpoint = function ( selection ) {
+ve.dm.Surface.prototype.breakpoint = function () {
if ( !this.enabled ) {
return false;
}
if ( this.newTransactions.length 0 ) {
this.undoStack.push( {
'transactions': this.newTransactions,
- 'selection': selection || this.selection.clone()
+ 'selection': this.selection.clone()
} );
this.newTransactions = [];
this.emit( 'history' );
@@ -548,7 +547,7 @@
* @fires history
*/
ve.dm.Surface.prototype.undo = function () {
- var i, item, selection, transaction, transactions = [];
+ var i, item, prevItem, prevSelection, transaction, transactions = [];
if ( !this.enabled || !this.hasPastState() ) {
return;
}
@@ -558,14 +557,15 @@
item = this.undoStack[this.undoStack.length - this.undoIndex];
if ( item ) {
- // Apply reversed transactions in reversed order, and translate
the selection accordingly
- selection = item.selection;
+ // Apply reversed transactions in reversed order
for ( i = item.transactions.length - 1; i = 0; i-- ) {
transaction = item.transactions[i].reversed();
- selection = transaction.translateRange( selection );
transactions.push( transaction );
}
- this.changeInternal( transactions, selection, true );
+ // Get selection from previous item in stack
+ prevItem = this.undoStack[this.undoStack.length -
this.undoIndex - 1];
+ prevSelection = prevItem ? prevItem.selection : new ve.Range(
1, 1 );
+ this.changeInternal( transactions, prevSelection, true );
this.emit( 'history' );
}
};
--
To view, visit https://gerrit.wikimedia.org/r/116754
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic19ef19cfbb1fabac9153bc0c4cd56e5dffdc2c4
Gerrit-PatchSet: 1
Gerrit-Project: VisualEditor/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders esand...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Only generate date header when rendering is guaranteed - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged. Change subject: Only generate date header when rendering is guaranteed .. Only generate date header when rendering is guaranteed The OldChangesListRecentChangesLine hook can skip rendering of a particular rc line. If that line was the one that would have added a new date header then no date header is output. The pushes checking for a new date header until after we know a line will be output so none of the headers get lost. Change-Id: I64ddd99c6af0b562802504b803563cf77fc2eb28 --- M includes/changes/OldChangesList.php 1 file changed, 3 insertions(+), 3 deletions(-) Approvals: Matthias Mullie: Looks good to me, approved jenkins-bot: Verified diff --git a/includes/changes/OldChangesList.php b/includes/changes/OldChangesList.php index 9cb1146..458f21a 100644 --- a/includes/changes/OldChangesList.php +++ b/includes/changes/OldChangesList.php @@ -37,9 +37,6 @@ # Should patrol-related stuff be shown? $unpatrolled = $this-showAsUnpatrolled( $rc ); - $dateheader = ''; // $s now contains only li.../li, for hooks' convenience. - $this-insertDateHeader( $dateheader, $rc-mAttribs['rc_timestamp'] ); - $s = ''; $classes = array(); // use mw-line-even/mw-line-odd class only if linenumber is given (feature from bug 14468) @@ -128,6 +125,9 @@ wfProfileOut( __METHOD__ ); + $dateheader = ''; // $s now contains only li.../li, for hooks' convenience. + $this-insertDateHeader( $dateheader, $rc-mAttribs['rc_timestamp'] ); + return $dateheaderli class=\ . implode( ' ', $classes ) . \ . $s . /li\n; } } -- To view, visit https://gerrit.wikimedia.org/r/116648 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I64ddd99c6af0b562802504b803563cf77fc2eb28 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: EBernhardson ebernhard...@wikimedia.org Gerrit-Reviewer: Aude aude.w...@gmail.com Gerrit-Reviewer: Bsitu bs...@wikimedia.org Gerrit-Reviewer: Matthias Mullie mmul...@wikimedia.org Gerrit-Reviewer: Werdna agarr...@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] Set ZeroOpts=tls cookie for HTTPS-enabled Zero clients - change (operations/puppet)
BBlack has submitted this change and it was merged.
Change subject: Set ZeroOpts=tls cookie for HTTPS-enabled Zero clients
..
Set ZeroOpts=tls cookie for HTTPS-enabled Zero clients
With guards against:
Setting the cookie when it's already present from the origin
Setting the cookie when the client is already sending it
To be reverted 30 days after merge, which gives time for
the origin to set the cookie itself in the caches varied
via X-CS.
Change-Id: I9db747c37a30d0ec1452ad0dacea094a7ec63721
---
M templates/varnish/zero.inc.vcl.erb
1 file changed, 19 insertions(+), 0 deletions(-)
Approvals:
BBlack: Verified; Looks good to me, approved
jenkins-bot: Verified
diff --git a/templates/varnish/zero.inc.vcl.erb
b/templates/varnish/zero.inc.vcl.erb
index 02a4da5..8faee7c 100644
--- a/templates/varnish/zero.inc.vcl.erb
+++ b/templates/varnish/zero.inc.vcl.erb
@@ -109,6 +109,7 @@
} else if (req.http.X-CS2 == 416-03) {
if (!req.http.X-Forwarded-By) {
if (req.http.host ~ ^((en|ar)\.)?(zero|m)\.) {
+ set req.http.X-ZeroTLS = 1;
set req.http.X-CS = req.http.X-CS2;
}
}
@@ -187,6 +188,7 @@
} else if (req.http.X-CS2 == 646-02) {
if (!req.http.X-Forwarded-By) {
if (req.http.host ~ ^((fr|en|mg)\.)?m\.) {
+ set req.http.X-ZeroTLS = 1;
set req.http.X-CS = req.http.X-CS2;
}
}
@@ -202,10 +204,12 @@
}
} else if (req.http.X-CS2 == 655-12) {
if (req.http.X-Forwarded-By == Opera) {
+ set req.http.X-ZeroTLS = 1;
set req.http.X-CS = req.http.X-CS2;
}
} else if (req.http.X-CS2 == TEST) {
// Test carrier allows all proxies and SSL
+ set req.http.X-ZeroTLS = 1;
set req.http.X-CS = req.http.X-CS2;
} else {
if (!req.http.X-Forwarded-Proto
!req.http.X-Forwarded-By) {
@@ -214,7 +218,22 @@
}
}
+ // Only trigger Set-Cookie below if the cookie isn't already
being sent by the client
+ if (req.http.X-ZeroTLS req.http.Cookie ~ ZeroOpts=) {
+ unset req.http.X-ZeroTLS;
+ }
unset req.http.X-CS2;
} // end of if(X-CS2)
unset req.http.X-Forwarded-By;
}
+
+sub vcl_deliver {
+ // This, and the supporting X-ZeroTLS bits above in tag_carrier, to be
removed after 30 days
+ if (req.http.X-ZeroTLS) {
+ if (!resp.http.Set-Cookie) {
+ set resp.http.Set-Cookie = ZeroOpts=tls;
+ } else if(resp.http.Set-Cookie !~ ZeroOpts=) {
+ set resp.http.Set-Cookie = resp.http.Set-Cookie + ;
ZeroOpts=tls;
+ }
+ }
+}
--
To view, visit https://gerrit.wikimedia.org/r/115669
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I9db747c37a30d0ec1452ad0dacea094a7ec63721
Gerrit-PatchSet: 6
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BBlack bbl...@wikimedia.org
Gerrit-Reviewer: BBlack bbl...@wikimedia.org
Gerrit-Reviewer: Dr0ptp4kt ab...@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] Add a deprecation notice of $wgRateLimitLog in RELEASE-NOTES - change (mediawiki/core)
IAlex has uploaded a new change for review. https://gerrit.wikimedia.org/r/116755 Change subject: Add a deprecation notice of $wgRateLimitLog in RELEASE-NOTES .. Add a deprecation notice of $wgRateLimitLog in RELEASE-NOTES Follow-up I86131c4a80 (5b52c88). Change-Id: I3e4f7c91fd6728052da877c2847c08d69f300dfe --- M RELEASE-NOTES-1.23 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/55/116755/1 diff --git a/RELEASE-NOTES-1.23 b/RELEASE-NOTES-1.23 index 382b54f..abc7e8a 100644 --- a/RELEASE-NOTES-1.23 +++ b/RELEASE-NOTES-1.23 @@ -41,6 +41,8 @@ * $wgSkipSkin, which has been replaceable by $wgSkipSkins since 2005 (r9249), is now formally deprecated. * Removed deprecated $wgDisabledActions as it is hardly used anywhere. +* $wgRateLimitLog has been deprecated and replaced by + $wgDebugLogGroup['ratelimit']. === New features in 1.23 === * ResourceLoader can utilize the Web Storage API to cache modules client-side. -- To view, visit https://gerrit.wikimedia.org/r/116755 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I3e4f7c91fd6728052da877c2847c08d69f300dfe Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: IAlex coderev...@emsenhuber.ch ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add maintenance timeout which is super long - change (mediawiki...CirrusSearch)
Chad has submitted this change and it was merged.
Change subject: Add maintenance timeout which is super long
..
Add maintenance timeout which is super long
We can't clear the timeout altogether for maintenance actions because
Elastica doesn't allow that but we can set it to an hour.
Bug: 62158
Change-Id: Ibfb5f60ef6857c4fa37aab00cbc934570f27dfa9
---
M CirrusSearch.php
M includes/Updater.php
M maintenance/forceSearchIndex.php
M maintenance/updateOneSearchIndexConfig.php
4 files changed, 25 insertions(+), 12 deletions(-)
Approvals:
Chad: Looks good to me, approved
diff --git a/CirrusSearch.php b/CirrusSearch.php
index 3de1938..68146a7 100644
--- a/CirrusSearch.php
+++ b/CirrusSearch.php
@@ -110,6 +110,11 @@
// partial results. Defaults to 20 seconds.
$wgCirrusSearchClientSideSearchTimeout = 40;
+// Client side timeout for maintanance operations. We can't disable the
timeout
+// all together so we set it to one hour for really long running operations
+// like optimize.
+$wgCirrusSearchMaintenanceTimeout = 3600;
+
// Is it ok if the prefix starts on any word in the title or just the first
word?
// Defaults to false (first word only) because that is the wikipedia behavior
and so
// what we expect users to expect. Does not effect the prefix: search filter
or
diff --git a/includes/Updater.php b/includes/Updater.php
index 013c9bb..806acfd 100644
--- a/includes/Updater.php
+++ b/includes/Updater.php
@@ -140,17 +140,15 @@
* shard. Defaults to null, meaning don't wait. Null is more
efficient when sending
* multiple pages because Cirrus will use Elasticsearch's bulk API.
Timeout is in
* Elasticsearch's time format.
-* @param $clientSideTimeout null|int Timeout in seconds to update
pages or null if using
-* the Elastica default which is 300 seconds.
+* @param $clientSideTimeout null|int timeout in seconds to update
pages or null to not
+* change the configured timeout which defaults to 300 seconds.
* @param $flags int Bitfield containing instructions about how the
document should be built
* and sent to Elasticsearch.
*/
public function updatePages( $pages, $checkFreshness, $shardTimeout,
$clientSideTimeout, $flags ) {
$profiler = new ProfileSection( __METHOD__ );
- if ( $clientSideTimeout === null ) {
- Connection::setTimeout( null );
- } else {
+ if ( $clientSideTimeout !== null ) {
Connection::setTimeout( $clientSideTimeout );
}
if ( $checkFreshness ) {
@@ -187,17 +185,15 @@
*
* @param $titles array(Title) of titles to delete
* @param $ids array(integer) of ids to delete
-* @param $clientSideTimeout timeout in seconds to update pages or null
if using
-* the Elastica default which is 300 seconds.
+* @param $clientSideTimeout null|int timeout in seconds to update
pages or null to not
+* change the configured timeout which defaults to 300 seconds.
*/
public function deletePages( $titles, $ids, $clientSideTimeout = null )
{
$profiler = new ProfileSection( __METHOD__ );
OtherIndexJob::queueIfRequired( $titles, false );
- if ( $clientSideTimeout === null ) {
- Connection::setTimeout( null );
- } else {
+ if ( $clientSideTimeout !== null ) {
Connection::setTimeout( $clientSideTimeout );
}
$this-sendDeletes( $ids );
diff --git a/maintenance/forceSearchIndex.php b/maintenance/forceSearchIndex.php
index 3329628..e1ae571 100644
--- a/maintenance/forceSearchIndex.php
+++ b/maintenance/forceSearchIndex.php
@@ -86,7 +86,11 @@
}
public function execute() {
- global $wgPoolCounterConf;
+ global $wgPoolCounterConf,
+ $wgCirrusSearchMaintenanceTimeout;
+
+ // Set the timeout for maintenance actions
+ Connection::setTimeout( $wgCirrusSearchMaintenanceTimeout );
$profiler = new ProfileSection( __METHOD__ );
diff --git a/maintenance/updateOneSearchIndexConfig.php
b/maintenance/updateOneSearchIndexConfig.php
index 3bad9fa..16d9207 100644
--- a/maintenance/updateOneSearchIndexConfig.php
+++ b/maintenance/updateOneSearchIndexConfig.php
@@ -160,10 +160,13 @@
$wgLanguageCode,
$wgCirrusSearchPhraseUseText,
$wgCirrusSearchPrefixSearchStartsWithAnyWord,
- $wgCirrusSearchUseAggressiveSplitting;
+ $wgCirrusSearchUseAggressiveSplitting,
+ $wgCirrusSearchMaintenanceTimeout;
// Make sure we don't
[MediaWiki-commits] [Gerrit] Use simplediff to diff rt-server test results - change (mediawiki...parsoid)
jenkins-bot has submitted this change and it was merged.
Change subject: Use simplediff to diff rt-server test results
..
Use simplediff to diff rt-server test results
Change-Id: I4e079cee763429d203c58aca5c8111a0afe5af07
---
M lib/mediawiki.Util.js
M package.json
M tests/roundtrip-test.js
3 files changed, 40 insertions(+), 10 deletions(-)
Approvals:
Marcoil: Looks good to me, approved
jenkins-bot: Verified
diff --git a/lib/mediawiki.Util.js b/lib/mediawiki.Util.js
index 34cd020..5d5ccd5 100644
--- a/lib/mediawiki.Util.js
+++ b/lib/mediawiki.Util.js
@@ -9,6 +9,7 @@
var async = require('async'),
request = require( 'request' ),
jsDiff = require( 'diff' ),
+ simpleDiff = require( 'simplediff' ),
entities = require( 'entities' ),
TemplateRequest = require( './mediawiki.ApiRequest.js'
).TemplateRequest,
Consts = require('./mediawiki.wikitext.constants.js').WikitextConstants;
@@ -1249,29 +1250,31 @@
currentPair = {};
};
+ var valueLength = change[1].join('').length;
+
if ( !currentPair ) {
currentPair = {};
}
- if ( change.added ) {
+ if ( change[0] === '+' ) {
if ( currentPair.added ) {
pushPair( currentPair, outOff );
}
currentPair.added = { start: outOff };
- outOff += change.value.length;
+ outOff += valueLength;
currentPair.added.end = outOff;
if ( currentPair.removed ) {
pushPair( currentPair );
}
- } else if ( change.removed ) {
+ } else if ( change[0] === '-' ) {
if ( currentPair.removed ) {
pushPair( currentPair, srcOff );
}
currentPair.removed = { start: srcOff };
- srcOff += change.value.length;
+ srcOff += valueLength;
currentPair.removed.end = srcOff;
if ( currentPair.added ) {
@@ -1282,14 +1285,41 @@
pushPair( currentPair, currentPair.added ?
srcOff : outOff );
}
- srcOff += change.value.length;
- outOff += change.value.length;
+ srcOff += valueLength;
+ outOff += valueLength;
}
} );
return pairs;
};
+
+var diffLines = function(oldString, newString) {
+ var lineTokenize = function(value) {
+ var retLines = [],
+ lines = value.split(/^/m);
+ for(var i = 0; i lines.length; i++) {
+ var line = lines[i],
+ lastLine = lines[i - 1];
+ // Merge lines that may contain windows new lines
+ if (line === '\n' lastLine
lastLine[lastLine.length - 1] === '\r') {
+ retLines[retLines.length - 1] += '\n';
+ } else if (line) {
+ retLines.push(line);
+ }
+ }
+ return retLines;
+ };
+
+ if (oldString === newString) {
+ return [['=', [newString]]];
+ } else {
+ return simpleDiff.diff(lineTokenize(oldString),
lineTokenize(newString));
+ }
+};
+
+
Util.convertDiffToOffsetPairs = convertDiffToOffsetPairs;
+Util.diffLines = diffLines;
}( Util ) );
diff --git a/package.json b/package.json
index 8c993a1..baaf453 100644
--- a/package.json
+++ b/package.json
@@ -18,7 +18,8 @@
},
devDependencies: {
colors: ~0.6.2,
- diff: ~1.0.7
+ diff: ~1.0.7,
+ simplediff: 0.1.1
},
main: mediawiki.parser.js,
scripts: {
diff --git a/tests/roundtrip-test.js b/tests/roundtrip-test.js
index 544393f..1bf60da 100755
--- a/tests/roundtrip-test.js
+++ b/tests/roundtrip-test.js
@@ -1,8 +1,7 @@
#!/usr/bin/env node
use strict;
-var jsDiff = require( 'diff' ),
- request = require( 'request' ),
+varrequest = require( 'request' ),
optimist = require( 'optimist' ),
domino = require( 'domino' ),
url = require( 'url' ),
@@ -461,7 +460,7 @@
var diff, offsetPairs;
try {
- diff = jsDiff.diffLines( out, env.page.src );
+ diff = Util.diffLines(out, env.page.src);
offsetPairs = Util.convertDiffToOffsetPairs( diff );
if ( diff.length 0 ) {
--
To view, visit https://gerrit.wikimedia.org/r/115985
To
[MediaWiki-commits] [Gerrit] Introduce search timeouts - change (mediawiki...CirrusSearch)
Manybubbles has uploaded a new change for review.
https://gerrit.wikimedia.org/r/116757
Change subject: Introduce search timeouts
..
Introduce search timeouts
There are two kinds of search timeouts:
1. Elasticsearch enforced shard timeouts which allow it to cleanly timeout
shard actions and return partial results. Some shard actions return partial
results on timeout (finding matches) while others just cause the search to
try to move ahead without any data from the shard (global term frequency
fetching).
2. CirrusSearch enforced connection timeouts. These are just curl timeouts
and will chop the connection after that much time.
We default #1 to 20 seconds and #2 to 40 seconds. Both are crazy long, twice
as long as the longest requests we're seeing. We suspect we'll only get
timeouts when something has gone wrong like if a node gets stuck in infinite
GC.
Bug: 62079
Change-Id: Ib1bc2ee95ad0d34dd3b29e356c50b49f0dfdfab2
---
M CirrusSearch.php
M includes/CirrusSearch.php
M includes/Searcher.php
M includes/Updater.php
4 files changed, 55 insertions(+), 21 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CirrusSearch
refs/changes/57/116757/1
diff --git a/CirrusSearch.php b/CirrusSearch.php
index e39d162..3de1938 100644
--- a/CirrusSearch.php
+++ b/CirrusSearch.php
@@ -85,22 +85,31 @@
// results until the job is done.
$wgCirrusSearchExtraIndexes = array();
-// Shard timeout for non-maintenance index operations including those done in
the web
-// process and those done via job queue. This is the amount of time
Elasticsearch
-// will wait around for an offline primary shard. Currently this is just used
in
-// page updates and not deletes. If this is specified then page updates
cannot use
-// the bulk api so they will be less efficient. Luckily, this isn't used in
-// maintenance scripts which really need bulk operations. It is defined in
-// Elasticsearch's time format which is a string containing a number and then
a unit
-// which is one of d (days), m (minutes), h (hours), ms (milliseconds) or w
(weeks).
-// Cirrus defaults to a very tiny value to prevent folks from waiting around
for
-// updates.
-$wgCirrusSearchShardTimeout = '1ms';
+// Shard timeout for non-maintenance index operations. This is the amount of
+// time Elasticsearch will wait around for an offline primary shard. Currently
+// this is just used in page updates and not deletes. It is defined in
+// Elasticsearch's time format which is a string containing a number and then
+// a unit which is one of d (days), m (minutes), h (hours), ms (milliseconds)
or
+// w (weeks). Cirrus defaults to a very tiny value to prevent job executors
+// from waiting around a long time for Elasticsearch. Instead, the job will
+// fail and be retried later.
+$wgCirrusSearchUpdateShardTimeout = '1ms';
-// Client side timeout for non-maintenance index and delete operations and
freshness
-// checks in seconds.
+// Client side timeout for non-maintenance index and delete operations and
+// freshness checks in seconds.
$wgCirrusSearchClientSideUpdateTimeout = 5;
+// The amount of time Elasticsearch will wait for search shard actions before
+// giving up on them and returning the results from the other shards. Defaults
+// to 20s which is about twice the slowest queries we see. Some shard actions
+// are capable of returning partial results and others are just ignored.
+$wgCirrusSearchSearchShardTimeout = '20s';
+
+// Client side timeout for searches in seconds. Best to keep this double the
+// shard timeout to give Elasticsearch a change to timeout the shards and
return
+// partial results. Defaults to 20 seconds.
+$wgCirrusSearchClientSideSearchTimeout = 40;
+
// Is it ok if the prefix starts on any word in the title or just the first
word?
// Defaults to false (first word only) because that is the wikipedia behavior
and so
// what we expect users to expect. Does not effect the prefix: search filter
or
diff --git a/includes/CirrusSearch.php b/includes/CirrusSearch.php
index 3d0114e..e72b7b7 100644
--- a/includes/CirrusSearch.php
+++ b/includes/CirrusSearch.php
@@ -95,6 +95,8 @@
// so we must unwrap all OK statuses. Note that $status can be
good and still contain null
// since that is interpreted as no results.
if ( $status-isOK() ) {
+ // Note that we have no way of sending warning back to
the user. In this case all warnings
+ // are logged when they are added to the status object
so we just ignore them here
$result = $status-getValue();
$interwiki = new InterwikiSearcher( $this-offset,
$this-limit, $this-namespaces, $user );
$interwikiResult = $interwiki-getInterwikiResults(
$term );
diff --git a/includes/Searcher.php b/includes/Searcher.php
index
[MediaWiki-commits] [Gerrit] Introduce search timeouts - change (mediawiki...CirrusSearch)
jenkins-bot has submitted this change and it was merged.
Change subject: Introduce search timeouts
..
Introduce search timeouts
There are two kinds of search timeouts:
1. Elasticsearch enforced shard timeouts which allow it to cleanly timeout
shard actions and return partial results. Some shard actions return partial
results on timeout (finding matches) while others just cause the search to
try to move ahead without any data from the shard (global term frequency
fetching).
2. CirrusSearch enforced connection timeouts. These are just curl timeouts
and will chop the connection after that much time.
We default #1 to 20 seconds and #2 to 40 seconds. Both are crazy long, twice
as long as the longest requests we're seeing. We suspect we'll only get
timeouts when something has gone wrong like if a node gets stuck in infinite
GC.
Bug: 62079
Change-Id: Ib1bc2ee95ad0d34dd3b29e356c50b49f0dfdfab2
---
M CirrusSearch.php
M includes/CirrusSearch.php
M includes/Searcher.php
M includes/Updater.php
4 files changed, 55 insertions(+), 21 deletions(-)
Approvals:
Manybubbles: Looks good to me, approved
jenkins-bot: Verified
diff --git a/CirrusSearch.php b/CirrusSearch.php
index e39d162..3de1938 100644
--- a/CirrusSearch.php
+++ b/CirrusSearch.php
@@ -85,22 +85,31 @@
// results until the job is done.
$wgCirrusSearchExtraIndexes = array();
-// Shard timeout for non-maintenance index operations including those done in
the web
-// process and those done via job queue. This is the amount of time
Elasticsearch
-// will wait around for an offline primary shard. Currently this is just used
in
-// page updates and not deletes. If this is specified then page updates
cannot use
-// the bulk api so they will be less efficient. Luckily, this isn't used in
-// maintenance scripts which really need bulk operations. It is defined in
-// Elasticsearch's time format which is a string containing a number and then
a unit
-// which is one of d (days), m (minutes), h (hours), ms (milliseconds) or w
(weeks).
-// Cirrus defaults to a very tiny value to prevent folks from waiting around
for
-// updates.
-$wgCirrusSearchShardTimeout = '1ms';
+// Shard timeout for non-maintenance index operations. This is the amount of
+// time Elasticsearch will wait around for an offline primary shard. Currently
+// this is just used in page updates and not deletes. It is defined in
+// Elasticsearch's time format which is a string containing a number and then
+// a unit which is one of d (days), m (minutes), h (hours), ms (milliseconds)
or
+// w (weeks). Cirrus defaults to a very tiny value to prevent job executors
+// from waiting around a long time for Elasticsearch. Instead, the job will
+// fail and be retried later.
+$wgCirrusSearchUpdateShardTimeout = '1ms';
-// Client side timeout for non-maintenance index and delete operations and
freshness
-// checks in seconds.
+// Client side timeout for non-maintenance index and delete operations and
+// freshness checks in seconds.
$wgCirrusSearchClientSideUpdateTimeout = 5;
+// The amount of time Elasticsearch will wait for search shard actions before
+// giving up on them and returning the results from the other shards. Defaults
+// to 20s which is about twice the slowest queries we see. Some shard actions
+// are capable of returning partial results and others are just ignored.
+$wgCirrusSearchSearchShardTimeout = '20s';
+
+// Client side timeout for searches in seconds. Best to keep this double the
+// shard timeout to give Elasticsearch a change to timeout the shards and
return
+// partial results. Defaults to 20 seconds.
+$wgCirrusSearchClientSideSearchTimeout = 40;
+
// Is it ok if the prefix starts on any word in the title or just the first
word?
// Defaults to false (first word only) because that is the wikipedia behavior
and so
// what we expect users to expect. Does not effect the prefix: search filter
or
diff --git a/includes/CirrusSearch.php b/includes/CirrusSearch.php
index 3d0114e..e72b7b7 100644
--- a/includes/CirrusSearch.php
+++ b/includes/CirrusSearch.php
@@ -95,6 +95,8 @@
// so we must unwrap all OK statuses. Note that $status can be
good and still contain null
// since that is interpreted as no results.
if ( $status-isOK() ) {
+ // Note that we have no way of sending warning back to
the user. In this case all warnings
+ // are logged when they are added to the status object
so we just ignore them here
$result = $status-getValue();
$interwiki = new InterwikiSearcher( $this-offset,
$this-limit, $this-namespaces, $user );
$interwikiResult = $interwiki-getInterwikiResults(
$term );
diff --git a/includes/Searcher.php b/includes/Searcher.php
index 97cfe5f..e284746 100644
--- a/includes/Searcher.php
+++
[MediaWiki-commits] [Gerrit] Add maintenance timeout which is super long - change (mediawiki...CirrusSearch)
jenkins-bot has submitted this change and it was merged.
Change subject: Add maintenance timeout which is super long
..
Add maintenance timeout which is super long
We can't clear the timeout altogether for maintenance actions because
Elastica doesn't allow that but we can set it to an hour.
Bug: 62158
Change-Id: Ibfb5f60ef6857c4fa37aab00cbc934570f27dfa9
---
M CirrusSearch.php
M includes/Updater.php
M maintenance/forceSearchIndex.php
M maintenance/updateOneSearchIndexConfig.php
4 files changed, 25 insertions(+), 12 deletions(-)
Approvals:
Manybubbles: Looks good to me, approved
jenkins-bot: Verified
diff --git a/CirrusSearch.php b/CirrusSearch.php
index 3de1938..68146a7 100644
--- a/CirrusSearch.php
+++ b/CirrusSearch.php
@@ -110,6 +110,11 @@
// partial results. Defaults to 20 seconds.
$wgCirrusSearchClientSideSearchTimeout = 40;
+// Client side timeout for maintanance operations. We can't disable the
timeout
+// all together so we set it to one hour for really long running operations
+// like optimize.
+$wgCirrusSearchMaintenanceTimeout = 3600;
+
// Is it ok if the prefix starts on any word in the title or just the first
word?
// Defaults to false (first word only) because that is the wikipedia behavior
and so
// what we expect users to expect. Does not effect the prefix: search filter
or
diff --git a/includes/Updater.php b/includes/Updater.php
index 013c9bb..806acfd 100644
--- a/includes/Updater.php
+++ b/includes/Updater.php
@@ -140,17 +140,15 @@
* shard. Defaults to null, meaning don't wait. Null is more
efficient when sending
* multiple pages because Cirrus will use Elasticsearch's bulk API.
Timeout is in
* Elasticsearch's time format.
-* @param $clientSideTimeout null|int Timeout in seconds to update
pages or null if using
-* the Elastica default which is 300 seconds.
+* @param $clientSideTimeout null|int timeout in seconds to update
pages or null to not
+* change the configured timeout which defaults to 300 seconds.
* @param $flags int Bitfield containing instructions about how the
document should be built
* and sent to Elasticsearch.
*/
public function updatePages( $pages, $checkFreshness, $shardTimeout,
$clientSideTimeout, $flags ) {
$profiler = new ProfileSection( __METHOD__ );
- if ( $clientSideTimeout === null ) {
- Connection::setTimeout( null );
- } else {
+ if ( $clientSideTimeout !== null ) {
Connection::setTimeout( $clientSideTimeout );
}
if ( $checkFreshness ) {
@@ -187,17 +185,15 @@
*
* @param $titles array(Title) of titles to delete
* @param $ids array(integer) of ids to delete
-* @param $clientSideTimeout timeout in seconds to update pages or null
if using
-* the Elastica default which is 300 seconds.
+* @param $clientSideTimeout null|int timeout in seconds to update
pages or null to not
+* change the configured timeout which defaults to 300 seconds.
*/
public function deletePages( $titles, $ids, $clientSideTimeout = null )
{
$profiler = new ProfileSection( __METHOD__ );
OtherIndexJob::queueIfRequired( $titles, false );
- if ( $clientSideTimeout === null ) {
- Connection::setTimeout( null );
- } else {
+ if ( $clientSideTimeout !== null ) {
Connection::setTimeout( $clientSideTimeout );
}
$this-sendDeletes( $ids );
diff --git a/maintenance/forceSearchIndex.php b/maintenance/forceSearchIndex.php
index 3329628..e1ae571 100644
--- a/maintenance/forceSearchIndex.php
+++ b/maintenance/forceSearchIndex.php
@@ -86,7 +86,11 @@
}
public function execute() {
- global $wgPoolCounterConf;
+ global $wgPoolCounterConf,
+ $wgCirrusSearchMaintenanceTimeout;
+
+ // Set the timeout for maintenance actions
+ Connection::setTimeout( $wgCirrusSearchMaintenanceTimeout );
$profiler = new ProfileSection( __METHOD__ );
diff --git a/maintenance/updateOneSearchIndexConfig.php
b/maintenance/updateOneSearchIndexConfig.php
index 3bad9fa..16d9207 100644
--- a/maintenance/updateOneSearchIndexConfig.php
+++ b/maintenance/updateOneSearchIndexConfig.php
@@ -160,10 +160,13 @@
$wgLanguageCode,
$wgCirrusSearchPhraseUseText,
$wgCirrusSearchPrefixSearchStartsWithAnyWord,
- $wgCirrusSearchUseAggressiveSplitting;
+ $wgCirrusSearchUseAggressiveSplitting,
+ $wgCirrusSearchMaintenanceTimeout;
[MediaWiki-commits] [Gerrit] Add maintenance timeout which is super long - change (mediawiki...CirrusSearch)
Manybubbles has uploaded a new change for review.
https://gerrit.wikimedia.org/r/116758
Change subject: Add maintenance timeout which is super long
..
Add maintenance timeout which is super long
We can't clear the timeout altogether for maintenance actions because
Elastica doesn't allow that but we can set it to an hour.
Bug: 62158
Change-Id: Ibfb5f60ef6857c4fa37aab00cbc934570f27dfa9
---
M CirrusSearch.php
M includes/Updater.php
M maintenance/forceSearchIndex.php
M maintenance/updateOneSearchIndexConfig.php
4 files changed, 25 insertions(+), 12 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CirrusSearch
refs/changes/58/116758/1
diff --git a/CirrusSearch.php b/CirrusSearch.php
index 3de1938..68146a7 100644
--- a/CirrusSearch.php
+++ b/CirrusSearch.php
@@ -110,6 +110,11 @@
// partial results. Defaults to 20 seconds.
$wgCirrusSearchClientSideSearchTimeout = 40;
+// Client side timeout for maintanance operations. We can't disable the
timeout
+// all together so we set it to one hour for really long running operations
+// like optimize.
+$wgCirrusSearchMaintenanceTimeout = 3600;
+
// Is it ok if the prefix starts on any word in the title or just the first
word?
// Defaults to false (first word only) because that is the wikipedia behavior
and so
// what we expect users to expect. Does not effect the prefix: search filter
or
diff --git a/includes/Updater.php b/includes/Updater.php
index 013c9bb..806acfd 100644
--- a/includes/Updater.php
+++ b/includes/Updater.php
@@ -140,17 +140,15 @@
* shard. Defaults to null, meaning don't wait. Null is more
efficient when sending
* multiple pages because Cirrus will use Elasticsearch's bulk API.
Timeout is in
* Elasticsearch's time format.
-* @param $clientSideTimeout null|int Timeout in seconds to update
pages or null if using
-* the Elastica default which is 300 seconds.
+* @param $clientSideTimeout null|int timeout in seconds to update
pages or null to not
+* change the configured timeout which defaults to 300 seconds.
* @param $flags int Bitfield containing instructions about how the
document should be built
* and sent to Elasticsearch.
*/
public function updatePages( $pages, $checkFreshness, $shardTimeout,
$clientSideTimeout, $flags ) {
$profiler = new ProfileSection( __METHOD__ );
- if ( $clientSideTimeout === null ) {
- Connection::setTimeout( null );
- } else {
+ if ( $clientSideTimeout !== null ) {
Connection::setTimeout( $clientSideTimeout );
}
if ( $checkFreshness ) {
@@ -187,17 +185,15 @@
*
* @param $titles array(Title) of titles to delete
* @param $ids array(integer) of ids to delete
-* @param $clientSideTimeout timeout in seconds to update pages or null
if using
-* the Elastica default which is 300 seconds.
+* @param $clientSideTimeout null|int timeout in seconds to update
pages or null to not
+* change the configured timeout which defaults to 300 seconds.
*/
public function deletePages( $titles, $ids, $clientSideTimeout = null )
{
$profiler = new ProfileSection( __METHOD__ );
OtherIndexJob::queueIfRequired( $titles, false );
- if ( $clientSideTimeout === null ) {
- Connection::setTimeout( null );
- } else {
+ if ( $clientSideTimeout !== null ) {
Connection::setTimeout( $clientSideTimeout );
}
$this-sendDeletes( $ids );
diff --git a/maintenance/forceSearchIndex.php b/maintenance/forceSearchIndex.php
index 3329628..e1ae571 100644
--- a/maintenance/forceSearchIndex.php
+++ b/maintenance/forceSearchIndex.php
@@ -86,7 +86,11 @@
}
public function execute() {
- global $wgPoolCounterConf;
+ global $wgPoolCounterConf,
+ $wgCirrusSearchMaintenanceTimeout;
+
+ // Set the timeout for maintenance actions
+ Connection::setTimeout( $wgCirrusSearchMaintenanceTimeout );
$profiler = new ProfileSection( __METHOD__ );
diff --git a/maintenance/updateOneSearchIndexConfig.php
b/maintenance/updateOneSearchIndexConfig.php
index 3bad9fa..16d9207 100644
--- a/maintenance/updateOneSearchIndexConfig.php
+++ b/maintenance/updateOneSearchIndexConfig.php
@@ -160,10 +160,13 @@
$wgLanguageCode,
$wgCirrusSearchPhraseUseText,
$wgCirrusSearchPrefixSearchStartsWithAnyWord,
- $wgCirrusSearchUseAggressiveSplitting;
+ $wgCirrusSearchUseAggressiveSplitting,
+
[MediaWiki-commits] [Gerrit] Remove dumb log message left over from debugging - change (mediawiki...CirrusSearch)
Manybubbles has uploaded a new change for review.
https://gerrit.wikimedia.org/r/116756
Change subject: Remove dumb log message left over from debugging
..
Remove dumb log message left over from debugging
Change-Id: Ife93017866c174005b72918a7dd34992891ab039
---
M includes/Result.php
1 file changed, 0 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CirrusSearch
refs/changes/56/116756/1
diff --git a/includes/Result.php b/includes/Result.php
index c0f682c..a07bf0d 100644
--- a/includes/Result.php
+++ b/includes/Result.php
@@ -78,7 +78,6 @@
// This odd juggling is the second half of the script
fields hack to get redirect loaded.
// It'll go away when we switch to source filtering.
$redirects = $result-redirect;
- wfDebugLog( 'CirrusSearch', ASDFASDF . implode( '
', explode( \n, var_export( $redirects, true ) ) ) );
if ( $redirects !== null ) {
// I not null it'll always be an array.
// In Elasticsearch 0.90 it'll be an array of
arrays which is what we need.
@@ -88,7 +87,6 @@
wfDebugLog( 'CirrusSearch', 1.0);
// Since the first entry doesn't have a
title we assume we're in 1.0
$redirects = $redirects[ 0 ];
- wfDebugLog( 'CirrusSearch', ASDFASDF
. implode( ' ', explode( \n, var_export( $redirects, true ) ) ) );
}
}
$this-redirectTitle = $this-findRedirectTitle(
$highlights[ 'redirect.title' ][ 0 ], $redirects );
--
To view, visit https://gerrit.wikimedia.org/r/116756
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ife93017866c174005b72918a7dd34992891ab039
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CirrusSearch
Gerrit-Branch: wmf/1.23wmf16
Gerrit-Owner: Manybubbles never...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update Cirrus to include 3 small fixes - change (mediawiki/core)
Manybubbles has uploaded a new change for review. https://gerrit.wikimedia.org/r/116759 Change subject: Update Cirrus to include 3 small fixes .. Update Cirrus to include 3 small fixes Change-Id: I876d28fe30215e3729a9deb4d5073939bef7cb5b --- M extensions/CirrusSearch 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/59/116759/1 diff --git a/extensions/CirrusSearch b/extensions/CirrusSearch index eb1d5d3..fe479d7 16 --- a/extensions/CirrusSearch +++ b/extensions/CirrusSearch -Subproject commit eb1d5d36d6c318eb34d5e2eba1af491f48d43a55 +Subproject commit fe479d7ee9c1ea594e310c5bc7cbf4b8639fe5e7 -- To view, visit https://gerrit.wikimedia.org/r/116759 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I876d28fe30215e3729a9deb4d5073939bef7cb5b Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: wmf/1.23wmf16 Gerrit-Owner: Manybubbles never...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove dumb log message left over from debugging - change (mediawiki...CirrusSearch)
jenkins-bot has submitted this change and it was merged.
Change subject: Remove dumb log message left over from debugging
..
Remove dumb log message left over from debugging
Change-Id: Ife93017866c174005b72918a7dd34992891ab039
---
M includes/Result.php
1 file changed, 0 insertions(+), 2 deletions(-)
Approvals:
Manybubbles: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/Result.php b/includes/Result.php
index c0f682c..a07bf0d 100644
--- a/includes/Result.php
+++ b/includes/Result.php
@@ -78,7 +78,6 @@
// This odd juggling is the second half of the script
fields hack to get redirect loaded.
// It'll go away when we switch to source filtering.
$redirects = $result-redirect;
- wfDebugLog( 'CirrusSearch', ASDFASDF . implode( '
', explode( \n, var_export( $redirects, true ) ) ) );
if ( $redirects !== null ) {
// I not null it'll always be an array.
// In Elasticsearch 0.90 it'll be an array of
arrays which is what we need.
@@ -88,7 +87,6 @@
wfDebugLog( 'CirrusSearch', 1.0);
// Since the first entry doesn't have a
title we assume we're in 1.0
$redirects = $redirects[ 0 ];
- wfDebugLog( 'CirrusSearch', ASDFASDF
. implode( ' ', explode( \n, var_export( $redirects, true ) ) ) );
}
}
$this-redirectTitle = $this-findRedirectTitle(
$highlights[ 'redirect.title' ][ 0 ], $redirects );
--
To view, visit https://gerrit.wikimedia.org/r/116756
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ife93017866c174005b72918a7dd34992891ab039
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CirrusSearch
Gerrit-Branch: wmf/1.23wmf16
Gerrit-Owner: Manybubbles never...@wikimedia.org
Gerrit-Reviewer: Manybubbles never...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Possible fix to bug 62218 https://bugzilla.wikimedia.org/sho... - change (mediawiki...SemanticMediaWiki)
Carnevalegiacomo has uploaded a new change for review.
https://gerrit.wikimedia.org/r/116760
Change subject: Possible fix to bug 62218
https://bugzilla.wikimedia.org/show_bug.cgi?id=62218
..
Possible fix to bug 62218
https://bugzilla.wikimedia.org/show_bug.cgi?id=62218
Change-Id: If28848f0528b4aaa2351cd04150c440669d93ede
---
M includes/sparql/SMW_SparqlResultParser.php
1 file changed, 2 insertions(+), 2 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/SemanticMediaWiki
refs/changes/60/116760/1
diff --git a/includes/sparql/SMW_SparqlResultParser.php
b/includes/sparql/SMW_SparqlResultParser.php
index b1a671a..a0a478e 100644
--- a/includes/sparql/SMW_SparqlResultParser.php
+++ b/includes/sparql/SMW_SparqlResultParser.php
@@ -112,7 +112,7 @@
if ( array_key_exists( 'datatype', $attributes ) ) {
$this-m_xml_datatype = $attributes['datatype'];
} else {
- $this-m_xml_datatype = false;
+ $this-m_xml_datatype = '';
}
/// TODO handle xml:lang attributes here as well?
} elseif ( ( $tagName == 'variable' ) ( $prevTag == 'head' )
) {
@@ -150,4 +150,4 @@
}
}
-}
\ No newline at end of file
+}
--
To view, visit https://gerrit.wikimedia.org/r/116760
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: If28848f0528b4aaa2351cd04150c440669d93ede
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SemanticMediaWiki
Gerrit-Branch: master
Gerrit-Owner: Carnevalegiacomo gcarnev...@imolinfo.it
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update Cirrus to include 3 small fixes - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged. Change subject: Update Cirrus to include 3 small fixes .. Update Cirrus to include 3 small fixes Change-Id: I876d28fe30215e3729a9deb4d5073939bef7cb5b --- M extensions/CirrusSearch 1 file changed, 0 insertions(+), 0 deletions(-) Approvals: Manybubbles: Looks good to me, approved jenkins-bot: Verified diff --git a/extensions/CirrusSearch b/extensions/CirrusSearch index eb1d5d3..fe479d7 16 --- a/extensions/CirrusSearch +++ b/extensions/CirrusSearch -Subproject commit eb1d5d36d6c318eb34d5e2eba1af491f48d43a55 +Subproject commit fe479d7ee9c1ea594e310c5bc7cbf4b8639fe5e7 -- To view, visit https://gerrit.wikimedia.org/r/116759 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I876d28fe30215e3729a9deb4d5073939bef7cb5b Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: wmf/1.23wmf16 Gerrit-Owner: Manybubbles never...@wikimedia.org Gerrit-Reviewer: Chad ch...@wikimedia.org Gerrit-Reviewer: Manybubbles never...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Formatter showing details of TimeValue in diffs. - change (mediawiki...Wikibase)
Daniel Kinzler has uploaded a new change for review.
https://gerrit.wikimedia.org/r/116761
Change subject: Formatter showing details of TimeValue in diffs.
..
Formatter showing details of TimeValue in diffs.
Change-Id: I29c083b31c6bf269f0e7bb9c211c266489aef9a7
---
M lib/WikibaseLib.i18n.php
A lib/includes/formatters/TimeDetailsFormatter.php
M lib/includes/formatters/WikibaseValueFormatterBuilders.php
A lib/tests/phpunit/formatters/TimeDetailsFormatterTest.php
4 files changed, 191 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/61/116761/1
diff --git a/lib/WikibaseLib.i18n.php b/lib/WikibaseLib.i18n.php
index e584eed..d673aa2 100644
--- a/lib/WikibaseLib.i18n.php
+++ b/lib/WikibaseLib.i18n.php
@@ -52,6 +52,13 @@
'wikibase-quantitydetails-upperbound' = 'Upper bound',
'wikibase-quantitydetails-lowerbound' = 'Lower bound',
'wikibase-quantitydetails-unit' = 'Unit',
+ 'wikibase-timedetails-time' = 'Time',
+ 'wikibase-timedetails-isotime' = 'ISO Timestamp',
+ 'wikibase-timedetails-timezone' = 'Timezone',
+ 'wikibase-timedetails-calendar' = 'Calendar',
+ 'wikibase-timedetails-precision' = 'Amount',
+ 'wikibase-timedetails-before' = 'Before',
+ 'wikibase-timedetails-after' = 'After',
'wikibase-replicationnote' = 'Please notice that it can take several
minutes until the changes are visible on all wikis.',
'wikibase-sitelinks-wikipedia' = 'Wikipedia pages linked to this item',
'wikibase-sitelinks-sitename-columnheading' = 'Language',
@@ -159,6 +166,13 @@
'wikibase-quantitydetails-lowerbound' = 'Label used for the lower
bound field of a quantity value when showing a detailed representation of the
quantity, e.g. in a diff.',
'wikibase-quantitydetails-unit' = 'Label used for the unit field of
a quantity value when showing a detailed representation of the quantity, e.g.
in a diff.
{{Identical|Unit}}',
+ 'wikibase-timedetails-time' = 'Label used for the rendered version of
a time value when showing a detailed representation of the time, e.g. in a
diff.',
+ 'wikibase-timedetails-isotime' = 'Label used for the isotime field
of a time value when showing a detailed representation of the time, e.g. in a
diff.',
+ 'wikibase-timedetails-timezone' = 'Label used for the timezone field
of a time value when showing a detailed representation of the time, e.g. in a
diff.',
+ 'wikibase-timedetails-calendar' = 'Label used for the calendar field
of a time value when showing a detailed representation of the time, e.g. in a
diff.',
+ 'wikibase-timedetails-precision' = 'Label used for the precision
field of a time value when showing a detailed representation of the time, e.g.
in a diff.',
+ 'wikibase-timedetails-before' = 'Label used for the before field of
a time value when showing a detailed representation of the time, e.g. in a
diff.',
+ 'wikibase-timedetails-after' = 'Label used for the after field of a
time value when showing a detailed representation of the time, e.g. in a diff.',
'wikibase-replicationnote' = 'Note telling the user that it can take a
few minutes until the made changes are visible on all wikis.
Preceded by message {{msg-mw|Wikibase-linkitem-success-link}}',
'wikibase-sitelinks-wikipedia' = '[[File:Screenshot WikidataRepo
2012-05-13 A.png|right|0x150px]]
diff --git a/lib/includes/formatters/TimeDetailsFormatter.php
b/lib/includes/formatters/TimeDetailsFormatter.php
new file mode 100644
index 000..6fa5a86
--- /dev/null
+++ b/lib/includes/formatters/TimeDetailsFormatter.php
@@ -0,0 +1,104 @@
+?php
+
+namespace Wikibase\Lib;
+
+use DataValues\TimeValue;
+use Html;
+use InvalidArgumentException;
+use Message;
+use ValueFormatters\FormatterOptions;
+use ValueFormatters\Test\MwTimeIsoFormatterTest;
+use ValueFormatters\TimeFormatter;
+use ValueFormatters\ValueFormatter;
+use ValueFormatters\ValueFormatterBase;
+
+/**
+ * Formatter for rendering the details of a TimeValue (most useful for diffs)
in HTML.
+ *
+ * @since 0.5
+ *
+ * @licence GNU GPL v2+
+ * @author Daniel Kinzler
+ */
+class TimeDetailsFormatter extends ValueFormatterBase {
+
+ /**
+* @var MwTimeIsoFormatter
+*/
+ protected $isoTimeFormatter;
+
+ /**
+* @param FormatterOptions $options
+*/
+ public function __construct( FormatterOptions $options ) {
+ parent::__construct( $options );
+
+ $this-isoTimeFormatter = new MwTimeIsoFormatter( $options );
+ }
+
+ /**
+* Generates HTML representing the details of a TimeValue,
+* as an itemized list.
+*
+* @since 0.5
+*
+* @param TimeValue $value The ID to format
+*
+* @return string
+* @throws InvalidArgumentException
+
[MediaWiki-commits] [Gerrit] Check leading and trailing whitespace - change (mediawiki...Wikibase)
Addshore has submitted this change and it was merged.
Change subject: Check leading and trailing whitespace
..
Check leading and trailing whitespace
Change-Id: I16f9fbc7214cc4079d5bbabb1e937ba8e71defdd
---
M lib/tests/phpunit/WikibaseDataTypeBuildersTest.php
1 file changed, 7 insertions(+), 2 deletions(-)
Approvals:
WikidataJenkins: Verified
Addshore: Looks good to me, approved
jenkins-bot: Checked
diff --git a/lib/tests/phpunit/WikibaseDataTypeBuildersTest.php
b/lib/tests/phpunit/WikibaseDataTypeBuildersTest.php
index 7063ed0..0582ff1 100644
--- a/lib/tests/phpunit/WikibaseDataTypeBuildersTest.php
+++ b/lib/tests/phpunit/WikibaseDataTypeBuildersTest.php
@@ -68,7 +68,8 @@
array( 'commonsMedia', new StringValue( 'Foo/bar.jpg'
), false, 'illegal character: slash' ),
array( 'commonsMedia', new StringValue( 'Foo\bar.jpg'
), false, 'illegal character: backslash' ),
array( 'commonsMedia', new StringValue( 'Äöü.jpg' ),
true, 'Unicode support' ),
- array( 'commonsMedia', new StringValue( ' Foo.jpg ' ),
false, 'Untrimmed input is forbidden' ),
+ array( 'commonsMedia', new StringValue( ' Foo.jpg' ),
false, 'media name with leading space' ),
+ array( 'commonsMedia', new StringValue( 'Foo.jpg ' ),
false, 'media name with trailing space' ),
//string
array( 'string', 'Foo', false, 'StringValue expected,
string supplied' ),
@@ -78,7 +79,8 @@
array( 'string', new StringValue( 'Äöü' ), true,
'Unicode support' ),
array( 'string', new StringValue( str_repeat('x', 390)
), true, 'long, but not too long' ),
array( 'string', new StringValue( str_repeat('x', 401)
), false, 'too long' ),
- array( 'string', new StringValue( ' Foo ' ), false,
'Untrimmed' ),
+ array( 'string', new StringValue( ' Foo' ), false,
'string with leading space' ),
+ array( 'string', new StringValue( 'Foo ' ), false,
'string with trailing space' ),
//time
array( 'time', 'Foo', false, 'TimeValue expected,
string supplied' ),
@@ -153,6 +155,9 @@
array( 'url', new StringValue(
'javascript:alert(evil)' ), false, 'JavaScript URL' ),
array( 'url', new StringValue( 'http://' ), false, 'bad
http URL' ),
array( 'url', new StringValue( 'http://' .
str_repeat('x', 505) ), false, 'URL too long' ),
+
+ array( 'url', new StringValue( ' http://acme.com' ),
false, 'URL with leading space' ),
+ array( 'url', new StringValue( 'http://acme.com ' ),
false, 'URL with trailing space' ),
);
if ( defined( 'WB_EXPERIMENTAL_FEATURES' )
WB_EXPERIMENTAL_FEATURES ) {
--
To view, visit https://gerrit.wikimedia.org/r/116751
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I16f9fbc7214cc4079d5bbabb1e937ba8e71defdd
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Daniel Kinzler daniel.kinz...@wikimedia.de
Gerrit-Reviewer: Addshore addshorew...@gmail.com
Gerrit-Reviewer: Jens Ohlig jens.oh...@wikimedia.de
Gerrit-Reviewer: Tobias Gritschacher tobias.gritschac...@wikimedia.de
Gerrit-Reviewer: WikidataJenkins wikidata-servi...@wikimedia.de
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add groups for wikipedia-android - change (translatewiki)
jenkins-bot has submitted this change and it was merged.
Change subject: Add groups for wikipedia-android
..
Add groups for wikipedia-android
Check out from https://github.com/wikimedia/apps-android-wikipedia.git
Requires Translate extension update Ie05a4840 for descriptions
Change-Id: I907de1904d98f8f5d3dda1a3271b86e0024bf19e
---
M REPOCONF
M REPOCONF.siebrand
M bin/repocommit
M bin/repocreate
M bin/repoexport
M bin/repoupdate
M groups/Wikimedia/WikimediaMobile-android.yaml
M groups/Wikimedia/WikimediaMobile.yaml
8 files changed, 37 insertions(+), 0 deletions(-)
Approvals:
Nikerabbit: Looks good to me, approved
jenkins-bot: Verified
diff --git a/REPOCONF b/REPOCONF
index e64a44b..97d01dd 100644
--- a/REPOCONF
+++ b/REPOCONF
@@ -38,6 +38,7 @@
REPO_WIKIA_BRANCH=dev
REPO_WIKIBLAME=svn://svn.code.sf.net/p/wikiblame/code/wikiblame_inc
REPO_WIKIMANIA=https://gerrit.wikimedia.org/r/wikimedia/wikimania-scholarships
+REPO_WIKIPEDIAANDROID=https://gerrit.wikimedia.org/r/apps/android/wikipedia
REPO_WIKIPEDIAIOS=https://gerrit.wikimedia.org/r/apps/ios/wikipedia
REPO_WIKIPEDIAMOBILE=git://github.com/wikimedia/WikipediaMobile.git
REPO_WIKIPEDIAMOBILEJ2ME=git://github.com/wikimedia/WikipediaMobileJ2ME.git
diff --git a/REPOCONF.siebrand b/REPOCONF.siebrand
index 0421a08..a8bb9f1 100644
--- a/REPOCONF.siebrand
+++ b/REPOCONF.siebrand
@@ -38,6 +38,7 @@
REPO_WIKIA_BRANCH=dev
REPO_WIKIBLAME=svn://svn.code.sf.net/p/wikiblame/code/wikiblame_inc
REPO_WIKIMANIA=ssh://l10n-...@gerrit.wikimedia.org:29418/wikimedia/wikimania-scholarships
+REPO_WIKIPEDIAANDROID=ssh://l10n-...@gerrit.wikimedia.org:29418/apps/android/wikipedia
REPO_WIKIPEDIAIOS=ssh://l10n-...@gerrit.wikimedia.org:29418/apps/ios/wikipedia
REPO_WIKIPEDIAMOBILE=g...@github.com:wikimedia/WikipediaMobile.git
REPO_WIKIPEDIAMOBILEJ2ME=g...@github.com:wikimedia/WikipediaMobileJ2ME.git
diff --git a/bin/repocommit b/bin/repocommit
index 21514b7..05bf85d 100755
--- a/bin/repocommit
+++ b/bin/repocommit
@@ -84,6 +84,7 @@
commons-ios \
pywikibot \
wikimania \
+wikipedia-android \
wikipedia-ios
for i in $GERRITPROJECTS; do
diff --git a/bin/repocreate b/bin/repocreate
index 7bc4a29..2cfc9c2 100755
--- a/bin/repocreate
+++ b/bin/repocreate
@@ -291,6 +291,19 @@
gitCreateGerrit
fi
+elif [ $PROJECT = wikipedia-android ]
+then
+ if [ -z $REPO_WIKIPEDIAANDROID ]
+ then echo Add REPO_WIKIPEDIAANDROID to REPOCONF; exit 1
+ fi
+
+ git clone $REPO_WIKIPEDIAANDROID $PROJECT
+ if [ $REPO_RW = yes ]
+ then
+ cd $PROJECT
+ gitCreateGerrit
+ fi
+
elif [ $PROJECT = wikipedia-ios ]
then
if [ -z $REPO_WIKIPEDIAIOS ]
diff --git a/bin/repoexport b/bin/repoexport
index f7c64f3..10d030e 100755
--- a/bin/repoexport
+++ b/bin/repoexport
@@ -183,6 +183,11 @@
php $EXPORTER --target . --group=out-wikimania-scholarships-app
--lang '*' --skip en,qqq $THRESHOLD
php $EXPORTER --target . --group=out-wikimania-scholarships-app
--lang qqq
+elif [ $PROJECT = wikipedia-android ]
+then
+ php $EXPORTER --target .
--group=out-wikimedia-mobile-wikipedia-android* --lang '*' --skip en,qqq
$THRESHOLD
+ php $EXPORTER --target .
--group=out-wikimedia-mobile-wikipedia-android* --lang qqq
+
elif [ $PROJECT = wikipedia-ios ]
then
php $EXPORTER --target . --group=out-wikimedia-mobile-wikipedia-ios*
--lang '*' --skip en,qqq $THRESHOLD
diff --git a/bin/repoupdate b/bin/repoupdate
index d0fd908..9909baf 100755
--- a/bin/repoupdate
+++ b/bin/repoupdate
@@ -87,6 +87,7 @@
vicuna \
waymarked-trails-site \
wikimania \
+wikipedia-android \
wikipedia-ios \
WikipediaMobile \
WikipediaMobileJ2ME \
diff --git a/groups/Wikimedia/WikimediaMobile-android.yaml
b/groups/Wikimedia/WikimediaMobile-android.yaml
index 467f680..562091b 100644
--- a/groups/Wikimedia/WikimediaMobile-android.yaml
+++ b/groups/Wikimedia/WikimediaMobile-android.yaml
@@ -229,3 +229,17 @@
FILES:
sourcePattern:
%GROUPROOT%/commons-android/commons/res/values-%CODE%/error.xml
definitionFile: %GROUPROOT%/commons-android/commons/res/values/error.xml
+
+---
+BASIC:
+ description:
{{int:translate-group-desc-wikimedia-mobile-wikipedia-android}}
+ icon: wiki://Wikipedia-logo-v2.svg
+ id: out-wikimedia-mobile-wikipedia-android-strings
+ label: Wikipedia Android Mobile
+
+MANGLER:
+ prefix: wikipedia-android-strings-
+
+FILES:
+ sourcePattern:
%GROUPROOT%/wikipedia-android/commons/res/values-%CODE%/strings.xml
+ definitionFile: %GROUPROOT%/wikipedia-android/commons/res/values/strings.xml
diff --git a/groups/Wikimedia/WikimediaMobile.yaml
b/groups/Wikimedia/WikimediaMobile.yaml
index b9da6e3..947ea93 100644
--- a/groups/Wikimedia/WikimediaMobile.yaml
+++ b/groups/Wikimedia/WikimediaMobile.yaml
@@ -19,6 +19,7 @@
GROUPS:
- out-wikimedia-mobile-commons-android-0-all
+ -
[MediaWiki-commits] [Gerrit] Add group description for wikipedia-android - change (mediawiki...Translate)
jenkins-bot has submitted this change and it was merged. Change subject: Add group description for wikipedia-android .. Add group description for wikipedia-android Needed for I907de19 Change-Id: Ie05a484099d68845e81df180200a033cdfd32315 --- M i18n/groupdescriptions/en.json 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Nikerabbit: Looks good to me, approved jenkins-bot: Verified diff --git a/i18n/groupdescriptions/en.json b/i18n/groupdescriptions/en.json index 9bfe9be..c61de51 100644 --- a/i18n/groupdescriptions/en.json +++ b/i18n/groupdescriptions/en.json @@ -47,6 +47,7 @@ translate-group-desc-wikimedia-mobile: Aggregated message group containing mobile applications for Wikimedia projects, translate-group-desc-wikimedia-mobile-commons: [[Translating:WikipediaMobile|Commons Mobile]] is an app for Android or iOS for uploading and browsing Wikimedia Commons, translate-group-desc-wikimedia-mobile-wikipedia: [[Translating:WikipediaMobile|WikipediaMobile]] is a cross-platform mobile and tablet application for reading and contributing to Wikipedia, +translate-group-desc-wikimedia-mobile-wikipedia-android: [[Translating:WikipediaMobile|Wikipedia Android]] is the Android-specific version of the Wikipedia mobile app (new 2014), translate-group-desc-wikimedia-mobile-wikipedia-ios: [[Translating:WikipediaMobile|Wikipedia iOS]] is the iOS-specific version of the Wikipedia mobile app (new 2014); main strings list, translate-group-desc-wikimedia-mobile-wikipedia-ios-meta: [[Translating:WikipediaMobile|Wikipedia iOS]] is the iOS-specific version of the Wikipedia mobile app (new 2014); app metadata subcomponent, translate-group-desc-wikimedia-mobile-wikipedia-ios-ui: [[Translating:WikipediaMobile|Wikipedia iOS]] is the iOS-specific version of the Wikipedia mobile app (new 2014); user interface subcomponent, -- To view, visit https://gerrit.wikimedia.org/r/116141 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ie05a484099d68845e81df180200a033cdfd32315 Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/extensions/Translate Gerrit-Branch: master Gerrit-Owner: Brion VIBBER br...@wikimedia.org 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] Display old before new revision in rt-server views - change (mediawiki...parsoid)
jenkins-bot has submitted this change and it was merged.
Change subject: Display old before new revision in rt-server views
..
Display old before new revision in rt-server views
Change-Id: I19e52bf6251e91d7452bb907970f144ba0448a2f
---
M tests/server/server.js
1 file changed, 9 insertions(+), 9 deletions(-)
Approvals:
Marcoil: Looks good to me, approved
jenkins-bot: Verified
diff --git a/tests/server/server.js b/tests/server/server.js
index 5dddf73..e1a8e4e 100755
--- a/tests/server/server.js
+++ b/tests/server/server.js
@@ -1147,22 +1147,22 @@
var makeRegressionRow = function(row) {
return [
pageTitleData(row),
- commitLinkData(row.new_commit, row.title, row.prefix),
- row.errors + | + row.fails + | + row.skips,
commitLinkData(row.old_commit, row.title, row.prefix),
- row.old_errors + | + row.old_fails + | + row.old_skips
+ row.old_errors + | + row.old_fails + | + row.old_skips,
+ commitLinkData(row.new_commit, row.title, row.prefix),
+ row.errors + | + row.fails + | + row.skips
];
};
var makeOneDiffRegressionRow = function(row) {
return [
pageTitleData(row),
- commitLinkData(row.new_commit, row.title, row.prefix),
commitLinkData(row.old_commit, row.title, row.prefix),
+ commitLinkData(row.new_commit, row.title, row.prefix)
];
};
-var regressionsHeaderData = ['Title', 'New Commit', 'Errors|Fails|Skips', 'Old
Commit', 'Errors|Fails|Skips'];
+var regressionsHeaderData = ['Title', 'Old Commit', 'Errors|Fails|Skips', 'New
Commit', 'Errors|Fails|Skips'];
var GET_regressions = function( req, res ) {
var r1 = req.params[0];
@@ -1203,7 +1203,7 @@
urlSuffix: '',
heading: 'Flagged regressions between selected
revisions: ' +
row[0].numFlaggedRegressions,
- subheading: 'New Commit: semantic diffs | Old
Commit: only syntactic diffs',
+ subheading: 'Old Commit: only syntactic diffs |
New Commit: semantic diffs',
headingLink: [
{name: 'one fail regressions',
info: 'one new semantic diff,
previously perfect',
@@ -1245,7 +1245,7 @@
row[0].numFlaggedRegressions,
subheading: subheading,
headingLink: headingLink,
- header: ['Title', 'New Commit', 'Old Commit']
+ header: ['Title', 'Old Commit', 'New Commit']
};
db.query(dbOneDiffRegressionsBetweenRevs, [r2, r1,
numFails, numSkips, offset],
displayPageList.bind(null, res, data,
makeOneDiffRegressionRow));
@@ -1254,12 +1254,12 @@
};
var GET_oneFailRegressions = displayOneDiffRegressions.bind(
- null, 1, 0, 'New Commit: one semantic diff | Old Commit: perfect',
+ null, 1, 0, 'Old Commit: perfect | New Commit: one semantic diff',
['one skip regressions', 'one new syntactic diff, previously perfect',
'oneskip']
);
var GET_oneSkipRegressions = displayOneDiffRegressions.bind(
- null, 0, 1, 'New Commit: one syntactic diff | Old Commit: perfect',
+ null, 0, 1, 'Old Commit: perfect | New Commit: one syntactic diff',
['one fail regressions', 'one new semantic diff, previously perfect',
'onefail']
);
--
To view, visit https://gerrit.wikimedia.org/r/116264
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I19e52bf6251e91d7452bb907970f144ba0448a2f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/parsoid
Gerrit-Branch: master
Gerrit-Owner: Bebirchall bebirch...@gmail.com
Gerrit-Reviewer: Marcoil marc...@wikimedia.org
Gerrit-Reviewer: Subramanya Sastry ssas...@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] Correct paths for I907de1 - change (translatewiki)
Nikerabbit has uploaded a new change for review. https://gerrit.wikimedia.org/r/116762 Change subject: Correct paths for I907de1 .. Correct paths for I907de1 Change-Id: Ibd202a8beefb57d5c90e06f93ca7afb190ba3ccc --- M groups/Wikimedia/WikimediaMobile-android.yaml 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/translatewiki refs/changes/62/116762/1 diff --git a/groups/Wikimedia/WikimediaMobile-android.yaml b/groups/Wikimedia/WikimediaMobile-android.yaml index 562091b..79cab73 100644 --- a/groups/Wikimedia/WikimediaMobile-android.yaml +++ b/groups/Wikimedia/WikimediaMobile-android.yaml @@ -241,5 +241,5 @@ prefix: wikipedia-android-strings- FILES: - sourcePattern: %GROUPROOT%/wikipedia-android/commons/res/values-%CODE%/strings.xml - definitionFile: %GROUPROOT%/wikipedia-android/commons/res/values/strings.xml + sourcePattern: %GROUPROOT%/wikipedia-android/wikipedia/res/values-%CODE%/strings.xml + definitionFile: %GROUPROOT%/wikipedia-android/wikipedia/res/values/strings.xml -- To view, visit https://gerrit.wikimedia.org/r/116762 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ibd202a8beefb57d5c90e06f93ca7afb190ba3ccc Gerrit-PatchSet: 1 Gerrit-Project: translatewiki Gerrit-Branch: master Gerrit-Owner: Nikerabbit niklas.laxst...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Correct paths for I907de1 - change (translatewiki)
jenkins-bot has submitted this change and it was merged. Change subject: Correct paths for I907de1 .. Correct paths for I907de1 Change-Id: Ibd202a8beefb57d5c90e06f93ca7afb190ba3ccc --- M groups/Wikimedia/WikimediaMobile-android.yaml 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Nikerabbit: Looks good to me, approved jenkins-bot: Verified diff --git a/groups/Wikimedia/WikimediaMobile-android.yaml b/groups/Wikimedia/WikimediaMobile-android.yaml index 562091b..79cab73 100644 --- a/groups/Wikimedia/WikimediaMobile-android.yaml +++ b/groups/Wikimedia/WikimediaMobile-android.yaml @@ -241,5 +241,5 @@ prefix: wikipedia-android-strings- FILES: - sourcePattern: %GROUPROOT%/wikipedia-android/commons/res/values-%CODE%/strings.xml - definitionFile: %GROUPROOT%/wikipedia-android/commons/res/values/strings.xml + sourcePattern: %GROUPROOT%/wikipedia-android/wikipedia/res/values-%CODE%/strings.xml + definitionFile: %GROUPROOT%/wikipedia-android/wikipedia/res/values/strings.xml -- To view, visit https://gerrit.wikimedia.org/r/116762 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ibd202a8beefb57d5c90e06f93ca7afb190ba3ccc Gerrit-PatchSet: 1 Gerrit-Project: translatewiki Gerrit-Branch: master Gerrit-Owner: Nikerabbit niklas.laxst...@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] Formatter showing details of GlobeCoordinateValue - change (mediawiki...Wikibase)
Daniel Kinzler has uploaded a new change for review.
https://gerrit.wikimedia.org/r/116763
Change subject: Formatter showing details of GlobeCoordinateValue
..
Formatter showing details of GlobeCoordinateValue
Change-Id: Iad4fa6227a5ff39ee49dbbe03d57c593bbb91ddc
---
M lib/WikibaseLib.i18n.php
A lib/includes/formatters/GlobeCoordinateDetailsFormatter.php
M lib/includes/formatters/WikibaseValueFormatterBuilders.php
A lib/tests/phpunit/formatters/GlobeCoordinateDetailsFormatterTest.php
4 files changed, 170 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/63/116763/1
diff --git a/lib/WikibaseLib.i18n.php b/lib/WikibaseLib.i18n.php
index d673aa2..bb879bb 100644
--- a/lib/WikibaseLib.i18n.php
+++ b/lib/WikibaseLib.i18n.php
@@ -59,6 +59,10 @@
'wikibase-timedetails-precision' = 'Amount',
'wikibase-timedetails-before' = 'Before',
'wikibase-timedetails-after' = 'After',
+ 'wikibase-globedetails-longitude' = 'Longitude',
+ 'wikibase-globedetails-latitude' = 'Latitude',
+ 'wikibase-globedetails-precision' = 'precision',
+ 'wikibase-globedetails-globe' = 'Globe',
'wikibase-replicationnote' = 'Please notice that it can take several
minutes until the changes are visible on all wikis.',
'wikibase-sitelinks-wikipedia' = 'Wikipedia pages linked to this item',
'wikibase-sitelinks-sitename-columnheading' = 'Language',
@@ -173,6 +177,10 @@
'wikibase-timedetails-precision' = 'Label used for the precision
field of a time value when showing a detailed representation of the time, e.g.
in a diff.',
'wikibase-timedetails-before' = 'Label used for the before field of
a time value when showing a detailed representation of the time, e.g. in a
diff.',
'wikibase-timedetails-after' = 'Label used for the after field of a
time value when showing a detailed representation of the time, e.g. in a diff.',
+ 'wikibase-globedetails-longitude' = 'Label used for the longitude
field of a globecoordinate value when showing a detailed representation of the
time, e.g. in a diff.',
+ 'wikibase-globedetails-latitude' = 'Label used for the latitude
field of a globecoordinate value when showing a detailed representation of the
time, e.g. in a diff.',
+ 'wikibase-globedetails-precision' = 'Label used for the precision
field of a globecoordinate value when showing a detailed representation of the
time, e.g. in a diff.',
+ 'wikibase-globedetails-globe' = 'Label used for the globe field of a
globecoordinate value when showing a detailed representation of the time, e.g.
in a diff.',
'wikibase-replicationnote' = 'Note telling the user that it can take a
few minutes until the made changes are visible on all wikis.
Preceded by message {{msg-mw|Wikibase-linkitem-success-link}}',
'wikibase-sitelinks-wikipedia' = '[[File:Screenshot WikidataRepo
2012-05-13 A.png|right|0x150px]]
diff --git a/lib/includes/formatters/GlobeCoordinateDetailsFormatter.php
b/lib/includes/formatters/GlobeCoordinateDetailsFormatter.php
new file mode 100644
index 000..8c5a666
--- /dev/null
+++ b/lib/includes/formatters/GlobeCoordinateDetailsFormatter.php
@@ -0,0 +1,91 @@
+?php
+
+namespace Wikibase\Lib;
+
+use DataValues\GlobeCoordinateValue;
+use Html;
+use InvalidArgumentException;
+use Message;
+use NumberFormatter;
+use ValueFormatters\DecimalFormatter;
+use ValueFormatters\FormatterOptions;
+use ValueFormatters\ValueFormatter;
+use ValueFormatters\ValueFormatterBase;
+
+/**
+ * Formatter for rendering the details of a GlobeCoordinateValue (most useful
for diffs) in HTML.
+ *
+ * @since 0.5
+ *
+ * @licence GNU GPL v2+
+ * @author Daniel Kinzler
+ */
+class GlobeCoordinateDetailsFormatter extends ValueFormatterBase {
+
+ /**
+* @param FormatterOptions $options
+*/
+ public function __construct( FormatterOptions $options ) {
+ parent::__construct( $options );
+ }
+
+ /**
+* Generates HTML representing the details of a GlobeCoordinateValue,
+* as an itemized list.
+*
+* @since 0.5
+*
+* @param GlobeCoordinateValue $value The ID to format
+*
+* @return string
+* @throws InvalidArgumentException
+*/
+ public function format( $value ) {
+ if ( !( $value instanceof GlobeCoordinateValue ) ) {
+ throw new InvalidArgumentException( 'Data value type
mismatch. Expected an GlobeCoordinateValue.' );
+ }
+
+ $html = '';
+ $html .= Html::openElement( 'dl', array( 'class' =
'wikibase-details wikibase-globe-details' ) );
+
+ //TODO: nicer formatting and localization of numbers.
+ $html .= $this-renderLabelValuePair( 'latitude',
htmlspecialchars( strval(
[MediaWiki-commits] [Gerrit] Send 404 to rt clients when there aren't any more pages to test - change (mediawiki...parsoid)
Marcoil has uploaded a new change for review.
https://gerrit.wikimedia.org/r/116764
Change subject: Send 404 to rt clients when there aren't any more pages to test
..
Send 404 to rt clients when there aren't any more pages to test
Change-Id: Ie8ccab3fe34ff61a577dde620c84f69a14d055a6
---
M tests/server/server.js
1 file changed, 3 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/parsoid
refs/changes/64/116764/1
diff --git a/tests/server/server.js b/tests/server/server.js
index e1a8e4e..8b5ee33 100755
--- a/tests/server/server.js
+++ b/tests/server/server.js
@@ -598,7 +598,9 @@
fetchedPages = fetchedPages.concat( newPages );
}
if ( fetchedPages.length === 0 ) {
- res.send( 'No available titles that fit the
constraints.', 200 );
+ // Send 404 to indicate no pages available now, clients
depend on
+ // this.
+ res.send( 'No available titles that fit the
constraints.', 404 );
} else {
var page = fetchedPages.pop();
--
To view, visit https://gerrit.wikimedia.org/r/116764
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie8ccab3fe34ff61a577dde620c84f69a14d055a6
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/parsoid
Gerrit-Branch: master
Gerrit-Owner: Marcoil marc...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove use of deprecated --extended argument to mwversionsinuse - change (operations/puppet)
Ottomata has submitted this change and it was merged. Change subject: Remove use of deprecated --extended argument to mwversionsinuse .. Remove use of deprecated --extended argument to mwversionsinuse This command flag was dropped from the backing php code in Id87a904. Scap would like to reimplement the mwversionsinuse script in I0db1c73 without supporting the now vestigial command flag. Change-Id: I367ac550311027def629c31e055cf4ccb28f8ca6 --- M files/misc/l10nupdate/l10nupdate-1 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Ottomata: Verified; Looks good to me, approved diff --git a/files/misc/l10nupdate/l10nupdate-1 b/files/misc/l10nupdate/l10nupdate-1 index 5ba96bc..b4ac9d3 100755 --- a/files/misc/l10nupdate/l10nupdate-1 +++ b/files/misc/l10nupdate/l10nupdate-1 @@ -45,7 +45,7 @@ echo git clone updated. # Get all MW message cache versions (and a wiki DB name for each) -mwVerDbSets=$($BINDIR/mwversionsinuse --extended --withdb) +mwVerDbSets=$($BINDIR/mwversionsinuse --withdb) if [ -z $mwVerDbSets ]; then $BINDIR/dologmsg !log LocalisationUpdate failed: mwversionsinuse returned empty list echo Obtaining MediaWiki version list FAILED -- To view, visit https://gerrit.wikimedia.org/r/116140 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I367ac550311027def629c31e055cf4ccb28f8ca6 Gerrit-PatchSet: 2 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: BryanDavis bda...@wikimedia.org Gerrit-Reviewer: Aaron Schulz asch...@wikimedia.org Gerrit-Reviewer: Faidon Liambotis fai...@wikimedia.org Gerrit-Reviewer: Mark Bergsma m...@wikimedia.org Gerrit-Reviewer: Ottomata o...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] add Icinga contactgroup for contint - change (operations/puppet)
Dzahn has submitted this change and it was merged.
Change subject: add Icinga contactgroup for contint
..
add Icinga contactgroup for contint
as requested by Hashar
RT #6966
the contact has been created in private repo
Change-Id: I23f7154671161d3b30b8581b671e6634d6ba76f4
---
M files/icinga/contactgroups.cfg
1 file changed, 6 insertions(+), 0 deletions(-)
Approvals:
jenkins-bot: Verified
Dzahn: Looks good to me, approved
diff --git a/files/icinga/contactgroups.cfg b/files/icinga/contactgroups.cfg
index 6e203dc..ba5924a 100644
--- a/files/icinga/contactgroups.cfg
+++ b/files/icinga/contactgroups.cfg
@@ -28,3 +28,9 @@
contactgroup_name parsoid
members rkattouw
}
+
+define contactgroup {
+ contactgroup_name contint
+ members amusso
+}
+
--
To view, visit https://gerrit.wikimedia.org/r/116765
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I23f7154671161d3b30b8581b671e6634d6ba76f4
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn dz...@wikimedia.org
Gerrit-Reviewer: Dzahn dz...@wikimedia.org
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] Remove stray whitespace from strings.xml - change (apps...wikipedia)
Brion VIBBER has uploaded a new change for review. https://gerrit.wikimedia.org/r/116766 Change subject: Remove stray whitespace from strings.xml .. Remove stray whitespace from strings.xml Change-Id: I25010d603028a5799b7585bc2078c0beea9d93ad --- M wikipedia/res/values/strings.xml 1 file changed, 3 insertions(+), 7 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia refs/changes/66/116766/1 diff --git a/wikipedia/res/values/strings.xml b/wikipedia/res/values/strings.xml index da03adb..7b3fc22 100644 --- a/wikipedia/res/values/strings.xml +++ b/wikipedia/res/values/strings.xml @@ -32,8 +32,7 @@ string name=toast_saved_page_deletedSaved page(s) deleted/string string name=last_updated_textLast updated %1$s/string -string name=content_license_html -![CDATA[Content is available under a class=\external\ rel=\nofollow\ href=\//creativecommons.org/licenses/by-sa/3.0/\CC BY-SA 3.0/a unless otherwise noted]]/string +string name=content_license_html![CDATA[Content is available under a class=\external\ rel=\nofollow\ href=\//creativecommons.org/licenses/by-sa/3.0/\CC BY-SA 3.0/a unless otherwise noted]]/string string name=preference_title_languageLanguage/string string name=preference_summary_languageContent language/string string name=nav_item_preferencesSettings/string @@ -53,9 +52,7 @@ string name=dialog_message_edit_failed_cancelCancel/string string name=menu_show_tocTable of Contents/string string name=search_no_results_foundNo results found/string -string name=edit_section_captcha_messageTo help protect against automated spam, please enter the words that -appear below -/string +string name=edit_section_captcha_messageTo help protect against automated spam, please enter the words that appear below/string string name=edit_section_captcha_hintRepeat words from above/string string name=title_captchaEnter captcha/string string name=edit_section_abusefilter_back_textMake changes to my edit/string @@ -71,8 +68,7 @@ string name=login_error_wrong_usernameIncorrect username/string string name=login_success_toastLogin Success!/string string name=login_error_blockedThis user has been blocked/string -string name=login_error_throttled -![CDATA[Too many login attempts. Wait for a few minutes try again?]]/string +string name=login_error_throttled![CDATA[Too many login attempts. Wait for a few minutes try again?]]/string string name=login_error_unknownLogin failed :(/string string name=login_error_no_networkNo network connection/string string name=nav_item_logoutLog out/string -- To view, visit https://gerrit.wikimedia.org/r/116766 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I25010d603028a5799b7585bc2078c0beea9d93ad Gerrit-PatchSet: 1 Gerrit-Project: apps/android/wikipedia Gerrit-Branch: master Gerrit-Owner: Brion VIBBER br...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove stray whitespace from strings.xml - change (apps...wikipedia)
Brion VIBBER has submitted this change and it was merged. Change subject: Remove stray whitespace from strings.xml .. Remove stray whitespace from strings.xml Change-Id: I25010d603028a5799b7585bc2078c0beea9d93ad --- M wikipedia/res/values/strings.xml 1 file changed, 3 insertions(+), 7 deletions(-) Approvals: Brion VIBBER: Verified; Looks good to me, approved diff --git a/wikipedia/res/values/strings.xml b/wikipedia/res/values/strings.xml index da03adb..7b3fc22 100644 --- a/wikipedia/res/values/strings.xml +++ b/wikipedia/res/values/strings.xml @@ -32,8 +32,7 @@ string name=toast_saved_page_deletedSaved page(s) deleted/string string name=last_updated_textLast updated %1$s/string -string name=content_license_html -![CDATA[Content is available under a class=\external\ rel=\nofollow\ href=\//creativecommons.org/licenses/by-sa/3.0/\CC BY-SA 3.0/a unless otherwise noted]]/string +string name=content_license_html![CDATA[Content is available under a class=\external\ rel=\nofollow\ href=\//creativecommons.org/licenses/by-sa/3.0/\CC BY-SA 3.0/a unless otherwise noted]]/string string name=preference_title_languageLanguage/string string name=preference_summary_languageContent language/string string name=nav_item_preferencesSettings/string @@ -53,9 +52,7 @@ string name=dialog_message_edit_failed_cancelCancel/string string name=menu_show_tocTable of Contents/string string name=search_no_results_foundNo results found/string -string name=edit_section_captcha_messageTo help protect against automated spam, please enter the words that -appear below -/string +string name=edit_section_captcha_messageTo help protect against automated spam, please enter the words that appear below/string string name=edit_section_captcha_hintRepeat words from above/string string name=title_captchaEnter captcha/string string name=edit_section_abusefilter_back_textMake changes to my edit/string @@ -71,8 +68,7 @@ string name=login_error_wrong_usernameIncorrect username/string string name=login_success_toastLogin Success!/string string name=login_error_blockedThis user has been blocked/string -string name=login_error_throttled -![CDATA[Too many login attempts. Wait for a few minutes try again?]]/string +string name=login_error_throttled![CDATA[Too many login attempts. Wait for a few minutes try again?]]/string string name=login_error_unknownLogin failed :(/string string name=login_error_no_networkNo network connection/string string name=nav_item_logoutLog out/string -- To view, visit https://gerrit.wikimedia.org/r/116766 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I25010d603028a5799b7585bc2078c0beea9d93ad Gerrit-PatchSet: 1 Gerrit-Project: apps/android/wikipedia Gerrit-Branch: master Gerrit-Owner: Brion VIBBER br...@wikimedia.org Gerrit-Reviewer: Brion VIBBER br...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Should be --os-region not --region - change (operations/puppet)
Andrew Bogott has uploaded a new change for review.
https://gerrit.wikimedia.org/r/116767
Change subject: Should be --os-region not --region
..
Should be --os-region not --region
Change-Id: I9472005e79efd9c3a88d981094e7ba9f89e5cf7d
---
M files/openstack/havana/virtscripts/dc-migrate
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/67/116767/1
diff --git a/files/openstack/havana/virtscripts/dc-migrate
b/files/openstack/havana/virtscripts/dc-migrate
index 68fed77..1d9c364 100755
--- a/files/openstack/havana/virtscripts/dc-migrate
+++ b/files/openstack/havana/virtscripts/dc-migrate
@@ -55,7 +55,7 @@
exit 1
fi
echo Creating initial image in $TOREGION
-CREATED=`cd /srv/org/wikimedia/controller/wikis/w php
./extensions/OpenStackManager/maintenance/createInstance.php --image
${FROMIMAGE} --flavor ${FROMFLAVOR} --instance ${INSTANCENAME} --project
${PROJECT} --region ${TOREGION} --securitygroups ${FROMSECURITY} --copypuppet
${FROMINSTANCE} --copypuppetregion ${FROMREGION}`
+CREATED=`cd /srv/org/wikimedia/controller/wikis/w php
./extensions/OpenStackManager/maintenance/createInstance.php --image
${FROMIMAGE} --flavor ${FROMFLAVOR} --instance ${INSTANCENAME} --project
${PROJECT} --os-region ${TOREGION} --securitygroups ${FROMSECURITY}
--copypuppet ${FROMINSTANCE} --copypuppetregion ${FROMREGION}`
if [ $CREATED != created instance. ]; then
echo ERROR: Failed to create new instance in ${TOREGION}
exit 1
--
To view, visit https://gerrit.wikimedia.org/r/116767
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I9472005e79efd9c3a88d981094e7ba9f89e5cf7d
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
[MediaWiki-commits] [Gerrit] Should be --os-region not --region - change (operations/puppet)
Andrew Bogott has submitted this change and it was merged.
Change subject: Should be --os-region not --region
..
Should be --os-region not --region
Change-Id: I9472005e79efd9c3a88d981094e7ba9f89e5cf7d
---
M files/openstack/havana/virtscripts/dc-migrate
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Andrew Bogott: Looks good to me, approved
jenkins-bot: Verified
diff --git a/files/openstack/havana/virtscripts/dc-migrate
b/files/openstack/havana/virtscripts/dc-migrate
index 68fed77..1d9c364 100755
--- a/files/openstack/havana/virtscripts/dc-migrate
+++ b/files/openstack/havana/virtscripts/dc-migrate
@@ -55,7 +55,7 @@
exit 1
fi
echo Creating initial image in $TOREGION
-CREATED=`cd /srv/org/wikimedia/controller/wikis/w php
./extensions/OpenStackManager/maintenance/createInstance.php --image
${FROMIMAGE} --flavor ${FROMFLAVOR} --instance ${INSTANCENAME} --project
${PROJECT} --region ${TOREGION} --securitygroups ${FROMSECURITY} --copypuppet
${FROMINSTANCE} --copypuppetregion ${FROMREGION}`
+CREATED=`cd /srv/org/wikimedia/controller/wikis/w php
./extensions/OpenStackManager/maintenance/createInstance.php --image
${FROMIMAGE} --flavor ${FROMFLAVOR} --instance ${INSTANCENAME} --project
${PROJECT} --os-region ${TOREGION} --securitygroups ${FROMSECURITY}
--copypuppet ${FROMINSTANCE} --copypuppetregion ${FROMREGION}`
if [ $CREATED != created instance. ]; then
echo ERROR: Failed to create new instance in ${TOREGION}
exit 1
--
To view, visit https://gerrit.wikimedia.org/r/116767
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I9472005e79efd9c3a88d981094e7ba9f89e5cf7d
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] Revert Should be --os-region not --region - change (operations/puppet)
Andrew Bogott has uploaded a new change for review.
https://gerrit.wikimedia.org/r/116769
Change subject: Revert Should be --os-region not --region
..
Revert Should be --os-region not --region
Nope!
This reverts commit 2f08614f7abe98173386d512586904bc7c076876.
Change-Id: I10ef095d0542e547e59ee1184a5b5ec150b0b684
---
M files/openstack/havana/virtscripts/dc-migrate
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/69/116769/1
diff --git a/files/openstack/havana/virtscripts/dc-migrate
b/files/openstack/havana/virtscripts/dc-migrate
index 1d9c364..68fed77 100755
--- a/files/openstack/havana/virtscripts/dc-migrate
+++ b/files/openstack/havana/virtscripts/dc-migrate
@@ -55,7 +55,7 @@
exit 1
fi
echo Creating initial image in $TOREGION
-CREATED=`cd /srv/org/wikimedia/controller/wikis/w php
./extensions/OpenStackManager/maintenance/createInstance.php --image
${FROMIMAGE} --flavor ${FROMFLAVOR} --instance ${INSTANCENAME} --project
${PROJECT} --os-region ${TOREGION} --securitygroups ${FROMSECURITY}
--copypuppet ${FROMINSTANCE} --copypuppetregion ${FROMREGION}`
+CREATED=`cd /srv/org/wikimedia/controller/wikis/w php
./extensions/OpenStackManager/maintenance/createInstance.php --image
${FROMIMAGE} --flavor ${FROMFLAVOR} --instance ${INSTANCENAME} --project
${PROJECT} --region ${TOREGION} --securitygroups ${FROMSECURITY} --copypuppet
${FROMINSTANCE} --copypuppetregion ${FROMREGION}`
if [ $CREATED != created instance. ]; then
echo ERROR: Failed to create new instance in ${TOREGION}
exit 1
--
To view, visit https://gerrit.wikimedia.org/r/116769
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I10ef095d0542e547e59ee1184a5b5ec150b0b684
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
[MediaWiki-commits] [Gerrit] Revert Should be --os-region not --region - change (operations/puppet)
Andrew Bogott has submitted this change and it was merged.
Change subject: Revert Should be --os-region not --region
..
Revert Should be --os-region not --region
Nope!
This reverts commit 2f08614f7abe98173386d512586904bc7c076876.
Change-Id: I10ef095d0542e547e59ee1184a5b5ec150b0b684
---
M files/openstack/havana/virtscripts/dc-migrate
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Andrew Bogott: Looks good to me, approved
jenkins-bot: Verified
diff --git a/files/openstack/havana/virtscripts/dc-migrate
b/files/openstack/havana/virtscripts/dc-migrate
index 1d9c364..68fed77 100755
--- a/files/openstack/havana/virtscripts/dc-migrate
+++ b/files/openstack/havana/virtscripts/dc-migrate
@@ -55,7 +55,7 @@
exit 1
fi
echo Creating initial image in $TOREGION
-CREATED=`cd /srv/org/wikimedia/controller/wikis/w php
./extensions/OpenStackManager/maintenance/createInstance.php --image
${FROMIMAGE} --flavor ${FROMFLAVOR} --instance ${INSTANCENAME} --project
${PROJECT} --os-region ${TOREGION} --securitygroups ${FROMSECURITY}
--copypuppet ${FROMINSTANCE} --copypuppetregion ${FROMREGION}`
+CREATED=`cd /srv/org/wikimedia/controller/wikis/w php
./extensions/OpenStackManager/maintenance/createInstance.php --image
${FROMIMAGE} --flavor ${FROMFLAVOR} --instance ${INSTANCENAME} --project
${PROJECT} --region ${TOREGION} --securitygroups ${FROMSECURITY} --copypuppet
${FROMINSTANCE} --copypuppetregion ${FROMREGION}`
if [ $CREATED != created instance. ]; then
echo ERROR: Failed to create new instance in ${TOREGION}
exit 1
--
To view, visit https://gerrit.wikimedia.org/r/116769
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I10ef095d0542e547e59ee1184a5b5ec150b0b684
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] Add a line specifying the nova api rate limits. - change (operations/puppet)
Andrew Bogott has submitted this change and it was merged. Change subject: Add a line specifying the nova api rate limits. .. Add a line specifying the nova api rate limits. This line doesn't change any of the defaults. I'm commiting this to establish a baseline... the next patch will actually change these limits, temporarily. Change-Id: Ie79b3c6f262ffb18d6db362a11f4182083fd2c78 --- M templates/openstack/folsom/nova/api-paste.ini.erb M templates/openstack/havana/nova/api-paste.ini.erb 2 files changed, 2 insertions(+), 0 deletions(-) Approvals: Andrew Bogott: Looks good to me, approved jenkins-bot: Verified diff --git a/templates/openstack/folsom/nova/api-paste.ini.erb b/templates/openstack/folsom/nova/api-paste.ini.erb index 269d956..5423e72 100644 --- a/templates/openstack/folsom/nova/api-paste.ini.erb +++ b/templates/openstack/folsom/nova/api-paste.ini.erb @@ -87,6 +87,7 @@ [filter:ratelimit] paste.filter_factory = nova.api.openstack.compute.limits:RateLimitingMiddleware.factory +limits =(POST, *, .*, 10, MINUTE);(POST, */servers, ^/servers, 50, DAY);(PUT, *, .*, 10, MINUTE);(GET, *changes-since*, .*changes-since.*, 3, MINUTE);(DELETE, *, .*, 100, MINUTE) [filter:sizelimit] paste.filter_factory = nova.api.sizelimit:RequestBodySizeLimiter.factory diff --git a/templates/openstack/havana/nova/api-paste.ini.erb b/templates/openstack/havana/nova/api-paste.ini.erb index 6a03bb3..2b36b0f 100644 --- a/templates/openstack/havana/nova/api-paste.ini.erb +++ b/templates/openstack/havana/nova/api-paste.ini.erb @@ -87,6 +87,7 @@ [filter:ratelimit] paste.filter_factory = nova.api.openstack.compute.limits:RateLimitingMiddleware.factory +limits =(POST, *, .*, 10, MINUTE);(POST, */servers, ^/servers, 50, DAY);(PUT, *, .*, 10, MINUTE);(GET, *changes-since*, .*changes-since.*, 3, MINUTE);(DELETE, *, .*, 100, MINUTE) [filter:sizelimit] paste.filter_factory = nova.api.sizelimit:RequestBodySizeLimiter.factory -- To view, visit https://gerrit.wikimedia.org/r/115614 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ie79b3c6f262ffb18d6db362a11f4182083fd2c78 Gerrit-PatchSet: 2 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] add Icinga contactgroup for contint - change (operations/puppet)
Dzahn has uploaded a new change for review.
https://gerrit.wikimedia.org/r/116765
Change subject: add Icinga contactgroup for contint
..
add Icinga contactgroup for contint
as requested by Hashar
RT #6966
the contact has been created in private repo
Change-Id: I23f7154671161d3b30b8581b671e6634d6ba76f4
---
M files/icinga/contactgroups.cfg
1 file changed, 6 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/65/116765/1
diff --git a/files/icinga/contactgroups.cfg b/files/icinga/contactgroups.cfg
index 6e203dc..ba5924a 100644
--- a/files/icinga/contactgroups.cfg
+++ b/files/icinga/contactgroups.cfg
@@ -28,3 +28,9 @@
contactgroup_name parsoid
members rkattouw
}
+
+define contactgroup {
+ contactgroup_name contint
+ members amusso
+}
+
--
To view, visit https://gerrit.wikimedia.org/r/116765
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I23f7154671161d3b30b8581b671e6634d6ba76f4
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn dz...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Send 404 to rt clients when there aren't any more pages to test - change (mediawiki...parsoid)
jenkins-bot has submitted this change and it was merged.
Change subject: Send 404 to rt clients when there aren't any more pages to test
..
Send 404 to rt clients when there aren't any more pages to test
Change-Id: Ie8ccab3fe34ff61a577dde620c84f69a14d055a6
---
M tests/server/server.js
1 file changed, 3 insertions(+), 1 deletion(-)
Approvals:
Subramanya Sastry: Looks good to me, approved
jenkins-bot: Verified
diff --git a/tests/server/server.js b/tests/server/server.js
index e1a8e4e..8b5ee33 100755
--- a/tests/server/server.js
+++ b/tests/server/server.js
@@ -598,7 +598,9 @@
fetchedPages = fetchedPages.concat( newPages );
}
if ( fetchedPages.length === 0 ) {
- res.send( 'No available titles that fit the
constraints.', 200 );
+ // Send 404 to indicate no pages available now, clients
depend on
+ // this.
+ res.send( 'No available titles that fit the
constraints.', 404 );
} else {
var page = fetchedPages.pop();
--
To view, visit https://gerrit.wikimedia.org/r/116764
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie8ccab3fe34ff61a577dde620c84f69a14d055a6
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/parsoid
Gerrit-Branch: master
Gerrit-Owner: Marcoil marc...@wikimedia.org
Gerrit-Reviewer: GWicke gwi...@wikimedia.org
Gerrit-Reviewer: Subramanya Sastry ssas...@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] Turn rate limits WAY up for nova api. - change (operations/puppet)
Andrew Bogott has submitted this change and it was merged. Change subject: Turn rate limits WAY up for nova api. .. Turn rate limits WAY up for nova api. This is a temporary change to allow for automated instance migration. This patch should be reverted after the migration is complete. Change-Id: Ie4967598f95b0258a1835a7c6376ab1e99f118cc --- M templates/openstack/folsom/nova/api-paste.ini.erb M templates/openstack/havana/nova/api-paste.ini.erb 2 files changed, 2 insertions(+), 2 deletions(-) Approvals: Andrew Bogott: Looks good to me, approved jenkins-bot: Verified diff --git a/templates/openstack/folsom/nova/api-paste.ini.erb b/templates/openstack/folsom/nova/api-paste.ini.erb index 5423e72..4ec0769 100644 --- a/templates/openstack/folsom/nova/api-paste.ini.erb +++ b/templates/openstack/folsom/nova/api-paste.ini.erb @@ -87,7 +87,7 @@ [filter:ratelimit] paste.filter_factory = nova.api.openstack.compute.limits:RateLimitingMiddleware.factory -limits =(POST, *, .*, 10, MINUTE);(POST, */servers, ^/servers, 50, DAY);(PUT, *, .*, 10, MINUTE);(GET, *changes-since*, .*changes-since.*, 3, MINUTE);(DELETE, *, .*, 100, MINUTE) +limits =(POST, *, .*, 30, MINUTE);(POST, */servers, ^/servers, 1, MINUTE);(PUT, *, .*, 30, MINUTE);(GET, *changes-since*, .*changes-since.*, 30, MINUTE);(DELETE, *, .*, 100, MINUTE) [filter:sizelimit] paste.filter_factory = nova.api.sizelimit:RequestBodySizeLimiter.factory diff --git a/templates/openstack/havana/nova/api-paste.ini.erb b/templates/openstack/havana/nova/api-paste.ini.erb index 2b36b0f..da9ffd2 100644 --- a/templates/openstack/havana/nova/api-paste.ini.erb +++ b/templates/openstack/havana/nova/api-paste.ini.erb @@ -87,7 +87,7 @@ [filter:ratelimit] paste.filter_factory = nova.api.openstack.compute.limits:RateLimitingMiddleware.factory -limits =(POST, *, .*, 10, MINUTE);(POST, */servers, ^/servers, 50, DAY);(PUT, *, .*, 10, MINUTE);(GET, *changes-since*, .*changes-since.*, 3, MINUTE);(DELETE, *, .*, 100, MINUTE) +limits =(POST, *, .*, 30, MINUTE);(POST, */servers, ^/servers, 1, MINUTE);(PUT, *, .*, 30, MINUTE);(GET, *changes-since*, .*changes-since.*, 30, MINUTE);(DELETE, *, .*, 100, MINUTE) [filter:sizelimit] paste.filter_factory = nova.api.sizelimit:RequestBodySizeLimiter.factory -- To view, visit https://gerrit.wikimedia.org/r/115615 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ie4967598f95b0258a1835a7c6376ab1e99f118cc Gerrit-PatchSet: 2 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] Giving ottomata (myself) ops icinga access - change (operations/puppet)
Ottomata has uploaded a new change for review. https://gerrit.wikimedia.org/r/116771 Change subject: Giving ottomata (myself) ops icinga access .. Giving ottomata (myself) ops icinga access RT 6967 Change-Id: Ia4420ed732873b5a9916473d2e3330de49292942 --- M files/icinga/cgi.cfg 1 file changed, 5 insertions(+), 5 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/71/116771/1 diff --git a/files/icinga/cgi.cfg b/files/icinga/cgi.cfg index b4ed114..6897c62 100644 --- a/files/icinga/cgi.cfg +++ b/files/icinga/cgi.cfg @@ -131,7 +131,7 @@ # not use authorization. You may use an asterisk (*) to # authorize any user who has authenticated to the web server. -authorized_for_system_information=tim starling,robh,mark bergsma,domas,ryan lane,arielglenn,cmjohnson,dzahn,jgreen,Faidon Liambotis,mwalker,katie horn,pgehres,catrope,alexandros kosiaris,springle,ori.livneh,gage,andrew bogott +authorized_for_system_information=tim starling,robh,mark bergsma,domas,ryan lane,arielglenn,cmjohnson,dzahn,jgreen,Faidon Liambotis,mwalker,katie horn,pgehres,catrope,alexandros kosiaris,springle,ori.livneh,gage,andrew bogott,ottomata # CONFIGURATION INFORMATION ACCESS @@ -142,7 +142,7 @@ # an asterisk (*) to authorize any user who has authenticated # to the web server. -authorized_for_configuration_information=tim starling,robh,mark bergsma,domas,ryan lane,arielglenn,cmjohnson,dzahn,jgreen,Faidon Liambotis,mwalker,katie horn,pgehres,catrope,alexandros kosiaris,springle,ori.livneh,gage,andrew bogott +authorized_for_configuration_information=tim starling,robh,mark bergsma,domas,ryan lane,arielglenn,cmjohnson,dzahn,jgreen,Faidon Liambotis,mwalker,katie horn,pgehres,catrope,alexandros kosiaris,springle,ori.livneh,gage,andrew bogott,ottomata @@ -155,7 +155,7 @@ # You may use an asterisk (*) to authorize any user who has # authenticated to the web server. -authorized_for_system_commands=tim starling,robh,mark bergsma,domas,ryan lane,arielglenn,cmjohnson,dzahn,jgreen,Faidon Liambotis,mwalker,katie horn,pgehres,catrope,alexandros kosiaris,springle,ori.livneh,gage,andrew bogott +authorized_for_system_commands=tim starling,robh,mark bergsma,domas,ryan lane,arielglenn,cmjohnson,dzahn,jgreen,Faidon Liambotis,mwalker,katie horn,pgehres,catrope,alexandros kosiaris,springle,ori.livneh,gage,andrew bogott,ottomata # GLOBAL HOST/SERVICE VIEW ACCESS @@ -181,8 +181,8 @@ # authorization). You may use an asterisk (*) to authorize any # user who has authenticated to the web server. -authorized_for_all_service_commands=tim starling,robh,mark bergsma,domas,ryan lane,arielglenn,cmjohnson,dzahn,jgreen,Faidon Liambotis,mwalker,katie horn,pgehres,catrope,alexandros kosiaris,springle,ori.livneh,gage,andrew bogott -authorized_for_all_host_commands=tim starling,robh,mark bergsma,domas,ryan lane,arielglenn,cmjohnson,dzahn,jgreen,Faidon Liambotis,mwalker,katie horn,pgehres,catrope,alexandros kosiaris,springle,ori.livneh,gage,andrew bogott +authorized_for_all_service_commands=tim starling,robh,mark bergsma,domas,ryan lane,arielglenn,cmjohnson,dzahn,jgreen,Faidon Liambotis,mwalker,katie horn,pgehres,catrope,alexandros kosiaris,springle,ori.livneh,gage,andrew bogott,ottomata +authorized_for_all_host_commands=tim starling,robh,mark bergsma,domas,ryan lane,arielglenn,cmjohnson,dzahn,jgreen,Faidon Liambotis,mwalker,katie horn,pgehres,catrope,alexandros kosiaris,springle,ori.livneh,gage,andrew bogott,ottomata -- To view, visit https://gerrit.wikimedia.org/r/116771 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ia4420ed732873b5a9916473d2e3330de49292942 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Ottomata o...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add more flowchart groupings for clarity of stages - change (mediawiki...releng)
Greg Grossmeier has submitted this change and it was merged.
Change subject: Add more flowchart groupings for clarity of stages
..
Add more flowchart groupings for clarity of stages
Added more groupings to show the stages/parts of the flowchart. Also forced
some 'linebreaks' ([folded] in blockdiag speak).
Change-Id: I5dbfdec87459951675265587eeb1d29e7a808939
---
M source/devdeployflow/devdeployflow.diag
1 file changed, 34 insertions(+), 16 deletions(-)
Approvals:
Greg Grossmeier: Looks good to me, approved
jenkins-bot: Verified
diff --git a/source/devdeployflow/devdeployflow.diag
b/source/devdeployflow/devdeployflow.diag
index 2d32cff..7581832 100644
--- a/source/devdeployflow/devdeployflow.diag
+++ b/source/devdeployflow/devdeployflow.diag
@@ -44,12 +44,12 @@
sec_bug_report - sec_dev
sec_dev - sec_patch_in_BZ
sec_patch_in_BZ - sec_patch_review
-sec_patch_review - sec_coord_deploy
+sec_patch_review - sec_coord_deploy [folded];
sec_coord_deploy - sec_deploy
sec_deploy - sec_get_cve
sec_get_cve - sec_coord_release
sec_coord_release - sec_release
-sec_release - sec_merge_master
+sec_release - sec_merge_master [folded];
group security_group {
fontsize = 16
@@ -59,13 +59,18 @@
}
// Bug stages
-report_bug [label = Report bug];
bug_reported [label = Bug reported];
bug_languish [label = Languish, color = red];
bug_reviewed [label = Reviewed/\nprioritized];
bug_assigned [label = BZ Status:\nAssigned\n(Optional)];
bug_patch [label = BZ Status:\nPatch in Gerrit];
-//bug_resolved [label = BZ Status:\nResolved/Fixed];
+
+group bug_group {
+fontsize = 16
+label = Bug Tracker
+color = grey
+bug_reported; bug_languish; bug_reviewed; bug_assigned;
+}
// Development stages
@@ -78,18 +83,27 @@
master [label = Code committed\n in master\n(+2)];
unit_tests_postcommit [label = Post-commit\nunit tests];
-beta_cluster [label = Code on Beta Cluster];
+group dev_group {
+fontsize = 16
+label = Development
+color = aqua
+dev; dev_labs_instance; patch_submission; code_reviews;
unit_tests_precommit; manual_testing_presubmit; master; unit_tests_postcommit;
+}
+
+
+beta_cluster [label = Beta Cluster\nupdated with\ncode];
manual_testing_beta [label = Manual testing\n(Beta Cluster)];
browser_tests_beta [label = Beta Cluster\nbrowser tests];
review_browsertest_beta [label = Manual review of \nBeta Cluster\nbrowser
tests];
verified_beta_breakage_cond [label = Verified\nbreakage\nin
Beta\nCluster?, shape = flowchart.condition, height = 100];
revert_beta [label = Revert offending commit];
+report_bug_beta [label = Report bug];
group beta_group {
fontsize = 16
label = Beta Cluster
color = lightgreen
-beta_cluster; manual_testing_beta; browser_tests_beta;
review_browsertest_beta; verified_beta_breakage_cond; revert_beta;
+beta_cluster; manual_testing_beta; browser_tests_beta;
review_browsertest_beta; verified_beta_breakage_cond; revert_beta;
report_bug_beta;
}
// Deployment stages
@@ -106,12 +120,13 @@
review_browsertest_prod [label = Manual review of\nproduction browser
tests];
verified_prod_breakage_cond [label = Verified\nbreakage?, shape =
flowchart.condition];
+success [label = Success!, color = green];
+
prod_fix_quick_cond [label = Fix production quickly?];
fix_prod [label = Fix production!];
backport_master [label = Backport fix\nto master];
prod_revert [label = Revert broken code];
-
-success [label = Success!, color = green];
+report_bug [label = Report bug];
//
// Connections / edges
@@ -122,7 +137,7 @@
// bug flow
bug_reported - bug_reviewed, bug_languish
bug_reviewed - bug_assigned
-bug_assigned - dev
+bug_assigned - dev [folded];
// dev flow
dev - dev_labs_instance
@@ -132,16 +147,18 @@
patch_submission - unit_tests_precommit [folded]
unit_tests_precommit - code_reviews
code_reviews - master
-master - beta_cluster, unit_tests_postcommit
+master - unit_tests_postcommit
+master - beta_cluster [folded];
-beta_cluster - manual_testing_beta, browser_tests_beta
+beta_cluster - browser_tests_beta
+beta_cluster - manual_testing_beta [folded];
browser_tests_beta - review_browsertest_beta
manual_testing_beta, review_browsertest_beta - verified_beta_breakage_cond
verified_beta_breakage_cond - revert_beta [label = Yes, textcolor=red]
verified_beta_breakage_cond - create_wmf_branch [label = No, textcolor
= green, folded];
-revert_beta - report_bug
+revert_beta - report_bug_beta
-create_wmf_branch - wmf_deploy_p0
+create_wmf_branch - wmf_deploy_p0 [folded];
wmf_deploy_p0 -
[MediaWiki-commits] [Gerrit] Use fixed header emulation only on iPad, not iPhone - change (mediawiki...MobileFrontend)
jenkins-bot has submitted this change and it was merged.
Change subject: Use fixed header emulation only on iPad, not iPhone
..
Use fixed header emulation only on iPad, not iPhone
Bug: 62120
Change-Id: Ib2e7274ad4be2e77f7518a84dc3026f5081a56f1
---
M javascripts/common/OverlayNew.js
1 file changed, 15 insertions(+), 10 deletions(-)
Approvals:
Jdlrobson: Looks good to me, approved
jenkins-bot: Verified
diff --git a/javascripts/common/OverlayNew.js b/javascripts/common/OverlayNew.js
index ffd90d6..b0e794c 100644
--- a/javascripts/common/OverlayNew.js
+++ b/javascripts/common/OverlayNew.js
@@ -29,16 +29,21 @@
if ( ( /ipad|iphone/i ).test( navigator.userAgent ) ) {
this.$( el ).
on( 'focus', function() {
- $header.css( 'top',
$window.scrollTop() ).removeClass( 'position-fixed' );
- $window.on(
'scroll.fixIosHeader', function() {
- $header.css( 'top',
$window.scrollTop() ).addClass( 'visible' );
- } );
- $window.on(
'touchmove.fixIosHeader', function() {
- // don't hide header if
we're at the top
- if (
$window.scrollTop() 0 ) {
-
$header.removeClass( 'visible' );
- }
- } );
+ $header.removeClass(
'position-fixed' );
+ // don't show fixed header on
iPhone, it causes bug 62120
+ // (also, there is a Done
button on the keyboard anyway)
+ if ( M.isWideScreen() ) {
+ $header.css( 'top',
$window.scrollTop() );
+ $window.on(
'scroll.fixIosHeader', function() {
+ $header.css(
'top', $window.scrollTop() ).addClass( 'visible' );
+ } );
+ $window.on(
'touchmove.fixIosHeader', function() {
+ // don't hide
header if we're at the top
+ if (
$window.scrollTop() 0 ) {
+
$header.removeClass( 'visible' );
+ }
+ } );
+ }
} ).
on( 'blur', function() {
$header.css( 'top', 0
).addClass( 'position-fixed visible' );
--
To view, visit https://gerrit.wikimedia.org/r/116690
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib2e7274ad4be2e77f7518a84dc3026f5081a56f1
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: JGonera jgon...@wikimedia.org
Gerrit-Reviewer: Jdlrobson jrob...@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] Make ButtonOptionWidget background transparent - change (oojs/ui)
Trevor Parscal has uploaded a new change for review.
https://gerrit.wikimedia.org/r/116772
Change subject: Make ButtonOptionWidget background transparent
..
Make ButtonOptionWidget background transparent
Change-Id: Id32b501599519119624d3a253372c3a0d8086e79
---
A src/themes/apex/widgets/OO.ui.ButtonOptionWidget.less
1 file changed, 8 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/72/116772/1
diff --git a/src/themes/apex/widgets/OO.ui.ButtonOptionWidget.less
b/src/themes/apex/widgets/OO.ui.ButtonOptionWidget.less
new file mode 100644
index 000..a18d7be
--- /dev/null
+++ b/src/themes/apex/widgets/OO.ui.ButtonOptionWidget.less
@@ -0,0 +1,8 @@
+/* OO.ui.ButtonOptionWidget */
+
+.oo-ui-buttonOptionWidget {
+ .oo-ui-optionWidget-selected,
+ .oo-ui-optionWidget-highlighted {
+ background-color: transparent;
+ }
+}
--
To view, visit https://gerrit.wikimedia.org/r/116772
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Id32b501599519119624d3a253372c3a0d8086e79
Gerrit-PatchSet: 1
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: Trevor Parscal tpars...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Ignore expected inter-wiki exceptions - change (mediawiki...Flow)
Bsitu has uploaded a new change for review.
https://gerrit.wikimedia.org/r/116773
Change subject: Ignore expected inter-wiki exceptions
..
Ignore expected inter-wiki exceptions
They will be fixed once we have the user_id/user_wiki support
Change-Id: I1a16348c2b03bee3e1aad94d59ff287947062fa1
---
M includes/Formatter/ContributionsQuery.php
1 file changed, 3 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Flow
refs/changes/73/116773/1
diff --git a/includes/Formatter/ContributionsQuery.php
b/includes/Formatter/ContributionsQuery.php
index 4fbbc35..5ef4958 100644
--- a/includes/Formatter/ContributionsQuery.php
+++ b/includes/Formatter/ContributionsQuery.php
@@ -113,7 +113,9 @@
$result = $this-buildResult( $pager,
$revision, $blockType );
} catch ( FlowException $e ) {
$result = false;
- \MWExceptionHandler::logException( $e );
+ // Comment out for now since we expect
some flow exceptions, when gerrit 111952 is
+ // merged, then we will turn this back
on so we can catch unexpected exceptions.
+ //\MWExceptionHandler::logException( $e
);
}
if ( $result ) {
$results[] = $result;
--
To view, visit https://gerrit.wikimedia.org/r/116773
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I1a16348c2b03bee3e1aad94d59ff287947062fa1
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: Bsitu bs...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Make ButtonOptionWidget background transparent - change (oojs/ui)
jenkins-bot has submitted this change and it was merged.
Change subject: Make ButtonOptionWidget background transparent
..
Make ButtonOptionWidget background transparent
Change-Id: Id32b501599519119624d3a253372c3a0d8086e79
---
A src/themes/apex/widgets/OO.ui.ButtonOptionWidget.less
1 file changed, 8 insertions(+), 0 deletions(-)
Approvals:
Jforrester: Looks good to me, approved
jenkins-bot: Verified
diff --git a/src/themes/apex/widgets/OO.ui.ButtonOptionWidget.less
b/src/themes/apex/widgets/OO.ui.ButtonOptionWidget.less
new file mode 100644
index 000..a18d7be
--- /dev/null
+++ b/src/themes/apex/widgets/OO.ui.ButtonOptionWidget.less
@@ -0,0 +1,8 @@
+/* OO.ui.ButtonOptionWidget */
+
+.oo-ui-buttonOptionWidget {
+ .oo-ui-optionWidget-selected,
+ .oo-ui-optionWidget-highlighted {
+ background-color: transparent;
+ }
+}
--
To view, visit https://gerrit.wikimedia.org/r/116772
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Id32b501599519119624d3a253372c3a0d8086e79
Gerrit-PatchSet: 1
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: Trevor Parscal tpars...@wikimedia.org
Gerrit-Reviewer: Jforrester jforres...@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 i18n file - change (mediawiki...FundraisingChart)
Ssmith has submitted this change and it was merged.
Change subject: Add i18n file
..
Add i18n file
Change-Id: Id102daa3f1413758559c4219b1995d2741cee532
---
A FundraisingChart.i18n.php
M FundraisingChart.php
2 files changed, 19 insertions(+), 1 deletion(-)
Approvals:
Ssmith: Verified; Looks good to me, approved
jenkins-bot: Checked
diff --git a/FundraisingChart.i18n.php b/FundraisingChart.i18n.php
new file mode 100644
index 000..b32584e
--- /dev/null
+++ b/FundraisingChart.i18n.php
@@ -0,0 +1,17 @@
+?php
+/**
+ * Fundraising Chart extension
+ *
+ * @file
+ * @ingroup Extensions
+ */
+
+$messages = array();
+
+$messages['en'] = array(
+ 'fundraisingchart-desc' = 'A tag that affords JavaScript chart
embedding for fundraising datasets',
+);
+
+$messages['qqq'] = array(
+ 'fundraisingchart-desc' =
'{{desc|name=FundraisingChart|url=https://www.mediawiki.org/wiki/Extension:FundraisingChart}}',
+);
diff --git a/FundraisingChart.php b/FundraisingChart.php
index 384b7a7..c721275 100644
--- a/FundraisingChart.php
+++ b/FundraisingChart.php
@@ -1,10 +1,11 @@
?php
$wgExtensionCredits['parserhook'][] = array(
+ 'path' = __FILE__,
'name' = 'Fundraising Chart',
'author' = 'Sherah Smith',
'version' = '1.0.0',
- 'description' = 'A tag that affords javascript chart embedding for
fundraising datasets.',
+ 'descriptionmsg' = 'fundraisingchart-desc',
'url' = 'https://www.mediawiki.org/wiki/Extension:FundraisingChart',
);
--
To view, visit https://gerrit.wikimedia.org/r/116739
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Id102daa3f1413758559c4219b1995d2741cee532
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/FundraisingChart
Gerrit-Branch: master
Gerrit-Owner: Raimond Spekking raimond.spekk...@gmail.com
Gerrit-Reviewer: Siebrand siebr...@wikimedia.org
Gerrit-Reviewer: Ssmith ssm...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix internal domain handling to ensure various cookies get p... - change (mediawiki...MobileFrontend)
jenkins-bot has submitted this change and it was merged.
Change subject: Fix internal domain handling to ensure various cookies get
properly set
..
Fix internal domain handling to ensure various cookies get properly set
In the event that you are using accessing your instance with an IP
address on a non-standard port (eg 127.0.0.1:8080, like with
mw-vagrant), cookies were not properly being set right because we were
incorrectly identifying the 'base domain' (eg en.wikipedia.org -
.wikipedia.org) by relying on the Host request header. Now we rely on
$wgServer and parse out the host name with wfParseUrl().
Change-Id: I0c58a9e5e19b917b791dacb958bda19c19049852
---
M includes/MobileContext.php
M tests/MobileContextTest.php
2 files changed, 23 insertions(+), 8 deletions(-)
Approvals:
JGonera: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/MobileContext.php b/includes/MobileContext.php
index b266941..6c3b5dd 100644
--- a/includes/MobileContext.php
+++ b/includes/MobileContext.php
@@ -487,9 +487,11 @@
* @return string
*/
public function getBaseDomain() {
+ global $wgServer;
wfProfileIn( __METHOD__ );
+ $parsedUrl = wfParseUrl( $wgServer );
+ $host = $parsedUrl['host'];
// Validates value as IP address
- $host = $this-getRequest()-getHeader( 'Host' );
if ( !IP::isValid( $host ) ) {
$domainParts = explode( '.', $host );
$domainParts = array_reverse( $domainParts );
diff --git a/tests/MobileContextTest.php b/tests/MobileContextTest.php
index 556d1ea..a3ab073 100644
--- a/tests/MobileContextTest.php
+++ b/tests/MobileContextTest.php
@@ -34,11 +34,24 @@
parent::tearDown();
}
- public function testGetBaseDomain() {
- MobileContext::singleton()-getRequest()-setHeader( 'Host',
'en.wikipedia.org' );
- $this-assertEquals( '.wikipedia.org',
MobileContext::singleton()-getBaseDomain() );
- MobileContext::singleton()-getRequest()-setHeader( 'Host',
'en.m.wikipedia.org' );
- $this-assertEquals( '.wikipedia.org',
MobileContext::singleton()-getBaseDomain() );
+ /**
+* @dataProvider getBaseDomainProvider
+*/
+ public function testGetBaseDomain( $server, $baseDomain ) {
+ global $wgServer;
+ $wgServer = $server;
+ $this-assertEquals( $baseDomain,
MobileContext::singleton()-getBaseDomain() );
+
+ }
+
+ public function getBaseDomainProvider() {
+ return array(
+ array( 'https://en.wikipedia.org', '.wikipedia.org' ),
+ array( 'http://en.m.wikipedia.org', '.wikipedia.org' ),
+ array( '//en.m.wikipedia.org', '.wikipedia.org' ),
+ array( 'http://127.0.0.1', '127.0.0.1' ),
+ array( 'http://127.0.0.1:8080', '127.0.0.1' ),
+ );
}
public function testGetMobileUrl() {
@@ -329,10 +342,10 @@
}
public function testGetStopMobileRedirectCookieDomain(){
- global $wgMFStopRedirectCookieHost;
+ global $wgMFStopRedirectCookieHost, $wgServer;
$context = MobileContext::singleton();
$wgMFStopRedirectCookieHost = null;
- $context-getRequest()-setHeader( 'Host', 'en.wikipedia.org' );
+ $wgServer = 'http://en.wikipedia.org';
$this-assertEquals(
$context-getStopMobileRedirectCookieDomain(), '.wikipedia.org' );
$wgMFStopRedirectCookieHost = 'foo.bar.baz';
$this-assertEquals(
$context-getStopMobileRedirectCookieDomain(), 'foo.bar.baz' );
--
To view, visit https://gerrit.wikimedia.org/r/115844
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I0c58a9e5e19b917b791dacb958bda19c19049852
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Awjrichards aricha...@wikimedia.org
Gerrit-Reviewer: JGonera jgon...@wikimedia.org
Gerrit-Reviewer: MaxSem maxsem.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] Remove /* OO.ui.… */ comments from LESS theme files - change (oojs/ui)
Jforrester has uploaded a new change for review.
https://gerrit.wikimedia.org/r/116776
Change subject: Remove /* OO.ui.… */ comments from LESS theme files
..
Remove /* OO.ui.… */ comments from LESS theme files
Removed from regular LESS files in f0e179c but these were missed in 3290d40.
Change-Id: I495198e15cd91a62aa8e9080b625a2a06c4e0580
---
M src/themes/apex/OO.ui.ToolGroup.less
M src/themes/apex/OO.ui.Toolbar.less
M src/themes/apex/OO.ui.Window.less
M src/themes/apex/elements/OO.ui.ButtonedElement.less
M src/themes/apex/layouts/OO.ui.BookletLayout.less
M src/themes/apex/layouts/OO.ui.FieldsetLayout.less
M src/themes/apex/toolgroups/OO.ui.BarToolgroup.less
M src/themes/apex/toolgroups/OO.ui.ListToolgroup.less
M src/themes/apex/toolgroups/OO.ui.MenuToolgroup.less
M src/themes/apex/toolgroups/OO.ui.PopupToolgroup.less
M src/themes/apex/widgets/OO.ui.ButtonGroupWidget.less
M src/themes/apex/widgets/OO.ui.ButtonOptionWidget.less
M src/themes/apex/widgets/OO.ui.ButtonSelectWidget.less
M src/themes/apex/widgets/OO.ui.InlineMenuWidget.less
M src/themes/apex/widgets/OO.ui.MenuItemWidget.less
M src/themes/apex/widgets/OO.ui.MenuSectonItemWidget.less
M src/themes/apex/widgets/OO.ui.MenuWidget.less
M src/themes/apex/widgets/OO.ui.OptionWidget.less
M src/themes/apex/widgets/OO.ui.OutlineControlsWidget.less
M src/themes/apex/widgets/OO.ui.OutlineItemWidget.less
M src/themes/apex/widgets/OO.ui.PopupWidget.less
M src/themes/apex/widgets/OO.ui.SearchWidget.less
M src/themes/apex/widgets/OO.ui.TextInputWidget.less
M src/themes/apex/widgets/OO.ui.ToggleSwitchWidget.less
24 files changed, 0 insertions(+), 48 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/76/116776/1
diff --git a/src/themes/apex/OO.ui.ToolGroup.less
b/src/themes/apex/OO.ui.ToolGroup.less
index 394f292..dbdaa09 100644
--- a/src/themes/apex/OO.ui.ToolGroup.less
+++ b/src/themes/apex/OO.ui.ToolGroup.less
@@ -1,7 +1,5 @@
@import '../../styles/mixins';
-/* OO.ui.ToolGroup */
-
.oo-ui-toolGroup {
border-radius: 0.25em;
border: solid 1px transparent;
diff --git a/src/themes/apex/OO.ui.Toolbar.less
b/src/themes/apex/OO.ui.Toolbar.less
index 8625845..8aabca0 100644
--- a/src/themes/apex/OO.ui.Toolbar.less
+++ b/src/themes/apex/OO.ui.Toolbar.less
@@ -1,7 +1,5 @@
@import '../../styles/mixins';
-/* OO.ui.Toolbar */
-
.oo-ui-toolbar {
-bar {
border-bottom: solid 1px #ccc;
diff --git a/src/themes/apex/OO.ui.Window.less
b/src/themes/apex/OO.ui.Window.less
index c0bd2d6..c41846b 100644
--- a/src/themes/apex/OO.ui.Window.less
+++ b/src/themes/apex/OO.ui.Window.less
@@ -1,5 +1,3 @@
-/* OO.ui.Window */
-
.oo-ui-window {
-title {
color: #333;
diff --git a/src/themes/apex/elements/OO.ui.ButtonedElement.less
b/src/themes/apex/elements/OO.ui.ButtonedElement.less
index 424e67e..ddab045 100644
--- a/src/themes/apex/elements/OO.ui.ButtonedElement.less
+++ b/src/themes/apex/elements/OO.ui.ButtonedElement.less
@@ -1,7 +1,5 @@
@import '../../../styles/mixins';
-/* OO.ui.ButtonedElement */
-
.oo-ui-buttonedElement {
.oo-ui-buttonedElement-button {
color: #333;
diff --git a/src/themes/apex/layouts/OO.ui.BookletLayout.less
b/src/themes/apex/layouts/OO.ui.BookletLayout.less
index 4214900..327cec7 100644
--- a/src/themes/apex/layouts/OO.ui.BookletLayout.less
+++ b/src/themes/apex/layouts/OO.ui.BookletLayout.less
@@ -1,5 +1,3 @@
-/* OO.ui.BookletLayout */
-
.oo-ui-bookletLayout {
-outlinePanel {
border-right: solid 1px #ddd;
diff --git a/src/themes/apex/layouts/OO.ui.FieldsetLayout.less
b/src/themes/apex/layouts/OO.ui.FieldsetLayout.less
index b0dc644..d435384 100644
--- a/src/themes/apex/layouts/OO.ui.FieldsetLayout.less
+++ b/src/themes/apex/layouts/OO.ui.FieldsetLayout.less
@@ -1,5 +1,3 @@
-/* OO.ui.FieldsetLayout */
-
.oo-ui-fieldsetLayout {
border: none;
diff --git a/src/themes/apex/toolgroups/OO.ui.BarToolgroup.less
b/src/themes/apex/toolgroups/OO.ui.BarToolgroup.less
index 37f994b..6d0974a 100644
--- a/src/themes/apex/toolgroups/OO.ui.BarToolgroup.less
+++ b/src/themes/apex/toolgroups/OO.ui.BarToolgroup.less
@@ -1,7 +1,5 @@
@import '../../../styles/mixins';
-/* OO.ui.BarToolGroup */
-
.oo-ui-barToolGroup {
.oo-ui-tool {
margin: -1px 0 -1px -1px;
diff --git a/src/themes/apex/toolgroups/OO.ui.ListToolgroup.less
b/src/themes/apex/toolgroups/OO.ui.ListToolgroup.less
index c1c6031..4c6ccac 100644
--- a/src/themes/apex/toolgroups/OO.ui.ListToolgroup.less
+++ b/src/themes/apex/toolgroups/OO.ui.ListToolgroup.less
@@ -1,7 +1,5 @@
@import '../../../styles/mixins';
-/* OO.ui.ListToolGroup */
-
.oo-ui-listToolGroup {
.oo-ui-popupToolGroup-active {
border-color: rgba(0,0,0,0.2);
diff --git a/src/themes/apex/toolgroups/OO.ui.MenuToolgroup.less
[MediaWiki-commits] [Gerrit] QA: Simplify article page - change (mediawiki...MobileFrontend)
Jdlrobson has uploaded a new change for review. https://gerrit.wikimedia.org/r/116778 Change subject: QA: Simplify article page .. QA: Simplify article page Where elements are the same but have different classes be more clever Change-Id: I22cd699dbc4fbb03455872b8244368e50a936bf0 --- M tests/browser/features/step_definitions/common_article_steps.rb M tests/browser/features/support/pages/article_page.rb 2 files changed, 3 insertions(+), 5 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend refs/changes/78/116778/1 diff --git a/tests/browser/features/step_definitions/common_article_steps.rb b/tests/browser/features/step_definitions/common_article_steps.rb index a55be1d..b6c7eb8 100644 --- a/tests/browser/features/step_definitions/common_article_steps.rb +++ b/tests/browser/features/step_definitions/common_article_steps.rb @@ -62,7 +62,7 @@ end Then /^The watch star is selected$/ do - on(ArticlePage).watched_link_element.should exist + on(ArticlePage).watch_link_element.class_name.should match watched end Then /^The watch star is not selected$/ do @@ -79,7 +79,7 @@ end Then(/^I see a toast error$/) do - on(ArticlePage).toast_error_element.when_present.should be_visible + on(ArticlePage).toast_element.when_present.class_name.should match error end Then(/^The text of the first heading is (.*)$/) do |title| diff --git a/tests/browser/features/support/pages/article_page.rb b/tests/browser/features/support/pages/article_page.rb index ba130ae..5bda2d2 100644 --- a/tests/browser/features/support/pages/article_page.rb +++ b/tests/browser/features/support/pages/article_page.rb @@ -42,8 +42,7 @@ end ## watch star - a(:watch_link, class: watch-this-article) - a(:watched_link, class: watch-this-article watched) + a(:watch_link, css: .watch-this-article) # search button(:search_button, css: .searchSubmit) @@ -105,7 +104,6 @@ # toast div(:toast, css: .toast) - div(:toast_error, css: .toast.error) #loader div(:content_wrapper, id:'content_wrapper') -- To view, visit https://gerrit.wikimedia.org/r/116778 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I22cd699dbc4fbb03455872b8244368e50a936bf0 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/MobileFrontend Gerrit-Branch: master Gerrit-Owner: Jdlrobson jrob...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Hygiene: Remove need in QA tests for LogoutPage - change (mediawiki...MobileFrontend)
jenkins-bot has submitted this change and it was merged. Change subject: Hygiene: Remove need in QA tests for LogoutPage .. Hygiene: Remove need in QA tests for LogoutPage Change-Id: Ic2ec862d6498ff375fd3fe8ddee1cc9b9e42b7ec --- M tests/browser/features/step_definitions/common_steps.rb D tests/browser/features/support/pages/logout_page.rb 2 files changed, 1 insertion(+), 6 deletions(-) Approvals: JGonera: Looks good to me, approved jenkins-bot: Verified diff --git a/tests/browser/features/step_definitions/common_steps.rb b/tests/browser/features/step_definitions/common_steps.rb index 8acbf0b..d42634a 100644 --- a/tests/browser/features/step_definitions/common_steps.rb +++ b/tests/browser/features/step_definitions/common_steps.rb @@ -30,7 +30,7 @@ page.password_field_element.when_present.send_keys(pwd) page.confirm_password_field_element.when_present.send_keys(pwd) page.sign_up_element.when_present.click -visit(LogoutPage) +step 'I go to the Special:UserLogout page' visit(LoginPage) do |page| page.login_with(username, pwd) end diff --git a/tests/browser/features/support/pages/logout_page.rb b/tests/browser/features/support/pages/logout_page.rb deleted file mode 100644 index 9183ca0..000 --- a/tests/browser/features/support/pages/logout_page.rb +++ /dev/null @@ -1,5 +0,0 @@ -class LogoutPage - include PageObject - include URL - page_url URL.url(Special:UserLogout) -end -- To view, visit https://gerrit.wikimedia.org/r/116696 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ic2ec862d6498ff375fd3fe8ddee1cc9b9e42b7ec Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/extensions/MobileFrontend Gerrit-Branch: master Gerrit-Owner: Jdlrobson jrob...@wikimedia.org Gerrit-Reviewer: JGonera jgon...@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] Hygiene: Rename QA file to use underscores - change (mediawiki...MobileFrontend)
jenkins-bot has submitted this change and it was merged. Change subject: Hygiene: Rename QA file to use underscores .. Hygiene: Rename QA file to use underscores Change-Id: Ia5c24184154c9eb9bf3a8f7e6b20f121158f103f --- R tests/browser/features/search_special_page.feature 1 file changed, 0 insertions(+), 0 deletions(-) Approvals: JGonera: Looks good to me, approved jenkins-bot: Verified diff --git a/tests/browser/features/search-specialpages.feature b/tests/browser/features/search_special_page.feature similarity index 100% rename from tests/browser/features/search-specialpages.feature rename to tests/browser/features/search_special_page.feature -- To view, visit https://gerrit.wikimedia.org/r/116697 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ia5c24184154c9eb9bf3a8f7e6b20f121158f103f Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/extensions/MobileFrontend Gerrit-Branch: master Gerrit-Owner: Jdlrobson jrob...@wikimedia.org Gerrit-Reviewer: JGonera jgon...@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] Hygiene: Kill meaningless create_article.feature browser test - change (mediawiki...MobileFrontend)
jenkins-bot has submitted this change and it was merged.
Change subject: Hygiene: Kill meaningless create_article.feature browser test
..
Hygiene: Kill meaningless create_article.feature browser test
This tests nothing
Change-Id: If2d057fe81835955ee0da91534f60a87856d2530
---
D tests/browser/features/create_article.feature
D tests/browser/features/step_definitions/create_article_steps.rb
2 files changed, 0 insertions(+), 14 deletions(-)
Approvals:
JGonera: Looks good to me, approved
jenkins-bot: Verified
diff --git a/tests/browser/features/create_article.feature
b/tests/browser/features/create_article.feature
deleted file mode 100644
index 2eb39f5..000
--- a/tests/browser/features/create_article.feature
+++ /dev/null
@@ -1,6 +0,0 @@
-@en.m.wikipedia.beta.wmflabs.org @en.m.wikipedia.org @login
@test2.m.wikipedia.org
-Feature: Create Article
-
- Scenario: Create Article
-Given I am logged into the mobile website
- And SelAutomationTestArticle has not been created
diff --git a/tests/browser/features/step_definitions/create_article_steps.rb
b/tests/browser/features/step_definitions/create_article_steps.rb
deleted file mode 100644
index 1efa5da..000
--- a/tests/browser/features/step_definitions/create_article_steps.rb
+++ /dev/null
@@ -1,8 +0,0 @@
-# FIXME: Review purpose of this file
-Given /^(.+) has not been created$/ do |article|
- visit(CreateArticlePage, :using_params = {:article_name = article})
- if on(CreateArticlePage).doesnotexist_msg_element.element
-on(HomePage).edit_link_element.when_present.click
- end
-end
-
--
To view, visit https://gerrit.wikimedia.org/r/116698
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: If2d057fe81835955ee0da91534f60a87856d2530
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson jrob...@wikimedia.org
Gerrit-Reviewer: JGonera jgon...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki.loader: Better document IE stylesheet limit bug - change (mediawiki/core)
Krinkle has uploaded a new change for review.
https://gerrit.wikimedia.org/r/116779
Change subject: mediawiki.loader: Better document IE stylesheet limit bug
..
mediawiki.loader: Better document IE stylesheet limit bug
Also leave a comment on the line where the relevant exception
will be thrown from if it does end up hitting the limit still
(which wouldn't be due to mw.loader appending more than 31
stylesheets but due to there being more than 30 on the page
already).
Change-Id: I3a46affc5498fbaa1d442ca65cb4844dd8f8169c
---
M resources/mediawiki/mediawiki.js
1 file changed, 9 insertions(+), 6 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/79/116779/1
diff --git a/resources/mediawiki/mediawiki.js b/resources/mediawiki/mediawiki.js
index 8a50363..9bb86af 100644
--- a/resources/mediawiki/mediawiki.js
+++ b/resources/mediawiki/mediawiki.js
@@ -767,11 +767,11 @@
return;
}
- // By default, always create a new style.
Appending text
- // to a style tag means the contents have to
be re-parsed (bug 45810).
- // Except, of course, in IE below 9, in there
we default to
- // re-using and appending to a style tag due
to the
- // IE stylesheet limit (bug 31676).
+ // By default, always create a new style.
Appending text to a style
+ // tag is bad as it means the contents have to
be re-parsed (bug 45810).
+ //
+ // Except, of course, in IE 9 and below. In
there we default to re-using and
+ // appending to a style tag due to the IE
stylesheet limit (bug 31676).
if ( 'documentMode' in document
document.documentMode = 9 ) {
$style = getMarker().prev();
@@ -1138,11 +1138,14 @@
*/
function addLink( media, url ) {
var el = document.createElement( 'link'
);
- getMarker().before( el ); // IE: Insert
in dom before setting href
+ // For IE: Insert in document *before*
setting href
+ getMarker().before( el );
el.rel = 'stylesheet';
if ( media media !== 'all' ) {
el.media = media;
}
+ // If you end up here from an IE
exception SCRIPT: Invalid property value.,
+ // see #addEmbeddedCSS, bug 31676, and
bug 47277 for details.
el.href = url;
}
--
To view, visit https://gerrit.wikimedia.org/r/116779
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I3a46affc5498fbaa1d442ca65cb4844dd8f8169c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
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
