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 1682ac5717 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/controllers/following_accounts_controller.rb Conflicts were due to glitch-soc's theming system. - app/javascript/packs/public.js Some code has been change upstream, but it has been moved to app/javascript/core/settings.js in glitch-soc. Applied the changes there.		6 years ago
..
activitypub	Do not try fetching keys of unknown accounts on a Delete from them (#10326)	6 years ago
admin	Add validations to admin settings (#10348)	6 years ago
api	…
auth	…
concerns	Admission-based registrations mode (#10250)	6 years ago
oauth	Add force_login option to OAuth authorize page (#8655)	7 years ago
settings	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
well_known	…
about_controller_spec.rb	…
account_follow_controller_spec.rb	Cover AccountFollowController more in spec (#3227)	8 years ago
account_unfollow_controller_spec.rb	…
accounts_controller_spec.rb	…
application_controller_spec.rb	…
authorize_interactions_controller_spec.rb	…
emojis_controller_spec.rb	Misc. typos (#8694)	7 years ago
follower_accounts_controller_spec.rb	…
following_accounts_controller_spec.rb	Add tests for following accounts controller (#7800)	7 years ago
home_controller_spec.rb	…
intents_controller_spec.rb	…
invites_controller_spec.rb	…
manifests_controller_spec.rb	…
media_controller_spec.rb	…
relationships_controller_spec.rb	…
remote_follow_controller_spec.rb	…
remote_interaction_controller_spec.rb	…
remote_unfollows_controller_spec.rb	…
shares_controller_spec.rb	Add tests for shares_controller (#7835)	7 years ago
statuses_controller_spec.rb	…
stream_entries_controller_spec.rb	…
tags_controller_spec.rb	…