djsundog/tootlab-mastodon
1
0
Fork 0
mirror of https://github.com/glitch-soc/mastodon.git synced 2024-11-15 04:34:00 -05:00
Code Issues Packages Projects Releases Wiki Activity
f328d20ff8
tootlab-mastodon/spec
History
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
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
models Merge branch 'master' into glitch-soc/merge-upstream 2018-07-16 14:50:42 +02:00
policies
presenters
requests
routing
services Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master 2018-06-12 13:17:21 +00:00
support
validators
views Merge branch 'master' into glitch-soc/tentative-merge 2018-07-09 07:13:59 +02:00
workers
rails_helper.rb
spec_helper.rb Disable simplecov on CircleCI (#7416) 2018-05-09 16:59:58 +02:00