diff --git a/Gemfile b/Gemfile index 7b0a2ad9..b5b01ca9 100644 --- a/Gemfile +++ b/Gemfile @@ -41,7 +41,7 @@ gem 'stackprof' gem 'chartkick' gem 'groupdate', '~> 5.0.0', require: true -gem 'rubocop', '~> 0.48.1', require: false, group: :test +gem 'rubocop', '~> 0.49.0', require: false, group: :test gem 'simplecov', require: false, group: :test gem 'blazer', '2.2.1.charcoal', github: 'Charcoal-SE/blazer' diff --git a/Gemfile.lock b/Gemfile.lock index a9752f6a..b81a1236 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -286,6 +286,7 @@ GEM mime-types mimemagic (~> 0.3.0) terrapin (~> 0.6.0) + parallel (1.23.0) parser (2.7.2.0) ast (~> 2.4.1) powerpack (0.1.3) @@ -349,13 +350,14 @@ GEM chunky_png (~> 1.0) rqrcode_core (~> 1.0) rqrcode_core (1.2.0) - rubocop (0.48.1) + 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) safely_block (0.3.0) errbase (>= 0.1.1) @@ -487,7 +489,7 @@ DEPENDENCIES rolify rotp (~> 4.0) rqrcode - rubocop (~> 0.48.1) + rubocop (~> 0.49.0) sass-rails sensible_routes (~> 0.1.2) simplecov