diff options
| author | Nick Thomas <nick@gitlab.com> | 2019-01-09 20:01:28 +0300 |
|---|---|---|
| committer | Nick Thomas <nick@gitlab.com> | 2019-02-05 17:12:48 +0300 |
| commit | f9e41d0d851ae0ab1d67df63d0309fdce97517e1 (patch) | |
| tree | 3c71a5853b789ff57d8a47522d8603c36eb7aa59 /doc/development/file_storage.md | |
| parent | f04910f254c29047dd3ae798161683a722e7162b (diff) | |
Allow MR diffs to be placed into an object store
Diffstat (limited to 'doc/development/file_storage.md')
| -rw-r--r-- | doc/development/file_storage.md | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/doc/development/file_storage.md b/doc/development/file_storage.md index b90dc90e424..597812c8c49 100644 --- a/doc/development/file_storage.md +++ b/doc/development/file_storage.md @@ -18,6 +18,7 @@ There are many places where file uploading is used, according to contexts: - Issues/MR/Notes Legacy Markdown attachments - CI Artifacts (archive, metadata, trace) - LFS Objects + - Merge request diffs ## Disk storage @@ -37,6 +38,7 @@ they are still not 100% standardized. You can see them below: | Issues/MR/Notes Legacy Markdown attachments | no | uploads/-/system/note/attachment/:id/:filename | `AttachmentUploader` | Note | | CI Artifacts (CE) | yes | shared/artifacts/:disk_hash[0..1]/:disk_hash[2..3]/:disk_hash/:year_:month_:date/:job_id/:job_artifact_id (:disk_hash is SHA256 digest of project_id) | `JobArtifactUploader` | Ci::JobArtifact | | LFS Objects (CE) | yes | shared/lfs-objects/:hex/:hex/:object_hash | `LfsObjectUploader` | LfsObject | +| External merge request diffs | yes | shared/external-diffs/merge_request_diffs/mr-:parent_id/diff-:id | `ExternalDiffUploader` | MergeRequestDiff | CI Artifacts and LFS Objects behave differently in CE and EE. In CE they inherit the `GitlabUploader` while in EE they inherit the `ObjectStorage` and store files in and S3 API compatible object store. |