diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2021-12-27 15:16:18 +0100 |
|---|---|---|
| committer | Claire <claire.github-309c@sitedethib.com> | 2021-12-27 15:16:18 +0100 |
| commit | 09c61e13767f7b77618949f422f229b638381088 (patch) | |
| tree | 4729cdeb166e05b4e8b6e594be3f8487378aacad /config/environments | |
| parent | 3b9a6049adf3ee6844a81622c297dd893836f79d (diff) | |
| parent | fe71548844715d796b9a6d2dd5234f70cf080f13 (diff) | |
Merge branch 'main' into glitch-soc/merge-upstream
Conflicts: - `README.md`: We have completely different contents. Kept our version. - `package.json`: Not a real conflict, just an upstream dependency udpated textually too close to a glitch-soc-only dependency. Updated dependencies like upstream. - `streaming/index.js`: Conflict due to code style changes on parts that were modified in glitch-soc to handle local-only toots. Changed style according to upstream.
Diffstat (limited to 'config/environments')
| -rw-r--r-- | config/environments/development.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/config/environments/development.rb b/config/environments/development.rb index d76361c60..de8762ff7 100644 --- a/config/environments/development.rb +++ b/config/environments/development.rb @@ -81,7 +81,7 @@ Rails.application.configure do Bullet.bullet_logger = true Bullet.rails_logger = false - Bullet.add_whitelist type: :n_plus_one_query, class_name: 'User', association: :account + Bullet.add_safelist type: :n_plus_one_query, class_name: 'User', association: :account end config.x.otp_secret = ENV.fetch('OTP_SECRET', '1fc2b87989afa6351912abeebe31ffc5c476ead9bf8b3d74cbc4a302c7b69a45b40b1bbef3506ddad73e942e15ed5ca4b402bf9a66423626051104f4b5f05109') |