Add latest changes from gitlab-org/gitlab@13-0-stable-ee

1 files changed, 2 insertions, 2 deletions

diff --git a/spec/lib/gitlab/database/rename_reserved_paths_migration/v1/rename_base_spec.rb b/spec/lib/gitlab/database/rename_reserved_paths_migration/v1/rename_base_spec.rb
index 7b8437e4874..fae57996fb6 100644
--- a/spec/lib/gitlab/database/rename_reserved_paths_migration/v1/rename_base_spec.rb
+++ b/spec/lib/gitlab/database/rename_reserved_paths_migration/v1/rename_base_spec.rb
@@ -242,7 +242,7 @@ describe Gitlab::Database::RenameReservedPathsMigration::V1::RenameBase, :delete
       old_path, new_path = [nil, nil]
       Gitlab::Redis::SharedState.with do |redis|
         rename_info = redis.lpop(key)
-        old_path, new_path = JSON.parse(rename_info)
+        old_path, new_path = Gitlab::Json.parse(rename_info)
       end
 
       expect(old_path).to eq('path/to/namespace')
@@ -278,7 +278,7 @@ describe Gitlab::Database::RenameReservedPathsMigration::V1::RenameBase, :delete
       end
 
       expect(rename_count).to eq(1)
-      expect(JSON.parse(stored_renames.first)).to eq(%w(old_path new_path))
+      expect(Gitlab::Json.parse(stored_renames.first)).to eq(%w(old_path new_path))
     end
   end
 end