summaryrefslogtreecommitdiff
path: root/app/helpers
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/helpers
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/helpers')
-rw-r--r--app/helpers/issuables_helper.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/app/helpers/issuables_helper.rb b/app/helpers/issuables_helper.rb
index f8176facce9..0fee29bf7c7 100644
--- a/app/helpers/issuables_helper.rb
+++ b/app/helpers/issuables_helper.rb
@@ -269,6 +269,7 @@ module IssuablesHelper
markdownPreviewPath: preview_markdown_path(parent),
markdownDocsPath: help_page_path('user/markdown'),
markdownVersion: issuable.cached_markdown_version,
+ lockVersion: issuable.lock_version,
issuableTemplates: issuable_templates(issuable),
initialTitleHtml: markdown_field(issuable, :title),
initialTitleText: issuable.title,