From 2ea5aa8bd11544524b4f5da1e4c750f67bf5fc7d Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Wed, 1 Jul 2020 18:08:50 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- config/routes/user.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'config/routes') diff --git a/config/routes/user.rb b/config/routes/user.rb index 9db3a71a270..3bf13908d39 100644 --- a/config/routes/user.rb +++ b/config/routes/user.rb @@ -56,7 +56,7 @@ end constraints(::Constraints::UserUrlConstrainer.new) do # Get all keys of user - get ':username.keys' => 'profiles/keys#get_keys', constraints: { username: Gitlab::PathRegex.root_namespace_route_regex } + get ':username.keys', controller: :users, action: :ssh_keys, constraints: { username: Gitlab::PathRegex.root_namespace_route_regex } scope(path: ':username', as: :user, -- cgit v1.2.3