diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2018-08-02 12:50:59 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2018-08-02 12:50:59 +0000 |
| commit | bed7ff8eb419c3871b43574c70079526035517f9 (patch) | |
| tree | 8a53026548237d08dff7ada4ee2b334b70085a7d /app/models | |
| parent | 056025f78e337630148e4c795c282ab668b9fc18 (diff) | |
| parent | 07009a1f4893652e152794ae8160a2f46e00772c (diff) | |
| download | gitlab-ce-bed7ff8eb419c3871b43574c70079526035517f9.tar.gz | |
Merge branch '48773-gitlab-project-import-should-use-object-storage' into 'master'
Resolve "GitLab Project Import should use object storage"
Closes #48773
See merge request gitlab-org/gitlab-ce!20773
Diffstat (limited to 'app/models')
| -rw-r--r-- | app/models/import_export_upload.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/app/models/import_export_upload.rb b/app/models/import_export_upload.rb index 40795d7c42f..f0cc5aafcd4 100644 --- a/app/models/import_export_upload.rb +++ b/app/models/import_export_upload.rb @@ -6,6 +6,7 @@ class ImportExportUpload < ActiveRecord::Base belongs_to :project + # These hold the project Import/Export archives (.tar.gz files) mount_uploader :import_file, ImportExportUploader mount_uploader :export_file, ImportExportUploader |