summaryrefslogtreecommitdiff
path: root/app/models/user.rb
diff options
context:
space:
mode:
authorDouwe Maan <douwe@selenight.nl>2018-01-31 11:39:03 -0600
committerDouwe Maan <douwe@selenight.nl>2018-02-06 12:09:03 -0600
commita03d29da1dbbef3c202899cef3cd89b453a8b76f (patch)
tree83f08b67027f9169eac9dfbc6a4c19f1752ad9ff /app/models/user.rb
parent75144b1e03db342730535f1f49b0e7cd2987d755 (diff)
downloadgitlab-ce-a03d29da1dbbef3c202899cef3cd89b453a8b76f.tar.gz
Validate User username only on Namespace, and bubble up appropriately
Diffstat (limited to 'app/models/user.rb')
-rw-r--r--app/models/user.rb4
1 files changed, 1 insertions, 3 deletions
diff --git a/app/models/user.rb b/app/models/user.rb
index da56446b6ab..05c93d3cb17 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -151,9 +151,7 @@ class User < ActiveRecord::Base
validates :projects_limit,
presence: true,
numericality: { greater_than_or_equal_to: 0, less_than_or_equal_to: Gitlab::Database::MAX_INT_VALUE }
- validates :username,
- user_path: true,
- presence: true
+ validates :username, presence: true
validates :namespace, presence: true
validate :namespace_move_dir_allowed, if: :username_changed?