Merge commit 'dc09c10fa8cc9230bf14e48d790c8f0c26043f8f' into glitch-soc/merge-upstream
Conflicts: - `.rubocop_todo.yml`: Upstream re-generated the file, while glitch-soc has a specific ignore for some file. Updated the file as upstream did and kept our extra ignore. - `config/webpack/shared.js`: Upstream added a plugin, but our files are pretty different. Added the plugin as well. - `spec/helpers/application_helper_spec.rb`: Upstream refactored tests, but part of them were different because of glitch-soc's theming system. Applied the refactoring to glitch-soc's change.
This commit is contained in:
@@ -2,8 +2,8 @@
|
||||
|
||||
class Redis
|
||||
module NamespaceExtensions
|
||||
def exists?(*args, &block)
|
||||
call_with_namespace('exists?', *args, &block)
|
||||
def exists?(...)
|
||||
call_with_namespace('exists?', ...)
|
||||
end
|
||||
end
|
||||
end
|
||||
|
Reference in New Issue
Block a user