luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-11-16 20:03:24 +00:00
Code Issues Projects Releases Wiki Activity
mastodon/app/views/filters
History
Claire c04f2d0cf7 Merge branch 'main' into glitch-soc/merge-upstream 
Conflicts:
- `app/views/admin/settings/appearance/show.html.haml`:
  Upstream enforced an uniform code style around lambdas, and glitch-soc
  had a different lambda due to its theming system.
  Applied the same code style changes.
- `app/views/settings/preferences/appearance/show.html.haml`:
  Upstream enforced an uniform code style around lambdas, and glitch-soc
  removed some code just after the lambda.
  Applied the same code style changes.
2023-07-17 19:02:23 +02:00
..
statuses Fix error when accessing /filters/:id/statuses on glitch-soc (#1837) 2022-08-31 11:55:27 +02:00
_filter.html.haml Add ability to filter individual posts (#18945) 2022-08-25 04:27:47 +02:00
_filter_fields.html.haml Fix haml-lint Rubocop lambda cop (#25946) 2023-07-17 15:07:29 +02:00
_keyword_fields.html.haml
edit.html.haml
index.html.haml Setup haml-lint CI with todo config (#23524) 2023-03-15 04:15:36 +01:00
new.html.haml