Commit b85cca7a authored by Stan Hu's avatar Stan Hu

Merge branch 'ashmckenzie/remove-duplicate-users-routes' into 'master'

Remove duplicate -/users/terms routes

See merge request gitlab-org/gitlab-ce!31812
parents 90328145 895e9122
......@@ -43,13 +43,6 @@ scope '-/users', module: :users do
end
end
scope '-/users', module: :users do
resources :terms, only: [:index] do
post :accept, on: :member
post :decline, on: :member
end
end
scope(constraints: { username: Gitlab::PathRegex.root_namespace_route_regex }) do
scope(path: 'users/:username',
as: :user,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment