mastodon/spec
Claire 077183a121 Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `app/controllers/settings/preferences_controller.rb`:
  Upstream dropping `digest` from notifications emails while we have more
  notification emails settings.
  Removed `digest` from our list while keeping our extra settings.
- `app/javascript/packs/admin.js`:
  Conflicts caused by glitch-soc's theming system.
  Applied the changes to `app/javascript/core/admin.js`.
- `app/views/settings/preferences/other/show.html.haml`:
  Upstream removed a setting close to a glitch-soc-only setting.
  Applied upstream's change.
2022-08-28 11:31:00 +02:00
..
controllers Merge branch 'main' into glitch-soc/merge-upstream 2022-08-25 05:07:39 +02:00
fabricators Add ability to filter individual posts (#18945) 2022-08-25 04:27:47 +02:00
features Add submit button to the top of preferences pages (#13068) 2020-03-08 16:04:03 +01:00
fixtures Allow import/export of instance-level domain blocks/allows (#1754) 2022-05-16 09:29:01 +02:00
helpers Add audit log entries for user roles (#19040) 2022-08-25 20:39:40 +02:00
lib Merge branch 'main' into glitch-soc/merge-upstream 2022-07-17 22:07:20 +02:00
mailers Remove digest e-mails (#17985) 2022-08-25 23:38:22 +02:00
models Merge branch 'main' into glitch-soc/merge-upstream 2022-08-25 05:07:39 +02:00
policies Merge branch 'main' into glitch-soc/merge-upstream 2022-07-05 09:33:44 +02:00
presenters Merge branch 'main' into glitch-soc/merge-upstream 2022-08-25 05:07:39 +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 2022-08-25 05:07:39 +02:00
support Spelling (#17705) 2022-03-06 22:51:40 +01:00
validators Merge branch 'main' into glitch-soc/merge-upstream 2022-06-10 11:51:43 +02:00
views Merge branch 'main' into glitch-soc/merge-upstream 2022-03-04 01:07:49 +01:00
workers Remove digest e-mails (#17985) 2022-08-25 23:38:22 +02:00
rails_helper.rb Fix single Redis connection being used across all threads (#18135) 2022-04-28 17:47:34 +02:00
spec_helper.rb Improve tests involving push_bulk (#17508) 2022-02-10 19:42:45 +01:00