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

Conflicts: - app/controllers/directories_controller.rb - package.json - yarn.lock
2019-07-30 12:22:33 +02:00
parent f48c7689d2 b31b232edf
commit 24968d20a0
59 changed files with 779 additions and 221 deletions
--- a/spec/fabricators/domain_allow_fabricator.rb
+++ b/spec/fabricators/domain_allow_fabricator.rb
@@ -0,0 +1,3 @@
+Fabricator(:domain_allow) do
+  domain "MyString"
+end