mastodon/spec
Thibaut Girka c790ecb14d Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- `app/controllers/api/v1/statuses_controller.rb`:
  Conflict due to upstream adding a new parameter (with_rate_limit),
  too close to glitch-soc's own additional parameter (content_type).
  Added upstream's parameter.
- `app/services/post_status_service.rb`:
  Conflict due to upstream adding a new parameter (rate_limit),
  too close to glitch-soc's own additional parameter (content_type).
  Added upstream's parameter.
- `app/views/settings/preferences/appearance/show.html.haml`:
  Conflict due to us not exposing theme settings here (as we have
  a different flavour/skin menu).
  Took upstream change, while still not exposing theme settings.
- `config/webpack/shared.js`:
  Coding style fixes for a part we have rewritten.
  Discarded upstream changes.
2020-03-08 19:38:53 +01:00
..
controllers Merge branch 'master' into glitch-soc/merge-upstream 2020-03-08 19:38:53 +01:00
fabricators Add announcements (#12662) 2020-01-23 22:00:13 +01: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 2019-10-27 12:14:01 +01:00
lib Fix tests 2020-02-09 12:32:33 +01:00
mailers Add password challenge to 2FA settings, e-mail notifications (#11878) 2019-09-18 16:37:27 +02:00
models Merge branch 'master' into glitch-soc/merge-upstream 2020-02-03 09:22:58 +01:00
policies
presenters
requests Fix localization test failing due to order of locale definitions (#12393) 2019-11-15 21:00:09 +01:00
routing
serializers/activitypub
services Merge branch 'master' into glitch-soc/merge-upstream 2020-01-24 14:37:06 +01: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
workers Fix RefollowWorker not keeping show_reblogs setting (#12707) 2020-01-02 20:52:39 +01:00
rails_helper.rb Fix records not being indexed sometimes (#12024) 2019-10-01 01:19:11 +02:00
spec_helper.rb Move rspec examples to tmp dir (#12539) 2019-12-02 19:55:08 +01:00