diff options
| author | Grzegorz Bizon <grzegorz@gitlab.com> | 2018-09-11 10:39:36 +0000 |
|---|---|---|
| committer | Grzegorz Bizon <grzegorz@gitlab.com> | 2018-09-11 10:39:36 +0000 |
| commit | c56f2b96159afaf6f1e0831d0e7a756a40568cab (patch) | |
| tree | 9070e9f1d9b63733e7d0ecd57bd7aeca242bdc85 /app | |
| parent | b9ea4e35ac679a87ea16ca01a5f02bd96b3b16c3 (diff) | |
| parent | 678ceb257ef829377c197ef368ea8e1b7fce9c4e (diff) | |
| download | gitlab-ce-c56f2b96159afaf6f1e0831d0e7a756a40568cab.tar.gz | |
Merge branch '51318-project-export-broken-when-avatar-is-set' into 'master'
Resolve "Project export broken when avatar is set"
Closes #51318
See merge request gitlab-org/gitlab-ce!21649
Diffstat (limited to 'app')
| -rw-r--r-- | app/uploaders/avatar_uploader.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/uploaders/avatar_uploader.rb b/app/uploaders/avatar_uploader.rb index 8526bc16390..c0165759203 100644 --- a/app/uploaders/avatar_uploader.rb +++ b/app/uploaders/avatar_uploader.rb @@ -19,7 +19,7 @@ class AvatarUploader < GitlabUploader end def absolute_path - self.class.absolute_path(model.avatar) + self.class.absolute_path(model.avatar.upload) end private |