diff --git a/Gemfile b/Gemfile index 2b8bcc65f7..6d4cf42ff3 100644 --- a/Gemfile +++ b/Gemfile @@ -78,7 +78,7 @@ gem 'capybara', :group => :test gem 'webmock', :group => :test gem 'launchy', :group => :test -gem 'rubocop', '0.39.0', :group => :development +gem 'rubocop', '0.49.0', :group => :development gem 'pry', :group => :development gem 'pry-nav', :group => :development # gem 'xray-rails', :group => :development diff --git a/Gemfile.lock b/Gemfile.lock index ac0ef70885..59d95c621d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -205,6 +205,7 @@ GEM mini_portile2 (~> 2.4.0) openseadragon (0.6.0) rails (> 3.2.0) + parallel (1.20.1) parser (2.7.2.0) ast (~> 2.4.1) passenger (6.0.8) @@ -253,7 +254,7 @@ GEM thor (>= 0.18.1, < 2.0) rainbow (2.2.2) rake - rake (13.0.3) + rake (13.0.6) rb-fsevent (0.11.0) rb-inotify (0.10.1) ffi (~> 1.0) @@ -285,13 +286,14 @@ GEM rspec-mocks (~> 3.10) rspec-support (~> 3.10) rspec-support (3.10.2) - rubocop (0.39.0) - parser (>= 2.3.0.7, < 3.0) + rubocop (0.49.0) + parallel (~> 1.10) + parser (>= 2.3.3.1, < 3.0) powerpack (~> 0.1) rainbow (>= 1.99.1, < 3.0) ruby-progressbar (~> 1.7) unicode-display_width (~> 1.0, >= 1.0.1) - ruby-progressbar (1.11.0) + ruby-progressbar (1.13.0) ruby2_keywords (0.0.5) rubyzip (1.3.0) sass (3.7.4) @@ -338,7 +340,7 @@ GEM thread_safe (~> 0.1) uglifier (4.2.0) execjs (>= 0.3.0, < 3) - unicode-display_width (1.7.0) + unicode-display_width (1.8.0) webmock (3.13.0) addressable (>= 2.3.6) crack (>= 0.3.2) @@ -384,7 +386,7 @@ DEPENDENCIES rsolr rspec rspec-rails - rubocop (= 0.39.0) + rubocop (= 0.49.0) rubyzip (~> 1.3.0) sass-rails (~> 5.0.7) sdoc (~> 0.4.0)