summaryrefslogtreecommitdiff
path: root/app/views/projects/merge_requests
diff options
context:
space:
mode:
authorSean McGivern <sean@gitlab.com>2019-02-04 08:52:22 +0000
committerSean McGivern <sean@gitlab.com>2019-02-04 08:52:22 +0000
commit70b92fb380659717e2f3a4f5aac802ec5460e78c (patch)
treef7e8132f13cdcb25b098924e92eff5d53022483d /app/views/projects/merge_requests
parent200ebab1cf8a41585c94a15bcc37547abd73bc80 (diff)
parent863ee930a6260c42d3d0252a0310ac9adff24862 (diff)
downloadgitlab-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/views/projects/merge_requests')
-rw-r--r--app/views/projects/merge_requests/show.html.haml2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/projects/merge_requests/show.html.haml b/app/views/projects/merge_requests/show.html.haml
index d6f340d0ee2..0b720e5d542 100644
--- a/app/views/projects/merge_requests/show.html.haml
+++ b/app/views/projects/merge_requests/show.html.haml
@@ -7,7 +7,7 @@
- page_card_attributes @merge_request.card_attributes
- suggest_changes_help_path = help_page_path('user/discussions/index.md', anchor: 'suggest-changes')
-.merge-request{ data: { mr_action: j(params[:tab].presence || 'show'), url: merge_request_path(@merge_request, format: :json), project_path: project_path(@merge_request.project) } }
+.merge-request{ data: { mr_action: j(params[:tab].presence || 'show'), url: merge_request_path(@merge_request, format: :json), project_path: project_path(@merge_request.project), lock_version: @merge_request.lock_version } }
= render "projects/merge_requests/mr_title"
.merge-request-details.issuable-details{ data: { id: @merge_request.project.id } }