diff options
| author | Eric Eastwood <contact@ericeastwood.com> | 2017-06-12 22:42:12 +0300 |
|---|---|---|
| committer | Eric Eastwood <contact@ericeastwood.com> | 2017-06-19 21:42:12 +0300 |
| commit | e51078ecfc4aeae7bdfa0ced45fe0de21c9afd8c (patch) | |
| tree | aab5841cb6e17abed46c8d9176978c4484d6b61e /app/views | |
| parent | dbfafd442ee863e6614d0f6765285fcd06f3d843 (diff) | |
Disable autocomplete on snippets comments
Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/33594
Was supposedly fixed in MR for
https://gitlab.com/gitlab-org/gitlab-ce/issues/32086 but seeing this pop
up again
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/projects/_zen.html.haml | 7 | ||||
| -rw-r--r-- | app/views/projects/snippets/show.html.haml | 2 | ||||
| -rw-r--r-- | app/views/shared/notes/_form.html.haml | 4 | ||||
| -rw-r--r-- | app/views/shared/notes/_notes_with_form.html.haml | 2 |
4 files changed, 11 insertions, 4 deletions
diff --git a/app/views/projects/_zen.html.haml b/app/views/projects/_zen.html.haml index bff11d888a7..afc40ca4eab 100644 --- a/app/views/projects/_zen.html.haml +++ b/app/views/projects/_zen.html.haml @@ -1,10 +1,15 @@ - @gfm_form = true - current_text ||= nil +- supports_autocomplete = local_assigns.fetch(:supports_autocomplete, true) - supports_quick_actions = local_assigns.fetch(:supports_quick_actions, 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 } + = f.text_area attr, + class: classes, + placeholder: placeholder, + data: { supports_quick_actions: supports_quick_actions, + supports_autocomplete: supports_autocomplete } - 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/projects/snippets/show.html.haml b/app/views/projects/snippets/show.html.haml index 847f3c2f348..37b114e7a3a 100644 --- a/app/views/projects/snippets/show.html.haml +++ b/app/views/projects/snippets/show.html.haml @@ -9,4 +9,4 @@ .row-content-block.top-block.content-component-block = render 'award_emoji/awards_block', awardable: @snippet, inline: true - #notes= render "shared/notes/notes_with_form", :autocomplete => true + #notes= render "shared/notes/notes_with_form", :autocomplete => false diff --git a/app/views/shared/notes/_form.html.haml b/app/views/shared/notes/_form.html.haml index 32ff505cbda..c6b5dcc3647 100644 --- a/app/views/shared/notes/_form.html.haml +++ b/app/views/shared/notes/_form.html.haml @@ -1,3 +1,4 @@ +- 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) @@ -27,7 +28,8 @@ attr: :note, classes: 'note-textarea js-note-text', placeholder: "Write a comment or drag your files here...", - supports_quick_actions: supports_quick_actions + supports_quick_actions: supports_quick_actions, + supports_autocomplete: supports_autocomplete = render 'shared/notes/hints', supports_quick_actions: supports_quick_actions .error-alert diff --git a/app/views/shared/notes/_notes_with_form.html.haml b/app/views/shared/notes/_notes_with_form.html.haml index 5902798dfd0..0cca8d875d2 100644 --- a/app/views/shared/notes/_notes_with_form.html.haml +++ b/app/views/shared/notes/_notes_with_form.html.haml @@ -12,7 +12,7 @@ %a.author_link{ href: user_path(current_user) } = image_tag avatar_icon(current_user), alt: current_user.to_reference, class: 'avatar s40' .timeline-content.timeline-content-form - = render "shared/notes/form", view: diff_view + = render "shared/notes/form", view: diff_view, supports_autocomplete: autocomplete - elsif !current_user .disabled-comment.text-center.prepend-top-default Please |