diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2020-07-15 15:32:40 +0200 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2020-07-15 15:32:40 +0200 |
| commit | 3f60b096b51b000905290d69ea05b874b60fa9e0 (patch) | |
| tree | 0b8c7011810b4a97523c2c63816735e519f0682c /app/lib/settings | |
| parent | 7a23347db5be3f262dbcafbecf768588dc648bda (diff) | |
| parent | d9cad44ca54374cafa0c97775083bb1bc0a5a3ce (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - `config/routes.rb`: Upstream disabled E2EE routes, which we did earlier, but slightly differently. Took upstream's version.
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) |