Deploy TwoColConflict extension to production
Closed, ResolvedPublic
Actions

Assigned To

Authored By

	Addshore
	Nov 7 2016, 4:13 PM

Description

The TwoColConflict extension provides an alternative two-column view for the edit conflict resolution page.
It should be available as a betafeature to begin with.
https://www.mediawiki.org/wiki/Extension:TwoColConflict
Two-Column-Edit-Conflict-Merge

Deployment currently planned last 2016 early 2017 as a beta feature to dewiki/

Details

	Subject	Repo	Branch	Lines +/-
	Add twocolconflict to wgBetaFeaturesWhitelist	operations/mediawiki-config	master	+1 -0
	Add TwoColConflict to make-wmf-branch	mediawiki/tools/release	master	+1 -0

Customize query in gerrit

Related Objects
Search...

Status	Assigned	Task
Resolved	Addshore	T150184 Deploy TwoColConflict extension to production
Resolved	Addshore	T150738 Make TwoColConflict extension a betafeature
Resolved	Addshore	T150847 Create logo for TwoColConflict beta feature
Resolved	Reedy	T154927 Deploy TwoColConflict extension to beta
Resolved	Addshore	T149808 Security review for TwoColConflict extension
Resolved	Addshore	T155721 Deploy TwoColConflict extension to meta, dewiki and one RTL-wiki
Resolved	Addshore	T155717 Deploy TwoColConflict extension to mediawiki.org
Resolved	Addshore	T155716 Deploy TwoColConflict extension to test-wikis
Resolved	Addshore	T158493 Deploy TwoColConflict beta to Arabic Wikipedia

Event Timeline

Addshore created this task.Nov 7 2016, 4:13 PM

Restricted Application added a subscriber: Aklapper. · View Herald TranscriptNov 7 2016, 4:13 PM

Addshore added a parent task: T33235: [DO NOT USE] Extensions awaiting code review to be deployed on Wikimedia wikis (tracking) [superseded by #wikimedia-extension-review-queue].Nov 7 2016, 4:14 PM

Addshore added a subtask: T149808: Security review for TwoColConflict extension.

Addshore updated the task description. (Show Details)Nov 7 2016, 4:16 PM

Addshore updated the task description. (Show Details)

Addshore added a project: User-Addshore.Nov 7 2016, 4:23 PM

Addshore moved this task from Unsorted 💣 to Next on the User-Addshore board.

Tobi_WMDE_SW created subtask T150738: Make TwoColConflict extension a betafeature.Nov 15 2016, 10:21 AM

Tobi_WMDE_SW mentioned this in T149808: Security review for TwoColConflict extension.

Tobi_WMDE_SW updated the task description. (Show Details)

Tobi_WMDE_SW added a project: WMDE-TechWish.Nov 15 2016, 11:19 AM

Addshore moved this task from Incoming to Edit Conflict Handling on the TCB-Team (now WMDE-TechWish) board.Nov 17 2016, 9:30 AM

Addshore updated the task description. (Show Details)Nov 18 2016, 11:49 AM

Addshore changed the status of subtask T150738: Make TwoColConflict extension a betafeature from Open to Stalled.Nov 30 2016, 4:06 PM

Addshore added a project: SRE.Dec 2 2016, 11:41 AM

Addshore changed the status of subtask T150738: Make TwoColConflict extension a betafeature from Stalled to Open.

Tobi_WMDE_SW closed subtask T150738: Make TwoColConflict extension a betafeature as Resolved.Dec 2 2016, 2:11 PM

Addshore created subtask T154927: Deploy TwoColConflict extension to beta.Jan 9 2017, 7:46 PM

Addshore closed subtask T149808: Security review for TwoColConflict extension as Resolved.Jan 9 2017, 11:09 PM

Addshore closed subtask T154927: Deploy TwoColConflict extension to beta as Resolved.Jan 9 2017, 11:20 PM

MoritzMuehlenhoff triaged this task as Medium priority.Jan 16 2017, 3:05 PM

Change 332904 had a related patch set uploaded (by Addshore):
Add twocolconflict to wgBetaFeaturesWhitelist

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

Change 332906 had a related patch set uploaded (by Addshore):
Add TwoColConflict to make-wmf-branch

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

Tobi_WMDE_SW created subtask T155716: Deploy TwoColConflict extension to test-wikis.Jan 19 2017, 10:46 AM

Addshore edited subtasks, added: T155721: Deploy TwoColConflict extension to meta, dewiki and one RTL-wiki; removed: T155716: Deploy TwoColConflict extension to test-wikis.Jan 19 2017, 1:13 PM

Addshore claimed this task.Jan 19 2017, 1:16 PM

Addshore moved this task from Next to Active 🚁 on the User-Addshore board.

Addshore moved this task from Proposed to Todo on the WMDE-TechWish board.Jan 19 2017, 1:24 PM

Change 332906 merged by jenkins-bot:
Add TwoColConflict to make-wmf-branch

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

Addshore moved this task from Todo to Sprint ready on the WMDE-TechWish board.Jan 30 2017, 5:37 PM

Change 332904 merged by jenkins-bot:
Add twocolconflict to wgBetaFeaturesWhitelist

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

Mentioned in SAL (#wikimedia-operations) [2017-01-31T12:16:34Z] <addshore@tin> Synchronized wmf-config/InitialiseSettings.php: [[gerrit:332904|Add twocolconflict to wgBetaFeaturesWhitelist (T150184)]] (duration: 00m 41s)