summaryrefslogtreecommitdiff
path: root/vendor
diff options
context:
space:
mode:
authorKamil Trzciński <ayufan@ayufan.eu>2018-01-07 16:02:40 +0000
committerKamil Trzciński <ayufan@ayufan.eu>2018-01-07 16:02:40 +0000
commitdf48758c69e5927a45fb70293c18a2ec82995d6c (patch)
treee62084717dfe832edbdbd6777c17592626966b0e /vendor
parent64ef3bfd6cfb00b8ef361298e83522bcf3e6dea8 (diff)
parent92df3a742c05919f73fa64457794b485c93fa614 (diff)
downloadgitlab-ce-df48758c69e5927a45fb70293c18a2ec82995d6c.tar.gz
Merge branch 'fix/gb/fix-import-export-restoring-associations' into 'master'
Fix restoring associations with import/export Closes #41646 See merge request gitlab-org/gitlab-ce!16221
Diffstat (limited to 'vendor')
-rw-r--r--vendor/project_templates/express.tar.gzbin5651 -> 5614 bytes
-rw-r--r--vendor/project_templates/rails.tar.gzbin25065 -> 25007 bytes
-rw-r--r--vendor/project_templates/spring.tar.gzbin50845 -> 50945 bytes
3 files changed, 0 insertions, 0 deletions
diff --git a/vendor/project_templates/express.tar.gz b/vendor/project_templates/express.tar.gz
index 7a811e1986b..dcf5e4a0416 100644
--- a/vendor/project_templates/express.tar.gz
+++ b/vendor/project_templates/express.tar.gz
Binary files differ
diff --git a/vendor/project_templates/rails.tar.gz b/vendor/project_templates/rails.tar.gz
index 7db63ecc65f..d4856090ed9 100644
--- a/vendor/project_templates/rails.tar.gz
+++ b/vendor/project_templates/rails.tar.gz
Binary files differ
diff --git a/vendor/project_templates/spring.tar.gz b/vendor/project_templates/spring.tar.gz
index 96f51ee804c..6ee7e76f676 100644
--- a/vendor/project_templates/spring.tar.gz
+++ b/vendor/project_templates/spring.tar.gz
Binary files differ