diff options
author | James Lopez <james@jameslopez.es> | 2016-07-15 17:05:05 +0200 |
---|---|---|
committer | James Lopez <james@jameslopez.es> | 2016-07-15 17:05:05 +0200 |
commit | 9b86006ca160b5edc05f4b5c67d9f4efc61ca877 (patch) | |
tree | d50e8c95003fa386ae57a01025690a6bf8fd1cb7 /lib/gitlab/import_export | |
parent | 9c5356039bf41405a235501f83f67b2f7aa53d11 (diff) | |
parent | 8b7932c21951de172d531ab8a3e9506c98db7483 (diff) | |
download | gitlab-ce-9b86006ca160b5edc05f4b5c67d9f4efc61ca877.tar.gz |
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into fix/project-export-filenamefix/project-export-filename
Diffstat (limited to 'lib/gitlab/import_export')
-rw-r--r-- | lib/gitlab/import_export/project_tree_restorer.rb | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/lib/gitlab/import_export/project_tree_restorer.rb b/lib/gitlab/import_export/project_tree_restorer.rb index 025ecc12f9f..051110c23cf 100644 --- a/lib/gitlab/import_export/project_tree_restorer.rb +++ b/lib/gitlab/import_export/project_tree_restorer.rb @@ -12,7 +12,10 @@ module Gitlab json = IO.read(@path) @tree_hash = ActiveSupport::JSON.decode(json) @project_members = @tree_hash.delete('project_members') - create_relations + + ActiveRecord::Base.no_touching do + create_relations + end rescue => e @shared.error(e) false |