summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorJeroen van Baarsen <jeroenvanbaarsen@gmail.com>2015-05-15 11:36:40 +0200
committerJeroen van Baarsen <jeroenvanbaarsen@gmail.com>2015-05-15 11:36:40 +0200
commit735fbb43edc0f599f3cc754da135e1c67ab3cc79 (patch)
tree3af927d1cca8ed8d0f5d2f983f3450aeafd3ee5d /app
parenta13e6f13c7a1dc4ee329e36b58ec0a28c17fedeb (diff)
parentdfb58234a1b2b354d82f936086737f9f3073b68e (diff)
downloadgitlab-ce-735fbb43edc0f599f3cc754da135e1c67ab3cc79.tar.gz
Merge pull request #9296 from jorgevbo/master
Fix bug with default timezone en RSS gitlab events
Diffstat (limited to 'app')
-rw-r--r--app/helpers/events_helper.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/helpers/events_helper.rb b/app/helpers/events_helper.rb
index 18c75a8726b..7cce059c3ef 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:%SZ")
+ xml.updated event.created_at.strftime("%Y-%m-%dT%H:%M:%S%Z")
xml.media :thumbnail, width: "40", height: "40", url: avatar_icon(event.author_email)
xml.author do |author|
xml.name event.author_name