diff options
| author | Valery Sizov <valery@gitlab.com> | 2015-07-22 10:51:37 +0000 |
|---|---|---|
| committer | Valery Sizov <valery@gitlab.com> | 2015-07-22 10:51:37 +0000 |
| commit | 95d89e442a83eaf5456c2a34362579dd889e0f71 (patch) | |
| tree | cfb276e6c7ec3e9c7ca5fc83d7ff33c6c585c63e | |
| parent | 546731244a80fb44a7b1792615f2ccda767ad947 (diff) | |
| parent | bf3b318ec561a3d8146c6bff56fe21335cab0aec (diff) | |
| download | gitlab-ce-95d89e442a83eaf5456c2a34362579dd889e0f71.tar.gz | |
Merge branch 'revert_note_caching' into 'master'
revert caching of note text
This MR reverts the caching of note texts because what is rendered as a link in Markdown depends on the user's access to other projects and groups.
Until we find a solution that doesn't decrease security, let's not use the cache for this.
See discussion in gitlab-org/gitlab-ce!911 for more information.
/cc @DouweM @stanhu @vsizov
See merge request !1014
| -rw-r--r-- | app/views/projects/notes/_note.html.haml | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/app/views/projects/notes/_note.html.haml b/app/views/projects/notes/_note.html.haml index c8d705687da..4a1009686c6 100644 --- a/app/views/projects/notes/_note.html.haml +++ b/app/views/projects/notes/_note.html.haml @@ -56,10 +56,9 @@ .note-body{class: note_editable?(note) ? 'js-task-list-container' : ''} - = cache [note, 'markdown', user_color_scheme_class] do - .note-text - = preserve do - = markdown(note.note, {no_header_anchors: true}) + .note-text + = preserve do + = markdown(note.note, {no_header_anchors: true}) = render 'projects/notes/edit_form', note: note - if note.attachment.url |