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	Add scenarios for log in (#3497)	8 years ago
fixtures	Slightly reduce RAM usage (#7301)	7 years ago
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	Account archive download (#6460)	7 years ago
models	Merge branch 'master' into glitch-soc/merge-upstream	7 years ago
policies	Update StatusPolicy to check current_account for local_only? toots.	7 years ago
presenters	Isolate each specs for cache store (#6450)	7 years ago
requests	Use raw status code on have_http_status (#7214)	7 years ago
routing	Move create/destroy actions for api/v1/statuses to namespace (#3678)	8 years ago
services	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	7 years ago
support	Remove empty strings (#5732)	7 years ago
validators	Merge remote-tracking branch 'origin/master' into gs-master	7 years ago
views	Merge branch 'master' into glitch-soc/tentative-merge	7 years ago
workers	Lists (#5703)	7 years ago
rails_helper.rb	Slightly reduce RAM usage (#7301)	7 years ago
spec_helper.rb	Disable simplecov on CircleCI (#7416)	7 years ago