Skip to content

Task description conflict resolution

Simon Knox requested to merge psi-wi-confict into master

What does this MR do and why?

Show warning if task description changes while you are editing it.

When description widget is updated while you are editing, assigns the updated description to conflictedDescription and displays then updated contents in a readonly textarea.

See #362967 (closed)

Screenshots or screen recordings

collapsed expanded
Screen_Shot_2022-11-02_at_3.57.39_pm Screen_Shot_2022-11-02_at_3.57.51_pm

How to set up and validate locally

  1. Create a work item https://docs.gitlab.com/ee/user/tasks.html#create-a-task
  2. Edit description of it, but don't save
  3. Edit description in another window and save
  4. See warning above Save button

MR acceptance checklist

This checklist encourages us to confirm any changes have been analyzed to reduce risks in quality, performance, reliability, security, and maintainability.

Edited by Simon Knox

Merge request reports