diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2018-02-06 18:56:12 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2018-02-06 18:56:12 +0000 |
| commit | 1f86e54910895b1683449d7aee6adbe3a1cc44a0 (patch) | |
| tree | d36de19bd9fb8b79226c69b1f239d7733e8575c0 /app/models/project.rb | |
| parent | e776096e84d01ab3d1d07a028b65e7430e195114 (diff) | |
| parent | 4f335663068bb0c52e7258013ee607891a662d6c (diff) | |
| download | gitlab-ce-1f86e54910895b1683449d7aee6adbe3a1cc44a0.tar.gz | |
Merge branch 'dm-route-path-validation' into 'master'
Validate user, group and project paths consistently, and only once
See merge request gitlab-org/gitlab-ce!16903
Diffstat (limited to 'app/models/project.rb')
| -rw-r--r-- | app/models/project.rb | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/app/models/project.rb b/app/models/project.rb index 33085151217..3edb6109fb8 100644 --- a/app/models/project.rb +++ b/app/models/project.rb @@ -245,8 +245,7 @@ class Project < ActiveRecord::Base validates :path, presence: true, project_path: true, - length: { maximum: 255 }, - uniqueness: { scope: :namespace_id } + length: { maximum: 255 } validates :namespace, presence: true validates :name, uniqueness: { scope: :namespace_id } |