Commit 502598e1 authored by Robert Speicher's avatar Robert Speicher Committed by Ruben Davila

Merge branch 'fix-impersonation-log' into 'master'

Fix incorrect "stopped impersonation" log message

Minor bug: Usernames were swapped in the log message.

Closes #21015

See merge request !5949
parent 3bc866c6
......@@ -7,7 +7,7 @@ class Admin::ImpersonationsController < Admin::ApplicationController
warden.set_user(impersonator, scope: :user)
Gitlab::AppLogger.info("User #{original_user.username} has stopped impersonating #{impersonator.username}")
Gitlab::AppLogger.info("User #{impersonator.username} has stopped impersonating #{original_user.username}")
session[:impersonator_id] = nil
......
......@@ -77,6 +77,8 @@ describe Admin::ImpersonationsController do
context "when the impersonator is not blocked" do
it "redirects to the impersonated user's page" do
expect(Gitlab::AppLogger).to receive(:info).with("User #{impersonator.username} has stopped impersonating #{user.username}").and_call_original
delete :destroy
expect(response).to redirect_to(admin_user_path(user))
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment