diff options
| author | Douwe Maan <douwe@gitlab.com> | 2015-06-23 11:59:03 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2015-06-23 11:59:03 +0000 |
| commit | 1cfdc7a63b2ebeffdd6f44310f42c83b78a6e7e6 (patch) | |
| tree | 4eacffe3a6c4e41cf44cb223dca8c9f6ee71b073 | |
| parent | 883438970df30ac7101d8f32b30007c4248c75d5 (diff) | |
| parent | cacc955accb7087501b154457dff20bece7a5d44 (diff) | |
| download | gitlab-ce-1cfdc7a63b2ebeffdd6f44310f42c83b78a6e7e6.tar.gz | |
Merge branch 'fix-issue-1771-2' into 'master'
Fixed invalid timestamps in RSS feed #1771
Fixed invalid timestamps in RSS feed by using rfc3339 #1771
See merge request !870
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | app/helpers/events_helper.rb | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG index a8aaec1e566..506f25684cb 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,6 +1,7 @@ Please view this file on the master branch, on stable branches it's out of date. v 7.13.0 (unreleased) + - Fix invalid timestamps in RSS feeds (Rowan Wookey) - Update maintenance documentation to explain no need to recompile asssets for omnibus installations (Stan Hu) - Support commenting on diffs in side-by-side mode (Stan Hu) - Fix JavaScript error when clicking on the comment button on a diff line that has a comment already (Stan Hu) diff --git a/app/helpers/events_helper.rb b/app/helpers/events_helper.rb index d440da050e1..8428281f8f6 100644 --- a/app/helpers/events_helper.rb +++ b/app/helpers/events_helper.rb @@ -189,7 +189,7 @@ module EventsHelper xml.id "tag:#{request.host},#{event.created_at.strftime("%Y-%m-%d")}:#{event.id}" xml.link href: event_link xml.title truncate(event_title, length: 80) - xml.updated event.created_at.strftime("%Y-%m-%dT%H:%M:%S%Z") + xml.updated event.created_at.xmlschema xml.media :thumbnail, width: "40", height: "40", url: avatar_icon(event.author_email) xml.author do |author| xml.name event.author_name |