diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-12 18:09:21 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-12 18:09:21 +0000 |
commit | 43e3dc2f95a25c600e08f65d4f1c406a1a63ed3d (patch) | |
tree | db5c72020c7c8916020c8aff7c1b7128028d650b /app/uploaders | |
parent | 2c89e169769ead722394a79ed67fcd08e96863dd (diff) | |
download | gitlab-ce-43e3dc2f95a25c600e08f65d4f1c406a1a63ed3d.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/uploaders')
-rw-r--r-- | app/uploaders/avatar_uploader.rb | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/app/uploaders/avatar_uploader.rb b/app/uploaders/avatar_uploader.rb index b79a5deb9c0..e4046e4b7e6 100644 --- a/app/uploaders/avatar_uploader.rb +++ b/app/uploaders/avatar_uploader.rb @@ -25,6 +25,10 @@ class AvatarUploader < GitlabUploader self.class.absolute_path(upload) end + def mounted_as + super || 'avatar' + end + private def dynamic_segment |