diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-11-21 09:06:32 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-11-21 09:06:32 +0300 |
| commit | 80e5134020483299c039114e76b734436f006c66 (patch) | |
| tree | c01e1b0451c336f2349cc7db9c9dc317b98bed54 /Gemfile.lock | |
| parent | 8d78e95a9c5b352fb0498ca9c46d068eb93e6e27 (diff) | |
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 cf78043b1ac..a568e0c59e0 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -157,7 +157,7 @@ GEM coercible (1.0.0) descendants_tracker (~> 0.0.1) colored2 (3.1.2) - commonmarker (0.17.13) + commonmarker (0.20.1) ruby-enum (~> 0.5) concord (0.1.5) adamantium (~> 0.2.0) @@ -1146,7 +1146,7 @@ DEPENDENCIES carrierwave (~> 1.3) charlock_holmes (~> 0.7.5) chronic (~> 0.10.2) - commonmarker (~> 0.17) + commonmarker (~> 0.20) concurrent-ruby (~> 1.1) connection_pool (~> 2.0) countries (~> 3.0) |