mastodon-docker-playground/spec
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
2018-07-16 14:50:42 +02:00
..
controllers Migrate glitch-soc keyword mutes to Mastodon's 2018-07-09 19:19:23 +02:00
fabricators Merge branch 'master' into glitch-soc/merge-upstream 2018-07-16 14:50:42 +02:00
features
fixtures Slightly reduce RAM usage (#7301) 2018-05-02 18:58:48 +02:00
helpers Merge branch 'master' into glitch-soc/merge-upstream 2018-07-16 14:50:42 +02:00
lib Merge branch 'master' into glitch-soc/merge-upstream 2018-07-16 14:50:42 +02:00
mailers Account archive download (#6460) 2018-02-21 23:21:32 +01:00
models Merge branch 'master' into glitch-soc/merge-upstream 2018-07-16 14:50:42 +02:00
policies Update StatusPolicy to check current_account for local_only? toots. 2017-11-17 09:07:21 -06:00
presenters Isolate each specs for cache store (#6450) 2018-02-17 22:35:05 +01:00
requests Use raw status code on have_http_status (#7214) 2018-04-21 21:35:07 +02:00
routing
services Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master 2018-06-12 13:17:21 +00:00
support Remove empty strings (#5732) 2017-11-17 10:52:30 +09:00
validators Merge remote-tracking branch 'origin/master' into gs-master 2018-03-27 10:44:12 -05:00
views Merge branch 'master' into glitch-soc/tentative-merge 2018-07-09 07:13:59 +02:00
workers Lists (#5703) 2017-11-18 00:16:48 +01:00
rails_helper.rb Slightly reduce RAM usage (#7301) 2018-05-02 18:58:48 +02:00
spec_helper.rb Disable simplecov on CircleCI (#7416) 2018-05-09 16:59:58 +02:00