Glitch-Shrike/app/views
Claire 0cec9077a4 Merge commit 'edeae945c0c9d6318d489ab720587621545063d0' into glitch-soc/merge-upstream
Conflicts:
- `spec/requests/api/v2/instance_spec.rb`:
  Upstream added a test for a new attribute, next to a line we modified
  in glitch-soc because of a different default value.
  Updated as upstream's did, keeping glitch-soc's default value.
2024-08-21 18:44:21 +02:00
..
about
accounts
admin Merge commit '9ba7c90151463a6e4f7952317253fe8c113e9b0a' into glitch-soc/merge-upstream 2024-08-20 18:31:50 +02:00
admin_mailer
application Merge commit '9ba7c90151463a6e4f7952317253fe8c113e9b0a' into glitch-soc/merge-upstream 2024-08-20 18:31:50 +02:00
auth Merge commit '9ba7c90151463a6e4f7952317253fe8c113e9b0a' into glitch-soc/merge-upstream 2024-08-20 18:31:50 +02:00
custom_css
disputes/strikes Migrate fontawesome->material in more views (#31360) 2024-08-20 11:52:45 +00:00
errors
filters Migrate fontawesome->material in more views (#31360) 2024-08-20 11:52:45 +00:00
follower_accounts
following_accounts
home
invites Migrate fontawesome->material in more views (#31360) 2024-08-20 11:52:45 +00:00
kaminari Migrate fontawesome->material in more views (#31360) 2024-08-20 11:52:45 +00:00
layouts Merge commit '9ba7c90151463a6e4f7952317253fe8c113e9b0a' into glitch-soc/merge-upstream 2024-08-20 18:31:50 +02:00
mail_subscriptions
media
notification_mailer
oauth Migrate fontawesome->material in more views (#31360) 2024-08-20 11:52:45 +00:00
privacy
redirects
relationships Merge commit '9ba7c90151463a6e4f7952317253fe8c113e9b0a' into glitch-soc/merge-upstream 2024-08-20 18:31:50 +02:00
remote_interaction_helper
settings Merge commit '9ba7c90151463a6e4f7952317253fe8c113e9b0a' into glitch-soc/merge-upstream 2024-08-20 18:31:50 +02:00
severed_relationships
shared
shares
statuses Merge commit 'edeae945c0c9d6318d489ab720587621545063d0' into glitch-soc/merge-upstream 2024-08-21 18:44:21 +02:00
statuses_cleanup
tags
user_mailer
well_known/host_meta
.rubocop.yml