monorail
/
mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
mastodon/app/views
History
Claire 29124990a2 Merge commit '7335a43b6dac0e82c305ce4dec9db4da114c769e' into glitch-soc/merge-upstream 
Conflicts:
- `app/helpers/application_helper.rb`:
  Upstream reworked how CSS classes for the document's body are computed.
  Slight conflict due to glitch-soc's different theming system.
  Updated as upstream did.
 		2024-09-06 19:25:31 +02:00
..
about
…
accounts
…
admin Merge commit '7335a43b6dac0e82c305ce4dec9db4da114c769e' into glitch-soc/merge-upstream 2024-09-06 19:25:31 +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 Use existing config access to `local_domain` value (#30509) 2024-06-03 09:15:58 +00:00
filters Migrate fontawesome->material in more views (#31360) 2024-08-20 11:52:45 +00:00
follower_accounts
…
following_accounts
…
home
…
invites Convert invites controller spec to system/request specs (#31755) 2024-09-05 11:54:27 +00:00
kaminari Migrate fontawesome->material in more views (#31360) 2024-08-20 11:52:45 +00:00
layouts Merge commit '7335a43b6dac0e82c305ce4dec9db4da114c769e' into glitch-soc/merge-upstream 2024-09-06 19:25:31 +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
…
oauth Direct link to each authorized_application entry with html anchor (#31677) 2024-09-05 09:48:42 +00:00
privacy
…
redirects Add `noindex` meta tag and `rel=canonical` link to redirect interstitials (#30651) 2024-06-11 15:29:45 +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 '5acec087caed4a2fdf0fd8ed11f891222496f321' into glitch-soc/merge-upstream 2024-09-05 20:36:25 +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 Disable irrelevant fields unless cleanup is enabled (#26562) 2024-08-04 08:57:46 +00:00
tags
…
user_mailer
…
well_known/host_meta
…
.rubocop.yml
…