diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-05-02 18:09:45 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-05-02 18:09:45 +0000 |
| commit | b63f3afa42a43e2a261a989f87e9ccd1e18caaa5 (patch) | |
| tree | 5fc652add6f21528c9a1b06f0d4536b90d547e3c | |
| parent | 879372bc8cced2381df282d64608639cb063b007 (diff) | |
| download | gitlab-ce-b63f3afa42a43e2a261a989f87e9ccd1e18caaa5.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 4 | ||||
| -rw-r--r-- | lib/quality/helm3_client.rb | 2 |
3 files changed, 4 insertions, 4 deletions
@@ -204,7 +204,7 @@ gem 'ruby-progressbar' gem 'settingslogic', '~> 2.0.9' # Linear-time regex library for untrusted regular expressions -gem 're2', '~> 1.1.1' +gem 're2', '~> 1.2.0' # Misc diff --git a/Gemfile.lock b/Gemfile.lock index e796144f62a..eb1a0eb5a27 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -854,7 +854,7 @@ GEM msgpack (>= 0.4.3) optimist (>= 3.0.0) rdoc (6.1.2) - re2 (1.1.1) + re2 (1.2.0) recaptcha (4.13.1) json recursive-open-struct (1.1.0) @@ -1346,7 +1346,7 @@ DEPENDENCIES rblineprof (~> 0.3.6) rbtrace (~> 0.4) rdoc (~> 6.1.2) - re2 (~> 1.1.1) + re2 (~> 1.2.0) recaptcha (~> 4.11) redis (~> 4.0) redis-namespace (~> 1.6.0) diff --git a/lib/quality/helm3_client.rb b/lib/quality/helm3_client.rb index 28ff3ef0271..afea73cbc50 100644 --- a/lib/quality/helm3_client.rb +++ b/lib/quality/helm3_client.rb @@ -65,7 +65,7 @@ module Quality %(--output json), *args ] - releases = Gitlab::Json.parse(run_command(command)) + releases = JSON.parse(run_command(command)) releases.map do |release| Release.new(*release.values_at(*RELEASE_JSON_ATTRIBUTES)) |