update rubocop to 0.48.1. We still want to match Code Climate though

This commit is contained in:
Devin Howard 2018-01-20 13:36:07 -08:00
parent 4313f6eff8
commit 4f94123f3e
2 changed files with 12 additions and 11 deletions

View file

@ -51,7 +51,7 @@ group :development, :test do
gem 'faker'
gem 'pry-byebug'
gem 'pry-rails'
gem 'rubocop', '~> 0.46.0' # match code climate https://github.com/tootsuite/mastodon/issues/1758
gem 'rubocop', '~> 0.48' # match code climate https://github.com/tootsuite/mastodon/issues/1758
gem 'timecop'
gem 'tunemygc'
end

View file

@ -166,8 +166,9 @@ GEM
cocaine (~> 0.5.5)
mime-types
mimemagic (~> 0.3.0)
parser (2.4.0.0)
ast (~> 2.2)
parallel (1.12.1)
parser (2.4.0.2)
ast (~> 2.3)
pg (0.21.0)
powerpack (0.1.1)
pry (0.10.4)
@ -213,9 +214,8 @@ GEM
method_source
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
rainbow (2.2.2)
rake
rake (12.0.0)
rainbow (3.0.0)
rake (12.3.0)
rb-fsevent (0.10.2)
rb-inotify (0.9.10)
ffi (>= 0.5.0, < 2)
@ -240,10 +240,11 @@ GEM
rspec-mocks (~> 3.6.0)
rspec-support (~> 3.6.0)
rspec-support (3.6.0)
rubocop (0.46.0)
parser (>= 2.3.1.1, < 3.0)
rubocop (0.52.1)
parallel (~> 1.10)
parser (>= 2.4.0.2, < 3.0)
powerpack (~> 0.1)
rainbow (>= 1.99.1, < 3.0)
rainbow (>= 2.2.2, < 4.0)
ruby-progressbar (~> 1.7)
unicode-display_width (~> 1.0, >= 1.0.1)
ruby-progressbar (1.9.0)
@ -331,7 +332,7 @@ DEPENDENCIES
rails (~> 5.0.0)
redis (~> 3.3.3)
rspec-rails
rubocop (~> 0.46.0)
rubocop (~> 0.48)
sass-rails
shoulda-matchers
simplecov
@ -346,4 +347,4 @@ RUBY VERSION
ruby 2.3.0p0
BUNDLED WITH
1.15.4
1.16.1