Mastodon

History

Claire 2810231180 Merge commit 'b2388be71eb0031ef9e47c492b1c038231cd8bc0' into glitch-soc/merge-upstream

Conflicts:
- `app/controllers/activitypub/collections_controller.rb`:
  Upstream renamed a helper method everywhere.
  There was one glitch-soc line involving changes because of the local-only post
  feature.
  Ported upstream's change.

2024-05-16 19:30:10 +02:00

about

…

accounts

…

admin

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

2024-05-16 19:30:10 +02:00

admin_mailer

Fix string interpolation for software updates admin mailer (#30035 )

2024-04-23 12:54:52 +00:00

application

Merge commit '20b1e55f24a87868d661fc7b033bbbbd48b1a918' into glitch-soc/merge-upstream

2024-05-01 18:42:26 +02:00

auth

Replace use_pack, layouts/theme and @theme by new helpers

2024-04-28 15:45:42 +02: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

Use EXPIRATION_DURATIONS constant in CustomFilter class (#30088 )

2024-04-29 09:01:46 +00:00

follower_accounts

…

following_accounts

…

home

…

invites

…

kaminari

…

layouts

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

2024-05-16 19:30:10 +02:00

mail_subscriptions

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

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

media

Replace use_pack, layouts/theme and @theme by new helpers

2024-04-28 15:45:42 +02: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

Replace use_pack, layouts/theme and @theme by new helpers

2024-04-28 15:45:42 +02:00

remote_interaction_helper

Replace use_pack, layouts/theme and @theme by new helpers

2024-04-28 15:45:42 +02:00

settings

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

2024-05-16 19:30:10 +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 '0622107449e72d35b22afeeba2f0ba983e914803' into glitch-soc/merge-upstream

2024-05-01 19:16:48 +02:00

Replace use_pack, layouts/theme and @theme by new helpers

2024-04-28 15:45:42 +02:00

statuses

…

statuses_cleanup

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

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