diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-09-28 15:09:44 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-09-28 15:09:44 +0000 |
| commit | 34b3acb5a3a9b21490e45b81b81dca600b66521c (patch) | |
| tree | 81deb74283f931cdbf65b8878b41085b0213a9e6 /Gemfile.lock | |
| parent | effda22b3e6367cefd12666463b8409bf7e24cef (diff) | |
| download | gitlab-ce-34b3acb5a3a9b21490e45b81b81dca600b66521c.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 0057b46f06e..e9d309545cf 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -167,7 +167,7 @@ GEM mime-types (>= 1.16) cbor (0.5.9.6) character_set (1.4.0) - charlock_holmes (0.7.6) + charlock_holmes (0.7.7) childprocess (3.0.0) chunky_png (1.3.5) citrus (3.0.2) @@ -1270,7 +1270,7 @@ DEPENDENCIES capybara (~> 3.33.0) capybara-screenshot (~> 1.0.22) carrierwave (~> 1.3) - charlock_holmes (~> 0.7.5) + charlock_holmes (~> 0.7.7) commonmarker (~> 0.20) concurrent-ruby (~> 1.1) connection_pool (~> 2.0) |