Last modified: 2014-08-27 01:26:37 UTC

Wikimedia Bugzilla is closed!

Wikimedia migrated from Bugzilla to Phabricator. Bug reports are handled in Wikimedia Phabricator.
This static website is read-only and for historical purposes. It is not possible to log in and except for displaying bug reports and their history, links might be broken. See T71150, the corresponding Phabricator task for complete and up-to-date bug report information.

Bug 69150 - VisualEditor: Edit conflict message provides no button to actually resolve the conflict


Summary:	VisualEditor: Edit conflict message provides no button to actually resolve th...

Status:	RESOLVED FIXED

Product:	VisualEditor
Classification:	Unclassified
Component:	MediaWiki integration (Other open bugs)
Version:	unspecified
Hardware:	All All

Importance:	High major
Target Milestone:	VE-deploy-2014-08-28
Assigned To:	Roan Kattouw

URL:
Whiteboard:
Keywords:

Depends on:
Blocks:
	Show dependency tree / graph

Attachments
Add an attachment (proposed patch, testcase, etc.)

Description Alex Monk 2014-08-05 17:53:06 UTC

Comment 1 Gerrit Notification Bot 2014-08-27 01:06:56 UTC

Change 156491 had a related patch set uploaded by Jforrester:
Make the Resolve conflict button actually appear

https://gerrit.wikimedia.org/r/156491

Comment 2 Gerrit Notification Bot 2014-08-27 01:08:46 UTC

Change 156491 merged by jenkins-bot:
Make the Resolve conflict button actually appear

https://gerrit.wikimedia.org/r/156491

Comment 3 Gerrit Notification Bot 2014-08-27 01:11:00 UTC

Change 156493 had a related patch set uploaded by Catrope:
Make the Resolve conflict button actually appear

https://gerrit.wikimedia.org/r/156493

Comment 4 Gerrit Notification Bot 2014-08-27 01:12:38 UTC

Change 156494 had a related patch set uploaded by Catrope:
Make the Resolve conflict button actually appear

https://gerrit.wikimedia.org/r/156494

Comment 5 Gerrit Notification Bot 2014-08-27 01:14:25 UTC

Change 156493 merged by jenkins-bot:
Make the Resolve conflict button actually appear

https://gerrit.wikimedia.org/r/156493

Comment 6 Gerrit Notification Bot 2014-08-27 01:16:33 UTC

Change 156494 merged by Catrope:
Make the Resolve conflict button actually appear

https://gerrit.wikimedia.org/r/156494