diff options
Diffstat (limited to 'app/views/projects/_zen.html.haml')
| -rw-r--r-- | app/views/projects/_zen.html.haml | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/app/views/projects/_zen.html.haml b/app/views/projects/_zen.html.haml index 74e681a48ed..bf372bd0d5f 100644 --- a/app/views/projects/_zen.html.haml +++ b/app/views/projects/_zen.html.haml @@ -1,23 +1,15 @@ - @gfm_form = true - current_text ||= nil -<<<<<<< HEAD -- supports_slash_commands = local_assigns.fetch(:supports_slash_commands, false) -.zen-backdrop - - classes << ' js-gfm-input js-autosize markdown-area' - - if defined?(f) && f - = f.text_area attr, class: classes, placeholder: placeholder, data: { supports_slash_commands: supports_slash_commands } -======= - supports_autocomplete = local_assigns.fetch(:supports_autocomplete, true) -- supports_quick_actions = local_assigns.fetch(:supports_quick_actions, false) +- supports_slash_commands = local_assigns.fetch(:supports_slash_commands, false) .zen-backdrop - classes << ' js-gfm-input js-autosize markdown-area' - if defined?(f) && f = f.text_area attr, class: classes, placeholder: placeholder, - data: { supports_quick_actions: supports_quick_actions, + data: { supports_slash_commands: supports_slash_commands, supports_autocomplete: supports_autocomplete } ->>>>>>> be2ea8f... Merge branch '33594-disable-autocomplete-on-snippet-comments' into 'master' - else = text_area_tag attr, current_text, class: classes, placeholder: placeholder %a.zen-control.zen-control-leave.js-zen-leave{ href: "#" } |