Upstream sync

2020-08-31 18:19:00 +02:00
parent 896cec2259
commit 95a14ab2f6
37 changed files with 487 additions and 375 deletions
--- a/app/controllers/api/user_token_controller.rb
+++ b/app/controllers/api/user_token_controller.rb
@@ -4,6 +4,7 @@ require './lib/knock_monkeypatch'

 class Api::UserTokenController < Knock::AuthTokenController
  include Oath::ControllerHelpers
+  include RememberMe::Controller

  skip_before_action :verify_authenticity_token
  before_action :sign_in_user