Merge branch 'sh-bump-whitequark-parser' into 'master'

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

Merge branch 'sh-bump-whitequark-parser' into 'master'
Upgrade whitequark/parser to 2.5.3.0 See merge request gitlab-org/gitlab-ce!22652
54bb7ad4 · Robert Speicher · 6e743299 · 7fb30b4c · 54bb7ad4
Commit 54bb7ad4 authored Oct 29, 2018 by Robert Speicher
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

Gemfile.lock Gemfile.lock +1 -1

No files found.
--- 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.2)
+    parser (2.5.3.0)
      ast (~> 2.4.0)
    parslet (1.8.2)
    peek (1.0.1)