Claire 44a5f1b64a Merge commit '425d77f8124a50fc033e8fb3bdf7b89a6a25f4fa' into glitch-soc/merge-upstream ...

Conflicts:
- `.rubocop_todo.yml`:
  Upstream regenerated this file, glitch-soc had a specific ignore.
- `README.md`:
  Upstream updated its README, but glitch-soc has a completely different one.
  Kept glitch-soc's README

2023-08-11 22:15:41 +02:00

..

activitypub

Update rubocop-rspec to version 2.22.0, fix RSpec/IndexedLet cop (#24698)

2023-06-14 16:44:37 +02:00

admin

Fix RSpec/SubjectDeclaration cop (#25312)

2023-07-12 09:49:33 +02:00

api

Merge commit '1814990a3d117555153321216fa593e4d9e84de3' into glitch-soc/merge-upstream

2023-07-30 15:54:34 +02:00

auth

Fix RSpec/StubbedMock cop (#25552)

2023-07-12 10:20:10 +02:00

concerns

Do not normalize URL before fetching it (#26219)

2023-07-31 23:17:37 +02: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

Fix RSpec/InferredSpecType cop (#24736)

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

settings

Merge commit '82e477b184b5666fff7fb55933dce22ca2925db8' into glitch-soc/merge-upstream

2023-07-12 16:03:05 +02:00

well_known

Fix RSpec/InferredSpecType cop (#24736)

2023-05-04 05:49:53 +02: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

accounts_controller_spec.rb

Fix RSpec/MissingExampleGroupArgument cop (#25310)

2023-06-06 15:51:42 +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

Fix RSpec/MultipleSubjects cop (#24738)

2023-05-04 05:48:35 +02: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

Update rubocop-rspec to version 2.22.0, fix RSpec/IndexedLet cop (#24698)

2023-06-14 16:44:37 +02:00

following_accounts_controller_spec.rb

Update rubocop-rspec to version 2.22.0, fix RSpec/IndexedLet cop (#24698)

2023-06-14 16:44:37 +02:00

health_controller_spec.rb

…

home_controller_spec.rb

Fix RSpec/InferredSpecType cop (#24736)

2023-05-04 05:49:53 +02: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/InferredSpecType cop (#24736)

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

statuses_controller_spec.rb

Speed-up on StatusesController spec (#25549)

2023-06-22 14:51:53 +02:00

tags_controller_spec.rb

Fix RSpec/InferredSpecType cop (#24736)

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