treehouse
/
mastodon
22
8
Fork 5
Code Issues 32 Pull Requests Projects 1 Releases Wiki Activity
mastodon/app/views
History
Claire 0b2c7cdb02 Merge commit 'fe2667bb0d3487a32b9da5250402a90482a85fe2' into glitch-soc/merge-upstream 
Conflicts:
- `app/lib/content_security_policy.rb`:
  Conflict caused by glitch-soc's support for the extra `EXTRA_DATA_HOSTS`
  environment variable.
  Ported upstream's changes while keeping support for `EXTRA_DATA_HOSTS`.
 		2024-01-10 17:51:12 +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 'fe2667bb0d3487a32b9da5250402a90482a85fe2' into glitch-soc/merge-upstream 2024-01-10 17:51:12 +01:00
admin_mailer Use `admin_mailer` layout with initial salutation (#28085) 2023-11-28 07:41:26 +00:00
application Add card with who invited you to join when displaying rules on sign-up (#23475) 2023-06-02 18:35:37 +02:00
auth Merge commit '2e6bf60f1549e5c1f1cfea2d614f978bea17b8a2' into glitch-soc/merge-upstream 2023-12-10 18:05:02 +01:00
custom_css Add role badges to the WebUI (#25649) 2023-07-27 16:05:24 +02:00
disputes/strikes Fix haml-lint `UnnecessaryStringOutput` for views (#27531) 2023-10-25 12:01: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 Fix glitch-only HAML linting issue 2023-12-20 22:27:29 +01:00
mail_subscriptions Add unsubscribe link to e-mails (#25378) 2023-06-12 14:22:46 +02:00
media Merge commit '144a406d332b034caa812ade2629df03ed4898d7' into glitch-soc/merge-upstream 2023-07-30 13:42:06 +02:00
notification_mailer Fix haml-lint `UnnecessaryStringOutput` for views (#27531) 2023-10-25 12:01:00 +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 '0b4a3a04378ce43f2f314b9446b5053f6b374c6d' into glitch-soc/merge-upstream 2023-12-20 22:16:50 +01:00
shared Remove redundant asset preload (#2488) 2023-12-02 14:54:26 +01:00
shares
…
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 Fix haml-lint `UnnecessaryStringOutput` for views (#27531) 2023-10-25 12:01:00 +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