Mastodon

History

Claire f624ef2778 Merge commit 'b06fd54c305915527e3a6edc575dc23b623143ef' into glitch-soc/merge-upstream

Conflicts:
- `app/helpers/formatting_helper.rb`:
  Upstream wrapped some code glitch-soc had modified in an OTEL instrumentation span.
  Wrapped the modified code.

2024-11-03 20:51:58 +01:00

about

…

accounts

…

admin

Merge commit '1fc165de02d79294c8a218f5fa82bcd477484ca1' into glitch-soc/merge-upstream

2024-10-19 19:13:32 +02:00

admin_mailer

…

application

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

2024-11-03 20:51:58 +01:00

auth

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

2024-09-29 11:06:09 +02:00

custom_css

…

disputes/strikes

Fix recently-broken admin interface buttons (#32240 )

2024-10-03 16:12:15 +00:00

errors

Use existing config access to local_domain value (#30509 )

2024-06-03 09:15:58 +00:00

filters

Remove fa_ prefix from status visibility icon method (#31846 )

2024-09-11 07:47:16 +00:00

follower_accounts

…

following_accounts

…

home

…

invites

Add copyable_input helper method to wrap shared options (#32119 )

2024-10-02 14:45:54 +00:00

kaminari

Migrate fontawesome->material in more views (#31360 )

2024-08-20 11:52:45 +00:00

layouts

Merge commit '24ef8255b3f9b44cb54f49bc78fe3382a7070b1a' into glitch-soc/merge-upstream

2024-09-12 20:05:08 +02:00

mail_subscriptions

Migrate form_tag to form_with in admin and auth views (#30692 )

2024-06-14 09:49:10 +00:00

media

Merge commit '7335a43b6dac0e82c305ce4dec9db4da114c769e' into glitch-soc/merge-upstream

2024-09-06 19:25:31 +02:00

notification_mailer

Mailer header partial access cleanup (#32585 )

2024-10-28 13:41:56 +00:00

oauth

Add copyable_input helper method to wrap shared options (#32119 )

2024-10-02 14:45:54 +00:00

privacy

…

redirects

Move redirect/base body class to view (#31796 )

2024-09-12 13:31:50 +00:00

relationships

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

2024-08-20 18:31:50 +02:00

remote_interaction_helper

…

settings

Merge commit '1fc165de02d79294c8a218f5fa82bcd477484ca1' into glitch-soc/merge-upstream

2024-10-19 19:13:32 +02:00

severed_relationships

Wrap datetime in time element with attrs (#32177 )

2024-10-01 12:45:58 +00:00

shared

…

statuses

Change embedded posts to use web UI (#31766 )

2024-09-12 09:41:19 +00:00

statuses_cleanup

Disable irrelevant fields unless cleanup is enabled (#26562 )

2024-08-04 08:57:46 +00:00