treehouse
/
mastodon
21
8
Fork 5
Code Issues 32 Pull Requests Projects 1 Releases Wiki Activity
mastodon/spec
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
..
config/initializers Autofix Rubocop Style/EmptyLambdaParameter (#23705) 2023-02-19 07:12:06 +09:00
controllers Merge branch 'main' into glitch-soc/merge-upstream 2023-02-19 10:42:55 +01:00
fabricators Autofix Rubocop Style/StringLiterals (#23695) 2023-02-19 07:38:14 +09:00
features Autofix Rubocop Style/StringLiterals (#23695) 2023-02-19 07:38:14 +09:00
fixtures Change domain block CSV parsing to be more robust and handle more lists (#21470) 2023-01-18 16:20:52 +01:00
helpers Autofix Rubocop RSpec/EmptyLineAfterHook (#23718) 2023-02-19 14:54:34 +09:00
lib Merge branch 'main' into glitch-soc/merge-upstream 2023-02-19 10:42:55 +01:00
mailers Autofix Rubocop Style/StringLiterals (#23695) 2023-02-19 07:38:14 +09:00
models Merge branch 'main' into glitch-soc/merge-upstream 2023-02-19 10:42:55 +01:00
policies Merge branch 'main' into glitch-soc/merge-upstream 2022-10-28 19:23:58 +02:00
presenters Merge branch 'main' into glitch-soc/merge-upstream 2023-02-19 10:42:55 +01:00
requests Autofix Rubocop Style/StringLiterals (#23695) 2023-02-19 07:38:14 +09:00
routing Enable Rubocop RSpec/MultipleDescribes (#23672) 2023-02-18 03:25:47 +01:00
serializers Run rubocop formatting except line length (#23632) 2023-02-18 06:56:20 +09:00
services Merge branch 'main' into glitch-soc/merge-upstream 2023-02-19 10:42:55 +01:00
support Autofix Rubocop Style/IfUnlessModifier (#23697) 2023-02-18 12:37:47 +01:00
validators Merge branch 'main' into glitch-soc/merge-upstream 2023-02-19 10:42:55 +01:00
views/statuses Fix style for hashes (#20518) 2022-11-17 11:05:39 +01:00
workers Autofix Rubocop Style/TrailingCommaInArrayLiteral (#23692) 2023-02-19 06:54:30 +09:00
rails_helper.rb Autofix Rubocop Style/StringLiterals (#23695) 2023-02-19 07:38:14 +09:00
spec_helper.rb Autofix Rubocop Style/StringLiterals (#23695) 2023-02-19 07:38:14 +09:00