Commit cea4f385 authored by Stan Hu's avatar Stan Hu

Merge branch 'ruby-parser-rb-2-6' into 'master'

Update ruby_parser for ruby 2.6

See merge request gitlab-org/gitlab-ce!28295
parents 9353339c 892cfb86
...@@ -812,7 +812,7 @@ GEM ...@@ -812,7 +812,7 @@ GEM
ruby-progressbar (1.10.0) ruby-progressbar (1.10.0)
ruby-saml (1.7.2) ruby-saml (1.7.2)
nokogiri (>= 1.5.10) nokogiri (>= 1.5.10)
ruby_parser (3.11.0) ruby_parser (3.13.1)
sexp_processor (~> 4.9) sexp_processor (~> 4.9)
rubyntlm (0.6.2) rubyntlm (0.6.2)
rubypants (0.2.0) rubypants (0.2.0)
...@@ -852,7 +852,7 @@ GEM ...@@ -852,7 +852,7 @@ GEM
sentry-raven (2.9.0) sentry-raven (2.9.0)
faraday (>= 0.7.6, < 1.0) faraday (>= 0.7.6, < 1.0)
settingslogic (2.0.9) settingslogic (2.0.9)
sexp_processor (4.11.0) sexp_processor (4.12.0)
sham_rack (1.3.6) sham_rack (1.3.6)
rack rack
shoulda-matchers (3.1.2) shoulda-matchers (3.1.2)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment