diff options
| author | James Lopez <james@jameslopez.es> | 2017-09-05 17:10:57 +0200 |
|---|---|---|
| committer | James Lopez <james@jameslopez.es> | 2017-09-05 17:47:45 +0200 |
| commit | 4119206f76d802413850dc9fe1fa4715c3bd6fc0 (patch) | |
| tree | 01877dafda4888e318bdafa85df23973836818bc /lib | |
| parent | be99f82478e023e41a543a0b9348e27d56fb3c13 (diff) | |
| download | gitlab-ce-4119206f76d802413850dc9fe1fa4715c3bd6fc0.tar.gz | |
fix export performance of CI builds
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/gitlab/import_export/import_export.yml | 1 | ||||
| -rw-r--r-- | lib/gitlab/import_export/reader.rb | 4 |
2 files changed, 2 insertions, 3 deletions
diff --git a/lib/gitlab/import_export/import_export.yml b/lib/gitlab/import_export/import_export.yml index 78795dd3d92..ec73846d844 100644 --- a/lib/gitlab/import_export/import_export.yml +++ b/lib/gitlab/import_export/import_export.yml @@ -116,6 +116,7 @@ excluded_attributes: statuses: - :trace - :token + - :when push_event_payload: - :event_id diff --git a/lib/gitlab/import_export/reader.rb b/lib/gitlab/import_export/reader.rb index 4f061959047..eb7f5120592 100644 --- a/lib/gitlab/import_export/reader.rb +++ b/lib/gitlab/import_export/reader.rb @@ -18,9 +18,7 @@ module Gitlab attributes = @attributes_finder.find(:project) project_attributes = attributes.is_a?(Hash) ? attributes[:project] : {} - build_hash(@tree).each do |sub_hash| - yield(project_attributes.merge(include: sub_hash)) - end + project_attributes.merge(include: build_hash(@tree)) rescue => e @shared.error(e) false |