luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-12-29 16:46:51 +00:00
Code Issues Projects Releases Wiki Activity
mastodon/lib
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
..
assets Add emoji autosuggest (#5053) 2017-09-23 14:47:32 +02:00
devise Add LDAP_TLS_NO_VERIFY option, don't require LDAP_ENABLED outside .env (#6845) 2018-03-20 19:41:51 +01:00
mastodon Merge branch 'master' into glitch-soc/merge-upstream 2018-07-11 17:57:08 +02:00
paperclip Merge branch 'master' into glitch-soc/merge-upstream 2018-07-16 14:50:42 +02:00
tasks Merge remote-tracking branch 'tootsuite/master' into merge-upstream 2018-06-07 05:13:49 -05:00
templates/haml/scaffold Adding simple_form, adding profile settings, header image 2016-03-12 20:47:22 +01:00