summaryrefslogtreecommitdiff
path: root/LICENSE
diff options
context:
space:
mode:
authorStan Hu <stanhu@gmail.com>2019-05-15 09:26:18 -0700
committerStan Hu <stanhu@gmail.com>2019-05-16 23:36:55 -0700
commita1f44c1b4969847fa80d6c53d6bd70813d273d6c (patch)
tree93a72b0cec8d043bbde754a69c12eba803b46620 /LICENSE
parent04794fb476a6071c1e1f782ae1c81801ff2410c3 (diff)
downloadgitlab-ce-a1f44c1b4969847fa80d6c53d6bd70813d273d6c.tar.gz
Fix incorrect prefix used in new uploads for personal snippets
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/24550 fixed the case where the wrong path on disk was being searched, but it inadvertently ommitted the `/uploads/-/system` prefix when rendering the Markdown for personal snippet uploads when they were stored directly in object storage. A personal snippet path is stored using FileUploader#upload_path. The format for the path: Local storage: :random_hex/:filename. Object storage: personal_snippet/:id/:random_hex/:filename. upload_paths represent the possible paths for a given identifier, which will vary depending on whether the file is stored in local or object storage. upload_path should match an element in upload_paths. base_dir represents the path seen by the user in Markdown, and it should always be prefixed with uploads/-/system. store_dirs represent the paths that are actually used on disk. For object storage, this should omit the prefix /uploads/-/system. For example, consider the requested path /uploads/-/system/personal_snippet/172/ff4ad5c2/file.png. For local storage: base_dir: uploads/-/system/personal_snippet/172 upload_path: ff4ad5c2/file.png upload_paths: ["ff4ad5c2/file.png", "personal_snippet/172/ff4ad5c2/file.png"]. store_dirs: {1=>"uploads/-/system/personal_snippet/172/ff4ad5c2", 2=>"personal_snippet/172/ff4ad5c2"} For object storage: upload_path: personal_snippet/172/ff4ad5c2/file.png Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/61671
Diffstat (limited to 'LICENSE')
0 files changed, 0 insertions, 0 deletions