[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceExtensions[REL1_23]: Umlauts in URL were causing ExtendedSearch to fail showing t...
ItSpiderman has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/333853 )
Change subject: Umlauts in URL were causing ExtendedSearch to fail showing the
correct results. This encodes URI to overcome this limitation.
..
Umlauts in URL were causing ExtendedSearch to fail showing the correct
results. This encodes URI to overcome this limitation.
Needs to be cherry-picket to REL1_27 and master
Change-Id: Ia3e77c2557a824c4badcc965ea613bcea26a2881
---
M ExtendedSearch/resources/bluespice.extendedSearch.specialpage.js
1 file changed, 2 insertions(+), 1 deletion(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceExtensions
refs/changes/53/333853/1
diff --git a/ExtendedSearch/resources/bluespice.extendedSearch.specialpage.js
b/ExtendedSearch/resources/bluespice.extendedSearch.specialpage.js
index 99b6fb9..e519a17 100644
--- a/ExtendedSearch/resources/bluespice.extendedSearch.specialpage.js
+++ b/ExtendedSearch/resources/bluespice.extendedSearch.specialpage.js
@@ -77,7 +77,8 @@
for ( key2 in
ExtendedSearchAjaxManager.oUrlParams[key] ){
if ( typeof(
ExtendedSearchAjaxManager.oUrlParams[key][key2] ) != 'string' ) continue;
- out.push( key + '[]=' +
ExtendedSearchAjaxManager.oUrlParams[key][key2] );
+ var keyValue =
encodeURI(ExtendedSearchAjaxManager.oUrlParams[key][key2] );
+ out.push( key + '[]=' + keyValue );
}
} else {
out.push( key + '=' +
ExtendedSearchAjaxManager.oUrlParams[key] );
--
To view, visit https://gerrit.wikimedia.org/r/333853
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia3e77c2557a824c4badcc965ea613bcea26a2881
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: REL1_23
Gerrit-Owner: ItSpiderman
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Popups[mpga]: build: Re-use MessageDirs in banana conf
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/333631 )
Change subject: build: Re-use MessageDirs in banana conf
..
build: Re-use MessageDirs in banana conf
Change-Id: Ia673030da7ce5f9114772cc879a0449743ef151a
---
M Gruntfile.js
1 file changed, 3 insertions(+), 4 deletions(-)
Approvals:
jenkins-bot: Verified
Phuedx: Looks good to me, approved
diff --git a/Gruntfile.js b/Gruntfile.js
index b4b9393..e40aec7 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -1,7 +1,8 @@
/* eslint-evn node */
module.exports = function ( grunt ) {
- var QUNIT_URL_BASE =
'http://localhost:8080/wiki/Special:JavaScriptTest/qunit/plain';
+ var conf = grunt.file.readJSON( 'extension.json' ),
+ QUNIT_URL_BASE =
'http://localhost:8080/wiki/Special:JavaScriptTest/qunit/plain';
grunt.loadNpmTasks( 'grunt-banana-checker' );
grunt.loadNpmTasks( 'grunt-contrib-qunit' );
@@ -11,9 +12,7 @@
grunt.loadNpmTasks( 'grunt-stylelint' );
grunt.initConfig( {
- banana: {
- all: 'i18n/'
- },
+ banana: conf.MessagesDirs,
eslint: {
fix: {
options: {
--
To view, visit https://gerrit.wikimedia.org/r/333631
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia673030da7ce5f9114772cc879a0449743ef151a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Popups
Gerrit-Branch: mpga
Gerrit-Owner: Esanders
Gerrit-Reviewer: Phuedx
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...BlueSpiceSkin[master]: Watchlist: add / remove from watchlist changed to ajax.
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/333852 )
Change subject: Watchlist: add / remove from watchlist changed to ajax.
..
Watchlist: add / remove from watchlist changed to ajax.
CodingConventions: spaces between brackets
Adding less to js file
Code wraped in immediately invoked function expressions (IIFE)
Fixed issue from ERM4954
Needs merge to master
Change-Id: I002dbf5f677f8b7bbb8f6411645d6ae05991401c
---
D resources/components/skin.ajaxwatchlist.less
M resources/components/skin.contentActions.js
A resources/components/skin.watch.js
M skin.json
4 files changed, 36 insertions(+), 50 deletions(-)
Approvals:
Robert Vogel: Looks good to me, approved
jenkins-bot: Verified
diff --git a/resources/components/skin.ajaxwatchlist.less
b/resources/components/skin.ajaxwatchlist.less
deleted file mode 100644
index d368a5a..000
--- a/resources/components/skin.ajaxwatchlist.less
+++ /dev/null
@@ -1,42 +0,0 @@
-/* Code from /skins/vector/screen.css */
-
-li#ca-unwatch.icon,
-li#ca-watch.icon {
- float:none;
- margin-left: -4px
-}
-
-
-/* Watch/Unwatch Icon Styling */
-#ca-unwatch.icon a,
-#ca-watch.icon a {
- outline: none;
- display: inline-block;
- width: 16px;
- height: 16px;
- margin: 0;
- text-indent: px;
- white-space: nowrap;
- /* @embed */
- background-image: url("../../vector/images/watch-icons.png");
-}
-#ca-unwatch.icon a {
- background-position: -48px;
-}
-#ca-watch.icon a {
- background-position: 0px;
-}
-#ca-unwatch.icon a:hover,
-#ca-unwatch.icon a:focus {
- background-position: -72px;
-}
-#ca-watch.icon a:hover,
-#ca-watch.icon a:focus {
- background-position: -24px;
-}
-#ca-unwatch.icon a.loading,
-#ca-watch.icon a.loading {
- /* @embed */
- background-image: url("../../vector/images/watch-icon-loading.gif");
- background-position: 0px;
-}
\ No newline at end of file
diff --git a/resources/components/skin.contentActions.js
b/resources/components/skin.contentActions.js
index e18c9f2..f1226ff 100644
--- a/resources/components/skin.contentActions.js
+++ b/resources/components/skin.contentActions.js
@@ -10,13 +10,5 @@
}
});
}
-
- $("#ca-watch, #ca-unwatch").click(function(e){
- $(this).children().first().trigger('click');
- if ($(this).hasClass("icon-star"))
-
$(this).removeClass("icon-star").addClass("icon-star3");
- else
-
$(this).removeClass("icon-star3").addClass("icon-star");
- });
});
})( mediaWiki, jQuery );
\ No newline at end of file
diff --git a/resources/components/skin.watch.js
b/resources/components/skin.watch.js
new file mode 100644
index 000..78aa2ef
--- /dev/null
+++ b/resources/components/skin.watch.js
@@ -0,0 +1,35 @@
+(function ( mw, $ ) {
+$( function () {
+$( '#ca-watch, #ca-unwatch' ).on( 'click', function () {
+api = new mw.Api();
+
+var me = this;
+
+if ( $( this ).attr( "id" ) == "ca-watch" ) {
+api.watch( mw.config.get( 'wgPageName' ) ).done( function (
result ) {
+doWatch( result, me, 'ca-unwatch' );
+} );
+} else {
+api.unwatch( mw.config.get( 'wgPageName' ) ).done( function (
result ) {
+doWatch( result, me, 'ca-watch' );
+} );
+}
+
+return false; // Do not follow the link if JS is enabled.
+} );
+
+/**
+ * Adds or removes a page to watchlist and shows a notify.
+ *
+ * @param result jQuery.Promise.done()
+ * @param me this
+ * @param sWatch
+ */
+function doWatch( result, me, sWatch ) {
+mw.notify( $( result.message ) );
+$( me ).attr( "id", sWatch );
+$( 'a', me ).attr( 'title', mw.message( 'tooltip-' + sWatch
).plain() );
+$( 'a', me ).updateTooltipAccessKeys();
+}
+} );
+})( mediaWiki, jQuery );
\ No newline at end of file
diff --git a/skin.json b/skin.json
index fda16ba..b006a00 100644
--- a/skin.json
+++ b/skin.json
@@ -62,6 +62,7 @@
"components/skin.closeMenu.js",
"components/skin.scrollToTop.js",
"components/skin.dataAfterContent.js",
+ "components/skin.watch.js",
"components/special.preferences.js"
],
"messages": [
--
To view, visit https://gerrit.wikimedia.org/r/333852
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit
[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceSkin[master]: Watchlist: add / remove from watchlist changed to ajax.
Robert Vogel has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/333852 )
Change subject: Watchlist: add / remove from watchlist changed to ajax.
..
Watchlist: add / remove from watchlist changed to ajax.
CodingConventions: spaces between brackets
Adding less to js file
Code wraped in immediately invoked function expressions (IIFE)
Fixed issue from ERM4954
Needs merge to master
Change-Id: I002dbf5f677f8b7bbb8f6411645d6ae05991401c
---
D resources/components/skin.ajaxwatchlist.less
M resources/components/skin.contentActions.js
A resources/components/skin.watch.js
M skin.json
4 files changed, 36 insertions(+), 50 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/BlueSpiceSkin
refs/changes/52/333852/1
diff --git a/resources/components/skin.ajaxwatchlist.less
b/resources/components/skin.ajaxwatchlist.less
deleted file mode 100644
index d368a5a..000
--- a/resources/components/skin.ajaxwatchlist.less
+++ /dev/null
@@ -1,42 +0,0 @@
-/* Code from /skins/vector/screen.css */
-
-li#ca-unwatch.icon,
-li#ca-watch.icon {
- float:none;
- margin-left: -4px
-}
-
-
-/* Watch/Unwatch Icon Styling */
-#ca-unwatch.icon a,
-#ca-watch.icon a {
- outline: none;
- display: inline-block;
- width: 16px;
- height: 16px;
- margin: 0;
- text-indent: px;
- white-space: nowrap;
- /* @embed */
- background-image: url("../../vector/images/watch-icons.png");
-}
-#ca-unwatch.icon a {
- background-position: -48px;
-}
-#ca-watch.icon a {
- background-position: 0px;
-}
-#ca-unwatch.icon a:hover,
-#ca-unwatch.icon a:focus {
- background-position: -72px;
-}
-#ca-watch.icon a:hover,
-#ca-watch.icon a:focus {
- background-position: -24px;
-}
-#ca-unwatch.icon a.loading,
-#ca-watch.icon a.loading {
- /* @embed */
- background-image: url("../../vector/images/watch-icon-loading.gif");
- background-position: 0px;
-}
\ No newline at end of file
diff --git a/resources/components/skin.contentActions.js
b/resources/components/skin.contentActions.js
index e18c9f2..f1226ff 100644
--- a/resources/components/skin.contentActions.js
+++ b/resources/components/skin.contentActions.js
@@ -10,13 +10,5 @@
}
});
}
-
- $("#ca-watch, #ca-unwatch").click(function(e){
- $(this).children().first().trigger('click');
- if ($(this).hasClass("icon-star"))
-
$(this).removeClass("icon-star").addClass("icon-star3");
- else
-
$(this).removeClass("icon-star3").addClass("icon-star");
- });
});
})( mediaWiki, jQuery );
\ No newline at end of file
diff --git a/resources/components/skin.watch.js
b/resources/components/skin.watch.js
new file mode 100644
index 000..78aa2ef
--- /dev/null
+++ b/resources/components/skin.watch.js
@@ -0,0 +1,35 @@
+(function ( mw, $ ) {
+$( function () {
+$( '#ca-watch, #ca-unwatch' ).on( 'click', function () {
+api = new mw.Api();
+
+var me = this;
+
+if ( $( this ).attr( "id" ) == "ca-watch" ) {
+api.watch( mw.config.get( 'wgPageName' ) ).done( function (
result ) {
+doWatch( result, me, 'ca-unwatch' );
+} );
+} else {
+api.unwatch( mw.config.get( 'wgPageName' ) ).done( function (
result ) {
+doWatch( result, me, 'ca-watch' );
+} );
+}
+
+return false; // Do not follow the link if JS is enabled.
+} );
+
+/**
+ * Adds or removes a page to watchlist and shows a notify.
+ *
+ * @param result jQuery.Promise.done()
+ * @param me this
+ * @param sWatch
+ */
+function doWatch( result, me, sWatch ) {
+mw.notify( $( result.message ) );
+$( me ).attr( "id", sWatch );
+$( 'a', me ).attr( 'title', mw.message( 'tooltip-' + sWatch
).plain() );
+$( 'a', me ).updateTooltipAccessKeys();
+}
+} );
+})( mediaWiki, jQuery );
\ No newline at end of file
diff --git a/skin.json b/skin.json
index fda16ba..b006a00 100644
--- a/skin.json
+++ b/skin.json
@@ -62,6 +62,7 @@
"components/skin.closeMenu.js",
"components/skin.scrollToTop.js",
"components/skin.dataAfterContent.js",
+ "components/skin.watch.js",
"components/special.preferences.js"
],
"messages": [
--
To view, visit https://gerrit.wikimedia.org/r/333852
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType:
[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: db-codfw, db-eqiad.php: Add rack positions for s1
Marostegui has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/333851 ) Change subject: db-codfw,db-eqiad.php: Add rack positions for s1 .. db-codfw,db-eqiad.php: Add rack positions for s1 It is easier and faster to see in which rack each server is here than opening racktables, specially for emergencies. So far only done for s1 Bug: T155999 Change-Id: If623a38ef2f4a8e018fd461fb4681e92b068005b --- M wmf-config/db-codfw.php M wmf-config/db-eqiad.php 2 files changed, 19 insertions(+), 19 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/51/333851/1 diff --git a/wmf-config/db-codfw.php b/wmf-config/db-codfw.php index a4f47f4..af03cbe 100644 --- a/wmf-config/db-codfw.php +++ b/wmf-config/db-codfw.php @@ -93,14 +93,14 @@ 'sectionLoads' => [ 's1' => [ - 'db2016' => 0, # 2.9TB 96GB, master - 'db2034' => 50, # 2.9TB 160GB, rc, log - 'db2042' => 50, # 2.9TB 160GB, rc, log - 'db2048' => 400, # 2.9TB 160GB - 'db2055' => 50, # 3.3TB 160GB, dump (inactive), vslow - 'db2062' => 100, # 3.3TB 160GB, api - 'db2069' => 100, # 3.3TB 160GB, api - 'db2070' => 400, # 3.3TB 160GB + 'db2016' => 0, # 2.9TB 96GB, master #B6 + 'db2034' => 50, # 2.9TB 160GB, rc, log #C6 + 'db2042' => 50, # 2.9TB 160GB, rc, log #C6 + 'db2048' => 400, # 2.9TB 160GB #C6 + 'db2055' => 50, # 3.3TB 160GB, dump (inactive), vslow #D6 + 'db2062' => 100, # 3.3TB 160GB, api #D6 + 'db2069' => 100, # 3.3TB 160GB, api #D6 + 'db2070' => 400, # 3.3TB 160GB #D6 ], 's2' => [ 'db2017' => 0, # 2.9TB 96GB, master diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php index 04f6957..1f84df6 100644 --- a/wmf-config/db-eqiad.php +++ b/wmf-config/db-eqiad.php @@ -93,17 +93,17 @@ 'sectionLoads' => [ 's1' => [ - 'db1057' => 0, # 2.8TB 96GB, master -# 'db1052' => 1, # 2.8TB 96GB, old master #Temporary master for db1095 - new sanitarium #T150960 - 'db1051' => 50, # 2.8TB 96GB, watchlist, recentchanges, contributions, logpager - 'db1055' => 50, # 2.8TB 96GB, watchlist, recentchanges, contributions, logpager - 'db1065' => 1, # 2.8TB 160GB, api, low weight after maintenance - 'db1066' => 50, # 2.8TB 160GB, api - 'db1072' => 0, # 2.8TB 160GB, vslow, dump - 'db1073' => 50, # 2.8TB 160GB, api - 'db1080' => 500, # 3.6TB 512GB - 'db1083' => 500, # 3.6TB 512GB - 'db1089' => 500, # 3.6TB 512GB + 'db1057' => 0, # 2.8TB 96GB, master #C2 +# 'db1052' => 1, # 2.8TB 96GB, old master #Temporary master for db1095 - new sanitarium #T150960 #C2 + 'db1051' => 50, # 2.8TB 96GB, watchlist, recentchanges, contributions, logpager #C2 + 'db1055' => 50, # 2.8TB 96GB, watchlist, recentchanges, contributions, logpager #C2 + 'db1065' => 1, # 2.8TB 160GB, api, low weight after maintenance #D1 + 'db1066' => 50, # 2.8TB 160GB, api #D1 + 'db1072' => 0, # 2.8TB 160GB, vslow, dump #D1 + 'db1073' => 50, # 2.8TB 160GB, api #D1 + 'db1080' => 500, # 3.6TB 512GB #A2 + 'db1083' => 500, # 3.6TB 512GB #B1 + 'db1089' => 500, # 3.6TB 512GB #C3 ], 's2' => [ 'db1018' => 0, # 1.4TB 64GB, master -- To view, visit https://gerrit.wikimedia.org/r/333851 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If623a38ef2f4a8e018fd461fb4681e92b068005b Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config 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] operations/puppet[production]: site.pp: Disable RBR on db1052
Marostegui has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/333850 )
Change subject: site.pp: Disable RBR on db1052
..
site.pp: Disable RBR on db1052
db1052 will be the new s1 master. It is currently the master for db1095
(new sanitarium) and it is running RBR. It needs to go back to SBR.
Bug: T156006
Change-Id: I7f84cba6a556f3182723d3ca7b9bef9e3a0e237c
---
M manifests/site.pp
1 file changed, 1 insertion(+), 9 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/50/333850/1
diff --git a/manifests/site.pp b/manifests/site.pp
index 8b1f5a0..4839311 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -428,17 +428,9 @@
}
}
-node /^db10(51|55|65|66|72|73|80|83|89)\.eqiad\.wmnet/ {
+node /^db10(51|52|55|65|66|72|73|80|83|89)\.eqiad\.wmnet/ {
class { '::role::mariadb::core':
shard => 's1',
-}
-}
-
-# Testing row-based replication to sanitarium2 (T150960)
-node 'db1052.eqiad.wmnet' {
-class { '::role::mariadb::core':
-shard => 's1',
-binlog_format => 'ROW',
}
}
--
To view, visit https://gerrit.wikimedia.org/r/333850
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I7f84cba6a556f3182723d3ca7b9bef9e3a0e237c
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Marostegui
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: Revert "site.pp: db1052's binlog changed to ROW"
Hello jenkins-bot, Jcrespo, Volans,
I'd like you to do a code review. Please visit
https://gerrit.wikimedia.org/r/333849
to review the following change.
Change subject: Revert "site.pp: db1052's binlog changed to ROW"
..
Revert "site.pp: db1052's binlog changed to ROW"
In preparations for the DB switchover, db1052 needs to go back to SBR (T156006)
This reverts commit 83dbd721b243cd48197af3d7432ac3f28d49610a.
Change-Id: I0d3a339b3c3e6c9cfd1bc0d71babf0f7cc0340e3
---
M manifests/site.pp
1 file changed, 1 insertion(+), 9 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/49/333849/1
diff --git a/manifests/site.pp b/manifests/site.pp
index a8ceef7..09784ee 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -429,17 +429,9 @@
}
}
-node /^db10(51|55|65|66|72|73|80|83|89)\.eqiad\.wmnet/ {
+node /^db10(51|52|55|65|66|72|73|80|83|89)\.eqiad\.wmnet/ {
class { 'role::mariadb::core':
shard => 's1',
-}
-}
-
-# Testing row-based replication to sanitarium2 (T150960)
-node 'db1052.eqiad.wmnet' {
-class { 'role::mariadb::core':
-shard => 's1',
-binlog_format => 'ROW',
}
}
--
To view, visit https://gerrit.wikimedia.org/r/333849
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I0d3a339b3c3e6c9cfd1bc0d71babf0f7cc0340e3
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Marostegui
Gerrit-Reviewer: Jcrespo
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...BlueSpiceExtensions[master]: ExtendedStatistics: pass empty var to prevent js error on lo...
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/333614 )
Change subject: ExtendedStatistics: pass empty var to prevent js error on
localsamespaces
..
ExtendedStatistics: pass empty var to prevent js error on localsamespaces
Change-Id: I5e77f9759f028c5951fce96788ba9008ad1592be
---
M Statistics/resources/BS.Statistics/Filter.js
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Robert Vogel: Looks good to me, approved
jenkins-bot: Verified
diff --git a/Statistics/resources/BS.Statistics/Filter.js
b/Statistics/resources/BS.Statistics/Filter.js
index 6afc4f1..cede797 100644
--- a/Statistics/resources/BS.Statistics/Filter.js
+++ b/Statistics/resources/BS.Statistics/Filter.js
@@ -38,7 +38,7 @@
fields: ['key', 'displaytitle', 'listable', 'filters']
});
this.storeUserFilter = new BS.store.ApiUser();
- this.storeNamespaceFilter = new BS.store.LocalNamespaces();
+ this.storeNamespaceFilter = new BS.store.LocalNamespaces({});
this.storeCategoryFilter = new BS.store.ApiCategory();
this.storeSearchscopeFilter = new BS.store.BSApi({
apiAction: 'bs-statistics-search-options-store',
--
To view, visit https://gerrit.wikimedia.org/r/333614
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I5e77f9759f028c5951fce96788ba9008ad1592be
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: master
Gerrit-Owner: Ljonka
Gerrit-Reviewer: Dvogel hallowelt
Gerrit-Reviewer: Mglaser
Gerrit-Reviewer: Pwirth
Gerrit-Reviewer: Robert Vogel
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...BlueSpiceExtensions[REL1_27]: ExtendedStatistics: pass empty var to prevent js error on lo...
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/333848 )
Change subject: ExtendedStatistics: pass empty var to prevent js error on
localsamespaces
..
ExtendedStatistics: pass empty var to prevent js error on localsamespaces
Change-Id: I5e77f9759f028c5951fce96788ba9008ad1592be
---
M Statistics/resources/BS.Statistics/Filter.js
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Robert Vogel: Looks good to me, approved
jenkins-bot: Verified
diff --git a/Statistics/resources/BS.Statistics/Filter.js
b/Statistics/resources/BS.Statistics/Filter.js
index 6afc4f1..cede797 100644
--- a/Statistics/resources/BS.Statistics/Filter.js
+++ b/Statistics/resources/BS.Statistics/Filter.js
@@ -38,7 +38,7 @@
fields: ['key', 'displaytitle', 'listable', 'filters']
});
this.storeUserFilter = new BS.store.ApiUser();
- this.storeNamespaceFilter = new BS.store.LocalNamespaces();
+ this.storeNamespaceFilter = new BS.store.LocalNamespaces({});
this.storeCategoryFilter = new BS.store.ApiCategory();
this.storeSearchscopeFilter = new BS.store.BSApi({
apiAction: 'bs-statistics-search-options-store',
--
To view, visit https://gerrit.wikimedia.org/r/333848
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I5e77f9759f028c5951fce96788ba9008ad1592be
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: REL1_27
Gerrit-Owner: Robert Vogel
Gerrit-Reviewer: Ljonka
Gerrit-Reviewer: Robert Vogel
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...BlueSpiceExtensions[REL1_27]: ExtendedStatistics: pass empty var to prevent js error on lo...
Robert Vogel has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/333848 )
Change subject: ExtendedStatistics: pass empty var to prevent js error on
localsamespaces
..
ExtendedStatistics: pass empty var to prevent js error on localsamespaces
Change-Id: I5e77f9759f028c5951fce96788ba9008ad1592be
---
M Statistics/resources/BS.Statistics/Filter.js
1 file changed, 1 insertion(+), 1 deletion(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceExtensions
refs/changes/48/333848/1
diff --git a/Statistics/resources/BS.Statistics/Filter.js
b/Statistics/resources/BS.Statistics/Filter.js
index 6afc4f1..cede797 100644
--- a/Statistics/resources/BS.Statistics/Filter.js
+++ b/Statistics/resources/BS.Statistics/Filter.js
@@ -38,7 +38,7 @@
fields: ['key', 'displaytitle', 'listable', 'filters']
});
this.storeUserFilter = new BS.store.ApiUser();
- this.storeNamespaceFilter = new BS.store.LocalNamespaces();
+ this.storeNamespaceFilter = new BS.store.LocalNamespaces({});
this.storeCategoryFilter = new BS.store.ApiCategory();
this.storeSearchscopeFilter = new BS.store.BSApi({
apiAction: 'bs-statistics-search-options-store',
--
To view, visit https://gerrit.wikimedia.org/r/333848
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I5e77f9759f028c5951fce96788ba9008ad1592be
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: REL1_27
Gerrit-Owner: Robert Vogel
Gerrit-Reviewer: Ljonka
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceExtensions[REL1_27]: Just a typo
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/333846 )
Change subject: Just a typo
..
Just a typo
Needs to be cherry-picked to REL1_27 and master
Change-Id: Ia4f3396ab58a3ec8af15532261abf093e32277ac
---
M ExtendedSearch/includes/ExtendedSearchBase.class.php
1 file changed, 3 insertions(+), 3 deletions(-)
Approvals:
Robert Vogel: Looks good to me, approved
jenkins-bot: Verified
diff --git a/ExtendedSearch/includes/ExtendedSearchBase.class.php
b/ExtendedSearch/includes/ExtendedSearchBase.class.php
index 43ae396..51c661d 100644
--- a/ExtendedSearch/includes/ExtendedSearchBase.class.php
+++ b/ExtendedSearch/includes/ExtendedSearchBase.class.php
@@ -485,7 +485,7 @@
* @return array Array of Apache_Solr_Documents
*/
private static function searchAutocomplete( &$sSearchString,
&$vNsSearch ) {
- $oSerachService = SearchService::getInstance();
+ $oSearchService = SearchService::getInstance();
$oSearchRequest = new SearchRequest();
$oSearchRequest->init();
$oSearchOptions = new SearchOptions( $oSearchRequest,
RequestContext::getMain() );
@@ -496,7 +496,7 @@
$aQuery = $oSearchOptions->getSolrAutocompleteQuery(
$sSearchString, $sSolrSearchString );
try {
- $oHits = $oSerachService->search(
+ $oHits = $oSearchService->search(
$aQuery['searchString'],
$aQuery['offset'],
$aQuery['searchLimit'],
@@ -523,7 +523,7 @@
$aFuzzyQuery['searchOptions']['hl'] = 'off';
try {
- $oHits = $oSerachService->search(
+ $oHits = $oSearchService->search(
$aFuzzyQuery['searchString'],
$aFuzzyQuery['offset'],
$aFuzzyQuery['searchLimit'],
--
To view, visit https://gerrit.wikimedia.org/r/333846
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia4f3396ab58a3ec8af15532261abf093e32277ac
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: REL1_27
Gerrit-Owner: Robert Vogel
Gerrit-Reviewer: ItSpiderman
Gerrit-Reviewer: Robert Vogel
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...BlueSpiceExtensions[master]: Just a typo
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/333847 )
Change subject: Just a typo
..
Just a typo
Needs to be cherry-picked to REL1_27 and master
Change-Id: Ia4f3396ab58a3ec8af15532261abf093e32277ac
---
M ExtendedSearch/includes/ExtendedSearchBase.class.php
1 file changed, 3 insertions(+), 3 deletions(-)
Approvals:
Robert Vogel: Looks good to me, approved
jenkins-bot: Verified
diff --git a/ExtendedSearch/includes/ExtendedSearchBase.class.php
b/ExtendedSearch/includes/ExtendedSearchBase.class.php
index 44865ba..eaf40cb 100644
--- a/ExtendedSearch/includes/ExtendedSearchBase.class.php
+++ b/ExtendedSearch/includes/ExtendedSearchBase.class.php
@@ -485,7 +485,7 @@
* @return array Array of Apache_Solr_Documents
*/
private static function searchAutocomplete( &$sSearchString,
&$vNsSearch ) {
- $oSerachService = SearchService::getInstance();
+ $oSearchService = SearchService::getInstance();
$oSearchRequest = new SearchRequest();
$oSearchRequest->init();
$oSearchOptions = new SearchOptions( $oSearchRequest,
RequestContext::getMain() );
@@ -496,7 +496,7 @@
$aQuery = $oSearchOptions->getSolrAutocompleteQuery(
$sSearchString, $sSolrSearchString );
try {
- $oHits = $oSerachService->search(
+ $oHits = $oSearchService->search(
$aQuery['searchString'],
$aQuery['offset'],
$aQuery['searchLimit'],
@@ -523,7 +523,7 @@
$aFuzzyQuery['searchOptions']['hl'] = 'off';
try {
- $oHits = $oSerachService->search(
+ $oHits = $oSearchService->search(
$aFuzzyQuery['searchString'],
$aFuzzyQuery['offset'],
$aFuzzyQuery['searchLimit'],
--
To view, visit https://gerrit.wikimedia.org/r/333847
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia4f3396ab58a3ec8af15532261abf093e32277ac
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: master
Gerrit-Owner: Robert Vogel
Gerrit-Reviewer: ItSpiderman
Gerrit-Reviewer: Robert Vogel
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...BlueSpiceExtensions[master]: Just a typo
Robert Vogel has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/333847 )
Change subject: Just a typo
..
Just a typo
Needs to be cherry-picked to REL1_27 and master
Change-Id: Ia4f3396ab58a3ec8af15532261abf093e32277ac
---
M ExtendedSearch/includes/ExtendedSearchBase.class.php
1 file changed, 3 insertions(+), 3 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceExtensions
refs/changes/47/333847/1
diff --git a/ExtendedSearch/includes/ExtendedSearchBase.class.php
b/ExtendedSearch/includes/ExtendedSearchBase.class.php
index 44865ba..eaf40cb 100644
--- a/ExtendedSearch/includes/ExtendedSearchBase.class.php
+++ b/ExtendedSearch/includes/ExtendedSearchBase.class.php
@@ -485,7 +485,7 @@
* @return array Array of Apache_Solr_Documents
*/
private static function searchAutocomplete( &$sSearchString,
&$vNsSearch ) {
- $oSerachService = SearchService::getInstance();
+ $oSearchService = SearchService::getInstance();
$oSearchRequest = new SearchRequest();
$oSearchRequest->init();
$oSearchOptions = new SearchOptions( $oSearchRequest,
RequestContext::getMain() );
@@ -496,7 +496,7 @@
$aQuery = $oSearchOptions->getSolrAutocompleteQuery(
$sSearchString, $sSolrSearchString );
try {
- $oHits = $oSerachService->search(
+ $oHits = $oSearchService->search(
$aQuery['searchString'],
$aQuery['offset'],
$aQuery['searchLimit'],
@@ -523,7 +523,7 @@
$aFuzzyQuery['searchOptions']['hl'] = 'off';
try {
- $oHits = $oSerachService->search(
+ $oHits = $oSearchService->search(
$aFuzzyQuery['searchString'],
$aFuzzyQuery['offset'],
$aFuzzyQuery['searchLimit'],
--
To view, visit https://gerrit.wikimedia.org/r/333847
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia4f3396ab58a3ec8af15532261abf093e32277ac
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: master
Gerrit-Owner: Robert Vogel
Gerrit-Reviewer: ItSpiderman
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceExtensions[REL1_27]: Just a typo
Robert Vogel has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/333846 )
Change subject: Just a typo
..
Just a typo
Needs to be cherry-picked to REL1_27 and master
Change-Id: Ia4f3396ab58a3ec8af15532261abf093e32277ac
---
M ExtendedSearch/includes/ExtendedSearchBase.class.php
1 file changed, 3 insertions(+), 3 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceExtensions
refs/changes/46/333846/1
diff --git a/ExtendedSearch/includes/ExtendedSearchBase.class.php
b/ExtendedSearch/includes/ExtendedSearchBase.class.php
index 43ae396..51c661d 100644
--- a/ExtendedSearch/includes/ExtendedSearchBase.class.php
+++ b/ExtendedSearch/includes/ExtendedSearchBase.class.php
@@ -485,7 +485,7 @@
* @return array Array of Apache_Solr_Documents
*/
private static function searchAutocomplete( &$sSearchString,
&$vNsSearch ) {
- $oSerachService = SearchService::getInstance();
+ $oSearchService = SearchService::getInstance();
$oSearchRequest = new SearchRequest();
$oSearchRequest->init();
$oSearchOptions = new SearchOptions( $oSearchRequest,
RequestContext::getMain() );
@@ -496,7 +496,7 @@
$aQuery = $oSearchOptions->getSolrAutocompleteQuery(
$sSearchString, $sSolrSearchString );
try {
- $oHits = $oSerachService->search(
+ $oHits = $oSearchService->search(
$aQuery['searchString'],
$aQuery['offset'],
$aQuery['searchLimit'],
@@ -523,7 +523,7 @@
$aFuzzyQuery['searchOptions']['hl'] = 'off';
try {
- $oHits = $oSerachService->search(
+ $oHits = $oSearchService->search(
$aFuzzyQuery['searchString'],
$aFuzzyQuery['offset'],
$aFuzzyQuery['searchLimit'],
--
To view, visit https://gerrit.wikimedia.org/r/333846
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia4f3396ab58a3ec8af15532261abf093e32277ac
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: REL1_27
Gerrit-Owner: Robert Vogel
Gerrit-Reviewer: ItSpiderman
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceExtensions[REL1_23]: Just a typo
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/333651 )
Change subject: Just a typo
..
Just a typo
Needs to be cherry-picked to REL1_27 and master
Change-Id: Ia4f3396ab58a3ec8af15532261abf093e32277ac
---
M ExtendedSearch/includes/ExtendedSearchBase.class.php
1 file changed, 3 insertions(+), 3 deletions(-)
Approvals:
Robert Vogel: Looks good to me, approved
jenkins-bot: Verified
diff --git a/ExtendedSearch/includes/ExtendedSearchBase.class.php
b/ExtendedSearch/includes/ExtendedSearchBase.class.php
index 44865ba..eaf40cb 100644
--- a/ExtendedSearch/includes/ExtendedSearchBase.class.php
+++ b/ExtendedSearch/includes/ExtendedSearchBase.class.php
@@ -485,7 +485,7 @@
* @return array Array of Apache_Solr_Documents
*/
private static function searchAutocomplete( &$sSearchString,
&$vNsSearch ) {
- $oSerachService = SearchService::getInstance();
+ $oSearchService = SearchService::getInstance();
$oSearchRequest = new SearchRequest();
$oSearchRequest->init();
$oSearchOptions = new SearchOptions( $oSearchRequest,
RequestContext::getMain() );
@@ -496,7 +496,7 @@
$aQuery = $oSearchOptions->getSolrAutocompleteQuery(
$sSearchString, $sSolrSearchString );
try {
- $oHits = $oSerachService->search(
+ $oHits = $oSearchService->search(
$aQuery['searchString'],
$aQuery['offset'],
$aQuery['searchLimit'],
@@ -523,7 +523,7 @@
$aFuzzyQuery['searchOptions']['hl'] = 'off';
try {
- $oHits = $oSerachService->search(
+ $oHits = $oSearchService->search(
$aFuzzyQuery['searchString'],
$aFuzzyQuery['offset'],
$aFuzzyQuery['searchLimit'],
--
To view, visit https://gerrit.wikimedia.org/r/333651
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia4f3396ab58a3ec8af15532261abf093e32277ac
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: REL1_23
Gerrit-Owner: ItSpiderman
Gerrit-Reviewer: Dvogel hallowelt
Gerrit-Reviewer: Ljonka
Gerrit-Reviewer: Mglaser
Gerrit-Reviewer: Pwirth
Gerrit-Reviewer: Robert Vogel
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/vagrant[jessie-migration]: Remove zotero
BryanDavis has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/333845 )
Change subject: Remove zotero
..
Remove zotero
Zotero requires XULRunner which is not packaged for Jessie. See T107302
and T93579 for more details.
Bug: T155972
Change-Id: I956b9d92e68fd43bec3f4017f15899bcd4752505
---
M puppet/hieradata/common.yaml
M puppet/modules/citoid/manifests/init.pp
M puppet/modules/role/manifests/citoid.pp
D puppet/modules/role/manifests/zotero.pp
D puppet/modules/zotero/manifests/init.pp
D puppet/modules/zotero/templates/defaults.js.erb
D puppet/modules/zotero/templates/systemd/zotero.erb
7 files changed, 2 insertions(+), 158 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant
refs/changes/45/333845/1
diff --git a/puppet/hieradata/common.yaml b/puppet/hieradata/common.yaml
index 115ad42..07b01bc 100644
--- a/puppet/hieradata/common.yaml
+++ b/puppet/hieradata/common.yaml
@@ -485,6 +485,3 @@
thumbor::sentry_dsn_file: "%{hiera('sentry::dsn_file')}"
xhprofgui::dir: "%{hiera('mwv::vendor_dir')}/xhprof"
-
-zotero::base_path: "%{hiera('mwv::services_dir')}/zotero"
-zotero::log_file: /vagrant/logs/zotero.log
diff --git a/puppet/modules/citoid/manifests/init.pp
b/puppet/modules/citoid/manifests/init.pp
index dcd9fe6..abf4525 100644
--- a/puppet/modules/citoid/manifests/init.pp
+++ b/puppet/modules/citoid/manifests/init.pp
@@ -19,10 +19,8 @@
port => $port,
log_level => $log_level,
config=> {
-userAgent => undef,
-zoteroInterface => '127.0.0.1',
-zoteroPort => '1969',
-zoteroUseProxy => false,
+userAgent => undef,
+zotero=> false,
},
}
}
diff --git a/puppet/modules/role/manifests/citoid.pp
b/puppet/modules/role/manifests/citoid.pp
index de637f1..1045295 100644
--- a/puppet/modules/role/manifests/citoid.pp
+++ b/puppet/modules/role/manifests/citoid.pp
@@ -4,7 +4,6 @@
class role::citoid(
$url,
) {
-include ::role::zotero
include ::citoid
mediawiki::extension { 'Citoid':
diff --git a/puppet/modules/role/manifests/zotero.pp
b/puppet/modules/role/manifests/zotero.pp
deleted file mode 100644
index 0bdc227..000
--- a/puppet/modules/role/manifests/zotero.pp
+++ /dev/null
@@ -1,5 +0,0 @@
-# == Class: role::zotero
-# Provisions Zotero, a dependency of Citoid.
-class role::zotero {
-include ::zotero
-}
diff --git a/puppet/modules/zotero/manifests/init.pp
b/puppet/modules/zotero/manifests/init.pp
deleted file mode 100644
index 6cdecb3..000
--- a/puppet/modules/zotero/manifests/init.pp
+++ /dev/null
@@ -1,76 +0,0 @@
-# == Class: zotero
-#
-# Zotero is a service based on running the Zotero Firefox extension via
xpcshell
-# and JavaScript wrappers. It is meant to scrape URLs provided to it and return
-# metadata.
-#
-# === Parameters
-#
-# [*base_path*]
-# Path to the zotero code. (e.g. /vagrant/srv/zotero)
-#
-# [*log_file*]
-# Place where zotero should log messages.
-#
-class zotero(
-$base_path,
-$log_file,
-) {
-
-package { 'xulrunner-dev':
-ensure => present,
-before => Service['zotero'],
-}
-
-file { $base_path:
-ensure => directory,
-before => Service['zotero'],
-owner => $::share_owner,
-group => $::share_group,
-}
-
-git::clone{ 'mediawiki/services/zotero/translation-server':
-directory => "${base_path}/translation-server",
-require => File[$base_path],
-before=> Service['zotero'],
-}
-
-git::clone{ 'mediawiki/services/zotero/translators':
-directory => "${base_path}/translators",
-require => File[$base_path],
-before=> Service['zotero'],
-}
-
-file { '/etc/zotero':
-ensure => directory,
-}
-file { '/etc/zotero/defaults.js':
-ensure => present,
-content => template('zotero/defaults.js.erb'),
-require => Git::Clone['mediawiki/services/zotero/translation-server'],
-notify => Service['zotero'],
-}
-
-file { $log_file:
-ensure => present,
-mode => '0666',
-owner => $::share_owner,
-group => $::share_group,
-}
-
-service::gitupdate { 'zotero_translation_server':
-dir => "${base_path}/translation-server",
-restart => true,
-service_name => 'zotero',
-}
-
-service::gitupdate { 'zotero_translators':
-dir => "${base_path}/translators",
-restart => true,
-service_name => 'zotero',
-}
-
-systemd::service { 'zotero':
-ensure => 'present',
-}
-}
diff --git a/puppet/modules/zotero/templates/defaults.js.erb
b/puppet/modules/zotero/templates/defaults.js.erb
deleted file mode 100644
index 9c70fb0..000
--- a/puppet/modules/zotero/templates/defaults.js.erb
+++ /dev/null
@@ -1,46 +0,
[MediaWiki-commits] [Gerrit] mediawiki...parsoid[master]: Get wfIsBadImage() information in API requests
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/327293 )
Change subject: Get wfIsBadImage() information in API requests
..
Get wfIsBadImage() information in API requests
This just requests the information, it doesn't do anything with it yet.
Change-Id: I670f683b6fe58d4455478da2f7ec7b3b3ce26e0f
---
M lib/mw/ApiRequest.js
M lib/mw/Batcher.js
2 files changed, 7 insertions(+), 1 deletion(-)
Approvals:
Subramanya Sastry: Looks good to me, approved
jenkins-bot: Verified
diff --git a/lib/mw/ApiRequest.js b/lib/mw/ApiRequest.js
index 7421c17..2e4b440 100644
--- a/lib/mw/ApiRequest.js
+++ b/lib/mw/ApiRequest.js
@@ -963,6 +963,7 @@
'mediatype',
'size',
'url',
+ 'badfile',
];
this.ns = imgns;
@@ -977,6 +978,7 @@
prop: 'imageinfo',
titles: filenames.join('|'),
iiprop: props.join('|'),
+ iibadfilecontexttitle: env.page.name,
rawcontinue: 1,
};
diff --git a/lib/mw/Batcher.js b/lib/mw/Batcher.js
index cf8a2ed..db3c53d 100644
--- a/lib/mw/Batcher.js
+++ b/lib/mw/Batcher.js
@@ -269,7 +269,7 @@
*/
Batcher.prototype.imageinfo = Promise.method(function(filename, dims) {
var env = this.env;
- var hash = Util.makeHash(["imageinfo", filename, dims.width || "",
dims.height || ""]);
+ var hash = Util.makeHash(["imageinfo", filename, dims.width || "",
dims.height || "", env.page.name]);
if (hash in this.resultCache) {
return this.resultCache[hash];
} else if (!env.conf.parsoid.useBatchAPI) {
@@ -282,6 +282,7 @@
action: "imageinfo",
filename: filename,
hash: hash,
+ page: env.page.name,
};
if (dims.width !== null || dims.height !== null) {
params.txopts = {};
@@ -343,6 +344,9 @@
if ("txopts" in params) {
apiItemParams.txopts = params.txopts;
}
+ if ("page" in params) {
+ apiItemParams.page = params.page;
+ }
} else {
apiItemParams = {
action: params.action,
--
To view, visit https://gerrit.wikimedia.org/r/327293
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I670f683b6fe58d4455478da2f7ec7b3b3ce26e0f
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/services/parsoid
Gerrit-Branch: master
Gerrit-Owner: Legoktm
Gerrit-Reviewer: Arlolra
Gerrit-Reviewer: C. Scott Ananian
Gerrit-Reviewer: Legoktm
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]: Fallback to mw:Error for missing images
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/03 )
Change subject: Fallback to mw:Error for missing images
..
Fallback to mw:Error for missing images
* Don't rely on imageinfo being absent.
Change-Id: Id43767fbe5fc4ef69a47ebc83b32320d9a32e9b4
---
M lib/wt2html/tt/LinkHandler.js
1 file changed, 5 insertions(+), 3 deletions(-)
Approvals:
Subramanya Sastry: Looks good to me, approved
jenkins-bot: Verified
diff --git a/lib/wt2html/tt/LinkHandler.js b/lib/wt2html/tt/LinkHandler.js
index 52cb947..5f02fc2 100644
--- a/lib/wt2html/tt/LinkHandler.js
+++ b/lib/wt2html/tt/LinkHandler.js
@@ -965,10 +965,12 @@
var ns = data.imgns;
// title is guaranteed to be not null here
image = data.pages[ns + ':' + title.getKey()];
- if (image && image.imageinfo && image.imageinfo[0]) {
- info = image.imageinfo[0];
- } else {
+ if (!image || !image.imageinfo || !image.imageinfo[0] ||
+ // Fallback to adding mw:Error
+ image.missing !== undefined) {
info = false;
+ } else {
+ info = image.imageinfo[0];
}
}
}
--
To view, visit https://gerrit.wikimedia.org/r/03
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Id43767fbe5fc4ef69a47ebc83b32320d9a32e9b4
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/services/parsoid
Gerrit-Branch: master
Gerrit-Owner: Arlolra
Gerrit-Reviewer: Arlolra
Gerrit-Reviewer: C. Scott Ananian
Gerrit-Reviewer: Legoktm
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...mobileapps[master]: Hygiene: update JSDoc param & return value nullity
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/330616 )
Change subject: Hygiene: update JSDoc param & return value nullity
..
Hygiene: update JSDoc param & return value nullity
As reported by and easily inferred from:
rg
'@(arg|const|enum|exception|member|module|namespace|param|private|prop|protected|public|return|throws|type|var)[^{]*\{[^!?]'
Change-Id: I19bed5bebb514cd5ada601da5509edaa4a9ab377
---
M app.js
M lib/api-util.js
M lib/dateUtil.js
M lib/feed/featured-image.js
M lib/feed/featured.js
M lib/mobile-util.js
M lib/mwapi.js
M lib/pageviews.js
M lib/parseDefinition.js
M lib/parseProperty.js
M lib/parsoid-access.js
M lib/transformations/extractHatnotes.js
M lib/transformations/extractInfobox.js
M lib/transformations/extractLeadIntroduction.js
M lib/transformations/extractPageIssues.js
M lib/transformations/hideIPA.js
M lib/transformations/markReferenceSections.js
M lib/transformations/relocateFirstParagraph.js
M lib/util.js
M routes/mobile-sections.js
M test/utils/testUtil.js
21 files changed, 127 insertions(+), 113 deletions(-)
Approvals:
BearND: Looks good to me, approved
jenkins-bot: Verified
diff --git a/app.js b/app.js
index 17327f2..4ac9024 100644
--- a/app.js
+++ b/app.js
@@ -17,8 +17,8 @@
/**
* Creates an express app and initialises it
- * @param {Object} options the options to initialise the app with
- * @return {bluebird} the promise resolving to the app object
+ * @param {!Object} options the options to initialise the app with
+ * @return {!bluebird} the promise resolving to the app object
*/
function initApp(options) {
@@ -136,8 +136,8 @@
/**
* Loads all routes declared in routes/ into the app
- * @param {Application} app the application object to load routes into
- * @returns {bluebird} a promise resolving to the app object
+ * @param {!Application} app the application object to load routes into
+ * @returns {!bluebird} a promise resolving to the app object
*/
function loadRoutes(app) {
@@ -188,8 +188,8 @@
/**
* Creates and start the service's web server
- * @param {Application} app the app object to use in the service
- * @returns {bluebird} a promise creating the web server
+ * @param {!Application} app the app object to use in the service
+ * @returns {!bluebird} a promise creating the web server
*/
function createServer(app) {
diff --git a/lib/api-util.js b/lib/api-util.js
index 7de0e00..447503f 100644
--- a/lib/api-util.js
+++ b/lib/api-util.js
@@ -11,10 +11,10 @@
/**
* Calls the MW API with the supplied query as its body
*
- * @param {Object} app the application object
+ * @param {!Object} app the application object
* @param {string} domain the domain to issue the request to
- * @param {Object} query an object with all the query parameters for the MW API
- * @return {Promise} a promise resolving as the response object from the MW API
+ * @param {?Object} query an object with all the query parameters for the MW
API
+ * @return {!Promise} a promise resolving as the response object from the MW
API
*/
function mwApiGet(app, domain, query) {
@@ -48,15 +48,15 @@
/**
* Calls the REST API with the supplied domain, path and request parameters
*
- * @param {Object} app the application object
+ * @param {!Object} app the application object
* @param {string} domain the domain to issue the request for
- * @param {string} path the REST API path to contact without the leading slash
- * @param {Object} [restReq={}] the object containing the REST request details
- * @param {string} [restReq.method=get] the request method
- * @param {Object} [restReq.query={}] the query string to send, if any
- * @param {Object} [restReq.headers={}] the request headers to send
- * @param {Object} [restReq.body=null] the body of the request, if any
- * @return {Promise} a promise resolving as the response object from the REST
API
+ * @param {!string} path the REST API path to contact without the leading slash
+ * @param {?Object} [restReq={}] the object containing the REST request details
+ * @param {?string} [restReq.method=get] the request method
+ * @param {?Object} [restReq.query={}] the query string to send, if any
+ * @param {?Object} [restReq.headers={}] the request headers to send
+ * @param {?Object} [restReq.body=null] the body of the request, if any
+ * @return {!Promise} a promise resolving as the response object from the REST
API
*
*/
function restApiGet(app, domain, path, restReq) {
@@ -82,7 +82,7 @@
/**
* Sets up the request templates for MW and RESTBase API requests
*
- * @param {Application} app the application object
+ * @param {!Application} app the application object
*/
function setupApiTemplates(app) {
diff --git a/lib/dateUtil.js b/lib/dateUtil.js
index a137f4b..9a48d29 100644
--- a/lib/dateUtil.js
+++ b/lib/dateUtil.js
@@ -16,8 +16,8 @@
*
* Example: "May 16, 2016"
*
- * @param {Date} date date to
mediawiki-commits@lists.wikimedia.org
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/327436 )
Change subject: Add Linter categories to action=query&meta=siteinfo
..
Add Linter categories to action=query&meta=siteinfo
Bug: T153056
Change-Id: Ieed01741d31c9e268a8769a5bc5d566d8020e760
---
M extension.json
M includes/Hooks.php
2 files changed, 18 insertions(+), 0 deletions(-)
Approvals:
jenkins-bot: Verified
Arlolra: Looks good to me, approved
diff --git a/extension.json b/extension.json
index 0996932..98fc55d 100644
--- a/extension.json
+++ b/extension.json
@@ -27,6 +27,7 @@
"Hooks": {
"LoadExtensionSchemaUpdates":
"MediaWiki\\Linter\\Hooks::onLoadExtensionSchemaUpdates",
"EditFormInitialText":
"MediaWiki\\Linter\\Hooks::onEditFormInitialText",
+ "APIQuerySiteInfoGeneralInfo":
"MediaWiki\\Linter\\Hooks::onAPIQuerySiteInfoGeneralInfo",
"WikiPageDeletionUpdates":
"MediaWiki\\Linter\\Hooks::onWikiPageDeletionUpdates"
},
"APIModules": {
diff --git a/includes/Hooks.php b/includes/Hooks.php
index f4ca189..01dd5ab 100644
--- a/includes/Hooks.php
+++ b/includes/Hooks.php
@@ -20,6 +20,7 @@
namespace MediaWiki\Linter;
+use ApiQuerySiteInfo;
use Content;
use DatabaseUpdater;
use EditPage;
@@ -84,4 +85,20 @@
$database->setForPage( [] );
}, __METHOD__ );
}
+
+ /**
+* Hook: APIQuerySiteInfoGeneralInfo
+*
+* Expose categories via action=query&meta=siteinfo
+*
+* @param ApiQuerySiteInfo $api
+* @param array &$data
+*/
+ public static function onAPIQuerySiteInfoGeneralInfo( ApiQuerySiteInfo
$api, array &$data ) {
+ $catManager = new CategoryManager();
+ $data['linter'] = [
+ 'errors' => $catManager->getErrors(),
+ 'warnings' => $catManager->getWarnings(),
+ ];
+ }
}
--
To view, visit https://gerrit.wikimedia.org/r/327436
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ieed01741d31c9e268a8769a5bc5d566d8020e760
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/Linter
Gerrit-Branch: master
Gerrit-Owner: Legoktm
Gerrit-Reviewer: Arlolra
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Display date in featured image share subject when coming fro...
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/327117 )
Change subject: Display date in featured image share subject when coming from
the gallery
..
Display date in featured image share subject when coming from the gallery
Change-Id: I38cb6dcd274c1a9b9248d266f28aab3a0c053ca6
---
M
app/src/main/java/org/wikipedia/feed/aggregated/AggregatedFeedContentClient.java
M app/src/main/java/org/wikipedia/feed/featured/FeaturedArticleCard.java
M app/src/main/java/org/wikipedia/feed/image/FeaturedImageCard.java
M app/src/main/java/org/wikipedia/feed/news/NewsListCard.java
M app/src/main/java/org/wikipedia/feed/news/NewsListCardView.java
A app/src/main/java/org/wikipedia/gallery/FeaturedImageGalleryItem.java
M app/src/main/java/org/wikipedia/gallery/GalleryActivity.java
M app/src/main/java/org/wikipedia/gallery/GalleryItem.java
M app/src/main/java/org/wikipedia/gallery/GalleryItemFragment.java
M app/src/main/java/org/wikipedia/main/MainFragment.java
M app/src/main/java/org/wikipedia/util/DateUtil.java
M app/src/main/java/org/wikipedia/util/ShareUtil.java
M app/src/test/java/org/wikipedia/feed/featured/FeaturedArticleCardTest.java
13 files changed, 137 insertions(+), 78 deletions(-)
Approvals:
Niedzielski: Looks good to me, approved
jenkins-bot: Verified
diff --git
a/app/src/main/java/org/wikipedia/feed/aggregated/AggregatedFeedContentClient.java
b/app/src/main/java/org/wikipedia/feed/aggregated/AggregatedFeedContentClient.java
index db561fa..6745f5b 100644
---
a/app/src/main/java/org/wikipedia/feed/aggregated/AggregatedFeedContentClient.java
+++
b/app/src/main/java/org/wikipedia/feed/aggregated/AggregatedFeedContentClient.java
@@ -86,21 +86,20 @@
@Override public void onResponse(Call call,
Response
response) {
if (response.isSuccessful()) {
-UtcDate date = DateUtil.getUtcRequestDateFor(age);
List cards = new ArrayList<>();
AggregatedFeedContent content = response.body();
// todo: remove age check when news endpoint provides dated
content, T139481.
if (age == 0 && content.news() != null) {
-cards.add(new NewsListCard(content.news(), date, wiki));
+cards.add(new NewsListCard(content.news(), age, wiki));
}
if (content.tfa() != null) {
-cards.add(new FeaturedArticleCard(content.tfa(), date,
wiki));
+cards.add(new FeaturedArticleCard(content.tfa(), age,
wiki));
}
if (content.mostRead() != null) {
cards.add(new MostReadListCard(content.mostRead(), wiki));
}
if (content.potd() != null) {
-cards.add(new FeaturedImageCard(content.potd(), date,
wiki));
+cards.add(new FeaturedImageCard(content.potd(), age,
wiki));
}
cb.success(cards);
} else {
diff --git
a/app/src/main/java/org/wikipedia/feed/featured/FeaturedArticleCard.java
b/app/src/main/java/org/wikipedia/feed/featured/FeaturedArticleCard.java
index ef1feca..3c03365 100644
--- a/app/src/main/java/org/wikipedia/feed/featured/FeaturedArticleCard.java
+++ b/app/src/main/java/org/wikipedia/feed/featured/FeaturedArticleCard.java
@@ -11,20 +11,19 @@
import org.wikipedia.feed.model.Card;
import org.wikipedia.feed.model.CardType;
import org.wikipedia.feed.model.FeedPageSummary;
-import org.wikipedia.feed.model.UtcDate;
import org.wikipedia.history.HistoryEntry;
import org.wikipedia.page.PageTitle;
import org.wikipedia.util.DateUtil;
public class FeaturedArticleCard extends Card {
-@NonNull private UtcDate date;
-@NonNull private WikiSite wiki;
@NonNull private FeedPageSummary page;
+private int age;
+@NonNull private WikiSite wiki;
-public FeaturedArticleCard(@NonNull FeedPageSummary page, @NonNull UtcDate
date, @NonNull WikiSite wiki) {
+public FeaturedArticleCard(@NonNull FeedPageSummary page, int age,
@NonNull WikiSite wiki) {
this.page = page;
+this.age = age;
this.wiki = wiki;
-this.date = date;
}
@Override
@@ -36,7 +35,7 @@
@Override
@NonNull
public String subtitle() {
-return DateUtil.getFeedCardDateString(date.baseCalendar());
+return DateUtil.getFeedCardDateString(age);
}
@NonNull
diff --git a/app/src/main/java/org/wikipedia/feed/image/FeaturedImageCard.java
b/app/src/main/java/org/wikipedia/feed/image/FeaturedImageCard.java
index 67e2a5d..f75eeda 100644
--- a/app/src/main/java/org/wikipedia/feed/image/FeaturedImageCard.java
+++ b/app/src/main/java/org/wikipedia/feed/image/FeaturedImageCard.java
@@ -9,18 +9,17 @@
import org.wikipedia.dataclient.WikiSite;
import org.wikipedia.fee
[MediaWiki-commits] [Gerrit] mediawiki...CleanChanges[master]: Update version before MLEB release
KartikMistry has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/333844 )
Change subject: Update version before MLEB release
..
Update version before MLEB release
Change-Id: Ia47ac20a7e3638865d74710419e31607c613feb2
---
M extension.json
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CleanChanges
refs/changes/44/333844/1
diff --git a/extension.json b/extension.json
index 1918f00..ada72cc 100644
--- a/extension.json
+++ b/extension.json
@@ -1,6 +1,6 @@
{
"name": "Clean Changes",
- "version": "2016-10-28",
+ "version": "2017-01-24",
"author": "Niklas Laxström",
"url": "https://www.mediawiki.org/wiki/Extension:CleanChanges";,
"descriptionmsg": "cleanchanges-desc",
--
To view, visit https://gerrit.wikimedia.org/r/333844
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia47ac20a7e3638865d74710419e31607c613feb2
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CleanChanges
Gerrit-Branch: master
Gerrit-Owner: KartikMistry
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...UniversalLanguageSelector[master]: Update version before MLEB release
KartikMistry has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/333843 )
Change subject: Update version before MLEB release
..
Update version before MLEB release
Change-Id: Ib79b4d32227c57eecb247995f2f02395efd6da8d
---
M extension.json
1 file changed, 1 insertion(+), 1 deletion(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/UniversalLanguageSelector
refs/changes/43/333843/1
diff --git a/extension.json b/extension.json
index f5a21e0..024b295 100644
--- a/extension.json
+++ b/extension.json
@@ -1,6 +1,6 @@
{
"name": "UniversalLanguageSelector",
- "version": "2016-10-28",
+ "version": "2017-01-24",
"author": [
"Alolita Sharma",
"Amir Aharoni",
--
To view, visit https://gerrit.wikimedia.org/r/333843
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib79b4d32227c57eecb247995f2f02395efd6da8d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/UniversalLanguageSelector
Gerrit-Branch: master
Gerrit-Owner: KartikMistry
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Translate[master]: Update version before MLEB release
KartikMistry has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/333842 ) Change subject: Update version before MLEB release .. Update version before MLEB release Change-Id: I24fd7be4626a5733f019afa1328558748bd2b997 --- M Translate.php 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Translate refs/changes/42/333842/1 diff --git a/Translate.php b/Translate.php index 619b56f..e051196 100644 --- a/Translate.php +++ b/Translate.php @@ -17,7 +17,7 @@ /** * Version number used in extension credits and in other places where needed. */ -define( 'TRANSLATE_VERSION', '2016-10-28' ); +define( 'TRANSLATE_VERSION', '2017-01-24' ); /** * Extension credits properties. -- To view, visit https://gerrit.wikimedia.org/r/333842 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I24fd7be4626a5733f019afa1328558748bd2b997 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Translate Gerrit-Branch: master Gerrit-Owner: KartikMistry ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Truglass[master]: v4.1.3 - remove unused legacy files from source repo
SamanthaNguyen has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/333841 )
Change subject: v4.1.3 - remove unused legacy files from source repo
..
v4.1.3 - remove unused legacy files from source repo
Bug: T156094
Change-Id: I6a70c9377e7018c465a7cb636e00974ec9b8e04e
---
D truglass/Checker-16x16.png
D truglass/donate.gif
D truglass/link_icon.gif
D truglass/magnify-clip.png
M truglass/main.css
D truglass/required.gif
D truglass/roundgrey_bottom.gif
D truglass/searchleftcap.gif
D truglass/searchleftcap_rtl.gif
D truglass/searchrightcap.gif
D truglass/searchrightcap_rtl.gif
D truglass/user.gif
D truglass/wiki-indexed.png
D truglass/wiki.png
14 files changed, 0 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/Truglass
refs/changes/41/333841/1
diff --git a/truglass/Checker-16x16.png b/truglass/Checker-16x16.png
deleted file mode 100644
index 3e9e3d0..000
--- a/truglass/Checker-16x16.png
+++ /dev/null
Binary files differ
diff --git a/truglass/donate.gif b/truglass/donate.gif
deleted file mode 100644
index 1d238d7..000
--- a/truglass/donate.gif
+++ /dev/null
Binary files differ
diff --git a/truglass/link_icon.gif b/truglass/link_icon.gif
deleted file mode 100644
index 815ccb1..000
--- a/truglass/link_icon.gif
+++ /dev/null
Binary files differ
diff --git a/truglass/magnify-clip.png b/truglass/magnify-clip.png
deleted file mode 100644
index 992aa2e..000
--- a/truglass/magnify-clip.png
+++ /dev/null
Binary files differ
diff --git a/truglass/main.css b/truglass/main.css
index b303518..98c3b4e 100644
--- a/truglass/main.css
+++ b/truglass/main.css
@@ -346,8 +346,6 @@
li#pt-userpage,
li#pt-anonuserpage,
li#pt-login {
- /* user.gif doesn't exist */
- /* background: url("user.gif") top left no-repeat; */
padding-left: 20px;
text-transform: none;
}
diff --git a/truglass/required.gif b/truglass/required.gif
deleted file mode 100644
index bd71976..000
--- a/truglass/required.gif
+++ /dev/null
Binary files differ
diff --git a/truglass/roundgrey_bottom.gif b/truglass/roundgrey_bottom.gif
deleted file mode 100644
index 1640816..000
--- a/truglass/roundgrey_bottom.gif
+++ /dev/null
Binary files differ
diff --git a/truglass/searchleftcap.gif b/truglass/searchleftcap.gif
deleted file mode 100644
index e5ed00c..000
--- a/truglass/searchleftcap.gif
+++ /dev/null
Binary files differ
diff --git a/truglass/searchleftcap_rtl.gif b/truglass/searchleftcap_rtl.gif
deleted file mode 100644
index c9f1b99..000
--- a/truglass/searchleftcap_rtl.gif
+++ /dev/null
Binary files differ
diff --git a/truglass/searchrightcap.gif b/truglass/searchrightcap.gif
deleted file mode 100644
index 85c800e..000
--- a/truglass/searchrightcap.gif
+++ /dev/null
Binary files differ
diff --git a/truglass/searchrightcap_rtl.gif b/truglass/searchrightcap_rtl.gif
deleted file mode 100644
index b7747d8..000
--- a/truglass/searchrightcap_rtl.gif
+++ /dev/null
Binary files differ
diff --git a/truglass/user.gif b/truglass/user.gif
deleted file mode 100644
index c9c9ab9..000
--- a/truglass/user.gif
+++ /dev/null
Binary files differ
diff --git a/truglass/wiki-indexed.png b/truglass/wiki-indexed.png
deleted file mode 100644
index 189a2ae..000
--- a/truglass/wiki-indexed.png
+++ /dev/null
Binary files differ
diff --git a/truglass/wiki.png b/truglass/wiki.png
deleted file mode 100644
index 69fce98..000
--- a/truglass/wiki.png
+++ /dev/null
Binary files differ
--
To view, visit https://gerrit.wikimedia.org/r/333841
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I6a70c9377e7018c465a7cb636e00974ec9b8e04e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/Truglass
Gerrit-Branch: master
Gerrit-Owner: SamanthaNguyen
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/vagrant[master]: Flow config: Remove dead code
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/333839 ) Change subject: Flow config: Remove dead code .. Flow config: Remove dead code We use VirtualRESTServiceClient now, so this is confusing. Change-Id: Ib9acffb63026296fa16955768db8566bc61e85a4 --- M puppet/modules/role/templates/flow/conf.php.erb 1 file changed, 0 insertions(+), 4 deletions(-) Approvals: Catrope: Looks good to me, approved jenkins-bot: Verified diff --git a/puppet/modules/role/templates/flow/conf.php.erb b/puppet/modules/role/templates/flow/conf.php.erb index 7c1cac4..ee613d6 100644 --- a/puppet/modules/role/templates/flow/conf.php.erb +++ b/puppet/modules/role/templates/flow/conf.php.erb @@ -17,10 +17,6 @@ $wgFlowEnableOptInBetaFeature = true; -$wgFlowParsoidURL = 'http://localhost:<%= scope['parsoid::port'] %>'; -$wgFlowParsoidPrefix = 'localhost'; -$wgFlowParsoidTimeout = 100; - $wgGroupPermissions['autoconfirmed']['flow-edit-post'] = true; $wgGroupPermissions['sysop']['flow-create-board'] = true; -- To view, visit https://gerrit.wikimedia.org/r/333839 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ib9acffb63026296fa16955768db8566bc61e85a4 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/vagrant Gerrit-Branch: master Gerrit-Owner: Mattflaschen Gerrit-Reviewer: BryanDavis Gerrit-Reviewer: Catrope Gerrit-Reviewer: Dduvall Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] translatewiki[master]: config for MLEB 2017.01
KartikMistry has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/333840 ) Change subject: config for MLEB 2017.01 .. config for MLEB 2017.01 Bug: T154462 Change-Id: I228f19c0f737d2334aeef629891fb5856178a1e9 --- M melange/config.ini 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/translatewiki refs/changes/40/333840/1 diff --git a/melange/config.ini b/melange/config.ini index 8488a94..ed2f72a 100644 --- a/melange/config.ini +++ b/melange/config.ini @@ -2,8 +2,8 @@ mediawikirepo=ssh://kar...@gerrit.wikimedia.org:29418/mediawiki/core.git extensionrepo=ssh://kar...@gerrit.wikimedia.org:29418/mediawiki/extensions/ branches=origin/master origin/REL1_21 origin/REL1_20 -releasever=2016.10 -releasever-prev=2016.08 +releasever=2017.01 +releasever-prev=2016.10 bundlename=MediaWiki language extension bundle downloadurl=https://translatewiki.net/mleb hasher=sha256sum -- To view, visit https://gerrit.wikimedia.org/r/333840 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I228f19c0f737d2334aeef629891fb5856178a1e9 Gerrit-PatchSet: 1 Gerrit-Project: translatewiki Gerrit-Branch: master Gerrit-Owner: KartikMistry ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/vagrant[master]: Flow config: Remove dead code
Mattflaschen has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/333839 ) Change subject: Flow config: Remove dead code .. Flow config: Remove dead code We use VirtualRESTServiceClient now, so this is confusing. Change-Id: Ib9acffb63026296fa16955768db8566bc61e85a4 --- M puppet/modules/role/templates/flow/conf.php.erb 1 file changed, 0 insertions(+), 4 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant refs/changes/39/333839/1 diff --git a/puppet/modules/role/templates/flow/conf.php.erb b/puppet/modules/role/templates/flow/conf.php.erb index 7c1cac4..ee613d6 100644 --- a/puppet/modules/role/templates/flow/conf.php.erb +++ b/puppet/modules/role/templates/flow/conf.php.erb @@ -17,10 +17,6 @@ $wgFlowEnableOptInBetaFeature = true; -$wgFlowParsoidURL = 'http://localhost:<%= scope['parsoid::port'] %>'; -$wgFlowParsoidPrefix = 'localhost'; -$wgFlowParsoidTimeout = 100; - $wgGroupPermissions['autoconfirmed']['flow-edit-post'] = true; $wgGroupPermissions['sysop']['flow-create-board'] = true; -- To view, visit https://gerrit.wikimedia.org/r/333839 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib9acffb63026296fa16955768db8566bc61e85a4 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/vagrant Gerrit-Branch: master Gerrit-Owner: Mattflaschen ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...CentralAuth[REL1_28]: SECURITY: Disallow user CSS/JS when centralauthtoken is in use
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/44 )
Change subject: SECURITY: Disallow user CSS/JS when centralauthtoken is in use
..
SECURITY: Disallow user CSS/JS when centralauthtoken is in use
This prevents an attacker from putting something bad in their
User:Me/apioutput.js or User:Me/apioutput.css and then using
centralauthtoken to cause it to be loaded for some other user.
Bug: T144573
Change-Id: Ie0a68b6e71b8e8262539499b31f24a84152b4aa7
(cherry picked from commit ff8906162f583da889b04c323730d3c0aef6e2d7)
---
M includes/session/CentralAuthTokenSessionProvider.php
1 file changed, 18 insertions(+), 0 deletions(-)
Approvals:
Chad: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/session/CentralAuthTokenSessionProvider.php
b/includes/session/CentralAuthTokenSessionProvider.php
index 161b3de..7662ffe 100644
--- a/includes/session/CentralAuthTokenSessionProvider.php
+++ b/includes/session/CentralAuthTokenSessionProvider.php
@@ -21,6 +21,7 @@
parent::__construct();
$wgHooks['APIGetAllowedParams'][] = $this;
+ $wgHooks['BeforePageDisplay'][] = $this;
}
/**
@@ -216,4 +217,21 @@
return true;
}
+ /**
+* Prevent user scripts and styles when centralauthtoken is in use
+* @param OutputPage $out
+* @return bool
+*/
+ public function onBeforePageDisplay( $out ) {
+ if ( $out->getRequest()->getSession()->getProvider() instanceof
CentralAuthTokenSessionProvider ) {
+ $out->reduceAllowedModules(
+ ResourceLoaderModule::TYPE_SCRIPTS,
ResourceLoaderModule::ORIGIN_USER_SITEWIDE
+ );
+ $out->reduceAllowedModules(
+ ResourceLoaderModule::TYPE_STYLES,
ResourceLoaderModule::ORIGIN_USER_SITEWIDE
+ );
+ }
+ return true;
+ }
+
}
--
To view, visit https://gerrit.wikimedia.org/r/44
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie0a68b6e71b8e8262539499b31f24a84152b4aa7
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CentralAuth
Gerrit-Branch: REL1_28
Gerrit-Owner: Paladox
Gerrit-Reviewer: Anomie
Gerrit-Reviewer: Chad
Gerrit-Reviewer: Jforrester
Gerrit-Reviewer: Legoktm
Gerrit-Reviewer: MarcoAurelio
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...CentralAuth[REL1_27]: SECURITY: Disallow user CSS/JS when centralauthtoken is in use
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/45 )
Change subject: SECURITY: Disallow user CSS/JS when centralauthtoken is in use
..
SECURITY: Disallow user CSS/JS when centralauthtoken is in use
This prevents an attacker from putting something bad in their
User:Me/apioutput.js or User:Me/apioutput.css and then using
centralauthtoken to cause it to be loaded for some other user.
Bug: T144573
Change-Id: Ie0a68b6e71b8e8262539499b31f24a84152b4aa7
(cherry picked from commit ff8906162f583da889b04c323730d3c0aef6e2d7)
---
M includes/session/CentralAuthTokenSessionProvider.php
1 file changed, 18 insertions(+), 0 deletions(-)
Approvals:
Chad: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/session/CentralAuthTokenSessionProvider.php
b/includes/session/CentralAuthTokenSessionProvider.php
index 161b3de..7662ffe 100644
--- a/includes/session/CentralAuthTokenSessionProvider.php
+++ b/includes/session/CentralAuthTokenSessionProvider.php
@@ -21,6 +21,7 @@
parent::__construct();
$wgHooks['APIGetAllowedParams'][] = $this;
+ $wgHooks['BeforePageDisplay'][] = $this;
}
/**
@@ -216,4 +217,21 @@
return true;
}
+ /**
+* Prevent user scripts and styles when centralauthtoken is in use
+* @param OutputPage $out
+* @return bool
+*/
+ public function onBeforePageDisplay( $out ) {
+ if ( $out->getRequest()->getSession()->getProvider() instanceof
CentralAuthTokenSessionProvider ) {
+ $out->reduceAllowedModules(
+ ResourceLoaderModule::TYPE_SCRIPTS,
ResourceLoaderModule::ORIGIN_USER_SITEWIDE
+ );
+ $out->reduceAllowedModules(
+ ResourceLoaderModule::TYPE_STYLES,
ResourceLoaderModule::ORIGIN_USER_SITEWIDE
+ );
+ }
+ return true;
+ }
+
}
--
To view, visit https://gerrit.wikimedia.org/r/45
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie0a68b6e71b8e8262539499b31f24a84152b4aa7
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CentralAuth
Gerrit-Branch: REL1_27
Gerrit-Owner: Paladox
Gerrit-Reviewer: Anomie
Gerrit-Reviewer: Chad
Gerrit-Reviewer: Jforrester
Gerrit-Reviewer: Legoktm
Gerrit-Reviewer: MarcoAurelio
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...parsoid[master]: Remove unnecessary nowikis
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/333815 ) Change subject: Remove unnecessary nowikis .. Remove unnecessary nowikis * Besides, the comment says the html is supposed to match the previous test. Change-Id: I2dfa02d826574d12831fa773748264c01766c6a7 --- M tests/parserTests.txt 1 file changed, 10 insertions(+), 18 deletions(-) Approvals: Subramanya Sastry: Looks good to me, approved jenkins-bot: Verified diff --git a/tests/parserTests.txt b/tests/parserTests.txt index 6f66257..7d99c89 100644 --- a/tests/parserTests.txt +++ b/tests/parserTests.txt @@ -933,6 +933,7 @@ ### ### multiple quote sequences in a line ### + !! test Italics and bold: multiple quote sequences: (2,4,2) !! options @@ -942,8 +943,7 @@ !! html/* foo'bar -!!end - +!! end # same html as previous, but wikitext adjusted to match parsoid html2wt !! test @@ -955,7 +955,6 @@ !! end - !! test Italics and bold: multiple quote sequences: (2,4,3) !! options @@ -965,8 +964,7 @@ !! html/* foo'bar -!!end - +!! end # same html as previous, but wikitext adjusted to match parsoid html2wt !! test @@ -978,7 +976,6 @@ !! end - !! test Italics and bold: multiple quote sequences: (2,4,4) !! options @@ -988,8 +985,7 @@ !! html/* foo'bar' -!!end - +!! end # same html as previous, but wikitext adjusted to match parsoid html2wt !! test @@ -1000,7 +996,6 @@ foo'bar' !! end - # The PHP parser strips the empty tags out for giggles; parsoid doesn't. !! test @@ -1015,23 +1010,20 @@ !! html/parsoid foo'bar -!!end +!! end # same html as previous, but wikitext adjusted to match parsoid html2wt !! test Italics and bold: multiple quote sequences: (3,4,2+2) w/ nowiki -!! options -parsoid !! wikitext -'''foobar +'''foobar !! html/php foo'bar !! html/parsoid -foo'bar +foo'bar !! end - # The PHP parser strips the empty tags out for giggles; parsoid doesn't. !! test @@ -1046,18 +1038,18 @@ !! html/parsoid foo'bar -!!end +!! end # same html as previous, but wikitext adjusted to match parsoid html2wt !! test Italics and bold: multiple quote sequences: (3,4,3+3) w/ nowiki !! wikitext -'''foobar'' +'''foobar'' !! html/php foo'bar !! html/parsoid -foo'bar +foo'bar !! end -- To view, visit https://gerrit.wikimedia.org/r/333815 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I2dfa02d826574d12831fa773748264c01766c6a7 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/services/parsoid Gerrit-Branch: master Gerrit-Owner: Arlolra Gerrit-Reviewer: C. Scott Ananian 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...CheckUser[master]: [WIP] Create new Special:RangeContributions page to view con...
MusikAnimal has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/333838 )
Change subject: [WIP] Create new Special:RangeContributions page to view
contribs of an IP range
..
[WIP] Create new Special:RangeContributions page to view contribs of an IP range
Bug: T145912
Change-Id: If1cfc046093cfcb661fdbc976525e01c4810696e
---
M CheckUser.alias.php
M extension.json
M i18n/en.json
A specials/SpecialRangeContributions.php
4 files changed, 1,119 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CheckUser
refs/changes/38/333838/1
diff --git a/CheckUser.alias.php b/CheckUser.alias.php
index a4fadee..f97f38f 100644
--- a/CheckUser.alias.php
+++ b/CheckUser.alias.php
@@ -13,6 +13,7 @@
$specialPageAliases['en'] = array(
'CheckUser' => array( 'CheckUser' ),
'CheckUserLog' => array( 'CheckUserLog' ),
+ 'RangeContributions' => array( 'RangeContributions' ),
);
/** Arabic (العربية) */
diff --git a/extension.json b/extension.json
index bd5dda2..fa0142a 100644
--- a/extension.json
+++ b/extension.json
@@ -3,7 +3,8 @@
"version": "2.4",
"author": [
"Tim Starling",
- "Aaron Schulz"
+ "Aaron Schulz",
+ "MusikAnimal"
],
"url": "https://www.mediawiki.org/wiki/Extension:CheckUser";,
"descriptionmsg": "checkuser-desc",
@@ -104,13 +105,15 @@
],
"SpecialPages": {
"CheckUser": "CheckUser",
- "CheckUserLog": "SpecialCheckUserLog"
+ "CheckUserLog": "SpecialCheckUserLog",
+ "RangeContributions": "SpecialRangeContributions"
},
"AutoloadClasses": {
"CheckUser": "specials/SpecialCheckUser.php",
"CheckUserHooks": "CheckUser.hooks.php",
"CheckUserLogPager": "CheckUserLogPager.php",
"SpecialCheckUserLog": "specials/SpecialCheckUserLog.php",
+ "SpecialRangeContributions":
"specials/SpecialRangeContributions.php",
"CheckUserEncryptedData": "CheckUserEncryptedData.php",
"ApiQueryCheckUser": "api/ApiQueryCheckUser.php",
"ApiQueryCheckUserLog": "api/ApiQueryCheckUserLog.php",
diff --git a/i18n/en.json b/i18n/en.json
index a60e5d0..3ba1b61 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -87,6 +87,13 @@
"checkuser-token-fail": "Session failure. Please try again.",
"group-checkuser.css": "/* CSS placed here will affect checkuser only
*/",
"group-checkuser.js": "/* JS placed here will affect checkuser only */",
+ "rangecontributions": "Range contributions",
+ "rangecontributions-summary": "This tool scans recent changes to find
contributions by the given IP range. IPv4 (CIDR $1-32) and IPv6 (CIDR $2-128)
are supported. No more than 5,000 edits will be returned for performance
reasons.",
+ "rangecontributions-query": "Search for contributions",
+ "rangecontributions-target": "Common range:",
+ "rangecontributions-duration": "Period of time to search:",
+ "rangecontributions-by-time": "Show results by time",
+ "rangecontributions-by-ip": "Show results by IP",
"apihelp-query+checkuser-description": "Check which IP addresses are
used by a given username or which usernames are used by a given IP address.",
"apihelp-query+checkuser-param-request": "Type of CheckUser
request:\n;userips:Get IP address of target user.\n;edits:Get changes from
target IP address or range.\n;ipusers:Get users from target IP address or
range.",
"apihelp-query+checkuser-param-target": "Username, IP address, or CIDR
range to check.",
diff --git a/specials/SpecialRangeContributions.php
b/specials/SpecialRangeContributions.php
new file mode 100644
index 000..9afbaa3
--- /dev/null
+++ b/specials/SpecialRangeContributions.php
@@ -0,0 +1,1106 @@
+setHeaders();
+ $out = $this->getOutput();
+ $request = $this->getRequest();
+
+ $this->opts = [];
+
+ // set opts based on what they entered in the form
+ if ( $par !== null ) {
+ $this->opts['rangetarget'] = $par;
+ } else {
+ $this->opts['rangetarget'] = $request->getText(
'rangetarget' );
+ }
+ $this->opts['rangetarget'] = trim( $this->opts['rangetarget'] );
+ $this->opts['days'] = $request->getFloat( 'days' );
+ $ns = $request->getVal( 'namespace', null );
+ if ( $ns !== null && $ns !== '' ) {
+ $this->opts['namespace'] = intval( $ns );
+ } else {
+ $this->opts['namespace'] = '';
+ }
+ $this->opts['associated'] = $request->getBool( 'associated' );
+ $this->opts['nsInvert']
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: rcfilters: Remove implemented filters from list of links
Catrope has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/333837 )
Change subject: rcfilters: Remove implemented filters from list of links
..
rcfilters: Remove implemented filters from list of links
This is a bit hacky because the filter name needs to be inferred
from the class on each span, and because the separators aren't
wrapped.
Change-Id: Ib39ad435d3b48fa38533926e4ab49942c3bd5d6f
---
M resources/Resources.php
M resources/src/mediawiki.rcfilters/mw.rcfilters.init.js
D resources/src/mediawiki.rcfilters/styles/mw.rcfilters.less
3 files changed, 34 insertions(+), 6 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/37/333837/1
diff --git a/resources/Resources.php b/resources/Resources.php
index bd7f68e..cd5e3b9 100644
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -1747,7 +1747,6 @@
'resources/src/mediawiki.rcfilters/mw.rcfilters.init.js',
],
'styles' => [
-
'resources/src/mediawiki.rcfilters/styles/mw.rcfilters.less',
'resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.FilterItemWidget.less',
'resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.FilterGroupWidget.less',
'resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.FiltersListWidget.less',
diff --git a/resources/src/mediawiki.rcfilters/mw.rcfilters.init.js
b/resources/src/mediawiki.rcfilters/mw.rcfilters.init.js
index ce0fc8a..98e886f 100644
--- a/resources/src/mediawiki.rcfilters/mw.rcfilters.init.js
+++ b/resources/src/mediawiki.rcfilters/mw.rcfilters.init.js
@@ -146,6 +146,40 @@
// Initialize values
controller.initialize();
+ // Remove old-style filter links for filters handled by
the widget
+ $( '.rcshowhide' ).children().each( function () {
+ // Some of the older browsers we support don't
have .classList :(
+ var i,
+ name = null,
+ classes = this.getAttribute( 'class'
).split( ' ' );
+ for ( i = 0; i < classes.length; i++ ) {
+ if ( classes[ i ].substr( 0,
'rcshow'.length ) === 'rcshow' ) {
+ name = classes[ i ].substr(
'rcshow'.length );
+ break;
+ }
+ }
+ if ( name === null ) {
+ return;
+ }
+ if ( name === 'hidemine' ) {
+ // HACK: the span for hidemyself is
called hidemine
+ name = 'hidemyself';
+ }
+ // This span corresponds to a filter that's in
our model, so remove it
+ if ( model.getItemByName( name ) ) {
+ debugger;
+ // Remove the text node after the span.
+ // If there isn't one, we're at the
end, so remove the text node before the span.
+ if ( this.nextSibling &&
this.nextSibling.nodeType === Node.TEXT_NODE ) {
+ this.parentNode.removeChild(
this.nextSibling );
+ } else if ( this.previousSibling &&
this.previousSibling.nodeType === Node.TEXT_NODE ) {
+ this.parentNode.removeChild(
this.previousSibling );
+ }
+ // Remove the span itself
+ this.parentNode.removeChild( this );
+ }
+ } );
+
$( '.rcoptions form' ).submit( function () {
var $form = $( this );
diff --git a/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.less
b/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.less
deleted file mode 100644
index 7f71c0c..000
--- a/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.less
+++ /dev/null
@@ -1,5 +0,0 @@
-.rcshowhidemine {
- // HACK: Hide this filter since it already appears in
- // the new filter drop-down.
- display: none;
-}
--
To view, visit https://gerrit.wikimedia.org/r/333837
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib39ad435d3b48fa38533926e4ab49942c3bd5
[MediaWiki-commits] [Gerrit] mediawiki/vagrant[jessie-migration]: [WIP] Make kafka run on Jessie
BryanDavis has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/333836 )
Change subject: [WIP] Make kafka run on Jessie
..
[WIP] Make kafka run on Jessie
Change-Id: Ic1f8960ed8c792687e0a1c552639c3e10e65ad8e
---
M puppet/modules/kafka/manifests/init.pp
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant
refs/changes/36/333836/1
diff --git a/puppet/modules/kafka/manifests/init.pp
b/puppet/modules/kafka/manifests/init.pp
index 14f103c..e3ee5d3 100644
--- a/puppet/modules/kafka/manifests/init.pp
+++ b/puppet/modules/kafka/manifests/init.pp
@@ -57,7 +57,7 @@
}
exec { 'zookeeper-server-init':
-command => '/usr/bin/service zookeeper-server init',
+command => '/etc/init.d/zookeeper-server init',
unless => '/usr/bin/test -d /var/lib/zookeeper/version-2',
require => Package['zookeeper-server']
}
--
To view, visit https://gerrit.wikimedia.org/r/333836
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic1f8960ed8c792687e0a1c552639c3e10e65ad8e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: jessie-migration
Gerrit-Owner: BryanDavis
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Follow-up e3da2e23: Fix typo in hideanons filter name
Catrope has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/333835 )
Change subject: Follow-up e3da2e23: Fix typo in hideanons filter name
..
Follow-up e3da2e23: Fix typo in hideanons filter name
Change-Id: I5d3d72147f1c0ce7994e253801128dbe145f72e8
---
M resources/src/mediawiki.rcfilters/mw.rcfilters.init.js
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/35/333835/1
diff --git a/resources/src/mediawiki.rcfilters/mw.rcfilters.init.js
b/resources/src/mediawiki.rcfilters/mw.rcfilters.init.js
index 34df2f5..ce0fc8a 100644
--- a/resources/src/mediawiki.rcfilters/mw.rcfilters.init.js
+++ b/resources/src/mediawiki.rcfilters/mw.rcfilters.init.js
@@ -24,7 +24,7 @@
description: mw.msg(
'rcfilters-filter-registered-description' )
},
{
- name: 'hideanon',
+ name: 'hideanons',
label: mw.msg(
'rcfilters-filter-unregistered-label' ),
description: mw.msg(
'rcfilters-filter-unregistered-description' )
}
--
To view, visit https://gerrit.wikimedia.org/r/333835
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I5d3d72147f1c0ce7994e253801128dbe145f72e8
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Catrope
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...MobileFrontend[master]: Fix: leak of mfTempOpenSection() Minerva-only JavaScript fun...
Niedzielski has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/333834 )
Change subject: Fix: leak of mfTempOpenSection() Minerva-only JavaScript
function
..
Fix: leak of mfTempOpenSection() Minerva-only JavaScript function
Bug: T152009
Change-Id: Ib010b402c20685105cf9c3fd59ee21372e54c46c
---
M includes/MobileFrontend.hooks.php
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend
refs/changes/34/333834/1
diff --git a/includes/MobileFrontend.hooks.php
b/includes/MobileFrontend.hooks.php
index a660f9d..ad14bc1 100644
--- a/includes/MobileFrontend.hooks.php
+++ b/includes/MobileFrontend.hooks.php
@@ -213,7 +213,7 @@
}
}
- if ( !$title->isMainPage() && !$title->isSpecialPage() ) {
+ if ( $context->shouldDisplayMobileView() &&
!$title->isMainPage() && !$title->isSpecialPage() ) {
$text =
MobileFrontendSkinHooks::interimTogglingSupport() . $text;
}
return true;
--
To view, visit https://gerrit.wikimedia.org/r/333834
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib010b402c20685105cf9c3fd59ee21372e54c46c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Niedzielski
Gerrit-Reviewer: Sniedzielski
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: delete dumps.wikimedia.org SSL cert
Dzahn has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/333833 ) Change subject: delete dumps.wikimedia.org SSL cert .. delete dumps.wikimedia.org SSL cert replaced by Letsencrypt. Not needed anymore. Don't forget to delete key in private repo too. Bug: T154940 Change-Id: I1cda1942704ad747b8c0e6fe0801e8a71f322f89 --- D files/ssl/dumps.wikimedia.org.crt 1 file changed, 0 insertions(+), 31 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/33/333833/1 diff --git a/files/ssl/dumps.wikimedia.org.crt b/files/ssl/dumps.wikimedia.org.crt deleted file mode 100644 index 7e04e79..000 --- a/files/ssl/dumps.wikimedia.org.crt +++ /dev/null @@ -1,31 +0,0 @@ --BEGIN CERTIFICATE- -MIIFSDCCBDCgAwIBAgISESHHodmEG6aWLluEPhIvg+s9MA0GCSqGSIb3DQEBCwUA -MGYxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMTwwOgYD -VQQDEzNHbG9iYWxTaWduIE9yZ2FuaXphdGlvbiBWYWxpZGF0aW9uIENBIC0gU0hB -MjU2IC0gRzIwHhcNMTUxMjIzMTkwNjE0WhcNMTcwNDI2MTA0NzM4WjB9MQswCQYD -VQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2FuIEZyYW5j -aXNjbzEjMCEGA1UEChMaV2lraW1lZGlhIEZvdW5kYXRpb24sIEluYy4xHDAaBgNV -BAMTE2R1bXBzLndpa2ltZWRpYS5vcmcwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw -ggEKAoIBAQDIUsiJIMzv38vS9P+VJVWVB1JzNve6eyMMZ6cO86awtLiKE2P/PChW -8lUFXFfPuhXycbJ2Dycwor/UxL9XMUnd5ckCDkRCBDpuJtFq1XjYgixlj5YIjJMJ -3jSbxGtRzPFDmsVGlrjdAZ6D264JByl7mqttZhDdu58RFEvfnubfuZ10ioAlRqy6 -DkPbnEI4ycSNteTqEnQZWU8rtdiu8kPcBeDEuCgqqXD1mkabJMYQV5bxHed6RWo2 -SZyMJudh8/UnD552t5h+LhkiKTtResaGKb6B0ZaYP8diI3SxF1Lqb+Hs5MpuXoW9 -qQdV4U7IyILBv2IK+FI4oQZS/XaPVBx7AgMBAAGjggHXMIIB0zAOBgNVHQ8BAf8E -BAMCBaAwSQYDVR0gBEIwQDA+BgZngQwBAgIwNDAyBggrBgEFBQcCARYmaHR0cHM6 -Ly93d3cuZ2xvYmFsc2lnbi5jb20vcmVwb3NpdG9yeS8wHgYDVR0RBBcwFYITZHVt -cHMud2lraW1lZGlhLm9yZzAJBgNVHRMEAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMB -BggrBgEFBQcDAjBJBgNVHR8EQjBAMD6gPKA6hjhodHRwOi8vY3JsLmdsb2JhbHNp -Z24uY29tL2dzL2dzb3JnYW5pemF0aW9udmFsc2hhMmcyLmNybDCBoAYIKwYBBQUH -AQEEgZMwgZAwTQYIKwYBBQUHMAKGQWh0dHA6Ly9zZWN1cmUuZ2xvYmFsc2lnbi5j -b20vY2FjZXJ0L2dzb3JnYW5pemF0aW9udmFsc2hhMmcycjEuY3J0MD8GCCsGAQUF -BzABhjNodHRwOi8vb2NzcDIuZ2xvYmFsc2lnbi5jb20vZ3Nvcmdhbml6YXRpb252 -YWxzaGEyZzIwHQYDVR0OBBYEFKcK885oqxfYFjbkaztJQbRnzZMQMB8GA1UdIwQY -MBaAFJbeYfG9HBYpUxzAzH07gwBA5hp8MA0GCSqGSIb3DQEBCwUAA4IBAQA6Qbu5 -DF1JAueUNx52rG/i412C3Kz0vZGq6zkmX9IDqgU2ZWSaicMCaTJDYR61gE/BSYsg -mOlWSTPrXeLzPwNWDeL0d7G9IXHDpJCXFmGETd3FoiSstA1gLann6FACVouZIdNf -jUf0M2jCloNGa974QN9vl5rQq091Q49VxeHHuI2ZBq45kFl9f312P1UNPnx0LULs -/vXv1Yg/Z081GdwhDshTGGwDAUf3L3NZ1f+SzJVqnKkcpj1MPoSXVdAmWbNgT5Yg -KjOkQglKOa0CetfZupoHQzGdyO9jBaTeMtluAHVuaSFbAgqNZ40+HHdrGdnxKzOs -nJX7wXnvGZ8Y4sCA --END CERTIFICATE- -- To view, visit https://gerrit.wikimedia.org/r/333833 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I1cda1942704ad747b8c0e6fe0801e8a71f322f89 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/vagrant[master]: Add a role for Commons Datasets
MaxSem has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/333832 )
Change subject: Add a role for Commons Datasets
..
Add a role for Commons Datasets
Change-Id: I49e1952e15c96fa476f80c31d00b34b5f9faa19b
---
A puppet/modules/role/files/commons_datasets/commons_datasets.php
A puppet/modules/role/manifests/commons_datasets.pp
2 files changed, 56 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant
refs/changes/32/333832/1
diff --git a/puppet/modules/role/files/commons_datasets/commons_datasets.php
b/puppet/modules/role/files/commons_datasets/commons_datasets.php
new file mode 100644
index 000..31938ba
--- /dev/null
+++ b/puppet/modules/role/files/commons_datasets/commons_datasets.php
@@ -0,0 +1,47 @@
+https://www.mediawiki.org/wiki/Extension:JsonConfig#Configuration
+$wgJsonConfigModels['Tabular.JsonConfig'] = 'JsonConfig\JCTabularContent';
+$wgJsonConfigs['Tabular.JsonConfig'] = [
+ 'namespace' => 486,
+ 'nsName' => 'Data',
+ // page name must end in ".tab", and contain at least one symbol
+ 'pattern' => '/.\.tab$/',
+ 'license' => 'CC0-1.0+',
+ 'isLocal' => false,
+];
+
+$wgJsonConfigModels['Map.JsonConfig'] = 'JsonConfig\JCMapDataContent';
+$wgJsonConfigs['Map.JsonConfig'] = [
+ 'namespace' => 486,
+ 'nsName' => 'Data',
+ // page name must end in ".map", and contain at least one symbol
+ 'pattern' => '/.\.map$/',
+ 'license' => 'CC0-1.0+',
+ 'isLocal' => false,
+];
+
+if ( $wgDBname === 'commonswiki' ) {
+ // Ensure we have a stable cross-wiki title resolution
+ // See JCSingleton::parseTitle()
+ $wgJsonConfigInterwikiPrefix = "meta";
+ $wgJsonConfigs['Tabular.JsonConfig']['store'] = true;
+ $wgJsonConfigs['Map.JsonConfig']['store'] = true;
+} else {
+ $wgJsonConfigInterwikiPrefix = "commons";
+ $wgJsonConfigs['Tabular.JsonConfig']['remote'] = [
+ 'url' => 'https://commons.wikimedia.org/w/api.php'
+ ];
+ $wgJsonConfigs['Map.JsonConfig']['remote'] = [
+ 'url' => 'https://commons.wikimedia.org/w/api.php'
+ ];
+}
+
+$wgJsonConfigEnableLuaSupport = true;
diff --git a/puppet/modules/role/manifests/commons_datasets.pp
b/puppet/modules/role/manifests/commons_datasets.pp
new file mode 100644
index 000..fa16a4c
--- /dev/null
+++ b/puppet/modules/role/manifests/commons_datasets.pp
@@ -0,0 +1,9 @@
+class role::commons_datasets {
+ include ::role::jsonconfig
+ include ::role::commons
+
+ file { "${::mediawiki::managed_settings_dir}/commons_datasets.php":
+ensure => present,
+source => 'puppet:///modules/role/commons_datasets/commons_datasets.php',
+ }
+}
--
To view, visit https://gerrit.wikimedia.org/r/333832
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I49e1952e15c96fa476f80c31d00b34b5f9faa19b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: MaxSem
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...MobileFrontend[master]: Hygiene: add phpcs rule for function declaration equals spacing
Niedzielski has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/333831 )
Change subject: Hygiene: add phpcs rule for function declaration equals spacing
..
Hygiene: add phpcs rule for function declaration equals spacing
Add PHP_CodeSniffer rule to require spaces around equals (=) in function
declarations and fix offenders
Bug: T149887
Change-Id: I7d0e1a43f45f42e279f05e78f56749b2aa643fe1
---
M phpcs.xml
M tests/phpunit/MobileFormatterTest.php
2 files changed, 12 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend
refs/changes/31/333831/1
diff --git a/phpcs.xml b/phpcs.xml
index d81a292..750e66a 100644
--- a/phpcs.xml
+++ b/phpcs.xml
@@ -5,4 +5,12 @@
vendor
+
+
+
+
+
+
+
+
diff --git a/tests/phpunit/MobileFormatterTest.php
b/tests/phpunit/MobileFormatterTest.php
index 2ddd5b2..d0bb5db 100644
--- a/tests/phpunit/MobileFormatterTest.php
+++ b/tests/phpunit/MobileFormatterTest.php
@@ -17,7 +17,7 @@
* @param integer [$sectionNumber] heading corresponds to
* @return string
*/
- private function makeSectionHeading( $heading, $innerHtml,
$sectionNumber=1 ) {
+ private function makeSectionHeading( $heading, $innerHtml,
$sectionNumber = 1 ) {
return "<$heading class=\"section-heading\""
. "
onclick=\"javascript:mfTempOpenSection($sectionNumber)\">"
. self::SECTION_INDICATOR
@@ -32,7 +32,9 @@
* @param boolean $isReferenceSection whether the section contains
references
* @return string
*/
- private function makeSectionHtml( $sectionNumber, $contentHtml='',
$isReferenceSection=false ) {
+ private function makeSectionHtml( $sectionNumber, $contentHtml = '',
+ $isReferenceSection = false
+ ) {
$attrs = $isReferenceSection ? ' data-is-reference-section="1"'
: '';
$className = "mf-section-$sectionNumber";
--
To view, visit https://gerrit.wikimedia.org/r/333831
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I7d0e1a43f45f42e279f05e78f56749b2aa643fe1
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Niedzielski
Gerrit-Reviewer: Sniedzielski
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: aptrepo:rsync: fix 'Invalid relationship' and ferm syntax
Dzahn has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/333830 )
Change subject: aptrepo:rsync: fix 'Invalid relationship' and ferm syntax
..
aptrepo:rsync: fix 'Invalid relationship' and ferm syntax
Can't absent the rsync fragment when rsync server is not in catalog.
"Invalid relationship"
Do not add /32 in ferm rule. wrong syntax.
Change-Id: I5a452c3e7349bffc0ee9ed8a42e8a001e268bf2d
---
M modules/aptrepo/manifests/rsync.pp
1 file changed, 9 insertions(+), 8 deletions(-)
Approvals:
jenkins-bot: Verified
Dzahn: Looks good to me, approved
diff --git a/modules/aptrepo/manifests/rsync.pp
b/modules/aptrepo/manifests/rsync.pp
index 56aad73..b56ffd7 100644
--- a/modules/aptrepo/manifests/rsync.pp
+++ b/modules/aptrepo/manifests/rsync.pp
@@ -6,8 +6,16 @@
# only activate rsync/firewall hole on the server that is NOT active
if $::fqdn != $primary_server {
+
$ensure = 'present'
include rsync::server
+
+rsync::server::module { 'aptrepo-basedir':
+ensure => $aptrepo::rsync::ensure,
+path=> $aptrepo::basedir,
+read_only => 'no',
+hosts_allow => "@resolve(${primary_server})",
+}
} else {
$ensure = 'absent'
}
@@ -16,13 +24,6 @@
ensure => $aptrepo::rsync::ensure,
proto => 'tcp',
port => '873',
-srange => "@resolve(${primary_server})/32",
-}
-
-rsync::server::module { 'aptrepo-basedir':
-ensure => $aptrepo::rsync::ensure,
-path=> $aptrepo::basedir,
-read_only => 'no',
-hosts_allow => "@resolve(${primary_server})",
+srange => "@resolve(${primary_server})",
}
}
--
To view, visit https://gerrit.wikimedia.org/r/333830
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I5a452c3e7349bffc0ee9ed8a42e8a001e268bf2d
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn
Gerrit-Reviewer: Dzahn
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]: aptrepo:rsync: fix 'Invalid relationship' and ferm syntax
Dzahn has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/333830 )
Change subject: aptrepo:rsync: fix 'Invalid relationship' and ferm syntax
..
aptrepo:rsync: fix 'Invalid relationship' and ferm syntax
Can't absent the rsync fragment when rsync server is not in catalog.
"Invalid relationship"
Do not add /32 in ferm rule. wrong syntax.
Change-Id: I5a452c3e7349bffc0ee9ed8a42e8a001e268bf2d
---
M modules/aptrepo/manifests/rsync.pp
1 file changed, 9 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/30/333830/1
diff --git a/modules/aptrepo/manifests/rsync.pp
b/modules/aptrepo/manifests/rsync.pp
index 56aad73..e3059d8 100644
--- a/modules/aptrepo/manifests/rsync.pp
+++ b/modules/aptrepo/manifests/rsync.pp
@@ -6,8 +6,16 @@
# only activate rsync/firewall hole on the server that is NOT active
if $::fqdn != $primary_server {
+
$ensure = 'present'
include rsync::server
+
+rsync::server::module { 'aptrepo-basedir':
+ensure => $aptrepo::rsync::ensure,
+path=> $aptrepo::basedir,
+read_only => 'no',
+hosts_allow => "@resolve(${primary_server})",
+}
} else {
$ensure = 'absent'
}
@@ -16,7 +24,7 @@
ensure => $aptrepo::rsync::ensure,
proto => 'tcp',
port => '873',
-srange => "@resolve(${primary_server})/32",
+srange => "@resolve(${primary_server})",
}
rsync::server::module { 'aptrepo-basedir':
--
To view, visit https://gerrit.wikimedia.org/r/333830
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I5a452c3e7349bffc0ee9ed8a42e8a001e268bf2d
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]: aptrepo: setup rsync between 2 APT servers
Dzahn has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/333676 )
Change subject: aptrepo: setup rsync between 2 APT servers
..
aptrepo: setup rsync between 2 APT servers
So far we just have a single APT repo, apt.wikimedia.org
points to carbon.
But we want to retire carbon and replace it fully with 2 servers,
one per each DC, install1001 and install2001.
As a first step one of them will be the "live" server
that DNS points to and the other one will be warm stand-by.
To ensure it is "warm" we setup rsyncd to keep /srv/wikimedia
with the actual package data in sync between the 2 servers.
For this we put rsyncd on the target, the one that is NOT live,
and add a firewall hole to allow connections from the source,
the live server, which pushes data to the failover server.
Decide which server is which with a simple switch in Hiera.
Bug: T84380
Bug: T132757
Change-Id: Idd9c51f93b8cb46a7f00fa44f9061ff5a8e133cb
---
M hieradata/common.yaml
A modules/aptrepo/manifests/rsync.pp
M modules/role/manifests/aptrepo/wikimedia.pp
3 files changed, 30 insertions(+), 0 deletions(-)
Approvals:
jenkins-bot: Verified
Dzahn: Looks good to me, approved
diff --git a/hieradata/common.yaml b/hieradata/common.yaml
index a5a7925..f950a80 100644
--- a/hieradata/common.yaml
+++ b/hieradata/common.yaml
@@ -452,3 +452,4 @@
id: 2003
deployment_server: tin.eqiad.wmnet
+install_server: install1001.wikimedia.org
diff --git a/modules/aptrepo/manifests/rsync.pp
b/modules/aptrepo/manifests/rsync.pp
new file mode 100644
index 000..56aad73
--- /dev/null
+++ b/modules/aptrepo/manifests/rsync.pp
@@ -0,0 +1,28 @@
+# sets up rsync of APT repos between 2 servers
+# activates rsync for push from the primary to secondary
+class aptrepo::rsync {
+
+$primary_server = hiera('install_server', 'install1001.wikimedia.org')
+
+# only activate rsync/firewall hole on the server that is NOT active
+if $::fqdn != $primary_server {
+$ensure = 'present'
+include rsync::server
+} else {
+$ensure = 'absent'
+}
+
+ferm::service { 'aptrepo-rsync':
+ensure => $aptrepo::rsync::ensure,
+proto => 'tcp',
+port => '873',
+srange => "@resolve(${primary_server})/32",
+}
+
+rsync::server::module { 'aptrepo-basedir':
+ensure => $aptrepo::rsync::ensure,
+path=> $aptrepo::basedir,
+read_only => 'no',
+hosts_allow => "@resolve(${primary_server})",
+}
+}
diff --git a/modules/role/manifests/aptrepo/wikimedia.pp
b/modules/role/manifests/aptrepo/wikimedia.pp
index 73f401d..b5a78fd 100644
--- a/modules/role/manifests/aptrepo/wikimedia.pp
+++ b/modules/role/manifests/aptrepo/wikimedia.pp
@@ -22,4 +22,5 @@
include role::backup::host
backup::set { 'srv-wikimedia': }
+include aptrepo::rsync
}
--
To view, visit https://gerrit.wikimedia.org/r/333676
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Idd9c51f93b8cb46a7f00fa44f9061ff5a8e133cb
Gerrit-PatchSet: 15
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn
Gerrit-Reviewer: Dzahn
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...vendor[master]: Remove Stomp, update other libraries
Ejegg has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/333829 ) Change subject: Remove Stomp, update other libraries .. Remove Stomp, update other libraries Change-Id: I22cca38819c8f608e113ca378a9e56d99638c0e7 --- M coderkungfu/php-queue/src/PHPQueue/Backend/PDO.php M coderkungfu/php-queue/src/PHPQueue/Backend/Predis.php A coderkungfu/php-queue/src/PHPQueue/Exception/JsonException.php A coderkungfu/php-queue/src/PHPQueue/Json.php M coderkungfu/php-queue/test/PHPQueue/Backend/PredisTest.php M composer/LICENSE M composer/autoload_classmap.php M composer/autoload_files.php M composer/autoload_namespaces.php M composer/autoload_psr4.php M composer/installed.json D fusesource/stomp-php/.gitignore D fusesource/stomp-php/.travis.yml D fusesource/stomp-php/README.md D fusesource/stomp-php/build.xml D fusesource/stomp-php/composer.json D fusesource/stomp-php/examples/activemq-connectivity.xml D fusesource/stomp-php/examples/activemq-security.xml D fusesource/stomp-php/examples/binary.php D fusesource/stomp-php/examples/connectivity.php D fusesource/stomp-php/examples/durable.php D fusesource/stomp-php/examples/first.php D fusesource/stomp-php/examples/security.php D fusesource/stomp-php/examples/transactions.php D fusesource/stomp-php/examples/transformation.php D fusesource/stomp-php/phpunit.xml D fusesource/stomp-php/src/FuseSource/Stomp/Exception/StompException.php D fusesource/stomp-php/src/FuseSource/Stomp/ExceptionInterface.php D fusesource/stomp-php/src/FuseSource/Stomp/Frame.php D fusesource/stomp-php/src/FuseSource/Stomp/Message.php D fusesource/stomp-php/src/FuseSource/Stomp/Message/Bytes.php D fusesource/stomp-php/src/FuseSource/Stomp/Message/Map.php D fusesource/stomp-php/src/FuseSource/Stomp/Stomp.php D fusesource/stomp-php/tests/bootstrap.php D fusesource/stomp-php/tests/functional/StompASyncTest.php D fusesource/stomp-php/tests/functional/StompFailoverTest.php D fusesource/stomp-php/tests/functional/StompRabbitTest.php D fusesource/stomp-php/tests/functional/StompSslTest.php D fusesource/stomp-php/tests/functional/StompSyncTest.php D fusesource/stomp-php/tests/functional/StompTest.php D fusesource/stomp-php/tests/stubbed/StompUnitTest.php D fusesource/stomp-php/tests/stubbed/fusesource_stream_function_stubs.php D fusesource/stomp-php/travisci/bin/ci/install_dependencies.sh D fusesource/stomp-php/travisci/conf/amq/activemq.xml M minfraud/http/Changes M minfraud/http/README.md M minfraud/http/composer.json M minfraud/http/examples/minfraud.php M minfraud/http/src/HTTPBase.php M psr/log/Psr/Log/AbstractLogger.php M psr/log/Psr/Log/LogLevel.php M psr/log/Psr/Log/LoggerAwareInterface.php A psr/log/Psr/Log/LoggerAwareTrait.php M psr/log/Psr/Log/LoggerInterface.php A psr/log/Psr/Log/LoggerTrait.php M psr/log/Psr/Log/NullLogger.php M psr/log/Psr/Log/Test/LoggerInterfaceTest.php M psr/log/composer.json M symfony/event-dispatcher/Event.php M symfony/event-dispatcher/EventDispatcher.php M symfony/event-dispatcher/GenericEvent.php M symfony/event-dispatcher/LICENSE M symfony/event-dispatcher/Tests/ContainerAwareEventDispatcherTest.php M symfony/event-dispatcher/Tests/Debug/TraceableEventDispatcherTest.php M symfony/event-dispatcher/Tests/DependencyInjection/RegisterListenersPassTest.php M symfony/event-dispatcher/Tests/ImmutableEventDispatcherTest.php M symfony/http-foundation/AcceptHeader.php M symfony/http-foundation/AcceptHeaderItem.php M symfony/http-foundation/BinaryFileResponse.php M symfony/http-foundation/Cookie.php M symfony/http-foundation/File/File.php M symfony/http-foundation/File/MimeType/ExtensionGuesser.php M symfony/http-foundation/File/MimeType/FileinfoMimeTypeGuesser.php M symfony/http-foundation/File/MimeType/MimeTypeGuesser.php M symfony/http-foundation/JsonResponse.php M symfony/http-foundation/LICENSE M symfony/http-foundation/RedirectResponse.php M symfony/http-foundation/Request.php M symfony/http-foundation/RequestMatcher.php M symfony/http-foundation/Response.php M symfony/http-foundation/Session/Storage/Handler/MemcacheSessionHandler.php M symfony/http-foundation/StreamedResponse.php M symfony/http-foundation/Tests/CookieTest.php M symfony/http-foundation/Tests/File/FileTest.php M symfony/http-foundation/Tests/JsonResponseTest.php M symfony/http-foundation/Tests/RequestTest.php M symfony/http-foundation/Tests/ResponseHeaderBagTest.php M symfony/http-foundation/Tests/ResponseTest.php M symfony/http-foundation/Tests/Session/Storage/Handler/MemcacheSessionHandlerTest.php M symfony/http-foundation/Tests/Session/Storage/Handler/MemcachedSessionHandlerTest.php M symfony/http-foundation/Tests/Session/Storage/Handler/PdoSessionHandlerTest.php M symfony/http-foundation/Tests/Session/Storage/Handler/WriteCheckSessionHandlerTest.php M symfony/http-foundation/Tests/Session/Storage/Proxy/SessionHandlerProxyTest.php M symfony/polyfill-mbstring/Mbstring.php M symfony/polyfill-mbstring/bootstrap.php M
[MediaWiki-commits] [Gerrit] mediawiki...parsoid[master]: Shadow href w/ the original value, not the current one
Arlolra has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/333828 )
Change subject: Shadow href w/ the original value, not the current one
..
Shadow href w/ the original value, not the current one
* Follow up to fa6906a1 to fix all the regressions in rt.
Change-Id: Ieaf91b6622981b5ed6153d6c383aa66c044393f4
---
M lib/wt2html/tt/Sanitizer.js
M tests/parserTests.txt
2 files changed, 15 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/parsoid
refs/changes/28/333828/1
diff --git a/lib/wt2html/tt/Sanitizer.js b/lib/wt2html/tt/Sanitizer.js
index 9917933..f70541d 100644
--- a/lib/wt2html/tt/Sanitizer.js
+++ b/lib/wt2html/tt/Sanitizer.js
@@ -666,13 +666,14 @@
}
var hrefKV = Util.lookupKV(token.attribs, 'href');
if (hrefKV !== null) {
- var origHref = hrefKV.v;
+ var origHref = token.getAttributeShadowInfo('href').value;
+ var curVal = hrefKV.v;
console.assert(typeof origHref === 'string');
- var newHref = Sanitizer.cleanUrl(this.manager.env, origHref);
+ var newHref = Sanitizer.cleanUrl(this.manager.env, curVal);
if (newHref === null) {
token.removeAttribute('href');
token.setShadowInfo('href', newHref, origHref);
- } else if (newHref !== origHref) {
+ } else if (newHref !== curVal) {
hrefKV.v = newHref;
token.setShadowInfo('href', newHref, origHref);
}
diff --git a/tests/parserTests.txt b/tests/parserTests.txt
index 6f66257..757c27d 100644
--- a/tests/parserTests.txt
+++ b/tests/parserTests.txt
@@ -7853,6 +7853,17 @@
!! end
!! test
+Link containing double quotes and spaces
+!! wikitext
+[[Cool "Gator"]]
+!! html/php
+Cool
"Gator"
+
+!! html/parsoid
+Cool
"Gator"
+!! end
+
+!! test
Link containing double-single-quotes '' in text (bug 4598 sanity check)
!! wikitext
Some [[Link|pretty ''italics'' and stuff]]!
--
To view, visit https://gerrit.wikimedia.org/r/333828
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ieaf91b6622981b5ed6153d6c383aa66c044393f4
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] oojs/ui[master]: Follow-up d21cf8a: unbreak popups with no $floatableContainer
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/333821 )
Change subject: Follow-up d21cf8a: unbreak popups with no $floatableContainer
..
Follow-up d21cf8a: unbreak popups with no $floatableContainer
* Prevent positioning from being enabled for popups with no
$floatableContainer due to true&&undefined === undefined
* Prevent JS error in togglePositioning when $floatableContainer
is not set
Change-Id: I5de8d4d40ee5ac945695204200c1d5dc1595fd93
---
M src/mixins/FloatableElement.js
M src/widgets/PopupWidget.js
2 files changed, 5 insertions(+), 1 deletion(-)
Approvals:
Prtksxna: Looks good to me, approved
jenkins-bot: Verified
diff --git a/src/mixins/FloatableElement.js b/src/mixins/FloatableElement.js
index ced8660..2fae3a2 100644
--- a/src/mixins/FloatableElement.js
+++ b/src/mixins/FloatableElement.js
@@ -79,6 +79,10 @@
OO.ui.mixin.FloatableElement.prototype.togglePositioning = function (
positioning ) {
var closestScrollableOfContainer;
+ if ( !this.$floatable || !this.$floatableContainer ) {
+ return this;
+ }
+
positioning = positioning === undefined ? !this.positioning :
!!positioning;
if ( this.positioning !== positioning ) {
diff --git a/src/widgets/PopupWidget.js b/src/widgets/PopupWidget.js
index 5aa33b4..23d6dc8 100644
--- a/src/widgets/PopupWidget.js
+++ b/src/widgets/PopupWidget.js
@@ -256,7 +256,7 @@
OO.ui.PopupWidget.parent.prototype.toggle.call( this, show );
if ( change ) {
- this.togglePositioning( show && this.$floatableContainer );
+ this.togglePositioning( show && !!this.$floatableContainer );
if ( show ) {
if ( this.autoClose ) {
--
To view, visit https://gerrit.wikimedia.org/r/333821
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I5de8d4d40ee5ac945695204200c1d5dc1595fd93
Gerrit-PatchSet: 1
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: Catrope
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] wikimedia...crm[master]: Update libraries (no more Stomp!)
Ejegg has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/333827 )
Change subject: Update libraries (no more Stomp!)
..
Update libraries (no more Stomp!)
Change-Id: Ie4469b95afa8ba721783737ffaff856131593004
---
M composer.lock
1 file changed, 111 insertions(+), 154 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm
refs/changes/27/333827/1
diff --git a/composer.lock b/composer.lock
index f2f8e19..0f07766 100644
--- a/composer.lock
+++ b/composer.lock
@@ -93,7 +93,7 @@
"source": {
"type": "git",
"url":
"https://gerrit.wikimedia.org/r/p/wikimedia/fundraising/php-queue.git";,
-"reference": "14198ba1f7d4868933649a85621a3955965e83cd"
+"reference": "d56c5bd69dad595f2e00a3e10c851736b1feb57b"
},
"require": {
"clio/clio": "0.1.*",
@@ -149,7 +149,7 @@
"queue",
"transaction"
],
-"time": "2016-08-05 19:16:32"
+"time": "2017-01-04 21:01:15"
},
{
"name": "cogpowered/finediff",
@@ -203,56 +203,6 @@
"time": "2014-05-19 10:25:02"
},
{
-"name": "fusesource/stomp-php",
-"version": "2.1.1",
-"source": {
-"type": "git",
-"url": "https://github.com/dejanb/stomp-php.git";,
-"reference": "4ac51c0abee05078e198faf13f48c056a72f8f8c"
-},
-"dist": {
-"type": "zip",
-"url":
"https://api.github.com/repos/dejanb/stomp-php/zipball/4ac51c0abee05078e198faf13f48c056a72f8f8c";,
-"reference": "4ac51c0abee05078e198faf13f48c056a72f8f8c",
-"shasum": ""
-},
-"require": {
-"php": ">=5.3.0"
-},
-"type": "library",
-"autoload": {
-"psr-0": {
-"FuseSource": "src/"
-}
-},
-"notification-url": "https://packagist.org/downloads/";,
-"license": [
-"Apache-2.0"
-],
-"authors": [
-{
-"name": "Dejan Bosnanac",
-"email": "de...@nighttale.net",
-"homepage": "http://www.nighttale.net";
-},
-{
-"name": "Sören Rohweder",
-"email": "s.rohwe...@blage.net",
-"homepage": "http://www.monofone.de";
-}
-],
-"description": "stomp support for PHP",
-"homepage": "http://github.com/dejanb/stomp-php";,
-"keywords": [
-"activeMQ",
-"jms",
-"messaging",
-"stomp"
-],
-"abandoned": "stomp-php/stomp-php",
-"time": "2013-02-23 17:34:44"
-},
-{
"name": "ircmaxell/password-compat",
"version": "v1.0.4",
"source": {
@@ -296,23 +246,22 @@
},
{
"name": "minfraud/http",
-"version": "v1.70",
+"version": "v1.71",
"source": {
"type": "git",
"url": "https://github.com/maxmind/ccfd-api-php.git";,
-"reference": "941e9345f9c237a253be8b908ecef951698a1a99"
+"reference": "5f6c2a5454e755f1c56be17a1fc0c97576ff010e"
},
"dist": {
"type": "zip",
-"url":
"https://api.github.com/repos/maxmind/ccfd-api-php/zipball/941e9345f9c237a253be8b908ecef951698a1a99";,
-"reference": "941e9345f9c237a253be8b908ecef951698a1a99",
+"url":
"https://api.github.com/repos/maxmind/ccfd-api-php/zipball/5f6c2a5454e755f1c56be17a1fc0c97576ff010e";,
+"reference": "5f6c2a5454e755f1c56be17a1fc0c97576ff010e",
"shasum": ""
},
"type": "library",
"autoload": {
-"files": [
-"src/HTTPBase.php",
-"src/CreditCardFraudDetection.php"
+"classmap": [
+"src"
]
},
"notification-url": "https://packagist.org/downloads/";,
@@ -333,7 +282,7 @@
"maxmind",
"minfraud"
],
-"time": "2015-07-21 14:49:48"
+"time": "2016-10-13 14:35:01"
},
{
"name": "monolog/monolog",
@@ -659,22 +608,30 @@
},
{
"name": "psr/log",
-"version": "1.0.0",
+"version": "1.0.2",
"source": {
"type": "git",
"url": "https://github.com/ph
[MediaWiki-commits] [Gerrit] mediawiki...Nimbus[master]: Remove unused wgSupress* globals
SamanthaNguyen has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/333826 )
Change subject: Remove unused wgSupress* globals
..
Remove unused wgSupress* globals
Bug: T143145
Change-Id: I6897d4bae642259d50f8c2f088c45045e85d94b4
---
M Nimbus.skin.php
M nimbus/Nimbus.css
M skin.json
3 files changed, 5 insertions(+), 44 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/Nimbus
refs/changes/26/333826/1
diff --git a/Nimbus.skin.php b/Nimbus.skin.php
index 628ac37..4c019f6 100644
--- a/Nimbus.skin.php
+++ b/Nimbus.skin.php
@@ -63,40 +63,6 @@
public $skin;
/**
-* Should we show the page title (the HTML element) for the current
-* page or not?
-*
-* @see /skins/Games/Games.skin.php, GamesTemplate::pageTitle()
-*
-* @return bool
-*/
- function showPageTitle() {
- global $wgSupressPageTitle;
-
- $nsArray = array();
- // Suppress page title on NS_USER when SocialProfile ext. is
installed
- if ( class_exists( 'UserProfile' ) ) {
- $nsArray[] = NS_USER;
- }
- // Also suppress page titles on social profiles (for users
whose "main"
- // user page is the wiki-style page)
- if ( defined( 'NS_USER_PROFILE' ) ) {
- $nsArray[] = NS_USER_PROFILE;
- }
- // Finally do the opposite to the above for users whose main
user page
- // is their social profile
- if ( defined( 'NS_USER_WIKI' ) ) {
- $nsArray[] = NS_USER_WIKI;
- }
-
- // Strangely enough this does *not* cause any errors even if
$nsArray
- // is empty...I was sure it'd cause one.
- $nsCheck = !in_array( $this->skin->getTitle()->getNamespace(),
$nsArray );
-
- return (bool) ( !$wgSupressPageTitle && $nsCheck );
- }
-
- /**
* Template filter callback for Nimbus skin.
* Takes an associative array of data set from a SkinTemplate-based
* class, and a wrapper for MediaWiki's localization database, and
@@ -104,7 +70,7 @@
*/
public function execute() {
global $wgContLang, $wgLogo, $wgOut, $wgStylePath;
- global $wgLangToCentralMap, $wgSupressSubTitle,
$wgSupressPageCategories;
+ global $wgLangToCentralMap;
global $wgUserLevels;
$this->skin = $this->data['skin'];
@@ -305,15 +271,15 @@
data['sitenotice'] ) { ?>html( 'sitenotice' ) ?>
- showPageTitle() ) {
?>html( 'title' ) ?>
- msg( 'tagline' ) ?>
+ html( 'title' ) ?>
+ msg(
'tagline' ) ?>
html(
'userlangattributes' ) ?>>html( 'subtitle' ) ?>
data['undelete'] ) {
?>html( 'undelete' ) ?>
data['newtalk'] ) {
?>html( 'newtalk' ) ?>
html( 'bodytext' ) ?>
html( 'debughtml' ); ?>
- data['catlinks'] &&
!$wgSupressPageCategories ) { $this->html( 'catlinks' ); } ?>
+ data['catlinks'] ) {
$this->html( 'catlinks' ); } ?>
data['dataAfterContent'] ) { $this->html( 'dataAfterContent' ); } ?>
diff --git a/nimbus/Nimbus.css b/nimbus/Nimbus.css
index e98ae90..d28c7d2 100644
--- a/nimbus/Nimbus.css
+++ b/nimbus/Nimbus.css
@@ -48,11 +48,6 @@
color: #36b;
}
-/* Hide [[MediaWiki:Tagline]] by default, just like how MonoBook & friends do
it */
-p.subtitle {
- display: none;
-}
-
/* Styling for [[MediaWiki:Noarticletext]], the message shown on nonexistent
pages */
div.noarticletext {
border: 1px solid #ccc;
diff --git a/skin.json b/skin.json
index 281b886..aeddf42 100644
--- a/skin.json
+++ b/skin.json
@@ -1,6 +1,6 @@
{
"name": "Nimbus",
- "version": "3.3",
+ "version": "3.4",
"author": [
"Aaron Wright",
"David Pean",
--
To view, visit https://gerrit.wikimedia.org/r/333826
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I6897d4bae642259d50f8c2f088c45045e85d94b4
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/Nimbus
Gerrit-Branch: master
Gerrit-Owner: SamanthaNguyen
___
[MediaWiki-commits] [Gerrit] operations/puppet[production]: gerrit/lists/microsite/rolematcher: fix "rysnc", "wikimeda" ...
Dzahn has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/333825 )
Change subject: gerrit/lists/microsite/rolematcher: fix "rysnc", "wikimeda"
typos
..
gerrit/lists/microsite/rolematcher: fix "rysnc", "wikimeda" typos
Change-Id: I8a0efd847aa2ac8c854ba0f01a24d2bc6a4057b0
---
M modules/role/manifests/gerrit/migration.pp
M modules/role/manifests/lists/migration.pp
M modules/role/manifests/microsites/peopleweb/migration.pp
M modules/udp2log/files/rolematcher.py
4 files changed, 4 insertions(+), 4 deletions(-)
Approvals:
jenkins-bot: Verified
Dzahn: Looks good to me, approved
diff --git a/modules/role/manifests/gerrit/migration.pp
b/modules/role/manifests/gerrit/migration.pp
index a9987b9..b328218 100644
--- a/modules/role/manifests/gerrit/migration.pp
+++ b/modules/role/manifests/gerrit/migration.pp
@@ -2,7 +2,7 @@
$sourceip='208.80.154.82'
-ferm::service { 'gerrit-migration-rysnc':
+ferm::service { 'gerrit-migration-rsync':
proto => 'tcp',
port => '873',
srange => "${sourceip}/32",
diff --git a/modules/role/manifests/lists/migration.pp
b/modules/role/manifests/lists/migration.pp
index fdb4937..f1d5694 100644
--- a/modules/role/manifests/lists/migration.pp
+++ b/modules/role/manifests/lists/migration.pp
@@ -9,7 +9,7 @@
port => '80',
}
-ferm::service { 'mailman-migration-rysnc':
+ferm::service { 'mailman-migration-rsync':
proto => 'tcp',
port => '873',
srange => "${sourceip}/32",
diff --git a/modules/role/manifests/microsites/peopleweb/migration.pp
b/modules/role/manifests/microsites/peopleweb/migration.pp
index e1c980f..5ded8b6 100644
--- a/modules/role/manifests/microsites/peopleweb/migration.pp
+++ b/modules/role/manifests/microsites/peopleweb/migration.pp
@@ -4,7 +4,7 @@
$sourceip='10.64.32.13'
-ferm::service { 'peopleweb-migration-rysnc':
+ferm::service { 'peopleweb-migration-rsync':
proto => 'tcp',
port => '873',
srange => "${sourceip}/32",
diff --git a/modules/udp2log/files/rolematcher.py
b/modules/udp2log/files/rolematcher.py
index ac02b86..52bb03e 100644
--- a/modules/udp2log/files/rolematcher.py
+++ b/modules/udp2log/files/rolematcher.py
@@ -4,7 +4,7 @@
'''
This script parses the packet-loss.log file and for each server entry
it determines what it's role is. Server role data has been obtained
-from noc.wikimeda.org/pybal and can either be downloaded or the
+from noc.wikimedia.org/pybal and can either be downloaded or the
hard-coded version can be used.
Purpose of this script is to use it in conjunction with
--
To view, visit https://gerrit.wikimedia.org/r/333825
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I8a0efd847aa2ac8c854ba0f01a24d2bc6a4057b0
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn
Gerrit-Reviewer: Dzahn
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/core[master]: Pass the right username to 'tool-link-userrights' / 'tool-li...
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/333680 ) Change subject: Pass the right username to 'tool-link-userrights' / 'tool-link-userrights-readonly' .. Pass the right username to 'tool-link-userrights' / 'tool-link-userrights-readonly' Change-Id: Iba2e41942352b834acb4ecd0781313ae522c25c4 --- M includes/skins/SkinTemplate.php 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Legoktm: Looks good to me, approved jenkins-bot: Verified diff --git a/includes/skins/SkinTemplate.php b/includes/skins/SkinTemplate.php index 575a9ac..1a4554f 100644 --- a/includes/skins/SkinTemplate.php +++ b/includes/skins/SkinTemplate.php @@ -1326,7 +1326,7 @@ $nav_urls['userrights'] = [ 'text' => $this->msg( $canChange ? 'tool-link-userrights' : 'tool-link-userrights-readonly', - $this->getUser()->getName() + $rootUser )->text(), 'href' => self::makeSpecialUrlSubpage( 'Userrights', $rootUser ) ]; -- To view, visit https://gerrit.wikimedia.org/r/333680 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iba2e41942352b834acb4ecd0781313ae522c25c4 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Bartosz Dziewoński Gerrit-Reviewer: Jack Phoenix Gerrit-Reviewer: Jackmcbarn Gerrit-Reviewer: Legoktm Gerrit-Reviewer: Nikerabbit Gerrit-Reviewer: TTO 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]: typos: fix "rysnc", "wikimeda"
Dzahn has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/333825 )
Change subject: typos: fix "rysnc", "wikimeda"
..
typos: fix "rysnc", "wikimeda"
Change-Id: I8a0efd847aa2ac8c854ba0f01a24d2bc6a4057b0
---
M modules/role/manifests/gerrit/migration.pp
M modules/role/manifests/lists/migration.pp
M modules/role/manifests/microsites/peopleweb/migration.pp
M modules/udp2log/files/rolematcher.py
4 files changed, 4 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/25/333825/1
diff --git a/modules/role/manifests/gerrit/migration.pp
b/modules/role/manifests/gerrit/migration.pp
index a9987b9..b328218 100644
--- a/modules/role/manifests/gerrit/migration.pp
+++ b/modules/role/manifests/gerrit/migration.pp
@@ -2,7 +2,7 @@
$sourceip='208.80.154.82'
-ferm::service { 'gerrit-migration-rysnc':
+ferm::service { 'gerrit-migration-rsync':
proto => 'tcp',
port => '873',
srange => "${sourceip}/32",
diff --git a/modules/role/manifests/lists/migration.pp
b/modules/role/manifests/lists/migration.pp
index fdb4937..f1d5694 100644
--- a/modules/role/manifests/lists/migration.pp
+++ b/modules/role/manifests/lists/migration.pp
@@ -9,7 +9,7 @@
port => '80',
}
-ferm::service { 'mailman-migration-rysnc':
+ferm::service { 'mailman-migration-rsync':
proto => 'tcp',
port => '873',
srange => "${sourceip}/32",
diff --git a/modules/role/manifests/microsites/peopleweb/migration.pp
b/modules/role/manifests/microsites/peopleweb/migration.pp
index e1c980f..5ded8b6 100644
--- a/modules/role/manifests/microsites/peopleweb/migration.pp
+++ b/modules/role/manifests/microsites/peopleweb/migration.pp
@@ -4,7 +4,7 @@
$sourceip='10.64.32.13'
-ferm::service { 'peopleweb-migration-rysnc':
+ferm::service { 'peopleweb-migration-rsync':
proto => 'tcp',
port => '873',
srange => "${sourceip}/32",
diff --git a/modules/udp2log/files/rolematcher.py
b/modules/udp2log/files/rolematcher.py
index ac02b86..52bb03e 100644
--- a/modules/udp2log/files/rolematcher.py
+++ b/modules/udp2log/files/rolematcher.py
@@ -4,7 +4,7 @@
'''
This script parses the packet-loss.log file and for each server entry
it determines what it's role is. Server role data has been obtained
-from noc.wikimeda.org/pybal and can either be downloaded or the
+from noc.wikimedia.org/pybal and can either be downloaded or the
hard-coded version can be used.
Purpose of this script is to use it in conjunction with
--
To view, visit https://gerrit.wikimedia.org/r/333825
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I8a0efd847aa2ac8c854ba0f01a24d2bc6a4057b0
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] oojs/ui[master]: demo: Fix vertical spacing in icons demo
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/333727 )
Change subject: demo: Fix vertical spacing in icons demo
..
demo: Fix vertical spacing in icons demo
Follow-up to 0e6c4b89ceeb95f7953bf7933b3c374c51da8cba.
Change-Id: I19875cee0d5c1a747928d56332b7743eb6c54c15
---
M demos/styles/demo.css
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
jenkins-bot: Verified
VolkerE: Looks good to me, approved
diff --git a/demos/styles/demo.css b/demos/styles/demo.css
index 9d5cc5e..282ec1f 100644
--- a/demos/styles/demo.css
+++ b/demos/styles/demo.css
@@ -68,7 +68,7 @@
.oo-ui-demo-icons .oo-ui-fieldLayout {
display: inline-block;
- margin-bottom: 0;
+ margin-top: 0;
}
.oo-ui-demo-icons .oo-ui-fieldLayout .oo-ui-labelElement-label {
--
To view, visit https://gerrit.wikimedia.org/r/333727
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I19875cee0d5c1a747928d56332b7743eb6c54c15
Gerrit-PatchSet: 2
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: Bartosz Dziewoński
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] mediawiki...RemexHtml[master]: Remove XhtmlFormatter and Parser
Tim Starling has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/333824 )
Change subject: Remove XhtmlFormatter and Parser
..
Remove XhtmlFormatter and Parser
They were not fully baked, and are not necessary for present purposes.
Change-Id: I4bb2c989ca131436a52f35df061b85c66091ec6c
---
M bin/test.php
D src/Serializer/XhtmlFormatter.php
D src/TreeBuilder/Parser.php
3 files changed, 5 insertions(+), 134 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/libs/RemexHtml
refs/changes/24/333824/1
diff --git a/bin/test.php b/bin/test.php
index e8a95ce..3708a35 100755
--- a/bin/test.php
+++ b/bin/test.php
@@ -66,17 +66,6 @@
reserializeState( $text, Tokenizer\Tokenizer::STATE_RCDATA, 'xmp' );
}
-function traceDispatch( $text ) {
- TreeBuilder\Parser::parseDocument( $text, [ 'traceDispatch' => true ] );
-}
-
-function traceDOM( $text ) {
- TreeBuilder\Parser::parseDocument( $text, [
- 'traceTreeMutation' => true,
- 'traceDispatch' => true,
- ] );
-}
-
function trace( $text ) {
$traceCallback = function ( $msg ) {
print "$msg\n";
@@ -110,25 +99,6 @@
// 'fragmentNamespace' => \RemexHtml\HTMLData::NS_HTML,
// 'fragmentName' => 'html'
] );
-}
-
-function tidyBodyViaDOM( $text ) {
- $docText = "\n$text";
- $doc = TreeBuilder\Parser::parseDocument( $docText, [] );
- $body = $doc->getElementsByTagName( 'body' )->item( 0 );
- foreach ( $body->childNodes as $node ) {
- print $doc->saveHTML( $node );
- }
- print "\n";
-}
-
-function tidyViaDOM( $text ) {
- $doc = TreeBuilder\Parser::parseDocument( $text, [
- 'treeBuilder' => [
- 'scopeCache' => true,
- ]
- ] );
- print $doc->saveHTML() . "\n";
}
function tidy( $text ) {
@@ -178,12 +148,11 @@
function benchmarkDOM( $text ) {
$time = -microtime( true );
- $dom = TreeBuilder\Parser::parseDocument( $text, [
- 'treeBuilder' => [
- 'ignoreErrors' => true,
- ],
- 'tokenizer' => $GLOBALS['tokenizerOptions']
- ] );
+ $domBuilder = new TreeBuilder\DOMBuilder;
+ $treeBuilder = new TreeBuilder\TreeBuilder( $domBuilder, [
'ignoreErrors' => true ] );
+ $dispatcher = new TreeBuilder\Dispatcher( $treeBuilder );
+ $tokenizer = new Tokenizer\Tokenizer( $dispatcher, $text,
$GLOBALS['tokenizerOptions'] );
+ $tokenizer->execute();
$time += microtime( true );
print "$time\n";
}
diff --git a/src/Serializer/XhtmlFormatter.php
b/src/Serializer/XhtmlFormatter.php
deleted file mode 100644
index 8fc4f42..000
--- a/src/Serializer/XhtmlFormatter.php
+++ /dev/null
@@ -1,48 +0,0 @@
-\n";
- }
-
- public function characters( SerializerNode $parent, $text, $start,
$length ) {
- $text = substr( $text, $start, $length );
- return strtr( $text, [
- '<' => '<',
- '>' => '>',
- '&' => '&' ] );
- }
-
- public function element( SerializerNode $parent, SerializerNode $node,
$contents ) {
- $name = $node->name;
- $ret = "<$name";
- foreach ( $node->attrs->getValues() as $attrName => $value ) {
- $ret .= " $attrName=\"" .
- strtr( $value, [
- '"' => '"',
- '&' => '&',
- ] ) . "\"";
- }
- if ( $contents === null ) {
- $ret .= " />";
- } elseif ( isset( $contents[0] ) && $contents[0] === "\n"
- && in_array( $name, [ 'pre', 'textarea', 'listing' ] )
- ) {
- $ret .= ">\n$contents";
- } else {
- $ret .= ">$contents";
- }
- return $ret;
- }
-
- public function comment( SerializerNode $parent, $text ) {
- return "";
- }
-
- public function doctype( $name, $public, $system ) {
- return '';
- }
-}
diff --git a/src/TreeBuilder/Parser.php b/src/TreeBuilder/Parser.php
deleted file mode 100644
index 871d203..000
--- a/src/TreeBuilder/Parser.php
+++ /dev/null
@@ -1,50 +0,0 @@
- [],
- 'tokenizer' => [],
- 'domBuilder' => [],
- 'traceDispatch' => false,
- 'traceTreeMutation' => false,
- ];
-
- $this->domBuilder = new DOMBuilder( $options['domBuilder'] );
- if ( $options['traceTreeMutation'] ) {
- $treeHandler = new TreeMutationTracer(
$this-
[MediaWiki-commits] [Gerrit] operations/puppet[production]: typos: add rysnc, rsnyc, wikimeda
Dzahn has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/333822 ) Change subject: typos: add rysnc, rsnyc, wikimeda .. typos: add rysnc, rsnyc, wikimeda I _just_ did the "rysnc" thing, and wikimeda is also one i remember more than once. Change-Id: I80de38224afd68519fa13dbeb20acd0e4009dfdd --- M typos 1 file changed, 3 insertions(+), 0 deletions(-) Approvals: Dzahn: Verified; Looks good to me, approved diff --git a/typos b/typos index bd3e6e0..f29d5aa 100644 --- a/typos +++ b/typos @@ -12,6 +12,9 @@ pmpta wikmedia wqds +rysnc +rsnyc +wikimeda (?https://gerrit.wikimedia.org/r/333822 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I80de38224afd68519fa13dbeb20acd0e4009dfdd Gerrit-PatchSet: 2 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Dzahn Gerrit-Reviewer: Dzahn 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...SmashPig[deployment]: Merge branch 'master' into deployment
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/333823 )
Change subject: Merge branch 'master' into deployment
..
Merge branch 'master' into deployment
e93f367 Parse Express Checkout charge
Change-Id: Icb3bb3f4486b509ace163a6b933abbb5bec3f893
---
D PaymentProviders/PayPal/Tests/phpunit/CaptureIncomingMessageTest.php
1 file changed, 0 insertions(+), 197 deletions(-)
Approvals:
jenkins-bot: Verified
Ejegg: Looks good to me, approved
diff --git
a/PaymentProviders/PayPal/Tests/phpunit/CaptureIncomingMessageTest.php
b/PaymentProviders/PayPal/Tests/phpunit/CaptureIncomingMessageTest.php
deleted file mode 100644
index 42eeb73..000
--- a/PaymentProviders/PayPal/Tests/phpunit/CaptureIncomingMessageTest.php
+++ /dev/null
@@ -1,197 +0,0 @@
-<<< HEAD (03880c Fix insecure uncaught exception logging)
-===
- 'verified',
- 'express_checkout.json' => 'verified',
- 'subscr_signup.json' => 'recurring',
- 'subscr_payment.json' => 'recurring',
- 'refund.json' => 'refund',
- 'chargeback_settlement.json' => 'refund',
- // this should not actually get written to
- // TODO 'new_case.json' => 'no-op',
- );
-
- static $messages = array();
-
- public function setUp() {
- parent::setUp();
- $this->config = PayPalTestConfiguration::get();
-
- // php-queue\PDO complains about pop() from non-existent table
- $this->config->object( 'data-store/jobs-paypal' )
- ->createTable( 'jobs-paypal' );
-
- Context::initWithLogger( $this->config );
- foreach ( self::$message_data as $file => $type ) {
- self::$messages[] = array(
- 'type' => $type,
- 'payload' => json_decode(
- file_get_contents( __DIR__ .
'/../Data/' . $file ),
- true
- )
- );
- }
- }
-
- public function tearDown() {
- self::$fail_verification = false;
- self::$paypal_is_broken = false;
- parent::tearDown();
- }
-
- private function capture( $msg ) {
- $request = new Request( $msg );
- $response = new Response;
- $listener = new Listener;
- return $listener->execute( $request, $response );
- }
-
- public function testCapture() {
- foreach ( self::$messages as $msg ) {
-
- $this->capture( $msg['payload'] );
-
- $jobQueue = $this->config->object(
'data-store/jobs-paypal' );
- $jobMessage = $jobQueue->pop();
-
- $this->assertEquals( $jobMessage['php-message-class'],
- 'SmashPig\PaymentProviders\PayPal\Job' );
-
- $this->assertEquals( $jobMessage['payload'],
$msg['payload'] );
- }
- }
-
- public function testBlankMessage() {
- $this->capture( array() );
- $jobQueue = $this->config->object( 'data-store/jobs-paypal' );
- $this->assertNull( $jobQueue->pop() );
- }
-
- public function testConsume() {
- foreach ( self::$messages as $msg ) {
- $this->capture( $msg['payload'] );
-
- $jobQueue = $this->config->object(
'data-store/jobs-paypal' );
- $jobMessage = $jobQueue->pop();
-
- $job = KeyedOpaqueStorableObject::fromJsonProxy(
- $jobMessage['php-message-class'],
- json_encode( $jobMessage )
- );
-
- $job->execute();
-
- $queue = $this->config->object( 'data-store/' .
$msg['type'] );
- $queue->createTable( $msg['type'] );
- $message = $queue->pop();
-
- if ( $job->is_reject() ) {
- $this->assertEmpty( $message );
- } else {
- $this->assertNotEmpty( $message );
- if ( isset(
$message['contribution_tracking_id'] ) ) {
- $this->assertEquals(
$message['contribution_tracking_id'], $message['order_id'] );
- }
-
- if ( isset( $message['supplemental_address_1']
) ) {
- $this->assertNotEquals(
-
$message['supplemental_address_1'],
- "
[MediaWiki-commits] [Gerrit] wikimedia...SmashPig[deployment]: Merge branch 'master' into deployment
Ejegg has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/333823 )
Change subject: Merge branch 'master' into deployment
..
Merge branch 'master' into deployment
e93f367 Parse Express Checkout charge
Change-Id: Icb3bb3f4486b509ace163a6b933abbb5bec3f893
---
D PaymentProviders/PayPal/Tests/phpunit/CaptureIncomingMessageTest.php
1 file changed, 0 insertions(+), 197 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/SmashPig
refs/changes/23/333823/1
diff --git
a/PaymentProviders/PayPal/Tests/phpunit/CaptureIncomingMessageTest.php
b/PaymentProviders/PayPal/Tests/phpunit/CaptureIncomingMessageTest.php
deleted file mode 100644
index 42eeb73..000
--- a/PaymentProviders/PayPal/Tests/phpunit/CaptureIncomingMessageTest.php
+++ /dev/null
@@ -1,197 +0,0 @@
-<<< HEAD (03880c Fix insecure uncaught exception logging)
-===
- 'verified',
- 'express_checkout.json' => 'verified',
- 'subscr_signup.json' => 'recurring',
- 'subscr_payment.json' => 'recurring',
- 'refund.json' => 'refund',
- 'chargeback_settlement.json' => 'refund',
- // this should not actually get written to
- // TODO 'new_case.json' => 'no-op',
- );
-
- static $messages = array();
-
- public function setUp() {
- parent::setUp();
- $this->config = PayPalTestConfiguration::get();
-
- // php-queue\PDO complains about pop() from non-existent table
- $this->config->object( 'data-store/jobs-paypal' )
- ->createTable( 'jobs-paypal' );
-
- Context::initWithLogger( $this->config );
- foreach ( self::$message_data as $file => $type ) {
- self::$messages[] = array(
- 'type' => $type,
- 'payload' => json_decode(
- file_get_contents( __DIR__ .
'/../Data/' . $file ),
- true
- )
- );
- }
- }
-
- public function tearDown() {
- self::$fail_verification = false;
- self::$paypal_is_broken = false;
- parent::tearDown();
- }
-
- private function capture( $msg ) {
- $request = new Request( $msg );
- $response = new Response;
- $listener = new Listener;
- return $listener->execute( $request, $response );
- }
-
- public function testCapture() {
- foreach ( self::$messages as $msg ) {
-
- $this->capture( $msg['payload'] );
-
- $jobQueue = $this->config->object(
'data-store/jobs-paypal' );
- $jobMessage = $jobQueue->pop();
-
- $this->assertEquals( $jobMessage['php-message-class'],
- 'SmashPig\PaymentProviders\PayPal\Job' );
-
- $this->assertEquals( $jobMessage['payload'],
$msg['payload'] );
- }
- }
-
- public function testBlankMessage() {
- $this->capture( array() );
- $jobQueue = $this->config->object( 'data-store/jobs-paypal' );
- $this->assertNull( $jobQueue->pop() );
- }
-
- public function testConsume() {
- foreach ( self::$messages as $msg ) {
- $this->capture( $msg['payload'] );
-
- $jobQueue = $this->config->object(
'data-store/jobs-paypal' );
- $jobMessage = $jobQueue->pop();
-
- $job = KeyedOpaqueStorableObject::fromJsonProxy(
- $jobMessage['php-message-class'],
- json_encode( $jobMessage )
- );
-
- $job->execute();
-
- $queue = $this->config->object( 'data-store/' .
$msg['type'] );
- $queue->createTable( $msg['type'] );
- $message = $queue->pop();
-
- if ( $job->is_reject() ) {
- $this->assertEmpty( $message );
- } else {
- $this->assertNotEmpty( $message );
- if ( isset(
$message['contribution_tracking_id'] ) ) {
- $this->assertEquals(
$message['contribution_tracking_id'], $message['order_id'] );
- }
-
- if ( isset( $message['supplemental_address_1']
) ) {
- $this->assertNotEquals(
-
$message['supplemental_address_1'],
-
[MediaWiki-commits] [Gerrit] mediawiki/core[fundraising/REL1_27]: Update DonationInterface submodule
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/333820 ) Change subject: Update DonationInterface submodule .. Update DonationInterface submodule Change-Id: I9aaf8d4fc1bd015150d74abb3c1896e064573e76 --- M extensions/DonationInterface 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: jenkins-bot: Verified Ejegg: Looks good to me, approved diff --git a/extensions/DonationInterface b/extensions/DonationInterface index e7abdbe..1363912 16 --- a/extensions/DonationInterface +++ b/extensions/DonationInterface @@ -1 +1 @@ -Subproject commit e7abdbefcdca14158e3b4e79beeb5b7e00ab109b +Subproject commit 1363912fccffaaba387a654fd1640cfbcb7435e4 -- To view, visit https://gerrit.wikimedia.org/r/333820 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I9aaf8d4fc1bd015150d74abb3c1896e064573e76 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: fundraising/REL1_27 Gerrit-Owner: Ejegg Gerrit-Reviewer: Awight 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] operations/puppet[production]: typos: add rysnc, rsnyc, wikimeda
Dzahn has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/333822 ) Change subject: typos: add rysnc, rsnyc, wikimeda .. typos: add rysnc, rsnyc, wikimeda I _just_ did the "rysnc" thing, and wikimeda is also one i remember more than once. Change-Id: I80de38224afd68519fa13dbeb20acd0e4009dfdd --- M typos 1 file changed, 3 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/22/333822/1 diff --git a/typos b/typos index bd3e6e0..f29d5aa 100644 --- a/typos +++ b/typos @@ -12,6 +12,9 @@ pmpta wikmedia wqds +rysnc +rsnyc +wikimeda (?https://gerrit.wikimedia.org/r/333822 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I80de38224afd68519fa13dbeb20acd0e4009dfdd 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] oojs/ui[master]: Follow-up d21cf8a: unbreak popups with no $floatableContainer
Catrope has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/333821 )
Change subject: Follow-up d21cf8a: unbreak popups with no $floatableContainer
..
Follow-up d21cf8a: unbreak popups with no $floatableContainer
* Prevent positioning from being enabled for popups with no
$floatableContainer due to true&&undefined === undefined
* Prevent JS error in togglePositioning when $floatableContainer
is not set
Change-Id: I5de8d4d40ee5ac945695204200c1d5dc1595fd93
---
M src/mixins/FloatableElement.js
M src/widgets/PopupWidget.js
2 files changed, 5 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/21/333821/1
diff --git a/src/mixins/FloatableElement.js b/src/mixins/FloatableElement.js
index ced8660..2fae3a2 100644
--- a/src/mixins/FloatableElement.js
+++ b/src/mixins/FloatableElement.js
@@ -79,6 +79,10 @@
OO.ui.mixin.FloatableElement.prototype.togglePositioning = function (
positioning ) {
var closestScrollableOfContainer;
+ if ( !this.$floatable || !this.$floatableContainer ) {
+ return this;
+ }
+
positioning = positioning === undefined ? !this.positioning :
!!positioning;
if ( this.positioning !== positioning ) {
diff --git a/src/widgets/PopupWidget.js b/src/widgets/PopupWidget.js
index 5aa33b4..23d6dc8 100644
--- a/src/widgets/PopupWidget.js
+++ b/src/widgets/PopupWidget.js
@@ -256,7 +256,7 @@
OO.ui.PopupWidget.parent.prototype.toggle.call( this, show );
if ( change ) {
- this.togglePositioning( show && this.$floatableContainer );
+ this.togglePositioning( show && !!this.$floatableContainer );
if ( show ) {
if ( this.autoClose ) {
--
To view, visit https://gerrit.wikimedia.org/r/333821
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I5de8d4d40ee5ac945695204200c1d5dc1595fd93
Gerrit-PatchSet: 1
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: Catrope
___
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 DonationInterface submodule
Ejegg has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/333820 ) Change subject: Update DonationInterface submodule .. Update DonationInterface submodule Change-Id: I9aaf8d4fc1bd015150d74abb3c1896e064573e76 --- M extensions/DonationInterface 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/20/333820/1 diff --git a/extensions/DonationInterface b/extensions/DonationInterface index e7abdbe..1363912 16 --- a/extensions/DonationInterface +++ b/extensions/DonationInterface @@ -1 +1 @@ -Subproject commit e7abdbefcdca14158e3b4e79beeb5b7e00ab109b +Subproject commit 1363912fccffaaba387a654fd1640cfbcb7435e4 -- To view, visit https://gerrit.wikimedia.org/r/333820 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I9aaf8d4fc1bd015150d74abb3c1896e064573e76 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: fundraising/REL1_27 Gerrit-Owner: Ejegg ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...DonationInterface[deployment]: Merge branch 'master' into deployment
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/333819 )
Change subject: Merge branch 'master' into deployment
..
Merge branch 'master' into deployment
And update vendor
ee26441 Localisation updates from https://translatewiki.net.
1e1f15e Check contribution_id before rectifying orphans
974b3ab ProcessResponse no longer needs to be public
0dee6d3 Remove unused form functions
01f1158 Delete unused CyclicalArray
6b42f45 Remove unused base adapter code
184e6a7 Fold getRetryData into mustache error form
e43388c Localisation updates from https://translatewiki.net.
e1cd297 Update default queue backend
4e63748 Remove Stomp requirement, update Composer libraries
Change-Id: Id1af1a2695075dba47e719f9910eeffdf0338350
---
D tests/phpunit/Adapter/GlobalCollect/GlobalCollectOrphanAdapterTest.php
M vendor
2 files changed, 1 insertion(+), 209 deletions(-)
Approvals:
jenkins-bot: Verified
Ejegg: Looks good to me, approved
diff --git
a/tests/phpunit/Adapter/GlobalCollect/GlobalCollectOrphanAdapterTest.php
b/tests/phpunit/Adapter/GlobalCollect/GlobalCollectOrphanAdapterTest.php
deleted file mode 100644
index f1ef314..000
--- a/tests/phpunit/Adapter/GlobalCollect/GlobalCollectOrphanAdapterTest.php
+++ /dev/null
@@ -1,208 +0,0 @@
-<<< HEAD (e7abdb Merge branch 'master' into deployment)
-===
-setMwGlobals( array(
- 'wgGlobalCollectGatewayEnabled' => true,
- 'wgDonationInterfaceAllowedHtmlForms' => array(
- 'cc-vmad' => array(
- 'gateway' => 'globalcollect',
- 'payment_methods' => array('cc' =>
array( 'visa', 'mc', 'amex', 'discover' )),
- 'countries' => array(
- '+' => array( 'US', ),
- ),
- ),
- ),
- ) );
- }
-
- /**
-* @param $name string The name of the test case
-* @param $data array Any parameters read from a dataProvider
-* @param $dataName string|int The name or index of the data set
-*/
- function __construct( $name = null, array $data = array(), $dataName =
'' ) {
- parent::__construct( $name, $data, $dataName );
- $this->testAdapterClass = 'TestingGlobalCollectOrphanAdapter';
- $this->dummy_utm_data = array (
- 'utm_source' => 'dummy_source',
- 'utm_campaign' => 'dummy_campaign',
- 'utm_medium' => 'dummy_medium',
- 'date' => time(),
- );
- }
-
- public function testConstructor() {
-
- $options = $this->getDonorTestData();
- $class = $this->testAdapterClass;
-
- $gateway = $this->getFreshGatewayObject();
-
- $this->assertInstanceOf( $class, $gateway );
-
- $this->verifyNoLogErrors();
- }
-
-
- public function testBatchOrderID_generate() {
-
- //no data on construct, generate Order IDs
- $gateway = $this->getFreshGatewayObject( null, array (
'order_id_meta' => array ( 'generate' => TRUE ) ) );
- $this->assertTrue( $gateway->getOrderIDMeta( 'generate' ), 'The
order_id meta generate setting override is not working properly. Order_id
generation may be broken.' );
- $this->assertNotNull( $gateway->getData_Unstaged_Escaped(
'order_id' ), 'Failed asserting that an absent order id is not left as null,
when generating our own' );
-
- $data = array_merge( $this->getDonorTestData(),
$this->dummy_utm_data );
- $data['order_id'] = '5';
-
- //now, add data and check that we didn't kill the oid. Still
generating.
- $gateway->loadDataAndReInit( $data );
- $this->assertEquals( $gateway->getData_Unstaged_Escaped(
'order_id' ), '5', 'loadDataAndReInit failed to stick OrderID' );
-
- $data['order_id'] = '44';
- $gateway->loadDataAndReInit( $data );
- $this->assertEquals( $gateway->getData_Unstaged_Escaped(
'order_id' ), '44', 'loadDataAndReInit failed to stick OrderID' );
-
- $this->verifyNoLogErrors();
- }
-
- public function testBatchOrderID_no_generate() {
-
- //no data on construct, do not generate Order IDs
- $gateway = $this->getFreshGatewayObject( null, array (
'order_id_meta' => array ( 'generate' => FALSE ) ) );
- $this->assertFalse( $gateway->getOrderIDMeta( 'generate' ),
'The order_id meta generate setting override is not working properly. Deferred
order_id generation may be broken.' );
- $this->assert
[MediaWiki-commits] [Gerrit] search/extra[master]: Workaround timeout limitation
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/328644 )
Change subject: Workaround timeout limitation
..
Workaround timeout limitation
Timeout checks are passive with Lucene, it means that the timeout is
only checked when a doc matches or when we switch to a new segment.
The problem is that the timeout can be very inaccurate when scanning a
large segment where no docs match.
Workaround this issue by a horrible hack:
- Build a fake collector to be able to throw TimeExceededException
(private constructor)
Sadly it is necessary to explicitly tell the source_regex query
to use a timout. It's impossible to determine if a timeout
has been set in the top level search request.
Added some code to prevent the query from being cached.
We'd like to avoid caching partial results.
Bug: T152895
Change-Id: I1ce0378e475bf5c122cb8586916722992f82bed3
---
M
src/main/java/org/wikimedia/search/extra/regex/AcceleratedSourceRegexQuery.java
M src/main/java/org/wikimedia/search/extra/regex/SourceRegexQuery.java
M src/main/java/org/wikimedia/search/extra/regex/SourceRegexQueryBuilder.java
M src/main/java/org/wikimedia/search/extra/regex/SourceRegexQueryParser.java
M
src/main/java/org/wikimedia/search/extra/regex/UnacceleratedSourceRegexQuery.java
M src/test/java/org/wikimedia/search/extra/regex/SourceRegexQueryTest.java
A src/test/java/org/wikimedia/search/extra/regex/TimeoutCheckerTest.java
7 files changed, 302 insertions(+), 17 deletions(-)
Approvals:
EBernhardson: Looks good to me, approved
jenkins-bot: Verified
diff --git
a/src/main/java/org/wikimedia/search/extra/regex/AcceleratedSourceRegexQuery.java
b/src/main/java/org/wikimedia/search/extra/regex/AcceleratedSourceRegexQuery.java
index 097b2ad..0a21c7d 100644
---
a/src/main/java/org/wikimedia/search/extra/regex/AcceleratedSourceRegexQuery.java
+++
b/src/main/java/org/wikimedia/search/extra/regex/AcceleratedSourceRegexQuery.java
@@ -19,7 +19,7 @@
/**
* Accelerated version of the source_regex query.
*/
-@EqualsAndHashCode
+@EqualsAndHashCode( callSuper = true )
class AcceleratedSourceRegexQuery extends UnacceleratedSourceRegexQuery {
private final Query approximation;
@@ -39,11 +39,13 @@
@Override
public Weight createWeight(IndexSearcher searcher, boolean needsScores)
throws IOException {
// Build the approximation based on trigrams
-final Weight approxWeight = approximation.createWeight(searcher,
false);
+// Creating the Weight from the Searcher with needScore:false allows
the searcher to cache our approximation.
+final Weight approxWeight = searcher.createWeight(approximation,
false);
return new ConstantScoreWeight(this) {
// TODO: Get rid of this shared mutable state, we should be able
to use
// the generic timeout system.
private final MutableValueInt inspected = new MutableValueInt();
+private final TimeoutChecker timeoutChecker = new
TimeoutChecker(settings.getTimeout());
@Override
public Scorer scorer(final LeafReaderContext context) throws
IOException {
@@ -51,7 +53,8 @@
if(approxScorer == null) {
return null;
}
-return new ConstantScoreScorer(this, 1f, new
RegexTwoPhaseIterator(approxScorer.iterator(), context, inspected));
+timeoutChecker.nextSegment(context);
+return new ConstantScoreScorer(this, 1f, new
RegexTwoPhaseIterator(approxScorer.iterator(), context, inspected,
timeoutChecker));
}
};
}
@@ -69,5 +72,4 @@
public String toString(String field) {
return "source_regex(accelerated):" + field;
}
-
}
diff --git
a/src/main/java/org/wikimedia/search/extra/regex/SourceRegexQuery.java
b/src/main/java/org/wikimedia/search/extra/regex/SourceRegexQuery.java
index 9b8c612..89501c2 100644
--- a/src/main/java/org/wikimedia/search/extra/regex/SourceRegexQuery.java
+++ b/src/main/java/org/wikimedia/search/extra/regex/SourceRegexQuery.java
@@ -304,6 +304,6 @@
private Locale locale = Locale.ROOT;
private boolean rejectUnaccelerated = false;
private int maxNgramClauses = ExpressionRewriter.MAX_BOOLEAN_CLAUSES;
-
+private long timeout;
}
}
diff --git
a/src/main/java/org/wikimedia/search/extra/regex/SourceRegexQueryBuilder.java
b/src/main/java/org/wikimedia/search/extra/regex/SourceRegexQueryBuilder.java
index 8027483..a1ab943 100644
---
a/src/main/java/org/wikimedia/search/extra/regex/SourceRegexQueryBuilder.java
+++
b/src/main/java/org/wikimedia/search/extra/regex/SourceRegexQueryBuilder.java
@@ -3,6 +3,7 @@
import java.io.IOException;
import java.util.Locale;
+import org.elasticsearch.common.unit.TimeValue;
import org.elasticsearch.common.xcontent.ToXContent;
import org.elasticsearch.common.xconte
[MediaWiki-commits] [Gerrit] mediawiki...DonationInterface[deployment]: Merge branch 'master' into deployment
Ejegg has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/333819 )
Change subject: Merge branch 'master' into deployment
..
Merge branch 'master' into deployment
And update vendor
ee26441 Localisation updates from https://translatewiki.net.
1e1f15e Check contribution_id before rectifying orphans
974b3ab ProcessResponse no longer needs to be public
0dee6d3 Remove unused form functions
01f1158 Delete unused CyclicalArray
6b42f45 Remove unused base adapter code
184e6a7 Fold getRetryData into mustache error form
e43388c Localisation updates from https://translatewiki.net.
e1cd297 Update default queue backend
4e63748 Remove Stomp requirement, update Composer libraries
Change-Id: Id1af1a2695075dba47e719f9910eeffdf0338350
---
D tests/phpunit/Adapter/GlobalCollect/GlobalCollectOrphanAdapterTest.php
M vendor
2 files changed, 1 insertion(+), 209 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/DonationInterface
refs/changes/19/333819/1
diff --git
a/tests/phpunit/Adapter/GlobalCollect/GlobalCollectOrphanAdapterTest.php
b/tests/phpunit/Adapter/GlobalCollect/GlobalCollectOrphanAdapterTest.php
deleted file mode 100644
index f1ef314..000
--- a/tests/phpunit/Adapter/GlobalCollect/GlobalCollectOrphanAdapterTest.php
+++ /dev/null
@@ -1,208 +0,0 @@
-<<< HEAD (e7abdb Merge branch 'master' into deployment)
-===
-setMwGlobals( array(
- 'wgGlobalCollectGatewayEnabled' => true,
- 'wgDonationInterfaceAllowedHtmlForms' => array(
- 'cc-vmad' => array(
- 'gateway' => 'globalcollect',
- 'payment_methods' => array('cc' =>
array( 'visa', 'mc', 'amex', 'discover' )),
- 'countries' => array(
- '+' => array( 'US', ),
- ),
- ),
- ),
- ) );
- }
-
- /**
-* @param $name string The name of the test case
-* @param $data array Any parameters read from a dataProvider
-* @param $dataName string|int The name or index of the data set
-*/
- function __construct( $name = null, array $data = array(), $dataName =
'' ) {
- parent::__construct( $name, $data, $dataName );
- $this->testAdapterClass = 'TestingGlobalCollectOrphanAdapter';
- $this->dummy_utm_data = array (
- 'utm_source' => 'dummy_source',
- 'utm_campaign' => 'dummy_campaign',
- 'utm_medium' => 'dummy_medium',
- 'date' => time(),
- );
- }
-
- public function testConstructor() {
-
- $options = $this->getDonorTestData();
- $class = $this->testAdapterClass;
-
- $gateway = $this->getFreshGatewayObject();
-
- $this->assertInstanceOf( $class, $gateway );
-
- $this->verifyNoLogErrors();
- }
-
-
- public function testBatchOrderID_generate() {
-
- //no data on construct, generate Order IDs
- $gateway = $this->getFreshGatewayObject( null, array (
'order_id_meta' => array ( 'generate' => TRUE ) ) );
- $this->assertTrue( $gateway->getOrderIDMeta( 'generate' ), 'The
order_id meta generate setting override is not working properly. Order_id
generation may be broken.' );
- $this->assertNotNull( $gateway->getData_Unstaged_Escaped(
'order_id' ), 'Failed asserting that an absent order id is not left as null,
when generating our own' );
-
- $data = array_merge( $this->getDonorTestData(),
$this->dummy_utm_data );
- $data['order_id'] = '5';
-
- //now, add data and check that we didn't kill the oid. Still
generating.
- $gateway->loadDataAndReInit( $data );
- $this->assertEquals( $gateway->getData_Unstaged_Escaped(
'order_id' ), '5', 'loadDataAndReInit failed to stick OrderID' );
-
- $data['order_id'] = '44';
- $gateway->loadDataAndReInit( $data );
- $this->assertEquals( $gateway->getData_Unstaged_Escaped(
'order_id' ), '44', 'loadDataAndReInit failed to stick OrderID' );
-
- $this->verifyNoLogErrors();
- }
-
- public function testBatchOrderID_no_generate() {
-
- //no data on construct, do not generate Order IDs
- $gateway = $this->getFreshGatewayObject( null, array (
'order_id_meta' => array ( 'generate' => FALSE ) ) );
- $this->assertFalse( $gateway->getOrderIDMeta( 'generate' ),
'The order_id meta generate setting override is not working properly. Deferred
order_id generation may be broken.' );
-
[MediaWiki-commits] [Gerrit] mediawiki...vendor[master]: Remove Stomp, update other libs
Ejegg has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/333818 ) Change subject: Remove Stomp, update other libs .. Remove Stomp, update other libs Change-Id: Ia7fa9eef072e095a33d0d46ed2cd6c19e66dac53 --- M coderkungfu/php-queue/src/PHPQueue/Backend/PDO.php M coderkungfu/php-queue/src/PHPQueue/Backend/Predis.php A coderkungfu/php-queue/src/PHPQueue/Exception/JsonException.php A coderkungfu/php-queue/src/PHPQueue/Json.php M coderkungfu/php-queue/test/PHPQueue/Backend/PredisTest.php M composer/autoload_classmap.php M composer/autoload_files.php M composer/autoload_namespaces.php M composer/autoload_psr4.php M composer/installed.json D fusesource/stomp-php/.gitignore D fusesource/stomp-php/.travis.yml D fusesource/stomp-php/README.md D fusesource/stomp-php/build.xml D fusesource/stomp-php/composer.json D fusesource/stomp-php/examples/activemq-connectivity.xml D fusesource/stomp-php/examples/activemq-security.xml D fusesource/stomp-php/examples/binary.php D fusesource/stomp-php/examples/connectivity.php D fusesource/stomp-php/examples/durable.php D fusesource/stomp-php/examples/first.php D fusesource/stomp-php/examples/security.php D fusesource/stomp-php/examples/transactions.php D fusesource/stomp-php/examples/transformation.php D fusesource/stomp-php/phpunit.xml D fusesource/stomp-php/src/FuseSource/Stomp/Exception/StompException.php D fusesource/stomp-php/src/FuseSource/Stomp/ExceptionInterface.php D fusesource/stomp-php/src/FuseSource/Stomp/Frame.php D fusesource/stomp-php/src/FuseSource/Stomp/Message.php D fusesource/stomp-php/src/FuseSource/Stomp/Message/Bytes.php D fusesource/stomp-php/src/FuseSource/Stomp/Message/Map.php D fusesource/stomp-php/src/FuseSource/Stomp/Stomp.php D fusesource/stomp-php/tests/bootstrap.php D fusesource/stomp-php/tests/functional/StompASyncTest.php D fusesource/stomp-php/tests/functional/StompFailoverTest.php D fusesource/stomp-php/tests/functional/StompRabbitTest.php D fusesource/stomp-php/tests/functional/StompSslTest.php D fusesource/stomp-php/tests/functional/StompSyncTest.php D fusesource/stomp-php/tests/functional/StompTest.php D fusesource/stomp-php/tests/stubbed/StompUnitTest.php D fusesource/stomp-php/tests/stubbed/fusesource_stream_function_stubs.php D fusesource/stomp-php/travisci/bin/ci/install_dependencies.sh D fusesource/stomp-php/travisci/conf/amq/activemq.xml M minfraud/http/Changes M minfraud/http/README.md M minfraud/http/composer.json M minfraud/http/examples/minfraud.php M minfraud/http/src/HTTPBase.php M phpmailer/phpmailer/VERSION M phpmailer/phpmailer/class.phpmailer.php M phpmailer/phpmailer/class.pop3.php M phpmailer/phpmailer/class.smtp.php A phpmailer/phpmailer/examples/contactform.phps M phpmailer/phpmailer/examples/contentsutf8.html M phpmailer/phpmailer/examples/scripts/XRegExp.js M phpmailer/phpmailer/examples/send_file_upload.phps M phpmailer/phpmailer/examples/send_multiple_file_upload.phps M phpmailer/phpmailer/extras/htmlfilter.php M psr/log/Psr/Log/AbstractLogger.php M psr/log/Psr/Log/LogLevel.php M psr/log/Psr/Log/LoggerAwareInterface.php M psr/log/Psr/Log/LoggerInterface.php M psr/log/Psr/Log/NullLogger.php M psr/log/Psr/Log/Test/LoggerInterfaceTest.php M psr/log/composer.json M symfony/event-dispatcher/Event.php M symfony/event-dispatcher/EventDispatcher.php M symfony/event-dispatcher/GenericEvent.php M symfony/event-dispatcher/LICENSE M symfony/event-dispatcher/Tests/ContainerAwareEventDispatcherTest.php M symfony/event-dispatcher/Tests/Debug/TraceableEventDispatcherTest.php M symfony/event-dispatcher/Tests/DependencyInjection/RegisterListenersPassTest.php M symfony/event-dispatcher/Tests/ImmutableEventDispatcherTest.php M symfony/http-foundation/AcceptHeader.php M symfony/http-foundation/AcceptHeaderItem.php M symfony/http-foundation/BinaryFileResponse.php M symfony/http-foundation/Cookie.php M symfony/http-foundation/File/File.php M symfony/http-foundation/File/MimeType/ExtensionGuesser.php M symfony/http-foundation/File/MimeType/FileinfoMimeTypeGuesser.php M symfony/http-foundation/File/MimeType/MimeTypeGuesser.php M symfony/http-foundation/JsonResponse.php M symfony/http-foundation/LICENSE M symfony/http-foundation/RedirectResponse.php M symfony/http-foundation/Request.php M symfony/http-foundation/RequestMatcher.php M symfony/http-foundation/Response.php M symfony/http-foundation/Session/Storage/Handler/MemcacheSessionHandler.php M symfony/http-foundation/StreamedResponse.php M symfony/http-foundation/Tests/CookieTest.php M symfony/http-foundation/Tests/File/FileTest.php M symfony/http-foundation/Tests/JsonResponseTest.php M symfony/http-foundation/Tests/RequestTest.php M symfony/http-foundation/Tests/ResponseHeaderBagTest.php M symfony/http-foundation/Tests/ResponseTest.php M symfony/http-foundation/Tests/Session/Storage/Handler/MemcacheSessionHandlerTest.php M symfony/http-foundation/Tests/Session/Storage/Handler/MemcachedSessio
[MediaWiki-commits] [Gerrit] mediawiki...vendor[master]: Remove Stomp, update other libs
Ejegg has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/333818 ) Change subject: Remove Stomp, update other libs .. Remove Stomp, update other libs Change-Id: Ia7fa9eef072e095a33d0d46ed2cd6c19e66dac53 --- M coderkungfu/php-queue/src/PHPQueue/Backend/PDO.php M coderkungfu/php-queue/src/PHPQueue/Backend/Predis.php A coderkungfu/php-queue/src/PHPQueue/Exception/JsonException.php A coderkungfu/php-queue/src/PHPQueue/Json.php M coderkungfu/php-queue/test/PHPQueue/Backend/PredisTest.php M composer/autoload_classmap.php M composer/autoload_files.php M composer/autoload_namespaces.php M composer/autoload_psr4.php M composer/installed.json D fusesource/stomp-php/.gitignore D fusesource/stomp-php/.travis.yml D fusesource/stomp-php/README.md D fusesource/stomp-php/build.xml D fusesource/stomp-php/composer.json D fusesource/stomp-php/examples/activemq-connectivity.xml D fusesource/stomp-php/examples/activemq-security.xml D fusesource/stomp-php/examples/binary.php D fusesource/stomp-php/examples/connectivity.php D fusesource/stomp-php/examples/durable.php D fusesource/stomp-php/examples/first.php D fusesource/stomp-php/examples/security.php D fusesource/stomp-php/examples/transactions.php D fusesource/stomp-php/examples/transformation.php D fusesource/stomp-php/phpunit.xml D fusesource/stomp-php/src/FuseSource/Stomp/Exception/StompException.php D fusesource/stomp-php/src/FuseSource/Stomp/ExceptionInterface.php D fusesource/stomp-php/src/FuseSource/Stomp/Frame.php D fusesource/stomp-php/src/FuseSource/Stomp/Message.php D fusesource/stomp-php/src/FuseSource/Stomp/Message/Bytes.php D fusesource/stomp-php/src/FuseSource/Stomp/Message/Map.php D fusesource/stomp-php/src/FuseSource/Stomp/Stomp.php D fusesource/stomp-php/tests/bootstrap.php D fusesource/stomp-php/tests/functional/StompASyncTest.php D fusesource/stomp-php/tests/functional/StompFailoverTest.php D fusesource/stomp-php/tests/functional/StompRabbitTest.php D fusesource/stomp-php/tests/functional/StompSslTest.php D fusesource/stomp-php/tests/functional/StompSyncTest.php D fusesource/stomp-php/tests/functional/StompTest.php D fusesource/stomp-php/tests/stubbed/StompUnitTest.php D fusesource/stomp-php/tests/stubbed/fusesource_stream_function_stubs.php D fusesource/stomp-php/travisci/bin/ci/install_dependencies.sh D fusesource/stomp-php/travisci/conf/amq/activemq.xml M minfraud/http/Changes M minfraud/http/README.md M minfraud/http/composer.json M minfraud/http/examples/minfraud.php M minfraud/http/src/HTTPBase.php M phpmailer/phpmailer/VERSION M phpmailer/phpmailer/class.phpmailer.php M phpmailer/phpmailer/class.pop3.php M phpmailer/phpmailer/class.smtp.php A phpmailer/phpmailer/examples/contactform.phps M phpmailer/phpmailer/examples/contentsutf8.html M phpmailer/phpmailer/examples/scripts/XRegExp.js M phpmailer/phpmailer/examples/send_file_upload.phps M phpmailer/phpmailer/examples/send_multiple_file_upload.phps M phpmailer/phpmailer/extras/htmlfilter.php M psr/log/Psr/Log/AbstractLogger.php M psr/log/Psr/Log/LogLevel.php M psr/log/Psr/Log/LoggerAwareInterface.php M psr/log/Psr/Log/LoggerInterface.php M psr/log/Psr/Log/NullLogger.php M psr/log/Psr/Log/Test/LoggerInterfaceTest.php M psr/log/composer.json M symfony/event-dispatcher/Event.php M symfony/event-dispatcher/EventDispatcher.php M symfony/event-dispatcher/GenericEvent.php M symfony/event-dispatcher/LICENSE M symfony/event-dispatcher/Tests/ContainerAwareEventDispatcherTest.php M symfony/event-dispatcher/Tests/Debug/TraceableEventDispatcherTest.php M symfony/event-dispatcher/Tests/DependencyInjection/RegisterListenersPassTest.php M symfony/event-dispatcher/Tests/ImmutableEventDispatcherTest.php M symfony/http-foundation/AcceptHeader.php M symfony/http-foundation/AcceptHeaderItem.php M symfony/http-foundation/BinaryFileResponse.php M symfony/http-foundation/Cookie.php M symfony/http-foundation/File/File.php M symfony/http-foundation/File/MimeType/ExtensionGuesser.php M symfony/http-foundation/File/MimeType/FileinfoMimeTypeGuesser.php M symfony/http-foundation/File/MimeType/MimeTypeGuesser.php M symfony/http-foundation/JsonResponse.php M symfony/http-foundation/LICENSE M symfony/http-foundation/RedirectResponse.php M symfony/http-foundation/Request.php M symfony/http-foundation/RequestMatcher.php M symfony/http-foundation/Response.php M symfony/http-foundation/Session/Storage/Handler/MemcacheSessionHandler.php M symfony/http-foundation/StreamedResponse.php M symfony/http-foundation/Tests/CookieTest.php M symfony/http-foundation/Tests/File/FileTest.php M symfony/http-foundation/Tests/JsonResponseTest.php M symfony/http-foundation/Tests/RequestTest.php M symfony/http-foundation/Tests/ResponseHeaderBagTest.php M symfony/http-foundation/Tests/ResponseTest.php M symfony/http-foundation/Tests/Session/Storage/Handler/MemcacheSessionHandlerTest.php M symfony/http-foundation/Tests/Session/Storage/Handler/MemcachedSessionHandler
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Installer: don't treat the existance of main page as an error
MaxSem has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/333817 )
Change subject: Installer: don't treat the existance of main page as an error
..
Installer: don't treat the existance of main page as an error
It results in CLI installer returning status code 1, messing various
automation such as our own Vagrant.
Change-Id: I7c14596db4ddd91339b2d2af463d851123a00ae7
---
M includes/installer/Installer.php
M includes/installer/i18n/en.json
M includes/installer/i18n/qqq.json
3 files changed, 8 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/17/333817/1
diff --git a/includes/installer/Installer.php b/includes/installer/Installer.php
index d887a13..9c87cf0 100644
--- a/includes/installer/Installer.php
+++ b/includes/installer/Installer.php
@@ -1656,8 +1656,13 @@
*/
protected function createMainpage( DatabaseInstaller $installer ) {
$status = Status::newGood();
+ $title = Title::newMainPage();
+ if ( $title->exists() ) {
+ $status->warning( 'config-install-mainpage-exists' );
+ return $status;
+ }
try {
- $page = WikiPage::factory( Title::newMainPage() );
+ $page = WikiPage::factory( $title );
$content = new WikitextContent(
wfMessage( 'mainpagetext'
)->inContentLanguage()->text() . "\n\n" .
wfMessage( 'mainpagedocfooter'
)->inContentLanguage()->text()
diff --git a/includes/installer/i18n/en.json b/includes/installer/i18n/en.json
index 95d2ba3..db92652 100644
--- a/includes/installer/i18n/en.json
+++ b/includes/installer/i18n/en.json
@@ -298,6 +298,7 @@
"config-install-subscribe-fail": "Unable to subscribe to
mediawiki-announce: $1",
"config-install-subscribe-notpossible": "cURL is not installed and
allow_url_fopen is not available.",
"config-install-mainpage": "Creating main page with default content",
+ "config-install-mainpage-exists": "Main page already exists, skipping",
"config-install-extension-tables": "Creating tables for enabled
extensions",
"config-install-mainpage-failed": "Could not insert main page: $1",
"config-install-done": "Congratulations!\nYou have
installed MediaWiki.\n\nThe installer has generated a
LocalSettings.php file.\nIt contains all your
configuration.\n\nYou will need to download it and put it in the base of your
wiki installation (the same directory as index.php). The download should have
started automatically.\n\nIf the download was not offered, or if you cancelled
it, you can restart the download by clicking the link
below:\n\n$3\n\nNote: If you do not do this now, this
generated configuration file will not be available to you later if you exit the
installation without downloading it.\n\nWhen that has been done, you can
[$2 enter your wiki].",
diff --git a/includes/installer/i18n/qqq.json b/includes/installer/i18n/qqq.json
index 7b60ed0..8d10b51 100644
--- a/includes/installer/i18n/qqq.json
+++ b/includes/installer/i18n/qqq.json
@@ -317,6 +317,7 @@
"config-install-subscribe-fail":
"{{doc-important|\"[[m:mail:mediawiki-announce|mediawiki-announce]]\" is the
name of a mailing list and should not be translated.}}\nA message displayed if
the MediaWiki installer encounters an error making a request to
lists.wikimedia.org which hosts the mailing list.\n* $1 - the HTTP error
encountered, reproduced as is (English string)",
"config-install-subscribe-notpossible": "Error shown when automatically
subscribing to the MediaWiki announcements mailing list fails.",
"config-install-mainpage":
"*{{msg-mw|Config-install-database}}\n*{{msg-mw|Config-install-tables}}\n*{{msg-mw|Config-install-schema}}\n*{{msg-mw|Config-install-user}}\n*{{msg-mw|Config-install-interwiki}}\n*{{msg-mw|Config-install-stats}}\n*{{msg-mw|Config-install-keys}}\n*{{msg-mw|Config-install-sysop}}\n*{{msg-mw|Config-install-mainpage}}",
+ "config-install-mainpage-exists": "Warning shown when installer
attempts to create main page but it already exists.",
"config-install-extension-tables": "Notice shown to the user during the
install about progress.",
"config-install-mainpage-failed": "Used as error message.
Parameters:\n* $1 - detailed error message",
"config-install-done": "Parameters:\n* $1 is the URL to LocalSettings
download\n* $2 is a link to the wiki.\n* $3 is a download link with attached
download icon. The config-download-localsettings message will be used as the
link text.",
--
To view, visit https://gerrit.wikimedia.org/r/333817
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I7c14596db4ddd91339b2d2af463d851123a0
[MediaWiki-commits] [Gerrit] mediawiki...DonationInterface[master]: Remove Stomp requirement, update Composer libraries
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/332716 )
Change subject: Remove Stomp requirement, update Composer libraries
..
Remove Stomp requirement, update Composer libraries
Bug: T131274
Change-Id: Id8c37034ae4f54a8c258c9e63d36342844d75cb1
---
M composer.json
M composer.lock
2 files changed, 67 insertions(+), 111 deletions(-)
Approvals:
jenkins-bot: Verified
Ejegg: Looks good to me, approved
diff --git a/composer.json b/composer.json
index ff07415..717ffa5 100644
--- a/composer.json
+++ b/composer.json
@@ -23,7 +23,6 @@
},
"require": {
"coderkungfu/php-queue": "dev-master",
- "fusesource/stomp-php": "^2.1",
"minfraud/http": "^1.70",
"monolog/monolog": "~1.18.2",
"neitanod/forceutf8": "^2.0",
diff --git a/composer.lock b/composer.lock
index e18e257..013a6a4 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,8 +4,8 @@
"Read more about it at
https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file";,
"This file is @generated automatically"
],
-"hash": "16969a6f73b030f3d6c3a2435a7099ae",
-"content-hash": "b48455e6e53399fe588ca65fb1257c5e",
+"hash": "ee3f90702fff3bcc172baabd6f541eb5",
+"content-hash": "c80503673255d9fe80c09a081876776e",
"packages": [
{
"name": "amzn/login-and-pay-with-amazon-sdk-php",
@@ -93,7 +93,7 @@
"source": {
"type": "git",
"url":
"https://gerrit.wikimedia.org/r/p/wikimedia/fundraising/php-queue.git";,
-"reference": "14198ba1f7d4868933649a85621a3955965e83cd"
+"reference": "d56c5bd69dad595f2e00a3e10c851736b1feb57b"
},
"require": {
"clio/clio": "0.1.*",
@@ -149,57 +149,7 @@
"queue",
"transaction"
],
-"time": "2016-08-05 19:16:32"
-},
-{
-"name": "fusesource/stomp-php",
-"version": "2.1.1",
-"source": {
-"type": "git",
-"url": "https://github.com/dejanb/stomp-php.git";,
-"reference": "4ac51c0abee05078e198faf13f48c056a72f8f8c"
-},
-"dist": {
-"type": "zip",
-"url":
"https://api.github.com/repos/dejanb/stomp-php/zipball/4ac51c0abee05078e198faf13f48c056a72f8f8c";,
-"reference": "4ac51c0abee05078e198faf13f48c056a72f8f8c",
-"shasum": ""
-},
-"require": {
-"php": ">=5.3.0"
-},
-"type": "library",
-"autoload": {
-"psr-0": {
-"FuseSource": "src/"
-}
-},
-"notification-url": "https://packagist.org/downloads/";,
-"license": [
-"Apache-2.0"
-],
-"authors": [
-{
-"name": "Dejan Bosnanac",
-"email": "de...@nighttale.net",
-"homepage": "http://www.nighttale.net";
-},
-{
-"name": "Sören Rohweder",
-"email": "s.rohwe...@blage.net",
-"homepage": "http://www.monofone.de";
-}
-],
-"description": "stomp support for PHP",
-"homepage": "http://github.com/dejanb/stomp-php";,
-"keywords": [
-"activeMQ",
-"jms",
-"messaging",
-"stomp"
-],
-"abandoned": "stomp-php/stomp-php",
-"time": "2013-02-23 17:34:44"
+"time": "2017-01-04 21:01:15"
},
{
"name": "ircmaxell/password-compat",
@@ -245,23 +195,22 @@
},
{
"name": "minfraud/http",
-"version": "v1.70",
+"version": "v1.71",
"source": {
"type": "git",
"url": "https://github.com/maxmind/ccfd-api-php.git";,
-"reference": "941e9345f9c237a253be8b908ecef951698a1a99"
+"reference": "5f6c2a5454e755f1c56be17a1fc0c97576ff010e"
},
"dist": {
"type": "zip",
-"url":
"https://api.github.com/repos/maxmind/ccfd-api-php/zipball/941e9345f9c237a253be8b908ecef951698a1a99";,
-"reference": "941e9345f9c237a253be8b908ecef951698a1a99",
+"url":
"https://api.github.com/repos/maxmind/ccfd-api-php/zipball/5f6c2a5454e755f1c56be17a1fc0c97576ff010e";,
+"reference": "5f6c2a5454e755f1c56be17a1fc0c97576ff010e",
"shasum": ""
},
"type": "library",
"autoload": {
-"fil
[MediaWiki-commits] [Gerrit] mediawiki...Echo[master]: Remove FloatableElement hack, no longer necessary.
Catrope has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/333816 )
Change subject: Remove FloatableElement hack, no longer necessary.
..
Remove FloatableElement hack, no longer necessary.
Reverts 02252d05310. Depends on I22f2ca72cf7c2f in oojs-ui.
Change-Id: I726aada60238d17227e4475637bd3d9befa1b4c3
---
M modules/styles/mw.echo.ui.NotificationBadgeWidget.less
1 file changed, 1 insertion(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Echo
refs/changes/16/333816/1
diff --git a/modules/styles/mw.echo.ui.NotificationBadgeWidget.less
b/modules/styles/mw.echo.ui.NotificationBadgeWidget.less
index b82f335..6584417 100644
--- a/modules/styles/mw.echo.ui.NotificationBadgeWidget.less
+++ b/modules/styles/mw.echo.ui.NotificationBadgeWidget.less
@@ -40,9 +40,7 @@
> .oo-ui-popupWidget-body {
// Work around scrollbar rendering bug in Chrome
- overflow-y: visible;
- // Work around OO.ui.FloatableElement bug
(T130153)
- overflow-x: auto;
+ overflow: visible;
> .mw-echo-ui-notificationsListWidget >
.mw-echo-ui-notificationItemWidget {
// The popup body itself has a border.
We need to override the notification
--
To view, visit https://gerrit.wikimedia.org/r/333816
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I726aada60238d17227e4475637bd3d9befa1b4c3
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Echo
Gerrit-Branch: master
Gerrit-Owner: Catrope
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Nimbus[master]: Delicious copypasta from MonoBook to fix the tabs on Special...
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/333814 )
Change subject: Delicious copypasta from MonoBook to fix the tabs on
Special:Preferences
..
Delicious copypasta from MonoBook to fix the tabs on Special:Preferences
Change-Id: I3eca5f749f67baa8ea77c00706fac4441bb1f1e7
---
M skin.json
A skinStyles/mediawiki.special.preferences.styles.less
2 files changed, 91 insertions(+), 1 deletion(-)
Approvals:
Jack Phoenix: Looks good to me, approved
jenkins-bot: Verified
diff --git a/skin.json b/skin.json
index 9979080..281b886 100644
--- a/skin.json
+++ b/skin.json
@@ -1,6 +1,6 @@
{
"name": "Nimbus",
- "version": "3.2.2",
+ "version": "3.3",
"author": [
"Aaron Wright",
"David Pean",
@@ -41,5 +41,10 @@
"position": "bottom"
}
},
+ "ResourceModuleSkinStyles": {
+ "nimbus": {
+ "+mediawiki.special.preferences.styles":
"skinStyles/mediawiki.special.preferences.styles.less"
+ }
+ },
"manifest_version": 1
}
diff --git a/skinStyles/mediawiki.special.preferences.styles.less
b/skinStyles/mediawiki.special.preferences.styles.less
new file mode 100644
index 000..49ea1a1
--- /dev/null
+++ b/skinStyles/mediawiki.special.preferences.styles.less
@@ -0,0 +1,85 @@
+.client-js #preftoc {
+ /* Tabs */
+ width: 100%;
+ clear: both;
+ margin: 0;
+ padding: 0;
+
+ li {
+ /* Tab */
+ background-color: #f0f0f0;
+ color: #000;
+ margin: 1px -2px 1px 2px;
+ float: left;
+ padding: 2px 0 3px 0;
+ border: 1px solid #fff;
+ border-right-color: #716f64;
+ border-bottom: 0;
+ position: relative;
+ white-space: nowrap;
+ list-style-type: none;
+ list-style-image: none;
+
+ &.selected {
+ font-weight: bold;
+ background-color: #f9f9f9;
+ border: 1px solid #aaa;
+ border-bottom: 0;
+ cursor: default;
+ top: 2px;
+ padding-top: 2px;
+ margin-right: -3px;
+
+ a {
+ cursor: default;
+ text-decoration: none;
+ }
+ }
+ }
+
+ a,
+ a:active {
+ display: inline-block;
+ color: #000;
+ padding: 0 .7em;
+ position: relative;
+ text-decoration: none;
+ }
+}
+
+#preferences {
+margin: 0;
+ border: 1px solid #aaa;
+ clear: both;
+ padding: 1.5em;
+ background-color: #F9F9F9;
+}
+
+.client-js #preferences {
+ >fieldset {
+ border: none;
+ padding: 0;
+ margin: 0;
+
+ >legend {
+ display: none;
+ }
+ }
+
+ legend {
+ font-weight: bold;
+ }
+}
+
+.mw-htmlform-submit {
+ font-weight: bold;
+ padding-left: .3em;
+ padding-right: .3em;
+ margin-right: 2em;
+}
+
+.htmlform-tip {
+ font-size: x-small;
+ padding: .2em 2em;
+ color: #666;
+}
--
To view, visit https://gerrit.wikimedia.org/r/333814
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I3eca5f749f67baa8ea77c00706fac4441bb1f1e7
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/skins/Nimbus
Gerrit-Branch: master
Gerrit-Owner: Jack Phoenix
Gerrit-Reviewer: Jack Phoenix
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...DonationInterface[master]: Update default queue backend
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/332715 )
Change subject: Update default queue backend
..
Update default queue backend
Default to PDO instead of Stomp. Use a connection string that will
fail with an error if the user turns queueing on but does not
configure it as opposed to the SQLite connection used for testing
that would silently discard messages.
Bug: T131274
Change-Id: I22ee8384becb7e45506eac9c1953747f388372b2
---
M extension.json
1 file changed, 2 insertions(+), 4 deletions(-)
Approvals:
jenkins-bot: Verified
Ejegg: Looks good to me, approved
diff --git a/extension.json b/extension.json
index 12c2c5a..dc2b360 100644
--- a/extension.json
+++ b/extension.json
@@ -368,10 +368,8 @@
"AstroPayGatewayURL": "https://astropaycard.com/";,
"AstroPayGatewayTestingURL":
"https://sandbox.astropaycard.com/";,
"DonationInterfaceDefaultQueueServer": {
- "type": "PHPQueue\\Backend\\Stomp",
- "uri": "tcp://localhost:61613",
- "read_timeout": "1",
- "expiry": "30 days",
+ "type": "PHPQueue\\Backend\\PDO",
+ "connection_string":
"mysql:host=localhost;dbname=payment_queues",
"_merge_strategy": "array_plus"
},
"DonationInterfaceQueues": {
--
To view, visit https://gerrit.wikimedia.org/r/332715
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I22ee8384becb7e45506eac9c1953747f388372b2
Gerrit-PatchSet: 5
Gerrit-Project: mediawiki/extensions/DonationInterface
Gerrit-Branch: master
Gerrit-Owner: Ejegg
Gerrit-Reviewer: AndyRussG
Gerrit-Reviewer: Awight
Gerrit-Reviewer: Ejegg
Gerrit-Reviewer: Legoktm
Gerrit-Reviewer: Ssmith
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/mediawiki-config[master]: mariadb: repool db1065 with low weight after maintenance
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/333812 ) Change subject: mariadb: repool db1065 with low weight after maintenance .. mariadb: repool db1065 with low weight after maintenance Bug: T156005 Change-Id: Ia6a25d4462142272ce654c3284879a2cb1014d94 --- M wmf-config/db-eqiad.php 1 file changed, 6 insertions(+), 6 deletions(-) Approvals: jenkins-bot: Verified Jcrespo: Looks good to me, approved diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php index 68abe67..04f6957 100644 --- a/wmf-config/db-eqiad.php +++ b/wmf-config/db-eqiad.php @@ -94,10 +94,10 @@ 'sectionLoads' => [ 's1' => [ 'db1057' => 0, # 2.8TB 96GB, master -# 'db1052' => 1 , # 2.8TB 96GB, old master #Temporary master for db1095 - new sanitarium #T150960 +# 'db1052' => 1, # 2.8TB 96GB, old master #Temporary master for db1095 - new sanitarium #T150960 'db1051' => 50, # 2.8TB 96GB, watchlist, recentchanges, contributions, logpager 'db1055' => 50, # 2.8TB 96GB, watchlist, recentchanges, contributions, logpager -# 'db1065' => 50, # 2.8TB 160GB, api, depooled for maintenance T156005 + 'db1065' => 1, # 2.8TB 160GB, api, low weight after maintenance 'db1066' => 50, # 2.8TB 160GB, api 'db1072' => 0, # 2.8TB 160GB, vslow, dump 'db1073' => 50, # 2.8TB 160GB, api @@ -121,7 +121,7 @@ /* s3 */ 'DEFAULT' => [ 'db1075' => 0, # 3.6TB 512GB, master 'db1038' => 0, # 1.4TB 64GB, vslow, dump, old master - 'db1015' => 1 , # 1.4TB 64GB, watchlist, recentchanges, contributions, logpager + 'db1015' => 1, # 1.4TB 64GB, watchlist, recentchanges, contributions, logpager # 'db1035' => 0, # 1.4TB 64GB # 'db1044' => 0, # 1.4TB 64GB, #Temporary master for db1095 - new sanitarium #T150802 'db1077' => 500, # 3.6TB 512GB @@ -264,9 +264,9 @@ 'db1072' => 1, ], 'api' => [ -# 'db1065' => 1, - 'db1066' => 1, - 'db1073' => 1, + 'db1065' => 1, # low weight after maintenance + 'db1066' => 5, + 'db1073' => 5, ], ], 's2' => [ -- To view, visit https://gerrit.wikimedia.org/r/333812 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ia6a25d4462142272ce654c3284879a2cb1014d94 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Jcrespo Gerrit-Reviewer: Florianschmidtwelzow Gerrit-Reviewer: Jcrespo 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]: Remove unnecessary nowikis
Arlolra has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/333815 ) Change subject: Remove unnecessary nowikis .. Remove unnecessary nowikis * Besides, the comment says the html is supposed to match the previous test. Change-Id: I2dfa02d826574d12831fa773748264c01766c6a7 --- M tests/parserTests.txt 1 file changed, 10 insertions(+), 18 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/parsoid refs/changes/15/333815/1 diff --git a/tests/parserTests.txt b/tests/parserTests.txt index 6f66257..7d99c89 100644 --- a/tests/parserTests.txt +++ b/tests/parserTests.txt @@ -933,6 +933,7 @@ ### ### multiple quote sequences in a line ### + !! test Italics and bold: multiple quote sequences: (2,4,2) !! options @@ -942,8 +943,7 @@ !! html/* foo'bar -!!end - +!! end # same html as previous, but wikitext adjusted to match parsoid html2wt !! test @@ -955,7 +955,6 @@ !! end - !! test Italics and bold: multiple quote sequences: (2,4,3) !! options @@ -965,8 +964,7 @@ !! html/* foo'bar -!!end - +!! end # same html as previous, but wikitext adjusted to match parsoid html2wt !! test @@ -978,7 +976,6 @@ !! end - !! test Italics and bold: multiple quote sequences: (2,4,4) !! options @@ -988,8 +985,7 @@ !! html/* foo'bar' -!!end - +!! end # same html as previous, but wikitext adjusted to match parsoid html2wt !! test @@ -1000,7 +996,6 @@ foo'bar' !! end - # The PHP parser strips the empty tags out for giggles; parsoid doesn't. !! test @@ -1015,23 +1010,20 @@ !! html/parsoid foo'bar -!!end +!! end # same html as previous, but wikitext adjusted to match parsoid html2wt !! test Italics and bold: multiple quote sequences: (3,4,2+2) w/ nowiki -!! options -parsoid !! wikitext -'''foobar +'''foobar !! html/php foo'bar !! html/parsoid -foo'bar +foo'bar !! end - # The PHP parser strips the empty tags out for giggles; parsoid doesn't. !! test @@ -1046,18 +1038,18 @@ !! html/parsoid foo'bar -!!end +!! end # same html as previous, but wikitext adjusted to match parsoid html2wt !! test Italics and bold: multiple quote sequences: (3,4,3+3) w/ nowiki !! wikitext -'''foobar'' +'''foobar'' !! html/php foo'bar !! html/parsoid -foo'bar +foo'bar !! end -- To view, visit https://gerrit.wikimedia.org/r/333815 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I2dfa02d826574d12831fa773748264c01766c6a7 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] mediawiki...Nimbus[master]: Delicious copypasta from MonoBook to fix the tabs on Special...
Jack Phoenix has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/333814 )
Change subject: Delicious copypasta from MonoBook to fix the tabs on
Special:Preferences
..
Delicious copypasta from MonoBook to fix the tabs on Special:Preferences
Change-Id: I3eca5f749f67baa8ea77c00706fac4441bb1f1e7
---
M skin.json
A skinStyles/mediawiki.special.preferences.styles.less
2 files changed, 91 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/Nimbus
refs/changes/14/333814/1
diff --git a/skin.json b/skin.json
index 9979080..5250cda 100644
--- a/skin.json
+++ b/skin.json
@@ -1,6 +1,6 @@
{
"name": "Nimbus",
- "version": "3.2.2",
+ "version": "3.3",
"author": [
"Aaron Wright",
"David Pean",
@@ -41,5 +41,10 @@
"position": "bottom"
}
},
+ "ResourceModuleSkinStyles": {
+ "monobook": {
+ "+mediawiki.special.preferences.styles":
"skinStyles/mediawiki.special.preferences.styles.less"
+ }
+ },
"manifest_version": 1
}
diff --git a/skinStyles/mediawiki.special.preferences.styles.less
b/skinStyles/mediawiki.special.preferences.styles.less
new file mode 100644
index 000..49ea1a1
--- /dev/null
+++ b/skinStyles/mediawiki.special.preferences.styles.less
@@ -0,0 +1,85 @@
+.client-js #preftoc {
+ /* Tabs */
+ width: 100%;
+ clear: both;
+ margin: 0;
+ padding: 0;
+
+ li {
+ /* Tab */
+ background-color: #f0f0f0;
+ color: #000;
+ margin: 1px -2px 1px 2px;
+ float: left;
+ padding: 2px 0 3px 0;
+ border: 1px solid #fff;
+ border-right-color: #716f64;
+ border-bottom: 0;
+ position: relative;
+ white-space: nowrap;
+ list-style-type: none;
+ list-style-image: none;
+
+ &.selected {
+ font-weight: bold;
+ background-color: #f9f9f9;
+ border: 1px solid #aaa;
+ border-bottom: 0;
+ cursor: default;
+ top: 2px;
+ padding-top: 2px;
+ margin-right: -3px;
+
+ a {
+ cursor: default;
+ text-decoration: none;
+ }
+ }
+ }
+
+ a,
+ a:active {
+ display: inline-block;
+ color: #000;
+ padding: 0 .7em;
+ position: relative;
+ text-decoration: none;
+ }
+}
+
+#preferences {
+margin: 0;
+ border: 1px solid #aaa;
+ clear: both;
+ padding: 1.5em;
+ background-color: #F9F9F9;
+}
+
+.client-js #preferences {
+ >fieldset {
+ border: none;
+ padding: 0;
+ margin: 0;
+
+ >legend {
+ display: none;
+ }
+ }
+
+ legend {
+ font-weight: bold;
+ }
+}
+
+.mw-htmlform-submit {
+ font-weight: bold;
+ padding-left: .3em;
+ padding-right: .3em;
+ margin-right: 2em;
+}
+
+.htmlform-tip {
+ font-size: x-small;
+ padding: .2em 2em;
+ color: #666;
+}
--
To view, visit https://gerrit.wikimedia.org/r/333814
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I3eca5f749f67baa8ea77c00706fac4441bb1f1e7
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/Nimbus
Gerrit-Branch: master
Gerrit-Owner: Jack Phoenix
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...TimedMediaHandler[master]: [File_Ogg] calculate length for FLAC when header lists unknown
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/332799 )
Change subject: [File_Ogg] calculate length for FLAC when header lists unknown
..
[File_Ogg] calculate length for FLAC when header lists unknown
0 for total length in the FLAC header indicates 'unknown', which
we can calculate the actual value for similarly to Vorbis/Opus/etc.
Add a check and branch.
Fixes https://pear.php.net/bugs/bug.php?id=21164
Also committing this upstream so we'll be closer to in sync.
Bug: T87619
Change-Id: I8a7caff6f1a9e4b81fb66608b9f5cccfde0065ad
---
M handlers/OggHandler/File_Ogg/File/Ogg/Flac.php
1 file changed, 26 insertions(+), 2 deletions(-)
Approvals:
jenkins-bot: Verified
TheDJ: Looks good to me, approved
diff --git a/handlers/OggHandler/File_Ogg/File/Ogg/Flac.php
b/handlers/OggHandler/File_Ogg/File/Ogg/Flac.php
index 6838ba6..bf98d60 100644
--- a/handlers/OggHandler/File_Ogg/File/Ogg/Flac.php
+++ b/handlers/OggHandler/File_Ogg/File/Ogg/Flac.php
@@ -42,8 +42,32 @@
parent::__construct($streamSerial, $streamData, $filePointer);
$this->_decodeHeader();
$this->_decodeCommentsHeader();
-$this->_streamLength= $this->_streamInfo['total_samples']
-/ $this->_streamInfo['sample_rate'];
+
+if ($this->_streamInfo['total_samples'] > 0) {
+$this->_streamLength= $this->_streamInfo['total_samples']
+/ $this->_streamInfo['sample_rate'];
+} else {
+// Header may have 0 for total_samples in which case we have to
check.
+// https://xiph.org/flac/format.html#metadata_block_streaminfo
+ $endSec = $this->getSecondsFromGranulePos(
$this->_lastGranulePos );
+ $startSec = $this->getSecondsFromGranulePos(
$this->_firstGranulePos );
+
+//make sure the offset is worth taking into account oggz_chop
related hack
+if( $startSec > 1) {
+$this->_streamLength = $endSec - $startSec;
+$this->_startOffset = $startSec;
+} else {
+$this->_streamLength = $endSec;
+}
+}
+
+$this->_avgBitrate = $this->_streamLength ? ($this->_streamSize *
8) / $this->_streamLength : 0;
+}
+
+function getSecondsFromGranulePos( $granulePos ){
+return (( '0x' . substr( $granulePos, 0, 8 ) ) * pow(2, 32)
+ + ( '0x' . substr( $granulePos, 8, 8 ) ))
+ / $this->_streamInfo['sample_rate'];
}
/**
--
To view, visit https://gerrit.wikimedia.org/r/332799
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I8a7caff6f1a9e4b81fb66608b9f5cccfde0065ad
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/TimedMediaHandler
Gerrit-Branch: master
Gerrit-Owner: Brion VIBBER
Gerrit-Reviewer: TheDJ
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]: mediawiki.api.options: Use sequential API requests in the re...
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/333782 )
Change subject: mediawiki.api.options: Use sequential API requests in the
remaining edge cases
..
mediawiki.api.options: Use sequential API requests in the remaining edge cases
Bug: T100908
Change-Id: I927c098fd750bd765ffd746d40c3f7408f99f2de
---
M resources/src/mediawiki/api/options.js
1 file changed, 25 insertions(+), 19 deletions(-)
Approvals:
Krinkle: Looks good to me, approved
jenkins-bot: Verified
diff --git a/resources/src/mediawiki/api/options.js
b/resources/src/mediawiki/api/options.js
index 069fbbf..4930c4f 100644
--- a/resources/src/mediawiki/api/options.js
+++ b/resources/src/mediawiki/api/options.js
@@ -26,7 +26,7 @@
* Any warnings returned by the API, including warnings about
invalid option names or values,
* are ignored. However, do not rely on this behavior.
*
-* If necessary, the options will be saved using several
parallel API requests. Only one promise
+* If necessary, the options will be saved using several
sequential API requests. Only one promise
* is always returned that will be resolved when all requests
complete.
*
* @param {Object} options Options as a `{ name: value, … }`
object
@@ -35,7 +35,7 @@
saveOptions: function ( options ) {
var name, value, bundleable,
grouped = [],
- deferreds = [];
+ promise = $.Deferred().resolve();
for ( name in options ) {
value = options[ name ] === null ? null :
String( options[ name ] );
@@ -58,32 +58,38 @@
}
} else {
if ( value !== null ) {
- deferreds.push(
this.postWithToken( 'csrf', {
- formatversion: 2,
- action: 'options',
- optionname: name,
- optionvalue: value
- } ) );
+ promise = promise.then(
function ( name, value ) {
+ return
this.postWithToken( 'csrf', {
+ formatversion:
2,
+ action:
'options',
+ optionname:
name,
+ optionvalue:
value
+ } );
+ }.bind( this, name, value ) );
} else {
// Omitting value resets the
option
- deferreds.push(
this.postWithToken( 'csrf', {
- formatversion: 2,
- action: 'options',
- optionname: name
- } ) );
+ promise = promise.then(
function ( name ) {
+ return
this.postWithToken( 'csrf', {
+ formatversion:
2,
+ action:
'options',
+ optionname: name
+ } );
+ }.bind( this, name ) );
}
}
}
if ( grouped.length ) {
- deferreds.push( this.postWithToken( 'csrf', {
- formatversion: 2,
- action: 'options',
- change: grouped
- } ) );
+ promise = promise.then( function () {
+ return this.postWithToken( 'csrf', {
+ formatversion: 2,
+ action: 'options',
+
[MediaWiki-commits] [Gerrit] mediawiki...SocialProfile[master]: Remove unused wgSupressPageTitle global
SamanthaNguyen has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/333813 )
Change subject: Remove unused wgSupressPageTitle global
..
Remove unused wgSupressPageTitle global
Bug: T143145
Change-Id: I7ea977669ecf98af02d9ce0fff468439a042158c
---
M SocialProfile.php
M UserProfile/SpecialEditProfile.php
M UserProfile/SpecialUpdateProfile.php
3 files changed, 3 insertions(+), 9 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/SocialProfile
refs/changes/13/333813/1
diff --git a/SocialProfile.php b/SocialProfile.php
index 1d123d5..39a9abf 100644
--- a/SocialProfile.php
+++ b/SocialProfile.php
@@ -150,7 +150,7 @@
'path' => __FILE__,
'name' => 'SocialProfile',
'author' => array( 'Aaron Wright', 'David Pean', 'Jack Phoenix' ),
- 'version' => '1.10',
+ 'version' => '1.11',
'url' => 'https://www.mediawiki.org/wiki/Extension:SocialProfile',
'descriptionmsg' => 'socialprofile-desc',
);
diff --git a/UserProfile/SpecialEditProfile.php
b/UserProfile/SpecialEditProfile.php
index afcf671..5816e21 100644
--- a/UserProfile/SpecialEditProfile.php
+++ b/UserProfile/SpecialEditProfile.php
@@ -23,13 +23,11 @@
* @param $section Mixed: parameter passed to the page or null
*/
public function execute( $par ) {
- global $wgUpdateProfileInRecentChanges, $wgSupressPageTitle;
+ global $wgUpdateProfileInRecentChanges;
$out = $this->getOutput();
$request = $this->getRequest();
$user = $this->getUser();
-
- $wgSupressPageTitle = true;
// Set the page title, robot policies, etc.
$this->setHeaders();
diff --git a/UserProfile/SpecialUpdateProfile.php
b/UserProfile/SpecialUpdateProfile.php
index 50da25d..6485983 100644
--- a/UserProfile/SpecialUpdateProfile.php
+++ b/UserProfile/SpecialUpdateProfile.php
@@ -51,13 +51,11 @@
* @param $section Mixed: parameter passed to the page or null
*/
public function execute( $section ) {
- global $wgUpdateProfileInRecentChanges,
$wgUserProfileThresholds, $wgSupressPageTitle, $wgAutoConfirmCount,
$wgEmailConfirmToEdit;
+ global $wgUpdateProfileInRecentChanges,
$wgUserProfileThresholds, $wgAutoConfirmCount, $wgEmailConfirmToEdit;
$out = $this->getOutput();
$request = $this->getRequest();
$user = $this->getUser();
-
- $wgSupressPageTitle = true;
// Set the page title, robot policies, etc.
$this->setHeaders();
@@ -115,8 +113,6 @@
// Boo, go away!
if ( $can_create == false ) {
- global $wgSupressPageTitle;
- $wgSupressPageTitle = false;
$out->setPageTitle( $this->msg(
'user-profile-create-threshold-title' )->text() );
$thresholdMessages = array();
foreach ( $thresholdReasons as $requiredAmount
=> $reason ) {
--
To view, visit https://gerrit.wikimedia.org/r/333813
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I7ea977669ecf98af02d9ce0fff468439a042158c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SocialProfile
Gerrit-Branch: master
Gerrit-Owner: SamanthaNguyen
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: mariadb: repool db1065 with low weight after maintenance
Jcrespo has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/333812 ) Change subject: mariadb: repool db1065 with low weight after maintenance .. mariadb: repool db1065 with low weight after maintenance Bug: T156005 Change-Id: Ia6a25d4462142272ce654c3284879a2cb1014d94 --- M wmf-config/db-eqiad.php 1 file changed, 6 insertions(+), 6 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/12/333812/1 diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php index 68abe67..04f6957 100644 --- a/wmf-config/db-eqiad.php +++ b/wmf-config/db-eqiad.php @@ -94,10 +94,10 @@ 'sectionLoads' => [ 's1' => [ 'db1057' => 0, # 2.8TB 96GB, master -# 'db1052' => 1 , # 2.8TB 96GB, old master #Temporary master for db1095 - new sanitarium #T150960 +# 'db1052' => 1, # 2.8TB 96GB, old master #Temporary master for db1095 - new sanitarium #T150960 'db1051' => 50, # 2.8TB 96GB, watchlist, recentchanges, contributions, logpager 'db1055' => 50, # 2.8TB 96GB, watchlist, recentchanges, contributions, logpager -# 'db1065' => 50, # 2.8TB 160GB, api, depooled for maintenance T156005 + 'db1065' => 1, # 2.8TB 160GB, api, low weight after maintenance 'db1066' => 50, # 2.8TB 160GB, api 'db1072' => 0, # 2.8TB 160GB, vslow, dump 'db1073' => 50, # 2.8TB 160GB, api @@ -121,7 +121,7 @@ /* s3 */ 'DEFAULT' => [ 'db1075' => 0, # 3.6TB 512GB, master 'db1038' => 0, # 1.4TB 64GB, vslow, dump, old master - 'db1015' => 1 , # 1.4TB 64GB, watchlist, recentchanges, contributions, logpager + 'db1015' => 1, # 1.4TB 64GB, watchlist, recentchanges, contributions, logpager # 'db1035' => 0, # 1.4TB 64GB # 'db1044' => 0, # 1.4TB 64GB, #Temporary master for db1095 - new sanitarium #T150802 'db1077' => 500, # 3.6TB 512GB @@ -264,9 +264,9 @@ 'db1072' => 1, ], 'api' => [ -# 'db1065' => 1, - 'db1066' => 1, - 'db1073' => 1, + 'db1065' => 1, # low weight after maintenance + 'db1066' => 5, + 'db1073' => 5, ], ], 's2' => [ -- To view, visit https://gerrit.wikimedia.org/r/333812 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ia6a25d4462142272ce654c3284879a2cb1014d94 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Jcrespo ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Truglass[master]: Fix save button on Special:Preferences
Jack Phoenix has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/333811 )
Change subject: Fix save button on Special:Preferences
..
Fix save button on Special:Preferences
Given that the preftoc CSS was copied from core, that rule was once
necessary but these days it's certainly not wanted.
Change-Id: I33a9313994bc1feaa1b0b3996ef6ad9b87bcd065
---
M truglass/main.css
1 file changed, 0 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/Truglass
refs/changes/11/333811/1
diff --git a/truglass/main.css b/truglass/main.css
index b303518..a149b90 100644
--- a/truglass/main.css
+++ b/truglass/main.css
@@ -1567,7 +1567,6 @@
text-decoration: none;
}
#prefcontrol {
- padding-top: 2em;
clear: both;
}
#preferences {
--
To view, visit https://gerrit.wikimedia.org/r/333811
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I33a9313994bc1feaa1b0b3996ef6ad9b87bcd065
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/Truglass
Gerrit-Branch: master
Gerrit-Owner: Jack Phoenix
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/software[master]: Use local tox instead of installing a new one
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/325762 )
Change subject: Use local tox instead of installing a new one
..
Use local tox instead of installing a new one
The root tox.ini creates sub environment which each came with their own
copy of tox coming from pypi. Thus the latest version of tox is used
instead of the locally one which is definitely confusing.
Instead of installing the dependency, allow it as an external command.
Bug: T152549
Change-Id: Ic5f6c5ccafc879a4cc1cd617f28e1b370bd6a8ed
---
M tox.ini
1 file changed, 3 insertions(+), 3 deletions(-)
Approvals:
ArielGlenn: Looks good to me, but someone else must approve
jenkins-bot: Verified
Volans: Looks good to me, approved
diff --git a/tox.ini b/tox.ini
index dae2fb9..da0bcdc 100644
--- a/tox.ini
+++ b/tox.ini
@@ -7,12 +7,12 @@
# https://gerrit.wikimedia.org/r/#/c/124325/
[testenv:clouseau]
toxworkdir={toxinidir}/clouseau
-deps = tox
+whitelist_externals = tox
commands = tox -c {toxinidir}/clouseau/tox.ini
[testenv:checkhosts]
toxworkdir={toxinidir}/checkhosts
-deps = tox
+whitelist_externals = tox
commands = tox -c {toxinidir}/checkhosts/tox.ini
[testenv:flake8]
@@ -21,7 +21,7 @@
[testenv:salt-misc]
toxworkdir={toxinidir}/salt-misc
-deps = tox
+whitelist_externals = tox
commands = tox -c {toxinidir}/salt-misc/tox.ini
[flake8]
--
To view, visit https://gerrit.wikimedia.org/r/325762
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ic5f6c5ccafc879a4cc1cd617f28e1b370bd6a8ed
Gerrit-PatchSet: 1
Gerrit-Project: operations/software
Gerrit-Branch: master
Gerrit-Owner: Hashar
Gerrit-Reviewer: ArielGlenn
Gerrit-Reviewer: Hashar
Gerrit-Reviewer: Tim Landscheidt
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...VisualEditor[master]: Update actions on live inspectors and preview dialogs
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/332084 )
Change subject: Update actions on live inspectors and preview dialogs
..
Update actions on live inspectors and preview dialogs
Make inspectors inheriting from MWLiveExtensionInspector
and dialogs inheriting from MWExtensionPreviewDialog
update their 'done' action every time updatePreview is
called. Since both mix in ExtensionWindow, two new methods,
updateActions and isModified are added there.
This should make it more difficult to insert an empty node
accidentally or create a transaction just by opening and
closing an inspector or dialog.
For more complicated dialogs, or inspectors or dialogs
that don't live-update, this behaviour will have to be
implemented separately.
Bug: T155330
Change-Id: Iacafa01fcd419faaec9b112c96be86693a57d561
---
M modules/ve-mw/ui/dialogs/ve.ui.MWExtensionPreviewDialog.js
M modules/ve-mw/ui/inspectors/ve.ui.MWLiveExtensionInspector.js
M modules/ve-mw/ui/ve.ui.MWExtensionWindow.js
3 files changed, 61 insertions(+), 4 deletions(-)
Approvals:
Esanders: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/ve-mw/ui/dialogs/ve.ui.MWExtensionPreviewDialog.js
b/modules/ve-mw/ui/dialogs/ve.ui.MWExtensionPreviewDialog.js
index d956d1e..7da260a 100644
--- a/modules/ve-mw/ui/dialogs/ve.ui.MWExtensionPreviewDialog.js
+++ b/modules/ve-mw/ui/dialogs/ve.ui.MWExtensionPreviewDialog.js
@@ -19,8 +19,7 @@
// Parent constructor
ve.ui.MWExtensionPreviewDialog.super.apply( this, arguments );
- // Late bind onChangeHandler to a debounced updatePreview
- this.onChangeHandler = ve.debounce( this.updatePreview.bind( this ),
250 );
+ this.updatePreviewDebounced = ve.debounce( this.updatePreview.bind(
this ), 250 );
};
/* Inheritance */
@@ -73,6 +72,16 @@
};
/**
+ * @inheritdoc
+ */
+ve.ui.MWExtensionPreviewDialog.prototype.onChange = function () {
+ // Parent method
+ ve.ui.MWExtensionPreviewDialog.super.prototype.onChange.call( this );
+
+ this.updatePreviewDebounced();
+};
+
+/**
* Update the node rendering to reflect the current content in the dialog.
*/
ve.ui.MWExtensionPreviewDialog.prototype.updatePreview = function () {
diff --git a/modules/ve-mw/ui/inspectors/ve.ui.MWLiveExtensionInspector.js
b/modules/ve-mw/ui/inspectors/ve.ui.MWLiveExtensionInspector.js
index ce9b000..595dec9 100644
--- a/modules/ve-mw/ui/inspectors/ve.ui.MWLiveExtensionInspector.js
+++ b/modules/ve-mw/ui/inspectors/ve.ui.MWLiveExtensionInspector.js
@@ -19,8 +19,7 @@
// Parent constructor
ve.ui.MWLiveExtensionInspector.super.apply( this, arguments );
- // Late bind onChangeHandler to a debounced updatePreview
- this.onChangeHandler = ve.debounce( this.updatePreview.bind( this ),
250 );
+ this.updatePreviewDebounced = ve.debounce( this.updatePreview.bind(
this ), 250 );
};
/* Inheritance */
@@ -114,6 +113,16 @@
};
/**
+ * @inheritdoc
+ */
+ve.ui.MWLiveExtensionInspector.prototype.onChange = function () {
+ // Parent method
+ ve.ui.MWLiveExtensionInspector.super.prototype.onChange.call( this );
+
+ this.updatePreviewDebounced();
+};
+
+/**
* Update the node rendering to reflect the current content in the inspector.
*/
ve.ui.MWLiveExtensionInspector.prototype.updatePreview = function () {
diff --git a/modules/ve-mw/ui/ve.ui.MWExtensionWindow.js
b/modules/ve-mw/ui/ve.ui.MWExtensionWindow.js
index 203007c..0794f5e 100644
--- a/modules/ve-mw/ui/ve.ui.MWExtensionWindow.js
+++ b/modules/ve-mw/ui/ve.ui.MWExtensionWindow.js
@@ -17,6 +17,9 @@
ve.ui.MWExtensionWindow = function VeUiMWExtensionWindow() {
this.whitespace = null;
this.input = null;
+ this.originalMwData = null;
+
+ this.onChangeHandler = ve.debounce( this.onChange.bind( this ), 0 );
};
/* Inheritance */
@@ -80,6 +83,7 @@
if ( this.selectedNode ) {
this.input.setValueAndWhitespace(
this.selectedNode.getAttribute( 'mw' ).body.extsrc );
+ this.originalMwData = this.selectedNode.getAttribute(
'mw' );
} else {
if ( !this.constructor.static.modelClasses[ 0
].static.isContent ) {
// New nodes should use linebreaks for blocks
@@ -92,6 +96,9 @@
dir = this.constructor.static.dir || data.dir;
this.input.setDir( dir );
+
+ this.actions.setAbilities( { done: false } );
+ this.input.connect( this, { change: 'onChangeHandler' } );
}, this );
};
@@ -127,6 +134,38 @@
};
/**
+ * Handle change event.
+ */
+ve.ui.MWExtensionWindow.prototype.onChange = function () {
+ this.updateActions();
+};
+
+/**
+ * Update the 'done' action according to whether there are changes
+ */
+ve.ui.MWExtensionWindow.prototype.updateA
[MediaWiki-commits] [Gerrit] mediawiki...TemplateData[master]: Update list of spec authors basd on git shortlog -n Specific...
Catrope has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/333810 ) Change subject: Update list of spec authors basd on git shortlog -n Specification.md .. Update list of spec authors basd on git shortlog -n Specification.md Change-Id: Ifc4741c9d18ae10b44b7f224a000e1d04f6c9462 --- M Specification.md 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/TemplateData refs/changes/10/333810/1 diff --git a/Specification.md b/Specification.md index d0133b9..57aea75 100644 --- a/Specification.md +++ b/Specification.md @@ -6,7 +6,7 @@ This version https://git.wikimedia.org/blob/mediawiki%2Fextensions%2FTemplateData/master/Specification.md";>https://git.wikimedia.org/blob/mediawiki%2Fextensions%2FTemplateData/master/Specification.md Editors - Timo Tijhof, Trevor Parscal, James D. Forrester, Marielle Volz + Timo Tijhof, Trevor Parscal, James D. Forrester, Marielle Volz, Moriel Schottlender, C.Scott Ananian, eranroz *** -- To view, visit https://gerrit.wikimedia.org/r/333810 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ifc4741c9d18ae10b44b7f224a000e1d04f6c9462 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/TemplateData Gerrit-Branch: master Gerrit-Owner: Catrope ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] oojs/ui[master]: FloatableElement: More correctly decide if we need custom po...
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/332758 )
Change subject: FloatableElement: More correctly decide if we need custom
position
..
FloatableElement: More correctly decide if we need custom position
Bug: T130169
Change-Id: I22f2ca72cf7c2f05f1c0bd7f1acfa30656e50725
---
M src/mixins/FloatableElement.js
1 file changed, 2 insertions(+), 3 deletions(-)
Approvals:
Catrope: Looks good to me, approved
jenkins-bot: Verified
Jforrester: Looks good to me, but someone else must approve
diff --git a/src/mixins/FloatableElement.js b/src/mixins/FloatableElement.js
index 8fa82e5..ced8660 100644
--- a/src/mixins/FloatableElement.js
+++ b/src/mixins/FloatableElement.js
@@ -77,7 +77,7 @@
* @chainable
*/
OO.ui.mixin.FloatableElement.prototype.togglePositioning = function (
positioning ) {
- var closestScrollableOfContainer, closestScrollableOfFloatable;
+ var closestScrollableOfContainer;
positioning = positioning === undefined ? !this.positioning :
!!positioning;
@@ -85,8 +85,7 @@
this.positioning = positioning;
closestScrollableOfContainer =
OO.ui.Element.static.getClosestScrollableContainer( this.$floatableContainer[ 0
] );
- closestScrollableOfFloatable =
OO.ui.Element.static.getClosestScrollableContainer( this.$floatable[ 0 ] );
- this.needsCustomPosition = closestScrollableOfContainer !==
closestScrollableOfFloatable;
+ this.needsCustomPosition = !OO.ui.contains(
this.$floatableContainer[ 0 ], this.$floatable[ 0 ] );
// If the scrollable is the root, we have to listen to scroll
events
// on the window because of browser inconsistencies.
if ( $( closestScrollableOfContainer ).is( 'html, body' ) ) {
--
To view, visit https://gerrit.wikimedia.org/r/332758
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I22f2ca72cf7c2f05f1c0bd7f1acfa30656e50725
Gerrit-PatchSet: 2
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: Bartosz Dziewoński
Gerrit-Reviewer: Catrope
Gerrit-Reviewer: Jforrester
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]: demo: Failing demo for DropdownWidget with an overlay
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/277931 )
Change subject: demo: Failing demo for DropdownWidget with an overlay
..
demo: Failing demo for DropdownWidget with an overlay
This exposes the FloatableElement regression from T130153 / I5b5d7936.
The dropdown added by this patch doesn't work: its menu is painted
in the top left corner of the document instead. If you scroll
up there you won't find it, though, because scrolling the
DropdownWidget out of view hides the menu.
Bug: T130169
Change-Id: I6b2b72244bf820d599d24c0539f5931e31323837
---
M demos/pages/widgets.js
1 file changed, 30 insertions(+), 0 deletions(-)
Approvals:
Bartosz Dziewoński: Looks good to me, but someone else must approve
jenkins-bot: Verified
Jforrester: Looks good to me, approved
diff --git a/demos/pages/widgets.js b/demos/pages/widgets.js
index 9467644..2b9832c 100644
--- a/demos/pages/widgets.js
+++ b/demos/pages/widgets.js
@@ -1284,6 +1284,36 @@
}
),
new OO.ui.FieldLayout(
+ new OO.ui.DropdownWidget( {
+ label: 'Select one',
+ $overlay: $( ''
).appendTo( 'body' ).css( { position: 'absolute', top: 0, left: 0 } ),
+ menu: {
+ items: [
+ new
OO.ui.MenuOptionWidget( {
+ data:
'a',
+ label:
'First'
+ } ),
+ new
OO.ui.MenuOptionWidget( {
+ data:
'b',
+ label:
'Second'
+ } ),
+ new
OO.ui.MenuOptionWidget( {
+ data:
'c',
+ label:
'Third'
+ } ),
+ new
OO.ui.MenuOptionWidget( {
+ data:
'd',
+ label:
'Fourth'
+ } )
+ ]
+ }
+ } ),
+ {
+ label: 'DropdownWidget (using
overlay)\u200E',
+ align: 'top'
+ }
+ ),
+ new OO.ui.FieldLayout(
new OO.ui.DropdownInputWidget( {
options: [
{
--
To view, visit https://gerrit.wikimedia.org/r/277931
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I6b2b72244bf820d599d24c0539f5931e31323837
Gerrit-PatchSet: 5
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: Catrope
Gerrit-Reviewer: Bartosz Dziewoński
Gerrit-Reviewer: Jforrester
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]: PopupButtonWidget: Add $overlay config option
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/330462 )
Change subject: PopupButtonWidget: Add $overlay config option
..
PopupButtonWidget: Add $overlay config option
Code in PopupButtonWidget / PopupWidget based on
DropdownWidget / FloatingMenuSelectWidget.
Bug: T146531
Change-Id: Ibab4be23b20edef23686e4563db2acc0d69f52b6
---
M build/modules.yaml
M demos/pages/dialogs.js
M src/themes/apex/widgets.less
M src/themes/mediawiki/widgets.less
M src/widgets/PopupButtonWidget.js
M src/widgets/PopupWidget.js
6 files changed, 56 insertions(+), 14 deletions(-)
Approvals:
Catrope: Looks good to me, approved
jenkins-bot: Verified
Jforrester: Looks good to me, but someone else must approve
diff --git a/build/modules.yaml b/build/modules.yaml
index 70381b1..df434bc 100644
--- a/build/modules.yaml
+++ b/build/modules.yaml
@@ -37,8 +37,10 @@
# The JavaScript-specific dependencies of the basic
widgets. It's sad how many there are :(
# TextInputWidget
"src/mixins/PendingElement.js",
- # FieldLayout, FieldsetLayout
+ # ComboBoxInputWidget, DropdownWidget, PopupWidget
+ "src/mixins/FloatableElement.js",
"src/mixins/ClippableElement.js",
+ # FieldLayout, FieldsetLayout
"src/widgets/PopupWidget.js",
"src/mixins/PopupElement.js",
"src/widgets/PopupButtonWidget.js",
@@ -62,7 +64,6 @@
"src/widgets/CheckboxMultioptionWidget.js",
"src/widgets/CheckboxMultiselectWidget.js",
# ComboBoxInputWidget
- "src/mixins/FloatableElement.js",
"src/widgets/FloatingMenuSelectWidget.js",
# ProgressBarWidget
"src/widgets/ProgressBarWidget.js",
diff --git a/demos/pages/dialogs.js b/demos/pages/dialogs.js
index ef5c62d..e6108ff 100644
--- a/demos/pages/dialogs.js
+++ b/demos/pages/dialogs.js
@@ -632,6 +632,28 @@
items: this.makeItems()
} ), $spacer.clone() ]
} ),
+ new SamplePage( 'popupbutton', {
+ label: 'PopupButtonWidget',
+ content: [ $spacer.clone(), new
OO.ui.PopupButtonWidget( {
+ $overlay: this.$overlay,
+ label: 'Popup button',
+ popup: {
+ padded: true,
+ $content: $( '' ).text(
'Popup contents.' )
+ }
+ } ), $spacer.clone() ]
+ } ),
+ new SamplePage( 'popupbutton2', {
+ label: 'PopupButtonWidget',
+ icon: 'alert',
+ content: [ $spacer.clone(), new
OO.ui.PopupButtonWidget( {
+ label: 'Popup button',
+ popup: {
+ padded: true,
+ $content: $( '' ).text(
'Popup contents.' )
+ }
+ } ), $spacer.clone() ]
+ } ),
new SamplePage( 'capsule', {
label: 'CapsuleMultiselectWidget',
content: [ $spacer.clone(), new
OO.ui.CapsuleMultiselectWidget( {
@@ -652,7 +674,7 @@
} )
];
this.bookletLayout.on( 'set', function ( page ) {
- page.$element[ 0 ].scrollTop = 300;
+ page.$element[ 0 ].scrollTop = 325;
} );
this.bookletLayout.addPages( this.pages );
this.$body.append( this.bookletLayout.$element );
diff --git a/src/themes/apex/widgets.less b/src/themes/apex/widgets.less
index f076a7a..9498355 100644
--- a/src/themes/apex/widgets.less
+++ b/src/themes/apex/widgets.less
@@ -63,17 +63,17 @@
}
.theme-oo-ui-popupButtonWidget () {
- &.oo-ui-buttonElement-frameless > .oo-ui-popupWidget {
+ .oo-ui-popupWidget&-frameless-popup {
// Compensate for icon being inset
/* @noflip */
- left: @size-icon / 2;
+ margin-left: @size-icon / 2;
}
- &.oo-ui-buttonElement-framed > .oo-ui-popupWidget {
+ .oo-ui-popupWidget&-framed-popup {
// Compensate for icon being in
[MediaWiki-commits] [Gerrit] mediawiki...BlogPage[master]: Remove unused wgSupress* globals and duplicate heading
SamanthaNguyen has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/333809 )
Change subject: Remove unused wgSupress* globals and duplicate heading
..
Remove unused wgSupress* globals and duplicate heading
Bug: T143145
Change-Id: I28ad3f0a32691ed6d77cc42a5034326427c461f4
---
M BlogPageHooks.php
M SpecialArticleLists.php
M SpecialArticlesHome.php
M extension.json
M resources/css/ext.blogpage.articleshome.css
M resources/css/ext.blogpage.blogpage.css
6 files changed, 4 insertions(+), 24 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlogPage
refs/changes/09/333809/1
diff --git a/BlogPageHooks.php b/BlogPageHooks.php
index 559e0ce..5568fbf 100644
--- a/BlogPageHooks.php
+++ b/BlogPageHooks.php
@@ -16,16 +16,9 @@
* @return bool
*/
public static function blogFromTitle( &$title, &$article ) {
- global $wgHooks, $wgOut, $wgRequest, $wgSupressPageTitle,
$wgSupressSubTitle, $wgSupressPageCategories;
+ global $wgHooks, $wgOut;
if ( $title->getNamespace() == NS_BLOG ) {
- if ( !$wgRequest->getVal( 'action' ) ) {
- $wgSupressPageTitle = true;
- }
-
- $wgSupressSubTitle = true;
- $wgSupressPageCategories = true;
-
// This will suppress category links in
SkinTemplate-based skins
$wgHooks['SkinTemplateOutputPageBeforeExec'][] =
function( $sk, $tpl ) {
$tpl->set( 'catlinks', '' );
diff --git a/SpecialArticleLists.php b/SpecialArticleLists.php
index cffe104..4d5f4d3 100644
--- a/SpecialArticleLists.php
+++ b/SpecialArticleLists.php
@@ -41,8 +41,6 @@
$output = '';
if ( !$this->including() ) {
- $output .= '' . $this->msg( 'ah-new-articles'
)->escaped() . '';
-
$descMsg = $this->msg( 'ah-new-articles-summary' );
if ( !$descMsg->isDisabled() ) {
$output .= Xml::tags('div', array(
diff --git a/SpecialArticlesHome.php b/SpecialArticlesHome.php
index 608149c..a69af2e 100644
--- a/SpecialArticlesHome.php
+++ b/SpecialArticlesHome.php
@@ -25,9 +25,7 @@
* @param string $type What kind of articles to show? Default is
'popular'
*/
public function execute( $type ) {
- global $wgContLang, $wgSupressPageTitle;
-
- $wgSupressPageTitle = true;
+ global $wgContLang;
$out = $this->getOutput();
// Add CSS
@@ -63,7 +61,6 @@
// Start building the HTML output
$output = '';
$output .= '';
- $output .= '' . $name->escaped() . '';
$output .= '' .
$this->msg( 'ah-write-article' )->escaped() . ' -
https://gerrit.wikimedia.org/r/333809
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I28ad3f0a32691ed6d77cc42a5034326427c461f4
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlogPage
Gerrit-Branch: master
Gerrit-Owner: SamanthaNguyen
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...TimedMediaHandler[master]: build: Update package versions
Esanders has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/333806 )
Change subject: build: Update package versions
..
build: Update package versions
Switch from grunt-patch (abandoned at grunt 0.4)
to grunt-patcher (maintained fork). No requires that
a patch file exists to avoid an error code.
Change-Id: Ia22da2b06861de1e1df6f9f0c574d7558aa5619b
---
M Gruntfile.js
M package.json
A patches/videojs.defaults.patch
3 files changed, 10 insertions(+), 11 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/TimedMediaHandler
refs/changes/06/333806/1
diff --git a/Gruntfile.js b/Gruntfile.js
index fd1235a..2089bd6 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -1,12 +1,12 @@
/*jshint node:true */
module.exports = function ( grunt ) {
+ grunt.loadNpmTasks( 'grunt-banana-checker' );
grunt.loadNpmTasks( 'grunt-contrib-copy' );
grunt.loadNpmTasks( 'grunt-contrib-jshint' );
- grunt.loadNpmTasks( 'grunt-jsonlint' );
- grunt.loadNpmTasks( 'grunt-banana-checker' );
- grunt.loadNpmTasks( 'grunt-jscs' );
grunt.loadNpmTasks( 'grunt-exec' );
- grunt.loadNpmTasks( 'grunt-patch' );
+ grunt.loadNpmTasks( 'grunt-jscs' );
+ grunt.loadNpmTasks( 'grunt-jsonlint' );
+ grunt.loadNpmTasks( 'grunt-patcher' );
grunt.initConfig( {
jshint: {
diff --git a/package.json b/package.json
index 6d24ac1..4662f84 100644
--- a/package.json
+++ b/package.json
@@ -4,15 +4,14 @@
"test": "grunt test"
},
"devDependencies": {
-"grunt": "0.4.5",
-"grunt-banana-checker": "0.4.0",
-"grunt-cli": "0.1.13",
+"grunt": "1.0.1",
+"grunt-banana-checker": "0.5.0",
"grunt-contrib-copy": "^0.8.2",
+"grunt-exec": "1.0.1",
"grunt-contrib-jshint": "1.0.0",
-"grunt-exec": "^0.4.6",
-"grunt-jscs": "2.8.0",
-"grunt-jsonlint": "1.0.7",
-"grunt-patch": "^0.1.7",
+"grunt-jsonlint": "1.1.0",
+"grunt-jscs": "3.0.1",
+"grunt-patcher": "1.0.0",
"jscs-preset-wikimedia": "~1.0.0",
"video.js": "^5.12.2",
"videojs-ogvjs": "^1.3.1",
diff --git a/patches/videojs.defaults.patch b/patches/videojs.defaults.patch
new file mode 100644
index 000..e69de29
--- /dev/null
+++ b/patches/videojs.defaults.patch
--
To view, visit https://gerrit.wikimedia.org/r/333806
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia22da2b06861de1e1df6f9f0c574d7558aa5619b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/TimedMediaHandler
Gerrit-Branch: master
Gerrit-Owner: Esanders
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...TimedMediaHandler[master]: build: Introduce stylelint and make a pass
Esanders has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/333808 )
Change subject: build: Introduce stylelint and make a pass
..
build: Introduce stylelint and make a pass
Change-Id: Ie3000d73a5ea58d66f7652ca9b9b1a7ed5010dbe
---
A .stylelintrc
M Gruntfile.js
M package.json
M resources/PopUpThumbVideo.css
M resources/embedPlayerIframe.css
M resources/ext.tmh.player.styles.less
M resources/ext.tmh.thumbnail.css
M resources/transcodeTable.css
8 files changed, 43 insertions(+), 21 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/TimedMediaHandler
refs/changes/08/333808/1
diff --git a/.stylelintrc b/.stylelintrc
new file mode 100644
index 000..2c90730
--- /dev/null
+++ b/.stylelintrc
@@ -0,0 +1,3 @@
+{
+ "extends": "stylelint-config-wikimedia"
+}
diff --git a/Gruntfile.js b/Gruntfile.js
index 32fe844..e4f137a 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -6,11 +6,24 @@
grunt.loadNpmTasks( 'grunt-exec' );
grunt.loadNpmTasks( 'grunt-jsonlint' );
grunt.loadNpmTasks( 'grunt-patcher' );
+ grunt.loadNpmTasks( 'grunt-stylelint' );
grunt.initConfig( {
eslint: {
all: [
'**/*.js',
+ '!MwEmbedModules/**',
+ '!resources/videojs*/**',
+ '!resources/mw-info-button/**',
+ '!node_modules/**'
+ ]
+ },
+ stylelint: {
+ options: {
+ syntax: 'less'
+ },
+ all: [
+ '**/*.{css,less}',
'!MwEmbedModules/**',
'!resources/videojs*/**',
'!resources/mw-info-button/**',
@@ -97,6 +110,6 @@
} );
grunt.registerTask( 'update-videojs', [ 'exec:npm-update-videojs',
'copy:video.js', 'copy:videojs-resolution-switcher', 'copy:videojs-ogvjs',
'copy:videojs-responsive-layout', 'copy:videojs-replay', 'patch:video.js' ] );
- grunt.registerTask( 'test', [ 'eslint', 'jsonlint', 'banana' ] );
+ grunt.registerTask( 'test', [ 'eslint', 'stylelint', 'jsonlint',
'banana' ] );
grunt.registerTask( 'default', 'test' );
};
diff --git a/package.json b/package.json
index 4bfc1db..7ca7368 100644
--- a/package.json
+++ b/package.json
@@ -12,6 +12,8 @@
"grunt-exec": "1.0.1",
"grunt-jsonlint": "1.1.0",
"grunt-patcher": "1.0.0",
+"grunt-stylelint": "0.6.0",
+"stylelint-config-wikimedia": "0.3.0",
"video.js": "^5.12.2",
"videojs-ogvjs": "^1.3.1",
"videojs-replay": "^1.1.0",
diff --git a/resources/PopUpThumbVideo.css b/resources/PopUpThumbVideo.css
index 5f97d7f..b981235 100644
--- a/resources/PopUpThumbVideo.css
+++ b/resources/PopUpThumbVideo.css
@@ -1,17 +1,19 @@
.PopUpMediaTransform a .play-btn-large {
top: 50%;
- left : 50%;
+ left: 50%;
width: 70px;
height: 53px;
margin-left: -35px;
margin-top: -25px;
/* @embed */
- background-image:url('player_big_play_button.png');
+ background-image: url( player_big_play_button.png );
}
+
.PopUpMediaTransform a .play-btn-large :hover {
/* @embed */
- background-image:url('player_big_play_button_hover.png');
+ background-image: url( player_big_play_button_hover.png );
}
+
/* Should hopefully be only visible to screen readers */
.mw-tmh-playtext {
display: block;
diff --git a/resources/embedPlayerIframe.css b/resources/embedPlayerIframe.css
index 584e04a..533e715 100644
--- a/resources/embedPlayerIframe.css
+++ b/resources/embedPlayerIframe.css
@@ -5,16 +5,20 @@
margin-bottom: 0;
overflow: hidden;
}
-html, body {
+
+html,
+body {
height: 100%;
width: 100%;
margin: 0;
padding: 0;
}
-#videoContainer .videoHolder {
+
+#videoContainer .videoHolder { /* stylelint-disable-line selector-no-id */
position: static;
}
-#videoContainer {
+
+#videoContainer { /* stylelint-disable-line selector-no-id */
width: 100%;
height: 100%;
background-color: #000;
diff --git a/resources/ext.tmh.player.styles.less
b/resources/ext.tmh.player.styles.less
index b4fa311..0c0783b 100644
--- a/resources/ext.tmh.player.styles.less
+++ b/resources/ext.tmh.player.styles.less
@@ -32,7 +32,7 @@
/* Resets styling on the resolution button. Our content linewraps */
.vjs-resolution-button ul.vjs-menu-content.vjs-menu-content {
margin-left: -6em;
- width: 100% !important;
+ width: 100% !important; /* stylelint-disable-line
declaration-no-important */
}
/* Audio player skin */
@@ -53,25 +53,20 @@
}
&.vjs-waiting .vjs-progress-holder
[MediaWiki-commits] [Gerrit] mediawiki...TimedMediaHandler[master]: build: Replace jshint/jscs with eslint
Esanders has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/333807 )
Change subject: build: Replace jshint/jscs with eslint
..
build: Replace jshint/jscs with eslint
Change-Id: Iaf792a6a4952439bc2ae6ff693dcbfee6218c47e
---
A .eslintrc.json
D .jscsrc
D .jshintignore
D .jshintrc
M Gruntfile.js
M package.json
M resources/ext.tmh.OgvJsSupport.js
M resources/ext.tmh.embedPlayerIframe.js
M resources/ext.tmh.player.js
M resources/ext.tmh.transcodetable.js
M resources/mw.MediaWikiPlayerSupport.js
M resources/mw.PopUpThumbVideo.js
12 files changed, 74 insertions(+), 117 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/TimedMediaHandler
refs/changes/07/333807/1
diff --git a/.eslintrc.json b/.eslintrc.json
new file mode 100644
index 000..a29fd88
--- /dev/null
+++ b/.eslintrc.json
@@ -0,0 +1,11 @@
+{
+ "extends": "wikimedia",
+ "env": {
+ "browser": true,
+ "jquery": true
+ },
+ "globals": {
+ "mediaWiki": false,
+ "OO": false
+ }
+}
diff --git a/.jscsrc b/.jscsrc
deleted file mode 100644
index 4cf5f8b..000
--- a/.jscsrc
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "preset": "wikimedia",
- "requireVarDeclFirst": null,
- "requireMultipleVarDecl": null
-}
diff --git a/.jshintignore b/.jshintignore
deleted file mode 100644
index 0b19ceb..000
--- a/.jshintignore
+++ /dev/null
@@ -1,8 +0,0 @@
-MwEmbedModules
-resources/videojs
-resources/videojs-resolution-switcher
-resources/videojs-responsive-layout
-resources/mw-info-button
-
-node_modules
-vendor
diff --git a/.jshintrc b/.jshintrc
deleted file mode 100644
index a2125aa..000
--- a/.jshintrc
+++ /dev/null
@@ -1,44 +0,0 @@
-{
- /* Common */
-
- // Enforcing
- "camelcase": true,
- "curly": true,
- "eqeqeq": true,
- "immed": true,
- "latedef": "nofunc",
- "newcap": true,
- "noarg": true,
- "noempty": true,
- "nonew": true,
- "quotmark": "single",
- "trailing": true,
- "undef": true,
- "unused": true,
- // Legacy
- "onevar": true,
-
- /* Local */
-
- // Enforcing
- "bitwise": true,
- "es3": true,
- // Relaxing
- "laxbreak": true,
- "smarttabs": true,
- "multistr": true,
- // Environment
- "browser": true,
- // Legacy
- "nomen": true,
-
- "globals": {
- "mediaWiki": false,
- "jQuery": false,
- "OGVVersion": false,
- "OGVSupport": false,
- "OGVPlayer": false,
- "OGVLoader": false,
- "videojs": false
- }
-}
diff --git a/Gruntfile.js b/Gruntfile.js
index 2089bd6..32fe844 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -1,18 +1,14 @@
-/*jshint node:true */
+/* eslint-env node */
module.exports = function ( grunt ) {
grunt.loadNpmTasks( 'grunt-banana-checker' );
grunt.loadNpmTasks( 'grunt-contrib-copy' );
- grunt.loadNpmTasks( 'grunt-contrib-jshint' );
+ grunt.loadNpmTasks( 'grunt-eslint' );
grunt.loadNpmTasks( 'grunt-exec' );
- grunt.loadNpmTasks( 'grunt-jscs' );
grunt.loadNpmTasks( 'grunt-jsonlint' );
grunt.loadNpmTasks( 'grunt-patcher' );
grunt.initConfig( {
- jshint: {
- options: {
- jshintrc: true
- },
+ eslint: {
all: [
'**/*.js',
'!MwEmbedModules/**',
@@ -20,9 +16,6 @@
'!resources/mw-info-button/**',
'!node_modules/**'
]
- },
- jscs: {
- src: '<%= jshint.all %>'
},
banana: {
all: 'i18n/',
@@ -104,6 +97,6 @@
} );
grunt.registerTask( 'update-videojs', [ 'exec:npm-update-videojs',
'copy:video.js', 'copy:videojs-resolution-switcher', 'copy:videojs-ogvjs',
'copy:videojs-responsive-layout', 'copy:videojs-replay', 'patch:video.js' ] );
- grunt.registerTask( 'test', [ 'jshint', 'jscs', 'jsonlint', 'banana' ]
);
+ grunt.registerTask( 'test', [ 'eslint', 'jsonlint', 'banana' ] );
grunt.registerTask( 'default', 'test' );
};
diff --git a/package.json b/package.json
index 4662f84..4bfc1db 100644
--- a/package.json
+++ b/package.json
@@ -5,14 +5,13 @@
},
"devDependencies": {
"grunt": "1.0.1",
+"eslint-config-wikimedia": "0.3.0",
"grunt-banana-checker": "0.5.0",
"grunt-contrib-copy": "^0.8.2",
+"grunt-eslint": "19.0.0",
"grunt-exec": "1.0.1",
-"grunt-contrib-jshint": "1.0.0",
"grunt-jsonlint": "1.1.0",
-"grunt-jscs": "3.0.1",
"grunt-patcher":
[MediaWiki-commits] [Gerrit] mediawiki...PageImages[master]: UseGalleries is unused
Jdlrobson has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/333804 )
Change subject: UseGalleries is unused
..
UseGalleries is unused
Unless I'm mistaken this config variable has never been used
in this codebase since introduction in
I64e997d58e4a1b66a8a351d85a3e7df1a77354e9
It's not documented so not clear why it is needed
and not referenced in this codebase.
Change-Id: Ib227eefb77ba2719db277fa80a8bfb958ea6a778
---
M extension.json
1 file changed, 0 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/PageImages
refs/changes/04/333804/1
diff --git a/extension.json b/extension.json
index 04c445c..25ca45d 100644
--- a/extension.json
+++ b/extension.json
@@ -87,9 +87,6 @@
"@doc": "Temporary feature flag - Whether page images
should be restricted to those in section id 0.",
"@fixme": "Please remove a month after it has defaulted
to true on the cluster (T152115)",
"value": false
- },
- "PageImagesUseGalleries": {
- "value": false
}
},
"manifest_version": 2
--
To view, visit https://gerrit.wikimedia.org/r/333804
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib227eefb77ba2719db277fa80a8bfb958ea6a778
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/PageImages
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...PageImages[master]: Document page property names
Jdlrobson has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/333805 ) Change subject: Document page property names .. Document page property names This should protect us when we consider renaming these variables in future. Bug: T152239 Change-Id: I227ffd0867f797d6a450b8b51759338cff7ee3a8 --- M includes/PageImages.php 1 file changed, 9 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/PageImages refs/changes/05/333805/1 diff --git a/includes/PageImages.php b/includes/PageImages.php index 8081ffa..8eda85f 100644 --- a/includes/PageImages.php +++ b/includes/PageImages.php @@ -12,16 +12,24 @@ * Page property used to store the best page image information. * If the best image is the same as the best image with free license, * then nothing is stored under this property. +* Note changing this value is not advised as it will invalidate all +* existing page property names on a production instance +* and cause them to be regenerated. * @see PageImages::PROP_NAME_FREE */ const PROP_NAME = 'page_image'; /** * Page property used to store the best free page image information +* Note changing this value is not advised as it will invalidate all +* existing page property names on a production instance +* and cause them to be regenerated. */ const PROP_NAME_FREE = 'page_image_free'; /** -* Get property name used in page_props table +* Get property name used in page_props table. When a page image +* is stored it will be stored under this property name on the corresponding +* article. * * @param bool $isFree Whether the image is a free-license image * @return string -- To view, visit https://gerrit.wikimedia.org/r/333805 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I227ffd0867f797d6a450b8b51759338cff7ee3a8 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/PageImages Gerrit-Branch: master Gerrit-Owner: Jdlrobson ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Localisation updates from https://translatewiki.net.
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/333607 ) Change subject: Localisation updates from https://translatewiki.net. .. Localisation updates from https://translatewiki.net. Change-Id: I66e36a088640ed8d54606b83fb0fad4d567f150c --- M app/src/main/res/values-ast/strings.xml M app/src/main/res/values-bn/strings.xml M app/src/main/res/values-br/strings.xml M app/src/main/res/values-cs/strings.xml M app/src/main/res/values-da/strings.xml M app/src/main/res/values-de/strings.xml M app/src/main/res/values-fi/strings.xml M app/src/main/res/values-fr/strings.xml M app/src/main/res/values-in/strings.xml M app/src/main/res/values-it/strings.xml M app/src/main/res/values-iw/strings.xml M app/src/main/res/values-jv/strings.xml M app/src/main/res/values-ka/strings.xml M app/src/main/res/values-ko/strings.xml M app/src/main/res/values-lb/strings.xml M app/src/main/res/values-lt/strings.xml M app/src/main/res/values-lv/strings.xml M app/src/main/res/values-mk/strings.xml M app/src/main/res/values-ms/strings.xml M app/src/main/res/values-pl/strings.xml M app/src/main/res/values-pt-rBR/strings.xml M app/src/main/res/values-ru/strings.xml M app/src/main/res/values-sah/strings.xml M app/src/main/res/values-sd/strings.xml M app/src/main/res/values-sr/strings.xml M app/src/main/res/values-sv/strings.xml M app/src/main/res/values-ta/strings.xml M app/src/main/res/values-tcy/strings.xml M app/src/main/res/values-tr/strings.xml M app/src/main/res/values-zh-rTW/strings.xml M app/src/main/res/values-zh/strings.xml 31 files changed, 348 insertions(+), 7 deletions(-) Approvals: Niedzielski: Looks good to me, approved jenkins-bot: Verified diff --git a/app/src/main/res/values-ast/strings.xml b/app/src/main/res/values-ast/strings.xml index 773fc63..77b7776 100644 --- a/app/src/main/res/values-ast/strings.xml +++ b/app/src/main/res/values-ast/strings.xml @@ -278,6 +278,16 @@ Entendílo Conseyu: barre cualquier páxina a la izquierda o a la derecha pa quitala d\'esta llista de llectura. Preferencies + Ver la páxina + Falar col usuariu + Ver l\'historial d\'ediciones + Avisu en Wikipedia + Mensaxe nuevu en Wikipedia + %1$s dexó un mensaxe na to páxina d\'alderique «%2$s» + Edición revertida + %1$s revertió la to edición del artículu «%2$s». + ¡Diéronte les gracies! + %1$s agradecióte la edición de la páxina «%2$s» Siguir lleyendo Porque lleísti Al debalu diff --git a/app/src/main/res/values-bn/strings.xml b/app/src/main/res/values-bn/strings.xml index 4bf6d25..4cee378 100644 --- a/app/src/main/res/values-bn/strings.xml +++ b/app/src/main/res/values-bn/strings.xml @@ -238,6 +238,9 @@ একটি পড়ার তালিকা এই নিবন্ধটি যোগ করে নিবন্ধের লিঙ্ক ভাগ করুন নিবন্ধের অবস্থান থেকে পরিভ্রমণ করুন + সম্পাদনা করা + বিবরণ সম্পাদনা করুন + ভূমিকা সম্পাদনা আমার তালিকা শিরোনামহীন পড়ার তালিকায় সংরক্ষণ করুন @@ -275,6 +278,15 @@ বুঝেছি পরামর্শি: যে কোন পাতা পড়ার তালিকা থেকে মুছে ফেলার জন্য সেই পাতা বাম বা ডান দিকে টেনে আনুন। পছন্দসমূহ + পাতা দেখাও + ব্যাবহারকারীর সঙ্গে আলাপ + সম্পাদনার ইতিহাস দেখাও + উইকিপিড়িয়ার বিজ্ঞপ্তি + উইকিপিড়িয়ার নতুন বার্তা + %1$sআলাপ পাতায় তোমার বার্তা লিখ%2$s + পুনরায় সম্পাদনা করা + তোমার সম্পাদন করা প্রবন্ধে %2$sপুনঃসম্পাদিত করেছে%1$s + আপনাকে ধন্যবাদ জানান হয়েছে পড়া অব্যাহত রাখুন কারণ আপনি পড়েছেন অজানা পাতা @@ -309,10 +321,15 @@ বিবরণ লেখার জন্য উইকিউপাত্তের নির্দেশিকা https://www.wikidata.org/wiki/Wikidata:Introduction/bn https://www.wikidata.org/wiki/Help:Description/bn + বিবরণ রক্ষা করা হয়েছে + এইমাত্র আপনি উইকিপিড়িয়াকে আরো উত্তম করেছেন সবার জন্য + সম্পন্ন + আপনি জানেন কি? শিরোনামের বিবরণ পাঠককে এক নজরে বিষয় বুঝতে সাহায্য করার জন্য একটি নিবন্ধের সংক্ষিপ্ত বিবরণ লিখুন অগ্রসর হোন এটি সংক্ষিপ্ত রাখুন এক লাইনে, দুই থেকে বারো পর্যন্ত শব্দ রাখা যাবে সম্পাদনা শুরু করুন + শুউরুতেই আমি পণ করছি আমি আর ভুল করবো না diff --git a/app/src/main/res/values-br/strings.xml b/app/src/main/res/values-br/strings.xml index 8e2d553..9e8b641 100644 --- a/app/src/main/res/values-br/strings.xml +++ b/app/src/main/res/values-br/strings.xml @@ -278,6 +278,16 @@ Kaout anezhañ Alioù : Lakaat ur bajenn da riklañ a-zehoù pe a-gleiz evit lemel anezhi eus ar roll lenn-se. Penndibaboù + Gwelet ar bajenn + Komz gant an implijer + Gwelet istor ar c\'hemmoù + Kemennadenn war Wikipedia + Kemennadenn nevez war Wikipedia + Lezet ez eus bet ur gemennadenn war ho pajenn gaozeal \"%2$s\" gant %1$s + Kemm distaolet + Distaolet eo bet gant %1$s ar c\'hemm graet ganeoc\'h e %2$s\". + Trugarekaet oc\'h bet ! + Trugarekaet oc\'h bet gant %1$s evit ar c\'hemm graet ganeoc\'h war ar bajenn %2$s Kenderc\'hel da lenn Peogwir ho peus lennet Dre zegouezh diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index 2aa246f..3e7c1d3 100644 ---
[MediaWiki-commits] [Gerrit] mediawiki...CollaborationKit[master]: [WIP] Fixing bugs causing JS-based browsers to stall
Harej has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/333803 )
Change subject: [WIP] Fixing bugs causing JS-based browsers to stall
..
[WIP] Fixing bugs causing JS-based browsers to stall
Also specifying default hub image in the absence of input
Bug: T155615
Bug: T155579
Change-Id: I0966e7c5fd6c1d0e4878187bc212fa3facf6e264
---
M includes/SpecialCreateHubFeature.php
M modules/ext.CollaborationKit.colour.js
M modules/ext.CollaborationKit.hubimage.js
M modules/ext.CollaborationKit.icon.js
4 files changed, 46 insertions(+), 18 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CollaborationKit
refs/changes/03/333803/1
diff --git a/includes/SpecialCreateHubFeature.php
b/includes/SpecialCreateHubFeature.php
index a1af255..b64176b 100644
--- a/includes/SpecialCreateHubFeature.php
+++ b/includes/SpecialCreateHubFeature.php
@@ -65,7 +65,8 @@
'cssclass' => 'mw-ck-icon-input',
'label-message' =>
'collaborationkit-createhubfeature-icon',
'help-message' =>
'collaborationkit-createhubfeature-icon-help',
- 'options' => $iconChoices
+ 'options' => $iconChoices,
+ 'default' => 'circlestar'
],
'contenttype' => [
'type' => 'radio',
diff --git a/modules/ext.CollaborationKit.colour.js
b/modules/ext.CollaborationKit.colour.js
index 9841661..18df988 100644
--- a/modules/ext.CollaborationKit.colour.js
+++ b/modules/ext.CollaborationKit.colour.js
@@ -59,6 +59,8 @@
classes: [ 'mw-ck-colourchoice-container' ]
} );
+ this.radioSelect.selectItemByData( $( '.mw-ck-colour-input
select' ).val() );
+
this.content.$element.append( this.radioSelect.$element );
this.$body.append( this.content.$element );
diff --git a/modules/ext.CollaborationKit.hubimage.js
b/modules/ext.CollaborationKit.hubimage.js
index 1c02c01..365249d 100644
--- a/modules/ext.CollaborationKit.hubimage.js
+++ b/modules/ext.CollaborationKit.hubimage.js
@@ -17,9 +17,28 @@
// Use the initialize() method to add content to the dialog's $body,
// to initialize widgets, and to set up event handlers.
ProcessDialog.prototype.initialize = function () {
+ var defaultSearchTerm;
+
ProcessDialog.super.prototype.initialize.apply( this, arguments
);
- this.content = new mw.widgets.MediaSearchWidget();
+ // Default image search flow:
+ // First work off of existing value for hub image, if it exists
+ // If no hub image (new hub creation), search display title or
page title
+ // If nothing specified, fill in a filename for a generic icon
+
+ if ( $( '.mw-ck-hub-image-input input' ).val() != '' ) {
+ defaultSearchTerm = $( '.mw-ck-hub-image-input input'
).val();
+ } else if ( $( 'input[name=wpdisplay_name]' ).val() != '' ) {
+ defaultSearchTerm = $( 'input[name=wpdisplay_name]'
).val();
+ } else if ( $( 'input[name=wptitle]' ).val() != '' ) {
+ defaultSearchTerm = $( 'input[name=wptitle]' ).val();
+ } else {
+ defaultSearchTerm = 'OOjs UI icon puzzle-ltr.svg';
+ }
+
+ this.content = new mw.widgets.MediaSearchWidget( {
+ value: defaultSearchTerm
+ } );
this.$body.append( this.content.$element );
};
@@ -30,24 +49,27 @@
dialog = this;
if ( action ) {
- return new OO.ui.Process( function () {
- fileObj =
dialog.content.getResults().getSelectedItem().getData();
- fileUrl = fileObj.thumburl;
- fileTitle = new mw.Title( fileObj.title );
- fileTitle = fileTitle.title + '.' +
fileTitle.ext;
+ if ( $( '.mw-ck-hub-image-input input' ).val() != '' ) {
+ return new OO.ui.Process( function () {
+ fileObj =
dialog.content.getResults().getSelectedItem().getData();
+ fileUrl = fileObj.thumburl;
+ fileTitle = new mw.Title( fileObj.title
);
+ fileTitle = fileTitle.title + '.' +
fileTitle.ext;
- // Generate preview
- $( 'img.hubimagePreview' )
- .attr( 'style', 'display:block' )
-
[MediaWiki-commits] [Gerrit] oojs/ui[master]: Follow-up 1dc6a45, 1a11bb8b: stop using deprecated config.co...
Catrope has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/333802 )
Change subject: Follow-up 1dc6a45, 1a11bb8b: stop using deprecated
config.complete
..
Follow-up 1dc6a45, 1a11bb8b: stop using deprecated config.complete
Change-Id: If807b321fb549623de3df93241de7d8c01ca835c
---
M src/layouts/BookletLayout.js
M src/layouts/IndexLayout.js
2 files changed, 6 insertions(+), 10 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/02/333802/1
diff --git a/src/layouts/BookletLayout.js b/src/layouts/BookletLayout.js
index 537e81c..973ddc1 100644
--- a/src/layouts/BookletLayout.js
+++ b/src/layouts/BookletLayout.js
@@ -181,11 +181,9 @@
OO.ui.BookletLayout.prototype.onStackLayoutSet = function ( page ) {
var layout = this;
if ( !this.scrolling && page ) {
- page.scrollElementIntoView( {
- complete: function () {
- if ( layout.autoFocus && !OO.ui.isMobile() ) {
- layout.focus();
- }
+ page.scrollElementIntoView().done( function () {
+ if ( layout.autoFocus && !OO.ui.isMobile() ) {
+ layout.focus();
}
} );
}
diff --git a/src/layouts/IndexLayout.js b/src/layouts/IndexLayout.js
index c5ea9fe..77cd885 100644
--- a/src/layouts/IndexLayout.js
+++ b/src/layouts/IndexLayout.js
@@ -137,11 +137,9 @@
OO.ui.IndexLayout.prototype.onStackLayoutSet = function ( card ) {
var layout = this;
if ( card ) {
- card.scrollElementIntoView( {
- complete: function () {
- if ( layout.autoFocus && !OO.ui.isMobile() ) {
- layout.focus();
- }
+ card.scrollElementIntoView().done( function () {
+ if ( layout.autoFocus && !OO.ui.isMobile() ) {
+ layout.focus();
}
} );
}
--
To view, visit https://gerrit.wikimedia.org/r/333802
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: If807b321fb549623de3df93241de7d8c01ca835c
Gerrit-PatchSet: 1
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: Catrope
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...FanBoxes[master]: Remove unused wgSupressPageTitle global, keep native heading...
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/333674 )
Change subject: Remove unused wgSupressPageTitle global, keep native heading
style
..
Remove unused wgSupressPageTitle global, keep native heading style
- Keep native heading style instead of rolling out our own custom
CSS for the special page h1 heading
- Change all other h1 elements to h2 elements for accessibility
and semantics
- Added classes to h2 elements
- Slightly less code duplication
Bug: T143145
Change-Id: I0bc1e4b873db2cdfdd50a181be0a4c036af5a0a9
---
M FanBoxHooks.php
M FanBoxPage.php
M SpecialFanBoxes.css
M SpecialFanBoxes.php
M extension.json
5 files changed, 17 insertions(+), 35 deletions(-)
Approvals:
Jack Phoenix: Looks good to me, approved
jenkins-bot: Verified
diff --git a/FanBoxHooks.php b/FanBoxHooks.php
index 33dad33..286121a 100644
--- a/FanBoxHooks.php
+++ b/FanBoxHooks.php
@@ -41,11 +41,7 @@
* @return Boolean: true
*/
public static function deleteFanBox( &$article, &$user, $reason ) {
- global $wgSupressPageTitle;
-
if ( $article->getTitle()->getNamespace() == NS_FANTAG ) {
- $wgSupressPageTitle = true;
-
$dbw = wfGetDB( DB_MASTER );
$s = $dbw->selectRow(
@@ -127,11 +123,9 @@
* @return Boolean: true
*/
public static function fantagFromTitle( &$title, &$article ) {
- global $wgRequest, $wgOut, $wgSupressPageTitle;
+ global $wgRequest, $wgOut;
if ( $title->getNamespace() == NS_FANTAG ) {
- $wgSupressPageTitle = true;
-
// Add CSS
$wgOut->addModuleStyles( 'ext.fanBoxes' );
@@ -264,4 +258,4 @@
$list[NS_FANTAG_TALK] = 'UserBox_talk';
return true;
}
-}
\ No newline at end of file
+}
diff --git a/FanBoxPage.php b/FanBoxPage.php
index f6d8cfa..85ba7c3 100644
--- a/FanBoxPage.php
+++ b/FanBoxPage.php
@@ -40,7 +40,6 @@
$fanboxTitle = Title::makeTitle( NS_FANTAG,
$this->fan->getName() );
$output = '';
- $output .= "{$fanboxTitle->getPrefixedText()}";
$output .= '' .
$this->fan->outputFanBox();
@@ -162,4 +161,4 @@
" ";
}
-}
\ No newline at end of file
+}
diff --git a/SpecialFanBoxes.css b/SpecialFanBoxes.css
index 6d1e674..5d4cdff 100644
--- a/SpecialFanBoxes.css
+++ b/SpecialFanBoxes.css
@@ -23,13 +23,6 @@
width: 550px;
}
-.mw-body h1, .mw-body-primary h1 {
- font-size: 16px;
- margin: 10px 0px 10px 0px !important;
- border-bottom: none;
- font-weight: bold;
-}
-
table.fanBoxTable {
border: 0;
border-collapse: collapse; /* cellspacing=0 equivalent */
@@ -91,10 +84,6 @@
#inputRightSide {
width: 350px;
-}
-
-.add-colors h1 {
- clear: both;
}
#add-colors-left {
diff --git a/SpecialFanBoxes.php b/SpecialFanBoxes.php
index 8f3c9fc..8a793e1 100644
--- a/SpecialFanBoxes.php
+++ b/SpecialFanBoxes.php
@@ -175,27 +175,27 @@
';
- $output .= '' . $this->msg( 'fanbox-addtext'
)->plain() . '
+ $output .= '' .
$this->msg( 'fanbox-addtext' )->plain() . '
' . $this->msg(
'fanbox-leftsidetext' )->plain() . '' .
$this->msg(
'fanbox-display-image' )->plain() . ' ' .
$this->msg(
'fanbox-close-image' )->plain() . "
getFanBoxLeftText()}\" maxlength=\"11\">
- " .
$this->msg( 'fanbox-leftsideinstructions' )->plain() . '
+ " . $this->msg(
'fanbox-leftsideinstructions' )->plain() . '
' . $this->msg(
'fanbox-rightsidetext' )->plain() . ''
. $this->msg( 'fanbox-charsleft', ' ' )->text() . "
getFanBoxRightText()}\" maxlength=\"70\" />
- " .
$this->msg( 'fanbox-rightsideinstructions' )->plain() . '
+ " . $this->msg(
'fanbox-rightsideinstructions' )->plain() . '
';
$output .= '
-
[MediaWiki-commits] [Gerrit] wikimedia...SmashPig[master]: Override configuration with specific instances
Ejegg has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/333801 )
Change subject: Override configuration with specific instances
..
Override configuration with specific instances
Homebrew dependency injection is nearly complete. Last thing we'd
need would be a way to specify a runnable to return instances for
nodes.
This is mostly just useful for test cases, where you want to create
a mock on the fly and configure some return values. Should let us
get rid of the silly mock types in the Amazon SDK fork.
Change-Id: I6445c01429a337482d52399c5dafb2fd32c50717
---
M Core/Configuration.php
M Tests/ConfigurationTest.php
2 files changed, 37 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/SmashPig
refs/changes/01/333801/1
diff --git a/Core/Configuration.php b/Core/Configuration.php
index 7c9ec83..095daec 100644
--- a/Core/Configuration.php
+++ b/Core/Configuration.php
@@ -180,6 +180,18 @@
}
/**
+* For testing: provide a specific instance of an object to fulfil
requests
+* for a specific node. Helpful when using test library mocks that you
can't
+* declaratively configure with constructor parameters.
+*
+* @param $node string
+* @param $object object
+*/
+ public function overrideObjectInstance( $node, $object ) {
+ $this->objects[$node] = $object;
+ }
+
+ /**
* Obtain a value from the configuration. If the key does not exist
this will throw an
* exception.
*
diff --git a/Tests/ConfigurationTest.php b/Tests/ConfigurationTest.php
index 1044a2e..dc857d0 100644
--- a/Tests/ConfigurationTest.php
+++ b/Tests/ConfigurationTest.php
@@ -1,6 +1,9 @@
assertEquals( $expected, $config->val(
'endpoints/listener' ),
'Deep merge went as hoped' );
}
+
+ public function testOverrideObjectInstance() {
+ $config = $this->setConfig();
+
+ $this->assertInstanceOf(
+ SyslogLogStream::class,
+ $config->object( 'logging/log-streams/syslog' ),
+ 'Default config was not as expected.'
+ );
+
+ $overrideInstance = new ConsoleLogStream();
+ $config->overrideObjectInstance(
+ 'logging/log-streams/syslog',
+ $overrideInstance
+ );
+ $this->assertEquals(
+ spl_object_hash( $overrideInstance ),
+ spl_object_hash( $config->object(
'logging/log-streams/syslog' ) ),
+ 'Sorcery fizzled out. Do you have enough mana?'
+ );
+ }
+
}
--
To view, visit https://gerrit.wikimedia.org/r/333801
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I6445c01429a337482d52399c5dafb2fd32c50717
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/SmashPig
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...CirrusSearch[es5]: Update changed error type for rejected regex queries
EBernhardson has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/333800 )
Change subject: Update changed error type for rejected regex queries
..
Update changed error type for rejected regex queries
Regex's look to now be rejected with type query_shard_exception,
so adding it to the list. As far as i can tell QueryParsingException
no longer exists in 5.6, so replacing all occurances with the new
QueryShardException.
Depends-On: I208a8dbcc2cb05af69af84a8a534ca8e8e03897c
Change-Id: I3cb0265a78e528394ec3e7acd5314b035ce9698c
---
M includes/ElasticaErrorHandler.php
1 file changed, 2 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CirrusSearch
refs/changes/00/333800/1
diff --git a/includes/ElasticaErrorHandler.php
b/includes/ElasticaErrorHandler.php
index d13078a..4f7f1fa 100644
--- a/includes/ElasticaErrorHandler.php
+++ b/includes/ElasticaErrorHandler.php
@@ -86,7 +86,7 @@
'^too_complex_to_determinize_exception$',
'^elasticsearch_parse_exception$',
'^search_parse_exception$',
- '^query_parsing_exception$',
+ '^query_shard_exception$',
'^illegal_argument_exception$',
'^too_many_clauses$'
],
@@ -165,7 +165,7 @@
// it happens.
$cause = reset( $error['root_cause'] );
- if ( $cause['type'] === 'query_parsing_exception' ) {
+ if ( $cause['type'] === 'query_shard_exception' ) {
// The important part of the parse error message is
embedded a few levels down
// and comes before the next new line so lets slurp it
up and log it rather than
// the huge clump of error.
--
To view, visit https://gerrit.wikimedia.org/r/333800
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I3cb0265a78e528394ec3e7acd5314b035ce9698c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CirrusSearch
Gerrit-Branch: es5
Gerrit-Owner: EBernhardson
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...JsonConfig[master]: Merge "Fix "Call to undefined method JsonConfig\JCTitle::get...
MaxSem has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/333799 )
Change subject: Merge "Fix "Call to undefined method
JsonConfig\JCTitle::getPrefixedText()""
..
Merge "Fix "Call to undefined method JsonConfig\JCTitle::getPrefixedText()""
Change-Id: Ia5216d7f72f7da3367a41496905dcee96fa78c6c
---
M includes/JCDataApi.php
1 file changed, 1 insertion(+), 5 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/JsonConfig
refs/changes/99/333799/1
diff --git a/includes/JCDataApi.php b/includes/JCDataApi.php
index a22598c..294e332 100644
--- a/includes/JCDataApi.php
+++ b/includes/JCDataApi.php
@@ -15,11 +15,7 @@
$params = $this->extractRequestParams();
$jct = JCSingleton::parseTitle( $params['title'], NS_DATA );
if ( !$jct ) {
- if ( is_callable( [ $this, 'dieWithError' ] ) ) {
- $this->dieWithError( [ 'apierror-invalidtitle',
wfEscapeWikiText( $params['title'] ) ] );
- } else {
- $this->dieUsageMsg( [ 'invalidtitle',
$params['title'] ] );
- }
+ $this->dieWithError( [ 'apierror-invalidtitle',
wfEscapeWikiText( $params['title'] ) ] );
}
$data = JCSingleton::getContent( $jct );
--
To view, visit https://gerrit.wikimedia.org/r/333799
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia5216d7f72f7da3367a41496905dcee96fa78c6c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/JsonConfig
Gerrit-Branch: master
Gerrit-Owner: MaxSem
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: Update restbase to 5d1d44f
Ppchelko has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/333795 ) Change subject: Update restbase to 5d1d44f .. Update restbase to 5d1d44f List of changes: 463fd7d Specify 'any' license in TFA pageimage request cfc1670 Added option for 'monthly' granularity in metrics endpoint 1c71783 Log feed only for en.wiki xxx Update node module dependencies Change-Id: I8ce373b06b80a60997674ba940f7bf357542c9f9 --- M node_modules/content-type/package.json M node_modules/heapdump/build/Makefile M node_modules/heapdump/build/Release/.deps/Release/obj.target/addon/src/heapdump.o.d M node_modules/heapdump/build/addon.target.mk M node_modules/heapdump/build/config.gypi M node_modules/json-stable-stringify/package.json M node_modules/kad/package.json M node_modules/nan/nan.h M node_modules/nan/nan_callbacks.h M node_modules/nan/nan_callbacks_12_inl.h M node_modules/nan/nan_callbacks_pre_12_inl.h M node_modules/nan/nan_converters.h M node_modules/nan/nan_converters_43_inl.h M node_modules/nan/nan_converters_pre_43_inl.h M node_modules/nan/nan_implementation_12_inl.h M node_modules/nan/nan_implementation_pre_12_inl.h M node_modules/nan/nan_maybe_43_inl.h M node_modules/nan/nan_maybe_pre_43_inl.h M node_modules/nan/nan_new.h M node_modules/nan/nan_object_wrap.h M node_modules/nan/nan_persistent_12_inl.h M node_modules/nan/nan_persistent_pre_12_inl.h M node_modules/nan/nan_private.h M node_modules/nan/nan_typedarray_contents.h M node_modules/nan/nan_weak.h M node_modules/nan/package.json M node_modules/nan/tools/1to2.js A node_modules/normalize-package-data/test/normalize.js~ M node_modules/swagger-ui/package.json M restbase 30 files changed, 652 insertions(+), 261 deletions(-) Approvals: Ppchelko: Verified; Looks good to me, approved diff --git a/node_modules/content-type/package.json b/node_modules/content-type/package.json index a4e8165..b98eea9 100644 --- a/node_modules/content-type/package.json +++ b/node_modules/content-type/package.json @@ -49,7 +49,7 @@ "/" ], "_resolved": "git+https://github.com/wikimedia/content-type.git#47b2632d0a2ee79a7d67268e2f6621becd95d05b";, - "_shasum": "ff9dc790d6558b26110898bab39d0c214dc32067", + "_shasum": "241a59ae56e1c89aefb2ca6908c9dd3411cf7a20", "_shrinkwrap": null, "_spec": "content-type@git+https://github.com/wikimedia/content-type.git#master";, "_where": "/opt/service", diff --git a/node_modules/heapdump/build/Makefile b/node_modules/heapdump/build/Makefile index 80ab260..2f27e5e 100644 --- a/node_modules/heapdump/build/Makefile +++ b/node_modules/heapdump/build/Makefile @@ -308,8 +308,8 @@ endif quiet_cmd_regen_makefile = ACTION Regenerating $@ -cmd_regen_makefile = cd $(srcdir); /usr/local/nvm/versions/node/v6.9.1/lib/node_modules/npm/node_modules/node-gyp/gyp/gyp_main.py -fmake --ignore-environment "--toplevel-dir=." -I/opt/service/node_modules/heapdump/build/config.gypi -I/usr/local/nvm/versions/node/v6.9.1/lib/node_modules/npm/node_modules/node-gyp/addon.gypi -I/home/runuser/.node-gyp/6.9.1/include/node/common.gypi "--depth=." "-Goutput_dir=." "--generator-output=build" "-Dlibrary=shared_library" "-Dvisibility=default" "-Dnode_root_dir=/home/runuser/.node-gyp/6.9.1" "-Dnode_gyp_dir=/usr/local/nvm/versions/node/v6.9.1/lib/node_modules/npm/node_modules/node-gyp" "-Dnode_lib_file=node.lib" "-Dmodule_root_dir=/opt/service/node_modules/heapdump" binding.gyp -Makefile: $(srcdir)/../../../../home/runuser/.node-gyp/6.9.1/include/node/common.gypi $(srcdir)/../../../../usr/local/nvm/versions/node/v6.9.1/lib/node_modules/npm/node_modules/node-gyp/addon.gypi $(srcdir)/build/config.gypi $(srcdir)/binding.gyp +cmd_regen_makefile = cd $(srcdir); /usr/local/nvm/versions/node/v6.9.1/lib/node_modules/npm/node_modules/node-gyp/gyp/gyp_main.py -fmake --ignore-environment "--toplevel-dir=." -I/opt/service/node_modules/heapdump/build/config.gypi -I/usr/local/nvm/versions/node/v6.9.1/lib/node_modules/npm/node_modules/node-gyp/addon.gypi -I/root/.node-gyp/6.9.1/include/node/common.gypi "--depth=." "-Goutput_dir=." "--generator-output=build" "-Dlibrary=shared_library" "-Dvisibility=default" "-Dnode_root_dir=/root/.node-gyp/6.9.1" "-Dnode_gyp_dir=/usr/local/nvm/versions/node/v6.9.1/lib/node_modules/npm/node_modules/node-gyp" "-Dnode_lib_file=node.lib" "-Dmodule_root_dir=/opt/service/node_modules/heapdump" binding.gyp +Makefile: $(srcdir)/../../../../usr/local/nvm/versions/node/v6.9.1/lib/node_modules/npm/node_modules/node-gyp/addon.gypi $(srcdir)/build/config.gypi $(srcdir)/binding.gyp $(srcdir)/../../../../root/.node-gyp/6.9.1/include/node/common.gypi $(call do_cmd,regen_makefile) # "all" is a concatenation of the "all" targets from all the included diff --git a/node_modules/heapdump/build/Release/.deps/Release/obj.target/addon/src/heapdump.o.d b/node_modules/heapdump/build/Release/.deps/Release/obj.target/addon/src/heapdump
[MediaWiki-commits] [Gerrit] mediawiki...SyntaxHighlight_GeSHi[master]: Make sure $wgPygmentizePath is sane only when we need it
Legoktm has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/333797 )
Change subject: Make sure $wgPygmentizePath is sane only when we need it
..
Make sure $wgPygmentizePath is sane only when we need it
This avoids having an extension function, which runs on every request,
regardless of whether it uses syntax highlighting or not.
Change-Id: I890348b73af956819300cce64d0672dcdb209c19
---
M SyntaxHighlight_GeSHi.class.php
M extension.json
2 files changed, 5 insertions(+), 12 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/SyntaxHighlight_GeSHi
refs/changes/97/333797/1
diff --git a/SyntaxHighlight_GeSHi.class.php b/SyntaxHighlight_GeSHi.class.php
index 0a5913d..fc274b6 100644
--- a/SyntaxHighlight_GeSHi.class.php
+++ b/SyntaxHighlight_GeSHi.class.php
@@ -41,15 +41,6 @@
'text/xml' => 'xml',
);
- public static function onSetup() {
- global $wgPygmentizePath;
-
- // If $wgPygmentizePath is unset, use the bundled copy.
- if ( $wgPygmentizePath === false ) {
- $wgPygmentizePath = __DIR__ . '/pygments/pygmentize';
- }
- }
-
/**
* Get the Pygments lexer name for a particular language.
*
@@ -276,6 +267,11 @@
$output = $cache->get( $cacheKey );
if ( $output === false ) {
+ // If $wgPygmentizePath is unset, use the bundled copy.
+ if ( $wgPygmentizePath === false ) {
+ $wgPygmentizePath = __DIR__ .
'/pygments/pygmentize';
+ }
+
$optionPairs = array();
foreach ( $options as $k => $v ) {
$optionPairs[] = "{$k}={$v}";
diff --git a/extension.json b/extension.json
index eab0d93..062f10e 100644
--- a/extension.json
+++ b/extension.json
@@ -27,9 +27,6 @@
"SyntaxHighlightAce": "SyntaxHighlight_GeSHi.ace.php",
"ResourceLoaderGeSHiVisualEditorModule":
"ResourceLoaderGeSHiVisualEditorModule.php"
},
- "ExtensionFunctions": [
- "SyntaxHighlight_GeSHi::onSetup"
- ],
"ResourceFileModulePaths": {
"localBasePath": "modules",
"remoteExtPath": "SyntaxHighlight_GeSHi/modules"
--
To view, visit https://gerrit.wikimedia.org/r/333797
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I890348b73af956819300cce64d0672dcdb209c19
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SyntaxHighlight_GeSHi
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...SyntaxHighlight_GeSHi[master]: Fix typehints for class constants
Legoktm has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/333796 )
Change subject: Fix typehints for class constants
..
Fix typehints for class constants
Change-Id: I6c65f361a2cb830ed92632ef1e04511a7f2eaf5b
---
M SyntaxHighlight_GeSHi.class.php
1 file changed, 4 insertions(+), 4 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/SyntaxHighlight_GeSHi
refs/changes/96/333796/1
diff --git a/SyntaxHighlight_GeSHi.class.php b/SyntaxHighlight_GeSHi.class.php
index 5631972..0a5913d 100644
--- a/SyntaxHighlight_GeSHi.class.php
+++ b/SyntaxHighlight_GeSHi.class.php
@@ -22,16 +22,16 @@
class SyntaxHighlight_GeSHi {
// @codingStandardsIgnoreEnd
- /** @var const The maximum number of lines that may be selected for
highlighting. **/
+ /** @var int The maximum number of lines that may be selected for
highlighting. **/
const HIGHLIGHT_MAX_LINES = 1000;
- /** @var const Maximum input size for the highlighter (100 kB). **/
+ /** @var int Maximum input size for the highlighter (100 kB). **/
const HIGHLIGHT_MAX_BYTES = 102400;
- /** @var const CSS class for syntax-highlighted code. **/
+ /** @var string CSS class for syntax-highlighted code. **/
const HIGHLIGHT_CSS_CLASS = 'mw-highlight';
- /** @var const Cache version. Increment whenever the HTML changes. */
+ /** @var int Cache version. Increment whenever the HTML changes. */
const CACHE_VERSION = 1;
/** @var array Mapping of MIME-types to lexer names. **/
--
To view, visit https://gerrit.wikimedia.org/r/333796
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I6c65f361a2cb830ed92632ef1e04511a7f2eaf5b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SyntaxHighlight_GeSHi
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...SyntaxHighlight_GeSHi[master]: Support alias tags for dedicated wikis
Legoktm has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/333798 )
Change subject: Support alias tags for dedicated wikis
..
Support alias tags for dedicated wikis
Some wikis focus on a specific programming language (e.g. HaskellWiki),
and mostly will want to highlight in a specific language. This allows
for the easy creation of alias tags that are shorthand for
.
This feature was inspired by the HaskellWiki creating an alias
"" tag manually.
Change-Id: If9dbf6f8c9a1ac2f72c7d5c367f275d2b339588f
---
M README
M SyntaxHighlight_GeSHi.class.php
M extension.json
M tests/parserTests.txt
4 files changed, 36 insertions(+), 3 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/SyntaxHighlight_GeSHi
refs/changes/98/333798/1
diff --git a/README b/README
index 61e774d..df0122c 100644
--- a/README
+++ b/README
@@ -25,6 +25,15 @@
would like to use a different copy of the library, you can set
$wgPygmentizePath to point to the path to the 'pygmentize' binary.
+For wikis that focus on a specific programming language, you can add aliases
+for specific languages.
+
+$wgSyntaxHighlightAliases['haskell'] = 'haskell';
+
+Will create a tag that is syntactically equivalent to the longer
+. The key in the array is the tag name, and the
+value is the language name.
+
== Usage ==
On the wiki page, you can now use "source" elements:
diff --git a/SyntaxHighlight_GeSHi.class.php b/SyntaxHighlight_GeSHi.class.php
index fc274b6..53ff9c6 100644
--- a/SyntaxHighlight_GeSHi.class.php
+++ b/SyntaxHighlight_GeSHi.class.php
@@ -80,11 +80,17 @@
* Register parser hook
*
* @param $parser Parser
-* @return bool
*/
public static function onParserFirstCallInit( Parser &$parser ) {
+ global $wgSyntaxHighlightAliases;
foreach ( array( 'source', 'syntaxhighlight' ) as $tag ) {
$parser->setHook( $tag, array( 'SyntaxHighlight_GeSHi',
'parserHook' ) );
+ }
+ foreach ( $wgSyntaxHighlightAliases as $tag => $lang ) {
+ $parser->setHook( $tag, function ( $text, $args =
array(), $parser ) use ( $lang ) {
+ $args['lang'] = $lang;
+ return self::parserHook( $text, $args, $parser
);
+ } );
}
}
@@ -485,6 +491,10 @@
return true;
}
+ public static function onParserTestGlobals( array &$globals ) {
+ $globals['wgSyntaxHighlightAliases']['haskell'] = 'haskell';
+ }
+
/** Backward-compatibility shim for extensions. */
public static function prepare( $text, $lang ) {
wfDeprecated( __METHOD__ );
diff --git a/extension.json b/extension.json
index 062f10e..261bbb9 100644
--- a/extension.json
+++ b/extension.json
@@ -84,7 +84,8 @@
],
"RejectParserCacheValue": [
"SyntaxHighlight_GeSHi::onRejectParserCacheValue"
- ]
+ ],
+ "ParserTestGlobals":
"SyntaxHighlight_GeSHi::onParserTestGlobals"
},
"SyntaxHighlightModels": {
"css": "css",
@@ -94,7 +95,8 @@
"ext.geshi.visualEditor"
],
"config": {
- "PygmentizePath": false
+ "PygmentizePath": false,
+ "SyntaxHighlightAliases": {}
},
"TrackingCategories": [
"syntaxhighlight-error-category"
diff --git a/tests/parserTests.txt b/tests/parserTests.txt
index 5b93444..25be6c0 100644
--- a/tests/parserTests.txt
+++ b/tests/parserTests.txt
@@ -162,3 +162,15 @@
foo
!! end
+
+!! test
+Custom alias tag
+!! input
+
+main = putStrLn "Hello, World!"
+
+!! result
+main = putStrLn "Hello, World!"
+
+
+!! end
--
To view, visit https://gerrit.wikimedia.org/r/333798
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: If9dbf6f8c9a1ac2f72c7d5c367f275d2b339588f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SyntaxHighlight_GeSHi
Gerrit-Branch: master
Gerrit-Owner: Legoktm
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
