Merge branch '17295_discussion_note' into 'master'

Fixes missing avatar on system notes Closes #17295 ![Screen_Shot_2016-06-27_at_12.50.50_PM](/uploads/b142226e608ccfe751a9b6059f57c9ec/Screen_Shot_2016-06-27_at_12.50.50_PM.jpg) See merge request !4954

Merge branch '17295_discussion_note' into 'master'
9e8fdead · Jacob Schatz · 9c2fbcb0 · d9584ec7 · 9e8fdead · 9e8fdead
Commit 9e8fdead authored Jun 29, 2016 by Jacob Schatz
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 0 deletions

CHANGELOG CHANGELOG +1 -0

notes.scss app/assets/stylesheets/pages/notes.scss +4 -0

No files found.
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -24,6 +24,7 @@ v 8.9.3 (unreleased)
  - Decreased min width of screen to 1280px for pinned sidebar
  - Fix encrypted data backwards compatibility after upgrading attr_encrypted gem
  - Update mobile button icons to be more inline with typical UI paradigms
+  - Fixes missing avatar on system notes. !4954

 v 8.9.2
  - Fix visibility of snippets when searching.

--- 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;
+        }
      }
    }
  }