Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2016-12-07 20:15:26 +0300
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2016-12-12 15:21:02 +0300
commit161d7c02d4ff49d6d91b982faee61b5de00d2631 (patch)
tree3200b76fb5f5252928c12997d9c1a47e0b04856b /app/models/namespace.rb
parent3f768f9a14ad90bbd79d384e3c287db4feea3e35 (diff)
Modify namespace name and path validation
Currently namespace name and path have uniq validaiton which does not allow us to use same group name/path inside different groups. This commit changes validation in next way: * Allow same namespace name with different parent_id * Allow same namespace path. Uniq validation should be handled by routes table Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Diffstat (limited to 'app/models/namespace.rb')
-rw-r--r--app/models/namespace.rb3
1 files changed, 1 insertions, 2 deletions
diff --git a/app/models/namespace.rb b/app/models/namespace.rb
index 37374044551..f0479d94986 100644
--- a/app/models/namespace.rb
+++ b/app/models/namespace.rb
@@ -17,14 +17,13 @@ class Namespace < ActiveRecord::Base
validates :owner, presence: true, unless: ->(n) { n.type == "Group" }
validates :name,
presence: true,
- uniqueness: true,
+ uniqueness: { scope: :parent_id },
length: { maximum: 255 },
namespace_name: true
validates :description, length: { maximum: 255 }
validates :path,
presence: true,
- uniqueness: { case_sensitive: false },
length: { maximum: 255 },
namespace: true