Daniel Kinzler has submitted this change and it was merged. Change subject: (Bug 37685) Initial commit for checking edit conflicts ......................................................................
(Bug 37685) Initial commit for checking edit conflicts Checks if the user is the last one to edit after a given revision, which should be the last one, and only stores the edit if the the checks turns out as true. Simple version just to get things going ;/ dk: fixing test case Change-Id: I67f2f225029e3a39af027193a999e20cb7338a66 --- M repo/Wikibase.hooks.php M repo/Wikibase.i18n.php M repo/Wikibase.php A repo/includes/EditEntity.php M repo/includes/api/ApiModifyItem.php M repo/includes/content/EntityContent.php M repo/includes/content/EntityHandler.php M repo/resources/Resources.php M repo/resources/wikibase.ui.PropertyEditTool.EditableAliases.js M repo/resources/wikibase.ui.PropertyEditTool.EditableDescription.js M repo/resources/wikibase.ui.PropertyEditTool.EditableLabel.js M repo/resources/wikibase.ui.PropertyEditTool.EditableSiteLink.js M repo/resources/wikibase.ui.PropertyEditTool.EditableValue.js A repo/tests/phpunit/includes/EditEntityTest.php 14 files changed, 745 insertions(+), 44 deletions(-) Approvals: John Erling Blad: Verified; Looks good to me, but someone else must approve Daniel Kinzler: Verified; Looks good to me, approved -- To view, visit https://gerrit.wikimedia.org/r/20679 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I67f2f225029e3a39af027193a999e20cb7338a66 Gerrit-PatchSet: 15 Gerrit-Project: mediawiki/extensions/Wikibase Gerrit-Branch: master Gerrit-Owner: John Erling Blad <john.b...@wikimedia.de> Gerrit-Reviewer: Daniel Kinzler <daniel.kinz...@wikimedia.de> Gerrit-Reviewer: Daniel Werner <daniel.wer...@wikimedia.de> Gerrit-Reviewer: John Erling Blad <john.b...@wikimedia.de> Gerrit-Reviewer: Nikerabbit <niklas.laxst...@gmail.com> Gerrit-Reviewer: Tobias Gritschacher <tobias.gritschac...@wikimedia.de> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits