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
e6654447
Commit
e6654447
authored
Aug 23, 2016
by
Stan Hu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix incorrect "stopped impersonation" log message
Closes #21015
parent
148b8487
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
1 deletion
+3
-1
app/controllers/admin/impersonations_controller.rb
app/controllers/admin/impersonations_controller.rb
+1
-1
spec/controllers/admin/impersonations_controller_spec.rb
spec/controllers/admin/impersonations_controller_spec.rb
+2
-0
No files found.
app/controllers/admin/impersonations_controller.rb
View file @
e6654447
...
@@ -7,7 +7,7 @@ class Admin::ImpersonationsController < Admin::ApplicationController
...
@@ -7,7 +7,7 @@ class Admin::ImpersonationsController < Admin::ApplicationController
warden
.
set_user
(
impersonator
,
scope: :user
)
warden
.
set_user
(
impersonator
,
scope: :user
)
Gitlab
::
AppLogger
.
info
(
"User
#{
original_user
.
username
}
has stopped impersonating
#{
impersonato
r
.
username
}
"
)
Gitlab
::
AppLogger
.
info
(
"User
#{
impersonator
.
username
}
has stopped impersonating
#{
original_use
r
.
username
}
"
)
session
[
:impersonator_id
]
=
nil
session
[
:impersonator_id
]
=
nil
...
...
spec/controllers/admin/impersonations_controller_spec.rb
View file @
e6654447
...
@@ -77,6 +77,8 @@ describe Admin::ImpersonationsController do
...
@@ -77,6 +77,8 @@ describe Admin::ImpersonationsController do
context
"when the impersonator is not blocked"
do
context
"when the impersonator is not blocked"
do
it
"redirects to the impersonated user's page"
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
delete
:destroy
expect
(
response
).
to
redirect_to
(
admin_user_path
(
user
))
expect
(
response
).
to
redirect_to
(
admin_user_path
(
user
))
...
...
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