Commit 8e9b6019 authored by Rémy Coutable's avatar Rémy Coutable

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
parents d3d4d9f8 f611b7b3
...@@ -44,7 +44,7 @@ module Gitlab ...@@ -44,7 +44,7 @@ module Gitlab
if @relation_name == :notes if @relation_name == :notes
set_note_author set_note_author
# TODO: note attatchments not supported yet # attachment is deprecated and note uploads are handled by Markdown uploader
@relation_hash['attachment'] = nil @relation_hash['attachment'] = nil
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment