Mastodon

History

Claire 1d1c3a808a Merge commit '6c381f20b1d52c96525cbd5c41b0c972c3394a48' into glitch-soc/merge-upstream

Conflicts:
- `app/models/user_settings.rb`:
  Upstream removed a setting textually adjacent to a glitch-soc-only setting.
  Removed the setting glitch-soc removed.

2024-04-06 21:01:40 +02: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 '8a1423a47425dd67615e94bdfd13d64b53676da4' into glitch-soc/merge-upstream

2024-03-20 18:31:09 +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 'ffc5be4820ed7bad4656489f096230dd7965140b' into glitch-soc/merge-upstream

2024-03-19 19:21:12 +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

Fix haml-lint LineLength cops in app/views/admin (#28680 )

2024-03-15 11:19:00 +00:00

follower_accounts

…

following_accounts

…

home

…

invites

…

kaminari

…

layouts

Merge commit 'ffc5be4820ed7bad4656489f096230dd7965140b' into glitch-soc/merge-upstream

2024-03-19 19:21:12 +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 '6c381f20b1d52c96525cbd5c41b0c972c3394a48' into glitch-soc/merge-upstream

2024-04-06 21:01:40 +02:00

severed_relationships

Change AccountRelationshipSeveranceEvent model to store lost followers and following counts separately (#29714 )

2024-03-22 15:44:31 +00:00

shared

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

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

…

statuses

Merge commit '9a3d047f3e604e581e18346424569e28fc9c5b96' into glitch-soc/merge-upstream

2023-10-25 19:59:17 +02:00

statuses_cleanup

Fix haml-lint LineLength cops in app/views/admin (#28680 )

2024-03-15 11:19:00 +00:00