Ejegg has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/391436 )
Change subject: Merge branch 'REL1_27' into fundraising/REL1_27 ...................................................................... Merge branch 'REL1_27' into fundraising/REL1_27 Get it all square after the security release Change-Id: If351605e0d9f5fcf759bd4ae053b864b249e966c --- M RELEASE-NOTES-1.27 M includes/DefaultSettings.php 2 files changed, 1 insertion(+), 8 deletions(-) Approvals: Ejegg: Verified; Looks good to me, approved diff --git a/RELEASE-NOTES-1.27 b/RELEASE-NOTES-1.27 index 51347f8..a84c6e8 100644 --- a/RELEASE-NOTES-1.27 +++ b/RELEASE-NOTES-1.27 @@ -17,9 +17,6 @@ * (T175439) Unbreak Postgres Updater when setting defaults for a column. * (T160298) Remove use of implicitGroupBy() in ActiveUsersPager. * (T142304) Allow putting the app ID in the password for bot passwords. -* (T178451) SECURITY: Potential XSS when $wgShowExceptionDetails = false and browser - sends non-standard url escaping. -* (T165846) SECURITY: BotPassword login attempts weren't throttled. * Updated dev dependancy phpunit/phpunit from v4.8.24 to v4.8.36. * (T178451) SECURITY: Potential XSS when $wgShowExceptionDetails = false and browser sends non-standard url escaping. diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php index 82a5140..5b47077 100644 --- a/includes/DefaultSettings.php +++ b/includes/DefaultSettings.php @@ -75,11 +75,7 @@ * MediaWiki version number * @since 1.2 */ -<<<<<<< HEAD (8bdce4 Update vendor submodule for .htaccess) -$wgVersion = '1.27.3-fundraising'; -======= -$wgVersion = '1.27.4'; ->>>>>>> BRANCH (a80647 Bump 1.27.4) +$wgVersion = '1.27.4-fundraising'; /** * Name of the site. It must be changed in LocalSettings.php -- To view, visit https://gerrit.wikimedia.org/r/391436 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: If351605e0d9f5fcf759bd4ae053b864b249e966c Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/core Gerrit-Branch: fundraising/REL1_27 Gerrit-Owner: Ejegg <ej...@ejegg.com> Gerrit-Reviewer: Ejegg <ej...@ejegg.com> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
