From 0c272d8adfb070949eb4262e852496f33b3f39ae Mon Sep 17 00:00:00 2001 From: Kamil Trzcinski Date: Tue, 21 Jun 2016 11:35:13 +0200 Subject: [PATCH 1/2] Make spring to monitor all config files --- config/spring.rb | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 config/spring.rb diff --git a/config/spring.rb b/config/spring.rb new file mode 100644 index 000000000000..d6a88796c544 --- /dev/null +++ b/config/spring.rb @@ -0,0 +1,3 @@ +Dir.glob(File.join('config', '*.yml')).each do |file| + Spring.watch file +end -- GitLab From 3eab0f4a81d3c337099dd657922c8725e8c637c6 Mon Sep 17 00:00:00 2001 From: Kamil Trzcinski Date: Tue, 21 Jun 2016 11:35:52 +0200 Subject: [PATCH 2/2] Add workaround for https://github.com/rails/spring/pull/484 --- config/initializers/spring.rb | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 config/initializers/spring.rb diff --git a/config/initializers/spring.rb b/config/initializers/spring.rb new file mode 100644 index 000000000000..380f8556fc5b --- /dev/null +++ b/config/initializers/spring.rb @@ -0,0 +1,6 @@ +if Rails.env.development? || Rails.env.test? + Thread.abort_on_exception = false + Thread.send(:define_method, :abort_on_exception) do |value| + puts "Ignoring Thread.abort_on_exception change to #{value}" + end +end -- GitLab