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
Tatuya Kamada
gitlab-ce
Commits
ecc3f315
Commit
ecc3f315
authored
Dec 08, 2016
by
Sean McGivern
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch '24982-ux-improvement-sign-in-success-message' into 'master'
Closes #24982 See merge request !7837
parents
564b1662
6ab74b1c
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
11 additions
and
6 deletions
+11
-6
app/controllers/sessions_controller.rb
app/controllers/sessions_controller.rb
+2
-0
changelogs/unreleased/24982-ux-improvement-sign-in-success-message.yml
...released/24982-ux-improvement-sign-in-success-message.yml
+5
-0
spec/controllers/sessions_controller_spec.rb
spec/controllers/sessions_controller_spec.rb
+0
-1
spec/features/u2f_spec.rb
spec/features/u2f_spec.rb
+4
-5
No files found.
app/controllers/sessions_controller.rb
View file @
ecc3f315
...
@@ -31,6 +31,8 @@ class SessionsController < Devise::SessionsController
...
@@ -31,6 +31,8 @@ class SessionsController < Devise::SessionsController
resource
.
update_attributes
(
reset_password_token:
nil
,
resource
.
update_attributes
(
reset_password_token:
nil
,
reset_password_sent_at:
nil
)
reset_password_sent_at:
nil
)
end
end
# hide the signed-in notification
flash
[
:notice
]
=
nil
log_audit_event
(
current_user
,
with:
authentication_method
)
log_audit_event
(
current_user
,
with:
authentication_method
)
end
end
end
end
...
...
changelogs/unreleased/24982-ux-improvement-sign-in-success-message.yml
0 → 100644
View file @
ecc3f315
---
title
:
'
fix:
24982-
Remove'
'
Signed
in
successfully'
'
message
After
this
change
the
sign-in-success
flash
message
will
not
be
shown'
merge_request
:
7837
author
:
jnoortheen
spec/controllers/sessions_controller_spec.rb
View file @
ecc3f315
...
@@ -22,7 +22,6 @@ describe SessionsController do
...
@@ -22,7 +22,6 @@ describe SessionsController do
it
'authenticates user correctly'
do
it
'authenticates user correctly'
do
post
(
:create
,
user:
{
login:
user
.
username
,
password:
user
.
password
})
post
(
:create
,
user:
{
login:
user
.
username
,
password:
user
.
password
})
expect
(
response
).
to
set_flash
.
to
/Signed in successfully/
expect
(
subject
.
current_user
).
to
eq
user
expect
(
subject
.
current_user
).
to
eq
user
end
end
...
...
spec/features/u2f_spec.rb
View file @
ecc3f315
...
@@ -163,8 +163,7 @@ feature 'Using U2F (Universal 2nd Factor) Devices for Authentication', feature:
...
@@ -163,8 +163,7 @@ feature 'Using U2F (Universal 2nd Factor) Devices for Authentication', feature:
click_on
"Sign in via U2F device"
click_on
"Sign in via U2F device"
expect
(
page
.
body
).
to
match
(
'We heard back from your U2F device'
)
expect
(
page
.
body
).
to
match
(
'We heard back from your U2F device'
)
click_on
"Authenticate via U2F Device"
click_on
"Authenticate via U2F Device"
expect
(
page
.
body
).
to
match
(
'href="/users/sign_out"'
)
expect
(
page
.
body
).
to
match
(
'Signed in successfully'
)
end
end
end
end
...
@@ -178,7 +177,7 @@ feature 'Using U2F (Universal 2nd Factor) Devices for Authentication', feature:
...
@@ -178,7 +177,7 @@ feature 'Using U2F (Universal 2nd Factor) Devices for Authentication', feature:
expect
(
page
.
body
).
to
match
(
'We heard back from your U2F device'
)
expect
(
page
.
body
).
to
match
(
'We heard back from your U2F device'
)
click_on
"Authenticate via U2F Device"
click_on
"Authenticate via U2F Device"
expect
(
page
.
body
).
to
match
(
'
Signed in successfully
'
)
expect
(
page
.
body
).
to
match
(
'
href="/users/sign_out"
'
)
end
end
end
end
...
@@ -234,7 +233,7 @@ feature 'Using U2F (Universal 2nd Factor) Devices for Authentication', feature:
...
@@ -234,7 +233,7 @@ feature 'Using U2F (Universal 2nd Factor) Devices for Authentication', feature:
expect
(
page
.
body
).
to
match
(
'We heard back from your U2F device'
)
expect
(
page
.
body
).
to
match
(
'We heard back from your U2F device'
)
click_on
"Authenticate via U2F Device"
click_on
"Authenticate via U2F Device"
expect
(
page
.
body
).
to
match
(
'
Signed in successfully
'
)
expect
(
page
.
body
).
to
match
(
'
href="/users/sign_out"
'
)
end
end
end
end
end
end
...
@@ -275,7 +274,7 @@ feature 'Using U2F (Universal 2nd Factor) Devices for Authentication', feature:
...
@@ -275,7 +274,7 @@ feature 'Using U2F (Universal 2nd Factor) Devices for Authentication', feature:
expect
(
page
.
body
).
to
match
(
'We heard back from your U2F device'
)
expect
(
page
.
body
).
to
match
(
'We heard back from your U2F device'
)
click_on
"Authenticate via U2F Device"
click_on
"Authenticate via U2F Device"
expect
(
page
.
body
).
to
match
(
'
Signed in successfully
'
)
expect
(
page
.
body
).
to
match
(
'
href="/users/sign_out"
'
)
logout
logout
end
end
...
...
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