Conflicts: - `.env.production.sample`: Upstream and glitch-soc had different comments, some comments got updated upstream. Updated them in glitch-soc accordingly.
AdminMailer#auto_close_registrations
public_visibility
max_pinned_statuses
Capybara/NegationMatcher
match_json_values
simplecov
rails_helper