luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-11-15 19:33:32 +00:00
Code Issues Projects Releases Wiki Activity
mastodon/app
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
..
chewy Change tootctl search deploy algorithm (#14300) 2020-07-14 18:10:35 +02:00
controllers Merge branch 'master' into glitch-soc/merge-upstream 2020-09-07 09:21:38 +02:00
helpers Merge branch 'master' into glitch-soc/merge-upstream 2020-09-01 17:02:18 +02:00
javascript Merge branch 'master' into glitch-soc/merge-upstream 2020-09-07 09:21:38 +02:00
lib Merge branch 'master' into glitch-soc/merge-upstream 2020-09-07 09:21:38 +02:00
mailers Add WebAuthn as an alternative 2FA method (#14466) 2020-08-24 16:46:27 +02:00
models Merge branch 'master' into glitch-soc/merge-upstream 2020-09-01 17:02:18 +02:00
policies
presenters
serializers Merge branch 'master' into glitch-soc/merge-upstream 2020-09-07 09:21:38 +02:00
services Merge branch 'master' into glitch-soc/merge-upstream 2020-09-01 17:02:18 +02:00
validators Merge branch 'master' into glitch-soc/merge-upstream 2020-08-13 22:17:29 +02:00
views Adapt 2FA changes to glitch-soc's theming system 2020-08-30 17:26:18 +02:00
workers Merge branch 'master' into glitch-soc/merge-upstream 2020-07-22 13:38:17 +02:00