Merge branch 'dz-remove-deprecated-user-routes' into 'master'

Remove deprecated user routes

See merge request gitlab-org/gitlab-ce!30044

2 files changed, 1 insertions, 10 deletions

diff --git a/config/routes/snippets.rb b/config/routes/snippets.rb
index 81bc890d86b..ba6da3ac57e 100644
--- a/config/routes/snippets.rb
+++ b/config/routes/snippets.rb
@@ -17,5 +17,5 @@ resources :snippets, concerns: :awardable do
   end
 end
 
-get '/s/:username', to: redirect('u/%{username}/snippets'),
+get '/s/:username', to: redirect('users/%{username}/snippets'),
                     constraints: { username: /[a-zA-Z.0-9_\-]+(?<!\.atom)/ }
diff --git a/config/routes/user.rb b/config/routes/user.rb
index e0ae264e2c0..f93a3fc6161 100644
--- a/config/routes/user.rb
+++ b/config/routes/user.rb
@@ -48,15 +48,6 @@ scope(constraints: { username: Gitlab::PathRegex.root_namespace_route_regex }) d
     get :activity
     get '/', to: redirect('%{username}'), as: nil
   end
-
-  # Compatibility with old routing
-  # TODO (dzaporozhets): remove in 10.0
-  get '/u/:username', to: redirect('%{username}')
-  # TODO (dzaporozhets): remove in 9.0
-  get '/u/:username/groups', to: redirect('users/%{username}/groups')
-  get '/u/:username/projects', to: redirect('users/%{username}/projects')
-  get '/u/:username/snippets', to: redirect('users/%{username}/snippets')
-  get '/u/:username/contributed', to: redirect('users/%{username}/contributed')
 end
 
 constraints(::Constraints::UserUrlConstrainer.new) do