Claire 9ae60f8738 Merge commit '82e477b184b5666fff7fb55933dce22ca2925db8' into glitch-soc/merge-upstream ... Conflicts: - `db/migrate/20180831171112_create_bookmarks.rb`: Upstream ran a lint fix on this file, but this file is different in glitch-soc because the feature was added much earlier. Ran the lint fix on our own version of the file.		2023-07-12 16:03:05 +02:00
..
accounts	Merge commit '39110d1d0af5e3d9cf452ae47496a52797249fd0' into glitch-soc/merge-upstream	2023-06-18 10:36:14 +02:00
admin	Migrate to request specs in /api/v1/admin/account_actions (#25514)	2023-06-20 18:16:48 +02:00
announcements
emails	Fix HTTP 500 in /api/v1/emails/check_confirmation (#25595)	2023-07-02 00:05:44 +02:00
featured_tags
instances
lists
polls
push
statuses	Change /api/v1/statuses/:id/history to always return at least one item (#25510)	2023-06-22 14:56:14 +02:00
timelines
trends
accounts_controller_spec.rb	Extract shared examples from api specs (#25387)	2023-06-14 09:34:01 +02:00
announcements_controller_spec.rb
blocks_controller_spec.rb
bookmarks_controller_spec.rb
conversations_controller_spec.rb	Fix /api/v1/conversations sometimes returning empty accounts (#25499)	2023-06-20 18:32:26 +02:00
custom_emojis_controller_spec.rb
directories_controller_spec.rb	Fix rails rewhere deprecation warning in directories api controller (#25625)	2023-07-01 21:48:16 +02:00
endorsements_controller_spec.rb
favourites_controller_spec.rb
filters_controller_spec.rb
followed_tags_controller_spec.rb
instances_controller_spec.rb
markers_controller_spec.rb
media_controller_spec.rb	Fix RSpec/StubbedMock cop (#25552)	2023-07-12 10:20:10 +02:00
mutes_controller_spec.rb
notifications_controller_spec.rb	Combine assertions in api/v1/notifications spec (#25486)	2023-06-19 09:05:42 +02:00
polls_controller_spec.rb
preferences_controller_spec.rb
reports_controller_spec.rb	Admin mailer parameterization (#25759)	2023-07-08 20:03:38 +02:00
scheduled_statuses_controller_spec.rb
statuses_controller_spec.rb	Fix RSpec/MissingExampleGroupArgument cop (#25310)	2023-06-06 15:51:42 +02:00
streaming_controller_spec.rb