diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-07-22 15:10:04 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-07-22 15:10:04 +0300 |
commit | cb8bd7d5946ca50a2de99645687a633a0c8105be (patch) | |
tree | a327e4da74f2a2d050a6971e0e03d41e5b0c5780 /spec/support/import_export | |
parent | 8e0dafbb6665d431f7f1b635c0f7c4a5c61bc325 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/support/import_export')
-rw-r--r-- | spec/support/import_export/common_util.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/spec/support/import_export/common_util.rb b/spec/support/import_export/common_util.rb index 5fb6af99b79..1aa20dab6f8 100644 --- a/spec/support/import_export/common_util.rb +++ b/spec/support/import_export/common_util.rb @@ -83,7 +83,7 @@ module ImportExport path = File.join(dir_path, "#{exportable_path}.json") return unless File.exist?(path) - ActiveSupport::JSON.decode(IO.read(path)) + Gitlab::Json.parse(IO.read(path)) end def consume_relations(dir_path, exportable_path, key) @@ -93,7 +93,7 @@ module ImportExport relations = [] File.foreach(path) do |line| - json = ActiveSupport::JSON.decode(line) + json = Gitlab::Json.parse(line) relations << json end @@ -101,7 +101,7 @@ module ImportExport end def project_json(filename) - ActiveSupport::JSON.decode(IO.read(filename)) + Gitlab::Json.parse(IO.read(filename)) end end end |