d6cd7006ae
Navigating to the "Members" section of a project would omit the relative URL root path. Fix the redirection and eliminate the need for a redirection in the first place. Fix other redirections failing to work with relative roots
48 lines
1.7 KiB
Ruby
48 lines
1.7 KiB
Ruby
require 'constraints/user_url_constrainer'
|
|
|
|
devise_for :users, controllers: { omniauth_callbacks: :omniauth_callbacks,
|
|
registrations: :registrations,
|
|
passwords: :passwords,
|
|
sessions: :sessions,
|
|
confirmations: :confirmations }
|
|
|
|
devise_scope :user do
|
|
get '/users/auth/:provider/omniauth_error' => 'omniauth_callbacks#omniauth_error', as: :omniauth_error
|
|
get '/users/almost_there' => 'confirmations#almost_there'
|
|
end
|
|
|
|
scope(constraints: { username: Gitlab::PathRegex.root_namespace_route_regex }) do
|
|
scope(path: 'users/:username',
|
|
as: :user,
|
|
controller: :users) do
|
|
get :calendar
|
|
get :calendar_activities
|
|
get :groups
|
|
get :projects
|
|
get :contributed, as: :contributed_projects
|
|
get :snippets
|
|
get :exists
|
|
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(UserUrlConstrainer.new) do
|
|
# Get all keys of user
|
|
get ':username.keys' => 'profiles/keys#get_keys', constraints: { username: Gitlab::PathRegex.root_namespace_route_regex }
|
|
|
|
scope(path: ':username',
|
|
as: :user,
|
|
constraints: { username: Gitlab::PathRegex.root_namespace_route_regex },
|
|
controller: :users) do
|
|
get '/', action: :show
|
|
end
|
|
end
|