diff options
| author | Kamil Trzcinski <ayufan@ayufan.eu> | 2017-09-07 19:03:20 +0300 |
|---|---|---|
| committer | Kamil Trzcinski <ayufan@ayufan.eu> | 2017-09-07 19:03:20 +0300 |
| commit | 12ddc28f844fe63446a16ac908b09ed7b13c71ef (patch) | |
| tree | 149ef1a7e2b32e6fa8c4462394daf942b7452440 /lib/gitlab/import_export | |
| parent | 62a5cc7134457d21bf3a68bfdb04e090cf0e6ecf (diff) | |
| parent | f2421b2b97d81ef7631f1baefb4ba4401c8a04dc (diff) | |
Merge remote-tracking branch 'origin/master' into zj/gitlab-ce-zj-auto-devops-table
Diffstat (limited to 'lib/gitlab/import_export')
| -rw-r--r-- | lib/gitlab/import_export/relation_factory.rb | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/lib/gitlab/import_export/relation_factory.rb b/lib/gitlab/import_export/relation_factory.rb index 7448b806b72..380b336395d 100644 --- a/lib/gitlab/import_export/relation_factory.rb +++ b/lib/gitlab/import_export/relation_factory.rb @@ -70,7 +70,6 @@ module Gitlab reset_tokens! remove_encrypted_attributes! - @relation_hash['data'].deep_symbolize_keys! if @relation_name == :events && @relation_hash['data'] set_st_diff_commits if @relation_name == :merge_request_diff set_diff if @relation_name == :merge_request_diff_files end |