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 fcce135d27 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/controllers/admin/settings_controller.rb - app/models/form/admin_settings.rb Conflicts caused by upstream refactoring, while we have flavours and skins, with the flavour_and_skin pseudo-setting.		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	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
auth	Admission-based registrations mode (#10250)	6 years ago
concerns	Admission-based registrations mode (#10250)	6 years ago
oauth	…
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	Add specs for RemoteInteractionController (#9524)	6 years ago
remote_unfollows_controller_spec.rb	…
shares_controller_spec.rb	…
statuses_controller_spec.rb	…
stream_entries_controller_spec.rb	…
tags_controller_spec.rb	Redesign public hashtag page to use a masonry layout (#9822)	6 years ago