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

Bump ruby_parser to 3.11.0 for Ruby 2.5 compatibility See merge request gitlab-org/gitlab-ce!23209

Merge branch 'sh-bump-ruby-parser' into 'master'
Bump ruby_parser to 3.11.0 for Ruby 2.5 compatibility See merge request gitlab-org/gitlab-ce!23209
2ef44dae · Douglas Barbosa Alexandre · ee3f4749 · 1ecf0962 · 2ef44dae · 2ef44dae
Commit 2ef44dae authored Nov 19, 2018 by Douglas Barbosa Alexandre
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 6 deletions

Gemfile.lock Gemfile.lock +3 -3

Gemfile.rails4.lock Gemfile.rails4.lock +3 -3

No files found.
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -767,8 +767,8 @@ GEM
    ruby-progressbar (1.9.0)
    ruby-saml (1.7.2)
      nokogiri (>= 1.5.10)
-    ruby_parser (3.9.0)
+    ruby_parser (3.11.0)
-      sexp_processor (~> 4.1)
+      sexp_processor (~> 4.9)
    rubyntlm (0.6.2)
    rubypants (0.2.0)
    rubyzip (1.2.2)
@@ -808,7 +808,7 @@ GEM
    sentry-raven (2.7.2)
      faraday (>= 0.7.6, < 1.0)
    settingslogic (2.0.9)
-    sexp_processor (4.9.0)
+    sexp_processor (4.11.0)
    sham_rack (1.3.6)
      rack
    shoulda-matchers (3.1.2)

--- a/Gemfile.rails4.lock
+++ b/Gemfile.rails4.lock
@@ -759,8 +759,8 @@ GEM
    ruby-progressbar (1.9.0)
    ruby-saml (1.7.2)
      nokogiri (>= 1.5.10)
-    ruby_parser (3.9.0)
+    ruby_parser (3.11.0)
-      sexp_processor (~> 4.1)
+      sexp_processor (~> 4.9)
    rubyntlm (0.6.2)
    rubypants (0.2.0)
    rubyzip (1.2.2)
@@ -800,7 +800,7 @@ GEM
    sentry-raven (2.7.2)
      faraday (>= 0.7.6, < 1.0)
    settingslogic (2.0.9)
-    sexp_processor (4.9.0)
+    sexp_processor (4.11.0)
    sham_rack (1.3.6)
      rack
    shoulda-matchers (3.1.2)