Merge branch 'rails5-update-gemfile' into 'master'

Upgrade whitequark/parser to 2.5.3.0 See merge request gitlab-org/gitlab-ce!22984

Merge branch 'rails5-update-gemfile' into 'master'
Upgrade whitequark/parser to 2.5.3.0 See merge request gitlab-org/gitlab-ce!22984
72f9c7eb · Sean McGivern · d15c9ae3 · 6f10ffb6 · 72f9c7eb
Commit 72f9c7eb authored Nov 12, 2018 by Sean McGivern
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

Gemfile.rails5.lock Gemfile.rails5.lock +1 -1

No files found.
--- a/Gemfile.rails5.lock
+++ b/Gemfile.rails5.lock
@@ -546,7 +546,7 @@ GEM
    orm_adapter (0.5.0)
    os (1.0.0)
    parallel (1.12.1)
-    parser (2.5.1.2)
+    parser (2.5.3.0)
      ast (~> 2.4.0)
    parslet (1.8.2)
    peek (1.0.1)