diff options
| author | Douwe Maan <douwe@gitlab.com> | 2017-06-09 21:39:09 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2017-06-09 21:39:09 +0000 |
| commit | ac9c3da00571562b4fec393f471c857a83d3cb9e (patch) | |
| tree | cd7a83561b370c563ca5b14424681c7286f75413 | |
| parent | 34f45cebcf31607def461cfaa3a50831cafb2a6a (diff) | |
| parent | 2b97aa75e40932b38358c70976e19377032a8962 (diff) | |
| download | gitlab-ce-ac9c3da00571562b4fec393f471c857a83d3cb9e.tar.gz | |
Merge branch 'bugfix/upgrade-ruby-parser' into 'master'
Bugfix/upgrade ruby parser
See merge request !11861
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 6 |
2 files changed, 4 insertions, 4 deletions
@@ -259,7 +259,7 @@ gem 'sentry-raven', '~> 2.4.0' gem 'premailer-rails', '~> 1.9.0' # I18n -gem 'ruby_parser', '~> 3.8.4', require: false +gem 'ruby_parser', '~> 3.8', require: false gem 'gettext_i18n_rails', '~> 1.8.0' gem 'gettext_i18n_rails_js', '~> 1.2.0' gem 'gettext', '~> 3.2.2', require: false, group: :development diff --git a/Gemfile.lock b/Gemfile.lock index d34b84df5e6..67f813b764f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -706,7 +706,7 @@ GEM ruby-progressbar (1.8.1) ruby-saml (1.4.1) nokogiri (>= 1.5.10) - ruby_parser (3.8.4) + ruby_parser (3.9.0) sexp_processor (~> 4.1) rubyntlm (0.5.2) rubypants (0.2.0) @@ -739,7 +739,7 @@ GEM sentry-raven (2.4.0) faraday (>= 0.7.6, < 1.0) settingslogic (2.0.9) - sexp_processor (4.8.0) + sexp_processor (4.9.0) sham_rack (1.3.6) rack shoulda-matchers (2.8.0) @@ -1031,7 +1031,7 @@ DEPENDENCIES rubocop-rspec (~> 1.15.0) ruby-fogbugz (~> 0.2.1) ruby-prof (~> 0.16.2) - ruby_parser (~> 3.8.4) + ruby_parser (~> 3.8) rufus-scheduler (~> 3.4) rugged (~> 0.25.1.1) sanitize (~> 2.0) |