You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Thibaut Girka f26f1145ac 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		7 years ago
..
controllers	Migrate glitch-soc keyword mutes to Mastodon's	7 years ago
fabricators	Merge branch 'master' into glitch-soc/merge-upstream	7 years ago
features	…
fixtures	…
helpers	Merge branch 'master' into glitch-soc/merge-upstream	7 years ago
lib	Merge branch 'master' into glitch-soc/merge-upstream	7 years ago
mailers	…
models	Merge branch 'master' into glitch-soc/merge-upstream	7 years ago
policies	…
presenters	…
requests	…
routing	…
services	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	7 years ago
support	…
validators	…
views	Merge branch 'master' into glitch-soc/tentative-merge	7 years ago
workers	…
rails_helper.rb	…
spec_helper.rb	…