diff options
| author | Alfredo Sumaran <alfredo@gitlab.com> | 2017-03-02 00:26:03 +0000 |
|---|---|---|
| committer | Alfredo Sumaran <alfredo@gitlab.com> | 2017-03-02 00:26:03 +0000 |
| commit | 42660b9eb5c11cbfb040efebae943baccb3606cd (patch) | |
| tree | 784128de801167aa5587b50c600c28df8cdd2773 | |
| parent | b6a945b39354ec2b2c09fc5f6904dfbf8990df26 (diff) | |
| parent | 9174d2e75c6bca531fa0de565d0a24b4a24b79d1 (diff) | |
| download | gitlab-ce-42660b9eb5c11cbfb040efebae943baccb3606cd.tar.gz | |
Merge branch 'rs-issue-28647' into 'master'
Fix ES6 interpolation in GitLabCrop class
Closes #28647
See merge request !9624
| -rw-r--r-- | app/assets/javascripts/profile/gl_crop.js.es6 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/assets/javascripts/profile/gl_crop.js.es6 b/app/assets/javascripts/profile/gl_crop.js.es6 index 42e9847af91..192b1192d07 100644 --- a/app/assets/javascripts/profile/gl_crop.js.es6 +++ b/app/assets/javascripts/profile/gl_crop.js.es6 @@ -13,7 +13,7 @@ this.onPickImageClick = this.onPickImageClick.bind(this); this.fileInput = $(input); this.modalCropImg = _.isString(this.modalCropImg) ? $(this.modalCropImg) : this.modalCropImg; - this.fileInput.attr('name', `${this.fileInput.attr('name')}-trigger`).attr('id', `this.fileInput.attr('id')-trigger`); + this.fileInput.attr('name', `${this.fileInput.attr('name')}-trigger`).attr('id', `${this.fileInput.attr('id')}-trigger`); this.exportWidth = exportWidth; this.exportHeight = exportHeight; this.cropBoxWidth = cropBoxWidth; |