mastodon/app
Thibaut Girka 8c3c27bf06 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- `app/controllers/accounts_controller.rb`:
  Upstream change too close to a glitch-soc change related to
  instance-local toots. Merged upstream changes.
- `app/services/fan_out_on_write_service.rb`:
  Minor conflict due to glitch-soc's handling of Direct Messages,
  merged upstream changes.
- `yarn.lock`:
  Not really a conflict, caused by glitch-soc-only dependencies
  being textually too close to updated upstream dependencies.
  Merged upstream changes.
2020-08-30 16:13:08 +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-08-30 16:13:08 +02:00
helpers Merge branch 'master' into glitch-soc/merge-upstream 2020-06-26 13:02:14 +02:00
javascript Merge branch 'master' into glitch-soc/merge-upstream 2020-08-30 16:13:08 +02:00
lib Merge branch 'master' into glitch-soc/merge-upstream 2020-08-30 16:13:08 +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-08-30 16:13:08 +02:00
policies Merge branch 'master' into glitch-soc/merge-upstream 2020-03-08 19:38:53 +01:00
presenters Merge branch 'master' into glitch-soc/merge-upstream 2020-06-30 23:00:20 +02:00
serializers Add support for direct message assertions 2020-08-04 19:43:19 +02:00
services Merge branch 'master' into glitch-soc/merge-upstream 2020-08-30 16:13:08 +02:00
validators Merge branch 'master' into glitch-soc/merge-upstream 2020-08-13 22:17:29 +02:00
views Merge branch 'master' into glitch-soc/merge-upstream 2020-08-30 16:13:08 +02:00
workers Merge branch 'master' into glitch-soc/merge-upstream 2020-07-22 13:38:17 +02:00