diff --git a/app/controllers/users/omniauth_callbacks_controller.rb b/app/controllers/users/omniauth_callbacks_controller.rb index 69270438c2c..8ff1ba52dc2 100644 --- a/app/controllers/users/omniauth_callbacks_controller.rb +++ b/app/controllers/users/omniauth_callbacks_controller.rb @@ -16,7 +16,7 @@ class Users::OmniauthCallbacksController < ApplicationController skip_before_action :redirect_to_login_if_required - layout false + layout 'no_ember' def self.types @types ||= Enum.new(:facebook, :instagram, :twitter, :google, :yahoo, :github, :persona, :cas) @@ -80,7 +80,7 @@ class Users::OmniauthCallbacksController < ApplicationController def failure flash[:error] = I18n.t("login.omniauth_error") - render layout: 'no_ember' + render 'failure' end def self.find_authenticator(name) diff --git a/app/views/users/omniauth_callbacks/failure.html.erb b/app/views/users/omniauth_callbacks/failure.html.erb index c83169acb3c..ea34e2fa24a 100644 --- a/app/views/users/omniauth_callbacks/failure.html.erb +++ b/app/views/users/omniauth_callbacks/failure.html.erb @@ -1,20 +1,11 @@ - - - <%= render partial: "layouts/head" %> - <%= render partial: "common/special_font_face" %> - <%= render partial: "common/discourse_stylesheet" %> - - -
- <%if flash[:error].present? %> -
- <%=flash[:error]%> -
- <%else%> -
- <%= t 'login.omniauth_error_unknown' %> -
- <%end%> +
+ <%if flash[:error].present? %> +
+ <%=flash[:error]%>
- - + <%else%> +
+ <%= t 'login.omniauth_error_unknown' %> +
+ <%end%> +