From 0653e08efd039a5905f3fa4f6e9cef9f5d2f799c Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Mon, 20 Sep 2021 13:18:24 +0000 Subject: Add latest changes from gitlab-org/gitlab@14-3-stable-ee --- app/assets/javascripts/dropzone_input.js | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'app/assets/javascripts/dropzone_input.js') diff --git a/app/assets/javascripts/dropzone_input.js b/app/assets/javascripts/dropzone_input.js index 337f7ae2757..f98f63529fc 100644 --- a/app/assets/javascripts/dropzone_input.js +++ b/app/assets/javascripts/dropzone_input.js @@ -4,6 +4,7 @@ import { escape } from 'lodash'; import './behaviors/preview_markdown'; import { spriteIcon } from '~/lib/utils/common_utils'; import { getFilename } from '~/lib/utils/file_upload'; +import { truncate } from '~/lib/utils/text_utility'; import { n__, __ } from '~/locale'; import PasteMarkdownTable from './behaviors/markdown/paste_markdown_table'; import axios from './lib/utils/axios_utils'; @@ -189,10 +190,13 @@ export default function dropzoneInput(form, config = { parallelUploads: 2 }) { if (image) { event.preventDefault(); + const MAX_FILE_NAME_LENGTH = 246; const filename = getFilename(pasteEvent) || 'image.png'; - const text = `{{${filename}}}`; + const truncateFilename = truncate(filename, MAX_FILE_NAME_LENGTH); + const text = `{{${truncateFilename}}}`; pasteText(text); - return uploadFile(image.getAsFile(), filename); + + return uploadFile(image.getAsFile(), truncateFilename); } } } -- cgit v1.2.1