mastodon-glitch/app/controllers
Claire 665e9129fe Merge commit 'e0648a916ab81925545504173bf4f43ec64d4f3c' into glitch-soc/merge-upstream
Conflicts:
- `app/models/custom_emoji.rb`:
  An upstream refactor touched lines adjacent to ones modified in glitch-soc.
  Ported upstream's changes.
2024-09-16 21:08:58 +02:00
..
activitypub Merge commit 'b2388be71eb0031ef9e47c492b1c038231cd8bc0' into glitch-soc/merge-upstream 2024-05-16 19:30:10 +02:00
admin Merge commit '7335a43b6dac0e82c305ce4dec9db4da114c769e' into glitch-soc/merge-upstream 2024-09-06 19:25:31 +02:00
api Merge commit 'e0648a916ab81925545504173bf4f43ec64d4f3c' into glitch-soc/merge-upstream 2024-09-16 21:08:58 +02:00
auth Set "admin" body class from `admin` nested layout (#31269) 2024-09-06 13:58:46 +00:00
concerns Merge commit '0226bbe5165a53658b29e46ddbef6a10507fdc8c' into glitch-soc/merge-upstream 2024-09-12 21:32:39 +02:00
disputes Set "admin" body class from `admin` nested layout (#31269) 2024-09-06 13:58:46 +00:00
filters Set "admin" body class from `admin` nested layout (#31269) 2024-09-06 13:58:46 +00:00
oauth Set "admin" body class from `admin` nested layout (#31269) 2024-09-06 13:58:46 +00:00
redirect Move redirect/base body class to view (#31796) 2024-09-12 13:31:50 +00:00
settings Merge commit '0c3c06f7cc50c9207a44f56e184ce6a41f953171' into glitch-soc/merge-upstream 2024-09-12 12:09:21 +02:00
well_known Implement RFC 8414 for OAuth 2.0 server metadata (#29191) 2024-05-06 13:17:56 +00:00
about_controller.rb Simplify instance presenter view access (#26046) 2023-09-28 16:52:37 +02:00
accounts_controller.rb Merge commit 'b2388be71eb0031ef9e47c492b1c038231cd8bc0' into glitch-soc/merge-upstream 2024-05-16 19:30:10 +02:00
application_controller.rb Merge commit '887e64efd4abbf3980e008c7a5441b44fbd6c766' into glitch-soc/merge-upstream 2024-07-25 17:47:02 +02:00
authorize_interactions_controller.rb Change interaction modal in web UI (#26075) 2023-07-27 16:11:17 +02:00
backups_controller.rb Add SELF_DESTRUCT env variable to process self-destructions in the background (#26439) 2023-10-23 15:46:21 +00:00
custom_css_controller.rb Add scope `providing_styles` to `UserRole` (#29286) 2024-02-20 09:18:05 +00:00
emojis_controller.rb
filters_controller.rb Set "admin" body class from `admin` nested layout (#31269) 2024-09-06 13:58:46 +00:00
follower_accounts_controller.rb Merge commit '40ba6e119b7457161fd43b449875d0fb9d473c1a' into glitch-soc/merge-upstream 2023-10-08 17:26:43 +02:00
following_accounts_controller.rb Fix Vary headers not being set on some redirects (#27272) 2023-10-05 09:50:08 +02:00
health_controller.rb Disable `Rails/ApplicationController` for `HealthController` (#28705) 2024-01-12 09:08:17 +00:00
home_controller.rb Simplify instance presenter view access (#26046) 2023-09-28 16:52:37 +02:00
instance_actors_controller.rb Move common module inclusion in sub classes to `ActivityPub::BaseController` (#29560) 2024-03-15 10:40:21 +00:00
intents_controller.rb Remove redundant `return` in `IntentsController` (#29099) 2024-02-06 12:56:22 +00:00
invites_controller.rb Set "admin" body class from `admin` nested layout (#31269) 2024-09-06 13:58:46 +00:00
mail_subscriptions_controller.rb Fix contrast between background and form elements on some pages (#31266) 2024-08-02 13:55:31 +00:00
manifests_controller.rb
media_controller.rb Add coverage for `media#player`, move body class to view (#31790) 2024-09-06 16:46:25 +00:00
media_proxy_controller.rb Refactor: replace whitelist_mode mentions with limited_federation_mode (#26252) 2023-08-02 19:32:48 +02:00
privacy_controller.rb Simplify instance presenter view access (#26046) 2023-09-28 16:52:37 +02:00
relationships_controller.rb Set "admin" body class from `admin` nested layout (#31269) 2024-09-06 13:58:46 +00:00
remote_interaction_helper_controller.rb Change interaction modal in web UI (#26075) 2023-07-27 16:11:17 +02:00
severed_relationships_controller.rb Set "admin" body class from `admin` nested layout (#31269) 2024-09-06 13:58:46 +00:00
shares_controller.rb Move shares/modal body class to layout (#31789) 2024-09-06 16:46:55 +00:00
statuses_cleanup_controller.rb Set "admin" body class from `admin` nested layout (#31269) 2024-09-06 13:58:46 +00:00
statuses_controller.rb Remove unused `statuses#embed` body class assignment (#31787) 2024-09-12 13:38:15 +00:00
tags_controller.rb Rename `cache_*` methods to `preload_*` in controller concern (#30209) 2024-05-16 08:03:46 +00:00