Claire 193250556c Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `README.md`: Upstream changed their README, we have our own. Kept ours. - `app/helpers/application_helper.rb`: Minor code style fix upstream, on a line that is different in glitch-soc due to the different theming system. Applied the code style fix to our own code. - `app/views/settings/preferences/appearance/show.html.haml`: Code style fix on a line next to lines exclusive to glitch-soc. Applied upstream changes. - `yarn.lock`: Upstream updated a dependency textually close to a glitch-soc-only dependency. Updated the dependency like upstream did.		2023-03-16 23:12:59 +01:00
..
activitypub	Coverage improvement round-out following up previous work (#23987)	2023-03-10 13:33:30 +01:00
admin	Admin controllers specs (#23917)	2023-03-04 17:13:28 +01:00
api	Merge branch 'main' into glitch-soc/merge-upstream	2023-03-16 23:12:59 +01:00
auth	Coverage improvement round-out following up previous work (#23987)	2023-03-10 13:33:30 +01:00
concerns	Enable Rubocop HTTP status rules (#23717)	2023-02-20 11:16:40 +09:00
disputes	Enable Style/FrozenStringLiteralComment for specs (#23790)	2023-02-22 09:55:31 +09:00
filters	Coverage improvement round-out following up previous work (#23987)	2023-03-10 13:33:30 +01:00
oauth	Autofix Rubocop Style/StringLiterals (#23695)	2023-02-19 07:38:14 +09:00
settings	Merge branch 'main' into glitch-soc/merge-upstream	2023-03-15 09:16:10 +01:00
well_known	Enable Style/FrozenStringLiteralComment for specs (#23790)	2023-02-22 09:55:31 +09:00
about_controller_spec.rb	Enable Style/FrozenStringLiteralComment for specs (#23790)	2023-02-22 09:55:31 +09:00
accounts_controller_spec.rb	Enable Style/FrozenStringLiteralComment for specs (#23790)	2023-02-22 09:55:31 +09:00
application_controller_spec.rb	Merge branch 'main' into glitch-soc/merge-upstream	2023-02-25 14:00:40 +01:00
authorize_interactions_controller_spec.rb	Run rubocop formatting except line length (#23632)	2023-02-18 06:56:20 +09:00
custom_css_controller_spec.rb	Coverage improvement round-out following up previous work (#23987)	2023-03-10 13:33:30 +01:00
emojis_controller_spec.rb	Enable Style/FrozenStringLiteralComment for specs (#23790)	2023-02-22 09:55:31 +09:00
filters_controller_spec.rb	Coverage improvement round-out following up previous work (#23987)	2023-03-10 13:33:30 +01:00
follower_accounts_controller_spec.rb	Enable Style/FrozenStringLiteralComment for specs (#23790)	2023-02-22 09:55:31 +09:00
following_accounts_controller_spec.rb	Enable Style/FrozenStringLiteralComment for specs (#23790)	2023-02-22 09:55:31 +09: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	Enable Style/FrozenStringLiteralComment for specs (#23790)	2023-02-22 09:55:31 +09:00
instance_actors_controller_spec.rb	Enable Style/FrozenStringLiteralComment for specs (#23790)	2023-02-22 09:55:31 +09:00
intents_controller_spec.rb	Enable Style/FrozenStringLiteralComment for specs (#23790)	2023-02-22 09:55:31 +09:00
invites_controller_spec.rb	Enable Style/FrozenStringLiteralComment for specs (#23790)	2023-02-22 09:55:31 +09:00
manifests_controller_spec.rb	Enable Style/FrozenStringLiteralComment for specs (#23790)	2023-02-22 09:55:31 +09:00
media_controller_spec.rb
media_proxy_controller_spec.rb
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	Fix “Remove all followers from the selected domains” being more destructive than it claims (#23805)	2023-03-03 20:25:15 +01:00
shares_controller_spec.rb	Enable Style/FrozenStringLiteralComment for specs (#23790)	2023-02-22 09:55:31 +09:00
statuses_cleanup_controller_spec.rb	Enable Style/FrozenStringLiteralComment for specs (#23790)	2023-02-22 09:55:31 +09:00
statuses_controller_spec.rb	Autofix Rubocop RSpec/BeNil (#23653)	2023-02-17 21:45:27 +09:00
tags_controller_spec.rb	Enable Style/FrozenStringLiteralComment for specs (#23790)	2023-02-22 09:55:31 +09:00