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 c0dc247bce Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/models/account.rb - app/views/settings/profiles/show.html.haml - spec/controllers/api/v1/accounts/credentials_controller_spec.rb Conflicts were due to an increase in account bio length upstream, which is already covered in glitch-soc through `MAX_BIO_CHARS`.		5 years ago
..
activitypub	Cache featured collections, as well as outbox, followers and following (#10467)	5 years ago
admin	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
api	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
auth	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
concerns	Move signature verification stoplight to the requests themselves (#10813)	5 years ago
oauth	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
settings	Add option for default toot content-type	5 years ago
well_known	Allow turning keybase off instance-wide	5 years ago
about_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
account_follow_controller.rb	Restful refactor of accounts/ routes (#2133)	7 years ago
account_unfollow_controller.rb	Restful refactor of accounts/ routes (#2133)	7 years ago
accounts_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
application_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
authorize_interactions_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
custom_css_controller.rb	Add admin custom CSS setting (#8399)	6 years ago
directories_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
emojis_controller.rb	Unuse ActiveRecord::Base#cache_key (#8185)	6 years ago
filters_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
follower_accounts_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
following_accounts_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
home_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
intents_controller.rb	Add remote interaction dialog for toots (#8202)	6 years ago
invites_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
manifests_controller.rb	Make Chrome splash screen same color as web UI's background color (#5169)	7 years ago
media_controller.rb	fix CSP / X-Frame-Options for media embeds (#9558)	5 years ago
media_proxy_controller.rb	Raise Mastodon::RaceConditionError if Redis lock failed (#7511)	6 years ago
public_timelines_controller.rb	[Glitch] Redesign landing page	5 years ago
relationships_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
remote_follow_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
remote_interaction_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
remote_unfollows_controller.rb	Add tests for remote_unfollows_controller (#7879)	6 years ago
shares_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
statuses_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
stream_entries_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
tags_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago