Claire 2810231180 Merge commit 'b2388be71eb0031ef9e47c492b1c038231cd8bc0' into glitch-soc/merge-upstream ...

Conflicts:
- `app/controllers/activitypub/collections_controller.rb`:
  Upstream renamed a helper method everywhere.
  There was one glitch-soc line involving changes because of the local-only post
  feature.
  Ported upstream's change.

2024-05-16 19:30:10 +02:00

..

activitypub

Extract parsed_uri_query_values helper in ap/replies controller spec (#29410)

2024-02-29 13:47:38 +00:00

admin

Improve Report Notes and Account Moderation Notes (#30288)

2024-05-15 13:38:36 +00:00

api

Add Api::ErrorHandling concern for api/base controller (#29574)

2024-03-14 09:09:47 +00:00

auth

Better tests for auth/registrations#update (#29303)

2024-02-26 16:09:56 +00:00

concerns

Rename cache_* methods to preload_* in controller concern (#30209)

2024-05-16 08:03:46 +00:00

disputes

Use capture_emails helper to improve email assertions in specs (#29245)

2024-02-19 15:57:47 +00: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 commit '24319836de6046fb2985ec1a24c30ad7d47584d7' into glitch-soc/merge-upstream

2024-03-11 17:29:07 +01:00

.rubocop.yml

Use unchanging github links in docs/comments (#29545)

2024-03-11 15:14:55 +00:00

about_controller_spec.rb

Fix RSpec/InferredSpecType cop (#24736)

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

application_controller_spec.rb

Merge commit '20b1e55f24a87868d661fc7b033bbbbd48b1a918' into glitch-soc/merge-upstream

2024-05-01 18:42:26 +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

Use "cacheable response" shared example in more places (#29419)

2024-02-27 11:50:21 +00: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

Coverage improvement round-out following up previous work (#23987)

2023-03-10 13:33:30 +01:00

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

Add coverage for suspended instance actor scenario (#29571)

2024-03-13 15:43:40 +00: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

Use "cacheable response" shared example in more places (#29419)

2024-02-27 11:50:21 +00:00

media_controller_spec.rb

Fix error when rendering public pages with media attachments (#16763)

2021-10-13 15:27:19 +02:00

media_proxy_controller_spec.rb

Fix media attachments enumeration (#14254)

2020-07-07 15:26:51 +02:00

privacy_controller_spec.rb

Coverage improvement round-out following up previous work (#23987)

2023-03-10 13:33:30 +01:00

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

Use "cacheable response" shared example in more places (#29419)

2024-02-27 11:50:21 +00:00