diff options
| author | Robert Speicher <robert@gitlab.com> | 2016-01-08 20:29:43 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2016-01-08 20:29:43 +0000 |
| commit | af68897acda31a55093e2b5fdd7eba61e54b404c (patch) | |
| tree | de423ec8ff971b5f2c42cb6810259d2fab82da67 /app/assets | |
| parent | 6467448a1aaaa216560d35f2bd0ac4f8932f77ec (diff) | |
| parent | 0614793b38db4711053cbcb4fa80d9c8cc492eec (diff) | |
| download | gitlab-ce-af68897acda31a55093e2b5fdd7eba61e54b404c.tar.gz | |
Merge branch 'api-project-upload' into 'master'
Add API project upload endpoint
Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/4317
See merge request !2329
Diffstat (limited to 'app/assets')
| -rw-r--r-- | app/assets/javascripts/dropzone_input.js.coffee | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/app/assets/javascripts/dropzone_input.js.coffee b/app/assets/javascripts/dropzone_input.js.coffee index 30a35a04339..c714c0fa939 100644 --- a/app/assets/javascripts/dropzone_input.js.coffee +++ b/app/assets/javascripts/dropzone_input.js.coffee @@ -66,7 +66,7 @@ class @DropzoneInput success: (header, response) -> child = $(dropzone[0]).children("textarea") - $(child).val $(child).val() + formatLink(response.link) + "\n" + $(child).val $(child).val() + response.link.markdown + "\n" return error: (temp, errorMessage) -> @@ -99,11 +99,6 @@ class @DropzoneInput child = $(dropzone[0]).children("textarea") - formatLink = (link) -> - text = "[#{link.alt}](#{link.url})" - text = "!#{text}" if link.is_image - text - handlePaste = (event) -> pasteEvent = event.originalEvent if pasteEvent.clipboardData and pasteEvent.clipboardData.items @@ -162,7 +157,7 @@ class @DropzoneInput closeAlertMessage() success: (e, textStatus, response) -> - insertToTextArea(filename, formatLink(response.responseJSON.link)) + insertToTextArea(filename, response.responseJSON.link.markdown) error: (response) -> showError(response.responseJSON.message) @@ -202,8 +197,3 @@ class @DropzoneInput e.preventDefault() $(@).closest('.gfm-form').find('.div-dropzone').click() return - - formatLink: (link) -> - text = "[#{link.alt}](#{link.url})" - text = "!#{text}" if link.is_image - text |