mastodon/app/controllers
Claire 2126812f65 Merge commit 'd9c21293aa6e105cedeff6b5e469af40a20909d9' into glitch-soc/merge-upstream
Conflicts:
- `app/views/settings/preferences/other/show.html.haml`:
  Upstream moved some settings, where glitch-soc has an extra setting.
  Ported upstream changes, moving the same settings as them.
2023-08-22 18:31:28 +02:00
..
activitypub
admin Merge commit '121443c0fca383268b8022c048dd137994785aff' into glitch-soc/main 2023-08-13 18:47:15 +02:00
api Merge commit '3a4d3e9d4b573c400eec1743471d54cdccae50a5' into glitch-soc/merge-upstream 2023-08-12 09:36:38 +02:00
auth Merge commit 'ce1f35d7e213327549b960bb64f63c67a141ea40' into glitch-soc/merge-upstream 2023-07-30 14:58:56 +02:00
concerns Merge commit '121443c0fca383268b8022c048dd137994785aff' into glitch-soc/main 2023-08-13 18:47:15 +02:00
disputes
filters
oauth Merge commit '4a22e72b9b1b8f14792efcc649b0db8bc27f0df2' into glitch-soc/merge-upstream 2023-05-25 22:59:30 +02:00
settings Merge commit 'd9c21293aa6e105cedeff6b5e469af40a20909d9' into glitch-soc/merge-upstream 2023-08-22 18:31:28 +02:00
well_known Change interaction modal in web UI (#26075) 2023-07-27 16:11:17 +02:00
about_controller.rb
accounts_controller.rb Merge commit '425d77f8124a50fc033e8fb3bdf7b89a6a25f4fa' into glitch-soc/merge-upstream 2023-08-11 22:15:41 +02:00
application_controller.rb Merge commit '425d77f8124a50fc033e8fb3bdf7b89a6a25f4fa' into glitch-soc/merge-upstream 2023-08-11 22:15:41 +02:00
authorize_interactions_controller.rb Change interaction modal in web UI (#26075) 2023-07-27 16:11:17 +02:00
backups_controller.rb Storage: add :azure to remaining callers (#26080) 2023-07-27 16:13:45 +02:00
custom_css_controller.rb
emojis_controller.rb
filters_controller.rb
follower_accounts_controller.rb Merge commit '425d77f8124a50fc033e8fb3bdf7b89a6a25f4fa' into glitch-soc/merge-upstream 2023-08-11 22:15:41 +02:00
following_accounts_controller.rb Refactor: replace whitelist_mode mentions with limited_federation_mode (#26252) 2023-08-02 19:32:48 +02:00
health_controller.rb
home_controller.rb
instance_actors_controller.rb
intents_controller.rb
invites_controller.rb
mail_subscriptions_controller.rb Add List-Unsubscribe email header (#26085) 2023-08-01 19:34:40 +02:00
manifests_controller.rb
media_controller.rb Merge commit '425d77f8124a50fc033e8fb3bdf7b89a6a25f4fa' into glitch-soc/merge-upstream 2023-08-11 22:15:41 +02: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
relationships_controller.rb
remote_interaction_helper_controller.rb Change interaction modal in web UI (#26075) 2023-07-27 16:11:17 +02:00
shares_controller.rb
statuses_cleanup_controller.rb
statuses_controller.rb Merge commit '425d77f8124a50fc033e8fb3bdf7b89a6a25f4fa' into glitch-soc/merge-upstream 2023-08-11 22:15:41 +02:00
tags_controller.rb Refactor: replace whitelist_mode mentions with limited_federation_mode (#26252) 2023-08-02 19:32:48 +02:00