diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2018-06-20 11:56:50 +0300 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2018-06-20 11:56:50 +0300 |
| commit | ae20de7afc189c13ca039a448b3643b155b6c44e (patch) | |
| tree | e85c52fd0ad7d87e3aa5e04f4131074ac2059de3 | |
| parent | c02f396be5e76a4b4ea8dceebc0b4b530a18dabd (diff) | |
| parent | 9d5f5c43119197b9c522ae121af5564f43d06574 (diff) | |
Merge branch '47959-rails5-redis-timewithzone' into 'master'
Resolve "[Rails5] expected "2018-05-07 13:53:08 UTC" to be an instance of ActiveSupport::TimeWithZone"
Closes #47959
See merge request gitlab-org/gitlab-ce!20000
| -rw-r--r-- | app/models/concerns/redis_cacheable.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/concerns/redis_cacheable.rb b/app/models/concerns/redis_cacheable.rb index b5425295130..3bdc1330d23 100644 --- a/app/models/concerns/redis_cacheable.rb +++ b/app/models/concerns/redis_cacheable.rb @@ -48,7 +48,7 @@ module RedisCacheable def cast_value_from_cache(attribute, value) if Gitlab.rails5? - self.class.type_for_attribute(attribute).cast(value) + self.class.type_for_attribute(attribute.to_s).cast(value) else self.class.column_for_attribute(attribute).type_cast_from_database(value) end |