diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-10-13 12:11:55 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-10-13 12:11:55 +0300 |
commit | bc2f7ab125361e4180018b1b933f42a8709df356 (patch) | |
tree | cbdb7c268428bbf1bd1023cfd5865a530e91dc8f /app/models/concerns/avatarable.rb | |
parent | 56a177ed56309f4742fe9f978adec394636bd7ca (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/models/concerns/avatarable.rb')
-rw-r--r-- | app/models/concerns/avatarable.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/app/models/concerns/avatarable.rb b/app/models/concerns/avatarable.rb index 53cc6aabcce..b32502c3ee2 100644 --- a/app/models/concerns/avatarable.rb +++ b/app/models/concerns/avatarable.rb @@ -18,6 +18,7 @@ module Avatarable prepend ShadowMethods include ObjectStorage::BackgroundMove include Gitlab::Utils::StrongMemoize + include ApplicationHelper validate :avatar_type, if: ->(user) { user.avatar.present? && user.avatar_changed? } validates :avatar, file_size: { maximum: MAXIMUM_FILE_SIZE }, if: :avatar_changed? |