glitch-social/app/controllers
Claire b474cbbd28 Merge commit '7840c6b75b61e64d89d7fd9f291277fb177e513f' into glitch-soc/merge-upstream
Conflicts:
- `app/controllers/api/v1/accounts/relationships_controller.rb`:
  We differed by listing suspended users when requesting relationships.
  Updated to upstream's code.
2023-12-18 18:40:58 +01:00
..
activitypub
admin Merge commit 'b87bfb8c96c8491f1228e0258d05119f3420db05' into glitch-soc/merge-upstream 2023-12-18 18:34:25 +01:00
api Merge commit '7840c6b75b61e64d89d7fd9f291277fb177e513f' into glitch-soc/merge-upstream 2023-12-18 18:40:58 +01:00
auth Merge commit '2e6bf60f1549e5c1f1cfea2d614f978bea17b8a2' into glitch-soc/merge-upstream 2023-12-10 18:05:02 +01:00
concerns Merge commit 'a916251d8a8fffcaeb6be80eacf50138a53650dc' into glitch-soc/main 2023-12-17 15:32:29 +01:00
disputes
filters
oauth
settings Merge commit '379115e601361c2b5da775fbf28b7dff9dc02e71' into glitch-soc/merge-upstream 2023-10-24 19:31:14 +02:00
well_known Fix `RSpec/SpecFilePathFormat` cops (#27730) 2023-11-06 16:25:40 +00:00
about_controller.rb Simplify instance presenter view access (#26046) 2023-09-28 16:52:37 +02:00
accounts_controller.rb
application_controller.rb Fix self-destruct page not using theme styles (#2490) 2023-12-02 14:54:35 +01:00
authorize_interactions_controller.rb
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
emojis_controller.rb
filters_controller.rb
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
home_controller.rb Simplify instance presenter view access (#26046) 2023-09-28 16:52:37 +02:00
instance_actors_controller.rb
intents_controller.rb
invites_controller.rb
mail_subscriptions_controller.rb
manifests_controller.rb
media_controller.rb
media_proxy_controller.rb
privacy_controller.rb Simplify instance presenter view access (#26046) 2023-09-28 16:52:37 +02:00
relationships_controller.rb
remote_interaction_helper_controller.rb
shares_controller.rb
statuses_cleanup_controller.rb
statuses_controller.rb Merge commit '5393be7a21331c8615ffb79c2271db92f6959458' into glitch-soc/merge-upstream 2023-10-08 16:48:19 +02:00
tags_controller.rb Simplify instance presenter view access (#26046) 2023-09-28 16:52:37 +02:00