Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Jérome Perrin
gitlab-ce
Commits
c9203e25
Commit
c9203e25
authored
Jan 31, 2017
by
Rémy Coutable
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'remove-warning-to-login' into 'master'
Remove flash warning from login page See merge request !8864
parents
fef6f52b
685d67cc
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
11 additions
and
1 deletion
+11
-1
app/controllers/root_controller.rb
app/controllers/root_controller.rb
+2
-1
changelogs/unreleased/25360-remove-flash-warning-from-login-page.yml
...unreleased/25360-remove-flash-warning-from-login-page.yml
+4
-0
spec/features/login_spec.rb
spec/features/login_spec.rb
+5
-0
No files found.
app/controllers/root_controller.rb
View file @
c9203e25
...
@@ -7,6 +7,7 @@
...
@@ -7,6 +7,7 @@
# For users who haven't customized the setting, we simply delegate to
# For users who haven't customized the setting, we simply delegate to
# `DashboardController#show`, which is the default.
# `DashboardController#show`, which is the default.
class
RootController
<
Dashboard
::
ProjectsController
class
RootController
<
Dashboard
::
ProjectsController
skip_before_action
:authenticate_user!
,
only:
[
:index
]
before_action
:redirect_to_custom_dashboard
,
only:
[
:index
]
before_action
:redirect_to_custom_dashboard
,
only:
[
:index
]
def
index
def
index
...
@@ -16,7 +17,7 @@ class RootController < Dashboard::ProjectsController
...
@@ -16,7 +17,7 @@ class RootController < Dashboard::ProjectsController
private
private
def
redirect_to_custom_dashboard
def
redirect_to_custom_dashboard
return
unless
current_user
return
redirect_to
new_user_session_path
unless
current_user
case
current_user
.
dashboard
case
current_user
.
dashboard
when
'stars'
when
'stars'
...
...
changelogs/unreleased/25360-remove-flash-warning-from-login-page.yml
0 → 100644
View file @
c9203e25
---
title
:
Remove flash warning from login page
merge_request
:
8864
author
:
Gerald J. Padilla
spec/features/login_spec.rb
View file @
c9203e25
...
@@ -25,6 +25,11 @@ feature 'Login', feature: true do
...
@@ -25,6 +25,11 @@ feature 'Login', feature: true do
expect
(
current_path
).
to
eq
root_path
expect
(
current_path
).
to
eq
root_path
end
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
end
describe
'with two-factor authentication'
do
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