You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
nyastodon/app/views
Claire 30ee7339d3 Merge commit '7d9b209fe84b00eff348ea9d54905cbfffa79788' into glitch-soc/merge-upstream
Conflicts:
- `app/models/form/admin_settings.rb`:
  Upstream changed code style change, including on a line modified by glitch-soc.
  Kept glitch-soc's line but with the code style change applied.
5 months ago
..
about
accounts Avoid unnecessary i-var for account rss page url generation (#28092) 6 months ago
admin Merge commit '7d9b209fe84b00eff348ea9d54905cbfffa79788' into glitch-soc/merge-upstream 5 months ago
admin_mailer Use `admin_mailer` layout with initial salutation (#28085) 6 months ago
application
auth Merge commit '2e6bf60f1549e5c1f1cfea2d614f978bea17b8a2' into glitch-soc/merge-upstream 5 months ago
custom_css
disputes/strikes Fix haml-lint `UnnecessaryStringOutput` for views (#27531) 7 months ago
errors
filters Extract helper methods for labels from filters/_filter_fields (#27574) 6 months ago
follower_accounts
following_accounts
home
invites
kaminari
layouts Fix glitch-only HAML linting issue 5 months ago
mail_subscriptions
media
notification_mailer Fix haml-lint `UnnecessaryStringOutput` for views (#27531) 7 months ago
oauth Add `Account#unavailable?` and `Account#permanently_unavailable?` aliases (#28053) 6 months ago
privacy
relationships
remote_interaction_helper
settings Merge commit '0b4a3a04378ce43f2f314b9446b5053f6b374c6d' into glitch-soc/merge-upstream 5 months ago
shared Remove redundant asset preload (#2488) 6 months ago
shares
statuses Merge commit '9a3d047f3e604e581e18346424569e28fc9c5b96' into glitch-soc/merge-upstream 7 months ago
statuses_cleanup Solve simplest haml-lint `Rubocop` lints (#27529) 7 months ago
tags
user_mailer Fix haml-lint `UnnecessaryStringOutput` for views (#27531) 7 months ago
well_known/host_meta
.rubocop.yml Solve simplest haml-lint `Rubocop` lints (#27529) 7 months ago