[MediaWiki-commits] [Gerrit] mediawiki...LiquidThreads[master]: Revert "Replaced Linker::link() & Linker::linkKnown() with L...
Hello Reedy, Subins2000, MtDu, Legoktm, Florianschmidtwelzow, jenkins-bot,
Siebrand,
I'd like you to do a code review. Please visit
https://gerrit.wikimedia.org/r/330102
to review the following change.
Change subject: Revert "Replaced Linker::link() & Linker::linkKnown() with
LinkRenderer"
..
Revert "Replaced Linker::link() & Linker::linkKnown() with LinkRenderer"
This reverts commit c6f6aac2ce151896525b945338860972095cd02d which causes fatal
errors.
Change-Id: Idbbfaab72aa10e54e8be627fd7bc67dc6afc4476
---
M api/ApiFeedLQTThreads.php
M classes/Hooks.php
M classes/LogFormatter.php
M classes/ThreadHistoryPager.php
M classes/View.php
M pages/NewUserMessagesView.php
M pages/SpecialMoveThread.php
M pages/SummaryPageView.php
M pages/TalkpageHistoryView.php
M pages/TalkpageView.php
M pages/ThreadPermalinkView.php
11 files changed, 54 insertions(+), 113 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/LiquidThreads
refs/changes/02/330102/1
diff --git a/api/ApiFeedLQTThreads.php b/api/ApiFeedLQTThreads.php
index d7a00e1..ce3ad49 100644
--- a/api/ApiFeedLQTThreads.php
+++ b/api/ApiFeedLQTThreads.php
@@ -21,8 +21,6 @@
require_once ( "ApiBase.php" );
}
-use MediaWiki\MediaWikiServices;
-
/**
* This action returns LiquidThreads threads/posts in RSS/Atom formats.
*
@@ -85,16 +83,15 @@
$titleUrl = $threadTitle->getFullURL();
$timestamp = $thread->created();
$user = $thread->author()->getName();
- $linkRenderer =
MediaWikiServices::getInstance()->getLinkRenderer();
// Prefix content with a quick description
$userLink = Linker::userLink( $thread->author()->getId(), $user
);
- $talkpageLink = $linkRenderer->makeLink( $thread->getTitle() );
+ $talkpageLink = Linker::link( $thread->getTitle() );
if ( $thread->hasSuperThread() ) {
$stTitle = clone $thread->topmostThread()->title();
$stTitle->setFragment( '#' .
$thread->superthread()->getAnchorName() );
- $superthreadLink = $linkRenderer->makeLink( $stTitle );
+ $superthreadLink = Linker::link( $stTitle );
$description = wfMessage( 'lqt-feed-reply-intro' )
->rawParams( $talkpageLink, $userLink,
$superthreadLink )
->params( $user )
diff --git a/classes/Hooks.php b/classes/Hooks.php
index 2598c21..2a74991 100644
--- a/classes/Hooks.php
+++ b/classes/Hooks.php
@@ -1,7 +1,5 @@
mAttribs['rc_new'] ) {
// Article link, timestamp, user
- $s =
MediaWikiServices::getInstance()->getLinkRenderer()->makeLink(
$thread->getTitle() );
+ $s = '';
+ $s .= Linker::link( $thread->getTitle() );
$changeslist->insertTimestamp( $s, $rc );
$changeslist->insertUserRelatedLinks( $s, $rc );
@@ -136,9 +135,7 @@
$messages_title = SpecialPage::getTitleFor( 'NewMessages' );
$new_messages = wfMessage( 'lqt-new-messages' )->parse();
- $link =
MediaWikiServices::getInstance()->getLinkRenderer()->makeLink(
- $messages_title,
- new HtmlArmor( $new_messages ),
+ $link = Linker::link( $messages_title, $new_messages,
array( 'class' => 'lqt_watchlist_messages_notice' ) );
$wgOut->addHTML( $link );
diff --git a/classes/LogFormatter.php b/classes/LogFormatter.php
index b0feeff..7cf5d82 100644
--- a/classes/LogFormatter.php
+++ b/classes/LogFormatter.php
@@ -1,7 +1,5 @@
getLinkRenderer();
- $parameters[] = Message::rawParam(
$linkRenderer->makeLink(
+ $parameters[] = Message::rawParam(
Linker::link(
SpecialPage::getTitleFor(
'MoveThread', $title ),
wfMessage( 'revertmove'
)->text(),
array(),
diff --git a/classes/ThreadHistoryPager.php b/classes/ThreadHistoryPager.php
index f376d92..31c66d5 100644
--- a/classes/ThreadHistoryPager.php
+++ b/classes/ThreadHistoryPager.php
@@ -1,7 +1,5 @@
timeanddate( $value, true
);
- return
MediaWikiServices::getInstance()->getLinkRenderer()->makeLink(
+ return Linker::link(
$wgTitle,
- $formatted,
+ htmlspecialchars( $formatted ),
array(),
array( 'lqt_oldid' => $row->th_id )
[MediaWiki-commits] [Gerrit] mediawiki...Refreshed[master]: v3.1.5 - Remove unused scripts
SamanthaNguyen has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/330101 ) Change subject: v3.1.5 - Remove unused scripts .. v3.1.5 - Remove unused scripts Change-Id: I19349d4072aa207b1067f4cea63609cb3f21db0e --- D refreshed/jquery.mobile.custom.min.js D refreshed/jquery.mobile.custom.src.js D refreshed/respond.min.js M skin.json 4 files changed, 1 insertion(+), 15,464 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/Refreshed refs/changes/01/330101/1 -- To view, visit https://gerrit.wikimedia.org/r/330101 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I19349d4072aa207b1067f4cea63609cb3f21db0e Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/skins/Refreshed 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/core[master]: Add `showThumbnails` option to slideshow galleries
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/327897 )
Change subject: Add `showThumbnails` option to slideshow galleries
..
Add `showThumbnails` option to slideshow galleries
This option causes the thumbnail images for the slideshow to be visible
as soon as the slideshow is loaded. They can still be closed normally.`
Bug: T147913
Change-Id: Iae6fd4f016d9fc98280d4ba92e4332ff06e1fb9e
---
M includes/gallery/SlideshowImageGallery.php
M resources/src/mediawiki/page/gallery-slideshow.js
2 files changed, 5 insertions(+), 1 deletion(-)
Approvals:
Filip: Looks good to me, but someone else must approve
Prtksxna: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/gallery/SlideshowImageGallery.php
b/includes/gallery/SlideshowImageGallery.php
index 3f0c932..f29c565 100644
--- a/includes/gallery/SlideshowImageGallery.php
+++ b/includes/gallery/SlideshowImageGallery.php
@@ -34,4 +34,8 @@
protected function getModules() {
return [ 'mediawiki.page.gallery.slideshow' ];
}
+
+ public function setAdditionalOptions( $params ) {
+ $this->mAttribs['data-showthumbnails'] = isset(
$params['showthumbnails'] );
+ }
}
diff --git a/resources/src/mediawiki/page/gallery-slideshow.js
b/resources/src/mediawiki/page/gallery-slideshow.js
index 094c4df..e651c9c 100644
--- a/resources/src/mediawiki/page/gallery-slideshow.js
+++ b/resources/src/mediawiki/page/gallery-slideshow.js
@@ -26,7 +26,7 @@
// Initialize
this.drawCarousel();
this.setSizeRequirement();
- this.toggleThumbnails( false );
+ this.toggleThumbnails( !!this.$gallery.attr(
'data-showthumbnails' ) );
this.showCurrentImage();
// Events
--
To view, visit https://gerrit.wikimedia.org/r/327897
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iae6fd4f016d9fc98280d4ba92e4332ff06e1fb9e
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Pppery
Gerrit-Reviewer: Aklapper
Gerrit-Reviewer: Filip
Gerrit-Reviewer: Florianschmidtwelzow
Gerrit-Reviewer: Jack Phoenix
Gerrit-Reviewer: Krinkle
Gerrit-Reviewer: Pppery
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] VisualEditor/VisualEditor[master]: Rebaser: Separate namespace creation from /doc/edit
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/329714 )
Change subject: Rebaser: Separate namespace creation from /doc/edit
..
Rebaser: Separate namespace creation from /doc/edit
Change-Id: Ie3b7d6af467c2c9d2d55491ee2509afcb8f92111
---
M rebaser/server.js
M src/dm/ve.dm.SurfaceSynchronizer.js
2 files changed, 14 insertions(+), 8 deletions(-)
Approvals:
Divec: Looks good to me, approved
jenkins-bot: Verified
diff --git a/rebaser/server.js b/rebaser/server.js
index af4ddd6..9f24955 100644
--- a/rebaser/server.js
+++ b/rebaser/server.js
@@ -4,6 +4,7 @@
port = 8081,
express = require( 'express' ),
app = express(),
+ url = require( 'url' ),
http = require( 'http' ).Server( app ),
io = require( 'socket.io' )( http ),
ve = require( '../dist/ve-rebaser.js' );
@@ -81,13 +82,7 @@
} );
app.get( '/doc/edit/:docName', function ( req, res ) {
- var nsp,
- docName = req.params.docName;
- if ( !docNamespaces.has( docName ) ) {
- nsp = io.of( '/' + docName );
- docNamespaces.set( docName, nsp );
- nsp.on( 'connection', makeConnectionHandler( docName ) );
- }
+ var docName = req.params.docName;
res.render( 'editor', { docName: docName } );
} );
@@ -99,5 +94,16 @@
res.status( 401 ).send( 'DOM in nodejs is hard' );
} );
+io.on( 'connection', function ( socket ) {
+ var nsp,
+ docName = url.parse( socket.handshake.url, true ).query.docName;
+
+ if ( docName && !docNamespaces.has( docName ) ) {
+ nsp = io.of( '/' + docName );
+ docNamespaces.set( docName, nsp );
+ nsp.on( 'connection', makeConnectionHandler( docName ) );
+ }
+} );
+
http.listen( port );
console.log( 'Listening on ' + port + ' (artificial delay ' + artificialDelay
+ ' ms)' );
diff --git a/src/dm/ve.dm.SurfaceSynchronizer.js
b/src/dm/ve.dm.SurfaceSynchronizer.js
index ddacf20..a891ccd 100644
--- a/src/dm/ve.dm.SurfaceSynchronizer.js
+++ b/src/dm/ve.dm.SurfaceSynchronizer.js
@@ -36,7 +36,7 @@
this.applying = false;
// HACK
- this.socket = io( ( config.server || '' ) + '/' + this.documentId );
+ this.socket = io( ( config.server || '' ) + '/' + this.documentId, {
query: { docName: this.documentId } } );
this.socket.on( 'registered', this.onRegistered.bind( this ) );
this.socket.on( 'newChange', this.onNewChange.bind( this ) );
--
To view, visit https://gerrit.wikimedia.org/r/329714
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie3b7d6af467c2c9d2d55491ee2509afcb8f92111
Gerrit-PatchSet: 2
Gerrit-Project: VisualEditor/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders
Gerrit-Reviewer: Divec
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] pywikibot/core[master]: listpages.py: fix help on formatting
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/330042 )
Change subject: listpages.py: fix help on formatting
..
listpages.py: fix help on formatting
Change-Id: Ib59ba3182130624f01bb4068a2e525c0862e5e11
---
M scripts/listpages.py
1 file changed, 2 insertions(+), 2 deletions(-)
Approvals:
Dalba: Looks good to me, approved
jenkins-bot: Verified
diff --git a/scripts/listpages.py b/scripts/listpages.py
index 1106143..7395e01 100755
--- a/scripts/listpages.py
+++ b/scripts/listpages.py
@@ -16,13 +16,13 @@
1 - u'{num:4d} {page.title}'
--> 10 PageTitle
-2 - u'{num:4d} {[[page.title]]}'
+2 - u'{num:4d} [[{page.title}]]'
--> 10 [[PageTitle]]
3 - u'{page.title}'
--> PageTitle
-4 - u'{[[page.title]]}'
+4 - u'[[{page.title}]]'
--> [[PageTitle]]
5 - u'{num:4d} \03{{lightred}}{page.loc_title:<40}\03{{default}}'
--
To view, visit https://gerrit.wikimedia.org/r/330042
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib59ba3182130624f01bb4068a2e525c0862e5e11
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: Mpaa
Gerrit-Reviewer: Dalba
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...EnhanceContactForm[master]: Replace hard-coded English strings with i18n messages
SamanthaNguyen has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/330100 )
Change subject: Replace hard-coded English strings with i18n messages
..
Replace hard-coded English strings with i18n messages
Also consistent tabbing in package.json, and adding
authors to the i18n files.
Change-Id: Idd39017e62cbd973683b4e299db80096c3fabf7b
---
M EnhanceContactForm.php
M i18n/en.json
M i18n/qqq.json
M package.json
4 files changed, 36 insertions(+), 22 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/EnhanceContactForm
refs/changes/00/330100/1
diff --git a/EnhanceContactForm.php b/EnhanceContactForm.php
index d70b011..67c1cd9 100644
--- a/EnhanceContactForm.php
+++ b/EnhanceContactForm.php
@@ -6,7 +6,7 @@
* -wiki database name ($wgDBname)
* -reporter's IP address (regardless of whether they checked the "Include
my IP address in this message" checkbox or not)
* -reporter's browser
- * -the skin the reporter was using when they used Special:Contact
+ * -the skin the reporter was using when they used Special:Contact
* -reporter's operating system
* -reporter's User-Agent string
* MyInfo extension is required for the browser/OS/skin/UA detection.
@@ -41,11 +41,11 @@
function enhanceContactForm( &$to, &$replyto, &$subject, &$text ) {
global $wgDBname, $wgRequest, $wgServer;
- $text = 'Contact message by the user: ' . $wgRequest->getText( 'wpText'
) . "\n\n\n\n\n\n\n";
+ $text .= wfMessage( 'enhancecontactform-contact-message-user',
$wgRequest->getText( 'wpText' ) )->escaped() . "\n\n\n\n\n\n\n";
// Now add the custom stuff
- $text .= 'URL of the wiki: ' . $wgServer . "\n";
- $text .= 'Database name: ' . $wgDBname . "\n";
- $text .= 'IP address of the reporter: ' . $wgRequest->getIP() . "\n";
+ $text .= wfMessage( 'enhancecontactform-url-wiki', $wgServer
)->escaped() . "\n";
+ $text .= wfMessage( 'enhancecontactform-database', $wgDBname
)->escaped() . "\n";
+ $text .= wfMessage( 'enhancecontactform-ip-reporter',
$wgRequest->getIP() )->escaped() . "\n";
if ( class_exists( 'MyInfo' ) ) {
global $IP;
@@ -64,11 +64,11 @@
$myinfo->info = browser_detection( 'full' );
$myinfo->info[] = browser_detection( 'moz_version' );
- $text .= 'Browser: ' . $myinfo->getBrowser() . "\n";
- $text .= 'Operating system: ' . $myinfo->getOs() . "\n";
- $text .= 'Skin: ' . $myinfo->getSkin() . "\n";
- $text .= 'User-Agent string: ' . $myinfo->getUAgent() . "\n";
+ $text .= wfMessage( 'enhancecontactform-browser',
$myinfo->getBrowser() )->escaped() . "\n";
+ $text .= wfMessage( 'enhancecontactform-os', $myinfo->getOs()
)->escaped() . "\n";
+ $text .= wfMessage( 'enhancecontactform-skin',
$myinfo->getSkin() )->escaped() . "\n";
+ $text .= wfMessage( 'enhancecontactform-user-agent-string',
$myinfo->getUAgent() )->escaped() . "\n";
}
return true;
-}
\ No newline at end of file
+}
diff --git a/i18n/en.json b/i18n/en.json
index 245ad08..bd56461 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -1,6 +1,18 @@
{
"@metadata": {
- "authors": []
+ "authors": [
+ "Jack Phoenix",
+ "Paladox",
+ "SamanthaNguyen"
+ ]
},
- "enhancecontactform-desc": "Enhances [[Special:Contact]] by sending
more info'"
+ "enhancecontactform-desc": "Enhances [[Special:Contact]] by sending
more info",
+ "enhancecontactform-contact-message-user": "Contact message by the
user: $1",
+ "enhancecontactform-url-wiki": "URL of the wiki: $1",
+ "enhancecontactform-database": "Database name: $1",
+ "enhancecontactform-ip-reporter": "IP address of the reporter: $1",
+ "enhancecontactform-browser": "Browser: $1",
+ "enhancecontactform-os": "Operating system: $1",
+ "enhancecontantform-skin": "Skin: $1",
+ "enhancecontactform-user-agent-string": "User-Agent string: $1"
}
diff --git a/i18n/qqq.json b/i18n/qqq.json
index 4d1c3a2..1ece734 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -1,6 +1,8 @@
{
"@metadata": {
- "authors": []
+ "authors": [
+ "Paladox"
+ ]
},
"enhancecontactform-desc":
"{{desc|what=extension|name=EnhanceContactForm|url=https://www.mediawiki.org/wiki/Extension:EnhanceContactForm}}";
}
diff --git a/package.json b/package.json
index 41cecca..ced56ab 100644
--- a/package.json
+++ b/package.json
@@ -1,11 +1,11 @@
{
- "scripts": {
-"test": "grunt test"
- },
- "devDependencies": {
-"grunt": "0.4.5",
-"grunt-cli": "0.1.13",
-"grunt-banana-checker": "0.4.0",
-"
[MediaWiki-commits] [Gerrit] mediawiki...Nuke[master]: Change "Go" to "List pages"
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/330095 )
Change subject: Change "Go" to "List pages"
..
Change "Go" to "List pages"
Bug: T154347
Change-Id: I1de14f7350e0a74f55eeb434120cd34e652ffb29
---
M i18n/en.json
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
TTO: Looks good to me, approved
jenkins-bot: Verified
diff --git a/i18n/en.json b/i18n/en.json
index aa5e48e..d8f29a2 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -14,7 +14,7 @@
"nuke-defaultreason": "Mass deletion of pages added by
[[Special:Contributions/$1|{{GENDER:$1|$1}}]]",
"nuke-multiplepeople": "Mass deletion of recently added pages",
"nuke-tools": "This tool allows for mass deletions of pages recently
added by a given user or an IP address.\nInput the username or IP address to
get a list of pages to delete, or leave blank for all users.",
- "nuke-submit-user": "Go",
+ "nuke-submit-user": "List pages",
"nuke-toggleinvert": "Invert",
"nuke-submit-delete": "Delete selected",
"right-nuke": "Mass delete pages",
--
To view, visit https://gerrit.wikimedia.org/r/330095
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I1de14f7350e0a74f55eeb434120cd34e652ffb29
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Nuke
Gerrit-Branch: master
Gerrit-Owner: Ladsgroup
Gerrit-Reviewer: Legoktm
Gerrit-Reviewer: TTO
Gerrit-Reviewer: Thiemo Mättig (WMDE)
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] pywikibot/core[master]: Replace assertRaises with asserRaisesRegex in family_tests.py
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/330099 )
Change subject: Replace assertRaises with asserRaisesRegex in family_tests.py
..
Replace assertRaises with asserRaisesRegex in family_tests.py
assertRaises is not as good of a test as asserRaisesRegex. The latter has an
extra parameter to match the exception message, allowing more more precision
when checking an error.
Bug: T154281
Change-Id: Idb030c163f48f349f0adabd5c27dd90dac0d5b4b
---
M tests/family_tests.py
1 file changed, 50 insertions(+), 12 deletions(-)
Approvals:
John Vandenberg: Looks good to me, approved
jenkins-bot: Verified
diff --git a/tests/family_tests.py b/tests/family_tests.py
index 41ab51d..1482cad 100644
--- a/tests/family_tests.py
+++ b/tests/family_tests.py
@@ -1,7 +1,7 @@
# -*- coding: utf-8 -*-
"""Tests for the family module."""
#
-# (C) Pywikibot team, 2014-2015
+# (C) Pywikibot team, 2014-2017
#
# Distributed under the terms of the MIT license.
#
@@ -28,6 +28,11 @@
"""Test cases for Family methods."""
+UNKNOWNFAMILY_RE = 'Family unknown does not exist'
+FAMILY_TYPEERROR_RE = (
+'Family.obsolete not updatable; '
+'use Family.interwiki_removals and Family.interwiki_replacements')
+FROZENSET_TYPEERROR_RE = '\'frozenset\' object does not support item
assignment'
net = False
def test_family_load_valid(self):
@@ -58,7 +63,11 @@
def test_family_load_invalid(self):
"""Test that an invalid family raised UnknownFamily exception."""
-self.assertRaises(UnknownFamily, Family.load, 'unknown')
+self.assertRaisesRegex(
+UnknownFamily,
+self.UNKNOWNFAMILY_RE,
+Family.load,
+'unknown')
def test_eq_different_families_by_name(self):
"""Test that two Family with same name are equal."""
@@ -96,7 +105,11 @@
"""Test that Family and string with different name are not equal."""
family = Family.load('wikipedia')
other = 'unknown'
-self.assertRaises(UnknownFamily, family.__eq__, other)
+self.assertRaisesRegex(
+UnknownFamily,
+self.UNKNOWNFAMILY_RE,
+family.__eq__,
+other)
def test_get_obsolete_wp(self):
"""Test three types of obsolete codes."""
@@ -132,14 +145,27 @@
def test_obsolete_readonly(self):
"""Test obsolete result not updatable."""
family = Family.load('test')
-self.assertRaises(TypeError, family.obsolete.update, {})
-self.assertRaises(TypeError, family.obsolete.__setitem__, 'a', 'b')
+self.assertRaisesRegex(
+TypeError,
+self.FAMILY_TYPEERROR_RE,
+family.obsolete.update,
+{})
+self.assertRaisesRegex(
+TypeError,
+self.FAMILY_TYPEERROR_RE,
+family.obsolete.__setitem__,
+'a',
+'b')
def test_WikimediaFamily_obsolete_readonly(self):
"""Test WikimediaFamily obsolete is readonly."""
family = Family.load('test')
-self.assertRaises(TypeError, family.__setattr__, 'obsolete',
- {'a': 'b', 'c': None})
+self.assertRaisesRegex(
+TypeError,
+self.FROZENSET_TYPEERROR_RE,
+family.__setattr__,
+'obsolete',
+{'a': 'b', 'c': None})
class TestFamilyUrlRegex(PatchingTestCase):
@@ -185,8 +211,11 @@
self.assertEqual(f.from_url('//vo.wikipedia.org/wiki/$1'), 'vo')
# Text after $1 is not allowed
-self.assertRaises(ValueError, f.from_url,
- '//vo.wikipedia.org/wiki/$1/foo')
+self.assertRaisesRegex(
+ValueError,
+'Text after the \$1 placeholder is not supported \(T111513\)',
+f.from_url,
+'//vo.wikipedia.org/wiki/$1/foo')
# the IWM may contain the wrong protocol, but it's only used to
# determine a site so using HTTP or HTTPS is not an issue
@@ -225,6 +254,7 @@
"""Test cases for old site.Family method."""
+UNKNOWNFAMILY_RE = 'Family unknown does not exist'
net = False
def test_old_site_family_function(self):
@@ -251,9 +281,17 @@
# As assertRaises calls the method, unittest is the module
# invoking the method instead of this test module.
self._do_test_warning_filename = False
-self.assertRaises(UnknownFamily, pywikibot.site.Family, 'unknown',
- fatal=False)
-self.assertRaises(UnknownFamily, pywikibot.site.Family, 'unknown')
+self.assertRaisesRegex(
+UnknownFamily,
+self.UNKNOWNFAMILY_RE,
+pywikibot.site.Family,
+'unknown',
+fatal=False)
+self.assertRaisesRegex(
+UnknownFamily,
+self.UNKNO
[MediaWiki-commits] [Gerrit] pywikibot/core[master]: Replace assertRaises with asserRaisesRegex in family_tests.py
MtDu has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/330099 )
Change subject: Replace assertRaises with asserRaisesRegex in family_tests.py
..
Replace assertRaises with asserRaisesRegex in family_tests.py
assertRaises is not as good of a test as asserRaisesRegex. The latter has an
extra parameter to match the exception message, allowing more more precision
when checking an error.
Bug: T154281
Change-Id: Idb030c163f48f349f0adabd5c27dd90dac0d5b4b
---
M tests/family_tests.py
1 file changed, 48 insertions(+), 11 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core
refs/changes/99/330099/1
diff --git a/tests/family_tests.py b/tests/family_tests.py
index 41ab51d..c8c9b2f 100644
--- a/tests/family_tests.py
+++ b/tests/family_tests.py
@@ -28,6 +28,10 @@
"""Test cases for Family methods."""
+UNKNOWNFAMILY_RE = 'Family unknown does not exist'
+FAMILY_TYPEERROR_RE = 'Family.obsolete not updatable; ' \
+'use Family.interwiki_removals and Family.interwiki_replacements'
+FROZENSET_TYPEERROR_RE = '\'frozenset\' object does not support item
assignment'
net = False
def test_family_load_valid(self):
@@ -58,7 +62,11 @@
def test_family_load_invalid(self):
"""Test that an invalid family raised UnknownFamily exception."""
-self.assertRaises(UnknownFamily, Family.load, 'unknown')
+self.assertRaisesRegex(
+UnknownFamily,
+self.UNKNOWNFAMILY_RE,
+Family.load,
+'unknown')
def test_eq_different_families_by_name(self):
"""Test that two Family with same name are equal."""
@@ -96,7 +104,11 @@
"""Test that Family and string with different name are not equal."""
family = Family.load('wikipedia')
other = 'unknown'
-self.assertRaises(UnknownFamily, family.__eq__, other)
+self.assertRaisesRegex(
+UnknownFamily,
+self.UNKNOWNFAMILY_RE,
+family.__eq__,
+other)
def test_get_obsolete_wp(self):
"""Test three types of obsolete codes."""
@@ -132,14 +144,27 @@
def test_obsolete_readonly(self):
"""Test obsolete result not updatable."""
family = Family.load('test')
-self.assertRaises(TypeError, family.obsolete.update, {})
-self.assertRaises(TypeError, family.obsolete.__setitem__, 'a', 'b')
+self.assertRaisesRegex(
+TypeError,
+self.FAMILY_TYPEERROR_RE,
+family.obsolete.update,
+{})
+self.assertRaisesRegex(
+TypeError,
+self.FAMILY_TYPEERROR_RE,
+family.obsolete.__setitem__,
+'a',
+'b')
def test_WikimediaFamily_obsolete_readonly(self):
"""Test WikimediaFamily obsolete is readonly."""
family = Family.load('test')
-self.assertRaises(TypeError, family.__setattr__, 'obsolete',
- {'a': 'b', 'c': None})
+self.assertRaisesRegex(
+TypeError,
+self.FROZENSET_TYPEERROR_RE,
+family.__setattr__,
+'obsolete',
+{'a': 'b', 'c': None})
class TestFamilyUrlRegex(PatchingTestCase):
@@ -185,8 +210,11 @@
self.assertEqual(f.from_url('//vo.wikipedia.org/wiki/$1'), 'vo')
# Text after $1 is not allowed
-self.assertRaises(ValueError, f.from_url,
- '//vo.wikipedia.org/wiki/$1/foo')
+self.assertRaisesRegex(
+ValueError,
+'Text after the \$1 placeholder is not supported \(T111513\)',
+f.from_url,
+'//vo.wikipedia.org/wiki/$1/foo')
# the IWM may contain the wrong protocol, but it's only used to
# determine a site so using HTTP or HTTPS is not an issue
@@ -225,6 +253,7 @@
"""Test cases for old site.Family method."""
+UNKNOWNFAMILY_RE = 'Family unknown does not exist'
net = False
def test_old_site_family_function(self):
@@ -251,9 +280,17 @@
# As assertRaises calls the method, unittest is the module
# invoking the method instead of this test module.
self._do_test_warning_filename = False
-self.assertRaises(UnknownFamily, pywikibot.site.Family, 'unknown',
- fatal=False)
-self.assertRaises(UnknownFamily, pywikibot.site.Family, 'unknown')
+self.assertRaisesRegex(
+UnknownFamily,
+self.UNKNOWNFAMILY_RE,
+pywikibot.site.Family,
+'unknown',
+fatal=False)
+self.assertRaisesRegex(
+UnknownFamily,
+self.UNKNOWNFAMILY_RE,
+pywikibot.site.Family,
+'unknown')
self.assertDeprecationParts('pywikibot.site.Family',
'pywikibot.family
[MediaWiki-commits] [Gerrit] mediawiki...UnusedRedirects[master]: Make extension description more i18n-friendly
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/330098 )
Change subject: Make extension description more i18n-friendly
..
Make extension description more i18n-friendly
Change-Id: I8657654b2acf605901384f66440b35488c4ce8c0
---
M extension.json
M i18n/en.json
2 files changed, 4 insertions(+), 3 deletions(-)
Approvals:
SamanthaNguyen: Looks good to me, approved
jenkins-bot: Verified
diff --git a/extension.json b/extension.json
index 21fab02..caf4f36 100644
--- a/extension.json
+++ b/extension.json
@@ -1,10 +1,10 @@
{
"name": "UnusedRedirects",
- "version": "1.0",
+ "version": "1.1",
"author": "Jack Phoenix",
"license-name": "GPL-2.0+",
"url": "https://www.mediawiki.org/wiki/Extension:UnusedRedirects";,
- "description": "[[Special:UnusedRedirects|Lists unused redirects]]",
+ "descriptionmsg": "unusedredirects-desc",
"type": "specialpage",
"SpecialPages": {
"UnusedRedirects": "UnusedRedirectsPage"
diff --git a/i18n/en.json b/i18n/en.json
index 7f21c80..8b95c0c 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -5,5 +5,6 @@
]
},
"unusedredirects": "Unused redirects",
+ "unusedredirects-desc": "[[Special:UnusedRedirects|Lists unused
redirects]]",
"unusedredirects-text": ""
-}
\ No newline at end of file
+}
--
To view, visit https://gerrit.wikimedia.org/r/330098
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I8657654b2acf605901384f66440b35488c4ce8c0
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/UnusedRedirects
Gerrit-Branch: master
Gerrit-Owner: SamanthaNguyen
Gerrit-Reviewer: Jack Phoenix
Gerrit-Reviewer: SamanthaNguyen
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...UnusedRedirects[master]: Make extension description more i18n-friendly
SamanthaNguyen has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/330098 )
Change subject: Make extension description more i18n-friendly
..
Make extension description more i18n-friendly
Change-Id: I8657654b2acf605901384f66440b35488c4ce8c0
---
M extension.json
M i18n/en.json
2 files changed, 4 insertions(+), 3 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/UnusedRedirects
refs/changes/98/330098/1
diff --git a/extension.json b/extension.json
index 21fab02..caf4f36 100644
--- a/extension.json
+++ b/extension.json
@@ -1,10 +1,10 @@
{
"name": "UnusedRedirects",
- "version": "1.0",
+ "version": "1.1",
"author": "Jack Phoenix",
"license-name": "GPL-2.0+",
"url": "https://www.mediawiki.org/wiki/Extension:UnusedRedirects";,
- "description": "[[Special:UnusedRedirects|Lists unused redirects]]",
+ "descriptionmsg": "unusedredirects-desc",
"type": "specialpage",
"SpecialPages": {
"UnusedRedirects": "UnusedRedirectsPage"
diff --git a/i18n/en.json b/i18n/en.json
index 7f21c80..8b95c0c 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -5,5 +5,6 @@
]
},
"unusedredirects": "Unused redirects",
+ "unusedredirects-desc": "[[Special:UnusedRedirects|Lists unused
redirects]]",
"unusedredirects-text": ""
-}
\ No newline at end of file
+}
--
To view, visit https://gerrit.wikimedia.org/r/330098
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I8657654b2acf605901384f66440b35488c4ce8c0
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/UnusedRedirects
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...GlobalContribs[master]: Remove duplicate i18n messages, use semantic HTML element
SamanthaNguyen has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/330097 )
Change subject: Remove duplicate i18n messages, use semantic HTML element
..
Remove duplicate i18n messages, use semantic HTML element
Change-Id: Ib227cfdccce9ae113a18b206e54b31d325618742
---
M SpecialGlobalContributions.php
M extension.json
M i18n/en.json
M i18n/ka.json
M i18n/qqq.json
5 files changed, 6 insertions(+), 9 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/GlobalContribs
refs/changes/97/330097/1
diff --git a/SpecialGlobalContributions.php b/SpecialGlobalContributions.php
index 0efe993..6c97b80 100644
--- a/SpecialGlobalContributions.php
+++ b/SpecialGlobalContributions.php
@@ -207,7 +207,7 @@
if ( $message ) {
if ( !$this->msg( $message, $target
)->isDisabled() ) {
$out->wrapWikiMsg(
- "\n$1\n",
+ "\n$1\n",
array( $message, $target )
);
}
diff --git a/extension.json b/extension.json
index fa75a8a..0436f71 100644
--- a/extension.json
+++ b/extension.json
@@ -1,6 +1,6 @@
{
"name": "GlobalContribs",
- "version": "1.1.0",
+ "version": "1.1.1",
"author": [
"Adam Carter",
"George Barnick",
diff --git a/i18n/en.json b/i18n/en.json
index fc55499..b24b315 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -3,8 +3,6 @@
"authors": []
},
"globalcontribs": "Global contributions",
- "globalcontributions": "Global contributions",
"globaleditcount": "Global edit count",
- "globalcontribs-desc": "Shows contributions from all projects in a
wikifarm",
- "globalcontributions-desc": "Shows contributions from all projects in a
wikifarm"
+ "globalcontribs-desc": "Shows contributions from all projects in a
wikifarm"
}
diff --git a/i18n/ka.json b/i18n/ka.json
index ec677b2..d1605e4 100644
--- a/i18n/ka.json
+++ b/i18n/ka.json
@@ -3,8 +3,6 @@
"authors": []
},
"globalcontribs": "გლობალ წვლილი",
- "globalcontributions": "გლობალ წვლილი",
"globaleditcount": "გლობალ სრული რედაქტირებათა მთვლელი",
- "globalcontribs-desc": "გადაცემები შემოწირულობების ყველა პროექტი ვიკი
ფერმაში",
- "globalcontributions-desc": "გადაცემები შემოწირულობების ყველა პროექტი
ვიკი ფერმაში"
+ "globalcontribs-desc": "გადაცემები შემოწირულობების ყველა პროექტი ვიკი
ფერმაში"
}
diff --git a/i18n/qqq.json b/i18n/qqq.json
index e36aa16..87eb04b 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -2,6 +2,7 @@
"@metadata": {
"authors": []
},
- "globalcontribs": "The name of the extension's entry in
Special:SpecialPage",
+ "globalcontribs": "The name of the extension's entry in
Special:SpecialPages",
+ "globaleditcount": "The name of the global editcount special page in
Special:SpecialPages",
"globalcontribs-desc": "{{desc}}"
}
--
To view, visit https://gerrit.wikimedia.org/r/330097
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib227cfdccce9ae113a18b206e54b31d325618742
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/GlobalContribs
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...OAuth[master]: Update Maintenance scripts to use $this->requireExtension()
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/330062 )
Change subject: Update Maintenance scripts to use $this->requireExtension()
..
Update Maintenance scripts to use $this->requireExtension()
Bug: T152139
Change-Id: Id350ea5d8919d792b6dfa78bd6a9718faa6cd06c
---
M maintenance/importCentralWikiLogs.php
M maintenance/migrateCentralWiki.php
M maintenance/testOAuthConsumer.php
3 files changed, 3 insertions(+), 0 deletions(-)
Approvals:
Reedy: Looks good to me, approved
MtDu: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/maintenance/importCentralWikiLogs.php
b/maintenance/importCentralWikiLogs.php
index 30b1d96..8f38893 100644
--- a/maintenance/importCentralWikiLogs.php
+++ b/maintenance/importCentralWikiLogs.php
@@ -22,6 +22,7 @@
$this->mDescription = "Import central wiki logs to this wiki";
$this->addOption( 'old', 'Previous central wiki', true, true );
$this->setBatchSize( 200 );
+ $this->requireExtension( "OAuth" );
}
public function execute() {
diff --git a/maintenance/migrateCentralWiki.php
b/maintenance/migrateCentralWiki.php
index 4cc237b..2b9ddfa 100644
--- a/maintenance/migrateCentralWiki.php
+++ b/maintenance/migrateCentralWiki.php
@@ -33,6 +33,7 @@
$this->addOption( 'target', 'New central wiki', true, true );
$this->addOption( 'table', 'Table name
(oauth_registered_consumer or oauth_accepted_consumer)', true, true );
$this->setBatchSize( 200 );
+ $this->requireExtension( "OAuth" );
}
public function execute() {
diff --git a/maintenance/testOAuthConsumer.php
b/maintenance/testOAuthConsumer.php
index 76c891f..8374d3d 100644
--- a/maintenance/testOAuthConsumer.php
+++ b/maintenance/testOAuthConsumer.php
@@ -25,6 +25,7 @@
);
$this->addOption( 'useSSL', 'Use SSL' );
$this->addOption( 'verbose', 'Verbose output (e.g. HTTP
request/response headers)' );
+ $this->requireExtension( "OAuth" );
}
public function execute() {
--
To view, visit https://gerrit.wikimedia.org/r/330062
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Id350ea5d8919d792b6dfa78bd6a9718faa6cd06c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/OAuth
Gerrit-Branch: master
Gerrit-Owner: Divadsn
Gerrit-Reviewer: Florianschmidtwelzow
Gerrit-Reviewer: Legoktm
Gerrit-Reviewer: MtDu
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...TorBlock[master]: Update Maintenance scripts to use $this->requireExtension()
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/330063 )
Change subject: Update Maintenance scripts to use $this->requireExtension()
..
Update Maintenance scripts to use $this->requireExtension()
Bug: T152139
Change-Id: I1c0495a4dd581a7c3cf6bef61075cd653ed95733
---
M loadExitNodes.php
1 file changed, 1 insertion(+), 0 deletions(-)
Approvals:
Reedy: Looks good to me, approved
jenkins-bot: Verified
diff --git a/loadExitNodes.php b/loadExitNodes.php
index 959eb96..5ef8d3c 100644
--- a/loadExitNodes.php
+++ b/loadExitNodes.php
@@ -37,6 +37,7 @@
parent::__construct();
$this->mDescription = "Load the list of Tor exit nodes.";
$this->addOption( 'force', 'Force loading of exit nodes from
the server rather than cache.' );
+ $this->requireExtension( "TorBlock" );
}
public function execute() {
--
To view, visit https://gerrit.wikimedia.org/r/330063
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I1c0495a4dd581a7c3cf6bef61075cd653ed95733
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/TorBlock
Gerrit-Branch: master
Gerrit-Owner: Divadsn
Gerrit-Reviewer: Florianschmidtwelzow
Gerrit-Reviewer: Legoktm
Gerrit-Reviewer: Reedy
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] wikimedia...crm[master]: Add small extension to mark dead contacts as opted out.
Eileen has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/330096 )
Change subject: Add small extension to mark dead contacts as opted out.
..
Add small extension to mark dead contacts as opted out.
On install all is_deceased contacts will be opted out.
Bug: T153110
Change-Id: I98acab2db5d1512265b45dc6fbdba8b577ede4b3
---
A sites/default/civicrm/extensions/org.wikimedia.rip/CRM/Rip/Upgrader.php
A sites/default/civicrm/extensions/org.wikimedia.rip/CRM/Rip/Upgrader/Base.php
A sites/default/civicrm/extensions/org.wikimedia.rip/LICENSE.txt
A sites/default/civicrm/extensions/org.wikimedia.rip/info.xml
A sites/default/civicrm/extensions/org.wikimedia.rip/rip.civix.php
A sites/default/civicrm/extensions/org.wikimedia.rip/rip.php
A sites/default/civicrm/extensions/org.wikimedia.rip/sql/rip_install.sql
7 files changed, 1,734 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm
refs/changes/96/330096/1
diff --git
a/sites/default/civicrm/extensions/org.wikimedia.rip/CRM/Rip/Upgrader.php
b/sites/default/civicrm/extensions/org.wikimedia.rip/CRM/Rip/Upgrader.php
new file mode 100644
index 000..c8ea8bc
--- /dev/null
+++ b/sites/default/civicrm/extensions/org.wikimedia.rip/CRM/Rip/Upgrader.php
@@ -0,0 +1,133 @@
+executeSqlFile('sql/rip_install.sql');
+ }
+
+ /**
+ * Example: Work with entities usually not available during the install step.
+ *
+ * This method can be used for any post-install tasks. For example, if a step
+ * of your installation depends on accessing an entity that is itself
+ * created during the installation (e.g., a setting or a managed entity), do
+ * so here to avoid order of operation problems.
+ *
+ public function postInstall() {
+$customFieldId = civicrm_api3('CustomField', 'getvalue', array(
+ 'return' => array("id"),
+ 'name' => "customFieldCreatedViaManagedHook",
+));
+civicrm_api3('Setting', 'create', array(
+ 'myWeirdFieldSetting' => array('id' => $customFieldId, 'weirdness' => 1),
+));
+ }
+
+ /**
+ * Example: Run an external SQL script when the module is uninstalled.
+ *
+ public function uninstall() {
+ $this->executeSqlFile('sql/myuninstall.sql');
+ }
+
+ /**
+ * Example: Run a simple query when a module is enabled.
+ *
+ public function enable() {
+CRM_Core_DAO::executeQuery('UPDATE foo SET is_active = 1 WHERE bar =
"whiz"');
+ }
+
+ /**
+ * Example: Run a simple query when a module is disabled.
+ *
+ public function disable() {
+CRM_Core_DAO::executeQuery('UPDATE foo SET is_active = 0 WHERE bar =
"whiz"');
+ }
+
+ /**
+ * Example: Run a couple simple queries.
+ *
+ * @return TRUE on success
+ * @throws Exception
+ *
+ public function upgrade_4200() {
+$this->ctx->log->info('Applying update 4200');
+CRM_Core_DAO::executeQuery('UPDATE foo SET bar = "whiz"');
+CRM_Core_DAO::executeQuery('DELETE FROM bang WHERE willy = wonka(2)');
+return TRUE;
+ } // */
+
+
+ /**
+ * Example: Run an external SQL script.
+ *
+ * @return TRUE on success
+ * @throws Exception
+ public function upgrade_4201() {
+$this->ctx->log->info('Applying update 4201');
+// this path is relative to the extension base dir
+$this->executeSqlFile('sql/upgrade_4201.sql');
+return TRUE;
+ } // */
+
+
+ /**
+ * Example: Run a slow upgrade process by breaking it up into smaller chunk.
+ *
+ * @return TRUE on success
+ * @throws Exception
+ public function upgrade_4202() {
+$this->ctx->log->info('Planning update 4202'); // PEAR Log interface
+
+$this->addTask(ts('Process first step'), 'processPart1', $arg1, $arg2);
+$this->addTask(ts('Process second step'), 'processPart2', $arg3, $arg4);
+$this->addTask(ts('Process second step'), 'processPart3', $arg5);
+return TRUE;
+ }
+ public function processPart1($arg1, $arg2) { sleep(10); return TRUE; }
+ public function processPart2($arg3, $arg4) { sleep(10); return TRUE; }
+ public function processPart3($arg5) { sleep(10); return TRUE; }
+ // */
+
+
+ /**
+ * Example: Run an upgrade with a query that touches many (potentially
+ * millions) of records by breaking it up into smaller chunks.
+ *
+ * @return TRUE on success
+ * @throws Exception
+ public function upgrade_4203() {
+$this->ctx->log->info('Planning update 4203'); // PEAR Log interface
+
+$minId = CRM_Core_DAO::singleValueQuery('SELECT coalesce(min(id),0) FROM
civicrm_contribution');
+$maxId = CRM_Core_DAO::singleValueQuery('SELECT coalesce(max(id),0) FROM
civicrm_contribution');
+for ($startId = $minId; $startId <= $maxId; $startId += self::BATCH_SIZE) {
+ $endId = $startId + self::BATCH_SIZE - 1;
+ $title = ts('Upgrade Batch (%1 => %2)', array(
+1 => $startId,
+2 => $endId,
+ ));
+ $sql = '
+UPDATE civicrm_contribution SET foobar = whiz(wo
[MediaWiki-commits] [Gerrit] mediawiki...Nuke[master]: Change "Go" to "List pages"
Ladsgroup has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/330095 )
Change subject: Change "Go" to "List pages"
..
Change "Go" to "List pages"
Bug: T154347
Change-Id: I1de14f7350e0a74f55eeb434120cd34e652ffb29
---
M i18n/en.json
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Nuke
refs/changes/95/330095/1
diff --git a/i18n/en.json b/i18n/en.json
index aa5e48e..d8f29a2 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -14,7 +14,7 @@
"nuke-defaultreason": "Mass deletion of pages added by
[[Special:Contributions/$1|{{GENDER:$1|$1}}]]",
"nuke-multiplepeople": "Mass deletion of recently added pages",
"nuke-tools": "This tool allows for mass deletions of pages recently
added by a given user or an IP address.\nInput the username or IP address to
get a list of pages to delete, or leave blank for all users.",
- "nuke-submit-user": "Go",
+ "nuke-submit-user": "List pages",
"nuke-toggleinvert": "Invert",
"nuke-submit-delete": "Delete selected",
"right-nuke": "Mass delete pages",
--
To view, visit https://gerrit.wikimedia.org/r/330095
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I1de14f7350e0a74f55eeb434120cd34e652ffb29
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Nuke
Gerrit-Branch: master
Gerrit-Owner: Ladsgroup
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...ArticleFeedbackv5[master]: Remove deprecated PHP entry point
SamanthaNguyen has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/330094 )
Change subject: Remove deprecated PHP entry point
..
Remove deprecated PHP entry point
Bug: T154411
Change-Id: I7b392afb26db131fbdc1e8b13ab85a8cbba91889
---
D ArticleFeedbackv5.php
M extension.json
2 files changed, 1 insertion(+), 16 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ArticleFeedbackv5
refs/changes/94/330094/1
diff --git a/ArticleFeedbackv5.php b/ArticleFeedbackv5.php
deleted file mode 100644
index f2310ee..000
--- a/ArticleFeedbackv5.php
+++ /dev/null
@@ -1,15 +0,0 @@
-https://www.mediawiki.org/wiki/Extension_registration for
more details.'
- );
- return true;
-} else {
- die( 'This version of the ArticleFeedbackv5 extension requires
MediaWiki 1.25+' );
-}
\ No newline at end of file
diff --git a/extension.json b/extension.json
index 7873b88..643e379 100644
--- a/extension.json
+++ b/extension.json
@@ -1,6 +1,6 @@
{
"name": "Article Feedback",
- "version": "5.2.1",
+ "version": "5.2.2",
"author": [
"Greg Chiasson",
"Reha Sterbin",
--
To view, visit https://gerrit.wikimedia.org/r/330094
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I7b392afb26db131fbdc1e8b13ab85a8cbba91889
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ArticleFeedbackv5
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...ArticleFeedbackv5[master]: Rewording for "autohide" i18n messages so they make more sense
SamanthaNguyen has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/330093 )
Change subject: Rewording for "autohide" i18n messages so they make more sense
..
Rewording for "autohide" i18n messages so they make more sense
Also adding "Jack Phoenix" as an author, updated version number,
consistent tabbing in package.json, and support section
in composer.json
Bug: T60495
Change-Id: I913006679dc3471a2a6fcd07daf0845538faeb24
---
M composer.json
M extension.json
M i18n/en.json
M package.json
4 files changed, 19 insertions(+), 14 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ArticleFeedbackv5
refs/changes/93/330093/1
diff --git a/composer.json b/composer.json
index ccf72d0..8ecbaa4 100644
--- a/composer.json
+++ b/composer.json
@@ -4,11 +4,15 @@
"description": "The Article Feedback Tool, Version 5 is a MediaWiki
extension designed to engage readers in the assessment of article quality.",
"homepage":
"https://www.mediawiki.org/wiki/Extension:ArticleFeedbackv5";,
"license" : "GPL-2.0+",
-
+ "support": {
+ "wiki":
"https://www.mediawiki.org/wiki/Extension:ArticleFeedbackv5";,
+ "forum":
"https://www.mediawiki.org/wiki/Extension_talk:ArticleFeedbackv5";,
+ "source":
"https://github.com/wikimedia/mediawiki-extensions-ArticleFeedbackv5.git";,
+ "issues":
"https://phabricator.wikimedia.org/maniphest/task/edit/form/1/?projects=articlfeedbackv5";
+ },
"require": {
"composer/installers" : "*"
},
-
"suggest": {
"mediawiki/abuse-filter" : "dev-master"
},
diff --git a/extension.json b/extension.json
index 3a2c09e..7873b88 100644
--- a/extension.json
+++ b/extension.json
@@ -1,6 +1,6 @@
{
"name": "Article Feedback",
- "version": "5.2.0",
+ "version": "5.2.1",
"author": [
"Greg Chiasson",
"Reha Sterbin",
@@ -15,7 +15,8 @@
"Ryan Kaldari",
"Elizabeth M Smith",
"Michael Jackson",
- "Matthias Mullie"
+ "Matthias Mullie",
+ "Jack Phoenix"
],
"license-name": "GPL-2.0+",
"url": "https://www.mediawiki.org/wiki/Extension:ArticleFeedbackv5";,
diff --git a/i18n/en.json b/i18n/en.json
index 73d89bd..05bba2a 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -217,7 +217,7 @@
"articlefeedbackv5-status-unarchive": "This post was un-archived by $1
on $2 at $3",
"articlefeedbackv5-new-marker": "New",
"articlefeedbackv5-oversight-marker": "Oversighted",
- "articlefeedbackv5-autohide-marker": "Hidden",
+ "articlefeedbackv5-autohide-marker": "Auto-hidden",
"articlefeedbackv5-hide-marker": "Hidden",
"articlefeedbackv5-feature-marker": "Useful",
"articlefeedbackv5-resolve-marker": "Resolved",
@@ -320,7 +320,7 @@
"articlefeedbackv5-viewactivity": "View activity",
"articlefeedbackv5-mask-view-contents": "View contents",
"articlefeedbackv5-mask-text-inappropriate": "This post #$1
{{GENDER:$2|was marked as inappropriate by $2}} $3.",
- "articlefeedbackv5-mask-text-autohide": "This post #$1 {{GENDER:$2|was
autohidden by $2}} $3.",
+ "articlefeedbackv5-mask-text-autohide": "This post #$1 {{GENDER:$2|was
auto-hidden by $2}} $3.",
"articlefeedbackv5-mask-text-hide": "This post #$1 {{GENDER:$2|was
hidden by $2}} $3.",
"articlefeedbackv5-mask-text-oversight": "This post #$1 {{GENDER:$2|was
oversighted by $2}} $3.",
"articlefeedbackv5-special-goback": "View feedback page",
@@ -626,7 +626,7 @@
"articlefeedbackv5-activity-item-uninappropriate": "$1
{{GENDER:$6|un-marked}} this post as inappropriate on $4 at $5 $2",
"articlefeedbackv5-activity-item-hide": "$1 {{GENDER:$6|hid}} this post
on $4 at $5 $2",
"articlefeedbackv5-activity-item-unhide": "$1 {{GENDER:$6|un-hid}} this
post on $4 at $5 $2",
- "articlefeedbackv5-activity-item-autohide": "$1 {{GENDER:$6|hid}} this
post on $4 at $5 $2",
+ "articlefeedbackv5-activity-item-autohide": "$1 {{GENDER:$6|auto-hid}}
this post on $4 at $5 $2",
"articlefeedbackv5-activity-item-archive": "$1 {{GENDER:$6|archived}}
this post on $4 at $5 $2",
"articlefeedbackv5-activity-item-unarchive": "$1
{{GENDER:$6|un-archived}} this post on $4 at $5 $2",
"articlefeedbackv5-activity-item-helpful": "$1 {{GENDER:$6|marked}}
this post as helpful on $4 at $5 $2",
diff --git a/package.json b/package.json
index 1bedcd0..96bc73e 100644
--- a/package.json
+++ b/package.json
@@ -1,9 +1,9 @@
{
- "scripts": {
-"test": "grunt test"
- },
- "devDependencies": {
-"grunt": "1.0.1",
-"grunt-jsonlint": "1.1.0"
- }
+ "scripts": {
+ "test": "grunt test"
+ },
+ "de
[MediaWiki-commits] [Gerrit] mediawiki...ImportArticles[master]: Add grunt-jsonlint
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/330085 )
Change subject: Add grunt-jsonlint
..
Add grunt-jsonlint
Together with existing grunt-banana-checker this will check for valid
i18n files
Change-Id: I20b97dd4d2f966b077ebd49fd29b22f865066a85
---
M Gruntfile.js
M package.json
2 files changed, 10 insertions(+), 1 deletion(-)
Approvals:
Cblair91: Looks good to me, approved
jenkins-bot: Verified
diff --git a/Gruntfile.js b/Gruntfile.js
index ce51693..d1063c6 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -2,6 +2,7 @@
module.exports = function ( grunt ) {
grunt.loadNpmTasks( 'grunt-contrib-jshint' );
grunt.loadNpmTasks( 'grunt-jscs' );
+ grunt.loadNpmTasks( 'grunt-jsonlint' );
grunt.loadNpmTasks( 'grunt-banana-checker' );
grunt.initConfig( {
jshint: {
@@ -17,9 +18,16 @@
},
banana: {
all: 'i18n/'
+ },
+ jsonlint: {
+ all: [
+ '**/*.json',
+ '!node_modules/**',
+ '!vendor/**'
+ ]
}
} );
- grunt.registerTask( 'lint', [ 'jshint', 'jscs', 'banana' ] );
+ grunt.registerTask( 'lint', [ 'jshint', 'jscs', 'jsonlint', 'banana' ]
);
grunt.registerTask( 'test', [ 'lint' ] );
grunt.registerTask( 'default', 'test' );
};
\ No newline at end of file
diff --git a/package.json b/package.json
index fe6f4e9..43277a0 100644
--- a/package.json
+++ b/package.json
@@ -17,6 +17,7 @@
"grunt": "0.4.5",
"grunt-cli": "0.1.13",
"grunt-banana-checker": "0.4.0",
+"grunt-jsonlint": "1.1.0",
"grunt-contrib-jshint": "0.11.2",
"grunt-jscs": "1.8.0"
}
--
To view, visit https://gerrit.wikimedia.org/r/330085
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I20b97dd4d2f966b077ebd49fd29b22f865066a85
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ImportArticles
Gerrit-Branch: master
Gerrit-Owner: Umherirrender
Gerrit-Reviewer: Cblair91
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...SecurePoll[master]: Add grunt-jsonlint
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/330088 )
Change subject: Add grunt-jsonlint
..
Add grunt-jsonlint
Together with existing grunt-banana-checker this will check for valid
i18n files
Change-Id: I8e0e494636c5a4d252b08217aeaa40b28aad2a05
---
M Gruntfile.js
M package.json
2 files changed, 11 insertions(+), 2 deletions(-)
Approvals:
Huji: Looks good to me, approved
jenkins-bot: Verified
diff --git a/Gruntfile.js b/Gruntfile.js
index ee7863f..5354082 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -1,4 +1,5 @@
module.exports = function ( grunt ) {
+ grunt.loadNpmTasks( 'grunt-jsonlint' );
grunt.loadNpmTasks( 'grunt-banana-checker' );
grunt.initConfig( {
@@ -6,10 +7,17 @@
all: [
'i18n/',
]
+ },
+ jsonlint: {
+ all: [
+ '**/*.json',
+ '!node_modules/**',
+ '!vendor/**'
+ ]
}
} );
- grunt.registerTask( 'lint', ['banana'] );
+ grunt.registerTask( 'lint', ['jsonlint', 'banana'] );
grunt.registerTask( 'test', ['lint'] );
grunt.registerTask( 'default', ['test'] );
};
diff --git a/package.json b/package.json
index d916fde..12df97f 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,8 @@
{
"devDependencies": {
"grunt": "1.0.1",
-"grunt-banana-checker": "0.5.0"
+"grunt-banana-checker": "0.5.0",
+"grunt-jsonlint": "1.1.0"
},
"scripts": {
"test": "grunt test"
--
To view, visit https://gerrit.wikimedia.org/r/330088
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I8e0e494636c5a4d252b08217aeaa40b28aad2a05
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SecurePoll
Gerrit-Branch: master
Gerrit-Owner: Umherirrender
Gerrit-Reviewer: Huji
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...MiniInvite[master]: Lowercase content i18n messages for consistency
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/330084 )
Change subject: Lowercase content i18n messages for consistency
..
Lowercase content i18n messages for consistency
Also make words consistent - mixed "e-mail"s and "email"s
have become "email".
Bug: T152879
Change-Id: I1c1cd02e7a8c7f0f7fd9a9c675ec668a34f22ea2
---
M extension.json
M i18n/en.json
M i18n/fi.json
3 files changed, 28 insertions(+), 28 deletions(-)
Approvals:
Jack Phoenix: Looks good to me, approved
jenkins-bot: Verified
diff --git a/extension.json b/extension.json
index 7b0acc9..981f97d 100644
--- a/extension.json
+++ b/extension.json
@@ -1,6 +1,6 @@
{
"name": "MiniInvite",
- "version": "2.1",
+ "version": "2.2",
"author": [
"Aaron Wright",
"David Pean",
@@ -8,7 +8,7 @@
],
"license-name": "GPL-2.0+",
"url": "https://www.mediawiki.org/wiki/Extension:MiniInvite";,
- "description": "[[Special:InviteEmail|A special page to invite your
friends to join the wiki]]",
+ "descriptionmsg": "invite-desc",
"type": "specialpage",
"callback": "MiniInviteHooks::registerExtension",
"config": {
diff --git a/i18n/en.json b/i18n/en.json
index 106aeac..fea70eb 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -2,47 +2,48 @@
"@metadata": {
"authors": [
"Aaron Wright ",
- "David Pean "
+ "David Pean ",
+ "Samantha Nguyen "
]
},
+ "invite-desc": "[[Special:InviteEmail|A special page to invite your
friends to join the wiki]]",
"invite-subject": "$1 wants you to join {{SITENAME}}!",
"invite-body": "Hey!\n\nYour friend, $1, wants you to join
{{SITENAME}}! Check it out at http://{{SERVERNAME}}\n\nTo join, just click this
link and sign up!\n$4\n\nThe {{SITENAME}} Team",
"invite-email-anon-text": "Please [[Special:UserLogin|log in]] to send
out invite emails.",
"invite-not-logged-in": "Not logged in",
- "invite-message": "{{SITENAME}} is more fun with your friends. Invite
your friends to join {{SITENAME}} by simply entering e-mail addresses and an
invitiation message and clicking \"{{int:invite-customize-send}}\"",
- "invite-skip-step": "Skip This Step",
- "invite-sent": "Your Invitation Has Been Sent!",
- "invite-back-to-userpage": "< Back to Your User Page",
+ "invite-message": "{{SITENAME}} is more fun with your friends. Invite
your friends to join {{SITENAME}} by simply entering email addresses and an
invitiation message and clicking \"{{int:invite-customize-send}}\"",
+ "invite-skip-step": "Skip this step",
+ "invite-sent": "Your invitation has been sent!",
+ "invite-back-to-userpage": "< Back to your user page",
"invite-sent-thanks": "Thanks for spreading the word about
{{SITENAME}}!",
- "invite-more-friends": "Invite More Friends",
- "invite-your-friends": "Invite Your Friends",
- "invite-enter-emails": "Enter E-mails",
+ "invite-more-friends": "Invite more friends",
+ "invite-your-friends": "Invite your friends",
+ "invite-enter-emails": "Enter emails",
"invite-comma-separated": "(comma seperated for multiple addresses)",
- "invite-customize-email": "Customize Your E-mail",
+ "invite-customize-email": "Customize your email",
"invite-customize-subject": "Subject",
- "invite-customize-body": "E-mail Body",
- "invite-customize-send": "Send Email",
- "invite-emailswentout": "E-mails went out to the following addresses",
- "invite-entervalidemail": "You must enter an e-mail address",
+ "invite-customize-body": "Email body",
+ "invite-customize-send": "Send email",
+ "invite-entervalidemail": "You must enter an email address.",
"invite-contact-passwd": "Password",
- "invite-verifyemail": "Verify Your Email Address",
- "invite-friendsname": "Friend's Name",
+ "invite-verifyemail": "Verify your email address",
+ "invite-friendsname": "Friend's name",
"invite-emailaddr": "Email",
"invite-yourcontacts": "Your contacts",
"invite-sharefriends": "Share {{SITENAME}} with your friends. They will
thank you. The more friends you invite, the less bored you will be.",
- "invite-getcontactsmaintitle": "{{SITENAME}} is more fun with your
friends. Invite all of them. Enter your e-mail and password below to load your
contacts. We are serious about keeping your private information
private. We do not store the e-mail address or password provided to us.",
- "invite-msg-sent": "Messages Sent!",
- "invite-share-article": "Share Your Article With Your Friends!",
+ "invite-getcontactsmaintitle": "{{SITENAME}} is more fun with y
[MediaWiki-commits] [Gerrit] mediawiki...WikibaseQualityExternalValidation[master]: Add grunt-jsonlint
Umherirrender has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/330091 )
Change subject: Add grunt-jsonlint
..
Add grunt-jsonlint
Together with existing grunt-banana-checker this will check for valid
i18n files
Change-Id: Id4c49b2ec8d0b860624e7201e9312c5ae8543c62
---
M Gruntfile.js
M package.json
2 files changed, 57 insertions(+), 48 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikibaseQualityExternalValidation
refs/changes/91/330091/1
diff --git a/Gruntfile.js b/Gruntfile.js
index be72aec..31a2508 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -1,28 +1,36 @@
-/* jshint node: true, strict: false */
-module.exports = function ( grunt ) {
- grunt.loadNpmTasks( 'grunt-contrib-jshint' );
- grunt.loadNpmTasks( 'grunt-jscs' );
- grunt.loadNpmTasks( 'grunt-banana-checker' );
-
- grunt.initConfig( {
- jshint: {
- options: {
- jshintrc: true
- },
- all: '.'
- },
- jscs: {
- all: '.'
- },
- banana: {
- options: {
- disallowDuplicateTranslations: false,
- disallowUnusedTranslations: false,
- requireCompleteMessageDocumentation: false
- },
- all: 'i18n/'
- }
- } );
-
- grunt.registerTask( 'test', [ 'jshint', 'jscs', 'banana' ] );
-};
+/* jshint node: true, strict: false */
+module.exports = function ( grunt ) {
+ grunt.loadNpmTasks( 'grunt-contrib-jshint' );
+ grunt.loadNpmTasks( 'grunt-jscs' );
+ grunt.loadNpmTasks( 'grunt-jsonlint' );
+ grunt.loadNpmTasks( 'grunt-banana-checker' );
+
+ grunt.initConfig( {
+ jshint: {
+ options: {
+ jshintrc: true
+ },
+ all: '.'
+ },
+ jscs: {
+ all: '.'
+ },
+ banana: {
+ options: {
+ disallowDuplicateTranslations: false,
+ disallowUnusedTranslations: false,
+ requireCompleteMessageDocumentation: false
+ },
+ all: 'i18n/'
+ },
+ jsonlint: {
+ all: [
+ '**/*.json',
+ '!node_modules/**',
+ '!vendor/**'
+ ]
+ }
+ } );
+
+ grunt.registerTask( 'test', [ 'jshint', 'jscs', 'jsonlint', 'banana' ]
);
+};
diff --git a/package.json b/package.json
index e1850b3..8e49af8 100644
--- a/package.json
+++ b/package.json
@@ -1,20 +1,21 @@
-{
- "name": "WikibaseQualityExternalValidation",
- "version": "0.0.0",
- "scripts": {
- "test": "grunt test"
- },
- "repository": {
- "type": "git",
- "url":
"https://gerrit.wikimedia.org/r/mediawiki/extensions/WikibaseQualityExternalValidation";
- },
- "author": "BP2014N1",
- "license": "GPL-2.0+",
- "devDependencies": {
- "grunt": "0.4.5",
- "grunt-banana-checker": "0.3.0",
- "grunt-cli": "0.1.13",
- "grunt-contrib-jshint": "0.11.3",
- "grunt-jscs": "2.1.0"
- }
-}
+{
+ "name": "WikibaseQualityExternalValidation",
+ "version": "0.0.0",
+ "scripts": {
+ "test": "grunt test"
+ },
+ "repository": {
+ "type": "git",
+ "url":
"https://gerrit.wikimedia.org/r/mediawiki/extensions/WikibaseQualityExternalValidation";
+ },
+ "author": "BP2014N1",
+ "license": "GPL-2.0+",
+ "devDependencies": {
+ "grunt": "0.4.5",
+ "grunt-banana-checker": "0.3.0",
+ "grunt-jsonlint": "1.1.0",
+ "grunt-cli": "0.1.13",
+ "grunt-contrib-jshint": "0.11.3",
+ "grunt-jscs": "2.1.0"
+ }
+}
--
To view, visit https://gerrit.wikimedia.org/r/330091
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Id4c49b2ec8d0b860624e7201e9312c5ae8543c62
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikibaseQualityExternalValidation
Gerrit-Branch: master
Gerrit-Owner: Umherirrender
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...WikimediaMessages[master]: Add grunt-jsonlint
Umherirrender has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/330092 )
Change subject: Add grunt-jsonlint
..
Add grunt-jsonlint
Together with existing grunt-banana-checker this will check for valid
i18n files
Change-Id: I96d9f5fcf96b5b6eec9a5fccd2a196bf05248c09
---
M Gruntfile.js
M package.json
2 files changed, 33 insertions(+), 24 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikimediaMessages
refs/changes/92/330092/1
diff --git a/Gruntfile.js b/Gruntfile.js
index ce7a487..f5a1c3b 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -1,15 +1,23 @@
-module.exports = function ( grunt ) {
- grunt.loadNpmTasks( 'grunt-banana-checker' );
-
- grunt.initConfig( {
- banana: {
- all: [
- 'i18n/*/',
- ]
- }
- } );
-
- grunt.registerTask( 'lint', ['banana'] );
- grunt.registerTask( 'test', ['lint'] );
- grunt.registerTask( 'default', ['test'] );
-};
+module.exports = function ( grunt ) {
+ grunt.loadNpmTasks( 'grunt-jsonlint' );
+ grunt.loadNpmTasks( 'grunt-banana-checker' );
+
+ grunt.initConfig( {
+ banana: {
+ all: [
+ 'i18n/*/',
+ ]
+ },
+ jsonlint: {
+ all: [
+ '**/*.json',
+ '!node_modules/**',
+ '!vendor/**'
+ ]
+ }
+ } );
+
+ grunt.registerTask( 'lint', ['jsonlint', 'banana'] );
+ grunt.registerTask( 'test', ['lint'] );
+ grunt.registerTask( 'default', ['test'] );
+};
diff --git a/package.json b/package.json
index d916fde..7e17e83 100644
--- a/package.json
+++ b/package.json
@@ -1,9 +1,10 @@
-{
- "devDependencies": {
-"grunt": "1.0.1",
-"grunt-banana-checker": "0.5.0"
- },
- "scripts": {
- "test": "grunt test"
- }
-}
+{
+ "devDependencies": {
+"grunt": "1.0.1",
+"grunt-banana-checker": "0.5.0",
+"grunt-jsonlint": "1.1.0"
+ },
+ "scripts": {
+ "test": "grunt test"
+ }
+}
--
To view, visit https://gerrit.wikimedia.org/r/330092
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I96d9f5fcf96b5b6eec9a5fccd2a196bf05248c09
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikimediaMessages
Gerrit-Branch: master
Gerrit-Owner: Umherirrender
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...WikibaseQualityConstraints[master]: Add grunt-jsonlint
Umherirrender has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/330090 )
Change subject: Add grunt-jsonlint
..
Add grunt-jsonlint
Together with existing grunt-banana-checker this will check for valid
i18n files
Change-Id: I78adc4bae3fcfb5dbff2e3f8e75288074437714e
---
M Gruntfile.js
M package.json
2 files changed, 56 insertions(+), 47 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikibaseQualityConstraints
refs/changes/90/330090/1
diff --git a/Gruntfile.js b/Gruntfile.js
index e169f16..225c1b8 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -1,27 +1,35 @@
-/* jshint node: true, strict: false */
-module.exports = function ( grunt ) {
- grunt.loadNpmTasks( 'grunt-contrib-jshint' );
- grunt.loadNpmTasks( 'grunt-jscs' );
- grunt.loadNpmTasks( 'grunt-banana-checker' );
-
- grunt.initConfig( {
- jshint: {
- options: {
- jshintrc: true
- },
- all: '.'
- },
- jscs: {
- all: '.'
- },
- banana: {
- options: {
- disallowDuplicateTranslations: false,
- disallowUnusedTranslations: false
- },
- all: 'i18n/'
- }
- } );
-
- grunt.registerTask( 'test', [ 'jshint', 'jscs', 'banana' ] );
-};
+/* jshint node: true, strict: false */
+module.exports = function ( grunt ) {
+ grunt.loadNpmTasks( 'grunt-contrib-jshint' );
+ grunt.loadNpmTasks( 'grunt-jscs' );
+ grunt.loadNpmTasks( 'grunt-jsonlint' );
+ grunt.loadNpmTasks( 'grunt-banana-checker' );
+
+ grunt.initConfig( {
+ jshint: {
+ options: {
+ jshintrc: true
+ },
+ all: '.'
+ },
+ jscs: {
+ all: '.'
+ },
+ banana: {
+ options: {
+ disallowDuplicateTranslations: false,
+ disallowUnusedTranslations: false
+ },
+ all: 'i18n/'
+ },
+ jsonlint: {
+ all: [
+ '**/*.json',
+ '!node_modules/**',
+ '!vendor/**'
+ ]
+ }
+ } );
+
+ grunt.registerTask( 'test', [ 'jshint', 'jscs', 'jsonlint', 'banana' ]
);
+};
diff --git a/package.json b/package.json
index 149282e..424b42d 100644
--- a/package.json
+++ b/package.json
@@ -1,20 +1,21 @@
-{
- "name": "WikibaseQualityConstraints",
- "version": "0.0.0",
- "scripts": {
- "test": "grunt test"
- },
- "repository": {
- "type": "git",
- "url":
"https://gerrit.wikimedia.org/r/mediawiki/extensions/WikibaseQualityConstraints";
- },
- "author": "BP2014N1",
- "license": "GPL-2.0+",
- "devDependencies": {
- "grunt": "0.4.5",
- "grunt-banana-checker": "0.3.0",
- "grunt-cli": "0.1.13",
- "grunt-contrib-jshint": "0.11.3",
- "grunt-jscs": "2.1.0"
- }
-}
+{
+ "name": "WikibaseQualityConstraints",
+ "version": "0.0.0",
+ "scripts": {
+ "test": "grunt test"
+ },
+ "repository": {
+ "type": "git",
+ "url":
"https://gerrit.wikimedia.org/r/mediawiki/extensions/WikibaseQualityConstraints";
+ },
+ "author": "BP2014N1",
+ "license": "GPL-2.0+",
+ "devDependencies": {
+ "grunt": "0.4.5",
+ "grunt-banana-checker": "0.3.0",
+ "grunt-jsonlint": "1.1.0",
+ "grunt-cli": "0.1.13",
+ "grunt-contrib-jshint": "0.11.3",
+ "grunt-jscs": "2.1.0"
+ }
+}
--
To view, visit https://gerrit.wikimedia.org/r/330090
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I78adc4bae3fcfb5dbff2e3f8e75288074437714e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikibaseQualityConstraints
Gerrit-Branch: master
Gerrit-Owner: Umherirrender
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...WikiLove[master]: Add grunt-jsonlint
Umherirrender has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/330089 )
Change subject: Add grunt-jsonlint
..
Add grunt-jsonlint
Together with existing grunt-banana-checker this will check for valid
i18n files
Change-Id: I638017b9e691611e6ad7dbe543d9ce2a171e06c1
---
M Gruntfile.js
M package.json
2 files changed, 11 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikiLove
refs/changes/89/330089/1
diff --git a/Gruntfile.js b/Gruntfile.js
index 931b835..d7f05c8 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -1,5 +1,6 @@
/*jshint node:true */
module.exports = function ( grunt ) {
+ grunt.loadNpmTasks( 'grunt-jsonlint' );
grunt.loadNpmTasks( 'grunt-banana-checker' );
grunt.initConfig( {
@@ -7,10 +8,17 @@
all: [
'i18n/',
]
+ },
+ jsonlint: {
+ all: [
+ '**/*.json',
+ '!node_modules/**',
+ '!vendor/**'
+ ]
}
} );
- grunt.registerTask( 'lint', [ 'banana' ] );
+ grunt.registerTask( 'lint', [ 'jsonlint', 'banana' ] );
grunt.registerTask( 'test', [ 'lint' ] );
grunt.registerTask( 'default', [ 'test' ] );
};
diff --git a/package.json b/package.json
index d916fde..12df97f 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,8 @@
{
"devDependencies": {
"grunt": "1.0.1",
-"grunt-banana-checker": "0.5.0"
+"grunt-banana-checker": "0.5.0",
+"grunt-jsonlint": "1.1.0"
},
"scripts": {
"test": "grunt test"
--
To view, visit https://gerrit.wikimedia.org/r/330089
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I638017b9e691611e6ad7dbe543d9ce2a171e06c1
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikiLove
Gerrit-Branch: master
Gerrit-Owner: Umherirrender
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...SecurePoll[master]: Add grunt-jsonlint
Umherirrender has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/330088 )
Change subject: Add grunt-jsonlint
..
Add grunt-jsonlint
Together with existing grunt-banana-checker this will check for valid
i18n files
Change-Id: I8e0e494636c5a4d252b08217aeaa40b28aad2a05
---
M Gruntfile.js
M package.json
2 files changed, 11 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/SecurePoll
refs/changes/88/330088/1
diff --git a/Gruntfile.js b/Gruntfile.js
index ee7863f..5354082 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -1,4 +1,5 @@
module.exports = function ( grunt ) {
+ grunt.loadNpmTasks( 'grunt-jsonlint' );
grunt.loadNpmTasks( 'grunt-banana-checker' );
grunt.initConfig( {
@@ -6,10 +7,17 @@
all: [
'i18n/',
]
+ },
+ jsonlint: {
+ all: [
+ '**/*.json',
+ '!node_modules/**',
+ '!vendor/**'
+ ]
}
} );
- grunt.registerTask( 'lint', ['banana'] );
+ grunt.registerTask( 'lint', ['jsonlint', 'banana'] );
grunt.registerTask( 'test', ['lint'] );
grunt.registerTask( 'default', ['test'] );
};
diff --git a/package.json b/package.json
index d916fde..12df97f 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,8 @@
{
"devDependencies": {
"grunt": "1.0.1",
-"grunt-banana-checker": "0.5.0"
+"grunt-banana-checker": "0.5.0",
+"grunt-jsonlint": "1.1.0"
},
"scripts": {
"test": "grunt test"
--
To view, visit https://gerrit.wikimedia.org/r/330088
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I8e0e494636c5a4d252b08217aeaa40b28aad2a05
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SecurePoll
Gerrit-Branch: master
Gerrit-Owner: Umherirrender
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...ParsoidBatchAPI[master]: Add grunt-jsonlint
Umherirrender has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/330087 )
Change subject: Add grunt-jsonlint
..
Add grunt-jsonlint
Together with existing grunt-banana-checker this will check for valid
i18n files
Change-Id: I29d298cbbdf4d50bde20741fc7c1eaba9d8638c8
---
M Gruntfile.js
M package.json
2 files changed, 11 insertions(+), 2 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ParsoidBatchAPI
refs/changes/87/330087/1
diff --git a/Gruntfile.js b/Gruntfile.js
index ee7863f..d990810 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -1,4 +1,5 @@
module.exports = function ( grunt ) {
+ grunt.loadNpmTasks( 'grunt-jsonlint' );
grunt.loadNpmTasks( 'grunt-banana-checker' );
grunt.initConfig( {
@@ -6,10 +7,17 @@
all: [
'i18n/',
]
+ },
+ jsonlint: {
+ all: [
+ '**/*.json',
+ '!node_modules/**',
+ '!vendor/**'
+ ]
}
} );
- grunt.registerTask( 'lint', ['banana'] );
+ grunt.registerTask( 'lint', ['jsonlint', 'banana'] );
grunt.registerTask( 'test', ['lint'] );
grunt.registerTask( 'default', ['test'] );
};
diff --git a/package.json b/package.json
index d916fde..12df97f 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,8 @@
{
"devDependencies": {
"grunt": "1.0.1",
-"grunt-banana-checker": "0.5.0"
+"grunt-banana-checker": "0.5.0",
+"grunt-jsonlint": "1.1.0"
},
"scripts": {
"test": "grunt test"
--
To view, visit https://gerrit.wikimedia.org/r/330087
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I29d298cbbdf4d50bde20741fc7c1eaba9d8638c8
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ParsoidBatchAPI
Gerrit-Branch: master
Gerrit-Owner: Umherirrender
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...LanguageTool[master]: Add grunt-jsonlint
Umherirrender has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/330086 )
Change subject: Add grunt-jsonlint
..
Add grunt-jsonlint
Together with existing grunt-banana-checker this will check for valid
i18n files
Change-Id: Id7afe489d9639a2d498417ba90773ea0d1c2f19f
---
M Gruntfile.js
M package.json
2 files changed, 10 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/LanguageTool
refs/changes/86/330086/1
diff --git a/Gruntfile.js b/Gruntfile.js
index a6da383..a260757 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -2,6 +2,7 @@
module.exports = function ( grunt ) {
grunt.loadNpmTasks( 'grunt-contrib-jshint' );
grunt.loadNpmTasks( 'grunt-jscs' );
+ grunt.loadNpmTasks( 'grunt-jsonlint' );
grunt.loadNpmTasks( 'grunt-banana-checker' );
grunt.initConfig( {
@@ -19,10 +20,17 @@
},
banana: {
all: 'i18n/'
+ },
+ jsonlint: {
+ all: [
+ '**/*.json',
+ '!node_modules/**',
+ '!vendor/**'
+ ]
}
} );
- grunt.registerTask( 'lint', [ 'jshint', 'jscs', 'banana' ] );
+ grunt.registerTask( 'lint', [ 'jshint', 'jscs', 'jsonlint', 'banana' ]
);
grunt.registerTask( 'test', [ 'lint' ] );
grunt.registerTask( 'default', 'test' );
};
diff --git a/package.json b/package.json
index cc5ae03..d29a4ea 100644
--- a/package.json
+++ b/package.json
@@ -8,6 +8,7 @@
"grunt": "0.4.5",
"grunt-cli": "0.1.13",
"grunt-banana-checker": "0.4.0",
+"grunt-jsonlint": "1.1.0",
"grunt-contrib-jshint": "0.11.3",
"grunt-jscs": "1.8.0"
}
--
To view, visit https://gerrit.wikimedia.org/r/330086
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Id7afe489d9639a2d498417ba90773ea0d1c2f19f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/LanguageTool
Gerrit-Branch: master
Gerrit-Owner: Umherirrender
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...ImportArticles[master]: Add grunt-jsonlint
Umherirrender has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/330085 )
Change subject: Add grunt-jsonlint
..
Add grunt-jsonlint
Together with existing grunt-banana-checker this will check for valid
i18n files
Change-Id: I20b97dd4d2f966b077ebd49fd29b22f865066a85
---
M Gruntfile.js
M package.json
2 files changed, 10 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ImportArticles
refs/changes/85/330085/1
diff --git a/Gruntfile.js b/Gruntfile.js
index ce51693..d1063c6 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -2,6 +2,7 @@
module.exports = function ( grunt ) {
grunt.loadNpmTasks( 'grunt-contrib-jshint' );
grunt.loadNpmTasks( 'grunt-jscs' );
+ grunt.loadNpmTasks( 'grunt-jsonlint' );
grunt.loadNpmTasks( 'grunt-banana-checker' );
grunt.initConfig( {
jshint: {
@@ -17,9 +18,16 @@
},
banana: {
all: 'i18n/'
+ },
+ jsonlint: {
+ all: [
+ '**/*.json',
+ '!node_modules/**',
+ '!vendor/**'
+ ]
}
} );
- grunt.registerTask( 'lint', [ 'jshint', 'jscs', 'banana' ] );
+ grunt.registerTask( 'lint', [ 'jshint', 'jscs', 'jsonlint', 'banana' ]
);
grunt.registerTask( 'test', [ 'lint' ] );
grunt.registerTask( 'default', 'test' );
};
\ No newline at end of file
diff --git a/package.json b/package.json
index fe6f4e9..43277a0 100644
--- a/package.json
+++ b/package.json
@@ -17,6 +17,7 @@
"grunt": "0.4.5",
"grunt-cli": "0.1.13",
"grunt-banana-checker": "0.4.0",
+"grunt-jsonlint": "1.1.0",
"grunt-contrib-jshint": "0.11.2",
"grunt-jscs": "1.8.0"
}
--
To view, visit https://gerrit.wikimedia.org/r/330085
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I20b97dd4d2f966b077ebd49fd29b22f865066a85
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ImportArticles
Gerrit-Branch: master
Gerrit-Owner: Umherirrender
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...MiniInvite[master]: Lowercase content i18n messages for consistency
SamanthaNguyen has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/330084 )
Change subject: Lowercase content i18n messages for consistency
..
Lowercase content i18n messages for consistency
Bug: T152879
Change-Id: I1c1cd02e7a8c7f0f7fd9a9c675ec668a34f22ea2
---
M extension.json
M i18n/en.json
2 files changed, 22 insertions(+), 20 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MiniInvite
refs/changes/84/330084/1
diff --git a/extension.json b/extension.json
index 7b0acc9..83ebffa 100644
--- a/extension.json
+++ b/extension.json
@@ -1,6 +1,6 @@
{
"name": "MiniInvite",
- "version": "2.1",
+ "version": "2.3",
"author": [
"Aaron Wright",
"David Pean",
@@ -8,7 +8,7 @@
],
"license-name": "GPL-2.0+",
"url": "https://www.mediawiki.org/wiki/Extension:MiniInvite";,
- "description": "[[Special:InviteEmail|A special page to invite your
friends to join the wiki]]",
+ "descriptionmsg": "invite-desc",
"type": "specialpage",
"callback": "MiniInviteHooks::registerExtension",
"config": {
diff --git a/i18n/en.json b/i18n/en.json
index 106aeac..01869e8 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -2,40 +2,42 @@
"@metadata": {
"authors": [
"Aaron Wright ",
- "David Pean "
+ "David Pean ",
+ "Samantha Nguyen "
]
},
+ "invite-desc": "[[Special:InviteEmail|A special page to invite your
friends to join the wiki]]",
"invite-subject": "$1 wants you to join {{SITENAME}}!",
"invite-body": "Hey!\n\nYour friend, $1, wants you to join
{{SITENAME}}! Check it out at http://{{SERVERNAME}}\n\nTo join, just click this
link and sign up!\n$4\n\nThe {{SITENAME}} Team",
"invite-email-anon-text": "Please [[Special:UserLogin|log in]] to send
out invite emails.",
"invite-not-logged-in": "Not logged in",
"invite-message": "{{SITENAME}} is more fun with your friends. Invite
your friends to join {{SITENAME}} by simply entering e-mail addresses and an
invitiation message and clicking \"{{int:invite-customize-send}}\"",
- "invite-skip-step": "Skip This Step",
- "invite-sent": "Your Invitation Has Been Sent!",
- "invite-back-to-userpage": "< Back to Your User Page",
+ "invite-skip-step": "Skip this step",
+ "invite-sent": "Your invitation has been sent!",
+ "invite-back-to-userpage": "< Back to Your user page",
"invite-sent-thanks": "Thanks for spreading the word about
{{SITENAME}}!",
- "invite-more-friends": "Invite More Friends",
- "invite-your-friends": "Invite Your Friends",
- "invite-enter-emails": "Enter E-mails",
+ "invite-more-friends": "Invite more friends",
+ "invite-your-friends": "Invite your friends",
+ "invite-enter-emails": "Enter emails",
"invite-comma-separated": "(comma seperated for multiple addresses)",
- "invite-customize-email": "Customize Your E-mail",
+ "invite-customize-email": "Customize your e-mail",
"invite-customize-subject": "Subject",
- "invite-customize-body": "E-mail Body",
- "invite-customize-send": "Send Email",
- "invite-emailswentout": "E-mails went out to the following addresses",
- "invite-entervalidemail": "You must enter an e-mail address",
+ "invite-customize-body": "Email body",
+ "invite-customize-send": "Send email",
+ "invite-emailswentout": "Emails went out to the following addresses",
+ "invite-entervalidemail": "You must enter an email address",
"invite-contact-passwd": "Password",
- "invite-verifyemail": "Verify Your Email Address",
- "invite-friendsname": "Friend's Name",
+ "invite-verifyemail": "Verify your email address",
+ "invite-friendsname": "Friend's name",
"invite-emailaddr": "Email",
"invite-yourcontacts": "Your contacts",
"invite-sharefriends": "Share {{SITENAME}} with your friends. They will
thank you. The more friends you invite, the less bored you will be.",
"invite-getcontactsmaintitle": "{{SITENAME}} is more fun with your
friends. Invite all of them. Enter your e-mail and password below to load your
contacts. We are serious about keeping your private information
private. We do not store the e-mail address or password provided to us.",
- "invite-msg-sent": "Messages Sent!",
- "invite-share-article": "Share Your Article With Your Friends!",
+ "invite-msg-sent": "Messages sent!",
+ "invite-share-article": "Share your article with your friends!",
"invite-send-new-article-to-friends": "Awesome. Now, let's get you some
reads! Share your article with your friends. Just click below!",
- "invite-my-friends": "I
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Converted Special:Tags to OOUI
Awu42 has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/330083 ) Change subject: Converted Special:Tags to OOUI .. Converted Special:Tags to OOUI Updated forms to use OOUI with HTMLForm::factory() Change-Id: I6ec8dd59af482ed22ac3bee29c35d4a056540ac2 --- M includes/specials/SpecialTags.php 1 file changed, 4 insertions(+), 4 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/83/330083/1 diff --git a/includes/specials/SpecialTags.php b/includes/specials/SpecialTags.php index ea40cb8..e67356f 100644 --- a/includes/specials/SpecialTags.php +++ b/includes/specials/SpecialTags.php @@ -98,7 +98,7 @@ ], ]; - $form = new HTMLForm( $fields, $this->getContext() ); + $form = HTMLForm::factory( 'ooui', $fields, $this->getContext() ); $form->setAction( $this->getPageTitle( 'create' )->getLocalURL() ); $form->setWrapperLegendMsg( 'tags-create-heading' ); $form->setHeaderText( $this->msg( 'tags-create-explanation' )->parseAsBlock() ); @@ -312,7 +312,7 @@ $out->parse( $status->getWikiText() ) . $this->msg( 'tags-create-warnings-below' )->parseAsBlock(); - $subform = new HTMLForm( $fields, $this->getContext() ); + $subform = HTMLForm::factory( 'ooui', $fields, $this->getContext() ); $subform->setAction( $this->getPageTitle( 'create' )->getLocalURL() ); $subform->setWrapperLegendMsg( 'tags-create-heading' ); $subform->setHeaderText( $headerText ); @@ -377,7 +377,7 @@ 'required' => true, ]; - $form = new HTMLForm( $fields, $this->getContext() ); + $form = HTMLForm::factory( 'ooui', $fields, $this->getContext() ); $form->setAction( $this->getPageTitle( 'delete' )->getLocalURL() ); $form->tagAction = 'delete'; // custom property on HTMLForm object $form->setSubmitCallback( [ $this, 'processTagForm' ] ); @@ -428,7 +428,7 @@ 'required' => true, ]; - $form = new HTMLForm( $fields, $this->getContext() ); + $form = HTMLForm::factory( 'ooui', $fields, $this->getContext() ); $form->setAction( $this->getPageTitle( $actionStr )->getLocalURL() ); $form->tagAction = $actionStr; $form->setSubmitCallback( [ $this, 'processTagForm' ] ); -- To view, visit https://gerrit.wikimedia.org/r/330083 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I6ec8dd59af482ed22ac3bee29c35d4a056540ac2 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Awu42 <9922y...@gmail.com> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Avoid passing $this by reference in hooks
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/330081 )
Change subject: Avoid passing $this by reference in hooks
..
Avoid passing $this by reference in hooks
Renamed $this passed by reference usages in hooks inside includes directory
Bug: T153505
Change-Id: Ib3e6a288a423958e75b5c1bfe53dc29e0f3fee6d
---
M includes/Block.php
M includes/OutputPage.php
M includes/Revision.php
3 files changed, 18 insertions(+), 6 deletions(-)
Approvals:
Florianschmidtwelzow: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/Block.php b/includes/Block.php
index 20cb614..9d3a2f9 100644
--- a/includes/Block.php
+++ b/includes/Block.php
@@ -765,8 +765,10 @@
return false;
}
+ // Avoid PHP 7.1 warning of passing $this by reference
+ $block = $this;
# Allow hooks to cancel the autoblock.
- if ( !Hooks::run( 'AbortAutoblock', [ $autoblockIP, &$this ] )
) {
+ if ( !Hooks::run( 'AbortAutoblock', [ $autoblockIP, &$block ] )
) {
wfDebug( "Autoblock aborted by hook.\n" );
return false;
}
diff --git a/includes/OutputPage.php b/includes/OutputPage.php
index 9bae882..f140f54 100644
--- a/includes/OutputPage.php
+++ b/includes/OutputPage.php
@@ -1266,10 +1266,12 @@
}
}
+ // Avoid PHP 7.1 warning of passing $this by reference
+ $outputPage = $this;
# Add the remaining categories to the skin
if ( Hooks::run(
'OutputPageMakeCategoryLinks',
- [ &$this, $categories, &$this->mCategoryLinks ] )
+ [ &$outputPage, $categories, &$this->mCategoryLinks ] )
) {
$linkRenderer =
MediaWikiServices::getInstance()->getLinkRenderer();
foreach ( $categories as $category => $type ) {
@@ -1810,8 +1812,10 @@
// Link flags are ignored for now, but may in the future be
// used to mark individual language links.
$linkFlags = [];
+ // Avoid PHP 7.1 warning of passing $this by reference
+ $outputPage = $this;
Hooks::run( 'LanguageLinks', [ $this->getTitle(),
&$this->mLanguageLinks, &$linkFlags ] );
- Hooks::run( 'OutputPageParserOutput', [ &$this, $parserOutput ]
);
+ Hooks::run( 'OutputPageParserOutput', [ &$outputPage,
$parserOutput ] );
}
/**
@@ -1839,7 +1843,9 @@
*/
public function addParserOutputText( $parserOutput ) {
$text = $parserOutput->getText();
- Hooks::run( 'OutputPageBeforeHTML', [ &$this, &$text ] );
+ // Avoid PHP 7.1 warning of passing $this by reference
+ $outputPage = $this;
+ Hooks::run( 'OutputPageBeforeHTML', [ &$outputPage, &$text ] );
$this->addHTML( $text );
}
@@ -2358,9 +2364,11 @@
}
MWDebug::addModules( $this );
+ // Avoid PHP 7.1 warning of passing $this by reference
+ $outputPage = $this;
// Hook that allows last minute changes to the output
page, e.g.
// adding of CSS or Javascript by extensions.
- Hooks::run( 'BeforePageDisplay', [ &$this, &$sk ] );
+ Hooks::run( 'BeforePageDisplay', [ &$outputPage, &$sk ]
);
try {
$sk->outputPage();
diff --git a/includes/Revision.php b/includes/Revision.php
index aea8488..8721ef9 100644
--- a/includes/Revision.php
+++ b/includes/Revision.php
@@ -1505,7 +1505,9 @@
);
}
- Hooks::run( 'RevisionInsertComplete', [ &$this, $data, $flags ]
);
+ // Avoid PHP 7.1 warning of passing $this by reference
+ $revision = $this;
+ Hooks::run( 'RevisionInsertComplete', [ &$revision, $data,
$flags ] );
return $this->mId;
}
--
To view, visit https://gerrit.wikimedia.org/r/330081
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib3e6a288a423958e75b5c1bfe53dc29e0f3fee6d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Georggi199
Gerrit-Reviewer: Florianschmidtwelzow
Gerrit-Reviewer: Legoktm
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Update some packages
Paladox has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/330082 ) Change subject: Update some packages .. Update some packages Update karma to 1.1.2, changelog at https://github.com/karma-runner/karma/blob/master/CHANGELOG.md Update karma-chrome-launcher to 2.0.0, changelog at https://github.com/karma-runner/karma-chrome-launcher/releases Change-Id: I125aafc7427ff84895f28505b642d45a49931523 --- 0 files changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/82/330082/1 -- To view, visit https://gerrit.wikimedia.org/r/330082 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I125aafc7427ff84895f28505b642d45a49931523 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Paladox ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Avoid passing $this by reference in hooks
Georggi199 has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/330081 )
Change subject: Avoid passing $this by reference in hooks
..
Avoid passing $this by reference in hooks
Renamed $this passed by reference usages in hooks inside includes directory
Bug: T153505
Change-Id: Ib3e6a288a423958e75b5c1bfe53dc29e0f3fee6d
---
M includes/Block.php
M includes/OutputPage.php
M includes/Revision.php
3 files changed, 18 insertions(+), 6 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/81/330081/1
diff --git a/includes/Block.php b/includes/Block.php
index 20cb614..9d3a2f9 100644
--- a/includes/Block.php
+++ b/includes/Block.php
@@ -765,8 +765,10 @@
return false;
}
+ // Avoid PHP 7.1 warning of passing $this by reference
+ $block = $this;
# Allow hooks to cancel the autoblock.
- if ( !Hooks::run( 'AbortAutoblock', [ $autoblockIP, &$this ] )
) {
+ if ( !Hooks::run( 'AbortAutoblock', [ $autoblockIP, &$block ] )
) {
wfDebug( "Autoblock aborted by hook.\n" );
return false;
}
diff --git a/includes/OutputPage.php b/includes/OutputPage.php
index 9bae882..f140f54 100644
--- a/includes/OutputPage.php
+++ b/includes/OutputPage.php
@@ -1266,10 +1266,12 @@
}
}
+ // Avoid PHP 7.1 warning of passing $this by reference
+ $outputPage = $this;
# Add the remaining categories to the skin
if ( Hooks::run(
'OutputPageMakeCategoryLinks',
- [ &$this, $categories, &$this->mCategoryLinks ] )
+ [ &$outputPage, $categories, &$this->mCategoryLinks ] )
) {
$linkRenderer =
MediaWikiServices::getInstance()->getLinkRenderer();
foreach ( $categories as $category => $type ) {
@@ -1810,8 +1812,10 @@
// Link flags are ignored for now, but may in the future be
// used to mark individual language links.
$linkFlags = [];
+ // Avoid PHP 7.1 warning of passing $this by reference
+ $outputPage = $this;
Hooks::run( 'LanguageLinks', [ $this->getTitle(),
&$this->mLanguageLinks, &$linkFlags ] );
- Hooks::run( 'OutputPageParserOutput', [ &$this, $parserOutput ]
);
+ Hooks::run( 'OutputPageParserOutput', [ &$outputPage,
$parserOutput ] );
}
/**
@@ -1839,7 +1843,9 @@
*/
public function addParserOutputText( $parserOutput ) {
$text = $parserOutput->getText();
- Hooks::run( 'OutputPageBeforeHTML', [ &$this, &$text ] );
+ // Avoid PHP 7.1 warning of passing $this by reference
+ $outputPage = $this;
+ Hooks::run( 'OutputPageBeforeHTML', [ &$outputPage, &$text ] );
$this->addHTML( $text );
}
@@ -2358,9 +2364,11 @@
}
MWDebug::addModules( $this );
+ // Avoid PHP 7.1 warning of passing $this by reference
+ $outputPage = $this;
// Hook that allows last minute changes to the output
page, e.g.
// adding of CSS or Javascript by extensions.
- Hooks::run( 'BeforePageDisplay', [ &$this, &$sk ] );
+ Hooks::run( 'BeforePageDisplay', [ &$outputPage, &$sk ]
);
try {
$sk->outputPage();
diff --git a/includes/Revision.php b/includes/Revision.php
index aea8488..8721ef9 100644
--- a/includes/Revision.php
+++ b/includes/Revision.php
@@ -1505,7 +1505,9 @@
);
}
- Hooks::run( 'RevisionInsertComplete', [ &$this, $data, $flags ]
);
+ // Avoid PHP 7.1 warning of passing $this by reference
+ $revision = $this;
+ Hooks::run( 'RevisionInsertComplete', [ &$revision, $data,
$flags ] );
return $this->mId;
}
--
To view, visit https://gerrit.wikimedia.org/r/330081
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib3e6a288a423958e75b5c1bfe53dc29e0f3fee6d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Georggi199
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Test do not merge
Paladox has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/330080 ) Change subject: Test do not merge .. Test do not merge Change-Id: I89fe5a3c3a3e45bb9e3230dcb67438325e988c42 --- 0 files changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/80/330080/1 -- To view, visit https://gerrit.wikimedia.org/r/330080 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I89fe5a3c3a3e45bb9e3230dcb67438325e988c42 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Paladox ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] integration/config[master]: [FundraisingEmailUnsubscribe] add npm job
Umherirrender has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/330079 ) Change subject: [FundraisingEmailUnsubscribe] add npm job .. [FundraisingEmailUnsubscribe] add npm job package.json was added with Ie9a7163c3bd92b5e75c723fb0d56d5fbb178af56 Change-Id: I181e535bba1275375fce47c99c572a6f3425f452 --- M zuul/layout.yaml 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/integration/config refs/changes/79/330079/1 diff --git a/zuul/layout.yaml b/zuul/layout.yaml index da6744d..6b3b297 100644 --- a/zuul/layout.yaml +++ b/zuul/layout.yaml @@ -5293,6 +5293,7 @@ - name: jshint - name: jsonlint - name: extension-unittests-generic + - name: npm - name: mediawiki/extensions/Genderize template: -- To view, visit https://gerrit.wikimedia.org/r/330079 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I181e535bba1275375fce47c99c572a6f3425f452 Gerrit-PatchSet: 1 Gerrit-Project: integration/config Gerrit-Branch: master Gerrit-Owner: Umherirrender ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] integration/config[master]: [FundraisingChart] add npm job
Umherirrender has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/330078 ) Change subject: [FundraisingChart] add npm job .. [FundraisingChart] add npm job package.json was added with 170bac9c85e053c036e027bb2134e5ee93d18052 Change-Id: If165e04700f7a9cc833f792adc05b4eda3023532 --- M zuul/layout.yaml 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/integration/config refs/changes/78/330078/1 diff --git a/zuul/layout.yaml b/zuul/layout.yaml index da6744d..b076764 100644 --- a/zuul/layout.yaml +++ b/zuul/layout.yaml @@ -3243,6 +3243,7 @@ template: - name: jsonlint - name: extension-unittests-generic + - name: npm - name: mediawiki/extensions/ContributionReporting template: -- To view, visit https://gerrit.wikimedia.org/r/330078 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If165e04700f7a9cc833f792adc05b4eda3023532 Gerrit-PatchSet: 1 Gerrit-Project: integration/config Gerrit-Branch: master Gerrit-Owner: Umherirrender ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] integration/config[master]: [AWS] add npm job
Umherirrender has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/330077 ) Change subject: [AWS] add npm job .. [AWS] add npm job package.json was added with Iedaf44ee92e992e6c1ad4e27dc73a894d1f93b27 Change-Id: Idc8e5c55a2660b7f523fb04b1daa9e9346f3e2c8 --- M zuul/layout.yaml 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/integration/config refs/changes/77/330077/1 diff --git a/zuul/layout.yaml b/zuul/layout.yaml index da6744d..963d375 100644 --- a/zuul/layout.yaml +++ b/zuul/layout.yaml @@ -4712,6 +4712,7 @@ template: - name: composer-test - name: extension-unittests-composer + - name: npm check: - jsonlint -- To view, visit https://gerrit.wikimedia.org/r/330077 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Idc8e5c55a2660b7f523fb04b1daa9e9346f3e2c8 Gerrit-PatchSet: 1 Gerrit-Project: integration/config Gerrit-Branch: master Gerrit-Owner: Umherirrender ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] integration/config[master]: [BlueSky] add npm job
Umherirrender has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/330076 ) Change subject: [BlueSky] add npm job .. [BlueSky] add npm job package.json is there since begin Icb20b470f42f3a8e99b1592cc466cee2060a7f88 Change-Id: I6df4d3ee02e889ae0cffe86513055c5717fcb019 --- M zuul/layout.yaml 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/integration/config refs/changes/76/330076/1 diff --git a/zuul/layout.yaml b/zuul/layout.yaml index da6744d..a6fb231 100644 --- a/zuul/layout.yaml +++ b/zuul/layout.yaml @@ -1795,6 +1795,7 @@ template: - name: mw-checks-test - name: skin-tests + - name: npm experimental: - jshint -- To view, visit https://gerrit.wikimedia.org/r/330076 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I6df4d3ee02e889ae0cffe86513055c5717fcb019 Gerrit-PatchSet: 1 Gerrit-Project: integration/config Gerrit-Branch: master Gerrit-Owner: Umherirrender ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...CodeReview[master]: Replaced deprecated Linker::link() usages
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/329767 )
Change subject: Replaced deprecated Linker::link() usages
..
Replaced deprecated Linker::link() usages
Bug: T149346
Change-Id: Id5bef5db57e44a611a80d1114f36a53af362cd89
---
M backend/CodeCommentLinker.php
M ui/CodeCommentsListView.php
M ui/CodeRepoStatsView.php
M ui/CodeRevisionAuthorView.php
M ui/CodeRevisionListView.php
M ui/CodeRevisionView.php
M ui/CodeStatusChangeListView.php
M ui/CodeStatusListView.php
M ui/CodeView.php
9 files changed, 56 insertions(+), 40 deletions(-)
Approvals:
Florianschmidtwelzow: Looks good to me, approved
jenkins-bot: Verified
diff --git a/backend/CodeCommentLinker.php b/backend/CodeCommentLinker.php
index 9f1cbae..b4f502e 100644
--- a/backend/CodeCommentLinker.php
+++ b/backend/CodeCommentLinker.php
@@ -101,7 +101,8 @@
* @return string
*/
function makeInternalLink( $title, $text ) {
- return Linker::link( $title, $text );
+ $linkRenderer =
\MediaWiki\MediaWikiServices::getInstance()->getLinkRenderer();
+ return $linkRenderer->makeLink( $title, $text );
}
}
diff --git a/ui/CodeCommentsListView.php b/ui/CodeCommentsListView.php
index 1515b1e..3c90810 100644
--- a/ui/CodeCommentsListView.php
+++ b/ui/CodeCommentsListView.php
@@ -60,16 +60,17 @@
}
function formatValue( $name, $value ) {
+ $linkRenderer =
\MediaWiki\MediaWikiServices::getInstance()->getLinkRenderer();
switch( $name ) {
case 'cc_rev_id':
- return Linker::link(
+ return $linkRenderer->makeLink(
SpecialPage::getSafeTitleFor( 'Code',
$this->mRepo->getName() . '/' . $value . '#code-comments' ),
- htmlspecialchars( $value ) );
+ $value );
case 'cr_status':
- return Linker::link(
+ return $linkRenderer->makeLink(
SpecialPage::getTitleFor( 'Code',
$this->mRepo->getName() . '/status/' .
$value ),
- htmlspecialchars( $this->mView->statusDesc(
$value ) ) );
+ $this->mView->statusDesc( $value ) );
case 'cc_user_text':
return Linker::userLink( - 1, $value );
case 'cr_message':
diff --git a/ui/CodeRepoStatsView.php b/ui/CodeRepoStatsView.php
index 408b7fe..efeecaf 100644
--- a/ui/CodeRepoStatsView.php
+++ b/ui/CodeRepoStatsView.php
@@ -26,12 +26,13 @@
$wgOut->addHTML( ''
. '' . wfMessage( 'code-field-status'
)->escaped() . ''
. wfMessage( 'code-stats-count' )->escaped() .
'' );
+ $linkRenderer =
\MediaWiki\MediaWikiServices::getInstance()->getLinkRenderer();
foreach ( CodeRevision::getPossibleStates() as $state )
{
$count = isset( $stats->states[$state] ) ?
$stats->states[$state] : 0;
$count = htmlspecialchars( $wgLang->formatNum(
$count ) );
- $link = Linker::link(
+ $link = $linkRenderer->makeLink(
SpecialPage::getTitleFor( 'Code',
$repoName . '/status/' . $state ),
- htmlspecialchars( $this->statusDesc(
$state ) )
+ $this->statusDesc( $state )
);
$wgOut->addHTML( "$link"
. "$count" );
@@ -95,11 +96,12 @@
. wfMessage( 'code-stats-count' )->escaped() .
'' );
$title = SpecialPage::getTitleFor( 'Code', $repoName .
"/status/{$status}" );
+ $linkRenderer =
\MediaWiki\MediaWikiServices::getInstance()->getLinkRenderer();
foreach ( $array as $user => $count ) {
$count = htmlspecialchars( $wgLang->formatNum( $count )
);
- $link = Linker::link(
+ $link = $linkRenderer->makeLink(
$title,
- htmlspecialchars( $user ),
+ $user,
array(),
array_merge( $options, array( 'author' => $user
) )
);
diff --git a/ui/CodeRevisionAuthorView.php b/ui/CodeRevisionAuthorView.php
index 0900a95..2df0855 100644
--- a/ui/CodeRevisionAuthorView.php
+++ b/ui/CodeRevisionAuthorView.php
@@ -32,17 +32,18 @@
$linkInfo = $this->linkStatus();
+
[MediaWiki-commits] [Gerrit] mediawiki...Thanks[master]: Remove unneeded devDependencies "jshint"
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/330066 ) Change subject: Remove unneeded devDependencies "jshint" .. Remove unneeded devDependencies "jshint" Repo is using grunt with grunt-contrib-jshint Change-Id: Ibae4c586d51043775de51b3960a1e822c50c165d --- M package.json 1 file changed, 0 insertions(+), 1 deletion(-) Approvals: Paladox: Looks good to me, but someone else must approve Hashar: Looks good to me, approved jenkins-bot: Verified diff --git a/package.json b/package.json index da59c79..7c7d7f4 100644 --- a/package.json +++ b/package.json @@ -14,7 +14,6 @@ "grunt-contrib-watch": "1.0.0", "grunt-banana-checker": "0.5.0", "grunt-jscs": "2.8.0", -"jshint": "2.9.2", "grunt-jsonlint": "1.0.7" } } -- To view, visit https://gerrit.wikimedia.org/r/330066 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ibae4c586d51043775de51b3960a1e822c50c165d Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Thanks Gerrit-Branch: master Gerrit-Owner: Umherirrender Gerrit-Reviewer: Hashar Gerrit-Reviewer: Paladox 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] translatewiki[master]: Enable translations for the Material skin
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/329812 ) Change subject: Enable translations for the Material skin .. Enable translations for the Material skin Requires I50828b6056f220d7c44c028f1b9f30a2068b2416 Change-Id: Ie3a4ba1efd85a950e9a33f63a844f49fe418d642 --- M groups/MediaWiki/mediawiki-skins.txt 1 file changed, 3 insertions(+), 0 deletions(-) Approvals: Raimond Spekking: Looks good to me, approved jenkins-bot: Verified diff --git a/groups/MediaWiki/mediawiki-skins.txt b/groups/MediaWiki/mediawiki-skins.txt index 72e67bd..023eb68 100644 --- a/groups/MediaWiki/mediawiki-skins.txt +++ b/groups/MediaWiki/mediawiki-skins.txt @@ -32,6 +32,9 @@ Mask ignored = mask-menu-left, mask-menu-right, mask-index-url +Material +optional = material.css, material.js + MediaWiki Strapping file = mediawiki-strapping/i18n/%CODE%.json descmsg = strapping-desc -- To view, visit https://gerrit.wikimedia.org/r/329812 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ie3a4ba1efd85a950e9a33f63a844f49fe418d642 Gerrit-PatchSet: 2 Gerrit-Project: translatewiki Gerrit-Branch: master Gerrit-Owner: Paladox Gerrit-Reviewer: Nikerabbit Gerrit-Reviewer: Paladox Gerrit-Reviewer: Raimond Spekking Gerrit-Reviewer: Siebrand Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] integration/config[master]: [WikiLove] add npm for banana check
Hashar has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/330075 ) Change subject: [WikiLove] add npm for banana check .. [WikiLove] add npm for banana check Source change https://gerrit.wikimedia.org/r/#/c/320597/ Bug: T150332 Change-Id: I87c2f739a309bd1746c101ce3d2d2aae9f112fba --- M zuul/layout.yaml 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/integration/config refs/changes/75/330075/1 diff --git a/zuul/layout.yaml b/zuul/layout.yaml index da6744d..8c33453 100644 --- a/zuul/layout.yaml +++ b/zuul/layout.yaml @@ -8493,6 +8493,7 @@ - name: mediawiki/extensions/WikiLove template: + - name: npm - name: jshint - name: jsonlint - name: extension-unittests-generic -- To view, visit https://gerrit.wikimedia.org/r/330075 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I87c2f739a309bd1746c101ce3d2d2aae9f112fba Gerrit-PatchSet: 1 Gerrit-Project: integration/config Gerrit-Branch: master Gerrit-Owner: Hashar ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Replace mocks of DatabaseMysql by DatabaseMysqli
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/329764 )
Change subject: Replace mocks of DatabaseMysql by DatabaseMysqli
..
Replace mocks of DatabaseMysql by DatabaseMysqli
The class DatabaseMysql corresponds to the PHP extension 'mysql' which is
deprecated since PHP 5.5, and the class DatabaseMysqli corresponds to the
PHP extension 'mysqli' which is the current MySQL driver. Given the class
DatabaseMysql is likely to be removed in the future, this change is a
first step towards this.
Bug: T120333
Change-Id: I7b8363838449cae09b360221d8f50ace3a008f11
---
M tests/phpunit/includes/db/DatabaseMysqlBaseTest.php
M tests/phpunit/includes/db/LBFactoryTest.php
M tests/phpunit/includes/filerepo/FileBackendDBRepoWrapperTest.php
M tests/phpunit/includes/filerepo/MigrateFileRepoLayoutTest.php
M tests/phpunit/includes/utils/BatchRowUpdateTest.php
5 files changed, 7 insertions(+), 7 deletions(-)
Approvals:
Legoktm: Looks good to me, approved
jenkins-bot: Verified
diff --git a/tests/phpunit/includes/db/DatabaseMysqlBaseTest.php
b/tests/phpunit/includes/db/DatabaseMysqlBaseTest.php
index dbb126f..81b75de 100644
--- a/tests/phpunit/includes/db/DatabaseMysqlBaseTest.php
+++ b/tests/phpunit/includes/db/DatabaseMysqlBaseTest.php
@@ -170,7 +170,7 @@
}
function getMockForViews() {
- $db = $this->getMockBuilder( 'DatabaseMysql' )
+ $db = $this->getMockBuilder( 'DatabaseMysqli' )
->disableOriginalConstructor()
->setMethods( [ 'fetchRow', 'query' ] )
->getMock();
@@ -314,7 +314,7 @@
* @dataProvider provideLagAmounts
*/
function testPtHeartbeat( $lag ) {
- $db = $this->getMockBuilder( 'DatabaseMysql' )
+ $db = $this->getMockBuilder( 'DatabaseMysqli' )
->disableOriginalConstructor()
->setMethods( [
'getLagDetectionMethod', 'getHeartbeatData',
'getMasterServerInfo' ] )
diff --git a/tests/phpunit/includes/db/LBFactoryTest.php
b/tests/phpunit/includes/db/LBFactoryTest.php
index d8773f8..573b395 100644
--- a/tests/phpunit/includes/db/LBFactoryTest.php
+++ b/tests/phpunit/includes/db/LBFactoryTest.php
@@ -29,7 +29,7 @@
* @dataProvider getLBFactoryClassProvider
*/
public function testGetLBFactoryClass( $expected, $deprecated ) {
- $mockDB = $this->getMockBuilder( 'DatabaseMysql' )
+ $mockDB = $this->getMockBuilder( 'DatabaseMysqli' )
->disableOriginalConstructor()
->getMock();
@@ -178,7 +178,7 @@
$mPos = new MySQLMasterPos( 'db1034-bin.000976', '843431247' );
$now = microtime( true );
- $mockDB = $this->getMockBuilder( 'DatabaseMysql' )
+ $mockDB = $this->getMockBuilder( 'DatabaseMysqli' )
->disableOriginalConstructor()
->getMock();
$mockDB->method( 'writesOrCallbacksPending' )->willReturn( true
);
diff --git a/tests/phpunit/includes/filerepo/FileBackendDBRepoWrapperTest.php
b/tests/phpunit/includes/filerepo/FileBackendDBRepoWrapperTest.php
index 8366541..410d2df 100644
--- a/tests/phpunit/includes/filerepo/FileBackendDBRepoWrapperTest.php
+++ b/tests/phpunit/includes/filerepo/FileBackendDBRepoWrapperTest.php
@@ -112,7 +112,7 @@
}
protected function getMocks() {
- $dbMock = $this->getMockBuilder( 'DatabaseMysql' )
+ $dbMock = $this->getMockBuilder( 'DatabaseMysqli' )
->disableOriginalConstructor()
->getMock();
diff --git a/tests/phpunit/includes/filerepo/MigrateFileRepoLayoutTest.php
b/tests/phpunit/includes/filerepo/MigrateFileRepoLayoutTest.php
index 92a54fa..d3f9374 100644
--- a/tests/phpunit/includes/filerepo/MigrateFileRepoLayoutTest.php
+++ b/tests/phpunit/includes/filerepo/MigrateFileRepoLayoutTest.php
@@ -25,7 +25,7 @@
]
] );
- $dbMock = $this->getMockBuilder( 'DatabaseMysql' )
+ $dbMock = $this->getMockBuilder( 'DatabaseMysqli' )
->disableOriginalConstructor()
->getMock();
diff --git a/tests/phpunit/includes/utils/BatchRowUpdateTest.php
b/tests/phpunit/includes/utils/BatchRowUpdateTest.php
index cb1b3d2..6506d58 100644
--- a/tests/phpunit/includes/utils/BatchRowUpdateTest.php
+++ b/tests/phpunit/includes/utils/BatchRowUpdateTest.php
@@ -237,7 +237,7 @@
protected function mockDb() {
// @TODO: mock from Database
// FIXME: the constructor normally sets mAtomicLevels and
mSrvCache
- $databaseMysql = $this->getMockBuilder( 'DatabaseMysql' )
+ $databaseMy
[MediaWiki-commits] [Gerrit] mediawiki...Buggy[master]: Add grunt-banana-checker
Umherirrender has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/330073 )
Change subject: Add grunt-banana-checker
..
Add grunt-banana-checker
Change-Id: I830665f626bc71b8332262a300acbb693e80fd25
---
M Gruntfile.js
M package.json
2 files changed, 6 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Buggy
refs/changes/73/330073/1
diff --git a/Gruntfile.js b/Gruntfile.js
index c9e1a11..4e421b0 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -1,6 +1,7 @@
/*jshint node:true */
module.exports = function ( grunt ) {
grunt.loadNpmTasks( 'grunt-contrib-jshint' );
+ grunt.loadNpmTasks( 'grunt-banana-checker' );
grunt.initConfig( {
jshint: {
@@ -11,10 +12,13 @@
'*.js',
'modules/*.js'
]
+ },
+ banana: {
+ all: 'i18n/'
}
} );
- grunt.registerTask( 'lint', [ 'jshint' ] );
+ grunt.registerTask( 'lint', [ 'jshint', 'banana' ] );
grunt.registerTask( 'test', 'lint' );
grunt.registerTask( 'default', 'test' );
};
diff --git a/package.json b/package.json
index baada8c..a23f07e 100644
--- a/package.json
+++ b/package.json
@@ -4,6 +4,7 @@
},
"devDependencies": {
"grunt": "1.0.1",
+"grunt-banana-checker": "0.5.0",
"grunt-contrib-jshint": "1.0.0"
}
}
--
To view, visit https://gerrit.wikimedia.org/r/330073
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I830665f626bc71b8332262a300acbb693e80fd25
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Buggy
Gerrit-Branch: master
Gerrit-Owner: Umherirrender
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Buggy[master]: Call jshint over grunt
Umherirrender has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/330072 )
Change subject: Call jshint over grunt
..
Call jshint over grunt
This allows to add grunt-banana-checker later
Change-Id: I50a1084a60d32de309713c5d820fb7eec821f7cb
---
A Gruntfile.js
M package.json
2 files changed, 23 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Buggy
refs/changes/72/330072/1
diff --git a/Gruntfile.js b/Gruntfile.js
new file mode 100644
index 000..c9e1a11
--- /dev/null
+++ b/Gruntfile.js
@@ -0,0 +1,20 @@
+/*jshint node:true */
+module.exports = function ( grunt ) {
+ grunt.loadNpmTasks( 'grunt-contrib-jshint' );
+
+ grunt.initConfig( {
+ jshint: {
+ options: {
+ jshintrc: true
+ },
+ all: [
+ '*.js',
+ 'modules/*.js'
+ ]
+ }
+ } );
+
+ grunt.registerTask( 'lint', [ 'jshint' ] );
+ grunt.registerTask( 'test', 'lint' );
+ grunt.registerTask( 'default', 'test' );
+};
diff --git a/package.json b/package.json
index 22d4ca4..baada8c 100644
--- a/package.json
+++ b/package.json
@@ -1,8 +1,9 @@
{
"scripts": {
-"test": "jshint ."
+"test": "grunt test"
},
"devDependencies": {
-"jshint": "2.8.0"
+"grunt": "1.0.1",
+"grunt-contrib-jshint": "1.0.0"
}
}
--
To view, visit https://gerrit.wikimedia.org/r/330072
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I50a1084a60d32de309713c5d820fb7eec821f7cb
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Buggy
Gerrit-Branch: master
Gerrit-Owner: Umherirrender
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...ImageTweaks[master]: Add grunt-banana-checker
Umherirrender has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/330071 )
Change subject: Add grunt-banana-checker
..
Add grunt-banana-checker
Change-Id: I28490befec5d0324f63e5e52ca1c6b7078e353ff
---
M Gruntfile.js
M package.json
2 files changed, 6 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ImageTweaks
refs/changes/71/330071/1
diff --git a/Gruntfile.js b/Gruntfile.js
index 601df2a..73ffe93 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -2,6 +2,7 @@
module.exports = function ( grunt ) {
grunt.loadNpmTasks( 'grunt-contrib-jshint' );
grunt.loadNpmTasks( 'grunt-jscs' );
+ grunt.loadNpmTasks( 'grunt-banana-checker' );
grunt.initConfig( {
jshint: {
@@ -15,10 +16,13 @@
},
jscs: {
src: '<%= jshint.all %>'
+ },
+ banana: {
+ all: 'i18n/'
}
} );
- grunt.registerTask( 'lint', [ 'jscs', 'jshint' ] );
+ grunt.registerTask( 'lint', [ 'jscs', 'jshint', 'banana' ] );
grunt.registerTask( 'test', 'lint' );
grunt.registerTask( 'default', 'test' );
};
diff --git a/package.json b/package.json
index d34e192..f4c8760 100644
--- a/package.json
+++ b/package.json
@@ -9,6 +9,7 @@
},
"devDependencies": {
"grunt": "1.0.1",
+"grunt-banana-checker": "0.5.0",
"grunt-contrib-jshint": "1.0.0",
"grunt-jscs": "2.8.0"
}
--
To view, visit https://gerrit.wikimedia.org/r/330071
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I28490befec5d0324f63e5e52ca1c6b7078e353ff
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ImageTweaks
Gerrit-Branch: master
Gerrit-Owner: Umherirrender
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...ImageTweaks[master]: Call jshint and jscs over grunt
Umherirrender has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/330070 )
Change subject: Call jshint and jscs over grunt
..
Call jshint and jscs over grunt
This allows to add grunt-banana-checker later
Change-Id: Ifd6f966f8b194f0c542f98f41c2bc84c9dcab4a6
---
A Gruntfile.js
M package.json
2 files changed, 28 insertions(+), 6 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ImageTweaks
refs/changes/70/330070/1
diff --git a/Gruntfile.js b/Gruntfile.js
new file mode 100644
index 000..601df2a
--- /dev/null
+++ b/Gruntfile.js
@@ -0,0 +1,24 @@
+/*jshint node:true */
+module.exports = function ( grunt ) {
+ grunt.loadNpmTasks( 'grunt-contrib-jshint' );
+ grunt.loadNpmTasks( 'grunt-jscs' );
+
+ grunt.initConfig( {
+ jshint: {
+ options: {
+ jshintrc: true
+ },
+ all: [
+ '*.js',
+ 'resources/src/*.js'
+ ]
+ },
+ jscs: {
+ src: '<%= jshint.all %>'
+ }
+ } );
+
+ grunt.registerTask( 'lint', [ 'jscs', 'jshint' ] );
+ grunt.registerTask( 'test', 'lint' );
+ grunt.registerTask( 'default', 'test' );
+};
diff --git a/package.json b/package.json
index 319814f..d34e192 100644
--- a/package.json
+++ b/package.json
@@ -1,17 +1,15 @@
{
"private": true,
"scripts": {
-"jshint": "jshint resources/src/**.js",
-"jscs": "jscs resources/src/*.js",
-"test": "npm run jshint && npm run jscs",
+"test": "grunt test",
"doc": "jsduck resources/src --output docs"
},
"dependencies": {
"caman-dist-only": "^4.1.3"
},
"devDependencies": {
-"jscs": "^2.11.0",
-"jsduck": "^1.0.0",
-"jshint": "^2.9.1"
+"grunt": "1.0.1",
+"grunt-contrib-jshint": "1.0.0",
+"grunt-jscs": "2.8.0"
}
}
--
To view, visit https://gerrit.wikimedia.org/r/330070
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ifd6f966f8b194f0c542f98f41c2bc84c9dcab4a6
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ImageTweaks
Gerrit-Branch: master
Gerrit-Owner: Umherirrender
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...OOJsUIAjaxLogin[master]: Add grunt-banana-checker
Umherirrender has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/330069 )
Change subject: Add grunt-banana-checker
..
Add grunt-banana-checker
Change-Id: I6ac354efd91a2dcc06886d1a615e331537d61df2
---
M Gruntfile.js
M package.json
2 files changed, 6 insertions(+), 1 deletion(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/OOJsUIAjaxLogin
refs/changes/69/330069/1
diff --git a/Gruntfile.js b/Gruntfile.js
index cb8d9d0..3d4 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -2,6 +2,7 @@
module.exports = function ( grunt ) {
grunt.loadNpmTasks( 'grunt-contrib-jshint' );
grunt.loadNpmTasks( 'grunt-jscs' );
+ grunt.loadNpmTasks( 'grunt-banana-checker' );
grunt.initConfig( {
jshint: {
@@ -15,10 +16,13 @@
},
jscs: {
src: '<%= jshint.all %>'
+ },
+ banana: {
+ all: 'i18n/'
}
} );
- grunt.registerTask( 'lint', [ 'jscs', 'jshint' ] );
+ grunt.registerTask( 'lint', [ 'jscs', 'jshint', 'banana' ] );
grunt.registerTask( 'test', 'lint' );
grunt.registerTask( 'default', 'test' );
};
diff --git a/package.json b/package.json
index 46082d9..61c7122 100644
--- a/package.json
+++ b/package.json
@@ -5,6 +5,7 @@
},
"devDependencies": {
"grunt": "1.0.1",
+"grunt-banana-checker": "0.5.0",
"grunt-contrib-jshint": "1.0.0",
"grunt-jscs": "2.8.0"
}
--
To view, visit https://gerrit.wikimedia.org/r/330069
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I6ac354efd91a2dcc06886d1a615e331537d61df2
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/OOJsUIAjaxLogin
Gerrit-Branch: master
Gerrit-Owner: Umherirrender
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] oojs/ui[master]: Apply webkit GPU hack to scrollable panels
Esanders has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/330068 )
Change subject: Apply webkit GPU hack to scrollable panels
..
Apply webkit GPU hack to scrollable panels
Bug: T154385
Change-Id: Ie8b99bf84dc71b4f6a50b441bf0a6f5a11050eff
---
M src/styles/layouts/PanelLayout.less
1 file changed, 2 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/68/330068/1
diff --git a/src/styles/layouts/PanelLayout.less
b/src/styles/layouts/PanelLayout.less
index ed488ed..193b783 100644
--- a/src/styles/layouts/PanelLayout.less
+++ b/src/styles/layouts/PanelLayout.less
@@ -5,6 +5,8 @@
&-scrollable {
overflow-y: auto;
+ /* Make scrolling smooth */
+ .oo-ui-force-webkit-gpu();
}
&-expanded {
--
To view, visit https://gerrit.wikimedia.org/r/330068
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie8b99bf84dc71b4f6a50b441bf0a6f5a11050eff
Gerrit-PatchSet: 1
Gerrit-Project: oojs/ui
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...OOJsUIAjaxLogin[master]: Call jshint and jscs over grunt
Umherirrender has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/330067 )
Change subject: Call jshint and jscs over grunt
..
Call jshint and jscs over grunt
This allows to add grunt-banana-checker later
Change-Id: Ic1e7b418921179efd54563ee3d1aac4c598d9611
---
A Gruntfile.js
M package.json
2 files changed, 28 insertions(+), 4 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/OOJsUIAjaxLogin
refs/changes/67/330067/1
diff --git a/Gruntfile.js b/Gruntfile.js
new file mode 100644
index 000..cb8d9d0
--- /dev/null
+++ b/Gruntfile.js
@@ -0,0 +1,24 @@
+/*jshint node:true */
+module.exports = function ( grunt ) {
+ grunt.loadNpmTasks( 'grunt-contrib-jshint' );
+ grunt.loadNpmTasks( 'grunt-jscs' );
+
+ grunt.initConfig( {
+ jshint: {
+ options: {
+ jshintrc: true
+ },
+ all: [
+ '*.js',
+ 'resources/**/*.js'
+ ]
+ },
+ jscs: {
+ src: '<%= jshint.all %>'
+ }
+ } );
+
+ grunt.registerTask( 'lint', [ 'jscs', 'jshint' ] );
+ grunt.registerTask( 'test', 'lint' );
+ grunt.registerTask( 'default', 'test' );
+};
diff --git a/package.json b/package.json
index 9eb112d..46082d9 100644
--- a/package.json
+++ b/package.json
@@ -1,11 +1,11 @@
{
"scripts": {
-"test": "jshint ./resources/ && jscs ./resources/",
+"test": "grunt test"
"doc": "jsduck"
},
"devDependencies": {
-"jshint": "2.8.0",
-"jscs": "1.13.1",
-"jscs-jsdoc":
"git+https://github.com/jdlrobson/jscs-jsdoc.git#checkParamExistence";
+"grunt": "1.0.1",
+"grunt-contrib-jshint": "1.0.0",
+"grunt-jscs": "2.8.0"
}
}
--
To view, visit https://gerrit.wikimedia.org/r/330067
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic1e7b418921179efd54563ee3d1aac4c598d9611
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/OOJsUIAjaxLogin
Gerrit-Branch: master
Gerrit-Owner: Umherirrender
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Babel[master]: Use content language for Babel AutoCreate's edit summaries
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/330044 ) Change subject: Use content language for Babel AutoCreate's edit summaries .. Use content language for Babel AutoCreate's edit summaries Doesn't make sense to use the user's UI language here. Bug: T46623 Change-Id: I96d990de4d7a0ac46ad6d8416559c5b320efbc39 --- M BabelAutoCreate.class.php 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Nemo bis: Looks good to me, but someone else must approve Legoktm: Looks good to me, approved jenkins-bot: Verified diff --git a/BabelAutoCreate.class.php b/BabelAutoCreate.class.php index b696ed2..511c718 100644 --- a/BabelAutoCreate.class.php +++ b/BabelAutoCreate.class.php @@ -75,7 +75,7 @@ $article->doEditContent( ContentHandler::makeContent( $text, $title ), - wfMessage( 'babel-autocreate-reason', $url )->text(), + wfMessage( 'babel-autocreate-reason', $url )->inContentLanguage()->text(), EDIT_FORCE_BOT, false, $user -- To view, visit https://gerrit.wikimedia.org/r/330044 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I96d990de4d7a0ac46ad6d8416559c5b320efbc39 Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/extensions/Babel Gerrit-Branch: master Gerrit-Owner: TTO Gerrit-Reviewer: Legoktm Gerrit-Reviewer: Nemo bis 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...Thanks[master]: Remove unneeded devDependencies "jshint"
Umherirrender has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/330066 ) Change subject: Remove unneeded devDependencies "jshint" .. Remove unneeded devDependencies "jshint" Repo is using grunt with grunt-contrib-jshint Change-Id: Ibae4c586d51043775de51b3960a1e822c50c165d --- M package.json 1 file changed, 0 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Thanks refs/changes/66/330066/1 diff --git a/package.json b/package.json index da59c79..7c7d7f4 100644 --- a/package.json +++ b/package.json @@ -14,7 +14,6 @@ "grunt-contrib-watch": "1.0.0", "grunt-banana-checker": "0.5.0", "grunt-jscs": "2.8.0", -"jshint": "2.9.2", "grunt-jsonlint": "1.0.7" } } -- To view, visit https://gerrit.wikimedia.org/r/330066 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ibae4c586d51043775de51b3960a1e822c50c165d Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Thanks Gerrit-Branch: master Gerrit-Owner: Umherirrender ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Buggy[master]: Fix extension name in $wgMessagesDirs key
Umherirrender has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/330065 )
Change subject: Fix extension name in $wgMessagesDirs key
..
Fix extension name in $wgMessagesDirs key
Change-Id: I44754e462e21c0f0142bb65d71d52f4d331ca7c2
---
M Buggy.php
M extension.json
2 files changed, 2 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Buggy
refs/changes/65/330065/1
diff --git a/Buggy.php b/Buggy.php
index d9dc192..10d065a 100644
--- a/Buggy.php
+++ b/Buggy.php
@@ -48,7 +48,7 @@
// Register files
$wgAutoloadClasses['BuggyHooks'] = __DIR__ . '/Buggy.hooks.php';
$wgAutoloadClasses['ApiBuggy'] = __DIR__ . '/ApiBuggy.php';
-$wgMessagesDirs['BoilerPlate'] = __DIR__ . '/i18n';
+$wgMessagesDirs['Buggy'] = __DIR__ . '/i18n';
// Register hooks
$wgHooks['BeforePageDisplay'][] = 'BuggyHooks::onBeforePageDisplay';
diff --git a/extension.json b/extension.json
index 18f03a8..ff9b9b0 100644
--- a/extension.json
+++ b/extension.json
@@ -17,7 +17,7 @@
"buggy": "ApiBuggy"
},
"MessagesDirs": {
- "BoilerPlate": [
+ "Buggy": [
"i18n"
]
},
--
To view, visit https://gerrit.wikimedia.org/r/330065
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I44754e462e21c0f0142bb65d71d52f4d331ca7c2
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Buggy
Gerrit-Branch: master
Gerrit-Owner: Umherirrender
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: jquery.tablesorter: Sort invalid elements as -Infinity
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/329673 )
Change subject: jquery.tablesorter: Sort invalid elements as -Infinity
..
jquery.tablesorter: Sort invalid elements as -Infinity
NaN is problematic when sorting. We used 0 before, but that means that
these items get mixed in between 0 elements or in the middle of a column
when it has both negative and positive numbers. Therefore sort as
-Infinity instead, which is a proper number and will always sort to the
edge.
Bug: T154307
Change-Id: I4837669205a6c6d470f19b26d721efd2ccdcc3a0
---
M resources/src/jquery/jquery.tablesorter.js
M tests/qunit/suites/resources/jquery/jquery.tablesorter.parsers.test.js
M tests/qunit/suites/resources/jquery/jquery.tablesorter.test.js
3 files changed, 12 insertions(+), 12 deletions(-)
Approvals:
Bartosz Dziewoński: Looks good to me, approved
jenkins-bot: Verified
diff --git a/resources/src/jquery/jquery.tablesorter.js
b/resources/src/jquery/jquery.tablesorter.js
index 4da05e6..1b64237 100644
--- a/resources/src/jquery/jquery.tablesorter.js
+++ b/resources/src/jquery/jquery.tablesorter.js
@@ -1018,17 +1018,17 @@
s = out;
}
i = parseFloat( s.replace( /[, ]/g, '' ).replace(
'\u2212', '-' ) );
- return isNaN( i ) ? 0 : i;
+ return isNaN( i ) ? -Infinity : i;
},
formatFloat: function ( s ) {
var i = parseFloat( s );
- return isNaN( i ) ? 0 : i;
+ return isNaN( i ) ? -Infinity : i;
},
formatInt: function ( s ) {
var i = parseInt( s, 10 );
- return isNaN( i ) ? 0 : i;
+ return isNaN( i ) ? -Infinity : i;
},
clearTableBody: function ( table ) {
diff --git
a/tests/qunit/suites/resources/jquery/jquery.tablesorter.parsers.test.js
b/tests/qunit/suites/resources/jquery/jquery.tablesorter.parsers.test.js
index 11ceeea2..5203def 100644
--- a/tests/qunit/suites/resources/jquery/jquery.tablesorter.parsers.test.js
+++ b/tests/qunit/suites/resources/jquery/jquery.tablesorter.parsers.test.js
@@ -88,7 +88,7 @@
[ '1.238.27.1', true, 1238027001, 'An IP address with small
numbers' ],
[ '238.27.1', false, 238027001, 'A malformed IP Address' ],
[ '1', false, 1, 'A super malformed IP Address' ],
- [ 'Just text', false, 0, 'A line with just text' ],
+ [ 'Just text', false, -Infinity, 'A line with just text' ],
[ '45.238.27.109Postfix', false, 45238027109, 'An IP address
with a connected postfix' ],
[ '45.238.27.109 postfix', false, 45238027109, 'An IP address
with a seperated postfix' ]
];
@@ -177,22 +177,22 @@
[ '2000', false, 0, 'Plain 4-digit year' ],
[ '2000-01',false, 0, 'Year with month' ],
[ '2000-01-01', true, 94668480, 'Year with month and day' ],
- [ '2000-13-01', true, 0, 'Non existant month' ],
- [ '2000-01-32', true, 0, 'Non existant day' ],
+ [ '2000-13-01', true, -Infinity, 'Non existant month' ],
+ [ '2000-01-32', true, -Infinity, 'Non existant day' ],
[ '2000-01-01T12:30:30',true, 94672983,
'Date with a time' ],
[ '2000-01-01T12:30:30Z', true, 94672983, 'Date with
a UTC+0 time' ],
- [ '2000-01-01T24:30:30Z', true, 0, 'Date with invalid
hours' ],
- [ '2000-01-01T12:60:30Z', true, 0, 'Date with invalid
minutes' ],
+ [ '2000-01-01T24:30:30Z', true, -Infinity, 'Date with
invalid hours' ],
+ [ '2000-01-01T12:60:30Z', true, -Infinity, 'Date with
invalid minutes' ],
[ '2000-01-01T12:30:61Z', true, 94672980, 'Date with
invalid amount of seconds, drops seconds' ],
[ '2000-01-01T23:59:59Z', true, 946771199000, 'Edges of
time' ],
[ '2000-01-01T12:30:30.111Z', true, 946729830111, 'Date with
milliseconds' ],
[ '2000-01-01T12:30:30.1Z', true, 946729830111, 'Date with
too high precision' ],
- [ '2000-01-01T12:30:30,111Z', true, 0, 'Date with
milliseconds and , separator' ],
+ [ '2000-01-01T12:30:30,111Z', true, -Infinity, 'Date with
milliseconds and , separator' ],
[ '2000-01-01T12:30:30+01:00', true, 94672623, 'Date time
in UTC+1' ],
[ '2000-01-01T12:30:30+01:30', true, 94672443, 'Date time
in UTC+1:30' ],
[ '2000-01-01T12:30:30-01:00', true, 94673343, 'Date time
in UTC-1' ],
[MediaWiki-commits] [Gerrit] mediawiki...SkelJS[master]: Update grunt to 1.0.1
Umherirrender has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/330064 )
Change subject: Update grunt to 1.0.1
..
Update grunt to 1.0.1
Rename grunt.js to Gruntfile.js to match the name used in all other
repos
Change-Id: I759a9e128e40e003aee13e4662cc9e006c0eabae
---
R Gruntfile.js
M package.json
2 files changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/SkelJS
refs/changes/64/330064/1
diff --git a/grunt.js b/Gruntfile.js
similarity index 100%
rename from grunt.js
rename to Gruntfile.js
diff --git a/package.json b/package.json
index aa24265..0839d60 100644
--- a/package.json
+++ b/package.json
@@ -9,7 +9,7 @@
"main": "./lib/ext.SkelJS.js",
"repository" : { "type":"git",
"url":"git://gerrit.wikimedia.org/mediawiki/extensions/SkelJS.git" },
"devDependencies": {
-"grunt": "0.3.9"
+"grunt": "1.0.1"
},
"scripts": {
"test": "grunt qunit"
--
To view, visit https://gerrit.wikimedia.org/r/330064
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I759a9e128e40e003aee13e4662cc9e006c0eabae
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SkelJS
Gerrit-Branch: master
Gerrit-Owner: Umherirrender
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Removed deprecated Title::moveNoAuth function
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/329801 )
Change subject: Removed deprecated Title::moveNoAuth function
..
Removed deprecated Title::moveNoAuth function
(deprecated since 1.25)
Bug: T61113
Change-Id: I7a007dd87ea3bcbb1121738c84b0e654ba17ccbf
---
M RELEASE-NOTES-1.29
M includes/Title.php
2 files changed, 1 insertion(+), 12 deletions(-)
Approvals:
Reedy: Looks good to me, approved
jenkins-bot: Verified
diff --git a/RELEASE-NOTES-1.29 b/RELEASE-NOTES-1.29
index 7d10ad9..14b5692 100644
--- a/RELEASE-NOTES-1.29
+++ b/RELEASE-NOTES-1.29
@@ -151,6 +151,7 @@
\MediaWiki\Session\SessionManager::singleton()->getPersistedSessionId()
instead.
* Class ImageGallery (deprecated in 1.22) was removed.
Use ImageGalleryBase::factory instead.
+* Title::moveNoAuth() (deprecated in 1.25) was removed. Use MovePage class
instead.
== Compatibility ==
diff --git a/includes/Title.php b/includes/Title.php
index 1125f23..4d496e4 100644
--- a/includes/Title.php
+++ b/includes/Title.php
@@ -3610,18 +3610,6 @@
}
/**
-* Move this page without authentication
-*
-* @deprecated since 1.25 use MovePage class instead
-* @param Title $nt The new page Title
-* @return array|bool True on success, getUserPermissionsErrors()-like
array on failure
-*/
- public function moveNoAuth( &$nt ) {
- wfDeprecated( __METHOD__, '1.25' );
- return $this->moveTo( $nt, false );
- }
-
- /**
* Check whether a given move operation would be valid.
* Returns true if ok, or a getUserPermissionsErrors()-like array
otherwise
*
--
To view, visit https://gerrit.wikimedia.org/r/329801
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I7a007dd87ea3bcbb1121738c84b0e654ba17ccbf
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Awu42 <9922y...@gmail.com>
Gerrit-Reviewer: Divadsn
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...Wikibase[master]: Fix typo in unresolved-property-category-desc
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/329807 )
Change subject: Fix typo in unresolved-property-category-desc
..
Fix typo in unresolved-property-category-desc
"can not" -> "cannot"
Change-Id: I36fdbf0875c8f3bce26b3eac9f863ed40ae906b5
---
M client/i18n/en.json
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
jenkins-bot: Verified
Sn1per: Looks good to me, but someone else must approve
Thiemo Mättig (WMDE): Looks good to me, approved
diff --git a/client/i18n/en.json b/client/i18n/en.json
index b14c365..5c7c152 100644
--- a/client/i18n/en.json
+++ b/client/i18n/en.json
@@ -117,5 +117,5 @@
"notification-subject-page-connection": "A page on {{SITENAME}} you
{{GENDER:$3|created}} was {{GENDER:$2|connected}} to a {{WBREPONAME}} item",
"notification-page-connection-link": "Project:$1",
"unresolved-property-category": "Pages with unresolved properties",
- "unresolved-property-category-desc": "This category lists pages that
reference {{WBREPONAME}} properties that can not be found neither by their
property ID nor label."
+ "unresolved-property-category-desc": "This category lists pages that
reference {{WBREPONAME}} properties that cannot be found neither by their
property ID nor label."
}
--
To view, visit https://gerrit.wikimedia.org/r/329807
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I36fdbf0875c8f3bce26b3eac9f863ed40ae906b5
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Matěj Suchánek
Gerrit-Reviewer: Siebrand
Gerrit-Reviewer: Sn1per
Gerrit-Reviewer: Thiemo Mättig (WMDE)
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...TorBlock[master]: Update Maintenance scripts to use $this->requireExtension()
Divadsn has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/330063 )
Change subject: Update Maintenance scripts to use $this->requireExtension()
..
Update Maintenance scripts to use $this->requireExtension()
Bug: T152139
Change-Id: I1c0495a4dd581a7c3cf6bef61075cd653ed95733
---
M loadExitNodes.php
1 file changed, 1 insertion(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/TorBlock
refs/changes/63/330063/1
diff --git a/loadExitNodes.php b/loadExitNodes.php
index 959eb96..5ef8d3c 100644
--- a/loadExitNodes.php
+++ b/loadExitNodes.php
@@ -37,6 +37,7 @@
parent::__construct();
$this->mDescription = "Load the list of Tor exit nodes.";
$this->addOption( 'force', 'Force loading of exit nodes from
the server rather than cache.' );
+ $this->requireExtension( "TorBlock" );
}
public function execute() {
--
To view, visit https://gerrit.wikimedia.org/r/330063
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I1c0495a4dd581a7c3cf6bef61075cd653ed95733
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/TorBlock
Gerrit-Branch: master
Gerrit-Owner: Divadsn
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...ConfirmEdit[master]: Update Maintenance scripts to use $this->requireExtension()
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/330060 )
Change subject: Update Maintenance scripts to use $this->requireExtension()
..
Update Maintenance scripts to use $this->requireExtension()
Bug: T152139
Change-Id: I987c75233c8c1d02b240c1f2644aacd43dfff252
---
M maintenance/GenerateFancyCaptchas.php
1 file changed, 1 insertion(+), 0 deletions(-)
Approvals:
Florianschmidtwelzow: Looks good to me, approved
jenkins-bot: Verified
diff --git a/maintenance/GenerateFancyCaptchas.php
b/maintenance/GenerateFancyCaptchas.php
index 2ef07f2..b8b5692 100644
--- a/maintenance/GenerateFancyCaptchas.php
+++ b/maintenance/GenerateFancyCaptchas.php
@@ -50,6 +50,7 @@
);
$this->addOption( "delete", "Delete the old captches" );
$this->mDescription = "Generate new captchas and move them into
storage";
+ $this->requireExtension( "FancyCaptcha" );
}
public function execute() {
--
To view, visit https://gerrit.wikimedia.org/r/330060
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I987c75233c8c1d02b240c1f2644aacd43dfff252
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/extensions/ConfirmEdit
Gerrit-Branch: master
Gerrit-Owner: Divadsn
Gerrit-Reviewer: Divadsn
Gerrit-Reviewer: Florianschmidtwelzow
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...OAuth[master]: Update Maintenance scripts to use $this->requireExtension()
Divadsn has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/330062 )
Change subject: Update Maintenance scripts to use $this->requireExtension()
..
Update Maintenance scripts to use $this->requireExtension()
Bug: T152139
Change-Id: Id350ea5d8919d792b6dfa78bd6a9718faa6cd06c
---
M maintenance/importCentralWikiLogs.php
M maintenance/migrateCentralWiki.php
M maintenance/testOAuthConsumer.php
3 files changed, 3 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/OAuth
refs/changes/62/330062/1
diff --git a/maintenance/importCentralWikiLogs.php
b/maintenance/importCentralWikiLogs.php
index 30b1d96..8f38893 100644
--- a/maintenance/importCentralWikiLogs.php
+++ b/maintenance/importCentralWikiLogs.php
@@ -22,6 +22,7 @@
$this->mDescription = "Import central wiki logs to this wiki";
$this->addOption( 'old', 'Previous central wiki', true, true );
$this->setBatchSize( 200 );
+ $this->requireExtension( "OAuth" );
}
public function execute() {
diff --git a/maintenance/migrateCentralWiki.php
b/maintenance/migrateCentralWiki.php
index 4cc237b..2b9ddfa 100644
--- a/maintenance/migrateCentralWiki.php
+++ b/maintenance/migrateCentralWiki.php
@@ -33,6 +33,7 @@
$this->addOption( 'target', 'New central wiki', true, true );
$this->addOption( 'table', 'Table name
(oauth_registered_consumer or oauth_accepted_consumer)', true, true );
$this->setBatchSize( 200 );
+ $this->requireExtension( "OAuth" );
}
public function execute() {
diff --git a/maintenance/testOAuthConsumer.php
b/maintenance/testOAuthConsumer.php
index 76c891f..8374d3d 100644
--- a/maintenance/testOAuthConsumer.php
+++ b/maintenance/testOAuthConsumer.php
@@ -25,6 +25,7 @@
);
$this->addOption( 'useSSL', 'Use SSL' );
$this->addOption( 'verbose', 'Verbose output (e.g. HTTP
request/response headers)' );
+ $this->requireExtension( "OAuth" );
}
public function execute() {
--
To view, visit https://gerrit.wikimedia.org/r/330062
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Id350ea5d8919d792b6dfa78bd6a9718faa6cd06c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/OAuth
Gerrit-Branch: master
Gerrit-Owner: Divadsn
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] integration/config[master]: [WikiLove] add npm job
Umherirrender has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/330061 ) Change subject: [WikiLove] add npm job .. [WikiLove] add npm job Needed with I288e902ec922cff36f2dbd3332644bbf527e6301 Bug: T150332 Change-Id: I24a4ac4fdc1529143b3f47dea91ff27b55663f68 --- M zuul/layout.yaml 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/integration/config refs/changes/61/330061/1 diff --git a/zuul/layout.yaml b/zuul/layout.yaml index da6744d..c95c28f 100644 --- a/zuul/layout.yaml +++ b/zuul/layout.yaml @@ -8497,6 +8497,7 @@ - name: jsonlint - name: extension-unittests-generic - name: rake + - name: npm - name: mediawiki/extensions/wikihiero template: -- To view, visit https://gerrit.wikimedia.org/r/330061 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I24a4ac4fdc1529143b3f47dea91ff27b55663f68 Gerrit-PatchSet: 1 Gerrit-Project: integration/config Gerrit-Branch: master Gerrit-Owner: Umherirrender ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...WikiLove[master]: Add npm entry point and banana i18n linter
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/320597 )
Change subject: Add npm entry point and banana i18n linter
..
Add npm entry point and banana i18n linter
Bug: T150332
Change-Id: I288e902ec922cff36f2dbd3332644bbf527e6301
---
M .gitignore
A Gruntfile.js
A package.json
3 files changed, 26 insertions(+), 0 deletions(-)
Approvals:
Umherirrender: Looks good to me, approved
jenkins-bot: Verified
diff --git a/.gitignore b/.gitignore
index 98b092a..a30a7d4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
+/node_modules/
.svn
*~
*.kate-swp
diff --git a/Gruntfile.js b/Gruntfile.js
new file mode 100644
index 000..931b835
--- /dev/null
+++ b/Gruntfile.js
@@ -0,0 +1,16 @@
+/*jshint node:true */
+module.exports = function ( grunt ) {
+ grunt.loadNpmTasks( 'grunt-banana-checker' );
+
+ grunt.initConfig( {
+ banana: {
+ all: [
+ 'i18n/',
+ ]
+ }
+ } );
+
+ grunt.registerTask( 'lint', [ 'banana' ] );
+ grunt.registerTask( 'test', [ 'lint' ] );
+ grunt.registerTask( 'default', [ 'test' ] );
+};
diff --git a/package.json b/package.json
new file mode 100644
index 000..d916fde
--- /dev/null
+++ b/package.json
@@ -0,0 +1,9 @@
+{
+ "devDependencies": {
+"grunt": "1.0.1",
+"grunt-banana-checker": "0.5.0"
+ },
+ "scripts": {
+ "test": "grunt test"
+ }
+}
--
To view, visit https://gerrit.wikimedia.org/r/320597
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I288e902ec922cff36f2dbd3332644bbf527e6301
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/extensions/WikiLove
Gerrit-Branch: master
Gerrit-Owner: Hashar
Gerrit-Reviewer: Hashar
Gerrit-Reviewer: Umherirrender
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...ConfirmEdit[master]: Update Maintenance scripts to use $this->requireExtension()
Divadsn has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/330060 )
Change subject: Update Maintenance scripts to use $this->requireExtension()
..
Update Maintenance scripts to use $this->requireExtension()
Bug: T152139
Change-Id: I987c75233c8c1d02b240c1f2644aacd43dfff252
---
M maintenance/GenerateFancyCaptchas.php
1 file changed, 2 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ConfirmEdit
refs/changes/60/330060/1
diff --git a/maintenance/GenerateFancyCaptchas.php
b/maintenance/GenerateFancyCaptchas.php
old mode 100644
new mode 100755
index 2ef07f2..44b11f2
--- a/maintenance/GenerateFancyCaptchas.php
+++ b/maintenance/GenerateFancyCaptchas.php
@@ -50,6 +50,8 @@
);
$this->addOption( "delete", "Delete the old captches" );
$this->mDescription = "Generate new captchas and move them into
storage";
+
+ $this->requireExtension( "ConfirmEdit" );
}
public function execute() {
--
To view, visit https://gerrit.wikimedia.org/r/330060
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I987c75233c8c1d02b240c1f2644aacd43dfff252
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ConfirmEdit
Gerrit-Branch: master
Gerrit-Owner: Divadsn
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] integration/config[master]: [WikiLexicalData] Change to composer-test
Umherirrender has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/330059 ) Change subject: [WikiLexicalData] Change to composer-test .. [WikiLexicalData] Change to composer-test Related I6124fab4d64028d7a9a453475aef8c2421e97f78 Change-Id: I8bec018aee7092b4d50031818db3ff0d224fea13 --- M zuul/layout.yaml 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/integration/config refs/changes/59/330059/1 diff --git a/zuul/layout.yaml b/zuul/layout.yaml index da6744d..7bb19c5 100644 --- a/zuul/layout.yaml +++ b/zuul/layout.yaml @@ -8487,7 +8487,7 @@ - name: mediawiki/extensions/WikiLexicalData template: - - name: mw-checks-test + - name: composer-test - name: jshint - name: jsonlint -- To view, visit https://gerrit.wikimedia.org/r/330059 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I8bec018aee7092b4d50031818db3ff0d224fea13 Gerrit-PatchSet: 1 Gerrit-Project: integration/config Gerrit-Branch: master Gerrit-Owner: Umherirrender ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...WikiLexicalData[master]: Add composer.json for php-parallel-lint
Umherirrender has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/330058 )
Change subject: Add composer.json for php-parallel-lint
..
Add composer.json for php-parallel-lint
repo contains folder with spaces, which gives problem on the old
phplint.
Bug: T89380
Change-Id: I6124fab4d64028d7a9a453475aef8c2421e97f78
---
A composer.json
1 file changed, 10 insertions(+), 0 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikiLexicalData
refs/changes/58/330058/1
diff --git a/composer.json b/composer.json
new file mode 100644
index 000..1c63f9e
--- /dev/null
+++ b/composer.json
@@ -0,0 +1,10 @@
+{
+ "require-dev": {
+ "jakub-onderka/php-parallel-lint": "0.9.2"
+ },
+ "scripts": {
+ "test": [
+ "parallel-lint . --exclude vendor"
+ ]
+ }
+}
--
To view, visit https://gerrit.wikimedia.org/r/330058
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I6124fab4d64028d7a9a453475aef8c2421e97f78
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikiLexicalData
Gerrit-Branch: master
Gerrit-Owner: Umherirrender
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...ExtensionDistributor[master]: php: Use new array syntax
Esanders has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/330057 )
Change subject: php: Use new array syntax
..
php: Use new array syntax
Change-Id: Ifa264114b1de6d9397d1ab0a7b8e54b135cebcf5
---
M ExtensionDistributor.alias.php
M ExtensionDistributor.hooks.php
M includes/api/ApiListExtDistBranches.php
M includes/api/ApiListExtDistRepos.php
M includes/providers/ExtDistProvider.php
M includes/providers/GerritExtDistProvider.php
M includes/providers/GithubExtDistProvider.php
M includes/specials/SpecialBaseDistributor.php
M includes/stats/ExtDistGraphiteStats.php
9 files changed, 79 insertions(+), 79 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ExtensionDistributor
refs/changes/57/330057/1
diff --git a/ExtensionDistributor.alias.php b/ExtensionDistributor.alias.php
index cfed997..e50d1dd 100644
--- a/ExtensionDistributor.alias.php
+++ b/ExtensionDistributor.alias.php
@@ -6,12 +6,12 @@
* @ingroup Extensions
*/
-$specialPageAliases = array();
+$specialPageAliases = [];
/** English
* @author Chad Horohoe
*/
-$specialPageAliases['en'] = array(
- 'ExtensionDistributor' => array( 'ExtensionDistributor' ),
- 'SkinDistributor' => array( 'SkinDistributor' ),
-);
+$specialPageAliases['en'] = [
+ 'ExtensionDistributor' => [ 'ExtensionDistributor' ],
+ 'SkinDistributor' => [ 'SkinDistributor' ],
+];
diff --git a/ExtensionDistributor.hooks.php b/ExtensionDistributor.hooks.php
index 9d696d0..36c9211 100644
--- a/ExtensionDistributor.hooks.php
+++ b/ExtensionDistributor.hooks.php
@@ -9,10 +9,10 @@
*/
public static function onAPIQuerySiteInfoGeneralInfo( ApiQuerySiteInfo
$api, array &$data ) {
global $wgExtDistSnapshotRefs, $wgExtDistListFile;
- $data['extensiondistributor'] = array(
+ $data['extensiondistributor'] = [
'snapshots' => $wgExtDistSnapshotRefs,
'list' => $wgExtDistListFile ?: ''
- );
+ ];
$api->getResult()->setIndexedTagName(
$data['extensiondistributor']['snapshots'],
'snapshot'
diff --git a/includes/api/ApiListExtDistBranches.php
b/includes/api/ApiListExtDistBranches.php
index 43dc116..2dc764d 100644
--- a/includes/api/ApiListExtDistBranches.php
+++ b/includes/api/ApiListExtDistBranches.php
@@ -7,7 +7,7 @@
*/
class ApiListExtDistBranches extends ApiQueryBase {
- private $providers = array();
+ private $providers = [];
public function __construct( ApiQuery $query, $moduleName ) {
parent::__construct( $query, $moduleName, 'edb' );
@@ -35,7 +35,7 @@
$extProvider->setLogger( $logger );
$skinProvider = ExtDistProvider::getProviderFor(
ExtDistProvider::SKINS );
$skinProvider->setLogger( $logger );
- $info = array();
+ $info = [];
ApiResult::setArrayType( $info, 'assoc' );
$params = $this->extractRequestParams();
if ( $params['exts'] ) {
@@ -59,9 +59,9 @@
* @return array
*/
private function getInfo( ExtDistProvider $provider, array $repos ) {
- $out = array();
+ $out = [];
foreach ( $repos as $repo ) {
- $out[$repo] = array();
+ $out[$repo] = [];
$branches = $provider->getBranches( $repo );
foreach ( $branches as $branch => $sha1 ) {
$out[$repo][$branch] =
$provider->getTarballLocation( $repo, $branch );
@@ -85,19 +85,19 @@
public function getAllowedParams() {
$extensionsProvider = $this->getProvider(
ExtDistProvider::EXTENSIONS );
$skinsProvider = $this->getProvider( ExtDistProvider::SKINS );
- return array(
- 'exts' => array(
+ return [
+ 'exts' => [
ApiBase::PARAM_ISMULTI => true,
ApiBase::PARAM_TYPE => $extensionsProvider
?
$extensionsProvider->getRepositoryList()
- : array(),
- ),
- 'skins' => array(
+ : [],
+ ],
+ 'skins' => [
ApiBase::PARAM_ISMULTI => true,
ApiBase::PARAM_TYPE => $skinsProvider
? $skinsProvider->getRepositoryList()
- : array(),
- )
+ : [],
+ ]
);
}
@@ -1
[MediaWiki-commits] [Gerrit] mediawiki...ExtensionDistributor[master]: Use ActionFieldLayout for dropdown+button
Esanders has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/330055 )
Change subject: Use ActionFieldLayout for dropdown+button
..
Use ActionFieldLayout for dropdown+button
Change-Id: Ia1feba432b6221bbb0a034bb905591fc6603231f
---
M includes/specials/SpecialBaseDistributor.php
M resources/ext.extensiondistributor.special.js
2 files changed, 24 insertions(+), 16 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ExtensionDistributor
refs/changes/55/330055/1
diff --git a/includes/specials/SpecialBaseDistributor.php
b/includes/specials/SpecialBaseDistributor.php
index 93f8115..0e91435 100644
--- a/includes/specials/SpecialBaseDistributor.php
+++ b/includes/specials/SpecialBaseDistributor.php
@@ -245,19 +245,24 @@
$out->addHTML( $html );
$out->enableOOUI();
$out->addHTML(
- new OOUI\DropdownInputWidget( array(
- 'id' => 'mw-extdist-selector-version',
- 'infusable' => true,
- 'options' => $options,
- 'value' => $wgExtDistDefaultSnapshot,
- 'name' => 'extdist_version',
- ) ) .
- new OOUI\ButtonInputWidget( array(
- 'name' => 'extdist_submit',
- 'label' => $this->msg(
'extdist-submit-version' )->text(),
- 'type' => 'submit',
- 'flags' => array( 'primary',
'progressive' ),
- ) ) .
+ new OOUI\ActionFieldLayout(
+ new OOUI\DropdownInputWidget( array(
+ 'id' =>
'mw-extdist-selector-version',
+ 'infusable' => true,
+ 'options' => $options,
+ 'value' =>
$wgExtDistDefaultSnapshot,
+ 'name' => 'extdist_version',
+ ) ),
+ new OOUI\ButtonInputWidget( array(
+ 'name' => 'extdist_submit',
+ 'label' => $this->msg(
'extdist-submit-version' )->text(),
+ 'type' => 'submit',
+ 'flags' => array( 'primary',
'progressive' ),
+ ) ),
+ array(
+ 'align' => 'top'
+ )
+ ) .
Xml::closeElement( 'form' ) . "\n"
);
} else {
diff --git a/resources/ext.extensiondistributor.special.js
b/resources/ext.extensiondistributor.special.js
index 8150cc7..fdadbbc 100644
--- a/resources/ext.extensiondistributor.special.js
+++ b/resources/ext.extensiondistributor.special.js
@@ -81,6 +81,7 @@
function processAPIResponse( data ) {
var info = data.query.extdistbranches[ distributorType
][ selector.getValue() ],
options = [],
+ versionField,
versionSelector,
versionButton;
$.each( mw.config.get( 'wgExtDistSnapshotRefs' ),
function ( i, value ) {
@@ -110,8 +111,6 @@
'extdist-choose-version-' + distributorType,
selector.getValue()
).parse().replace( /\n\n/g, '' ) );
- // Add version selector after the help text
- $continue.after( versionSelector.$element );
versionButton = new OO.ui.ButtonInputWidget( {
id: 'mw-extdist-submit-button',
name: 'extdist_submit',
@@ -127,7 +126,11 @@
/* eslint-enable camelcase */
} );
} );
- versionSelector.$element.after( versionButton.$element
);
+ versionField = new OO.ui.ActionFieldLayout(
versionSelector, versionButton, {
+ align: 'top'
+ } );
+ // Add version selector after the help text
+ $continue.after( versionField.$element );
[MediaWiki-commits] [Gerrit] mediawiki...ExtensionDistributor[master]: build: Replace jshint/jscs with eslint & stylelint
Esanders has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/330054 )
Change subject: build: Replace jshint/jscs with eslint & stylelint
..
build: Replace jshint/jscs with eslint & stylelint
Change-Id: I020dac42a26b71cb7d21defb31033385eb815577
---
A .eslintrc.json
D .jscsrc
D .jshintignore
D .jshintrc
A .stylelintrc
M Gruntfile.js
M package.json
M resources/ext.extensiondistributor.special.css
M resources/ext.extensiondistributor.special.js
9 files changed, 39 insertions(+), 50 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ExtensionDistributor
refs/changes/54/330054/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 9d22e3f..000
--- a/.jscsrc
+++ /dev/null
@@ -1,3 +0,0 @@
-{
- "preset": "wikimedia"
-}
diff --git a/.jshintignore b/.jshintignore
deleted file mode 100644
index 3c3629e..000
--- a/.jshintignore
+++ /dev/null
@@ -1 +0,0 @@
-node_modules
diff --git a/.jshintrc b/.jshintrc
deleted file mode 100644
index 66e3d48..000
--- a/.jshintrc
+++ /dev/null
@@ -1,24 +0,0 @@
-{
- // Enforcing
- "bitwise": true,
- "eqeqeq": true,
- "freeze": true,
- "latedef": true,
- "noarg": true,
- "nonew": true,
- "undef": true,
- "unused": true,
- "strict": false,
-
- // Relaxing
- "es5": false,
-
- // Environment
- "browser": true,
- "jquery": true,
-
- "globals": {
- "mediaWiki": false,
- "OO": false
- }
-}
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 d9a02ca..dda8c36 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -4,26 +4,28 @@
* @package ExtensionDistributor
*/
-/*jshint node:true */
+/* eslint-env node */
+
module.exports = function ( grunt ) {
var conf = grunt.file.readJSON( 'extension.json' );
- grunt.loadNpmTasks( 'grunt-contrib-jshint' );
- grunt.loadNpmTasks( 'grunt-jsonlint' );
+
grunt.loadNpmTasks( 'grunt-banana-checker' );
- grunt.loadNpmTasks( 'grunt-jscs' );
+ grunt.loadNpmTasks( 'grunt-eslint' );
+ grunt.loadNpmTasks( 'grunt-jsonlint' );
+ grunt.loadNpmTasks( 'grunt-stylelint' );
grunt.initConfig( {
- jshint: {
- options: {
- jshintrc: true
- },
+ eslint: {
all: [
- 'resources/*.js',
- '*.js'
+ '**/*.js',
+ '!node_modules/**'
]
},
- jscs: {
- src: '<%= jshint.all %>'
+ stylelint: {
+ all: [
+ '**/*.css',
+ '!node_modules/**'
+ ]
},
banana: conf.MessagesDirs,
jsonlint: {
@@ -34,6 +36,6 @@
}
} );
- grunt.registerTask( 'test', [ 'jshint', 'jscs', 'jsonlint', 'banana' ]
);
+ grunt.registerTask( 'test', [ 'eslint', 'stylelint', 'jsonlint',
'banana' ] );
grunt.registerTask( 'default', 'test' );
};
diff --git a/package.json b/package.json
index e2a5db2..f1f2186 100644
--- a/package.json
+++ b/package.json
@@ -5,11 +5,12 @@
"test": "grunt test"
},
"devDependencies": {
-"grunt": "0.4.5",
-"grunt-cli": "0.1.13",
-"grunt-contrib-jshint": "0.11.3",
-"grunt-banana-checker": "0.4.0",
-"grunt-jscs": "2.1.0",
-"grunt-jsonlint": "1.0.7"
+"eslint-config-wikimedia": "0.3.0",
+"grunt": "1.0.1",
+"grunt-banana-checker": "0.5.0",
+"grunt-eslint": "19.0.0",
+"grunt-jsonlint": "1.0.8",
+"grunt-stylelint": "0.6.0",
+"stylelint-config-wikimedia": "0.3.0"
}
}
diff --git a/resources/ext.extensiondistributor.special.css
b/resources/ext.extensiondistributor.special.css
index 193ca4d..d80793f 100644
--- a/resources/ext.extensiondistributor.special.css
+++ b/resources/ext.extensiondistributor.special.css
@@ -1,3 +1,4 @@
+/* stylelint-disable selector-no-id */
/* make it look the same width as the input fields */
#mw-extdist-continue {
max-width: 50em;
diff --git a/resources/ext.extensiondistributor.special.js
b/resources/ext.extensiondis
[MediaWiki-commits] [Gerrit] mediawiki...ExtensionDistributor[master]: Replace IDs with classes
Esanders has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/330056 )
Change subject: Replace IDs with classes
..
Replace IDs with classes
Change-Id: Id007aefa2eaaa6a7d7fe4288fe48fa7b840901e1
---
M includes/specials/SpecialBaseDistributor.php
M resources/ext.extensiondistributor.special.css
M resources/ext.extensiondistributor.special.js
3 files changed, 16 insertions(+), 17 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ExtensionDistributor
refs/changes/56/330056/1
diff --git a/includes/specials/SpecialBaseDistributor.php
b/includes/specials/SpecialBaseDistributor.php
index 0e91435..d04330f 100644
--- a/includes/specials/SpecialBaseDistributor.php
+++ b/includes/specials/SpecialBaseDistributor.php
@@ -98,8 +98,8 @@
$out = $this->getOutput();
$out->enableOOUI();
+ $out->addHTML( '' );
// extdist-choose-extensions, extdist-choose-skins
- $out->addHTML( '' );
$out->addWikiMsg( $this->msgKey( 'extdist-choose-$TYPE' ) );
$out->addHTML(
Xml::openElement( 'form', array(
@@ -122,14 +122,14 @@
) );
$out->addHTML(
new OOUI\DropdownInputWidget( array(
- 'id' => 'mw-extdist-selector',
+ 'classes' => array( 'mw-extdist-selector' ),
'infusable' => true,
'options' => $items,
'name' => 'extdist_name',
) ) .
// only shown to no-JS users via CSS
new OOUI\ButtonInputWidget( array(
- 'id' => 'mw-extdist-ext-submit',
+ 'classes' => array( 'mw-extdist-ext-submit' ),
'infusable' => true,
'name' => 'extdist_submit',
'label' => $this->msg(
'extdist-submit-extension' )->text(),
@@ -137,7 +137,7 @@
'flags' => array( 'primary', 'progressive' ),
) ) .
Xml::closeElement( 'form' ) . "\n" .
- Html::element( 'div', array( 'id' =>
'mw-extdist-continue' ) ) .
+ Html::element( 'div', array( 'class' =>
'mw-extdist-continue' ) ) .
""
);
@@ -149,7 +149,7 @@
}
$out->addHTML(
- '' .
+ '' .
$this->msg( $this->msgKey( 'extdist-popular-$TYPE' ) )
->numParams( count( $popularList ) )
->escaped() .
diff --git a/resources/ext.extensiondistributor.special.css
b/resources/ext.extensiondistributor.special.css
index d80793f..5a7a627 100644
--- a/resources/ext.extensiondistributor.special.css
+++ b/resources/ext.extensiondistributor.special.css
@@ -1,26 +1,25 @@
-/* stylelint-disable selector-no-id */
/* make it look the same width as the input fields */
-#mw-extdist-continue {
+.mw-extdist-continue {
max-width: 50em;
}
/* use display: table to create two columns */
-#mw-extdist-container {
+.mw-extdist-container {
width: 100%;
display: table;
}
-#mw-extdist-form {
+.mw-extdist-form {
width: 60%;
display: table-cell;
}
-#mw-extdist-popular {
+.mw-extdist-popular {
width: 40%;
display: table-cell;
}
/* hide submit button for JS users */
-.client-js #mw-extdist-ext-submit {
+.client-js .mw-extdist-ext-submit {
display: none;
}
diff --git a/resources/ext.extensiondistributor.special.js
b/resources/ext.extensiondistributor.special.js
index fdadbbc..92bf73a 100644
--- a/resources/ext.extensiondistributor.special.js
+++ b/resources/ext.extensiondistributor.special.js
@@ -3,9 +3,9 @@
$( function () {
// infusing the DropdownInputWidgets makes
// them look prettier.
- var selector = OO.ui.infuse( 'mw-extdist-selector' ),
+ var selector = OO.ui.infuse( $( '.mw-extdist-selector' ) ),
distributorType, progress,
- $continue = $( '#mw-extdist-continue' );
+ $continue = $( '.mw-extdist-continue' );
if ( mw.config.get( 'wgCanonicalSpecialPageName' ) ===
'ExtensionDistributor' ) {
distributorType = 'extensions';
} else {
@@ -101,7 +101,7 @@
return;
}
versionSelector = new OO.ui.DropdownInputWidget( {
- id: 'mw-extdist-selector-version',
+ classes:
[MediaWiki-commits] [Gerrit] mediawiki...VIKI[master]: Change extension url to https
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/330050 )
Change subject: Change extension url to https
..
Change extension url to https
Change-Id: Ib0fc39614b0576918242541dd989afcef3a7ec2b
---
M VIKI.php
1 file changed, 3 insertions(+), 3 deletions(-)
Approvals:
Fomafix: Looks good to me, approved
jenkins-bot: Verified
diff --git a/VIKI.php b/VIKI.php
index 4f4512e..8a5e8dd 100644
--- a/VIKI.php
+++ b/VIKI.php
@@ -72,11 +72,11 @@
$wgExtensionCredits['parserhook'][] = array (
'name' => 'VIKI',
'version' => VIKIJS_VERSION,
- 'author' => array('[http://www.mediawiki.org/wiki/User:Jji Jason Ji]',
-
'[http://www.mediawiki.org/wiki/User:Cindy.cicalese Cindy Cicalese]'),
+ 'author' => array('[https://www.mediawiki.org/wiki/User:Jji Jason Ji]',
+
'[https://www.mediawiki.org/wiki/User:Cindy.cicalese Cindy Cicalese]'),
'descriptionmsg' => 'viki-desc',
'path' => __FILE__,
- 'url' => 'http://www.mediawiki.org/wiki/Extension:VIKI'
+ 'url' => 'https://www.mediawiki.org/wiki/Extension:VIKI'
);
$wgExtensionMessagesFiles['VIKIMagic'] =
--
To view, visit https://gerrit.wikimedia.org/r/330050
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib0fc39614b0576918242541dd989afcef3a7ec2b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VIKI
Gerrit-Branch: master
Gerrit-Owner: Umherirrender
Gerrit-Reviewer: Fomafix
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...SocialProfile[master]: Make the signature of UploadAvatar::performUpload() consiste...
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/330053 )
Change subject: Make the signature of UploadAvatar::performUpload() consistent
with UploadBase::performUpload() to get rid of an E_STRICT notice
..
Make the signature of UploadAvatar::performUpload() consistent with
UploadBase::performUpload() to get rid of an E_STRICT notice
Bug: T154390
Change-Id: If369342600c900bc148e9f6852dee94cff668a7f
---
M UserProfile/SpecialUploadAvatar.php
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Jack Phoenix: Looks good to me, approved
jenkins-bot: Verified
diff --git a/UserProfile/SpecialUploadAvatar.php
b/UserProfile/SpecialUploadAvatar.php
index 55fee5c..c2136ce 100644
--- a/UserProfile/SpecialUploadAvatar.php
+++ b/UserProfile/SpecialUploadAvatar.php
@@ -356,7 +356,7 @@
/**
* Create the thumbnails and delete old files
*/
- public function performUpload( $comment, $pageText, $watch, $user ) {
+ public function performUpload( $comment, $pageText, $watch, $user,
$tags = [] ) {
global $wgUploadDirectory, $wgAvatarKey, $wgMemc;
$this->avatarUploadDirectory = $wgUploadDirectory . '/avatars';
--
To view, visit https://gerrit.wikimedia.org/r/330053
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: If369342600c900bc148e9f6852dee94cff668a7f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SocialProfile
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/core[master]: Removed deprecated class ImageGallery
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/329773 )
Change subject: Removed deprecated class ImageGallery
..
Removed deprecated class ImageGallery
Bug: T61113
Change-Id: If315002ef7d1a3937f150d0dda930976c1d95f57
---
M RELEASE-NOTES-1.29
M autoload.php
M includes/gallery/TraditionalImageGallery.php
3 files changed, 2 insertions(+), 15 deletions(-)
Approvals:
Reedy: Looks good to me, approved
jenkins-bot: Verified
diff --git a/RELEASE-NOTES-1.29 b/RELEASE-NOTES-1.29
index 9e3cfac..7d10ad9 100644
--- a/RELEASE-NOTES-1.29
+++ b/RELEASE-NOTES-1.29
@@ -149,6 +149,8 @@
* FSRepo (deprecated in 1.19) was removed.
* WebRequest::checkSessionCookie() (deprecated in 1.27) was removed. Use
\MediaWiki\Session\SessionManager::singleton()->getPersistedSessionId()
instead.
+* Class ImageGallery (deprecated in 1.22) was removed.
+ Use ImageGalleryBase::factory instead.
== Compatibility ==
diff --git a/autoload.php b/autoload.php
index fd593de..cdbdf1f 100644
--- a/autoload.php
+++ b/autoload.php
@@ -608,7 +608,6 @@
'IdentityCollation' => __DIR__ .
'/includes/collation/IdentityCollation.php',
'ImageBuilder' => __DIR__ . '/maintenance/rebuildImages.php',
'ImageCleanup' => __DIR__ . '/maintenance/cleanupImages.php',
- 'ImageGallery' => __DIR__ .
'/includes/gallery/TraditionalImageGallery.php',
'ImageGalleryBase' => __DIR__ .
'/includes/gallery/ImageGalleryBase.php',
'ImageHandler' => __DIR__ . '/includes/media/ImageHandler.php',
'ImageHistoryList' => __DIR__ . '/includes/page/ImageHistoryList.php',
diff --git a/includes/gallery/TraditionalImageGallery.php
b/includes/gallery/TraditionalImageGallery.php
index 0f889da..1fd7b0a 100644
--- a/includes/gallery/TraditionalImageGallery.php
+++ b/includes/gallery/TraditionalImageGallery.php
@@ -348,17 +348,3 @@
protected function adjustImageParameters( $thumb, &$imageParameters ) {
}
}
-
-/**
- * Backwards compatibility. This always uses traditional mode
- * if called the old way, for extensions that may expect traditional
- * mode.
- *
- * @deprecated since 1.22 Use ImageGalleryBase::factory instead.
- */
-class ImageGallery extends TraditionalImageGallery {
- function __construct( $mode = 'traditional' ) {
- wfDeprecated( __METHOD__, '1.22' );
- parent::__construct( $mode );
- }
-}
--
To view, visit https://gerrit.wikimedia.org/r/329773
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: If315002ef7d1a3937f150d0dda930976c1d95f57
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Divadsn
Gerrit-Reviewer: Aklapper
Gerrit-Reviewer: D3r1ck01
Gerrit-Reviewer: Divadsn
Gerrit-Reviewer: McIntireEvan
Gerrit-Reviewer: MtDu
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...SocialProfile[master]: Make the signature of UploadAvatar::performUpload() consiste...
Jack Phoenix has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/330053 )
Change subject: Make the signature of UploadAvatar::performUpload() consistent
with UploadBase::performUpload() to get rid of an E_STRICT notice
..
Make the signature of UploadAvatar::performUpload() consistent with
UploadBase::performUpload() to get rid of an E_STRICT notice
Bug: T154390
Change-Id: If369342600c900bc148e9f6852dee94cff668a7f
---
M UserProfile/SpecialUploadAvatar.php
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/SocialProfile
refs/changes/53/330053/1
diff --git a/UserProfile/SpecialUploadAvatar.php
b/UserProfile/SpecialUploadAvatar.php
index 55fee5c..c2136ce 100644
--- a/UserProfile/SpecialUploadAvatar.php
+++ b/UserProfile/SpecialUploadAvatar.php
@@ -356,7 +356,7 @@
/**
* Create the thumbnails and delete old files
*/
- public function performUpload( $comment, $pageText, $watch, $user ) {
+ public function performUpload( $comment, $pageText, $watch, $user,
$tags = [] ) {
global $wgUploadDirectory, $wgAvatarKey, $wgMemc;
$this->avatarUploadDirectory = $wgUploadDirectory . '/avatars';
--
To view, visit https://gerrit.wikimedia.org/r/330053
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: If369342600c900bc148e9f6852dee94cff668a7f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SocialProfile
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...GWToolset[master]: Replaced deprecated Linker::link() usages
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/329768 )
Change subject: Replaced deprecated Linker::link() usages
..
Replaced deprecated Linker::link() usages
Bug: T149346
Change-Id: I4f7bb27ea12543e5ab67403bd89a754956894453
---
M includes/Adapters/Php/MediawikiTemplatePhpAdapter.php
M includes/Forms/MetadataDetectForm.php
M includes/Forms/MetadataMappingForm.php
M includes/Forms/PreviewForm.php
M includes/Handlers/Forms/MetadataMappingHandler.php
M includes/Models/Mapping.php
M includes/Specials/SpecialGWToolset.php
7 files changed, 23 insertions(+), 18 deletions(-)
Approvals:
Florianschmidtwelzow: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/Adapters/Php/MediawikiTemplatePhpAdapter.php
b/includes/Adapters/Php/MediawikiTemplatePhpAdapter.php
index 71e24dd..6b0bee9 100644
--- a/includes/Adapters/Php/MediawikiTemplatePhpAdapter.php
+++ b/includes/Adapters/Php/MediawikiTemplatePhpAdapter.php
@@ -15,7 +15,6 @@
use GWToolset\Config;
use GWToolset\GWTException;
use GWToolset\Utils;
-use Linker;
use Title;
class MediawikiTemplatePhpAdapter implements DataAdapterInterface {
diff --git a/includes/Forms/MetadataDetectForm.php
b/includes/Forms/MetadataDetectForm.php
index c2e8bc7..911a5c7 100644
--- a/includes/Forms/MetadataDetectForm.php
+++ b/includes/Forms/MetadataDetectForm.php
@@ -15,7 +15,7 @@
use GWToolset\Utils;
use GWToolset\Helpers\FileChecks;
use GWToolset\Models\MediawikiTemplate;
-use Linker;
+use MediaWiki\MediaWikiServices;
use SpecialPage;
use Title;
@@ -72,6 +72,7 @@
$namespace = Utils::getNamespaceName(
Config::$metadata_namespace );
$MediawikiTemplate = new MediawikiTemplate( new
MediawikiTemplatePhpAdapter() );
$user = $SpecialPage->getUser();
+ $linkRenderer =
MediaWikiServices::getInstance()->getLinkRenderer();
return
Html::rawElement(
@@ -251,7 +252,7 @@
]
) .
Html::rawElement( 'br' ) .
- Linker::link(
+ $linkRenderer->makeLink(
Title::newFromText(
'Special:PrefixIndex/'
. $namespace . Config::$metadata_mapping_subpage
),
@@ -381,6 +382,7 @@
public static function getMetadataFileUrlInput( $namespace ) {
$result = null;
+ $linkRenderer =
MediaWikiServices::getInstance()->getLinkRenderer();
if ( Constants::USE_FILEBACKEND ) {
return $result;
@@ -403,7 +405,7 @@
]
) .
Html::rawElement( 'br' ) .
- Linker::link(
+ $linkRenderer->makeLink(
Title::newFromText(
'Special:PrefixIndex/' .
$namespace .
diff --git a/includes/Forms/MetadataMappingForm.php
b/includes/Forms/MetadataMappingForm.php
index bb0e36e..c522b4c 100644
--- a/includes/Forms/MetadataMappingForm.php
+++ b/includes/Forms/MetadataMappingForm.php
@@ -12,7 +12,7 @@
use GWToolset\Config;
use GWToolset\Utils;
use GWToolset\Handlers\Forms\FormHandler;
-use Linker;
+use MediaWiki\MediaWikiServices;
use Title;
class MetadataMappingForm {
@@ -30,11 +30,12 @@
*/
public static function getForm( FormHandler $Handler, array
&$user_options ) {
+ $linkRenderer =
MediaWikiServices::getInstance()->getLinkRenderer();
$template_link = '[[Template:' .
Utils::sanitizeString(
$user_options['gwtoolset-mediawiki-template-name'] ) .
']]';
$metadata_file_url = !empty( $user_options['Metadata-Title'] )
- ? Linker::link( $user_options['Metadata-Title'], null,
[ 'target' => '_blank' ] ) .
+ ? $linkRenderer->makeLink(
$user_options['Metadata-Title'], null, [ 'target' => '_blank' ] ) .
Html::rawElement( 'br' )
: null;
@@ -650,7 +651,7 @@
)
) .
Html::rawElement( 'br' ) .
- Linker::link(
+ $linkRenderer->makeLink(
Title::newFromText( 'Category:' .
Config::$source_templates ),
null,
[MediaWiki-commits] [Gerrit] mediawiki...SocialProfile[master]: Replaced deprecated Linker::link() usages
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/329769 )
Change subject: Replaced deprecated Linker::link() usages
..
Replaced deprecated Linker::link() usages
Bug: T149346
Change-Id: Ic872dac40945eae635bd8c566f8a014244110e9a
---
M SystemGifts/SpecialViewSystemGifts.php
M SystemGifts/TopAwards.php
M UserActivity/UserActivity.body.php
M UserBoard/SpecialUserBoard.php
M UserGifts/SpecialGiveGift.php
M UserGifts/SpecialViewGifts.php
M UserProfile/UserProfileClass.php
M UserProfile/UserProfilePage.php
M UserRelationship/SpecialViewRelationships.php
M UserStats/TopFansByStat.php
M UserStats/TopFansRecent.php
M UserStats/TopUsers.php
12 files changed, 45 insertions(+), 26 deletions(-)
Approvals:
Florianschmidtwelzow: Looks good to me, approved
jenkins-bot: Verified
diff --git a/SystemGifts/SpecialViewSystemGifts.php
b/SystemGifts/SpecialViewSystemGifts.php
index 4714c4e..8ec1f41 100644
--- a/SystemGifts/SpecialViewSystemGifts.php
+++ b/SystemGifts/SpecialViewSystemGifts.php
@@ -23,6 +23,8 @@
public function execute( $par ) {
global $wgUploadPath;
+ $linkRenderer = $this->getLinkRenderer();
+
$out = $this->getOutput();
$request = $this->getRequest();
$user = $this->getUser();
@@ -141,7 +143,7 @@
$output .= '';
if ( $page > 1 ) {
- $output .= Linker::link(
+ $output .= $linkRenderer->makeLink(
$page_link,
$this->msg( 'ga-previous' )->plain(),
array(),
@@ -166,7 +168,7 @@
if ( $i == $page ) {
$output .= ( $i . ' ' );
} else {
- $output .= Linker::link(
+ $output .= $linkRenderer->makeLink(
$page_link,
$i,
array(),
@@ -180,7 +182,7 @@
if ( ( $total - ( $per_page * $page ) ) > 0 ) {
$output .= $this->msg( 'word-separator'
)->plain() .
- Linker::link(
+ $linkRenderer->makeLink(
$page_link,
$this->msg( 'ga-next'
)->plain(),
array(),
diff --git a/SystemGifts/TopAwards.php b/SystemGifts/TopAwards.php
index 2b39b78..5a18a4a 100644
--- a/SystemGifts/TopAwards.php
+++ b/SystemGifts/TopAwards.php
@@ -158,6 +158,7 @@
if ( $dbr->numRows( $res ) <= 0 ) {
$output .= $this->msg( 'topawards-empty' )->plain();
} else {
+ $linkRenderer = $this->getLinkRenderer();
foreach ( $res as $row ) {
$user_name = $row->sg_user_name;
$user_id = $row->sg_user_id;
@@ -181,7 +182,7 @@
$x++;
}
- $userLink = Linker::link(
+ $userLink = $linkRenderer->makeLink(
Title::makeTitle( NS_USER,
$row->sg_user_name ),
$user_name
);
diff --git a/UserActivity/UserActivity.body.php
b/UserActivity/UserActivity.body.php
index f72f45e..8d5e1fb 100644
--- a/UserActivity/UserActivity.body.php
+++ b/UserActivity/UserActivity.body.php
@@ -129,7 +129,7 @@
}
}
- $output .= Linker::link(
+ $output .= $this->getLinkRenderer()->makeLink(
$this->getPageTitle(),
$this->msg( 'useractivity-all' )->plain()
);
diff --git a/UserBoard/SpecialUserBoard.php b/UserBoard/SpecialUserBoard.php
index b230b4c..c2a7936 100644
--- a/UserBoard/SpecialUserBoard.php
+++ b/UserBoard/SpecialUserBoard.php
@@ -37,6 +37,8 @@
$request = $this->getRequest();
$currentUser = $this->getUser();
+ $linkRenderer = $this->getLinkRenderer();
+
// Set the page title, robot policies, etc.
$this->setHeaders();
@@ -170,7 +172,7 @@
if ( $numofpages > 1 ) {
$output .= '';
if ( $page > 1 ) {
- $output .= Linker::link(
+
[MediaWiki-commits] [Gerrit] mediawiki...VikiTitleIcon[master]: Change extension url to https
Umherirrender has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/330052 )
Change subject: Change extension url to https
..
Change extension url to https
Change-Id: I628231f57fcc95f2686611354199d38e873ac38d
---
M extension.json
1 file changed, 2 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VikiTitleIcon
refs/changes/52/330052/1
diff --git a/extension.json b/extension.json
index 2ce7d14..ff5c6a6 100644
--- a/extension.json
+++ b/extension.json
@@ -1,8 +1,8 @@
{
"name": "VikiTitleIcon",
"version": "1.3.1",
- "author": "[http://www.mediawiki.org/wiki/User:Jji Jason Ji]",
- "url": "http://www.mediawiki.org/wiki/Extension:VikiTitleIcon";,
+ "author": "[https://www.mediawiki.org/wiki/User:Jji Jason Ji]",
+ "url": "https://www.mediawiki.org/wiki/Extension:VikiTitleIcon";,
"descriptionmsg": "vikititleicon-desc",
"type": "parserhook",
"APIModules": {
--
To view, visit https://gerrit.wikimedia.org/r/330052
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I628231f57fcc95f2686611354199d38e873ac38d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VikiTitleIcon
Gerrit-Branch: master
Gerrit-Owner: Umherirrender
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...VikiSemanticTitle[master]: Change extension url to https
Umherirrender has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/330051 )
Change subject: Change extension url to https
..
Change extension url to https
Change-Id: If1b65e737a83d8e235f8103443c92d33573b6401
---
M extension.json
1 file changed, 2 insertions(+), 2 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VikiSemanticTitle
refs/changes/51/330051/1
diff --git a/extension.json b/extension.json
index ef8bdd0..fc2039e 100644
--- a/extension.json
+++ b/extension.json
@@ -1,8 +1,8 @@
{
"name": "VikiSemanticTitle",
"version": "1.3",
- "author": "[http://www.mediawiki.org/wiki/User:Jji Jason Ji]",
- "url": "http://www.mediawiki.org/wiki/Extension:VikiSemanticTitle";,
+ "author": "[https://www.mediawiki.org/wiki/User:Jji Jason Ji]",
+ "url": "https://www.mediawiki.org/wiki/Extension:VikiSemanticTitle";,
"descriptionmsg": "vikisemantictitle-desc",
"type": "parserhook",
"MessagesDirs": {
--
To view, visit https://gerrit.wikimedia.org/r/330051
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: If1b65e737a83d8e235f8103443c92d33573b6401
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VikiSemanticTitle
Gerrit-Branch: master
Gerrit-Owner: Umherirrender
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...VIKI[master]: Change extension url to https
Umherirrender has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/330050 )
Change subject: Change extension url to https
..
Change extension url to https
Change-Id: Ib0fc39614b0576918242541dd989afcef3a7ec2b
---
M VIKI.php
1 file changed, 3 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VIKI
refs/changes/50/330050/1
diff --git a/VIKI.php b/VIKI.php
index 4f4512e..8a5e8dd 100644
--- a/VIKI.php
+++ b/VIKI.php
@@ -72,11 +72,11 @@
$wgExtensionCredits['parserhook'][] = array (
'name' => 'VIKI',
'version' => VIKIJS_VERSION,
- 'author' => array('[http://www.mediawiki.org/wiki/User:Jji Jason Ji]',
-
'[http://www.mediawiki.org/wiki/User:Cindy.cicalese Cindy Cicalese]'),
+ 'author' => array('[https://www.mediawiki.org/wiki/User:Jji Jason Ji]',
+
'[https://www.mediawiki.org/wiki/User:Cindy.cicalese Cindy Cicalese]'),
'descriptionmsg' => 'viki-desc',
'path' => __FILE__,
- 'url' => 'http://www.mediawiki.org/wiki/Extension:VIKI'
+ 'url' => 'https://www.mediawiki.org/wiki/Extension:VIKI'
);
$wgExtensionMessagesFiles['VIKIMagic'] =
--
To view, visit https://gerrit.wikimedia.org/r/330050
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib0fc39614b0576918242541dd989afcef3a7ec2b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VIKI
Gerrit-Branch: master
Gerrit-Owner: Umherirrender
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...PageDisqus[master]: Change extension url to https
Umherirrender has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/330049 )
Change subject: Change extension url to https
..
Change extension url to https
Change-Id: Ibac2dcf811d414ed844caf14a1990d59bcee3ebb
---
M extension.json
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/PageDisqus
refs/changes/49/330049/1
diff --git a/extension.json b/extension.json
index 0bcf1f0..9666353 100644
--- a/extension.json
+++ b/extension.json
@@ -5,7 +5,7 @@
"Michael Platzer",
"[[mw:User:Felipe Schenone|Felipe Schenone]]"
],
- "url": "http://www.mediawiki.org/wiki/Extension:PageDisqus";,
+ "url": "https://www.mediawiki.org/wiki/Extension:PageDisqus";,
"descriptionmsg": "pagedisqus-desc",
"type": "other",
"MessagesDirs": {
--
To view, visit https://gerrit.wikimedia.org/r/330049
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibac2dcf811d414ed844caf14a1990d59bcee3ebb
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/PageDisqus
Gerrit-Branch: master
Gerrit-Owner: Umherirrender
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Newsletter[master]: Removed unnecessary logging/
Filip has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/330048 )
Change subject: Removed unnecessary logging/
..
Removed unnecessary logging/
Deletion and restore are unnecessary, becouse they're logged in WikiPage
actions.
Bug: T154342
Change-Id: I3c55ecf24ecb3d503e2ae0160f4ad9bb586e56f4
---
M includes/NewsletterStore.php
M includes/logging/NewsletterLogger.php
2 files changed, 2 insertions(+), 31 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Newsletter
refs/changes/48/330048/1
diff --git a/includes/NewsletterStore.php b/includes/NewsletterStore.php
index 8e86f2c..27f81cb 100644
--- a/includes/NewsletterStore.php
+++ b/includes/NewsletterStore.php
@@ -139,11 +139,7 @@
* @return bool success of the action
*/
public function deleteNewsletter( Newsletter $newsletter, $reason ) {
- $success = $this->db->deleteNewsletter( $newsletter );
- if ( $success ) {
- $this->logger->logNewsletterDeleted( $newsletter,
$reason );
- }
- return $success;
+ return $this->db->deleteNewsletter( $newsletter );
}
/**
@@ -154,11 +150,7 @@
* @return bool success of the action
*/
public function restoreNewsletter( $newsletterName ) {
- $success = $this->db->restoreNewsletter( $newsletterName );
- if ( $success ) {
- $this->logger->logNewsletterRestored(
$this->db->getNewsletterFromName( $newsletterName ) );
- }
- return $success;
+ return $this->db->restoreNewsletter( $newsletterName );
}
/**
diff --git a/includes/logging/NewsletterLogger.php
b/includes/logging/NewsletterLogger.php
index 8987cd4..14c266e 100644
--- a/includes/logging/NewsletterLogger.php
+++ b/includes/logging/NewsletterLogger.php
@@ -41,27 +41,6 @@
$log->publish( $log->insert() );
}
- public function logNewsletterDeleted( Newsletter $newsletter, $reason )
{
- $id = $newsletter->getId();
- $log = new ManualLogEntry( 'newsletter', 'newsletter-removed' );
- $log->setPerformer( RequestContext::getMain()->getUser() );
- $log->setTarget( SpecialPage::getTitleFor( 'Newsletter', $id )
);
- $log->setParameters( [ '4:newsletter-link:nl_id' =>
"$id:{$newsletter->getName()}" ] );
- $log->setComment( $reason );
- $log->setRelations( [ 'nl_id' => $id ] );
- $log->publish( $log->insert() );
- }
-
- public function logNewsletterRestored( Newsletter $newsletter ) {
- $id = $newsletter->getId();
- $log = new ManualLogEntry( 'newsletter', 'newsletter-restored'
);
- $log->setPerformer( RequestContext::getMain()->getUser() );
- $log->setTarget( SpecialPage::getTitleFor( 'Newsletter', $id )
);
- $log->setParameters( [ '4:newsletter-link:nl_id' =>
"$id:{$newsletter->getName()}" ] );
- $log->setRelations( [ 'nl_id' => $id ] );
- $log->publish( $log->insert() );
- }
-
public function logNewIssue( User $publisher, Newsletter $newsletter,
Title $issueTitle, $issueId, $comment ) {
$log = new ManualLogEntry( 'newsletter', 'issue-added' );
$log->setPerformer( $publisher );
--
To view, visit https://gerrit.wikimedia.org/r/330048
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I3c55ecf24ecb3d503e2ae0160f4ad9bb586e56f4
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Newsletter
Gerrit-Branch: master
Gerrit-Owner: Filip
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] VisualEditor/VisualEditor[master]: Remove unit test hack, no longer needed.
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/329690 )
Change subject: Remove unit test hack, no longer needed.
..
Remove unit test hack, no longer needed.
Change-Id: Iff757ba0eac1efb76ce343f334470e8f733f649f
---
M src/dm/ve.dm.SurfaceSynchronizer.js
1 file changed, 1 insertion(+), 8 deletions(-)
Approvals:
Bartosz Dziewoński: Looks good to me, approved
jenkins-bot: Verified
diff --git a/src/dm/ve.dm.SurfaceSynchronizer.js
b/src/dm/ve.dm.SurfaceSynchronizer.js
index ed6fac7..ddacf20 100644
--- a/src/dm/ve.dm.SurfaceSynchronizer.js
+++ b/src/dm/ve.dm.SurfaceSynchronizer.js
@@ -35,11 +35,6 @@
// Whether we are currently synchronizing the model
this.applying = false;
- // HACK: Disable in unit tests
- if ( window.QUnit ) {
- return;
- }
-
// HACK
this.socket = io( ( config.server || '' ) + '/' + this.documentId );
this.socket.on( 'registered', this.onRegistered.bind( this ) );
@@ -197,9 +192,7 @@
this.setAuthor( author );
this.surface.setAuthor( this.author );
// HACK
- if ( !window.QUnit ) {
- $( '.ve-demo-editor' ).prepend( $( '' ).text( this.author ) );
- }
+ $( '.ve-demo-editor' ).prepend( $( '' ).text( this.author ) );
};
/**
--
To view, visit https://gerrit.wikimedia.org/r/329690
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iff757ba0eac1efb76ce343f334470e8f733f649f
Gerrit-PatchSet: 2
Gerrit-Project: VisualEditor/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders
Gerrit-Reviewer: Bartosz Dziewoński
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...OATHAuth[master]: Rename api example message of oathvalidate
Umherirrender has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/330047 )
Change subject: Rename api example message of oathvalidate
..
Rename api example message of oathvalidate
To make clear from the message name which module it belongs to, two
example messages should be renamed.
Change-Id: Idd329e77d5c7082eb8097309fb89f82c7a37cf68
---
M api/ApiOATHValidate.php
M i18n/en.json
M i18n/qqq.json
3 files changed, 6 insertions(+), 6 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/OATHAuth
refs/changes/47/330047/1
diff --git a/api/ApiOATHValidate.php b/api/ApiOATHValidate.php
index c6232d0..14f4641 100644
--- a/api/ApiOATHValidate.php
+++ b/api/ApiOATHValidate.php
@@ -93,9 +93,9 @@
protected function getExamplesMessages() {
return [
'action=oathvalidate&totp=123456&token=123ABC'
- => 'apihelp-oath-example-1',
+ => 'apihelp-oathvalidate-example-1',
'action=oathvalidate&user=Example&totp=123456&token=123ABC'
- => 'apihelp-oath-example-2',
+ => 'apihelp-oathvalidate-example-2',
];
}
}
diff --git a/i18n/en.json b/i18n/en.json
index 4547da4..4d9e827 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -64,6 +64,6 @@
"apihelp-oathvalidate-description": "Validate a two-factor
authentication (OATH) token.",
"apihelp-oathvalidate-param-user": "User to validate token for.
Defaults to the current user.",
"apihelp-oathvalidate-param-totp": "Two-factor authentication (OATH)
token.",
- "apihelp-oath-example-1": "Validate a token for the current user",
- "apihelp-oath-example-2": "Validate a token for the user
Example"
+ "apihelp-oathvalidate-example-1": "Validate a token for the current
user",
+ "apihelp-oathvalidate-example-2": "Validate a token for the user
Example"
}
diff --git a/i18n/qqq.json b/i18n/qqq.json
index 0209311..682f457 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -71,6 +71,6 @@
"apihelp-oathvalidate-description":
"{{doc-apihelp-description|oathvalidate}}",
"apihelp-oathvalidate-param-user":
"{{doc-apihelp-param|oathvalidate|user}}",
"apihelp-oathvalidate-param-totp":
"{{doc-apihelp-param|oathvalidate|totp}}",
- "apihelp-oath-example-1": "{{doc-apihelp-example|oathvalidate}}",
- "apihelp-oath-example-2": "{{doc-apihelp-example|oathvalidate}}"
+ "apihelp-oathvalidate-example-1":
"{{doc-apihelp-example|oathvalidate}}",
+ "apihelp-oathvalidate-example-2": "{{doc-apihelp-example|oathvalidate}}"
}
--
To view, visit https://gerrit.wikimedia.org/r/330047
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Idd329e77d5c7082eb8097309fb89f82c7a37cf68
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/OATHAuth
Gerrit-Branch: master
Gerrit-Owner: Umherirrender
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] VisualEditor/VisualEditor[master]: Remove serialization test cheat; make tests actually pass
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/329657 )
Change subject: Remove serialization test cheat; make tests actually pass
..
Remove serialization test cheat; make tests actually pass
The author of I1eccd4ef99d764911994d11d747f13ae42919eff is clearly a very shady
character
Change-Id: I69038332adf57ce43edd85930028d337a4946356
---
M tests/dm/ve.dm.Change.test.js
1 file changed, 32 insertions(+), 24 deletions(-)
Approvals:
Esanders: Looks good to me, approved
jenkins-bot: Verified
diff --git a/tests/dm/ve.dm.Change.test.js b/tests/dm/ve.dm.Change.test.js
index ef67971..53e404e 100644
--- a/tests/dm/ve.dm.Change.test.js
+++ b/tests/dm/ve.dm.Change.test.js
@@ -269,28 +269,34 @@
serialized = {
start: 0,
transactions: [
- [
- { type: 'retain', length: 1 },
- {
- type: 'replace',
- remove: [],
- insert: [ [ 'f', bIndex ] ],
- insertedDataOffset: 0,
- insertedDataLength: 1
- },
- { type: 'retain', length: 4 }
- ],
- [
- { type: 'retain', length: 2 },
- {
- type: 'replace',
- remove: [],
- insert: [ [ 'u', bIndex ] ],
- insertedDataOffset: 0,
- insertedDataLength: 1
- },
- { type: 'retain', length: 4 }
- ]
+ {
+ author: null,
+ operations: [
+ { type: 'retain', length: 1 },
+ {
+ type: 'replace',
+ remove: [],
+ insert: [ [ 'f', bIndex
] ],
+ insertedDataOffset: 0,
+ insertedDataLength: 1
+ },
+ { type: 'retain', length: 4 }
+ ]
+ },
+ {
+ author: null,
+ operations: [
+ { type: 'retain', length: 2 },
+ {
+ type: 'replace',
+ remove: [],
+ insert: [ [ 'u', bIndex
] ],
+ insertedDataOffset: 0,
+ insertedDataLength: 1
+ },
+ { type: 'retain', length: 4 }
+ ]
+ }
],
stores: [
{
@@ -305,7 +311,10 @@
},
hashes: bIndex
},
- {}
+ {
+ hashStore: {},
+ hashes: []
+ }
],
selections: {}
};
@@ -313,7 +322,6 @@
// Fixup second insert
change.transactions[ 1 ].operations[ 2 ].length += 1;
- serialized = change.serialize();
assert.deepEqual( change.serialize(), serialized, 'Serialize' );
assert.deepEqual(
--
To view, visit https://gerrit.wikimedia.org/r/329657
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I69038332adf57ce43edd85930028d337a4946356
Gerrit-PatchSet: 1
Gerrit-Project: VisualEditor/VisualEditor
Gerrit-Branch:
[MediaWiki-commits] [Gerrit] VisualEditor/VisualEditor[master]: ce.Surface: in blur, make sure activeElement exists before b...
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/328700 )
Change subject: ce.Surface: in blur, make sure activeElement exists before
blurring it
..
ce.Surface: in blur, make sure activeElement exists before blurring it
This was breaking switching from VE to NWE in IE11, as activeElement was null
when we tried to blur it. At a guess, a detached documents thing?
Bug: T153960
Change-Id: I7cfa1da2df6cd236365d99123d62e849746b382b
---
M src/ce/ve.ce.Surface.js
1 file changed, 5 insertions(+), 1 deletion(-)
Approvals:
Esanders: Looks good to me, approved
jenkins-bot: Verified
diff --git a/src/ce/ve.ce.Surface.js b/src/ce/ve.ce.Surface.js
index ec04f41..3b1795f 100644
--- a/src/ce/ve.ce.Surface.js
+++ b/src/ce/ve.ce.Surface.js
@@ -517,7 +517,11 @@
this.activate();
}
this.nativeSelection.removeAllRanges();
- this.getElementDocument().activeElement.blur();
+ if ( this.getElementDocument().activeElement ) {
+ // Support: IE<=11
+ // While switching between editor modes, there's sometimes no
activeElement.
+ this.getElementDocument().activeElement.blur();
+ }
// This won't trigger focusin/focusout events, so trigger focus change
manually
this.onFocusChange();
};
--
To view, visit https://gerrit.wikimedia.org/r/328700
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I7cfa1da2df6cd236365d99123d62e849746b382b
Gerrit-PatchSet: 1
Gerrit-Project: VisualEditor/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: DLynch
Gerrit-Reviewer: Esanders
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...Babel[master]: Add language name as second parameter to babel-portal message
TTO has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/330046 )
Change subject: Add language name as second parameter to babel-portal message
..
Add language name as second parameter to babel-portal message
Bug: T34398
Change-Id: I41ab415a589d97cf2d84bb9d195c0e54995595c1
---
M BabelBox/LanguageBabelBox.php
M i18n/qqq.json
2 files changed, 7 insertions(+), 7 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Babel
refs/changes/46/330046/1
diff --git a/BabelBox/LanguageBabelBox.php b/BabelBox/LanguageBabelBox.php
index 9cd474f..d9873c0 100644
--- a/BabelBox/LanguageBabelBox.php
+++ b/BabelBox/LanguageBabelBox.php
@@ -69,18 +69,18 @@
* @return string A babel box for the given language and level.
*/
public function render() {
- $code = $this->code;
+ $originalCode = $this->code;
+ $name = BabelLanguageCodes::getName( $originalCode );
+ $code = BabelLanguageCodes::getCode( $originalCode );
- $portal = wfMessage( 'babel-portal', $code
)->inContentLanguage()->plain();
+ $portal = wfMessage( 'babel-portal', $code, $name
)->inContentLanguage()->plain();
if ( $portal !== '' ) {
- $portal = "[[$portal|$code]]";
+ $portal = "[[$portal|$originalCode]]";
} else {
- $portal = $code;
+ $portal = $originalCode;
}
$header = "$portallevel}\">-{$this->level}";
- $name = BabelLanguageCodes::getName( $code );
- $code = BabelLanguageCodes::getCode( $code );
$text = self::getText( $this->title, $name, $code, $this->level
);
$dir_current = Language::factory( $code )->getDir();
diff --git a/i18n/qqq.json b/i18n/qqq.json
index c2d6674..fc92b33 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -41,7 +41,7 @@
"babel-box-cellpadding": "{{notranslate}}\nInserted as the value of the
cellpadding attribute in the HTML table of the outer box.",
"babel-cellspacing": "{{notranslate}}\nInserted as the value of the
cellspacing attribute in the HTML tables of the inner boxes.",
"babel-cellpadding": "{{notranslate}}\nInserted as the value of the
cellpadding attribute in the HTML tables of the inner boxes.",
- "babel-portal": "{{notranslate}}",
+ "babel-portal": "{{notranslate}}\n\nParameters:\n* $1 - language
code\n* $2 - language name",
"babel-template": "{{Optional}}{{doc-important|Do not translate
\"Template:\".}}\nThis message contains the template schema for additional
templates that can be used in Babel. Parameters:\n* $1 is the parameter value
used in the #babel parser tag.",
"babel-footer": "This text is used in the last entry (footer) of the
outer box. It is a link anchor, if {{msg-mw|babel-footer-url}} is not empty,
otherwise, it is only text. No footer is generated, when this text is empty.",
"apihelp-query+babel-description":
"{{doc-apihelp-description|query+babel}}",
--
To view, visit https://gerrit.wikimedia.org/r/330046
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I41ab415a589d97cf2d84bb9d195c0e54995595c1
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Babel
Gerrit-Branch: master
Gerrit-Owner: TTO
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Configure[master]: Fix param values in apihelp
Umherirrender has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/330045 )
Change subject: Fix param values in apihelp
..
Fix param values in apihelp
When there are extra messages for the param values, than there have
another name and need a config hint.
This patch renames some message keys.
Change-Id: I5d0c085d463f1c062b9c309b12106d7744bca9a2
---
M Configure.api.php
M i18n/en.json
M i18n/qqq.json
3 files changed, 12 insertions(+), 10 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Configure
refs/changes/45/330045/1
diff --git a/Configure.api.php b/Configure.api.php
index 143ff50..df71b01 100644
--- a/Configure.api.php
+++ b/Configure.api.php
@@ -394,6 +394,7 @@
'ajax',
),
ApiBase::PARAM_DFLT =>
'versionlist|wikilist',
+ ApiBase::PARAM_HELP_MSG_PER_VALUE => [],
),
'version' => null,
'wiki' => null,
@@ -408,6 +409,7 @@
ApiBase::PARAM_TYPE => array(
'ajax',
),
+ ApiBase::PARAM_HELP_MSG_PER_VALUE => [],
),
'ajaxgroup' => null,
'ajaxsetting' => null,
diff --git a/i18n/en.json b/i18n/en.json
index e95714d..9b1e6c2 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -196,11 +196,11 @@
"configure-farmer-extensions-list": "[[Special:Extensions|List
extensions available for this wiki]].",
"apihelp-configure-description": "Configure extension's API module",
"apihelp-configure-param-prop": "Which information to get",
- "apihelp-configure-param-prop-versionlist": "Get the list of old
configurations",
- "apihelp-configure-param-prop-wikilist": "Get the list the wikis to
configuration",
- "apihelp-configure-param-prop-settings": "Get settings of a specific
version",
- "apihelp-configure-param-prop-extensions": "List of installed
extensions",
- "apihelp-configure-param-prop-ajax": "Get part of the html form on
Special:Configure (for internal use)",
+ "apihelp-configure-paramvalue-prop-versionlist": "Get the list of old
configurations",
+ "apihelp-configure-paramvalue-prop-wikilist": "Get the list the wikis
to configuration",
+ "apihelp-configure-paramvalue-prop-settings": "Get settings of a
specific version",
+ "apihelp-configure-paramvalue-prop-extensions": "List of installed
extensions",
+ "apihelp-configure-paramvalue-prop-ajax": "Get part of the html form on
Special:Configure (for internal use)",
"apihelp-configure-param-version": "Version to get settings from",
"apihelp-configure-param-wiki": "Wiki to get settings from (default:
current wiki)",
"apihelp-configure-param-group": "Whether to group settings",
diff --git a/i18n/qqq.json b/i18n/qqq.json
index 00d954f..856fbaa 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -210,11 +210,11 @@
"configure-farmer-extensions-list": "Preceded by the heading
{{msg-mw|Farmer-extensions-available}}.\n\nSee also:\n*
{{msg-mw|Configure-farmer-extensions}}",
"apihelp-configure-description":
"{{doc-apihelp-description|configure}}",
"apihelp-configure-param-prop": "{{doc-apihelp-param|configure|prop}}",
- "apihelp-configure-param-prop-versionlist":
"{{doc-apihelp-param|configure|prop|versionlist}}",
- "apihelp-configure-param-prop-wikilist":
"{{doc-apihelp-param|configure|prop|wikilist}}",
- "apihelp-configure-param-prop-settings":
"{{doc-apihelp-param|configure|prop|settings}}",
- "apihelp-configure-param-prop-extensions":
"{{doc-apihelp-param|configure|prop|extensions}}",
- "apihelp-configure-param-prop-ajax":
"{{doc-apihelp-param|configure|prop|ajax}}",
+ "apihelp-configure-paramvalue-prop-versionlist":
"{{doc-apihelp-param|configure|prop|versionlist}}",
+ "apihelp-configure-paramvalue-prop-wikilist":
"{{doc-apihelp-param|configure|prop|wikilist}}",
+ "apihelp-configure-paramvalue-prop-settings":
"{{doc-apihelp-param|configure|prop|settings}}",
+ "apihelp-configure-paramvalue-prop-extensions":
"{{doc-apihelp-param|configure|prop|extensions}}",
+ "apihelp-configure-paramvalue-prop-ajax":
"{{doc-apihelp-param|configure|prop|ajax}}",
"apihelp-configure-param-version":
"{{doc-apihelp-param|configure|version}}",
"apihelp-configure-param-wiki": "{{doc-apihelp-param|configure|wiki}}",
"apihelp-configure-param-group":
"{{doc-apihelp-param|configure|group}}",
--
To view, visit https://gerrit.wikimedia.org/r/330045
[MediaWiki-commits] [Gerrit] mediawiki...Babel[master]: Use content language for Babel AutoCreate's edit summaries
TTO has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/330044 ) Change subject: Use content language for Babel AutoCreate's edit summaries .. Use content language for Babel AutoCreate's edit summaries Doesn't make sense to use the user's UI language here. Bug: T46223 Change-Id: I96d990de4d7a0ac46ad6d8416559c5b320efbc39 --- M BabelAutoCreate.class.php 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Babel refs/changes/44/330044/1 diff --git a/BabelAutoCreate.class.php b/BabelAutoCreate.class.php index b696ed2..511c718 100644 --- a/BabelAutoCreate.class.php +++ b/BabelAutoCreate.class.php @@ -75,7 +75,7 @@ $article->doEditContent( ContentHandler::makeContent( $text, $title ), - wfMessage( 'babel-autocreate-reason', $url )->text(), + wfMessage( 'babel-autocreate-reason', $url )->inContentLanguage()->text(), EDIT_FORCE_BOT, false, $user -- To view, visit https://gerrit.wikimedia.org/r/330044 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I96d990de4d7a0ac46ad6d8416559c5b320efbc39 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Babel Gerrit-Branch: master Gerrit-Owner: TTO ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Babel[master]: Fix disappearing language names on Category: and File: pages
TTO has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/330043 )
Change subject: Fix disappearing language names on Category: and File: pages
..
Fix disappearing language names on Category: and File: pages
When $wgBabelMainCategory or one of the $wgBabelCategoryNames booleans is
false, the language name is hackishly made into a self-link (since the
localised message requires a link target). On category and file pages,
a self-link like [[Category:XYZ|English]] was being used, which has an
obvious problem.
Bug: T36507
Change-Id: I51c5d561312e255c686d7d18960f30ebd0fa7845
---
M BabelBox/LanguageBabelBox.php
1 file changed, 2 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Babel
refs/changes/43/330043/1
diff --git a/BabelBox/LanguageBabelBox.php b/BabelBox/LanguageBabelBox.php
index 9cd474f..d49e957 100644
--- a/BabelBox/LanguageBabelBox.php
+++ b/BabelBox/LanguageBabelBox.php
@@ -124,14 +124,14 @@
global $wgBabelMainCategory, $wgBabelCategoryNames;
if ( $wgBabelCategoryNames[$level] === false ) {
- $categoryLevel = $title->getFullText();
+ $categoryLevel = ':' . $title->getFullText();
} else {
$categoryLevel = ':Category:' .
self::getCategoryName(
$wgBabelCategoryNames[$level], $language );
}
if ( $wgBabelMainCategory === false ) {
- $categoryMain = $title->getFullText();
+ $categoryMain = ':' . $title->getFullText();
} else {
$categoryMain = ':Category:' .
self::getCategoryName( $wgBabelMainCategory,
$language );
--
To view, visit https://gerrit.wikimedia.org/r/330043
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I51c5d561312e255c686d7d18960f30ebd0fa7845
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Babel
Gerrit-Branch: master
Gerrit-Owner: TTO
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] pywikibot/core[master]: listpages.py: fix help on formatting
Mpaa has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/330042 )
Change subject: listpages.py: fix help on formatting
..
listpages.py: fix help on formatting
Change-Id: Ib59ba3182130624f01bb4068a2e525c0862e5e11
---
M scripts/listpages.py
1 file changed, 2 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core
refs/changes/42/330042/1
diff --git a/scripts/listpages.py b/scripts/listpages.py
index 1106143..7395e01 100755
--- a/scripts/listpages.py
+++ b/scripts/listpages.py
@@ -16,13 +16,13 @@
1 - u'{num:4d} {page.title}'
--> 10 PageTitle
-2 - u'{num:4d} {[[page.title]]}'
+2 - u'{num:4d} [[{page.title}]]'
--> 10 [[PageTitle]]
3 - u'{page.title}'
--> PageTitle
-4 - u'{[[page.title]]}'
+4 - u'[[{page.title}]]'
--> [[PageTitle]]
5 - u'{num:4d} \03{{lightred}}{page.loc_title:<40}\03{{default}}'
--
To view, visit https://gerrit.wikimedia.org/r/330042
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib59ba3182130624f01bb4068a2e525c0862e5e11
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: Mpaa
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] pywikibot/core[master]: Using pytest-httpbin
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/329644 )
Change subject: Using pytest-httpbin
..
Using pytest-httpbin
Now http_tests use pytest-httpbin if pytest is used to run the tests
Otherwise, http://httpbin.org is used
Bug: T153560
Change-Id: I2000fed5e5273dbfef5d51ac81698a32c7fc5676
---
M dev-requirements.txt
M tests/aspects.py
A tests/conftest.py
M tests/http_tests.py
4 files changed, 97 insertions(+), 34 deletions(-)
Approvals:
John Vandenberg: Looks good to me, approved
jenkins-bot: Verified
diff --git a/dev-requirements.txt b/dev-requirements.txt
index edd5005..44a3038 100644
--- a/dev-requirements.txt
+++ b/dev-requirements.txt
@@ -7,6 +7,7 @@
pytest-runner
pytest-cov
pytest-attrib
+pytest-httpbin
six
diff --git a/tests/aspects.py b/tests/aspects.py
index 3ac9ca6..305c4be 100644
--- a/tests/aspects.py
+++ b/tests/aspects.py
@@ -29,6 +29,7 @@
UITestCase:
Not integrated; direct subclass of unittest.TestCase.
"""
+import imp
import inspect
import itertools
import os
@@ -483,6 +484,20 @@
if not hasattr(cls, 'sites'):
return
+# Check is pytest is used and pytest_httpbin module is installed.
+if hasattr(sys, '_test_runner_pytest'):
+try:
+imp.find_module('pytest_httpbin')
+httpbin_used = True
+except ImportError:
+httpbin_used = False
+else:
+httpbin_used = False
+
+# If pytest_httpbin will be used during tests, then remove httpbin.org
from sites.
+if httpbin_used:
+cls.sites = {k: v for k, v in cls.sites.items() if 'httpbin.org'
not in v['hostname']}
+
for key, data in cls.sites.items():
if 'hostname' not in data:
raise Exception('%s: hostname not defined for %s'
diff --git a/tests/conftest.py b/tests/conftest.py
new file mode 100644
index 000..24965e0
--- /dev/null
+++ b/tests/conftest.py
@@ -0,0 +1,15 @@
+# -*- coding: utf-8 -*-
+"""Used by pytest to do some preparation work before running tests."""
+#
+# (C) Pywikibot team, 2017
+#
+# Distributed under the terms of the MIT license.
+#
+from __future__ import absolute_import, unicode_literals
+
+import sys
+
+
+def pytest_configure(config):
+"""Set the sys._test_runner_pytest flag to True, if pytest is used to run
tests."""
+sys._test_runner_pytest = True
diff --git a/tests/http_tests.py b/tests/http_tests.py
index e62b390..72db94c 100644
--- a/tests/http_tests.py
+++ b/tests/http_tests.py
@@ -27,6 +27,56 @@
from tests import join_images_path
from tests.aspects import unittest, TestCase, DeprecationTestCase,
require_modules
+try:
+import pytest_httpbin
+optional_pytest_httpbin_cls_decorator =
pytest_httpbin.use_class_based_httpbin
+except ImportError:
+pytest_httpbin = None
+
+def optional_pytest_httpbin_cls_decorator(f):
+"""Empty decorator in case pytest_httpbin is not installed."""
+return f
+
+
+@optional_pytest_httpbin_cls_decorator
+class HttpbinTestCase(TestCase):
+
+"""
+Custom test case class, which allows doing dry httpbin tests using
pytest-httpbin.
+
+Test cases, which use httpbin, need to inherit this class.
+"""
+
+sites = {
+'httpbin': {
+'hostname': 'httpbin.org',
+},
+}
+
+def get_httpbin_url(self, path=''):
+"""
+Return url of httpbin.
+
+If pytest is used, returns url of local httpbin server.
+Otherwise, returns: http://httpbin.org
+"""
+if hasattr(self, 'httpbin'):
+return self.httpbin.url + path
+else:
+return 'http://httpbin.org' + path
+
+def get_httpbin_hostname(self):
+"""
+Return httpbin hostname.
+
+If pytest is used, returns hostname of local httpbin server.
+Otherwise, returns: httpbin.org
+"""
+if hasattr(self, 'httpbin'):
+return '{0}:{1}'.format(self.httpbin.host, self.httpbin.port)
+else:
+return 'httpbin.org'
+
class HttpTestCase(TestCase):
@@ -157,7 +207,7 @@
'InsecureRequestWarning')
-class TestHttpStatus(TestCase):
+class TestHttpStatus(HttpbinTestCase):
"""Test HTTP status code handling and errors."""
@@ -177,7 +227,7 @@
"""Test that a HTTP 504 raises the correct exception."""
self.assertRaises(pywikibot.Server504Error,
http.fetch,
- uri='http://httpbin.org/status/504')
+ uri=self.get_httpbin_url('/status/504'))
def test_server_not_found(self):
"""Test server not found exception."""
@@ -316,15 +366,9 @@
self._test_fake_user_agent_randomness()
-class LiveFakeUserAgentTestCase(TestCase):
+class LiveFakeUserAgentTestCase(HttpbinT
[MediaWiki-commits] [Gerrit] mediawiki...Babel[master]: Map MediaWiki's fake language codes to real ones
TTO has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/330041 )
Change subject: Map MediaWiki's fake language codes to real ones
..
Map MediaWiki's fake language codes to real ones
'My understanding of the problem is that when someone uses
{{#babel:zh-classical}}, the extension puts the user into "Category:User
zh-classical" instead of into "Category:User lzh" even though they mean
the same thing. Instead, it should understand that zh-classical is a
legacy code and convert it to lzh, to avoid duplicate categories.'
-- Nikki at the phab task
Bug: T101086
Change-Id: I1ae053574805e4d118389f6bbf6dcf391fbed73b
---
M BabelLanguageCodes.class.php
1 file changed, 23 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Babel
refs/changes/41/330041/1
diff --git a/BabelLanguageCodes.class.php b/BabelLanguageCodes.class.php
index dfd2e73..82dc50c 100644
--- a/BabelLanguageCodes.class.php
+++ b/BabelLanguageCodes.class.php
@@ -13,6 +13,24 @@
*/
class BabelLanguageCodes {
/**
+* @var array A list of MediaWiki fake/legacy language codes, and the
ISO
+* codes they correspond to. This is almost the same as core's
+* $wgDummyLanguageCodes variable, except that a few things that aren't
+* strictly aliases ('no' => 'nb', 'simple' => 'en') are left out.
+*/
+ public static $fakeCodes = [
+ 'als' => 'gsw',
+ 'bat-smg' => 'sgs',
+ 'be-x-old' => 'be-tarask',
+ 'bh' => 'bho',
+ 'fiu-vro' => 'vro',
+ 'roa-rup' => 'rup',
+ 'zh-classical' => 'lzh',
+ 'zh-min-nan' => 'nan',
+ 'zh-yue' => 'yue',
+ ];
+
+ /**
* Takes a language code, and attempt to obtain a better variant of it,
* checks the MediaWiki language codes for a match, otherwise checks the
* Babel language codes CDB (preferring ISO 639-1 over ISO 639-3).
@@ -21,6 +39,11 @@
* @return string|bool Language code, or false for invalid language
code.
*/
public static function getCode( $code ) {
+ // map fake MediaWiki language codes to their real counterparts
(T101086)
+ if ( isset( self::$fakeCodes[$code] ) ) {
+ $code = self::$fakeCodes[$code];
+ }
+
$mediawiki = Language::fetchLanguageName( $code );
if ( $mediawiki !== '' ) {
return $code;
--
To view, visit https://gerrit.wikimedia.org/r/330041
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I1ae053574805e4d118389f6bbf6dcf391fbed73b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Babel
Gerrit-Branch: master
Gerrit-Owner: TTO
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] translatewiki[master]: Allow betawiki to restart mw-jobrunner
Nikerabbit has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/330040 ) Change subject: Allow betawiki to restart mw-jobrunner .. Allow betawiki to restart mw-jobrunner This allows me to add restart command to oregano post-deploy hook that restarts jobrunner when code is changed. Removed hhvm-fastcgi, as the service name is now hhvm and this has not been used for some time. Change-Id: I498641e0253bb182c6cc51a56526decca06d465f --- M puppet/modules/sudo/files/local 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/translatewiki refs/changes/40/330040/1 diff --git a/puppet/modules/sudo/files/local b/puppet/modules/sudo/files/local index 6923559..ef44c0a 100644 --- a/puppet/modules/sudo/files/local +++ b/puppet/modules/sudo/files/local @@ -3,4 +3,4 @@ siebrandALL = NOPASSWD: ALL mah ALL = NOPASSWD: ALL %betawiki ALL = (betawiki) NOPASSWD: ALL -%betawiki ALL = NOPASSWD: /sbin/restart hhvm-fastcgi +%betawiki ALL = NOPASSWD: /usr/sbin/service mw-jobrunner restart -- To view, visit https://gerrit.wikimedia.org/r/330040 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I498641e0253bb182c6cc51a56526decca06d465f Gerrit-PatchSet: 1 Gerrit-Project: translatewiki Gerrit-Branch: master Gerrit-Owner: Nikerabbit ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Translate[master]: Allow moving all pages for translation admins (translate-man...
Nikerabbit has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/330039 )
Change subject: Allow moving all pages for translation admins (translate-manage)
..
Allow moving all pages for translation admins (translate-manage)
Without this e.g. I cannot do message renames with Special:ReplaceText
in translatewiki.net because edits to /en pages are blocked, and there
is no way of preventing editing but allowing moves. Admins should know
better and not edit these pages directly.
Bug: T148892
Change-Id: I87ef5479f865373c89146e97275686a2d3baf5e3
---
M TranslateEditAddons.php
1 file changed, 4 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Translate
refs/changes/39/330039/1
diff --git a/TranslateEditAddons.php b/TranslateEditAddons.php
index 20e63a0..3bda02b 100644
--- a/TranslateEditAddons.php
+++ b/TranslateEditAddons.php
@@ -50,6 +50,10 @@
return true;
}
+ if ( $user->isAllowed( 'translate-manage' ) ) {
+ return true;
+ }
+
$group = $handle->getGroup();
$languages = $group->getTranslatableLanguages();
$langCode = $handle->getCode();
--
To view, visit https://gerrit.wikimedia.org/r/330039
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I87ef5479f865373c89146e97275686a2d3baf5e3
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Translate
Gerrit-Branch: master
Gerrit-Owner: Nikerabbit
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Wikidata[master]: New Wikidata Build - 2017-01-01T10:00:02+0000
WikidataBuilder has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/330038 )
Change subject: New Wikidata Build - 2017-01-01T10:00:02+
..
New Wikidata Build - 2017-01-01T10:00:02+
Change-Id: I13153a7218b34657ecfd149f5fb4591ee388e51d
---
M composer.lock
M extensions/Wikibase/client/WikibaseClient.php
M extensions/Wikibase/client/i18n/cs.json
M extensions/Wikibase/client/i18n/de.json
M extensions/Wikibase/client/i18n/en.json
M extensions/Wikibase/client/i18n/es.json
M extensions/Wikibase/client/i18n/eu.json
M extensions/Wikibase/client/i18n/mk.json
M extensions/Wikibase/client/i18n/nb.json
M extensions/Wikibase/client/i18n/nl.json
M extensions/Wikibase/client/i18n/qqq.json
M extensions/Wikibase/client/i18n/zh-hans.json
M
extensions/Wikibase/client/includes/DataAccess/PropertyParserFunction/LanguageAwareRenderer.php
M
extensions/Wikibase/client/includes/DataAccess/PropertyParserFunction/StatementGroupRendererFactory.php
M
extensions/Wikibase/client/tests/phpunit/includes/DataAccess/PropertyParserFunction/LanguageAwareRendererTest.php
M extensions/Wikibase/repo/i18n/mk.json
M extensions/Wikibase/repo/i18n/ta.json
M extensions/Wikibase/repo/includes/Content/EntityContent.php
M
extensions/Wikibase/repo/resources/wikibase.special/wikibase.special.languageLabelDescriptionAliases.js
A extensions/Wikibase/tests/browser/README.md
M extensions/Wikidata.org/resources/themes/default/wikidata-org.badges.css
A extensions/WikimediaBadges/i18n/nb.json
M vendor/composer/installed.json
23 files changed, 217 insertions(+), 77 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikidata
refs/changes/38/330038/1
diff --git a/composer.lock b/composer.lock
index db228bc..48c0b37 100644
--- a/composer.lock
+++ b/composer.lock
@@ -938,7 +938,7 @@
"source": {
"type": "git",
"url":
"https://gerrit.wikimedia.org/r/mediawiki/extensions/Wikidata.org";,
-"reference": "cb652cdb01b6b0317aaf3278f1fe951aae4307b8"
+"reference": "93892fd220415dadfcc51665dd2ff6c107ff1f3a"
},
"require": {
"php": ">=5.3.0"
@@ -982,7 +982,7 @@
"support": {
"irc": "irc://irc.freenode.net/wikidata"
},
-"time": "2016-12-12 21:45:02"
+"time": "2016-12-28 12:14:31"
},
{
"name": "wikibase/constraints",
@@ -1585,12 +1585,12 @@
"source": {
"type": "git",
"url":
"https://github.com/wikimedia/mediawiki-extensions-Wikibase.git";,
-"reference": "49d46a36b4cd582fa67e72b6ea73953d5f833695"
+"reference": "15f0c59423d8ca9342b00e15e66f26240dad5aa6"
},
"dist": {
"type": "zip",
-"url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/49d46a36b4cd582fa67e72b6ea73953d5f833695";,
-"reference": "49d46a36b4cd582fa67e72b6ea73953d5f833695",
+"url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/15f0c59423d8ca9342b00e15e66f26240dad5aa6";,
+"reference": "15f0c59423d8ca9342b00e15e66f26240dad5aa6",
"shasum": ""
},
"require": {
@@ -1663,7 +1663,7 @@
"wikibaserepo",
"wikidata"
],
-"time": "2016-12-30 04:22:49"
+"time": "2017-01-01 09:18:01"
},
{
"name": "wikibase/wikimedia-badges",
@@ -1671,7 +1671,7 @@
"source": {
"type": "git",
"url":
"https://gerrit.wikimedia.org/r/mediawiki/extensions/WikimediaBadges";,
-"reference": "b54b3d2dec6a9fc2e2a6b64ea87efa8c51dc6bd5"
+"reference": "71aa16664956f9d6850f810f4352f3d2a02de654"
},
"require": {
"php": ">=5.3.0"
@@ -1705,7 +1705,7 @@
"support": {
"irc": "irc://irc.freenode.net/wikidata"
},
-"time": "2016-12-22 22:01:58"
+"time": "2017-01-01 09:18:52"
},
{
"name": "wikimedia/assert",
diff --git a/extensions/Wikibase/client/WikibaseClient.php
b/extensions/Wikibase/client/WikibaseClient.php
index df99683..07a6ad8 100644
--- a/extensions/Wikibase/client/WikibaseClient.php
+++ b/extensions/Wikibase/client/WikibaseClient.php
@@ -70,7 +70,7 @@
global $wgExtensionCredits, $wgExtensionMessagesFiles, $wgHooks,
$wgExtensionFunctions;
global $wgAPIListModules, $wgAPIMetaModules, $wgAPIPropModules,
$wgSpecialPages;
global $wgResourceModules, $wgWBClientSettings, $wgRecentChangesFlags,
$wgMessagesDirs;
- global $wgJobClasses, $wgWBClientDataTypes, $wgWBClientEntityTypes;
+ global $w
