diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-05-15 15:49:40 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-05-15 15:49:40 +0000 |
| commit | b04b1e12c5847f7d366e08af47115d985b73e185 (patch) | |
| tree | 5077e33eedbf1e99b9ef9b87395f9acce844b234 /app/uploaders | |
| parent | a5b9fb9abc2b83304f45392642801b28f52b3f48 (diff) | |
| download | gitlab-ce-b04b1e12c5847f7d366e08af47115d985b73e185.tar.gz | |
Add latest changes from gitlab-org/gitlab@12-10-stable-ee
Diffstat (limited to 'app/uploaders')
| -rw-r--r-- | app/uploaders/file_uploader.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/uploaders/file_uploader.rb b/app/uploaders/file_uploader.rb index 517c22e2334..20aab58243a 100644 --- a/app/uploaders/file_uploader.rb +++ b/app/uploaders/file_uploader.rb @@ -15,7 +15,7 @@ class FileUploader < GitlabUploader prepend ObjectStorage::Extension::RecordsUploads MARKDOWN_PATTERN = %r{\!?\[.*?\]\(/uploads/(?<secret>[0-9a-f]{32})/(?<file>.*?)\)}.freeze - DYNAMIC_PATH_PATTERN = %r{.*/(?<secret>\h{10,32})/(?<identifier>.*)}.freeze + DYNAMIC_PATH_PATTERN = %r{.*(?<secret>\b(\h{10}|\h{32}))\/(?<identifier>.*)}.freeze VALID_SECRET_PATTERN = %r{\A\h{10,32}\z}.freeze InvalidSecret = Class.new(StandardError) |