diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-11-23 21:07:55 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-11-23 21:07:55 +0300 |
commit | 5421d61b1d5ffe11a9c7afbe2259b4e4d0e7c993 (patch) | |
tree | 093cfd5a5f80119f6e9c7ccd2c646ca2482cc3d2 /lib/gitlab/gfm | |
parent | bc0f141f2f073a971aad1eb5349bb718747df028 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/gitlab/gfm')
-rw-r--r-- | lib/gitlab/gfm/uploads_rewriter.rb | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/lib/gitlab/gfm/uploads_rewriter.rb b/lib/gitlab/gfm/uploads_rewriter.rb index 58b46a85aae..6b5f10ed78e 100644 --- a/lib/gitlab/gfm/uploads_rewriter.rb +++ b/lib/gitlab/gfm/uploads_rewriter.rb @@ -54,8 +54,7 @@ module Gitlab file = find_file(match[:secret], match[:file]) # No file will be returned for a path traversal - return '' if file.nil? - + return markdown if file.nil? return markdown unless file.try(:exists?) klass = @target_parent.is_a?(Namespace) ? NamespaceFileUploader : FileUploader |