Claire c48ec9cb8c Merge commit 'b85c387c5c0527b0ad31c27031a09d361826c5fc' into glitch-soc/merge-upstream ...

Conflicts:
- `config/initializers/content_security_policy.rb`:
  Kept our version, it was not affected by upstream's bug.

2023-06-10 16:48:01 +02:00

..

blacklisted_email_validator_spec.rb

Autofix Rubocop RSpec/LeadingSubject (#23670)

2023-02-20 13:24:14 +09:00

disallowed_hashtags_validator_spec.rb

Fix RSpec/ContextWording cop (#24739)

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

email_mx_validator_spec.rb

Fix RSpec/ContextWording cop (#24739)

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

follow_limit_validator_spec.rb

Fix RSpec/ContextWording cop (#24739)

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

note_length_validator_spec.rb

Fix RSpec/DescribedClass cop (#25104)

2023-06-06 13:58:33 +02:00

poll_validator_spec.rb

Fix RSpec/ContextWording cop (#24739)

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

reaction_validator_spec.rb

…

status_length_validator_spec.rb

Fix most rubocop issues (#2165)

2023-04-09 11:25:30 +02:00

status_pin_validator_spec.rb

Fix RSpec/ContextWording cop (#24739)

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

unique_username_validator_spec.rb

…

unreserved_username_validator_spec.rb

Fix RSpec/ContextWording cop (#24739)

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

url_validator_spec.rb

Fix RSpec/ContextWording cop (#24739)

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