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
..
activitypub	Do not try fetching keys of unknown accounts on a Delete from them (#10326)	6 years ago
admin	Record account suspend/silence time and keep track of domain blocks (#10660)	6 years ago
api	Merge remote-tracking branch 'upstream/master' into glitch-soc/merge-upstream	6 years ago
auth	Check that an invite link is valid before bypassing approval mode (#10657)	6 years ago
concerns	…
oauth	Add force_login option to OAuth authorize page (#8655)	6 years ago
settings	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
well_known	Add Keybase integration (#10297)	6 years ago
about_controller_spec.rb	…
account_follow_controller_spec.rb	…
account_unfollow_controller_spec.rb	…
accounts_controller_spec.rb	Admission-based registrations mode (#10250)	6 years ago
application_controller_spec.rb	…
authorize_interactions_controller_spec.rb	…
emojis_controller_spec.rb	…
follower_accounts_controller_spec.rb	…
following_accounts_controller_spec.rb	…
home_controller_spec.rb	…
intents_controller_spec.rb	…
invites_controller_spec.rb	…
manifests_controller_spec.rb	…
media_controller_spec.rb	…
relationships_controller_spec.rb	Add relationship manager UI (#10268)	6 years ago
remote_follow_controller_spec.rb	…
remote_interaction_controller_spec.rb	…
remote_unfollows_controller_spec.rb	…
shares_controller_spec.rb	…
statuses_controller_spec.rb	…
stream_entries_controller_spec.rb	…
tags_controller_spec.rb	…