tootlab-mastodon

mirror of https://github.com/glitch-soc/mastodon.git synced 2025-01-11 18:22:53 -05:00

History

Claire 296b3d1560 Merge commit 'dc09c10fa8cc9230bf14e48d790c8f0c26043f8f' into glitch-soc/merge-upstream

Conflicts:
- `.rubocop_todo.yml`:
  Upstream re-generated the file, while glitch-soc has a specific ignore
  for some file.
  Updated the file as upstream did and kept our extra ignore.
- `config/webpack/shared.js`:
  Upstream added a plugin, but our files are pretty different.
  Added the plugin as well.
- `spec/helpers/application_helper_spec.rb`:
  Upstream refactored tests, but part of them were different because
  of glitch-soc's theming system.
  Applied the refactoring to glitch-soc's change.

2023-08-24 21:26:27 +02:00

admin

Update rubocop and rubocop-rspec (#26329 )

2023-08-22 09:31:40 +02:00

accounts_helper_spec.rb

Fix RSpec/InferredSpecType cop (#24736 )

2023-05-04 05:49:53 +02:00

application_helper_spec.rb

Merge commit 'dc09c10fa8cc9230bf14e48d790c8f0c26043f8f' into glitch-soc/merge-upstream

2023-08-24 21:26:27 +02:00

flashes_helper_spec.rb

Fix RSpec/InferredSpecType cop (#24736 )