luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-11-30 18:43:56 +00:00
Code Issues Projects Releases Wiki Activity
mastodon/lib
History
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.
2020-09-07 09:21:38 +02:00
..
assets
chewy/strategy
devise
generators
json_ld
mastodon Merge branch 'master' into glitch-soc/merge-upstream 2020-09-07 09:21:38 +02:00
paperclip Bump rubocop from 0.86.0 to 0.88.0 (#14412) 2020-09-01 03:04:00 +02:00
redis Change Redis#exists calls to Redis#exists? to avoid deprecation warning (#14191) 2020-07-01 19:05:21 +02:00
tasks Merge branch 'master' into glitch-soc/merge-upstream 2020-09-01 17:02:18 +02:00
templates
cli.rb Fix help text around tootctl email_domain_blocks (#14147) 2020-06-26 21:28:40 +02:00