From 88a0ee1870a7ea27998b7f776d96b679cc5087c2 Mon Sep 17 00:00:00 2001 From: Artur Beljajev Date: Wed, 14 Jun 2017 18:07:14 +0300 Subject: [PATCH 1/2] Remove unneeded spring config --- .spring.rb | 2 -- 1 file changed, 2 deletions(-) delete mode 100644 .spring.rb diff --git a/.spring.rb b/.spring.rb deleted file mode 100644 index 48b5ff783..000000000 --- a/.spring.rb +++ /dev/null @@ -1,2 +0,0 @@ -Spring.watch 'config/application.yml' -eee From fcd4858ad7d9cf0fb4a1d25477df9c276899cddf Mon Sep 17 00:00:00 2001 From: Artur Beljajev Date: Wed, 14 Jun 2017 18:07:38 +0300 Subject: [PATCH 2/2] Update spring gem --- Gemfile | 4 ++-- Gemfile.lock | 9 +++++---- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/Gemfile b/Gemfile index cad46d3e8..d2d957656 100644 --- a/Gemfile +++ b/Gemfile @@ -114,8 +114,8 @@ gem 'jquery-ui-rails', '5.0.5' group :development do - gem 'spring', '1.3.6' - gem 'spring-commands-rspec', '1.0.4' + gem 'spring' + gem 'spring-commands-rspec' gem 'rubocop', '0.48.1' # deploy diff --git a/Gemfile.lock b/Gemfile.lock index 8356cec3a..3a1954029 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -232,7 +232,7 @@ GEM httpi (2.4.2) rack socksify - i18n (0.8.1) + i18n (0.8.4) i18n_data (0.7.0) ice_nine (0.11.2) isikukood (0.1.2) @@ -434,7 +434,8 @@ GEM sixarm_ruby_unaccent (1.1.1) slop (3.6.0) socksify (1.7.1) - spring (1.3.6) + spring (2.0.2) + activesupport (>= 4.2) spring-commands-rspec (1.0.4) spring (>= 0.9.1) sprockets (3.7.1) @@ -562,8 +563,8 @@ DEPENDENCIES selectize-rails (= 0.12.1) simplecov simpleidn (= 0.0.7) - spring (= 1.3.6) - spring-commands-rspec (= 1.0.4) + spring + spring-commands-rspec therubyracer (= 0.12.2) turbolinks (= 2.5.3) uglifier (= 2.7.2)