You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

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		6 years ago
..
controllers	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
fabricators	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
features	rubocop issues - Cleaning up (#8912)	6 years ago
fixtures	Export and import show_reblogs together with following list (#10495)	6 years ago
helpers	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
lib	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
mailers	Add invite request to pending account notification e-mail (#10528)	6 years ago
models	Update remote bio test from 160 to 500 (#10799)	6 years ago
policies	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
presenters	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
requests	Redesign landing page (#10232)	6 years ago
routing	…
serializers/activitypub	Improved remote thread fetching (#10106)	6 years ago
services	Merge remote-tracking branch 'upstream/master' into glitch-soc/merge-upstream	6 years ago
support	…
validators	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
views	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
workers	Improved remote thread fetching (#10106)	6 years ago
rails_helper.rb	Disable Same-Site cookie implementation to fix SSO issues on WebKit browsers (#9819)	6 years ago
spec_helper.rb	Disable simplecov on CircleCI (#7416)	7 years ago