Claire 7452a95998 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `.github/dependabot.yml`: Upstream made changes while we have dropped this file. Keep the file deleted. - `.prettierignore`: Upstream made changes at the end of the file, where we had our extra lines. Just moved our extra lines back at the end. - `app/serializers/initial_state_serializer.rb`: Upstream code style changes. Applied them. - `app/services/backup_service.rb`: Upstream code style changes. Applied them.		2023-02-19 10:42:55 +01:00
..
accounts	Merge branch 'main' into glitch-soc/merge-upstream	2023-02-19 10:42:55 +01:00
admin	Autofix Rubocop Lint/ParenthesesAsGroupedExpression (#23682)	2023-02-18 04:00:05 +01:00
announcements	…
apps	…
emails	…
instances	…
lists	…
polls	…
push	Autofix Rubocop Style/TrailingCommaInHashLiteral (#23693)	2023-02-18 23:33:41 +09:00
statuses	Run rubocop formatting except line length (#23632)	2023-02-18 06:56:20 +09:00
timelines	…
trends	…
accounts_controller_spec.rb	…
announcements_controller_spec.rb	…
apps_controller_spec.rb	Autofix Rubocop RSpec/BeNil (#23653)	2023-02-17 21:45:27 +09:00
blocks_controller_spec.rb	…
bookmarks_controller_spec.rb	…
conversations_controller_spec.rb	…
custom_emojis_controller_spec.rb	…
domain_blocks_controller_spec.rb	…
endorsements_controller_spec.rb	…
favourites_controller_spec.rb	…
filters_controller_spec.rb	Fix irreversible and whole_word parameters handling in /api/v1/filters (#21988)	2022-12-07 00:10:53 +01:00
follow_requests_controller_spec.rb	…
followed_tags_controller_spec.rb	…
instances_controller_spec.rb	…
lists_controller_spec.rb	…
markers_controller_spec.rb	Enable Rubocop Style/NumericLiterals (#23647)	2023-02-18 11:05:57 +09:00
media_controller_spec.rb	…
mutes_controller_spec.rb	…
notifications_controller_spec.rb	…
polls_controller_spec.rb	…
reports_controller_spec.rb	Run rubocop formatting except line length (#23632)	2023-02-18 06:56:20 +09:00
statuses_controller_spec.rb	Autofix Rubocop RSpec/BeNil (#23653)	2023-02-17 21:45:27 +09:00
streaming_controller_spec.rb	Autofix Rubocop Style/StringLiterals (#23695)	2023-02-19 07:38:14 +09:00
suggestions_controller_spec.rb	Autofix Rubocop Lint/AmbiguousOperator (#23680)	2023-02-18 03:22:01 +01:00
tags_controller_spec.rb	Fix not being able to follow more than one hashtag (#21285)	2022-11-21 10:35:09 +01:00