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
..
admin	Improvements to toots display in admin view (#7452)	2018-05-12 17:44:15 +02:00
settings
application_helper.rb	Add more granular OAuth scopes (#7929)	2018-07-05 18:31:35 +02:00
flashes_helper.rb
home_helper.rb
instance_helper.rb
jsonld_helper.rb	Fetch boosted statuses on behalf of a follower (fixes #7426) (#7459)	2018-05-12 16:48:32 +02:00
mailer_helper.rb
routing_helper.rb
settings_helper.rb	Weblate translations (2018-07-05) (#7950)	2018-07-05 21:50:16 +09:00
stream_entries_helper.rb	Display full acct on public status pages, always (#8011)	2018-07-14 04:07:47 +02:00