diff options
| author | Rémy Coutable <remy@rymai.me> | 2016-08-02 10:16:08 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2016-08-02 10:16:08 +0000 |
| commit | 8e9b6019e9889fd6267020acf76883c882512b2f (patch) | |
| tree | be233c5f33b73963b0b94e1a3c95112892f4c664 | |
| parent | d3d4d9f8f7a2959d5f5807b0928b9b22e9b3565f (diff) | |
| parent | f611b7b3573213956d8cd8f8580434dbcf3a41ea (diff) | |
| download | gitlab-ce-8e9b6019e9889fd6267020acf76883c882512b2f.tar.gz | |
Merge branch 'fix/import-export-note-attachments' into 'master'
fix TODO comment
Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/20376
After some testing, I've found out this wasn't needed and attachments seemed to work fine for import/export between instances (omnibus & source).
See merge request !5617
| -rw-r--r-- | lib/gitlab/import_export/relation_factory.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/gitlab/import_export/relation_factory.rb b/lib/gitlab/import_export/relation_factory.rb index e9c1b79fa45..5e56b3d1aa7 100644 --- a/lib/gitlab/import_export/relation_factory.rb +++ b/lib/gitlab/import_export/relation_factory.rb @@ -44,7 +44,7 @@ module Gitlab if @relation_name == :notes set_note_author - # TODO: note attatchments not supported yet + # attachment is deprecated and note uploads are handled by Markdown uploader @relation_hash['attachment'] = nil end |