Merge branch 'master' into refactor-messages

# Conflicts:
#	app/views/epp/poll/poll_req.xml.builder
#	test/fixtures/messages.yml
#	test/integration/epp/poll_test.rb
This commit is contained in:
Artur Beljajev 2018-09-17 13:21:33 +03:00
commit 1679e4b72e
8 changed files with 55 additions and 7 deletions

View file

@ -5,7 +5,7 @@ xml.epp_head do
end
xml.tag!('msgQ', 'count' => current_user.unread_notifications.count, 'id' => @notification.id) do
xml.qDate @notification.created_at.try(:iso8601)
xml.qDate @notification.created_at.utc.xmlschema
xml.msg @notification.text
end