diff options
| author | Robert Speicher <robert@gitlab.com> | 2018-10-25 16:29:43 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2018-10-25 16:29:43 +0000 |
| commit | c2a8cd05b517466a53700be52289c5f75d9eca5b (patch) | |
| tree | 3fd157c6587e0770b155e100f34898a596c9b149 | |
| parent | 4de9004175e7c1dfd0366c41d70573d4d686b292 (diff) | |
| parent | 4453adb59b0cbc33c90237403b29cd1ffee0aa52 (diff) | |
| download | gitlab-ce-c2a8cd05b517466a53700be52289c5f75d9eca5b.tar.gz | |
Merge branch 'sh-update-parser' into 'master'
Upgrade parser gem to 2.5.1.2
See merge request gitlab-org/gitlab-ce!22590
| -rw-r--r-- | Gemfile.lock | 2 | ||||
| -rw-r--r-- | Gemfile.rails5.lock | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index bf16bef4f32..240fcd4e551 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -547,7 +547,7 @@ GEM orm_adapter (0.5.0) os (1.0.0) parallel (1.12.1) - parser (2.5.1.0) + parser (2.5.1.2) ast (~> 2.4.0) parslet (1.8.2) peek (1.0.1) diff --git a/Gemfile.rails5.lock b/Gemfile.rails5.lock index 81547303ed2..22c783c2d3b 100644 --- a/Gemfile.rails5.lock +++ b/Gemfile.rails5.lock @@ -551,7 +551,7 @@ GEM orm_adapter (0.5.0) os (1.0.0) parallel (1.12.1) - parser (2.5.1.0) + parser (2.5.1.2) ast (~> 2.4.0) parslet (1.8.2) peek (1.0.1) |