Claire e08c8b6933 Merge commit 'b48f907b20e2c9909665a484041845697d26f17c' into glitch-soc/merge-upstream ...

Conflicts:
- `app/helpers/settings_helper.rb`:
  Upstream added a new helper.
  Conflict caused by the fact there is a glitch-soc specific helper.
  Added upstream's new helper in addition to glitch-soc's.

2026-06-09 21:30:54 +02:00

..

admin

Update rubocop-rspec to version 3.10.1 (#39303)

2026-06-08 15:27:34 +00:00

accounts_helper_spec.rb

…

application_helper_spec.rb

Update rubocop-rspec to version 3.10.1 (#39303)

2026-06-08 15:27:34 +00:00

database_helper_spec.rb

…

filters_helper_spec.rb

…

flashes_helper_spec.rb

…

formatting_helper_spec.rb

…

home_helper_spec.rb

…

instance_helper_spec.rb

…

json_ld_helper_spec.rb

Rescue JSON::ParserError where already converted (#38244)

2026-03-17 08:57:10 +00:00

languages_helper_spec.rb

…

media_component_helper_spec.rb

…

react_component_helper_spec.rb

…

routing_helper_spec.rb

…

self_destruct_helper_spec.rb

…

settings_helper_spec.rb

Handle offset relative to TZ in options list (#39334)

2026-06-09 12:58:45 +00:00

statuses_helper_spec.rb

…

theme_helper_spec.rb

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

2026-06-09 21:30:54 +02:00