monorail
/
mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
mastodon/app/views
History
Claire c59fb65ddc Merge commit '127503eb2cdd67126974bee304dde0f183300b84' into glitch-soc/merge-upstream 
Conflicts:
- `app/helpers/accounts_helper.rb`:
  Conflict due to glitch-soc's option to hide followers count.
  Ported upstream changes.

Additional changes:
- `app/views/application/mailer/_account.html.haml`:
  Ported glitch-soc's option to hide followers count.
- `app/views/settings/flavours/show.html.haml`:
  Ported the `frontend_asset_url` helper change to glitch-soc.
 		2024-01-17 18:32:15 +01:00
..
about Change public accounts pages to mount the web UI (#19319) 2022-10-20 14:35:29 +02:00
accounts Avoid unnecessary i-var for account rss page url generation (#28092) 2023-11-28 08:19:08 +00:00
admin Merge commit '2954279e9c630a9d146575bf600978dc6c5279bd' into glitch-soc/merge-upstream 2024-01-11 20:15:19 +01:00
admin_mailer Use `admin_mailer` layout with initial salutation (#28085) 2023-11-28 07:41:26 +00:00
application Merge commit '127503eb2cdd67126974bee304dde0f183300b84' into glitch-soc/merge-upstream 2024-01-17 18:32:15 +01:00
auth Merge commit '36b46ea3b5b4a4fb51cf1cd103b5a3c1103c300e' into glitch-soc/merge-upstream 2024-01-11 13:17:13 +01: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 Use `ENV.fetch` in views, fixes rubocop haml-lint issue (#27527) 2023-10-24 09:30:14 +00:00
filters Extract helper methods for labels from filters/_filter_fields (#27574) 2023-11-29 10:02:59 +00:00
follower_accounts Change public accounts pages to mount the web UI (#19319) 2022-10-20 14:35:29 +02:00
following_accounts Change public accounts pages to mount the web UI (#19319) 2022-10-20 14:35:29 +02:00
home Change public accounts pages to mount the web UI (#19319) 2022-10-20 14:35:29 +02:00
invites Fix haml-lint `InstanceVariables` rule for invites/_form (#26064) 2023-09-28 15:40:28 +02:00
kaminari Fix missing translation in pagination gap tags (#24262) 2023-03-29 13:54:33 +02:00
layouts Merge commit '127503eb2cdd67126974bee304dde0f183300b84' into glitch-soc/merge-upstream 2024-01-17 18:32:15 +01:00
mail_subscriptions Fix `LineLength` haml-lint in `t` usage (#28686) 2024-01-11 09:32:32 +00:00
media Merge commit '36b46ea3b5b4a4fb51cf1cd103b5a3c1103c300e' into glitch-soc/merge-upstream 2024-01-11 13:17:13 +01: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 Change public accounts pages to mount the web UI (#19319) 2022-10-20 14:35:29 +02:00
relationships Merge commit '77098c6f1c25958960df98a1510b28352a39704f' into glitch-soc/merge-upstream 2023-10-17 20:59:18 +02:00
remote_interaction_helper Fix interaction modal being broken because of glitch-soc's theming system 2023-07-30 16:45:50 +02:00
settings Merge commit '127503eb2cdd67126974bee304dde0f183300b84' into glitch-soc/merge-upstream 2024-01-17 18:32:15 +01:00
shared Merge commit '127503eb2cdd67126974bee304dde0f183300b84' into glitch-soc/merge-upstream 2024-01-17 18:32:15 +01:00
shares Add subresource integrity for JS and CSS assets (#15096) 2020-11-06 11:56:31 +01:00
statuses Merge commit '9a3d047f3e604e581e18346424569e28fc9c5b96' into glitch-soc/merge-upstream 2023-10-25 19:59:17 +02:00
statuses_cleanup Solve simplest haml-lint `Rubocop` lints (#27529) 2023-10-25 12:38:01 +00:00
tags Enable Rubocop Style/FrozenStringLiteralComment (#23793) 2023-07-12 09:47:08 +02:00
user_mailer Use a helper to avoid using `media/` asset prefixes (#28756) 2024-01-17 12:19:51 +00:00
well_known/host_meta Rubocop fix: `Perfomance/UnfreezeString` (#26217) 2023-07-28 23:11:05 +02:00
.rubocop.yml Solve simplest haml-lint `Rubocop` lints (#27529) 2023-10-25 12:38:01 +00:00