Conflicts: - `spec/controllers/application_controller_spec.rb`: Upstream moved specs that were textually-adjacent to glitch-soc ones. Kept the glitch-soc ones.
Conflicts: - `spec/controllers/application_controller_spec.rb`: Upstream moved specs that were textually-adjacent to glitch-soc ones. Kept the glitch-soc ones.