diff options
author | Sean McGivern <sean@mcgivern.me.uk> | 2018-03-23 14:51:59 +0300 |
---|---|---|
committer | Sean McGivern <sean@mcgivern.me.uk> | 2018-03-23 14:51:59 +0300 |
commit | 49e871680ce4ca4ef947916da4969cc4e80991eb (patch) | |
tree | 0128081b69f54dd8ec62d4856b1857c850e9e33e /app | |
parent | f87ad66cee1fcce347c3072ac27613f65626646e (diff) | |
parent | 839589fde30cff9ecf963dab775bfd9b9b2fe17b (diff) |
Merge branch '43771-improve-avatar-error-message' into 'master'
Resolve "Indicate supported image formats in avatar error"
Closes #43771
See merge request gitlab-org/gitlab-ce!17747
Diffstat (limited to 'app')
-rw-r--r-- | app/models/concerns/avatarable.rb | 2 | ||||
-rw-r--r-- | app/models/group.rb | 6 |
2 files changed, 1 insertions, 7 deletions
diff --git a/app/models/concerns/avatarable.rb b/app/models/concerns/avatarable.rb index d35e37935fb..318df11727e 100644 --- a/app/models/concerns/avatarable.rb +++ b/app/models/concerns/avatarable.rb @@ -21,7 +21,7 @@ module Avatarable def avatar_type unless self.avatar.image? - self.errors.add :avatar, "only images allowed" + errors.add :avatar, "file format is not supported. Please try one of the following supported formats: #{AvatarUploader::IMAGE_EXT.join(', ')}" end end diff --git a/app/models/group.rb b/app/models/group.rb index f669b1a7009..d99af79b5fe 100644 --- a/app/models/group.rb +++ b/app/models/group.rb @@ -189,12 +189,6 @@ class Group < Namespace owners.include?(user) && owners.size == 1 end - def avatar_type - unless self.avatar.image? - self.errors.add :avatar, "only images allowed" - end - end - def post_create_hook Gitlab::AppLogger.info("Group \"#{name}\" was created") |