Download as
Browse Code »

Commit 04a908f6a5c4f8753f0965615d94798286ecc675

Authored by Dmitriy Zaporozhets
2 parents 37a0a25f a3b6a3ed
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

Merge pull request #190 from mutewinter/dot_project_names 

Allow dots in project names
Showing 2 changed files with 7 additions and 7 deletions   Show diff stats
app/models/project.rb
  Diff comments   View file @04a908f
@@ -25,8 +25,8 @@ class Project < ActiveRecord::Base @@ -25,8 +25,8 @@ 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_\-]*$/,  
29 - :message => "only letters, digits & '_' '-' allowed" }, 28 + :format => { :with => /^[a-zA-Z0-9_\-\.]*$/,
  29 + :message => "only letters, digits & '_' '-' '.' allowed" },
30 :length => { :within => 0..255 } 30 :length => { :within => 0..255 }
31 31
32 validates :description, 32 validates :description,
@@ -35,8 +35,8 @@ class Project < ActiveRecord::Base @@ -35,8 +35,8 @@ 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_\-]*$/,  
39 - :message => "only letters, digits & '_' '-' allowed" }, 38 + :format => { :with => /^[a-zA-Z0-9_\-\.]*$/,
  39 + :message => "only letters, digits & '_' '-' '.' allowed" },
40 :length => { :within => 3..255 } 40 :length => { :within => 3..255 }
41 41
42 validates :owner, 42 validates :owner,
config/routes.rb
  Diff comments   View file @04a908f
@@ -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"