diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-01-13 18:10:40 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-01-13 18:10:40 +0300 |
| commit | 9b1b702f0fc3820e13fd3810bf096687d3378dc5 (patch) | |
| tree | 8ec6e084f9b0c84ebc0996c8ea64d47389f49e81 /Gemfile.lock | |
| parent | 39c1496527de559d5d3a5c3b53d11575f435a4dc (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index a39a504e34b..af8c1d5b50f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -432,9 +432,9 @@ GEM fog-json (~> 1.2.0) mime-types ms_rest_azure (~> 0.12.0) - gitlab-labkit (0.13.5) - actionpack (>= 5.0.0, < 6.1.0) - activesupport (>= 5.0.0, < 6.1.0) + gitlab-labkit (0.14.0) + actionpack (>= 5.0.0, < 7.0.0) + activesupport (>= 5.0.0, < 7.0.0) gitlab-pg_query (~> 1.3) grpc (~> 1.19) jaeger-client (~> 1.1) @@ -1363,7 +1363,7 @@ DEPENDENCIES gitlab-chronic (~> 0.10.5) gitlab-experiment (~> 0.4.4) gitlab-fog-azure-rm (~> 1.0) - gitlab-labkit (= 0.13.5) + gitlab-labkit (= 0.14.0) gitlab-license (~> 1.0) gitlab-mail_room (~> 0.0.8) gitlab-markup (~> 1.7.1) |