diff options
author | Stan Hu <stanhu@gmail.com> | 2019-08-15 17:09:50 +0000 |
---|---|---|
committer | Stan Hu <stanhu@gmail.com> | 2019-08-15 17:09:50 +0000 |
commit | b85cca7a95a8476fb114b5ea4c06bca6f02d60cb (patch) | |
tree | b3fc42784a9d5c5b123fc7c98cf52344e51d995a | |
parent | 903281454277805813eefd200d4279c6c4426a70 (diff) | |
parent | 895e912210591261287e33fda6f224c760df323d (diff) | |
download | gitlab-ce-b85cca7a95a8476fb114b5ea4c06bca6f02d60cb.tar.gz |
Merge branch 'ashmckenzie/remove-duplicate-users-routes' into 'master'
Remove duplicate -/users/terms routes
See merge request gitlab-org/gitlab-ce!31812
-rw-r--r-- | config/routes/user.rb | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/config/routes/user.rb b/config/routes/user.rb index 3f768d5d384..d4616c8080d 100644 --- a/config/routes/user.rb +++ b/config/routes/user.rb @@ -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, |