diff options
| author | Douwe Maan <douwe@gitlab.com> | 2018-04-20 09:40:22 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2018-04-20 09:40:22 +0000 |
| commit | 6d2c7cbead97b1d4677351dca91e892f27002ccf (patch) | |
| tree | b48e7a4ee806d0c1f057293be2235bf246888b35 /spec/lib | |
| parent | 7053bdba2e1d76707d924bfac83cc9ac32beac50 (diff) | |
| parent | 2d7efd9637c6789f73cae803869454b4ea6bc7f5 (diff) | |
| download | gitlab-ce-6d2c7cbead97b1d4677351dca91e892f27002ccf.tar.gz | |
Merge branch 'rd-45502-uploading-project-export-with-lfs-file-locks-fails' into 'master'
Don't include lfs_file_locks data in export bundle
Closes #45502
See merge request gitlab-org/gitlab-ce!18495
Diffstat (limited to 'spec/lib')
| -rw-r--r-- | spec/lib/gitlab/import_export/safe_model_attributes.yml | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/spec/lib/gitlab/import_export/safe_model_attributes.yml b/spec/lib/gitlab/import_export/safe_model_attributes.yml index f84a777a27f..05790bb5fe1 100644 --- a/spec/lib/gitlab/import_export/safe_model_attributes.yml +++ b/spec/lib/gitlab/import_export/safe_model_attributes.yml @@ -537,12 +537,6 @@ ProjectCustomAttribute: - project_id - key - value -LfsFileLock: -- id -- path -- user_id -- project_id -- created_at Badge: - id - link_url |