1
0
mirror of https://github.com/mastodon/mastodon.git synced 2024-12-14 15:15:08 +01:00
mastodon/app/serializers
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
..
activitypub Add federation relay support () 2018-07-13 02:16:06 +02:00
rest Merge branch 'master' into glitch-soc/tentative-merge 2018-07-09 07:13:59 +02:00
rss Add RSS feeds for end-users () 2018-04-25 02:10:02 +02:00
web Do not encode HTML entities in initial Web Push payload body () 2018-05-22 18:12:45 +02:00
initial_state_serializer.rb Merge branch 'master' into glitch-soc/merge-upstream 2018-07-16 14:50:42 +02:00
manifest_serializer.rb implement web share target () 2018-01-17 17:08:10 +01:00
oembed_serializer.rb Clean up and improve generated OpenGraph tags () 2017-09-12 05:39:38 +02:00
webfinger_serializer.rb Remove rabl dependency () 2017-12-06 15:04:49 +09:00