From 76044a792737e4b966be861b68947d289539c66e Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Tue, 17 Aug 2021 17:15:21 +0000 Subject: Add latest changes from gitlab-org/gitlab@14-1-stable-ee --- app/controllers/admin/users_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app/controllers/admin') 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) -- cgit v1.2.1