diff options
author | Toon Claes <toon@gitlab.com> | 2022-05-11 19:37:01 +0300 |
---|---|---|
committer | Toon Claes <toon@gitlab.com> | 2022-05-11 19:37:01 +0300 |
commit | f4ffe613c79589a728864f330493595ce70a1be1 (patch) | |
tree | 653fcf8a4470115eb74f1fc1ce9979f7acf3fb01 | |
parent | 94a955f7bac56cb8f524f43a7773038e6e341585 (diff) | |
parent | ac7f6fb6b4706f578b5582f617683579c48d2f6a (diff) |
Merge branch 'caw-downgrade-json-gem-to-match-gitlab' into 'master'
downgrade json gem to match gitlab version
See merge request gitlab-org/gitaly!4547
-rw-r--r-- | ruby/Gemfile.lock | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ruby/Gemfile.lock b/ruby/Gemfile.lock index cc37adacc..cc5344f8e 100644 --- a/ruby/Gemfile.lock +++ b/ruby/Gemfile.lock @@ -94,7 +94,7 @@ GEM jaeger-client (1.1.0) opentracing (~> 0.3) thrift - json (2.6.1) + json (2.5.1) licensee (9.14.1) dotenv (~> 2.0) octokit (~> 4.17) |