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.
mastodon/app/views
Claire f9d000ebae Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- `app/services/resolve_url_service.rb`:
  The private toot search by URL hack has been revamped upstream.
  Took upstream's version.
5 years ago
..
about Merge branch 'master' into glitch-soc/merge-upstream 5 years ago
accounts Merge branch 'master' into glitch-soc/merge-upstream 5 years ago
admin Merge branch 'master' into glitch-soc/merge-upstream 5 years ago
admin_mailer
application Fix lock icon not being shown when locking account in profile settings (#14190) 6 years ago
auth Merge branch 'master' into glitch-soc/merge-upstream 5 years ago
authorize_interactions
directories
errors
filters
follower_accounts
following_accounts
home Merge branch 'master' into glitch-soc/merge-upstream 5 years ago
invites
kaminari
layouts Merge branch 'master' into glitch-soc/merge-upstream 5 years ago
media Merge branch 'master' into glitch-soc/merge-upstream 5 years ago
notification_mailer Change RTL detection to rely on unicode-bidi paragraph by paragraph (#14573) 5 years ago
oauth Refactor settings controllers (#14767) 6 years ago
public_timelines Add subresource integrity for JS and CSS assets (#15096) 5 years ago
relationships Merge branch 'master' into glitch-soc/merge-upstream 5 years ago
remote_follow
remote_interaction
settings Merge branch 'master' into glitch-soc/merge-upstream 5 years ago
shared Add honeypot fields and minimum fill-out time for sign-up form (#15276) 5 years ago
shares Add subresource integrity for JS and CSS assets (#15096) 5 years ago
statuses Merge branch 'master' into glitch-soc/merge-upstream 5 years ago
tags Add subresource integrity for JS and CSS assets (#15096) 5 years ago
user_mailer Add WebAuthn as an alternative 2FA method (#14466) 6 years ago
well_known/host_meta Remove dependency on goldfinger gem (#14919) 5 years ago