Don't include lfs_file_locks data in export bundle

2018-04-19 23:30:32 -05:00 · 2018-04-19 23:30:32 -05:00 · 2d7efd9637
parent 73431ad0d1
commit 2d7efd9637
3 changed files with 5 additions and 8 deletions
--- a/changelogs/unreleased/rd-45502-uploading-project-export-with-lfs-file-locks-fails.yml
+++ b/changelogs/unreleased/rd-45502-uploading-project-export-with-lfs-file-locks-fails.yml
@ -0,0 +1,5 @@
 ---
 title: Don't include lfs_file_locks data in export bundle
 merge_request: 18495
 author:
 type: fixed
--- a/lib/gitlab/import_export/import_export.yml
+++ b/lib/gitlab/import_export/import_export.yml
@ -27,8 +27,6 @@ project_tree:
  - :releases
  - project_members:
    - :user
  - lfs_file_locks:
    - :user
  - merge_requests:
    - notes:
      - :author
--- 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