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 cde0ac1aa7 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/views/admin/pending_accounts/index.html.haml No real conflict, upstream changes too close to glitch-specific theming system changes. - config/navigation.rb Upstream redesigned the settings navigation, took those changes and re-inserted the flavours menu.		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	Merge branch 'master' into glitch-soc/merge-upstream	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	Move create/destroy actions for api/v1/statuses to namespace (#3678)	8 years ago
serializers/activitypub	Improved remote thread fetching (#10106)	6 years ago
services	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
support	Remove empty strings (#5732)	7 years ago
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