Merge remote-tracking branch 'upstream/master'
Showing
- .dependabot/config.yml 0 additions, 28 deletions.dependabot/config.yml
- .env.vagrant 1 addition, 0 deletions.env.vagrant
- .github/dependabot.yml 22 additions, 0 deletions.github/dependabot.yml
- Gemfile 14 additions, 14 deletionsGemfile
- Gemfile.lock 121 additions, 120 deletionsGemfile.lock
- SECURITY.md 12 additions, 0 deletionsSECURITY.md
- app/chewy/statuses_index.rb 1 addition, 1 deletionapp/chewy/statuses_index.rb
- app/controllers/accounts_controller.rb 4 additions, 2 deletionsapp/controllers/accounts_controller.rb
- app/controllers/activitypub/claims_controller.rb 21 additions, 0 deletionsapp/controllers/activitypub/claims_controller.rb
- app/controllers/activitypub/collections_controller.rb 31 additions, 17 deletionsapp/controllers/activitypub/collections_controller.rb
- app/controllers/admin/custom_emojis_controller.rb 2 additions, 0 deletionsapp/controllers/admin/custom_emojis_controller.rb
- app/controllers/api/v1/crypto/deliveries_controller.rb 30 additions, 0 deletionsapp/controllers/api/v1/crypto/deliveries_controller.rb
- app/controllers/api/v1/crypto/encrypted_messages_controller.rb 59 additions, 0 deletions...ontrollers/api/v1/crypto/encrypted_messages_controller.rb
- app/controllers/api/v1/crypto/keys/claims_controller.rb 25 additions, 0 deletionsapp/controllers/api/v1/crypto/keys/claims_controller.rb
- app/controllers/api/v1/crypto/keys/counts_controller.rb 17 additions, 0 deletionsapp/controllers/api/v1/crypto/keys/counts_controller.rb
- app/controllers/api/v1/crypto/keys/queries_controller.rb 26 additions, 0 deletionsapp/controllers/api/v1/crypto/keys/queries_controller.rb
- app/controllers/api/v1/crypto/keys/uploads_controller.rb 29 additions, 0 deletionsapp/controllers/api/v1/crypto/keys/uploads_controller.rb
- app/controllers/auth/sessions_controller.rb 5 additions, 45 deletionsapp/controllers/auth/sessions_controller.rb
- app/controllers/concerns/sign_in_token_authentication_concern.rb 49 additions, 0 deletions...trollers/concerns/sign_in_token_authentication_concern.rb
- app/controllers/concerns/two_factor_authentication_concern.rb 47 additions, 0 deletions...controllers/concerns/two_factor_authentication_concern.rb
Loading
Please register or sign in to comment