diff options
| author | schwedenmut <schwedenmut@googlemail.com> | 2018-09-05 14:29:04 +0300 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2018-09-05 14:29:04 +0300 |
| commit | 00e42e3c454bf87a5cae580c8edfa647d6e4d7c1 (patch) | |
| tree | 5565cefd67b8114e9037050ac82bfc0d16a5ed63 /app/views | |
| parent | 4a3a74979796e6245bd82dd06c52146caecb9b9e (diff) | |
Resolve "<link href=""> and <a href=""> not properly filled in activity RSS feed"
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/events/_event_push.atom.haml | 2 | ||||
| -rw-r--r-- | app/views/users/calendar_activities.html.haml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/views/events/_event_push.atom.haml b/app/views/events/_event_push.atom.haml index bc1d32607e4..c5b033b1185 100644 --- a/app/views/events/_event_push.atom.haml +++ b/app/views/events/_event_push.atom.haml @@ -1,7 +1,7 @@ %div{ xmlns: "http://www.w3.org/1999/xhtml" } %p %strong= event.author_name - = link_to "(#{truncate_sha(event.commit_id)})", project_commit_path(event.project, event.commit_id) + = link_to "(#{truncate_sha(event.commit_id)})", event_feed_url(event) %i at = event.created_at.to_s(:short) diff --git a/app/views/users/calendar_activities.html.haml b/app/views/users/calendar_activities.html.haml index 6b1d75c6e72..2d4656e8608 100644 --- a/app/views/users/calendar_activities.html.haml +++ b/app/views/users/calendar_activities.html.haml @@ -18,7 +18,7 @@ = event_action_name(event) %strong - if event.note? - = link_to event.note_target.to_reference, event_note_target_path(event), class: 'has-tooltip', title: event.target_title + = link_to event.note_target.to_reference, event_note_target_url(event), class: 'has-tooltip', title: event.target_title - elsif event.target = link_to event.target.to_reference, [event.project.namespace.becomes(Namespace), event.project, event.target], class: 'has-tooltip', title: event.target_title |