diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-12-11 18:09:57 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-12-11 18:09:57 +0000 |
commit | 3172281335efddd1078fa6c601f3ba8782f73192 (patch) | |
tree | f26352ede418cecb20b3f08b6bd04c0d7830e231 /config/routes | |
parent | a8704bd33cb36b4e7e88bb10d61265b8ad8a058c (diff) | |
download | gitlab-ce-3172281335efddd1078fa6c601f3ba8782f73192.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'config/routes')
-rw-r--r-- | config/routes/user.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/config/routes/user.rb b/config/routes/user.rb index 7af4bf2ac2a..ae6d3b2c3f1 100644 --- a/config/routes/user.rb +++ b/config/routes/user.rb @@ -55,7 +55,7 @@ end constraints(::Constraints::UserUrlConstrainer.new) do # Get all SSH keys of user - get ':username.keys' => 'profiles/keys#get_keys', constraints: { username: Gitlab::PathRegex.root_namespace_route_regex } + get ':username.keys' => 'users#ssh_keys', constraints: { username: Gitlab::PathRegex.root_namespace_route_regex } # Get all GPG keys of user get ':username.gpg' => 'profiles/gpg_keys#get_keys', constraints: { username: Gitlab::PathRegex.root_namespace_route_regex } |