diff options
| author | Valery Sizov <valery@gitlab.com> | 2015-07-19 09:19:30 +0000 |
|---|---|---|
| committer | Valery Sizov <valery@gitlab.com> | 2015-07-19 09:19:30 +0000 |
| commit | e8aaf5680355b2a71ab85439f653a70f4b487e0b (patch) | |
| tree | c62df43bf05403d91e31bdb04f3950d6bfc180a1 | |
| parent | 247609a3d8fc9c1b5cf728fdbea303a15ec640db (diff) | |
| parent | 875d8e7f31db88443c3c573473b496945d7673a0 (diff) | |
| download | gitlab-ce-e8aaf5680355b2a71ab85439f653a70f4b487e0b.tar.gz | |
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
| -rw-r--r-- | app/views/projects/notes/_note.html.haml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/projects/notes/_note.html.haml b/app/views/projects/notes/_note.html.haml index 5478a887f91..c8d705687da 100644 --- 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}) |