Merge branch 'fix-commit-comment' into 'master'

Fix commit comment alignment

Closes #14780

See merge request !3466

Signed-off-by: Rémy Coutable <remy@rymai.me>

CHANGELOG

@@ -1,11 +1,11 @@
 Please view this file on the master branch, on stable branches it's out of date.
 
-v 8.6.3 (unreleased)
-
 v 8.6.3 (unreleased)
   - Destroy related todos when an Issue/MR is deleted. !3376
   - Fix error 500 when target is nil on todo list. !3376
   - Fix raw/rendered diff producing different results on merge requests. !3450
+  - Fix commit comment alignment (Stan Hu). !3466
+  - Update gitlab-shell version and doc to 2.6.12. gitlab-org/gitlab-ee!280
 
 v 8.6.2
   - Fix dropdown alignment. !3298

app/views/projects/notes/discussions/_commit.html.haml

@@ -9,7 +9,7 @@
         Show/hide discussion
     %div
       = link_to_member(@project, note.author, avatar: false)
-      %p started a discussion on #{commit_description}
+      started a discussion on #{commit_description}
       - if commit
         = link_to(commit.short_id, namespace_project_commit_path(note.project.namespace, note.project, note.noteable), class: 'monospace')
     .last-update.hide.js-toggle-content