luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-10-18 21:44:24 +00:00
Code Issues Projects Releases Wiki Activity
mastodon/spec/controllers/settings
History
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
..
exports Add ability to filter followed accounts' posts by language (#19095) 2022-09-20 23:51:21 +02:00
preferences Autofix Rubocop Style/TrailingCommaInHashLiteral (#23693) 2023-02-18 23:33:41 +09:00
two_factor_authentication Autofix Rubocop Style/StringLiterals (#23695) 2023-02-19 07:38:14 +09:00
applications_controller_spec.rb Autofix Rubocop RSpec/EmptyLineAfterFinalLet (#23707) 2023-02-19 07:10:19 +09:00
deletes_controller_spec.rb Remove setting that disables account deletes (#17683) 2022-10-06 10:16:47 +02:00
exports_controller_spec.rb
featured_tags_controller_spec.rb
flavours_controller_spec.rb
imports_controller_spec.rb Autofix Rubocop Style/StringLiterals (#23695) 2023-02-19 07:38:14 +09:00
migrations_controller_spec.rb Autofix Rubocop RSpec/ExcessiveDocstringSpacing (#23666) 2023-02-18 12:47:37 +01:00
profiles_controller_spec.rb Autofix Rubocop Style/StringLiterals (#23695) 2023-02-19 07:38:14 +09:00
sessions_controller_spec.rb Autofix Rubocop RSpec/EmptyLineAfterFinalLet (#23707) 2023-02-19 07:10:19 +09:00
two_factor_authentication_methods_controller_spec.rb