Claire 92fa9d34b0 Merge commit '3554c527954441fd924586a49c7d99a89101ac7e' into glitch-soc/merge-upstream ... Conflicts: - `app/controllers/authorize_interactions_controller.rb`: Small conflict due to our theming system. - `streaming/index.js`: Upstream refactored part of the streaming server. We had some extra logic for handling local-only posts. Applied the refactor.		2023-07-30 16:11:55 +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	Use correct naming on controller concern specs (#26197)	2023-07-27 14:27:21 +02:00
disputes	Admin mailer parameterization (#25759)	2023-07-08 20:03:38 +02:00
filters
oauth
settings	Merge commit '82e477b184b5666fff7fb55933dce22ca2925db8' into glitch-soc/merge-upstream	2023-07-12 16:03:05 +02:00
well_known
.rubocop.yml
about_controller_spec.rb
accounts_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
filters_controller_spec.rb
follower_accounts_controller_spec.rb
following_accounts_controller_spec.rb
health_controller_spec.rb
home_controller_spec.rb
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
statuses_controller_spec.rb
tags_controller_spec.rb