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/spec
Claire 93912f0498 Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `app/models/account.rb`:
  Conflict because we (glitch-soc) have disabled trending of posts without
  review.
  Discarded that upstream change.
- `app/views/admin/settings/discovery/show.html.haml`:
  Just an extra setting in glitch-soc.
  Kept that extra setting.
2 years ago
..
controllers
fabricators
features
fixtures
helpers Test the native_locale_name of a non-standard locale (#20284) 2 years ago
lib
mailers
models
policies
presenters
requests
routing
serializers/activitypub
services
support
validators
views/statuses
workers
rails_helper.rb
spec_helper.rb