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 | |
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
-rw-r--r-- | app/models/concerns/avatarable.rb | 2 | ||||
-rw-r--r-- | app/models/group.rb | 6 | ||||
-rw-r--r-- | changelogs/unreleased/43771-improve-avatar-error-message.yml | 5 | ||||
-rw-r--r-- | spec/models/group_spec.rb | 2 | ||||
-rw-r--r-- | spec/models/project_spec.rb | 2 | ||||
-rw-r--r-- | spec/models/user_spec.rb | 2 |
6 files changed, 9 insertions, 10 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") diff --git a/changelogs/unreleased/43771-improve-avatar-error-message.yml b/changelogs/unreleased/43771-improve-avatar-error-message.yml new file mode 100644 index 00000000000..1fae10f4d1f --- /dev/null +++ b/changelogs/unreleased/43771-improve-avatar-error-message.yml @@ -0,0 +1,5 @@ +--- +title: Change avatar error message to include allowed file formats +merge_request: 17747 +author: Fabian Schneider +type: changed diff --git a/spec/models/group_spec.rb b/spec/models/group_spec.rb index abfc0896a41..d620943693c 100644 --- a/spec/models/group_spec.rb +++ b/spec/models/group_spec.rb @@ -240,7 +240,7 @@ describe Group do it "is false if avatar is html page" do group.update_attribute(:avatar, 'uploads/avatar.html') - expect(group.avatar_type).to eq(["only images allowed"]) + expect(group.avatar_type).to eq(["file format is not supported. Please try one of the following supported formats: png, jpg, jpeg, gif, bmp, tiff"]) end end diff --git a/spec/models/project_spec.rb b/spec/models/project_spec.rb index 43657e643d1..61aadddceb5 100644 --- a/spec/models/project_spec.rb +++ b/spec/models/project_spec.rb @@ -922,7 +922,7 @@ describe Project do it 'is false if avatar is html page' do project.update_attribute(:avatar, 'uploads/avatar.html') - expect(project.avatar_type).to eq(['only images allowed']) + expect(project.avatar_type).to eq(['file format is not supported. Please try one of the following supported formats: png, jpg, jpeg, gif, bmp, tiff']) end end diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb index 5680eb24985..c61674fff13 100644 --- a/spec/models/user_spec.rb +++ b/spec/models/user_spec.rb @@ -1222,7 +1222,7 @@ describe User do it 'is false if avatar is html page' do user.update_attribute(:avatar, 'uploads/avatar.html') - expect(user.avatar_type).to eq(['only images allowed']) + expect(user.avatar_type).to eq(['file format is not supported. Please try one of the following supported formats: png, jpg, jpeg, gif, bmp, tiff']) end end |