Claire b867d4581e Merge commit 'c91c0175db1cc8b954a977d29472886234ce9586' into glitch-soc/merge-upstream ... Conflicts: - `spec/controllers/api/v1/timelines/tag_controller_spec.rb`: Glitch-soc had a few extra lines in this file to account for a different default setting. This file got replaced by `spec/requests/api/v1/timelines/tag_spec.rb`, into which the glitch-soc additions were moved too. Additional changes: - `spec/requests/api/v1/statuses/sources_spec.rb`: Add glitch-soc-only attribute `content_type`.		2023-10-17 21:35:07 +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 moderator rights inconsistencies (#26729)	2023-09-06 16:40:19 +02:00
api	Merge commit 'c91c0175db1cc8b954a977d29472886234ce9586' into glitch-soc/merge-upstream	2023-10-17 21:35:07 +02:00
auth	Fix RSpec/StubbedMock cop (#25552)	2023-07-12 10:20:10 +02:00
concerns	Merge pull request from GHSA-hcqf-fw2r-52g4	2023-09-19 16:52:52 +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	Add avatar image to webfinger responses (#26558)	2023-08-31 13:46:27 +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	Coverage improvement round-out following up previous work (#23987)	2023-03-10 13:33:30 +01:00
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	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/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