Claire dd0002e1fe Merge commit '610cf6c3713e414995ea1a57110db400ccb88dd2' into glitch-soc/merge-upstream ... Conflicts: - `app/models/trends.rb`: Conflict due to glitch-soc's code splitting trends mailing depending on type. Ported upstream's changes.		2023-07-12 15:38:35 +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/VerifiedDoubles cop (#25469)	2023-06-22 14:55:22 +02:00
api	Merge commit '610cf6c3713e414995ea1a57110db400ccb88dd2' into glitch-soc/merge-upstream	2023-07-12 15:38:35 +02:00
auth	Fix RSpec/VerifiedDoubles cop (#25469)	2023-06-22 14:55:22 +02:00
concerns	Fix RSpec/ExpectChange cop (#25101)	2023-05-24 11:23:40 +02:00
disputes	Admin mailer parameterization (#25759)	2023-07-08 20:03:38 +02:00
filters
oauth	Fix RSpec/InferredSpecType cop (#24736)	2023-05-04 05:49:53 +02:00
settings	Merge commit '39110d1d0af5e3d9cf452ae47496a52797249fd0' into glitch-soc/merge-upstream	2023-06-18 10:36:14 +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	Fix RSpec/VerifiedDoubles cop (#25469)	2023-06-22 14:55:22 +02:00
custom_css_controller_spec.rb
emojis_controller_spec.rb	Fix RSpec/MultipleSubjects cop (#24738)	2023-05-04 05:48:35 +02:00
filters_controller_spec.rb
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
media_controller_spec.rb
media_proxy_controller_spec.rb
privacy_controller_spec.rb
relationships_controller_spec.rb
shares_controller_spec.rb
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