Mastodon

History

Claire a5127d0ef8 Merge commit '24319836de6046fb2985ec1a24c30ad7d47584d7' into glitch-soc/merge-upstream

Conflicts:
- `config/routes/api.rb`:
  glitch-soc has an extra `:destroy` action on notifications for historical reasons.
  Kept it for now, while otherwise updating as upstream did.

2024-03-11 17:29:07 +01:00

about

…

accounts

Avoid unnecessary i-var for account rss page url generation (#28092 )

2023-11-28 08:19:08 +00:00

admin

Merge commit '24319836de6046fb2985ec1a24c30ad7d47584d7' into glitch-soc/merge-upstream

2024-03-11 17:29:07 +01:00

admin_mailer

Automatically switch from open to approved registrations in absence of moderators (#29318 )

2024-02-22 20:45:40 +01:00

application

Merge commit '18945f62e07617ac44b7a25a61799b0959fe67f7' into glitch-soc/merge-upstream

2024-03-01 18:34:48 +01:00

auth

Merge commit '24319836de6046fb2985ec1a24c30ad7d47584d7' into glitch-soc/merge-upstream

2024-03-11 17:29:07 +01:00

custom_css

Spec coverage for custom css endpoint (#28706 )

2024-01-12 09:19:25 +00:00

disputes/strikes

Add coverage/bugfix for invalid appeal submission (#28703 )

2024-01-12 09:21:00 +00:00

errors

…

filters

Extract helper methods for labels from filters/_filter_fields (#27574 )

2023-11-29 10:02:59 +00:00

follower_accounts

…

following_accounts

…

home

…

invites

…

kaminari

…

layouts

Merge commit '127503eb2cdd67126974bee304dde0f183300b84' into glitch-soc/merge-upstream

2024-01-17 18:32:15 +01:00

mail_subscriptions

Fix LineLength haml-lint in t usage (#28686 )

2024-01-11 09:32:32 +00:00

media

Merge commit '36b46ea3b5b4a4fb51cf1cd103b5a3c1103c300e' into glitch-soc/merge-upstream

2024-01-11 13:17:13 +01:00

notification_mailer

Update follow and follow_request emails (#28755 )

2024-01-17 14:37:04 +00:00

oauth

Add Account#unavailable? and Account#permanently_unavailable? aliases (#28053 )

2023-11-30 15:43:26 +00:00

privacy

…

redirects

Add confirmation when redirecting logged-out requests to permalink (#27792 )

2024-01-24 10:49:19 +00:00

relationships

Merge commit '8156113d58db851d00f8052e66459e6dafb71e82' into glitch-soc/merge-upstream

2024-02-26 17:43:16 +01:00

remote_interaction_helper

…

settings

Merge commit '24319836de6046fb2985ec1a24c30ad7d47584d7' into glitch-soc/merge-upstream

2024-03-11 17:29:07 +01:00

shared

Merge commit '127503eb2cdd67126974bee304dde0f183300b84' into glitch-soc/merge-upstream

2024-01-17 18:32:15 +01:00

…

statuses

…

statuses_cleanup

…