mirrors/mastodon
1
0
Fork 1
mirror of https://github.com/glitch-soc/mastodon synced 2025-04-24 20:04:51 +00:00
Code Issues Projects Releases Packages Wiki Activity
mastodon/app/controllers
History
Claire 155dc4bc4b Merge commit '34cd7d6585992c03298c175ab5d22ad059b58cdb' into glitch-soc/merge-upstream 
Conflicts:
- `CONTRIBUTING.md`:
  Upstream changed the file, while we had a different one.
  Updated the common parts.
- `README.md`:
  Upstream changed the file, while we had a different one.
  Updated the common parts.
- `app/helpers/application_helper.rb`:
  Upstream added helpers where glitch-soc had extra ones.
  Added upstream's new helpers.
- `app/models/form/admin_settings.rb`:
  Upstream added some custom handling of one setting, while
  glitch-soc had additional code.
  Ported upstream's code.
- `lib/mastodon/version.rb`:
  Upstream moved some things to `config/mastodon.yml`.
  Did the same.
- `spec/requests/api/v1/accounts/credentials_spec.rb`:
  I don't know honestly.
2025-01-10 20:41:36 +01:00
..
activitypub Merge commit 'b06fd54c305915527e3a6edc575dc23b623143ef' into glitch-soc/merge-upstream 2024-11-03 20:51:58 +01:00
admin Merge commit '82d2ce293d98a2b9e024bc5396c3586904d46ae5' into glitch-soc/merge-upstream 2025-01-06 20:36:25 +01:00
api Merge commit '34cd7d6585992c03298c175ab5d22ad059b58cdb' into glitch-soc/merge-upstream 2025-01-10 20:41:36 +01:00
auth Fix various visual sign-up flow issues (#33206) 2024-12-09 08:23:19 +00:00
concerns Merge commit '82d2ce293d98a2b9e024bc5396c3586904d46ae5' into glitch-soc/merge-upstream 2025-01-06 20:36:25 +01: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 Fix logic in "last used at per application" oauth token list (#32912) 2024-11-15 15:52:37 +00:00
redirect Move redirect/base body class to view (#31796) 2024-09-12 13:31:50 +00:00
settings Merge commit 'e68b26c8df2056182564abcee230927ed53200c8' into glitch-soc/merge-upstream 2024-11-24 16:46:28 +01:00
well_known Support /.well-known/host-meta.json (#32206) 2024-10-02 09:23:44 +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 '877090518682b6c77ba9bdfa0231afd56daec44d' into glitch-soc/merge-upstream 2024-12-25 18:01:37 +01: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 Extend custom CSS cache time with digest paths (#33207) 2025-01-08 08:48:45 +00:00
emojis_controller.rb Refactor Cache-Control and Vary definitions (#24347) 2023-04-19 16:07:29 +02:00
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 Fix some user-independent endpoints potentially reading session cookies (#24650) 2023-04-25 22:14:44 +02:00
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 Add OpenSSL::SSL::SSLError to http connection errors wrapper (#32307) 2024-10-08 14:59:51 +00: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
terms_of_service_controller.rb Add terms of service (#33055) 2024-12-09 10:04:46 +00:00