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
Claire 30ee7339d3 Merge commit '7d9b209fe84b00eff348ea9d54905cbfffa79788' into glitch-soc/merge-upstream
Conflicts:
- `app/models/form/admin_settings.rb`:
  Upstream changed code style change, including on a line modified by glitch-soc.
  Kept glitch-soc's line but with the code style change applied.
5 months ago
..
activitypub Merge branch 'main' into glitch-soc/merge-upstream 1 year ago
admin Merge commit '272592d16d40e804ec325ef3b5e6de9bbad5f2dd' into glitch-soc/merge-upstream 5 months ago
api Merge commit '7d9b209fe84b00eff348ea9d54905cbfffa79788' into glitch-soc/merge-upstream 5 months ago
auth Merge commit '7d9b209fe84b00eff348ea9d54905cbfffa79788' into glitch-soc/merge-upstream 5 months ago
concerns Merge commit '272592d16d40e804ec325ef3b5e6de9bbad5f2dd' into glitch-soc/merge-upstream 5 months ago
disputes Merge commit '85662a5a57531af5402a6777d0b1089e78c56815' into glitch-soc/merge-upstream 5 months ago
filters Merge branch 'main' into glitch-soc/merge-upstream 1 year ago
oauth Merge commit '272592d16d40e804ec325ef3b5e6de9bbad5f2dd' into glitch-soc/merge-upstream 5 months ago
settings Merge commit '272592d16d40e804ec325ef3b5e6de9bbad5f2dd' into glitch-soc/merge-upstream 5 months ago
well_known Add `Account#unavailable?` and `Account#permanently_unavailable?` aliases (#28053) 6 months ago
about_controller.rb Simplify instance presenter view access (#26046) 8 months ago
accounts_controller.rb Merge commit '85662a5a57531af5402a6777d0b1089e78c56815' into glitch-soc/merge-upstream 5 months ago
application_controller.rb Fix self-destruct page not using theme styles (#2490) 6 months ago
authorize_interactions_controller.rb Change interaction modal in web UI (#26075) 10 months ago
backups_controller.rb Add SELF_DESTRUCT env variable to process self-destructions in the background (#26439) 7 months ago
custom_css_controller.rb Refactor `Cache-Control` and `Vary` definitions (#24347) 1 year ago
emojis_controller.rb Refactor `Cache-Control` and `Vary` definitions (#24347) 1 year ago
filters_controller.rb Merge commit '85662a5a57531af5402a6777d0b1089e78c56815' into glitch-soc/merge-upstream 5 months ago
follower_accounts_controller.rb Merge commit '40ba6e119b7457161fd43b449875d0fb9d473c1a' into glitch-soc/merge-upstream 7 months ago
following_accounts_controller.rb Fix Vary headers not being set on some redirects (#27272) 8 months ago
health_controller.rb
home_controller.rb Simplify instance presenter view access (#26046) 8 months ago
instance_actors_controller.rb Fix /actor needlessly reading session cookie and varying on Signature (#24664) 1 year ago
intents_controller.rb Fix Performance/DeletePrefix cop (#24796) 1 year ago
invites_controller.rb Merge branch 'main' into glitch-soc/merge-upstream 1 year ago
mail_subscriptions_controller.rb Add List-Unsubscribe email header (#26085) 10 months ago
manifests_controller.rb Fix some user-independent endpoints potentially reading session cookies (#24650) 1 year ago
media_controller.rb Merge commit '425d77f8124a50fc033e8fb3bdf7b89a6a25f4fa' into glitch-soc/merge-upstream 9 months ago
media_proxy_controller.rb Refactor: replace whitelist_mode mentions with limited_federation_mode (#26252) 10 months ago
privacy_controller.rb Simplify instance presenter view access (#26046) 8 months ago
relationships_controller.rb Merge commit '7d9b209fe84b00eff348ea9d54905cbfffa79788' into glitch-soc/merge-upstream 5 months ago
remote_interaction_helper_controller.rb Change interaction modal in web UI (#26075) 10 months ago
shares_controller.rb
statuses_cleanup_controller.rb Merge commit '85662a5a57531af5402a6777d0b1089e78c56815' into glitch-soc/merge-upstream 5 months ago
statuses_controller.rb Merge commit '5393be7a21331c8615ffb79c2271db92f6959458' into glitch-soc/merge-upstream 7 months ago
tags_controller.rb Simplify instance presenter view access (#26046) 8 months ago