diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-10-29 12:08:50 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-10-29 12:08:50 +0000 |
| commit | 5a7d44a955572b912d13ba8949e976f61b5c7f1b (patch) | |
| tree | 544ed48a55f80871ca0dcf588cf873ffc8ff1bc3 /tooling | |
| parent | c3ea5eada6f28b5e46cc4114f315729cde58de87 (diff) | |
| download | gitlab-ce-5a7d44a955572b912d13ba8949e976f61b5c7f1b.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'tooling')
| -rw-r--r-- | tooling/lib/tooling/helm3_client.rb | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/tooling/lib/tooling/helm3_client.rb b/tooling/lib/tooling/helm3_client.rb index 802ff9b9661..d6671688794 100644 --- a/tooling/lib/tooling/helm3_client.rb +++ b/tooling/lib/tooling/helm3_client.rb @@ -3,7 +3,6 @@ require 'time' require 'json' require_relative '../../../lib/gitlab/popen' unless defined?(Gitlab::Popen) -require_relative '../../../lib/gitlab/json' unless defined?(Gitlab::Json) module Tooling class Helm3Client @@ -67,7 +66,7 @@ module Tooling %(--output json), *args ] - releases = Gitlab::Json.parse(run_command(command)) + releases = JSON.parse(run_command(command)) # rubocop:disable Gitlab/Json releases.map do |release| Release.new(*release.values_at(*RELEASE_JSON_ATTRIBUTES)) |