Ensure valid mount_point is used by AvatarUploader

Default to 'avatar' if the mount_point from the database is nil.

Ensure valid mount_point is used by AvatarUploader
Default to 'avatar' if the mount_point from the database is nil.
df0a334e · Toon Claes · 8267ded1 · df0a334e · df0a334e
Commit df0a334e authored Feb 10, 2020 by Toon Claes
Hide whitespace changes
Inline Side-by-side

Showing with 9 additions and 0 deletions

app/uploaders/avatar_uploader.rb app/uploaders/avatar_uploader.rb +4 -0

changelogs/unreleased/tc-fix-38088.yml changelogs/unreleased/tc-fix-38088.yml +5 -0

No files found.
--- 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

--- a/changelogs/unreleased/tc-fix-38088.yml
+++ b/changelogs/unreleased/tc-fix-38088.yml
+---
+title: Ensure a valid mount_point is used by the AvatarUploader
+merge_request: 24800
+author:
+type: fixed