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.

Claire 694c073d1f Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/controllers/admin/dashboard_controller.rb`: Upstream completely redesigned the admin dashboard. glitch-soc tracked extra features, but that list is gone. Followed upstram. - `app/views/admin/dashboard/index.html.haml` Upstream completely redesigned the admin dashboard. glitch-soc tracked extra features, but that list is gone. Followed upstram.		3 years ago
..
activitypub	Merge branch 'main' into glitch-soc/merge-upstream	3 years ago
admin	Merge branch 'main' into glitch-soc/merge-upstream	3 years ago
api	Merge branch 'main' into glitch-soc/merge-upstream	3 years ago
auth	Merge branch 'main' into glitch-soc/merge-upstream	3 years ago
concerns	Merge branch 'main' into glitch-soc/merge-upstream	3 years ago
oauth	Merge branch 'master' into glitch-soc/merge-upstream	4 years ago
settings	Merge branch 'main' into glitch-soc/merge-upstream	3 years ago
well_known	Merge branch 'main' into glitch-soc/merge-upstream	3 years ago
about_controller.rb	Merge branch 'main' into glitch-soc/merge-upstream	4 years ago
account_follow_controller.rb	Add specific rate limits for posting and following (#13172)	5 years ago
account_unfollow_controller.rb	Restful refactor of accounts/ routes (#2133)	8 years ago
accounts_controller.rb	Merge branch 'main' into glitch-soc/merge-upstream	4 years ago
application_controller.rb	Merge branch 'main' into glitch-soc/merge-upstream	3 years ago
authorize_interactions_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
custom_css_controller.rb	Remove set-cookie header on custom.css (#16314)	3 years ago
directories_controller.rb	Merge branch 'main' into glitch-soc/merge-upstream	4 years ago
emojis_controller.rb	Add (back) rails-level JSON caching (#11333)	5 years ago
filters_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	4 years ago
follower_accounts_controller.rb	Merge branch 'main' into glitch-soc/merge-upstream	3 years ago
following_accounts_controller.rb	Merge branch 'main' into glitch-soc/merge-upstream	3 years ago
health_controller.rb	Change health check (#15988)	4 years ago
home_controller.rb	Merge branch 'main' into glitch-soc/merge-upstream	3 years ago
instance_actors_controller.rb	Create instance actor if it hasn't been properly seeded (#15693)	4 years ago
intents_controller.rb	Refactor controllers for statuses, accounts, and more (#11249)	5 years ago
invites_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
manifests_controller.rb	Fix redirecting non-functional accounts on public pages (#11978)	5 years ago
media_controller.rb	Merge branch 'main' into glitch-soc/merge-upstream	3 years ago
media_proxy_controller.rb	Fix media proxy RedisLocks auto-releasing too fast (#16291)	4 years ago
public_timelines_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
relationships_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	4 years ago
remote_follow_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
remote_interaction_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	4 years ago
shares_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
statuses_cleanup_controller.rb	Fix account statuses cleanup settings controller for glitch-soc's theming system	3 years ago
statuses_controller.rb	Merge branch 'main' into glitch-soc/merge-upstream	4 years ago
tags_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	4 years ago