Merge branch 'master' into glitch-soc/merge-upstream

Conflicts:
	config/locales/simple_form.ja.yml

spec/fabricators/web_push_subscription_fabricator.rb

@@ -1,4 +1,4 @@
-Fabricator(:web_push_subscription) do
+Fabricator(:web_push_subscription, from: Web::PushSubscription) do
   endpoint   Faker::Internet.url
   key_p256dh Faker::Internet.password
   key_auth   Faker::Internet.password

spec/fabricators/web_setting_fabricator.rb

@@ -1,3 +1,2 @@
-Fabricator('Web::Setting') do
-
+Fabricator(:web_setting, from: Web::Setting) do
 end