Claire 0b2c7cdb02 Merge commit 'fe2667bb0d3487a32b9da5250402a90482a85fe2' into glitch-soc/merge-upstream ...

Conflicts:
- `app/lib/content_security_policy.rb`:
  Conflict caused by glitch-soc's support for the extra `EXTRA_DATA_HOSTS`
  environment variable.
  Ported upstream's changes while keeping support for `EXTRA_DATA_HOSTS`.

2024-01-10 17:51:12 +01:00

..

activitypub

Fix Style/InverseMethods cop (#28377)

2023-12-15 15:52:00 +00:00

admin

Fix NULL MX handling and tighten DNS resolving specs (#28607)

2024-01-05 11:07:57 +00:00

api

Merge branch 'main' into glitch-soc/merge-upstream

2023-12-28 16:57:10 +01:00

auth

Add ability to require approval when users sign up using specific email domains (#28468)

2024-01-04 09:07:05 +00:00

concerns

Convert signature verification specs to request specs (#28443)

2023-12-22 18:56:22 +00:00

disputes

Admin mailer parameterization (#25759)

2023-07-08 20:03:38 +02:00

filters

Refactor Cache-Control and Vary definitions (#24347)

2023-04-19 16:07:29 +02:00

oauth

Clean up of RSpec/LetSetup within spec/controllers (#28446)

2023-12-21 09:28:41 +00:00

settings

Merge branch 'main' into glitch-soc/merge-upstream

2023-12-28 16:57:10 +01:00

.rubocop.yml

Fix RSpec/DescribedClass cop (#25104)

2023-06-06 13:58:33 +02:00

about_controller_spec.rb

Fix RSpec/InferredSpecType cop (#24736)

2023-05-04 05:49:53 +02:00

application_controller_spec.rb

Merge commit 'f877aa9d70d0d600961989b8e97c0e0ce3ac1db6' into glitch-soc/merge-upstream

2023-05-08 19:28:21 +02:00

authorize_interactions_controller_spec.rb

Change interaction modal in web UI (#26075)

2023-07-27 16:11:17 +02:00

custom_css_controller_spec.rb

Refactor Cache-Control and Vary definitions (#24347)

2023-04-19 16:07:29 +02:00

emojis_controller_spec.rb

Improve spec coverage for models/announcement class (#28350)

2023-12-14 10:29:10 +00:00

filters_controller_spec.rb

Refactor Cache-Control and Vary definitions (#24347)

2023-04-19 16:07:29 +02:00

follower_accounts_controller_spec.rb

Clean up of RSpec/LetSetup within spec/controllers (#28446)

2023-12-21 09:28:41 +00:00

following_accounts_controller_spec.rb

Clean up of RSpec/LetSetup within spec/controllers (#28446)

2023-12-21 09:28:41 +00:00

health_controller_spec.rb

…

home_controller_spec.rb

Use framework helpers instead of i-vars in controller specs (#27767)

2023-11-08 08:17:43 +00:00

instance_actors_controller_spec.rb

Fix RSpec/InferredSpecType cop (#24736)

2023-05-04 05:49:53 +02:00

intents_controller_spec.rb

Fix RSpec/InferredSpecType cop (#24736)

2023-05-04 05:49:53 +02:00

invites_controller_spec.rb

Fix RSpec/ExpectChange cop (#25101)

2023-05-24 11:23:40 +02:00

manifests_controller_spec.rb

Refactor Cache-Control and Vary definitions (#24347)

2023-04-19 16:07:29 +02:00

media_controller_spec.rb

…

media_proxy_controller_spec.rb

…

privacy_controller_spec.rb

…

relationships_controller_spec.rb

Refactor Cache-Control and Vary definitions (#24347)

2023-04-19 16:07:29 +02:00

shares_controller_spec.rb

Remove instance variables from helper usage (#24203)

2023-04-23 22:35:54 +02:00

statuses_cleanup_controller_spec.rb

Fix RSpec/InstanceVariable cop (#27766)

2023-11-08 15:42:30 +00:00

statuses_controller_spec.rb

Reduce expectations for RSpec/MultipleExpectations cop in controllers/statuses spec (#27875)

2023-11-16 09:54:51 +00:00

tags_controller_spec.rb

Fix RSpec/InferredSpecType cop (#24736)

2023-05-04 05:49:53 +02:00