Claire 077e0c6812 Merge commit '0b4a3a04378ce43f2f314b9446b5053f6b374c6d' into glitch-soc/merge-upstream ... Conflicts: - `Gemfile.lock`: Conflict caused by the `json` gem thing once again. Updated as upstream did, but keeping the most recent `json` version. - `spec/helpers/application_helper_spec.rb`: Upstream refactored a bunch of specs, including one place that differs because of glitch-soc's theming system. Refactored as upstream did, adapting it for glitch-soc's theming system.		2023-12-20 22:16:50 +01:00
..
activitypub	Fix RSpec/AnyInstance cop (#27810)	2023-11-14 14:52:59 +00:00
admin	Use the Admin::ActionLog fabricator in admin/action_logs spec (#28194)	2023-12-04 12:56:28 +00:00
api	Merge commit '0530ce5e9575c09464847412f43852f438b0494e' into glitch-soc/merge-upstream	2023-12-20 21:58:18 +01:00
auth	Fix RSpec/AnyInstance cop (#27810)	2023-11-14 14:52:59 +00:00
concerns	File cleanup/organization in controllers/concerns (#27846)	2023-11-30 14:39:41 +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	Fix RSpec/InferredSpecType cop (#24736)	2023-05-04 05:49:53 +02:00
settings	Merge commit '85662a5a57531af5402a6777d0b1089e78c56815' into glitch-soc/merge-upstream	2023-12-20 20:10:45 +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	Consolidate JSON parsing in serializers specs (#27693)	2023-11-07 15:20:24 +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	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	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	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	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	Fix RSpec/InferredSpecType cop (#24736)	2023-05-04 05:49:53 +02:00