mastodon/app
Thibaut Girka 12c8ac9e14 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- `app/controllers/activitypub/collections_controller.rb`:
  Conflict due to glitch-soc having to take care of local-only
  pinned toots in that controller.
  Took upstream's changes and restored the local-only special
  handling.
- `app/controllers/auth/sessions_controller.rb`:
  Minor conflicts due to the theming system, applied upstream
  changes, adapted the following two files for glitch-soc's
  theming system:
  - `app/controllers/concerns/sign_in_token_authentication_concern.rb`
  - `app/controllers/concerns/two_factor_authentication_concern.rb`
- `app/services/backup_service.rb`:
  Minor conflict due to glitch-soc having to handle local-only
  toots specially. Applied upstream changes and restored
  the local-only special handling.
- `app/views/admin/custom_emojis/index.html.haml`:
  Minor conflict due to the theming system.
- `package.json`:
  Upstream dependency updated, too close to a glitch-soc-only
  dependency in the file.
- `yarn.lock`:
  Upstream dependency updated, too close to a glitch-soc-only
  dependency in the file.
2020-06-09 10:39:20 +02:00
..
chewy Fix searchable status without explicitly mentioning it (#13829) 2020-05-23 05:47:25 +02:00
controllers Merge branch 'master' into glitch-soc/merge-upstream 2020-06-09 10:39:20 +02:00
helpers Merge branch 'master' into glitch-soc/merge-upstream 2020-06-09 10:39:20 +02:00
javascript Merge branch 'master' into glitch-soc/merge-upstream 2020-06-09 10:39:20 +02:00
lib Merge branch 'master' into glitch-soc/merge-upstream 2020-06-09 10:39:20 +02:00
mailers Add e-mail-based sign in challenge for users with disabled 2FA (#14013) 2020-06-09 10:23:06 +02:00
models Merge branch 'master' into glitch-soc/merge-upstream 2020-06-09 10:39:20 +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-09 10:39:20 +02:00
serializers Merge branch 'master' into glitch-soc/merge-upstream 2020-06-09 10:39:20 +02:00
services Merge branch 'master' into glitch-soc/merge-upstream 2020-06-09 10:39:20 +02:00
validators Merge branch 'master' into glitch-soc/merge-upstream 2020-06-09 10:39:20 +02:00
views Merge branch 'master' into glitch-soc/merge-upstream 2020-06-09 10:39:20 +02:00
workers Merge branch 'master' into glitch-soc/merge-upstream 2020-06-09 10:39:20 +02:00