diff options
| author | Rémy Coutable <remy@rymai.me> | 2016-03-31 06:49:32 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2016-03-31 18:53:57 +0200 |
| commit | 2a5bfc461e0c828cf61aeb8b7ca903fa3ce8fbee (patch) | |
| tree | 430f6f0263f596503377d2515dc7ee139ecb9358 | |
| parent | 0a3f5adf92df90cf7df02a5503a2f77ccd2e13b6 (diff) | |
| download | gitlab-ce-2a5bfc461e0c828cf61aeb8b7ca903fa3ce8fbee.tar.gz | |
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>
| -rw-r--r-- | CHANGELOG | 4 | ||||
| -rw-r--r-- | app/views/projects/notes/discussions/_commit.html.haml | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/CHANGELOG b/CHANGELOG index 0b6c245ccee..5aca2ed20e9 100644 --- a/CHANGELOG +++ b/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 diff --git a/app/views/projects/notes/discussions/_commit.html.haml b/app/views/projects/notes/discussions/_commit.html.haml index f67ec8db942..8d0a1af787c 100644 --- a/app/views/projects/notes/discussions/_commit.html.haml +++ b/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 |