diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-06-02 23:31:43 -0700 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-06-02 23:31:43 -0700 |
| commit | c228098587c1e90ec0530ae4646381448e36e573 (patch) | |
| tree | 31f4bc50f22b5c06b699be5291b4475a2c3def1f | |
| parent | ee2124b7e935bb8bbe7a33c1a276efa296311b28 (diff) | |
| parent | a00e29d7ccc51f1bfd5a95f7cfba71e2dbe94021 (diff) | |
| download | gitlab-ce-c228098587c1e90ec0530ae4646381448e36e573.tar.gz | |
Merge pull request #4158 from evalhub/master
Group/Team Atom feed 500 error
| -rw-r--r-- | app/views/groups/show.atom.builder | 4 | ||||
| -rw-r--r-- | app/views/teams/show.atom.builder | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/app/views/groups/show.atom.builder b/app/views/groups/show.atom.builder index 807ff5f39b4..edf03642d82 100644 --- a/app/views/groups/show.atom.builder +++ b/app/views/groups/show.atom.builder @@ -9,8 +9,8 @@ xml.feed "xmlns" => "http://www.w3.org/2005/Atom", "xmlns:media" => "http://sear @events.each do |event| if event.proper? xml.entry do - event_link = event.feed_url - event_title = event.feed_title + event_link = event_feed_url(event) + event_title = event_feed_title(event) xml.id "tag:#{request.host},#{event.created_at.strftime("%Y-%m-%d")}:#{event.id}" xml.link :href => event_link diff --git a/app/views/teams/show.atom.builder b/app/views/teams/show.atom.builder index 1468ac1d03c..fffb78d53e8 100644 --- a/app/views/teams/show.atom.builder +++ b/app/views/teams/show.atom.builder @@ -9,8 +9,8 @@ xml.feed "xmlns" => "http://www.w3.org/2005/Atom", "xmlns:media" => "http://sear @events.each do |event| if event.proper? xml.entry do - event_link = event.feed_url - event_title = event.feed_title + event_link = event_feed_url(event) + event_title = event_feed_title(event) xml.id "tag:#{request.host},#{event.created_at.strftime("%Y-%m-%d")}:#{event.id}" xml.link :href => event_link |