Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'spec/support/import_export/common_util.rb')
-rw-r--r--spec/support/import_export/common_util.rb6
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