diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-06-16 18:25:58 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-06-16 18:25:58 +0000 |
commit | a5f4bba440d7f9ea47046a0a561d49adf0a1e6d4 (patch) | |
tree | fb69158581673816a8cd895f9d352dcb3c678b1e /app/views/events | |
parent | d16b2e8639e99961de6ddc93909f3bb5c1445ba1 (diff) | |
download | gitlab-ce-a5f4bba440d7f9ea47046a0a561d49adf0a1e6d4.tar.gz |
Add latest changes from gitlab-org/gitlab@14-0-stable-eev14.0.0-rc42
Diffstat (limited to 'app/views/events')
-rw-r--r-- | app/views/events/_event.atom.builder | 3 | ||||
-rw-r--r-- | app/views/events/_event_push.atom.haml | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/app/views/events/_event.atom.builder b/app/views/events/_event.atom.builder index 17bf43a4590..c429bbbb610 100644 --- a/app/views/events/_event.atom.builder +++ b/app/views/events/_event.atom.builder @@ -3,10 +3,11 @@ return unless event.visible_to_user?(current_user) event = event.present +event_url = event_feed_url(event) xml.entry do xml.id "tag:#{request.host},#{event.created_at.strftime("%Y-%m-%d")}:#{event.id}" - xml.link href: event_feed_url(event) + xml.link href: event_url if event_url xml.title truncate(event_feed_title(event), length: 80) xml.updated event.updated_at.xmlschema diff --git a/app/views/events/_event_push.atom.haml b/app/views/events/_event_push.atom.haml index c5b033b1185..c3786d7c16d 100644 --- a/app/views/events/_event_push.atom.haml +++ b/app/views/events/_event_push.atom.haml @@ -1,7 +1,9 @@ +- event_url = event_feed_url(event) + %div{ xmlns: "http://www.w3.org/1999/xhtml" } %p %strong= event.author_name - = link_to "(#{truncate_sha(event.commit_id)})", event_feed_url(event) + = link_to "(#{truncate_sha(event.commit_id)})", event_url if event_url %i at = event.created_at.to_s(:short) |