Claire 6e56f95285 Merge commit '4a7395d989e40c3bd4ef18173aa5ea850c8ddcdd' into glitch-soc/merge-upstream ... Conflicts: - `README.md`: Upstream modified its README, we have a completely different one. Kept our README file.		2023-12-21 18:17:17 +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 '4a7395d989e40c3bd4ef18173aa5ea850c8ddcdd' into glitch-soc/merge-upstream	2023-12-21 18:17:17 +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	…
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	…
about_controller_spec.rb	…
application_controller_spec.rb	…
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	…
emojis_controller_spec.rb	Consolidate JSON parsing in serializers specs (#27693)	2023-11-07 15:20:24 +00:00
filters_controller_spec.rb	…
follower_accounts_controller_spec.rb	…
following_accounts_controller_spec.rb	…
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	…
intents_controller_spec.rb	…
invites_controller_spec.rb	…
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/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	…