treehouse
/
mastodon
21
8
Fork 5
Code Issues 32 Pull Requests Projects 1 Releases Wiki Activity
mastodon/app/views
History
Claire bceb45adda Merge commit '3f6887557b23d363e7f8f18518db4447739d64bb' into glitch-soc/merge-upstream 
Conflicts:
- `app/javascript/entrypoints/common.js`:
  Upstream moved everything from `app/javascript/packs` to
  `app/javascript/entrypoints` while this file was a glitch-soc
  addition. Moved it like the rest.
- `tsconfig.json`:
  Conflict due to glitch-soc's flavor.
  Updated like upstream.

Also moved and updated the following files accordingly:
- `app/javascript/flavours/vanilla/theme.yml`
- `app/javascript/flavours/glitch/theme.yml`
- everything in `app/javascript/flavours/glitch/packs`
 		2024-05-04 14:59:00 +02:00
..
about
…
accounts Avoid unnecessary i-var for account rss page url generation (#28092) 2023-11-28 08:19:08 +00:00
admin Merge commit '3f6887557b23d363e7f8f18518db4447739d64bb' into glitch-soc/merge-upstream 2024-05-04 14:59:00 +02:00
admin_mailer Fix string interpolation for software updates admin mailer (#30035) 2024-04-23 12:54:52 +00:00
application Merge commit '20b1e55f24a87868d661fc7b033bbbbd48b1a918' into glitch-soc/merge-upstream 2024-05-01 18:42:26 +02:00
auth Replace `use_pack`, `layouts/theme` and `@theme` by new helpers 2024-04-28 15:45:42 +02: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 Fix haml-lint `LineLength` cops in app/views/admin (#28680) 2024-03-15 11:19:00 +00:00
follower_accounts
…
following_accounts
…
home
…
invites Fix haml-lint `InstanceVariables` rule for invites/_form (#26064) 2023-09-28 15:40:28 +02:00
kaminari
…
layouts Merge commit 'b61ae28f8d4b6f269f50a05c3e65ec7f2c846d32' into glitch-soc/merge-upstream 2024-05-01 18:38:55 +02:00
mail_subscriptions Fix `LineLength` haml-lint in `t` usage (#28686) 2024-01-11 09:32:32 +00:00
media Replace `use_pack`, `layouts/theme` and `@theme` by new helpers 2024-04-28 15:45:42 +02: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
…
redirects Add confirmation when redirecting logged-out requests to permalink (#27792) 2024-01-24 10:49:19 +00:00
relationships Replace `use_pack`, `layouts/theme` and `@theme` by new helpers 2024-04-28 15:45:42 +02:00
remote_interaction_helper Replace `use_pack`, `layouts/theme` and `@theme` by new helpers 2024-04-28 15:45:42 +02:00
settings Merge commit 'ec71c02c4b028c3541742f023729aeb295a51559' into glitch-soc/merge-upstream 2024-05-01 19:38:34 +02:00
severed_relationships Change `AccountRelationshipSeveranceEvent` model to store lost followers and following counts separately (#29714) 2024-03-22 15:44:31 +00:00
shared Merge commit '0622107449e72d35b22afeeba2f0ba983e914803' into glitch-soc/merge-upstream 2024-05-01 19:16:48 +02:00
shares Replace `use_pack`, `layouts/theme` and `@theme` by new helpers 2024-04-28 15:45:42 +02:00
statuses Merge commit '9a3d047f3e604e581e18346424569e28fc9c5b96' into glitch-soc/merge-upstream 2023-10-25 19:59:17 +02:00
statuses_cleanup Fix haml-lint `LineLength` cops in app/views/admin (#28680) 2024-03-15 11:19:00 +00:00
tags
…
user_mailer Use partial collection render for welcome mailer features (#29843) 2024-04-04 16:13:10 +00:00
well_known/host_meta
…
.rubocop.yml Solve simplest haml-lint `Rubocop` lints (#27529) 2023-10-25 12:38:01 +00:00