jenkins-bot has submitted this change and it was merged.
Change subject: Add documentation to clarify difference between save and upload
message
..
Add documentation to clarify difference between save and upload message
Finnish translations use the same word for save and upload.
https://translatewiki.net/wiki/Thread:Support/About_MediaWiki:Upload-dialog-button-upload/fi
Change-Id: I3caf7b550b629c5c98bca0e0efd13aa864ce10e0
---
M languages/i18n/qqq.json
1 file changed, 2 insertions(+), 2 deletions(-)
Approvals:
Bartosz Dziewoński: Looks good to me, approved
Nemo bis: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/languages/i18n/qqq.json b/languages/i18n/qqq.json
index dc2bd50..78f2c10 100644
--- a/languages/i18n/qqq.json
+++ b/languages/i18n/qqq.json
@@ -1598,8 +1598,8 @@
"upload-dialog-title": "Title of the upload dialog
box\n{{Identical|Upload file}}",
"upload-dialog-button-cancel": "Button to cancel the
dialog\n{{Identical|Cancel}}",
"upload-dialog-button-done": "Button to close the dialog once upload is
complete\n{{Identical|Done}}",
- "upload-dialog-button-save": "Button to save the
file\n{{Identical|Save}}",
- "upload-dialog-button-upload": "Button to initiate
upload\n{{Identical|Upload}}",
+ "upload-dialog-button-save": "Button to save the file after upload
finishes and metadata is filled out, part 2 of a multi-step upload
form\n{{Identical|Save}}",
+ "upload-dialog-button-upload": "Button to initiate upload, part 1 of a
multi-step upload form\n{{Identical|Upload}}",
"upload-form-label-select-file": "Label for the select file
widget\n{{Identical|Select file}}",
"upload-form-label-infoform-title": "Title for the information
form\n{{Identical|Detail}}",
"upload-form-label-infoform-name": "Label for the file name
input\n{{Identical|Name}}",
--
To view, visit https://gerrit.wikimedia.org/r/262818
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I3caf7b550b629c5c98bca0e0efd13aa864ce10e0
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: MtDu
Gerrit-Reviewer: Bartosz Dziewoński
Gerrit-Reviewer: Nemo bis
Gerrit-Reviewer: Siebrand
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
jenkins-bot has submitted this change and it was merged.
Change subject: site.py: Support titles parameter in watch action
..
site.py: Support titles parameter in watch action
Deprecate 'watchpage' method and add 'watch' as replacement.
In the 'watch' method:
- Handle multiple pages.
- Use 'titles' instead of 'title' for mw 1.23+ API calls.
- Iterate over all pages for mw versions < 1.23.
Use the 'watch' method in BasePage().watch.
In the new implementation, an exception is raised if an unexpected
API response is received (instead of just showing a UI error as
'watchpage' does).
Changing the UI error to an exception could not be implemented in
the old 'watchpage' method without introducing a, although slight,
breaking change. See John Vandenberg's comment at T103736#1917344.
Other than that, 's.watch(pages)' feels more intuitive than
's.watchpage(pages)'.
Bug: T103736
Change-Id: I75621972f23509a7e6c843e69abad52025546526
---
M pywikibot/page.py
M pywikibot/site.py
2 files changed, 45 insertions(+), 3 deletions(-)
Approvals:
John Vandenberg: Looks good to me, approved
jenkins-bot: Verified
diff --git a/pywikibot/page.py b/pywikibot/page.py
index 34f30b6..811bc46 100644
--- a/pywikibot/page.py
+++ b/pywikibot/page.py
@@ -1240,7 +1240,7 @@
@return: bool; True if successful, False otherwise.
"""
-return self.site.watchpage(self, unwatch)
+return self.site.watch(self, unwatch)
def purge(self, **kwargs):
"""Purge the server's cache for this page.
diff --git a/pywikibot/site.py b/pywikibot/site.py
index a7c0bd4..8cd2aa8 100644
--- a/pywikibot/site.py
+++ b/pywikibot/site.py
@@ -5387,16 +5387,58 @@
return data
@must_be(group='user')
+def watch(self, pages, unwatch=False):
+"""Add or remove pages from watchlist.
+
+@param pages: A single page or a sequence of pages.
+@type pages: A page object, a page-title string, or sequence of them.
+Also accepts a single pipe-separated string like 'title1|title2'.
+@param unwatch: If True, remove pages from watchlist;
+if False add them (default).
+@return: True if API returned expected response; False otherwise
+@rtype: bool
+
+"""
+parameters = {'action': 'watch',
+ 'token': self.tokens['watch'],
+ 'unwatch': unwatch}
+unwatch = 'unwatched' if unwatch else 'watched'
+if MediaWikiVersion(self.version()) >= MediaWikiVersion('1.23'):
+parameters['titles'] = pages
+req = self._simple_request(**parameters)
+results = req.submit()
+return all(unwatch in r for r in results['watch'])
+
+# MW version < 1.23
+if isinstance(pages, str):
+if '|' in pages:
+pages = pages.split('|')
+else:
+pages = (pages,)
+
+for page in pages:
+parameters['title'] = page
+req = self._simple_request(**parameters)
+result = req.submit()
+if unwatch not in result['watch']:
+return False
+return True
+
+@must_be(group='user')
+@deprecated('Site().watch')
def watchpage(self, page, unwatch=False):
"""Add or remove page from watchlist.
+DEPRECATED: Use Site().watch() instead.
+
+@param page: A single page.
+@type page: A page object, a page-title string.
@param unwatch: If True, remove page from watchlist; if False
(default),
add it.
@return: True if API returned expected response; False otherwise
+@rtype: bool
"""
-# TODO: Separated parameters to allow easy conversion to 'watchpages'
-# as the API now allows 'titles'.
parameters = {'action': 'watch',
'title': page,
'token': self.tokens['watch'],
--
To view, visit https://gerrit.wikimedia.org/r/261904
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I75621972f23509a7e6c843e69abad52025546526
Gerrit-PatchSet: 23
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: Dalba
Gerrit-Reviewer: Dalba
Gerrit-Reviewer: John Vandenberg
Gerrit-Reviewer: Ladsgroup
Gerrit-Reviewer: Mpaa
Gerrit-Reviewer: Xqt
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
jenkins-bot has submitted this change and it was merged.
Change subject: renderer: Use NavigationPopups settings where available
..
renderer: Use NavigationPopups settings where available
Change-Id: I47e11d07561ebf710d39042c2a3bc4b213a821da
---
M resources/ext.popups.renderer.js
1 file changed, 16 insertions(+), 4 deletions(-)
Approvals:
Legoktm: Looks good to me, approved
Thiemo Mättig (WMDE): Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/resources/ext.popups.renderer.js b/resources/ext.popups.renderer.js
index f477c2d..bd281ab 100644
--- a/resources/ext.popups.renderer.js
+++ b/resources/ext.popups.renderer.js
@@ -1,3 +1,5 @@
+/*global popupDelay: true, popupHideDelay: true*/
+
( function ( $, mw ) {
/**
@@ -7,16 +9,26 @@
mw.popups.render = {};
/**
-* Time to wait in ms before showing a popup on hover
+* Time to wait in ms before showing a popup on hover.
+* Use the navigation popup delay if it has been set by the user.
+* This isn't the official way of setting the delay
+* TODO: Add setting to change delay
* @property POPUP_DELAY
*/
- mw.popups.render.POPUP_DELAY = 500;
+ mw.popups.render.POPUP_DELAY = ( typeof popupDelay === 'undefined' ) ?
+ 500 :
+ popupDelay * 1000;
/**
-* Time to wait in ms before closing a popup on de-hover
+* Time to wait in ms before closing a popup on de-hover.
+* Use the navigation popup delay if it has been set by the user
+* This isn't the official way of setting the delay
+* TODO: Add setting to change delay
* @property POPUP_CLOSE_DELAY
*/
- mw.popups.render.POPUP_CLOSE_DELAY = 300;
+ mw.popups.render.POPUP_CLOSE_DELAY = ( typeof popupHideDelay ===
'undefined' ) ?
+ 300 :
+ popupHideDelay * 1000;
/**
* Time to wait in ms before starting the API queries on hover, must be
<= POPUP_DELAY
--
To view, visit https://gerrit.wikimedia.org/r/137897
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I47e11d07561ebf710d39042c2a3bc4b213a821da
Gerrit-PatchSet: 8
Gerrit-Project: mediawiki/extensions/Popups
Gerrit-Branch: master
Gerrit-Owner: Prtksxna
Gerrit-Reviewer: AndyRussG
Gerrit-Reviewer: Jdlrobson
Gerrit-Reviewer: Legoktm
Gerrit-Reviewer: Prtksxna
Gerrit-Reviewer: Spage
Gerrit-Reviewer: Ssmith
Gerrit-Reviewer: TheDJ
Gerrit-Reviewer: Thiemo Mättig (WMDE)
Gerrit-Reviewer: Werdna
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
jenkins-bot has submitted this change and it was merged.
Change subject: Reduce CAS errors due to concurrent web requests by a user
..
Reduce CAS errors due to concurrent web requests by a user
Bug: T95839
Change-Id: If4013f34a39c451fe0a75b557a8f2c5316c57bdc
---
M BetaFeaturesHooks.php
1 file changed, 11 insertions(+), 4 deletions(-)
Approvals:
Legoktm: Looks good to me, approved
jenkins-bot: Verified
diff --git a/BetaFeaturesHooks.php b/BetaFeaturesHooks.php
index f3d1f8b..2f262d8 100644
--- a/BetaFeaturesHooks.php
+++ b/BetaFeaturesHooks.php
@@ -281,10 +281,17 @@
}
if ( $saveUser ) {
- // Save the preferences to the DB post-send
- DeferredUpdates::addCallableUpdate( function() use (
$user ) {
- $user->saveSettings();
- } );
+ $cache = ObjectCache::getLocalClusterInstance();
+ $key = $cache->makeKey( __CLASS__, 'prefs-update',
$user->getId() );
+ // T95839: If concurrent requests pile on (e.g.
multiple tabs), only let one
+ // thread bother doing these updates. This avoids
pointless error log spam.
+ if ( $cache->lock( $key, 0, $cache::TTL_MINUTE ) ) {
+ // Save the preferences to the DB post-send
+ DeferredUpdates::addCallableUpdate( function()
use ( $user, $cache, $key ) {
+ $user->saveSettings();
+ $cache->unlock( $key );
+ } );
+ }
}
return true;
--
To view, visit https://gerrit.wikimedia.org/r/259967
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: If4013f34a39c451fe0a75b557a8f2c5316c57bdc
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BetaFeatures
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz
Gerrit-Reviewer: Catrope
Gerrit-Reviewer: Legoktm
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
jenkins-bot has submitted this change and it was merged.
Change subject: Assorted transaction logic cleanups
..
Assorted transaction logic cleanups
* Replace DB begin()/commit() with startAtomic()/endAtomic() as needed.
* Avoid using rollback(), which generates warnings, and instead doing a
SELECT FOR UPDATE and checking if the user exists instead of counting
the affected rows of the subsequent UPDATE.
* Block rename jobs until the original transaction commits and abort
jobs if the log row was not found. That row acts as a good proxy for
whether the transaction committed or not. This is better than simply
moving the job insertion to post-commit because that breaks if the job
queue is down but not the DB.
* The User::invalidateCache() already defers to pre-commit with HOLDOFF_TTL
in clearSharedCache(), so having two of the calls was redundant. The later
call was removed.
Bug: T120791
Change-Id: I33f314fb93228b090c1b82c55b1621764e072028
---
M RenameUserJob.php
M RenameuserSQL.php
2 files changed, 84 insertions(+), 33 deletions(-)
Approvals:
Legoktm: Looks good to me, approved
jenkins-bot: Verified
diff --git a/RenameUserJob.php b/RenameUserJob.php
index e483733..bfe6d4a 100644
--- a/RenameUserJob.php
+++ b/RenameUserJob.php
@@ -9,6 +9,7 @@
* - oldname : The old user name
* - newname : The new user name
* - count : The expected number of rows to update in this batch
+ * - logId : The ID of the logging table row expected to exist if the
rename was committed
*
* Additionally, one of the following groups of parameters must be set:
* a) The timestamp based rename paramaters:
@@ -55,8 +56,29 @@
}
$uniqueKey = isset( $this->params['uniqueKey'] ) ?
$this->params['uniqueKey'] : null;
$keyId = isset( $this->params['keyId'] ) ?
$this->params['keyId'] : null;
+ $logId = isset( $this->params['logId'] ) ?
$this->params['logId'] : null;
$dbw = wfGetDB( DB_MASTER );
+ if ( $logId ) {
+ # Block until the transaction that inserted this job
commits.
+ # The atomic section is for sanity as FOR UPDATE does
not lock in auto-commit mode
+ # per
http://dev.mysql.com/doc/refman/5.7/en/innodb-locking-reads.html.
+ $dbw->startAtomic( __METHOD__ );
+ $committed = $dbw->selectField( 'logging',
+ '1',
+ array( 'log_id' => $logId ),
+ __METHOD__,
+ array( 'FOR UPDATE' )
+ );
+ $dbw->endAtomic( __METHOD__ );
+ # If the transaction inserting this job was rolled
back, detect that
+ if ( $committed === false ) { // rollback happened?
+ throw new LogicException( "Cannot run job if
the account rename failed." );
+ }
+ }
+
+ # Flush any state snapshot data (and release the lock above)
+ $dbw->commit( __METHOD__, 'flush' );
# Conditions like "*_user_text = 'x'
$conds = array( $column => $oldname );
diff --git a/RenameuserSQL.php b/RenameuserSQL.php
index 9fbacda..57dad4e 100755
--- a/RenameuserSQL.php
+++ b/RenameuserSQL.php
@@ -165,12 +165,19 @@
$contribs = User::newFromId( $this->uid )->getEditCount();
$dbw = wfGetDB( DB_MASTER );
- $dbw->begin();
+ $dbw->startAtomic( __METHOD__ );
+
Hooks::run( 'RenameUserPreRename', array( $this->uid,
$this->old, $this->new ) );
- // Rename and touch the user before re-attributing edits,
- // this avoids users still being logged in and making new edits
while
- // being renamed, which leaves edits at the old name.
+ // Make sure the user exists if needed
+ if ( $this->checkIfUserExists && !self::lockUserAndGetId(
$this->old ) ) {
+ $this->debug( "User {$this->old} does not exist,
bailing out" );
+
+ return false;
+ }
+
+ // Rename and touch the user before re-attributing edits to
avoid users still being
+ // logged in and making new edits (under the old name) while
being renamed.
$this->debug( "Starting rename of {$this->old} to {$this->new}"
);
$dbw->update( 'user',
array( 'user_name' => $this->new, 'user_touched' =>
$dbw->timestamp() ),
@@ -178,27 +185,21 @@
__METHOD__
);
- if ( !$dbw->affectedRows() && $this->checkIfUserExists ) {
- $dbw->rollback();
-
jenkins-bot has submitted this change and it was merged.
Change subject: Improve docs, fix deprecated functons usage, rm unused method
..
Improve docs, fix deprecated functons usage, rm unused method
Change-Id: Ic79ace426cb4dd377750966d7ce6722202c4c8b0
---
M includes/CoordinatesParserFunction.php
M includes/GeoData.body.php
M includes/GeoDataHooks.php
M includes/api/ApiQueryGeoSearchElastic.php
4 files changed, 23 insertions(+), 33 deletions(-)
Approvals:
Yurik: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/CoordinatesParserFunction.php
b/includes/CoordinatesParserFunction.php
index 5f989f4..dfb4d8a 100644
--- a/includes/CoordinatesParserFunction.php
+++ b/includes/CoordinatesParserFunction.php
@@ -31,7 +31,7 @@
*
* @param Parser $parser
* @param PPFrame $frame
-* @param Array $args
+* @param PPNode[] $args
* @throws MWException
* @return Mixed
*/
@@ -71,7 +71,7 @@
/**
* Parses parser function input
* @param PPFrame $frame
-* @param Array $args
+* @param PPNode[] $args
*/
private function parseArgs( $frame, $args ) {
$first = trim( $frame->expand( array_shift( $args ) ) );
@@ -89,7 +89,7 @@
/**
* Add an unnamed parameter to the list, turining it into a named one
if needed
-* @param String $value: Parameter
+* @param string $value Parameter
*/
private function addArg( $value ) {
$primary = MagicWord::get( 'primary' );
@@ -106,7 +106,7 @@
* Applies a coordinate to parser output
*
* @param Coord $coord
-* @return Status: whether save went OK
+* @return Status whether save went OK
*/
private function applyCoord( Coord $coord ) {
global $wgMaxCoordinatesPerPage, $wgContLang;
@@ -228,7 +228,7 @@
* Returns wikitext of status error message in content language
*
* @param Status $s
-* @return String
+* @return string
*/
private function errorText( Status $s ) {
$errors = array_merge( $s->getErrorsArray(),
$s->getWarningsArray() );
diff --git a/includes/GeoData.body.php b/includes/GeoData.body.php
index 605be8f..5bee492 100644
--- a/includes/GeoData.body.php
+++ b/includes/GeoData.body.php
@@ -23,7 +23,7 @@
/**
* Returns primary coordinates of the given page, if any
* @param Title $title
-* @return Coord|bool: Coordinates or false
+* @return Coord|bool Coordinates or false
*/
public static function getPageCoordinates( Title $title ) {
$coords = self::getAllCoordinates( $title->getArticleID(),
array( 'gt_primary' => 1 ) );
@@ -36,10 +36,10 @@
/**
* Retrieves all coordinates for the given page id
*
-* @param int $pageId: ID of the page
-* @param Array $conds: Conditions for Database::select()
-* @param int $dbType: Database to select from DM_MASTER or DB_SLAVE
-* @return Array: Array of Coord objects
+* @param int $pageId ID of the page
+* @param array $conds Conditions for Database::select()
+* @param int $dbType Database to select from DM_MASTER or DB_SLAVE
+* @return Coord[]
*/
public static function getAllCoordinates( $pageId, $conds = array(),
$dbType = DB_SLAVE ) {
$db = wfGetDB( $dbType );
@@ -56,9 +56,9 @@
* Parses coordinates
* See https://en.wikipedia.org/wiki/Template:Coord for sample inputs
*
-* @param Array $parts: Array of coordinate components
-* @param String $globe: Globe name
-* @return Status: Status object, in case of success its value is a
Coord object.
+* @param array $parts Array of coordinate components
+* @param string $globe Globe name
+* @return Status Status object, in case of success its value is a
Coord object.
*/
public static function parseCoordinates( $parts, $globe ) {
global $wgGlobes;
@@ -142,9 +142,9 @@
/**
* Parses coordinate suffix such as N, S, E or W
*
-* @param String $str: String to test
-* @param Array $coordInfo
-* @return int: Sign modifier or 0 if not a suffix
+* @param string $str String to test
+* @param array $coordInfo
+* @return int Sign modifier or 0 if not a suffix
*/
public static function parseSuffix( $str, $coordInfo ) {
global $wgContLang;
@@ -167,17 +167,5 @@
);
}
return $result;
- }
-
- /**
-* Given an array of non-normalised probabilities, this function will
select
-* an element and return the appropria
jenkins-bot has submitted this change and it was merged.
Change subject: Add docstring for
cosmetic_changes.CosmeticChangesToolkit.cleanUpLinks
..
Add docstring for cosmetic_changes.CosmeticChangesToolkit.cleanUpLinks
Bug: T118423
Change-Id: I1b655412a4dfaf4c287658d5a012d3bbb46de7e7
---
M pywikibot/cosmetic_changes.py
1 file changed, 20 insertions(+), 0 deletions(-)
Approvals:
John Vandenberg: Looks good to me, approved
jenkins-bot: Verified
diff --git a/pywikibot/cosmetic_changes.py b/pywikibot/cosmetic_changes.py
index 8aabc09..f466b89 100755
--- a/pywikibot/cosmetic_changes.py
+++ b/pywikibot/cosmetic_changes.py
@@ -467,6 +467,26 @@
return text
def cleanUpLinks(self, text):
+"""Tidy up wikilinks found in a string.
+
+This function will:
+* Replace underscores with spaces
+
+* Move leading and trailing spaces out of the wikilink and into the
+ surrounding text
+
+* Convert URL-encoded characters into Unicode-encoded characters
+
+* Move trailing characters out of the link and make the link without
+ using a pipe, if possible
+
+* Capitalize the article title of the link, if appropriate
+
+@param text: string to perform the clean-up on
+@type text: str
+@return: text with tidied wikilinks
+@rtype: str
+"""
# helper function which works on one link and either returns it
# unmodified, or returns a replacement.
def handleOneLink(match):
--
To view, visit https://gerrit.wikimedia.org/r/262668
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I1b655412a4dfaf4c287658d5a012d3bbb46de7e7
Gerrit-PatchSet: 3
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: Sn1per
Gerrit-Reviewer: John Vandenberg
Gerrit-Reviewer: Ladsgroup
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
TTO has uploaded a new change for review.
https://gerrit.wikimedia.org/r/263030
Change subject: Remove some uses of $wgTitle in core
..
Remove some uses of $wgTitle in core
- EditPage no longer uses $wgTitle. It now always uses the $this->mTitle
member variable.
In core, the code that read $wgTitle was only used by action=edit itself.
As far as I can tell, $wgTitle and $this->mTitle always point to the same
title in this scenario.
No extensions in Git are affected.
- Linker::makeExternalLink no longer uses $wgTitle. This means that if
the optional $title parameter is not passed in, the value of
$wgNoFollowNsExceptions will not be checked when deciding whether or not
to add rel="nofollow" to the link. Arguably $title should be made a
mandatory parameter, but its place in the argument list makes this
problematic.
Uses of this function in core are updated to take account of this change.
Extensions using this function are doing so from a special page
or other non-user-content context, so do not require any change.
- Parser::transformMsg no longer uses $wgTitle if the $title parameter is
null, instead using the $mTitle member variable.
This doesn't affect core, but does affect the SemanticForms and
Intersection extensions. (SemanticForms is still using $wgParser, so I'm
not going to bother patching it. They can figure it out themselves.)
Patch for Intersection is I17cb16fc3f9912cff1832d7eec09c4d9048f146c
Bug: T25307
Change-Id: I69ae09dabfcadafc1f964e2770ee184e2b34116e
---
M RELEASE-NOTES-1.27
M includes/EditPage.php
M includes/Linker.php
M includes/api/ApiEditPage.php
M includes/api/ApiParse.php
M includes/parser/Parser.php
6 files changed, 36 insertions(+), 21 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/30/263030/1
diff --git a/RELEASE-NOTES-1.27 b/RELEASE-NOTES-1.27
index 9b12b72..329db8e 100644
--- a/RELEASE-NOTES-1.27
+++ b/RELEASE-NOTES-1.27
@@ -61,6 +61,7 @@
$wgSharedDB and $wgSharedTables are properly set even on the "central" wiki
that all others are sharing from and that $wgLocalDatabases is set to the
full list of sharing wikis on all those wikis.
+* Adding NS_SPECIAL (-1) to $wgNoFollowNsExceptions no longer has any effect.
=== New features in 1.27 ===
* $wgDataCenterId and $wgDataCenterRoles where added, which will serve as
diff --git a/includes/EditPage.php b/includes/EditPage.php
index 47912cb..c3c23b3 100644
--- a/includes/EditPage.php
+++ b/includes/EditPage.php
@@ -436,15 +436,12 @@
/**
* Get the context title object.
-* If not set, $wgTitle will be returned. This behavior might change in
-* the future to return $this->mTitle instead.
*
* @return Title
*/
public function getContextTitle() {
if ( is_null( $this->mContextTitle ) ) {
- global $wgTitle;
- return $wgTitle;
+ return $this->mTitle;
} else {
return $this->mContextTitle;
}
diff --git a/includes/Linker.php b/includes/Linker.php
index 80e4c62..6df37c9 100644
--- a/includes/Linker.php
+++ b/includes/Linker.php
@@ -1038,13 +1038,14 @@
* @param bool $escape Do we escape the link text?
* @param string $linktype Type of external link. Gets added to the
classes
* @param array $attribs Array of extra attributes to
-* @param Title|null $title Title object used for title specific link
attributes
+* @param Title|null $title Title object used for title specific link
+* attributes. This parameter is only relevant when the external link is
+* in page content, and should be left null for links in the UI
* @return string
*/
public static function makeExternalLink( $url, $text, $escape = true,
$linktype = '', $attribs = array(), $title = null
) {
- global $wgTitle;
$class = "external";
if ( $linktype ) {
$class .= " $linktype";
@@ -1058,9 +1059,6 @@
$text = htmlspecialchars( $text );
}
- if ( !$title ) {
- $title = $wgTitle;
- }
$attribs['rel'] = Parser::getExternalLinkRel( $url, $title );
$link = '';
$success = Hooks::run( 'LinkerMakeExternalLink',
@@ -1509,7 +1507,10 @@
$title->getFragment()
),
$text,
- /* escape = */ false // Already escaped
+ /* escape = */ false, // Already escaped
+ /* linktype = */ '',
+ /* attribs = */ array(),
+
Gergő Tisza has uploaded a new change for review.
https://gerrit.wikimedia.org/r/263027
Change subject: Improve sentry plugin
..
Improve sentry plugin
Clean up whitespace + make parameters less cumbersome
Bug: T85239
Change-Id: I74e63e6b41af13389ba7be888f25286b3a508ec2
---
M logstash/outputs/sentry.rb
1 file changed, 37 insertions(+), 50 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/operations/software/logstash/plugins
refs/changes/27/263027/1
diff --git a/logstash/outputs/sentry.rb b/logstash/outputs/sentry.rb
index 584918b..e3e673f 100644
--- a/logstash/outputs/sentry.rb
+++ b/logstash/outputs/sentry.rb
@@ -9,44 +9,33 @@
# Sentry is a modern error logging and aggregation platform.
# * https://getsentry.com/
#
-# It’s important to note that Sentry should not be thought of as a log stream,
but as an aggregator.
+# It’s important to note that Sentry should not be thought of as a log stream,
but as an aggregator.
# It fits somewhere in-between a simple metrics solution (such as Graphite)
and a full-on log stream aggregator (like Logstash).
#
# Generate and inform your client key (Settings -> Client key)
-# The client key has this form * https://[key]:[secret]@[host]/[project_id] *
#
-# More informations :
+# More informations :
# * https://sentry.readthedocs.org/en/latest/
class LogStash::Outputs::Sentry < LogStash::Outputs::Base
-
+
config_name 'sentry'
-
-
- # The key of the client key
- config :key, :validate => :string, :required => true
-
- # The secret of the client key
- config :secret, :validate => :string, :required => true
-
- # The project id of the client key
- config :project_id, :validate => :string, :required => true
-
- # The Sentry host
- config :host, :validate => :string, :default => "https://app.getsentry.com";,
:required => false
-
+
+ # The Sentry DSN
+ config :dsn, :validate => :string, :required => true
+
# This sets the message value in Sentry (the title of your event)
config :msg, :validate => :string, :default => "Message from logstash",
:required => false
-
+
# This sets the level value in Sentry (the level tag)
config :level_tag, :validate => :string, :default => "error", :required =>
false
-
- # Is the protocole https ? By default yes (host is
"https://app.getsentry.com";)
- # If you have installed Sentry in your own machine, maybe you do use http,
- # so you have to disable ssl ( "use_ssl" => false )
- config :use_ssl, :validate => :boolean, :default => true, :required => false
-
+
+ # Is the protocole https ? By default yes (host is
"https://app.getsentry.com";)
+ # If you have installed Sentry in your own machine, maybe you do use http,
+ # so you have to disable ssl ( "use_ssl" => false )
+ config :use_ssl, :validate => :boolean, :default => true, :required => false
+
# If set to true automatically map all logstash defined fields to Sentry
extra fields.
# As an example, the logstash event:
# [source,ruby]
@@ -69,67 +58,65 @@
# "nested_field": {
#"key": "value"
# }
- #}
+ #}
config :fields_to_tags, :validate => :boolean, :default => false, :required
=> false
-
+
public
def register
require 'net/https'
require 'uri'
-
-@url = "#{host}/api/#{project_id}/store/"
-@uri = URI.parse(@url)
+
+@uri = URI.parse(@sentry_dsn)
@client = Net::HTTP.new(@uri.host, @uri.port)
-@client.use_ssl = use_ssl
+@client.use_ssl = @uri.scheme.downcase === 'https'
@client.verify_mode = OpenSSL::SSL::VERIFY_NONE
-
- @logger.debug("Client", :client => @client.inspect)
+
+@logger.debug("Client", :client => @client.inspect)
end
-
+
public
def receive(event)
return unless output?(event)
-
+
require 'securerandom'
-
+
packet = {
:event_id => SecureRandom.uuid.gsub('-', ''),
:timestamp => event['@timestamp'],
:message => event["#{msg}"] || "#{msg}"
}
-packet[:level] = "#{level_tag}"
+packet[:level] = "#{level_tag}"
packet[:platform] = 'logstash'
-packet[:server_name] = event['host']
-packet[:extra] = event.to_hash
-
+packet[:server_name] = event['host']
+packet[:extra] = event.to_hash
+
if fields_to_tags == true
packet[:tags] = event.to_hash
-end
+end
@logger.debug("Sentry packet", :sentry_packet => packet)
-
+
auth_header = "Sentry sentry_version=5," +
"sentry_client=raven_logstash/1.0," +
"sentry_timestamp=#{event['@timestamp'].to_i}," +
- "sentry_key=#{@key}," +
- "sentry_secret=#{@secret}"
-
+ "sentry_key=#{@uri.user}," +
+ "sentry_secret=#{@uri.password}"
+
request = Net::HTTP::Post.new(@uri.path)
-
+
begin
request.body = packet.to_json
request.add_field('X-Sentry-Auth', auth_header)
-
+
respons
jenkins-bot has submitted this change and it was merged.
Change subject: Allow setting local email/realname from remote wiki
..
Allow setting local email/realname from remote wiki
Change-Id: I9b34be7b49b5d12919f7c7b59b0e70bdca9bd079
---
M OAuthAuthentication.php
M handlers/AuthenticationHandler.php
M i18n/en.json
M i18n/qqq.json
M specials/SpecialOAuthLogin.php
M tests/OAuthAuthConfigTest.php
M tests/OAuthAuthDBTest.php
M tests/OAuthAuthExternalUserTest.php
M tests/OAuthAuthHooksTest.php
M utils/Hooks.php
M utils/OAuthExternalUser.php
11 files changed, 88 insertions(+), 17 deletions(-)
Approvals:
Reedy: Looks good to me, approved
jenkins-bot: Verified
diff --git a/OAuthAuthentication.php b/OAuthAuthentication.php
index 2af6352..4cbbe4e 100644
--- a/OAuthAuthentication.php
+++ b/OAuthAuthentication.php
@@ -96,6 +96,7 @@
$wgAutoloadClasses['MediaWiki\Extensions\OAuthAuthentication\OAuth1Handler'] =
"$dir/handlers/OAuth1Handler.php";
$wgAutoloadClasses['MediaWiki\Extensions\OAuthAuthentication\SessionStore'] =
"$dir/store/SessionStore.php";
$wgAutoloadClasses['MediaWiki\Extensions\OAuthAuthentication\PhpSessionStore']
= "$dir/store/PhpSessionStore.php";
+$wgAutoloadClasses['MediaWiki\Extensions\OAuthAuthentication\OAuthAuthDBTest']
= "$dir/tests/OAuthAuthDBTest.php";
## i18n
$wgMessagesDirs['OAuthAuthentication'] = "$dir/i18n";
diff --git a/handlers/AuthenticationHandler.php
b/handlers/AuthenticationHandler.php
index ddedfb1..a497736 100644
--- a/handlers/AuthenticationHandler.php
+++ b/handlers/AuthenticationHandler.php
@@ -12,6 +12,12 @@
wfGetDB( DB_MASTER ) #TODO: don't do this
);
$exUser->setAccessToken( $accessToken );
+ if ( isset( $identity->realname ) ) {
+ $exUser->setRealname( $identity->realname );
+ }
+ if ( isset( $identity->email ) ) {
+ $exUser->setEmail( $identity->email );
+ }
$exUser->setIdentifyTS( new \MWTimestamp() );
if ( $exUser->attached() ) {
@@ -57,9 +63,9 @@
return $status;
}
- /* TODO: Set email, realname, and language, once we can
get them via /identify
$u->setEmail( $exUser->getEmail() );
- $u->setRealName( $exUser->getRealName() );
+ $u->setRealName( $exUser->getRealname() );
+ /*
$u->setOption( 'language', $exUser->getLanguage() );
*/
@@ -100,9 +106,27 @@
__METHOD__ . ": Associated user is Anon.
Aborting." );
return \Status::newFatal(
'oauthauth-login-usernotexists' );
}
-wfDebugLog( "OAA", __METHOD__ . " updating exuser: " . print_r( $exUser, true
) );
$exUser->updateInDatabase( wfGetDB( DB_MASTER ) );
+ $changed = false;
+ // update private data if needed
+ if ( $u->getEmail() !== $exUser->getEmail() ) {
+ if ( $exUser->getEmail() ) {
+ $u->setEmail( $exUser->getEmail() );
+ $u->confirmEmail();
+ } else {
+ $u->invalidateEmail();
+ }
+ $changed = true;
+ }
+ if ( $u->getRealName() !== $exUser->getRealname() ) {
+ $u->setRealName( $exUser->getRealname() );
+ $changed = true;
+ }
+
+ if ( $changed ) {
+ $u->saveSettings();
+ }
$u->invalidateCache();
if ( !$wgSecureLogin ) {
diff --git a/i18n/en.json b/i18n/en.json
index f48bd79..eff0b85 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -17,5 +17,7 @@
"oauthauth-login-usernotexists": "The OAuth user is listed as
connected, but the user does not exist on this wiki.",
"oauthauth-nologin-policy": "This wiki's policy will not let you
login.",
"oauthauth-localuser-not-allowed": "Local account creation is disabled
on this wiki. \"$1\" creates an account with OAuth.",
- "oauthauth-loggout-policy": "You have been logged out because the site
policy no longer allows you to be logged in."
+ "oauthauth-loggout-policy": "You have been logged out because the site
policy no longer allows you to be logged in.",
+ "oauthauth-set-email": "Your attached account did not have an email
address the last time you logged in. Set an email address on $1 to set your
email address here.",
+ "oauthauth-email-set": "$1. Update your email address on $2 to change
it."
}
diff --git a/i18n/qqq.json b/i18n/qqq.json
index 6e7060e..6a6d3ce 1006
Gergő Tisza has uploaded a new change for review.
https://gerrit.wikimedia.org/r/263019
Change subject: Sentry: really create group
..
Sentry: really create group
Apparently groups do not default to 'present'.
Bug: T85239
Change-Id: Ic8824667a74de2ae15ad7e7c58b6795ce202e625
---
M modules/sentry/manifests/init.pp
1 file changed, 1 insertion(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/19/263019/1
diff --git a/modules/sentry/manifests/init.pp b/modules/sentry/manifests/init.pp
index a2d1647..91d99fb 100644
--- a/modules/sentry/manifests/init.pp
+++ b/modules/sentry/manifests/init.pp
@@ -46,6 +46,7 @@
}
group { 'sentry':
+ensure => present,
system => true,
}
--
To view, visit https://gerrit.wikimedia.org/r/263019
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic8824667a74de2ae15ad7e7c58b6795ce202e625
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Gergő Tisza
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
jenkins-bot has submitted this change and it was merged.
Change subject: Fixed viewer only displaying every nth image after reopening
..
Fixed viewer only displaying every nth image after reopening
Added code to detach emit calls when the interface is closed.
Bug: T122785
Change-Id: Ifd97aebe7aa01a152817100f301a80a9b6ac83a3
---
M resources/mmv/mmv.lightboxinterface.js
1 file changed, 5 insertions(+), 0 deletions(-)
Approvals:
Gergő Tisza: Looks good to me, approved
jenkins-bot: Verified
diff --git a/resources/mmv/mmv.lightboxinterface.js
b/resources/mmv/mmv.lightboxinterface.js
index 18b0474..d866d1e 100644
--- a/resources/mmv/mmv.lightboxinterface.js
+++ b/resources/mmv/mmv.lightboxinterface.js
@@ -276,6 +276,11 @@
this.clearEvents();
+ this.buttons.disconnect( this, {
+ 'next': [ 'emit', 'next' ],
+ 'prev': [ 'emit', 'prev' ]
+ } );
+
// We trigger this event on the document because unattach() can
run
// when the interface is unattached
$( document ).trigger( $.Event( 'mmv-close' ) )
--
To view, visit https://gerrit.wikimedia.org/r/262917
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ifd97aebe7aa01a152817100f301a80a9b6ac83a3
Gerrit-PatchSet: 7
Gerrit-Project: mediawiki/extensions/MultimediaViewer
Gerrit-Branch: master
Gerrit-Owner: Mhutti1
Gerrit-Reviewer: Gergő Tisza
Gerrit-Reviewer: Mhutti1
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
Alexandros Kosiaris has submitted this change and it was merged.
Change subject: Apply the mathoid role on scb
..
Apply the mathoid role on scb
apply the mathoid role on scb in order to migrate it from sca
Amend the conftool data as well
Change-Id: I16e73a0bff037011fd6092a860b6e1ebe4cea1e0
---
M conftool-data/nodes/eqiad.yaml
M manifests/role/scb.pp
2 files changed, 3 insertions(+), 2 deletions(-)
Approvals:
Alexandros Kosiaris: Verified; Looks good to me, approved
diff --git a/conftool-data/nodes/eqiad.yaml b/conftool-data/nodes/eqiad.yaml
index ab5c00f..28f5ba1 100644
--- a/conftool-data/nodes/eqiad.yaml
+++ b/conftool-data/nodes/eqiad.yaml
@@ -260,8 +260,8 @@
sca1001.eqiad.wmnet: [citoid, cxserver, graphoid, mathoid, zotero]
sca1002.eqiad.wmnet: [citoid, cxserver, graphoid, mathoid, zotero]
scb:
- scb1001.eqiad.wmnet: []
- scb1002.eqiad.wmnet: []
+ scb1001.eqiad.wmnet: [mathoid]
+ scb1002.eqiad.wmnet: [mathoid]
dns:
chromium.wikimedia.org: [pdns_recursor]
hydrogen.wikimedia.org: [pdns_recursor]
diff --git a/manifests/role/scb.pp b/manifests/role/scb.pp
index 1a49d51..c4e2286 100644
--- a/manifests/role/scb.pp
+++ b/manifests/role/scb.pp
@@ -2,6 +2,7 @@
# This class is an intermediate step to better design
class role::scb {
include role::mobileapps
+include role::mathoid
include standard
include base::firewall
--
To view, visit https://gerrit.wikimedia.org/r/263015
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I16e73a0bff037011fd6092a860b6e1ebe4cea1e0
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alexandros Kosiaris
Gerrit-Reviewer: Alexandros Kosiaris
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
Alexandros Kosiaris has uploaded a new change for review.
https://gerrit.wikimedia.org/r/263015
Change subject: Apply the mathoid role on scb
..
Apply the mathoid role on scb
apply the mathoid role on scb in order to migrate it from sca
Amend the conftool data as well
Change-Id: I16e73a0bff037011fd6092a860b6e1ebe4cea1e0
---
M conftool-data/nodes/eqiad.yaml
M manifests/role/scb.pp
2 files changed, 3 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/15/263015/1
diff --git a/conftool-data/nodes/eqiad.yaml b/conftool-data/nodes/eqiad.yaml
index ab5c00f..28f5ba1 100644
--- a/conftool-data/nodes/eqiad.yaml
+++ b/conftool-data/nodes/eqiad.yaml
@@ -260,8 +260,8 @@
sca1001.eqiad.wmnet: [citoid, cxserver, graphoid, mathoid, zotero]
sca1002.eqiad.wmnet: [citoid, cxserver, graphoid, mathoid, zotero]
scb:
- scb1001.eqiad.wmnet: []
- scb1002.eqiad.wmnet: []
+ scb1001.eqiad.wmnet: [mathoid]
+ scb1002.eqiad.wmnet: [mathoid]
dns:
chromium.wikimedia.org: [pdns_recursor]
hydrogen.wikimedia.org: [pdns_recursor]
diff --git a/manifests/role/scb.pp b/manifests/role/scb.pp
index 1a49d51..c4e2286 100644
--- a/manifests/role/scb.pp
+++ b/manifests/role/scb.pp
@@ -2,6 +2,7 @@
# This class is an intermediate step to better design
class role::scb {
include role::mobileapps
+include role::mathoid
include standard
include base::firewall
--
To view, visit https://gerrit.wikimedia.org/r/263015
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I16e73a0bff037011fd6092a860b6e1ebe4cea1e0
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alexandros Kosiaris
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
Mobrovac has submitted this change and it was merged.
Change subject: Update mathoid to 2a62d79
..
Update mathoid to 2a62d79
List of changes:
a93b408 Release v0.3.0
64bdc08 Release v0.3.1
2a62d79 Switch to Node 4.2 and Jessie
xxx Update node module dependencies
Change-Id: I0c97f56a0a9ff9b5bac6782056438d2a618e976a
---
A node_modules/.bin/esparse
A node_modules/.bin/esvalidate
A node_modules/ansi-regex/license
M node_modules/ansi-regex/package.json
M node_modules/bluebird/package.json
M node_modules/body-parser/node_modules/bytes/package.json
M node_modules/body-parser/node_modules/depd/package.json
M node_modules/body-parser/node_modules/iconv-lite/package.json
M node_modules/body-parser/node_modules/qs/package.json
M node_modules/body-parser/node_modules/raw-body/package.json
M node_modules/body-parser/package.json
R node_modules/bunyan/node_modules/dtrace-provider/node_modules/nan/.dntrc
R node_modules/bunyan/node_modules/dtrace-provider/node_modules/nan/appveyor.yml
R
node_modules/bunyan/node_modules/dtrace-provider/node_modules/nan/doc/.build.sh
R
node_modules/bunyan/node_modules/dtrace-provider/node_modules/nan/include_dirs.js
R node_modules/bunyan/node_modules/dtrace-provider/node_modules/nan/nan.h
R
node_modules/bunyan/node_modules/dtrace-provider/node_modules/nan/nan_callbacks.h
R
node_modules/bunyan/node_modules/dtrace-provider/node_modules/nan/nan_callbacks_12_inl.h
R
node_modules/bunyan/node_modules/dtrace-provider/node_modules/nan/nan_callbacks_pre_12_inl.h
R
node_modules/bunyan/node_modules/dtrace-provider/node_modules/nan/nan_converters.h
R
node_modules/bunyan/node_modules/dtrace-provider/node_modules/nan/nan_converters_43_inl.h
R
node_modules/bunyan/node_modules/dtrace-provider/node_modules/nan/nan_converters_pre_43_inl.h
R
node_modules/bunyan/node_modules/dtrace-provider/node_modules/nan/nan_implementation_12_inl.h
R
node_modules/bunyan/node_modules/dtrace-provider/node_modules/nan/nan_implementation_pre_12_inl.h
R
node_modules/bunyan/node_modules/dtrace-provider/node_modules/nan/nan_maybe_43_inl.h
R
node_modules/bunyan/node_modules/dtrace-provider/node_modules/nan/nan_maybe_pre_43_inl.h
R node_modules/bunyan/node_modules/dtrace-provider/node_modules/nan/nan_new.h
R
node_modules/bunyan/node_modules/dtrace-provider/node_modules/nan/nan_object_wrap.h
R
node_modules/bunyan/node_modules/dtrace-provider/node_modules/nan/nan_persistent_12_inl.h
R
node_modules/bunyan/node_modules/dtrace-provider/node_modules/nan/nan_persistent_pre_12_inl.h
R
node_modules/bunyan/node_modules/dtrace-provider/node_modules/nan/nan_string_bytes.h
R
node_modules/bunyan/node_modules/dtrace-provider/node_modules/nan/nan_typedarray_contents.h
R node_modules/bunyan/node_modules/dtrace-provider/node_modules/nan/nan_weak.h
A node_modules/bunyan/node_modules/dtrace-provider/node_modules/nan/package.json
R
node_modules/bunyan/node_modules/dtrace-provider/node_modules/nan/tools/1to2.js
R
node_modules/bunyan/node_modules/dtrace-provider/node_modules/nan/tools/package.json
M node_modules/bunyan/node_modules/dtrace-provider/package.json
M
node_modules/bunyan/node_modules/mv/node_modules/mkdirp/node_modules/minimist/package.json
M node_modules/bunyan/node_modules/mv/node_modules/mkdirp/package.json
M node_modules/bunyan/node_modules/mv/node_modules/ncp/package.json
A
node_modules/bunyan/node_modules/mv/node_modules/rimraf/node_modules/glob/LICENSE
M
node_modules/bunyan/node_modules/mv/node_modules/rimraf/node_modules/glob/common.js
M
node_modules/bunyan/node_modules/mv/node_modules/rimraf/node_modules/glob/node_modules/inflight/package.json
A
node_modules/bunyan/node_modules/mv/node_modules/rimraf/node_modules/glob/node_modules/minimatch/LICENSE
M
node_modules/bunyan/node_modules/mv/node_modules/rimraf/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/node_modules/balanced-match/package.json
M
node_modules/bunyan/node_modules/mv/node_modules/rimraf/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/node_modules/concat-map/package.json
M
node_modules/bunyan/node_modules/mv/node_modules/rimraf/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/package.json
M
node_modules/bunyan/node_modules/mv/node_modules/rimraf/node_modules/glob/node_modules/minimatch/package.json
A
node_modules/bunyan/node_modules/mv/node_modules/rimraf/node_modules/glob/node_modules/once/LICENSE
M
node_modules/bunyan/node_modules/mv/node_modules/rimraf/node_modules/glob/node_modules/once/package.json
A
node_modules/bunyan/node_modules/mv/node_modules/rimraf/node_modules/glob/node_modules/path-is-absolute/license
M
node_modules/bunyan/node_modules/mv/node_modules/rimraf/node_modules/glob/node_modules/path-is-absolute/package.json
M
node_modules/bunyan/node_modules/mv/node_modules/rimraf/node_modules/glob/node_modules/wrappy/package.json
M
node_modules/bunyan/node_modules/mv/node_modules/rimraf/node_m
Mobrovac has uploaded a new change for review.
https://gerrit.wikimedia.org/r/263013
Change subject: Update mathoid to 2a62d79
..
Update mathoid to 2a62d79
List of changes:
a93b408 Release v0.3.0
64bdc08 Release v0.3.1
2a62d79 Switch to Node 4.2 and Jessie
xxx Update node module dependencies
Change-Id: I0c97f56a0a9ff9b5bac6782056438d2a618e976a
---
A node_modules/.bin/esparse
A node_modules/.bin/esvalidate
A node_modules/ansi-regex/license
M node_modules/ansi-regex/package.json
M node_modules/bluebird/package.json
M node_modules/body-parser/node_modules/bytes/package.json
M node_modules/body-parser/node_modules/depd/package.json
M node_modules/body-parser/node_modules/iconv-lite/package.json
M node_modules/body-parser/node_modules/qs/package.json
M node_modules/body-parser/node_modules/raw-body/package.json
M node_modules/body-parser/package.json
R node_modules/bunyan/node_modules/dtrace-provider/node_modules/nan/.dntrc
R node_modules/bunyan/node_modules/dtrace-provider/node_modules/nan/appveyor.yml
R
node_modules/bunyan/node_modules/dtrace-provider/node_modules/nan/doc/.build.sh
R
node_modules/bunyan/node_modules/dtrace-provider/node_modules/nan/include_dirs.js
R node_modules/bunyan/node_modules/dtrace-provider/node_modules/nan/nan.h
R
node_modules/bunyan/node_modules/dtrace-provider/node_modules/nan/nan_callbacks.h
R
node_modules/bunyan/node_modules/dtrace-provider/node_modules/nan/nan_callbacks_12_inl.h
R
node_modules/bunyan/node_modules/dtrace-provider/node_modules/nan/nan_callbacks_pre_12_inl.h
R
node_modules/bunyan/node_modules/dtrace-provider/node_modules/nan/nan_converters.h
R
node_modules/bunyan/node_modules/dtrace-provider/node_modules/nan/nan_converters_43_inl.h
R
node_modules/bunyan/node_modules/dtrace-provider/node_modules/nan/nan_converters_pre_43_inl.h
R
node_modules/bunyan/node_modules/dtrace-provider/node_modules/nan/nan_implementation_12_inl.h
R
node_modules/bunyan/node_modules/dtrace-provider/node_modules/nan/nan_implementation_pre_12_inl.h
R
node_modules/bunyan/node_modules/dtrace-provider/node_modules/nan/nan_maybe_43_inl.h
R
node_modules/bunyan/node_modules/dtrace-provider/node_modules/nan/nan_maybe_pre_43_inl.h
R node_modules/bunyan/node_modules/dtrace-provider/node_modules/nan/nan_new.h
R
node_modules/bunyan/node_modules/dtrace-provider/node_modules/nan/nan_object_wrap.h
R
node_modules/bunyan/node_modules/dtrace-provider/node_modules/nan/nan_persistent_12_inl.h
R
node_modules/bunyan/node_modules/dtrace-provider/node_modules/nan/nan_persistent_pre_12_inl.h
R
node_modules/bunyan/node_modules/dtrace-provider/node_modules/nan/nan_string_bytes.h
R
node_modules/bunyan/node_modules/dtrace-provider/node_modules/nan/nan_typedarray_contents.h
R node_modules/bunyan/node_modules/dtrace-provider/node_modules/nan/nan_weak.h
A node_modules/bunyan/node_modules/dtrace-provider/node_modules/nan/package.json
R
node_modules/bunyan/node_modules/dtrace-provider/node_modules/nan/tools/1to2.js
R
node_modules/bunyan/node_modules/dtrace-provider/node_modules/nan/tools/package.json
M node_modules/bunyan/node_modules/dtrace-provider/package.json
M
node_modules/bunyan/node_modules/mv/node_modules/mkdirp/node_modules/minimist/package.json
M node_modules/bunyan/node_modules/mv/node_modules/mkdirp/package.json
M node_modules/bunyan/node_modules/mv/node_modules/ncp/package.json
A
node_modules/bunyan/node_modules/mv/node_modules/rimraf/node_modules/glob/LICENSE
M
node_modules/bunyan/node_modules/mv/node_modules/rimraf/node_modules/glob/common.js
M
node_modules/bunyan/node_modules/mv/node_modules/rimraf/node_modules/glob/node_modules/inflight/package.json
A
node_modules/bunyan/node_modules/mv/node_modules/rimraf/node_modules/glob/node_modules/minimatch/LICENSE
M
node_modules/bunyan/node_modules/mv/node_modules/rimraf/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/node_modules/balanced-match/package.json
M
node_modules/bunyan/node_modules/mv/node_modules/rimraf/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/node_modules/concat-map/package.json
M
node_modules/bunyan/node_modules/mv/node_modules/rimraf/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/package.json
M
node_modules/bunyan/node_modules/mv/node_modules/rimraf/node_modules/glob/node_modules/minimatch/package.json
A
node_modules/bunyan/node_modules/mv/node_modules/rimraf/node_modules/glob/node_modules/once/LICENSE
M
node_modules/bunyan/node_modules/mv/node_modules/rimraf/node_modules/glob/node_modules/once/package.json
A
node_modules/bunyan/node_modules/mv/node_modules/rimraf/node_modules/glob/node_modules/path-is-absolute/license
M
node_modules/bunyan/node_modules/mv/node_modules/rimraf/node_modules/glob/node_modules/path-is-absolute/package.json
M
node_modules/bunyan/node_modules/mv/node_modules/rimraf/node_modules/glob/node_modules/wrappy/package.json
M
node_modules/bunyan/node_modu
Arlolra has uploaded a new change for review.
https://gerrit.wikimedia.org/r/263009
Change subject: Only emit shared prefix bullets for the right parents
..
Only emit shared prefix bullets for the right parents
* In the other cases (ie. when this child doesn't match expectations),
we'll have already emitted bullets for the parent node, which is why
we're seeing duplicates.
* Fixes a regression introduced in e7e1cf2dc8c5b7683b9207b268dea10d7dfd53f5
* Identified in rt https://gerrit.wikimedia.org/r/#/c/262723/
Change-Id: Iae4dc35fdfd3058ae3bb12bc950f57e416398cb2
---
M lib/html2wt/DOMHandlers.js
1 file changed, 16 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/parsoid
refs/changes/09/263009/1
diff --git a/lib/html2wt/DOMHandlers.js b/lib/html2wt/DOMHandlers.js
index ca66f51..beef6b9 100644
--- a/lib/html2wt/DOMHandlers.js
+++ b/lib/html2wt/DOMHandlers.js
@@ -1287,9 +1287,24 @@
},
});
+var parentMap = {
+ LI: { UL: 1, OL: 1},
+ DT: { DL: 1 },
+ DD: { DL: 1 },
+};
+
+// FIXME: parentNode here should probably skip builder inserted elements,
+// as in `isBuilderInsertedElt`.
+function bulletsHaventAlreadyBeenEmitted(node) {
+ return (DU.isList(node) && DU.isListItem(node.parentNode)) ||
+ (DU.isListItem(node) &&
+ node.parentNode.nodeName in parentMap[node.nodeName]);
+}
+
function handleListPrefix(node, state) {
var bullets = '';
- if (DU.isListOrListItem(node) && !DU.previousNonSepSibling(node) &&
+ if (bulletsHaventAlreadyBeenEmitted(node) &&
+ !DU.previousNonSepSibling(node) &&
isTplListWithoutSharedPrefix(node) &&
// Nothing to do for definition list rows,
// since we're emitting for the parent node.
--
To view, visit https://gerrit.wikimedia.org/r/263009
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iae4dc35fdfd3058ae3bb12bc950f57e416398cb2
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/parsoid
Gerrit-Branch: master
Gerrit-Owner: Arlolra
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
jenkins-bot has submitted this change and it was merged.
Change subject: installer: Say "APCu" for PHP >= 5.5
..
installer: Say "APCu" for PHP >= 5.5
Pre-PHP 5.5 the extension was called "APC", and provided opcode caching
and userland object caching. In 5.5, the opcode caching was built-in to
PHP, and the userland object caching was moved into an extension named
"APCu".
Bug: T61998
Change-Id: Id6f4a87bfdb59b2592a56aea9450611238e313ad
---
M includes/installer/Installer.php
M includes/installer/i18n/en.json
M includes/installer/i18n/qqq.json
3 files changed, 9 insertions(+), 1 deletion(-)
Approvals:
Legoktm: Looks good to me, approved
Brian Wolff: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/installer/Installer.php b/includes/installer/Installer.php
index b863adc..ea700c7 100644
--- a/includes/installer/Installer.php
+++ b/includes/installer/Installer.php
@@ -883,7 +883,13 @@
}
if ( !$caches ) {
- $this->showMessage( 'config-no-cache' );
+ $key = 'config-no-cache';
+ // PHP >=5.5 is called APCu, earlier versions use APC
(T61998).
+ if ( !wfIsHHVM() && version_compare( PHP_VERSION,
'5.5', '>=' ) ) {
+ // config-no-cache-apcu
+ $key .= '-apcu';
+ }
+ $this->showMessage( $key );
}
$this->setVar( '_Caches', $caches );
diff --git a/includes/installer/i18n/en.json b/includes/installer/i18n/en.json
index ac3178f..f2ec7a7 100644
--- a/includes/installer/i18n/en.json
+++ b/includes/installer/i18n/en.json
@@ -69,6 +69,7 @@
"config-apc": "[http://www.php.net/apc APC] is installed",
"config-wincache": "[http://www.iis.net/download/WinCacheForPhp
WinCache] is installed",
"config-no-cache": "Warning: Could not find
[http://www.php.net/apc APC], [http://xcache.lighttpd.net/ XCache] or
[http://www.iis.net/download/WinCacheForPhp WinCache].\nObject caching is not
enabled.",
+ "config-no-cache-apcu": "Warning: Could not find
[http://www.php.net/apcu APCu], [http://xcache.lighttpd.net/ XCache] or
[http://www.iis.net/download/WinCacheForPhp WinCache].\nObject caching is not
enabled.",
"config-mod-security": "Warning: Your web server has
[http://modsecurity.org/ mod_security]/mod_security2 enabled. Many common
configurations of this will cause problems for MediaWiki and other software
that allows users to post arbitrary content.\nIf possible, this should be
disabled. Otherwise, refer to [http://modsecurity.org/documentation/
mod_security documentation] or contact your host's support if you encounter
random errors.",
"config-diff3-bad": "GNU diff3 not found.",
"config-git": "Found the Git version control software:
$1.",
diff --git a/includes/installer/i18n/qqq.json b/includes/installer/i18n/qqq.json
index bb42d88..372b228 100644
--- a/includes/installer/i18n/qqq.json
+++ b/includes/installer/i18n/qqq.json
@@ -87,6 +87,7 @@
"config-apc": "Message indicates if this program is available",
"config-wincache": "Message indicates if this program is available",
"config-no-cache": "Status message in the MediaWiki installer
environment checks.",
+ "config-no-cache-apcu": "Status message in the MediaWiki installer
environment checks.",
"config-mod-security": "Status message in the MediaWiki installer
environment checks.",
"config-diff3-bad": "Status message in the MediaWiki installer
environment checks.",
"config-git": "Message if Git version control software is
available.\nParameter:\n* $1 is the Git executable file name.",
--
To view, visit https://gerrit.wikimedia.org/r/262925
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Id6f4a87bfdb59b2592a56aea9450611238e313ad
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Legoktm
Gerrit-Reviewer: Brian Wolff
Gerrit-Reviewer: Legoktm
Gerrit-Reviewer: Reedy
Gerrit-Reviewer: Siebrand
Gerrit-Reviewer: Waldir
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
Jdlrobson has uploaded a new change for review.
https://gerrit.wikimedia.org/r/263006
Change subject: Add ResourceLoader::resetLessVars method
..
Add ResourceLoader::resetLessVars method
Currently LESS variables are cached on first lookup. Whenever the
environment changes, it is necessary thus to refresh them e.g. for
variables introduced via an extension.
This also allows tests to run whenever ResourceLoaderLESSVars is different
to an empty array
(note !array() == true)
Change-Id: Ie1cdc9518624340bb63863cdb1a3ac20eccb5951
---
M includes/resourceloader/ResourceLoader.php
M tests/phpunit/includes/resourceloader/ResourceLoaderTest.php
2 files changed, 9 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/06/263006/1
diff --git a/includes/resourceloader/ResourceLoader.php
b/includes/resourceloader/ResourceLoader.php
index 1f3085a..1c2d31e 100644
--- a/includes/resourceloader/ResourceLoader.php
+++ b/includes/resourceloader/ResourceLoader.php
@@ -1615,6 +1615,14 @@
}
/**
+* Resets any cached LESS variables
+*
+*/
+ public static function resetLessVars() {
+ self::$lessVars = null;
+ }
+
+ /**
* Get global LESS variables.
*
* @param Config $config
diff --git a/tests/phpunit/includes/resourceloader/ResourceLoaderTest.php
b/tests/phpunit/includes/resourceloader/ResourceLoaderTest.php
index b683885..c785535 100644
--- a/tests/phpunit/includes/resourceloader/ResourceLoaderTest.php
+++ b/tests/phpunit/includes/resourceloader/ResourceLoaderTest.php
@@ -5,6 +5,7 @@
protected function setUp() {
parent::setUp();
+ ResourceLoader::resetLessVars();
$this->setMwGlobals( array(
'wgResourceLoaderLESSImportPaths' => array(
dirname( dirname( __DIR__ ) ) .
'/data/less/common',
--
To view, visit https://gerrit.wikimedia.org/r/263006
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie1cdc9518624340bb63863cdb1a3ac20eccb5951
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
jenkins-bot has submitted this change and it was merged.
Change subject: RELEASE-NOTES-1.27: Add a note about file upload patrolling
..
RELEASE-NOTES-1.27: Add a note about file upload patrolling
Bug: T11501
Change-Id: I092d247e72f73c3317a8e6321fd28f8455e598b7
---
M RELEASE-NOTES-1.27
1 file changed, 3 insertions(+), 0 deletions(-)
Approvals:
Legoktm: Looks good to me, approved
jenkins-bot: Verified
diff --git a/RELEASE-NOTES-1.27 b/RELEASE-NOTES-1.27
index 7157776..4723220 100644
--- a/RELEASE-NOTES-1.27
+++ b/RELEASE-NOTES-1.27
@@ -103,6 +103,9 @@
from CDN to mitigate DB replication lag and WAN cache purge lag.
* (T49162) Installer will default to setting CACHE_ACCEL as the main cache type
if it is available.
+* It is now possible to patrol file uploads (both for new files and new
versions
+ of existing files). Special:NewFiles has gained an option to filter by patrol
+ status. This functionality can be disabled using $wgUseFilePatrol.
=== External library changes in 1.27 ===
--
To view, visit https://gerrit.wikimedia.org/r/263005
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I092d247e72f73c3317a8e6321fd28f8455e598b7
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Bartosz Dziewoński
Gerrit-Reviewer: Legoktm
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
Bartosz Dziewoński has uploaded a new change for review.
https://gerrit.wikimedia.org/r/263005
Change subject: RELEASE-NOTES-1.27: Add a note about file upload patrolling
..
RELEASE-NOTES-1.27: Add a note about file upload patrolling
Bug: T11501
Change-Id: I092d247e72f73c3317a8e6321fd28f8455e598b7
---
M RELEASE-NOTES-1.27
1 file changed, 3 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/05/263005/1
diff --git a/RELEASE-NOTES-1.27 b/RELEASE-NOTES-1.27
index 7157776..4723220 100644
--- a/RELEASE-NOTES-1.27
+++ b/RELEASE-NOTES-1.27
@@ -103,6 +103,9 @@
from CDN to mitigate DB replication lag and WAN cache purge lag.
* (T49162) Installer will default to setting CACHE_ACCEL as the main cache type
if it is available.
+* It is now possible to patrol file uploads (both for new files and new
versions
+ of existing files). Special:NewFiles has gained an option to filter by patrol
+ status. This functionality can be disabled using $wgUseFilePatrol.
=== External library changes in 1.27 ===
--
To view, visit https://gerrit.wikimedia.org/r/263005
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I092d247e72f73c3317a8e6321fd28f8455e598b7
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Bartosz Dziewoński
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
jenkins-bot has submitted this change and it was merged.
Change subject: RELEASE-NOTES-1.27: Wrap lines at 80 characters
..
RELEASE-NOTES-1.27: Wrap lines at 80 characters
Change-Id: Idf0cef999d798c935596e2a784b7d78a8e39f1cb
---
M RELEASE-NOTES-1.27
1 file changed, 12 insertions(+), 8 deletions(-)
Approvals:
Reedy: Looks good to me, approved
jenkins-bot: Verified
diff --git a/RELEASE-NOTES-1.27 b/RELEASE-NOTES-1.27
index 87cb2f5..7157776 100644
--- a/RELEASE-NOTES-1.27
+++ b/RELEASE-NOTES-1.27
@@ -53,10 +53,11 @@
* (T48998) $wgArticlePath must now be either a full url, or start with a "/".
* $wgRateLimitLog was removed; use $wgDebugLogGroups['ratelimit'] instead.
* Deprecated API formats dbg, txt, and yaml have been removed.
-* CLDRPluralRule* classes have been replaced with
wikimedia/cldr-plural-rule-parser.
+* CLDRPluralRule* classes have been replaced with
+ wikimedia/cldr-plural-rule-parser.
* Removed $wgProfilePerHost, $wgUDPProfilerHost, $wgUDPProfilerPort,
- $wgUDPProfilerFormatString, $wgStatsMethod, $wgAggregateStatsID,
$wgStatsFormatString,
- and $wgProfileCallTree (deprecated since 1.20).
+ $wgUDPProfilerFormatString, $wgStatsMethod, $wgAggregateStatsID,
+ $wgStatsFormatString, and $wgProfileCallTree (deprecated since 1.20).
* For proper operation of LocalIdLookup with shared user tables, ensure that
$wgSharedDB and $wgSharedTables are properly set even on the "central" wiki
that all others are sharing from and that $wgLocalDatabases is set to the
@@ -96,7 +97,8 @@
authentication extensions.
* $wgMaxUserDBWriteDuration added to limit huge user-generated transactions.
Regular web request transactions that takes longer than this are aborted.
-* Added a new hook, 'TitleMoveCompleting', which runs before a page move is
committed.
+* Added a new hook, 'TitleMoveCompleting', which runs before a page move is
+ committed.
* $wgCdnReboundPurgeDelay was added to provide secondary delayed purges of URLs
from CDN to mitigate DB replication lag and WAN cache purge lag.
* (T49162) Installer will default to setting CACHE_ACCEL as the main cache type
@@ -164,14 +166,15 @@
ignore the 2nd and 3rd arguments (formerly $id and $commit).
* Removed "loaderScripts" option from ResourceLoaderFileModule class.
* Removed ORM-like wrapper added in 1.20.
-* LinkCache::getGoodLinks and LinkCache::getBadLinks were removed (deprecated
in 1.26).
+* LinkCache::getGoodLinks and LinkCache::getBadLinks were removed
+ (deprecated in 1.26).
* WikiPage::doQuickEdit() was removed (deprecated since 1.21).
* Removed SiteObject and SiteArray classes (deprecated in 1.21).
* MessageBlobStore::getInstance() was removed (deprecated since 1.25).
* (T84937) Free external links ("autolinked" urls) will now be terminated
by and HTML entity encodings of , <, and >.
-* (T36948) The default file revert message's timestamp is now in
$wgLocaltimezone,
- instead of UTC.
+* (T36948) The default file revert message's timestamp is now in
+ $wgLocaltimezone, instead of UTC.
* The default name of the 'suppress' group page has been changed from
'Project:Oversight' to 'Project:Suppress'.
* DatabaseBase::resultObject() is now protected (use outside Database classes
@@ -180,7 +183,8 @@
ResourceLoaderContext instance is deprecated.
* ResourceLoader::getLessCompiler() now takes an optional parameter of
additional LESS variables to set for the compiler.
-* wfBaseConvert() marked as deprecated, use Wikimedia\base_convert() directly
instead.
+* wfBaseConvert() marked as deprecated, use Wikimedia\base_convert() directly
+ instead.
* Obsolete maintenance scripts clearCacheStats.php and showCacheStats.php
were removed. The underlying data is sent to StatsD (see $wgStatsdServer).
* Removed msg_resource_links database table and associated code.
--
To view, visit https://gerrit.wikimedia.org/r/263003
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Idf0cef999d798c935596e2a784b7d78a8e39f1cb
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Bartosz Dziewoński
Gerrit-Reviewer: Reedy
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
Mobrovac has submitted this change and it was merged.
Change subject: Update mobileapps to a4a5275
..
Update mobileapps to a4a5275
List of changes:
8461805 Create mobile content service route for Wiktionary definitions
c5f672f Put page/ back in endpoint path
a4a5275 Switch to node 4.2
xxx Update node module dependencies
Change-Id: Ib92f98ef3e3e3618b4b8f518807cb2428660913e
---
M node_modules/ansi-regex/package.json
M node_modules/bluebird/package.json
R node_modules/body-parser/node_modules/bytes/LICENSE
M node_modules/body-parser/node_modules/bytes/index.js
M node_modules/body-parser/node_modules/bytes/package.json
M node_modules/body-parser/node_modules/depd/package.json
R node_modules/body-parser/node_modules/http-errors/LICENSE
R node_modules/body-parser/node_modules/http-errors/index.js
R
node_modules/body-parser/node_modules/http-errors/node_modules/inherits/LICENSE
R
node_modules/body-parser/node_modules/http-errors/node_modules/inherits/inherits.js
R
node_modules/body-parser/node_modules/http-errors/node_modules/inherits/inherits_browser.js
R
node_modules/body-parser/node_modules/http-errors/node_modules/inherits/package.json
R
node_modules/body-parser/node_modules/http-errors/node_modules/inherits/test.js
C
node_modules/body-parser/node_modules/http-errors/node_modules/statuses/LICENSE
C
node_modules/body-parser/node_modules/http-errors/node_modules/statuses/codes.json
C
node_modules/body-parser/node_modules/http-errors/node_modules/statuses/index.js
R
node_modules/body-parser/node_modules/http-errors/node_modules/statuses/package.json
R node_modules/body-parser/node_modules/http-errors/package.json
M node_modules/body-parser/node_modules/iconv-lite/lib/extend-node.js
M node_modules/body-parser/node_modules/iconv-lite/package.json
M node_modules/body-parser/node_modules/qs/.travis.yml
M node_modules/body-parser/node_modules/qs/dist/qs.js
M node_modules/body-parser/node_modules/qs/lib/stringify.js
M node_modules/body-parser/node_modules/qs/package.json
M node_modules/body-parser/node_modules/qs/test/stringify.js
D node_modules/body-parser/node_modules/raw-body/node_modules/bytes/index.js
D node_modules/body-parser/node_modules/raw-body/node_modules/bytes/package.json
D
node_modules/body-parser/node_modules/raw-body/node_modules/iconv-lite/.npmignore
D
node_modules/body-parser/node_modules/raw-body/node_modules/iconv-lite/.travis.yml
D node_modules/body-parser/node_modules/raw-body/node_modules/iconv-lite/LICENSE
D
node_modules/body-parser/node_modules/raw-body/node_modules/iconv-lite/encodings/dbcs-codec.js
D
node_modules/body-parser/node_modules/raw-body/node_modules/iconv-lite/encodings/dbcs-data.js
D
node_modules/body-parser/node_modules/raw-body/node_modules/iconv-lite/encodings/index.js
D
node_modules/body-parser/node_modules/raw-body/node_modules/iconv-lite/encodings/internal.js
D
node_modules/body-parser/node_modules/raw-body/node_modules/iconv-lite/encodings/sbcs-codec.js
D
node_modules/body-parser/node_modules/raw-body/node_modules/iconv-lite/encodings/sbcs-data-generated.js
D
node_modules/body-parser/node_modules/raw-body/node_modules/iconv-lite/encodings/sbcs-data.js
D
node_modules/body-parser/node_modules/raw-body/node_modules/iconv-lite/encodings/tables/big5-added.json
D
node_modules/body-parser/node_modules/raw-body/node_modules/iconv-lite/encodings/tables/cp936.json
D
node_modules/body-parser/node_modules/raw-body/node_modules/iconv-lite/encodings/tables/cp949.json
D
node_modules/body-parser/node_modules/raw-body/node_modules/iconv-lite/encodings/tables/cp950.json
D
node_modules/body-parser/node_modules/raw-body/node_modules/iconv-lite/encodings/tables/eucjp.json
D
node_modules/body-parser/node_modules/raw-body/node_modules/iconv-lite/encodings/tables/gb18030-ranges.json
D
node_modules/body-parser/node_modules/raw-body/node_modules/iconv-lite/encodings/tables/gbk-added.json
D
node_modules/body-parser/node_modules/raw-body/node_modules/iconv-lite/encodings/tables/shiftjis.json
D
node_modules/body-parser/node_modules/raw-body/node_modules/iconv-lite/encodings/utf16.js
D
node_modules/body-parser/node_modules/raw-body/node_modules/iconv-lite/encodings/utf7.js
D
node_modules/body-parser/node_modules/raw-body/node_modules/iconv-lite/lib/bom-handling.js
D
node_modules/body-parser/node_modules/raw-body/node_modules/iconv-lite/lib/extend-node.js
D
node_modules/body-parser/node_modules/raw-body/node_modules/iconv-lite/lib/index.js
D
node_modules/body-parser/node_modules/raw-body/node_modules/iconv-lite/lib/streams.js
D
node_modules/body-parser/node_modules/raw-body/node_modules/iconv-lite/package.json
M node_modules/body-parser/node_modules/raw-body/package.json
M node_modules/body-parser/package.json
M node_modules/bunyan/node_modules/dtrace-provider/node_modules/nan/package.json
M node_modules/bunyan/node_modules/dtrace-provider/package.json
M node_modules/bunyan/node_modules/mv/node_
Bartosz Dziewoński has uploaded a new change for review.
https://gerrit.wikimedia.org/r/263003
Change subject: RELEASE-NOTES-1.27: Wrap lines at 80 characters
..
RELEASE-NOTES-1.27: Wrap lines at 80 characters
Change-Id: Idf0cef999d798c935596e2a784b7d78a8e39f1cb
---
M RELEASE-NOTES-1.27
1 file changed, 12 insertions(+), 8 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/03/263003/1
diff --git a/RELEASE-NOTES-1.27 b/RELEASE-NOTES-1.27
index 87cb2f5..7157776 100644
--- a/RELEASE-NOTES-1.27
+++ b/RELEASE-NOTES-1.27
@@ -53,10 +53,11 @@
* (T48998) $wgArticlePath must now be either a full url, or start with a "/".
* $wgRateLimitLog was removed; use $wgDebugLogGroups['ratelimit'] instead.
* Deprecated API formats dbg, txt, and yaml have been removed.
-* CLDRPluralRule* classes have been replaced with
wikimedia/cldr-plural-rule-parser.
+* CLDRPluralRule* classes have been replaced with
+ wikimedia/cldr-plural-rule-parser.
* Removed $wgProfilePerHost, $wgUDPProfilerHost, $wgUDPProfilerPort,
- $wgUDPProfilerFormatString, $wgStatsMethod, $wgAggregateStatsID,
$wgStatsFormatString,
- and $wgProfileCallTree (deprecated since 1.20).
+ $wgUDPProfilerFormatString, $wgStatsMethod, $wgAggregateStatsID,
+ $wgStatsFormatString, and $wgProfileCallTree (deprecated since 1.20).
* For proper operation of LocalIdLookup with shared user tables, ensure that
$wgSharedDB and $wgSharedTables are properly set even on the "central" wiki
that all others are sharing from and that $wgLocalDatabases is set to the
@@ -96,7 +97,8 @@
authentication extensions.
* $wgMaxUserDBWriteDuration added to limit huge user-generated transactions.
Regular web request transactions that takes longer than this are aborted.
-* Added a new hook, 'TitleMoveCompleting', which runs before a page move is
committed.
+* Added a new hook, 'TitleMoveCompleting', which runs before a page move is
+ committed.
* $wgCdnReboundPurgeDelay was added to provide secondary delayed purges of URLs
from CDN to mitigate DB replication lag and WAN cache purge lag.
* (T49162) Installer will default to setting CACHE_ACCEL as the main cache type
@@ -164,14 +166,15 @@
ignore the 2nd and 3rd arguments (formerly $id and $commit).
* Removed "loaderScripts" option from ResourceLoaderFileModule class.
* Removed ORM-like wrapper added in 1.20.
-* LinkCache::getGoodLinks and LinkCache::getBadLinks were removed (deprecated
in 1.26).
+* LinkCache::getGoodLinks and LinkCache::getBadLinks were removed
+ (deprecated in 1.26).
* WikiPage::doQuickEdit() was removed (deprecated since 1.21).
* Removed SiteObject and SiteArray classes (deprecated in 1.21).
* MessageBlobStore::getInstance() was removed (deprecated since 1.25).
* (T84937) Free external links ("autolinked" urls) will now be terminated
by and HTML entity encodings of , <, and >.
-* (T36948) The default file revert message's timestamp is now in
$wgLocaltimezone,
- instead of UTC.
+* (T36948) The default file revert message's timestamp is now in
+ $wgLocaltimezone, instead of UTC.
* The default name of the 'suppress' group page has been changed from
'Project:Oversight' to 'Project:Suppress'.
* DatabaseBase::resultObject() is now protected (use outside Database classes
@@ -180,7 +183,8 @@
ResourceLoaderContext instance is deprecated.
* ResourceLoader::getLessCompiler() now takes an optional parameter of
additional LESS variables to set for the compiler.
-* wfBaseConvert() marked as deprecated, use Wikimedia\base_convert() directly
instead.
+* wfBaseConvert() marked as deprecated, use Wikimedia\base_convert() directly
+ instead.
* Obsolete maintenance scripts clearCacheStats.php and showCacheStats.php
were removed. The underlying data is sent to StatsD (see $wgStatsdServer).
* Removed msg_resource_links database table and associated code.
--
To view, visit https://gerrit.wikimedia.org/r/263003
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Idf0cef999d798c935596e2a784b7d78a8e39f1cb
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Bartosz Dziewoński
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
Legoktm has uploaded a new change for review.
https://gerrit.wikimedia.org/r/263001
Change subject: Revert removal of message documentation by l10n-bot
..
Revert removal of message documentation by l10n-bot
This reverts commit 9aa75d33e4e453e795a18b903612935a9e43d3d4.
Change-Id: Icc62d78993b7a63ef50a79778ff6368ade391a3e
---
M languages/i18n/qqq.json
1 file changed, 3 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/01/263001/1
diff --git a/languages/i18n/qqq.json b/languages/i18n/qqq.json
index f4f3b81..d6bacd4 100644
--- a/languages/i18n/qqq.json
+++ b/languages/i18n/qqq.json
@@ -290,6 +290,8 @@
"october-date": "A date in the Gregorian month of October. $1 is the
numerical date, for example \"23\".",
"november-date": "A date in the Gregorian month of November. $1 is the
numerical date, for example \"23\".\n{{Identical|November}}",
"december-date": "A date in the Gregorian month of December. $1 is the
numerical date, for example \"23\".",
+ "period-am": "Text indicating the first period of the day when using a
12-hour calendar.",
+ "period-pm": "Text indicating the second period of the day when using a
12-hour calendar.",
"pagecategories": "Used in the categories section of pages.\n\nFollowed
by a colon and a list of categories.\n\nParameters:\n* $1 - number of
categories\n{{Identical|Category}}",
"pagecategorieslink": "{{notranslate}}",
"category_header": "In category description page. Parameters:\n* $1 -
category name\nSee also:\n* {{msg-mw|Category-media-header}}",
@@ -3580,6 +3582,7 @@
"signature": "This will be substituted in the signature
(~~~ or excluding
timestamp).\n\nParameters:\n* $1 - the username that is currently login\n* $2 -
the customized signature which is specified in [[Special:Preferences|user's
preferences]] as non-raw\nUse your language default parentheses
({{msg-mw|parentheses}}), but not use the message direct.\n\nSee also:\n*
{{msg-mw|Signature-anon}} - signature for anonymous user",
"signature-anon": "{{notranslate}}\nUsed as signature for anonymous
user. Parameters:\n* $1 - username (IP address?)\n* $2 - nickname (IP
address?)\nSee also:\n* {{msg-mw|Signature}} - signature for registered user",
"timezone-utc": "{{optional}}",
+ "timezone-local": "Label to indicate that a time is in the user's local
timezone.",
"duplicate-defaultsort": "See definition of [[w:Sorting|sort key]] on
Wikipedia. Parameters:\n* $1 - old default sort key\n* $2 - new default sort
key",
"duplicate-displaytitle": "Warning shown when a page has its display
title set multiple times. Parameters:\n* $1 - old display title\n* $2 - new
display title",
"invalid-indicator-name": "Warning shown when the
[https://www.mediawiki.org/wiki/Help:Page_status_indicators ''content''] parser tag is used
incorrectly.",
--
To view, visit https://gerrit.wikimedia.org/r/263001
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Icc62d78993b7a63ef50a79778ff6368ade391a3e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Legoktm
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
Anomie has uploaded a new change for review.
https://gerrit.wikimedia.org/r/262999
Change subject: Prepare for merged of ApiSandbox into core
..
Prepare for merged of ApiSandbox into core
We need to load the extension for branches without Ic42a6c5, but we must
not include it once that patch is merged.
Change-Id: Ic85ff4abbbcd2076ebf5cdfaa0e95e98878e2308
---
M wmf-config/CommonSettings.php
1 file changed, 3 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config
refs/changes/99/262999/1
diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index 3331faa..b08fff8 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -2388,7 +2388,9 @@
}
-if ( $wmgUseApiSandbox ) {
+// Keep loading the extension for MW before Ic42a6c5, but don't load it in
+// branches where that is merged.
+if ( $wmgUseApiSandbox && !class_exists( 'SpecialApiSandbox' ) ) {
wfLoadExtension( 'ApiSandbox' );
}
--
To view, visit https://gerrit.wikimedia.org/r/262999
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic85ff4abbbcd2076ebf5cdfaa0e95e98878e2308
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Anomie
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
D3r1ck01 has uploaded a new change for review.
https://gerrit.wikimedia.org/r/262937
Change subject: jQuery.makeCollapsible: Font color of collapsible button set
..
jQuery.makeCollapsible: Font color of collapsible button set
The font color for the collapsible button is now set which inherits
its color from the parent class(mw-collapsible-toggle). If the background
color of the button which contains the collapsible button is changed,
readability of the button will not be difficult.
Bug: T63018
Change-Id: Icd0b8b3434ecf53a155e840d9ab3e276a60b7ca6
---
M resources/src/jquery/jquery.makeCollapsible.css
1 file changed, 5 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/37/262937/1
diff --git a/resources/src/jquery/jquery.makeCollapsible.css
b/resources/src/jquery/jquery.makeCollapsible.css
index 2e5efba..48f1b92 100644
--- a/resources/src/jquery/jquery.makeCollapsible.css
+++ b/resources/src/jquery/jquery.makeCollapsible.css
@@ -45,3 +45,8 @@
.mw-collapsible-toggle-li {
list-style: none;
}
+
+/* collapsible button(text link) inherits color from the parent class */
+.mw-collapsible-toggle a {
+ color: inherit;
+}
\ No newline at end of file
--
To view, visit https://gerrit.wikimedia.org/r/262937
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Icd0b8b3434ecf53a155e840d9ab3e276a60b7ca6
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: D3r1ck01
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
jenkins-bot has submitted this change and it was merged.
Change subject: Add datetime input widget
..
Add datetime input widget
Since OOJS-UI isn't currently in a position to accept such things, the
decision is to put it in MediaWiki instead. Once OOJS-UI is
un-monolithicized and the i18n issue is solved, this should be somehow
moved there instead.
Change-Id: Ia3942c76804c865c1039904d170ee6eafcdc6793
---
M languages/i18n/en.json
M languages/i18n/qqq.json
M resources/Resources.php
A resources/src/mediawiki.widgets.datetime/CalendarWidget.js
A resources/src/mediawiki.widgets.datetime/CalendarWidget.less
A resources/src/mediawiki.widgets.datetime/DateTimeFormatter.js
A resources/src/mediawiki.widgets.datetime/DateTimeInputWidget.js
A resources/src/mediawiki.widgets.datetime/DateTimeInputWidget.less
A resources/src/mediawiki.widgets.datetime/DiscordianDateTimeFormatter.js
A
resources/src/mediawiki.widgets.datetime/ProlepticGregorianDateTimeFormatter.js
A
resources/src/mediawiki.widgets.datetime/mediawiki.widgets.datetime.definitions.less
A resources/src/mediawiki.widgets.datetime/mediawiki.widgets.datetime.js
12 files changed, 3,588 insertions(+), 0 deletions(-)
Approvals:
Bartosz Dziewoński: Looks good to me, approved
Jforrester: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/languages/i18n/en.json b/languages/i18n/en.json
index 0b31abc..3a4857b 100644
--- a/languages/i18n/en.json
+++ b/languages/i18n/en.json
@@ -115,6 +115,8 @@
"october-date": "October $1",
"november-date": "November $1",
"december-date": "December $1",
+ "period-am": "AM",
+ "period-pm": "PM",
"pagecategories": "{{PLURAL:$1|Category|Categories}}",
"pagecategorieslink": "Special:Categories",
"category_header": "Pages in category \"$1\"",
@@ -3403,6 +3405,7 @@
"signature": "[[{{ns:user}}:$1|$2]] ([[{{ns:user_talk}}:$1|talk]])",
"signature-anon": "[[{{#special:Contributions}}/$1|$2]]",
"timezone-utc": "UTC",
+ "timezone-local": "Local",
"duplicate-defaultsort": "Warning: Default sort key
\"$2\" overrides earlier default sort key \"$1\".",
"duplicate-displaytitle": "Warning: Display title
\"$2\" overrides earlier display title \"$1\".",
"invalid-indicator-name": "Error: Page status
indicators' name attribute must not be empty.",
diff --git a/languages/i18n/qqq.json b/languages/i18n/qqq.json
index 60ae69e..b0cfb61 100644
--- a/languages/i18n/qqq.json
+++ b/languages/i18n/qqq.json
@@ -290,6 +290,8 @@
"october-date": "A date in the Gregorian month of October. $1 is the
numerical date, for example \"23\".",
"november-date": "A date in the Gregorian month of November. $1 is the
numerical date, for example \"23\".\n{{Identical|November}}",
"december-date": "A date in the Gregorian month of December. $1 is the
numerical date, for example \"23\".",
+ "period-am": "Text indicating the first period of the day when using a
12-hour calendar.",
+ "period-pm": "Text indicating the second period of the day when using a
12-hour calendar.",
"pagecategories": "Used in the categories section of pages.\n\nFollowed
by a colon and a list of categories.\n\nParameters:\n* $1 - number of
categories\n{{Identical|Category}}",
"pagecategorieslink": "{{notranslate}}",
"category_header": "In category description page. Parameters:\n* $1 -
category name\nSee also:\n* {{msg-mw|Category-media-header}}",
@@ -3578,6 +3580,7 @@
"signature": "This will be substituted in the signature
(~~~ or excluding
timestamp).\n\nParameters:\n* $1 - the username that is currently login\n* $2 -
the customized signature which is specified in [[Special:Preferences|user's
preferences]] as non-raw\nUse your language default parentheses
({{msg-mw|parentheses}}), but not use the message direct.\n\nSee also:\n*
{{msg-mw|Signature-anon}} - signature for anonymous user",
"signature-anon": "{{notranslate}}\nUsed as signature for anonymous
user. Parameters:\n* $1 - username (IP address?)\n* $2 - nickname (IP
address?)\nSee also:\n* {{msg-mw|Signature}} - signature for registered user",
"timezone-utc": "{{optional}}",
+ "timezone-local": "Label to indicate that a time is in the user's local
timezone.",
"duplicate-defaultsort": "See definition of [[w:Sorting|sort key]] on
Wikipedia. Parameters:\n* $1 - old default sort key\n* $2 - new default sort
key",
"duplicate-displaytitle": "Warning shown when a page has its display
title set multiple times. Parameters:\n* $1 - old display title\n* $2 - new
display title",
"invalid-indicator-name": "Warning shown when the
[https://www.mediawiki.org/wiki/Help:Page_status_indicators ''content''] parser tag is used
incorrectly.",
diff --git a/reso
Mobrovac has uploaded a new change for review.
https://gerrit.wikimedia.org/r/262933
Change subject: Update mobileapps to a4a5275
..
Update mobileapps to a4a5275
List of changes:
8461805 Create mobile content service route for Wiktionary definitions
c5f672f Put page/ back in endpoint path
a4a5275 Switch to node 4.2
xxx Update node module dependencies
Change-Id: Ib92f98ef3e3e3618b4b8f518807cb2428660913e
---
M node_modules/ansi-regex/package.json
M node_modules/bluebird/package.json
R node_modules/body-parser/node_modules/bytes/LICENSE
M node_modules/body-parser/node_modules/bytes/index.js
M node_modules/body-parser/node_modules/bytes/package.json
M node_modules/body-parser/node_modules/depd/package.json
R node_modules/body-parser/node_modules/http-errors/LICENSE
R node_modules/body-parser/node_modules/http-errors/index.js
R
node_modules/body-parser/node_modules/http-errors/node_modules/inherits/LICENSE
R
node_modules/body-parser/node_modules/http-errors/node_modules/inherits/inherits.js
R
node_modules/body-parser/node_modules/http-errors/node_modules/inherits/inherits_browser.js
R
node_modules/body-parser/node_modules/http-errors/node_modules/inherits/package.json
R
node_modules/body-parser/node_modules/http-errors/node_modules/inherits/test.js
C
node_modules/body-parser/node_modules/http-errors/node_modules/statuses/LICENSE
C
node_modules/body-parser/node_modules/http-errors/node_modules/statuses/codes.json
C
node_modules/body-parser/node_modules/http-errors/node_modules/statuses/index.js
R
node_modules/body-parser/node_modules/http-errors/node_modules/statuses/package.json
R node_modules/body-parser/node_modules/http-errors/package.json
M node_modules/body-parser/node_modules/iconv-lite/lib/extend-node.js
M node_modules/body-parser/node_modules/iconv-lite/package.json
M node_modules/body-parser/node_modules/qs/.travis.yml
M node_modules/body-parser/node_modules/qs/dist/qs.js
M node_modules/body-parser/node_modules/qs/lib/stringify.js
M node_modules/body-parser/node_modules/qs/package.json
M node_modules/body-parser/node_modules/qs/test/stringify.js
D node_modules/body-parser/node_modules/raw-body/node_modules/bytes/index.js
D node_modules/body-parser/node_modules/raw-body/node_modules/bytes/package.json
D
node_modules/body-parser/node_modules/raw-body/node_modules/iconv-lite/.npmignore
D
node_modules/body-parser/node_modules/raw-body/node_modules/iconv-lite/.travis.yml
D node_modules/body-parser/node_modules/raw-body/node_modules/iconv-lite/LICENSE
D
node_modules/body-parser/node_modules/raw-body/node_modules/iconv-lite/encodings/dbcs-codec.js
D
node_modules/body-parser/node_modules/raw-body/node_modules/iconv-lite/encodings/dbcs-data.js
D
node_modules/body-parser/node_modules/raw-body/node_modules/iconv-lite/encodings/index.js
D
node_modules/body-parser/node_modules/raw-body/node_modules/iconv-lite/encodings/internal.js
D
node_modules/body-parser/node_modules/raw-body/node_modules/iconv-lite/encodings/sbcs-codec.js
D
node_modules/body-parser/node_modules/raw-body/node_modules/iconv-lite/encodings/sbcs-data-generated.js
D
node_modules/body-parser/node_modules/raw-body/node_modules/iconv-lite/encodings/sbcs-data.js
D
node_modules/body-parser/node_modules/raw-body/node_modules/iconv-lite/encodings/tables/big5-added.json
D
node_modules/body-parser/node_modules/raw-body/node_modules/iconv-lite/encodings/tables/cp936.json
D
node_modules/body-parser/node_modules/raw-body/node_modules/iconv-lite/encodings/tables/cp949.json
D
node_modules/body-parser/node_modules/raw-body/node_modules/iconv-lite/encodings/tables/cp950.json
D
node_modules/body-parser/node_modules/raw-body/node_modules/iconv-lite/encodings/tables/eucjp.json
D
node_modules/body-parser/node_modules/raw-body/node_modules/iconv-lite/encodings/tables/gb18030-ranges.json
D
node_modules/body-parser/node_modules/raw-body/node_modules/iconv-lite/encodings/tables/gbk-added.json
D
node_modules/body-parser/node_modules/raw-body/node_modules/iconv-lite/encodings/tables/shiftjis.json
D
node_modules/body-parser/node_modules/raw-body/node_modules/iconv-lite/encodings/utf16.js
D
node_modules/body-parser/node_modules/raw-body/node_modules/iconv-lite/encodings/utf7.js
D
node_modules/body-parser/node_modules/raw-body/node_modules/iconv-lite/lib/bom-handling.js
D
node_modules/body-parser/node_modules/raw-body/node_modules/iconv-lite/lib/extend-node.js
D
node_modules/body-parser/node_modules/raw-body/node_modules/iconv-lite/lib/index.js
D
node_modules/body-parser/node_modules/raw-body/node_modules/iconv-lite/lib/streams.js
D
node_modules/body-parser/node_modules/raw-body/node_modules/iconv-lite/package.json
M node_modules/body-parser/node_modules/raw-body/package.json
M node_modules/body-parser/package.json
M node_modules/bunyan/node_modules/dtrace-provider/node_modules/nan/package.json
M node_modules/bunyan/node_modules/dtrace-provider/package.json
M node_mod
Paladox has uploaded a new change for review.
https://gerrit.wikimedia.org/r/262931
Change subject: Test: Do Not merge
..
Test: Do Not merge
Change-Id: Ie6c94ca1c9f650140391489b4df8bfb1e58c0117
---
M Configure.js
1 file changed, 1 insertion(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Configure
refs/changes/31/262931/1
diff --git a/Configure.js b/Configure.js
index 913303f..3810e74 100644
--- a/Configure.js
+++ b/Configure.js
@@ -3,6 +3,7 @@
* create JavaScript buttons to allow to modify the form to have more
* flexibility
*/
+
jQuery( document ).ready( function ( $ ) {
"use strict";
// Tabs and TOC
--
To view, visit https://gerrit.wikimedia.org/r/262931
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie6c94ca1c9f650140391489b4df8bfb1e58c0117
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Configure
Gerrit-Branch: master
Gerrit-Owner: Paladox
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
TheDJ has uploaded a new change for review.
https://gerrit.wikimedia.org/r/262926
Change subject: Add parser tests for TMH output
..
Add parser tests for TMH output
Change-Id: I4ec8e3af4418cc775f986201b3c86c19b31e0530
Depends-On: I6a3b307ad9c82e9df0aeec025934d736eec8375f
---
M TimedMediaHandler.php
A tests/parserTests.txt
2 files changed, 101 insertions(+), 0 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/TimedMediaHandler
refs/changes/26/262926/1
diff --git a/TimedMediaHandler.php b/TimedMediaHandler.php
index 4d24cb9..04a9e92 100644
--- a/TimedMediaHandler.php
+++ b/TimedMediaHandler.php
@@ -234,6 +234,7 @@
// Testing:
$wgAutoloadClasses['ApiTestCaseVideoUpload'] =
"$timedMediaDir/tests/phpunit/ApiTestCaseVideoUpload.php";
+$wgParserTestFiles[] = "$timedMediaDir/tests/parserTests.txt";
// Ogg Handler
$wgAutoloadClasses['OggHandlerTMH'] =
"$timedMediaDir/handlers/OggHandler/OggHandler.php";
diff --git a/tests/parserTests.txt b/tests/parserTests.txt
new file mode 100644
index 000..b63124c
--- /dev/null
+++ b/tests/parserTests.txt
@@ -0,0 +1,100 @@
+!! test
+Simple video element
+!! wikitext
+[[File:Video.ogv]]
+!! html
+http://example.com/images/thumb/0/00/Video.ogv/320px--Video.ogv.jpg";
controls="" preload="none" style="width:320px;height:240px" class="kskin"
data-durationhint="4.36667" data-startoffset="0"
data-mwtitle="Video.ogv" data-mwprovider="local">http://example.com/images/0/00/Video.ogv"; type="video/ogg;
codecs="theora"" data-title="Original Ogg file, 320 × 240 (590 kbps)"
data-shorttitle="Ogg source" data-width="320" data-height="240"
data-bandwidth="590013" data-framerate="30" />Sorry, your browser either has
JavaScript disabled or does not have any supported player. You can http://example.com/images/0/00/Video.ogv";>download the clip or https://www.mediawiki.org/wiki/Special:MyLanguage/Extension:TimedMediaHandler/Client_download";>download
a player to play the clip in your browser.
+
+!! html+tidy
+http://example.com/images/thumb/0/00/Video.ogv/320px--Video.ogv.jpg";
controls="" preload="none" style="width:320px;height:240px" class="kskin"
data-durationhint="4.36667" data-startoffset="0"
data-mwtitle="Video.ogv" data-mwprovider="local">http://example.com/images/0/00/Video.ogv"; type="video/ogg;
codecs="theora"" data-title="Original Ogg file, 320 × 240 (590 kbps)"
data-shorttitle="Ogg source" data-width="320" data-height="240"
data-bandwidth="590013" data-framerate="30">Sorry, your browser either
has JavaScript disabled or does not have any supported player.
+You can http://example.com/images/0/00/Video.ogv";>download the
clip or https://www.mediawiki.org/wiki/Special:MyLanguage/Extension:TimedMediaHandler/Client_download";>download
a player to play the clip in your browser.
+!!end
+
+!! test
+Simple thumbed video
+!! wikitext
+[[File:Video.ogv|thumb]]
+!! html
+http://example.com/images/thumb/0/00/Video.ogv/320px--Video.ogv.jpg";
controls="" preload="none" autoplay=""
style="width:320px;height:240px" class="kskin"
data-durationhint="4.36667" data-startoffset="0"
data-mwtitle="Video.ogv"
data-mwprovider="local">Sorry,
your browser either has JavaScript disabled or does not have any supported
player.
You can download the
clip or download
a player to play the clip in your
browser.
">http://example.com/images/thumb/0/00/Video.ogv/180px--Video.ogv.jpg";>http://example.com/images/0/00/Video.ogv"; title="Play media"
target="new">Play
media
+
+!! html+tidy
+
+
+http://example.com/images/thumb/0/00/Video.ogv/320px--Video.ogv.jpg";
controls="" preload="none" autoplay=""
style="width:320px;height:240px" class="kskin"
data-durationhint="4.36667" data-startoffset="0"
data-mwtitle="Video.ogv"
data-mwprovider="local">Sorry,
your browser either has JavaScript disabled or does not have any supported
player.
+You can download the
clip or download
a player to play the clip in your
browser.">http://example.com/images/thumb/0/
Legoktm has uploaded a new change for review.
https://gerrit.wikimedia.org/r/262925
Change subject: installer: Say "APCu" for PHP >= 5.5
..
installer: Say "APCu" for PHP >= 5.5
Pre-PHP 5.5 the extension was called "APC", and provided opcode caching
and userland object caching. In 5.5, the opcode caching was built-in to
PHP, and the userland object caching was moved into an extension named
"APCu".
Bug: T61998
Change-Id: Id6f4a87bfdb59b2592a56aea9450611238e313ad
---
M includes/installer/Installer.php
M includes/installer/i18n/en.json
M includes/installer/i18n/qqq.json
3 files changed, 9 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/25/262925/1
diff --git a/includes/installer/Installer.php b/includes/installer/Installer.php
index b863adc..e5a56ef 100644
--- a/includes/installer/Installer.php
+++ b/includes/installer/Installer.php
@@ -882,8 +882,14 @@
}
}
+
if ( !$caches ) {
- $this->showMessage( 'config-no-cache' );
+ $key = 'config-no-cache';
+ // PHP >=5.5 is called APCu, earlier versions use APC
(T61998).
+ if ( !wfIsHHVM() && version_compare( PHP_VERSION,
'5.5', '>=' ) ) {
+ $key .= '-apcu';
+ }
+ $this->showMessage( $key );
}
$this->setVar( '_Caches', $caches );
diff --git a/includes/installer/i18n/en.json b/includes/installer/i18n/en.json
index ac3178f..f2ec7a7 100644
--- a/includes/installer/i18n/en.json
+++ b/includes/installer/i18n/en.json
@@ -69,6 +69,7 @@
"config-apc": "[http://www.php.net/apc APC] is installed",
"config-wincache": "[http://www.iis.net/download/WinCacheForPhp
WinCache] is installed",
"config-no-cache": "Warning: Could not find
[http://www.php.net/apc APC], [http://xcache.lighttpd.net/ XCache] or
[http://www.iis.net/download/WinCacheForPhp WinCache].\nObject caching is not
enabled.",
+ "config-no-cache-apcu": "Warning: Could not find
[http://www.php.net/apcu APCu], [http://xcache.lighttpd.net/ XCache] or
[http://www.iis.net/download/WinCacheForPhp WinCache].\nObject caching is not
enabled.",
"config-mod-security": "Warning: Your web server has
[http://modsecurity.org/ mod_security]/mod_security2 enabled. Many common
configurations of this will cause problems for MediaWiki and other software
that allows users to post arbitrary content.\nIf possible, this should be
disabled. Otherwise, refer to [http://modsecurity.org/documentation/
mod_security documentation] or contact your host's support if you encounter
random errors.",
"config-diff3-bad": "GNU diff3 not found.",
"config-git": "Found the Git version control software:
$1.",
diff --git a/includes/installer/i18n/qqq.json b/includes/installer/i18n/qqq.json
index bb42d88..372b228 100644
--- a/includes/installer/i18n/qqq.json
+++ b/includes/installer/i18n/qqq.json
@@ -87,6 +87,7 @@
"config-apc": "Message indicates if this program is available",
"config-wincache": "Message indicates if this program is available",
"config-no-cache": "Status message in the MediaWiki installer
environment checks.",
+ "config-no-cache-apcu": "Status message in the MediaWiki installer
environment checks.",
"config-mod-security": "Status message in the MediaWiki installer
environment checks.",
"config-diff3-bad": "Status message in the MediaWiki installer
environment checks.",
"config-git": "Message if Git version control software is
available.\nParameter:\n* $1 is the Git executable file name.",
--
To view, visit https://gerrit.wikimedia.org/r/262925
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Id6f4a87bfdb59b2592a56aea9450611238e313ad
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Legoktm
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
XZise has uploaded a new change for review.
https://gerrit.wikimedia.org/r/262923
Change subject: [FIX] Page: Use repr-like if it can't be encoded
..
[FIX] Page: Use repr-like if it can't be encoded
When the title contains characters which can't be encoded it falls back to use
an encoding which works like repr() on a unicode. It is also changing how it
behaves on Python 3 as it doesn't encode the title anymore and is thus not a
bytes anymore.
Conflicts:
pywikibot/page.py
tests/page_tests.py
Bug: T107428
Change-Id: I25dddac881891291c5a0dbe3f5dd2b1a0beedf0f
(cherry picked from commit 38589d3057847b9650b514e186b4bb3c66fad841)
---
M pywikibot/page.py
M tests/aspects.py
M tests/page_tests.py
M tests/utils.py
4 files changed, 48 insertions(+), 11 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core
refs/changes/23/262923/1
diff --git a/pywikibot/page.py b/pywikibot/page.py
index af178f0..a9c7a4e 100644
--- a/pywikibot/page.py
+++ b/pywikibot/page.py
@@ -273,7 +273,14 @@
def __repr__(self):
"""Return a more complete string representation."""
-title = self.title().encode(config.console_encoding)
+if sys.version_info[0] > 2:
+title = repr(self.title())
+else:
+try:
+title = self.title().encode(config.console_encoding)
+except UnicodeEncodeError:
+# okay console encoding didn't work, at least try something
+title = self.title().encode('unicode_escape')
return str('{0}({1})').format(self.__class__.__name__, title)
def _cmpkey(self):
diff --git a/tests/aspects.py b/tests/aspects.py
index 4e0411c..042281f 100644
--- a/tests/aspects.py
+++ b/tests/aspects.py
@@ -907,7 +907,7 @@
return self._mainpage
mainpage = pywikibot.Page(site, site.siteinfo['mainpage'])
-if mainpage.isRedirectPage():
+if not isinstance(site, DrySite) and mainpage.isRedirectPage():
mainpage = mainpage.getRedirectTarget()
self._mainpage = mainpage
diff --git a/tests/page_tests.py b/tests/page_tests.py
index c031da4..d80f0dc 100644
--- a/tests/page_tests.py
+++ b/tests/page_tests.py
@@ -17,8 +17,8 @@
from tests.aspects import (
unittest, TestCase, DefaultSiteTestCase, SiteAttributeTestCase,
+DefaultDrySiteTestCase,
)
-from tests.utils import expected_failure_if
if sys.version_info[0] > 2:
basestring = (str, )
@@ -507,11 +507,20 @@
self.assertTrue(page_copy.isRedirectPage())
-class TestPageRepr(DefaultSiteTestCase):
+class TestPageBaseUnicode(DefaultDrySiteTestCase):
-"""Test Page representation."""
+"""Base class for tests requring a page using a unicode title."""
-cached = True
+@classmethod
+def setUpClass(cls):
+"""Initialize page instance."""
+super(TestPageBaseUnicode, cls).setUpClass()
+cls.page = pywikibot.Page(cls.site, 'Ō')
+
+
+class TestPageRepr(TestPageBaseUnicode):
+
+"""Test for Page's repr implementation."""
def test_mainpage_type(self):
u"""Test the return type of repr(Page()) is str."""
@@ -523,7 +532,7 @@
page = pywikibot.Page(self.get_site(), u'Ō')
self.assertIsInstance(repr(page), str)
-@expected_failure_if(sys.version_info[0] > 2)
+@unittest.skipIf(sys.version_info[0] > 2, 'Python 2 specific test')
def test_unicode_value(self):
"""Test repr(Page(u'')) is represented simply as utf8."""
page = pywikibot.Page(self.get_site(), u'Ō')
@@ -539,10 +548,30 @@
@unittest.skipIf(sys.version_info[0] < 3, 'Python 3+ specific test')
def test_unicode_value_py3(self):
"""Test to capture actual Python 3 result pre unicode_literals."""
-page = pywikibot.Page(self.get_site(), u'Ō')
-self.assertEqual(repr(page), "Page(b'\\xc5\\x8c')")
-self.assertEqual(u'%r' % page, "Page(b'\\xc5\\x8c')")
-self.assertEqual(u'{0!r}'.format(page), "Page(b'\\xc5\\x8c')")
+self.assertEqual(repr(self.page), "Page('Ō')")
+self.assertEqual('%r' % self.page, "Page('Ō')")
+self.assertEqual('{0!r}'.format(self.page), "Page('Ō')")
+
+
+class TestPageReprASCII(TestPageBaseUnicode):
+
+"""Test for Page's repr implementation when using ASCII encoding."""
+
+def setUp(self):
+"""Patch the current console encoding to ASCII."""
+super(TestPageReprASCII, self).setUp()
+self._old_encoding = config.console_encoding
+config.console_encoding = 'ascii'
+
+def tearDown(self):
+"""Restore the original console encoding."""
+config.console_encoding = self._old_encoding
+super(TestPageReprASCII, self).tearDown()
+
+@unittest.skipIf(sys.version_info[0] > 2, 'Python 2 specific test')
+def test_incapable_encoding(self):
+"""Test that repr still works even if the console encodi
