diff options
| author | Douwe Maan <douwe@gitlab.com> | 2015-04-21 17:03:23 +0200 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2015-04-23 17:11:39 +0200 |
| commit | 9c60354a6a7e2f0249719b4c0cf929c5d8ebc6e2 (patch) | |
| tree | a04cf70072271fc4eec67359ba8ad6e1c7f6e302 /app/views/users | |
| parent | a6dfd065ca9de2e421425a5126c68bf8949ce110 (diff) | |
| download | gitlab-ce-9c60354a6a7e2f0249719b4c0cf929c5d8ebc6e2.tar.gz | |
Make links and titles of atom feeds consistent.
Diffstat (limited to 'app/views/users')
| -rw-r--r-- | app/views/users/show.atom.builder | 4 | ||||
| -rw-r--r-- | app/views/users/show.html.haml | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/app/views/users/show.atom.builder b/app/views/users/show.atom.builder index 8fe30b23635..50232dc7186 100644 --- a/app/views/users/show.atom.builder +++ b/app/views/users/show.atom.builder @@ -1,9 +1,9 @@ xml.instruct! xml.feed "xmlns" => "http://www.w3.org/2005/Atom", "xmlns:media" => "http://search.yahoo.com/mrss/" do - xml.title "Activity feed for #{@user.name}" + xml.title "#{@user.name} activity" xml.link href: user_url(@user, :atom), rel: "self", type: "application/atom+xml" xml.link href: user_url(@user), rel: "alternate", type: "text/html" - xml.id projects_url + xml.id user_url(@user) xml.updated @events.maximum(:updated_at).strftime("%Y-%m-%dT%H:%M:%SZ") if @events.any? @events.each do |event| diff --git a/app/views/users/show.html.haml b/app/views/users/show.html.haml index a2286773629..15a3f741e6c 100644 --- a/app/views/users/show.html.haml +++ b/app/views/users/show.html.haml @@ -1,5 +1,5 @@ = content_for :meta_tags do - = auto_discovery_link_tag(:atom, user_url(@user, format: :atom), title: "Activity feed for #{@user.name}") + = auto_discovery_link_tag(:atom, user_url(@user, format: :atom), title: "#{@user.name} activity") .row = link_to '#aside', class: 'show-aside' do |