Commit c9203e25 authored by Rémy Coutable's avatar Rémy Coutable

Merge branch 'remove-warning-to-login' into 'master'

Remove flash warning from login page

See merge request !8864
parents fef6f52b 685d67cc
......@@ -7,6 +7,7 @@
# For users who haven't customized the setting, we simply delegate to
# `DashboardController#show`, which is the default.
class RootController < Dashboard::ProjectsController
skip_before_action :authenticate_user!, only: [:index]
before_action :redirect_to_custom_dashboard, only: [:index]
def index
......@@ -16,7 +17,7 @@ class RootController < Dashboard::ProjectsController
private
def redirect_to_custom_dashboard
return unless current_user
return redirect_to new_user_session_path unless current_user
case current_user.dashboard
when 'stars'
......
---
title: Remove flash warning from login page
merge_request: 8864
author: Gerald J. Padilla
......@@ -25,6 +25,11 @@ feature 'Login', feature: true do
expect(current_path).to eq root_path
end
it 'does not show flash messages when login page' do
visit root_path
expect(page).not_to have_content('You need to sign in or sign up before continuing.')
end
end
describe 'with two-factor authentication' do
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment