Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: Dockerfile app/javascript/packs/common.js config/webpack/loaders/sass.js config/webpack/shared.js db/schema.rb package.json yarn.lock A lot of the conflicts come from updating webpack. Even though upstream deleted app/javascript/packs/common.js, I kept glitch-soc's version as it unifies JS/CSS packs behavior across flavours. Ported glitch changes to webpack 4.x
This commit is contained in:
4
spec/fabricators/relay_fabricator.rb
Normal file
4
spec/fabricators/relay_fabricator.rb
Normal file
@ -0,0 +1,4 @@
|
||||
Fabricator(:relay) do
|
||||
inbox_url "https://example.com/inbox"
|
||||
enabled true
|
||||
end
|
Reference in New Issue
Block a user