Commit 7be41074 authored by Sean McGivern's avatar Sean McGivern

Merge branch 'dz-refactor-namespace-regex' into 'master'

Refactor namespace regex

Reuse existing namespace regex constant in routing

See merge request !7336
parents fa88474a 34962c7d
...@@ -3,7 +3,7 @@ require 'constraints/group_url_constrainer' ...@@ -3,7 +3,7 @@ require 'constraints/group_url_constrainer'
constraints(GroupUrlConstrainer.new) do constraints(GroupUrlConstrainer.new) do
scope(path: ':id', scope(path: ':id',
as: :group, as: :group,
constraints: { id: /[a-zA-Z.0-9_\-]+(?<!\.atom)/ }, constraints: { id: Gitlab::Regex.namespace_route_regex },
controller: :groups) do controller: :groups) do
get '/', action: :show get '/', action: :show
patch '/', action: :update patch '/', action: :update
......
...@@ -14,15 +14,15 @@ end ...@@ -14,15 +14,15 @@ end
constraints(UserUrlConstrainer.new) do constraints(UserUrlConstrainer.new) do
scope(path: ':username', scope(path: ':username',
as: :user, as: :user,
constraints: { username: /[a-zA-Z.0-9_\-]+(?<!\.atom)/ }, constraints: { username: Gitlab::Regex.namespace_route_regex },
controller: :users) do controller: :users) do
get '/', action: :show get '/', action: :show
end end
end end
scope(path: 'users/:username', scope(constraints: { username: Gitlab::Regex.namespace_route_regex }) do
scope(path: 'users/:username',
as: :user, as: :user,
constraints: { username: /[a-zA-Z.0-9_\-]+(?<!\.atom)/ },
controller: :users) do controller: :users) do
get :calendar get :calendar
get :calendar_activities get :calendar_activities
...@@ -32,13 +32,14 @@ scope(path: 'users/:username', ...@@ -32,13 +32,14 @@ scope(path: 'users/:username',
get :snippets get :snippets
get :exists get :exists
get '/', to: redirect('/%{username}') get '/', to: redirect('/%{username}')
end end
# Compatibility with old routing # Compatibility with old routing
# TODO (dzaporozhets): remove in 10.0 # TODO (dzaporozhets): remove in 10.0
get '/u/:username', to: redirect('/%{username}'), constraints: { username: /[a-zA-Z.0-9_\-]+(?<!\.atom)/ } get '/u/:username', to: redirect('/%{username}')
# TODO (dzaporozhets): remove in 9.0 # TODO (dzaporozhets): remove in 9.0
get '/u/:username/groups', to: redirect('/users/%{username}/groups'), constraints: { username: /[a-zA-Z.0-9_\-]+/ } get '/u/:username/groups', to: redirect('/users/%{username}/groups')
get '/u/:username/projects', to: redirect('/users/%{username}/projects'), constraints: { username: /[a-zA-Z.0-9_\-]+/ } get '/u/:username/projects', to: redirect('/users/%{username}/projects')
get '/u/:username/snippets', to: redirect('/users/%{username}/snippets'), constraints: { username: /[a-zA-Z.0-9_\-]+/ } get '/u/:username/snippets', to: redirect('/users/%{username}/snippets')
get '/u/:username/contributed', to: redirect('/users/%{username}/contributed'), constraints: { username: /[a-zA-Z.0-9_\-]+/ } get '/u/:username/contributed', to: redirect('/users/%{username}/contributed')
end
...@@ -117,7 +117,7 @@ class Spinach::Features::Groups < Spinach::FeatureSteps ...@@ -117,7 +117,7 @@ class Spinach::Features::Groups < Spinach::FeatureSteps
end end
step 'I visit group "NonExistentGroup" page' do step 'I visit group "NonExistentGroup" page' do
visit group_path(-1) visit group_path("NonExistentGroup")
end end
step 'the archived project have some issues' do step 'the archived project have some issues' do
......
...@@ -8,6 +8,10 @@ module Gitlab ...@@ -8,6 +8,10 @@ module Gitlab
@namespace_regex ||= /\A#{NAMESPACE_REGEX_STR}\z/.freeze @namespace_regex ||= /\A#{NAMESPACE_REGEX_STR}\z/.freeze
end end
def namespace_route_regex
@namespace_route_regex ||= /#{NAMESPACE_REGEX_STR}/.freeze
end
def namespace_regex_message def namespace_regex_message
"can contain only letters, digits, '_', '-' and '.'. " \ "can contain only letters, digits, '_', '-' and '.'. " \
"Cannot start with '-' or end in '.', '.git' or '.atom'." \ "Cannot start with '-' or end in '.', '.git' or '.atom'." \
......
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