mastodon/spec
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
..
controllers Merge branch 'master' into glitch-soc/merge-upstream 2020-06-09 10:39:20 +02:00
fabricators Add E2EE API (#13820) 2020-06-02 19:24:53 +02:00
features Add submit button to the top of preferences pages (#13068) 2020-03-08 16:04:03 +01:00
fixtures Add noopener and/or noreferrer (#12202) 2019-10-24 22:44:42 +02:00
helpers Merge branch 'master' into glitch-soc/merge-upstream 2020-04-04 21:47:37 +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 2019-08-06 13:16:53 +02:00
presenters Merge branch 'master' into glitch-soc/merge-upstream 2019-03-14 17:17:20 +01:00
requests Fix localization test failing due to order of locale definitions (#12393) 2019-11-15 21:00:09 +01:00
routing
serializers/activitypub Fix account URI in UpdatePollSerializer (#11194) 2019-06-27 19:41:55 +02:00
services Merge branch 'master' into glitch-soc/merge-upstream 2020-06-09 10:39:20 +02:00
support Fix base64-encoded file uploads not being possible (#12748) 2020-01-04 01:54:07 +01:00
validators Merge branch 'master' into glitch-soc/merge-upstream 2020-02-03 09:22:58 +01:00
views Merge branch 'master' into glitch-soc/merge-upstream 2019-07-19 18:26:49 +02:00
workers Make domain block/silence/reject-media code more robust (#13424) 2020-06-09 10:32:00 +02:00
rails_helper.rb Bump sidekiq from 5.2.7 to 6.0.4 (#11727) 2020-03-21 12:04:54 +09:00
spec_helper.rb Move rspec examples to tmp dir (#12539) 2019-12-02 19:55:08 +01:00