diff options
| author | Sean McGivern <sean@gitlab.com> | 2019-02-04 08:52:22 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@gitlab.com> | 2019-02-04 08:52:22 +0000 |
| commit | 70b92fb380659717e2f3a4f5aac802ec5460e78c (patch) | |
| tree | f7e8132f13cdcb25b098924e92eff5d53022483d /app/controllers/concerns | |
| parent | 200ebab1cf8a41585c94a15bcc37547abd73bc80 (diff) | |
| parent | 863ee930a6260c42d3d0252a0310ac9adff24862 (diff) | |
| download | gitlab-ce-70b92fb380659717e2f3a4f5aac802ec5460e78c.tar.gz | |
Merge branch '19745-forms-with-task-lists-can-be-overwritten-when-editing-simultaneously' into 'master'
Forms with task lists can be overwritten when editing simultaneously
See merge request gitlab-org/gitlab-ce!23938
Diffstat (limited to 'app/controllers/concerns')
| -rw-r--r-- | app/controllers/concerns/issuable_actions.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/controllers/concerns/issuable_actions.rb b/app/controllers/concerns/issuable_actions.rb index 3d64ae8b775..8ef3b6502df 100644 --- a/app/controllers/concerns/issuable_actions.rb +++ b/app/controllers/concerns/issuable_actions.rb @@ -58,7 +58,8 @@ module IssuableActions title_text: issuable.title, description: view_context.markdown_field(issuable, :description), description_text: issuable.description, - task_status: issuable.task_status + task_status: issuable.task_status, + lock_version: issuable.lock_version } if issuable.edited? |