Merge branch '645-profile-update-bug' into 'master'

Add null check to formData.append Fixes https://gitlab.com/gitlab-com/support-forum/issues/645 See merge request !3799

Merge branch '645-profile-update-bug' into 'master'
4c59557f · Jacob Schatz · bf41703f · beb32f31 · 4c59557f
Commit 4c59557f authored Apr 18, 2016 by Jacob Schatz
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 2 deletions

profile.js.coffee app/assets/javascripts/profile.js.coffee +3 -2

No files found.
--- a/app/assets/javascripts/profile.js.coffee
+++ b/app/assets/javascripts/profile.js.coffee
@@ -45,9 +45,10 @@ class @Profile

  saveForm: ->
    self = @
-
    formData = new FormData(@form[0])
-    formData.append('user[avatar]', @avatarGlCrop.getBlob(), 'avatar.png')
+
+    avatarBlob = @avatarGlCrop.getBlob()
+    formData.append('user[avatar]', avatarBlob, 'avatar.png') if avatarBlob?

    $.ajax
      url: @form.attr('action')