diff options
| author | Fatih Acet <acetfatih@gmail.com> | 2018-12-21 01:19:17 +0100 |
|---|---|---|
| committer | Fatih Acet <acetfatih@gmail.com> | 2019-01-30 23:18:12 +0100 |
| commit | 8bcd508b4c7f559f27db3c05b6ae4a3a33dfff95 (patch) | |
| tree | 72a00519c4755df3094f5961077c5162138311f3 | |
| parent | 1414cfae43ce175feaaaca346287274fe3c372e2 (diff) | |
| download | gitlab-ce-8bcd508b4c7f559f27db3c05b6ae4a3a33dfff95.tar.gz | |
Add lock version to issuable helpers
| -rw-r--r-- | app/controllers/concerns/issuable_actions.rb | 3 | ||||
| -rw-r--r-- | app/helpers/issuables_helper.rb | 1 |
2 files changed, 3 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? 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, |