From 3795b229ab9d63846002ebb9b95073c3cbf5ab98 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Fri, 1 May 2020 00:09:59 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- lib/gitlab/ci/ansi2json/state.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/gitlab/ci/ansi2json/state.rb') diff --git a/lib/gitlab/ci/ansi2json/state.rb b/lib/gitlab/ci/ansi2json/state.rb index 7e1a8102a35..38d36e6950c 100644 --- a/lib/gitlab/ci/ansi2json/state.rb +++ b/lib/gitlab/ci/ansi2json/state.rb @@ -90,7 +90,7 @@ module Gitlab decoded_state = Base64.urlsafe_decode64(state) return unless decoded_state.present? - JSON.parse(decoded_state) + Gitlab::Json.parse(decoded_state) end end end -- cgit v1.2.3