diff options
| author | Rémy Coutable <remy@rymai.me> | 2017-03-26 19:56:18 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2017-03-26 19:56:18 +0000 |
| commit | c848735db6e77b7400ea88f9286bb12ff840a318 (patch) | |
| tree | a41885e5ef64b1299dfdbe73b388212fd0b8ab11 /app/models | |
| parent | 37b5b7a5e6907c364800f6f58d37b6c0412255da (diff) | |
| parent | 7a1236031aabd900facdbe7bd4940e03175d477b (diff) | |
| download | gitlab-ce-c848735db6e77b7400ea88f9286bb12ff840a318.tar.gz | |
Merge branch '29116-maxint-error' into 'master'
Fix projects_limit RangeError on user create
Closes #29116
See merge request !10209
Diffstat (limited to 'app/models')
| -rw-r--r-- | app/models/user.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/app/models/user.rb b/app/models/user.rb index 5d19d873f43..1c2821bb91a 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -115,7 +115,9 @@ class User < ActiveRecord::Base validates :notification_email, email: true, if: ->(user) { user.notification_email != user.email } validates :public_email, presence: true, uniqueness: true, email: true, allow_blank: true validates :bio, length: { maximum: 255 }, allow_blank: true - validates :projects_limit, presence: true, numericality: { greater_than_or_equal_to: 0 } + validates :projects_limit, + presence: true, + numericality: { greater_than_or_equal_to: 0, less_than_or_equal_to: Gitlab::Database::MAX_INT_VALUE } validates :username, namespace: true, presence: true, |