diff options
| author | Jacob Schatz <jschatz@gitlab.com> | 2016-06-29 05:18:58 +0000 |
|---|---|---|
| committer | Robert Speicher <rspeicher@gmail.com> | 2016-06-29 10:50:53 -0400 |
| commit | 428f56308db8a8efe095b8ea8700ed3dfa3988c2 (patch) | |
| tree | 9efd08e18815dfeba598ea3b421bb2e9521adcfd | |
| parent | c83db6b7cb8fce7262e0030c1eec6ee9382888f3 (diff) | |
| download | gitlab-ce-428f56308db8a8efe095b8ea8700ed3dfa3988c2.tar.gz | |
Merge branch '17295_discussion_note' into 'master'
Fixes missing avatar on system notes
Closes #17295
See merge request !4954
(cherry picked from commit 9e8fdead1789b425152256ec977241e7f19123ce)
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | app/assets/stylesheets/pages/notes.scss | 4 |
2 files changed, 5 insertions, 0 deletions
diff --git a/CHANGELOG b/CHANGELOG index a680d6fc123..e450c063d5c 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -12,6 +12,7 @@ v 8.9.3 - Use memorized tags array when searching tags by name. !4859 - Fixed avatar alignment in new MR view. !4901 - Removed fade when filtering results. !4932 + - Fix missing avatar on system notes. !4954 v 8.9.2 - Fix visibility of snippets when searching. diff --git a/app/assets/stylesheets/pages/notes.scss b/app/assets/stylesheets/pages/notes.scss index ffba3dc5bc6..32a99fb32ad 100644 --- a/app/assets/stylesheets/pages/notes.scss +++ b/app/assets/stylesheets/pages/notes.scss @@ -41,6 +41,10 @@ ul.notes { .timeline-icon { .avatar { visibility: hidden; + + .discussion-body & { + visibility: visible; + } } } } |