Thibaut Girka 1b0ff4cd69 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/controllers/settings/notifications_controller.rb - app/javascript/packs/public.js - app/views/settings/preferences/show.html.haml - app/views/stream_entries/_simple_status.html.haml - config/locales/simple_form.en.yml - config/locales/simple_form.pl.yml - config/navigation.rb - config/routes.rb		2019-06-10 18:59:53 +02:00
..
controllers	Merge branch 'master' into glitch-soc/merge-upstream	2019-06-10 18:59:53 +02:00
fabricators	Merge branch 'master' into glitch-soc/merge-upstream	2019-05-15 17:11:40 +02:00
features
fixtures	Export and import show_reblogs together with following list (#10495)	2019-04-08 07:28:27 +02:00
helpers	Merge branch 'master' into glitch-soc/merge-upstream	2019-03-16 14:14:20 +01:00
lib	Merge branch 'master' into glitch-soc/merge-upstream	2019-06-07 17:00:36 +02:00
mailers	Add invite request to pending account notification e-mail (#10528)	2019-04-10 00:36:01 +02:00
models	Update remote bio test from 160 to 500 (#10799)	2019-05-21 13:29:06 +02:00
policies
presenters	Merge branch 'master' into glitch-soc/merge-upstream	2019-03-14 17:17:20 +01:00
requests	Redesign landing page (#10232)	2019-03-12 17:34:00 +01:00
routing
serializers/activitypub	Improved remote thread fetching (#10106)	2019-02-28 15:22:21 +01:00
services	Merge remote-tracking branch 'upstream/master' into glitch-soc/merge-upstream	2019-06-03 14:54:30 +02:00
support
validators	Merge branch 'master' into glitch-soc/merge-upstream	2019-05-19 21:53:44 +02:00
views	Merge branch 'master' into glitch-soc/merge-upstream	2019-03-13 15:16:02 +01:00
workers	Improved remote thread fetching (#10106)	2019-02-28 15:22:21 +01:00
rails_helper.rb
spec_helper.rb