diff options
Diffstat (limited to 'app/views/shared/notes/_form.html.haml')
| -rw-r--r-- | app/views/shared/notes/_form.html.haml | 17 |
1 files changed, 3 insertions, 14 deletions
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 |