Merge branch 'main' into glitch-soc/merge-upstream

Conflicts:
- `.prettierignore`:
  Upstream added a line at the end of the file, while glitch-soc had its own
  extra lines.
  Took upstream's change.
- `CONTRIBUTING.md`:
  We have our custom CONTRIBUTING.md quoting upstream. Upstream made changes.
  Ported upstream changes.
- `app/controllers/application_controller.rb`:
  Upstream made code style changes in a method that is entirely replaced
  in glitch-soc.
  Ignored the change.
- `app/models/account.rb`:
  Code style changes textually close to glitch-soc-specific changes.
  Ported upstream changes.
- `lib/sanitize_ext/sanitize_config.rb`:
  Upstream code style changes.
  Ignored them.

1 files changed, 5 insertions, 3 deletions

diff --git a/spec/controllers/statuses_cleanup_controller_spec.rb b/spec/controllers/statuses_cleanup_controller_spec.rb
index 347fe4027..969778bbf 100644
--- a/spec/controllers/statuses_cleanup_controller_spec.rb
+++ b/spec/controllers/statuses_cleanup_controller_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rails_helper'
 
 RSpec.describe StatusesCleanupController, type: :controller do
@@ -19,9 +21,9 @@ RSpec.describe StatusesCleanupController, type: :controller do
     it 'updates the account status cleanup policy' do
       put :update, params: { account_statuses_cleanup_policy: { enabled: true, min_status_age: 2.weeks.seconds, keep_direct: false, keep_polls: true } }
       expect(response).to redirect_to(statuses_cleanup_path)
-      expect(@user.account.statuses_cleanup_policy.enabled).to eq true
-      expect(@user.account.statuses_cleanup_policy.keep_direct).to eq false
-      expect(@user.account.statuses_cleanup_policy.keep_polls).to eq true
+      expect(@user.account.statuses_cleanup_policy.enabled).to be true
+      expect(@user.account.statuses_cleanup_policy.keep_direct).to be false
+      expect(@user.account.statuses_cleanup_policy.keep_polls).to be true
     end
   end
 end