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

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
671e93dc · Stan Hu · aade8b36 · 585b7acc · 671e93dc · 671e93dc
Commit 671e93dc authored Apr 07, 2018 by Stan Hu
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 4 deletions

Gemfile.lock Gemfile.lock +1 -1

Gemfile.rails5.lock Gemfile.rails5.lock +3 -3

No files found.
--- 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)

--- 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)