Merge branch 'hotfix/1.5.3'

chatwoot · Jun 22, 2020 · 77c1693 · 77c1693
2 parents 991648e + d4214cd
commit 77c1693
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/config/app.yml b/config/app.yml
@@ -1,5 +1,5 @@
 shared: &shared
-  version: '1.5.2'
+  version: '1.5.3'
 
 development:
   <<: *shared

diff --git a/lib/global_config.rb b/lib/global_config.rb
@@ -31,7 +31,7 @@ def load_from_cache(config_key)
       if cached_value.blank?
         value_from_db = db_fallback(config_key)
         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
 
       JSON.parse(cached_value)['value']