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/lib
Thibaut Girka e5f934ddf0 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- `app/controllers/activitypub/collections_controller.rb`:
  Conflict caused because we have additional code to make sure pinned
  local-only toots don't get rendered on the ActivityPub endpoints.
  Ported upstream changes.
5 years ago
..
assets Add emoji autosuggest (#5053) 8 years ago
chewy/strategy Fix records not being indexed sometimes (#12024) 6 years ago
devise Fix authentication before 2FA challenge (#11943) 6 years ago
generators Add post-deployment migration system (#8182) 7 years ago
json_ld Fix preloaded JSON-LD context for identity not being used (#12138) 6 years ago
mastodon Merge branch 'master' into glitch-soc/merge-upstream 5 years ago
paperclip Bump rubocop from 0.86.0 to 0.88.0 (#14412) 5 years ago
redis Change Redis#exists calls to Redis#exists? to avoid deprecation warning (#14191) 5 years ago
tasks Merge branch 'master' into glitch-soc/merge-upstream 5 years ago
templates Add post-deployment migration system (#8182) 7 years ago
cli.rb Fix help text around `tootctl email_domain_blocks` (#14147) 5 years ago