tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
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.
This commit is contained in:
Claire
2021-12-27 15:16:18 +01:00
parent 3b9a6049ad fe71548844
commit 09c61e1376
14 changed files with 909 additions and 962 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
config/environments/development.rb
View File

@@ -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')