diff options
| author | ThibG <thib@sitedethib.com> | 2020-07-15 16:56:33 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-15 16:56:33 +0200 |
| commit | 37c092e9fdedd36c167e4b84610e7346c446e1d3 (patch) | |
| tree | 88992f2d65c83ece4e93f0b4b5c34ffed0989138 /app/lib/settings | |
| parent | 7a23347db5be3f262dbcafbecf768588dc648bda (diff) | |
| parent | 470458da13586db0e6ca074987fecfc80293d955 (diff) | |
Merge pull request #1382 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/lib/settings')
| -rw-r--r-- | app/lib/settings/scoped_settings.rb | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/app/lib/settings/scoped_settings.rb b/app/lib/settings/scoped_settings.rb index 4d21e0de7..8aa826561 100644 --- a/app/lib/settings/scoped_settings.rb +++ b/app/lib/settings/scoped_settings.rb @@ -12,7 +12,7 @@ module Settings @object = object end - # rubocop:disable Style/MethodMissing + # rubocop:disable Style/MethodMissingSuper def method_missing(method, *args) method_name = method.to_s # set a value for a variable @@ -25,7 +25,7 @@ module Settings self[method_name] end end - # rubocop:enable Style/MethodMissing + # rubocop:enable Style/MethodMissingSuper def respond_to_missing?(*) true @@ -49,7 +49,6 @@ module Settings record.update!(value: value) Rails.cache.write(Setting.cache_key(key, @object), value) - value end def [](key) |