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

Bump parser gem to 2.5.1.0 to remove warning in rspec See merge request gitlab-org/gitlab-ce!18384

Merge branch 'sh-bump-parser-gem' into 'master'
6680b6be · Robert Speicher · cf7a3da4 · 0089a452 · 6680b6be
Commit 6680b6be authored Apr 16, 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
@@ -590,7 +590,7 @@ GEM
    orm_adapter (0.5.0)
    os (0.9.6)
    parallel (1.12.1)
-    parser (2.5.0.5)
+    parser (2.5.1.0)
      ast (~> 2.4.0)
    parslet (1.5.0)
      blankslate (~> 2.0)