diff options
| author | Stan Hu <stanhu@gmail.com> | 2017-06-19 23:48:54 +0000 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2017-06-19 23:48:54 +0000 |
| commit | 8d714b0788669451d9e7b2debd232247099434c8 (patch) | |
| tree | ad9721aa1551f5b795ded370cf6db73d147b0b66 | |
| parent | f86ac8f568177aa4586963098a469f28189e2b04 (diff) | |
| parent | 2ddab6cdbce988b40920a17c623fc91ec8734a21 (diff) | |
| download | gitlab-ce-8d714b0788669451d9e7b2debd232247099434c8.tar.gz | |
Merge branch 'fix-missing-function-dropzone-input' into 'master'
Restored missing function inside dropzone_input.js
Closes #33836
See merge request !12279
| -rw-r--r-- | app/assets/javascripts/dropzone_input.js | 4 | ||||
| -rw-r--r-- | changelogs/unreleased/fix-missing-function-dropzone-input.yml | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/app/assets/javascripts/dropzone_input.js b/app/assets/javascripts/dropzone_input.js index 98ddcc20036..73675d300be 100644 --- a/app/assets/javascripts/dropzone_input.js +++ b/app/assets/javascripts/dropzone_input.js @@ -287,6 +287,10 @@ window.DropzoneInput = (function() { $uploadingErrorMessage.html(message); }; + closeAlertMessage = function() { + return form.find('.div-dropzone-alert').alert('close'); + }; + form.find('.markdown-selector').click(function(e) { e.preventDefault(); $(this).closest('.gfm-form').find('.div-dropzone').click(); diff --git a/changelogs/unreleased/fix-missing-function-dropzone-input.yml b/changelogs/unreleased/fix-missing-function-dropzone-input.yml new file mode 100644 index 00000000000..d9dfc76faaf --- /dev/null +++ b/changelogs/unreleased/fix-missing-function-dropzone-input.yml @@ -0,0 +1,4 @@ +--- +title: Fix for cut & pasted images not working +merge_request: +author: |