[MediaWiki-commits] [Gerrit] Update CentralAuth to master - change (mediawiki/core)
CSteipp has uploaded a new change for review. https://gerrit.wikimedia.org/r/84776 Change subject: Update CentralAuth to master .. Update CentralAuth to master Change-Id: I2270274a7c3c124f72c37ccba2d1a177a3dd0afa --- M extensions/CentralAuth 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/76/84776/1 diff --git a/extensions/CentralAuth b/extensions/CentralAuth index 7b268ce..d85ef79 16 --- a/extensions/CentralAuth +++ b/extensions/CentralAuth -Subproject commit 7b268ce670e1afcde13001dad210952d23d62b8f +Subproject commit d85ef79af58dfbbf0b1a254192d079f2103260d0 -- To view, visit https://gerrit.wikimedia.org/r/84776 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I2270274a7c3c124f72c37ccba2d1a177a3dd0afa Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: wmf/1.22wmf16 Gerrit-Owner: CSteipp cste...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Drop Video Scalers to 5 concurrent jobs - change (operations/puppet)
Reedy has uploaded a new change for review.
https://gerrit.wikimedia.org/r/84775
Change subject: Drop Video Scalers to 5 concurrent jobs
..
Drop Video Scalers to 5 concurrent jobs
Bug: 54060
Change-Id: Ibd37e18e658d85f513a871ff81f51d90193a9679
---
M manifests/role/applicationserver.pp
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/75/84775/1
diff --git a/manifests/role/applicationserver.pp
b/manifests/role/applicationserver.pp
index 77cbfe5..2eccf8f 100644
--- a/manifests/role/applicationserver.pp
+++ b/manifests/role/applicationserver.pp
@@ -196,7 +196,7 @@
class {mediawiki::jobrunner:
run_jobs_enabled = $run_jobs_enabled,
- dprioprocs = 10,
+ dprioprocs = 5,
iprioprocs = 0,
procs_per_iobound_type = 0,
type = webVideoTranscode,
--
To view, visit https://gerrit.wikimedia.org/r/84775
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibd37e18e658d85f513a871ff81f51d90193a9679
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Reedy re...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update CentralAuth to master - change (mediawiki/core)
CSteipp has uploaded a new change for review. https://gerrit.wikimedia.org/r/84777 Change subject: Update CentralAuth to master .. Update CentralAuth to master Change-Id: Idee15b9b3b91bd439900bc04b23619889c29d9ae --- M extensions/CentralAuth 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/77/84777/1 diff --git a/extensions/CentralAuth b/extensions/CentralAuth index 6ddde03..d85ef79 16 --- a/extensions/CentralAuth +++ b/extensions/CentralAuth -Subproject commit 6ddde03c3a362a2b0242afff1c96ab207ff3862f +Subproject commit d85ef79af58dfbbf0b1a254192d079f2103260d0 -- To view, visit https://gerrit.wikimedia.org/r/84777 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Idee15b9b3b91bd439900bc04b23619889c29d9ae Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: wmf/1.22wmf17 Gerrit-Owner: CSteipp cste...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Use html5 release. - change (mediawiki...Parsoid)
Arlolra has uploaded a new change for review.
https://gerrit.wikimedia.org/r/84778
Change subject: Use html5 release.
..
Use html5 release.
Change-Id: I3540b529bcec1f83b8e32e96f5814f2cbb2a6c04
---
M js/package.json
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Parsoid
refs/changes/78/84778/1
diff --git a/js/package.json b/js/package.json
index b3da090..a84f778 100644
--- a/js/package.json
+++ b/js/package.json
@@ -17,7 +17,7 @@
async: 0.x.x,
express: 2.5.x,
html5-entities: ~0.5.0,
- html5:
git://github.com/aredridel/html5.git#052ac530a2a422353067edb66c2fec86878e2340
+ html5: 0.3.15
},
devDependencies: {
colors: 0.x.x,
--
To view, visit https://gerrit.wikimedia.org/r/84778
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I3540b529bcec1f83b8e32e96f5814f2cbb2a6c04
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Parsoid
Gerrit-Branch: master
Gerrit-Owner: Arlolra abrea...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Reviving the lost gerrit patch - 82800 - change (mediawiki...Flow)
EBernhardson (WMF) has submitted this change and it was merged.
Change subject: Reviving the lost gerrit patch - 82800
..
Reviving the lost gerrit patch - 82800
Patch 82800 was merged, but for some reason it's lost and never
appears in Flow git history
Change-Id: I21db2ba139e1a718d5a1e99c9b032eae776a5f8b
---
M includes/Block/Block.php
1 file changed, 6 insertions(+), 3 deletions(-)
Approvals:
EBernhardson (WMF): Verified; Looks good to me, approved
diff --git a/includes/Block/Block.php b/includes/Block/Block.php
index 168ee92..adab7fc 100644
--- a/includes/Block/Block.php
+++ b/includes/Block/Block.php
@@ -56,9 +56,12 @@
}
abstract protected function validate();
- abstract public function render( Templating $templating, array $options
);
- abstract public function renderAPI( Templating $templating, array
$options );
- abstract public function commit();
+ // These methods exist in the Block interface and as such cannot be
abstract
+ // until php 5.3.9, but MediaWiki requires PHP version 5.3.2 or later
(and
+ // some of our test machines are on 5.3.3).
+ //abstract public function render( Templating $templating, array
$options );
+ //abstract public function renderAPI( Templating $templating, array
$options );
+ //abstract public function commit();
public function init( $action, $user ) {
$this-action = $action;
--
To view, visit https://gerrit.wikimedia.org/r/84774
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I21db2ba139e1a718d5a1e99c9b032eae776a5f8b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: Bsitu bs...@wikimedia.org
Gerrit-Reviewer: EBernhardson (WMF) ebernhard...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Optionally exclude elements from applying webfonts - change (mediawiki...UniversalLanguageSelector)
Santhosh has uploaded a new change for review.
https://gerrit.wikimedia.org/r/84779
Change subject: Optionally exclude elements from applying webfonts
..
Optionally exclude elements from applying webfonts
* Updates jquery.webfonts from upstream
* Introduces wgULSWebFontExcludeSelector cnfiguration variable. It
takes an array of jquery selector to which webfonts will not be
applied if defined.
Change-Id: I0dc263f84620af4077f52e18eeb0f986ff0f13b9
---
M UniversalLanguageSelector.hooks.php
M UniversalLanguageSelector.php
M lib/jquery.webfonts.js
M resources/js/ext.uls.webfonts.js
4 files changed, 16 insertions(+), 2 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/UniversalLanguageSelector
refs/changes/79/84779/1
diff --git a/UniversalLanguageSelector.hooks.php
b/UniversalLanguageSelector.hooks.php
index 3fc37be..58fa904 100644
--- a/UniversalLanguageSelector.hooks.php
+++ b/UniversalLanguageSelector.hooks.php
@@ -248,7 +248,7 @@
* @return bool
*/
public static function addConfig( $vars ) {
- global $wgULSGeoService, $wgULSIMEEnabled, $wgULSPosition,
+ global $wgULSGeoService, $wgULSIMEEnabled, $wgULSPosition,
$wgULSWebFontExcludeSelector,
$wgULSAnonCanChangeLanguage, $wgULSEventLogging,
$wgULSNoImeSelectors;
// Place constant stuff here (not depending on request context)
@@ -260,6 +260,7 @@
$vars['wgULSAnonCanChangeLanguage'] =
$wgULSAnonCanChangeLanguage;
$vars['wgULSEventLogging'] = $wgULSEventLogging;
$vars['wgULSNoImeSelectors'] = $wgULSNoImeSelectors;
+ $vars['wgULSWebFontExcludeSelector'] =
$wgULSWebFontExcludeSelector;
return true;
}
diff --git a/UniversalLanguageSelector.php b/UniversalLanguageSelector.php
index 1d5dd15..bc168fa 100644
--- a/UniversalLanguageSelector.php
+++ b/UniversalLanguageSelector.php
@@ -130,6 +130,14 @@
*/
$wgULSNoImeSelectors = array( '#wpCaptchaWord' );
+
+/**
+ * Array of jQuery selectors of elements on which webfonts must not be applied.
+ *
+ * @since 2013.09
+ */
+$wgULSWebFontExcludeSelector = array();
+
$dir = __DIR__;
// Internationalization
diff --git a/lib/jquery.webfonts.js b/lib/jquery.webfonts.js
index b4c0b5e..c089467 100644
--- a/lib/jquery.webfonts.js
+++ b/lib/jquery.webfonts.js
@@ -190,6 +190,10 @@
var fontFamilyStyle, fontFamily,
$element = $( element );
+ if ( $element.is( webfonts.options.exclude ) ) {
+ return;
+ }
+
// Note: it depends on the browser whether this
returns font names
// which don't exist. In Chrome it does, while
in Opera it doesn't.
fontFamilyStyle = $element.css( 'fontFamily' );
diff --git a/resources/js/ext.uls.webfonts.js b/resources/js/ext.uls.webfonts.js
index c0922bc..a22ea22 100644
--- a/resources/js/ext.uls.webfonts.js
+++ b/resources/js/ext.uls.webfonts.js
@@ -87,7 +87,8 @@
// MediaWiki specific overrides for jquery.webfonts
$.extend( $.fn.webfonts.defaults, {
repository: mediawikiFontRepository,
- fontStack: $( 'body' ).css( 'font-family'
).split( /, /g )
+ fontStack: $( 'body' ).css( 'font-family'
).split( /, /g ),
+ exclude: mw.config.get(
'wgULSWebFontExcludeSelector' ).join( ', ' )
} );
mw.webfonts.preferences.load();
--
To view, visit https://gerrit.wikimedia.org/r/84779
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I0dc263f84620af4077f52e18eeb0f986ff0f13b9
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/UniversalLanguageSelector
Gerrit-Branch: master
Gerrit-Owner: Santhosh santhosh.thottin...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update CentralAuth to master - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged. Change subject: Update CentralAuth to master .. Update CentralAuth to master Change-Id: I2270274a7c3c124f72c37ccba2d1a177a3dd0afa --- M extensions/CentralAuth 1 file changed, 0 insertions(+), 0 deletions(-) Approvals: CSteipp: Looks good to me, approved jenkins-bot: Verified diff --git a/extensions/CentralAuth b/extensions/CentralAuth index 7b268ce..d85ef79 16 --- a/extensions/CentralAuth +++ b/extensions/CentralAuth -Subproject commit 7b268ce670e1afcde13001dad210952d23d62b8f +Subproject commit d85ef79af58dfbbf0b1a254192d079f2103260d0 -- To view, visit https://gerrit.wikimedia.org/r/84776 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I2270274a7c3c124f72c37ccba2d1a177a3dd0afa Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: wmf/1.22wmf16 Gerrit-Owner: CSteipp cste...@wikimedia.org Gerrit-Reviewer: CSteipp cste...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Drop Video Scalers to 5 concurrent jobs - change (operations/puppet)
Akosiaris has submitted this change and it was merged.
Change subject: Drop Video Scalers to 5 concurrent jobs
..
Drop Video Scalers to 5 concurrent jobs
Bug: 54060
Change-Id: Ibd37e18e658d85f513a871ff81f51d90193a9679
---
M manifests/role/applicationserver.pp
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Akosiaris: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/role/applicationserver.pp
b/manifests/role/applicationserver.pp
index 77cbfe5..2eccf8f 100644
--- a/manifests/role/applicationserver.pp
+++ b/manifests/role/applicationserver.pp
@@ -196,7 +196,7 @@
class {mediawiki::jobrunner:
run_jobs_enabled = $run_jobs_enabled,
- dprioprocs = 10,
+ dprioprocs = 5,
iprioprocs = 0,
procs_per_iobound_type = 0,
type = webVideoTranscode,
--
To view, visit https://gerrit.wikimedia.org/r/84775
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ibd37e18e658d85f513a871ff81f51d90193a9679
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Reedy re...@wikimedia.org
Gerrit-Reviewer: Akosiaris akosia...@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] Fixed check of BagOStuff set() return value in mctest - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged.
Change subject: Fixed check of BagOStuff set() return value in mctest
..
Fixed check of BagOStuff set() return value in mctest
Change-Id: I6e69cdc24b9b40132641205cb40f64bb5db45f70
---
M maintenance/mctest.php
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
BryanDavis: Looks good to me, approved
jenkins-bot: Verified
diff --git a/maintenance/mctest.php b/maintenance/mctest.php
index 28b041a..eda101e 100644
--- a/maintenance/mctest.php
+++ b/maintenance/mctest.php
@@ -80,7 +80,7 @@
$get = 0;
$time_start = $this-microtime_float();
for ( $i = 1; $i = $iterations; $i++ ) {
- if ( !is_null( $mcc-set( test$i, $i ) ) ) {
+ if ( $mcc-set( test$i, $i ) ) {
$set++;
}
}
--
To view, visit https://gerrit.wikimedia.org/r/84655
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I6e69cdc24b9b40132641205cb40f64bb5db45f70
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz asch...@wikimedia.org
Gerrit-Reviewer: BryanDavis bda...@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] varnish (3.0.3plus~rc1-wm15) precise; urgency=low - change (operations...varnish)
BBlack has uploaded a new change for review. https://gerrit.wikimedia.org/r/84784 Change subject: varnish (3.0.3plus~rc1-wm15) precise; urgency=low .. varnish (3.0.3plus~rc1-wm15) precise; urgency=low * Add libvmod_netmapper Change-Id: I0b9aafcaf60ac0bf94ff8de54f8d92b8a270a59e --- M debian/changelog 1 file changed, 6 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/debs/varnish refs/changes/84/84784/1 diff --git a/debian/changelog b/debian/changelog index 4d964e1..cbbee64 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +varnish (3.0.3plus~rc1-wm15) precise; urgency=low + + * Add libvmod_netmapper + + -- Brandon Black bbl...@wikimedia.org Wed, 18 Sep 2013 18:15:29 + + varnish (3.0.3plus~rc1-wm14) precise; urgency=low * Don't increase cache_hit/cache_miss counters for PURGE requests -- To view, visit https://gerrit.wikimedia.org/r/84784 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I0b9aafcaf60ac0bf94ff8de54f8d92b8a270a59e Gerrit-PatchSet: 1 Gerrit-Project: operations/debs/varnish Gerrit-Branch: testing/3.0.3plus-rc1 Gerrit-Owner: BBlack bbl...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] fix changelog typo - change (operations...varnish)
BBlack has submitted this change and it was merged. Change subject: fix changelog typo .. fix changelog typo Change-Id: Ib6e00b5cd45863c22e8d738f45b5ad94c9d93792 --- M debian/changelog 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: BBlack: Verified; Looks good to me, approved diff --git a/debian/changelog b/debian/changelog index 85d1e1d..4d964e1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -90,7 +90,7 @@ - Persisten storage support - HTTP object streaming support - -- Mark Bergsma mark@wikimedia Tue, 28 Aug 2012 11:36:52 + + -- Mark Bergsma m...@wikimedia.org Tue, 28 Aug 2012 11:36:52 + varnish (3.0.3~rc1+persistent-wm1) precise; urgency=low -- To view, visit https://gerrit.wikimedia.org/r/84782 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ib6e00b5cd45863c22e8d738f45b5ad94c9d93792 Gerrit-PatchSet: 1 Gerrit-Project: operations/debs/varnish Gerrit-Branch: testing/3.0.3plus-rc1 Gerrit-Owner: BBlack bbl...@wikimedia.org Gerrit-Reviewer: BBlack bbl...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] update libvarnishapi1 symbols - change (operations...varnish)
BBlack has submitted this change and it was merged. Change subject: update libvarnishapi1 symbols .. update libvarnishapi1 symbols Change-Id: I9fa6e2210d151a82ad22acee6f9512512c9e943c --- M debian/libvarnishapi1.symbols 1 file changed, 2 insertions(+), 0 deletions(-) Approvals: BBlack: Verified; Looks good to me, approved diff --git a/debian/libvarnishapi1.symbols b/debian/libvarnishapi1.symbols index 723c656..3e4a46c 100644 --- a/debian/libvarnishapi1.symbols +++ b/debian/libvarnishapi1.symbols @@ -1,5 +1,6 @@ libvarnishapi.so.1 libvarnishapi1 #MINVER# LIBVARNISHAPI_1.0@LIBVARNISHAPI_1.0 3.0.0 + LIBVARNISHAPI_1.1@LIBVARNISHAPI_1.1 3.0.0 VCLI_AuthResponse@LIBVARNISHAPI_1.0 3.0.0 VCLI_ReadResult@LIBVARNISHAPI_1.0 3.0.0 VCLI_WriteResult@LIBVARNISHAPI_1.0 3.0.0 @@ -19,6 +20,7 @@ #MISSING: 3.0.0# VSL_H_Print@Base 2.0~rc1 VSL_H_Print@LIBVARNISHAPI_1.0 3.0.0 VSL_Matched@LIBVARNISHAPI_1.0 3.0.0 + VSL_Name2Tag@LIBVARNISHAPI_1.1 3.0.0 #MISSING: 3.0.0# VSL_Name@Base 2.0~rc1 #MISSING: 3.0.0# VSL_New@Base 2.0~rc1 #MISSING: 3.0.0# VSL_NextLog@Base 2.0~rc1 -- To view, visit https://gerrit.wikimedia.org/r/84783 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I9fa6e2210d151a82ad22acee6f9512512c9e943c Gerrit-PatchSet: 1 Gerrit-Project: operations/debs/varnish Gerrit-Branch: testing/3.0.3plus-rc1 Gerrit-Owner: BBlack bbl...@wikimedia.org Gerrit-Reviewer: BBlack bbl...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] varnish (3.0.3plus~rc1-wm15) precise; urgency=low - change (operations...varnish)
BBlack has submitted this change and it was merged. Change subject: varnish (3.0.3plus~rc1-wm15) precise; urgency=low .. varnish (3.0.3plus~rc1-wm15) precise; urgency=low * Add libvmod_netmapper Change-Id: I0b9aafcaf60ac0bf94ff8de54f8d92b8a270a59e --- M debian/changelog 1 file changed, 6 insertions(+), 0 deletions(-) Approvals: BBlack: Verified; Looks good to me, approved diff --git a/debian/changelog b/debian/changelog index 4d964e1..cbbee64 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +varnish (3.0.3plus~rc1-wm15) precise; urgency=low + + * Add libvmod_netmapper + + -- Brandon Black bbl...@wikimedia.org Wed, 18 Sep 2013 18:15:29 + + varnish (3.0.3plus~rc1-wm14) precise; urgency=low * Don't increase cache_hit/cache_miss counters for PURGE requests -- To view, visit https://gerrit.wikimedia.org/r/84784 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I0b9aafcaf60ac0bf94ff8de54f8d92b8a270a59e Gerrit-PatchSet: 1 Gerrit-Project: operations/debs/varnish Gerrit-Branch: testing/3.0.3plus-rc1 Gerrit-Owner: BBlack bbl...@wikimedia.org Gerrit-Reviewer: BBlack bbl...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] wmgHTTPSBlacklistCountries changes for CN - change (operations/mediawiki-config)
Reedy has uploaded a new change for review. https://gerrit.wikimedia.org/r/84781 Change subject: wmgHTTPSBlacklistCountries changes for CN .. wmgHTTPSBlacklistCountries changes for CN Bug: 53739 Change-Id: I23678ee47ac585be603214709e1b7f62d686f2ce --- M wmf-config/InitialiseSettings.php 1 file changed, 4 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/81/84781/1 diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index 8fad1b7..41b95eb 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -12621,9 +12621,11 @@ 'wmgHTTPSBlacklistCountries' = array( 'default' = array( - 'CN', // China 'IR', // Iran - ) + ), + '+wiki' = array( + 'CN', // China + ), ), ); -- To view, visit https://gerrit.wikimedia.org/r/84781 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I23678ee47ac585be603214709e1b7f62d686f2ce Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Reedy re...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] contint: typo packages {} - package {} - change (operations/puppet)
Hashar has uploaded a new change for review.
https://gerrit.wikimedia.org/r/84785
Change subject: contint: typo packages {} - package {}
..
contint: typo packages {} - package {}
I am often using package {} with its plural form, no idea how it could
be detected but that typo is hard to catch :( Introduced by 4d10573.
Change-Id: I2fb297d22fe9b2f8b9a184b5d6bea613ae67e0b7
---
M modules/contint/manifests/zuul/git-daemon.pp
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/85/84785/1
diff --git a/modules/contint/manifests/zuul/git-daemon.pp
b/modules/contint/manifests/zuul/git-daemon.pp
index d67fbea..48a0099 100644
--- a/modules/contint/manifests/zuul/git-daemon.pp
+++ b/modules/contint/manifests/zuul/git-daemon.pp
@@ -3,7 +3,7 @@
$zuul_git_dir = '/var/lib/zuul/git'
) {
- packages { 'git-daemon-sysvinit': ensure = present }
+ package { 'git-daemon-sysvinit': ensure = present }
# Point both git daemon paths to the same dir, this way we do not have a
# /git/ prefix in the git:// URLs.
--
To view, visit https://gerrit.wikimedia.org/r/84785
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I2fb297d22fe9b2f8b9a184b5d6bea613ae67e0b7
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] contint: typo packages {} - package {} - change (operations/puppet)
Akosiaris has submitted this change and it was merged.
Change subject: contint: typo packages {} - package {}
..
contint: typo packages {} - package {}
I am often using package {} with its plural form, no idea how it could
be detected but that typo is hard to catch :( Introduced by 4d10573.
Change-Id: I2fb297d22fe9b2f8b9a184b5d6bea613ae67e0b7
---
M modules/contint/manifests/zuul/git-daemon.pp
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Akosiaris: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/contint/manifests/zuul/git-daemon.pp
b/modules/contint/manifests/zuul/git-daemon.pp
index d67fbea..48a0099 100644
--- a/modules/contint/manifests/zuul/git-daemon.pp
+++ b/modules/contint/manifests/zuul/git-daemon.pp
@@ -3,7 +3,7 @@
$zuul_git_dir = '/var/lib/zuul/git'
) {
- packages { 'git-daemon-sysvinit': ensure = present }
+ package { 'git-daemon-sysvinit': ensure = present }
# Point both git daemon paths to the same dir, this way we do not have a
# /git/ prefix in the git:// URLs.
--
To view, visit https://gerrit.wikimedia.org/r/84785
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I2fb297d22fe9b2f8b9a184b5d6bea613ae67e0b7
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Hashar has...@free.fr
Gerrit-Reviewer: Akosiaris akosia...@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] Update CentralAuth to master - change (mediawiki/core)
CSteipp has submitted this change and it was merged. Change subject: Update CentralAuth to master .. Update CentralAuth to master Change-Id: Idee15b9b3b91bd439900bc04b23619889c29d9ae --- M extensions/CentralAuth 1 file changed, 0 insertions(+), 0 deletions(-) Approvals: CSteipp: Looks good to me, approved jenkins-bot: Verified diff --git a/extensions/CentralAuth b/extensions/CentralAuth index 6ddde03..d85ef79 16 --- a/extensions/CentralAuth +++ b/extensions/CentralAuth -Subproject commit 6ddde03c3a362a2b0242afff1c96ab207ff3862f +Subproject commit d85ef79af58dfbbf0b1a254192d079f2103260d0 -- To view, visit https://gerrit.wikimedia.org/r/84777 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Idee15b9b3b91bd439900bc04b23619889c29d9ae Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: wmf/1.22wmf17 Gerrit-Owner: CSteipp cste...@wikimedia.org Gerrit-Reviewer: CSteipp cste...@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 changelog typo - change (operations...varnish)
BBlack has uploaded a new change for review. https://gerrit.wikimedia.org/r/84782 Change subject: fix changelog typo .. fix changelog typo Change-Id: Ib6e00b5cd45863c22e8d738f45b5ad94c9d93792 --- M debian/changelog 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/debs/varnish refs/changes/82/84782/1 diff --git a/debian/changelog b/debian/changelog index 85d1e1d..4d964e1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -90,7 +90,7 @@ - Persisten storage support - HTTP object streaming support - -- Mark Bergsma mark@wikimedia Tue, 28 Aug 2012 11:36:52 + + -- Mark Bergsma m...@wikimedia.org Tue, 28 Aug 2012 11:36:52 + varnish (3.0.3~rc1+persistent-wm1) precise; urgency=low -- To view, visit https://gerrit.wikimedia.org/r/84782 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib6e00b5cd45863c22e8d738f45b5ad94c9d93792 Gerrit-PatchSet: 1 Gerrit-Project: operations/debs/varnish Gerrit-Branch: testing/3.0.3plus-rc1 Gerrit-Owner: BBlack bbl...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] VE bullets, numbering, indents, outdents - change (mediawiki...VisualEditor)
jenkins-bot has submitted this change and it was merged. Change subject: VE bullets, numbering, indents, outdents .. VE bullets, numbering, indents, outdents Change-Id: I0394c9d6f89e9a723d070b517560685d003f7bef --- M modules/ve-mw/test/browser/Gemfile.lock A modules/ve-mw/test/browser/features/step_definitions/visual_editor_bullets_steps.rb M modules/ve-mw/test/browser/features/step_definitions/visual_editor_references_steps.rb M modules/ve-mw/test/browser/features/support/pages/visual_editor_page.rb A modules/ve-mw/test/browser/features/visual_editor_bullets.feature 5 files changed, 189 insertions(+), 4 deletions(-) Approvals: Cmcmahon: Looks good to me, approved jenkins-bot: Verified diff --git a/modules/ve-mw/test/browser/Gemfile.lock b/modules/ve-mw/test/browser/Gemfile.lock index 816cda7..926178e 100644 --- a/modules/ve-mw/test/browser/Gemfile.lock +++ b/modules/ve-mw/test/browser/Gemfile.lock @@ -17,7 +17,10 @@ faker (1.2.0) i18n (~ 0.5) ffi (1.9.0) +ffi (1.9.0-x86-mingw32) gherkin (2.12.1) + multi_json (~ 1.3) +gherkin (2.12.1-x86-mingw32) multi_json (~ 1.3) i18n (0.6.5) json (1.8.0) @@ -46,6 +49,7 @@ PLATFORMS ruby + x86-mingw32 DEPENDENCIES cucumber diff --git a/modules/ve-mw/test/browser/features/step_definitions/visual_editor_bullets_steps.rb b/modules/ve-mw/test/browser/features/step_definitions/visual_editor_bullets_steps.rb new file mode 100644 index 000..591e132 --- /dev/null +++ b/modules/ve-mw/test/browser/features/step_definitions/visual_editor_bullets_steps.rb @@ -0,0 +1,103 @@ +Given(/^I close the VE information window$/) do + pending # express the regexp above with the code you wish you had +end + + When(/^I type in an input string$/) do + on(VisualEditorPage) do |page| +page.content_element.when_present.send_keys This is a new line +page.content_element.when_present.send_keys :return + end +end + +When(/^select the string$/) do + require watir-webdriver/extensions/select_text + on(VisualEditorPage).content_element.select_text This is a new line + #sleep 1 # turn the sleep on if this test fails with bullet/number in front of string NOT This is.. +end + +When(/^I click Numbering$/) do + on(VisualEditorPage).ve_numbering_element.when_present.click +end + +Then(/^a \# is added in front of input string in the diff view$/) do + on(VisualEditorPage) do |page| +page.wait_until(10) do + page.heading_diff_view.include? '# This ' +end +page.heading_diff_view.should match Regexp.new(/^\# This is a new line/) + end +end + +When(/^I click Bullets$/) do + on(VisualEditorPage).ve_bullets_element.when_present.click +end + +Then(/^a \* is added in front of input string in the diff view$/) do + on(VisualEditorPage) do |page| +page.wait_until(10) do + page.heading_diff_view.include? '* This ' +end +page.heading_diff_view.should match Regexp.new(/^\* This is a new line/) + end +end + +When(/^I click Increase indentation$/) do + on(VisualEditorPage).increase_indentation_on_element.when_present.click +end + +Then(/^a \#\# is added in front of input string in the diff view$/) do + on(VisualEditorPage) do |page| +page.wait_until(10) do + page.heading_diff_view.include? '## This ' +end +page.heading_diff_view.should match Regexp.new(/^\#\# This is a new line/) + end +end + +Then(/^a \*\* is added in front of input string in the diff view$/) do + on(VisualEditorPage) do |page| +page.wait_until(10) do + page.heading_diff_view.include? '** This ' +end +page.heading_diff_view.should match Regexp.new(/^\*\* This is a new line/) + end +end + + +When(/^I click Decrease indentation$/) do + on(VisualEditorPage).decrease_indentation_on_element.when_present.click +end + +Then(/^nothing is added in front of input string in the diff view$/) do + on(VisualEditorPage) do |page| +page.wait_until(10) do + page.heading_diff_view.include? 'This ' +end +page.heading_diff_view.should match Regexp.new(/^This is a new line/) + end +end + +Then(/^Decrease indentation should be disabled$/) do + on(VisualEditorPage).decrease_indentation_element.class_name.should match /disabled/ +end + +Then(/^Increase indentation should be disabled$/) do + on(VisualEditorPage).increase_indentation_element.class_name.should match /disabled/ +end + + +Then(/^Decrease indentation should be enabled$/) do + on(VisualEditorPage).decrease_indentation_on_element.class_name.should_not match /disabled/ +end + +Then(/^Increase indentation should be enabled$/) do + on(VisualEditorPage).increase_indentation_on_element.class_name.should_not match /disabled/ +end + +When(/^I undo Bullets$/) do + on(VisualEditorPage).ve_bullets_element.when_present.click +end + +When(/^I undo Numbering$/) do + on(VisualEditorPage).ve_numbering_element.when_present.click +end diff --git
[MediaWiki-commits] [Gerrit] Enable Collection on chapcomwiki - change (operations/mediawiki-config)
Reedy has uploaded a new change for review. https://gerrit.wikimedia.org/r/84786 Change subject: Enable Collection on chapcomwiki .. Enable Collection on chapcomwiki Bug: 52833 Change-Id: I23763880ab8d37f4b1e374287a310fcafcaf5ae4 --- M wmf-config/InitialiseSettings.php 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/86/84786/1 diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index 8fad1b7..d50f47f 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -9785,6 +9785,7 @@ 'bawiki' = true, // Bug 40879 'bpywiki' = true, # Bug 18517 'cawiki' = true, # Bug 21174 + 'chapcomwiki' = true, # Bug 52833 'cswiki' = true, # Bug 20436 'cswikiversity' = true, # Bug 21077 'bnwiki' = true, # https://bugzilla.wikimedia.org/show_bug.cgi?id=20338 -- To view, visit https://gerrit.wikimedia.org/r/84786 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I23763880ab8d37f4b1e374287a310fcafcaf5ae4 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Reedy re...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] update libvarnishapi1 symbols - change (operations...varnish)
BBlack has uploaded a new change for review. https://gerrit.wikimedia.org/r/84783 Change subject: update libvarnishapi1 symbols .. update libvarnishapi1 symbols Change-Id: I9fa6e2210d151a82ad22acee6f9512512c9e943c --- M debian/libvarnishapi1.symbols 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/debs/varnish refs/changes/83/84783/1 diff --git a/debian/libvarnishapi1.symbols b/debian/libvarnishapi1.symbols index 723c656..3e4a46c 100644 --- a/debian/libvarnishapi1.symbols +++ b/debian/libvarnishapi1.symbols @@ -1,5 +1,6 @@ libvarnishapi.so.1 libvarnishapi1 #MINVER# LIBVARNISHAPI_1.0@LIBVARNISHAPI_1.0 3.0.0 + LIBVARNISHAPI_1.1@LIBVARNISHAPI_1.1 3.0.0 VCLI_AuthResponse@LIBVARNISHAPI_1.0 3.0.0 VCLI_ReadResult@LIBVARNISHAPI_1.0 3.0.0 VCLI_WriteResult@LIBVARNISHAPI_1.0 3.0.0 @@ -19,6 +20,7 @@ #MISSING: 3.0.0# VSL_H_Print@Base 2.0~rc1 VSL_H_Print@LIBVARNISHAPI_1.0 3.0.0 VSL_Matched@LIBVARNISHAPI_1.0 3.0.0 + VSL_Name2Tag@LIBVARNISHAPI_1.1 3.0.0 #MISSING: 3.0.0# VSL_Name@Base 2.0~rc1 #MISSING: 3.0.0# VSL_New@Base 2.0~rc1 #MISSING: 3.0.0# VSL_NextLog@Base 2.0~rc1 -- To view, visit https://gerrit.wikimedia.org/r/84783 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I9fa6e2210d151a82ad22acee6f9512512c9e943c Gerrit-PatchSet: 1 Gerrit-Project: operations/debs/varnish Gerrit-Branch: testing/3.0.3plus-rc1 Gerrit-Owner: BBlack bbl...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Allow always using https links in emails - change (mediawiki...TranslationNotifications)
Siebrand has uploaded a new change for review.
https://gerrit.wikimedia.org/r/84849
Change subject: Allow always using https links in emails
..
Allow always using https links in emails
To enable this feature, $wgTranslationNotificationsAlwaysHttpsInEmail has
to be set to true.
Bug: 39139
Change-Id: I42ae891cd23653bf30dc78f872b4d4b87a935aed
---
M SpecialNotifyTranslators.php
M TranslationNotifications.php
2 files changed, 16 insertions(+), 1 deletion(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/TranslationNotifications
refs/changes/49/84849/1
diff --git a/SpecialNotifyTranslators.php b/SpecialNotifyTranslators.php
index d59290e..3ea8434 100644
--- a/SpecialNotifyTranslators.php
+++ b/SpecialNotifyTranslators.php
@@ -508,17 +508,29 @@
protected function sendTranslationNotificationEmail( User $user,
$languagesToNotify = array()
) {
+ global $wgTranslationNotificationsAlwaysHttpsInEmail;
+
$relevantLanguages = $this-getRelevantLanguages( $user,
$languagesToNotify );
$userFirstLanguage = Language::factory(
$this-getUserFirstLanguage( $user ) );
$emailSubject = self::getNotificationSubject(
$userFirstLanguage );
$signupURL = SpecialPage::getTitleFor( 'TranslatorSignup'
)-getCanonicalUrl();
+ $translationUrls = $this-getTranslationURLs(
+ $relevantLanguages,
+ 'email',
+ $userFirstLanguage
+ );
+
+ if ( $wgTranslationNotificationsAlwaysHttpsInEmail === true ) {
+ $translationUrls = str_replace( 'http:', 'https:',
$translationUrls );
+ }
+
$emailBody = $this-msg(
'translationnotifications-email-body',
$this-getUserName( $user ),
$userFirstLanguage-listToText( array_values(
$relevantLanguages ) ),
$this-translatablePageTitle,
- $this-getTranslationURLs( $relevantLanguages, 'email',
$userFirstLanguage ),
+ $translationUrls,
$this-getPriorityClause( $userFirstLanguage ),
$this-getDeadlineClause( $userFirstLanguage ),
$this-notificationText,
diff --git a/TranslationNotifications.php b/TranslationNotifications.php
index a4f57ed..791a9b4 100644
--- a/TranslationNotifications.php
+++ b/TranslationNotifications.php
@@ -89,6 +89,9 @@
// Message key of the legal text for Special:TranslatorSignup page.
$wgTranslationNotificationsSignupLegalMessage =
'translationnotifications-signup-legal';
+// Always use https links for translation notification emails?
+$wgTranslationNotificationsAlwaysHttpsInEmail = false;
+
// Give the language options default empty values, so that they
// won't be saved as empty strings. (Bug 37165)
foreach ( range( 1, 3 ) as $langNum ) {
--
To view, visit https://gerrit.wikimedia.org/r/84849
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I42ae891cd23653bf30dc78f872b4d4b87a935aed
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/TranslationNotifications
Gerrit-Branch: master
Gerrit-Owner: Siebrand siebr...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update http to https where possible - change (mediawiki...TranslationNotifications)
Siebrand has uploaded a new change for review.
https://gerrit.wikimedia.org/r/84848
Change subject: Update http to https where possible
..
Update http to https where possible
Also break some long lines in README.
Change-Id: I90b1c41fe7f8cecfce10043a8eeb75170c7cf96a
---
M TranslationNotifications.i18n.php
M composer.json
M scripts/README
3 files changed, 8 insertions(+), 5 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/TranslationNotifications
refs/changes/48/84848/1
diff --git a/TranslationNotifications.i18n.php
b/TranslationNotifications.i18n.php
index 1efadbf..347f8da 100644
--- a/TranslationNotifications.i18n.php
+++ b/TranslationNotifications.i18n.php
@@ -144,7 +144,7 @@
$messages['qqq'] = array(
'translatorsignup' = '{{doc-special|TranslatorSignup}}',
'translatorsignup-summary' = 'Text on top of
Special:TranslatorSignup.',
- 'translationnotifications-desc' = '{{desc|name=Translation
Notifications|url=http://www.mediawiki.org/wiki/Extension:TranslationNotifications}}',
+ 'translationnotifications-desc' = '{{desc|name=Translation
Notifications|url=https://www.mediawiki.org/wiki/Extension:TranslationNotifications}}',
'translationnotifications-info' = 'Fieldset header',
'translationnotifications-username' = 'Label followed by username.
{{Identical|Username}}',
diff --git a/composer.json b/composer.json
index 0a295b4..e9722be 100644
--- a/composer.json
+++ b/composer.json
@@ -2,7 +2,7 @@
name: mediawiki/translation-notifications,
type: mediawiki-extension,
description: Manage communication with translators,
- homepage:
http://www.mediawiki.org/wiki/Extension:TranslationNotifications;,
+ homepage:
https://www.mediawiki.org/wiki/Extension:TranslationNotifications;,
license: GPL-2.0+,
require: {
diff --git a/scripts/README b/scripts/README
index 16adb3f..1b1b541 100644
--- a/scripts/README
+++ b/scripts/README
@@ -1,9 +1,12 @@
DigestEmailer
=
The DigestEmailer script need to be configured using a cron job.
-For example, it can be scheduled to run on every Sunday 10AM using the
following crontab entry.
+For example, it can be scheduled to run on every Sunday 10AM using the
+following crontab entry.
0 10 * * 7 /usr/bin/php
/www/wiki/extensions/TranslationNotifications/scripts/DigestEmailer.php 21
/var/log/digestEmail.log
-The script will not start sending emails immediately. It starts inserting
email jobs to the MediaWiki job queue. Depending on the configured jobqueue
scheduling the mails will be send out. You can read more about the MediaWiki
Job Queue here: https://www.mediawiki.org/wiki/Job_queue
-
+The script will not start sending emails immediately. It starts inserting email
+jobs to the MediaWiki job queue. Depending on the configured jobqueue
scheduling
+the mails will be send out. You can read more about the MediaWiki Job Queue
+here: https://www.mediawiki.org/wiki/Job_queue
--
To view, visit https://gerrit.wikimedia.org/r/84848
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I90b1c41fe7f8cecfce10043a8eeb75170c7cf96a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/TranslationNotifications
Gerrit-Branch: master
Gerrit-Owner: Siebrand siebr...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Changed quoting function for oracleDB. - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged.
Change subject: Changed quoting function for oracleDB.
..
Changed quoting function for oracleDB.
Change-Id: Ifba624f62702740b6531d0dab082015cd2a235b4
---
M tests/phpunit/includes/db/DatabaseTest.php
1 file changed, 12 insertions(+), 2 deletions(-)
Approvals:
Chad: Looks good to me, approved
jenkins-bot: Verified
diff --git a/tests/phpunit/includes/db/DatabaseTest.php
b/tests/phpunit/includes/db/DatabaseTest.php
index c9f5f5c..a3ef55a 100644
--- a/tests/phpunit/includes/db/DatabaseTest.php
+++ b/tests/phpunit/includes/db/DatabaseTest.php
@@ -84,19 +84,29 @@
$quote = '';
} elseif ( $this-db-getType() === 'mysql' ) {
$quote = '`';
+ } elseif ( $this-db-getType() === 'oracle' ) {
+ $quote = '/*Q*/';
} else {
$quote = '';
}
if ( $database !== null ) {
- $database = $quote . $database . $quote . '.';
+ if ( $this-db-getType() === 'oracle' ) {
+ $database = $quote . $database . '.';
+ } else {
+ $database = $quote . $database . $quote . '.';
+ }
}
if ( $prefix === null ) {
$prefix = $this-dbPrefix();
}
- return $database . $quote . $prefix . $table . $quote;
+ if ( $this-db-getType() === 'oracle' ) {
+ return strtoupper($database . $quote . $prefix .
$table);
+ } else {
+ return $database . $quote . $prefix . $table . $quote;
+ }
}
function testTableNameLocal() {
--
To view, visit https://gerrit.wikimedia.org/r/65626
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ifba624f62702740b6531d0dab082015cd2a235b4
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Freakolowsky fr...@drajv.si
Gerrit-Reviewer: Chad ch...@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] [Experiment] Use Autonym font for language autonyms - change (mediawiki...UniversalLanguageSelector)
Santhosh has uploaded a new change for review.
https://gerrit.wikimedia.org/r/84850
Change subject: [Experiment] Use Autonym font for language autonyms
..
[Experiment] Use Autonym font for language autonyms
Updates jquery.uls from upstream autonymfont branch
Change-Id: Ia702ba1df91701df67160d973a0caaa72511c743
---
M lib/jquery.uls/css/jquery.uls.css
M lib/jquery.uls/src/jquery.uls.lcd.js
2 files changed, 14 insertions(+), 0 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/UniversalLanguageSelector
refs/changes/50/84850/1
diff --git a/lib/jquery.uls/css/jquery.uls.css
b/lib/jquery.uls/css/jquery.uls.css
index dd9a574..0ae3ea6 100644
--- a/lib/jquery.uls/css/jquery.uls.css
+++ b/lib/jquery.uls/css/jquery.uls.css
@@ -258,3 +258,15 @@
.uls-menu .search-input-block {
position: relative;
}
+
+@font-face {
+ font-family: 'Autonym';
+ src: url('font/Autonym.eot');
+ src: local('Autonym'), url('font/Autonym.woff') format('woff'),
url('font/Autonym.ttf') format('truetype');
+ font-style: normal;
+}
+
+.autonym {
+ font-family: 'Autonym', sans-serif;
+ font-size: 1em;
+}
\ No newline at end of file
diff --git a/lib/jquery.uls/src/jquery.uls.lcd.js
b/lib/jquery.uls/src/jquery.uls.lcd.js
index 87f79c2..0b614fe 100644
--- a/lib/jquery.uls/src/jquery.uls.lcd.js
+++ b/lib/jquery.uls/src/jquery.uls.lcd.js
@@ -98,6 +98,7 @@
$li = $( 'li' )
.data( 'code', langCode )
+ .addClass( 'autonym' )
.attr( {
lang: langCode,
dir: $.uls.data.getDir(
langCode )
@@ -230,6 +231,7 @@
langName = $.uls.data.getAutonym( langCode ) ||
language || langCode;
$li = $( 'li' )
.data( 'code', langCode )
+ .addClass( 'autonym' )
.attr( {
lang: langCode,
dir: $.uls.data.getDir(
langCode )
--
To view, visit https://gerrit.wikimedia.org/r/84850
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia702ba1df91701df67160d973a0caaa72511c743
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/UniversalLanguageSelector
Gerrit-Branch: master
Gerrit-Owner: Santhosh santhosh.thottin...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] [Experiment] Use Autonymfont for interlanguage links - change (mediawiki...UniversalLanguageSelector)
Santhosh has uploaded a new change for review.
https://gerrit.wikimedia.org/r/84851
Change subject: [Experiment] Use Autonymfont for interlanguage links
..
[Experiment] Use Autonymfont for interlanguage links
Change-Id: If194efa7785d472f78790ffcb6c68636fcaee5ad
---
M resources/css/ext.uls.css
1 file changed, 5 insertions(+), 0 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/UniversalLanguageSelector
refs/changes/51/84851/1
diff --git a/resources/css/ext.uls.css b/resources/css/ext.uls.css
index 8da64e5..ddf639d 100644
--- a/resources/css/ext.uls.css
+++ b/resources/css/ext.uls.css
@@ -312,3 +312,8 @@
-ms-filter:
progid:DXImageTransform.Microsoft.gradient(startColorstr='#2ca368',
endColorstr='#2ca368', GradientType=0);
filter:
progid:dximagetransform.microsoft.gradient(startColorstr='#2ca368',
endColorstr='#2ca368', GradientType=0);
}
+
+/* Interlanguage links */
+#p-lang a {
+ font-family: 'Autonym', sans-serif;
+}
\ No newline at end of file
--
To view, visit https://gerrit.wikimedia.org/r/84851
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: If194efa7785d472f78790ffcb6c68636fcaee5ad
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/UniversalLanguageSelector
Gerrit-Branch: master
Gerrit-Owner: Santhosh santhosh.thottin...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Updating CentralNotice to master - change (mediawiki/core)
Mwalker has submitted this change and it was merged. Change subject: Updating CentralNotice to master .. Updating CentralNotice to master Change-Id: I357098d272097c9c70e51391264fa65b89c33e91 --- M extensions/CentralNotice 1 file changed, 0 insertions(+), 0 deletions(-) Approvals: Mwalker: Verified; Looks good to me, approved diff --git a/extensions/CentralNotice b/extensions/CentralNotice index 5461bb6..3a46e0d 16 --- a/extensions/CentralNotice +++ b/extensions/CentralNotice -Subproject commit 5461bb68b97d59aab01574580fa2d7625359dc89 +Subproject commit 3a46e0d2305b65045bb55490e5c8824089e16ec2 -- To view, visit https://gerrit.wikimedia.org/r/84789 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I357098d272097c9c70e51391264fa65b89c33e91 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: wmf/1.22wmf16 Gerrit-Owner: Mwalker mwal...@wikimedia.org Gerrit-Reviewer: Mwalker mwal...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fixed OracleUpdater::doPageRestrictionsPKUKFix prefix - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged.
Change subject: Fixed OracleUpdater::doPageRestrictionsPKUKFix prefix
..
Fixed OracleUpdater::doPageRestrictionsPKUKFix prefix
Previously OracleUpdater::doPageRestrictionsPKUKFix had the
database prefix hard-coded into the SQL query. This removes
the hard-coded value and replaces it with the actual configured
prefix.
Change-Id: If60f23af7fd238d4c91ebf25b095749345a2718d
---
M includes/installer/OracleUpdater.php
1 file changed, 6 insertions(+), 1 deletion(-)
Approvals:
Chad: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/installer/OracleUpdater.php
b/includes/installer/OracleUpdater.php
index b416f4b..90b4c87 100644
--- a/includes/installer/OracleUpdater.php
+++ b/includes/installer/OracleUpdater.php
@@ -202,7 +202,12 @@
protected function doPageRestrictionsPKUKFix() {
$this-output( Altering PAGE_RESTRICTIONS keys ... );
- $meta = $this-db-query( 'SELECT column_name FROM
all_cons_columns WHERE owner = \''.strtoupper($this-db-getDBname()).'\' AND
constraint_name = \'MW_PAGE_RESTRICTIONS_PK\' AND rownum = 1' );
+ $meta = $this-db-query( 'SELECT column_name FROM
all_cons_columns WHERE owner = \'' .
+ strtoupper( $this-db-getDBname() ) .
+ '\' AND constraint_name = \'' .
+ $this-db-tablePrefix() .
+ 'PAGE_RESTRICTIONS_PK\' AND rownum = 1'
+ );
$row = $meta-fetchRow();
if ( $row['column_name'] == 'PR_ID' ) {
$this-output( seems to be up to date.\n );
--
To view, visit https://gerrit.wikimedia.org/r/66042
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: If60f23af7fd238d4c91ebf25b095749345a2718d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: REL1_21
Gerrit-Owner: Freakolowsky fr...@drajv.si
Gerrit-Reviewer: Chad ch...@wikimedia.org
Gerrit-Reviewer: Waldir wal...@email.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] Changed tableName so it returns uppercased table names (+pre... - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged.
Change subject: Changed tableName so it returns uppercased table names
(+prefix) Changed tableExists so it returns boolean (and closes resource when
it's done in case it fails)
..
Changed tableName so it returns uppercased table names (+prefix)
Changed tableExists so it returns boolean (and closes resource when
it's done in case it fails)
Change-Id: I4f842a634900756618bb4b3b6d83f86492e73fab
---
M includes/db/DatabaseOracle.php
1 file changed, 8 insertions(+), 7 deletions(-)
Approvals:
Chad: Looks good to me, approved
Parent5446: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/includes/db/DatabaseOracle.php b/includes/db/DatabaseOracle.php
index 4fa2397..a4dc662 100644
--- a/includes/db/DatabaseOracle.php
+++ b/includes/db/DatabaseOracle.php
@@ -686,7 +686,7 @@
break;
}
- return parent::tableName( strtoupper( $name ), $format );
+ return strtoupper( parent::tableName( $name, $format ) );
}
function tableNameInternal( $name ) {
@@ -875,7 +875,7 @@
/**
* Query whether a given table exists (in the given schema, or the
default mw one if not given)
-* @return int
+* @return bool
*/
function tableExists( $table, $fname = __METHOD__ ) {
$table = $this-tableName( $table );
@@ -883,13 +883,14 @@
$owner = $this-addQuotes( strtoupper( $this-mDBname ) );
$SQL = SELECT 1 FROM all_tables WHERE owner=$owner AND
table_name=$table;
$res = $this-doQuery( $SQL );
- if ( $res ) {
- $count = $res-numRows();
- $res-free();
+ if ( $res $res-numRows() 0 ) {
+ $exists = true;
} else {
- $count = 0;
+ $exists = false;
}
- return $count;
+
+ $res-free();
+ return $exists;
}
/**
--
To view, visit https://gerrit.wikimedia.org/r/65630
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I4f842a634900756618bb4b3b6d83f86492e73fab
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Freakolowsky fr...@drajv.si
Gerrit-Reviewer: Aaron Schulz asch...@wikimedia.org
Gerrit-Reviewer: Asher afeld...@wikimedia.org
Gerrit-Reviewer: Chad ch...@wikimedia.org
Gerrit-Reviewer: Parent5446 tylerro...@gmail.com
Gerrit-Reviewer: Waldir wal...@email.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] Updating CentralNotice to master - change (mediawiki/core)
Mwalker has submitted this change and it was merged. Change subject: Updating CentralNotice to master .. Updating CentralNotice to master Change-Id: I74affa88a08ba07049143dffa7cabfff67c810c2 --- M extensions/CentralNotice 1 file changed, 0 insertions(+), 0 deletions(-) Approvals: Mwalker: Verified; Looks good to me, approved diff --git a/extensions/CentralNotice b/extensions/CentralNotice index 5461bb6..3a46e0d 16 --- a/extensions/CentralNotice +++ b/extensions/CentralNotice -Subproject commit 5461bb68b97d59aab01574580fa2d7625359dc89 +Subproject commit 3a46e0d2305b65045bb55490e5c8824089e16ec2 -- To view, visit https://gerrit.wikimedia.org/r/84790 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I74affa88a08ba07049143dffa7cabfff67c810c2 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: wmf/1.22wmf17 Gerrit-Owner: Mwalker mwal...@wikimedia.org Gerrit-Reviewer: Mwalker mwal...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Merge remote-tracking branch 'origin/master' into wmf_deploy - change (mediawiki...CentralNotice)
Mwalker has uploaded a new change for review. https://gerrit.wikimedia.org/r/84787 Change subject: Merge remote-tracking branch 'origin/master' into wmf_deploy .. Merge remote-tracking branch 'origin/master' into wmf_deploy * origin/master: Cache Banner Message Field Definitions Change-Id: Ic8a081821ff6c8751a5ab2b01525e01723f3f06c --- 0 files changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CentralNotice refs/changes/87/84787/1 -- To view, visit https://gerrit.wikimedia.org/r/84787 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic8a081821ff6c8751a5ab2b01525e01723f3f06c Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/CentralNotice Gerrit-Branch: wmf_deploy Gerrit-Owner: Mwalker mwal...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Updating CentralNotice to master - change (mediawiki/core)
Mwalker has uploaded a new change for review. https://gerrit.wikimedia.org/r/84790 Change subject: Updating CentralNotice to master .. Updating CentralNotice to master Change-Id: I74affa88a08ba07049143dffa7cabfff67c810c2 --- M extensions/CentralNotice 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/90/84790/1 diff --git a/extensions/CentralNotice b/extensions/CentralNotice index 5461bb6..3a46e0d 16 --- a/extensions/CentralNotice +++ b/extensions/CentralNotice -Subproject commit 5461bb68b97d59aab01574580fa2d7625359dc89 +Subproject commit 3a46e0d2305b65045bb55490e5c8824089e16ec2 -- To view, visit https://gerrit.wikimedia.org/r/84790 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I74affa88a08ba07049143dffa7cabfff67c810c2 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: wmf/1.22wmf17 Gerrit-Owner: Mwalker mwal...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Merge remote-tracking branch 'origin/master' into wmf_deploy - change (mediawiki...CentralNotice)
jenkins-bot has submitted this change and it was merged. Change subject: Merge remote-tracking branch 'origin/master' into wmf_deploy .. Merge remote-tracking branch 'origin/master' into wmf_deploy * origin/master: Cache Banner Message Field Definitions Change-Id: Ic8a081821ff6c8751a5ab2b01525e01723f3f06c --- 0 files changed, 0 insertions(+), 0 deletions(-) Approvals: Mwalker: Looks good to me, approved jenkins-bot: Verified -- To view, visit https://gerrit.wikimedia.org/r/84787 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ic8a081821ff6c8751a5ab2b01525e01723f3f06c Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/CentralNotice Gerrit-Branch: wmf_deploy Gerrit-Owner: Mwalker mwal...@wikimedia.org Gerrit-Reviewer: Mwalker mwal...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Enable Collection on chapcomwiki - change (operations/mediawiki-config)
jenkins-bot has submitted this change and it was merged. Change subject: Enable Collection on chapcomwiki .. Enable Collection on chapcomwiki Bug: 52833 Change-Id: I23763880ab8d37f4b1e374287a310fcafcaf5ae4 --- M wmf-config/InitialiseSettings.php 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Reedy: Looks good to me, approved jenkins-bot: Verified diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index 8fad1b7..d50f47f 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -9785,6 +9785,7 @@ 'bawiki' = true, // Bug 40879 'bpywiki' = true, # Bug 18517 'cawiki' = true, # Bug 21174 + 'chapcomwiki' = true, # Bug 52833 'cswiki' = true, # Bug 20436 'cswikiversity' = true, # Bug 21077 'bnwiki' = true, # https://bugzilla.wikimedia.org/show_bug.cgi?id=20338 -- To view, visit https://gerrit.wikimedia.org/r/84786 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I23763880ab8d37f4b1e374287a310fcafcaf5ae4 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Reedy re...@wikimedia.org 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] fixed wrong version number in HISTORY - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged. Change subject: fixed wrong version number in HISTORY .. fixed wrong version number in HISTORY Change-Id: I0e702b7b3ea886ba725eb83dde0e0ad9eb6e2f38 --- M HISTORY 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Chad: Looks good to me, approved jenkins-bot: Verified diff --git a/HISTORY b/HISTORY index 2669f67..cfe5f7c 100644 --- a/HISTORY +++ b/HISTORY @@ -1,4 +1,4 @@ -Change notes from older releases. For current info see RELEASE-NOTES-1.20. +Change notes from older releases. For current info see RELEASE-NOTES-1.19. == MediaWiki 1.18 == === Changes since 1.18.2 === -- To view, visit https://gerrit.wikimedia.org/r/81007 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I0e702b7b3ea886ba725eb83dde0e0ad9eb6e2f38 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: REL1_19 Gerrit-Owner: Emwiemaikel erdm...@diqa-pm.com Gerrit-Reviewer: Chad ch...@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] Tweaks to tokenizing and bug fixes for escaping of behavior ... - change (mediawiki...Parsoid)
Subramanya Sastry has uploaded a new change for review.
https://gerrit.wikimedia.org/r/84852
Change subject: Tweaks to tokenizing and bug fixes for escaping of behavior
switches
..
Tweaks to tokenizing and bug fixes for escaping of behavior switches
* While debugging RT failures on en:Duke_of_Aveiro because of
excessive nowiki escaping, discovered that escaping was getting
tripped by overeager behavior switch tokenizing. Also discovered
that the existing wikitext escaping was completely missing escaping
for magic-words.
* This patch adds escaping for text that would parse as magic words.
It also adds checks to not trip on magic-word-like syntax.
* Added new parser tests for this behavior.
* Cleaned up debugging/tracing for wikitext escaping.
* Added tracing of wikitext escaping logic (--trace wt-escape)
* Added tracing to spit out tokenizer tokens only (--trace peg-tokens)
* Most RT failures on en:Duke_of_Aveiro are now fixed -- the remaining
issue will be investigated in a new patch since it doesn't seem
related to behavior switch handling.
Change-Id: Icef5d313f380261502da7fcbddc4e48c304b64d9
---
M js/lib/ext.core.BehaviorSwitchHandler.js
M js/lib/mediawiki.WikiConfig.js
M js/lib/mediawiki.WikitextSerializer.js
M js/lib/pegTokenizer.pegjs.txt
M js/tests/parse.js
M js/tests/parserTests.txt
6 files changed, 118 insertions(+), 42 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Parsoid
refs/changes/52/84852/1
diff --git a/js/lib/ext.core.BehaviorSwitchHandler.js
b/js/lib/ext.core.BehaviorSwitchHandler.js
index f746f9f..a737be0 100644
--- a/js/lib/ext.core.BehaviorSwitchHandler.js
+++ b/js/lib/ext.core.BehaviorSwitchHandler.js
@@ -65,15 +65,8 @@
* See {@link TokenTransformManager#addTransform}'s transformation parameter
*/
BehaviorSwitchPreprocessor.prototype.onBehaviorSwitch = function ( token,
manager, cb ) {
- var metaToken, switchType, env = this.manager.env,
- magicWord = token.attribs[0].v;
-
- switchType = magicWord.toLowerCase();
-
- var actualType = env.conf.wiki.magicWords[magicWord] ||
- env.conf.wiki.magicWords[switchType];
-
- if ( actualType ) {
+ var magicWord = token.attribs[0].v;
+ if (this.manager.env.conf.wiki.isMagicWord(magicWord)) {
token.dataAttribs.magicSrc = magicWord;
return {
tokens: [ token ]
diff --git a/js/lib/mediawiki.WikiConfig.js b/js/lib/mediawiki.WikiConfig.js
index e8cf480..43dbc38 100644
--- a/js/lib/mediawiki.WikiConfig.js
+++ b/js/lib/mediawiki.WikiConfig.js
@@ -328,7 +328,6 @@
this.functionHooks = JSUtils.arrayToHash(resultConf.functionhooks ||
[]);
}
-
/**
* @method
*
@@ -342,6 +341,13 @@
};
/**
+ * Check if a string is a recognized magic word
+ */
+WikiConfig.prototype.isMagicWord = function( word ) {
+ return this.magicWords[word] || this.magicWords[word.toLowerCase()];
+}
+
+/**
* @method
*
* Get a regexp matching a localized magic word, given its id.
diff --git a/js/lib/mediawiki.WikitextSerializer.js
b/js/lib/mediawiki.WikitextSerializer.js
index 56b5ae1..63613b7 100644
--- a/js/lib/mediawiki.WikitextSerializer.js
+++ b/js/lib/mediawiki.WikitextSerializer.js
@@ -187,8 +187,10 @@
};
WEHP.hasWikitextTokens = function ( state, onNewline, options, text, linksOnly
) {
- // console.warn(---EWT:DBG0---);
- // console.warn(---HWT---:onl: + onNewline + : + text);
+ if (this.traceWTE) {
+ console.warn(WTE-tokenize: nl: + onNewline + :text= +
JSON.stringify(text));
+ }
+
// tokenize the text
var sol = onNewline !(state.inIndentPre || state.inPPHPBlock);
@@ -200,7 +202,9 @@
for (var i = 0, n = tokens.length; i n; i++) {
var t = tokens[i];
- // console.warn(T: + JSON.stringify(t));
+ if (this.traceWTE) {
+ console.warn(T: + JSON.stringify(t));
+ }
// Ignore non-whitelisted html tags
if (t.isHTMLTag()) {
@@ -223,6 +227,11 @@
// Ignore url links
if (t.name === 'urllink') {
+ continue;
+ }
+
+ // Ignore invalid behavior-switch tokens
+ if (t.name === 'behavior-switch'
!state.env.conf.wiki.isMagicWord(t.attribs[0].v)) {
continue;
}
@@ -296,6 +305,9 @@
this.debugging = this.env.conf.parsoid.traceFlags
(this.env.conf.parsoid.traceFlags.indexOf(wts) !== -1);
+ this.traceWTE = this.env.conf.parsoid.traceFlags
+ (this.env.conf.parsoid.traceFlags.indexOf(wt-escape) !== -1);
+
if ( this.env.conf.parsoid.debug || this.debugging ) {
[MediaWiki-commits] [Gerrit] Link to page mode in notification emails - change (mediawiki...TranslationNotifications)
Siebrand has uploaded a new change for review.
https://gerrit.wikimedia.org/r/84853
Change subject: Link to page mode in notification emails
..
Link to page mode in notification emails
Bug: 52521
Change-Id: I879c6cec1598d52977d19a15a41ccede7d866c97
---
M SpecialNotifyTranslators.php
M scripts/DigestEmailer.php
2 files changed, 12 insertions(+), 4 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/TranslationNotifications
refs/changes/53/84853/1
diff --git a/SpecialNotifyTranslators.php b/SpecialNotifyTranslators.php
index d59290e..206c011 100644
--- a/SpecialNotifyTranslators.php
+++ b/SpecialNotifyTranslators.php
@@ -410,8 +410,12 @@
protected function getTranslationURL( $languageCode ) {
$page = TranslatablePage::newFromTitle(
$this-translatablePageTitle );
$translationURL = SpecialPage::getTitleFor( 'Translate'
)-getCanonicalUrl(
- array( 'group' = $page-getMessageGroupId(),
- 'language' = $languageCode ) );
+ array(
+ 'group' = $page-getMessageGroupId(),
+ 'language' = $languageCode,
+ 'action' = 'page'
+ )
+ );
return $translationURL;
}
diff --git a/scripts/DigestEmailer.php b/scripts/DigestEmailer.php
index 67330b8..9a7ad50 100644
--- a/scripts/DigestEmailer.php
+++ b/scripts/DigestEmailer.php
@@ -120,8 +120,12 @@
$page = TranslatablePage::newFromTitle(
$notification['translatablepage'] );
$translationURL = SpecialPage::getTitleFor(
'Translate' )-getCanonicalUrl(
- array( 'group' =
$page-getMessageGroupId(),
- 'language' = $firstLangCode )
);
+ array(
+ 'group' =
$page-getMessageGroupId(),
+ 'language' = $firstLangCode,
+ 'action' = 'page'
+ )
+ );
$notificationText .= wfMessage(
'translationnotifications-digestemail-notification-line',
--
To view, visit https://gerrit.wikimedia.org/r/84853
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I879c6cec1598d52977d19a15a41ccede7d866c97
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/TranslationNotifications
Gerrit-Branch: master
Gerrit-Owner: Siebrand siebr...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Follow-up 42333412833a - Fix behaviour $wgVerifyMimeType = f... - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged.
Change subject: Follow-up 42333412833a - Fix behaviour $wgVerifyMimeType =
false;
..
Follow-up 42333412833a - Fix behaviour $wgVerifyMimeType = false;
Should probably be backported to stable.
Bug: 49717
Change-Id: If1d6e8fed575bf2816a10db066ec4e023460ee1e
(cherry picked from commit 337fd7790e8d5e3a9983225c56adcd8ea8d496e7)
(cherry picked from commit dadfe0ae9349dd0bf5e1d3bedc8887289818fda1)
(cherry picked from commit adcf34af1273dd5868b21f4268d56f856b4403e5)
---
M includes/upload/UploadBase.php
1 file changed, 3 insertions(+), 3 deletions(-)
Approvals:
Chad: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/upload/UploadBase.php b/includes/upload/UploadBase.php
index 0848780..8fc3455 100644
--- a/includes/upload/UploadBase.php
+++ b/includes/upload/UploadBase.php
@@ -396,10 +396,10 @@
return $status;
}
- if ( $wgVerifyMimeType ) {
- $this-mFileProps = FSFile::getPropsFromPath(
$this-mTempPath, $this-mFinalExtension );
- $mime = $this-mFileProps['file-mime'];
+ $this-mFileProps = FSFile::getPropsFromPath( $this-mTempPath,
$this-mFinalExtension );
+ $mime = $this-mFileProps['file-mime'];
+ if ( $wgVerifyMimeType ) {
# XXX: Missing extension will be caught by
validateName() via getTitle()
if ( $this-mFinalExtension != ''
!$this-verifyExtension( $mime, $this-mFinalExtension ) ) {
wfProfileOut( __METHOD__ );
--
To view, visit https://gerrit.wikimedia.org/r/80508
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: If1d6e8fed575bf2816a10db066ec4e023460ee1e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: REL1_20
Gerrit-Owner: MarkAHershberger mhershber...@wikimedia.org
Gerrit-Reviewer: Brian Wolff bawolff...@gmail.com
Gerrit-Reviewer: Chad ch...@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] Updating CentralNotice to master - change (mediawiki/core)
Mwalker has uploaded a new change for review. https://gerrit.wikimedia.org/r/84789 Change subject: Updating CentralNotice to master .. Updating CentralNotice to master Change-Id: I357098d272097c9c70e51391264fa65b89c33e91 --- M extensions/CentralNotice 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/89/84789/1 diff --git a/extensions/CentralNotice b/extensions/CentralNotice index 5461bb6..3a46e0d 16 --- a/extensions/CentralNotice +++ b/extensions/CentralNotice -Subproject commit 5461bb68b97d59aab01574580fa2d7625359dc89 +Subproject commit 3a46e0d2305b65045bb55490e5c8824089e16ec2 -- To view, visit https://gerrit.wikimedia.org/r/84789 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I357098d272097c9c70e51391264fa65b89c33e91 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: wmf/1.22wmf16 Gerrit-Owner: Mwalker mwal...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Cleanup - in preparation for ESI - change (mediawiki...ZeroRatedMobileAccess)
jenkins-bot has submitted this change and it was merged.
Change subject: Cleanup - in preparation for ESI
..
Cleanup - in preparation for ESI
* Optimizing to use Title instead of Output object
* Added getConfigId()
Change-Id: Ifd588d87eaeb1e243a2b8b28bc1ad26c2ce16d66
---
M includes/PageRenderingHooks.php
M includes/ZeroSpecialPage.php
2 files changed, 50 insertions(+), 40 deletions(-)
Approvals:
Dr0ptp4kt: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/PageRenderingHooks.php b/includes/PageRenderingHooks.php
index ade0feb..2bf1c15 100644
--- a/includes/PageRenderingHooks.php
+++ b/includes/PageRenderingHooks.php
@@ -44,7 +44,7 @@
*/
public static function onGetMobileUrl( $subdomainTokenReplacement ) {
// TODO: logic check
- if ( self::isZeroSubdomain() self::disableImages() ) {
+ if ( self::isZeroSubdomain() ) {
$subdomainTokenReplacement = 'zero.';
}
return true;
@@ -62,7 +62,7 @@
}
$config = self::getConfig();
- if ( $config === null ) {
+ if ( $config === null || $context-getTitle()-isSpecial(
'ZeroRatedMobileAccess' ) ) {
return true;
}
@@ -73,6 +73,7 @@
$doc = $formatter-getDoc();
$xpath = new DOMXpath( $doc );
+ // ZERO site - replace all images with links to images
if ( !$isFilePage self::disableImages() ) {
$tagToReplaceNodes = $doc-getElementsByTagName( 'img'
);
$tagToReplaceNodesCollection = array();
@@ -91,7 +92,6 @@
$tagToReplaceNodesCollection[] = array(
'tagToReplaceNode' = $tagToReplaceNode, 'spanNode' = $spanNode );
}
}
-
foreach ( $tagToReplaceNodesCollection as $element ) {
$element['tagToReplaceNode']-parentNode-replaceChild( $element['spanNode'],
$element['tagToReplaceNode'] );
}
@@ -135,7 +135,7 @@
*/
public static function onMinervaPreRender( MinervaTemplate $template ) {
$req = $template-getSkin()-getRequest();
- $out = $template-getSkin()-getOutput();
+ $title = $template-getSkin()-getTitle();
// TODO: alias $template-data where appropriate
$bannersSupported = array_key_exists( 'banners',
$template-data );
@@ -143,7 +143,7 @@
$config = self::getConfig();
if ( $config === null ) {
if ( self::isZeroSubdomain() $bannersSupported ) {
- $unsupported = self::renderUnknownCarrier(
$req, $out, false );
+ $unsupported = self::renderUnknownCarrier(
$req, $title, false );
$template-set( 'banners', array( $unsupported
) );
}
return true;
@@ -151,7 +151,7 @@
$redirectWarningQPS = 'renderZeroRatedRedirect=truereturnto=';
- $warning = self::renderWarning( $config, $req, $out, false );
+ $warning = self::renderWarning( $config, $req, $title, false );
// TODO: If clearer way to put this, make it clearer
// trump all existing banners when in a banner-rendering context
@@ -185,18 +185,18 @@
$notice
) {
global $wgRequest;
- global $wgOut;
$config = self::getConfig();
+ $title = $sk-getTitle();
if ( $config === null ) {
if ( self::isZeroSubdomain() ) {
- $notice = self::renderUnknownCarrier(
$wgRequest, $wgOut, true );
+ $notice = self::renderUnknownCarrier(
$wgRequest, $title, true );
}
return true;
}
- $warning = self::renderWarning( $config, $wgRequest, $wgOut,
true );
+ $warning = self::renderWarning( $config, $wgRequest, $title,
true );
if ( isset( $warning ) ) {
$notice = $warning;
@@ -227,14 +227,8 @@
wfProfileIn( __METHOD__ );
- $out-addVaryHeader( 'X-CS' );
- $out-addVaryHeader( 'X-Subdomain' );
- $out-addVaryHeader( 'X-Images' );
-
- $config = self::getConfig();
-
// @FIXME: Debug checks - should be remove once all issues are
gone
- if ( $config === null ) {
+ if ( self::getConfigId() === null ) {
$warn = '';
if (
[MediaWiki-commits] [Gerrit] Add .gitignore and .gitreview - change (openzim)
Kelson has submitted this change and it was merged. Change subject: Add .gitignore and .gitreview .. Add .gitignore and .gitreview Bug: 54175 Change-Id: Ic900b6a1aa3848aa59b428adef19115a9c55ac61 --- A .gitignore A .gitreview 2 files changed, 9 insertions(+), 0 deletions(-) Approvals: Reedy: Looks good to me, but someone else must approve Kelson: Verified; Looks good to me, approved diff --git a/.gitignore b/.gitignore new file mode 100644 index 000..98b092a --- /dev/null +++ b/.gitignore @@ -0,0 +1,4 @@ +.svn +*~ +*.kate-swp +.*.swp diff --git a/.gitreview b/.gitreview new file mode 100644 index 000..2a01b99 --- /dev/null +++ b/.gitreview @@ -0,0 +1,5 @@ +[gerrit] +host=gerrit.wikimedia.org +port=29418 +project=openzim.git +defaultbranch=master -- To view, visit https://gerrit.wikimedia.org/r/84432 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ic900b6a1aa3848aa59b428adef19115a9c55ac61 Gerrit-PatchSet: 2 Gerrit-Project: openzim Gerrit-Branch: master Gerrit-Owner: Reedy re...@wikimedia.org Gerrit-Reviewer: Kelson kel...@kiwix.org Gerrit-Reviewer: Reedy re...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Don't break core's parserTests if VisualEditor is installed - change (mediawiki...VisualEditor)
jenkins-bot has submitted this change and it was merged.
Change subject: Don't break core's parserTests if VisualEditor is installed
..
Don't break core's parserTests if VisualEditor is installed
VisualEditor's hook changes the edit section link, which changes the
output of certain parser tests so that they no longer match the
expected text. Use the `ParserTestsGlobal` hook (which cleans up
after itself when the parserTests ends) to disable the
`onDoEditSectionLink` hook when we're running parserTests to avoid
the spurious failures.
Change-Id: Ic958d88f443ac37ba304d3256e2bb5ea2fde820d
---
M VisualEditor.hooks.php
M VisualEditor.php
2 files changed, 10 insertions(+), 0 deletions(-)
Approvals:
Catrope: Looks good to me, approved
jenkins-bot: Verified
diff --git a/VisualEditor.hooks.php b/VisualEditor.hooks.php
index 17f9016..d505def 100644
--- a/VisualEditor.hooks.php
+++ b/VisualEditor.hooks.php
@@ -170,7 +170,9 @@
*/
public static function onDoEditSectionLink( $skin, $title, $section,
$tooltip, $result, $lang ) {
// Only do this if the user has VE enabled
+ // (and we're not in parserTests)
if (
+ isset( $GLOBALS[ 'wgVisualEditorInParserTests' ] ) ||
!$skin-getUser()-getOption( 'visualeditor-enable' ) ||
$skin-getUser()-getOption(
'visualeditor-betatempdisable' )
) {
@@ -384,4 +386,11 @@
return true;
}
+
+ /**
+* Ensures that we know whether we're running inside a parser test.
+*/
+ public static function onParserTestGlobals( array $settings ) {
+ $settings['wgVisualEditorInParserTests'] = true;
+ }
}
diff --git a/VisualEditor.php b/VisualEditor.php
index b9e950b..a7bb1db 100644
--- a/VisualEditor.php
+++ b/VisualEditor.php
@@ -57,6 +57,7 @@
$wgHooks['ResourceLoaderGetConfigVars'][] =
'VisualEditorHooks::onResourceLoaderGetConfigVars';
$wgHooks['ResourceLoaderTestModules'][] =
'VisualEditorHooks::onResourceLoaderTestModules';
$wgHooks['SkinTemplateNavigation'][] =
'VisualEditorHooks::onSkinTemplateNavigation';
+$wgHooks['ParserTestGlobals'][] = 'VisualEditorHooks::onParserTestGlobals';
$wgExtensionFunctions[] = 'VisualEditorHooks::onSetup';
// Set default values for new preferences
--
To view, visit https://gerrit.wikimedia.org/r/84436
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ic958d88f443ac37ba304d3256e2bb5ea2fde820d
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Cscott canan...@wikimedia.org
Gerrit-Reviewer: Catrope roan.katt...@gmail.com
Gerrit-Reviewer: Cscott canan...@wikimedia.org
Gerrit-Reviewer: Jforrester jforres...@wikimedia.org
Gerrit-Reviewer: Krinkle krinklem...@gmail.com
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add gzdecode fallback to GlobalFunctions - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged.
Change subject: Add gzdecode fallback to GlobalFunctions
..
Add gzdecode fallback to GlobalFunctions
* Follows-up I6383e933b.
* Replaced existing usage of `gzinflate( substr( $data, 10, -8 ) );`
with `gzdecode( $data )`.
Change-Id: Ie2916584f92ff72c7d7ddca73acf1c94dda38cca
---
M includes/GlobalFunctions.php
M tests/phpunit/maintenance/DumpTestCase.php
2 files changed, 20 insertions(+), 5 deletions(-)
Approvals:
Aaron Schulz: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/GlobalFunctions.php b/includes/GlobalFunctions.php
index f43393a..0c92ab6 100644
--- a/includes/GlobalFunctions.php
+++ b/includes/GlobalFunctions.php
@@ -93,6 +93,18 @@
return Fallback::mb_strrpos( $haystack, $needle, $offset,
$encoding );
}
}
+
+// gzdecode function only exists in PHP = 5.4.0
+// http://php.net/gzdecode
+if ( !function_exists( 'gzdecode' ) ) {
+ /**
+* @codeCoverageIgnore
+* @return string
+*/
+ function gzdecode( $data ) {
+ return gzinflate( substr( $data, 10, -8 ) );
+ }
+}
/// @endcond
/**
diff --git a/tests/phpunit/maintenance/DumpTestCase.php
b/tests/phpunit/maintenance/DumpTestCase.php
index 78a5153..163314e 100644
--- a/tests/phpunit/maintenance/DumpTestCase.php
+++ b/tests/phpunit/maintenance/DumpTestCase.php
@@ -60,11 +60,14 @@
if ( $gzipped_contents === false ) {
$this-fail( Could not get contents of $fname );
}
- // We resort to use gzinflate instead of gzdecode, as gzdecode
- // need not be available
- $contents = gzinflate( substr( $gzipped_contents, 10, -8 ) );
- $this-assertEquals( strlen( $contents ),
- file_put_contents( $fname, $contents ), # bytes
written );
+
+ $contents = gzdecode( $gzipped_contents );
+
+ $this-assertEquals(
+ strlen( $contents ),
+ file_put_contents( $fname, $contents ),
+ '# bytes written'
+ );
}
/**
--
To view, visit https://gerrit.wikimedia.org/r/84510
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie2916584f92ff72c7d7ddca73acf1c94dda38cca
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Krinkle krinklem...@gmail.com
Gerrit-Reviewer: Aaron Schulz asch...@wikimedia.org
Gerrit-Reviewer: Bartosz Dziewoński matma@gmail.com
Gerrit-Reviewer: Krinkle krinklem...@gmail.com
Gerrit-Reviewer: Ori.livneh o...@wikimedia.org
Gerrit-Reviewer: Parent5446 tylerro...@gmail.com
Gerrit-Reviewer: Reedy re...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Ensure populate sites works for updating existing sites - change (mediawiki...Wikibase)
Aude has uploaded a new change for review.
https://gerrit.wikimedia.org/r/84857
Change subject: Ensure populate sites works for updating existing sites
..
Ensure populate sites works for updating existing sites
plus improve site matrix parser test
Change-Id: I2f50f40d0a796f03ef78c524bca63018595207e5
---
M lib/includes/sites/SiteMatrixParser.php
M lib/includes/sites/SitesBuilder.php
M lib/maintenance/populateSitesTable.php
M lib/tests/phpunit/sites/SiteMatrixParserTest.php
4 files changed, 79 insertions(+), 53 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/57/84857/1
diff --git a/lib/includes/sites/SiteMatrixParser.php
b/lib/includes/sites/SiteMatrixParser.php
index df3020b..9c32f19 100644
--- a/lib/includes/sites/SiteMatrixParser.php
+++ b/lib/includes/sites/SiteMatrixParser.php
@@ -94,8 +94,8 @@
foreach( $specialSites as $specialSite ) {
$site = $this-getSiteFromSiteData( $specialSite );
- $siteId= $site-getGlobalId();
- $sites[$siteId] = $this-getSiteFromSiteData(
$specialSite );
+ $siteId = $site-getGlobalId();
+ $sites[$siteId] = $site;
}
return $sites;
@@ -144,7 +144,7 @@
$url = $siteData['url'];
- if ( $this-stripProtocol === 'stripProtocol' ) {
+ if ( $this-stripProtocol ) {
$url = preg_replace( '@^https?:@', '', $url );
}
diff --git a/lib/includes/sites/SitesBuilder.php
b/lib/includes/sites/SitesBuilder.php
index 4857e50..f1d245b 100644
--- a/lib/includes/sites/SitesBuilder.php
+++ b/lib/includes/sites/SitesBuilder.php
@@ -30,6 +30,17 @@
$sites = $this-addInterwikiIdsToGroup( $sites, $siteGroup,
$wikiId );
$this-store-getSites( nocache );
+
+ foreach( $sites as $site ) {
+ $siteId = $site-getGlobalId();
+ $existingSites = $this-store-getSites( false );
+
+ if ( $existingSites-hasSite( $siteId ) ) {
+ $existingSite = $existingSites-getSite(
$siteId );
+ $site-setInternalId(
$existingSite-getInternalId() );
+ }
+ }
+
$this-store-saveSites( $sites );
}
diff --git a/lib/maintenance/populateSitesTable.php
b/lib/maintenance/populateSitesTable.php
index 080bb82..7d8 100644
--- a/lib/maintenance/populateSitesTable.php
+++ b/lib/maintenance/populateSitesTable.php
@@ -37,7 +37,7 @@
}
public function execute() {
- $stripProtocols = $this-getOption( 'strip-protocols' ) ?
stripProtocol : false;
+ $stripProtocols = $this-getOption( 'strip-protocols' ) ? true
: false;
$url = $this-getOption( 'load-from',
'https://meta.wikimedia.org/w/api.php' );
$scriptPath = $this-getOption( 'script-path', '/w/$1' );
$articlePath = $this-getOption( 'article-path', '/wiki/$1' );
diff --git a/lib/tests/phpunit/sites/SiteMatrixParserTest.php
b/lib/tests/phpunit/sites/SiteMatrixParserTest.php
index 3483efa..227edff 100644
--- a/lib/tests/phpunit/sites/SiteMatrixParserTest.php
+++ b/lib/tests/phpunit/sites/SiteMatrixParserTest.php
@@ -15,20 +15,31 @@
/**
* @dataProvider sitesFromJsonProvider
*/
- public function testSitesFromJson( $json, $expected ) {
- $siteMatrixParser = new SiteMatrixParser( '/w/$1', '/wiki/$1',
false );
+ public function testSitesFromJson( $scriptPath, $articlePath, $expected
) {
+ $json = $this-getSiteMatrixJson();
+
+ $siteMatrixParser = new SiteMatrixParser( $scriptPath,
$articlePath, true );
+
$sites = $siteMatrixParser-sitesFromJson( $json );
- $this-assertEquals( ksort( $expected ), ksort( $sites ) );
+
+ ksort( $expected );
+ ksort( $sites );
+
+ $this-assertEquals( $expected, $sites );
}
public function sitesFromJsonProvider() {
- $json = $this-getSiteMatrixJson();
- $sitesData = $this-getSitesData();
- $sites = $this-getSites( $sitesData );
+ $siteData = $this-getSiteData();
- return array(
- array( $json, $sites )
+ $data = array();
+
+ $data[] = array(
+ '/w/$1',
+ '/wiki/$1',
+ $this-getSites( $siteData, '/w/$1', '/wiki/$1' )
);
+
+ return $data;
}
protected function getSiteMatrixJson() {
@@ -108,81 +119,85 @@
return json_encode( $data );
}
-
[MediaWiki-commits] [Gerrit] Use html5 release. - change (mediawiki...Parsoid)
jenkins-bot has submitted this change and it was merged.
Change subject: Use html5 release.
..
Use html5 release.
Change-Id: I3540b529bcec1f83b8e32e96f5814f2cbb2a6c04
---
M js/package.json
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Subramanya Sastry: Looks good to me, approved
jenkins-bot: Verified
diff --git a/js/package.json b/js/package.json
index b3da090..a84f778 100644
--- a/js/package.json
+++ b/js/package.json
@@ -17,7 +17,7 @@
async: 0.x.x,
express: 2.5.x,
html5-entities: ~0.5.0,
- html5:
git://github.com/aredridel/html5.git#052ac530a2a422353067edb66c2fec86878e2340
+ html5: 0.3.15
},
devDependencies: {
colors: 0.x.x,
--
To view, visit https://gerrit.wikimedia.org/r/84778
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I3540b529bcec1f83b8e32e96f5814f2cbb2a6c04
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Parsoid
Gerrit-Branch: master
Gerrit-Owner: Arlolra abrea...@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] some jobs now use git proto to fetch Zuul reference - change (integration/jenkins-job-builder-config)
Hashar has uploaded a new change for review. https://gerrit.wikimedia.org/r/84855 Change subject: some jobs now use git proto to fetch Zuul reference .. some jobs now use git proto to fetch Zuul reference Change the use-remote-zuul default to point to a git:// URL instead of http:// url to fetch the Zuul reference. Updated jobs are mostly python ones: analytics-asana-stats-pep8 analytics-asana-stats-pyflakes analytics-check-stats-pep8 analytics-check-stats-pyflakes analytics-editor-geocoding-pep8 analytics-editor-geocoding-pyflakes analytics-gerrit-stats-pep8 analytics-gerrit-stats-pyflakes analytics-glass-pep8 analytics-glass-pyflakes analytics-reportcard-pep8 analytics-reportcard-pyflakes integration-jenkins-pep8 integration-jenkins-pyflakes integration-zuul-layoutdiff integration-zuul-layoutvalidation labs-nagios-builder-pep8 labs-nagios-builder-pyflakes mw-tools-codeutils-pep8 mw-tools-codeutils-pyflakes mw-tools-codeutils-sphinx-doc mw-tools-fluoride-pep8 mw-tools-fluoride-pyflakes mw-tools-fluoride-sphinx-doc mw-tools-release-pep8 mw-tools-release-pyflakes mw-tools-release-sphinx-doc mwext-BlameMaps-pep8 mwext-BlameMaps-pyflakes mwext-BlameMaps-sphinx-doc mwext-ConfirmEdit-pep8 mwext-ConfirmEdit-pyflakes mwext-ConfirmEdit-sphinx-doc mwext-DumpHTML-pep8 mwext-DumpHTML-pyflakes mwext-DumpHTML-sphinx-doc mwext-EventLogging-pep8 mwext-EventLogging-pyflakes mwext-EventLogging-sphinx-doc mwext-Offline-pep8 mwext-Offline-pyflakes mwext-Offline-sphinx-doc mwext-OpenStackManager-pep8 mwext-OpenStackManager-pyflakes mwext-OpenStackManager-sphinx-doc mwext-SemanticBundle-pep8 mwext-SemanticBundle-pyflakes mwext-SemanticBundle-sphinx-doc mwext-SemanticResultFormats-pep8 mwext-SemanticResultFormats-pyflakes mwext-SemanticResultFormats-sphinx-doc mwext-WikimediaMaintenance-pep8 mwext-WikimediaMaintenance-pyflakes mwext-WikimediaMaintenance-sphinx-doc operations-debs-adminbot-pep8 operations-debs-adminbot-pyflakes operations-debs-adminbot-sphinx-doc operations-debs-ircecho-pep8 operations-debs-ircecho-pyflakes operations-debs-ircecho-sphinx-doc operations-dumps-pep8 operations-dumps-pyflakes operations-dumps-sphinx-doc operations-software-pep8 operations-software-pyflakes operations-software-redactatron-pep8 operations-software-redactatron-pyflakes operations-software-redactatron-sphinx-doc operations-software-sphinx-doc pywikibot-compat-pep8 pywikibot-compat-pyflakes pywikibot-compat-sphinx-doc pywikibot-core-pep8 pywikibot-core-pyflakes pywikibot-core-sphinx-doc pywikibot-i18n-pep8 pywikibot-i18n-pyflakes pywikibot-i18n-sphinx-doc sartoris-pep8 sartoris-pyflakes sartoris-sphinx-doc translatewiki-puppet-validate translatewiki-shelllint wikimedia-fundraising-tools-pep8 wikimedia-fundraising-tools-pyflakes wikimedia-fundraising-tools-sphinx-doc Change-Id: Ia272be63a21cd613d37374b65f499e6543555dd1 --- M defaults.yaml 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/integration/jenkins-job-builder-config refs/changes/55/84855/1 diff --git a/defaults.yaml b/defaults.yaml index 5c6f7d0..0e12784 100644 --- a/defaults.yaml +++ b/defaults.yaml @@ -58,7 +58,7 @@ scm: - git: -url: 'http://integration.wikimedia.org/zuul/git/$ZUUL_PROJECT' +url: 'git://integration.wikimedia.org/$ZUUL_PROJECT' reference-repo: '/srv/ssd/gerrit/$ZUUL_PROJECT.git' branches: - '$ZUUL_COMMIT' -- To view, visit https://gerrit.wikimedia.org/r/84855 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ia272be63a21cd613d37374b65f499e6543555dd1 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] adding ebernhardson to site.pp/admins.pp rt5717 - change (operations/puppet)
Cmjohnson has uploaded a new change for review.
https://gerrit.wikimedia.org/r/84854
Change subject: adding ebernhardson to site.pp/admins.pp rt5717
..
adding ebernhardson to site.pp/admins.pp rt5717
Change-Id: I40ed8cb578ec66d45c21701241627db2c7163e67
---
M manifests/admins.pp
M manifests/site.pp
2 files changed, 22 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/54/84854/1
diff --git a/manifests/admins.pp b/manifests/admins.pp
index 1d2b987..fbf0466 100644
--- a/manifests/admins.pp
+++ b/manifests/admins.pp
@@ -3060,6 +3060,26 @@
}
}
+# RT 5717
+class ebernhardson inherits baseaccount {
+$username = 'ebernhardson'
+$realname = 'Erik Bernhardson'
+$uid = 651
+
+unixaccount { $realname: username = $username, uid = $uid, gid =
$gid }
+
+if $manage_home {
+Ssh_authorized_key { require = Unixaccount[$realname] }
+
+ssh_authorized_key { 'ebernhard...@wikimedia.org':
+ensure = present,
+user = $username,
+type = 'ssh-rsa',
+key=
'B3NzaC1yc2EDAQABAAABAQDnafs6VPTCwrVEEqllEMpH6zhLreme1qGFuLxKD5uYQu2OJ01fhxICnswF7uuDrOSs5X9kTyj4zYjoGLHkEbucv3tBunEwYvzbrtRh+WxWkNjBNqhnUkM6T3IxOIpGlXwFxs6rD57i5ZtG2RPdRbOd+NYMjjkR/tELNSwuOfwi0vFeaumqhrbs5Q4XRqcdjPpMxE/BwqqAFA0SU/WeU5ewifF+FedAwYp5LRaeGmgWt0wuRnTjib8xxyyoH8ZJa79bYHK1CSWo4HU/EPsFdAgTWhrX59UQwOWTFOztQKU6zUc50bfh3cpv3wQ/4+VXFWG4J6XMdL4jLVxZwhCebYn',
+}
+}
+}
+
# FIXME: not an admin. This is more like a system account.
class l10nupdate inherits baseaccount {
$username = l10nupdate
diff --git a/manifests/site.pp b/manifests/site.pp
index a6c5cd4..df1a0d7 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -2600,7 +2600,8 @@
accounts::qchris,# RT 5474
accounts::tnegrin, # RT 5391
accounts::kwang, # RT 5520
-accounts::siebrand # RT 5726
+accounts::siebrand, # RT 5726
+accounts::ebernhardson # RT 5717
sudo_user { otto: privileges = ['ALL = NOPASSWD: ALL'] }
--
To view, visit https://gerrit.wikimedia.org/r/84854
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I40ed8cb578ec66d45c21701241627db2c7163e67
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Cmjohnson cmjohn...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] ULS eventlogging phase 2 - change (operations/mediawiki-config)
jenkins-bot has submitted this change and it was merged. Change subject: ULS eventlogging phase 2 .. ULS eventlogging phase 2 Change-Id: Ibb9c28dc1c2919700690354203a36bbea0f52ab5 --- M wmf-config/InitialiseSettings.php 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Nikerabbit: Looks good to me, approved jenkins-bot: Verified diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index d50f47f..aa68f1e 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -12350,6 +12350,7 @@ 'wmgULSEventLogging' = array( 'default' = false, 'wiktionary' = true, + 'special' = true, ), 'wmgWikibaseCachePrefix' = array( -- To view, visit https://gerrit.wikimedia.org/r/84355 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ibb9c28dc1c2919700690354203a36bbea0f52ab5 Gerrit-PatchSet: 2 Gerrit-Project: operations/mediawiki-config 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] Reduce complexity of SiteSQLStore saveSites method - change (mediawiki/core)
Aude has uploaded a new change for review.
https://gerrit.wikimedia.org/r/84858
Change subject: Reduce complexity of SiteSQLStore saveSites method
..
Reduce complexity of SiteSQLStore saveSites method
split code that generates an ORMRow from a Site object
Change-Id: Ie1f7ed834a33befb43536355ad2b9b98a13d4c79
---
M includes/site/SiteSQLStore.php
1 file changed, 34 insertions(+), 18 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/58/84858/1
diff --git a/includes/site/SiteSQLStore.php b/includes/site/SiteSQLStore.php
index 4123805..11141e0 100644
--- a/includes/site/SiteSQLStore.php
+++ b/includes/site/SiteSQLStore.php
@@ -189,6 +189,39 @@
}
/**
+* Get a new ORMRow from a Site object
+*
+* @since 1.22
+*
+* @param Site
+*
+* @return ORMRow
+*/
+ protected function getRowFromSite( Site $site ) {
+ $fields = array(
+ // Site data
+ 'global_key' = $site-getGlobalId(), // TODO: check
not null
+ 'type' = $site-getType(),
+ 'group' = $site-getGroup(),
+ 'source' = $site-getSource(),
+ 'language' = $site-getLanguageCode() === null ? '' :
$site-getLanguageCode(),
+ 'protocol' = $site-getProtocol(),
+ 'domain' = strrev( $site-getDomain() ) . '.',
+ 'data' = $site-getExtraData(),
+
+ // Site config
+ 'forward' = $site-shouldForward(),
+ 'config' = $site-getExtraConfig(),
+ );
+
+ if ( $site-getInternalId() !== null ) {
+ $fields['id'] = $site-getInternalId();
+ }
+
+ return new ORMRow( $this-sitesTable, $fields );
+ }
+
+ /**
* Fetches the site from the database and loads them into the sites
field.
*
* @since 1.21
@@ -291,28 +324,11 @@
$localIds = array();
foreach ( $sites as $site ) {
- $fields = array(
- // Site data
- 'global_key' = $site-getGlobalId(), // TODO:
check not null
- 'type' = $site-getType(),
- 'group' = $site-getGroup(),
- 'source' = $site-getSource(),
- 'language' = $site-getLanguageCode() === null
? '' : $site-getLanguageCode(),
- 'protocol' = $site-getProtocol(),
- 'domain' = strrev( $site-getDomain() ) . '.',
- 'data' = $site-getExtraData(),
-
- // Site config
- 'forward' = $site-shouldForward(),
- 'config' = $site-getExtraConfig(),
- );
-
if ( $site-getInternalId() !== null ) {
- $fields['id'] = $site-getInternalId();
$internalIds[] = $site-getInternalId();
}
- $siteRow = new ORMRow( $this-sitesTable, $fields );
+ $siteRow = $this-getRowFromSite( $site );
$success = $siteRow-save( __METHOD__ ) $success;
foreach ( $site-getLocalIds() as $idType = $ids ) {
--
To view, visit https://gerrit.wikimedia.org/r/84858
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie1f7ed834a33befb43536355ad2b9b98a13d4c79
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Aude aude.w...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] ULS EventLogging phase 3 - change (operations/mediawiki-config)
jenkins-bot has submitted this change and it was merged. Change subject: ULS EventLogging phase 3 .. ULS EventLogging phase 3 Change-Id: I98f6b35224dfb2ec840d143175001d9f2c616ca1 --- M wmf-config/InitialiseSettings.php 1 file changed, 1 insertion(+), 3 deletions(-) Approvals: Nikerabbit: Looks good to me, approved jenkins-bot: Verified diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index aa68f1e..d4725cb 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -12348,9 +12348,7 @@ ), 'wmgULSEventLogging' = array( - 'default' = false, - 'wiktionary' = true, - 'special' = true, + 'default' = true, ), 'wmgWikibaseCachePrefix' = array( -- To view, visit https://gerrit.wikimedia.org/r/84856 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I98f6b35224dfb2ec840d143175001d9f2c616ca1 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config 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] ULS EventLogging phase 3 - change (operations/mediawiki-config)
Nikerabbit has uploaded a new change for review. https://gerrit.wikimedia.org/r/84856 Change subject: ULS EventLogging phase 3 .. ULS EventLogging phase 3 Change-Id: I98f6b35224dfb2ec840d143175001d9f2c616ca1 --- M wmf-config/InitialiseSettings.php 1 file changed, 1 insertion(+), 3 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/56/84856/1 diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index aa68f1e..d4725cb 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -12348,9 +12348,7 @@ ), 'wmgULSEventLogging' = array( - 'default' = false, - 'wiktionary' = true, - 'special' = true, + 'default' = true, ), 'wmgWikibaseCachePrefix' = array( -- To view, visit https://gerrit.wikimedia.org/r/84856 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I98f6b35224dfb2ec840d143175001d9f2c616ca1 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config 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] adding ebernhardson to site.pp/admins.pp rt5717 - change (operations/puppet)
Cmjohnson has submitted this change and it was merged.
Change subject: adding ebernhardson to site.pp/admins.pp rt5717
..
adding ebernhardson to site.pp/admins.pp rt5717
Change-Id: I40ed8cb578ec66d45c21701241627db2c7163e67
---
M manifests/admins.pp
M manifests/site.pp
2 files changed, 23 insertions(+), 1 deletion(-)
Approvals:
Cmjohnson: Looks good to me, approved
RobH: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/manifests/admins.pp b/manifests/admins.pp
index 1d2b987..49fa462 100644
--- a/manifests/admins.pp
+++ b/manifests/admins.pp
@@ -3060,6 +3060,26 @@
}
}
+# RT 5717
+class ebernhardson inherits baseaccount {
+$username = 'ebernhardson'
+$realname = 'Erik Bernhardson'
+$uid = 651
+
+unixaccount { $realname: username = $username, uid = $uid, gid =
$gid }
+
+if $manage_home {
+Ssh_authorized_key { require = Unixaccount[$realname] }
+
+ssh_authorized_key { 'ebernhard...@wikimedia.org':
+ensure = present,
+user = $username,
+type = 'ssh-rsa',
+key=
'B3NzaC1yc2EDAQABAAABAQDnafs6VPTCwrVEEqllEMpH6zhLreme1qGFuLxKD5uYQu2OJ01fhxICnswF7uuDrOSs5X9kTyj4zYjoGLHkEbucv3tBunEwYvzbrtRh+WxWkNjBNqhnUkM6T3IxOIpGlXwFxs6rD57i5ZtG2RPdRbOd+NYMjjkR/tELNSwuOfwi0vFeaumqhrbs5Q4XRqcdjPpMxE/BwqqAFA0SU/WeU5ewifF+FedAwYp5LRaeGmgWt0wuRnTjib8xxyyoH8ZJa79bYHK1CSWo4HU/EPsFdAgTWhrX59UQwOWTFOztQKU6zUc50bfh3cpv3wQ/4+VXFWG4J6XMdL4jLVxZwhCebYn',
+}
+}
+}
+
# FIXME: not an admin. This is more like a system account.
class l10nupdate inherits baseaccount {
$username = l10nupdate
@@ -3164,6 +3184,7 @@
include accounts::tfinc # move from roots RT 5485
include accounts::yurik #rt 4835, rt 5069
include accounts::zak # access revoked
+ include accounts::ebernhardson #RT 5717
}
class admins::restricted {
diff --git a/manifests/site.pp b/manifests/site.pp
index a6c5cd4..df1a0d7 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -2600,7 +2600,8 @@
accounts::qchris,# RT 5474
accounts::tnegrin, # RT 5391
accounts::kwang, # RT 5520
-accounts::siebrand # RT 5726
+accounts::siebrand, # RT 5726
+accounts::ebernhardson # RT 5717
sudo_user { otto: privileges = ['ALL = NOPASSWD: ALL'] }
--
To view, visit https://gerrit.wikimedia.org/r/84854
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I40ed8cb578ec66d45c21701241627db2c7163e67
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Cmjohnson cmjohn...@wikimedia.org
Gerrit-Reviewer: Cmjohnson cmjohn...@wikimedia.org
Gerrit-Reviewer: RobH r...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] some jobs now use git proto to fetch Zuul reference - change (integration/jenkins-job-builder-config)
jenkins-bot has submitted this change and it was merged. Change subject: some jobs now use git proto to fetch Zuul reference .. some jobs now use git proto to fetch Zuul reference Change the use-remote-zuul default to point to a git:// URL instead of http:// url to fetch the Zuul reference. Updated jobs are mostly python ones: analytics-asana-stats-pep8 analytics-asana-stats-pyflakes analytics-check-stats-pep8 analytics-check-stats-pyflakes analytics-editor-geocoding-pep8 analytics-editor-geocoding-pyflakes analytics-gerrit-stats-pep8 analytics-gerrit-stats-pyflakes analytics-glass-pep8 analytics-glass-pyflakes analytics-reportcard-pep8 analytics-reportcard-pyflakes integration-jenkins-pep8 integration-jenkins-pyflakes integration-zuul-layoutdiff integration-zuul-layoutvalidation labs-nagios-builder-pep8 labs-nagios-builder-pyflakes mw-tools-codeutils-pep8 mw-tools-codeutils-pyflakes mw-tools-codeutils-sphinx-doc mw-tools-fluoride-pep8 mw-tools-fluoride-pyflakes mw-tools-fluoride-sphinx-doc mw-tools-release-pep8 mw-tools-release-pyflakes mw-tools-release-sphinx-doc mwext-BlameMaps-pep8 mwext-BlameMaps-pyflakes mwext-BlameMaps-sphinx-doc mwext-ConfirmEdit-pep8 mwext-ConfirmEdit-pyflakes mwext-ConfirmEdit-sphinx-doc mwext-DumpHTML-pep8 mwext-DumpHTML-pyflakes mwext-DumpHTML-sphinx-doc mwext-EventLogging-pep8 mwext-EventLogging-pyflakes mwext-EventLogging-sphinx-doc mwext-Offline-pep8 mwext-Offline-pyflakes mwext-Offline-sphinx-doc mwext-OpenStackManager-pep8 mwext-OpenStackManager-pyflakes mwext-OpenStackManager-sphinx-doc mwext-SemanticBundle-pep8 mwext-SemanticBundle-pyflakes mwext-SemanticBundle-sphinx-doc mwext-SemanticResultFormats-pep8 mwext-SemanticResultFormats-pyflakes mwext-SemanticResultFormats-sphinx-doc mwext-WikimediaMaintenance-pep8 mwext-WikimediaMaintenance-pyflakes mwext-WikimediaMaintenance-sphinx-doc operations-debs-adminbot-pep8 operations-debs-adminbot-pyflakes operations-debs-adminbot-sphinx-doc operations-debs-ircecho-pep8 operations-debs-ircecho-pyflakes operations-debs-ircecho-sphinx-doc operations-dumps-pep8 operations-dumps-pyflakes operations-dumps-sphinx-doc operations-software-pep8 operations-software-pyflakes operations-software-redactatron-pep8 operations-software-redactatron-pyflakes operations-software-redactatron-sphinx-doc operations-software-sphinx-doc pywikibot-compat-pep8 pywikibot-compat-pyflakes pywikibot-compat-sphinx-doc pywikibot-core-pep8 pywikibot-core-pyflakes pywikibot-core-sphinx-doc pywikibot-i18n-pep8 pywikibot-i18n-pyflakes pywikibot-i18n-sphinx-doc sartoris-pep8 sartoris-pyflakes sartoris-sphinx-doc translatewiki-puppet-validate translatewiki-shelllint wikimedia-fundraising-tools-pep8 wikimedia-fundraising-tools-pyflakes wikimedia-fundraising-tools-sphinx-doc Change-Id: Ia272be63a21cd613d37374b65f499e6543555dd1 --- M defaults.yaml 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Hashar: Looks good to me, approved jenkins-bot: Verified diff --git a/defaults.yaml b/defaults.yaml index 5c6f7d0..0e12784 100644 --- a/defaults.yaml +++ b/defaults.yaml @@ -58,7 +58,7 @@ scm: - git: -url: 'http://integration.wikimedia.org/zuul/git/$ZUUL_PROJECT' +url: 'git://integration.wikimedia.org/$ZUUL_PROJECT' reference-repo: '/srv/ssd/gerrit/$ZUUL_PROJECT.git' branches: - '$ZUUL_COMMIT' -- To view, visit https://gerrit.wikimedia.org/r/84855 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ia272be63a21cd613d37374b65f499e6543555dd1 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] Set $wgFFmpegThreads to 2 for faster transcodes - change (operations/mediawiki-config)
jenkins-bot has submitted this change and it was merged. Change subject: Set $wgFFmpegThreads to 2 for faster transcodes .. Set $wgFFmpegThreads to 2 for faster transcodes Bug: 54060 Change-Id: If55a09de2c11bdf6494ecbd966a0711acc51c4e0 --- M wmf-config/CommonSettings.php 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Reedy: Looks good to me, approved jenkins-bot: Verified diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php index 5464224..18a2bab 100644 --- a/wmf-config/CommonSettings.php +++ b/wmf-config/CommonSettings.php @@ -662,6 +662,7 @@ //tmh1/2 have 12 cores and need lots of shared memory //for avconv / ffmpeg2theora $wgTranscodeBackgroundMemoryLimit = 4 * 1024 * 1024; // 4GB + $wgFFmpegThreads = 2; // Minimum size for an embed video player $wgMinimumVideoPlayerSize = $wmgMinimumVideoPlayerSize; -- To view, visit https://gerrit.wikimedia.org/r/84539 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: If55a09de2c11bdf6494ecbd966a0711acc51c4e0 Gerrit-PatchSet: 2 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: J jger...@wikimedia.org 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] Add Cookbook and Wikijunior namespaces for hywikibooks - change (operations/mediawiki-config)
jenkins-bot has submitted this change and it was merged. Change subject: Add Cookbook and Wikijunior namespaces for hywikibooks .. Add Cookbook and Wikijunior namespaces for hywikibooks Plus namespace aliases from the English names. Bug: 53162 Change-Id: Iff9c2d49b209872a9f46286bf90e85e1b7122ba0 --- M wmf-config/InitialiseSettings.php 1 file changed, 12 insertions(+), 0 deletions(-) Approvals: Reedy: Looks good to me, approved jenkins-bot: Verified diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index d4725cb..0f20d1b 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -2733,6 +2733,12 @@ 'Függelék_vita' = 101, // Bug 42505 'Index_vita' = 103, ), + '+hywikibooks' = array( // bug 53162 + 'Cookbook' = 102, + 'Cookbook_talk' = 103, + 'Wikijunior' = 110, + 'Wikijunior_talk' = 111, + ), '+hywikisource' = array( 'Author' = 100, 'Author_talk' = 101, @@ -5480,6 +5486,12 @@ 104 = 'מדף', # bookshelf 105 = 'שיחת_מדף', # bookshelf talk ), + 'hywikibooks' = array( // bug 53162 + 102 = 'ÔµÖƒÕ¸Ö‚Õ©Õ¸Ö‚Õ', // cookbook + 103 = 'ÔµÖƒÕ¸Ö‚Õ©Õ¸Ö‚ÕÕ«_Ö„Õ¶Õ¶Õ¡Ö€Õ¯Õ¸Ö‚Õ´', // cookbook talk + 110 = 'ÕŽÕ«Ö„Õ«ÖƒÕ¸Ö„Ö€Õ«Õ¯', // wikijunior + 111 = 'ÕŽÕ«Ö„Õ«ÖƒÕ¸Ö„Ö€Õ«Õ¯Õ«_Ö„Õ¶Õ¶Õ¡Ö€Õ¯Õ¸Ö‚Õ´', // wikijunior talk + ), 'idwikibooks' = array( 100 = 'Resep', # http://bugzilla.wikimedia.org/show_bug.cgi?id=7124 101 = 'Pembicaraan_Resep', -- To view, visit https://gerrit.wikimedia.org/r/84501 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iff9c2d49b209872a9f46286bf90e85e1b7122ba0 Gerrit-PatchSet: 2 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: TTO at.li...@live.com.au 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] yaml/ruby/perl linter now use git proto to fetch zuul ref - change (integration/jenkins-job-builder-config)
Hashar has uploaded a new change for review.
https://gerrit.wikimedia.org/r/84859
Change subject: yaml/ruby/perl linter now use git proto to fetch zuul ref
..
yaml/ruby/perl linter now use git proto to fetch zuul ref
Jobs updated:
integration-jjb-config-yamllint
integration-zuul-config-yamllint
labs-tools-grrrit-yamllint
mwext-MobileFrontend-ruby1.9.3lint
mwext-UniversalLanguageSelector-ruby1.9.3lint
mwext-timeline-perllint
qa-browsertests-ruby1.9.3lint
qa-browsertests-yamllint
translatewiki-yamllint
wikimedia-fundraising-tools-yamllint
Change-Id: I8aa7b0dba656e54030f891d1ed63edd0435ad872
---
M job-templates.yaml
1 file changed, 5 insertions(+), 5 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/integration/jenkins-job-builder-config
refs/changes/59/84859/1
diff --git a/job-templates.yaml b/job-templates.yaml
index ec556b2..d319dd1 100644
--- a/job-templates.yaml
+++ b/job-templates.yaml
@@ -34,7 +34,7 @@
- job-template:
name: '{name}-perllint'
node: hasSlaveScripts
-defaults: use-zuul
+defaults: use-remote-zuul
triggers:
- zuul
builders:
@@ -171,7 +171,7 @@
- job-template:
name: '{name}-rubylint'
-defaults: use-zuul
+defaults: use-remote-zuul
triggers:
- zuul
@@ -182,7 +182,7 @@
- job-template:
name: '{name}-ruby1.8lint'
-defaults: use-zuul
+defaults: use-remote-zuul
triggers:
- zuul
@@ -193,7 +193,7 @@
- job-template:
name: '{name}-ruby1.9.3lint'
-defaults: use-zuul
+defaults: use-remote-zuul
triggers:
- zuul
@@ -206,7 +206,7 @@
name: '{name}-yamllint'
node: hasSlaveScripts
-defaults: use-zuul
+defaults: use-remote-zuul
triggers:
- zuul
--
To view, visit https://gerrit.wikimedia.org/r/84859
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I8aa7b0dba656e54030f891d1ed63edd0435ad872
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] Add patrolmarks right to autoconfirmed user group on ckb.wik... - change (operations/mediawiki-config)
jenkins-bot has submitted this change and it was merged. Change subject: Add patrolmarks right to autoconfirmed user group on ckb.wikipedia .. Add patrolmarks right to autoconfirmed user group on ckb.wikipedia Bug: 54118 Change-Id: Ie726ce29378cade1b7b862ec4539f4fc29c746ec --- M wmf-config/InitialiseSettings.php 1 file changed, 5 insertions(+), 4 deletions(-) Approvals: Reedy: Looks good to me, approved jenkins-bot: Verified diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index 0f20d1b..ed90701 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -6603,10 +6603,11 @@ 'reupload-own' = false, // bug 52725 ), // bug 51232 'autoconfirmed' = array( - 'upload' = false, - 'reupload' = false, - ), // bug 51232 - 'sysop' = array( + 'upload' = false, //bug 51232 + 'reupload' = false, //bug 51232 + 'patrolmarks' = true, // bug 54118 + ), + 'sysop' = array( 'importupload' = true, // bug 52633 'reupload-own' = true, // bug 52725 ), -- To view, visit https://gerrit.wikimedia.org/r/84206 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ie726ce29378cade1b7b862ec4539f4fc29c746ec Gerrit-PatchSet: 5 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Ladsgroup ladsgr...@gmail.com Gerrit-Reviewer: Dereckson dereck...@espace-win.org Gerrit-Reviewer: Ladsgroup ladsgr...@gmail.com Gerrit-Reviewer: Reedy re...@wikimedia.org Gerrit-Reviewer: Ryan Lane rl...@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] PNG instead of SVG rendered for Persian Wikipedia - change (operations/mediawiki-config)
jenkins-bot has submitted this change and it was merged. Change subject: PNG instead of SVG rendered for Persian Wikipedia .. PNG instead of SVG rendered for Persian Wikipedia Change-Id: I6757f28c13741e33bfc65dda36935a62cc8d2fa2 --- M wmf-config/InitialiseSettings.php 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Reedy: Looks good to me, approved jenkins-bot: Verified diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index ed90701..ef05166 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -438,7 +438,7 @@ 'etwiki' = '//upload.wikimedia.org/wikipedia/commons/4/41/Wikipedia-logo-v2-et.png', 'euwiki' = '//upload.wikimedia.org/wikipedia/commons/0/01/Wikipedia-logo-v2-eu.png', 'extwiki' = '//upload.wikimedia.org/wikipedia/commons/e/e2/Wikipedia-logo-v2-ext.png', // bug 46589 - 'fawiki' = '//upload.wikimedia.org/wikipedia/commons/thumb/f/fb/Wikipedia-logo-v2-fa.svg/135px-Wikipedia-logo-v2-fa.svg.png', + 'fawiki' = '//upload.wikimedia.org/wikipedia/commons/1/12/Wikipedia-logo-v2-fa.png', 'ffwiki' = '$stdlogo', 'fiwiki' = '//upload.wikimedia.org/wikipedia/commons/7/7f/Wikipedia-logo-v2-fi.png', 'fiu_vrowiki' = '//upload.wikimedia.org/wikipedia/commons/0/0f/Wikipedia-logo-v2-fiu-vro.png', // bug 46589 -- To view, visit https://gerrit.wikimedia.org/r/84205 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I6757f28c13741e33bfc65dda36935a62cc8d2fa2 Gerrit-PatchSet: 2 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Ebrahim ebra...@byagowi.com Gerrit-Reviewer: Amire80 amir.ahar...@mail.huji.ac.il Gerrit-Reviewer: Dalba dalba.w...@gmail.com Gerrit-Reviewer: Ebrahim ebra...@byagowi.com Gerrit-Reviewer: Ladsgroup ladsgr...@gmail.com Gerrit-Reviewer: Nemo bis federicol...@tiscali.it Gerrit-Reviewer: Odder tom...@twkozlowski.net Gerrit-Reviewer: Reedy re...@wikimedia.org Gerrit-Reviewer: ZxxZxxZ zm.w...@yahoo.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] Simplified Special:MWOAuthManageMyGrants listings - change (mediawiki...OAuth)
jenkins-bot has submitted this change and it was merged.
Change subject: Simplified Special:MWOAuthManageMyGrants listings
..
Simplified Special:MWOAuthManageMyGrants listings
* Improved form error messages in Special:MWOAuthManageMyGrants.
* Improved some UI messages.
* Also fixed a fatal in getWikiIdName().
* Also fixed a few annoying form bugs.
Change-Id: Ic7ae9103909df0f8c51e18d5bbe9f684ecd9ef64
---
M backend/MWOAuthServer.php
M backend/MWOAuthUtils.php
M control/MWOAuthSubmitControl.php
M frontend/language/MWOAuth.i18n.php
M frontend/specialpages/SpecialMWOAuthManageConsumers.php
M frontend/specialpages/SpecialMWOAuthManageMyGrants.php
6 files changed, 76 insertions(+), 62 deletions(-)
Approvals:
CSteipp: Looks good to me, approved
jenkins-bot: Verified
diff --git a/backend/MWOAuthServer.php b/backend/MWOAuthServer.php
index b2af067..d5337e1 100644
--- a/backend/MWOAuthServer.php
+++ b/backend/MWOAuthServer.php
@@ -136,7 +136,7 @@
// ** Generate a new access token if this is a new authorization
// * Resave request token with the access token
- $verifyCode = MWCryptRand::generateHex( 32, true);
+ $verifyCode = MWCryptRand::generateHex( 32, true );
$requestToken = $this-data_store-lookup_token( $consumer,
'request', $requestTokenKey );
if ( !$requestToken || !( $requestToken instanceof MWOAuthToken
) ) {
throw new MWOAuthException(
'mwoauthserver-invalid-request-token' );
diff --git a/backend/MWOAuthUtils.php b/backend/MWOAuthUtils.php
index 8cb0b2c..0e75e7b 100644
--- a/backend/MWOAuthUtils.php
+++ b/backend/MWOAuthUtils.php
@@ -252,7 +252,12 @@
if ( $wikiId === '*' ) {
return wfMessage( 'mwoauth-consumer-allwikis' )-text();
} else {
- return WikiMap::getWiki( $wikiId )-getWikiName();
+ $host = WikiMap::getWikiName( $wikiId );
+ if ( strpos( $host, '.' ) ) {
+ return $host; // e.g. en.wikipedia.org
+ } else {
+ return $wikiId;
+ }
}
}
diff --git a/control/MWOAuthSubmitControl.php b/control/MWOAuthSubmitControl.php
index d998beb..a0b4d0c 100644
--- a/control/MWOAuthSubmitControl.php
+++ b/control/MWOAuthSubmitControl.php
@@ -107,6 +107,14 @@
* @return boolean|string
*/
public function validateFieldInternal( $field, $value, $allValues ) {
+ if ( !isset( $allValues['action'] ) isset(
$this-vals['action'] ) ) {
+ // The action may be derived, especially for
multi-button forms.
+ // Such an HTMLForm will not have an action key set in
$allValues.
+ $allValues['action'] = $this-vals['action']; //
injected
+ }
+ if ( !isset( $allValues['action'] ) ) {
+ throw new MWException( No form action defined; cannot
validate fields. );
+ }
$validators = $this-getRequiredFields();
if ( !isset( $validators[$allValues['action']][$field] ) ) {
return true; // nothing to check
diff --git a/frontend/language/MWOAuth.i18n.php
b/frontend/language/MWOAuth.i18n.php
index f2b6314..2504115 100644
--- a/frontend/language/MWOAuth.i18n.php
+++ b/frontend/language/MWOAuth.i18n.php
@@ -165,12 +165,14 @@
'mwoauthmanagemygrants-consumerkey' = 'Consumer key',
'mwoauthmanagemygrants-review' = 'review/manage access',
'mwoauthmanagemygrants-grantaccept' = 'Granted to consumer',
- 'mwoauthmanagemygrants-confirm-text' = 'Use the form below to revoke
access or change grants for an OAuth consumer to act on your behalf.
-
-Note that if you authorized a consumer to only have access to a subset of
wikis (site projects), then there will be multiple access tokens for that
consumer.',
+ 'mwoauthmanagemygrants-confirm-text' = 'Use the form below to revoke
access or change grants for an OAuth consumer to act on your behalf. A few
notes:
+* This form controls a particular access token, or key, that lets a consumer
access your account.
+* If you seperately authorized a consumer to access different projects on your
behalf, then you will have multiple access tokens for that consumer.
+* If you want to revoke access to consumer, be sure to revoke all the access
tokens for all versions of that consumer you accepted.
+* Using * in the wiki field grants access to all projects on this site;
using a wiki project ID limits access to a single project.',
'mwoauthmanagemygrants-confirm-legend' = 'Manage consumer access
token',
- 'mwoauthmanagemygrants-update' = 'Update access token grants',
- 'mwoauthmanagemygrants-renounce' =
[MediaWiki-commits] [Gerrit] yaml/ruby/perl linter now use git proto to fetch zuul ref - change (integration/jenkins-job-builder-config)
jenkins-bot has submitted this change and it was merged.
Change subject: yaml/ruby/perl linter now use git proto to fetch zuul ref
..
yaml/ruby/perl linter now use git proto to fetch zuul ref
Jobs updated:
integration-jjb-config-yamllint
integration-zuul-config-yamllint
labs-tools-grrrit-yamllint
mwext-MobileFrontend-ruby1.9.3lint
mwext-UniversalLanguageSelector-ruby1.9.3lint
mwext-timeline-perllint
qa-browsertests-ruby1.9.3lint
qa-browsertests-yamllint
translatewiki-yamllint
wikimedia-fundraising-tools-yamllint
Change-Id: I8aa7b0dba656e54030f891d1ed63edd0435ad872
---
M job-templates.yaml
1 file changed, 5 insertions(+), 5 deletions(-)
Approvals:
Hashar: Looks good to me, approved
jenkins-bot: Verified
diff --git a/job-templates.yaml b/job-templates.yaml
index ec556b2..d319dd1 100644
--- a/job-templates.yaml
+++ b/job-templates.yaml
@@ -34,7 +34,7 @@
- job-template:
name: '{name}-perllint'
node: hasSlaveScripts
-defaults: use-zuul
+defaults: use-remote-zuul
triggers:
- zuul
builders:
@@ -171,7 +171,7 @@
- job-template:
name: '{name}-rubylint'
-defaults: use-zuul
+defaults: use-remote-zuul
triggers:
- zuul
@@ -182,7 +182,7 @@
- job-template:
name: '{name}-ruby1.8lint'
-defaults: use-zuul
+defaults: use-remote-zuul
triggers:
- zuul
@@ -193,7 +193,7 @@
- job-template:
name: '{name}-ruby1.9.3lint'
-defaults: use-zuul
+defaults: use-remote-zuul
triggers:
- zuul
@@ -206,7 +206,7 @@
name: '{name}-yamllint'
node: hasSlaveScripts
-defaults: use-zuul
+defaults: use-remote-zuul
triggers:
- zuul
--
To view, visit https://gerrit.wikimedia.org/r/84859
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I8aa7b0dba656e54030f891d1ed63edd0435ad872
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 role::math. - change (mediawiki/vagrant)
BryanDavis has uploaded a new change for review.
https://gerrit.wikimedia.org/r/84860
Change subject: Add role::math.
..
Add role::math.
Creates a new role for installing the Math extension and associated
support programs.
Change-Id: I98518e257b02700fc4a9ed5f65bce0dfc37c0837
---
M puppet/manifests/packages.pp
M puppet/manifests/roles.pp
2 files changed, 33 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant
refs/changes/60/84860/1
diff --git a/puppet/manifests/packages.pp b/puppet/manifests/packages.pp
index b5f6342..57e 100644
--- a/puppet/manifests/packages.pp
+++ b/puppet/manifests/packages.pp
@@ -40,3 +40,11 @@
class packages::netpbm {
package { 'netpbm': }
}
+
+class packages::mediawiki_math {
+package { 'mediawiki-math': }
+}
+
+class packages::ocaml_native_compilers {
+package { 'ocaml-native-compilers': }
+}
diff --git a/puppet/manifests/roles.pp b/puppet/manifests/roles.pp
index 44f362c..ff4f51f 100644
--- a/puppet/manifests/roles.pp
+++ b/puppet/manifests/roles.pp
@@ -451,3 +451,28 @@
],
}
}
+
+# == Class: role::math
+#
+# The Math extension provides support for rendering mathematical formulas
+# on-wiki via texvc.
+class role::math {
+include role::mediawiki
+
+include packages::mediawiki_math
+include packages::ocaml_native_compilers
+
+@mediawiki::extension { 'Math':
+needs_update = true,
+}
+
+exec { 'compile texvc':
+command = 'make',
+cwd = /vagrant/mediawiki/extensions/Math/math,
+creates = /vagrant/mediawiki/extensions/Math/math/texvc,
+require = [
+ Package['mediawiki-math', 'ocaml-native-compilers'],
+ Mediawiki::Extension['Math'],
+],
+}
+}
--
To view, visit https://gerrit.wikimedia.org/r/84860
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I98518e257b02700fc4a9ed5f65bce0dfc37c0837
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: BryanDavis bda...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] more linters now use git proto to fetch zuul ref - change (integration/jenkins-job-builder-config)
Hashar has uploaded a new change for review.
https://gerrit.wikimedia.org/r/84861
Change subject: more linters now use git proto to fetch zuul ref
..
more linters now use git proto to fetch zuul ref
Jobs updated:
integration-docroot-phplint
labs-incubator-phplint
mediawiki-vagrant-puppet-validate
mw-skins-erudite-phplint
mw-skins-mediawiki-strapping-phplint
mw-skins-webplatform-phplint
mw-tools-codeutils-phplint
mw-tools-dippybird-phplint
mw-tools-release-phplint
operations-debs-wikistats-phplint
operations-mw-config-phplint
operations-puppet-cdh4-erblint-HEAD
operations-puppet-cdh4-pplint-HEAD
operations-puppet-erblint-HEAD
operations-puppet-jmxtrans-erblint-HEAD
operations-puppet-jmxtrans-pplint-HEAD
operations-puppet-kafka-erblint-HEAD
operations-puppet-kafka-pplint-HEAD
operations-puppet-zookeeper-erblint-HEAD
operations-puppet-zookeeper-pplint-HEAD
translatewiki-phplint
Change-Id: I3d57a75f33c38385e9e4deb87d924eb9df37659a
---
M job-templates.yaml
1 file changed, 5 insertions(+), 5 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/integration/jenkins-job-builder-config
refs/changes/61/84861/1
diff --git a/job-templates.yaml b/job-templates.yaml
index d319dd1..55da1f8 100644
--- a/job-templates.yaml
+++ b/job-templates.yaml
@@ -3,7 +3,7 @@
- job-template:
name: '{name}-erblint-HEAD'
node: hasSlaveScripts
-defaults: use-zuul
+defaults: use-remote-zuul
triggers:
- zuul
builders:
@@ -13,7 +13,7 @@
- job-template:
name: '{name}-jslint'
node: hasSlaveScripts
-defaults: use-zuul
+defaults: use-remote-zuul
triggers:
- zuul
scm:
@@ -25,7 +25,7 @@
- job-template:
name: '{name}-pplint-HEAD'
node: hasSlaveScripts
-defaults: use-zuul
+defaults: use-remote-zuul
triggers:
- zuul
builders:
@@ -43,7 +43,7 @@
- job-template:
name: '{name}-phplint'
node: hasSlaveScripts
-defaults: use-zuul
+defaults: use-remote-zuul
triggers:
- zuul
builders:
@@ -161,7 +161,7 @@
- job-template:
name: '{name}-puppet-validate'
-defaults: use-zuul
+defaults: use-remote-zuul
triggers:
- zuul
--
To view, visit https://gerrit.wikimedia.org/r/84861
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I3d57a75f33c38385e9e4deb87d924eb9df37659a
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] more linters now use git proto to fetch zuul ref - change (integration/jenkins-job-builder-config)
jenkins-bot has submitted this change and it was merged.
Change subject: more linters now use git proto to fetch zuul ref
..
more linters now use git proto to fetch zuul ref
Jobs updated:
integration-docroot-phplint
labs-incubator-phplint
mediawiki-vagrant-puppet-validate
mw-skins-erudite-phplint
mw-skins-mediawiki-strapping-phplint
mw-skins-webplatform-phplint
mw-tools-codeutils-phplint
mw-tools-dippybird-phplint
mw-tools-release-phplint
operations-debs-wikistats-phplint
operations-mw-config-phplint
operations-puppet-cdh4-erblint-HEAD
operations-puppet-cdh4-pplint-HEAD
operations-puppet-erblint-HEAD
operations-puppet-jmxtrans-erblint-HEAD
operations-puppet-jmxtrans-pplint-HEAD
operations-puppet-kafka-erblint-HEAD
operations-puppet-kafka-pplint-HEAD
operations-puppet-zookeeper-erblint-HEAD
operations-puppet-zookeeper-pplint-HEAD
translatewiki-phplint
Change-Id: I3d57a75f33c38385e9e4deb87d924eb9df37659a
---
M job-templates.yaml
1 file changed, 5 insertions(+), 5 deletions(-)
Approvals:
Hashar: Looks good to me, approved
jenkins-bot: Verified
diff --git a/job-templates.yaml b/job-templates.yaml
index d319dd1..55da1f8 100644
--- a/job-templates.yaml
+++ b/job-templates.yaml
@@ -3,7 +3,7 @@
- job-template:
name: '{name}-erblint-HEAD'
node: hasSlaveScripts
-defaults: use-zuul
+defaults: use-remote-zuul
triggers:
- zuul
builders:
@@ -13,7 +13,7 @@
- job-template:
name: '{name}-jslint'
node: hasSlaveScripts
-defaults: use-zuul
+defaults: use-remote-zuul
triggers:
- zuul
scm:
@@ -25,7 +25,7 @@
- job-template:
name: '{name}-pplint-HEAD'
node: hasSlaveScripts
-defaults: use-zuul
+defaults: use-remote-zuul
triggers:
- zuul
builders:
@@ -43,7 +43,7 @@
- job-template:
name: '{name}-phplint'
node: hasSlaveScripts
-defaults: use-zuul
+defaults: use-remote-zuul
triggers:
- zuul
builders:
@@ -161,7 +161,7 @@
- job-template:
name: '{name}-puppet-validate'
-defaults: use-zuul
+defaults: use-remote-zuul
triggers:
- zuul
--
To view, visit https://gerrit.wikimedia.org/r/84861
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I3d57a75f33c38385e9e4deb87d924eb9df37659a
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] Wrap README at 72 characters - change (mediawiki...MobileFrontend)
jenkins-bot has submitted this change and it was merged. Change subject: Wrap README at 72 characters .. Wrap README at 72 characters That's what git does in commit messages. It improves readability in code editors which usually are not configured to wrap lines by default. Also, replace tabs with spaces in command examples so that they're styled properly. Change-Id: I7ee5aaf65f2f8f9a66a3802be06956d6c3005384 --- M README.mediawiki 1 file changed, 61 insertions(+), 30 deletions(-) Approvals: Jdlrobson: Looks good to me, approved jenkins-bot: Verified diff --git a/README.mediawiki b/README.mediawiki index 91a724e..8d4b30b 100644 --- a/README.mediawiki +++ b/README.mediawiki @@ -1,5 +1,6 @@ = MobileFrontend Extension = -The MobileFrontend extension adds a mobile view to your mediawiki instance. +The MobileFrontend extension adds a mobile view to your mediawiki +instance. == Installation == See https://www.mediawiki.org/wiki/Extension:MobileFrontend#Installation @@ -14,81 +15,111 @@ === CSS === We currently use http://lesscss.org/ to generate stylesheets. -Ensure when you contribute CSS code you update the less files in stylesheets/less and to generate run: +Ensure when you contribute CSS code you update the less files in +stylesheets/less and to generate run: - make less + make less You need Node.js for the LESS compiler to run. -Ensure all CSS passes the [https://www.mediawiki.org/wiki/Manual:Coding_conventions/CSS style guidelines] +Ensure all CSS passes the +[https://www.mediawiki.org/wiki/Manual:Coding_conventions/CSS style guidelines] In mobile ensure all CSS class names use hyphens (not camel case) e.g. overlay-enabled not overlayEnabled -When adding a JavaScript module, ensure that the css module has the same name. -e.g. javascripts/modules/mf-toggle.js has the corresponding less/css stylesheets stylesheets/less/modules/mf-toggle.less and stylesheets/modules/mf-toggle.css +When adding a JavaScript module, ensure that the css module has the same +name, e.g. javascripts/modules/mf-toggle.js has the corresponding +less/css stylesheets stylesheets/less/modules/mf-toggle.less and +stylesheets/modules/mf-toggle.css -Introduce any browser specific patches in the relevant stylesheet. If the browser does not have its own stylesheet considering adding one in DeviceDetection.php - -NEVER use [http://www.w3.org/TR/CSS2/selector.html#attribute-selectors attribute selectors] - these are known to cause issues in the [https://github.com/wikimedia/WikipediaMobile phonegap app] which shares some of this codebase. +NEVER use +[http://www.w3.org/TR/CSS2/selector.html#attribute-selectors attribute selectors] +- these are known to cause issues in the +[https://github.com/wikimedia/WikipediaMobile phonegap app] which +shares some of this codebase. === JavaScript === -JavaScript can be found in the javascript folder. Any JavaScript committed to the core must pass the [https://www.mediawiki.org/wiki/Manual:Coding_conventions/JavaScript style guidelines] +JavaScript can be found in the javascript folder. Any JavaScript +committed to the core must pass the +[https://www.mediawiki.org/wiki/Manual:Coding_conventions/JavaScript style guidelines] Additional Naming conventions: * When naming events that are emitted using mw.mobileFrontend.emit use hyphens. Git hooks -Git hooks are provided in the scripts directory to assist with adhering to JavaScript code standards, optimizing PNG files, etc. Install like so: +Git hooks are provided in the scripts directory to assist with adhering +to JavaScript code standards, optimizing PNG files, etc. Install like +so: - make installhooks + make installhooks === HTML === -HTML should validate via http://validator.w3.org/ - note at the current time do not worry about markup introduced via wikitext. +HTML should validate via http://validator.w3.org/ - note at the current +time do not worry about markup introduced via wikitext. === Committing === -* Commits are important as they give the reviewer more information to successfully review your code and find errors or potential problems you might not have thought of -* Commits are also useful when troubleshooting issues and refactoring. If it's not clear why a line of code is in the repository important bug fixes could be lost. -* Commits should be as minor as possible. Please avoid removing unrelated console.log statements, fixing unrelated whitespace etc.. do that in a separate commit which mentions the word cleanup. -* First line commit should summarise the commit with bug it fixes if applicable. e.g. Fix problem with toggling see bug x -* Second line should be blank -* Third line should go into detail where necessary providing links to blog posts/other bugs to provide more background. Mention the platforms/browsers the change is for where necessary -** e.g. 'this is a problem on
[MediaWiki-commits] [Gerrit] Update coding conventions in README - change (mediawiki...MobileFrontend)
jenkins-bot has submitted this change and it was merged. Change subject: Update coding conventions in README .. Update coding conventions in README Remove obsolete text and replace it with a link to the new wiki page with all the coding conventions. Change-Id: Ida2bc9e46d91043229644da391ca0dc9e0b34ec8 --- M README.mediawiki 1 file changed, 3 insertions(+), 40 deletions(-) Approvals: Jdlrobson: Looks good to me, approved jenkins-bot: Verified diff --git a/README.mediawiki b/README.mediawiki index 8d4b30b..ffb7ec0 100644 --- a/README.mediawiki +++ b/README.mediawiki @@ -10,42 +10,9 @@ == Development == -=== PHP === -See http://meta.wikimedia.org/wiki/Mobile_team/Mobile_web/Engineering_conventions/PHP_naming_conventions - -=== CSS === -We currently use http://lesscss.org/ to generate stylesheets. -Ensure when you contribute CSS code you update the less files in -stylesheets/less and to generate run: - - make less - -You need Node.js for the LESS compiler to run. - -Ensure all CSS passes the -[https://www.mediawiki.org/wiki/Manual:Coding_conventions/CSS style guidelines] - -In mobile ensure all CSS class names use hyphens (not camel case) -e.g. overlay-enabled not overlayEnabled - -When adding a JavaScript module, ensure that the css module has the same -name, e.g. javascripts/modules/mf-toggle.js has the corresponding -less/css stylesheets stylesheets/less/modules/mf-toggle.less and -stylesheets/modules/mf-toggle.css - -NEVER use -[http://www.w3.org/TR/CSS2/selector.html#attribute-selectors attribute selectors] -- these are known to cause issues in the -[https://github.com/wikimedia/WikipediaMobile phonegap app] which -shares some of this codebase. - -=== JavaScript === -JavaScript can be found in the javascript folder. Any JavaScript -committed to the core must pass the -[https://www.mediawiki.org/wiki/Manual:Coding_conventions/JavaScript style guidelines] - -Additional Naming conventions: -* When naming events that are emitted using mw.mobileFrontend.emit use hyphens. +=== Coding conventions == +Please follow the coding conventions of MobileFrontend: +https://www.mediawiki.org/wiki/MobileFrontend/Coding_conventions Git hooks Git hooks are provided in the scripts directory to assist with adhering @@ -53,10 +20,6 @@ so: make installhooks - -=== HTML === -HTML should validate via http://validator.w3.org/ - note at the current -time do not worry about markup introduced via wikitext. === Committing === Commits are important as they give the reviewer more information to -- To view, visit https://gerrit.wikimedia.org/r/84669 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ida2bc9e46d91043229644da391ca0dc9e0b34ec8 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] fixing the default filling and slice problem - change (analytics/wikimetrics)
Milimetric has submitted this change and it was merged.
Change subject: fixing the default filling and slice problem
..
fixing the default filling and slice problem
Change-Id: Ib7bf30b96a960453da9e121091064e2c1de20036
---
M tests/test_metrics/test_bytes_added.py
M tests/test_metrics/test_timeseries.py
M wikimetrics/metrics/timeseries_metric.py
M wikimetrics/models/report_nodes/aggregate_report.py
4 files changed, 39 insertions(+), 14 deletions(-)
Approvals:
Milimetric: Verified; Looks good to me, approved
diff --git a/tests/test_metrics/test_bytes_added.py
b/tests/test_metrics/test_bytes_added.py
index 1afb769..43f80c5 100644
--- a/tests/test_metrics/test_bytes_added.py
+++ b/tests/test_metrics/test_bytes_added.py
@@ -165,7 +165,7 @@
metric = BytesAdded(
namespaces=[0],
-start_date='2013-01-01 00:00:00',
+start_date='2012-12-31 09:00:00',
end_date='2013-01-14 00:00:00',
positive_only_sum=False,
negative_only_sum=False,
@@ -176,6 +176,7 @@
results = metric(list(self.cohort), self.mwSession)
expected1 = {
'net_sum': {
+'2012-12-31 00:00:00' : 0,
'2013-01-01 00:00:00' : 100,
'2013-01-02 00:00:00' : 0,
'2013-01-03 00:00:00' : 0,
diff --git a/tests/test_metrics/test_timeseries.py
b/tests/test_metrics/test_timeseries.py
index a5e3535..be03f4f 100644
--- a/tests/test_metrics/test_timeseries.py
+++ b/tests/test_metrics/test_timeseries.py
@@ -137,19 +137,22 @@
results = {
1: {
'test': {
-'2013-01-02 00:00:00': 12,
-'2013-03-02 00:00:00': 1,
+'2013-01-01 00:00:00': 12,
+'2013-03-01 00:00:00': 1,
}
},
}
r = m.fill_in_missing_datetimes(results, [('test', 1, 0)])
+from pprint import pprint
+pprint(r)
+
assert_equals(r, {
1: {
'test': {
-'2013-01-02 00:00:00': 12,
-'2013-02-02 00:00:00': 0,
-'2013-03-02 00:00:00': 1,
+'2013-01-01 00:00:00': 12,
+'2013-02-01 00:00:00': 0,
+'2013-03-01 00:00:00': 1,
}
},
})
@@ -164,17 +167,20 @@
results = {
1: {
'test': {
-'2013-03-10 00:00:00': 12,
+'2013-01-01 00:00:00': 12,
}
},
}
r = m.fill_in_missing_datetimes(results, [('test', 1, 0)])
+from pprint import pprint
+pprint(r)
assert_equals(r, {
1: {
'test': {
-'2013-03-10 00:00:00': 12,
-'2014-03-10 00:00:00': 0,
+'2013-01-01 00:00:00': 12,
+'2014-01-01 00:00:00': 0,
+'2015-01-01 00:00:00': 0,
}
},
})
diff --git a/wikimetrics/metrics/timeseries_metric.py
b/wikimetrics/metrics/timeseries_metric.py
index 83423f1..2834dc7 100644
--- a/wikimetrics/metrics/timeseries_metric.py
+++ b/wikimetrics/metrics/timeseries_metric.py
@@ -183,7 +183,7 @@
slice_delta = self.get_delta_from_choice()
timeseries_slices = dict()
-slice_to_default = self.start_date.data
+slice_to_default = self.get_first_slice()
while slice_to_default self.end_date.data:
date_key = format_pretty_date(slice_to_default)
timeseries_slices[date_key] = None
@@ -202,6 +202,24 @@
return results_by_user
+def get_first_slice(self):
+
+Given a user's choice of timeseries grouping, and the value of the
start_date,
+return the first interval in the timeseries
+
+if self.timeseries.data == TimeseriesChoices.NONE:
+return None
+
+d = self.start_date.data
+if self.timeseries.data == TimeseriesChoices.HOUR:
+return datetime(d.year, d.month, d.day, d.hour)
+if self.timeseries.data == TimeseriesChoices.DAY:
+return datetime(d.year, d.month, d.day, 0)
+if self.timeseries.data == TimeseriesChoices.MONTH:
+return datetime(d.year, d.month, 1, 0)
+if self.timeseries.data == TimeseriesChoices.YEAR:
+return datetime(d.year, 1, 1, 0)
+
def get_delta_from_choice(self):
Given a user's choice of timeseries grouping,
diff --git a/wikimetrics/models/report_nodes/aggregate_report.py
b/wikimetrics/models/report_nodes/aggregate_report.py
index 0f228e0..19f5ed2 100644
--- a/wikimetrics/models/report_nodes/aggregate_report.py
+++
[MediaWiki-commits] [Gerrit] fixing the default filling and slice problem - change (analytics/wikimetrics)
Milimetric has uploaded a new change for review.
https://gerrit.wikimedia.org/r/84862
Change subject: fixing the default filling and slice problem
..
fixing the default filling and slice problem
Change-Id: Ib7bf30b96a960453da9e121091064e2c1de20036
---
M tests/test_metrics/test_bytes_added.py
M tests/test_metrics/test_timeseries.py
M wikimetrics/metrics/timeseries_metric.py
M wikimetrics/models/report_nodes/aggregate_report.py
4 files changed, 39 insertions(+), 14 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/analytics/wikimetrics
refs/changes/62/84862/1
diff --git a/tests/test_metrics/test_bytes_added.py
b/tests/test_metrics/test_bytes_added.py
index 1afb769..43f80c5 100644
--- a/tests/test_metrics/test_bytes_added.py
+++ b/tests/test_metrics/test_bytes_added.py
@@ -165,7 +165,7 @@
metric = BytesAdded(
namespaces=[0],
-start_date='2013-01-01 00:00:00',
+start_date='2012-12-31 09:00:00',
end_date='2013-01-14 00:00:00',
positive_only_sum=False,
negative_only_sum=False,
@@ -176,6 +176,7 @@
results = metric(list(self.cohort), self.mwSession)
expected1 = {
'net_sum': {
+'2012-12-31 00:00:00' : 0,
'2013-01-01 00:00:00' : 100,
'2013-01-02 00:00:00' : 0,
'2013-01-03 00:00:00' : 0,
diff --git a/tests/test_metrics/test_timeseries.py
b/tests/test_metrics/test_timeseries.py
index a5e3535..be03f4f 100644
--- a/tests/test_metrics/test_timeseries.py
+++ b/tests/test_metrics/test_timeseries.py
@@ -137,19 +137,22 @@
results = {
1: {
'test': {
-'2013-01-02 00:00:00': 12,
-'2013-03-02 00:00:00': 1,
+'2013-01-01 00:00:00': 12,
+'2013-03-01 00:00:00': 1,
}
},
}
r = m.fill_in_missing_datetimes(results, [('test', 1, 0)])
+from pprint import pprint
+pprint(r)
+
assert_equals(r, {
1: {
'test': {
-'2013-01-02 00:00:00': 12,
-'2013-02-02 00:00:00': 0,
-'2013-03-02 00:00:00': 1,
+'2013-01-01 00:00:00': 12,
+'2013-02-01 00:00:00': 0,
+'2013-03-01 00:00:00': 1,
}
},
})
@@ -164,17 +167,20 @@
results = {
1: {
'test': {
-'2013-03-10 00:00:00': 12,
+'2013-01-01 00:00:00': 12,
}
},
}
r = m.fill_in_missing_datetimes(results, [('test', 1, 0)])
+from pprint import pprint
+pprint(r)
assert_equals(r, {
1: {
'test': {
-'2013-03-10 00:00:00': 12,
-'2014-03-10 00:00:00': 0,
+'2013-01-01 00:00:00': 12,
+'2014-01-01 00:00:00': 0,
+'2015-01-01 00:00:00': 0,
}
},
})
diff --git a/wikimetrics/metrics/timeseries_metric.py
b/wikimetrics/metrics/timeseries_metric.py
index 83423f1..2834dc7 100644
--- a/wikimetrics/metrics/timeseries_metric.py
+++ b/wikimetrics/metrics/timeseries_metric.py
@@ -183,7 +183,7 @@
slice_delta = self.get_delta_from_choice()
timeseries_slices = dict()
-slice_to_default = self.start_date.data
+slice_to_default = self.get_first_slice()
while slice_to_default self.end_date.data:
date_key = format_pretty_date(slice_to_default)
timeseries_slices[date_key] = None
@@ -202,6 +202,24 @@
return results_by_user
+def get_first_slice(self):
+
+Given a user's choice of timeseries grouping, and the value of the
start_date,
+return the first interval in the timeseries
+
+if self.timeseries.data == TimeseriesChoices.NONE:
+return None
+
+d = self.start_date.data
+if self.timeseries.data == TimeseriesChoices.HOUR:
+return datetime(d.year, d.month, d.day, d.hour)
+if self.timeseries.data == TimeseriesChoices.DAY:
+return datetime(d.year, d.month, d.day, 0)
+if self.timeseries.data == TimeseriesChoices.MONTH:
+return datetime(d.year, d.month, 1, 0)
+if self.timeseries.data == TimeseriesChoices.YEAR:
+return datetime(d.year, 1, 1, 0)
+
def get_delta_from_choice(self):
Given a user's choice of timeseries grouping,
diff --git a/wikimetrics/models/report_nodes/aggregate_report.py
b/wikimetrics/models/report_nodes/aggregate_report.py
index 0f228e0..19f5ed2 100644
---
[MediaWiki-commits] [Gerrit] Enable EducationProgram on enwikinews - change (operations/mediawiki-config)
Reedy has uploaded a new change for review. https://gerrit.wikimedia.org/r/84863 Change subject: Enable EducationProgram on enwikinews .. Enable EducationProgram on enwikinews Bug: 53984 Change-Id: I337fef94d36f0c238b931f3ef1d08077f26c079b --- M wmf-config/InitialiseSettings.php 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/63/84863/1 diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index ef05166..86a74f2 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -12021,6 +12021,7 @@ 'default' = false, 'dewikiversity' = true, 'enwiki' = true, + 'enwikinews' = tru, // bug 53984 'hewiki' = true, // bug 48848 'mkwiki' = true, 'ptwiki' = true, // bug 52870 -- To view, visit https://gerrit.wikimedia.org/r/84863 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I337fef94d36f0c238b931f3ef1d08077f26c079b Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Reedy re...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove table from ManageMyGrants list - change (mediawiki...OAuth)
CSteipp has uploaded a new change for review.
https://gerrit.wikimedia.org/r/84864
Change subject: Remove table from ManageMyGrants list
..
Remove table from ManageMyGrants list
Use p instead, to keep things simple
Change-Id: I08231162d3295a31cba1304eacab829d06b53b84
---
M frontend/modules/ext.MWOAuth.BasicStyles.css
M frontend/specialpages/SpecialMWOAuthManageMyGrants.php
2 files changed, 7 insertions(+), 9 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/OAuth
refs/changes/64/84864/1
diff --git a/frontend/modules/ext.MWOAuth.BasicStyles.css
b/frontend/modules/ext.MWOAuth.BasicStyles.css
index b276eda..f15f6f1 100644
--- a/frontend/modules/ext.MWOAuth.BasicStyles.css
+++ b/frontend/modules/ext.MWOAuth.BasicStyles.css
@@ -1,10 +1,13 @@
.mw-mwoauthconsumerregistration-body,
-.mw-mwoauthmanagemygrants-body,
.mw-mwoauthmanageconsumers-body {
background-color: #F0F0F0;
}
+.mw-mwoauthmanagemygrants-list {
+
+}
+
.mw-mwoauthmanageconsumers-proposed,
.mw-mwoauthmanagemygrants-proposed,
.mw-mwoauthconsumerregistration-proposed {
diff --git a/frontend/specialpages/SpecialMWOAuthManageMyGrants.php
b/frontend/specialpages/SpecialMWOAuthManageMyGrants.php
index 4ff223b..c403cf1 100644
--- a/frontend/specialpages/SpecialMWOAuthManageMyGrants.php
+++ b/frontend/specialpages/SpecialMWOAuthManageMyGrants.php
@@ -273,7 +273,7 @@
return $s . ' [' . $cmr-get( 'version' ) . ']';
} ) );
- $r = li;
+ $r = 'li class=mw-mwoauthmanagemygrants-body';
$r .= {$encName} (strong{$link}/strong);
$data = array(
'mwoauthmanagemygrants-user' = $cmr-get( 'userId',
@@ -282,15 +282,10 @@
'MWOAuthUtils::getWikiIdName' )
);
- $r .= table class='mw-mwoauthmanagemygrants-body' .
- cellspacing='1' cellpadding='3' border='1'
width='100%';
foreach ( $data as $msg = $value ) {
- $r .= 'tr' .
- 'tdstrong' . $this-msg( $msg )-escaped()
. '/strong/td' .
- 'td width=\'90%\'' . htmlspecialchars( $value
) . '/td' .
- '/tr';
+ $r .= 'pstrong' . $this-msg( $msg )-escaped() .
'/strong: ' .
+ htmlspecialchars( $value ) . '/p';
}
- $r .= '/table';
$r .= '/li';
return $r;
--
To view, visit https://gerrit.wikimedia.org/r/84864
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I08231162d3295a31cba1304eacab829d06b53b84
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/OAuth
Gerrit-Branch: master
Gerrit-Owner: CSteipp cste...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Make the project tiles go to project page if one exists - change (mediawiki...TwnMainPage)
jenkins-bot has submitted this change and it was merged.
Change subject: Make the project tiles go to project page if one exists
..
Make the project tiles go to project page if one exists
Targets are currently hardcoded to Translating:Project label,
which works for many but not all projects in translatewiki.net
Change-Id: I6a85bef2773b91ca0cbc4ff27f196ced40ba4bae
---
M resources/css/ext.translate.mainpage.css
M resources/js/ext.translate.mainpage.js
M specials/SpecialTwnMainPage.php
3 files changed, 32 insertions(+), 6 deletions(-)
Approvals:
Santhosh: Looks good to me, approved
jenkins-bot: Verified
diff --git a/resources/css/ext.translate.mainpage.css
b/resources/css/ext.translate.mainpage.css
index 68c6bae..778df66 100644
--- a/resources/css/ext.translate.mainpage.css
+++ b/resources/css/ext.translate.mainpage.css
@@ -255,6 +255,10 @@
height: 180px;
}
+.project-tile.linked {
+ cursor: pointer;
+}
+
.project-tile:hover {
border-color: #777;
box-shadow: 0 2px 3px rgba(0, 0, 0, 0.25);
diff --git a/resources/js/ext.translate.mainpage.js
b/resources/js/ext.translate.mainpage.js
index 8e4502e..d031ccd 100644
--- a/resources/js/ext.translate.mainpage.js
+++ b/resources/js/ext.translate.mainpage.js
@@ -7,7 +7,7 @@
'use strict';
$( document ).ready( function () {
- var $tiles, language;
+ var $tiles, language, $selector;
$tiles = $( '.project-tile' );
@@ -20,6 +20,13 @@
}
);
+ $tiles.click( function () {
+ var url = $( this ).data( 'url' );
+ if ( url ) {
+ window.location.href = url;
+ }
+ } );
+
if ( $tiles.length !== 8 ) {
// We have less than 8 tiles, so all are shown
return;
@@ -27,10 +34,9 @@
language = mw.config.get( 'wgUserLanguage' );
- // Take the last tile
- $tiles.eq( 7 )
- .empty()
- .addClass( 'more' )
+ // Prepare one project tile to be a message group selector.
+ $selector = $( 'div' )
+ .addClass( 'project-tile more' )
.text( mw.msg( 'twnmp-show-more-projects' ) )
.one( 'click', function () {
$.when(
@@ -47,6 +53,10 @@
at: 'right bottom+275'
}
} );
+
+ // Replace the last shown tile with group selector.
+ // Users without JavaScript will just see the original one.
+ $tiles.eq( 7 ).replaceWith( $selector );
} );
}( jQuery, mediaWiki ) );
diff --git a/specials/SpecialTwnMainPage.php b/specials/SpecialTwnMainPage.php
index 5c0a2c8..dbedbb7 100644
--- a/specials/SpecialTwnMainPage.php
+++ b/specials/SpecialTwnMainPage.php
@@ -174,6 +174,18 @@
$proofread = round( 100 * $proofread /
$stats[MessageGroupStats::TOTAL] );
}
+ // Approximate project page links while we don't have config
value for them
+ $projectPage = Title::newFromText(
Translating:{$group-getLabel()} );
+ $dataUrl = $linked = '';
+ if ( $projectPage-exists() ) {
+ $dataUrl = str_replace(
+ 'X',
+ htmlspecialchars( $projectPage-getLocalUrl() ),
+ 'data-url=X'
+ );
+ $linked = 'linked';
+ }
+
$image = Html::element( 'div', array( 'class' =
project-icon-$id ) );
$label = htmlspecialchars( $group-getLabel(
$this-getContext() ) );
$stats = $statsbar-getHtml( $this-getContext() );
@@ -194,7 +206,7 @@
$out = HTML
div class=three columns twn-mainpage-project-tile
- div class=project-tile
+ div class=project-tile $linked $dataUrl
div class=row project-top
div class=project-icon four columns$image/div
div class=project-content eight columns
--
To view, visit https://gerrit.wikimedia.org/r/83081
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I6a85bef2773b91ca0cbc4ff27f196ced40ba4bae
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/TwnMainPage
Gerrit-Branch: master
Gerrit-Owner: Nikerabbit niklas.laxst...@gmail.com
Gerrit-Reviewer: Santhosh santhosh.thottin...@gmail.com
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
[MediaWiki-commits] [Gerrit] rm mwext whitespaces jobs - change (integration/jenkins-job-builder-config)
Hashar has uploaded a new change for review.
https://gerrit.wikimedia.org/r/84865
Change subject: rm mwext whitespaces jobs
..
rm mwext whitespaces jobs
The idea was to fail whenever we have trailing whitespace using 'git
diff --check' but that is too unreliable and often will fail on i18n
files. So just get rid of the jobs definitions, we can later use phpcs
to achieve the same goal.
Change-Id: Ibb7df0d595f7fe197de4318ef684f66faac36c8e
---
M mediawiki-extensions.yaml
1 file changed, 0 insertions(+), 10 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/integration/jenkins-job-builder-config
refs/changes/65/84865/1
diff --git a/mediawiki-extensions.yaml b/mediawiki-extensions.yaml
index 585327e..a01aaa3 100644
--- a/mediawiki-extensions.yaml
+++ b/mediawiki-extensions.yaml
@@ -8,15 +8,6 @@
builders:
- phplint
-- job-template:
-name: '{name}-{ext-name}-whitespaces'
-defaults: use-zuul-for-mw-ext
-triggers:
- - zuul
-builders:
- - lint-whitespaces-in:
-dir: '$WORKSPACE/extensions/{ext-name}'
-
# jshint is in a separate job from phplint because various extensions
# don't pass jshint yet but do pass phplint. This way we can opt-in
# on a project base.
@@ -134,7 +125,6 @@
name: mwext-check-jobs
jobs:
- '{name}-{ext-name}-lint'
- - '{name}-{ext-name}-whitespaces'
- '{name}-{ext-name}-jslint'
- '{name}-{ext-name}-install'
- '{name}-{ext-name}-testextensions-{mwbranch}'
--
To view, visit https://gerrit.wikimedia.org/r/84865
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibb7df0d595f7fe197de4318ef684f66faac36c8e
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] Separate RevDel logic from UI - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged.
Change subject: Separate RevDel logic from UI
..
Separate RevDel logic from UI
Move functions implementing the actual revision deletion out of
SpecialRevisiondelete, so they can be used from elsewhere (e.g.
ApiRevisiondelete).
Change-Id: Id0f6b1c8dab474bdfd802c07b211885d398c94e5
---
M RELEASE-NOTES-1.22
M includes/revisiondelete/RevisionDelete.php
M includes/revisiondelete/RevisionDeleteAbstracts.php
M includes/revisiondelete/RevisionDeleter.php
M includes/specials/SpecialRevisiondelete.php
5 files changed, 229 insertions(+), 81 deletions(-)
Approvals:
Aaron Schulz: Looks good to me, approved
jenkins-bot: Verified
diff --git a/RELEASE-NOTES-1.22 b/RELEASE-NOTES-1.22
index d0c9d1d..34e474a 100644
--- a/RELEASE-NOTES-1.22
+++ b/RELEASE-NOTES-1.22
@@ -213,6 +213,7 @@
against allowed proxy lists.
* Add deferrable update support for callback/closure
* Add TitleMove hook before page renames
+* Revision deletion backend code is moved out of SpecialRevisiondelete
=== Bug fixes in 1.22 ===
* Disable Special:PasswordReset when $wgEnableEmail is false. Previously one
diff --git a/includes/revisiondelete/RevisionDelete.php
b/includes/revisiondelete/RevisionDelete.php
index 191286d..7185087 100644
--- a/includes/revisiondelete/RevisionDelete.php
+++ b/includes/revisiondelete/RevisionDelete.php
@@ -41,6 +41,19 @@
return 'rev_id';
}
+ public static function getRestriction() {
+ return 'deleterevision';
+ }
+
+ public static function getRevdelConstant() {
+ return Revision::DELETED_TEXT;
+ }
+
+ public static function suggestTarget( $target, array $ids ) {
+ $rev = Revision::newFromId( $ids[0] );
+ return $rev ? $rev-getTitle() : $target;
+ }
+
/**
* @param $db DatabaseBase
* @return mixed
@@ -441,6 +454,14 @@
return 'oi_archive_name';
}
+ public static function getRestriction() {
+ return 'deleterevision';
+ }
+
+ public static function getRevdelConstant() {
+ return File::DELETED_FILE;
+ }
+
var $storeBatch, $deleteBatch, $cleanupBatch;
/**
@@ -802,6 +823,28 @@
return 'log_id';
}
+ public static function getRestriction() {
+ return 'deletelogentry';
+ }
+
+ public static function getRevdelConstant() {
+ return LogPage::DELETED_ACTION;
+ }
+
+ public static function suggestTarget( $target, array $ids ) {
+ $result = wfGetDB( DB_SLAVE )-select( 'logging',
+ 'log_type',
+ array( 'log_id' = $ids ),
+ __METHOD__,
+ array( 'DISTINCT' )
+ );
+ if ( $result-numRows() == 1 ) {
+ // If there's only one type, the target can be set to
include it.
+ return SpecialPage::getTitleFor( 'Log',
$result-current()-log_type );
+ }
+ return SpecialPage::getTitleFor( 'Log' );
+ }
+
/**
* @param $db DatabaseBase
* @return mixed
diff --git a/includes/revisiondelete/RevisionDeleteAbstracts.php
b/includes/revisiondelete/RevisionDeleteAbstracts.php
index d822d09..803467e 100644
--- a/includes/revisiondelete/RevisionDeleteAbstracts.php
+++ b/includes/revisiondelete/RevisionDeleteAbstracts.php
@@ -37,10 +37,42 @@
* Get the DB field name associated with the ID list.
* This used to populate the log_search table for finding log entries.
* Override this function.
-* @return null
+* @return string|null
*/
public static function getRelationType() {
return null;
+ }
+
+ /**
+* Get the user right required for this list type
+* Override this function.
+* @since 1.22
+* @return string|null
+*/
+ public static function getRestriction() {
+ return null;
+ }
+
+ /**
+* Get the revision deletion constant for this list type
+* Override this function.
+* @since 1.22
+* @return int|null
+*/
+ public static function getRevdelConstant() {
+ return null;
+ }
+
+ /**
+* Suggest a target for the revision deletion
+* Optionally override this function.
+* @since 1.22
+* @param Title|null $target User-supplied target
+* @param array $ids
+* @return Title|null
+*/
+ public static function suggestTarget( $target, array $ids ) {
+ return $target;
}
/**
@@ -72,7 +104,7 @@
$oldBits = $item-getBits();
// Build the
[MediaWiki-commits] [Gerrit] rm mwext whitespaces jobs - change (integration/jenkins-job-builder-config)
jenkins-bot has submitted this change and it was merged.
Change subject: rm mwext whitespaces jobs
..
rm mwext whitespaces jobs
The idea was to fail whenever we have trailing whitespace using 'git
diff --check' but that is too unreliable and often will fail on i18n
files. So just get rid of the jobs definitions, we can later use phpcs
to achieve the same goal.
Change-Id: Ibb7df0d595f7fe197de4318ef684f66faac36c8e
---
M mediawiki-extensions.yaml
1 file changed, 0 insertions(+), 10 deletions(-)
Approvals:
Hashar: Looks good to me, approved
jenkins-bot: Verified
diff --git a/mediawiki-extensions.yaml b/mediawiki-extensions.yaml
index 585327e..a01aaa3 100644
--- a/mediawiki-extensions.yaml
+++ b/mediawiki-extensions.yaml
@@ -8,15 +8,6 @@
builders:
- phplint
-- job-template:
-name: '{name}-{ext-name}-whitespaces'
-defaults: use-zuul-for-mw-ext
-triggers:
- - zuul
-builders:
- - lint-whitespaces-in:
-dir: '$WORKSPACE/extensions/{ext-name}'
-
# jshint is in a separate job from phplint because various extensions
# don't pass jshint yet but do pass phplint. This way we can opt-in
# on a project base.
@@ -134,7 +125,6 @@
name: mwext-check-jobs
jobs:
- '{name}-{ext-name}-lint'
- - '{name}-{ext-name}-whitespaces'
- '{name}-{ext-name}-jslint'
- '{name}-{ext-name}-install'
- '{name}-{ext-name}-testextensions-{mwbranch}'
--
To view, visit https://gerrit.wikimedia.org/r/84865
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ibb7df0d595f7fe197de4318ef684f66faac36c8e
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] Do not use invalid IPs from XFFs to avoid exceptions - change (mediawiki/core)
Aaron Schulz has uploaded a new change for review.
https://gerrit.wikimedia.org/r/84866
Change subject: Do not use invalid IPs from XFFs to avoid exceptions
..
Do not use invalid IPs from XFFs to avoid exceptions
Change-Id: Ib81e06527c2f7a8d9c288b56c0f46610a4517f74
---
M includes/WebRequest.php
1 file changed, 7 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/66/84866/1
diff --git a/includes/WebRequest.php b/includes/WebRequest.php
index 23eee04..c8fc8d1 100644
--- a/includes/WebRequest.php
+++ b/includes/WebRequest.php
@@ -1144,10 +1144,13 @@
foreach ( $ipchain as $i = $curIP ) {
$curIP = IP::sanitizeIP( IP::canonicalize(
$curIP ) );
if ( wfIsTrustedProxy( $curIP ) isset(
$ipchain[$i + 1] ) ) {
- if ( wfIsConfiguredProxy( $curIP ) ||
// bug 48919
- ( IP::isPublic( $ipchain[$i +
1] ) || $wgUsePrivateIPs )
- ) {
- $ip = IP::canonicalize(
$ipchain[$i + 1] );
+ $nextIP = IP::canonicalize( $ipchain[$i
+ 1] );
+ if ( $nextIP (
+ wfIsConfiguredProxy( $curIP )
|| // bug 48919; treat IP as sane
+ IP::isPublic( $ipchain[$i + 1]
) ||
+ $wgUsePrivateIPs
+ ) ) {
+ $ip = $nextIP;
continue;
}
}
--
To view, visit https://gerrit.wikimedia.org/r/84866
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib81e06527c2f7a8d9c288b56c0f46610a4517f74
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz asch...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] MessageGroups::haveSingleSourceLanguage must be static - change (mediawiki...Translate)
jenkins-bot has submitted this change and it was merged.
Change subject: MessageGroups::haveSingleSourceLanguage must be static
..
MessageGroups::haveSingleSourceLanguage must be static
Change-Id: I14719933be4b60c28688921b4dd94dbf043fbe77
---
M MessageGroups.php
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
KartikMistry: Verified; Looks good to me, but someone else must approve
Santhosh: Looks good to me, approved
jenkins-bot: Verified
diff --git a/MessageGroups.php b/MessageGroups.php
index e947a10..3959f3c 100644
--- a/MessageGroups.php
+++ b/MessageGroups.php
@@ -635,7 +635,7 @@
* @return string Language code if the languages are the same, empty
string otherwise.
* @since 2013.09
*/
- public function haveSingleSourceLanguage( array $groups ) {
+ public static function haveSingleSourceLanguage( array $groups ) {
$languages = array();
foreach ( $groups as $group ) {
--
To view, visit https://gerrit.wikimedia.org/r/84656
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I14719933be4b60c28688921b4dd94dbf043fbe77
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Translate
Gerrit-Branch: master
Gerrit-Owner: Nikerabbit niklas.laxst...@gmail.com
Gerrit-Reviewer: KartikMistry kartik.mis...@gmail.com
Gerrit-Reviewer: Santhosh santhosh.thottin...@gmail.com
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] updating apt-proxy ip range and tftp ip range - change (operations/puppet)
Lcarr has uploaded a new change for review. https://gerrit.wikimedia.org/r/84867 Change subject: updating apt-proxy ip range and tftp ip range .. updating apt-proxy ip range and tftp ip range Change-Id: I453ac7538e45c566fbd49c1ca30e39b259247fa4 --- M files/squid/apt-proxy.conf M manifests/misc/install-server.pp 2 files changed, 3 insertions(+), 5 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/67/84867/1 diff --git a/files/squid/apt-proxy.conf b/files/squid/apt-proxy.conf index fc74bb2..ab08da9 100644 --- a/files/squid/apt-proxy.conf +++ b/files/squid/apt-proxy.conf @@ -2422,12 +2422,9 @@ acl wikimedia src 208.80.152.0/22 acl wikimedia src 91.198.174.0/24 -acl wikimedia src 198.35.26.0/28 +acl wikimedia src 198.35.26.0/22 acl wikimedia src 185.15.56.0/22 -acl wikimedia src 10.0.0.0/16 -acl wikimedia src 10.64.0.0/12 -acl wikimedia src 10.4.16.0/24 -acl wikimedia src 10.4.0.0/21 +acl wikimedia src 10.0.0.0/8 # TAG: follow_x_forwarded_for # Note: This option is only available if Squid is rebuilt with the diff --git a/manifests/misc/install-server.pp b/manifests/misc/install-server.pp index 7cec180..4b02ae1 100644 --- a/manifests/misc/install-server.pp +++ b/manifests/misc/install-server.pp @@ -52,6 +52,7 @@ /sbin/iptables -A tftp -s 10.0.0.0/8 -j ACCEPT; /sbin/iptables -A tftp -s 208.80.152.0/22 -j ACCEPT; /sbin/iptables -A tftp -s 91.198.174.0/24 -j ACCEPT; +/sbin/iptables -A tftp -s 198.35.26.0/22 -j ACCEPT; /sbin/iptables -A tftp -j DROP; /sbin/iptables -I INPUT -p udp --dport tftp -j tftp ' -- To view, visit https://gerrit.wikimedia.org/r/84867 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I453ac7538e45c566fbd49c1ca30e39b259247fa4 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Lcarr lc...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Enable EducationProgram on enwikinews - change (operations/mediawiki-config)
jenkins-bot has submitted this change and it was merged. Change subject: Enable EducationProgram on enwikinews .. Enable EducationProgram on enwikinews Bug: 53984 Change-Id: I337fef94d36f0c238b931f3ef1d08077f26c079b --- M wmf-config/InitialiseSettings.php 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Reedy: Looks good to me, approved jenkins-bot: Verified diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index ef05166..4d11713 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -12021,6 +12021,7 @@ 'default' = false, 'dewikiversity' = true, 'enwiki' = true, + 'enwikinews' = true, // bug 53984 'hewiki' = true, // bug 48848 'mkwiki' = true, 'ptwiki' = true, // bug 52870 -- To view, visit https://gerrit.wikimedia.org/r/84863 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I337fef94d36f0c238b931f3ef1d08077f26c079b Gerrit-PatchSet: 2 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Reedy re...@wikimedia.org 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] Merge advanced database write method - change (mediawiki...Math)
Physikerwelt has uploaded a new change for review.
https://gerrit.wikimedia.org/r/84868
Change subject: Merge advanced database write method
..
Merge advanced database write method
Merge advanced database write capabilities
from the development branch.
Bug 53400
Change-Id: I99973bcf7b3a663eeecda136e32b70c26055dbb8
---
M MathRenderer.php
1 file changed, 61 insertions(+), 38 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Math
refs/changes/68/84868/1
diff --git a/MathRenderer.php b/MathRenderer.php
index 1df4203..1f22b50 100644
--- a/MathRenderer.php
+++ b/MathRenderer.php
@@ -141,24 +141,10 @@
*/
public function readFromDatabase() {
$dbr = wfGetDB( DB_SLAVE );
- $rpage = $dbr-selectRow(
- 'math',
- array(
- 'math_outputhash',
'math_html_conservativeness', 'math_html',
- 'math_mathml'
- ),
- array(
- 'math_inputhash' = $this-getInputHash()
- ),
- __METHOD__
- );
+ $rpage = $dbr-selectRow('math',$this-dbInArray(),
+ array('math_inputhash' = $this-getInputHash ()),
__METHOD__);
if ( $rpage !== false ) {
- # Trailing 0x20s can get dropped by the database, add
it back on if necessary:
- $xhash = unpack( 'H32md5', $dbr-decodeBlob(
$rpage-math_outputhash ) . );
- $this-hash = $xhash['md5'];
- $this-conservativeness =
$rpage-math_html_conservativeness;
- $this-html = $rpage-math_html;
- $this-mathml = utf8_decode( $rpage-math_mathml);
+ $this-initializeFromDatabaseRow ( $rpage );
if ( ! is_callable( 'StringUtils::isUtf8' ) ) {
$msg = wfMessage( 'math_latexml_xmlversion'
)-inContentLanguage()-escaped();
trigger_error( $msg, E_USER_NOTICE );
@@ -176,7 +162,31 @@
$this-recall = false;
return false;
}
+ /**
+*
+* @param database_row $rpage
+*/
+ public function initializeFromDatabaseRow( $rpage ) {
+ global $wgDebugMath;
+ $dbr = wfGetDB ( DB_SLAVE );
+ $xhash = unpack ( 'H32md5',
+ $dbr-decodeBlob ( $rpage-math_outputhash ) .
);
+ $this-hash = $xhash['md5'];
+ $this-conservativeness = $rpage-math_html_conservativeness;
+ $this-html = $rpage-math_html;
+ $this-mathml = utf8_decode ( $rpage-math_mathml );
+ $this-storedInDatabase = true;
+ }
+ /**
+* @return array with the database column names
+*/
+ private function dbInArray() {
+ global $wgDebugMath;
+ $in = array('math_inputhash', 'math_outputhash',
'math_html_conservativeness', 'math_html',
+ 'math_mathml');
+ return $in;
+ }
/**
* Writes rendering entry to database.
*
@@ -186,29 +196,39 @@
*
* This function can be seen as protected function.
*/
- public function writeToDatabase() {
+ public function writeToDatabase( $dbw = null ) {
# Now save it back to the DB:
- if ( !wfReadOnly() ) {
- $dbw = wfGetDB( DB_MASTER );
- if ( $this-hash !== '' ) {
- $outmd5_sql = $dbw-encodeBlob( pack( 'H32',
$this-hash ) );
- } else {
- $outmd5_sql = '';
+ if ( !wfReadOnly () ) {
+ if ( $dbw == null ) {
+ $dbw = wfGetDB ( DB_MASTER );
}
- wfDebugLog( Math, 'store entry for $' . $this-tex .
'$ in database (hash:' . $this-hash . ')\n' );
- $dbw-replace(
- 'math',
- array( 'math_inputhash' ),
- array(
- 'math_inputhash' =
$this-getInputHash(),
- 'math_outputhash' = $outmd5_sql ,
- 'math_html_conservativeness' =
$this-conservativeness,
- 'math_html' = $this-html,
- 'math_mathml' = utf8_encode(
$this-mathml ),
- ),
- __METHOD__
-
[MediaWiki-commits] [Gerrit] updating apt-proxy ip range and tftp ip range - change (operations/puppet)
Lcarr has submitted this change and it was merged. Change subject: updating apt-proxy ip range and tftp ip range .. updating apt-proxy ip range and tftp ip range Change-Id: I453ac7538e45c566fbd49c1ca30e39b259247fa4 --- M files/squid/apt-proxy.conf M manifests/misc/install-server.pp 2 files changed, 3 insertions(+), 5 deletions(-) Approvals: Lcarr: Looks good to me, approved jenkins-bot: Verified diff --git a/files/squid/apt-proxy.conf b/files/squid/apt-proxy.conf index fc74bb2..ab08da9 100644 --- a/files/squid/apt-proxy.conf +++ b/files/squid/apt-proxy.conf @@ -2422,12 +2422,9 @@ acl wikimedia src 208.80.152.0/22 acl wikimedia src 91.198.174.0/24 -acl wikimedia src 198.35.26.0/28 +acl wikimedia src 198.35.26.0/22 acl wikimedia src 185.15.56.0/22 -acl wikimedia src 10.0.0.0/16 -acl wikimedia src 10.64.0.0/12 -acl wikimedia src 10.4.16.0/24 -acl wikimedia src 10.4.0.0/21 +acl wikimedia src 10.0.0.0/8 # TAG: follow_x_forwarded_for # Note: This option is only available if Squid is rebuilt with the diff --git a/manifests/misc/install-server.pp b/manifests/misc/install-server.pp index 7cec180..4b02ae1 100644 --- a/manifests/misc/install-server.pp +++ b/manifests/misc/install-server.pp @@ -52,6 +52,7 @@ /sbin/iptables -A tftp -s 10.0.0.0/8 -j ACCEPT; /sbin/iptables -A tftp -s 208.80.152.0/22 -j ACCEPT; /sbin/iptables -A tftp -s 91.198.174.0/24 -j ACCEPT; +/sbin/iptables -A tftp -s 198.35.26.0/22 -j ACCEPT; /sbin/iptables -A tftp -j DROP; /sbin/iptables -I INPUT -p udp --dport tftp -j tftp ' -- To view, visit https://gerrit.wikimedia.org/r/84867 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I453ac7538e45c566fbd49c1ca30e39b259247fa4 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Lcarr lc...@wikimedia.org Gerrit-Reviewer: Lcarr lc...@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] rm analytics.disabled, not used - change (integration/jenkins-job-builder-config)
Hashar has uploaded a new change for review. https://gerrit.wikimedia.org/r/84869 Change subject: rm analytics.disabled, not used .. rm analytics.disabled, not used Not sure why I wanted to keep the old analytics job definition. We can phase it out now. Change-Id: Iad334b832d889ca50a16e82ad4c6124b4b3f01f1 --- D analytics.disabled 1 file changed, 0 insertions(+), 130 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/integration/jenkins-job-builder-config refs/changes/69/84869/1 diff --git a/analytics.disabled b/analytics.disabled deleted file mode 100644 index e1ea8bf..000 --- a/analytics.disabled +++ /dev/null @@ -1,130 +0,0 @@ -# Jobs for WMF Analytics team. -# -# This template has been used to bootstrap Analytics jobs in Jenkins on -# Dec. 13th 2012. It is no more used and kept for historical purposes, hence -# the .disabled file extension. - -# Note that udp-filters and webstatscollector uses submodules. Since the -# git repositories provided by Zuul are non-bare, Jenkins Git Plugin rewrite -# the submodules url (see bug 42953) which leads out to an invalid submodule -# being used. We had to disable submodules for both repositories and update -# the modules directly from the shell. - -- job-template: -name: 'analytics-libanon' -defaults: use-zuul - -triggers: - - zuul - -builders: - - shell: | -(make clean || true) -rm -f configure Makefile -(make maintainer-clean || true) -# Single files deletes: -rm -f \ -aclocal.m4 \ -configure \ -Makefile.in \ -config.h \ -config.h.in \ -config.status \ -libtool \ -ltmain.sh \ -; -# Recursive deletes: -rm -rf \ -m4 \ -autom4te.cache \ -; -autoreconf -./configure -make - -- project: -name: 'analytics-libanon' - -jobs: - - analytics-libanon - -- job-template: -name: 'analytics-udp-filters' -defaults: use-zuul - -triggers: - - zuul - -scm: - - git-zuul-no-submodules - -builders: - - shell: git submodule sync - - shell: git submodule update --init - - shell: | -echo Looking around in jenkins; -stat `pwd`/../../libanon/workspace/src/.libs/ -stat `pwd`/../../libcidr/workspace/src/ -stat `pwd`/../../libcidr/workspace/include/ -stat `pwd`/../../libanon/workspace/src/.libs/ - - shell: rm -f configure Makefile - - shell: | -aclocal -autoreconf -autoconf -automake -./configure - - shell: | -export LIBRARY_PATH=`pwd`/../../libanon/workspace/src/.libs/:`pwd`/../../libcidr/workspace/src/ -export C_INCLUDE_PATH=`pwd`/../../libanon/workspace/src/:`pwd`/../../libcidr/workspace/include/ -export LD_LIBRARY_PATH=`pwd`/../../libanon/workspace/src/.libs/:`pwd`/../../libcidr/workspace/src/ -make -bash run.sh - -- project: -name: 'analytics-udp-filters' - -jobs: - - 'analytics-udp-filters' - -- job-template: -name: 'analytics-webstatscollector' -defaults: use-zuul - -triggers: - - zuul - -scm: - - git-zuul-no-submodules - -builders: - - shell: git submodule sync - - shell: git submodule update --init - - shell: | -libtoolize -autoreconf --verbose --install --force --make - -- project: -name: 'analytics-webstatscollector' - -jobs: - - 'analytics-webstatscollector' - -- job-template: -name: 'analytics-wikistats' -defaults: use-zuul - -triggers: - - zuul - -builders: - - shell: | -cd squids -prove -v -Iperl/ t/; - -- project: -name: 'analytics-wikistats' - -jobs: - - 'analytics-wikistats' -# TODO add in a perl linting job -- To view, visit https://gerrit.wikimedia.org/r/84869 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iad334b832d889ca50a16e82ad4c6124b4b3f01f1 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] rm analytics.disabled, not used - change (integration/jenkins-job-builder-config)
jenkins-bot has submitted this change and it was merged. Change subject: rm analytics.disabled, not used .. rm analytics.disabled, not used Not sure why I wanted to keep the old analytics job definition. We can phase it out now. Change-Id: Iad334b832d889ca50a16e82ad4c6124b4b3f01f1 --- D analytics.disabled 1 file changed, 0 insertions(+), 130 deletions(-) Approvals: Hashar: Looks good to me, approved jenkins-bot: Verified diff --git a/analytics.disabled b/analytics.disabled deleted file mode 100644 index e1ea8bf..000 --- a/analytics.disabled +++ /dev/null @@ -1,130 +0,0 @@ -# Jobs for WMF Analytics team. -# -# This template has been used to bootstrap Analytics jobs in Jenkins on -# Dec. 13th 2012. It is no more used and kept for historical purposes, hence -# the .disabled file extension. - -# Note that udp-filters and webstatscollector uses submodules. Since the -# git repositories provided by Zuul are non-bare, Jenkins Git Plugin rewrite -# the submodules url (see bug 42953) which leads out to an invalid submodule -# being used. We had to disable submodules for both repositories and update -# the modules directly from the shell. - -- job-template: -name: 'analytics-libanon' -defaults: use-zuul - -triggers: - - zuul - -builders: - - shell: | -(make clean || true) -rm -f configure Makefile -(make maintainer-clean || true) -# Single files deletes: -rm -f \ -aclocal.m4 \ -configure \ -Makefile.in \ -config.h \ -config.h.in \ -config.status \ -libtool \ -ltmain.sh \ -; -# Recursive deletes: -rm -rf \ -m4 \ -autom4te.cache \ -; -autoreconf -./configure -make - -- project: -name: 'analytics-libanon' - -jobs: - - analytics-libanon - -- job-template: -name: 'analytics-udp-filters' -defaults: use-zuul - -triggers: - - zuul - -scm: - - git-zuul-no-submodules - -builders: - - shell: git submodule sync - - shell: git submodule update --init - - shell: | -echo Looking around in jenkins; -stat `pwd`/../../libanon/workspace/src/.libs/ -stat `pwd`/../../libcidr/workspace/src/ -stat `pwd`/../../libcidr/workspace/include/ -stat `pwd`/../../libanon/workspace/src/.libs/ - - shell: rm -f configure Makefile - - shell: | -aclocal -autoreconf -autoconf -automake -./configure - - shell: | -export LIBRARY_PATH=`pwd`/../../libanon/workspace/src/.libs/:`pwd`/../../libcidr/workspace/src/ -export C_INCLUDE_PATH=`pwd`/../../libanon/workspace/src/:`pwd`/../../libcidr/workspace/include/ -export LD_LIBRARY_PATH=`pwd`/../../libanon/workspace/src/.libs/:`pwd`/../../libcidr/workspace/src/ -make -bash run.sh - -- project: -name: 'analytics-udp-filters' - -jobs: - - 'analytics-udp-filters' - -- job-template: -name: 'analytics-webstatscollector' -defaults: use-zuul - -triggers: - - zuul - -scm: - - git-zuul-no-submodules - -builders: - - shell: git submodule sync - - shell: git submodule update --init - - shell: | -libtoolize -autoreconf --verbose --install --force --make - -- project: -name: 'analytics-webstatscollector' - -jobs: - - 'analytics-webstatscollector' - -- job-template: -name: 'analytics-wikistats' -defaults: use-zuul - -triggers: - - zuul - -builders: - - shell: | -cd squids -prove -v -Iperl/ t/; - -- project: -name: 'analytics-wikistats' - -jobs: - - 'analytics-wikistats' -# TODO add in a perl linting job -- To view, visit https://gerrit.wikimedia.org/r/84869 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iad334b832d889ca50a16e82ad4c6124b4b3f01f1 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] Remove markread action from the read API - change (mediawiki...Echo)
Bsitu has uploaded a new change for review.
https://gerrit.wikimedia.org/r/84870
Change subject: Remove markread action from the read API
..
Remove markread action from the read API
Don't merge till parent patch 84468 is merged and deployed
Change-Id: I863cf068754723701c26ba575c94a9852cac240e
---
M api/ApiEchoNotifications.php
1 file changed, 0 insertions(+), 27 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Echo
refs/changes/70/84870/1
diff --git a/api/ApiEchoNotifications.php b/api/ApiEchoNotifications.php
index af827f1..740185a 100644
--- a/api/ApiEchoNotifications.php
+++ b/api/ApiEchoNotifications.php
@@ -18,21 +18,6 @@
$params = $this-extractRequestParams();
- // @Todo - markread/markallread has been migrated to a separate
new API module,
- // any related code in this API should be removed in a
follow-up patch so that
- // anything integrated with markread will have time to switch
to the new markread
- // API, also to give client js code enough time to refresh
- //
- // There is no need to trigger markRead if all notifications
are read
- if ( $notifUser-getNotificationCount() 0 ) {
- if ( count( $params['markread'] ) ) {
- // Make sure there is a limit to the update
- $notifUser-markRead( array_slice(
$params['markread'], 0, ApiBase::LIMIT_SML2 ) );
- } elseif ( $params['markallread'] ) {
- $notifUser-markAllRead();
- }
- }
-
$prop = $params['prop'];
$result = array();
@@ -181,15 +166,6 @@
),
ApiBase::PARAM_DFLT = 'list',
),
- 'markread' = array(
- ApiBase::PARAM_ISMULTI = true,
- ApiBase::PARAM_DEPRECATED = true,
- ),
- 'markallread' = array(
- ApiBase::PARAM_REQUIRED = false,
- ApiBase::PARAM_TYPE = 'boolean',
- ApiBase::PARAM_DEPRECATED = true,
- ),
'format' = array(
ApiBase::PARAM_TYPE = array(
'text',
@@ -213,8 +189,6 @@
public function getParamDescription() {
return array(
'prop' = 'Details to request.',
- 'markread' = 'A list of notification IDs to mark as
read',
- 'markallread' = If set to true, marks all of a user's
notifications as read,
'format' = 'If specified, notifications will be
returned formatted this way.',
'index' = 'If specified, a list of notification IDs,
in order, will be returned.',
'limit' = 'The maximum number of notifications to
return.',
@@ -231,7 +205,6 @@
return array(
'api.php?action=querymeta=notifications',
'api.php?action=querymeta=notificationsnotprop=count',
- 'api.php?action=querymeta=notificationsnotmarkread=8',
);
}
--
To view, visit https://gerrit.wikimedia.org/r/84870
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I863cf068754723701c26ba575c94a9852cac240e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Echo
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] Add missing cc-by/cc-by-sa-3.0 licenses (China and more) - change (mediawiki...WikimediaMessages)
jenkins-bot has submitted this change and it was merged.
Change subject: Add missing cc-by/cc-by-sa-3.0 licenses (China and more)
..
Add missing cc-by/cc-by-sa-3.0 licenses (China and more)
bug: 52625
Change-Id: Icca0f3a279ffe7d060f56339973d570a8020022b
---
M WikimediaCCLicenseTexts.i18n.php
1 file changed, 17 insertions(+), 1 deletion(-)
Approvals:
Siebrand: Looks good to me, approved
jenkins-bot: Verified
diff --git a/WikimediaCCLicenseTexts.i18n.php b/WikimediaCCLicenseTexts.i18n.php
index da35bbd..3d7cf97 100644
--- a/WikimediaCCLicenseTexts.i18n.php
+++ b/WikimediaCCLicenseTexts.i18n.php
@@ -71,17 +71,22 @@
'wm-license-cc-by-3.0-at-text' = 'This file is licensed under the
[[{{int:wm-license-cc-wiki-link}}|Creative Commons]]
[//creativecommons.org/licenses/by/3.0/at/deed.en Attribution 3.0 Austria]
license.',
'wm-license-cc-by-3.0-au-text' = 'This file is licensed under the
[[{{int:wm-license-cc-wiki-link}}|Creative Commons]]
[//creativecommons.org/licenses/by/3.0/au/deed.en Attribution 3.0 Australia]
license.',
'wm-license-cc-by-3.0-br-text' = 'This file is licensed under the
[[{{int:wm-license-cc-wiki-link}}|Creative Commons]]
[//creativecommons.org/licenses/by/3.0/br/deed.en Attribution 3.0 Brazil]
license.',
+ 'wm-license-cc-by-3.0-ch-text' = 'This file is licensed under the
[[{{int:wm-license-cc-wiki-link}}|Creative Commons]]
[//creativecommons.org/licenses/by/3.0/ch/deed.en Attribution 3.0 Switzerland]
license.',
'wm-license-cc-by-3.0-cl-text' = 'This file is licensed under the
[[{{int:wm-license-cc-wiki-link}}|Creative Commons]]
[//creativecommons.org/licenses/by/3.0/cl/deed.en Attribution 3.0 Chile]
license.',
+ 'wm-license-cc-by-3.0-cn-text' = 'This file is licensed under the
[[{{int:wm-license-cc-wiki-link}}|Creative Commons]]
[//creativecommons.org/licenses/by/3.0/cn/deed.en Attribution 3.0 China
Mainland] license.',
'wm-license-cc-by-3.0-cr-text' = 'This file is licensed under the
[[{{int:wm-license-cc-wiki-link}}|Creative Commons]]
[//creativecommons.org/licenses/by/3.0/cr/deed.en Attribution 3.0 Costa Rica]
license.',
'wm-license-cc-by-3.0-cz-text' = 'This file is licensed under the
[[{{int:wm-license-cc-wiki-link}}|Creative Commons]]
[//creativecommons.org/licenses/by/3.0/cz/deed.en Attribution 3.0 Czech
Republic] license.',
'wm-license-cc-by-3.0-de-text' = 'This file is licensed under the
[[{{int:wm-license-cc-wiki-link}}|Creative Commons]]
[//creativecommons.org/licenses/by/3.0/de/deed.en Attribution 3.0 Germany]
license.',
'wm-license-cc-by-3.0-ec-text' = 'This file is licensed under the
[[{{int:wm-license-cc-wiki-link}}|Creative Commons]]
[//creativecommons.org/licenses/by/3.0/ec/deed.en Attribution 3.0 Ecuador]
license.',
'wm-license-cc-by-3.0-ee-text' = 'This file is licensed under the
[[{{int:wm-license-cc-wiki-link}}|Creative Commons]]
[//creativecommons.org/licenses/by/3.0/ee/deed.en Attribution 3.0 Estonia]
license.',
+ 'wm-license-cc-by-3.0-eg-text' = 'This file is licensed under the
[[{{int:wm-license-cc-wiki-link}}|Creative Commons]]
[//creativecommons.org/licenses/by/3.0/eg/deed.en Attribution 3.0 Egypt]
license.',
'wm-license-cc-by-3.0-es-text' = 'This file is licensed under the
[[{{int:wm-license-cc-wiki-link}}|Creative Commons]]
[//creativecommons.org/licenses/by/3.0/es/deed.en Attribution 3.0 Spain]
license.',
+ 'wm-license-cc-by-3.0-fr-text' = 'This file is licensed under the
[[{{int:wm-license-cc-wiki-link}}|Creative Commons]]
[//creativecommons.org/licenses/by/3.0/fr/deed.en Attribution 3.0 France]
license.',
'wm-license-cc-by-3.0-gr-text' = 'This file is licensed under the
[[{{int:wm-license-cc-wiki-link}}|Creative Commons]]
[//creativecommons.org/licenses/by/3.0/gr/deed.en Attribution 3.0 Greece]
license.',
'wm-license-cc-by-3.0-gt-text' = 'This file is licensed under the
[[{{int:wm-license-cc-wiki-link}}|Creative Commons]]
[//creativecommons.org/licenses/by/3.0/gt/deed.en Attribution 3.0 Guatemala]
license.',
- 'wm-license-cc-by-3.0-hr-text' = 'This file is licensed under the
[[{{int:wm-license-cc-wiki-link}}|Creative Commons]]
[//creativecommons.org/licenses/by/3.0/hr/deed.en Attribution 3.0 Croatia]
license.',
'wm-license-cc-by-3.0-hk-text' = 'This file is licensed under the
[[{{int:wm-license-cc-wiki-link}}|Creative Commons]]
[//creativecommons.org/licenses/by/3.0/hk/deed.en Attribution 3.0 Hong Kong]
license.',
+ 'wm-license-cc-by-3.0-hr-text' = 'This file is licensed under the
[[{{int:wm-license-cc-wiki-link}}|Creative Commons]]
[//creativecommons.org/licenses/by/3.0/hr/deed.en Attribution 3.0 Croatia]
license.',
+ 'wm-license-cc-by-3.0-ie-text' = 'This file is licensed under the
[[{{int:wm-license-cc-wiki-link}}|Creative Commons]]
[MediaWiki-commits] [Gerrit] Remove table from ManageMyGrants list - change (mediawiki...OAuth)
jenkins-bot has submitted this change and it was merged.
Change subject: Remove table from ManageMyGrants list
..
Remove table from ManageMyGrants list
Use p instead, to keep things simple
Change-Id: I08231162d3295a31cba1304eacab829d06b53b84
---
M frontend/modules/ext.MWOAuth.BasicStyles.css
M frontend/specialpages/SpecialMWOAuthManageMyGrants.php
2 files changed, 3 insertions(+), 9 deletions(-)
Approvals:
Aaron Schulz: Looks good to me, approved
jenkins-bot: Verified
diff --git a/frontend/modules/ext.MWOAuth.BasicStyles.css
b/frontend/modules/ext.MWOAuth.BasicStyles.css
index b276eda..7f41119 100644
--- a/frontend/modules/ext.MWOAuth.BasicStyles.css
+++ b/frontend/modules/ext.MWOAuth.BasicStyles.css
@@ -1,6 +1,5 @@
.mw-mwoauthconsumerregistration-body,
-.mw-mwoauthmanagemygrants-body,
.mw-mwoauthmanageconsumers-body {
background-color: #F0F0F0;
}
diff --git a/frontend/specialpages/SpecialMWOAuthManageMyGrants.php
b/frontend/specialpages/SpecialMWOAuthManageMyGrants.php
index 4ff223b..c403cf1 100644
--- a/frontend/specialpages/SpecialMWOAuthManageMyGrants.php
+++ b/frontend/specialpages/SpecialMWOAuthManageMyGrants.php
@@ -273,7 +273,7 @@
return $s . ' [' . $cmr-get( 'version' ) . ']';
} ) );
- $r = li;
+ $r = 'li class=mw-mwoauthmanagemygrants-body';
$r .= {$encName} (strong{$link}/strong);
$data = array(
'mwoauthmanagemygrants-user' = $cmr-get( 'userId',
@@ -282,15 +282,10 @@
'MWOAuthUtils::getWikiIdName' )
);
- $r .= table class='mw-mwoauthmanagemygrants-body' .
- cellspacing='1' cellpadding='3' border='1'
width='100%';
foreach ( $data as $msg = $value ) {
- $r .= 'tr' .
- 'tdstrong' . $this-msg( $msg )-escaped()
. '/strong/td' .
- 'td width=\'90%\'' . htmlspecialchars( $value
) . '/td' .
- '/tr';
+ $r .= 'pstrong' . $this-msg( $msg )-escaped() .
'/strong: ' .
+ htmlspecialchars( $value ) . '/p';
}
- $r .= '/table';
$r .= '/li';
return $r;
--
To view, visit https://gerrit.wikimedia.org/r/84864
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I08231162d3295a31cba1304eacab829d06b53b84
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/OAuth
Gerrit-Branch: master
Gerrit-Owner: CSteipp cste...@wikimedia.org
Gerrit-Reviewer: Aaron Schulz asch...@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] WIP: Major DOM spec cleanup - change (mediawiki...Parsoid)
GWicke has uploaded a new change for review.
https://gerrit.wikimedia.org/r/84871
Change subject: WIP: Major DOM spec cleanup
..
WIP: Major DOM spec cleanup
* mw:WikiLink/Interwiki becomes mw:ExtLink. We automatically serialize
links matching an interwiki URL as wiki links.
* mw:ExtLink/* all become just mw:ExtLink. We transparently handle the
serialization to special ISBN/RFC/PMID and auto-numbered forms.
Auto-numbered external links now have an empty content, which will be
auto-numbered with CSS as documented in bug 53505.
* mw:WikiLink/Category becomes mw:PageProp/Category
* mw:WikiLink/Language becomes mw:PageProp/Language
Change-Id: I0f0a826c6a56e9d74d92fefdc29dc2503e7908e3
---
M js/lib/ext.core.LinkHandler.js
M js/lib/mediawiki.Util.js
M js/lib/mediawiki.WikiConfig.js
M js/lib/mediawiki.WikitextSerializer.js
M js/lib/mediawiki.wikitext.constants.js
M js/lib/pegTokenizer.pegjs.txt
M js/tests/parserTests.txt
7 files changed, 218 insertions(+), 67 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Parsoid
refs/changes/71/84871/1
diff --git a/js/lib/ext.core.LinkHandler.js b/js/lib/ext.core.LinkHandler.js
index 3343c3d..627e4bc 100644
--- a/js/lib/ext.core.LinkHandler.js
+++ b/js/lib/ext.core.LinkHandler.js
@@ -359,8 +359,8 @@
newTk = new SelfclosingTagTk('link'),
content = this.addLinkAttributesAndGetContent(newTk, token,
target);
- // Change the rel to be mw:WikiLink / Category
- Util.lookupKV( newTk.attribs, 'rel' ).v += '/Category';
+ // Change the rel to be mw:PageProp/Category
+ Util.lookupKV( newTk.attribs, 'rel' ).v = 'mw:PageProp/Category';
var strContent = Util.tokensToString( content ),
saniContent = Util.sanitizeTitleURI( strContent ).replace(
/#/g, '%23' );
@@ -414,8 +414,8 @@
var absHref = target.language.url.replace( $1, target.href );
newTk.addNormalizedAttribute('href', absHref, target.hrefSrc);
- // Change the rel to be mw:WikiLink/Language
- Util.lookupKV( newTk.attribs, 'rel' ).v = 'mw:WikiLink/Language';
+ // Change the rel to be mw:PageProp/Language
+ Util.lookupKV( newTk.attribs, 'rel' ).v = 'mw:PageProp/Language';
cb({tokens: [newTk]});
};
@@ -434,8 +434,8 @@
var absHref = target.interwiki.url.replace( $1, target.href );
newTk.addNormalizedAttribute('href', absHref, target.hrefSrc);
- // Change the rel to be mw:WikiLink/Interwiki
- Util.lookupKV( newTk.attribs, 'rel' ).v = 'mw:WikiLink/Interwiki';
+ // Change the rel to be mw:ExtLink
+ Util.lookupKV( newTk.attribs, 'rel' ).v = 'mw:ExtLink';
tokens.push( newTk );
@@ -1348,9 +1348,9 @@
var dataAttribs = Util.clone(token.dataAttribs);
var rdfaType = token.getAttribute('typeof'),
- magLinkRe = /(?:^|\s)(mw:ExtLink\/(?:ISBN|RFC|PMID))(?=$|\s)/;
+ magLinkRe =
/(?:^|\s)(mw:(?:Ext|Wiki)Link\/(?:ISBN|RFC|PMID))(?=$|\s)/;
if ( rdfaType magLinkRe.test(rdfaType) ) {
- if ( /(?:^|\s)mw:ExtLink\/ISBN/.test(rdfaType) ) {
+ if ( /(?:^|\s)mw:WikiLink\/ISBN/.test(rdfaType) ) {
title = Title.fromPrefixedText( env, href );
newAttrs = [
new KV('href', title.makeLink()),
@@ -1359,9 +1359,10 @@
} else {
newAttrs = [
new KV('href', href),
- new KV('rel', rdfaType.match( magLinkRe )[1] )
+ new KV('rel', 'mw:ExtLink' )
];
}
+ token.removeAttribute('typeof');
// SSS FIXME: Right now, Parsoid does not support templating
// of ISBN attributes. So, ISBN {{echo|1234567890}} will not
@@ -1379,9 +1380,8 @@
} else if ( this.urlParser.tokenizeURL( href )) {
rdfaType = 'mw:ExtLink';
if ( ! content.length ) {
- content = ['[' + this.linkCount + ']'];
- this.linkCount++;
- rdfaType = 'mw:ExtLink/Numbered';
+ //content = ['[' + this.linkCount + ']'];
+ //this.linkCount++;
} else if ( content.length === 1
content[0].constructor === String
this.urlParser.tokenizeURL( content[0] )
diff --git a/js/lib/mediawiki.Util.js b/js/lib/mediawiki.Util.js
index 192a5c7..4a49086 100644
--- a/js/lib/mediawiki.Util.js
+++ b/js/lib/mediawiki.Util.js
@@ -177,7 +177,7 @@
var tc = token.constructor;
return (tc === pd.SelfclosingTagTk || tc === pd.TagTk || tc ===
pd.EndTagTk)
token.name === 'link'
-
[MediaWiki-commits] [Gerrit] Display the correct info in notifications - change (mediawiki...Flow)
Bsitu has submitted this change and it was merged. Change subject: Display the correct info in notifications .. Display the correct info in notifications Notifications were incorrectly displaying the notified user, rather than the user that performed an action triggering the notification. Change-Id: Ib2fdeb5e6a2391dbf8a638ac643e089180dc00db --- M Hooks.php M includes/NotificationFormatter.php 2 files changed, 6 insertions(+), 6 deletions(-) Approvals: Bsitu: Verified; Looks good to me, approved diff --git a/Hooks.php b/Hooks.php index 63d695c..d3c285a 100644 --- a/Hooks.php +++ b/Hooks.php @@ -22,30 +22,30 @@ $wgEchoNotifications['flow-new-topic'] = array( 'title-message' = 'flow-notification-newtopic', - 'title-params' = array( 'user', 'flow-title', 'title', 'subject', 'topic-permalink' ), + 'title-params' = array( 'agent', 'flow-title', 'title', 'subject', 'topic-permalink' ), 'payload' = array( 'comment-text' ), ) + $notificationTemplate; $wgEchoNotifications['flow-post-reply'] = array( 'title-message' = 'flow-notification-reply', - 'title-params' = array( 'user', 'subject', 'flow-title', 'title', 'post-permalink' ), + 'title-params' = array( 'agent', 'subject', 'flow-title', 'title', 'post-permalink' ), 'payload' = array( 'comment-text' ), ) + $notificationTemplate; $wgEchoNotifications['flow-post-edited'] = array( 'title-message' = 'flow-notification-edit', - 'title-params' = array( 'user', 'subject', 'flow-title', 'title', 'post-permalink' ), + 'title-params' = array( 'agent', 'subject', 'flow-title', 'title', 'post-permalink' ), ) + $notificationTemplate; // Saving for a rainy day // $wgEchoNotifications['flow-post-moderated'] = array( // 'title-message' = 'flow-notification-moderated', - // 'title-params' = array( 'user', 'subject', 'flow-title', 'title', 'post-permalink' ), + // 'title-params' = array( 'agent', 'subject', 'flow-title', 'title', 'post-permalink' ), // ) + $notificationTemplate; $wgEchoNotifications['flow-topic-renamed'] = array( 'title-message' = 'flow-notification-rename', - 'title-params' = array( 'user', 'topic-permalink', 'old-subject', 'new-subject', 'flow-title', 'title' ), + 'title-params' = array( 'agent', 'topic-permalink', 'old-subject', 'new-subject', 'flow-title', 'title' ), ) + $notificationTemplate; $wgEchoNotificationIcons['flow-discussion'] = array( diff --git a/includes/NotificationFormatter.php b/includes/NotificationFormatter.php index 7053a9f..5fb5074 100644 --- a/includes/NotificationFormatter.php +++ b/includes/NotificationFormatter.php @@ -64,4 +64,4 @@ parent::processParam( $event, $param, $message, $user ); } } -} \ No newline at end of file +} -- To view, visit https://gerrit.wikimedia.org/r/83033 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ib2fdeb5e6a2391dbf8a638ac643e089180dc00db Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Flow Gerrit-Branch: master Gerrit-Owner: EBernhardson (WMF) ebernhard...@wikimedia.org Gerrit-Reviewer: Bsitu bs...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] adding in wikimediastories.com/net/org - change (operations/dns)
RobH has uploaded a new change for review. https://gerrit.wikimedia.org/r/84872 Change subject: adding in wikimediastories.com/net/org .. adding in wikimediastories.com/net/org Change-Id: Ic9d4e4949cb6e4177215331207b5da26fe86d6fa --- A templates/wikimediastories.com A templates/wikimediastories.net A templates/wikimediastories.org 3 files changed, 3 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/dns refs/changes/72/84872/1 diff --git a/templates/wikimediastories.com b/templates/wikimediastories.com new file mode 12 index 000..c08543d --- /dev/null +++ b/templates/wikimediastories.com @@ -0,0 +1 @@ +wikimediafoundation.org \ No newline at end of file diff --git a/templates/wikimediastories.net b/templates/wikimediastories.net new file mode 12 index 000..c08543d --- /dev/null +++ b/templates/wikimediastories.net @@ -0,0 +1 @@ +wikimediafoundation.org \ No newline at end of file diff --git a/templates/wikimediastories.org b/templates/wikimediastories.org new file mode 12 index 000..c08543d --- /dev/null +++ b/templates/wikimediastories.org @@ -0,0 +1 @@ +wikimediafoundation.org \ No newline at end of file -- To view, visit https://gerrit.wikimedia.org/r/84872 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic9d4e4949cb6e4177215331207b5da26fe86d6fa Gerrit-PatchSet: 1 Gerrit-Project: operations/dns Gerrit-Branch: master Gerrit-Owner: RobH r...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] adding in wikimediastories.com/net/org - change (operations/dns)
RobH has submitted this change and it was merged. Change subject: adding in wikimediastories.com/net/org .. adding in wikimediastories.com/net/org Change-Id: Ic9d4e4949cb6e4177215331207b5da26fe86d6fa --- A templates/wikimediastories.com A templates/wikimediastories.net A templates/wikimediastories.org 3 files changed, 3 insertions(+), 0 deletions(-) Approvals: RobH: Looks good to me, approved jenkins-bot: Verified diff --git a/templates/wikimediastories.com b/templates/wikimediastories.com new file mode 12 index 000..c08543d --- /dev/null +++ b/templates/wikimediastories.com @@ -0,0 +1 @@ +wikimediafoundation.org \ No newline at end of file diff --git a/templates/wikimediastories.net b/templates/wikimediastories.net new file mode 12 index 000..c08543d --- /dev/null +++ b/templates/wikimediastories.net @@ -0,0 +1 @@ +wikimediafoundation.org \ No newline at end of file diff --git a/templates/wikimediastories.org b/templates/wikimediastories.org new file mode 12 index 000..c08543d --- /dev/null +++ b/templates/wikimediastories.org @@ -0,0 +1 @@ +wikimediafoundation.org \ No newline at end of file -- To view, visit https://gerrit.wikimedia.org/r/84872 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ic9d4e4949cb6e4177215331207b5da26fe86d6fa Gerrit-PatchSet: 1 Gerrit-Project: operations/dns Gerrit-Branch: master Gerrit-Owner: RobH r...@wikimedia.org Gerrit-Reviewer: RobH r...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Disable HTTPS on etherpad.wikimedia.org - change (operations/puppet)
Akosiaris has uploaded a new change for review.
https://gerrit.wikimedia.org/r/84873
Change subject: Disable HTTPS on etherpad.wikimedia.org
..
Disable HTTPS on etherpad.wikimedia.org
It makes no sense to have HTTPS for this for the following reasons:
1) HTTPS does not provides authentication (obviously). It actually is
possible to impersonate anyone at anytime due to the nature of the
software and the specific installation
2) HTTPS does not provide non-repudation (as above)
3) Integrity while data is transported is completely irrelevant in this
case since any data can be changed by anyone in the world at anytime in
this installation
4) Confidentiality of the data is also completely irrelevant since any
data can be read by anyone at anytime in this installation
In the sake of consistency and not providing a false sense of
security this patch disables HTTPS on etherpad.wikimedia.org
Change-Id: Ida97e1c3bf632bad6d7a7a99e4f90440b8ea4b51
---
M templates/apache/sites/etherpad_lite.wikimedia.org.erb
1 file changed, 4 insertions(+), 56 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/73/84873/1
diff --git a/templates/apache/sites/etherpad_lite.wikimedia.org.erb
b/templates/apache/sites/etherpad_lite.wikimedia.org.erb
index 5976897..d6a3bcb 100644
--- a/templates/apache/sites/etherpad_lite.wikimedia.org.erb
+++ b/templates/apache/sites/etherpad_lite.wikimedia.org.erb
@@ -7,9 +7,9 @@
VirtualHost *:80
ServerName %= etherpad_host %
-% if etherpad_serveraliases -%
+ %- if etherpad_serveraliases -%
ServerAlias %= etherpad_serveraliases %
-% end -%
+ %- end -%
RewriteEngine on
ProxyVia On
@@ -17,7 +17,7 @@
ProxyPass / http://%= etherpad_ip %:%= etherpad_port %/
ProxyPassReverse / http://%= etherpad_ip %:%= etherpad_port %/
ProxyPreserveHost On
- RewriteRule /p/*$ https://etherpad.wikimedia.org/ [NC,L]
+ RewriteRule /p/*$ http://etherpad.wikimedia.org/ [NC,L]
RewriteCond %{REQUEST_URI} !^/locales/
RewriteCond %{REQUEST_URI} !^/locales.json
RewriteCond %{REQUEST_URI} !^/admin
@@ -37,58 +37,7 @@
RewriteRule ^/+(.+)$ https://etherpad.wikimedia.org/p/$1 [L]
RewriteCond %{HTTP_HOST} !etherpad.wikimedia.org
- RewriteRule ^/+(.+)$ https://etherpad.wikimedia.org/$1 [R=301,L]
-
- Proxy *
- Options FollowSymLinks MultiViews
- AllowOverride All
- Order allow,deny
- Allow from all
-/Proxy
-
-/VirtualHost
-
-VirtualHost *:443
-
- ServerName %= etherpad_host %
-% if etherpad_serveraliases -%
- ServerAlias %= etherpad_serveraliases %
-% end -%
-
- SSLEngine on
- SSLProtocol -ALL +SSLv3 +TLSv1
- SSLCipherSuite
AES128-GCM-SHA256:RC4-SHA:RC4-MD5:DES-CBC3-SHA:AES128-SHA:AES256-SHA
- SSLHonorCipherOrder on
- SSLCertificateFile %= etherpad_ssl_cert %
- SSLCertificateKeyFile %= etherpad_ssl_key %
-
- RewriteEngine on
- ProxyVia On
- ProxyRequests Off
- ProxyPass / http://%= etherpad_ip %:%= etherpad_port %/
- ProxyPassReverse / http://%= etherpad_ip %:%= etherpad_port %/
- ProxyPreserveHost On
- RewriteRule /p/*$ https://etherpad.wikimedia.org/ [NC,L]
- RewriteCond %{REQUEST_URI} !^/locales/
- RewriteCond %{REQUEST_URI} !^/locales.json
- RewriteCond %{REQUEST_URI} !^/admin
- RewriteCond %{REQUEST_URI} !^/p/
- RewriteCond %{REQUEST_URI} !^/static/
- RewriteCond %{REQUEST_URI} !^/pluginfw/
- RewriteCond %{REQUEST_URI} !^/javascripts/
- RewriteCond %{REQUEST_URI} !^/socket.io/
- RewriteCond %{REQUEST_URI} !^/ep/
- RewriteCond %{REQUEST_URI} !^/minified/
- RewriteCond %{REQUEST_URI} !^/api/
- RewriteCond %{REQUEST_URI} !^/ro/
- RewriteCond %{REQUEST_URI} !^/error/
- RewriteCond %{REQUEST_URI} !^/jserror
- RewriteCond %{REQUEST_URI} !/favicon.ico
- RewriteCond %{REQUEST_URI} !/robots.txt
- RewriteRule ^/+(.+)$ https://etherpad.wikimedia.org/p/$1 [L]
-
- RewriteCond %{HTTP_HOST} !etherpad.wikimedia.org
- RewriteRule ^/+(.+)$ https://etherpad.wikimedia.org/$1 [R=301,L]
+ RewriteRule ^/+(.+)$ http://etherpad.wikimedia.org/$1 [R=301,L]
Proxy *
Options FollowSymLinks MultiViews
@@ -96,5 +45,4 @@
Order allow,deny
Allow from all
/Proxy
-
/VirtualHost
--
To view, visit https://gerrit.wikimedia.org/r/84873
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ida97e1c3bf632bad6d7a7a99e4f90440b8ea4b51
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Akosiaris akosia...@wikimedia.org
___
MediaWiki-commits mailing list
[MediaWiki-commits] [Gerrit] nickel: add self ('olivneh') w/sudo - change (operations/puppet)
Cmjohnson has submitted this change and it was merged.
Change subject: nickel: add self ('olivneh') w/sudo
..
nickel: add self ('olivneh') w/sudo
I expect to be doing a lot of work w/Ganglia over the next several months and
It'd be useful to be able to force Puppet runs and to view the Puppet logs to
debug any failures. I have such access on the graphite host (professor) and
it's been extremely useful for developing an understanding how things are set
up.
Change-Id: I7093010daf5d276f49f9e80c6ac0708c4df77eca
---
M manifests/site.pp
1 file changed, 7 insertions(+), 1 deletion(-)
Approvals:
Cmjohnson: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/site.pp b/manifests/site.pp
index df1a0d7..7921baf 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -2110,9 +2110,15 @@
include standard,
ganglia::web,
-misc::monitoring::views
+misc::monitoring::views,
+groups::wikidev,
+accounts::olivneh
install_certificate{ star.wikimedia.org: }
+
+ sudo_user { 'olivneh':
+ privileges = ['ALL = (ALL) NOPASSWD: ALL'],
+ }
}
node /^ocg[1-3]\.wikimedia\.org$/ {
--
To view, visit https://gerrit.wikimedia.org/r/83201
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I7093010daf5d276f49f9e80c6ac0708c4df77eca
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ori.livneh o...@wikimedia.org
Gerrit-Reviewer: Asher afeld...@wikimedia.org
Gerrit-Reviewer: Cmjohnson cmjohn...@wikimedia.org
Gerrit-Reviewer: Dzahn dz...@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] RT#4942 wikimediastories.com/net/org - change (operations/apache-config)
RobH has uploaded a new change for review.
https://gerrit.wikimedia.org/r/84874
Change subject: RT#4942 wikimediastories.com/net/org
..
RT#4942 wikimediastories.com/net/org
Change-Id: I672598b12412a8c5ef72f4fb417060584ffd6247
---
M redirects.conf
1 file changed, 9 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/apache-config
refs/changes/74/84874/1
diff --git a/redirects.conf b/redirects.conf
index 093e11c..bcfea79 100644
--- a/redirects.conf
+++ b/redirects.conf
@@ -137,6 +137,9 @@
*.wikimediafoundation.org \
wikimedia.jp.net *.wikimedia.jp.net \
wikimedia.lt *.wikimedia.lt \
+wikimediastories.com *.wikimediastories.com \
+wikimediastories.net *.wikimediastories.net \
+wikimediastories.org *.wikimediastories.org \
wiki.mediawiki.org \
wikimemory.org *.wikimemory.org \
wikinews.com *.wikinews.com \
@@ -598,6 +601,8 @@
# Other projects
+
+
RewriteCond %{HTTP_HOST} (^|\.)softwarewikipedia.(com|net|org)$
RewriteRule ^(.*)$ http://mediawiki.org$1 [R=301,L]
@@ -723,6 +728,10 @@
RewriteCond %{HTTP_HOST} ^(.*\.|)(careers|jobs)\.wikipedia\.org$
RewriteRule ^/$ http://wikimediafoundation.org/wiki/Work_with_us
[R=301,L,NE]
RewriteRule ^/(.*)$ http://wikimediafoundation.org/wiki/Job_openings/$1
[R=301,L,NE]
+
+# wikimediastories.com/net/org - RT #4942
+RewriteCond %{HTTP_HOST} (.*).wikimediastories.(com|net|org)$
+RewriteRule ^/$ http://wikimediafoundation.org/wiki/Thank_You_All
[R=301,L,NE]
# Send anything else that matched the ServerAlias to en.wikipedia.org
RewriteRule ^(.*)$ http://en.wikipedia.org$1 [R=301,L,NE]
--
To view, visit https://gerrit.wikimedia.org/r/84874
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I672598b12412a8c5ef72f4fb417060584ffd6247
Gerrit-PatchSet: 1
Gerrit-Project: operations/apache-config
Gerrit-Branch: master
Gerrit-Owner: RobH r...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Make vhtcpd collector and pyconf agree on titles. - change (operations/puppet)
BBlack has submitted this change and it was merged.
Change subject: Make vhtcpd collector and pyconf agree on titles.
..
Make vhtcpd collector and pyconf agree on titles.
Continue the cleanup of titles started in the ganglia collector by
correcting the same titles in the pyconf file. Also remove the units
descriptions as they look ugly in the graph titles.
Change-Id: Ibc81cc7e5a80f0f85278c902cf437e19311d4226
---
M modules/varnish/files/ganglia/ganglia-vhtcpd.py
M modules/varnish/templates/ganglia/vhtcpd.pyconf.erb
2 files changed, 9 insertions(+), 33 deletions(-)
Approvals:
BBlack: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/varnish/files/ganglia/ganglia-vhtcpd.py
b/modules/varnish/files/ganglia/ganglia-vhtcpd.py
index fe27185..d34f2bf 100644
--- a/modules/varnish/files/ganglia/ganglia-vhtcpd.py
+++ b/modules/varnish/files/ganglia/ganglia-vhtcpd.py
@@ -192,7 +192,7 @@
'name': CONF['prefix'] + 'queue_max_size',
'call_back': get_value,
'units': 'count',
-'description': 'Maximum number of packets in queue/overflow',
+'description': 'Maximum number of packets in queue since
startup/overflow',
}))
return descriptors
diff --git a/modules/varnish/templates/ganglia/vhtcpd.pyconf.erb
b/modules/varnish/templates/ganglia/vhtcpd.pyconf.erb
index f0ca14e..7be17f3 100644
--- a/modules/varnish/templates/ganglia/vhtcpd.pyconf.erb
+++ b/modules/varnish/templates/ganglia/vhtcpd.pyconf.erb
@@ -13,7 +13,7 @@
metric {
name = vhtcpd_start
-title = Time service started (epoch)
+title = Time service started
}
metric {
name = vhtcpd_uptime
@@ -21,54 +21,30 @@
}
metric {
name = vhtcpd_inpkts_recvd
-title = Multicast packets since startup (pkts)
+title = Multicast packets
}
metric {
name = vhtcpd_inpkts_sane
-title = Sane packets since startup (pkts)
+title = Sane packets
}
metric {
name = vhtcpd_inpkts_enqueued
-title = Pakets enqueued since startup (pkts)
+title = Packets enqueued
}
metric {
name = vhtcpd_inpkts_dequeued
-title = Packets dequeued since startup (pkts)
+title = Packets dequeued
}
metric {
name = vhtcpd_queue_overflows
-title = Number of queue overflows since startup (count)
+title = Number of queue overflows
}
metric {
name = vhtcpd_queue_size
-title = Number of packets in queue (count)
+title = Number of packets in queue
}
metric {
name = vhtcpd_queue_max_size
-title = Maximum number of packets in queue since startup/overflow
(count)
-}
-metric {
-name = vhtcpd_inpkts_recvd_delta
-title = Multicast packets since last check
-}
-metric {
-name = vhtcpd_inpkts_sane_delta
-title = Sane packets since last check
-}
-metric {
-name = vhtcpd_inpkts_enqueued_delta
-title = Pakets enqueued since last check
-}
-metric {
-name = vhtcpd_inpkts_dequeued_delta
-title = Packets dequeued since last check
-}
-metric {
-name = vhtcpd_queue_overflows_delta
-title = Number of queue overflows since last check
-}
-metric {
-name = vhtcpd_queue_max_size_delta
-title = Maximum number of packets in queue since last check/overflow
+title = Maximum number of packets in queue since startup/overflow
}
}
--
To view, visit https://gerrit.wikimedia.org/r/83932
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ibc81cc7e5a80f0f85278c902cf437e19311d4226
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BryanDavis bda...@wikimedia.org
Gerrit-Reviewer: BBlack bbl...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add 'Active Editor Totals' - change (analytics/geowiki)
Hello Milimetric, I'd like you to do a code review. Please visit https://gerrit.wikimedia.org/r/84875 to review the following change. Change subject: Add 'Active Editor Totals' .. Add 'Active Editor Totals' Card: analytics 1155 Change-Id: I5ff0bb8e39aef99ec6dbfcc438fb0b3f58fafc0f --- M scripts/make_limn_files.py 1 file changed, 18 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/analytics/geowiki refs/changes/75/84875/1 diff --git a/scripts/make_limn_files.py b/scripts/make_limn_files.py index a3a324b..525cf73 100755 --- a/scripts/make_limn_files.py +++ b/scripts/make_limn_files.py @@ -357,6 +357,23 @@ graph_id='global_south_editor_fractions') g.write(basedir) +def plot_active_editor_totals(basedir): +df = pd.read_csv(basedir + '/datafiles/global_south.csv', index_col='date', parse_dates=['date']) +df['Active Editors Total (100+)'] = (df['Global South (100+)'] + df['Global North (100+)'] + df['Unkown (100+)']).apply(float) +df['Active Editors Total (5+)'] = (df['Global South (5+)'] + df['Global North (5+)'] + df['Unkown (5+)'] ).apply(float) +df['Active Editors Total (all)'] = (df['Global South (all)'] + df['Global North (all)'] + df['Unkown (all)'] ).apply(float) +df_total = df[['Active Editors Total (100+)', 'Active Editors Total (5+)', 'Active Editors Total (all)']] + +ds_total = limnpy.DataSource(limn_id='active_editors_total', +limn_name='Active Editors Total', +limn_group=LIMN_GROUP, +data = df_total) +ds_total.write(basedir) +g = ds_total.get_graph(metric_ids=['Active Editors Total (100+)', 'Active Editors Total (5+)', 'Active Editors Total (all)'], +title='Active Editors Total', +graph_id='active_editors_total') +g.write(basedir) + if __name__ == '__main__': args = parse_args() @@ -393,5 +410,6 @@ write_overall_mysql(projects, cursor, args.basedir) plot_gs_editor_fraction(args.basedir) +plot_active_editor_totals(args.basedir) -- To view, visit https://gerrit.wikimedia.org/r/84875 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I5ff0bb8e39aef99ec6dbfcc438fb0b3f58fafc0f Gerrit-PatchSet: 1 Gerrit-Project: analytics/geowiki Gerrit-Branch: master Gerrit-Owner: QChris christ...@quelltextlich.at Gerrit-Reviewer: Milimetric dandree...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] correcting netboot gateway - change (operations/puppet)
Lcarr has uploaded a new change for review. https://gerrit.wikimedia.org/r/84876 Change subject: correcting netboot gateway .. correcting netboot gateway Change-Id: I9be7620ed2b91dc1abecb7ca7e27735cad8e3cfc --- M files/autoinstall/subnets/public1-ulsfo.cfg 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/76/84876/1 diff --git a/files/autoinstall/subnets/public1-ulsfo.cfg b/files/autoinstall/subnets/public1-ulsfo.cfg index 4a0325c..98b6c05 100644 --- a/files/autoinstall/subnets/public1-ulsfo.cfg +++ b/files/autoinstall/subnets/public1-ulsfo.cfg @@ -12,7 +12,7 @@ # ip address is taken from DHCP, rest is set here d-inetcfg/get_netmask string 255.255.255.240 -d-inetcfg/get_gateway string 192.32.26.1 +d-inetcfg/get_gateway string 198.35.26.1 d-inetcfg/get_nameservers string 208.80.152.131 208.80.152.132 d-inetcfg/confirm_static boolean true -- To view, visit https://gerrit.wikimedia.org/r/84876 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I9be7620ed2b91dc1abecb7ca7e27735cad8e3cfc Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Lcarr lc...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] php exts jobs now fetch Zuul ref via git protocol - change (integration/jenkins-job-builder-config)
Hashar has uploaded a new change for review.
https://gerrit.wikimedia.org/r/84877
Change subject: php exts jobs now fetch Zuul ref via git protocol
..
php exts jobs now fetch Zuul ref via git protocol
Jobs updated:
php-FastStringSearch-build
php-NativePreprocessor-build
php-luasandbox-build
php-wikidiff-build
php-wikidiff2-build
php-wmerrors-build
Change-Id: I4fbbc3e8fd71e14b582b81092530ca8977e5b2b3
---
M php-extensions.yaml
1 file changed, 1 insertion(+), 1 deletion(-)
git pull
ssh://gerrit.wikimedia.org:29418/integration/jenkins-job-builder-config
refs/changes/77/84877/1
diff --git a/php-extensions.yaml b/php-extensions.yaml
index 44b3a2a..3d98007 100644
--- a/php-extensions.yaml
+++ b/php-extensions.yaml
@@ -1,7 +1,7 @@
- job-template:
name: 'php-{name}-build'
node: hasContintPackages # needs phpize
-defaults: use-zuul
+defaults: use-remote-zuul
triggers:
- zuul
builders:
--
To view, visit https://gerrit.wikimedia.org/r/84877
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I4fbbc3e8fd71e14b582b81092530ca8977e5b2b3
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] correcting netboot gateway - change (operations/puppet)
Lcarr has submitted this change and it was merged. Change subject: correcting netboot gateway .. correcting netboot gateway Change-Id: I9be7620ed2b91dc1abecb7ca7e27735cad8e3cfc --- M files/autoinstall/subnets/public1-ulsfo.cfg 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Lcarr: Verified; Looks good to me, approved diff --git a/files/autoinstall/subnets/public1-ulsfo.cfg b/files/autoinstall/subnets/public1-ulsfo.cfg index 4a0325c..98b6c05 100644 --- a/files/autoinstall/subnets/public1-ulsfo.cfg +++ b/files/autoinstall/subnets/public1-ulsfo.cfg @@ -12,7 +12,7 @@ # ip address is taken from DHCP, rest is set here d-inetcfg/get_netmask string 255.255.255.240 -d-inetcfg/get_gateway string 192.32.26.1 +d-inetcfg/get_gateway string 198.35.26.1 d-inetcfg/get_nameservers string 208.80.152.131 208.80.152.132 d-inetcfg/confirm_static boolean true -- To view, visit https://gerrit.wikimedia.org/r/84876 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I9be7620ed2b91dc1abecb7ca7e27735cad8e3cfc Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Lcarr lc...@wikimedia.org Gerrit-Reviewer: Lcarr lc...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Updated Zero ext - change (mediawiki/core)
Yurik has uploaded a new change for review. https://gerrit.wikimedia.org/r/84878 Change subject: Updated Zero ext .. Updated Zero ext Change-Id: I010dd2a051a0be5bed151fb9b14f4c3a69c1e52d --- M extensions/ZeroRatedMobileAccess 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/78/84878/1 diff --git a/extensions/ZeroRatedMobileAccess b/extensions/ZeroRatedMobileAccess index ee24d52..bb0d3d5 16 --- a/extensions/ZeroRatedMobileAccess +++ b/extensions/ZeroRatedMobileAccess -Subproject commit ee24d522591b56e7a045042ffe153d9c6c19a29b +Subproject commit bb0d3d51572a6a7a9908e33fc586b95e16d5901e -- To view, visit https://gerrit.wikimedia.org/r/84878 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I010dd2a051a0be5bed151fb9b14f4c3a69c1e52d Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: wmf/1.22wmf16 Gerrit-Owner: Yurik yu...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] php exts jobs now fetch Zuul ref via git protocol - change (integration/jenkins-job-builder-config)
jenkins-bot has submitted this change and it was merged.
Change subject: php exts jobs now fetch Zuul ref via git protocol
..
php exts jobs now fetch Zuul ref via git protocol
Jobs updated:
php-FastStringSearch-build
php-NativePreprocessor-build
php-luasandbox-build
php-wikidiff-build
php-wikidiff2-build
php-wmerrors-build
Change-Id: I4fbbc3e8fd71e14b582b81092530ca8977e5b2b3
---
M php-extensions.yaml
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Hashar: Looks good to me, approved
jenkins-bot: Verified
diff --git a/php-extensions.yaml b/php-extensions.yaml
index 44b3a2a..3d98007 100644
--- a/php-extensions.yaml
+++ b/php-extensions.yaml
@@ -1,7 +1,7 @@
- job-template:
name: 'php-{name}-build'
node: hasContintPackages # needs phpize
-defaults: use-zuul
+defaults: use-remote-zuul
triggers:
- zuul
builders:
--
To view, visit https://gerrit.wikimedia.org/r/84877
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I4fbbc3e8fd71e14b582b81092530ca8977e5b2b3
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] Allow for cancellation of deferred updates - change (mediawiki/core)
Aaron Schulz has uploaded a new change for review.
https://gerrit.wikimedia.org/r/84880
Change subject: Allow for cancellation of deferred updates
..
Allow for cancellation of deferred updates
Change-Id: I9ef88a3230028e2675b4c671d20e343f4d7e7a2b
---
M includes/DeferredUpdates.php
1 file changed, 24 insertions(+), 6 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/80/84880/1
diff --git a/includes/DeferredUpdates.php b/includes/DeferredUpdates.php
index a321414..d62fc24 100644
--- a/includes/DeferredUpdates.php
+++ b/includes/DeferredUpdates.php
@@ -39,17 +39,19 @@
* @since 1.19
*/
class DeferredUpdates {
- /**
-* Store of updates to be deferred until the end of the request.
-*/
+ /** @var Array updates to be deferred until the end of the request */
private static $updates = array();
+ /** @var integer Unique ID counter */
+ private static $counter = 0;
/**
* Add an update to the deferred list
* @param $update DeferrableUpdate Some object that implements
doUpdate()
+* @returns integer Update receipt
*/
public static function addUpdate( DeferrableUpdate $update ) {
- array_push( self::$updates, $update );
+ self::$updates[++self::$counter] = self::$updates;
+ return self::$counter;
}
/**
@@ -58,9 +60,10 @@
* @see HTMLCacheUpdate::__construct()
* @param $title
* @param $table
+* @returns integer Update receipt
*/
public static function addHTMLCacheUpdate( $title, $table ) {
- self::addUpdate( new HTMLCacheUpdate( $title, $table ) );
+ return self::addUpdate( new HTMLCacheUpdate( $title, $table ) );
}
/**
@@ -68,9 +71,24 @@
* defining a new DeferrableUpdate object is not necessary
* @see MWCallableUpdate::__construct()
* @param callable $callable
+* @returns integer Update receipt
*/
public static function addCallableUpdate( $callable ) {
- self::addUpdate( new MWCallableUpdate( $callable ) );
+ return self::addUpdate( new MWCallableUpdate( $callable ) );
+ }
+
+ /**
+* Cancel a pending deferred update
+* @param integer $id Update receipt
+* @return bool Whether an update was found
+*/
+ public static function cancelUpdate( $id ) {
+ if ( isset( self::$updates[$id] ) ) {
+ unset( self::$updates[$id] );
+ return true;
+ } else {
+ return false;
+ }
}
/**
--
To view, visit https://gerrit.wikimedia.org/r/84880
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I9ef88a3230028e2675b4c671d20e343f4d7e7a2b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz asch...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Updated Zero ext - change (mediawiki/core)
Yurik has uploaded a new change for review. https://gerrit.wikimedia.org/r/84879 Change subject: Updated Zero ext .. Updated Zero ext Change-Id: Iedf2936bb333d63804703273d04da727760c1b44 --- M extensions/ZeroRatedMobileAccess 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/79/84879/1 diff --git a/extensions/ZeroRatedMobileAccess b/extensions/ZeroRatedMobileAccess index ee24d52..bb0d3d5 16 --- a/extensions/ZeroRatedMobileAccess +++ b/extensions/ZeroRatedMobileAccess -Subproject commit ee24d522591b56e7a045042ffe153d9c6c19a29b +Subproject commit bb0d3d51572a6a7a9908e33fc586b95e16d5901e -- To view, visit https://gerrit.wikimedia.org/r/84879 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iedf2936bb333d63804703273d04da727760c1b44 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: wmf/1.22wmf17 Gerrit-Owner: Yurik yu...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
