02134172f1
Conflicts: - `.rubocop_todo.yml`: Glitch-soc had different overrides, but upstream simply disabled the rules. Disabled them as well. - `app/serializers/initial_state_serializer.rb`: Not really a conflict, again because of a rubocop comment.