diff options
| author | Rémy Coutable <remy@rymai.me> | 2017-11-07 10:59:38 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2017-11-07 10:59:38 +0000 |
| commit | 31e3ef93e53802bb99b342a7b403972493ed63cc (patch) | |
| tree | 150d4328b00f71c2f28f7a58003b73e3d0548b5c /lib/gitlab/import_export/relation_factory.rb | |
| parent | 2ec5ae21b8ab16bea83c4b00df5bf17be8ad34c6 (diff) | |
| parent | 1f773a8ef5a1f76166d0455c6a5e473278885c17 (diff) | |
| download | gitlab-ce-31e3ef93e53802bb99b342a7b403972493ed63cc.tar.gz | |
Merge branch 'feature/custom-attributes-on-projects-and-groups' into 'master'
Support custom attributes on groups and projects
See merge request gitlab-org/gitlab-ce!14593
Diffstat (limited to 'lib/gitlab/import_export/relation_factory.rb')
| -rw-r--r-- | lib/gitlab/import_export/relation_factory.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/gitlab/import_export/relation_factory.rb b/lib/gitlab/import_export/relation_factory.rb index a790dcfe8a6..0d745e2b21f 100644 --- a/lib/gitlab/import_export/relation_factory.rb +++ b/lib/gitlab/import_export/relation_factory.rb @@ -17,7 +17,8 @@ module Gitlab labels: :project_labels, priorities: :label_priorities, auto_devops: :project_auto_devops, - label: :project_label }.freeze + label: :project_label, + custom_attributes: 'ProjectCustomAttribute' }.freeze USER_REFERENCES = %w[author_id assignee_id updated_by_id user_id created_by_id last_edited_by_id merge_user_id resolved_by_id].freeze |