jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/376125 )
Change subject: Merge branch 'REL1_27' into fundraising/REL1_27 ...................................................................... Merge branch 'REL1_27' into fundraising/REL1_27 66693417ac interwiki: Use makeKey from WANObjectCache instead of wfMemcKey 1a9b97d57b Fix broken wincache merge() implementation c7b95591b8 Remove type-hint from wincache merge() method fc74dfb770 Add wikimedia/testing-access-wrapper 2823ae925e Work around &$this usage in SkinTemplate e2465f32ad Replace use of &$this 0e4668e377 Bump version number for new point release 8df960d7d3 Better handling of jobs execution in post-connection shutdown 14cb8333f9 registration: Support conditionally registered namespaces e818a3d849 Fix highlighting for phrase queries 04b6b7533a Fix phrase search 051bd65388 registration: Provide credits information to callbacks 95070fd2f2 Allow namespaces defined in extension.json to be overwritten locally. a5728feb9f Allow SVGs using an older proposed recommendation DTD e7201a87b5 EditPage: Avoid use of &$this in hooks 566253b61f Replaced &$this with $this 30f44d36d8 Replace &$this with $this in MediaWiki/core hook system 09e4648e98 Replace some usages of &$this in hook parameters cfe3403400 Avoid passing $this by reference in hooks d1b43f85d6 Remove &$this usage ac03270127 Replace &$this with $this in MediaWiki/core hook system 5d301ea242 upload: Avoid &$this in hooks b0ced6ef73 Add support for PHP7 random_bytes in favor of mcrypt_create_iv 6f8e1386cc CryptRand: only use random_bytes on php 7 and HHVM bfcb0a0884 Flesh out 1.27.4 RELEASE-NOTES from merged commits 53912df847 RELEASE-NOTES for PHP 7.1 backports Change-Id: I862b96c232184ad97656607ba740b1fa5e90d2ad --- M includes/DefaultSettings.php 1 file changed, 1 insertion(+), 5 deletions(-) Approvals: jenkins-bot: Verified Ejegg: Looks good to me, approved diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php index ae3dc43..17455a2 100644 --- a/includes/DefaultSettings.php +++ b/includes/DefaultSettings.php @@ -75,11 +75,7 @@ * MediaWiki version number * @since 1.2 */ -<<<<<<< HEAD (bf97cd Update DonationInterface) -$wgVersion = '1.27.2-fundraising'; -======= -$wgVersion = '1.27.3'; ->>>>>>> BRANCH (53912d RELEASE-NOTES for PHP 7.1 backports) +$wgVersion = '1.27.3-fundraising'; /** * Name of the site. It must be changed in LocalSettings.php -- To view, visit https://gerrit.wikimedia.org/r/376125 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I862b96c232184ad97656607ba740b1fa5e90d2ad Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: fundraising/REL1_27 Gerrit-Owner: Ejegg <[email protected]> Gerrit-Reviewer: Ejegg <[email protected]> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
