Merge branch 'master' into fix-popover-header-sizefix-popover-header-size

1 files changed, 0 insertions, 10 deletions

diff --git a/bin/rake b/bin/rake
index 1362d51e3d6..17240489f64 100755
--- a/bin/rake
+++ b/bin/rake
@@ -1,14 +1,4 @@
 #!/usr/bin/env ruby
-
-# Remove this block when upgraded to rails 5.0.
-if %w[0 false].include?(ENV["RAILS5"])
-  begin
-    load File.expand_path('../spring', __FILE__)
-  rescue LoadError => e
-    raise unless e.message.include?('spring')
-  end
-end
-
 require_relative '../config/boot'
 require 'rake'
 Rake.application.run