Commit 91f8b22c authored by GitLab Bot's avatar GitLab Bot

Automatic merge of gitlab-org/gitlab master

parents 4ac29f8e c8f16497
...@@ -3,7 +3,6 @@ ...@@ -3,7 +3,6 @@
require 'time' require 'time'
require 'json' require 'json'
require_relative '../../../lib/gitlab/popen' unless defined?(Gitlab::Popen) require_relative '../../../lib/gitlab/popen' unless defined?(Gitlab::Popen)
require_relative '../../../lib/gitlab/json' unless defined?(Gitlab::Json)
module Tooling module Tooling
class Helm3Client class Helm3Client
...@@ -67,7 +66,7 @@ module Tooling ...@@ -67,7 +66,7 @@ module Tooling
%(--output json), %(--output json),
*args *args
] ]
releases = Gitlab::Json.parse(run_command(command)) releases = JSON.parse(run_command(command)) # rubocop:disable Gitlab/Json
releases.map do |release| releases.map do |release|
Release.new(*release.values_at(*RELEASE_JSON_ATTRIBUTES)) Release.new(*release.values_at(*RELEASE_JSON_ATTRIBUTES))
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment