diff options
| author | Robert Speicher <robert@gitlab.com> | 2018-09-04 20:22:16 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2018-09-04 20:22:16 +0000 |
| commit | 91003c6ebb764c9cf3fe01a14d6213b26c09dcc8 (patch) | |
| tree | 43bb8d7edbc6ffe4a713c7b87856dbd2ed268c8f /app/models | |
| parent | 265b49135436af9b8938c4b21b13462f0cfffdcb (diff) | |
| parent | d4bdcfbf19b594646d597bae5eb6d0c0f7354362 (diff) | |
| download | gitlab-ce-91003c6ebb764c9cf3fe01a14d6213b26c09dcc8.tar.gz | |
Merge branch 'sh-disable-unnecessary-avatar-revalidation' into 'master'
Disable project avatar validation if avatar has not changed
Closes #51053
See merge request gitlab-org/gitlab-ce!21506
Diffstat (limited to 'app/models')
| -rw-r--r-- | app/models/concerns/avatarable.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/concerns/avatarable.rb b/app/models/concerns/avatarable.rb index c0233661a9b..0d5311a9985 100644 --- a/app/models/concerns/avatarable.rb +++ b/app/models/concerns/avatarable.rb @@ -9,7 +9,7 @@ module Avatarable include Gitlab::Utils::StrongMemoize validate :avatar_type, if: ->(user) { user.avatar.present? && user.avatar_changed? } - validates :avatar, file_size: { maximum: 200.kilobytes.to_i } + validates :avatar, file_size: { maximum: 200.kilobytes.to_i }, if: :avatar_changed? mount_uploader :avatar, AvatarUploader |