scottk/chatwoot
1
0
Fork 0
mirror of https://github.com/lingble/chatwoot.git synced 2025-11-03 04:27:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'hotfix/1.5.3' into develop

Browse Source
This commit is contained in:
Sojan
2020-06-22 12:02:58 +05:30
parent 963f173730 d4214cd78f
commit aa8a85b8bd
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
config/app.yml
View File

@@ -1,5 +1,5 @@
shared: &shared shared: &shared
version: '1.5.2' version: '1.5.3'
development: development:
<<: *shared <<: *shared

2
lib/global_config.rb
View File

@@ -31,7 +31,7 @@ class GlobalConfig
if cached_value.blank? if cached_value.blank?
value_from_db = db_fallback(config_key) value_from_db = db_fallback(config_key)
cached_value = { value: value_from_db }.to_json cached_value = { value: value_from_db }.to_json
$alfred.set(cache_key, cached_value, { expiry: DEFAULT_EXPIRY }) $alfred.set(cache_key, cached_value, { ex: DEFAULT_EXPIRY })
end end
JSON.parse(cached_value)['value'] JSON.parse(cached_value)['value']