diff options
| author | Stan Hu <stanhu@gmail.com> | 2016-08-23 01:06:54 -0700 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2016-08-23 01:09:16 -0700 |
| commit | e665444724cd5d213d2d2d37267c3ded08912296 (patch) | |
| tree | 393c2d9ad8abab63ea95af32744ce40168a472b5 | |
| parent | 148b8487b817a0c8854c6842109ce1abc5aa4306 (diff) | |
| download | gitlab-ce-fix-impersonation-log.tar.gz | |
Fix incorrect "stopped impersonation" log messagefix-impersonation-log
Closes #21015
| -rw-r--r-- | app/controllers/admin/impersonations_controller.rb | 2 | ||||
| -rw-r--r-- | spec/controllers/admin/impersonations_controller_spec.rb | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/app/controllers/admin/impersonations_controller.rb b/app/controllers/admin/impersonations_controller.rb index 8be35f00a77..9433da02f64 100644 --- a/app/controllers/admin/impersonations_controller.rb +++ b/app/controllers/admin/impersonations_controller.rb @@ -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 diff --git a/spec/controllers/admin/impersonations_controller_spec.rb b/spec/controllers/admin/impersonations_controller_spec.rb index d5f0b289b5b..8be662974a0 100644 --- a/spec/controllers/admin/impersonations_controller_spec.rb +++ b/spec/controllers/admin/impersonations_controller_spec.rb @@ -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)) |