Merge commit '01ce9df88008cee705b7e02a4581802afa07c3df' into glitch-soc/merge-upstream
Conflicts: - `tsconfig.json`: Upstream made style fixes, while glitch-soc had extra options. Ported upstream's style fixes.
This commit is contained in:
commit
22cfab0ebf
63 files changed
+291
-88
No files matched your search
@@ -24,7 +24,7 @@ namespace :tests do
|
||||
exit(1)
|
||||
end
|
||||
|
||||
if Account.where(domain: Rails.configuration.x.local_domain).exists?
|
||||
if Account.exists?(domain: Rails.configuration.x.local_domain)
|
||||
puts 'Faux remote accounts not properly cleaned up'
|
||||
exit(1)
|
||||
end
|
||||
|
||||
Reference in new issue
Block a user