diff options
| author | James Lopez <james@jameslopez.es> | 2016-06-13 10:55:54 +0200 |
|---|---|---|
| committer | James Lopez <james@jameslopez.es> | 2016-06-13 10:55:54 +0200 |
| commit | 069bc264185f35f75c6840e26581e64a1de12d6a (patch) | |
| tree | a38f015d81a4e4e577207b89e061676f8f8dfcb6 /lib/gitlab/import_export | |
| parent | 771f73510937186130be260d11b8dbb273d45907 (diff) | |
| download | gitlab-ce-069bc264185f35f75c6840e26581e64a1de12d6a.tar.gz | |
refactored loads of things due to commits to pipeline change
Diffstat (limited to 'lib/gitlab/import_export')
| -rw-r--r-- | lib/gitlab/import_export/import_export.yml | 4 | ||||
| -rw-r--r-- | lib/gitlab/import_export/import_export_reader.rb | 3 |
2 files changed, 3 insertions, 4 deletions
diff --git a/lib/gitlab/import_export/import_export.yml b/lib/gitlab/import_export/import_export.yml index ee8fc544b60..3796fc8cd02 100644 --- a/lib/gitlab/import_export/import_export.yml +++ b/lib/gitlab/import_export/import_export.yml @@ -16,10 +16,10 @@ project_tree: - notes: :author - :merge_request_diff - - ci_commits: - - :statuses + - pipelines: - notes: :author + - :statuses - :variables - :triggers - :deploy_keys diff --git a/lib/gitlab/import_export/import_export_reader.rb b/lib/gitlab/import_export/import_export_reader.rb index c7a44efadf5..29b9ef24fde 100644 --- a/lib/gitlab/import_export/import_export_reader.rb +++ b/lib/gitlab/import_export/import_export_reader.rb @@ -3,9 +3,8 @@ module Gitlab class ImportExportReader def initialize(shared:) - config = ImportExport.config_file @shared = shared - config_hash = YAML.load_file(config).deep_symbolize_keys + config_hash = YAML.load_file(Gitlab::ImportExport.config_file).deep_symbolize_keys @tree = config_hash[:project_tree] @attributes_finder = Gitlab::ImportExport::AttributesFinder.new(included_attributes: config_hash[:included_attributes], excluded_attributes: config_hash[:excluded_attributes], |