diff options
Diffstat (limited to 'app/views/shared/notes/_form.html.haml')
| -rw-r--r-- | app/views/shared/notes/_form.html.haml | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/app/views/shared/notes/_form.html.haml b/app/views/shared/notes/_form.html.haml index eaf50bc2115..7f33c5012c5 100644 --- a/app/views/shared/notes/_form.html.haml +++ b/app/views/shared/notes/_form.html.haml @@ -1,6 +1,13 @@ +<<<<<<< HEAD - 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) @@ -27,8 +34,14 @@ 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_autocomplete: supports_autocomplete + = render 'shared/notes/hints', supports_quick_actions: supports_quick_actions +>>>>>>> be2ea8f... Merge branch '33594-disable-autocomplete-on-snippet-comments' into 'master' .error-alert .note-form-actions.clearfix |