Merge remote-tracking branch 'tootsuite/master' into merge-upstream

Conflicts: app/javascript/styles/mastodon/components.scss
2018-02-02 08:39:52 -06:00
parent ad3a2dfb66 33f56811e3
commit 4c1fd9a19c
30 changed files with 244 additions and 95 deletions
--- a/app/controllers/auth/sessions_controller.rb
+++ b/app/controllers/auth/sessions_controller.rb
@ -29,7 +29,11 @@ class Auth::SessionsController < Devise::SessionsController
    if session[:otp_user_id]
      User.find(session[:otp_user_id])
    elsif user_params[:email]
-      User.find_for_authentication(email: user_params[:email])
+      if use_pam? && Devise.check_at_sign && user_params[:email].index('@').nil?
+        User.joins(:account).find_by(accounts: { username: user_params[:email] })
+      else
+        User.find_for_authentication(email: user_params[:email])
+      end
    end
  end