diff options
| author | James Lopez <james@jameslopez.es> | 2016-09-07 17:08:19 +0200 |
|---|---|---|
| committer | James Lopez <james@jameslopez.es> | 2016-09-19 09:18:37 +0200 |
| commit | 3c7feaf3b12e3c8319f8ccc0f45a87ae0e2cfe8c (patch) | |
| tree | acda8b3b3532ec56b02cc83a21cc5b3a4f9f0827 | |
| parent | e74b7d665b80525c894bd3743ed7c4dc8810b4af (diff) | |
| download | gitlab-ce-3c7feaf3b12e3c8319f8ccc0f45a87ae0e2cfe8c.tar.gz | |
Fixed label color issue and added Import/Export versioning table
| -rw-r--r-- | doc/user/project/settings/import_export.md | 18 | ||||
| -rw-r--r-- | lib/gitlab/import_export.rb | 1 | ||||
| -rw-r--r-- | lib/gitlab/import_export/relation_factory.rb | 2 |
3 files changed, 18 insertions, 3 deletions
diff --git a/doc/user/project/settings/import_export.md b/doc/user/project/settings/import_export.md index 08ff89ce6ae..445c0ee8333 100644 --- a/doc/user/project/settings/import_export.md +++ b/doc/user/project/settings/import_export.md @@ -3,8 +3,8 @@ >**Notes:** > > - [Introduced][ce-3050] in GitLab 8.9. -> - Importing will not be possible if the import instance version is lower -> than that of the exporter. +> - Importing will not be possible if the import instance version differs from +> that of the exporter. > - For existing installations, the project import option has to be enabled in > application settings (`/admin/application_settings`) under 'Import sources'. > You will have to be an administrator to enable and use the import functionality. @@ -17,6 +17,20 @@ Existing projects running on any GitLab instance or GitLab.com can be exported with all their related data and be moved into a new GitLab instance. +## Version history + +| GitLab version | Import/Export version | +| -------- | -------- | +| 8.12.0 to current | 0.1.4 | +| 8.10.3 | 0.1.3 | +| 8.10.0 | 0.1.2 | +| 8.9.5 | 0.1.1 | +| 8.9.0 | 0.1.0 | + + > The table reflects what GitLab version we updated the Import/Export version at. + > For instance, 8.10.3 and 8.11 will have the same Import/Export version (0.1.3) + > and the exports between them will be compatible. + ## Exported contents The following items will be exported: diff --git a/lib/gitlab/import_export.rb b/lib/gitlab/import_export.rb index b90651cbc2d..181e288a014 100644 --- a/lib/gitlab/import_export.rb +++ b/lib/gitlab/import_export.rb @@ -2,6 +2,7 @@ module Gitlab module ImportExport extend self + # For every version update, the version history in import_export.md has to be kept up to date. VERSION = '0.1.4' FILENAME_LIMIT = 50 diff --git a/lib/gitlab/import_export/relation_factory.rb b/lib/gitlab/import_export/relation_factory.rb index 7b18d11ce0f..354ccd64696 100644 --- a/lib/gitlab/import_export/relation_factory.rb +++ b/lib/gitlab/import_export/relation_factory.rb @@ -19,7 +19,7 @@ module Gitlab EXISTING_OBJECT_CHECK = %i[milestone milestones label labels].freeze - FINDER_ATTRIBUTES = %w[title color project_id].freeze + FINDER_ATTRIBUTES = %w[title project_id].freeze def self.create(*args) new(*args).create |