Skip to content

Resolve '33594-disable-autocomplete-on-snippet-comments' conflicts

username-removed-408677 requested to merge 9-3-stable-rc5-autocomplete into 9-3-stable-rc5

From MR, https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/12108

Unmerged paths:
  (use "git add <file>..." to mark resolution)

	both modified:   app/views/projects/_zen.html.haml
	both modified:   app/views/shared/notes/_form.html.haml
Edited by username-removed-892863

Merge request reports