f624ef2778
Conflicts: - `app/helpers/formatting_helper.rb`: Upstream wrapped some code glitch-soc had modified in an OTEL instrumentation span. Wrapped the modified code. |
||
|---|---|---|
| .. | ||
| about | ||
| accounts | ||
| admin | ||
| admin_mailer | ||
| application | ||
| auth | ||
| custom_css | ||
| disputes/strikes | ||
| errors | ||
| filters | ||
| follower_accounts | ||
| following_accounts | ||
| home | ||
| invites | ||
| kaminari | ||
| layouts | ||
| mail_subscriptions | ||
| media | ||
| notification_mailer | ||
| oauth | ||
| privacy | ||
| redirects | ||
| relationships | ||
| remote_interaction_helper | ||
| settings | ||
| severed_relationships | ||
| shared | ||
| shares | ||
| statuses | ||
| statuses_cleanup | ||
| tags | ||
| user_mailer | ||
| well_known/host_meta | ||
| .rubocop.yml | ||