diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-18 12:09:13 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-18 12:09:13 +0000 |
| commit | 1363ca12f1f07c634647cf55c4c16b7401098673 (patch) | |
| tree | d932caf09c8148322edb51ae954ed159ff7d00f8 /Gemfile.lock | |
| parent | 6763d2787670bc03a36a8eb601703e88fc70dece (diff) | |
| download | gitlab-ce-1363ca12f1f07c634647cf55c4c16b7401098673.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 8006e45259a..3bbe3020b70 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -750,7 +750,7 @@ GEM orm_adapter (0.5.0) os (1.0.0) parallel (1.19.1) - parser (2.6.5.0) + parser (2.7.0.4) ast (~> 2.4.0) parslet (1.8.2) peek (1.1.0) @@ -1094,13 +1094,13 @@ GEM uniform_notifier (1.13.0) unleash (0.1.5) murmurhash3 (~> 0.1.6) - unparser (0.4.5) + unparser (0.4.7) abstract_type (~> 0.0.7) adamantium (~> 0.2.0) concord (~> 0.1.5) diff-lcs (~> 1.3) equalizer (~> 0.0.9) - parser (~> 2.6.3) + parser (>= 2.6.5) procto (~> 0.0.2) validate_email (0.1.6) activemodel (>= 3.0) |