This repository has been archived on 2024-07-22. You can view files and clone it, but cannot push or open issues or pull requests.
mastodon/app/controllers
Claire ce12934f5b Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `package.json`:
  Upstream removed a dependency that was textually close to a glitch-soc-only
  dependency.
  Removed the dependency as upstream did, while keeping the glitch-soc-only
  dependency.
2023-04-09 11:45:08 +02:00
..
activitypub
admin Merge branch 'main' into glitch-soc/merge-upstream 2023-03-22 19:50:11 +01:00
api Fix most rubocop issues (#2165) 2023-04-09 11:25:30 +02:00
auth Fix most rubocop issues (#2165) 2023-04-09 11:25:30 +02:00
concerns Merge branch 'main' into glitch-soc/merge-upstream 2023-03-31 21:30:27 +02:00
disputes
filters Merge branch 'main' into glitch-soc/merge-upstream 2023-02-19 10:42:55 +01:00
oauth
settings Merge branch 'main' into glitch-soc/merge-upstream 2023-04-09 11:45:08 +02:00
well_known
about_controller.rb
accounts_controller.rb
application_controller.rb Merge branch 'main' into glitch-soc/merge-upstream 2023-03-18 11:21:03 +01:00
authorize_interactions_controller.rb
backups_controller.rb Fix user archive takeouts when using OpenStack Swift (#24431) 2023-04-05 19:31:49 +02:00
custom_css_controller.rb
emojis_controller.rb
filters_controller.rb
follower_accounts_controller.rb
following_accounts_controller.rb
health_controller.rb
home_controller.rb
instance_actors_controller.rb
intents_controller.rb
invites_controller.rb
manifests_controller.rb
media_controller.rb Merge branch 'main' into glitch-soc/merge-upstream 2023-02-25 14:00:40 +01:00
media_proxy_controller.rb Add allow_other_host in redirects which may go outside app (#24252) 2023-03-26 00:38:32 +01:00
privacy_controller.rb
relationships_controller.rb Merge branch 'main' into glitch-soc/merge-upstream 2023-03-05 20:46:56 +01:00
shares_controller.rb
statuses_cleanup_controller.rb
statuses_controller.rb Merge branch 'main' into glitch-soc/merge-upstream 2023-03-31 21:30:27 +02:00
tags_controller.rb Autofix Rubocop Style/TrailingCommaInArguments (#23694) 2023-02-18 12:39:58 +01:00