mastodon-glitch/spec
Claire 155dc4bc4b Merge commit '34cd7d6585992c03298c175ab5d22ad059b58cdb' into glitch-soc/merge-upstream
Conflicts:
- `CONTRIBUTING.md`:
  Upstream changed the file, while we had a different one.
  Updated the common parts.
- `README.md`:
  Upstream changed the file, while we had a different one.
  Updated the common parts.
- `app/helpers/application_helper.rb`:
  Upstream added helpers where glitch-soc had extra ones.
  Added upstream's new helpers.
- `app/models/form/admin_settings.rb`:
  Upstream added some custom handling of one setting, while
  glitch-soc had additional code.
  Ported upstream's code.
- `lib/mastodon/version.rb`:
  Upstream moved some things to `config/mastodon.yml`.
  Did the same.
- `spec/requests/api/v1/accounts/credentials_spec.rb`:
  I don't know honestly.
2025-01-10 20:41:36 +01:00
..
chewy Enable "zero monkey patching" mode in RSpec (#31614) 2024-09-04 05:12:25 +00:00
config/initializers/rack Enable "zero monkey patching" mode in RSpec (#31614) 2024-09-04 05:12:25 +00:00
controllers Merge commit '34cd7d6585992c03298c175ab5d22ad059b58cdb' into glitch-soc/merge-upstream 2025-01-10 20:41:36 +01:00
fabrication Enable "zero monkey patching" mode in RSpec (#31614) 2024-09-04 05:12:25 +00:00
fabricators Add role-specific user fabricators (#33437) 2025-01-03 08:28:14 +00:00
fixtures Revert "Support animated PNGs in media attachments (#28516)" (#33334) 2024-12-17 10:52:59 +00:00
generators Enable "zero monkey patching" mode in RSpec (#31614) 2024-09-04 05:12:25 +00:00
helpers Merge commit '34cd7d6585992c03298c175ab5d22ad059b58cdb' into glitch-soc/merge-upstream 2025-01-10 20:41:36 +01:00
lib Merge commit '34cd7d6585992c03298c175ab5d22ad059b58cdb' into glitch-soc/merge-upstream 2025-01-10 20:41:36 +01:00
locales Enable "zero monkey patching" mode in RSpec (#31614) 2024-09-04 05:12:25 +00:00
mailers Add coverage for `UserMailer` not delivering to memorialized users (#33366) 2024-12-20 10:27:40 +00:00
models Merge commit '34cd7d6585992c03298c175ab5d22ad059b58cdb' into glitch-soc/merge-upstream 2025-01-10 20:41:36 +01:00
policies Merge commit '34cd7d6585992c03298c175ab5d22ad059b58cdb' into glitch-soc/merge-upstream 2025-01-10 20:41:36 +01:00
presenters Merge commit 'c40ab43dc703be988c277d4ba6b7987a3a80e16c' into glitch-soc/merge-upstream 2024-10-06 16:07:58 +02:00
requests Merge commit '34cd7d6585992c03298c175ab5d22ad059b58cdb' into glitch-soc/merge-upstream 2025-01-10 20:41:36 +01:00
routing Extend custom CSS cache time with digest paths (#33207) 2025-01-08 08:48:45 +00:00
search/models/concerns/account Enable "zero monkey patching" mode in RSpec (#31614) 2024-09-04 05:12:25 +00:00
serializers Re-introduce `application_id` in `ScheduledStatusSerializer` (#33505) 2025-01-09 13:38:23 +00:00
services Add role-specific user fabricators (#33437) 2025-01-03 08:28:14 +00:00
support Add "Account::Search" shared example for use in `Account` spec (#33507) 2025-01-09 08:12:48 +00:00
system Merge commit '34cd7d6585992c03298c175ab5d22ad059b58cdb' into glitch-soc/merge-upstream 2025-01-10 20:41:36 +01:00
validators Add ability to manage which websites can credit you in link previews (#31819) 2024-09-10 12:00:40 +00:00
views Merge commit '44d92fa4f6aac5c45ad358287af48cd879f5665e' into glitch-soc/merge-upstream 2024-11-15 18:44:32 +01:00
workers Add role-specific user fabricators (#33437) 2025-01-03 08:28:14 +00:00
flatware_helper.rb Use flatware to parallelize CI specs (#30284) 2024-06-27 07:42:57 +00:00
rails_helper.rb Update `rails` to version 8.0.1 (#32357) 2025-01-03 16:08:21 +00:00
spec_helper.rb Use `likes` and `shares` totalItems on status creations and updates (#32620) 2024-10-28 04:55:18 +00:00