diff options
| author | Stan Hu <stanhu@gmail.com> | 2018-04-07 08:15:32 +0000 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2018-04-07 08:15:32 +0000 |
| commit | 671e93dc38365f3b05cb3cfe719e64713196be31 (patch) | |
| tree | e1be82d7587f391c20df96a6d071d7a88a397277 | |
| parent | aade8b3652573db40e7b777c72caa922b0bc12ef (diff) | |
| parent | 585b7acc5b26d5bb98e4e1567b2d0ed36d81b7ac (diff) | |
| download | gitlab-ce-671e93dc38365f3b05cb3cfe719e64713196be31.tar.gz | |
Merge branch 'blackst0ne-bump-parser-2-5-0-5' into 'master'
Bump `parser` gem to 2.5.0.5
See merge request gitlab-org/gitlab-ce!18237
| -rw-r--r-- | Gemfile.lock | 2 | ||||
| -rw-r--r-- | Gemfile.rails5.lock | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 1e6fe7638a9..a1150dfccdd 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -587,7 +587,7 @@ GEM orm_adapter (0.5.0) os (0.9.6) parallel (1.12.1) - parser (2.5.0.3) + parser (2.5.0.5) ast (~> 2.4.0) parslet (1.5.0) blankslate (~> 2.0) diff --git a/Gemfile.rails5.lock b/Gemfile.rails5.lock index 08ae3fb514c..18bbad88ec3 100644 --- a/Gemfile.rails5.lock +++ b/Gemfile.rails5.lock @@ -291,7 +291,7 @@ GEM po_to_json (>= 1.0.0) rails (>= 3.2.0) gherkin-ruby (0.3.2) - gitaly-proto (0.91.0) + gitaly-proto (0.94.0) google-protobuf (~> 3.1) grpc (~> 1.0) github-linguist (5.3.3) @@ -587,7 +587,7 @@ GEM orm_adapter (0.5.0) os (0.9.6) parallel (1.12.1) - parser (2.5.0.4) + parser (2.5.0.5) ast (~> 2.4.0) parslet (1.5.0) blankslate (~> 2.0) @@ -1062,7 +1062,7 @@ DEPENDENCIES gettext (~> 3.2.2) gettext_i18n_rails (~> 1.8.0) gettext_i18n_rails_js (~> 1.3) - gitaly-proto (~> 0.91.0) + gitaly-proto (~> 0.94.0) github-linguist (~> 5.3.3) gitlab-flowdock-git-hook (~> 1.0.1) gitlab-markup (~> 1.6.2) |