Merge branch 'avatar-upload' into 'master'

Bugfix for #48378 - Resetting value of input element to fix Chrome-specific issue

See merge request gitlab-org/gitlab-ce!20161
This commit is contained in:
Mike Greiling 2018-06-26 15:36:23 +00:00
commit 1b592f8c35
2 changed files with 7 additions and 1 deletions

View File

@ -47,7 +47,8 @@ import _ from 'underscore';
var _this;
_this = this;
this.fileInput.on('change', function(e) {
return _this.onFileInputChange(e, this);
_this.onFileInputChange(e, this);
this.value = null;
});
this.pickImageEl.on('click', this.onPickImageClick);
this.modalCrop.on('shown.bs.modal', this.onModalShow);

View File

@ -0,0 +1,5 @@
---
title: Fixes issue with uploading same image to Profile Avatar twice
merge_request: 20161
author: Chirag Bhatia
type: fixed