diff options
| author | GitLab Release Tools Bot <delivery-team+release-tools@gitlab.com> | 2021-03-04 19:10:30 +0000 |
|---|---|---|
| committer | GitLab Release Tools Bot <delivery-team+release-tools@gitlab.com> | 2021-03-04 19:10:30 +0000 |
| commit | 9a70fcd2e277721bbe7b9a0c92ed925ddea201b6 (patch) | |
| tree | 01b1c941fae4768b8803526e0799aa09a245f244 /Gemfile.lock | |
| parent | 03979b4aaf060cae40934b2aade0bbe8a210e311 (diff) | |
| parent | 189a15a911843a9059d1f8bfd31008557bea520b (diff) | |
| download | gitlab-ce-9a70fcd2e277721bbe7b9a0c92ed925ddea201b6.tar.gz | |
Merge remote-tracking branch 'dev/13-9-stable' into 13-9-stable
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index bea01cf000d..90ee2eaec09 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1186,7 +1186,7 @@ GEM rack (>= 1, < 3) thor (1.1.0) thread_safe (0.3.6) - thrift (0.13.0) + thrift (0.14.0) tilt (2.0.10) timecop (0.9.1) timeliness (0.3.10) @@ -1535,6 +1535,7 @@ DEPENDENCIES terser (= 1.0.2) test-prof (~> 0.12.0) thin (~> 1.8.0) + thrift (>= 0.14.0) timecop (~> 0.9.1) toml-rb (~> 1.0.0) truncato (~> 0.7.11) |