BigW Consortium Gitlab
Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gitlab-ce
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Forest Godfrey
gitlab-ce
Commits
685d67cc
Commit
685d67cc
authored
Jan 28, 2017
by
Padilla, Gerald
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove flash warning from login page
parent
adc0e41f
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
11 additions
and
1 deletion
+11
-1
root_controller.rb
app/controllers/root_controller.rb
+2
-1
25360-remove-flash-warning-from-login-page.yml
...unreleased/25360-remove-flash-warning-from-login-page.yml
+4
-0
login_spec.rb
spec/features/login_spec.rb
+5
-0
No files found.
app/controllers/root_controller.rb
View file @
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'
...
...
changelogs/unreleased/25360-remove-flash-warning-from-login-page.yml
0 → 100644
View file @
685d67cc
---
title
:
Remove flash warning from login page
merge_request
:
8864
author
:
Gerald J. Padilla
spec/features/login_spec.rb
View file @
685d67cc
...
...
@@ -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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment