diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-18 12:09:24 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-18 12:09:24 +0300 |
commit | 4720b569f0fcbb47e9f1a60e95172ae63b6f065a (patch) | |
tree | 5c6bcecbca227e608753a57a9aad19ccfe0567b6 /app/views/projects/_zen.html.haml | |
parent | cefe554b7ce2d0b52f9de855be832a47c2bc24ab (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/views/projects/_zen.html.haml')
-rw-r--r-- | app/views/projects/_zen.html.haml | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/app/views/projects/_zen.html.haml b/app/views/projects/_zen.html.haml index c502b392384..744aef3cad4 100644 --- a/app/views/projects/_zen.html.haml +++ b/app/views/projects/_zen.html.haml @@ -2,6 +2,7 @@ - current_text ||= nil - supports_autocomplete = local_assigns.fetch(:supports_autocomplete, true) - supports_quick_actions = local_assigns.fetch(:supports_quick_actions, false) +- qa_selector = local_assigns.fetch(:qa_selector, '') .zen-backdrop - classes << ' js-gfm-input js-autosize markdown-area' - if defined?(f) && f @@ -10,7 +11,8 @@ placeholder: placeholder, dir: 'auto', data: { supports_quick_actions: supports_quick_actions, - supports_autocomplete: supports_autocomplete } + supports_autocomplete: supports_autocomplete, + qa_selector: qa_selector } - else = text_area_tag attr, current_text, class: classes, placeholder: placeholder %a.zen-control.zen-control-leave.js-zen-leave{ href: "#" } |