diff --git a/Gemfile b/Gemfile index c7c2109d76..c778d7528d 100644 --- a/Gemfile +++ b/Gemfile @@ -51,7 +51,7 @@ gem 'rdiscount', '~> 2.2' gem 'react-rails' gem "recaptcha", require: "recaptcha/rails" gem 'responders', '~> 3.0' -gem 'rubocop', '~> 1.13.0', require: false +gem 'rubocop', '~> 1.14.0', require: false gem "ruby-openid", :require => "openid" gem 'sanitize' gem 'sentry-raven' diff --git a/Gemfile.lock b/Gemfile.lock index 50fc84da72..a7eac2c3f9 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -350,7 +350,7 @@ GEM mimemagic (~> 0.3.0) terrapin (~> 0.6.0) parallel (1.20.1) - parser (3.0.1.0) + parser (3.0.1.1) ast (~> 2.4.1) passenger (6.0.8) rack @@ -463,17 +463,17 @@ GEM diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.10.0) rspec-support (3.10.0) - rubocop (1.13.0) + rubocop (1.14.0) parallel (~> 1.10) parser (>= 3.0.0.0) rainbow (>= 2.2.2, < 4.0) regexp_parser (>= 1.8, < 3.0) rexml - rubocop-ast (>= 1.2.0, < 2.0) + rubocop-ast (>= 1.5.0, < 2.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 1.4.0, < 3.0) - rubocop-ast (1.4.1) - parser (>= 2.7.1.5) + rubocop-ast (1.5.0) + parser (>= 3.0.1.1) ruby-openid (2.9.2) ruby-progressbar (1.11.0) ruby2_keywords (0.0.4) @@ -672,7 +672,7 @@ DEPENDENCIES rest-client reverse_markdown rspec - rubocop (~> 1.13.0) + rubocop (~> 1.14.0) ruby-openid sanitize sassc (~> 2.4.0)