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 e70fc059a9 Merge branch 'master' into glitch-soc/merge-upstream		7 years ago
..
activitypub	Better pagination for ActivityPub outbox (#7356)	7 years ago
admin	Merge branch 'master' into glitch-soc/merge-upstream	7 years ago
api	Merge branch 'master' into glitch-soc/master	7 years ago
auth	Merge branch 'master' into glitch-soc/merge-upstream	7 years ago
concerns	Redesign public profiles and toots (#8068)	7 years ago
oauth	Merge branch 'master' into glitch-soc/merge-upstream	7 years ago
settings	Migrate glitch-soc keyword mutes to Mastodon's	7 years ago
well_known	…
about_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	7 years ago
account_follow_controller.rb	…
account_unfollow_controller.rb	…
accounts_controller.rb	Merge branch 'master' into glitch-soc/master	7 years ago
application_controller.rb	Merge branch 'master' into glitch-soc/master	7 years ago
authorize_interactions_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	7 years ago
emojis_controller.rb	Unuse ActiveRecord::Base#cache_key (#8185)	7 years ago
filters_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	7 years ago
follower_accounts_controller.rb	Merge remote-tracking branch 'origin/master' into merge-upstream	7 years ago
following_accounts_controller.rb	Merge remote-tracking branch 'origin/master' into merge-upstream	7 years ago
home_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	7 years ago
intents_controller.rb	Add remote interaction dialog for toots (#8202)	7 years ago
invites_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	7 years ago
manifests_controller.rb	…
media_controller.rb	…
media_proxy_controller.rb	Raise Mastodon::RaceConditionError if Redis lock failed (#7511)	7 years ago
remote_follow_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	7 years ago
remote_interaction_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	7 years ago
remote_unfollows_controller.rb	Add tests for remote_unfollows_controller (#7879)	7 years ago
shares_controller.rb	Merge branch 'master' into glitch-soc/merge	7 years ago
statuses_controller.rb	Override CSP setting in the embed controller to allow frames	7 years ago
stream_entries_controller.rb	Merge remote-tracking branch 'origin/master' into gs-master	7 years ago
tags_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	7 years ago