diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-05 12:07:48 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-05 12:07:48 +0000 |
| commit | 5a6b36b60502c50ab59c0bc3c345793b70a3d548 (patch) | |
| tree | 7cf2effbd48359b44970f8f345cfa12ce6843dfd /Gemfile.lock | |
| parent | a76d34e6716aa8267111ecdcd21416e9dec3a08d (diff) | |
| download | gitlab-ce-5a6b36b60502c50ab59c0bc3c345793b70a3d548.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 0748cb0e56b..d46550a252d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -380,7 +380,7 @@ GEM github-markup (1.7.0) gitlab-chronic (0.10.5) numerizer (~> 0.2) - gitlab-labkit (0.10.0) + gitlab-labkit (0.10.1) actionpack (>= 5.0.0, < 6.1.0) activesupport (>= 5.0.0, < 6.1.0) grpc (~> 1.19) @@ -1232,7 +1232,7 @@ DEPENDENCIES gitaly (~> 1.86.0) github-markup (~> 1.7.0) gitlab-chronic (~> 0.10.5) - gitlab-labkit (= 0.10.0) + gitlab-labkit (= 0.10.1) gitlab-license (~> 1.0) gitlab-mail_room (~> 0.0.3) gitlab-markup (~> 1.7.0) |