Merge branch 'fix-mixed-color-preview' into 'master'

Fix bug where notes were being rendered with wrong color preferences due to caching ### What does this MR do? This MR adds the user's color preferences as part of the caching key for notes. ### Why was this MR needed? This should fix a bug introduced via 4d80360b where notes were being loaded from the cache without regard to the current user's color scheme. ### What are the relevant issue numbers? Closes #2008 See merge request !994

Merge branch 'fix-mixed-color-preview' into 'master'
e8aaf568 · Valery Sizov · 247609a3 · 875d8e7f · e8aaf568
Commit e8aaf568 authored Jul 19, 2015 by Valery Sizov
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

_note.html.haml app/views/projects/notes/_note.html.haml +1 -1

No files found.
--- a/app/views/projects/notes/_note.html.haml
+++ b/app/views/projects/notes/_note.html.haml
@@ -56,7 +56,7 @@


      .note-body{class: note_editable?(note) ? 'js-task-list-container' : ''}
-        = cache [note, 'markdown'] do
+        = cache [note, 'markdown', user_color_scheme_class] do
          .note-text
            = preserve do
              = markdown(note.note, {no_header_anchors: true})