From 15c0e5429f8acaa05179cc13db97781fdccfba72 Mon Sep 17 00:00:00 2001 From: Albert Wang Date: Wed, 7 Aug 2019 14:38:17 -0700 Subject: [PATCH] =?UTF-8?q?Revert=20"Devise=20shows=20t.devise.failure.tim?= =?UTF-8?q?eout=20after=20a=20user=20signs=20in.=20Removing=E2=80=A6=20(#2?= =?UTF-8?q?104)"=20(#2112)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 73255b4c1b2cf611d543f4aed1bcb03bca4b2023. --- app/controllers/publishers_controller.rb | 2 ++ app/views/layouts/static.html.slim | 6 ++++++ 2 files changed, 8 insertions(+) diff --git a/app/controllers/publishers_controller.rb b/app/controllers/publishers_controller.rb index 8c3d16c62c..54456f9b57 100644 --- a/app/controllers/publishers_controller.rb +++ b/app/controllers/publishers_controller.rb @@ -266,6 +266,8 @@ def get_site_banner_data private def authenticate_via_token + sign_out(current_publisher) if current_publisher + publisher_id = params[:id] token = params[:token] confirm_email = params[:confirm_email] diff --git a/app/views/layouts/static.html.slim b/app/views/layouts/static.html.slim index f832924b9c..6e2e3e5b55 100644 --- a/app/views/layouts/static.html.slim +++ b/app/views/layouts/static.html.slim @@ -19,4 +19,10 @@ html link rel="icon" type="image/png" href=image_path("favicon.ico") body data-action=params[:action] data-controller=params[:controller] + .notifications.navbar-static-top + - if flash[:alert] + .alert.alert-warning.flash= flash[:alert] + - if flash[:notice] + .alert.alert-success.flash= flash[:notice] + = yield