diff --git a/Gemfile b/Gemfile index 47de8e1a5b476..8f0a034e071a7 100644 --- a/Gemfile +++ b/Gemfile @@ -148,7 +148,7 @@ group :development, :test do gem "rubocop", "~> 1.22", require: false # Automatic Ruby code style checking tool gem "rubocop-performance", "~> 1.12", require: false # A collection of RuboCop cops to check for performance optimizations in Ruby code gem "rubocop-rails", "~> 2.12", require: false # Automatic Rails code style checking tool - gem "rubocop-rspec", "~> 2.5", require: false # Code style checking for RSpec files + gem "rubocop-rspec", "~> 2.11", require: false # Code style checking for RSpec files gem "sassc-rails", "~> 2.1.2" # Integrate SassC-Ruby into Rails gem "spring", "~> 3.0" # Preloads your application so things like console, rake and tests run faster gem "spring-commands-rspec", "~> 1.0" # rspec command for spring diff --git a/Gemfile.lock b/Gemfile.lock index 6adb119d0e3bd..ab678a0814622 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -535,7 +535,7 @@ GEM rack orm_adapter (0.5.0) parallel (1.21.0) - parser (3.0.2.0) + parser (3.1.2.0) ast (~> 2.4.1) patron (0.13.3) pg (1.2.3) @@ -604,7 +604,7 @@ GEM method_source rake (>= 0.13) thor (~> 1.0) - rainbow (3.0.0) + rainbow (3.1.1) rake (13.0.6) ransack (2.4.2) activerecord (>= 5.2.4) @@ -633,7 +633,7 @@ GEM redis-store (>= 1.2, < 2) redis-store (1.9.0) redis (>= 4, < 5) - regexp_parser (2.1.1) + regexp_parser (2.4.0) request_store (1.5.0) rack (>= 1.4) responders (3.0.1) @@ -692,8 +692,8 @@ GEM rubocop-ast (>= 1.12.0, < 2.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 1.4.0, < 3.0) - rubocop-ast (1.12.0) - parser (>= 3.0.1.1) + rubocop-ast (1.18.0) + parser (>= 3.1.1.0) rubocop-performance (1.12.0) rubocop (>= 1.7.0, < 2.0) rubocop-ast (>= 0.4.0) @@ -701,7 +701,7 @@ GEM activesupport (>= 4.2.0) rack (>= 1.1) rubocop (>= 1.7.0, < 2.0) - rubocop-rspec (2.5.0) + rubocop-rspec (2.11.1) rubocop (~> 1.19) ruby-next-core (0.12.0) ruby-prof (1.4.3) @@ -998,7 +998,7 @@ DEPENDENCIES rubocop (~> 1.22) rubocop-performance (~> 1.12) rubocop-rails (~> 2.12) - rubocop-rspec (~> 2.5) + rubocop-rspec (~> 2.11) ruby-prof (~> 1.4) rubyzip (~> 2.3) s3_direct_upload (~> 0.1) diff --git a/vendor/cache/parser-3.0.2.0.gem b/vendor/cache/parser-3.0.2.0.gem deleted file mode 100644 index ee615aaa86b8d..0000000000000 Binary files a/vendor/cache/parser-3.0.2.0.gem and /dev/null differ diff --git a/vendor/cache/parser-3.1.2.0.gem b/vendor/cache/parser-3.1.2.0.gem new file mode 100644 index 0000000000000..d2ce30ac250d7 Binary files /dev/null and b/vendor/cache/parser-3.1.2.0.gem differ diff --git a/vendor/cache/rainbow-3.0.0.gem b/vendor/cache/rainbow-3.0.0.gem deleted file mode 100644 index c53caf7afa806..0000000000000 Binary files a/vendor/cache/rainbow-3.0.0.gem and /dev/null differ diff --git a/vendor/cache/rainbow-3.1.1.gem b/vendor/cache/rainbow-3.1.1.gem new file mode 100644 index 0000000000000..863181a2e77bc Binary files /dev/null and b/vendor/cache/rainbow-3.1.1.gem differ diff --git a/vendor/cache/regexp_parser-2.1.1.gem b/vendor/cache/regexp_parser-2.1.1.gem deleted file mode 100644 index 4bb25a0eeb83c..0000000000000 Binary files a/vendor/cache/regexp_parser-2.1.1.gem and /dev/null differ diff --git a/vendor/cache/regexp_parser-2.4.0.gem b/vendor/cache/regexp_parser-2.4.0.gem new file mode 100644 index 0000000000000..72f755dcc1615 Binary files /dev/null and b/vendor/cache/regexp_parser-2.4.0.gem differ diff --git a/vendor/cache/rubocop-ast-1.12.0.gem b/vendor/cache/rubocop-ast-1.12.0.gem deleted file mode 100644 index efa3bccc85999..0000000000000 Binary files a/vendor/cache/rubocop-ast-1.12.0.gem and /dev/null differ diff --git a/vendor/cache/rubocop-ast-1.18.0.gem b/vendor/cache/rubocop-ast-1.18.0.gem new file mode 100644 index 0000000000000..acebf655966b8 Binary files /dev/null and b/vendor/cache/rubocop-ast-1.18.0.gem differ diff --git a/vendor/cache/rubocop-rspec-2.11.1.gem b/vendor/cache/rubocop-rspec-2.11.1.gem new file mode 100644 index 0000000000000..49ed783197dd4 Binary files /dev/null and b/vendor/cache/rubocop-rspec-2.11.1.gem differ diff --git a/vendor/cache/rubocop-rspec-2.5.0.gem b/vendor/cache/rubocop-rspec-2.5.0.gem deleted file mode 100644 index 77b51cda28e94..0000000000000 Binary files a/vendor/cache/rubocop-rspec-2.5.0.gem and /dev/null differ