diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2023-02-10 22:56:36 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-02-10 22:56:36 +0100 |
| commit | dc02a93d04815c618dc55748fff3cfe64c7023d9 (patch) | |
| tree | 5b6d56d248379823660d70dc35c95e4c547f43ea /app/models/setting.rb | |
| parent | 76b4e7727b7497c1b68e06133831701f8950ae19 (diff) | |
| parent | 87419f9307f54755af4604876ac149262ae3f0a6 (diff) | |
Merge pull request #2105 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/models/setting.rb')
| -rw-r--r-- | app/models/setting.rb | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/app/models/setting.rb b/app/models/setting.rb index 4bcaa060f..c6558d692 100644 --- a/app/models/setting.rb +++ b/app/models/setting.rb @@ -23,7 +23,7 @@ class Setting < RailsSettings::Base def [](key) return super(key) unless rails_initialized? - val = Rails.cache.fetch(cache_key(key, nil)) do + Rails.cache.fetch(cache_key(key, nil)) do db_val = object(key) if db_val @@ -35,7 +35,6 @@ class Setting < RailsSettings::Base default_settings[key] end end - val end def all_as_records |