You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
nyastodon/app/controllers
Jeremy Kescher 03f50f2f00
Merge remote-tracking branch 'upstream/main' into develop
# Conflicts:
#	app/javascript/flavours/glitch/features/ui/components/link_footer.js
#	lib/mastodon/version.rb
#	public/avatars/original/missing.png
2 years ago
..
activitypub Merge branch 'main' into glitch-soc/merge-upstream 2 years ago
admin Merge branch 'main' into glitch-soc/merge-upstream 2 years ago
api Merge remote-tracking branch 'upstream/main' into develop 2 years ago
auth Merge branch 'main' into glitch-soc/merge-upstream 2 years ago
concerns Merge branch 'main' into glitch-soc/merge-upstream 2 years ago
disputes Merge branch 'main' into glitch-soc/merge-upstream 2 years ago
filters Fix error when accessing /filters/:id/statuses on glitch-soc (#1837) 2 years ago
oauth Merge branch 'main' into glitch-soc/merge-upstream 2 years ago
settings Merge branch 'main' into glitch-soc/merge-upstream 2 years ago
well_known Remove Keybase integration (#17045) 2 years ago
about_controller.rb Change public accounts pages to mount the web UI (#19319) 2 years ago
accounts_controller.rb Merge branch 'main' into glitch-soc/merge-upstream 2 years ago
application_controller.rb Merge branch 'main' into glitch-soc/merge-upstream 2 years ago
authorize_interactions_controller.rb Merge branch 'main' into glitch-soc/merge-upstream 2 years ago
custom_css_controller.rb Add customizable user roles (#18641) 2 years ago
emojis_controller.rb Add (back) rails-level JSON caching (#11333) 5 years ago
filters_controller.rb Merge branch 'main' into glitch-soc/merge-upstream 2 years ago
follower_accounts_controller.rb Merge branch 'main' into glitch-soc/merge-upstream 2 years ago
following_accounts_controller.rb Change public accounts pages to mount the web UI (#19319) 2 years ago
health_controller.rb Change health check (#15988) 3 years ago
home_controller.rb Change public accounts pages to mount the web UI (#19319) 2 years ago
instance_actors_controller.rb Fix instance actor not being dereferenceable (#17457) 2 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 Refactor how Redis locks are created (#18400) 2 years ago
privacy_controller.rb Change public accounts pages to mount the web UI (#19319) 2 years ago
relationships_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 2 years ago
tags_controller.rb Change public accounts pages to mount the web UI (#19319) 2 years ago