diff options
author | Sean McGivern <sean@mcgivern.me.uk> | 2016-12-12 12:37:23 +0000 |
---|---|---|
committer | Sean McGivern <sean@mcgivern.me.uk> | 2016-12-12 12:37:23 +0000 |
commit | 0f6964a38527e648551e981157d5489d4c301b76 (patch) | |
tree | 1bacbdc73e0f2be12a5bd7673706dabb2f461e3d | |
parent | db9e1635d0d17596193ecbee8e0acc1916918d1d (diff) | |
parent | 3c36d9dc9b3c2db45df6dce19357e9c4bdde366f (diff) | |
download | gitlab-ce-0f6964a38527e648551e981157d5489d4c301b76.tar.gz |
Merge branch '25294-remove-signed-out-msg' into 'master'
fix: 25294 - remove signed_out notification
Closes #25294
See merge request !7958
-rw-r--r-- | app/controllers/sessions_controller.rb | 6 | ||||
-rw-r--r-- | changelogs/unreleased/25294-remove-signed-out-msg.yml | 4 | ||||
-rw-r--r-- | spec/support/login_helpers.rb | 3 |
3 files changed, 12 insertions, 1 deletions
diff --git a/app/controllers/sessions_controller.rb b/app/controllers/sessions_controller.rb index 38e7c6f4a48..8c698695202 100644 --- a/app/controllers/sessions_controller.rb +++ b/app/controllers/sessions_controller.rb @@ -37,6 +37,12 @@ class SessionsController < Devise::SessionsController end end + def destroy + super + # hide the signed_out notice + flash[:notice] = nil + end + private # Handle an "initial setup" state, where there's only one user, it's an admin, diff --git a/changelogs/unreleased/25294-remove-signed-out-msg.yml b/changelogs/unreleased/25294-remove-signed-out-msg.yml new file mode 100644 index 00000000000..567294fe5f7 --- /dev/null +++ b/changelogs/unreleased/25294-remove-signed-out-msg.yml @@ -0,0 +1,4 @@ +--- +title: 'fix: removed signed_out notification' +merge_request: 7958 +author: jnoortheen diff --git a/spec/support/login_helpers.rb b/spec/support/login_helpers.rb index c0b3e83244d..ad1eed5b369 100644 --- a/spec/support/login_helpers.rb +++ b/spec/support/login_helpers.rb @@ -75,7 +75,8 @@ module LoginHelpers def logout find(".header-user-dropdown-toggle").click click_link "Sign out" - expect(page).to have_content('Signed out successfully') + # check the sign_in button + expect(page).to have_button('Sign in') end # Logout without JavaScript driver |