Updated validations and routes to support dots in project names

Jeremy Mack
1 parent 822c0a50
Showing 2 changed files with 5 additions and 5 deletions Show diff stats
app/models/project.rb
config/routes.rb
@@ -25,7 +25,7 @@ class Project &lt; ActiveRecord::Base
   validates :path,
             :uniqueness => true,
             :presence => true,
-            :format => { :with => /^[a-zA-Z0-9_\-]*$/,
+            :format => { :with => /^[a-zA-Z0-9_\-\.]*$/,
                          :message => "only letters, digits & '_' '-' allowed" },
             :length   => { :within => 0..255 }
@@ -35,7 +35,7 @@ class Project &lt; ActiveRecord::Base
   validates :code,
             :presence => true,
             :uniqueness => true,
-            :format => { :with => /^[a-zA-Z0-9_\-]*$/,
+            :format => { :with => /^[a-zA-Z0-9_\-\.]*$/,
                          :message => "only letters, digits & '_' '-' allowed"  },
             :length   => { :within => 3..255 }
@@ -6,7 +6,7 @@ Gitlab::Application.routes.draw do
   namespace :admin do
     resources :users
-    resources :projects
+    resources :projects, :constraints => { :id => /[^\/]+/ }
     resources :team_members
     get 'emails', :to => 'mailer#preview'
     get 'mailer/preview_note'
@@ -28,12 +28,12 @@ Gitlab::Application.routes.draw do
   #get "profile/:id", :to => "profile#show"
-  resources :projects, :only => [:new, :create, :index]
+  resources :projects, :constraints => { :id => /[^\/]+/ }, :only => [:new, :create, :index]
   resources :keys
   devise_for :users
-  resources :projects, :except => [:new, :create, :index], :path => "/" do
+  resources :projects, :constraints => { :id => /[^\/]+/ }, :except => [:new, :create, :index], :path => "/" do
     member do
       get "team"
       get "wall"
	@@ -25,7 +25,7 @@ class Project < ActiveRecord::Base		@@ -25,7 +25,7 @@ class Project < ActiveRecord::Base
25	validates :path,	25	validates :path,
26	:uniqueness => true,	26	:uniqueness => true,
27	:presence => true,	27	:presence => true,
28	- :format => { :with => /^[a-zA-Z0-9_\-]*$/,	28	+ :format => { :with => /^[a-zA-Z0-9_\-\.]*$/,
29	:message => "only letters, digits & '_' '-' allowed" },	29	:message => "only letters, digits & '_' '-' allowed" },
30	:length => { :within => 0..255 }	30	:length => { :within => 0..255 }
31		31
	@@ -35,7 +35,7 @@ class Project < ActiveRecord::Base		@@ -35,7 +35,7 @@ class Project < ActiveRecord::Base
35	validates :code,	35	validates :code,
36	:presence => true,	36	:presence => true,
37	:uniqueness => true,	37	:uniqueness => true,
38	- :format => { :with => /^[a-zA-Z0-9_\-]*$/,	38	+ :format => { :with => /^[a-zA-Z0-9_\-\.]*$/,
39	:message => "only letters, digits & '_' '-' allowed" },	39	:message => "only letters, digits & '_' '-' allowed" },
40	:length => { :within => 3..255 }	40	:length => { :within => 3..255 }
41		41
	@@ -6,7 +6,7 @@ Gitlab::Application.routes.draw do		@@ -6,7 +6,7 @@ Gitlab::Application.routes.draw do
6		6
7	namespace :admin do	7	namespace :admin do
8	resources :users	8	resources :users
9	- resources :projects	9	+ resources :projects, :constraints => { :id => /[^\/]+/ }
10	resources :team_members	10	resources :team_members
11	get 'emails', :to => 'mailer#preview'	11	get 'emails', :to => 'mailer#preview'
12	get 'mailer/preview_note'	12	get 'mailer/preview_note'
	@@ -28,12 +28,12 @@ Gitlab::Application.routes.draw do		@@ -28,12 +28,12 @@ Gitlab::Application.routes.draw do
28		28
29	#get "profile/:id", :to => "profile#show"	29	#get "profile/:id", :to => "profile#show"
30		30
31	- resources :projects, :only => [:new, :create, :index]	31	+ resources :projects, :constraints => { :id => /[^\/]+/ }, :only => [:new, :create, :index]
32	resources :keys	32	resources :keys
33		33
34	devise_for :users	34	devise_for :users
35		35
36	- resources :projects, :except => [:new, :create, :index], :path => "/" do	36	+ resources :projects, :constraints => { :id => /[^\/]+/ }, :except => [:new, :create, :index], :path => "/" do
37	member do	37	member do
38	get "team"	38	get "team"
39	get "wall"	39	get "wall"