luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-11-08 07:55:14 +00:00
Code Issues Projects Releases Wiki Activity
mastodon/app/views
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
..
about
accounts Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master 2018-06-12 13:17:21 +00:00
admin Merge branch 'master' into glitch-soc/merge-upstream 2018-07-16 14:50:42 +02:00
admin_mailer
application
auth Add autofollow option to invites (#7805) 2018-06-15 18:00:23 +02:00
authorize_follows Add autofollow option to invites (#7805) 2018-06-15 18:00:23 +02:00
errors
filters Add option to not consider word boundaries when processing keyword filtering (#7975) 2018-07-09 02:22:09 +02:00
follower_accounts
following_accounts
home
invites Add autofollow option to invites (#7805) 2018-06-15 18:00:23 +02:00
kaminari
layouts
media
notification_mailer
oauth
remote_follow Add follow button to detailed status, add gradient to mask bio cut-off (#7979) 2018-07-07 22:20:14 +02:00
remote_unfollows
settings Merge branch 'master' into glitch-soc/tentative-merge 2018-07-09 07:13:59 +02:00
shared Add follow button to detailed status, add gradient to mask bio cut-off (#7979) 2018-07-07 22:20:14 +02:00
shares
stream_entries Merge branch 'master' into glitch-soc/tentative-merge 2018-07-09 07:13:59 +02:00
tags
user_mailer
well_known