mastodon/spec
Claire fc500a6062 Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `CONTRIBUTING.md`:
  Upstream file has changed and we're quoting it.
  Ported the changes.
- `README.md`:
  Upstream file has changed but we have a completely different one.
  Kept our version.
- `lib/mastodon/version.rb`:
  Upstream has changed from `tootsuite/mastodon` to `mastodon/mastodon`,
  but we're still `glitch-soc/mastodon`.
  Kept our version.
- `spec/presenters/instance_presenter_spec.rb`:
  Upstream has changed from `tootsuite/mastodon` to `mastodon/mastodon`,
  but we're still `glitch-soc/mastodon`.
  Kept our version.
2021-07-13 17:57:15 +02:00
..
controllers Merge branch 'main' into glitch-soc/merge-upstream 2021-07-08 16:17:19 +02:00
fabricators Add authentication history (#16408) 2021-06-21 17:07:30 +02:00
features Add submit button to the top of preferences pages (#13068) 2020-03-08 16:04:03 +01:00
fixtures Change references to tootsuite/mastodon to mastodon/mastodon (#16491) 2021-07-13 15:46:20 +02:00
helpers Merge branch 'master' into glitch-soc/merge-upstream 2020-12-15 14:27:06 +01:00
lib Merge branch 'main' into glitch-soc/merge-upstream 2021-05-07 18:21:59 +02:00
mailers Add Ruby 3.0 support (#16046) 2021-05-06 14:22:54 +02:00
models Merge branch 'main' into glitch-soc/merge-upstream 2021-07-08 16:17:19 +02:00
policies Merge branch 'master' into glitch-soc/merge-upstream 2020-11-08 14:20:35 +01:00
presenters Change references to tootsuite/mastodon to mastodon/mastodon (#16491) 2021-07-13 15:46:20 +02:00
requests Further preparation for Rails 6 (#15916) 2021-03-19 02:45:34 +01:00
routing Move create/destroy actions for api/v1/statuses to namespace (#3678) 2017-06-10 09:39:26 +02:00
serializers/activitypub Fix account URI in UpdatePollSerializer (#11194) 2019-06-27 19:41:55 +02:00
services Merge branch 'main' into glitch-soc/merge-upstream 2021-07-08 16:17:19 +02:00
support Fix base64-encoded file uploads not being possible (#12748) 2020-01-04 01:54:07 +01:00
validators Merge branch 'main' into glitch-soc/merge-upstream 2021-04-20 12:17:14 +02:00
views Merge branch 'main' into glitch-soc/merge-upstream 2021-07-13 17:57:15 +02:00
workers Change Web Push API deliveries to use request pooling (#16014) 2021-04-12 14:25:34 +02:00
rails_helper.rb Add WebAuthn as an alternative 2FA method (#14466) 2020-08-24 16:46:27 +02:00
spec_helper.rb Move rspec examples to tmp dir (#12539) 2019-12-02 19:55:08 +01:00