Commit d5b1551341107c003cdab2c644b761c38f86eebe
Exists in
theme-brasil-digital-from-staging
and in
9 other branches
Merge branch 'api' into stable
Conflicts: lib/api/entities.rb
Showing
1 changed file
with
1 additions
and
1 deletions
Show diff stats
lib/api/entities.rb
@@ -2,7 +2,7 @@ module API | @@ -2,7 +2,7 @@ module API | ||
2 | module Entities | 2 | module Entities |
3 | 3 | ||
4 | Grape::Entity.format_with :timestamp do |date| | 4 | Grape::Entity.format_with :timestamp do |date| |
5 | - date.strftime('%Y/%m/%d %H:%M:%S') | 5 | + date.strftime('%Y/%m/%d %H:%M:%S') if date |
6 | end | 6 | end |
7 | 7 | ||
8 | class Image < Grape::Entity | 8 | class Image < Grape::Entity |