From 59069c4557cdc97dca953ee16715cd817f2d9538 Mon Sep 17 00:00:00 2001
From: Eric Eastwood <contact@ericeastwood.com>
Date: Mon, 19 Jun 2017 16:16:13 -0500
Subject: Resolve "slash command" vs "quick action" conflicts

This was renamed in 9.4,
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/11811
---
 app/views/projects/_zen.html.haml      | 12 ++----------
 app/views/shared/notes/_form.html.haml | 17 +++--------------
 2 files changed, 5 insertions(+), 24 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: "#" }
diff --git a/app/views/shared/notes/_form.html.haml b/app/views/shared/notes/_form.html.haml
index 7f33c5012c5..7080f38dfd1 100644
--- a/app/views/shared/notes/_form.html.haml
+++ b/app/views/shared/notes/_form.html.haml
@@ -1,13 +1,7 @@
-<<<<<<< HEAD
+- supports_autocomplete = local_assigns.fetch(:supports_autocomplete, true)
 - supports_slash_commands = note_supports_slash_commands?(@note)
 - if supports_slash_commands
   - preview_url = preview_markdown_path(@project, slash_commands_target_type: @note.noteable_type, slash_commands_target_id: @note.noteable_id)
-=======
-- supports_autocomplete = local_assigns.fetch(:supports_autocomplete, true)
-- supports_quick_actions = note_supports_quick_actions?(@note)
-- if supports_quick_actions
-  - preview_url = preview_markdown_path(@project, quick_actions_target_type: @note.noteable_type, quick_actions_target_id: @note.noteable_id)
->>>>>>> be2ea8f... Merge branch '33594-disable-autocomplete-on-snippet-comments' into 'master'
 - else
   - preview_url = preview_markdown_path(@project)
 
@@ -34,14 +28,9 @@
       attr: :note,
       classes: 'note-textarea js-note-text',
       placeholder: "Write a comment or drag your files here...",
-<<<<<<< HEAD
-      supports_slash_commands: supports_slash_commands
-    = render 'shared/notes/hints', supports_slash_commands: supports_slash_commands
-=======
-      supports_quick_actions: supports_quick_actions,
+      supports_slash_commands: supports_slash_commands,
       supports_autocomplete: supports_autocomplete
-    = render 'shared/notes/hints', supports_quick_actions: supports_quick_actions
->>>>>>> be2ea8f... Merge branch '33594-disable-autocomplete-on-snippet-comments' into 'master'
+    = render 'shared/notes/hints', supports_slash_commands: supports_slash_commands
     .error-alert
 
   .note-form-actions.clearfix
-- 
cgit v1.2.1