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 f513317ba2 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/models/status.rb - db/schema.rb Both conflicts are caused by us having extra database columns.		6 years ago
..
activitypub	Add specs for activitypub collections controller (#9484)	6 years ago
admin	Redesign admin instances area (#9645)	6 years ago
api	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
auth	…
concerns	Add spec for AccountableConcern#log_action (#9559)	6 years ago
oauth	…
settings	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
well_known	…
about_controller_spec.rb	…
account_follow_controller_spec.rb	…
account_unfollow_controller_spec.rb	…
accounts_controller_spec.rb	…
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	…
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	Fix thread depth computation in statuses_controller (#9426)	6 years ago
stream_entries_controller_spec.rb	…
tags_controller_spec.rb	Redesign public hashtag page to use a masonry layout (#9822)	6 years ago