diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-11-23 00:06:06 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-11-23 00:06:06 +0000 |
| commit | 5cb94fc486b25f14d160a7a584dd9a9f23d1ccc9 (patch) | |
| tree | 1e786999c5965d0e7a4f37b75ce1d91fe6363b4d /Gemfile.lock | |
| parent | 69a23cbee136eda0ab37874399421e6865cfc76b (diff) | |
| download | gitlab-ce-5cb94fc486b25f14d160a7a584dd9a9f23d1ccc9.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 5938ec21fd0..1e93b011ffa 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -142,7 +142,7 @@ GEM mime-types (>= 1.16) cause (0.1) character_set (1.1.2) - charlock_holmes (0.7.7) + charlock_holmes (0.7.6) childprocess (0.9.0) ffi (~> 1.0, >= 1.0.11) chronic (0.10.2) @@ -1143,7 +1143,7 @@ DEPENDENCIES capybara (~> 3.22.0) capybara-screenshot (~> 1.0.22) carrierwave (~> 1.3) - charlock_holmes (~> 0.7.7) + charlock_holmes (~> 0.7.5) chronic (~> 0.10.2) commonmarker (~> 0.20) concurrent-ruby (~> 1.1) |