summaryrefslogtreecommitdiff
path: root/app/controllers
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2021-03-03 22:28:55 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2021-03-03 22:29:18 +0000
commitfa206403d6b6a501488b70173ba873189776edc6 (patch)
tree747df0d0c32d9f0624b5a9c84dfbfc09265adc49 /app/controllers
parent5fc81825b645b13c3ecd49ec727bdf2162d15922 (diff)
downloadgitlab-ce-fa206403d6b6a501488b70173ba873189776edc6.tar.gz
Add latest changes from gitlab-org/security/gitlab@13-9-stable-ee
Diffstat (limited to 'app/controllers')
-rw-r--r--app/controllers/profiles/active_sessions_controller.rb5
1 files changed, 2 insertions, 3 deletions
diff --git a/app/controllers/profiles/active_sessions_controller.rb b/app/controllers/profiles/active_sessions_controller.rb
index 1233c906406..aafd7c2b65b 100644
--- a/app/controllers/profiles/active_sessions_controller.rb
+++ b/app/controllers/profiles/active_sessions_controller.rb
@@ -8,9 +8,8 @@ class Profiles::ActiveSessionsController < Profiles::ApplicationController
end
def destroy
- # params[:id] can be either an Rack::Session::SessionId#private_id
- # or an encrypted Rack::Session::SessionId#public_id
- ActiveSession.destroy_with_deprecated_encryption(current_user, params[:id])
+ # params[:id] can be an Rack::Session::SessionId#private_id
+ ActiveSession.destroy_session(current_user, params[:id])
current_user.forget_me!
respond_to do |format|