diff options
| author | Robert Speicher <rspeicher@gmail.com> | 2016-02-29 17:17:14 -0500 |
|---|---|---|
| committer | Robert Speicher <rspeicher@gmail.com> | 2016-02-29 17:19:53 -0500 |
| commit | 58a8d6e9ba783d26ebdc6d79b2c457e2721988e8 (patch) | |
| tree | 986f0dbeaa8708b8325ea0503f6e1e299df30505 /app/models/user.rb | |
| parent | 128757a7f97b3dc0bf2efd4fac49dc0eaa0af04c (diff) | |
| download | gitlab-ce-58a8d6e9ba783d26ebdc6d79b2c457e2721988e8.tar.gz | |
Only validate avatar cropping values when avatar is present AND changedrs-avatar-validation
Closes #13905
Diffstat (limited to 'app/models/user.rb')
| -rw-r--r-- | app/models/user.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/user.rb b/app/models/user.rb index 913a32854ac..c5a9fec822a 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -169,7 +169,7 @@ class User < ActiveRecord::Base validates :avatar_crop_x, :avatar_crop_y, :avatar_crop_size, numericality: { only_integer: true }, presence: true, - if: ->(user) { user.avatar? } + if: ->(user) { user.avatar? && user.avatar_changed? } before_validation :generate_password, on: :create before_validation :restricted_signup_domains, on: :create |