summaryrefslogtreecommitdiff
path: root/app/views/events
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2015-05-14 13:05:33 +0200
committerDouwe Maan <douwe@gitlab.com>2015-05-14 13:05:33 +0200
commitcd52cef1c0898230cb684ee294bd7a6c5b2f226a (patch)
treeeb55e471d7d5e3d626f266b77f6931c708e145d4 /app/views/events
parent910794bae5a91479f41468ebc345db680a33b20e (diff)
downloadgitlab-ce-cd52cef1c0898230cb684ee294bd7a6c5b2f226a.tar.gz
Fix reference links in dashboard activity and ATOM feeds.dashboard-references
Diffstat (limited to 'app/views/events')
-rw-r--r--app/views/events/_event_issue.atom.haml2
-rw-r--r--app/views/events/_event_merge_request.atom.haml2
-rw-r--r--app/views/events/_event_note.atom.haml2
-rw-r--r--app/views/events/_event_push.atom.haml2
-rw-r--r--app/views/events/event/_note.html.haml2
5 files changed, 5 insertions, 5 deletions
diff --git a/app/views/events/_event_issue.atom.haml b/app/views/events/_event_issue.atom.haml
index 0edb61ea246..4259f64c191 100644
--- a/app/views/events/_event_issue.atom.haml
+++ b/app/views/events/_event_issue.atom.haml
@@ -1,3 +1,3 @@
%div{xmlns: "http://www.w3.org/1999/xhtml"}
- if issue.description.present?
- = markdown(issue.description, xhtml: true)
+ = markdown(issue.description, xhtml: true, reference_only_path: false, project: issue.project)
diff --git a/app/views/events/_event_merge_request.atom.haml b/app/views/events/_event_merge_request.atom.haml
index 1a8b62abeab..e8ed13df783 100644
--- a/app/views/events/_event_merge_request.atom.haml
+++ b/app/views/events/_event_merge_request.atom.haml
@@ -1,3 +1,3 @@
%div{xmlns: "http://www.w3.org/1999/xhtml"}
- if merge_request.description.present?
- = markdown(merge_request.description, xhtml: true)
+ = markdown(merge_request.description, xhtml: true, reference_only_path: false, project: merge_request.project)
diff --git a/app/views/events/_event_note.atom.haml b/app/views/events/_event_note.atom.haml
index b49c331ccf2..cfbfba50202 100644
--- a/app/views/events/_event_note.atom.haml
+++ b/app/views/events/_event_note.atom.haml
@@ -1,2 +1,2 @@
%div{xmlns: "http://www.w3.org/1999/xhtml"}
- = markdown(note.note, xhtml: true)
+ = markdown(note.note, xhtml: true, reference_only_path: false, project: note.project)
diff --git a/app/views/events/_event_push.atom.haml b/app/views/events/_event_push.atom.haml
index 5d14def8f75..42762e04b51 100644
--- a/app/views/events/_event_push.atom.haml
+++ b/app/views/events/_event_push.atom.haml
@@ -6,7 +6,7 @@
%i
at
= commit[:timestamp].to_time.to_s(:short)
- %blockquote= markdown(escape_once(commit[:message]), xhtml: true)
+ %blockquote= markdown(escape_once(commit[:message]), xhtml: true, reference_only_path: false, project: note.project)
- if event.commits_count > 15
%p
%i
diff --git a/app/views/events/event/_note.html.haml b/app/views/events/event/_note.html.haml
index 4ef18c09060..07bec1697f5 100644
--- a/app/views/events/event/_note.html.haml
+++ b/app/views/events/event/_note.html.haml
@@ -14,7 +14,7 @@
.event-note
.md
%i.fa.fa-comment-o.event-note-icon
- = event_note(event.target.note)
+ = event_note(event.target.note, project: event.project)
- note = event.target
- if note.attachment.url
- if note.attachment.image?