diff options
| author | Douglas Barbosa Alexandre <dbalexandre@gmail.com> | 2018-11-19 23:04:18 +0000 |
|---|---|---|
| committer | Douglas Barbosa Alexandre <dbalexandre@gmail.com> | 2018-11-19 23:04:18 +0000 |
| commit | 2ef44dae2acea60709320d8b3dcd409a77d8f705 (patch) | |
| tree | fa927738bc3d3ad2491f40867fce6201ed1d772c | |
| parent | ee3f474935336c35abb69485c3592fba7b5bfd98 (diff) | |
| parent | 1ecf0962074a2a46c5e2002c1c235411e91f2577 (diff) | |
| download | gitlab-ce-2ef44dae2acea60709320d8b3dcd409a77d8f705.tar.gz | |
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
| -rw-r--r-- | Gemfile.lock | 6 | ||||
| -rw-r--r-- | Gemfile.rails4.lock | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 975243f31d5..ed518555ebb 100644 --- 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) - sexp_processor (~> 4.1) + ruby_parser (3.11.0) + 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) diff --git a/Gemfile.rails4.lock b/Gemfile.rails4.lock index 657975da2a4..384e90af844 100644 --- 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) - sexp_processor (~> 4.1) + ruby_parser (3.11.0) + 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) |