diff options
| author | Jacob Schatz <jschatz1@gmail.com> | 2016-03-11 16:06:18 +0000 |
|---|---|---|
| committer | Jacob Schatz <jschatz1@gmail.com> | 2016-03-11 16:06:18 +0000 |
| commit | 6968ea32e2beade8bc5aee9c30451b6ed48fcc5f (patch) | |
| tree | 0f6ccc7805439a8ce52c9e144710a17e650e81b5 /app/views/projects | |
| parent | 5a84e8381ac7e8dc0ecef7b7af83553161033e3c (diff) | |
| parent | 25f392eab734bd68da377a61c608bca73355ba43 (diff) | |
| download | gitlab-ce-6968ea32e2beade8bc5aee9c30451b6ed48fcc5f.tar.gz | |
Merge branch 'award-emoji-design-update' into 'master'
Updated UI of award emoji
Closes #13878
See merge request !3028
Diffstat (limited to 'app/views/projects')
| -rw-r--r-- | app/views/projects/issues/show.html.haml | 2 | ||||
| -rw-r--r-- | app/views/projects/merge_requests/_show.html.haml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/views/projects/issues/show.html.haml b/app/views/projects/issues/show.html.haml index f5bb5d998bb..0242276cd84 100644 --- a/app/views/projects/issues/show.html.haml +++ b/app/views/projects/issues/show.html.haml @@ -71,7 +71,7 @@ .merge-requests = render 'merge_requests' - .content-block + .content-block.content-block-small = render 'votes/votes_block', votable: @issue .row diff --git a/app/views/projects/merge_requests/_show.html.haml b/app/views/projects/merge_requests/_show.html.haml index b262892ac65..ee5b9fd95a8 100644 --- a/app/views/projects/merge_requests/_show.html.haml +++ b/app/views/projects/merge_requests/_show.html.haml @@ -68,7 +68,7 @@ .tab-content #notes.notes.tab-pane.voting_notes - .content-block.oneline-block + .content-block.content-block-small.oneline-block = render 'votes/votes_block', votable: @merge_request .row |