BigW Consortium Gitlab

Commit 2e2e3521 by Jeremy Mack

Updated validations and routes to support dots in project names

parent 8ee6d21f
...@@ -25,7 +25,7 @@ class Project < ActiveRecord::Base ...@@ -25,7 +25,7 @@ class Project < ActiveRecord::Base
validates :path, validates :path,
:uniqueness => true, :uniqueness => true,
:presence => true, :presence => true,
:format => { :with => /^[a-zA-Z0-9_\-]*$/, :format => { :with => /^[a-zA-Z0-9_\-\.]*$/,
:message => "only letters, digits & '_' '-' allowed" }, :message => "only letters, digits & '_' '-' allowed" },
:length => { :within => 0..255 } :length => { :within => 0..255 }
...@@ -35,7 +35,7 @@ class Project < ActiveRecord::Base ...@@ -35,7 +35,7 @@ class Project < ActiveRecord::Base
validates :code, validates :code,
:presence => true, :presence => true,
:uniqueness => true, :uniqueness => true,
:format => { :with => /^[a-zA-Z0-9_\-]*$/, :format => { :with => /^[a-zA-Z0-9_\-\.]*$/,
:message => "only letters, digits & '_' '-' allowed" }, :message => "only letters, digits & '_' '-' allowed" },
:length => { :within => 3..255 } :length => { :within => 3..255 }
......
...@@ -6,7 +6,7 @@ Gitlab::Application.routes.draw do ...@@ -6,7 +6,7 @@ Gitlab::Application.routes.draw do
namespace :admin do namespace :admin do
resources :users resources :users
resources :projects resources :projects, :constraints => { :id => /[^\/]+/ }
resources :team_members resources :team_members
get 'emails', :to => 'mailer#preview' get 'emails', :to => 'mailer#preview'
get 'mailer/preview_note' get 'mailer/preview_note'
...@@ -28,12 +28,12 @@ Gitlab::Application.routes.draw do ...@@ -28,12 +28,12 @@ Gitlab::Application.routes.draw do
#get "profile/:id", :to => "profile#show" #get "profile/:id", :to => "profile#show"
resources :projects, :only => [:new, :create, :index] resources :projects, :constraints => { :id => /[^\/]+/ }, :only => [:new, :create, :index]
resources :keys resources :keys
devise_for :users devise_for :users
resources :projects, :except => [:new, :create, :index], :path => "/" do resources :projects, :constraints => { :id => /[^\/]+/ }, :except => [:new, :create, :index], :path => "/" do
member do member do
get "team" get "team"
get "wall" get "wall"
......
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