diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-08-17 17:15:21 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-08-17 17:15:21 +0000 |
| commit | 76044a792737e4b966be861b68947d289539c66e (patch) | |
| tree | 6355ac9d8b54beb5e6e0fd8fe6d28a464f8a5395 /app/controllers/admin | |
| parent | f63ce3000c16c04b7a7d5200c5da7c07b9af0cf2 (diff) | |
| download | gitlab-ce-76044a792737e4b966be861b68947d289539c66e.tar.gz | |
Add latest changes from gitlab-org/gitlab@14-1-stable-ee
Diffstat (limited to 'app/controllers/admin')
| -rw-r--r-- | app/controllers/admin/users_controller.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/admin/users_controller.rb b/app/controllers/admin/users_controller.rb index 700acc46d8d..145b4d10b16 100644 --- a/app/controllers/admin/users_controller.rb +++ b/app/controllers/admin/users_controller.rb @@ -304,7 +304,7 @@ class Admin::UsersController < Admin::ApplicationController end def user - @user ||= find_routable!(User, params[:id]) + @user ||= find_routable!(User, params[:id], request.path_info) end def build_canonical_path(user) |