diff --git a/Gemfile b/Gemfile index 24d64eaf19a..4c79d5f3a80 100644 --- a/Gemfile +++ b/Gemfile @@ -187,7 +187,7 @@ group :development do gem 'thin' gem 'faker' gem 'quiet_assets' - gem 'rubocop', '~> 0.28' + gem 'rubocop', '~> 0.32' end group :development, :test do diff --git a/Gemfile.lock b/Gemfile.lock index 6d1faff9239..abc9941f816 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -289,11 +289,11 @@ GEM omniauth (1.2.1) hashie (>= 1.2, < 3) rack (~> 1.0) - parser (2.2.0.2) + parser (2.2.2.5) ast (>= 1.1, < 3.0) pg (0.17.1) polyglot (0.3.5) - powerpack (0.0.9) + powerpack (0.1.1) prototype-rails (3.2.1) rails (~> 3.2) pry (0.9.12.6) @@ -401,10 +401,10 @@ GEM rspec-mocks (~> 3.2.0) rspec-support (~> 3.2.0) rspec-support (3.2.0) - rubocop (0.28.0) + rubocop (0.32.1) astrolabe (~> 1.3) - parser (>= 2.2.0.pre.7, < 3.0) - powerpack (~> 0.0.6) + parser (>= 2.2.2.5, < 3.0) + powerpack (~> 0.1) rainbow (>= 1.99.1, < 3.0) ruby-progressbar (~> 1.4) ruby-duration (3.2.0) @@ -412,7 +412,7 @@ GEM i18n iso8601 ruby-prof (0.13.0) - ruby-progressbar (1.7.1) + ruby-progressbar (1.7.5) rubytree (0.8.3) json (>= 1.7.5) structured_warnings (>= 0.1.3) @@ -553,7 +553,7 @@ DEPENDENCIES rspec-example_disabler! rspec-legacy_formatters rspec-rails (~> 3.2.0) - rubocop (~> 0.28) + rubocop (~> 0.32) ruby-duration (~> 3.2.0) ruby-prof ruby-progressbar @@ -576,3 +576,6 @@ DEPENDENCIES warden (~> 1.2) warden-basic_auth (~> 0.2.0) will_paginate (~> 3.0) + +BUNDLED WITH + 1.10.4