BigW Consortium Gitlab

Skip to content

G
gitlab-ce
Commit 3ea4bf48 by Dmitriy Zaporozhets
Options

Merge pull request #6045 from jacargentina/fix-4305

Temporary fix for #4305: Cant preview attached png images on notes; attachment.secure_url returns an url which is accessible
parents 0401e195 b61f80ba
Showing with 4 additions and 4 deletions
app/views/events/event/_note.html.haml
...@@ -14,8 +14,8 @@ ...@@ -14,8 +14,8 @@
- note = event.target - note = event.target
- if note.attachment.url - if note.attachment.url
- if note.attachment.image? - if note.attachment.image?
= link_to note.attachment.url, target: '_blank' do = link_to note.attachment.secure_url, target: '_blank' do
= image_tag note.attachment.url, class: 'note-image-attach' = image_tag note.attachment.secure_url, class: 'note-image-attach'
- else - else
= link_to note.attachment.secure_url, target: "_blank", class: 'note-file-attach' do = link_to note.attachment.secure_url, target: "_blank", class: 'note-file-attach' do
%i.icon-paper-clip %i.icon-paper-clip
......
app/views/projects/notes/_note.html.haml
...@@ -54,8 +54,8 @@ ...@@ -54,8 +54,8 @@
- if note.attachment.url - if note.attachment.url
.note-attachment .note-attachment
- if note.attachment.image? - if note.attachment.image?
= link_to note.attachment.url, target: '_blank' do = link_to note.attachment.secure_url, target: '_blank' do
= image_tag note.attachment.url, class: 'note-image-attach' = image_tag note.attachment.secure_url, class: 'note-image-attach'
.attachment.pull-right .attachment.pull-right
= link_to note.attachment.secure_url, target: "_blank" do = link_to note.attachment.secure_url, target: "_blank" do
%i.icon-paper-clip %i.icon-paper-clip
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment