[MediaWiki-commits] [Gerrit] integration/config[master]: Archive the SemanticMediaWiki on gerrit.wikimedia.org
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/390049 ) Change subject: Archive the SemanticMediaWiki on gerrit.wikimedia.org .. Archive the SemanticMediaWiki on gerrit.wikimedia.org Bug: T176080 Change-Id: I05d3093c42be1be40589facf4127975f2eb24190 --- M zuul/layout.yaml 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Hashar: Looks good to me, approved jenkins-bot: Verified diff --git a/zuul/layout.yaml b/zuul/layout.yaml index 8e2e364..f666fe0 100644 --- a/zuul/layout.yaml +++ b/zuul/layout.yaml @@ -6742,7 +6742,7 @@ - name: mediawiki/extensions/SemanticMediaWiki template: - - name: extension-unittests-composer-non-voting + - name: archived - name: mediawiki/extensions/SemanticPageMaker template: -- To view, visit https://gerrit.wikimedia.org/r/390049 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I05d3093c42be1be40589facf4127975f2eb24190 Gerrit-PatchSet: 1 Gerrit-Project: integration/config Gerrit-Branch: master Gerrit-Owner: Umherirrender Gerrit-Reviewer: Hashar Gerrit-Reviewer: Paladox Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] integration/config[master]: Archive the FormatNum extension on gerrit.wikimedia.org
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/390046 ) Change subject: Archive the FormatNum extension on gerrit.wikimedia.org .. Archive the FormatNum extension on gerrit.wikimedia.org Bug: T176081 Change-Id: I38497280a966312bf354b0f58f1e7db8700ab953 --- M zuul/layout.yaml 1 file changed, 1 insertion(+), 2 deletions(-) Approvals: Hashar: Looks good to me, approved jenkins-bot: Verified diff --git a/zuul/layout.yaml b/zuul/layout.yaml index 5598255..a47d997 100644 --- a/zuul/layout.yaml +++ b/zuul/layout.yaml @@ -4594,8 +4594,7 @@ - name: mediawiki/extensions/FormatNum template: - - name: extension-unittests-generic - - name: mwgate-npm + - name: archived - name: mediawiki/extensions/FormelApplet template: -- To view, visit https://gerrit.wikimedia.org/r/390046 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I38497280a966312bf354b0f58f1e7db8700ab953 Gerrit-PatchSet: 3 Gerrit-Project: integration/config Gerrit-Branch: master Gerrit-Owner: Umherirrender Gerrit-Reviewer: Hashar Gerrit-Reviewer: Paladox Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] integration/config[master]: Archive the BookManager extension
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/389979 ) Change subject: Archive the BookManager extension .. Archive the BookManager extension Bug: T180020 Change-Id: Iad74af36aac9cf6d1ab339b24ba9d202c5da5a5b --- M zuul/layout.yaml 1 file changed, 1 insertion(+), 2 deletions(-) Approvals: Umherirrender: Looks good to me, but someone else must approve Hashar: Looks good to me, approved jenkins-bot: Verified diff --git a/zuul/layout.yaml b/zuul/layout.yaml index f666fe0..5598255 100644 --- a/zuul/layout.yaml +++ b/zuul/layout.yaml @@ -2792,8 +2792,7 @@ - name: mediawiki/extensions/BookManager template: - - name: extension-unittests-non-voting - - name: mwgate-npm + - name: archived - name: mediawiki/extensions/BookManagerv2 template: -- To view, visit https://gerrit.wikimedia.org/r/389979 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iad74af36aac9cf6d1ab339b24ba9d202c5da5a5b Gerrit-PatchSet: 3 Gerrit-Project: integration/config Gerrit-Branch: master Gerrit-Owner: MarcoAurelio Gerrit-Reviewer: Hashar Gerrit-Reviewer: Paladox Gerrit-Reviewer: Umherirrender Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/software[master]: s1, s2, s5.hosts: Move db1105 to s1 and s2
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/390192 ) Change subject: s1,s2,s5.hosts: Move db1105 to s1 and s2 .. s1,s2,s5.hosts: Move db1105 to s1 and s2 db1105 will serve as a recentchanges slave in s1 and s2 Bug: T178359 Change-Id: I4f2205db26fd2c272d440b5f29e6420ba7f26613 --- M dbtools/s1.hosts M dbtools/s2.hosts M dbtools/s5.hosts 3 files changed, 2 insertions(+), 1 deletion(-) Approvals: Marostegui: Looks good to me, approved jenkins-bot: Verified diff --git a/dbtools/s1.hosts b/dbtools/s1.hosts index 529a135..32cdc7c 100644 --- a/dbtools/s1.hosts +++ b/dbtools/s1.hosts @@ -28,4 +28,5 @@ db1055.eqiad.wmnet 3306 db1051.eqiad.wmnet 3306 db1067.eqiad.wmnet 3306 +db1105.eqiad.wmnet 3311 db1052.eqiad.wmnet 3306 diff --git a/dbtools/s2.hosts b/dbtools/s2.hosts index 69501ce..ad21436 100644 --- a/dbtools/s2.hosts +++ b/dbtools/s2.hosts @@ -24,4 +24,5 @@ db1090.eqiad.wmnet 3306 db1101.eqiad.wmnet 3306 db1103.eqiad.wmnet 3312 +db1105.eqiad.wmnet 3312 db1054.eqiad.wmnet 3306 diff --git a/dbtools/s5.hosts b/dbtools/s5.hosts index 5f37b92..ae51f2a 100644 --- a/dbtools/s5.hosts +++ b/dbtools/s5.hosts @@ -32,6 +32,5 @@ db1099.eqiad.wmnet 3306 db1100.eqiad.wmnet 3306 db1104.eqiad.wmnet 3306 -db1105.eqiad.wmnet 3306 db1106.eqiad.wmnet 3306 db1063.eqiad.wmnet 3306 -- To view, visit https://gerrit.wikimedia.org/r/390192 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I4f2205db26fd2c272d440b5f29e6420ba7f26613 Gerrit-PatchSet: 1 Gerrit-Project: operations/software Gerrit-Branch: master Gerrit-Owner: Marostegui Gerrit-Reviewer: Marostegui Gerrit-Reviewer: Volans Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...ContentTranslation[master]: Bring back the overlay support for a specific screen region
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/390189 )
Change subject: Bring back the overlay support for a specific screen region
..
Bring back the overlay support for a specific screen region
Templates and template editor was using this and got
accidentally removed in I0198e67dc2bcf
This commit brings back that feature with the help of an option
fullscreen. The value for this option is by default true, since
that is the general usecase screnario.
Change-Id: Iee396e8517245ec6de2093949c8352015dadb970
Follow-up: I0198e67dc2bcf98e90293d8809aa68b18a220ffb
Bug: T179997
---
M modules/tools/ext.cx.tools.template.editor.js
M modules/tools/ext.cx.tools.template.js
M modules/widgets/overlay/ext.cx.overlay.js
M modules/widgets/overlay/ext.cx.overlay.less
4 files changed, 21 insertions(+), 2 deletions(-)
Approvals:
jenkins-bot: Verified
Nikerabbit: Checked; Looks good to me, approved
diff --git a/modules/tools/ext.cx.tools.template.editor.js
b/modules/tools/ext.cx.tools.template.editor.js
index bd98932..1876958 100644
--- a/modules/tools/ext.cx.tools.template.editor.js
+++ b/modules/tools/ext.cx.tools.template.editor.js
@@ -154,6 +154,7 @@
}
$value.cxoverlay( {
+ fullscreen: false,
showLoading: true
} );
mw.cx.wikitextToHTML( self.siteMapper, language,
value.wt ).then( function ( response ) {
@@ -291,6 +292,7 @@
// The html value is not available. We need to parse wikitext
here.
$value.cxoverlay( {
+ fullscreen: false,
showLoading: true
} );
@@ -447,6 +449,7 @@
queue = $.Deferred().resolve();
self.targetTemplate.$template.first().cxoverlay( {
+ fullscreen: false,
showLoading: true
} );
diff --git a/modules/tools/ext.cx.tools.template.js
b/modules/tools/ext.cx.tools.template.js
index 5c16214..403bd87 100644
--- a/modules/tools/ext.cx.tools.template.js
+++ b/modules/tools/ext.cx.tools.template.js
@@ -962,6 +962,7 @@
var self = this;
this.targetTemplate.$template.first().cxoverlay( {
+ fullscreen: false,
showLoading: true
} );
return this.targetTemplate.getUpdatedTemplate().then( function
( $newTemplate ) {
@@ -1146,6 +1147,7 @@
// Not a processed template. Proceed with attempt to adapt.
$targetTemplate.first().cxoverlay( {
+ fullscreen: false,
showLoading: true
} );
diff --git a/modules/widgets/overlay/ext.cx.overlay.js
b/modules/widgets/overlay/ext.cx.overlay.js
index ee852d4..f15a1e0 100644
--- a/modules/widgets/overlay/ext.cx.overlay.js
+++ b/modules/widgets/overlay/ext.cx.overlay.js
@@ -14,7 +14,7 @@
*/
function CXOverlay( element, options ) {
this.$container = $( element || 'body' );
- this.options = options || {};
+ this.options = $.extend( {}, $.fn.cxoverlay.defaults, options );
this.$overlay = null;
this.init();
}
@@ -31,6 +31,11 @@
if ( this.options.showLoading ) {
this.$overlay.append( mw.cx.widgets.spinner() );
+ }
+
+ if ( this.options.fullscreen ) {
+ this.$overlay
+ .addClass( 'cx-overlay-fullscreen' );
}
if ( this.options.closeOnClick ) {
@@ -74,4 +79,9 @@
} );
};
+ $.fn.cxoverlay.defaults = {
+ fullscreen: true,
+ closeOnClick: false,
+ showLoading: false
+ };
}( jQuery, mediaWiki ) );
diff --git a/modules/widgets/overlay/ext.cx.overlay.less
b/modules/widgets/overlay/ext.cx.overlay.less
index 34317d0..3eff7e6 100644
--- a/modules/widgets/overlay/ext.cx.overlay.less
+++ b/modules/widgets/overlay/ext.cx.overlay.less
@@ -2,7 +2,7 @@
.cx-overlay {
background-color: #fff;
- position: fixed;
+ position: absolute;
top: 0;
left: 0;
z-index: 300; // 200 is the z-index of sticky header
@@ -13,6 +13,10 @@
&--clickable {
background-color: transparent;
}
+
+ &-fullscreen {
+ position: fixed;
+ }
}
body.cx-noscroll {
--
To view, visit https://gerrit.wikimedia.org/r/390189
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iee396e8517245ec6de2093949c8352015dadb970
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ContentT
[MediaWiki-commits] [Gerrit] operations/puppet[production]: noc: restrict http access to cache_misc
Dzahn has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/390205 )
Change subject: noc: restrict http access to cache_misc
..
noc: restrict http access to cache_misc
Change-Id: Icbde97a025d68df6feb1323fc6aa0e5ec11f0cad
---
M modules/role/manifests/noc/site.pp
1 file changed, 3 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/05/390205/1
diff --git a/modules/role/manifests/noc/site.pp
b/modules/role/manifests/noc/site.pp
index 02f6e6c..eeec449 100644
--- a/modules/role/manifests/noc/site.pp
+++ b/modules/role/manifests/noc/site.pp
@@ -4,8 +4,9 @@
system::role { 'noc::site': description => 'noc.wikimedia.org' }
ferm::service { 'noc-http':
-proto => 'tcp',
-port => 'http',
+proto => 'tcp',
+port => 'http',
+srange => '$CACHE_MISC',
}
include ::noc
--
To view, visit https://gerrit.wikimedia.org/r/390205
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Icbde97a025d68df6feb1323fc6aa0e5ec11f0cad
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: smokeping: restrict http access to cache_misc
Dzahn has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/390203 )
Change subject: smokeping: restrict http access to cache_misc
..
smokeping: restrict http access to cache_misc
Change-Id: Ie1a7879a8f77d813d6529542d53e96c556132315
---
M modules/role/manifests/smokeping.pp
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/03/390203/1
diff --git a/modules/role/manifests/smokeping.pp
b/modules/role/manifests/smokeping.pp
index 702c75d..3b222fb 100644
--- a/modules/role/manifests/smokeping.pp
+++ b/modules/role/manifests/smokeping.pp
@@ -9,7 +9,7 @@
ferm::service { 'smokeping-http':
proto => 'tcp',
port => '80',
-srange => '$PRODUCTION_NETWORKS',
+srange => '$CACHE_MISC',
}
backup::set {'smokeping': }
--
To view, visit https://gerrit.wikimedia.org/r/390203
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie1a7879a8f77d813d6529542d53e96c556132315
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: rm modules/role/manifests/requesttracker/upgradetest.pp
Dzahn has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/390199 )
Change subject: rm modules/role/manifests/requesttracker/upgradetest.pp
..
rm modules/role/manifests/requesttracker/upgradetest.pp
This was a temp class to test upgrade to jessie.
It's not needed anymore.
Change-Id: If34174f02336ca81d84796ab442719d11b8232fc
---
D modules/role/manifests/requesttracker/upgradetest.pp
1 file changed, 0 insertions(+), 39 deletions(-)
Approvals:
jenkins-bot: Verified
Dzahn: Looks good to me, approved
diff --git a/modules/role/manifests/requesttracker/upgradetest.pp
b/modules/role/manifests/requesttracker/upgradetest.pp
deleted file mode 100644
index e5d453e..000
--- a/modules/role/manifests/requesttracker/upgradetest.pp
+++ /dev/null
@@ -1,39 +0,0 @@
-# temp. setup for testing RT migration to jessie
-class role::requesttracker::upgradetest {
-system::role { 'requesttracker::upgradetest': description => 'temp test
setup for RT migration to jessie' }
-
-include ::standard
-include ::base::firewall
-include rsync::server
-
-# copy db dump from slave via rsync
-$sourceip='10.64.0.20' # m1-slave.eqiad
-
-ferm::service { 'rt-db-rsync':
-proto => 'tcp',
-port => '873',
-srange => "${sourceip}/32",
-}
-
-rsync::server::module { 'rtdb':
-path=> '/srv/rt',
-read_only => 'no',
-hosts_allow => $sourceip,
-}
-
-# allow mysql connect from new jessie box
-ferm::service { 'rt-db-mysql':
-proto => 'tcp',
-port => '3306',
-srange => '208.80.154.84/32', # ununpentium
-}
-
-package { 'mariadb-server':
-ensure => 'present',
-}
-
-service { 'mysql':
-ensure => 'running',
-}
-
-}
--
To view, visit https://gerrit.wikimedia.org/r/390199
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: If34174f02336ca81d84796ab442719d11b8232fc
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn
Gerrit-Reviewer: Dzahn
Gerrit-Reviewer: Giuseppe Lavagetto
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: rm modules/role/manifests/requesttracker/upgradetest.pp
Dzahn has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/390199 )
Change subject: rm modules/role/manifests/requesttracker/upgradetest.pp
..
rm modules/role/manifests/requesttracker/upgradetest.pp
This was a temp class to test upgrade to jessie.
It's not needed anymore.
Change-Id: If34174f02336ca81d84796ab442719d11b8232fc
---
D modules/role/manifests/requesttracker/upgradetest.pp
1 file changed, 0 insertions(+), 39 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/99/390199/1
diff --git a/modules/role/manifests/requesttracker/upgradetest.pp
b/modules/role/manifests/requesttracker/upgradetest.pp
deleted file mode 100644
index e5d453e..000
--- a/modules/role/manifests/requesttracker/upgradetest.pp
+++ /dev/null
@@ -1,39 +0,0 @@
-# temp. setup for testing RT migration to jessie
-class role::requesttracker::upgradetest {
-system::role { 'requesttracker::upgradetest': description => 'temp test
setup for RT migration to jessie' }
-
-include ::standard
-include ::base::firewall
-include rsync::server
-
-# copy db dump from slave via rsync
-$sourceip='10.64.0.20' # m1-slave.eqiad
-
-ferm::service { 'rt-db-rsync':
-proto => 'tcp',
-port => '873',
-srange => "${sourceip}/32",
-}
-
-rsync::server::module { 'rtdb':
-path=> '/srv/rt',
-read_only => 'no',
-hosts_allow => $sourceip,
-}
-
-# allow mysql connect from new jessie box
-ferm::service { 'rt-db-mysql':
-proto => 'tcp',
-port => '3306',
-srange => '208.80.154.84/32', # ununpentium
-}
-
-package { 'mariadb-server':
-ensure => 'present',
-}
-
-service { 'mysql':
-ensure => 'running',
-}
-
-}
--
To view, visit https://gerrit.wikimedia.org/r/390199
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: If34174f02336ca81d84796ab442719d11b8232fc
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...ContentTranslation[master]: Fix some typos
KartikMistry has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/390195 )
Change subject: Fix some typos
..
Fix some typos
Change-Id: If5efb8c4d71d128d99c40dd38eee7aa509edf889
---
M modules/dashboard/ext.cx.dashboard.js
M modules/publish/ext.cx.publish.js
M modules/translation/ext.cx.translation.conflict.js
M modules/translation/ext.cx.translation.loader.js
M modules/translation/ext.cx.translation.storage.js
5 files changed, 5 insertions(+), 5 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ContentTranslation
refs/changes/95/390195/1
diff --git a/modules/dashboard/ext.cx.dashboard.js
b/modules/dashboard/ext.cx.dashboard.js
index 0a1c819..6755340 100644
--- a/modules/dashboard/ext.cx.dashboard.js
+++ b/modules/dashboard/ext.cx.dashboard.js
@@ -533,7 +533,7 @@
*
* @param {string} type Indicates type of language filter. Can be
'source' or 'target'
* @param {jQuery} $languageFilter DOM element of language filter
-* @param {string} language Language code retured from ULS onSelect
+* @param {string} language Language code returned from ULS onSelect
*/
CXDashboard.prototype.languageChangeHandler = function ( type,
$languageFilter, language ) {
var list = this.lists[ this.activeList ],
diff --git a/modules/publish/ext.cx.publish.js
b/modules/publish/ext.cx.publish.js
index 6855f0e..e914a32 100644
--- a/modules/publish/ext.cx.publish.js
+++ b/modules/publish/ext.cx.publish.js
@@ -328,7 +328,7 @@
// Firefox inserts in contenteditables
while clearing the content
// to keep the height and caret.
https://bugzilla.mozilla.org/show_bug.cgi?id=414223
- // It is not guaranted that the type attribute will be
present.
+ // It is not guaranteed that the type attribute will be
present.
// Remove them. But do not remove breaks from
paragraphs. They can be intentional
// line breaks.
if ( $section.is( 'h1, h2, h3, h4, h5, h6' ) ) {
diff --git a/modules/translation/ext.cx.translation.conflict.js
b/modules/translation/ext.cx.translation.conflict.js
index fe2340f..19a72f6 100644
--- a/modules/translation/ext.cx.translation.conflict.js
+++ b/modules/translation/ext.cx.translation.conflict.js
@@ -9,7 +9,7 @@
'use strict';
/**
-* Show the information about translaton conflict with a button
+* Show the information about translation conflict with a button
* to create a new translation on another topic.
*
* @param {Object} translation
diff --git a/modules/translation/ext.cx.translation.loader.js
b/modules/translation/ext.cx.translation.loader.js
index ccad754..d189c1c 100644
--- a/modules/translation/ext.cx.translation.loader.js
+++ b/modules/translation/ext.cx.translation.loader.js
@@ -242,7 +242,7 @@
// As a last resort, if we did not add orphans
immediately, add them
// now before this section.
if ( !this.originalRevision ) {
- // Dont use orphan sections unless we
are using old source article
+ // Don't use orphan sections unless we
are using old source article
continue;
}
for ( i = 0; i < orphans.length; i++ ) {
diff --git a/modules/translation/ext.cx.translation.storage.js
b/modules/translation/ext.cx.translation.storage.js
index c3dd004..a69544a 100644
--- a/modules/translation/ext.cx.translation.storage.js
+++ b/modules/translation/ext.cx.translation.storage.js
@@ -135,7 +135,7 @@
// This causes failCounter to increase because the
in-flight request fails.
// The new request we do below will either reset the
fail counter on success.
// If it does not succeed, the retry timer that was set
by the failed request
- // prevents further saves before the retry has
completed succesfully or given up.
+ // prevents further saves before the retry has
completed successfully or given up.
saveRequest.abort();
}
--
To view, visit https://gerrit.wikimedia.org/r/390195
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: If5efb8c4d71d128d99c40dd38eee7aa509edf889
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ContentTranslation
Gerrit-Branch: master
Gerrit-Owner: KartikMistry
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimed
[MediaWiki-commits] [Gerrit] mediawiki...ReadingLists[master]: Fix namespace support in readinglistentries generator
Gergő Tisza has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/390194 )
Change subject: Fix namespace support in readinglistentries generator
..
Fix namespace support in readinglistentries generator
Change-Id: Ifa837d4044911abde21e06c776edb4eda293e3cf
---
M src/Api/ApiQueryReadingListEntries.php
1 file changed, 13 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ReadingLists
refs/changes/94/390194/1
diff --git a/src/Api/ApiQueryReadingListEntries.php
b/src/Api/ApiQueryReadingListEntries.php
index ef6e9e5..ddd51c5 100644
--- a/src/Api/ApiQueryReadingListEntries.php
+++ b/src/Api/ApiQueryReadingListEntries.php
@@ -215,8 +215,19 @@
private function getResultTitle( $row ) {
$interwikiPrefix = $this->getReverseInterwikiLookup()->lookup(
$row->rle_project );
if ( is_string( $interwikiPrefix ) ) {
- // This will handle correctly the case of
$interwikiPrefix === '' as well.
- return Title::makeTitle( NS_MAIN, $row->rle_title, '',
$interwikiPrefix );
+ if ( $interwikiPrefix === '' ) {
+ $title = Title::newFromText( $row->rle_title );
+ if ( !$title ) {
+ // Validation differences between
wikis? Let's just return it as it is.
+ $title = Title::makeTitle( NS_MAIN,
$row->rle_title );
+ }
+ } else {
+ // We have no way of telling what the namespace
is, but Title does not support
+ // foreign namespaces anyway. Let's just
pretend it's in the main namespace so
+ // the prefixed title string works out as
expected.
+ $title = Title::makeTitle( NS_TALK,
$row->rle_title, '', $interwikiPrefix );
+ }
+ return $title;
} elseif ( is_array( $interwikiPrefix ) ) {
$title = implode( ':', array_slice( $interwikiPrefix, 1
) ). ':' . $row->rle_title;
$prefix = $interwikiPrefix[0];
--
To view, visit https://gerrit.wikimedia.org/r/390194
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ifa837d4044911abde21e06c776edb4eda293e3cf
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ReadingLists
Gerrit-Branch: master
Gerrit-Owner: Gergő Tisza
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: phabricator: limit http access to cache_misc
Dzahn has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/389459 ) Change subject: phabricator: limit http access to cache_misc .. phabricator: limit http access to cache_misc Change-Id: I46b706e95077f3d90d9df5587bebd5b0fda8f82c --- M modules/profile/manifests/phabricator/main.pp 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Paladox: Looks good to me, but someone else must approve 20after4: Looks good to me, but someone else must approve jenkins-bot: Verified Dzahn: Looks good to me, approved diff --git a/modules/profile/manifests/phabricator/main.pp b/modules/profile/manifests/phabricator/main.pp index 423654c..d3faa77 100644 --- a/modules/profile/manifests/phabricator/main.pp +++ b/modules/profile/manifests/phabricator/main.pp @@ -267,6 +267,7 @@ ensure => $ferm_ensure, proto => 'tcp', port => '80', +srange => '$CACHE_MISC', } # receive mail from mail smarthosts -- To view, visit https://gerrit.wikimedia.org/r/389459 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I46b706e95077f3d90d9df5587bebd5b0fda8f82c Gerrit-PatchSet: 2 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Dzahn Gerrit-Reviewer: 20after4 Gerrit-Reviewer: Dzahn Gerrit-Reviewer: Muehlenhoff Gerrit-Reviewer: Paladox Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: phabricator: drop ferm rule to open port 443
Dzahn has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/389457 )
Change subject: phabricator: drop ferm rule to open port 443
..
phabricator: drop ferm rule to open port 443
Phabricator is behind misc-web. This means we only
talk http betweeen varnish and Apache on phab servers.
Port 443 does not need to be open on phab servers.
(unless we want to be https-only on the backends in the future)
Change-Id: I7bc34e56d54d0fe80bee56899f430f93dec51787
---
M modules/profile/manifests/phabricator/main.pp
1 file changed, 0 insertions(+), 6 deletions(-)
Approvals:
Paladox: Looks good to me, but someone else must approve
20after4: Looks good to me, but someone else must approve
jenkins-bot: Verified
Dzahn: Looks good to me, approved
diff --git a/modules/profile/manifests/phabricator/main.pp
b/modules/profile/manifests/phabricator/main.pp
index 1a0bede..423654c 100644
--- a/modules/profile/manifests/phabricator/main.pp
+++ b/modules/profile/manifests/phabricator/main.pp
@@ -269,12 +269,6 @@
port => '80',
}
-ferm::service { 'phabmain_https':
-ensure => $ferm_ensure,
-proto => 'tcp',
-port => '443',
-}
-
# receive mail from mail smarthosts
ferm::service { 'phabmain-smtp':
ensure => $ferm_ensure,
--
To view, visit https://gerrit.wikimedia.org/r/389457
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I7bc34e56d54d0fe80bee56899f430f93dec51787
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn
Gerrit-Reviewer: 20after4
Gerrit-Reviewer: Dzahn
Gerrit-Reviewer: Muehlenhoff
Gerrit-Reviewer: Paladox
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/core[wmf/1.31.0-wmf.7]: Revert "resources: Remove deprecated 'jquery.placeholder' mo...
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/390191 )
Change subject: Revert "resources: Remove deprecated 'jquery.placeholder'
module"
..
Revert "resources: Remove deprecated 'jquery.placeholder' module"
This reverts commit 235e92846eb6fd132f28ec5e05240e3821542ac8.
Change-Id: Icc8c93dc6e4b5d09dc424eda5ffc9034f67128e1
---
M RELEASE-NOTES-1.31
M resources/Resources.php
A resources/src/jquery/jquery.placeholder.js
M resources/src/mediawiki.less/mediawiki.mixins.less
4 files changed, 28 insertions(+), 1 deletion(-)
Approvals:
Legoktm: Looks good to me, approved
jenkins-bot: Verified
diff --git a/RELEASE-NOTES-1.31 b/RELEASE-NOTES-1.31
index 1d1ab60..d410789 100644
--- a/RELEASE-NOTES-1.31
+++ b/RELEASE-NOTES-1.31
@@ -32,7 +32,6 @@
Removed and replaced external libraries
* The deprecated 'jquery.autoEllipsis' module was removed. Use the CSS
text-overflow property instead.
-* The deprecated 'jquery.placeholder' module was removed.
* The deprecated 'jquery.appear' module was removed. Use the
'mediawiki.viewport' module instead.
* The deprecated 'mediawiki.widgets.CategorySelector' module alias was removed.
diff --git a/resources/Resources.php b/resources/Resources.php
index ff53a12..27ebede 100644
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -288,6 +288,12 @@
'scripts' => 'resources/src/jquery/jquery.mw-jump.js',
'targets' => [ 'desktop', 'mobile' ],
],
+ 'jquery.placeholder' => [
+ 'deprecated' => 'Use of "jquery.placeholder" is deprecated
since MediaWiki 1.29.0',
+
+ 'scripts' => 'resources/src/jquery/jquery.placeholder.js',
+ 'targets' => [ 'desktop', 'mobile' ],
+ ],
'jquery.qunit' => [
'scripts' => 'resources/lib/qunitjs/qunit.js',
'styles' => 'resources/lib/qunitjs/qunit.css',
diff --git a/resources/src/jquery/jquery.placeholder.js
b/resources/src/jquery/jquery.placeholder.js
new file mode 100644
index 000..afb8837
--- /dev/null
+++ b/resources/src/jquery/jquery.placeholder.js
@@ -0,0 +1,18 @@
+/*!
+ * No-op for compatibility with code from before we used
+ * native placeholder in all supported browsers.
+ */
+
+( function ( $ ) {
+ var placeholder;
+
+ placeholder = $.fn.placeholder = function ( text ) {
+ if ( arguments.length ) {
+ this.prop( 'placeholder', text );
+ }
+ return this;
+ };
+
+ placeholder.input = placeholder.textarea = true;
+
+}( jQuery ) );
diff --git a/resources/src/mediawiki.less/mediawiki.mixins.less
b/resources/src/mediawiki.less/mediawiki.mixins.less
index ea0b959..fb3b00e 100644
--- a/resources/src/mediawiki.less/mediawiki.mixins.less
+++ b/resources/src/mediawiki.less/mediawiki.mixins.less
@@ -171,6 +171,10 @@
&::placeholder {
@rules();
}
+ // For inputs that use jquery.placeholder.js e.g. IE9
+ &.placeholder {
+ @rules();
+ }
}
/* stylelint-enable selector-no-vendor-prefix, at-rule-no-unknown */
--
To view, visit https://gerrit.wikimedia.org/r/390191
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Icc8c93dc6e4b5d09dc424eda5ffc9034f67128e1
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.31.0-wmf.7
Gerrit-Owner: Legoktm
Gerrit-Reviewer: Legoktm
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/software[master]: s1, s2, s5.hosts: Move db1105 to s1 and s2
Marostegui has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/390192 ) Change subject: s1,s2,s5.hosts: Move db1105 to s1 and s2 .. s1,s2,s5.hosts: Move db1105 to s1 and s2 db1105 will serve as a recentchanges slave in s1 and s2 Bug: T178359 Change-Id: I4f2205db26fd2c272d440b5f29e6420ba7f26613 --- M dbtools/s1.hosts M dbtools/s2.hosts M dbtools/s5.hosts 3 files changed, 2 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/software refs/changes/92/390192/1 diff --git a/dbtools/s1.hosts b/dbtools/s1.hosts index 529a135..32cdc7c 100644 --- a/dbtools/s1.hosts +++ b/dbtools/s1.hosts @@ -28,4 +28,5 @@ db1055.eqiad.wmnet 3306 db1051.eqiad.wmnet 3306 db1067.eqiad.wmnet 3306 +db1105.eqiad.wmnet 3311 db1052.eqiad.wmnet 3306 diff --git a/dbtools/s2.hosts b/dbtools/s2.hosts index 69501ce..ad21436 100644 --- a/dbtools/s2.hosts +++ b/dbtools/s2.hosts @@ -24,4 +24,5 @@ db1090.eqiad.wmnet 3306 db1101.eqiad.wmnet 3306 db1103.eqiad.wmnet 3312 +db1105.eqiad.wmnet 3312 db1054.eqiad.wmnet 3306 diff --git a/dbtools/s5.hosts b/dbtools/s5.hosts index 5f37b92..ae51f2a 100644 --- a/dbtools/s5.hosts +++ b/dbtools/s5.hosts @@ -32,6 +32,5 @@ db1099.eqiad.wmnet 3306 db1100.eqiad.wmnet 3306 db1104.eqiad.wmnet 3306 -db1105.eqiad.wmnet 3306 db1106.eqiad.wmnet 3306 db1063.eqiad.wmnet 3306 -- To view, visit https://gerrit.wikimedia.org/r/390192 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I4f2205db26fd2c272d440b5f29e6420ba7f26613 Gerrit-PatchSet: 1 Gerrit-Project: operations/software Gerrit-Branch: master Gerrit-Owner: Marostegui ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/core[wmf/1.31.0-wmf.7]: Revert "resources: Remove the deprecated 'jquery.badge' module"
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/390185 )
Change subject: Revert "resources: Remove the deprecated 'jquery.badge' module"
..
Revert "resources: Remove the deprecated 'jquery.badge' module"
This reverts commit caaae4e6db3b63985049a172060d5f9cbbe9afae.
Change-Id: I2c0c8936103313ba4979c7c303e762947823650c
---
M RELEASE-NOTES-1.31
M jsduck.json
M resources/Resources.php
A resources/src/jquery/jquery.badge.css
A resources/src/jquery/jquery.badge.js
5 files changed, 130 insertions(+), 1 deletion(-)
Approvals:
Legoktm: Looks good to me, approved
jenkins-bot: Verified
diff --git a/RELEASE-NOTES-1.31 b/RELEASE-NOTES-1.31
index 08e6109..1d1ab60 100644
--- a/RELEASE-NOTES-1.31
+++ b/RELEASE-NOTES-1.31
@@ -30,7 +30,6 @@
* …
Removed and replaced external libraries
-* (T17845) The deprecated 'jquery.badge' module was removed.
* The deprecated 'jquery.autoEllipsis' module was removed. Use the CSS
text-overflow property instead.
* The deprecated 'jquery.placeholder' module was removed.
diff --git a/jsduck.json b/jsduck.json
index 0021f37..a580c6b 100644
--- a/jsduck.json
+++ b/jsduck.json
@@ -21,6 +21,7 @@
"resources/src/mediawiki.toolbar",
"resources/src/mediawiki.widgets",
"resources/src/jquery/jquery.accessKeyLabel.js",
+ "resources/src/jquery/jquery.badge.js",
"resources/src/jquery/jquery.byteLength.js",
"resources/src/jquery/jquery.byteLimit.js",
"resources/src/jquery/jquery.checkboxShiftClick.js",
diff --git a/resources/Resources.php b/resources/Resources.php
index a16ab0e..ff53a12 100644
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -154,6 +154,12 @@
'jquery.async' => [
'scripts' => 'resources/lib/jquery/jquery.async.js',
],
+ 'jquery.badge' => [
+ 'deprecated' => 'Please use Notifications instead.',
+ 'scripts' => 'resources/src/jquery/jquery.badge.js',
+ 'styles' => 'resources/src/jquery/jquery.badge.css',
+ 'dependencies' => 'mediawiki.language',
+ ],
'jquery.byteLength' => [
'scripts' => 'resources/src/jquery/jquery.byteLength.js',
'targets' => [ 'desktop', 'mobile' ],
diff --git a/resources/src/jquery/jquery.badge.css
b/resources/src/jquery/jquery.badge.css
new file mode 100644
index 000..1157c27
--- /dev/null
+++ b/resources/src/jquery/jquery.badge.css
@@ -0,0 +1,35 @@
+.mw-badge {
+ background-color: #72777d;
+ min-width: 7px;
+ border-radius: 2px;
+ padding: 1px 4px;
+ text-align: center;
+ font-size: 12px;
+ line-height: 12px;
+ cursor: pointer;
+}
+
+.mw-badge-content {
+ font-weight: bold;
+ color: #fff;
+ vertical-align: baseline;
+}
+
+.mw-badge-inline {
+ margin-left: 3px;
+ display: inline-block;
+ /* Hack for IE6 and IE7 (T49926) */
+ zoom: 1;
+ *display: inline; /* stylelint-disable-line
declaration-block-no-duplicate-properties */
+
+}
+.mw-badge-overlay {
+ position: absolute;
+ bottom: -1px;
+ right: -3px;
+ z-index: 50;
+}
+
+.mw-badge-important {
+ background-color: #d33;
+}
diff --git a/resources/src/jquery/jquery.badge.js
b/resources/src/jquery/jquery.badge.js
new file mode 100644
index 000..40b3baf
--- /dev/null
+++ b/resources/src/jquery/jquery.badge.js
@@ -0,0 +1,88 @@
+/*!
+ * jQuery Badge plugin
+ *
+ * @license MIT
+ *
+ * @author Ryan Kaldari , 2012
+ * @author Andrew Garrett , 2012
+ * @author Marius Hoch , 2012
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to
deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * This program is distributed WITHOUT ANY WARRANTY.
+ */
+
+/**
+ * @class jQuery.plugin.badge
+ */
+( function ( $, mw ) {
+ /**
+* Put a badge on an item on the page. The badge container will be
appended to the selected element(s).
+*
+* $element.badge( text );
+* $element.badge( 5 );
+* $element.badge( '100+' );
+* $element.badge( text, inline );
+* $element.badge( 'New', true );
+*
+* @param {number|string} text The value to display in the badge. If
the value is falsey (0,
+* null, false, '', etc.), any existing badge
[MediaWiki-commits] [Gerrit] mediawiki/core[wmf/1.31.0-wmf.7]: Revert "resources: Remove deprecated 'jquery.placeholder' mo...
Legoktm has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/390191 )
Change subject: Revert "resources: Remove deprecated 'jquery.placeholder'
module"
..
Revert "resources: Remove deprecated 'jquery.placeholder' module"
This reverts commit 235e92846eb6fd132f28ec5e05240e3821542ac8.
Change-Id: Icc8c93dc6e4b5d09dc424eda5ffc9034f67128e1
---
M RELEASE-NOTES-1.31
M resources/Resources.php
A resources/src/jquery/jquery.placeholder.js
M resources/src/mediawiki.less/mediawiki.mixins.less
4 files changed, 28 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/91/390191/1
diff --git a/RELEASE-NOTES-1.31 b/RELEASE-NOTES-1.31
index 08e6109..9034a5a 100644
--- a/RELEASE-NOTES-1.31
+++ b/RELEASE-NOTES-1.31
@@ -33,7 +33,6 @@
* (T17845) The deprecated 'jquery.badge' module was removed.
* The deprecated 'jquery.autoEllipsis' module was removed. Use the CSS
text-overflow property instead.
-* The deprecated 'jquery.placeholder' module was removed.
* The deprecated 'jquery.appear' module was removed. Use the
'mediawiki.viewport' module instead.
* The deprecated 'mediawiki.widgets.CategorySelector' module alias was removed.
diff --git a/resources/Resources.php b/resources/Resources.php
index a16ab0e..17fa2a1 100644
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -282,6 +282,12 @@
'scripts' => 'resources/src/jquery/jquery.mw-jump.js',
'targets' => [ 'desktop', 'mobile' ],
],
+ 'jquery.placeholder' => [
+ 'deprecated' => 'Use of "jquery.placeholder" is deprecated
since MediaWiki 1.29.0',
+
+ 'scripts' => 'resources/src/jquery/jquery.placeholder.js',
+ 'targets' => [ 'desktop', 'mobile' ],
+ ],
'jquery.qunit' => [
'scripts' => 'resources/lib/qunitjs/qunit.js',
'styles' => 'resources/lib/qunitjs/qunit.css',
diff --git a/resources/src/jquery/jquery.placeholder.js
b/resources/src/jquery/jquery.placeholder.js
new file mode 100644
index 000..afb8837
--- /dev/null
+++ b/resources/src/jquery/jquery.placeholder.js
@@ -0,0 +1,18 @@
+/*!
+ * No-op for compatibility with code from before we used
+ * native placeholder in all supported browsers.
+ */
+
+( function ( $ ) {
+ var placeholder;
+
+ placeholder = $.fn.placeholder = function ( text ) {
+ if ( arguments.length ) {
+ this.prop( 'placeholder', text );
+ }
+ return this;
+ };
+
+ placeholder.input = placeholder.textarea = true;
+
+}( jQuery ) );
diff --git a/resources/src/mediawiki.less/mediawiki.mixins.less
b/resources/src/mediawiki.less/mediawiki.mixins.less
index ea0b959..fb3b00e 100644
--- a/resources/src/mediawiki.less/mediawiki.mixins.less
+++ b/resources/src/mediawiki.less/mediawiki.mixins.less
@@ -171,6 +171,10 @@
&::placeholder {
@rules();
}
+ // For inputs that use jquery.placeholder.js e.g. IE9
+ &.placeholder {
+ @rules();
+ }
}
/* stylelint-enable selector-no-vendor-prefix, at-rule-no-unknown */
--
To view, visit https://gerrit.wikimedia.org/r/390191
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Icc8c93dc6e4b5d09dc424eda5ffc9034f67128e1
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.31.0-wmf.7
Gerrit-Owner: Legoktm
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Revert "resources: Remove deprecated 'jquery.placeholder' mo...
Legoktm has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/390190 )
Change subject: Revert "resources: Remove deprecated 'jquery.placeholder'
module"
..
Revert "resources: Remove deprecated 'jquery.placeholder' module"
This reverts commit 235e92846eb6fd132f28ec5e05240e3821542ac8.
Change-Id: Icc8c93dc6e4b5d09dc424eda5ffc9034f67128e1
---
M RELEASE-NOTES-1.31
M resources/Resources.php
A resources/src/jquery/jquery.placeholder.js
M resources/src/mediawiki.less/mediawiki.mixins.less
4 files changed, 28 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/90/390190/1
diff --git a/RELEASE-NOTES-1.31 b/RELEASE-NOTES-1.31
index 09f0dc9..0544d59 100644
--- a/RELEASE-NOTES-1.31
+++ b/RELEASE-NOTES-1.31
@@ -32,7 +32,6 @@
Removed and replaced external libraries
* The deprecated 'jquery.autoEllipsis' module was removed. Use the CSS
text-overflow property instead.
-* The deprecated 'jquery.placeholder' module was removed.
* The deprecated 'jquery.appear' module was removed. Use the
'mediawiki.viewport' module instead.
* The deprecated 'mediawiki.widgets.CategorySelector' module alias was removed.
diff --git a/resources/Resources.php b/resources/Resources.php
index 81e0f02..e2065cb 100644
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -288,6 +288,12 @@
'scripts' => 'resources/src/jquery/jquery.mw-jump.js',
'targets' => [ 'desktop', 'mobile' ],
],
+ 'jquery.placeholder' => [
+ 'deprecated' => 'Use of "jquery.placeholder" is deprecated
since MediaWiki 1.29.0',
+
+ 'scripts' => 'resources/src/jquery/jquery.placeholder.js',
+ 'targets' => [ 'desktop', 'mobile' ],
+ ],
'jquery.qunit' => [
'scripts' => 'resources/lib/qunitjs/qunit.js',
'styles' => 'resources/lib/qunitjs/qunit.css',
diff --git a/resources/src/jquery/jquery.placeholder.js
b/resources/src/jquery/jquery.placeholder.js
new file mode 100644
index 000..afb8837
--- /dev/null
+++ b/resources/src/jquery/jquery.placeholder.js
@@ -0,0 +1,18 @@
+/*!
+ * No-op for compatibility with code from before we used
+ * native placeholder in all supported browsers.
+ */
+
+( function ( $ ) {
+ var placeholder;
+
+ placeholder = $.fn.placeholder = function ( text ) {
+ if ( arguments.length ) {
+ this.prop( 'placeholder', text );
+ }
+ return this;
+ };
+
+ placeholder.input = placeholder.textarea = true;
+
+}( jQuery ) );
diff --git a/resources/src/mediawiki.less/mediawiki.mixins.less
b/resources/src/mediawiki.less/mediawiki.mixins.less
index ea0b959..fb3b00e 100644
--- a/resources/src/mediawiki.less/mediawiki.mixins.less
+++ b/resources/src/mediawiki.less/mediawiki.mixins.less
@@ -171,6 +171,10 @@
&::placeholder {
@rules();
}
+ // For inputs that use jquery.placeholder.js e.g. IE9
+ &.placeholder {
+ @rules();
+ }
}
/* stylelint-enable selector-no-vendor-prefix, at-rule-no-unknown */
--
To view, visit https://gerrit.wikimedia.org/r/390190
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Icc8c93dc6e4b5d09dc424eda5ffc9034f67128e1
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Legoktm
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...ContentTranslation[master]: Bring back the overlay support for a specific screen region
Santhosh has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/390189 )
Change subject: Bring back the overlay support for a specific screen region
..
Bring back the overlay support for a specific screen region
Templates and template editor was using this and got
accidentally removed in I0198e67dc2bcf
This commit brings back that feature with the help of an option
fullscreen. The value for this option is by default true, since
that is the general usecase screnario.
Change-Id: Iee396e8517245ec6de2093949c8352015dadb970
Follow-up: I0198e67dc2bcf98e90293d8809aa68b18a220ffb
Bug: T179997
---
M modules/tools/ext.cx.tools.template.editor.js
M modules/tools/ext.cx.tools.template.js
M modules/widgets/overlay/ext.cx.overlay.js
M modules/widgets/overlay/ext.cx.overlay.less
4 files changed, 21 insertions(+), 2 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ContentTranslation
refs/changes/89/390189/1
diff --git a/modules/tools/ext.cx.tools.template.editor.js
b/modules/tools/ext.cx.tools.template.editor.js
index bd98932..1876958 100644
--- a/modules/tools/ext.cx.tools.template.editor.js
+++ b/modules/tools/ext.cx.tools.template.editor.js
@@ -154,6 +154,7 @@
}
$value.cxoverlay( {
+ fullscreen: false,
showLoading: true
} );
mw.cx.wikitextToHTML( self.siteMapper, language,
value.wt ).then( function ( response ) {
@@ -291,6 +292,7 @@
// The html value is not available. We need to parse wikitext
here.
$value.cxoverlay( {
+ fullscreen: false,
showLoading: true
} );
@@ -447,6 +449,7 @@
queue = $.Deferred().resolve();
self.targetTemplate.$template.first().cxoverlay( {
+ fullscreen: false,
showLoading: true
} );
diff --git a/modules/tools/ext.cx.tools.template.js
b/modules/tools/ext.cx.tools.template.js
index 5c16214..403bd87 100644
--- a/modules/tools/ext.cx.tools.template.js
+++ b/modules/tools/ext.cx.tools.template.js
@@ -962,6 +962,7 @@
var self = this;
this.targetTemplate.$template.first().cxoverlay( {
+ fullscreen: false,
showLoading: true
} );
return this.targetTemplate.getUpdatedTemplate().then( function
( $newTemplate ) {
@@ -1146,6 +1147,7 @@
// Not a processed template. Proceed with attempt to adapt.
$targetTemplate.first().cxoverlay( {
+ fullscreen: false,
showLoading: true
} );
diff --git a/modules/widgets/overlay/ext.cx.overlay.js
b/modules/widgets/overlay/ext.cx.overlay.js
index ee852d4..f15a1e0 100644
--- a/modules/widgets/overlay/ext.cx.overlay.js
+++ b/modules/widgets/overlay/ext.cx.overlay.js
@@ -14,7 +14,7 @@
*/
function CXOverlay( element, options ) {
this.$container = $( element || 'body' );
- this.options = options || {};
+ this.options = $.extend( {}, $.fn.cxoverlay.defaults, options );
this.$overlay = null;
this.init();
}
@@ -31,6 +31,11 @@
if ( this.options.showLoading ) {
this.$overlay.append( mw.cx.widgets.spinner() );
+ }
+
+ if ( this.options.fullscreen ) {
+ this.$overlay
+ .addClass( 'cx-overlay-fullscreen' );
}
if ( this.options.closeOnClick ) {
@@ -74,4 +79,9 @@
} );
};
+ $.fn.cxoverlay.defaults = {
+ fullscreen: true,
+ closeOnClick: false,
+ showLoading: false
+ };
}( jQuery, mediaWiki ) );
diff --git a/modules/widgets/overlay/ext.cx.overlay.less
b/modules/widgets/overlay/ext.cx.overlay.less
index 34317d0..3eff7e6 100644
--- a/modules/widgets/overlay/ext.cx.overlay.less
+++ b/modules/widgets/overlay/ext.cx.overlay.less
@@ -2,7 +2,7 @@
.cx-overlay {
background-color: #fff;
- position: fixed;
+ position: absolute;
top: 0;
left: 0;
z-index: 300; // 200 is the z-index of sticky header
@@ -13,6 +13,10 @@
&--clickable {
background-color: transparent;
}
+
+ &-fullscreen {
+ position: fixed;
+ }
}
body.cx-noscroll {
--
To view, visit https://gerrit.wikimedia.org/r/390189
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iee396e8517245ec6de2093949c8352015dadb970
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/ex
[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Adjust throttle.php
TerraCodes has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/390188 ) Change subject: Adjust throttle.php .. Adjust throttle.php Bug: T180046 Change-Id: I8f93b322aa388d7e9e8d22cc13d244f2ae83e466 --- M wmf-config/throttle.php 1 file changed, 8 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/88/390188/1 diff --git a/wmf-config/throttle.php b/wmf-config/throttle.php index 5315b4c..6add1bb 100644 --- a/wmf-config/throttle.php +++ b/wmf-config/throttle.php @@ -36,4 +36,12 @@ 'value' => 50, ]; +$wmgThrottlingExceptions[] = [ //T180046 + 'from' => '2017-11-11T07:00 -0:00', + 'to' => '2017-12-11T19:00 -0:00', + 'range' => '172.18.158.75/27', + 'dbname' => [ 'dewiki' ], + 'value' => 35, //30 expected +]; + ## Add throttling definitions above. -- To view, visit https://gerrit.wikimedia.org/r/390188 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I8f93b322aa388d7e9e8d22cc13d244f2ae83e466 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: TerraCodes ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Vector[master]: VectorTemplate: Some consistency in mixed PHP/HTML formatting
Krinkle has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/390186 )
Change subject: VectorTemplate: Some consistency in mixed PHP/HTML formatting
..
VectorTemplate: Some consistency in mixed PHP/HTML formatting
Consistently do the following in this file:
* Open '
-
data['sitenotice'] ) {
?>
@@ -137,7 +136,6 @@
msg( 'navigation-heading' ) ?>
-
renderNavigation( 'PERSONAL' ); ?>
@@ -158,42 +156,42 @@
html(
'userlangattributes' ) ?>>
getFooterLinks() as $category =>
$links ) {
- ?>
+ foreach ( $this->getFooterLinks() as $category
=> $links ) {
+ ?>
-
- html( $link ) ?>
-
+ html( $link ) ?>
+
+ ?>
getFooterIcons( 'icononly'
);
if ( count( $footericons ) > 0 ) {
?>
-
$footerIcons ) {
- ?>
-
- getSkin()->makeFooterIcon( $icon );
- }
- ?>
-
+ ?>
+
getSkin()->makeFooterIcon( $icon );
+ }
?>
+
+
-
+
printTrail(); ?>
@@ -266,9 +264,8 @@
html( 'userlangattributes' ) ?>
id=''>exists() ?
$msgObj->text() : $msg );
?>
-
-
@@ -290,7 +287,7 @@
}
$this->renderAfterPortlet( $name );
- ?>
+ ?>
"
aria-labelledby="p-namespaces-label">
msg( 'namespaces' ) ?>
html(
'userlangattributes' ) ?>>
- data['namespace_urls'] as $key => $item ) {
- echo
"\t\t\t\t\t\t\t" . $this->makeListItem( $key, $item, [
+ echo
$this->makeListItem( $key, $item, [
'vector-wrap' => true,
- ] ) . "\n";
+ ] );
}
- ?>
+ ?>
" aria-labelledby="p-variants-label">
getMsg(
'variants' )->text();
- foreach (
$this->data['variant_urls'] as $item ) {
- if ( isset(
$item['class'] ) && stripos( $item['class'], 'selected' ) !== false ) {
- $variantLabel =
$item['text'];
- break;
+ // Replace the label
with the name of currently chosen variant, if any
+ $variantLabel =
$this->getMsg( 'variants' )->text();
+ foreach (
$this->data['variant_urls'] as $item ) {
+ if ( isset(
$item['class'] ) && s
[MediaWiki-commits] [Gerrit] mediawiki...Vector[master]: VectorTemplate: Refactor literal HTML by using Html methods ...
Krinkle has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/390187 )
Change subject: VectorTemplate: Refactor literal HTML by using Html methods
instead
..
VectorTemplate: Refactor literal HTML by using Html methods instead
To some degree the literal HTML was (maybe) useful and self-documenting
at some point when the template was really simple, but until and unless
we really use an Html template for this, it's probably a lot easier to
maintain, understand and review (incl. from security perspective) if
we consistently use the Html class abstraction.
For now, I'm only focussing on cases where there is mixed literal HTML
with embedded PHP statements. The cases where HTML is created plain without
embedded PHP I'm leaving untouched for now.
Any case where attribute or content comes from PHP, use the Html class
instead to clearly indicate which values are escaped, and which are not.
Change-Id: Ib2d6425994918b0c17ef29c1b5d0f9893f61a889
---
M VectorTemplate.php
1 file changed, 34 insertions(+), 22 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/Vector
refs/changes/87/390187/1
diff --git a/VectorTemplate.php b/VectorTemplate.php
index 74aa3b7..247a5a2 100644
--- a/VectorTemplate.php
+++ b/VectorTemplate.php
@@ -61,30 +61,40 @@
data['sitenotice'] ) {
- ?>
- html( 'sitenotice' ) ?>
-'mw-body-content' ],
+ // Raw HTML
+ $this->get( 'sitenotice' )
+ );
}
- ?>
- getIndicators();
}
// Loose comparison with '!=' is intentional, to catch
null and false too, but not '0'
if ( $this->data['title'] != '' ) {
+ echo Html::rawElement( 'h1',
+ [
+ 'id' => 'firstHeading',
+ 'class' => 'firstHeading',
+ 'lang' => $this->get(
'pageLanguage' ),
+ ],
+ // Raw HTML
+ $this->get( 'title' )
+ );
+ }
+
+ $this->html( 'prebodyhtml' );
?>
- html( 'title' )
- ?>
-
- html( 'prebodyhtml' ) ?>
data['isarticle'] ) {
- ?>
- msg( 'tagline' ) ?>
-'siteSub',
+ 'class' => 'noprint',
+ ],
+ $this->getMsg( 'tagline'
)->text()
+ );
}
?>
html(
'userlangattributes' ) ?>>
data['undelete'] ) {
- ?>
- html( 'undelete' ) ?>
-'contentSub2' ],
+ // Raw HTML
+ $this->get( 'undelete' )
+ );
}
- ?>
- data['newtalk'] ) {
- ?>
- html( 'newtalk' ) ?>
-'usermessage' ],
+ // Raw HTML
+ $this->get( 'newtalk' )
+ );
}
?>
--
To view, visit https://gerrit.wikimedia.org/r/390187
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib2d6425994918b0c17ef29c1b5d0f9893f61a889
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/Vector
Gerrit-Branch: master
Gerrit-Owner: Krinkle
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/core[wmf/1.31.0-wmf.7]: Revert "resources: Remove the deprecated 'jquery.badge' module"
Legoktm has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/390185 )
Change subject: Revert "resources: Remove the deprecated 'jquery.badge' module"
..
Revert "resources: Remove the deprecated 'jquery.badge' module"
This reverts commit caaae4e6db3b63985049a172060d5f9cbbe9afae.
Change-Id: I2c0c8936103313ba4979c7c303e762947823650c
---
M RELEASE-NOTES-1.31
M jsduck.json
M resources/Resources.php
A resources/src/jquery/jquery.badge.css
A resources/src/jquery/jquery.badge.js
5 files changed, 130 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/85/390185/1
diff --git a/RELEASE-NOTES-1.31 b/RELEASE-NOTES-1.31
index 08e6109..1d1ab60 100644
--- a/RELEASE-NOTES-1.31
+++ b/RELEASE-NOTES-1.31
@@ -30,7 +30,6 @@
* …
Removed and replaced external libraries
-* (T17845) The deprecated 'jquery.badge' module was removed.
* The deprecated 'jquery.autoEllipsis' module was removed. Use the CSS
text-overflow property instead.
* The deprecated 'jquery.placeholder' module was removed.
diff --git a/jsduck.json b/jsduck.json
index 0021f37..a580c6b 100644
--- a/jsduck.json
+++ b/jsduck.json
@@ -21,6 +21,7 @@
"resources/src/mediawiki.toolbar",
"resources/src/mediawiki.widgets",
"resources/src/jquery/jquery.accessKeyLabel.js",
+ "resources/src/jquery/jquery.badge.js",
"resources/src/jquery/jquery.byteLength.js",
"resources/src/jquery/jquery.byteLimit.js",
"resources/src/jquery/jquery.checkboxShiftClick.js",
diff --git a/resources/Resources.php b/resources/Resources.php
index a16ab0e..ff53a12 100644
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -154,6 +154,12 @@
'jquery.async' => [
'scripts' => 'resources/lib/jquery/jquery.async.js',
],
+ 'jquery.badge' => [
+ 'deprecated' => 'Please use Notifications instead.',
+ 'scripts' => 'resources/src/jquery/jquery.badge.js',
+ 'styles' => 'resources/src/jquery/jquery.badge.css',
+ 'dependencies' => 'mediawiki.language',
+ ],
'jquery.byteLength' => [
'scripts' => 'resources/src/jquery/jquery.byteLength.js',
'targets' => [ 'desktop', 'mobile' ],
diff --git a/resources/src/jquery/jquery.badge.css
b/resources/src/jquery/jquery.badge.css
new file mode 100644
index 000..1157c27
--- /dev/null
+++ b/resources/src/jquery/jquery.badge.css
@@ -0,0 +1,35 @@
+.mw-badge {
+ background-color: #72777d;
+ min-width: 7px;
+ border-radius: 2px;
+ padding: 1px 4px;
+ text-align: center;
+ font-size: 12px;
+ line-height: 12px;
+ cursor: pointer;
+}
+
+.mw-badge-content {
+ font-weight: bold;
+ color: #fff;
+ vertical-align: baseline;
+}
+
+.mw-badge-inline {
+ margin-left: 3px;
+ display: inline-block;
+ /* Hack for IE6 and IE7 (T49926) */
+ zoom: 1;
+ *display: inline; /* stylelint-disable-line
declaration-block-no-duplicate-properties */
+
+}
+.mw-badge-overlay {
+ position: absolute;
+ bottom: -1px;
+ right: -3px;
+ z-index: 50;
+}
+
+.mw-badge-important {
+ background-color: #d33;
+}
diff --git a/resources/src/jquery/jquery.badge.js
b/resources/src/jquery/jquery.badge.js
new file mode 100644
index 000..40b3baf
--- /dev/null
+++ b/resources/src/jquery/jquery.badge.js
@@ -0,0 +1,88 @@
+/*!
+ * jQuery Badge plugin
+ *
+ * @license MIT
+ *
+ * @author Ryan Kaldari , 2012
+ * @author Andrew Garrett , 2012
+ * @author Marius Hoch , 2012
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to
deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * This program is distributed WITHOUT ANY WARRANTY.
+ */
+
+/**
+ * @class jQuery.plugin.badge
+ */
+( function ( $, mw ) {
+ /**
+* Put a badge on an item on the page. The badge container will be
appended to the selected element(s).
+*
+* $element.badge( text );
+* $element.badge( 5 );
+* $element.badge( '100+' );
+* $element.badge( text, inline );
+* $element.badge( 'New', true );
+*
+* @param {number|string} text The value to display in the badge. If
the value is falsey (0,
+* null, false, '', etc.), any existing badge w
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Revert "resources: Remove the deprecated 'jquery.badge' module"
Hello Krinkle, jenkins-bot, Jforrester, Kaldari,
I'd like you to do a code review. Please visit
https://gerrit.wikimedia.org/r/390184
to review the following change.
Change subject: Revert "resources: Remove the deprecated 'jquery.badge' module"
..
Revert "resources: Remove the deprecated 'jquery.badge' module"
This reverts commit caaae4e6db3b63985049a172060d5f9cbbe9afae.
Change-Id: I2c0c8936103313ba4979c7c303e762947823650c
---
M RELEASE-NOTES-1.31
M jsduck.json
M resources/Resources.php
A resources/src/jquery/jquery.badge.css
A resources/src/jquery/jquery.badge.js
5 files changed, 130 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/84/390184/1
diff --git a/RELEASE-NOTES-1.31 b/RELEASE-NOTES-1.31
index 86d887b..042af6e 100644
--- a/RELEASE-NOTES-1.31
+++ b/RELEASE-NOTES-1.31
@@ -28,7 +28,6 @@
* …
Removed and replaced external libraries
-* (T17845) The deprecated 'jquery.badge' module was removed.
* …
=== Bug fixes in 1.31 ===
diff --git a/jsduck.json b/jsduck.json
index 0f8daf8..7e59432 100644
--- a/jsduck.json
+++ b/jsduck.json
@@ -22,6 +22,7 @@
"resources/src/mediawiki.widgets",
"resources/src/jquery/jquery.accessKeyLabel.js",
"resources/src/jquery/jquery.autoEllipsis.js",
+ "resources/src/jquery/jquery.badge.js",
"resources/src/jquery/jquery.byteLength.js",
"resources/src/jquery/jquery.byteLimit.js",
"resources/src/jquery/jquery.checkboxShiftClick.js",
diff --git a/resources/Resources.php b/resources/Resources.php
index ca24922..b9986fe 100644
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -164,6 +164,12 @@
'dependencies' => 'jquery.highlightText',
'targets' => [ 'desktop', 'mobile' ],
],
+ 'jquery.badge' => [
+ 'deprecated' => 'Please use Notifications instead.',
+ 'scripts' => 'resources/src/jquery/jquery.badge.js',
+ 'styles' => 'resources/src/jquery/jquery.badge.css',
+ 'dependencies' => 'mediawiki.language',
+ ],
'jquery.byteLength' => [
'scripts' => 'resources/src/jquery/jquery.byteLength.js',
'targets' => [ 'desktop', 'mobile' ],
diff --git a/resources/src/jquery/jquery.badge.css
b/resources/src/jquery/jquery.badge.css
new file mode 100644
index 000..1157c27
--- /dev/null
+++ b/resources/src/jquery/jquery.badge.css
@@ -0,0 +1,35 @@
+.mw-badge {
+ background-color: #72777d;
+ min-width: 7px;
+ border-radius: 2px;
+ padding: 1px 4px;
+ text-align: center;
+ font-size: 12px;
+ line-height: 12px;
+ cursor: pointer;
+}
+
+.mw-badge-content {
+ font-weight: bold;
+ color: #fff;
+ vertical-align: baseline;
+}
+
+.mw-badge-inline {
+ margin-left: 3px;
+ display: inline-block;
+ /* Hack for IE6 and IE7 (T49926) */
+ zoom: 1;
+ *display: inline; /* stylelint-disable-line
declaration-block-no-duplicate-properties */
+
+}
+.mw-badge-overlay {
+ position: absolute;
+ bottom: -1px;
+ right: -3px;
+ z-index: 50;
+}
+
+.mw-badge-important {
+ background-color: #d33;
+}
diff --git a/resources/src/jquery/jquery.badge.js
b/resources/src/jquery/jquery.badge.js
new file mode 100644
index 000..40b3baf
--- /dev/null
+++ b/resources/src/jquery/jquery.badge.js
@@ -0,0 +1,88 @@
+/*!
+ * jQuery Badge plugin
+ *
+ * @license MIT
+ *
+ * @author Ryan Kaldari , 2012
+ * @author Andrew Garrett , 2012
+ * @author Marius Hoch , 2012
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to
deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * This program is distributed WITHOUT ANY WARRANTY.
+ */
+
+/**
+ * @class jQuery.plugin.badge
+ */
+( function ( $, mw ) {
+ /**
+* Put a badge on an item on the page. The badge container will be
appended to the selected element(s).
+*
+* $element.badge( text );
+* $element.badge( 5 );
+* $element.badge( '100+' );
+* $element.badge( text, inline );
+* $element.badge( 'New', true );
+*
+* @param {number|string} text The value to display in the badge. If
the value is falsey (0,
+* null, false, '', etc.), any existing badge will be removed.
+
[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Add BP and WP as aliases to project namespace
Jayprakash12345 has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/390183 ) Change subject: Add BP and WP as aliases to project namespace .. Add BP and WP as aliases to project namespace Change-Id: Ic4340be04cda48088376a6cd2679b287516eea7b --- M wmf-config/InitialiseSettings.php 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/83/390183/2 diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index e4f80fb..cd36f93 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -4015,6 +4015,8 @@ ], '+mwlwiki' => [ 'Wikipedia_cumbersa' => NS_PROJECT_TALK, + 'WP' => NS_PROJECT, // T180052 + 'BP' => NS_PROJECT, // T180052 ], '+mywiki' => [ 'WP' => NS_PROJECT, // T119807 -- To view, visit https://gerrit.wikimedia.org/r/390183 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic4340be04cda48088376a6cd2679b287516eea7b Gerrit-PatchSet: 2 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Jayprakash12345 <0freerunn...@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] operations/mediawiki-config[master]: Enable the SandboxLink extension in the Mirandese Wikipedia ...
Jayprakash12345 has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/390182 ) Change subject: Enable the SandboxLink extension in the Mirandese Wikipedia (Third Req) .. Enable the SandboxLink extension in the Mirandese Wikipedia (Third Req) Change-Id: I0a76dadd017589772db412454bd62770d95731dd --- M wmf-config/InitialiseSettings.php 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/82/390182/2 diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index e4f80fb..aa43455 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -13469,6 +13469,7 @@ 'lvwiki' => true, 'maiwiki' => true, 'minwiki' => true, + 'mwlwiki' => true, // T180052 'newiki' => true, 'nlwiki' => true, 'nlwikinews' => true, // T177170 -- To view, visit https://gerrit.wikimedia.org/r/390182 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I0a76dadd017589772db412454bd62770d95731dd Gerrit-PatchSet: 2 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Jayprakash12345 <0freerunn...@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] oojs/ui[master]: README: Add "Community" section
Prtksxna has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/390181 ) Change subject: README: Add "Community" section .. README: Add "Community" section Bug: T179111 Change-Id: Ic63bdaa25f2922d5345da2ad4f1a2d61b62d87a2 --- M README.md 1 file changed, 10 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/81/390181/1 diff --git a/README.md b/README.md index de5ac94..5433135 100644 --- a/README.md +++ b/README.md @@ -78,6 +78,16 @@ A new version of the library is released most weeks on Tuesdays. +Community +- + +Get updates, ask questions and join the discussion with maintainers and contributors. + +* Join the Wikimedia Developers mailing list, [wikitech-l](https://lists.wikimedia.org/mailman/listinfo/wikitech-l). +* Chat with the contributors on `#wikimedia-dev` on `irc.freenode.net`. +* Ask questions on [StackOverflow](https://stackoverflow.com/tags/oojs-ui/info). +* Watchlist the [documentation](https://www.mediawiki.org/wiki/OOjs_UI) on Mediawiki to stay updated. + Versioning -- -- To view, visit https://gerrit.wikimedia.org/r/390181 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic63bdaa25f2922d5345da2ad4f1a2d61b62d87a2 Gerrit-PatchSet: 1 Gerrit-Project: oojs/ui Gerrit-Branch: master Gerrit-Owner: Prtksxna ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...PropertySuggester[master]: Use MediaWiki autoloader
Legoktm has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/390180 )
Change subject: Use MediaWiki autoloader
..
Use MediaWiki autoloader
The maintenance script does not need to be autoloaded, so it was not migrated
to extension.json.
Bug: T180063
Change-Id: Ib4768e1370a3b7cf44576ed760f49540adca5501
---
M composer.json
M extension.json
2 files changed, 14 insertions(+), 10 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/PropertySuggester
refs/changes/80/390180/1
diff --git a/composer.json b/composer.json
index a073eb7..851f533 100644
--- a/composer.json
+++ b/composer.json
@@ -23,16 +23,6 @@
"wikimedia/testing-access-wrapper": "~1.0",
"mediawiki/minus-x": "0.2.0"
},
- "autoload": {
- "psr-4": {
- "PropertySuggester\\": "src/PropertySuggester/"
- },
- "files": [],
- "classmap": [
- "PropertySuggesterHooks.php",
- "maintenance/UpdateTable.php"
- ]
- },
"scripts": {
"fix": [
"phpcbf",
diff --git a/extension.json b/extension.json
index a57237e..3e5423e 100644
--- a/extension.json
+++ b/extension.json
@@ -11,6 +11,20 @@
"descriptionmsg": "propertysuggester-desc",
"license-name": "GPL-2.0+",
"type": "wikibase",
+ "AutoloadClasses": {
+ "PropertySuggester\\PropertySuggesterHooks":
"PropertySuggesterHooks.php",
+ "PropertySuggester\\GetSuggestions":
"src/PropertySuggestor/GetSuggestions.php",
+ "PropertySuggester\\ResultBuilder":
"src/PropertySuggestor/ResultBuilder.php",
+ "PropertySuggester\\SuggesterParamsParser":
"src/PropertySuggestor/SuggesterParamsParser.php",
+ "PropertySuggester\\SuggesterParams":
"src/PropertySuggestor/SuggesterParams.php",
+ "PropertySuggester\\SuggestionGenerator":
"src/PropertySuggestor/SuggestionGenerator.php",
+ "PropertySuggester\\Suggesters\\SimpleSuggester":
"src/PropertySuggestor/Suggestors/SimpleSuggester.php",
+ "PropertySuggester\\Suggesters\\SuggesterEngine":
"src/PropertySuggestor/Suggestors/SuggesterEngine.php",
+ "PropertySuggester\\Suggesters\\Suggestion":
"src/PropertySuggestor/Suggestors/Suggestion.php",
+ "PropertySuggester\\UpdateTable\\ImportContext":
"src/PropertySuggestor/UpdateTable/ImportContext.php",
+ "PropertySuggester\\UpdateTable\\Importer\\BasicImporter":
"src/PropertySuggestor/UpdateTable/Importer/BasicImporter.php",
+ "PropertySuggester\\UpdateTable\\Importer\\Importer":
"src/PropertySuggestor/UpdateTable/Importer/Importer.php"
+ },
"APIModules": {
"wbsgetsuggestions": "PropertySuggester\\GetSuggestions"
},
--
To view, visit https://gerrit.wikimedia.org/r/390180
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib4768e1370a3b7cf44576ed760f49540adca5501
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/PropertySuggester
Gerrit-Branch: master
Gerrit-Owner: Legoktm
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...WikimediaBadges[master]: Use MediaWiki autoloader for two hook handler classes
Legoktm has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/390179 )
Change subject: Use MediaWiki autoloader for two hook handler classes
..
Use MediaWiki autoloader for two hook handler classes
Bug: T180061
Change-Id: I7b583d8f181a8e787f4a6b58fc75899a13a8cc0f
---
M composer.json
M extension.json
2 files changed, 4 insertions(+), 5 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikimediaBadges
refs/changes/79/390179/1
diff --git a/composer.json b/composer.json
index fe7888f..848c405 100644
--- a/composer.json
+++ b/composer.json
@@ -23,11 +23,6 @@
"require": {
"php": ">=5.5.9"
},
- "autoload": {
- "psr-4": {
- "WikimediaBadges\\": "includes/"
- }
- },
"require-dev": {
"jakub-onderka/php-parallel-lint": "0.9.2",
"jakub-onderka/php-console-highlighter": "0.3.2",
diff --git a/extension.json b/extension.json
index ef51b71..829f367 100644
--- a/extension.json
+++ b/extension.json
@@ -14,6 +14,10 @@
"i18n"
]
},
+ "AutoloadClasses": {
+ "WikimediaBadges\\BeforePageDisplayHookHandler":
"includes/BeforePageDisplayHookHandler.php",
+ "WikimediaBadges\\OtherProjectsSidebarHookHandler":
"includes/OtherProjectsSidebarHookHandler.php"
+ },
"ResourceModules": {
"ext.wikimediaBadges": {
"position": "bottom",
--
To view, visit https://gerrit.wikimedia.org/r/390179
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I7b583d8f181a8e787f4a6b58fc75899a13a8cc0f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikimediaBadges
Gerrit-Branch: master
Gerrit-Owner: Legoktm
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...codesniffer[master]: Remove WhiteSpace.SpaceBeforeSingleLineComment.EmptyComment
Gergő Tisza has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/390178 )
Change subject: Remove WhiteSpace.SpaceBeforeSingleLineComment.EmptyComment
..
Remove WhiteSpace.SpaceBeforeSingleLineComment.EmptyComment
Empty comments are useful as paragraph breaks in multi-paragraph comments,
which improves readability of long comments. OTOH there isn't really any
unwanted behavior prevented by this rule that would be likely to occur
in the wild - it is easy get the spacing accidentaly, but accidentally
leaving empty comments is not likely to happen.
I've looked at only exempting empty comments when preceded and followed
by a comment, but PHP_CodeSniffer\Files\File is not really amenable to
line-based operations and it did not seem worth the effort.
Change-Id: I30e99d3e36fe3f18d56bc8fbae1b6e62471d81ea
---
M MediaWiki/Sniffs/WhiteSpace/SpaceBeforeSingleLineCommentSniff.php
M MediaWiki/Tests/files/WhiteSpace/space_before_singleline_comment.php.expect
2 files changed, 1 insertion(+), 8 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/tools/codesniffer
refs/changes/78/390178/1
diff --git a/MediaWiki/Sniffs/WhiteSpace/SpaceBeforeSingleLineCommentSniff.php
b/MediaWiki/Sniffs/WhiteSpace/SpaceBeforeSingleLineCommentSniff.php
index 68b1a49..647d624 100644
--- a/MediaWiki/Sniffs/WhiteSpace/SpaceBeforeSingleLineCommentSniff.php
+++ b/MediaWiki/Sniffs/WhiteSpace/SpaceBeforeSingleLineCommentSniff.php
@@ -54,10 +54,7 @@
( $currToken['content'][0] === '#' &&
rtrim( $currToken['content'] ) === '#' )
) {
- $phpcsFile->addWarning( 'Unnecessary empty
comment found',
- $stackPtr,
- 'EmptyComment'
- );
+ return;
// Checking whether there is a space between the
comment delimiter
// and the comment
} elseif ( substr( $currToken['content'], 0, 2 ) ===
'//' ) {
diff --git
a/MediaWiki/Tests/files/WhiteSpace/space_before_singleline_comment.php.expect
b/MediaWiki/Tests/files/WhiteSpace/space_before_singleline_comment.php.expect
index 53f88e7..b4d2e45 100644
---
a/MediaWiki/Tests/files/WhiteSpace/space_before_singleline_comment.php.expect
+++
b/MediaWiki/Tests/files/WhiteSpace/space_before_singleline_comment.php.expect
@@ -1,11 +1,7 @@
8 | WARNING | [x] Single space expected between "//" and comment
| |
(MediaWiki.WhiteSpace.SpaceBeforeSingleLineComment.SingleSpaceBeforeSingleLineComment)
- 9 | WARNING | [ ] Unnecessary empty comment found
-| |
(MediaWiki.WhiteSpace.SpaceBeforeSingleLineComment.EmptyComment)
10 | WARNING | [x] Single space expected between "#" and comment
| |
(MediaWiki.WhiteSpace.SpaceBeforeSingleLineComment.SingleSpaceBeforeSingleLineComment)
- 11 | WARNING | [ ] Unnecessary empty comment found
-| |
(MediaWiki.WhiteSpace.SpaceBeforeSingleLineComment.EmptyComment)
12 | WARNING | [x] Single space expected between "//" and comment
| |
(MediaWiki.WhiteSpace.SpaceBeforeSingleLineComment.SingleSpaceBeforeSingleLineComment)
13 | WARNING | [x] Single space expected between "#" and comment
--
To view, visit https://gerrit.wikimedia.org/r/390178
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I30e99d3e36fe3f18d56bc8fbae1b6e62471d81ea
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/tools/codesniffer
Gerrit-Branch: master
Gerrit-Owner: Gergő Tisza
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Wikidata.org[master]: Migrate to extension.json
Legoktm has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/390176 )
Change subject: Migrate to extension.json
..
Migrate to extension.json
This just migrates the entrypoint into extension.json, and keeps a
backwards-compatible PHP entrypoint behind.
The intialization check to see whether Wikibase is installed is now
moved to the onBeforePageDisplay hook since that's what actually depends
upon Wikibase.
And the WIKIDATA_ORG_VERSION constant was removed since it wasn't used
anywhere outside of the credits, and double loading is not possible with
extension.json.
Change-Id: I29709dd603e796b3aba5b7f5dcfc683975ed2008
---
M WikidataOrg.hooks.php
M WikidataOrg.php
A extension.json
D resources/Resources.php
4 files changed, 47 insertions(+), 103 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikidata.org
refs/changes/76/390176/1
diff --git a/WikidataOrg.hooks.php b/WikidataOrg.hooks.php
index 864f06a..f1eb8cf 100644
--- a/WikidataOrg.hooks.php
+++ b/WikidataOrg.hooks.php
@@ -2,6 +2,7 @@
namespace WikidataOrg;
+use Exception;
use Html;
use OutputPage;
use QuickTemplate;
@@ -30,6 +31,9 @@
* @param Skin $skin
*/
public static function onBeforePageDisplay( OutputPage &$out, Skin
&$skin ) {
+ if ( !class_exists( WikibaseRepo::class ) ) {
+ throw new Exception( 'The Wikidata.org extension
requires Wikibase to be installed' );
+ }
$entityNamespaceLookup =
WikibaseRepo::getDefaultInstance()->getEntityNamespaceLookup();
$ns = $out->getTitle()->getNamespace();
diff --git a/WikidataOrg.php b/WikidataOrg.php
index 30a3f0f..9ef6a0a 100644
--- a/WikidataOrg.php
+++ b/WikidataOrg.php
@@ -1,76 +1,14 @@
https://github.com/wmde/Wikidata.org
- * @license GPL-2.0+
- */
-
-if ( !defined( 'MEDIAWIKI' ) ) {
- die( 'Not an entry point.' );
+if ( function_exists( 'wfLoadExtension' ) ) {
+ wfLoadExtension( 'Wikidata.org' );
+ // Keep i18n globals so mergeMessageFileList.php doesn't break
+ $wgMessagesDirs['Wikidata.org'] = __DIR__ . '/i18n';
+ /* wfWarn(
+ 'Deprecated PHP entry point used for Wikidata.org extension.
Please use wfLoadExtension ' .
+ 'instead, see
https://www.mediawiki.org/wiki/Extension_registration for more details.'
+ ); */
+ return true;
+} else {
+ die( 'This version of the Wikidata.org extension requires MediaWiki
1.29+' );
}
-
-if ( defined( 'WIKIDATA_ORG_VERSION' ) ) {
- // Do not initialize more than once.
- return 1;
-}
-
-define( 'WIKIDATA_ORG_VERSION', '1.0.0' );
-
-// This is the path to the autoloader generated by composer in case of a
composer install.
-if ( is_readable( __DIR__ . '/vendor/autoload.php' ) ) {
- require_once __DIR__ . '/vendor/autoload.php';
-}
-
-$GLOBALS['wgMessagesDirs']['Wikidata.org'] = __DIR__ . '/i18n';
-
-$GLOBALS['wgExtensionFunctions'][] = function() {
- global $wgExtensionCredits, $wgHooks, $wgResourceModules;
-
- if ( !defined( 'WB_VERSION' ) ) {
- throw new Exception( 'The Wikidata.org extension requires
Wikibase to be installed.' );
- }
-
- $wgExtensionCredits['wikibase'][] = [
- 'path' => __DIR__,
- 'name' => 'Wikidata.org',
- 'version' => WIKIDATA_ORG_VERSION,
- 'author' => '[https://www.mediawiki.org/wiki/User:Bene* Bene*]',
- 'url' => 'https://github.com/wmde/Wikidata.org',
- 'descriptionmsg' => 'wikidata-org-desc',
- 'license-name' => 'GPL-2.0+'
- ];
-
- // Hooks
- $wgHooks['BeforePageDisplay'][] =
'WikidataOrg\Hooks::onBeforePageDisplay';
- $wgHooks['SkinTemplateOutputPageBeforeExec'][] =
- 'WikidataOrg\Hooks::onSkinTemplateOutputPageBeforeExec';
-
- // Resource Loader modules
- $wgResourceModules = array_merge(
- $wgResourceModules,
- include __DIR__ . '/resources/Resources.php'
- );
-};
diff --git a/extension.json b/extension.json
new file mode 100644
index 000..ec01486
--- /dev/null
+++ b/extension.json
@@ -0,0 +1,32 @@
+{
+ "name": "Wikidata.org",
+ "version": "1.0.0",
+ "author": "[https://www.mediawiki.org/wiki/User:Bene* Bene*]",
+ "url": "https://github.com/wmde/Wikidata.org";,
+ "descriptionmsg": "wikidata-org-desc",
+ "license-name": "GPL-2.0+",
+ "type": "wikibase",
+ "MessagesDirs": {
+ "Wikidata.org": [
+ "i18n"
+ ]
+ },
+ "ResourceModules": {
+ "ext.wikidata-org.badges": {
+ "position": "bottom",
+ "styles": [
+ "themes/default/wikidata-org.badges.css"
+ ]
+ }
+
[MediaWiki-commits] [Gerrit] mediawiki...Wikidata.org[master]: Use the MediaWiki autoloader for hooks file
Legoktm has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/390177 )
Change subject: Use the MediaWiki autoloader for hooks file
..
Use the MediaWiki autoloader for hooks file
Bug: T180060
Change-Id: I51e326c60943696fbb4677bf5707b7764a9eb792
---
M composer.json
M extension.json
2 files changed, 3 insertions(+), 5 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikidata.org
refs/changes/77/390177/1
diff --git a/composer.json b/composer.json
index c3db54a..4f54e52 100644
--- a/composer.json
+++ b/composer.json
@@ -39,10 +39,5 @@
"phpcbf",
"minus-x fix ."
]
- },
- "autoload": {
- "classmap": [
- "WikidataOrg.hooks.php"
- ]
}
}
diff --git a/extension.json b/extension.json
index ec01486..a6050d2 100644
--- a/extension.json
+++ b/extension.json
@@ -11,6 +11,9 @@
"i18n"
]
},
+ "AutoloadClasses": {
+ "WikidataOrg\\Hooks": "WikidataOrg.hooks.php"
+ },
"ResourceModules": {
"ext.wikidata-org.badges": {
"position": "bottom",
--
To view, visit https://gerrit.wikimedia.org/r/390177
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I51e326c60943696fbb4677bf5707b7764a9eb792
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikidata.org
Gerrit-Branch: master
Gerrit-Owner: Legoktm
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] oojs/ui[master]: build: Bump wikimedia-ui-base
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/390173 )
Change subject: build: Bump wikimedia-ui-base
..
build: Bump wikimedia-ui-base
wikimedia-ui-base 0.9.2 → 0.10.0
Change-Id: I6d4fb08cd9a1c408fd47af081ac9cb81b71434ef
---
M package.json
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
jenkins-bot: Verified
VolkerE: Looks good to me, approved
Jforrester: Looks good to me, approved
diff --git a/package.json b/package.json
index fe90f39..12ddd21 100644
--- a/package.json
+++ b/package.json
@@ -25,7 +25,7 @@
"dependencies": {
"jquery": "3.2.1",
"oojs": "2.1.0",
-"wikimedia-ui-base": "0.9.2"
+"wikimedia-ui-base": "0.10.0"
},
"devDependencies": {
"eslint-config-wikimedia": "0.5.0",
--
To view, visit https://gerrit.wikimedia.org/r/390173
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I6d4fb08cd9a1c408fd47af081ac9cb81b71434ef
Gerrit-PatchSet: 2
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: VolkerE
Gerrit-Reviewer: Bartosz Dziewoński
Gerrit-Reviewer: Jforrester
Gerrit-Reviewer: VolkerE
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations...logster[master]: git.wikimedia.org -> phab
TerraCodes has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/390175 ) Change subject: git.wikimedia.org -> phab .. git.wikimedia.org -> phab Bug: T139089 Change-Id: I37c96b0ef36f1e7f060aadc013dabc79ad83dbe9 --- M debian/control 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/debs/logster refs/changes/75/390175/1 diff --git a/debian/control b/debian/control index 8972446..620580e 100644 --- a/debian/control +++ b/debian/control @@ -5,7 +5,7 @@ Build-Depends: python, python-setuptools, debhelper (>= 9), Standards-Version: 3.9.5 Vcs-Git: https://gerrit.wikimedia.org/r/operations/debs/logster -b debian -Vcs-Browser: http://git.wikimedia.org/tree/operations%2Fdebs%logster.git/refs%2Fheads%2Fdebian +Vcs-Browser: https://phabricator.wikimedia.org/source/operations-debs-logster/repository/master/ Package: logster Architecture: all -- To view, visit https://gerrit.wikimedia.org/r/390175 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I37c96b0ef36f1e7f060aadc013dabc79ad83dbe9 Gerrit-PatchSet: 1 Gerrit-Project: operations/debs/logster Gerrit-Branch: master Gerrit-Owner: TerraCodes ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations...docker-pkg[master]: Add Jinja2 expression statement
Thcipriani has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/390174 ) Change subject: Add Jinja2 expression statement .. Add Jinja2 expression statement This change to the Jinja2 Environment adds support for the do tag in templates. Change-Id: I71c1263503d55a1f6880d47072e7575309c2bd86 --- M docker_pkg/dockerfile.py 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/docker-images/docker-pkg refs/changes/74/390174/1 diff --git a/docker_pkg/dockerfile.py b/docker_pkg/dockerfile.py index bc5a19d..4987ad9 100644 --- a/docker_pkg/dockerfile.py +++ b/docker_pkg/dockerfile.py @@ -9,7 +9,7 @@ @classmethod def setup(cls, config, known_images): -cls.env = Environment() +cls.env = Environment(extensions=['jinja2.ext.do']) cls.config = config cls.known_images = known_images cls.setup_filters() -- To view, visit https://gerrit.wikimedia.org/r/390174 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I71c1263503d55a1f6880d47072e7575309c2bd86 Gerrit-PatchSet: 1 Gerrit-Project: operations/docker-images/docker-pkg Gerrit-Branch: master Gerrit-Owner: Thcipriani ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] oojs/ui[master]: build: Bump wikimedia-ui-base
VolkerE has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/390173 )
Change subject: build: Bump wikimedia-ui-base
..
build: Bump wikimedia-ui-base
wikimedia-ui-base 0.9.2 → 0.10.0
Change-Id: I6d4fb08cd9a1c408fd47af081ac9cb81b71434ef
---
M package.json
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/73/390173/1
diff --git a/package.json b/package.json
index fe90f39..0465aad 100644
--- a/package.json
+++ b/package.json
@@ -25,7 +25,7 @@
"dependencies": {
"jquery": "3.2.1",
"oojs": "2.1.0",
-"wikimedia-ui-base": "0.9.2"
+"wikimedia-ui-base": "^0.10.0"
},
"devDependencies": {
"eslint-config-wikimedia": "0.5.0",
--
To view, visit https://gerrit.wikimedia.org/r/390173
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I6d4fb08cd9a1c408fd47af081ac9cb81b71434ef
Gerrit-PatchSet: 1
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: VolkerE
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: RCFilters: some more highlight cleanup
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/390172 )
Change subject: RCFilters: some more highlight cleanup
..
RCFilters: some more highlight cleanup
Change-Id: I81eb3bf86f786c79a94e99d51602d904504f918f
---
M resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FiltersViewModel.js
M resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.ItemModel.js
M resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.SavedQueriesModel.js
3 files changed, 1 insertion(+), 12 deletions(-)
Approvals:
jenkins-bot: Verified
Mooeypoo: Looks good to me, approved
diff --git
a/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FiltersViewModel.js
b/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FiltersViewModel.js
index 3a6efe2..d959540 100644
--- a/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FiltersViewModel.js
+++ b/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FiltersViewModel.js
@@ -1339,15 +1339,6 @@
};
/**
-* Clear highlight for all filter items
-*/
- mw.rcfilters.dm.FiltersViewModel.prototype.clearAllHighlightColors =
function () {
- this.getItems().forEach( function ( filterItem ) {
- filterItem.clearHighlightColor();
- } );
- };
-
- /**
* Return a version of the given string that is without any
* view triggers.
*
diff --git a/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.ItemModel.js
b/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.ItemModel.js
index 7b54833..44b6c8c 100644
--- a/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.ItemModel.js
+++ b/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.ItemModel.js
@@ -41,7 +41,6 @@
// Highlight
this.cssClass = config.cssClass;
this.highlightColor = config.defaultHighlightColor;
- this.highlightEnabled = !!config.defaultHighlightColor;
};
/* Initialization */
diff --git
a/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.SavedQueriesModel.js
b/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.SavedQueriesModel.js
index 23f6007..1d7934f 100644
--- a/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.SavedQueriesModel.js
+++ b/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.SavedQueriesModel.js
@@ -349,8 +349,7 @@
// Return parameter representation
return this.filtersModel.getMinimizedParamRepresentation(
$.extend( true, {},
this.filtersModel.getParametersFromFilters(
savedFilters ),
- data.highlights,
- { highlight: data.params.highlight }
+ data.highlights
) );
};
--
To view, visit https://gerrit.wikimedia.org/r/390172
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I81eb3bf86f786c79a94e99d51602d904504f918f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Sbisson
Gerrit-Reviewer: Mooeypoo
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Flow[master]: Don't wrap Documents with tags
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/390078 ) Change subject: Don't wrap Documents with tags .. Don't wrap Documents with tags Some old comments get to this point as entire HTML documents, including . Alternatively, it might make sense to do a stristr check for . Or we could try parsing again without calling createDOM(). Bug: T108089 Change-Id: I124c4ceff4ee612ec3cb567decf99ddf08c50f74 --- M includes/Parsoid/ContentFixer.php 1 file changed, 4 insertions(+), 1 deletion(-) Approvals: Catrope: Looks good to me, approved jenkins-bot: Verified diff --git a/includes/Parsoid/ContentFixer.php b/includes/Parsoid/ContentFixer.php index 6ecda82..5eb9aa7 100644 --- a/includes/Parsoid/ContentFixer.php +++ b/includes/Parsoid/ContentFixer.php @@ -82,7 +82,10 @@ * The body tag is required otherwise tags at the top are * magic'd into rather than kept with the content. */ - if ( substr( $content, 0, 5 ) !== ' tags, but prior to I0d9659f we were // storing only the contents and not the body tag itself. -- To view, visit https://gerrit.wikimedia.org/r/390078 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I124c4ceff4ee612ec3cb567decf99ddf08c50f74 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Flow Gerrit-Branch: master Gerrit-Owner: MarkAHershberger Gerrit-Reviewer: Catrope Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: RCFilters: some more highlight cleanup
Sbisson has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/390172 )
Change subject: RCFilters: some more highlight cleanup
..
RCFilters: some more highlight cleanup
Change-Id: I81eb3bf86f786c79a94e99d51602d904504f918f
---
M resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FiltersViewModel.js
M resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.ItemModel.js
M resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.SavedQueriesModel.js
3 files changed, 1 insertion(+), 12 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/72/390172/1
diff --git
a/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FiltersViewModel.js
b/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FiltersViewModel.js
index 3a6efe2..d959540 100644
--- a/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FiltersViewModel.js
+++ b/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FiltersViewModel.js
@@ -1339,15 +1339,6 @@
};
/**
-* Clear highlight for all filter items
-*/
- mw.rcfilters.dm.FiltersViewModel.prototype.clearAllHighlightColors =
function () {
- this.getItems().forEach( function ( filterItem ) {
- filterItem.clearHighlightColor();
- } );
- };
-
- /**
* Return a version of the given string that is without any
* view triggers.
*
diff --git a/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.ItemModel.js
b/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.ItemModel.js
index 7b54833..44b6c8c 100644
--- a/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.ItemModel.js
+++ b/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.ItemModel.js
@@ -41,7 +41,6 @@
// Highlight
this.cssClass = config.cssClass;
this.highlightColor = config.defaultHighlightColor;
- this.highlightEnabled = !!config.defaultHighlightColor;
};
/* Initialization */
diff --git
a/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.SavedQueriesModel.js
b/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.SavedQueriesModel.js
index 23f6007..1d7934f 100644
--- a/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.SavedQueriesModel.js
+++ b/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.SavedQueriesModel.js
@@ -349,8 +349,7 @@
// Return parameter representation
return this.filtersModel.getMinimizedParamRepresentation(
$.extend( true, {},
this.filtersModel.getParametersFromFilters(
savedFilters ),
- data.highlights,
- { highlight: data.params.highlight }
+ data.highlights
) );
};
--
To view, visit https://gerrit.wikimedia.org/r/390172
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I81eb3bf86f786c79a94e99d51602d904504f918f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Sbisson
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: RCFilters: Don't reload the list if the change was highlight...
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/383893 )
Change subject: RCFilters: Don't reload the list if the change was
highlights-only
..
RCFilters: Don't reload the list if the change was highlights-only
Bug: T164131
Change-Id: I9952467d0acef84a6445d970977c1265a3ebff95
---
M resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
1 file changed, 31 insertions(+), 12 deletions(-)
Approvals:
Sbisson: Looks good to me, approved
jenkins-bot: Verified
diff --git a/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
b/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
index 0b2dd8d..8374b48 100644
--- a/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
+++ b/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
@@ -369,9 +369,10 @@
* Reset to default filters
*/
mw.rcfilters.Controller.prototype.resetToDefaults = function () {
- this.filtersModel.updateStateFromParams(
this._getDefaultParams() );
-
- this.updateChangesList();
+ if ( this.applyParamChange( this._getDefaultParams() ) ) {
+ // Only update the changes list if there was a change
to actual filters
+ this.updateChangesList();
+ }
};
/**
@@ -387,13 +388,13 @@
* Empty all selected filters
*/
mw.rcfilters.Controller.prototype.emptyFilters = function () {
- var highlightedFilterNames = this.filtersModel
- .getHighlightedItems()
+ var highlightedFilterNames =
this.filtersModel.getHighlightedItems()
.map( function ( filterItem ) { return { name:
filterItem.getName() }; } );
- this.filtersModel.updateStateFromParams( {} );
-
- this.updateChangesList();
+ if ( this.applyParamChange( {} ) ) {
+ // Only update the changes list if there was a change
to actual filters
+ this.updateChangesList();
+ }
if ( highlightedFilterNames ) {
this._trackHighlight( 'clearAll',
highlightedFilterNames );
@@ -677,10 +678,10 @@
return;
}
- // Apply parameters to model
- this.filtersModel.updateStateFromParams( params );
-
- this.updateChangesList();
+ if ( this.applyParamChange( params ) ) {
+ // Update changes list only if there was a difference
in filter selection
+ this.updateChangesList();
+ }
// Log filter grouping
this.trackFilterGroupings( 'savedfilters' );
@@ -1058,6 +1059,24 @@
};
/**
+* Apply a change of parameters to the model state, and check whether
+* the new state is different than the old state.
+*
+* @param {Object} newParamState New parameter state to apply
+* @return {boolean} New applied model state is different than the
previous state
+*/
+ mw.rcfilters.Controller.prototype.applyParamChange = function (
newParamState ) {
+ var after,
+ before = this.filtersModel.getSelectedState();
+
+ this.filtersModel.updateStateFromParams( newParamState );
+
+ after = this.filtersModel.getSelectedState();
+
+ return !OO.compare( before, after );
+ };
+
+ /**
* Mark all changes as seen on Watchlist
*/
mw.rcfilters.Controller.prototype.markAllChangesAsSeen = function () {
--
To view, visit https://gerrit.wikimedia.org/r/383893
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I9952467d0acef84a6445d970977c1265a3ebff95
Gerrit-PatchSet: 6
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Mooeypoo
Gerrit-Reviewer: Sbisson
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: Bump src/ to 2887b5ad + update dependencies
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/390171 ) Change subject: Bump src/ to 2887b5ad + update dependencies .. Bump src/ to 2887b5ad + update dependencies * domino to 2.0.0 * service-runner to 2.4.0 Change-Id: I7c14819342daacfd2eaa34edcf42e60650b1e67c --- D node_modules/bl/node_modules/safe-buffer/.travis.yml D node_modules/bl/node_modules/safe-buffer/LICENSE D node_modules/bl/node_modules/safe-buffer/README.md D node_modules/bl/node_modules/safe-buffer/index.js D node_modules/bl/node_modules/safe-buffer/package.json D node_modules/bl/node_modules/safe-buffer/test.js M node_modules/bl/package.json M node_modules/bluebird/README.md M node_modules/bluebird/js/browser/bluebird.core.js M node_modules/bluebird/js/browser/bluebird.core.min.js M node_modules/bluebird/js/browser/bluebird.js M node_modules/bluebird/js/browser/bluebird.min.js M node_modules/bluebird/js/release/debuggability.js M node_modules/bluebird/js/release/promise.js M node_modules/bluebird/js/release/util.js M node_modules/bluebird/package.json M node_modules/content-type/package.json M node_modules/domino/.travis.yml M node_modules/domino/CHANGELOG.md M node_modules/domino/README.md M node_modules/domino/lib/CharacterData.js M node_modules/domino/lib/ChildNode.js M node_modules/domino/lib/Comment.js A node_modules/domino/lib/ContainerNode.js M node_modules/domino/lib/Document.js M node_modules/domino/lib/DocumentFragment.js M node_modules/domino/lib/DocumentType.js M node_modules/domino/lib/Element.js M node_modules/domino/lib/FilteredElementList.js M node_modules/domino/lib/Leaf.js A node_modules/domino/lib/LinkedList.js M node_modules/domino/lib/Node.js M node_modules/domino/lib/NonDocumentTypeChildNode.js M node_modules/domino/lib/ProcessingInstruction.js M node_modules/domino/lib/Text.js M node_modules/domino/lib/utils.js M node_modules/domino/package.json M node_modules/domino/test/mocha.opts A node_modules/hot-shots/#CHANGES.md# M node_modules/hot-shots/CHANGES.md M node_modules/hot-shots/README.md M node_modules/hot-shots/lib/statsd.js A node_modules/hot-shots/package-lock.json M node_modules/hot-shots/package.json M node_modules/js-yaml/package.json D node_modules/kad-fs/node_modules/safe-buffer/.travis.yml D node_modules/kad-fs/node_modules/safe-buffer/LICENSE D node_modules/kad-fs/node_modules/safe-buffer/README.md D node_modules/kad-fs/node_modules/safe-buffer/index.js D node_modules/kad-fs/node_modules/safe-buffer/package.json D node_modules/kad-fs/node_modules/safe-buffer/test.js M node_modules/kad-fs/package.json D node_modules/kad-memstore/node_modules/safe-buffer/.travis.yml D node_modules/kad-memstore/node_modules/safe-buffer/LICENSE D node_modules/kad-memstore/node_modules/safe-buffer/README.md D node_modules/kad-memstore/node_modules/safe-buffer/index.js D node_modules/kad-memstore/node_modules/safe-buffer/package.json D node_modules/kad-memstore/node_modules/safe-buffer/test.js M node_modules/kad-memstore/package.json M node_modules/kad/package.json D node_modules/limitation/node_modules/safe-buffer/.travis.yml D node_modules/limitation/node_modules/safe-buffer/LICENSE D node_modules/limitation/node_modules/safe-buffer/README.md D node_modules/limitation/node_modules/safe-buffer/index.js D node_modules/limitation/node_modules/safe-buffer/package.json D node_modules/limitation/node_modules/safe-buffer/test.js M node_modules/limitation/package.json D node_modules/msgpack5/.npmignore M node_modules/msgpack5/lib/encoder.js D node_modules/msgpack5/node_modules/safe-buffer/.travis.yml D node_modules/msgpack5/node_modules/safe-buffer/LICENSE D node_modules/msgpack5/node_modules/safe-buffer/README.md D node_modules/msgpack5/node_modules/safe-buffer/index.js D node_modules/msgpack5/node_modules/safe-buffer/package.json D node_modules/msgpack5/node_modules/safe-buffer/test.js M node_modules/msgpack5/package.json A node_modules/msgpack5/test/1-byte-length-uint8arrays.js A node_modules/msgpack5/test/2-bytes-length-uint8arrays.js A node_modules/msgpack5/test/4-bytes-length-uint8arrays.js M node_modules/negotiator/package.json M node_modules/pegjs/package.json M node_modules/safe-buffer/package.json M node_modules/service-runner/lib/worker.js M node_modules/service-runner/package.json M node_modules/service-runner/service-runner.js M node_modules/sshpk/package.json M src 87 files changed, 1,148 insertions(+), 4,639 deletions(-) Approvals: Subramanya Sastry: Looks good to me, approved jenkins-bot: Verified -- To view, visit https://gerrit.wikimedia.org/r/390171 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I7c14819342daacfd2eaa34edcf42e60650b1e67c Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/services/parsoid/deploy Gerrit-Branch: master Gerrit-Owner: Arlolra Gerrit-Reviewer: C. Scott Ananian Gerrit-Reviewer: Sbailey Gerrit-Reviewer: Subram
[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: Bump src/ to 2887b5ad + update dependencies
Arlolra has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/390171 ) Change subject: Bump src/ to 2887b5ad + update dependencies .. Bump src/ to 2887b5ad + update dependencies * domino to 2.0.0 * service-runner to 2.4.0 Change-Id: I7c14819342daacfd2eaa34edcf42e60650b1e67c --- D node_modules/bl/node_modules/safe-buffer/.travis.yml D node_modules/bl/node_modules/safe-buffer/LICENSE D node_modules/bl/node_modules/safe-buffer/README.md D node_modules/bl/node_modules/safe-buffer/index.js D node_modules/bl/node_modules/safe-buffer/package.json D node_modules/bl/node_modules/safe-buffer/test.js M node_modules/bl/package.json M node_modules/bluebird/README.md M node_modules/bluebird/js/browser/bluebird.core.js M node_modules/bluebird/js/browser/bluebird.core.min.js M node_modules/bluebird/js/browser/bluebird.js M node_modules/bluebird/js/browser/bluebird.min.js M node_modules/bluebird/js/release/debuggability.js M node_modules/bluebird/js/release/promise.js M node_modules/bluebird/js/release/util.js M node_modules/bluebird/package.json M node_modules/content-type/package.json M node_modules/domino/.travis.yml M node_modules/domino/CHANGELOG.md M node_modules/domino/README.md M node_modules/domino/lib/CharacterData.js M node_modules/domino/lib/ChildNode.js M node_modules/domino/lib/Comment.js A node_modules/domino/lib/ContainerNode.js M node_modules/domino/lib/Document.js M node_modules/domino/lib/DocumentFragment.js M node_modules/domino/lib/DocumentType.js M node_modules/domino/lib/Element.js M node_modules/domino/lib/FilteredElementList.js M node_modules/domino/lib/Leaf.js A node_modules/domino/lib/LinkedList.js M node_modules/domino/lib/Node.js M node_modules/domino/lib/NonDocumentTypeChildNode.js M node_modules/domino/lib/ProcessingInstruction.js M node_modules/domino/lib/Text.js M node_modules/domino/lib/utils.js M node_modules/domino/package.json M node_modules/domino/test/mocha.opts A node_modules/hot-shots/#CHANGES.md# M node_modules/hot-shots/CHANGES.md M node_modules/hot-shots/README.md M node_modules/hot-shots/lib/statsd.js A node_modules/hot-shots/package-lock.json M node_modules/hot-shots/package.json M node_modules/js-yaml/package.json D node_modules/kad-fs/node_modules/safe-buffer/.travis.yml D node_modules/kad-fs/node_modules/safe-buffer/LICENSE D node_modules/kad-fs/node_modules/safe-buffer/README.md D node_modules/kad-fs/node_modules/safe-buffer/index.js D node_modules/kad-fs/node_modules/safe-buffer/package.json D node_modules/kad-fs/node_modules/safe-buffer/test.js M node_modules/kad-fs/package.json D node_modules/kad-memstore/node_modules/safe-buffer/.travis.yml D node_modules/kad-memstore/node_modules/safe-buffer/LICENSE D node_modules/kad-memstore/node_modules/safe-buffer/README.md D node_modules/kad-memstore/node_modules/safe-buffer/index.js D node_modules/kad-memstore/node_modules/safe-buffer/package.json D node_modules/kad-memstore/node_modules/safe-buffer/test.js M node_modules/kad-memstore/package.json M node_modules/kad/package.json D node_modules/limitation/node_modules/safe-buffer/.travis.yml D node_modules/limitation/node_modules/safe-buffer/LICENSE D node_modules/limitation/node_modules/safe-buffer/README.md D node_modules/limitation/node_modules/safe-buffer/index.js D node_modules/limitation/node_modules/safe-buffer/package.json D node_modules/limitation/node_modules/safe-buffer/test.js M node_modules/limitation/package.json D node_modules/msgpack5/.npmignore M node_modules/msgpack5/lib/encoder.js D node_modules/msgpack5/node_modules/safe-buffer/.travis.yml D node_modules/msgpack5/node_modules/safe-buffer/LICENSE D node_modules/msgpack5/node_modules/safe-buffer/README.md D node_modules/msgpack5/node_modules/safe-buffer/index.js D node_modules/msgpack5/node_modules/safe-buffer/package.json D node_modules/msgpack5/node_modules/safe-buffer/test.js M node_modules/msgpack5/package.json A node_modules/msgpack5/test/1-byte-length-uint8arrays.js A node_modules/msgpack5/test/2-bytes-length-uint8arrays.js A node_modules/msgpack5/test/4-bytes-length-uint8arrays.js M node_modules/negotiator/package.json M node_modules/pegjs/package.json M node_modules/safe-buffer/package.json M node_modules/service-runner/lib/worker.js M node_modules/service-runner/package.json M node_modules/service-runner/service-runner.js M node_modules/sshpk/package.json M src 87 files changed, 1,148 insertions(+), 4,639 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/parsoid/deploy refs/changes/71/390171/1 -- To view, visit https://gerrit.wikimedia.org/r/390171 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I7c14819342daacfd2eaa34edcf42e60650b1e67c Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/services/parsoid/deploy Gerrit-Branch: master Gerrit-Owner: Arlolra ___ MediaWiki-commits mailin
[MediaWiki-commits] [Gerrit] mediawiki...parsoid[master]: Bump to domino@2.0.0
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/390170 )
Change subject: Bump to domino@2.0.0
..
Bump to domino@2.0.0
Bug: T176728
Change-Id: I286d7f90da2b5d417935cc7661709feb3436797e
---
M npm-shrinkwrap.json
M package.json
2 files changed, 4 insertions(+), 4 deletions(-)
Approvals:
Subramanya Sastry: Looks good to me, approved
jenkins-bot: Verified
diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
index 5eec9f2..fc4f4e7 100644
--- a/npm-shrinkwrap.json
+++ b/npm-shrinkwrap.json
@@ -725,9 +725,9 @@
"dev": true
},
"domino": {
- "version": "1.0.30",
- "from": "domino@1.0.30",
- "resolved": "https://registry.npmjs.org/domino/-/domino-1.0.30.tgz";
+ "version": "2.0.0",
+ "from": "domino@2.0.0",
+ "resolved": "https://registry.npmjs.org/domino/-/domino-2.0.0.tgz";
},
"domutils": {
"version": "1.5.1",
diff --git a/package.json b/package.json
index 638e62a..6ea27ce 100644
--- a/package.json
+++ b/package.json
@@ -12,7 +12,7 @@
"content-type": "git+https://github.com/wikimedia/content-type#master";,
"core-js": "^2.5.1",
"diff": "^1.0.7",
-"domino": "^1.0.30",
+"domino": "^2.0.0",
"entities": "^1.1.1",
"express": "^4.15.5",
"express-handlebars": "^3.0.0",
--
To view, visit https://gerrit.wikimedia.org/r/390170
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I286d7f90da2b5d417935cc7661709feb3436797e
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/services/parsoid
Gerrit-Branch: master
Gerrit-Owner: Arlolra
Gerrit-Reviewer: C. Scott Ananian
Gerrit-Reviewer: Sbailey
Gerrit-Reviewer: Subramanya Sastry
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...parsoid[master]: Bump to service-runner@2.4.0
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/388270 )
Change subject: Bump to service-runner@2.4.0
..
Bump to service-runner@2.4.0
* Each compute worker in the new http api architecture needs access to
logging and metrics which can't be passed across the process barier. This
version of service-runner exposes the configuration for those features so
that they can construct their own.
* Move the setup from the service entrypoint to ParsoidConfig construction
to support that.
Change-Id: Icb44e2c144bdd5fc256a79f067ef44682f2e405e
---
M lib/config/ParsoidConfig.js
M lib/index.js
M npm-shrinkwrap.json
M package.json
4 files changed, 51 insertions(+), 61 deletions(-)
Approvals:
Subramanya Sastry: Looks good to me, approved
Sbailey: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/lib/config/ParsoidConfig.js b/lib/config/ParsoidConfig.js
index 0109ea3..4ff9aa6 100644
--- a/lib/config/ParsoidConfig.js
+++ b/lib/config/ParsoidConfig.js
@@ -10,6 +10,7 @@
var fs = require('fs');
var path = require('path');
var url = require('url');
+var ServiceRunner = require('service-runner');
var Util = require('../utils/Util.js').Util;
var JSUtils = require('../utils/jsutils.js').JSUtils;
@@ -105,6 +106,21 @@
},
});
+var prepareLog = function(logData) {
+ var log = Object.assign({ logType: logData.logType },
logData.locationData);
+ var flat = logData.flatLogObject();
+ Object.keys(flat).forEach(function(k) {
+ // Be sure we don't have a `type` field here since logstash
+ // treats that as magical. We created a special `location`
+ // field above and bunyan will add a `level` field (from the
+ // contents of our `type` field) when we call the specific
+ // logger returned by `_getBunyanLogger`.
+ if (/^(type|location|level)$/.test(k)) { return; }
+ log[k] = flat[k];
+ });
+ return log;
+};
+
/**
* @class
*
@@ -118,6 +134,8 @@
* @param {Object} options Any options we want to set over the defaults. See
the class properties for more information.
*/
function ParsoidConfig(localSettings, options) {
+ options = options || {};
+
this.mwApiMap = new Map();
this.reverseMwApiMap = new Map();
Object.keys(CONFIG_DEFAULTS).forEach(function(k) {
@@ -127,8 +145,19 @@
// Don't freak out!
// This happily overwrites inherited properties.
- if (options) {
- Object.assign(this, options);
+ Object.assign(this, options);
+
+ if (options.parent && (!this.loggerBackend || !this.metrics)) {
+ var srlogger = ServiceRunner.getLogger(options.parent.logging);
+ if (!this.loggerBackend) {
+ this.loggerBackend = function(logData, cb) {
+ srlogger.log(logData.logType,
prepareLog(logData));
+ cb();
+ };
+ }
+ if (!this.metrics) {
+ this.metrics =
ServiceRunner.getMetrics(options.parent.metrics, srlogger);
+ }
}
if (!localSettings && options.localsettings) {
diff --git a/lib/index.js b/lib/index.js
index d18fa6f..9170bae 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -8,21 +8,6 @@
var ParsoidConfig = require('./config/ParsoidConfig.js').ParsoidConfig;
var ParsoidService = require('./api/ParsoidService.js');
-var prepareLog = function(logData) {
- var log = Object.assign({ logType: logData.logType },
logData.locationData);
- var flat = logData.flatLogObject();
- Object.keys(flat).forEach(function(k) {
- // Be sure we don't have a `type` field here since logstash
- // treats that as magical. We created a special `location`
- // field above and bunyan will add a `level` field (from the
- // contents of our `type` field) when we call the specific
- // logger returned by `_getBunyanLogger`.
- if (/^(type|location|level)$/.test(k)) { return; }
- log[k] = flat[k];
- });
- return log;
-};
-
/**
* Main entry point for Parsoid's JavaScript API.
*
@@ -46,18 +31,19 @@
/**
* Start an API service worker as part of a service-runner service.
+ *
* @param {Object} options
* @return {Promise} a Promise for an `http.Server`.
*/
Parsoid.apiServiceWorker = function apiServiceWorker(options) {
- // By default, set the loggerBackend and metrics to service-runner's.
var parsoidOptions = Object.assign({
- loggerBackend: function(logData, cb) {
- options.logger.log(logData.logType,
prepareLog(logData));
- cb();
+ // Pull these out sinc
[MediaWiki-commits] [Gerrit] mediawiki...parsoid[master]: Bump to domino@2.0.0
Arlolra has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/390170 )
Change subject: Bump to domino@2.0.0
..
Bump to domino@2.0.0
Bug: T176728
Change-Id: I286d7f90da2b5d417935cc7661709feb3436797e
---
M npm-shrinkwrap.json
M package.json
2 files changed, 4 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/parsoid
refs/changes/70/390170/1
diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
index 0d2a3fc..dfb50e0 100644
--- a/npm-shrinkwrap.json
+++ b/npm-shrinkwrap.json
@@ -730,9 +730,9 @@
"dev": true
},
"domino": {
- "version": "1.0.30",
- "from": "domino@1.0.30",
- "resolved": "https://registry.npmjs.org/domino/-/domino-1.0.30.tgz";
+ "version": "2.0.0",
+ "from": "domino@2.0.0",
+ "resolved": "https://registry.npmjs.org/domino/-/domino-2.0.0.tgz";
},
"domutils": {
"version": "1.5.1",
diff --git a/package.json b/package.json
index 95f9bcd..a50c4a1 100644
--- a/package.json
+++ b/package.json
@@ -12,7 +12,7 @@
"content-type": "git+https://github.com/wikimedia/content-type#master";,
"core-js": "^2.5.1",
"diff": "^1.0.7",
-"domino": "^1.0.30",
+"domino": "^2.0.0",
"entities": "^1.1.1",
"express": "^4.15.5",
"express-handlebars": "^3.0.0",
--
To view, visit https://gerrit.wikimedia.org/r/390170
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I286d7f90da2b5d417935cc7661709feb3436797e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/parsoid
Gerrit-Branch: master
Gerrit-Owner: Arlolra
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] labs...heritage[master]: Make statistics table for unknown fields
Lokal Profil has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/390169 )
Change subject: Make statistics table for unknown fields
..
Make statistics table for unknown fields
Also add header to each report page.
Change-Id: I89e5e2e4adcbfe31139fb111a436c6240d0a6c62
---
M erfgoedbot/update_database.py
M tests/test_update_database.py
2 files changed, 580 insertions(+), 19 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/labs/tools/heritage
refs/changes/69/390169/1
diff --git a/erfgoedbot/update_database.py b/erfgoedbot/update_database.py
index fc0fceb..2086046 100755
--- a/erfgoedbot/update_database.py
+++ b/erfgoedbot/update_database.py
@@ -140,30 +140,59 @@
countryconfig.get('table'), field.get('conv')))
-def unknownFieldsStatistics(countryconfig, unknownFields):
+def unknownFieldsStatistics(countryconfig, unknown_fields):
"""
Outputs a list of any unknown fields as a wikitext table.
The table contains the name and frequency of the field and a sample of
source pages where this field was encountered.
+
+@param countryconfig: the configurations for the dataset being processed.
+@param unknown_fields: dict of discovered fields with each value being a
+Counter for how frequently the field is encountered per page.
+@return: dict summarising the usages
"""
site = pywikibot.Site(u'commons', u'commons')
page = pywikibot.Page(
site, u'Commons:Monuments database/Unknown fields/{0}'.format(
countryconfig.get('table')))
-summary = u'Updating the list of unknown fields'
+summary = u'Updating the list of unknown fields with {0} entries'
-text = u'{| class="wikitable sortable"\n'
-text += u'! Field !! Count !! Sources\n'
-for key, counter in unknownFields.items():
-text += u'|-\n'
-text += u'| {0} || {1} || {2}\n'.format(
-key, sum(counter.values()), format_source_field(counter, site))
+text = (
+u'{{#ifexist:{{FULLPAGENAME}}/header'
+u'|{{/header}}'
+u'|For information on how to use this report and how to localise '
+u'these instructions visit '
+u'[[:c:Commons:Monuments_database/Unknown fields]]. }}\n')
-text += u'|}\n'
+total_usages = 0
+pages_with_fields = set()
+
+if not unknown_fields:
+text += u'\nThere are no unknown fields left. Great work!\n'
+else:
+text += u'{| class="wikitable sortable"\n'
+text += u'! Field !! Count !! Sources\n'
+for key, counter in unknown_fields.iteritems():
+total_usages += sum(counter.values())
+pages_with_fields.update(counter.keys())
+text += u'|-\n'
+text += u'| {0} || {1} || {2}\n'.format(
+key, sum(counter.values()), format_source_field(counter, site))
+text += u'|}\n'
+
text += u'[[Category:Commons:Monuments database/Unknown fields]]'
-common.save_to_wiki_or_local(page, summary, text)
+common.save_to_wiki_or_local(
+page, summary.format(len(unknown_fields)), text)
+
+return {
+'report_page': page,
+'config': countryconfig,
+'total_fields': len(unknown_fields),
+'total_pages': len(pages_with_fields),
+'total_usages': total_usages
+}
def format_source_field(sources, site, sample_size=4):
@@ -445,7 +474,8 @@
if countryconfig.get('type') == 'sparql':
process_country_wikidata(countryconfig, conn, cursor)
else:
-process_country_list(countryconfig, conn, cursor, fullUpdate, daysBack)
+return process_country_list(
+countryconfig, conn, cursor, fullUpdate, daysBack)
def process_country_list(countryconfig, conn, cursor, fullUpdate, daysBack):
@@ -484,7 +514,7 @@
page, page.permalink(percent_encoded=False), countryconfig,
conn, cursor, unknownFields=unknownFields)
-unknownFieldsStatistics(countryconfig, unknownFields)
+return unknownFieldsStatistics(countryconfig, unknownFields)
def load_wikidata_template_sparql():
@@ -522,6 +552,102 @@
for resultitem in query_result:
process_monument_wikidata(resultitem, countryconfig, conn, cursor)
+
+
+def make_statistics(statistics):
+"""Output the overall results for unknown fields as a nice wikitable."""
+site = pywikibot.Site('commons', 'commons')
+page = pywikibot.Page(
+site, u'Commons:Monuments database/Unknown fields/Statistics')
+
+text = (
+u'{| class="wikitable sortable"\n'
+u'! country '
+u'!! lang '
+u'!! data-sort-type="number"|Total unknown fields '
+u'!! data-sort-type="number"|Total usage of unknown fields '
+u'!! data-sort-type="number"|Total pages containing unknown fields '
+u'!! Report page '
+u'!! Row template '
+u'!! Header template
[MediaWiki-commits] [Gerrit] mediawiki...parsoid[master]: T180010: Broken wikitext for link inside square brackets
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/390045 )
Change subject: T180010: Broken wikitext for link inside square brackets
..
T180010: Broken wikitext for link inside square brackets
Change-Id: I638897ab96b43253dea4bc63e6500285fc6a26ca
---
M lib/html2wt/ConstrainedText.js
M tests/parserTests.txt
2 files changed, 31 insertions(+), 1 deletion(-)
Approvals:
C. Scott Ananian: Looks good to me, approved
Sbailey: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/lib/html2wt/ConstrainedText.js b/lib/html2wt/ConstrainedText.js
index cd2a78c..ec722df 100644
--- a/lib/html2wt/ConstrainedText.js
+++ b/lib/html2wt/ConstrainedText.js
@@ -17,6 +17,7 @@
var util = require('util');
var DU = require('../utils/DOMUtils.js').DOMUtils;
var Util = require('../utils/Util.js').Util;
+var JSUtils = require('../utils/jsutils.js').JSUtils;
/*
@@ -328,10 +329,14 @@
var WikiLinkText = function WikiLinkText(text, node, wikiConfig, type) {
// category links/external links/images don't use link trails or
prefixes
var noTrails = !/^mw:(Wiki|Ext)Link$/.test(type);
+ var badPrefix = /(^|[^\[])(\[\[)*\[$/;
+ if (!noTrails && wikiConfig.linkPrefixRegex) {
+ badPrefix = JSUtils.rejoin('(', wikiConfig.linkPrefixRegex,
')|(', badPrefix, ')');
+ }
WikiLinkText.super_.call(this, {
text: text,
node: node,
- badPrefix: noTrails ? undefined : wikiConfig.linkPrefixRegex,
+ badPrefix: badPrefix,
badSuffix: noTrails ? undefined : wikiConfig.linkTrailRegex,
});
// We match link trails greedily when they exist.
diff --git a/tests/parserTests.txt b/tests/parserTests.txt
index 0b5d060..178691c 100644
--- a/tests/parserTests.txt
+++ b/tests/parserTests.txt
@@ -8548,6 +8548,31 @@
!! end
!! test
+Parsoid link bracket escaping
+!! options
+parsoid=html2wt,html2html
+!! html/parsoid
+Test
+[Test]
+[[Test]]
+[[[Test]]]
+Test
+[Test]
+!! wikitext
+[[Test]]
+
+[[[Test]]]
+
+Test
+
+[Test]
+
+[[Test]]
+
+[[[Test]]]
+!! end
+
+!! test
Parsoid-centric test: Whitespace in ext- and wiki-links should be preserved
!! wikitext
[[Foo| bar]]
--
To view, visit https://gerrit.wikimedia.org/r/390045
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I638897ab96b43253dea4bc63e6500285fc6a26ca
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/services/parsoid
Gerrit-Branch: master
Gerrit-Owner: Arlolra
Gerrit-Reviewer: Arlolra
Gerrit-Reviewer: C. Scott Ananian
Gerrit-Reviewer: Sbailey
Gerrit-Reviewer: Subramanya Sastry
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...ReadingLists[master]: Fix handling of partial order parameters
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/387186 )
Change subject: Fix handling of partial order parameters
..
Fix handling of partial order parameters
Throw an error when setListOrder() or setListEntryOrder() is called,
and the provided ids are valid, but not all valid ids are provided.
Bug: T177853
Change-Id: Id992ed0eefd67c9e0b67ce378a9654301880b52a
---
M i18n/en.json
M i18n/qqq.json
M src/ReadingListRepository.php
M tests/src/ReadingListRepositoryTest.php
4 files changed, 60 insertions(+), 22 deletions(-)
Approvals:
jenkins-bot: Verified
Mholloway: Looks good to me, approved
diff --git a/i18n/en.json b/i18n/en.json
index 5e88465..b7c4321 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -17,6 +17,8 @@
"readinglists-db-error-duplicate-page": "The list already contains this
page.",
"readinglists-db-error-empty-list-ids": "List ids parameter must not be
empty.",
"readinglists-db-error-empty-order": "Order parameter must not be
empty.",
+ "readinglists-db-error-missing-list": "All lists must be included in
the order ($1 missing).",
+ "readinglists-db-error-missing-list-entry": "All list entries must be
included in the order ($1 missing).",
"readinglists-db-error-entry-not-in-list": "List entry $1 does not
belong to this list.",
"readinglists-db-error-user-required": "This method cannot be called
without specifying the user.",
"readinglists-apierror-project-title-param": "$1project and
$1title must be used together.",
diff --git a/i18n/qqq.json b/i18n/qqq.json
index c7f8e33..b7b2f38 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -18,6 +18,8 @@
"readinglists-db-error-duplicate-page": "Error message used when trying
to add a page to a list that already contains it.",
"readinglists-db-error-empty-list-ids": "Error message used when
querying list entries without specifying any lists.",
"readinglists-db-error-empty-order": "Error message used when trying to
set the order of lists or list entries but passing an empty order array.",
+ "readinglists-db-error-missing-list": "Error message used when trying
to set the order of lists but omitting some list IDs.",
+ "readinglists-db-error-missing-list-entry": "Error message used when
trying to set the order of list entries but omitting some entry IDs.",
"readinglists-db-error-entry-not-in-list": "Error message used when
trying to set the order of list entries but some of them do not belong to the
list.",
"readinglists-db-error-user-required": "Error message used when calling
a method that operates on a single user, but the user was not specified when
the repository object was constructed.",
"readinglists-apierror-project-title-param": "{{doc-apierror}}\n$1 is
the module prefix.",
diff --git a/src/ReadingListRepository.php b/src/ReadingListRepository.php
index f22e298..5fdec56 100644
--- a/src/ReadingListRepository.php
+++ b/src/ReadingListRepository.php
@@ -534,28 +534,40 @@
throw new ReadingListRepositoryException(
'readinglists-db-error-not-set-up' );
}
- // Make sure the lists exist and the user owns them.
- $res = $this->dbw->select(
+ // Make sure the set of IDs match the actual lists.
+ $ids = $this->dbw->selectFieldValues(
'reading_list',
- [ 'rl_id', 'rl_user_id', 'rl_deleted' ],
- [ 'rl_id' => $order ]
- );
- $filtered = [];
- foreach ( $res as $row ) {
+ 'rl_id',
+ [
+ 'rl_user_id' => $this->userId,
+ 'rl_deleted' => 0,
+ ]
+ ) ?: [];
+ $nonExistent = array_diff( $order, $ids );
+ if ( $nonExistent ) {
/** @var ReadingListRow $row */
- if ( $row->rl_user_id != $this->userId ) {
+ $row = $this->dbw->selectRow(
+ 'reading_list',
+ [ 'rl_id', 'rl_user_id', 'rl_deleted' ],
+ [ 'rl_id' => reset( $nonExistent ) ]
+ );
+ if ( !$row ) {
+ throw new ReadingListRepositoryException(
'readinglists-db-error-no-such-list',
+ [ reset( $nonExistent ) ] );
+ } elseif ( $row->rl_user_id != $this->userId ) {
throw new ReadingListRepositoryException(
'readinglists-db-error-not-own-list', [
$row->rl_id ] );
} elseif ( $row->rl_deleted ) {
[MediaWiki-commits] [Gerrit] mediawiki...ReadingLists[master]: Fix deleted row handling
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/387185 )
Change subject: Fix deleted row handling
..
Fix deleted row handling
Add a number of missing checks against performing operations on
deleted lists, or deleted list entries, or entries of deleted lists.
The old logic tried to avoid the extra SELECT needed for those
checks by cramming all the check logic into the INSERT/UPDATE/DELETE
conditions and only doing explicit checks when the write failed.
This was unwieldy and the performance gain was unlikely to be
significant, so it is now replaced with explicit checks.
Bug: T177853
Change-Id: If8db3dee951be7038bb104eaf3a7c9f58b5f1723
---
M src/ReadingListRepository.php
M tests/src/ReadingListRepositoryTest.php
2 files changed, 204 insertions(+), 130 deletions(-)
Approvals:
jenkins-bot: Verified
Mholloway: Looks good to me, approved
diff --git a/src/ReadingListRepository.php b/src/ReadingListRepository.php
index c23eb9c..f22e298 100644
--- a/src/ReadingListRepository.php
+++ b/src/ReadingListRepository.php
@@ -11,6 +11,9 @@
use Psr\Log\LoggerInterface;
use Psr\Log\NullLogger;
use Wikimedia\Rdbms\IDatabase;
+// @codingStandardsIgnoreStart MediaWiki.Classes.UnusedUseStatement.UnusedUse
+use Wikimedia\Rdbms\IResultWrapper;
+// @codingStandardsIgnoreEnd
use Wikimedia\Rdbms\LBFactory;
/**
@@ -132,6 +135,8 @@
/**
* Check whether reading lists have been set up for the given user (ie.
setupForUser() was
* called with $userId and teardownForUser() was not called with the
same id afterwards).
+* Optionally also lock the DB row for the default list of the user
(will be used as a
+* semaphore).
* @param int $flags IDBAccessObject flags
* @throws ReadingListRepositoryException
* @return bool
@@ -249,6 +254,7 @@
$id, $name = null, $description = null, $color = null, $image =
null, $icon = null
) {
$this->assertUser();
+ $this->selectValidList( $id, self::READ_LOCKING );
$data = array_filter( [
'rl_name' => $name,
@@ -264,29 +270,9 @@
$this->dbw->update(
'reading_list',
$data,
- [
- 'rl_id' => $id,
- 'rl_user_id' => $this->userId,
- ],
- __METHOD__
+ [ 'rl_id' => $id ]
);
- if ( $this->dbw->affectedRows() ) {
- return;
- }
-
- // failed; see what went wrong so we can return a useful error
message
- /** @var ReadingListRow $row */
- $row = $this->dbw->selectRow(
- 'reading_list',
- [ 'rl_user_id' ],
- [ 'rl_id' => $id ],
- __METHOD__
- );
- if ( !$row ) {
- throw new ReadingListRepositoryException(
'readinglists-db-error-no-such-list', [ $id ] );
- } elseif ( $row->rl_user_id != $this->userId ) {
- throw new ReadingListRepositoryException(
'readinglists-db-error-not-own-list', [ $id ] );
- } else {
+ if ( !$this->dbw->affectedRows() ) {
throw new LogicException( 'updateList failed for
unknown reason' );
}
}
@@ -299,6 +285,10 @@
*/
public function deleteList( $id ) {
$this->assertUser();
+ $row = $this->selectValidList( $id, self::READ_LOCKING );
+ if ( $row->rl_is_default ) {
+ throw new ReadingListRepositoryException(
'readinglists-db-error-cannot-delete-default-list' );
+ }
$this->dbw->update(
'reading_list',
@@ -306,39 +296,16 @@
'rl_deleted' => 1,
'rl_date_updated' => $this->dbw->timestamp(),
],
- [
- 'rl_id' => $id,
- 'rl_user_id' => $this->userId,
- // cannot delete the default list
- 'rl_is_default' => 0,
- ],
- __METHOD__
+ [ 'rl_id' => $id ]
);
- if ( $this->dbw->affectedRows() ) {
- $this->logger->info( 'Deleted list {list} for user
{user}', [
- 'list' => $id,
- 'user' => $this->userId,
- ] );
- return;
- }
-
- // failed; see what went wrong so we
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Escape single quotes in attributes
MaxSem has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/390168 )
Change subject: Escape single quotes in attributes
..
Escape single quotes in attributes
Replaces a long excuse in Html class not to call
Sanitizer::encodeAttribute() with a call to it.
In anything security related, excuses are a sign that you're doing
something wrong:)
Change-Id: Icf7f60d8cd6ea757d8f1999d638b82733001f68a
---
M includes/Html.php
M tests/parser/parserTests.txt
2 files changed, 18 insertions(+), 39 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/68/390168/1
diff --git a/includes/Html.php b/includes/Html.php
index 8fe4dbe..0988b05 100644
--- a/includes/Html.php
+++ b/includes/Html.php
@@ -544,28 +544,7 @@
if ( in_array( $key, self::$boolAttribs ) ) {
$ret .= " $key=\"\"";
} else {
- // Apparently we need to entity-encode \n, \r,
\t, although the
- // spec doesn't mention that. Since we're
doing strtr() anyway,
- // we may as well not call htmlspecialchars().
- // @todo FIXME: Verify that we actually need to
- // escape \n\r\t here, and explain why, exactly.
- // We could call Sanitizer::encodeAttribute()
for this, but we
- // don't because we're stubborn and like our
marginal savings on
- // byte size from not having to encode
unnecessary quotes.
- // The only difference between this transform
and the one by
- // Sanitizer::encodeAttribute() is ' is not
encoded.
- $map = [
- '&' => '&',
- '"' => '"',
- '>' => '>',
- // '<' allegedly allowed per spec
- // but breaks some tools if not escaped.
- "<" => '<',
- "\n" => '
',
- "\r" => '
',
- "\t" => ' '
- ];
- $ret .= " $key=$quote" . strtr( $value, $map )
. $quote;
+ $ret .= " $key=$quote" .
Sanitizer::encodeAttribute( $value ) . $quote;
}
}
return $ret;
diff --git a/tests/parser/parserTests.txt b/tests/parser/parserTests.txt
index 1204dbd..9c92da0 100644
--- a/tests/parser/parserTests.txt
+++ b/tests/parser/parserTests.txt
@@ -4911,7 +4911,7 @@
news:'a'b''c''d e
!! html/php
News: Stuff here
-news:'a'bcd e
+news:'a'b";>news:'a'bcd e
!! html/parsoid
News: Stuff here
@@ -5557,8 +5557,8 @@
[//foo.org/bar'baz bang]
!! html/php
-[1]
-bang
+[1]
+bang
!! html/parsoid
@@ -7973,7 +7973,7 @@
!! wikitext
[[Lista d''e paise d''o munno]]
!! html/php
-Lista
d''e paise d''o munno
+Lista d''e paise d''o munno
!! html/parsoid
Lista d''e paise d''o munno
@@ -8038,9 +8038,9 @@
[[''Pentecoste''|''Pentecoste'']]
!! html/php
File:Denys Savchenko
Pentecoste.jpg
-''Pentecoste''
-Pentecoste
-Pentecoste
+''Pentecoste''
+Pentecoste
+Pentecoste
!! html/parsoid
@@ -8333,7 +8333,7 @@
!! wikitext
[[Something]]'nice
!! html
-Something'nice
+Something'nice
!! end
@@ -15817,7 +15817,7 @@
!! wikitext
[[:Category:MediaWiki User's Guide]]
!! html
-Category:MediaWiki User's Guide
+Category:MediaWiki User's Guide
!! end
@@ -16794,7 +16794,7 @@
text & text[edit]
section 3
-text ' text[edit]
+text ' text[edit]
section 4
text " text[edit]
@@ -29427,7 +29427,7 @@
3 Тест
4 Тест
5 тест
-6 Hey < # " > % : '
+6 Hey < # " > % : '
@@ -29436,8 +29436,8 @@
Тест[edit]
Тест[edit]
тест[edit]
-Hey < # " > % : '[edit]
-#Foo bar #foo Bar #Тест #тест #Hey < # " > % : '
+Hey < # " > % : '[edit]
+#Foo bar #foo Bar #Тест #тест #Hey < # " > % : '
💩
#啤酒 #啤酒
@@ -29483,7 +29483,7 @@
Тест[edit]
Тест[edit]
тест[edit]
-Hey < # " > % :
'[edit]
+Hey < # " > % :
'[edit]
#Foo bar #foo Bar #Тест #тест #Hey < # " > % : '
.F0.9F.92.A9
#啤酒 #啤酒
@@ -29521,7 +29521,7 @@
3 Тест
4 Тест
5 тест
-6 Hey < # " > % : '
+6 Hey < # " > % : '
@@ -29530,8 +29530,8 @@
Тест[edit]
Тест[edit]
тест[edit]
-Hey < # "
> % : '[edit]
-#Foo bar #foo Bar #Тест #тест #Hey < # " > % : '
+Hey < # "
> % : '[edit]
+#Foo bar #foo Bar #Тест #тест #Hey < # " > % : '
💩
#啤酒 #啤酒
--
To view, visit https://gerrit.wikimedia.org/r/390168
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Icf7f60d8cd6ea757d8f1999d6
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Change disabled saved filter tooltip
Petar.petkovic has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/390167 ) Change subject: Change disabled saved filter tooltip .. Change disabled saved filter tooltip Bug: T179743 Change-Id: I2359bec7d89c6184dafbb5a1f90ea0f47cccd962 --- M languages/i18n/en.json 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/67/390167/1 diff --git a/languages/i18n/en.json b/languages/i18n/en.json index b463d95..5386927 100644 --- a/languages/i18n/en.json +++ b/languages/i18n/en.json @@ -1382,7 +1382,7 @@ "rcfilters-savedqueries-apply-and-setdefault-label": "Create default filter", "rcfilters-savedqueries-cancel-label": "Cancel", "rcfilters-savedqueries-add-new-title": "Save current filter settings", - "rcfilters-savedqueries-already-saved": "These filters are already saved", + "rcfilters-savedqueries-already-saved": "These filters are already saved. Change your settings to create a new Saved Filter.", "rcfilters-restore-default-filters": "Restore default filters", "rcfilters-clear-all-filters": "Clear all filters", "rcfilters-show-new-changes": "View newest changes", -- To view, visit https://gerrit.wikimedia.org/r/390167 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I2359bec7d89c6184dafbb5a1f90ea0f47cccd962 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Petar.petkovic ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] wikimedia...analytics[master]: Fetch inner hits and only the first page
EBernhardson has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/384989 )
Change subject: Fetch inner hits and only the first page
..
Fetch inner hits and only the first page
Change-Id: Ifc2dcb24111bfececa5c448f886f2db3a2b39aff
---
M oozie/query_clicks/hourly/query_clicks_hourly.hql
1 file changed, 4 insertions(+), 2 deletions(-)
Approvals:
EBernhardson: Looks good to me, approved
Bearloga: Looks good to me, but someone else must approve
jenkins-bot: Verified
Chelsyx: Checked; Looks good to me, but someone else must approve
diff --git a/oozie/query_clicks/hourly/query_clicks_hourly.hql
b/oozie/query_clicks/hourly/query_clicks_hourly.hql
index 8b825b5..7cb82eb 100644
--- a/oozie/query_clicks/hourly/query_clicks_hourly.hql
+++ b/oozie/query_clicks/hourly/query_clicks_hourly.hql
@@ -138,7 +138,7 @@
csrs.identity,
csrs.id AS request_set_token,
csrs.ts AS timestamp,
-csrs.hits
+get_main_search_request(csrs.wikiid, csrs.requests).hits AS hits
FROM
${source_cirrus_table} csrs
JOIN
@@ -156,9 +156,11 @@
-- Make sure we only extract from content index
AND SIZE(get_main_search_request(csrs.wikiid, csrs.requests).indices)
== 1
AND get_main_search_request(csrs.wikiid, csrs.requests).indices[0]
LIKE '%_content'
+-- Only fetch first page for simplicity
+AND get_main_search_request(csrs.wikiid, csrs.requests).hitsoffset = 0
-- We only want 'normal' requests here. if the user requested more than
-- the default 20 results filter them out
-AND SIZE(csrs.hits) <= 20
+AND SIZE(get_main_search_request(csrs.wikiid, csrs.requests).hits) <=
20
)
INSERT OVERWRITE TABLE
--
To view, visit https://gerrit.wikimedia.org/r/384989
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ifc2dcb24111bfececa5c448f886f2db3a2b39aff
Gerrit-PatchSet: 2
Gerrit-Project: wikimedia/discovery/analytics
Gerrit-Branch: master
Gerrit-Owner: DCausse
Gerrit-Reviewer: Bearloga
Gerrit-Reviewer: Chelsyx
Gerrit-Reviewer: EBernhardson
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] wikimedia...analytics[master]: Calculate click data for top queries
EBernhardson has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/317019 )
Change subject: Calculate click data for top queries
..
Calculate click data for top queries
Joins search request logs against the web requests table to locate
click throughs on search requests on a daily basis. This is the first
step in figuring out a way to judge engine relevance based on user click
throughs.
* Applies some of dcausse's approaches to limit the search logs to
full text searches performed via web on Special:Search.
* Takes +1 hour of webrequest data as compared to search log data, to
ensure we collect the clicks against searches near the end of the last
hour
* Applies naive sessionization of queries, defining a new session as
being more than 30 minutes without a search query from a user
identity.
* Identities performing more than 1k queries per day are filtered out of
the daily table for performance reasons. It may be desirable to limit
even further in sources that consume this data.
Bug: T162054
Depends-On: I67d5f0e7674f970b353ab5992fec1431f4592256
Depends-On: I458e7ac724fefe813732b48fcfcef4728359fca9
Change-Id: I09f253849d8a1d28a3c26dc6b0f60233074d6a90
---
A hive/query_clicks/create_query_clicks_daily.hql
A hive/query_clicks/create_query_clicks_hourly.hql
M oozie/datasets.xml
A oozie/query_clicks/daily/coordinator.properties
A oozie/query_clicks/daily/coordinator.xml
A oozie/query_clicks/daily/drop_query_clicks_hourly_partitions.hql
A oozie/query_clicks/daily/query_clicks_daily.hql
A oozie/query_clicks/daily/workflow.xml
A oozie/query_clicks/datasets.xml
A oozie/query_clicks/hourly/coordinator.properties
A oozie/query_clicks/hourly/coordinator.xml
A oozie/query_clicks/hourly/query_clicks_hourly.hql
A oozie/query_clicks/hourly/workflow.xml
13 files changed, 1,178 insertions(+), 0 deletions(-)
Approvals:
jenkins-bot: Verified
DCausse: Looks good to me, approved
diff --git a/hive/query_clicks/create_query_clicks_daily.hql
b/hive/query_clicks/create_query_clicks_daily.hql
new file mode 100644
index 000..1c8ff68
--- /dev/null
+++ b/hive/query_clicks/create_query_clicks_daily.hql
@@ -0,0 +1,19 @@
+CREATE TABLE `discovery.query_clicks_daily`(
+ `query` string,
+ `q_by_ip_day` int,
+ `timestamp` bigint,
+ `wikiid` string,
+ `project` string,
+ `hits`
array>,
+ `clicks` array>,
+ `session_id` string
+)
+PARTITIONED BY (
+ `year` int,
+ `month` int,
+ `day` int
+)
+STORED AS PARQUET
+LOCATION 'hdfs://analytics-hadoop/wmf/data/discovery/query_clicks/daily'
+;
+
diff --git a/hive/query_clicks/create_query_clicks_hourly.hql
b/hive/query_clicks/create_query_clicks_hourly.hql
new file mode 100644
index 000..77f5971
--- /dev/null
+++ b/hive/query_clicks/create_query_clicks_hourly.hql
@@ -0,0 +1,20 @@
+CREATE TABLE `discovery.query_clicks_hourly` (
+ `query` string,
+ `ip` string,
+ `identity` string,
+ `timestamp` bigint,
+ `wikiid` string,
+ `project` string,
+ `hits`
array>,
+ `clicks` array>
+)
+PARTITIONED BY (
+ `year` int,
+ `month` int,
+ `day` int,
+ `hour` int
+)
+STORED AS PARQUET
+LOCATION 'hdfs://analytics-hadoop/wmf/data/discovery/query_clicks/hourly'
+;
+
diff --git a/oozie/datasets.xml b/oozie/datasets.xml
index 68c7ec2..e33f73d 100644
--- a/oozie/datasets.xml
+++ b/oozie/datasets.xml
@@ -31,4 +31,5 @@
${popularity_score_data_directory}/agg_days=${days_aggregated}/year=${YEAR}/month=${"$"}{MONTH
+ 0}/day=${"$"}{DAY + 0}
_SUCCESS
+
diff --git a/oozie/query_clicks/daily/coordinator.properties
b/oozie/query_clicks/daily/coordinator.properties
new file mode 100644
index 000..3874b0b
--- /dev/null
+++ b/oozie/query_clicks/daily/coordinator.properties
@@ -0,0 +1,63 @@
+# Configures a coordinator to manage automatically merging
+# query_clicks_hourly into a daily table.
+#
+# Any of the following properties are overidable with -D.
+# Usage:
+# oozie job -Duser=$USER -Dstart_time=2016-12-01T00:00Z -submit \
+# -config oozie/query_clicks/daily/coordinator.properties
+#
+# NOTE: Both *_oozie_directory must be synced to HDFS so that all relevant
+#.xml files exist there when this job is submitted.
+
+# Base path in HDFS to this repository oozie files.
+# Other files will be used relative to this path.
+discovery_oozie_directory =
${name_node}/wmf/discovery/current/oozie
+
+# Base path in HDFS to the analytics team oozie files.
+# Other files will be used relative to this path
+refinery_directory= ${name_node}/wmf/refinery/current
+analytics_oozie_directory = ${refinery_directory}/oozie
+
+name_node = hdfs://analytics-hadoop
+job_tracker =
resourcemanager.analytics.eqiad.wmnet:8032
+queue_name= default
+
+user = hdfs
+
+# HDFS path to coordinator to run to generate
[MediaWiki-commits] [Gerrit] wikimedia-ui-base[master]: Tag v0.10.0
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/390163 )
Change subject: Tag v0.10.0
..
Tag v0.10.0
Change-Id: I81b526657d773fbb1900740caffa3f61e7b47295
---
M History.md
M package.json
M wikimedia-ui-base.css
M wikimedia-ui-base.less
4 files changed, 14 insertions(+), 4 deletions(-)
Approvals:
Jdrewniak: Looks good to me, approved
jenkins-bot: Verified
diff --git a/History.md b/History.md
index 96dcf40..f6b7bb9 100644
--- a/History.md
+++ b/History.md
@@ -1,5 +1,15 @@
# WikimediaUI Base Variables Release History
+## v0.10.0 (2017-11-08)
+* Add mobile and desktop thresholds (Volker E)
+* Add `border-color-wikitable` variable (Volker E)
+* Add `box-shadow-card` variable (Volker E)
+* Add `font-family-monospace` variable (Volker E)
+* Replace wrong `border-color-base--disabled` value (Volker E)
+* Clarify referencing color palette vars & use LESS style comments (Volker E)
+* README: Use clearer and more consistent description (Volker E)
+* build: Bump dependencies to latest (Volker E)
+
## v0.9.2 (2017-05-25)
* build: Remove `private` flag from package.json (Volker E)
@@ -27,9 +37,9 @@
* [BREAKING CHANGE] Turn `*highlight` variable to appropriate property (Volker
E)
* [BREAKING CHANGE] Refine variable naming (Volker E)
* Introduce WikimediaUI color labels (Volker E)
+* Add `background-color-framed--active` color (Julien Girault)
* Update “destructive” colors to tweaked color palette (Volker E)
* Increase contrast of `background-color-framed--active` color (Volker E)
-* Add `background-color-framed--active` color (Julien Girault)
* Replace abandoned color from early palette iteration (Volker E)
* Set placeholder text to WCAG 2.0 level AA compliant color (Volker E)
diff --git a/package.json b/package.json
index 886aa54..1bb32f5 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "wikimedia-ui-base",
- "version": "0.9.2",
+ "version": "0.10.0",
"description": "Wikimedia Foundation user interface base variables files",
"keywords": [
"css",
diff --git a/wikimedia-ui-base.css b/wikimedia-ui-base.css
index 3957f9b..10ca2ce 100644
--- a/wikimedia-ui-base.css
+++ b/wikimedia-ui-base.css
@@ -1,5 +1,5 @@
/**
- * WikimediaUI Base v0.9.2
+ * WikimediaUI Base v0.10.0
* Wikimedia Foundation user interface base variables
*/
diff --git a/wikimedia-ui-base.less b/wikimedia-ui-base.less
index 9316f34..7976e62 100644
--- a/wikimedia-ui-base.less
+++ b/wikimedia-ui-base.less
@@ -1,5 +1,5 @@
/**
- * WikimediaUI Base v0.9.2
+ * WikimediaUI Base v0.10.0
* Wikimedia Foundation user interface base variables
*/
--
To view, visit https://gerrit.wikimedia.org/r/390163
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I81b526657d773fbb1900740caffa3f61e7b47295
Gerrit-PatchSet: 2
Gerrit-Project: wikimedia-ui-base
Gerrit-Branch: master
Gerrit-Owner: VolkerE
Gerrit-Reviewer: Jdrewniak
Gerrit-Reviewer: Prtksxna
Gerrit-Reviewer: VolkerE
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] wikimedia-ui-base[master]: build: Bump dependencies to latest
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/390166 )
Change subject: build: Bump dependencies to latest
..
build: Bump dependencies to latest
grunt-stylelint 0.8.0 → 0.9.0
stylelint 7.8.0 → 8.2.0
stylelint-config-wikimedia 0.4.1 → 0.4.2
Change-Id: I210f406f2d3aa6d9f862a0c6126e60374466555b
---
M package.json
1 file changed, 3 insertions(+), 3 deletions(-)
Approvals:
Jdrewniak: Looks good to me, approved
jenkins-bot: Verified
diff --git a/package.json b/package.json
index c74c9b6..886aa54 100644
--- a/package.json
+++ b/package.json
@@ -19,8 +19,8 @@
"devDependencies": {
"grunt": "1.0.1",
"grunt-contrib-watch": "1.0.0",
-"grunt-stylelint": "0.8.0",
-"stylelint": "7.8.0",
-"stylelint-config-wikimedia": "0.4.1"
+"grunt-stylelint": "0.9.0",
+"stylelint": "8.2.0",
+"stylelint-config-wikimedia": "0.4.2"
}
}
--
To view, visit https://gerrit.wikimedia.org/r/390166
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I210f406f2d3aa6d9f862a0c6126e60374466555b
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia-ui-base
Gerrit-Branch: master
Gerrit-Owner: VolkerE
Gerrit-Reviewer: Jdrewniak
Gerrit-Reviewer: Prtksxna
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: dns400[12] install params
RobH has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/390164 )
Change subject: dns400[12] install params
..
dns400[12] install params
setting basic installation parameters
Bug: T179204
Change-Id: I785eca288a7c682a4df10c43f8766738dede30e2
---
M manifests/site.pp
M modules/install_server/files/autoinstall/netboot.cfg
M modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
3 files changed, 22 insertions(+), 4 deletions(-)
Approvals:
jenkins-bot: Verified
RobH: Looks good to me, approved
diff --git a/manifests/site.pp b/manifests/site.pp
index 028e5fc..9195bef 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -748,6 +748,11 @@
interface::add_ip6_mapped { 'main': }
}
+# new dns systems T179204
+node /^dns400[12]\.ulsfo\.wmnet$/ {
+role(spare::system)
+}
+
# Druid analytics-eqiad (non public) servers.
# These power internal backends and queries.
# https://wikitech.wikimedia.org/wiki/Analytics/Data_Lake#Druid
diff --git a/modules/install_server/files/autoinstall/netboot.cfg
b/modules/install_server/files/autoinstall/netboot.cfg
index 7e1a2c3..cb3097d 100755
--- a/modules/install_server/files/autoinstall/netboot.cfg
+++ b/modules/install_server/files/autoinstall/netboot.cfg
@@ -55,7 +55,7 @@
heze|neodymium|oxygen|terbium) echo partman/lvm.cfg ;; \
ruthenium|ocg1003) echo partman/raid1-lvm.cfg ;; \
bast[123]*) echo partman/raid1-lvm-ext4-srv.cfg ;; \
-bast4002) echo partman/raid1-lvm-ext4-srv-noswap.cfg;; \
+bast4002|dns400[12]) echo partman/raid1-lvm-ext4-srv-noswap.cfg;; \
californium|dbproxy10[0-1][0-9]|iridium) echo partman/raid1.cfg ;; \
helium|tmh1002|hydrogen|chromium) echo partman/raid1-1partition.cfg ;;
\
lawrencium|notebook1001|notebook1002|tungsten|labsdb1009|labsdb101[0-1]|labvirt1019|labvirt1020)
echo partman/db.cfg ;; \
diff --git a/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
b/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
index 26209cc..0237416 100644
--- a/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
+++ b/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
@@ -313,10 +313,9 @@
host bast4002 {
hardware ethernet F4:E9:D4:BA:EE:D0;
fixed-address bast4002.wikimedia.org;
-
next-server 198.35.26.5; # bast4001 (tftp server)
-option pxelinux.pathprefix
"http://apt.wikimedia.org/tftpboot/jessie-installer/";;
-filename "lpxelinux.0";
+option pxelinux.pathprefix "stretch-installer/";
+filename "stretch-installer/debian-installer/amd64/pxelinux.0";
}
host californium {
@@ -1809,6 +1808,20 @@
fixed-address druid1006.eqiad.wmnet;
}
+host dns4001 {
+hardware ethernet F4:E9:D4:BA:F3:90;
+fixed-address dns4001.wikimedia.org;
+option pxelinux.pathprefix "stretch-installer/";
+filename "stretch-installer/debian-installer/amd64/pxelinux.0";
+}
+
+host dns4002 {
+hardware ethernet F4:E9:D4:BA:BF:70;
+fixed-address dns4002.wikimedia.org;
+option pxelinux.pathprefix "stretch-installer/";
+filename "stretch-installer/debian-installer/amd64/pxelinux.0";
+}
+
host dumpsdata1001 {
hardware ethernet 18:66:DA:FA:5E:A0;
fixed-address dumpsdata1001.eqiad.wmnet;
--
To view, visit https://gerrit.wikimedia.org/r/390164
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I785eca288a7c682a4df10c43f8766738dede30e2
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: RobH
Gerrit-Reviewer: RobH
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] wikimedia-ui-base[master]: build: Bump dependencies to latest
VolkerE has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/390166 )
Change subject: build: Bump dependencies to latest
..
build: Bump dependencies to latest
grunt-stylelint 0.8.0 → 0.9.0
stylelint 7.8.0 → 8.2.0
stylelint-config-wikimedia 0.4.1 → 0.4.2
Change-Id: I210f406f2d3aa6d9f862a0c6126e60374466555b
---
M package.json
1 file changed, 3 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/wikimedia-ui-base
refs/changes/66/390166/1
diff --git a/package.json b/package.json
index c74c9b6..886aa54 100644
--- a/package.json
+++ b/package.json
@@ -19,8 +19,8 @@
"devDependencies": {
"grunt": "1.0.1",
"grunt-contrib-watch": "1.0.0",
-"grunt-stylelint": "0.8.0",
-"stylelint": "7.8.0",
-"stylelint-config-wikimedia": "0.4.1"
+"grunt-stylelint": "0.9.0",
+"stylelint": "8.2.0",
+"stylelint-config-wikimedia": "0.4.2"
}
}
--
To view, visit https://gerrit.wikimedia.org/r/390166
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I210f406f2d3aa6d9f862a0c6126e60374466555b
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia-ui-base
Gerrit-Branch: master
Gerrit-Owner: VolkerE
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...CirrusSearch[wmf/1.31.0-wmf.6]: Try to unify phrase rescore with RescoreBuilder
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/390162 )
Change subject: Try to unify phrase rescore with RescoreBuilder
..
Try to unify phrase rescore with RescoreBuilder
- kill Searcher::installBoosts
- single place to build rescore
- all sort options handled in the same switch/case
benefits: allow to customize positioning of the phrase rescore
drawbacks: rescore profiles need to add a placeholder for the phrase rescore
Bug: T178906
Change-Id: I438153c9fe52d8275868ddf3f0a0bd7a0cc5627f
(cherry picked from commit bc5a8a63929c1e4cbec65ef16b5221c4c1264285)
---
M includes/Query/FullTextQueryStringQueryBuilder.php
M includes/Search/RescoreBuilders.php
M includes/Search/SearchContext.php
M includes/Searcher.php
M profiles/RescoreProfiles.config.php
M tests/unit/fixtures/searchText/ltr_001.query
6 files changed, 97 insertions(+), 80 deletions(-)
Approvals:
EBernhardson: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/Query/FullTextQueryStringQueryBuilder.php
b/includes/Query/FullTextQueryStringQueryBuilder.php
index d1883a5..0c727b3 100644
--- a/includes/Query/FullTextQueryStringQueryBuilder.php
+++ b/includes/Query/FullTextQueryStringQueryBuilder.php
@@ -223,19 +223,12 @@
$rescoreFields = $nonAllFields;
}
- $searchContext->addRescore( [
- 'window_size' => $this->config->get(
'CirrusSearchPhraseRescoreWindowSize' ),
- 'query' => [
- 'rescore_query' =>
$this->buildPhraseRescoreQuery(
+ $searchContext->setPhraseRescoreQuery(
$this->buildPhraseRescoreQuery(
$searchContext,
$rescoreFields,
$this->queryStringQueryString,
$this->config->getElement(
'CirrusSearchPhraseSlop', 'boost' )
- ),
- 'query_weight' => 1.0,
- 'rescore_query_weight' =>
$this->config->get( 'CirrusSearchPhraseRescoreBoost' ),
- ]
- ] );
+ ) );
}
if ( $showSuggestion ) {
@@ -269,7 +262,6 @@
'query' => $this->queryStringQueryString,
'default_operator' => 'AND',
] ] ) );
- $searchContext->clearRescore();
return true;
}
@@ -639,9 +631,7 @@
// Queries with the quote already contain a phrase query and we
// can't build phrase queries out of phrase queries at this
// point.
- if ( $this->config->get( 'CirrusSearchPhraseRescoreBoost' ) >
0.0 &&
- $this->config->get(
'CirrusSearchPhraseRescoreWindowSize' ) &&
- !$searchContext->isSpecialKeywordUsed() &&
+ if ( !$searchContext->isSpecialKeywordUsed() &&
strpos( $this->queryStringQueryString, '"' ) === false
&&
( $this->useTokenCountRouter || strpos(
$this->queryStringQueryString, ' ' ) !== false )
) {
diff --git a/includes/Search/RescoreBuilders.php
b/includes/Search/RescoreBuilders.php
index f63826d..12d4054 100644
--- a/includes/Search/RescoreBuilders.php
+++ b/includes/Search/RescoreBuilders.php
@@ -52,6 +52,7 @@
const FUNCTION_SCORE_TYPE = "function_score";
const LTR_TYPE = "ltr";
+ const PHRASE = "phrase";
/**
* @var SearchContext
@@ -82,11 +83,14 @@
$rescores = [];
foreach ( $this->profile['rescore'] as $rescoreDef ) {
$windowSize = $this->windowSize( $rescoreDef );
+ if ( $windowSize <= 0 ) {
+ continue;
+ }
$rescore = [
'window_size' => $windowSize,
];
- $rescore['query'] = array_intersect_key( $rescoreDef,
array_flip( self::$rescoreMainParams ) );
+ $rescore['query'] = $this->prepareQueryParams(
$rescoreDef );
$rescoreQuery = $this->buildRescoreQuery( $rescoreDef );
if ( $rescoreQuery === null ) {
continue;
@@ -111,6 +115,8 @@
return $funcChain->buildRescoreQuery();
case self::LTR_TYPE:
return $this->buildLtrQuery( $rescoreDef['model'] );
+ case self::PHRASE:
+ return $th
[MediaWiki-commits] [Gerrit] operations/puppet[production]: clean up dumps web server rsync to its fallback
ArielGlenn has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/390165 )
Change subject: clean up dumps web server rsync to its fallback
..
clean up dumps web server rsync to its fallback
No need for a python script any more, just rsync the relevant
directories.
Move the destination host name out to a profile.
Bug: T179942
Change-Id: I48493292def0c0630d960aaa403d2f87ff59137b
---
D modules/dumps/files/copying/rsync-dumps.py
A modules/dumps/files/copying/rsync_from_webserver.sh
M modules/dumps/manifests/copying/peers.pp
M modules/profile/manifests/dumps/web/xmldumps_active.pp
4 files changed, 62 insertions(+), 225 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/65/390165/1
diff --git a/modules/dumps/files/copying/rsync-dumps.py
b/modules/dumps/files/copying/rsync-dumps.py
deleted file mode 100644
index 00aba76..000
--- a/modules/dumps/files/copying/rsync-dumps.py
+++ /dev/null
@@ -1,218 +0,0 @@
-import sys
-import subprocess
-import socket
-
-# This file is managed by puppet!
-# puppet:///modules/dumps/copying/rsync-dumps.py
-###
-
-
-class Rsyncer(object):
-def __init__(self, max_bw, dryrun, list_only):
-self.max_bw = str(max_bw)
-self.dryrun = dryrun
-self.list_only = list_only
-self.host = socket.gethostname()
-self.rsync_args = ["--bwlimit=" + self.max_bw, '-a', '--delete']
-if self.list_only:
-self.rsync_args.append("--list-only")
-else:
-self.rsync_args.append("-q")
-self.excludes = ['--exclude=wikidump_*', '--exclude=md5temp.*',
'--exclude=*.inprog']
-
-def get_excludes_for_job(self, jobname, host_info):
-excludes = []
-for job in host_info:
-# 'exclude': { 'dir': 'other', 'job': 'public' }
-if (job != jobname and 'exclude' in host_info[job] and
-host_info[job]['exclude']['job'] == jobname):
-excludes.append(host_info[job]['exclude']['dir'])
-return excludes
-
-def rsync_all(self, host_info):
-for job in host_info:
-excludes = self.get_excludes_for_job(job, host_info)
-
-hosts = host_info[job]['hosts']
-if self.host not in hosts:
-# no rsync job info for this host
-continue
-
-targets = [h for h in hosts if h != self.host]
-if not len(targets):
-# no hosts to rsync to
-continue
-
-if 'primary' in hosts[self.host]:
-# this host rsyncs everything except a specific list of dirs
-dir_args = ["--exclude=/" + d.strip('/') + "/"
-for d in excludes]
-for targ in targets:
-if 'dirs' in hosts[targ]:
-dir_args.extend(["--exclude=/" + d.strip('/') + "/"
- for d in hosts[targ]['dirs']])
-
-elif 'dirs' in hosts[self.host]:
-# this host keeps data in a specific list of dirs and must
-# rsync those everywhere else
-
-dirs_to_include = [d.strip('/')
- for d in hosts[self.host]['dirs']]
-if not len(dirs_to_include):
-# no specific dirs to sync
-continue
-
-dir_args = ["--include=/" + d + "/" for d in dirs_to_include]
-dir_args.extend(["--include=/" + d + "/**"
- for d in dirs_to_include])
-dir_args.append('--exclude=*')
-
-else:
-# not a primary, no specific dirs to sync, do nothing
-continue
-
-self.do_rsync(host_info[job]['source'], host_info[job]['dest'],
- targets, dir_args)
-
-def do_rsync(self, src, dest, targets, dir_args):
-for targ in targets:
-command = ["/usr/bin/pgrep", "-u", "root",
- "-f", "%s::%s" % (targ, dest)]
-try:
-subprocess.check_output(command)
-# return code 0 = already running
-if self.dryrun:
-print "would skip rsync to", "%s::%s" % (targ, dest)
-continue
-except subprocess.CalledProcessError as err:
-if err.returncode != 1:
-# genuine error
-raise
-
-command = (["/usr/bin/rsync"] + self.rsync_args + self.excludes +
- dir_args + [src, "%s::%s" % (targ, dest)])
-if self.dryrun:
-print "would run", " ".join(command)
-else:
-output = None
-try:
-output = subprocess.check_output(command)
-
[MediaWiki-commits] [Gerrit] operations/puppet[production]: dns400[12] install params
RobH has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/390164 )
Change subject: dns400[12] install params
..
dns400[12] install params
setting basic installation parameters
Bug: T179204
Change-Id: I785eca288a7c682a4df10c43f8766738dede30e2
---
M manifests/site.pp
M modules/install_server/files/autoinstall/netboot.cfg
M modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
3 files changed, 22 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/64/390164/1
diff --git a/manifests/site.pp b/manifests/site.pp
index 028e5fc..9195bef 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -748,6 +748,11 @@
interface::add_ip6_mapped { 'main': }
}
+# new dns systems T179204
+node /^dns400[12]\.ulsfo\.wmnet$/ {
+role(spare::system)
+}
+
# Druid analytics-eqiad (non public) servers.
# These power internal backends and queries.
# https://wikitech.wikimedia.org/wiki/Analytics/Data_Lake#Druid
diff --git a/modules/install_server/files/autoinstall/netboot.cfg
b/modules/install_server/files/autoinstall/netboot.cfg
index 7e1a2c3..cb3097d 100755
--- a/modules/install_server/files/autoinstall/netboot.cfg
+++ b/modules/install_server/files/autoinstall/netboot.cfg
@@ -55,7 +55,7 @@
heze|neodymium|oxygen|terbium) echo partman/lvm.cfg ;; \
ruthenium|ocg1003) echo partman/raid1-lvm.cfg ;; \
bast[123]*) echo partman/raid1-lvm-ext4-srv.cfg ;; \
-bast4002) echo partman/raid1-lvm-ext4-srv-noswap.cfg;; \
+bast4002|dns400[12]) echo partman/raid1-lvm-ext4-srv-noswap.cfg;; \
californium|dbproxy10[0-1][0-9]|iridium) echo partman/raid1.cfg ;; \
helium|tmh1002|hydrogen|chromium) echo partman/raid1-1partition.cfg ;;
\
lawrencium|notebook1001|notebook1002|tungsten|labsdb1009|labsdb101[0-1]|labvirt1019|labvirt1020)
echo partman/db.cfg ;; \
diff --git a/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
b/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
index 26209cc..f77ba09 100644
--- a/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
+++ b/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
@@ -313,10 +313,9 @@
host bast4002 {
hardware ethernet F4:E9:D4:BA:EE:D0;
fixed-address bast4002.wikimedia.org;
-
next-server 198.35.26.5; # bast4001 (tftp server)
-option pxelinux.pathprefix
"http://apt.wikimedia.org/tftpboot/jessie-installer/";;
-filename "lpxelinux.0";
+option pxelinux.pathprefix "stretch-installer/";
+filename "stretch-installer/debian-installer/amd64/pxelinux.0";
}
host californium {
@@ -1809,6 +1808,20 @@
fixed-address druid1006.eqiad.wmnet;
}
+host dns4001 {
+hardware ethernet F4:E9:D4:BA:F3:90;
+fixed-address dns4001.ulsfo.wmnet;
+option pxelinux.pathprefix "stretch-installer/";
+filename "stretch-installer/debian-installer/amd64/pxelinux.0";
+}
+
+host dns4002 {
+hardware ethernet F4:E9:D4:BA:BF:70;
+fixed-address dns4002.ulsfo.wmnet;
+option pxelinux.pathprefix "stretch-installer/";
+filename "stretch-installer/debian-installer/amd64/pxelinux.0";
+}
+
host dumpsdata1001 {
hardware ethernet 18:66:DA:FA:5E:A0;
fixed-address dumpsdata1001.eqiad.wmnet;
--
To view, visit https://gerrit.wikimedia.org/r/390164
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I785eca288a7c682a4df10c43f8766738dede30e2
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: RobH
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] wikimedia-ui-base[master]: Tag v0.10.0
VolkerE has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/390163 )
Change subject: Tag v0.10.0
..
Tag v0.10.0
Change-Id: I81b526657d773fbb1900740caffa3f61e7b47295
---
M History.md
M package.json
M wikimedia-ui-base.css
M wikimedia-ui-base.less
4 files changed, 13 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/wikimedia-ui-base
refs/changes/63/390163/1
diff --git a/History.md b/History.md
index 96dcf40..741d10a 100644
--- a/History.md
+++ b/History.md
@@ -1,5 +1,14 @@
# WikimediaUI Base Variables Release History
+## v0.10.0 (2017-11-08)
+* Add mobile and desktop thresholds (Volker E)
+* Add `border-color-wikitable` variable (Volker E)
+* Add `box-shadow-card` variable (Volker E)
+* Add `font-family-monospace` variable (Volker E)
+* Replace wrong `border-color-base--disabled` value (Volker E)
+* Clarify referencing color palette vars & use LESS style comments (Volker E)
+* README: Use clearer and more consistent description (Volker E)
+
## v0.9.2 (2017-05-25)
* build: Remove `private` flag from package.json (Volker E)
@@ -27,9 +36,9 @@
* [BREAKING CHANGE] Turn `*highlight` variable to appropriate property (Volker
E)
* [BREAKING CHANGE] Refine variable naming (Volker E)
* Introduce WikimediaUI color labels (Volker E)
+* Add `background-color-framed--active` color (Julien Girault)
* Update “destructive” colors to tweaked color palette (Volker E)
* Increase contrast of `background-color-framed--active` color (Volker E)
-* Add `background-color-framed--active` color (Julien Girault)
* Replace abandoned color from early palette iteration (Volker E)
* Set placeholder text to WCAG 2.0 level AA compliant color (Volker E)
diff --git a/package.json b/package.json
index c74c9b6..068df89 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "wikimedia-ui-base",
- "version": "0.9.2",
+ "version": "0.10.0",
"description": "Wikimedia Foundation user interface base variables files",
"keywords": [
"css",
diff --git a/wikimedia-ui-base.css b/wikimedia-ui-base.css
index 3957f9b..10ca2ce 100644
--- a/wikimedia-ui-base.css
+++ b/wikimedia-ui-base.css
@@ -1,5 +1,5 @@
/**
- * WikimediaUI Base v0.9.2
+ * WikimediaUI Base v0.10.0
* Wikimedia Foundation user interface base variables
*/
diff --git a/wikimedia-ui-base.less b/wikimedia-ui-base.less
index 9316f34..7976e62 100644
--- a/wikimedia-ui-base.less
+++ b/wikimedia-ui-base.less
@@ -1,5 +1,5 @@
/**
- * WikimediaUI Base v0.9.2
+ * WikimediaUI Base v0.10.0
* Wikimedia Foundation user interface base variables
*/
--
To view, visit https://gerrit.wikimedia.org/r/390163
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I81b526657d773fbb1900740caffa3f61e7b47295
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia-ui-base
Gerrit-Branch: master
Gerrit-Owner: VolkerE
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...ShortUrl[master]: Make compatible with SemanticMediaWiki
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/389994 )
Change subject: Make compatible with SemanticMediaWiki
..
Make compatible with SemanticMediaWiki
Bug: T78018
Change-Id: I74b828d294d850c80b9506bb169e4031577fc97d
---
M ShortUrl.hooks.php
1 file changed, 3 insertions(+), 3 deletions(-)
Approvals:
Legoktm: Looks good to me, approved
jenkins-bot: Verified
diff --git a/ShortUrl.hooks.php b/ShortUrl.hooks.php
index 3374d55..fb59d6f 100644
--- a/ShortUrl.hooks.php
+++ b/ShortUrl.hooks.php
@@ -19,9 +19,9 @@
public static function setupUrlRouting( $router ) {
global $wgShortUrlTemplate;
if ( $wgShortUrlTemplate ) {
- $router->add( $wgShortUrlTemplate,
- [ 'title' => SpecialPage::getTitleFor(
'ShortUrl', '$1' )->getPrefixedText() ]
- );
+ // Hardcode full title to avoid T78018. It shouldn't
matter because the
+ // page redirects immediately.
+ $router->add( $wgShortUrlTemplate, [ 'title' =>
'Special:ShortUrl/$1' ] );
}
return true;
}
--
To view, visit https://gerrit.wikimedia.org/r/389994
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I74b828d294d850c80b9506bb169e4031577fc97d
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/ShortUrl
Gerrit-Branch: master
Gerrit-Owner: Nikerabbit
Gerrit-Reviewer: Legoktm
Gerrit-Reviewer: Reedy
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...CirrusSearch[wmf/1.31.0-wmf.6]: Try to unify phrase rescore with RescoreBuilder
EBernhardson has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/390162 )
Change subject: Try to unify phrase rescore with RescoreBuilder
..
Try to unify phrase rescore with RescoreBuilder
- kill Searcher::installBoosts
- single place to build rescore
- all sort options handled in the same switch/case
benefits: allow to customize positioning of the phrase rescore
drawbacks: rescore profiles need to add a placeholder for the phrase rescore
Bug: T178906
Change-Id: I438153c9fe52d8275868ddf3f0a0bd7a0cc5627f
(cherry picked from commit bc5a8a63929c1e4cbec65ef16b5221c4c1264285)
---
M includes/Query/FullTextQueryStringQueryBuilder.php
M includes/Search/RescoreBuilders.php
M includes/Search/SearchContext.php
M includes/Searcher.php
M profiles/RescoreProfiles.config.php
M tests/unit/fixtures/searchText/ltr_001.query
6 files changed, 97 insertions(+), 80 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CirrusSearch
refs/changes/62/390162/1
diff --git a/includes/Query/FullTextQueryStringQueryBuilder.php
b/includes/Query/FullTextQueryStringQueryBuilder.php
index d1883a5..0c727b3 100644
--- a/includes/Query/FullTextQueryStringQueryBuilder.php
+++ b/includes/Query/FullTextQueryStringQueryBuilder.php
@@ -223,19 +223,12 @@
$rescoreFields = $nonAllFields;
}
- $searchContext->addRescore( [
- 'window_size' => $this->config->get(
'CirrusSearchPhraseRescoreWindowSize' ),
- 'query' => [
- 'rescore_query' =>
$this->buildPhraseRescoreQuery(
+ $searchContext->setPhraseRescoreQuery(
$this->buildPhraseRescoreQuery(
$searchContext,
$rescoreFields,
$this->queryStringQueryString,
$this->config->getElement(
'CirrusSearchPhraseSlop', 'boost' )
- ),
- 'query_weight' => 1.0,
- 'rescore_query_weight' =>
$this->config->get( 'CirrusSearchPhraseRescoreBoost' ),
- ]
- ] );
+ ) );
}
if ( $showSuggestion ) {
@@ -269,7 +262,6 @@
'query' => $this->queryStringQueryString,
'default_operator' => 'AND',
] ] ) );
- $searchContext->clearRescore();
return true;
}
@@ -639,9 +631,7 @@
// Queries with the quote already contain a phrase query and we
// can't build phrase queries out of phrase queries at this
// point.
- if ( $this->config->get( 'CirrusSearchPhraseRescoreBoost' ) >
0.0 &&
- $this->config->get(
'CirrusSearchPhraseRescoreWindowSize' ) &&
- !$searchContext->isSpecialKeywordUsed() &&
+ if ( !$searchContext->isSpecialKeywordUsed() &&
strpos( $this->queryStringQueryString, '"' ) === false
&&
( $this->useTokenCountRouter || strpos(
$this->queryStringQueryString, ' ' ) !== false )
) {
diff --git a/includes/Search/RescoreBuilders.php
b/includes/Search/RescoreBuilders.php
index f63826d..12d4054 100644
--- a/includes/Search/RescoreBuilders.php
+++ b/includes/Search/RescoreBuilders.php
@@ -52,6 +52,7 @@
const FUNCTION_SCORE_TYPE = "function_score";
const LTR_TYPE = "ltr";
+ const PHRASE = "phrase";
/**
* @var SearchContext
@@ -82,11 +83,14 @@
$rescores = [];
foreach ( $this->profile['rescore'] as $rescoreDef ) {
$windowSize = $this->windowSize( $rescoreDef );
+ if ( $windowSize <= 0 ) {
+ continue;
+ }
$rescore = [
'window_size' => $windowSize,
];
- $rescore['query'] = array_intersect_key( $rescoreDef,
array_flip( self::$rescoreMainParams ) );
+ $rescore['query'] = $this->prepareQueryParams(
$rescoreDef );
$rescoreQuery = $this->buildRescoreQuery( $rescoreDef );
if ( $rescoreQuery === null ) {
continue;
@@ -111,6 +115,8 @@
return $funcChain->buildRescoreQuery();
case self::LTR_TYPE:
return $this->buildLtrQuery( $rescoreDef['model'] );
+ case self::PHRASE:
+
[MediaWiki-commits] [Gerrit] operations/dns[master]: setting dns400[12] mgmt dns entries
RobH has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/390161 ) Change subject: setting dns400[12] mgmt dns entries .. setting dns400[12] mgmt dns entries they already had asset tag entries, just adding hostnames Bug: T179204 Change-Id: I07929e8fa04a8f7d6490bee78b1bb02486a3fbc1 --- M templates/10.in-addr.arpa M templates/wmnet 2 files changed, 4 insertions(+), 0 deletions(-) Approvals: jenkins-bot: Verified RobH: Looks good to me, approved diff --git a/templates/10.in-addr.arpa b/templates/10.in-addr.arpa index c840e5e..a9a2c33 100644 --- a/templates/10.in-addr.arpa +++ b/templates/10.in-addr.arpa @@ -2811,7 +2811,9 @@ 12 1H IN PTR WMF7218.mgmt.ulsfo.wmnet. 12 1H IN PTR bast4002.mgmt.ulsfo.wmnet. +15 1H IN PTR dns4001.mgmt.ulsfo.wmnet. 15 1H IN PTR WMF7215.mgmt.ulsfo.wmnet. +16 1H IN PTR dns4002.mgmt.ulsfo.wmnet. 16 1H IN PTR WMF7216.mgmt.ulsfo.wmnet. diff --git a/templates/wmnet b/templates/wmnet index b58cb6b..4e66fb7 100644 --- a/templates/wmnet +++ b/templates/wmnet @@ -4544,6 +4544,8 @@ cp4030 1H IN A10.128.129.130 cp4031 1H IN A10.128.129.131 cp4032 1H IN A10.128.129.132 +dns4001 1H IN A10.128.129.15 +dns4002 1H IN A10.128.129.16 ; Asset tags listed in order -- To view, visit https://gerrit.wikimedia.org/r/390161 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I07929e8fa04a8f7d6490bee78b1bb02486a3fbc1 Gerrit-PatchSet: 2 Gerrit-Project: operations/dns Gerrit-Branch: master Gerrit-Owner: RobH Gerrit-Reviewer: RobH Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/dns[master]: setting dns400[12] mgmt dns entries
RobH has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/390161 ) Change subject: setting dns400[12] mgmt dns entries .. setting dns400[12] mgmt dns entries they already had asset tag entries, just adding hostnames Bug: T179204 Change-Id: I07929e8fa04a8f7d6490bee78b1bb02486a3fbc1 --- M templates/10.in-addr.arpa M templates/wmnet 2 files changed, 4 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/dns refs/changes/61/390161/1 diff --git a/templates/10.in-addr.arpa b/templates/10.in-addr.arpa index c602752..295641b 100644 --- a/templates/10.in-addr.arpa +++ b/templates/10.in-addr.arpa @@ -2828,7 +2828,9 @@ 12 1H IN PTR WMF7218.mgmt.ulsfo.wmnet. 12 1H IN PTR bast4002.mgmt.ulsfo.wmnet. +15 1H IN PTR dns4001.mgmt.ulsfo.wmnet. 15 1H IN PTR WMF7215.mgmt.ulsfo.wmnet. +16 1H IN PTR dns4002.mgmt.ulsfo.wmnet. 16 1H IN PTR WMF7216.mgmt.ulsfo.wmnet. diff --git a/templates/wmnet b/templates/wmnet index e84d41f..ef40592 100644 --- a/templates/wmnet +++ b/templates/wmnet @@ -4564,6 +4564,8 @@ cp4030 1H IN A10.128.129.130 cp4031 1H IN A10.128.129.131 cp4032 1H IN A10.128.129.132 +dns4001 1H IN A10.128.129.15 +dns4002 1H IN A10.128.129.16 ; Asset tags listed in order -- To view, visit https://gerrit.wikimedia.org/r/390161 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I07929e8fa04a8f7d6490bee78b1bb02486a3fbc1 Gerrit-PatchSet: 1 Gerrit-Project: operations/dns Gerrit-Branch: master Gerrit-Owner: RobH ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/dns[master]: setting dns400[12] production dns
RobH has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/390160 ) Change subject: setting dns400[12] production dns .. setting dns400[12] production dns adding dns entires for dns systems Bug: T179204 Change-Id: I22632880ee4bf3820ce2bbee8a03cf4a71bfba40 --- M templates/26.35.198.in-addr.arpa M templates/3.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa M templates/wikimedia.org 3 files changed, 9 insertions(+), 0 deletions(-) Approvals: jenkins-bot: Verified RobH: Looks good to me, approved diff --git a/templates/26.35.198.in-addr.arpa b/templates/26.35.198.in-addr.arpa index 3c5965d..2408fb5 100644 --- a/templates/26.35.198.in-addr.arpa +++ b/templates/26.35.198.in-addr.arpa @@ -23,6 +23,8 @@ 3 1H IN PTR ae1-1201.cr2-ulsfo.wikimedia.org. 5 1H IN PTR bast4001.wikimedia.org. 6 1H IN PTR bast4002.wikimedia.org. +7 1H IN PTR dns4001.wikimedia.org. +8 1H IN PTR dns4002.wikimedia.org. ; 198.35.26.16/28 (16-31) - unused ; 198.35.26.32/27 (32-63) - unused diff --git a/templates/3.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa b/templates/3.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa index 5e8e56c..edb80f6 100644 --- a/templates/3.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa +++ b/templates/3.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa @@ -23,6 +23,9 @@ 6.0.0.0.6.2.0.0.5.3.0.0.8.9.1.0 1H IN PTR bast4002.wikimedia.org. 1.0.0.0.0.0.0.0.0.0.0.0.0.0.e.f 1H IN PTR ae1-1201.cr1-ulsfo.wikimedia.org. 2.0.0.0.0.0.0.0.0.0.0.0.0.0.e.f 1H IN PTR ae1-1201.cr2-ulsfo.wikimedia.org. +7.0.0.0.6.2.0.0.5.3.0.0.8.9.1.0 1H IN PTR dns4001.wikimedia.org. +8.0.0.0.6.2.0.0.5.3.0.0.8.9.1.0 1H IN PTR dns4002.wikimedia.org. + ; ulsfo private subnets (2620:0:863:100::/56) diff --git a/templates/wikimedia.org b/templates/wikimedia.org index 17e3744..12eced2 100644 --- a/templates/wikimedia.org +++ b/templates/wikimedia.org @@ -159,6 +159,10 @@ contint2001 1H IN A208.80.153.15 contint2001 1H IN 2620:0:860:1:208:80:153:15 diadem 1H IN A208.80.153.17 +dns4001 1H IN A198.35.26.7 +dns4001 1H IN 2620:0:863:1:198:35:26:7 +dns4002 1H IN A198.35.26.8 +dns4002 1H IN 2620:0:863:1:198:35:26:8 dns5001 1H IN A103.102.166.8 dns5001 1H IN 2001:df2:e500:1:103:102:166:8 dns5002 1H IN A103.102.166.9 -- To view, visit https://gerrit.wikimedia.org/r/390160 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I22632880ee4bf3820ce2bbee8a03cf4a71bfba40 Gerrit-PatchSet: 2 Gerrit-Project: operations/dns Gerrit-Branch: master Gerrit-Owner: RobH Gerrit-Reviewer: RobH Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/dns[master]: setting dns400[12] production dns
RobH has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/390160 ) Change subject: setting dns400[12] production dns .. setting dns400[12] production dns adding dns entires for dns systems Bug: T179204 Change-Id: I22632880ee4bf3820ce2bbee8a03cf4a71bfba40 --- M templates/26.35.198.in-addr.arpa M templates/3.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa M templates/wikimedia.org 3 files changed, 9 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/dns refs/changes/60/390160/1 diff --git a/templates/26.35.198.in-addr.arpa b/templates/26.35.198.in-addr.arpa index 3c5965d..2408fb5 100644 --- a/templates/26.35.198.in-addr.arpa +++ b/templates/26.35.198.in-addr.arpa @@ -23,6 +23,8 @@ 3 1H IN PTR ae1-1201.cr2-ulsfo.wikimedia.org. 5 1H IN PTR bast4001.wikimedia.org. 6 1H IN PTR bast4002.wikimedia.org. +7 1H IN PTR dns4001.wikimedia.org. +8 1H IN PTR dns4002.wikimedia.org. ; 198.35.26.16/28 (16-31) - unused ; 198.35.26.32/27 (32-63) - unused diff --git a/templates/3.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa b/templates/3.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa index 5e8e56c..edb80f6 100644 --- a/templates/3.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa +++ b/templates/3.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa @@ -23,6 +23,9 @@ 6.0.0.0.6.2.0.0.5.3.0.0.8.9.1.0 1H IN PTR bast4002.wikimedia.org. 1.0.0.0.0.0.0.0.0.0.0.0.0.0.e.f 1H IN PTR ae1-1201.cr1-ulsfo.wikimedia.org. 2.0.0.0.0.0.0.0.0.0.0.0.0.0.e.f 1H IN PTR ae1-1201.cr2-ulsfo.wikimedia.org. +7.0.0.0.6.2.0.0.5.3.0.0.8.9.1.0 1H IN PTR dns4001.wikimedia.org. +8.0.0.0.6.2.0.0.5.3.0.0.8.9.1.0 1H IN PTR dns4002.wikimedia.org. + ; ulsfo private subnets (2620:0:863:100::/56) diff --git a/templates/wikimedia.org b/templates/wikimedia.org index 17e3744..12eced2 100644 --- a/templates/wikimedia.org +++ b/templates/wikimedia.org @@ -159,6 +159,10 @@ contint2001 1H IN A208.80.153.15 contint2001 1H IN 2620:0:860:1:208:80:153:15 diadem 1H IN A208.80.153.17 +dns4001 1H IN A198.35.26.7 +dns4001 1H IN 2620:0:863:1:198:35:26:7 +dns4002 1H IN A198.35.26.8 +dns4002 1H IN 2620:0:863:1:198:35:26:8 dns5001 1H IN A103.102.166.8 dns5001 1H IN 2001:df2:e500:1:103:102:166:8 dns5002 1H IN A103.102.166.9 -- To view, visit https://gerrit.wikimedia.org/r/390160 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I22632880ee4bf3820ce2bbee8a03cf4a71bfba40 Gerrit-PatchSet: 1 Gerrit-Project: operations/dns Gerrit-Branch: master Gerrit-Owner: RobH ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...parsoid[master]: T171381: Linter: Handle optional end tags in missing-end-tag...
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/389531 )
Change subject: T171381: Linter: Handle optional end tags in missing-end-tag
category
..
T171381: Linter: Handle optional end tags in missing-end-tag category
See https://www.w3.org/TR/html5/syntax.html#optional-tags
There are a bunch of other contexts in which other end tags (like dt,
dd, thead, tbody, p, rb, etc.) are optional, but that requires
contextual DOM analysis and I haven't reasoned through the spec and the
code that is required to handle them properly. Since these other tags
are uncommon in HTML form, I am skipping that detail at this time.
Those additional sources of false positives can be addressed in
followup patches on demand based on how commonly these reports
show up in linter output.
Change-Id: I4455fa26a969fc8dea56273259140d13e9995236
---
M lib/wt2html/pp/handlers/linter.js
M tests/mocha/linter.js
2 files changed, 25 insertions(+), 1 deletion(-)
Approvals:
jenkins-bot: Verified
Arlolra: Looks good to me, approved
diff --git a/lib/wt2html/pp/handlers/linter.js
b/lib/wt2html/pp/handlers/linter.js
index afbb732..aa20ff9 100644
--- a/lib/wt2html/pp/handlers/linter.js
+++ b/lib/wt2html/pp/handlers/linter.js
@@ -222,6 +222,27 @@
DU.getDataParsoid(contentNode).name === name);
}
+function endTagOptional(node) {
+ // See https://www.w3.org/TR/html5/syntax.html#optional-tags
+ //
+ // End tags for tr/td/th/li are entirely optional since they
+ // require a parent container and can only be followed by like
+ // kind.
+ //
+ // Caveat: foo.. and foo..
+ // generate different DOM trees, so explicit tag
+ // is required to specify which of the two was intended.
+ //
+ // With that one caveat around nesting, the parse with/without
+ // the end tag is identical. For now, ignoring that caveat
+ // since they aren't like to show up in our corpus much.
+ //
+ // For the other tags in that w3c spec section, I haven't reasoned
+ // through when exactly they are optional. Not handling that complexity
+ // for now since those are likely uncommon use cases in our corpus.
+ return /^(TR|TD|TH|LI)$/.test(node.nodeName);
+}
+
/*
* Log Treebuilder fixups marked by dom.markTreeBuilderFixup.js
* It handles the following scenarios:
@@ -319,7 +340,7 @@
}
adjDp.tmp.linted = true;
env.log('lint/misnested-tag', lintObj);
- } else if (DU.hasLiteralHTMLMarker(dp)) {
+ } else if (DU.hasLiteralHTMLMarker(dp) &&
!endTagOptional(c)) {
env.log('lint/missing-end-tag',
lintObj);
}
}
diff --git a/tests/mocha/linter.js b/tests/mocha/linter.js
index 3eea822..ab8bb5b 100644
--- a/tests/mocha/linter.js
+++ b/tests/mocha/linter.js
@@ -67,6 +67,9 @@
result[0].params.should.have.a.property("name",
"p");
});
});
+ it('should not flag tags where end tags are optional in the
spec', function() {
+ return
expectEmptyResults('xyheading 1col
1col 2');
+ });
});
describe('STRIPPED TAGS', function() {
--
To view, visit https://gerrit.wikimedia.org/r/389531
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I4455fa26a969fc8dea56273259140d13e9995236
Gerrit-PatchSet: 6
Gerrit-Project: mediawiki/services/parsoid
Gerrit-Branch: master
Gerrit-Owner: Subramanya Sastry
Gerrit-Reviewer: Arlolra
Gerrit-Reviewer: C. Scott Ananian
Gerrit-Reviewer: Legoktm
Gerrit-Reviewer: Sbailey
Gerrit-Reviewer: Subramanya Sastry
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] wikimedia-ui-base[master]: Clarify referencing color palette vars & use LESS style comm...
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/390159 )
Change subject: Clarify referencing color palette vars & use LESS style comments
..
Clarify referencing color palette vars & use LESS style comments
Clarifying variables intended usage in extended comment and
move towards LESS style comments in LESS file to make compiler completely
remove them.
Change-Id: Ib4b5fa013a23ab45037cbd6eda05ffd45958d57e
---
M wikimedia-ui-base.css
M wikimedia-ui-base.less
2 files changed, 44 insertions(+), 37 deletions(-)
Approvals:
Jdrewniak: Looks good to me, approved
jenkins-bot: Verified
diff --git a/wikimedia-ui-base.css b/wikimedia-ui-base.css
index 2e712d6..3957f9b 100644
--- a/wikimedia-ui-base.css
+++ b/wikimedia-ui-base.css
@@ -4,6 +4,7 @@
*/
:root {
+ /* == Breakpoints == */
/**
* Minimum available screen width at which a device can be considered a
mobile device
* Many older feature phones have screens smaller than this value.
@@ -37,8 +38,12 @@
--width-breapoint-desktop-extrawide: 2000px;
- /* Colors */
- /* WikimediaUI (WMUI) color palette */
+ /* == Colors == */
+ /**
+* WikimediaUI (WMUI) color palette
+* Don't use those variables directly, instead define your vars
+* referring to them as applied further below
+*/
--wmui-color-base0:#000;/* = HSB 0°, 0%, 0% */
--wmui-color-base10: #222;/* = HSB 0°, 0%, 13% */
--wmui-color-base20: #54595d; /* = HSB 207°, 10%, 36%; WCAG 2.0 level
AAA 7.09:1 contrast ratio on `#fff` */
@@ -118,12 +123,12 @@
--opacity-icon-base--selected: 1;
- /* Positioning */
+ /* == Positioning == */
/* Z-Index */
--z-index-base: 0;
- /* Box Model properties */
+ /* == Box Model properties == */
/* Max Widths */
--max-width-button: 28.75em; /* = `460px` at `16px` base,
see T95367 */
--max-width-input-inline: 100%;
@@ -158,7 +163,7 @@
--box-shadow-menu: var( --box-shadow-dialog );
- /* Typography incl. print properties */
+ /* == Typography incl. print properties == */
/* Font Families */
--font-family-base: var( --font-family-sans );
--font-family-heading-main: var( --font-family-serif );
@@ -176,12 +181,12 @@
--text-shadow-base--disabled: var( --text-shadow-base );
- /* Other Properties */
+ /* == Other Properties == */
/* Cursors */
--cursor-base--disabled:default;
- /* Animation & Transition */
+ /* == Animation & Transition == */
/* Transitions */
--transition-base: var( --transition-duration-base );
--transition-medium:var( --transition-duration-medium );
diff --git a/wikimedia-ui-base.less b/wikimedia-ui-base.less
index 1f11564..9316f34 100644
--- a/wikimedia-ui-base.less
+++ b/wikimedia-ui-base.less
@@ -3,42 +3,44 @@
* Wikimedia Foundation user interface base variables
*/
-/* Breakpoints */
-/**
- * Minimum available screen width at which a device can be considered a mobile
device
- * Many older feature phones have screens smaller than this value.
- * Number is prone to change with new information.
- */
+// == Breakpoints ==
+// Minimum available screen width at which a device can be considered a mobile
device
+// Many older feature phones have screens smaller than this value.
+// Number is prone to change with new information.
+
@width-breakpoint-mobile: 320px;
-/**
- * Minimum available screen width at which a device can be considered a tablet
- * The number is currently based on the device width of a Samsung Galaxy S5
mini and is low
- * enough to cover iPad (768px). Number is prone to change with new
information.
- */
+
+// Minimum available screen width at which a device can be considered a tablet
+// The number is currently based on the device width of a Samsung Galaxy S5
mini and is low
+// enough to cover iPad (768px). Number is prone to change with new
information.
+
@width-breakpoint-tablet: 720px;
-/**
- * Minimum available screen width at which a device can be considered a desktop
- * Number is prone to change with new information.
- */
+
+// Minimum available screen width at which a device can be considered a desktop
+// Number is prone to change with new information.
+
@width-breakpoint-desktop: 1000px;
-/**
- * Wider desktop breakpoint, currently used in Flow.
- * Number is prone to change with new information.
- */
+
+// Wider desktop breakpoint, currently used in Flow.
+// Number is prone to change with new information.
+
@width-breakpoint-desktop-wide: 1200px;
-/**
- * Extra wide desktop breakpoint
- * Number is prone to change with new information.
- */
+
+// Extra wide deskto
[MediaWiki-commits] [Gerrit] wikimedia-ui-base[master]: Clarify referencing color palette vars & use LESS style comm...
VolkerE has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/390159 )
Change subject: Clarify referencing color palette vars & use LESS style comments
..
Clarify referencing color palette vars & use LESS style comments
Clarifying variables intended usage in extended comment and
move towards LESS style comments in LESS file to make compiler completely
remove them.
Change-Id: Ib4b5fa013a23ab45037cbd6eda05ffd45958d57e
---
M wikimedia-ui-base.css
M wikimedia-ui-base.less
2 files changed, 44 insertions(+), 37 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/wikimedia-ui-base
refs/changes/59/390159/1
diff --git a/wikimedia-ui-base.css b/wikimedia-ui-base.css
index 2e712d6..3957f9b 100644
--- a/wikimedia-ui-base.css
+++ b/wikimedia-ui-base.css
@@ -4,6 +4,7 @@
*/
:root {
+ /* == Breakpoints == */
/**
* Minimum available screen width at which a device can be considered a
mobile device
* Many older feature phones have screens smaller than this value.
@@ -37,8 +38,12 @@
--width-breapoint-desktop-extrawide: 2000px;
- /* Colors */
- /* WikimediaUI (WMUI) color palette */
+ /* == Colors == */
+ /**
+* WikimediaUI (WMUI) color palette
+* Don't use those variables directly, instead define your vars
+* referring to them as applied further below
+*/
--wmui-color-base0:#000;/* = HSB 0°, 0%, 0% */
--wmui-color-base10: #222;/* = HSB 0°, 0%, 13% */
--wmui-color-base20: #54595d; /* = HSB 207°, 10%, 36%; WCAG 2.0 level
AAA 7.09:1 contrast ratio on `#fff` */
@@ -118,12 +123,12 @@
--opacity-icon-base--selected: 1;
- /* Positioning */
+ /* == Positioning == */
/* Z-Index */
--z-index-base: 0;
- /* Box Model properties */
+ /* == Box Model properties == */
/* Max Widths */
--max-width-button: 28.75em; /* = `460px` at `16px` base,
see T95367 */
--max-width-input-inline: 100%;
@@ -158,7 +163,7 @@
--box-shadow-menu: var( --box-shadow-dialog );
- /* Typography incl. print properties */
+ /* == Typography incl. print properties == */
/* Font Families */
--font-family-base: var( --font-family-sans );
--font-family-heading-main: var( --font-family-serif );
@@ -176,12 +181,12 @@
--text-shadow-base--disabled: var( --text-shadow-base );
- /* Other Properties */
+ /* == Other Properties == */
/* Cursors */
--cursor-base--disabled:default;
- /* Animation & Transition */
+ /* == Animation & Transition == */
/* Transitions */
--transition-base: var( --transition-duration-base );
--transition-medium:var( --transition-duration-medium );
diff --git a/wikimedia-ui-base.less b/wikimedia-ui-base.less
index 1f11564..9316f34 100644
--- a/wikimedia-ui-base.less
+++ b/wikimedia-ui-base.less
@@ -3,42 +3,44 @@
* Wikimedia Foundation user interface base variables
*/
-/* Breakpoints */
-/**
- * Minimum available screen width at which a device can be considered a mobile
device
- * Many older feature phones have screens smaller than this value.
- * Number is prone to change with new information.
- */
+// == Breakpoints ==
+// Minimum available screen width at which a device can be considered a mobile
device
+// Many older feature phones have screens smaller than this value.
+// Number is prone to change with new information.
+
@width-breakpoint-mobile: 320px;
-/**
- * Minimum available screen width at which a device can be considered a tablet
- * The number is currently based on the device width of a Samsung Galaxy S5
mini and is low
- * enough to cover iPad (768px). Number is prone to change with new
information.
- */
+
+// Minimum available screen width at which a device can be considered a tablet
+// The number is currently based on the device width of a Samsung Galaxy S5
mini and is low
+// enough to cover iPad (768px). Number is prone to change with new
information.
+
@width-breakpoint-tablet: 720px;
-/**
- * Minimum available screen width at which a device can be considered a desktop
- * Number is prone to change with new information.
- */
+
+// Minimum available screen width at which a device can be considered a desktop
+// Number is prone to change with new information.
+
@width-breakpoint-desktop: 1000px;
-/**
- * Wider desktop breakpoint, currently used in Flow.
- * Number is prone to change with new information.
- */
+
+// Wider desktop breakpoint, currently used in Flow.
+// Number is prone to change with new information.
+
@width-breakpoint-desktop-wide: 1200px;
-/**
- * Extra wide desktop breakpoint
- * Number is prone to change with new information.
- */
+
+// Extra wide deskto
[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Enable per-filter profiling on enwiki
Dmaza has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/390153 ) Change subject: Enable per-filter profiling on enwiki .. Enable per-filter profiling on enwiki Bug: T179323 Change-Id: I283a3959d6426e6b37f57a65c58ee88253fce7e7 --- M wmf-config/abusefilter.php 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/53/390153/1 diff --git a/wmf-config/abusefilter.php b/wmf-config/abusefilter.php index 4b9f087..fb53f44 100644 --- a/wmf-config/abusefilter.php +++ b/wmf-config/abusefilter.php @@ -108,6 +108,7 @@ $wgGroupPermissions['sysop']['abusefilter-view-private'] = true; $wgGroupPermissions['abusefilter-helper']['abusefilter-view-private'] = true; // T175684 $wgAbuseFilterNotificationsPrivate = true; // T46045 + $wgAbuseFilterProfile = true; break; case 'enwikibooks': $wgGroupPermissions['*']['abusefilter-view'] = false; -- To view, visit https://gerrit.wikimedia.org/r/390153 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I283a3959d6426e6b37f57a65c58ee88253fce7e7 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Dmaza ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...chromium-render[master]: Terminate browser process after certain time
Bmansurov has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/390144 )
Change subject: Terminate browser process after certain time
..
Terminate browser process after certain time
By default after 5 minutes the puppeteer will terminate the browser
subprocess if it hasn't finished returning a PDF yet.
Bug: T178501
Change-Id: I904fc15826b7de3a34e5c977b40bfd8518bb1679
---
M config.dev.yaml
M lib/queue.js
M lib/renderer.js
M routes/html2pdf-v1.js
M test/lib/queue.js
A test/lib/renderer.js
6 files changed, 132 insertions(+), 46 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/chromium-render
refs/changes/44/390144/1
diff --git a/config.dev.yaml b/config.dev.yaml
index 6b5b682..00d6f4d 100644
--- a/config.dev.yaml
+++ b/config.dev.yaml
@@ -91,12 +91,17 @@
# some room for page numbers
bottom: '0.75in'
left: '0.5in'
- puppeteer_flags:
-- '--no-sandbox'
-- '--disable-setuid-sandbox'
+ #
https://github.com/GoogleChrome/puppeteer/blob/v0.11.0/docs/api.md#puppeteerlaunchoptions
+ puppeteer_options:
+timeout: 3
+args:
+ - '--no-sandbox'
+ - '--disable-setuid-sandbox'
# the maximum number of puppeteer instances that can be launched at a
time
render_concurrency: 1
# don't wait to render a PDF after this many seconds
render_queue_timeout: 90
# maximum allowed number of pending jobs
- render_queue_count: 3
\ No newline at end of file
+ render_queue_count: 3
+ # the number of seconds before puppeteer terminates the browser instance
+ render_execution_timout: 300
\ No newline at end of file
diff --git a/lib/queue.js b/lib/queue.js
index 4fcea12..1750858 100644
--- a/lib/queue.js
+++ b/lib/queue.js
@@ -19,22 +19,24 @@
class Queue {
/**
* @param {number} concurrency number of concurrent render instances
- * @param {number} timeout number of seconds after which the
+ * @param {number} queueTimeout number of seconds after which the
* yet-to-start renders are aborted
* @param {number} maxCount number of tasks the queue should hold.
* New tasks will be rejected once the number of tasks in the queue
* is equal to this number.
- * @param {Object} puppeteerFlags flags used to in starting puppeteer
+ * @param {number} executionTimeout number of seconds after which
puppeteer
+ * closes the browser
+ * @param {Object} puppeteerOptions options used to in starting puppeteer
* @param {Object} pdfOptions pdf options passed to Chromium
* @param {Object} logger app logger
*/
-constructor(
-concurrency, timeout, maxCount, puppeteerFlags, pdfOptions, logger
-) {
+constructor(concurrency, queueTimeout, maxCount, executionTimeout,
+puppeteerOptions, pdfOptions, logger) {
this._queueObject = asyncQueue(this._worker.bind(this), concurrency);
-this._timeout = timeout;
+this._queueTimeout = queueTimeout;
this._maxCount = maxCount;
-this._puppeteerFlags = puppeteerFlags;
+this._executionTimeout = executionTimeout;
+this._puppeteerOptions = puppeteerOptions;
this._pdfOptions = pdfOptions;
this._logger = logger;
}
@@ -67,14 +69,14 @@
if (worker.data._id === data._id) {
that._logger.log('trace/info', {
msg: `Queue is still busy after waiting ` +
-`for ${that._timeout} secs.`
+`for ${that._queueTimeout} secs.`
});
callback(queueErrors.timeout, null);
return true;
}
return false;
});
-}, this._timeout * 1000);
+}, this._queueTimeout * 1000);
q.push(data, callback);
}
@@ -85,8 +87,8 @@
clearTimeout(data._timeoutID);
renderer
-.articleToPdf(data.uri, data.format, this._puppeteerFlags,
- this._pdfOptions)
+.articleToPdf(data.uri, data.format, this._puppeteerOptions,
+ this._pdfOptions, this._executionTimeout)
.then((pdf) => {
callback(null, pdf);
})
diff --git a/lib/renderer.js b/lib/renderer.js
index dae34f1..518f849 100644
--- a/lib/renderer.js
+++ b/lib/renderer.js
@@ -6,36 +6,51 @@
* Renders content from `url` in PDF
* @param {string} url URL to get content from
* @param {string} format Page size, e.g. Letter or A4, passed to understands
- * @param {Object} puppeteerFlags
+ * @param {Object} puppeteerOptions
* @param {Object} pdfOptions
+ * @param {number} executionTimeout number of seconds after which puppeteer
+ * closes the browser
* @return {>} Promise which reso
[MediaWiki-commits] [Gerrit] labs...heritage[master]: Stop categorization job during database update
Lokal Profil has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/390142 )
Change subject: Stop categorization job during database update
..
Stop categorization job during database update
This commits changes which exist on labs today.
Change-Id: I26784cd24b5ccd52202ca45f02f15ce4bbbfe990
---
M bin/categorize_images.sh
M bin/update_monuments.sh
2 files changed, 9 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/labs/tools/heritage
refs/changes/42/390142/1
diff --git a/bin/categorize_images.sh b/bin/categorize_images.sh
index 342b437..884f3d1 100755
--- a/bin/categorize_images.sh
+++ b/bin/categorize_images.sh
@@ -5,6 +5,9 @@
CURRENT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
. $CURRENT_DIR/defaults.sh
+# Use a virtual environment with our requirements
+source $VIRTUAL_ENV_PATH/bin/activate
+
# Make sure we are in our homedir
cd $HOME_DIR || exit
diff --git a/bin/update_monuments.sh b/bin/update_monuments.sh
index 2d96a9c..3a4af50 100755
--- a/bin/update_monuments.sh
+++ b/bin/update_monuments.sh
@@ -28,10 +28,16 @@
echo_time "Full source database update..."
$PYWIKIBOT_BIN $ERFGOED_PATH/update_database.py -fullupdate -log -skip_wd
+# stop categorization job as next stage locks the database
+jstop categorize_images
+
# Update the all monuments table
echo_time "Update monuments_all table..."
$MYSQL_BIN -h $DB_SERVER $DATABASE <
$ERFGOED_PATH/sql/fill_table_monuments_all.sql
+# restart the categorization job
+jsub -l release=trusty -mem 1000m -once -j y -o
/data/project/heritage/logs/categorize_images.log -N categorize_images
/data/project/heritage/bin/categorize_images.sh >>
/data/project/heritage/logs/crontab.log
+
## Update the image table. Is now another job
# echo_time "Update image table..."
# PYWIKIBOT_BIN $ERFGOED_PATH/populate_image_table.py
--
To view, visit https://gerrit.wikimedia.org/r/390142
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I26784cd24b5ccd52202ca45f02f15ce4bbbfe990
Gerrit-PatchSet: 1
Gerrit-Project: labs/tools/heritage
Gerrit-Branch: master
Gerrit-Owner: Lokal Profil
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...ReadingLists[master]: Validate titles
Gergő Tisza has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/390134 )
Change subject: Validate titles
..
Validate titles
Change-Id: I4be37788670209fb6a912daf558402d26368bdd1
---
M src/Api/ApiReadingListsCreateEntry.php
1 file changed, 12 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ReadingLists
refs/changes/34/390134/1
diff --git a/src/Api/ApiReadingListsCreateEntry.php
b/src/Api/ApiReadingListsCreateEntry.php
index 0570562..8a82070 100644
--- a/src/Api/ApiReadingListsCreateEntry.php
+++ b/src/Api/ApiReadingListsCreateEntry.php
@@ -4,6 +4,7 @@
use ApiBase;
use Message;
+use Title;
/**
* API module for all write operations.
@@ -26,6 +27,17 @@
$project = $this->getParameter( 'project' );
$title = $this->getParameter( 'title' );
+ // Lists can contain titles from other wikis, and we have no
idea of the exact title
+ // validation rules used there; but in practice it's unlikely
the rules would differ,
+ // and allowing things like <> or # in the title could result
in vulnerabilities in
+ // clients that assume they are getting something sane. So
let's validate anyway.
+ //
+ // We do not normalize, that would contain too much local logic
(e.g. title case), and
+ // clients are expected to submit already normalized titles
(that they got from the API) anyway.
+ if ( !Title::newFromText( $title ) ) {
+ $this->dieWithError( 'apierror-invalidtitle',
wfEscapeWikiText( $title ) );
+ }
+
$entryId = $this->getReadingListRepository( $this->getUser() )
->addListEntry( $listId, $project, $title );
$this->getResult()->addValue( null, $this->getModuleName(), [
'id' => $entryId ] );
--
To view, visit https://gerrit.wikimedia.org/r/390134
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I4be37788670209fb6a912daf558402d26368bdd1
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ReadingLists
Gerrit-Branch: master
Gerrit-Owner: Gergő Tisza
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...ReadingLists[master]: Verify string length before inserting into the database
Gergő Tisza has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/390136 )
Change subject: Verify string length before inserting into the database
..
Verify string length before inserting into the database
Depending on configuration settings, the DB might quietly truncate
long values. Failing loudly is preferable.
Change-Id: Ia0bc3c11c30e60db96fba7bc001e34ec03b79273
---
M i18n/en.json
M i18n/qqq.json
M src/ReadingListRepository.php
M tests/src/ReadingListRepositoryTest.php
4 files changed, 44 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ReadingLists
refs/changes/36/390136/1
diff --git a/i18n/en.json b/i18n/en.json
index f8ee29d..afa13e0 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -23,6 +23,7 @@
"readinglists-db-error-user-required": "This method cannot be called
without specifying the user.",
"readinglists-db-error-list-limit": "Users cannot have more than $1
lists.",
"readinglists-db-error-entry-limit": "List $1 cannot have more than $2
entries.",
+ "readinglists-db-error-too-long": "Value for field $1 cannot be longer
than $2 bytes.",
"readinglists-apierror-project-title-param": "$1project and
$1title must be used together.",
"readinglists-apierror-too-old": "Timestamps passed to
$1changedsince cannot be older than $2.",
"apihelp-query+readinglists-summary": "List or filter the user's
reading lists and show metadata about them.",
diff --git a/i18n/qqq.json b/i18n/qqq.json
index 6c00bd5..8414fa4 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -24,6 +24,7 @@
"readinglists-db-error-user-required": "Error message used when calling
a method that operates on a single user, but the user was not specified when
the repository object was constructed.",
"readinglists-db-error-list-limit": "Error message used when the user
has as many or more lists than the maximum allowed, and tries to add another
one.\n\nParameters:\n* $1 - the maximum allowed number of lists per user.",
"readinglists-db-error-entry-limit": "Error message used when the user
has as many or more entries in the given list than the maximum allowed, and
tries to add another one.\n\nParameters:\n* $1 - the ID of the list in
question.\n$2 - the maximum allowed number of entries per list.",
+ "readinglists-db-error-too-long": "Error message used when the user
tries to set list/entry string fields to a longer value than what the database
schema allows.\n\nParameters:\n* $1 - DB field name.\n$2 - DB field maximum
length (in bytes).",
"readinglists-apierror-project-title-param": "{{doc-apierror}}\n$1 is
the module prefix.",
"readinglists-apierror-too-old": "{{doc-apierror}}\n$1 is the module
prefix, $2 is the expiry date for deleted lists/entries.",
"apihelp-query+readinglists-summary":
"{{doc-apihelp-summary|query+readinglists}}",
diff --git a/src/ReadingListRepository.php b/src/ReadingListRepository.php
index a2dc7b2..dcf499b 100644
--- a/src/ReadingListRepository.php
+++ b/src/ReadingListRepository.php
@@ -32,6 +32,17 @@
*/
class ReadingListRepository implements IDBAccessObject, LoggerAwareInterface {
+ /** @var array Database field lengths in bytes (only for the string
types). */
+ public static $fieldLength = [
+ 'rl_name' => 255,
+ 'rl_description' => 767,
+ 'rl_color' => 6,
+ 'rl_image' => 255,
+ 'rl_icon' => 32,
+ 'rle_project' => 255,
+ 'rle_title' => 255,
+ ];
+
/** @var int|null Max allowed lists per user */
private $listLimit;
@@ -191,6 +202,11 @@
*/
public function addList( $name, $description = '', $color = '', $image
= '', $icon = '' ) {
$this->assertUser();
+ $this->assertFieldLength( 'rl_name', $name );
+ $this->assertFieldLength( 'rl_description', $description );
+ $this->assertFieldLength( 'rl_color', $color );
+ $this->assertFieldLength( 'rl_image', $image );
+ $this->assertFieldLength( 'rl_icon', $icon );
if ( !$this->isSetupForUser( self::READ_LOCKING ) ) {
throw new ReadingListRepositoryException(
'readinglists-db-error-not-set-up' );
}
@@ -274,6 +290,11 @@
$id, $name = null, $description = null, $color = null, $image =
null, $icon = null
) {
$this->assertUser();
+ $this->assertFieldLength( 'rl_name', $name );
+ $this->assertFieldLength( 'rl_description', $description );
+ $this->assertFieldLength( 'rl_color', $color );
+ $this->assertFieldLength( 'rl_image', $image );
+ $this->assertFieldLength( 'rl_icon', $icon );
$this->selectValidList( $id
[MediaWiki-commits] [Gerrit] mediawiki...ReadingLists[master]: Fix iw lookup warnings when interwiki table is empty
Gergő Tisza has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/390135 )
Change subject: Fix iw lookup warnings when interwiki table is empty
..
Fix iw lookup warnings when interwiki table is empty
Change-Id: I49732cbd42107b4937bdeaa20500b126518c8cc5
---
M src/ReverseInterwikiLookup.php
M tests/src/ReverseInterwikiLookupTest.php
2 files changed, 2 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ReadingLists
refs/changes/35/390135/1
diff --git a/src/ReverseInterwikiLookup.php b/src/ReverseInterwikiLookup.php
index 468d695..3458015 100644
--- a/src/ReverseInterwikiLookup.php
+++ b/src/ReverseInterwikiLookup.php
@@ -65,6 +65,7 @@
*/
protected function getPrefixTable() {
if ( $this->prefixTable === null ) {
+ $this->prefixTable = [];
$iwData = $this->interwikiLookup->getAllPrefixes( true
);
foreach ( $iwData as $iwRow ) {
$url = wfParseUrl( $iwRow['iw_url'] );
diff --git a/tests/src/ReverseInterwikiLookupTest.php
b/tests/src/ReverseInterwikiLookupTest.php
index f524d8b..1001a8b 100644
--- a/tests/src/ReverseInterwikiLookupTest.php
+++ b/tests/src/ReverseInterwikiLookupTest.php
@@ -38,6 +38,7 @@
'exact match 2' => [ 'b', 'en.wikibooks.org', $iwTable
],
'cross-project + cross-lang' => [ [ 'b', 'de', ],
'de.wikibooks.org', $iwTable ],
'invalid language code' => [ null,
'nosuchlang.wikipedia.org', $iwTable ],
+ 'empty table' => [ null, 'foo.bar', [] ],
];
}
--
To view, visit https://gerrit.wikimedia.org/r/390135
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I49732cbd42107b4937bdeaa20500b126518c8cc5
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ReadingLists
Gerrit-Branch: master
Gerrit-Owner: Gergő Tisza
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Create new MP3 Uploaders group on Commons
Kaldari has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/390131 ) Change subject: Create new MP3 Uploaders group on Commons .. Create new MP3 Uploaders group on Commons Bug: T180002 Change-Id: Ifd4adffc9911cb3454a87f4c63730bf7b899c8cc Dependencies: I74021aa --- M wmf-config/InitialiseSettings.php 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/31/390131/1 diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index e4f80fb..5c79bd9 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -8238,6 +8238,7 @@ 'autopatrolled' => [ 'autopatrol' => true ], 'filemover' => [ 'movefile' => true ], 'Image-reviewer' => [ 'autopatrol' => true, 'upload_by_url' => true ], + 'mp3-uploader' => [ 'autoconfirmed' => true, 'upload' => true, 'reupload' => true ], 'sysop' => [ 'changetags' => true, // T134196 'upload_by_url' => true, -- To view, visit https://gerrit.wikimedia.org/r/390131 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ifd4adffc9911cb3454a87f4c63730bf7b899c8cc Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Kaldari ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] wikimedia/portals[master]: SVG Sprites - Remove old gulp tasks & npm deps
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/387194 )
Change subject: SVG Sprites - Remove old gulp tasks & npm deps
..
SVG Sprites - Remove old gulp tasks & npm deps
Removes unneeded gulp tasks related to the old image processing
workflow. Modifying gulp tasks to suit new SVG sprite workflow.
In Gulpfile, renames the image optimization config from `imgOpt` to
`img` and moves the sprite config into this config variable.
Removing npm dependancies that are no longer needed with new SVG
sprite worflow as well. These dependancies include image processors
and optimizers that have been failing to build in CI & certain OS's.
Bug: T129634, T152351, T177343
Change-Id: I139f2e3e4fb071437e2671ee88169f6e40069608
---
M gulpfile.js
M package.json
2 files changed, 31 insertions(+), 90 deletions(-)
Approvals:
jenkins-bot: Verified
VolkerE: Looks good to me, approved
diff --git a/gulpfile.js b/gulpfile.js
index 952cd10..d134a4e 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -8,13 +8,9 @@
var gulp = require( 'gulp' ),
gulpLoadPlugins = require( 'gulp-load-plugins' ),
argv = require( 'yargs' ).argv,
- imagemin = require( 'gulp-imagemin' ),
- imageminPngquant = require( 'imagemin-pngquant' ),
- imageminZopfli = require( 'imagemin-zopfli' ),
siteStats = require( './data/site-stats' ),
fs = require( 'fs' ),
exec = require( 'child_process' ).exec,
- sprity = require( 'sprity' ),
postCSSNext = require( 'postcss-cssnext' ),
postCSSImport = require( 'postcss-import' ),
postCSSReporter = require( 'postcss-reporter' ),
@@ -23,13 +19,6 @@
plugins = gulpLoadPlugins(),
gulpSlash = require( 'gulp-slash' ),
replace = require( 'gulp-replace' ),
- spriteConfig = {
- cssPrefix: 'sprite',
- assets: 'assets/img/sprite_assets/*.svg',
- outputName: 'sprite',
- outputCSS: 'sprite.css',
- template: 'assets/css/sprite-template.mustache'
- },
portalParam = argv.portal,
getBaseDir, getProdDir, getConfig;
@@ -49,7 +38,6 @@
console.log( '|
|' );
console.log( '| gulp lint --portal wikipedia.org- run
jslint on JS files on portal JS files |' );
console.log( '| gulp inline-assets --portal wikipedia.org - build
inline CSS and JS assets|' );
- console.log( '| gulp optimize-images --portal wikipedia.org - run
imagemin on image directory |' );
console.log( '| gulp watch --portal wikipedia.org - watches
dev directory and generates an index.html |' );
console.log( '| file in
it without inlined/minified assets|' );
console.log( '| gulp --portal wikipedia.org - run all
of the above on the specified portal page |' );
@@ -152,18 +140,19 @@
]
};
- config.optImage = {
- imageminConf: {
- plugins: [
- imagemin.svgo(),
- imageminPngquant( { quality: '57-95', speed: 1
} ),
- imagemin.optipng(),
- imageminZopfli()
- ],
- options: { verbose: true }
- },
+ config.img = {
src: [ baseDir + 'assets/img/*', '!' + baseDir +
'assets/img/sprite_assets' ],
- dest: prodDir + 'assets/img'
+ dest: prodDir + 'assets/img',
+ sprite: {
+ cssPrefix: 'sprite',
+ assets: baseDir + 'assets/img/sprite_assets/*.svg',
+ outputName: 'sprite',
+ outputCSS: 'sprite.css',
+ outputCSSPath: baseDir + 'assets/css/' + 'sprite.css',
/* outputCSS value */
+ outputSVGGlob: baseDir + 'assets/img/' + 'sprite' /*
outputName */ + '*.svg',
+ outputPNGGlob: baseDir + 'assets/img/' + 'sprite' /*
outputName */ + '*.png',
+ template: baseDir +
'assets/css/sprite-template.mustache'
+ }
};
getConfig = function () {
@@ -269,21 +258,6 @@
} );
/**
- * Optimize images in dev folder and moves them into prod folder.
- */
-gulp.task( 'optimize-images', function () {
-
- var imgOpt;
- requirePortalParam();
-
- imgOpt = getConfig().optImage;
-
- return gulp.src( imgOpt.src )
- .pipe( imagemin( imgOpt.imageminConf.plugins,
imgOpt.imageminConf.options ) )
- .pipe( gulp.dest( imgOpt.dest ) );
-} );
-
-/**
* Watch for changes in de
[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: Update mobileapps to 8e82983
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/390096 ) Change subject: Update mobileapps to 8e82983 .. Update mobileapps to 8e82983 List of changes: ad0b15a Exclude properties only needed for summary from lead response, pt. 2 xxx Update node module dependencies Change-Id: I6dcde58d70b175e6c1a1195298724bea72e03040 --- M node_modules/kad/package.json M src 2 files changed, 2 insertions(+), 2 deletions(-) Approvals: BearND: Looks good to me, approved jenkins-bot: Verified diff --git a/node_modules/kad/package.json b/node_modules/kad/package.json index 85ace01..34d5caf 100644 --- a/node_modules/kad/package.json +++ b/node_modules/kad/package.json @@ -49,7 +49,7 @@ "/limitation" ], "_resolved": "git+https://github.com/gwicke/kad.git#936c91652d757ea6f9dd30e44698afb0daaa1d17";, - "_shasum": "02c183d0147c659a4dd89dbdeac0db26087592d0", + "_shasum": "335455782298b6f0d3a0bdafb789ea71e7e02250", "_shrinkwrap": null, "_spec": "kad@git+https://github.com/gwicke/kad.git#master";, "_where": "/opt/service/node_modules/limitation", diff --git a/src b/src index e86fb6c..8e82983 16 --- a/src +++ b/src @@ -1 +1 @@ -Subproject commit e86fb6c9b0ffc4cb9f829ce239c52ca690fb85e0 +Subproject commit 8e829839628f1722db80965ed86a1b299418c626 -- To view, visit https://gerrit.wikimedia.org/r/390096 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I6dcde58d70b175e6c1a1195298724bea72e03040 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/services/mobileapps/deploy Gerrit-Branch: master Gerrit-Owner: BearND Gerrit-Reviewer: BearND Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: Update mobileapps to 8e82983
BearND has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/390096 ) Change subject: Update mobileapps to 8e82983 .. Update mobileapps to 8e82983 List of changes: ad0b15a Exclude properties only needed for summary from lead response, pt. 2 xxx Update node module dependencies Change-Id: I6dcde58d70b175e6c1a1195298724bea72e03040 --- M node_modules/kad/package.json M src 2 files changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/mobileapps/deploy refs/changes/96/390096/1 diff --git a/node_modules/kad/package.json b/node_modules/kad/package.json index 85ace01..34d5caf 100644 --- a/node_modules/kad/package.json +++ b/node_modules/kad/package.json @@ -49,7 +49,7 @@ "/limitation" ], "_resolved": "git+https://github.com/gwicke/kad.git#936c91652d757ea6f9dd30e44698afb0daaa1d17";, - "_shasum": "02c183d0147c659a4dd89dbdeac0db26087592d0", + "_shasum": "335455782298b6f0d3a0bdafb789ea71e7e02250", "_shrinkwrap": null, "_spec": "kad@git+https://github.com/gwicke/kad.git#master";, "_where": "/opt/service/node_modules/limitation", diff --git a/src b/src index e86fb6c..8e82983 16 --- a/src +++ b/src @@ -1 +1 @@ -Subproject commit e86fb6c9b0ffc4cb9f829ce239c52ca690fb85e0 +Subproject commit 8e829839628f1722db80965ed86a1b299418c626 -- To view, visit https://gerrit.wikimedia.org/r/390096 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I6dcde58d70b175e6c1a1195298724bea72e03040 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/services/mobileapps/deploy Gerrit-Branch: master Gerrit-Owner: BearND ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...mobileapps[master]: Exclude properties only needed for summary from lead respons...
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/390089 )
Change subject: Exclude properties only needed for summary from lead response,
pt. 2
..
Exclude properties only needed for summary from lead response, pt. 2
Change-Id: Idf9481db0543e16e591c66e50f5d4fbcbeeda09e
---
M routes/mobile-sections.js
M
test/diff/results/page_formatted-enwiki-User%3ABSitzmann_(WMF)_MCS_Test_Frankenstein.json
M
test/diff/results/page_formatted-enwiki-User%3ABSitzmann_(WMF)_MCS_Test_TitleLinkEncoding.json
M
test/diff/results/page_mobile-sections-enwiki-User%3ABSitzmann_(WMF)_MCS_Test_Frankenstein.json
M
test/diff/results/page_mobile-sections-enwiki-User%3ABSitzmann_(WMF)_MCS_Test_TitleLinkEncoding.json
5 files changed, 4 insertions(+), 8 deletions(-)
Approvals:
BearND: Looks good to me, approved
jenkins-bot: Verified
diff --git a/routes/mobile-sections.js b/routes/mobile-sections.js
index 9dc29df..84e06a1 100644
--- a/routes/mobile-sections.js
+++ b/routes/mobile-sections.js
@@ -321,6 +321,10 @@
delete lead.ns_text;
delete lead.talk_ns;
delete lead.talk_ns_text;
+delete lead.dir;
+delete lead.lang;
+delete lead.thumbnail;
+delete lead.originalimage;
}
/*
diff --git
"a/test/diff/results/page_formatted-enwiki-User%3ABSitzmann_\050WMF\051_MCS_Test_Frankenstein.json"
"b/test/diff/results/page_formatted-enwiki-User%3ABSitzmann_\050WMF\051_MCS_Test_Frankenstein.json"
index adff852..9bcadf5 100644
---
"a/test/diff/results/page_formatted-enwiki-User%3ABSitzmann_\050WMF\051_MCS_Test_Frankenstein.json"
+++
"b/test/diff/results/page_formatted-enwiki-User%3ABSitzmann_\050WMF\051_MCS_Test_Frankenstein.json"
@@ -15,8 +15,6 @@
]
},
"editable": false,
-"dir": "ltr",
-"lang": "en",
"hatnotes": [],
"intro": "Frankenstein Castle is a medieval fortification on a
spur above the village of
Frankenstein, Rhineland-Palatinate in the Palatinate Forest
in Germany. Its name derives from
the local House of Frankenstein.",
"geo": {
diff --git
"a/test/diff/results/page_formatted-enwiki-User%3ABSitzmann_\050WMF\051_MCS_Test_TitleLinkEncoding.json"
"b/test/diff/results/page_formatted-enwiki-User%3ABSitzmann_\050WMF\051_MCS_Test_TitleLinkEncoding.json"
index 31da190..2616067 100644
---
"a/test/diff/results/page_formatted-enwiki-User%3ABSitzmann_\050WMF\051_MCS_Test_TitleLinkEncoding.json"
+++
"b/test/diff/results/page_formatted-enwiki-User%3ABSitzmann_\050WMF\051_MCS_Test_TitleLinkEncoding.json"
@@ -8,8 +8,6 @@
"normalizedtitle": "User:BSitzmann (WMF)/MCS/Test/TitleLinkEncoding",
"protection": {},
"editable": true,
-"dir": "ltr",
-"lang": "en",
"hatnotes": [],
"intro": "Some tests for https://phabricator.wikimedia.org/T136346\";>T136346: Links with plus
signs are not urlencoded: #Pushed
to browser\n #Special
chars $%&\n User:BSitzmann
(WMF)/MCS/Test/TitleLinkEncoding#Special chars $%&\n User:BSitzmann
(WMF)/MCS/Test/Lead paragraph move\n Cation\n Ion#Anions_and_cations\n Sort (C++)\n &\n 100%\n File:CSA-T4-$50-1861.jpg\n A
reference with an internal link[1]\n TitleStart %!\"$&'()*,-.0-9:;=?@A-Z^_`a-z~+
titleEnd#FragmentStart_!$&'()*+,;=-._~:@/?abc0123456789_FragmentEnd
",
"text": ""
diff --git
"a/test/diff/results/page_mobile-sections-enwiki-User%3ABSitzmann_\050WMF\051_MCS_Test_Frankenstein.json"
"b/test/diff/results/page_mobile-sections-enwiki-User%3ABSitzmann_\050WMF\051_MCS_Test_Frankenstein.json"
index 3ce5fed..545856e 100644
---
"a/test/diff/results/page_mobile-sections-enwiki-User%3ABSitzmann_\050WMF\051_MCS_Test_Frankenstein.json"
+++
"b/test/diff/results/page_mobile-sections-enwiki-User%3ABSitzmann_\050WMF\051_MCS_Test_Frankenstein.json"
@@ -15,8 +15,6 @@
]
},
"editable": false,
-"dir": "ltr",
-"lang": "en",
"hatnotes": [],
"geo": {
"latitude": 49.4388,
diff --git
"a/test/diff/results/page_mobile-sections-enwiki-User%3ABSitzmann_\050WMF\051_MCS_Test_TitleLinkEncoding.json"
"b/test/diff/results/page_mobile-sections-enwiki-User%3ABSitzmann_\050WMF\051_MCS_Test_TitleLinkEncoding.json"
index a39f26d..5872b60 100644
---
"a/test/diff/results/page_mobile-sections-enwiki-User%3ABSitzmann_\050WMF\051_MCS_Test_TitleLinkEncoding.json"
+++
"b/test/diff/results/page_mobile-sections-enwiki-User%3ABSitzmann_\050WMF\051_MCS_Test_TitleLinkEncoding.json"
@@ -8,8 +8,6 @@
"normalizedtitle": "User:BSitzmann (WMF)/MCS/Test/TitleLinkEncoding",
"protection": {},
"editable": true,
-"dir": "ltr",
-"lang": "en",
"hatnotes": [],
"sections": [
{
--
To view, visit https://gerrit.wikimedia.org/r/390089
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Idf9481db0543e16e591c66e50f5d4fbcbeeda09e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/mobileapps
Gerrit-Branch: m
[MediaWiki-commits] [Gerrit] operations/puppet[production]: move last hardcoded user names out of snapshot modules to pr...
ArielGlenn has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/390085 )
Change subject: move last hardcoded user names out of snapshot modules to
profiles
..
move last hardcoded user names out of snapshot modules to profiles
Bug: T179942
Change-Id: I3fbdda5f9a0544e08ba1973edfe6b4ae6b24b062
---
M modules/profile/manifests/dumps/generation/worker/monitor.pp
M modules/snapshot/manifests/dumps/monitor.pp
M modules/snapshot/templates/initscripts/dumps-monitor.systemd.erb
M modules/snapshot/templates/initscripts/dumps-monitor.upstart.erb
4 files changed, 11 insertions(+), 5 deletions(-)
Approvals:
ArielGlenn: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/profile/manifests/dumps/generation/worker/monitor.pp
b/modules/profile/manifests/dumps/generation/worker/monitor.pp
index fd6b003..3f8905e 100644
--- a/modules/profile/manifests/dumps/generation/worker/monitor.pp
+++ b/modules/profile/manifests/dumps/generation/worker/monitor.pp
@@ -1,3 +1,6 @@
class profile::dumps::generation::worker::monitor {
-class { '::snapshot::dumps::monitor': }
+class { '::snapshot::dumps::monitor':
+xmldumpsuser => 'dumpsgen',
+xmldumpsgroup => 'dumpsgen',
+}
}
diff --git a/modules/snapshot/manifests/dumps/monitor.pp
b/modules/snapshot/manifests/dumps/monitor.pp
index cd96ea5..87a1723 100644
--- a/modules/snapshot/manifests/dumps/monitor.pp
+++ b/modules/snapshot/manifests/dumps/monitor.pp
@@ -1,4 +1,7 @@
-class snapshot::dumps::monitor {
+class snapshot::dumps::monitor(
+$xmldumpsuser = undef,
+$xmldumpsgroup = undef,
+) {
$repodir = $snapshot::dumps::dirs::repodir
$confsdir = $snapshot::dumps::dirs::confsdir
diff --git a/modules/snapshot/templates/initscripts/dumps-monitor.systemd.erb
b/modules/snapshot/templates/initscripts/dumps-monitor.systemd.erb
index 36d4540..88eb0ad 100644
--- a/modules/snapshot/templates/initscripts/dumps-monitor.systemd.erb
+++ b/modules/snapshot/templates/initscripts/dumps-monitor.systemd.erb
@@ -7,7 +7,7 @@
After=network.target
[Service]
-User=dumpsgen
+User=<%= @xmldumpsuser %>
WorkingDirectory=<%= @repodir %>
ExecStart=/bin/bash <%= @repodir -%>/monitor --configfile <%= @confsdir
-%>/wikidump.conf.dumps:monitor --basedir <%= @repodir %>
diff --git a/modules/snapshot/templates/initscripts/dumps-monitor.upstart.erb
b/modules/snapshot/templates/initscripts/dumps-monitor.upstart.erb
index 1d50cfd..8920a4d 100644
--- a/modules/snapshot/templates/initscripts/dumps-monitor.upstart.erb
+++ b/modules/snapshot/templates/initscripts/dumps-monitor.upstart.erb
@@ -7,8 +7,8 @@
start on (local-filesystems and net-device-up IFACE!=lo)
stop on runlevel [!2345]
-setuid "dumpsgen"
-setgid "dumpsgen"
+setuid "<%= @xmldumpsuser %>"
+setgid "<%= @xmldumpsgroup %>"
respawn
--
To view, visit https://gerrit.wikimedia.org/r/390085
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I3fbdda5f9a0544e08ba1973edfe6b4ae6b24b062
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: ArielGlenn
Gerrit-Reviewer: ArielGlenn
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...mobileapps[master]: Exclude properties only needed for summary from lead respons...
Mholloway has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/390089 )
Change subject: Exclude properties only needed for summary from lead response,
pt. 2
..
Exclude properties only needed for summary from lead response, pt. 2
Change-Id: Idf9481db0543e16e591c66e50f5d4fbcbeeda09e
---
M routes/mobile-sections.js
M
test/diff/results/page_formatted-enwiki-User%3ABSitzmann_(WMF)_MCS_Test_Frankenstein.json
M
test/diff/results/page_formatted-enwiki-User%3ABSitzmann_(WMF)_MCS_Test_TitleLinkEncoding.json
M
test/diff/results/page_mobile-sections-enwiki-User%3ABSitzmann_(WMF)_MCS_Test_Frankenstein.json
M
test/diff/results/page_mobile-sections-enwiki-User%3ABSitzmann_(WMF)_MCS_Test_TitleLinkEncoding.json
5 files changed, 4 insertions(+), 8 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/mobileapps
refs/changes/89/390089/1
diff --git a/routes/mobile-sections.js b/routes/mobile-sections.js
index 9dc29df..84e06a1 100644
--- a/routes/mobile-sections.js
+++ b/routes/mobile-sections.js
@@ -321,6 +321,10 @@
delete lead.ns_text;
delete lead.talk_ns;
delete lead.talk_ns_text;
+delete lead.dir;
+delete lead.lang;
+delete lead.thumbnail;
+delete lead.originalimage;
}
/*
diff --git
"a/test/diff/results/page_formatted-enwiki-User%3ABSitzmann_\050WMF\051_MCS_Test_Frankenstein.json"
"b/test/diff/results/page_formatted-enwiki-User%3ABSitzmann_\050WMF\051_MCS_Test_Frankenstein.json"
index adff852..9bcadf5 100644
---
"a/test/diff/results/page_formatted-enwiki-User%3ABSitzmann_\050WMF\051_MCS_Test_Frankenstein.json"
+++
"b/test/diff/results/page_formatted-enwiki-User%3ABSitzmann_\050WMF\051_MCS_Test_Frankenstein.json"
@@ -15,8 +15,6 @@
]
},
"editable": false,
-"dir": "ltr",
-"lang": "en",
"hatnotes": [],
"intro": "Frankenstein Castle is a medieval fortification on a
spur above the village of
Frankenstein, Rhineland-Palatinate in the Palatinate Forest
in Germany. Its name derives from
the local House of Frankenstein.",
"geo": {
diff --git
"a/test/diff/results/page_formatted-enwiki-User%3ABSitzmann_\050WMF\051_MCS_Test_TitleLinkEncoding.json"
"b/test/diff/results/page_formatted-enwiki-User%3ABSitzmann_\050WMF\051_MCS_Test_TitleLinkEncoding.json"
index 31da190..2616067 100644
---
"a/test/diff/results/page_formatted-enwiki-User%3ABSitzmann_\050WMF\051_MCS_Test_TitleLinkEncoding.json"
+++
"b/test/diff/results/page_formatted-enwiki-User%3ABSitzmann_\050WMF\051_MCS_Test_TitleLinkEncoding.json"
@@ -8,8 +8,6 @@
"normalizedtitle": "User:BSitzmann (WMF)/MCS/Test/TitleLinkEncoding",
"protection": {},
"editable": true,
-"dir": "ltr",
-"lang": "en",
"hatnotes": [],
"intro": "Some tests for https://phabricator.wikimedia.org/T136346\";>T136346: Links with plus
signs are not urlencoded: #Pushed
to browser\n #Special
chars $%&\n User:BSitzmann
(WMF)/MCS/Test/TitleLinkEncoding#Special chars $%&\n User:BSitzmann
(WMF)/MCS/Test/Lead paragraph move\n Cation\n Ion#Anions_and_cations\n Sort (C++)\n &\n 100%\n File:CSA-T4-$50-1861.jpg\n A
reference with an internal link[1]\n TitleStart %!\"$&'()*,-.0-9:;=?@A-Z^_`a-z~+
titleEnd#FragmentStart_!$&'()*+,;=-._~:@/?abc0123456789_FragmentEnd
",
"text": ""
diff --git
"a/test/diff/results/page_mobile-sections-enwiki-User%3ABSitzmann_\050WMF\051_MCS_Test_Frankenstein.json"
"b/test/diff/results/page_mobile-sections-enwiki-User%3ABSitzmann_\050WMF\051_MCS_Test_Frankenstein.json"
index 3ce5fed..545856e 100644
---
"a/test/diff/results/page_mobile-sections-enwiki-User%3ABSitzmann_\050WMF\051_MCS_Test_Frankenstein.json"
+++
"b/test/diff/results/page_mobile-sections-enwiki-User%3ABSitzmann_\050WMF\051_MCS_Test_Frankenstein.json"
@@ -15,8 +15,6 @@
]
},
"editable": false,
-"dir": "ltr",
-"lang": "en",
"hatnotes": [],
"geo": {
"latitude": 49.4388,
diff --git
"a/test/diff/results/page_mobile-sections-enwiki-User%3ABSitzmann_\050WMF\051_MCS_Test_TitleLinkEncoding.json"
"b/test/diff/results/page_mobile-sections-enwiki-User%3ABSitzmann_\050WMF\051_MCS_Test_TitleLinkEncoding.json"
index a39f26d..5872b60 100644
---
"a/test/diff/results/page_mobile-sections-enwiki-User%3ABSitzmann_\050WMF\051_MCS_Test_TitleLinkEncoding.json"
+++
"b/test/diff/results/page_mobile-sections-enwiki-User%3ABSitzmann_\050WMF\051_MCS_Test_TitleLinkEncoding.json"
@@ -8,8 +8,6 @@
"normalizedtitle": "User:BSitzmann (WMF)/MCS/Test/TitleLinkEncoding",
"protection": {},
"editable": true,
-"dir": "ltr",
-"lang": "en",
"hatnotes": [],
"sections": [
{
--
To view, visit https://gerrit.wikimedia.org/r/390089
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Idf9481db0543e16e591c66e50f5d4fbcbeeda09e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/mobilea
[MediaWiki-commits] [Gerrit] wikimedia...crm[deployment]: Merge branch 'master' into deployment
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/390088 ) Change subject: Merge branch 'master' into deployment .. Merge branch 'master' into deployment 299c03513 Fix TY mail test form Change-Id: I450caff1f209e47d6955eb712e376bdcd507c990 --- 0 files changed, 0 insertions(+), 0 deletions(-) Approvals: jenkins-bot: Verified Ejegg: Looks good to me, approved -- To view, visit https://gerrit.wikimedia.org/r/390088 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I450caff1f209e47d6955eb712e376bdcd507c990 Gerrit-PatchSet: 1 Gerrit-Project: wikimedia/fundraising/crm Gerrit-Branch: deployment Gerrit-Owner: Ejegg Gerrit-Reviewer: Ejegg Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] wikimedia...crm[deployment]: Merge branch 'master' into deployment
Ejegg has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/390088 ) Change subject: Merge branch 'master' into deployment .. Merge branch 'master' into deployment 299c03513 Fix TY mail test form Change-Id: I450caff1f209e47d6955eb712e376bdcd507c990 --- 0 files changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm refs/changes/88/390088/1 -- To view, visit https://gerrit.wikimedia.org/r/390088 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I450caff1f209e47d6955eb712e376bdcd507c990 Gerrit-PatchSet: 1 Gerrit-Project: wikimedia/fundraising/crm Gerrit-Branch: deployment Gerrit-Owner: Ejegg ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] wikimedia...crm[master]: Fix TY mail test form
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/390087 )
Change subject: Fix TY mail test form
..
Fix TY mail test form
Change-Id: I58a8073bb45eac228d99570a4834bfb02cfa8b50
---
M sites/all/modules/thank_you/thank_you.module
1 file changed, 7 insertions(+), 0 deletions(-)
Approvals:
jenkins-bot: Verified
Ejegg: Looks good to me, approved
diff --git a/sites/all/modules/thank_you/thank_you.module
b/sites/all/modules/thank_you/thank_you.module
index 883cb68..1d9d610 100644
--- a/sites/all/modules/thank_you/thank_you.module
+++ b/sites/all/modules/thank_you/thank_you.module
@@ -155,6 +155,13 @@
'#default_value' => mt_rand(),
);
+ $form['contact_id'] = array(
+ '#type' => 'textfield',
+ '#title' => t('Contact ID'),
+ '#description' => t('Actual ID of contact to be thanked, for
example: 12345'),
+ '#default_value' => mt_rand(),
+ );
+
$form['recurring'] = array(
'#type' => 'checkbox',
'#title' => t('Is a recurring donation?'),
--
To view, visit https://gerrit.wikimedia.org/r/390087
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I58a8073bb45eac228d99570a4834bfb02cfa8b50
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: master
Gerrit-Owner: Ejegg
Gerrit-Reviewer: Ejegg
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] wikimedia...crm[master]: Fix TY mail test form
Ejegg has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/390087 )
Change subject: Fix TY mail test form
..
Fix TY mail test form
Change-Id: I58a8073bb45eac228d99570a4834bfb02cfa8b50
---
M sites/all/modules/thank_you/thank_you.module
1 file changed, 7 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm
refs/changes/87/390087/1
diff --git a/sites/all/modules/thank_you/thank_you.module
b/sites/all/modules/thank_you/thank_you.module
index 883cb68..1d9d610 100644
--- a/sites/all/modules/thank_you/thank_you.module
+++ b/sites/all/modules/thank_you/thank_you.module
@@ -155,6 +155,13 @@
'#default_value' => mt_rand(),
);
+ $form['contact_id'] = array(
+ '#type' => 'textfield',
+ '#title' => t('Contact ID'),
+ '#description' => t('Actual ID of contact to be thanked, for
example: 12345'),
+ '#default_value' => mt_rand(),
+ );
+
$form['recurring'] = array(
'#type' => 'checkbox',
'#title' => t('Is a recurring donation?'),
--
To view, visit https://gerrit.wikimedia.org/r/390087
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I58a8073bb45eac228d99570a4834bfb02cfa8b50
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: master
Gerrit-Owner: Ejegg
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: move last hardcoded user names out of snapshot modules to pr...
ArielGlenn has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/390085 )
Change subject: move last hardcoded user names out of snapshot modules to
profiles
..
move last hardcoded user names out of snapshot modules to profiles
Bug: T179942
Change-Id: I3fbdda5f9a0544e08ba1973edfe6b4ae6b24b062
---
M modules/profile/manifests/dumps/generation/worker/monitor.pp
M modules/snapshot/manifests/dumps/monitor.pp
M modules/snapshot/templates/initscripts/dumps-monitor.systemd.erb
M modules/snapshot/templates/initscripts/dumps-monitor.upstart.erb
4 files changed, 11 insertions(+), 5 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/85/390085/1
diff --git a/modules/profile/manifests/dumps/generation/worker/monitor.pp
b/modules/profile/manifests/dumps/generation/worker/monitor.pp
index fd6b003..2ffdc60 100644
--- a/modules/profile/manifests/dumps/generation/worker/monitor.pp
+++ b/modules/profile/manifests/dumps/generation/worker/monitor.pp
@@ -1,3 +1,6 @@
class profile::dumps::generation::worker::monitor {
-class { '::snapshot::dumps::monitor': }
+class { '::snapshot::dumps::monitor':
+xmldumpsuser => 'dumpsgen',
+xmldumpsgroup => 'dumpsgen',
+}
}
diff --git a/modules/snapshot/manifests/dumps/monitor.pp
b/modules/snapshot/manifests/dumps/monitor.pp
index cd96ea5..87a1723 100644
--- a/modules/snapshot/manifests/dumps/monitor.pp
+++ b/modules/snapshot/manifests/dumps/monitor.pp
@@ -1,4 +1,7 @@
-class snapshot::dumps::monitor {
+class snapshot::dumps::monitor(
+$xmldumpsuser = undef,
+$xmldumpsgroup = undef,
+) {
$repodir = $snapshot::dumps::dirs::repodir
$confsdir = $snapshot::dumps::dirs::confsdir
diff --git a/modules/snapshot/templates/initscripts/dumps-monitor.systemd.erb
b/modules/snapshot/templates/initscripts/dumps-monitor.systemd.erb
index 36d4540..88eb0ad 100644
--- a/modules/snapshot/templates/initscripts/dumps-monitor.systemd.erb
+++ b/modules/snapshot/templates/initscripts/dumps-monitor.systemd.erb
@@ -7,7 +7,7 @@
After=network.target
[Service]
-User=dumpsgen
+User=<%= @xmldumpsuser %>
WorkingDirectory=<%= @repodir %>
ExecStart=/bin/bash <%= @repodir -%>/monitor --configfile <%= @confsdir
-%>/wikidump.conf.dumps:monitor --basedir <%= @repodir %>
diff --git a/modules/snapshot/templates/initscripts/dumps-monitor.upstart.erb
b/modules/snapshot/templates/initscripts/dumps-monitor.upstart.erb
index 1d50cfd..981ea73 100644
--- a/modules/snapshot/templates/initscripts/dumps-monitor.upstart.erb
+++ b/modules/snapshot/templates/initscripts/dumps-monitor.upstart.erb
@@ -7,8 +7,8 @@
start on (local-filesystems and net-device-up IFACE!=lo)
stop on runlevel [!2345]
-setuid "dumpsgen"
-setgid "dumpsgen"
+setuid <%= @xmldumpsuser %>
+setgid <%= @xmldumpsgroup %>
respawn
--
To view, visit https://gerrit.wikimedia.org/r/390085
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I3fbdda5f9a0544e08ba1973edfe6b4ae6b24b062
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: ArielGlenn
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] wikimedia...crm[deployment]: Merge branch 'master' into deployment
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/390084 )
Change subject: Merge branch 'master' into deployment
..
Merge branch 'master' into deployment
And update vendor
a126d53f4 Update donation-interface for new ty message subject
79462ced1 Update English thank you letter for 2017
470ee09c7 English TY letter updates
7dcaa28f8 Use shell-safe verp when not making CiviMail records
Change-Id: Ieaec47d10fd9f1f7f8ddec57bf9277fab0dbfa6e
---
D sites/all/modules/thank_you/tests/phpunit/ThankYouTest.php
D
sites/default/civicrm/extensions/org.wikimedia.omnimail/tests/phpunit/OmnigroupmemberGetTest.php
D
sites/default/civicrm/extensions/org.wikimedia.omnimail/tests/phpunit/OmnigroupmemberLoadTest.php
D
sites/default/civicrm/extensions/org.wikimedia.omnimail/tests/phpunit/OmnimailBaseTestClass.php
D
sites/default/civicrm/extensions/org.wikimedia.omnimail/tests/phpunit/OmnimailingGetTest.php
D
sites/default/civicrm/extensions/org.wikimedia.omnimail/tests/phpunit/OmnimailingLoadTest.php
D
sites/default/civicrm/extensions/org.wikimedia.omnimail/tests/phpunit/OmnirecipientGetTest.php
D
sites/default/civicrm/extensions/org.wikimedia.omnimail/tests/phpunit/OmnirecipientLoadTest.php
D
sites/default/civicrm/extensions/org.wikimedia.omnimail/tests/phpunit/OmnirecipientProcessUnsubscribesTest.php
D
sites/default/civicrm/extensions/org.wikimedia.omnimail/tests/phpunit/Responses/20170509_noCID
- All - Jul 5 2017 06-27-45 AM.csv
D
sites/default/civicrm/extensions/org.wikimedia.omnimail/tests/phpunit/Responses/AggregateGetResponse1.txt
D
sites/default/civicrm/extensions/org.wikimedia.omnimail/tests/phpunit/Responses/AuthenticateResponse.txt
D
sites/default/civicrm/extensions/org.wikimedia.omnimail/tests/phpunit/Responses/ExportListResponse.txt
D
sites/default/civicrm/extensions/org.wikimedia.omnimail/tests/phpunit/Responses/GetMailingTemplateResponse.txt
D
sites/default/civicrm/extensions/org.wikimedia.omnimail/tests/phpunit/Responses/GetMailingTemplateResponse2.txt
D
sites/default/civicrm/extensions/org.wikimedia.omnimail/tests/phpunit/Responses/JobStatusCompleteResponse.txt
D
sites/default/civicrm/extensions/org.wikimedia.omnimail/tests/phpunit/Responses/JobStatusWaitingResponse.txt
D
sites/default/civicrm/extensions/org.wikimedia.omnimail/tests/phpunit/Responses/MailingGetResponse1.txt
D
sites/default/civicrm/extensions/org.wikimedia.omnimail/tests/phpunit/Responses/Raw
Recipient Data Export Jul 03 2017 00-47-42 AM 1295.csv
D
sites/default/civicrm/extensions/org.wikimedia.omnimail/tests/phpunit/Responses/RawRecipientDataExportResponse.txt
D
sites/default/civicrm/extensions/org.wikimedia.omnimail/tests/phpunit/bootstrap.php
D
sites/default/civicrm/extensions/org.wikimedia.rip/tests/phpunit/CRM/RipTest.php
D sites/default/civicrm/extensions/org.wikimedia.rip/tests/phpunit/bootstrap.php
M vendor
24 files changed, 1 insertion(+), 1,695 deletions(-)
Approvals:
jenkins-bot: Verified
Ejegg: Looks good to me, approved
diff --git a/sites/all/modules/thank_you/tests/phpunit/ThankYouTest.php
b/sites/all/modules/thank_you/tests/phpunit/ThankYouTest.php
deleted file mode 100644
index 587ced2..000
--- a/sites/all/modules/thank_you/tests/phpunit/ThankYouTest.php
+++ /dev/null
@@ -1,164 +0,0 @@
-<<< HEAD (dc1b27 Revert "Update English thank you letter for 2017")
-===
-message = array(
- 'city' => 'Somerville',
- 'country' => 'US',
- 'currency' => 'USD',
- 'date' => time(),
- 'email' => 'generousdo...@example.org',
- 'first_name' => 'Test',
- 'last_name' => 'Es',
- 'language' => 'en',
- 'gateway' => 'test_gateway',
- 'gateway_txn_id' => mt_rand(),
- 'gross' => '1.23',
- 'payment_method' => 'cc',
- 'postal_code' => '02144',
- 'state_province' => 'MA',
- 'street_address' => '1 Davis Square',
- );
- $this->old_civimail = variable_get(
'thank_you_add_civimail_records', 'false' );
- $this->old_civimail_rate = variable_get(
'thank_you_civimail_rate', 1.0 );
-
- $contribution = wmf_civicrm_contribution_message_import(
$this->message );
-
- $this->contact_id = $contribution['contact_id'];
- $this->contribution_id = $contribution['id'];
- }
-
- public function tearDown() {
- parent::cleanUpContact( $this->contact_id );
- variable_set( 'thank_you_add_civimail_records',
$this->old_civimail );
- variable_get( 'thank_you_civimail_rate',
$this->old_civimail_rate );
- parent::tearDown();
- }
-
- /**
-*
[MediaWiki-commits] [Gerrit] wikimedia...crm[deployment]: Merge branch 'master' into deployment
Ejegg has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/390084 )
Change subject: Merge branch 'master' into deployment
..
Merge branch 'master' into deployment
And update vendor
a126d53f4 Update donation-interface for new ty message subject
79462ced1 Update English thank you letter for 2017
470ee09c7 English TY letter updates
7dcaa28f8 Use shell-safe verp when not making CiviMail records
Change-Id: Ieaec47d10fd9f1f7f8ddec57bf9277fab0dbfa6e
---
D sites/all/modules/thank_you/tests/phpunit/ThankYouTest.php
D
sites/default/civicrm/extensions/org.wikimedia.omnimail/tests/phpunit/OmnigroupmemberGetTest.php
D
sites/default/civicrm/extensions/org.wikimedia.omnimail/tests/phpunit/OmnigroupmemberLoadTest.php
D
sites/default/civicrm/extensions/org.wikimedia.omnimail/tests/phpunit/OmnimailBaseTestClass.php
D
sites/default/civicrm/extensions/org.wikimedia.omnimail/tests/phpunit/OmnimailingGetTest.php
D
sites/default/civicrm/extensions/org.wikimedia.omnimail/tests/phpunit/OmnimailingLoadTest.php
D
sites/default/civicrm/extensions/org.wikimedia.omnimail/tests/phpunit/OmnirecipientGetTest.php
D
sites/default/civicrm/extensions/org.wikimedia.omnimail/tests/phpunit/OmnirecipientLoadTest.php
D
sites/default/civicrm/extensions/org.wikimedia.omnimail/tests/phpunit/OmnirecipientProcessUnsubscribesTest.php
D
sites/default/civicrm/extensions/org.wikimedia.omnimail/tests/phpunit/Responses/20170509_noCID
- All - Jul 5 2017 06-27-45 AM.csv
D
sites/default/civicrm/extensions/org.wikimedia.omnimail/tests/phpunit/Responses/AggregateGetResponse1.txt
D
sites/default/civicrm/extensions/org.wikimedia.omnimail/tests/phpunit/Responses/AuthenticateResponse.txt
D
sites/default/civicrm/extensions/org.wikimedia.omnimail/tests/phpunit/Responses/ExportListResponse.txt
D
sites/default/civicrm/extensions/org.wikimedia.omnimail/tests/phpunit/Responses/GetMailingTemplateResponse.txt
D
sites/default/civicrm/extensions/org.wikimedia.omnimail/tests/phpunit/Responses/GetMailingTemplateResponse2.txt
D
sites/default/civicrm/extensions/org.wikimedia.omnimail/tests/phpunit/Responses/JobStatusCompleteResponse.txt
D
sites/default/civicrm/extensions/org.wikimedia.omnimail/tests/phpunit/Responses/JobStatusWaitingResponse.txt
D
sites/default/civicrm/extensions/org.wikimedia.omnimail/tests/phpunit/Responses/MailingGetResponse1.txt
D
sites/default/civicrm/extensions/org.wikimedia.omnimail/tests/phpunit/Responses/Raw
Recipient Data Export Jul 03 2017 00-47-42 AM 1295.csv
D
sites/default/civicrm/extensions/org.wikimedia.omnimail/tests/phpunit/Responses/RawRecipientDataExportResponse.txt
D
sites/default/civicrm/extensions/org.wikimedia.omnimail/tests/phpunit/bootstrap.php
D
sites/default/civicrm/extensions/org.wikimedia.rip/tests/phpunit/CRM/RipTest.php
D sites/default/civicrm/extensions/org.wikimedia.rip/tests/phpunit/bootstrap.php
M vendor
24 files changed, 1 insertion(+), 1,695 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm
refs/changes/84/390084/1
diff --git a/sites/all/modules/thank_you/tests/phpunit/ThankYouTest.php
b/sites/all/modules/thank_you/tests/phpunit/ThankYouTest.php
deleted file mode 100644
index 587ced2..000
--- a/sites/all/modules/thank_you/tests/phpunit/ThankYouTest.php
+++ /dev/null
@@ -1,164 +0,0 @@
-<<< HEAD (dc1b27 Revert "Update English thank you letter for 2017")
-===
-message = array(
- 'city' => 'Somerville',
- 'country' => 'US',
- 'currency' => 'USD',
- 'date' => time(),
- 'email' => 'generousdo...@example.org',
- 'first_name' => 'Test',
- 'last_name' => 'Es',
- 'language' => 'en',
- 'gateway' => 'test_gateway',
- 'gateway_txn_id' => mt_rand(),
- 'gross' => '1.23',
- 'payment_method' => 'cc',
- 'postal_code' => '02144',
- 'state_province' => 'MA',
- 'street_address' => '1 Davis Square',
- );
- $this->old_civimail = variable_get(
'thank_you_add_civimail_records', 'false' );
- $this->old_civimail_rate = variable_get(
'thank_you_civimail_rate', 1.0 );
-
- $contribution = wmf_civicrm_contribution_message_import(
$this->message );
-
- $this->contact_id = $contribution['contact_id'];
- $this->contribution_id = $contribution['id'];
- }
-
- public function tearDown() {
- parent::cleanUpContact( $this->contact_id );
- variable_set( 'thank_you_add_civimail_records',
$this->old_civimail );
- variable_get( 'thank_you_civimail_rate',
$this->old_civimail_rate );
- parent::tearDown();
- }
-
- /**
[MediaWiki-commits] [Gerrit] wikimedia...crm[master]: Use shell-safe verp when not making CiviMail records
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/387953 )
Change subject: Use shell-safe verp when not making CiviMail records
..
Use shell-safe verp when not making CiviMail records
This will give us the option to turn off CiviMail records if TY mail
start to lag too far behind.
Change-Id: I33997b0dec07fdfabdc029aa89b0d1d962fc4494
---
M sites/all/modules/thank_you/tests/phpunit/ThankYouTest.php
M sites/all/modules/thank_you/thank_you.module
2 files changed, 13 insertions(+), 5 deletions(-)
Approvals:
Mepps: Looks good to me, approved
jenkins-bot: Verified
diff --git a/sites/all/modules/thank_you/tests/phpunit/ThankYouTest.php
b/sites/all/modules/thank_you/tests/phpunit/ThankYouTest.php
index 6e1c8fa..03acdda 100644
--- a/sites/all/modules/thank_you/tests/phpunit/ThankYouTest.php
+++ b/sites/all/modules/thank_you/tests/phpunit/ThankYouTest.php
@@ -106,8 +106,7 @@
"{$this->message['first_name']}
{$this->message['last_name']}",
$sent['to_name']
);
- $expectedBounce = 'bounce-' .
- str_replace( '@', '=', $this->message['email'] ) .
+ $expectedBounce =
"ty.{$this->contact_id}.{$this->contribution_id}" .
'@donate.wikimedia.org';
$this->assertEquals( $expectedBounce, $sent['reply_to'] );
$this->assertRegExp( '/\$ 1.23/', $sent['html'] );
diff --git a/sites/all/modules/thank_you/thank_you.module
b/sites/all/modules/thank_you/thank_you.module
index 17bdbb1..883cb68 100644
--- a/sites/all/modules/thank_you/thank_you.module
+++ b/sites/all/modules/thank_you/thank_you.module
@@ -144,8 +144,15 @@
$form['transaction_id'] = array(
'#type' => 'textfield',
'#title' => t('Transaction ID'),
- '#description' => t('Some kind of key we would use to find your
records, example: "CNTCT-1234"'),
+ '#description' => t('ID to show in the text of the email, for
example: "CNTCT-1234"'),
'#default_value' => 'TEST-' . mt_rand(),
+ );
+
+ $form['contribution_id'] = array(
+ '#type' => 'textfield',
+ '#title' => t('Contribution ID'),
+ '#description' => t('Actual ID of contribution to be thanked,
for example: 12345'),
+ '#default_value' => mt_rand(),
);
$form['recurring'] = array(
@@ -336,7 +343,8 @@
'receive_date' => $mailingData['receive_date'],
'recipient_address' => $mailingData['email'],
'recurring' => $is_recurring,
-'transaction_id' => "CNTCT-{$mailingData['contact_id']}",
+'transaction_id' => "CNTCT-{$mailingData['contact_id']}", // shown in
the body of the text
+ 'contribution_id' => $contribution_id, // used for the bounce
header
'unsubscribe_link' => build_unsub_link( $contribution_id,
$mailingData['email'], $locale ),
'contribution_tags' => wmf_thank_you_get_tag_names($contribution_id),
);
@@ -408,6 +416,7 @@
function thank_you_send_mail( $params ) {
$require_params = array(
'amount',
+'contribution_id',
'currency',
'from_name',
'from_address',
@@ -470,7 +479,7 @@
if ( $civi_queue_record ) {
$email['reply_to'] = $civi_queue_record->getVerp();
} else {
- $email['reply_to'] = 'bounce-' . str_replace( '@', '=',
$email['to_address'] ) . '@donate.wikimedia.org';
+ $email['reply_to'] =
"ty.{$params['contact_id']}.{$params['contribution_id']}@donate.wikimedia.org";
}
try {
--
To view, visit https://gerrit.wikimedia.org/r/387953
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I33997b0dec07fdfabdc029aa89b0d1d962fc4494
Gerrit-PatchSet: 3
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: master
Gerrit-Owner: Ejegg
Gerrit-Reviewer: AndyRussG
Gerrit-Reviewer: Cdentinger
Gerrit-Reviewer: Eileen
Gerrit-Reviewer: Ejegg
Gerrit-Reviewer: Jgleeson
Gerrit-Reviewer: Katie Horn
Gerrit-Reviewer: Mepps
Gerrit-Reviewer: XenoRyet
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: webperf: Refactor tests to directly associate expected data ...
Krinkle has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/390083 ) Change subject: webperf: Refactor tests to directly associate expected data with cases .. webperf: Refactor tests to directly associate expected data with cases Previously we had a file with all input and a file with all output, which is pretty hard to review and basically only helps catch errors when the intent is to change nothing in the output. Whenever we do make a change in the output, the expected data was sufficiently mixed up that one basically ends up just recreating it with the new input with no feasible way to review. Hopefully this new structure will make it easier to review by having the input and expected output directly associated with each another, and in the same file. Change-Id: Ibb6c11476535e45490a5147294099d1965a3f970 --- D modules/webperf/files/navtiming_expected.txt M modules/webperf/files/navtiming_fixture.yaml M modules/webperf/files/navtiming_test.py 3 files changed, 463 insertions(+), 6,775 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/83/390083/1 -- To view, visit https://gerrit.wikimedia.org/r/390083 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ibb6c11476535e45490a5147294099d1965a3f970 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Krinkle ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: New: Make Feed content completely configurable.
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/389872 )
Change subject: New: Make Feed content completely configurable.
..
New: Make Feed content completely configurable.
Bug: T141397
Change-Id: Icace97fe0af8490983555bcd0661ec237d051af7
---
M app/src/main/AndroidManifest.xml
M app/src/main/java/org/wikipedia/Constants.java
A app/src/main/java/org/wikipedia/feed/FeedContentType.java
M app/src/main/java/org/wikipedia/feed/FeedCoordinator.java
M app/src/main/java/org/wikipedia/feed/FeedCoordinatorBase.java
M app/src/main/java/org/wikipedia/feed/FeedFragment.java
A app/src/main/java/org/wikipedia/feed/configure/ConfigureActivity.java
A app/src/main/java/org/wikipedia/feed/configure/ConfigureFragment.java
A app/src/main/java/org/wikipedia/feed/configure/ConfigureItemView.java
M app/src/main/java/org/wikipedia/settings/Prefs.java
M app/src/main/java/org/wikipedia/views/ExploreOverflowView.java
A app/src/main/res/drawable/ic_drag_handle_black_24dp.xml
A app/src/main/res/layout/fragment_feed_configure.xml
A app/src/main/res/layout/item_feed_content_type.xml
M app/src/main/res/layout/view_explore_overflow.xml
A app/src/main/res/menu/menu_feed_configure.xml
M app/src/main/res/values-qq/strings.xml
M app/src/main/res/values/preference_keys.xml
M app/src/main/res/values/strings.xml
19 files changed, 634 insertions(+), 26 deletions(-)
Approvals:
jenkins-bot: Verified
Cooltey: Looks good to me, approved
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 02b4856..8448bf2 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -236,6 +236,10 @@
android:label="@string/on_this_day"
android:theme="@style/AppTheme.ActionBar"/>
+
+
MAP
+= new EnumCodeMap<>(FeedContentType.class);
+private final int code;
+@StringRes private final int titleId;
+private int order;
+private boolean enabled = true;
+
+@NonNull public static FeedContentType of(int code) {
+return MAP.get(code);
+}
+
+@Nullable
+public abstract FeedClient newClient(AggregatedFeedContentClient
aggregatedClient,
+ int age, boolean isOnline);
+
+@Override public int code() {
+return code;
+}
+
+public int titleId() {
+return titleId;
+}
+
+public boolean isEnabled() {
+return enabled;
+}
+
+public void setEnabled(boolean enabled) {
+this.enabled = enabled;
+}
+
+public Integer getOrder() {
+return order;
+}
+
+public void setOrder(int order) {
+this.order = order;
+}
+
+FeedContentType(int code, @StringRes int titleId) {
+this.code = code;
+this.order = code;
+this.titleId = titleId;
+}
+
+public static void saveState() {
+List enabledList = new ArrayList<>();
+List orderList = new ArrayList<>();
+for (int i = 0; i < FeedContentType.values().length; i++) {
+enabledList.add(FeedContentType.values()[i].isEnabled());
+orderList.add(FeedContentType.values()[i].getOrder());
+}
+Prefs.setFeedCardsEnabled(enabledList);
+Prefs.setFeedCardsOrder(orderList);
+}
+
+public static void restoreState() {
+List enabledList = Prefs.getFeedCardsEnabled();
+List orderList = Prefs.getFeedCardsOrder();
+for (int i = 0; i < FeedContentType.values().length; i++) {
+FeedContentType.values()[i].setEnabled(i < enabledList.size() ?
enabledList.get(i) : true);
+FeedContentType.values()[i].setOrder(i < orderList.size() ?
orderList.get(i) : i);
+}
+}
+}
diff --git a/app/src/main/java/org/wikipedia/feed/FeedCoordinator.java
b/app/src/main/java/org/wikipedia/feed/FeedCoordinator.java
index 5af0e97..1d4a040 100644
--- a/app/src/main/java/org/wikipedia/feed/FeedCoordinator.java
+++ b/app/src/main/java/org/wikipedia/feed/FeedCoordinator.java
@@ -5,24 +5,23 @@
import org.wikipedia.feed.aggregated.AggregatedFeedContentClient;
import org.wikipedia.feed.announcement.AnnouncementClient;
-import org.wikipedia.feed.becauseyouread.BecauseYouReadClient;
-import org.wikipedia.feed.continuereading.ContinueReadingClient;
-import org.wikipedia.feed.mainpage.MainPageClient;
import org.wikipedia.feed.offline.OfflineCompilationClient;
import org.wikipedia.feed.onboarding.OnboardingClient;
-import org.wikipedia.feed.onthisday.OnThisDayClient;
-import org.wikipedia.feed.random.RandomClient;
import org.wikipedia.feed.searchbar.SearchClient;
import org.wikipedia.offline.OfflineManager;
import org.wikipedia.util.DeviceUtil;
-import static org.wikipedia.util.ReleaseUtil.isPreBetaRelease;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
-class FeedCoordinator
[MediaWiki-commits] [Gerrit] wikimedia...crm[master]: Update English thank you letter for 2017
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/390081 )
Change subject: Update English thank you letter for 2017
..
Update English thank you letter for 2017
Bug: T177878
Change-Id: I613fd0bbda01943f637be1d555f013a02fa182c0
---
M sites/all/modules/thank_you/generators/ThankYou.php
M sites/all/modules/thank_you/templates/html/thank_you.en.html
2 files changed, 19 insertions(+), 16 deletions(-)
Approvals:
jenkins-bot: Verified
Ejegg: Looks good to me, approved
diff --git a/sites/all/modules/thank_you/generators/ThankYou.php
b/sites/all/modules/thank_you/generators/ThankYou.php
index 742c4ea..d93cba1 100644
--- a/sites/all/modules/thank_you/generators/ThankYou.php
+++ b/sites/all/modules/thank_you/generators/ThankYou.php
@@ -3,7 +3,7 @@
class ThankYou extends RenderTranslatedPage {
function __construct() {
// FIXME: drupal var and settings UI
- $this->title =
'Fundraising/Translation/Thank_you_email_20161128';
+ $this->title =
'Fundraising/Translation/Thank_you_email_20171019';
$this->proto_file = __DIR__ .
'/../templates/html/thank_you.$1.html';
$this->substitutions = array(
diff --git a/sites/all/modules/thank_you/templates/html/thank_you.en.html
b/sites/all/modules/thank_you/templates/html/thank_you.en.html
index ea3fcd6..049b106 100644
--- a/sites/all/modules/thank_you/templates/html/thank_you.en.html
+++ b/sites/all/modules/thank_you/templates/html/thank_you.en.html
@@ -5,7 +5,7 @@
Dear donor,
{%endif%}
-Thank you for your support of Wikipedia and the Wikimedia Foundation. Your
contribution of {{ (currency ~ " " ~ amount) | l10n_currency(locale) }}
supports Wikipedia and helps secure the future of free knowledge for
everyone.
+Thank you for supporting Wikipedia and the Wikimedia Foundation with your
gift of {{ (currency ~ " " ~ amount) | l10n_currency(locale) }}. Your
contribution allows us to keep Wikipedia independent. I’d like to tell you why
that is so important.
{% if "RecurringRestarted" in contribution_tags %}
We recently resolved a small technical issue which paused some monthly
recurring donations. We have reinstated your recurring donation, and it will
process normally going forward. We will not charge you for the months that were
skipped. Thank you for your patience and your support, and please feel free to
email don...@wikimedia.org if you have any questions.
@@ -15,26 +15,27 @@
We recently resolved a technical issue which caused a small number of
donors to not receive a confirmation of their donation. Please accept this
email as a thank you for your donation on {{ receive_date }}. We truly
appreciate your patience and your support, and please feel free to email
don...@wikimedia.org if you have any questions.
{%endif%}
-
- Wikipedia is possible because of a powerful idea: that people, like you
and me, can participate in building the world’s knowledge and making it freely
available to everyone, everywhere.
-
-
-Today, thanks to the support of millions of volunteer contributors and
supporters, you can wander Wikipedia for hours. With more than 40 million
Wikipedia articles and 35 million freely licensed images, Wikipedia can answer
almost any question, and take you places you’ve never been.
-
-Your donation supports the creation and sharing of free knowledge in real,
practical ways. It helps us make Wikipedia fast, secure, and accessible to
everyone in the world. It helps us bring free access to Wikipedia in places
where high mobile data costs prevent people from going online. It helps us
support people who are digitizing knowledge currently locked away in analog
archives. It protects Wikipedia from threats to free knowledge and the open
internet.
-
-Your support means that you can find the information you need now, wherever
you may be—to settle a bet with a friend at a dinner party, or to understand
the world around us.
+Wikipedia is a global project. At the Wikimedia Foundation, we have
engineers and other staff striving to make your experience on Wikipedia useful
every day. We are one of the world’s most popular and beloved websites, and we
are working to make Wikipedia accessible on any internet connection, across any
device, no matter where you are in the world. We are standing up for the future
of the open internet and fighting to protect the privacy of our users around
the world. Each contribution matters, and your {{ (currency ~ " " ~ amount) |
l10n_currency(locale) }} has a big impact.
- Donating to Wikipedia makes you the champion of a powerful idea.
+ Every day, people make critical decisions based on what they read on the
internet. Wikipedia is a vital resource because it offers free, neutral, and
unbiased information written by people from all around the world.
-Wikipedia will continue to evolve, grow, and meet n
[MediaWiki-commits] [Gerrit] wikimedia...crm[master]: Update donation-interface for new ty message subject
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/390080 )
Change subject: Update donation-interface for new ty message subject
..
Update donation-interface for new ty message subject
Deploy with new TY message text (in English)
Bug: T177878
Change-Id: Id73d8d545d0a4c9f257ce8aa8682f79e2bf1ee39
---
M composer.lock
1 file changed, 2 insertions(+), 2 deletions(-)
Approvals:
jenkins-bot: Verified
Ejegg: Looks good to me, approved
diff --git a/composer.lock b/composer.lock
index e1adc58..34f7606 100644
--- a/composer.lock
+++ b/composer.lock
@@ -2045,7 +2045,7 @@
"source": {
"type": "git",
"url":
"https://gerrit.wikimedia.org/r/mediawiki/extensions/DonationInterface.git";,
-"reference": "81b12c1166d91c689b4b7a9dad0f845f97ccecc1"
+"reference": "39a903423d7c430e7c6c684eeb24d29d4f071999"
},
"require": {
"addshore/psr-6-mediawiki-bagostuff-adapter": "0.1",
@@ -2087,7 +2087,7 @@
"GPL-2.0"
],
"description": "Wikimedia Foundation payment processing library",
-"time": "2017-10-17T15:40:59+00:00"
+"time": "2017-11-07T15:32:55+00:00"
},
{
"name": "wikimedia/omnimail-silverpop",
--
To view, visit https://gerrit.wikimedia.org/r/390080
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Id73d8d545d0a4c9f257ce8aa8682f79e2bf1ee39
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: master
Gerrit-Owner: Ejegg
Gerrit-Reviewer: Ejegg
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...CentralAuth[wmf/1.31.0-wmf.6]: Use the proper cache key method in loadFromCache()
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/390076 )
Change subject: Use the proper cache key method in loadFromCache()
..
Use the proper cache key method in loadFromCache()
Bug: T17
Change-Id: I9199ad964377dd3d079cb2d55f0a2ea88acdad56
(cherry picked from commit aa1022f38b13911b9cbe0878182475ee000cad92)
---
M includes/CentralAuthUser.php
1 file changed, 6 insertions(+), 4 deletions(-)
Approvals:
Aaron Schulz: Looks good to me, approved
Krinkle: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/includes/CentralAuthUser.php b/includes/CentralAuthUser.php
index e2705d0..3db5d86 100644
--- a/includes/CentralAuthUser.php
+++ b/includes/CentralAuthUser.php
@@ -492,7 +492,7 @@
protected function loadFromCache() {
$cache = ObjectCache::getMainWANInstance();
$data = $cache->getWithSetCallback(
- $this->getCacheKey(),
+ $this->getCacheKey( $cache ),
$cache::TTL_DAY,
function ( $oldValue, &$ttl, array &$setOpts ) {
$dbr = CentralAuthUtils::getCentralSlaveDB();
@@ -569,10 +569,11 @@
/**
* Generate a valid memcached key for caching the object's data.
+* @param WANObjectCache $cache
* @return string
*/
- protected function getCacheKey() {
- return "centralauth-user-" . md5( $this->mName );
+ protected function getCacheKey( WANObjectCache $cache ) {
+ return $cache->makeGlobalKey( 'centralauth-user', md5(
$this->mName ) );
}
/**
@@ -2905,7 +2906,8 @@
"Quick cache invalidation for global user
{$this->mName}" );
CentralAuthUtils::getCentralDB()->onTransactionPreCommitOrIdle(
function () {
- ObjectCache::getMainWANInstance()->delete(
$this->getCacheKey() );
+ $cache = ObjectCache::getMainWANInstance();
+ $cache->delete( $this->getCacheKey( $cache ) );
} );
}
--
To view, visit https://gerrit.wikimedia.org/r/390076
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I9199ad964377dd3d079cb2d55f0a2ea88acdad56
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CentralAuth
Gerrit-Branch: wmf/1.31.0-wmf.6
Gerrit-Owner: Aaron Schulz
Gerrit-Reviewer: Aaron Schulz
Gerrit-Reviewer: Krinkle
Gerrit-Reviewer: Legoktm
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] wikimedia...crm[master]: Update English thank you letter for 2017
Ejegg has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/390081 )
Change subject: Update English thank you letter for 2017
..
Update English thank you letter for 2017
Bug: T177878
Change-Id: I613fd0bbda01943f637be1d555f013a02fa182c0
---
M sites/all/modules/thank_you/generators/ThankYou.php
M sites/all/modules/thank_you/templates/html/thank_you.en.html
2 files changed, 19 insertions(+), 16 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm
refs/changes/81/390081/1
diff --git a/sites/all/modules/thank_you/generators/ThankYou.php
b/sites/all/modules/thank_you/generators/ThankYou.php
index 742c4ea..d93cba1 100644
--- a/sites/all/modules/thank_you/generators/ThankYou.php
+++ b/sites/all/modules/thank_you/generators/ThankYou.php
@@ -3,7 +3,7 @@
class ThankYou extends RenderTranslatedPage {
function __construct() {
// FIXME: drupal var and settings UI
- $this->title =
'Fundraising/Translation/Thank_you_email_20161128';
+ $this->title =
'Fundraising/Translation/Thank_you_email_20171019';
$this->proto_file = __DIR__ .
'/../templates/html/thank_you.$1.html';
$this->substitutions = array(
diff --git a/sites/all/modules/thank_you/templates/html/thank_you.en.html
b/sites/all/modules/thank_you/templates/html/thank_you.en.html
index ea3fcd6..049b106 100644
--- a/sites/all/modules/thank_you/templates/html/thank_you.en.html
+++ b/sites/all/modules/thank_you/templates/html/thank_you.en.html
@@ -5,7 +5,7 @@
Dear donor,
{%endif%}
-Thank you for your support of Wikipedia and the Wikimedia Foundation. Your
contribution of {{ (currency ~ " " ~ amount) | l10n_currency(locale) }}
supports Wikipedia and helps secure the future of free knowledge for
everyone.
+Thank you for supporting Wikipedia and the Wikimedia Foundation with your
gift of {{ (currency ~ " " ~ amount) | l10n_currency(locale) }}. Your
contribution allows us to keep Wikipedia independent. I’d like to tell you why
that is so important.
{% if "RecurringRestarted" in contribution_tags %}
We recently resolved a small technical issue which paused some monthly
recurring donations. We have reinstated your recurring donation, and it will
process normally going forward. We will not charge you for the months that were
skipped. Thank you for your patience and your support, and please feel free to
email don...@wikimedia.org if you have any questions.
@@ -15,26 +15,27 @@
We recently resolved a technical issue which caused a small number of
donors to not receive a confirmation of their donation. Please accept this
email as a thank you for your donation on {{ receive_date }}. We truly
appreciate your patience and your support, and please feel free to email
don...@wikimedia.org if you have any questions.
{%endif%}
-
- Wikipedia is possible because of a powerful idea: that people, like you
and me, can participate in building the world’s knowledge and making it freely
available to everyone, everywhere.
-
-
-Today, thanks to the support of millions of volunteer contributors and
supporters, you can wander Wikipedia for hours. With more than 40 million
Wikipedia articles and 35 million freely licensed images, Wikipedia can answer
almost any question, and take you places you’ve never been.
-
-Your donation supports the creation and sharing of free knowledge in real,
practical ways. It helps us make Wikipedia fast, secure, and accessible to
everyone in the world. It helps us bring free access to Wikipedia in places
where high mobile data costs prevent people from going online. It helps us
support people who are digitizing knowledge currently locked away in analog
archives. It protects Wikipedia from threats to free knowledge and the open
internet.
-
-Your support means that you can find the information you need now, wherever
you may be—to settle a bet with a friend at a dinner party, or to understand
the world around us.
+Wikipedia is a global project. At the Wikimedia Foundation, we have
engineers and other staff striving to make your experience on Wikipedia useful
every day. We are one of the world’s most popular and beloved websites, and we
are working to make Wikipedia accessible on any internet connection, across any
device, no matter where you are in the world. We are standing up for the future
of the open internet and fighting to protect the privacy of our users around
the world. Each contribution matters, and your {{ (currency ~ " " ~ amount) |
l10n_currency(locale) }} has a big impact.
- Donating to Wikipedia makes you the champion of a powerful idea.
+ Every day, people make critical decisions based on what they read on the
internet. Wikipedia is a vital resource because it offers free, neutral, and
unbiased information written by people from all around the world.
-Wikipedia will continue to evolve, grow,
[MediaWiki-commits] [Gerrit] wikimedia...crm[master]: Update donation-interface for new ty message subject
Ejegg has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/390080 )
Change subject: Update donation-interface for new ty message subject
..
Update donation-interface for new ty message subject
Deploy with new TY message text (in English)
Bug: T177878
Change-Id: Id73d8d545d0a4c9f257ce8aa8682f79e2bf1ee39
---
M composer.lock
1 file changed, 2 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm
refs/changes/80/390080/1
diff --git a/composer.lock b/composer.lock
index e1adc58..34f7606 100644
--- a/composer.lock
+++ b/composer.lock
@@ -2045,7 +2045,7 @@
"source": {
"type": "git",
"url":
"https://gerrit.wikimedia.org/r/mediawiki/extensions/DonationInterface.git";,
-"reference": "81b12c1166d91c689b4b7a9dad0f845f97ccecc1"
+"reference": "39a903423d7c430e7c6c684eeb24d29d4f071999"
},
"require": {
"addshore/psr-6-mediawiki-bagostuff-adapter": "0.1",
@@ -2087,7 +2087,7 @@
"GPL-2.0"
],
"description": "Wikimedia Foundation payment processing library",
-"time": "2017-10-17T15:40:59+00:00"
+"time": "2017-11-07T15:32:55+00:00"
},
{
"name": "wikimedia/omnimail-silverpop",
--
To view, visit https://gerrit.wikimedia.org/r/390080
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Id73d8d545d0a4c9f257ce8aa8682f79e2bf1ee39
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: master
Gerrit-Owner: Ejegg
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Group messages in WANObjectCache by key
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/390057 )
Change subject: Group messages in WANObjectCache by key
..
Group messages in WANObjectCache by key
Change-Id: I31c570a095735c9157332660e9f1f542e679410f
---
M includes/libs/objectcache/WANObjectCache.php
1 file changed, 8 insertions(+), 4 deletions(-)
Approvals:
Aaron Schulz: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/libs/objectcache/WANObjectCache.php
b/includes/libs/objectcache/WANObjectCache.php
index 0a6bfb1..73e4a9a 100644
--- a/includes/libs/objectcache/WANObjectCache.php
+++ b/includes/libs/objectcache/WANObjectCache.php
@@ -447,7 +447,8 @@
// Do not cache potentially uncommitted data as it might get
rolled back
if ( !empty( $opts['pending'] ) ) {
- $this->logger->info( "Rejected set() for $key due to
pending writes." );
+ $this->logger->info( 'Rejected set() for {cachekey} due
to pending writes.',
+ [ 'cachekey' => $key ] );
return true; // no-op the write for being unsafe
}
@@ -461,16 +462,19 @@
$wrapExtra[self::FLD_FLAGS] = self::FLG_STALE;
// mark as stale
// Case B: any long-running transaction; ignore this
set()
} elseif ( $age > self::MAX_READ_LAG ) {
- $this->logger->info( "Rejected set() for $key
due to snapshot lag." );
+ $this->logger->info( 'Rejected set() for
{cachekey} due to snapshot lag.',
+ [ 'cachekey' => $key ] );
return true; // no-op the write for being unsafe
// Case C: high replication lag; lower TTL instead of
ignoring all set()s
} elseif ( $lag === false || $lag > self::MAX_READ_LAG
) {
$ttl = $ttl ? min( $ttl, self::TTL_LAGGED ) :
self::TTL_LAGGED;
- $this->logger->warning( "Lowered set() TTL for
$key due to replication lag." );
+ $this->logger->warning( 'Lowered set() TTL for
{cachekey} due to replication lag.',
+ [ 'cachekey' => $key ] );
// Case D: medium length request with medium
replication lag; ignore this set()
} else {
- $this->logger->info( "Rejected set() for $key
due to high read lag." );
+ $this->logger->info( 'Rejected set() for
{cachekey} due to high read lag.',
+ [ 'cachekey' => $key ] );
return true; // no-op the write for being unsafe
}
--
To view, visit https://gerrit.wikimedia.org/r/390057
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I31c570a095735c9157332660e9f1f542e679410f
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Chad
Gerrit-Reviewer: Aaron Schulz
Gerrit-Reviewer: BryanDavis
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/core[fundraising/REL1_27]: Update FundraisingEmailUnsubscribe extension
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/390079 ) Change subject: Update FundraisingEmailUnsubscribe extension .. Update FundraisingEmailUnsubscribe extension 086d24d Don't error on links from test TY mails c450a1e build: mark package.json as private 34c2441 build: bump grunt and drop grunt-cli 78a4bb4 Use short array syntax in alias file a833a67 Add CODE_OF_CONDUCT.md 0e6d92a build: add parallel-lint 97107ac Use upstream PHP-Queue b6ef8ad Fix bad newlines 191b43a build: add grunt-contrib-jshint 11e5578 Add file for special page aliases bbe8a7f Whoops, track not trace 6f1ebb3 Swapping defaultbranch for trace Change-Id: I94bc168857d88bc8517a3ba4489f83c66086d89b --- M extensions/FundraisingEmailUnsubscribe 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: jenkins-bot: Verified Ejegg: Looks good to me, approved diff --git a/extensions/FundraisingEmailUnsubscribe b/extensions/FundraisingEmailUnsubscribe index 576f92a..086d24d 16 --- a/extensions/FundraisingEmailUnsubscribe +++ b/extensions/FundraisingEmailUnsubscribe @@ -1 +1 @@ -Subproject commit 576f92a34869d31271ff01429d0e59612ba6db7b +Subproject commit 086d24d6d7e54221ee734676b06df3927e7ccf3a -- To view, visit https://gerrit.wikimedia.org/r/390079 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I94bc168857d88bc8517a3ba4489f83c66086d89b Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: fundraising/REL1_27 Gerrit-Owner: Ejegg Gerrit-Reviewer: Ejegg Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
