summaryrefslogtreecommitdiff
path: root/changelogs
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2018-04-20 09:40:22 +0000
committerDouwe Maan <douwe@gitlab.com>2018-04-20 09:40:22 +0000
commit6d2c7cbead97b1d4677351dca91e892f27002ccf (patch)
treeb48e7a4ee806d0c1f057293be2235bf246888b35 /changelogs
parent7053bdba2e1d76707d924bfac83cc9ac32beac50 (diff)
parent2d7efd9637c6789f73cae803869454b4ea6bc7f5 (diff)
downloadgitlab-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 'changelogs')
-rw-r--r--changelogs/unreleased/rd-45502-uploading-project-export-with-lfs-file-locks-fails.yml5
1 files changed, 5 insertions, 0 deletions
diff --git 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
new file mode 100644
index 00000000000..e3266dda629
--- /dev/null
+++ 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