diff options
| author | imncls <himasoto@gmail.com> | 2018-02-23 23:28:31 +0900 |
|---|---|---|
| committer | imncls <himasoto@gmail.com> | 2018-02-23 23:28:31 +0900 |
| commit | bb6988a7ac319c08776d8c07204232a67f992671 (patch) | |
| tree | 4a53349374bc4a871a6ce74b786a8e747803155c /app/controllers/auth | |
| parent | 544543e40a723d9719f5571bd4c3455a6a69fccd (diff) | |
| parent | e668180044560e28bdc5eef94744c210013efcda (diff) | |
Merge branch 'master' of https://github.com/tootsuite/mastodon
# Conflicts: # app/controllers/settings/exports_controller.rb # app/models/media_attachment.rb # app/models/status.rb # app/views/about/show.html.haml # docker_entrypoint.sh # spec/views/about/show.html.haml_spec.rb
Diffstat (limited to 'app/controllers/auth')
| -rw-r--r-- | app/controllers/auth/sessions_controller.rb | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/app/controllers/auth/sessions_controller.rb b/app/controllers/auth/sessions_controller.rb index ce9cf98d7..475cd540a 100644 --- a/app/controllers/auth/sessions_controller.rb +++ b/app/controllers/auth/sessions_controller.rb @@ -11,6 +11,15 @@ class Auth::SessionsController < Devise::SessionsController prepend_before_action :set_pack before_action :set_instance_presenter, only: [:new] + def new + Devise.omniauth_configs.each do |provider, config| + if config.strategy.redirect_at_sign_in + return redirect_to(omniauth_authorize_path(resource_name, provider)) + end + end + super + end + def create super do |resource| remember_me(resource) |