From: Thibaut Girka <thib@sitedethib.com>
Date: Wed, 18 Sep 2019 15:25:56 +0000 (+0200)
Subject: Merge branch 'master' into glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=5cadb4723832b91068ee51955b9d4b1336502369;p=mastodon.git

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

Conflicts:
- app/controllers/auth/sessions_controller.rb
  Minor conflict due to glitch-soc's theming code
---

5cadb4723832b91068ee51955b9d4b1336502369
diff --cc app/controllers/auth/sessions_controller.rb
index 7ecbaf193,3e93b2e68..c2b38883b
--- a/app/controllers/auth/sessions_controller.rb
+++ b/app/controllers/auth/sessions_controller.rb
@@@ -8,9 -8,6 +8,8 @@@ class Auth::SessionsController < Devise
    skip_before_action :require_no_authentication, only: [:create]
    skip_before_action :require_functional!
  
-   prepend_before_action :authenticate_with_two_factor, if: :two_factor_enabled?, only: [:create]
 +  prepend_before_action :set_pack
 +
    before_action :set_instance_presenter, only: [:new]
    before_action :set_body_classes
  
@@@ -109,12 -92,15 +94,19 @@@
      render :two_factor
    end
  
+   def authenticate_and_respond(user)
+     sign_in(user)
+     remember_me(user)
+ 
+     respond_with user, location: after_sign_in_path_for(user)
+   end
+ 
    private
  
 +  def set_pack
 +    use_pack 'auth'
 +  end
 +
    def set_instance_presenter
      @instance_presenter = InstancePresenter.new
    end
diff --cc package.json
index 3cdd0abcb,24d5fcf9c..97d3ec497
--- a/package.json
+++ b/package.json
@@@ -98,9 -96,9 +98,10 @@@
      "exif-js": "^2.3.0",
      "express": "^4.17.1",
      "file-loader": "^4.2.0",
 +    "favico.js": "^0.3.10",
      "font-awesome": "^4.7.0",
      "glob": "^7.1.1",
+     "history": "^4.10.1",
      "http-link-header": "^1.0.2",
      "immutable": "^3.8.2",
      "imports-loader": "^0.8.0",