summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStan Hu <stanhu@gmail.com>2019-05-13 19:27:17 +0000
committerStan Hu <stanhu@gmail.com>2019-05-13 19:27:17 +0000
commitcea4f38529ef535a14de2a73e1a6e613b88dc924 (patch)
tree4443c40975ba6e2c4a2a7565205147026cfcc2da
parent9353339ca639f47d8c1fee151e76abc0acd3b077 (diff)
parent892cfb867abfa0f66ea00f1c8f0253a37d1fac92 (diff)
downloadgitlab-ce-cea4f38529ef535a14de2a73e1a6e613b88dc924.tar.gz
Merge branch 'ruby-parser-rb-2-6' into 'master'
Update ruby_parser for ruby 2.6 See merge request gitlab-org/gitlab-ce!28295
-rw-r--r--Gemfile.lock4
1 files changed, 2 insertions, 2 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index 2be35efe1da..1bd88b65124 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -812,7 +812,7 @@ GEM
ruby-progressbar (1.10.0)
ruby-saml (1.7.2)
nokogiri (>= 1.5.10)
- ruby_parser (3.11.0)
+ ruby_parser (3.13.1)
sexp_processor (~> 4.9)
rubyntlm (0.6.2)
rubypants (0.2.0)
@@ -852,7 +852,7 @@ GEM
sentry-raven (2.9.0)
faraday (>= 0.7.6, < 1.0)
settingslogic (2.0.9)
- sexp_processor (4.11.0)
+ sexp_processor (4.12.0)
sham_rack (1.3.6)
rack
shoulda-matchers (3.1.2)