diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-07-01 21:08:50 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-07-01 21:08:50 +0300 |
commit | 2ea5aa8bd11544524b4f5da1e4c750f67bf5fc7d (patch) | |
tree | 7771ce1234dc66bb59eb5128561d485f91330056 /config/routes | |
parent | ae1efa2e1d32dee59d8f509ba17b623b5ffe4ba6 (diff) |
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 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, |