Commit 6c292e90 authored by Douwe Maan's avatar Douwe Maan

Merge branch 'make-spring-optional' into 'master'

Make spring optional

Require to `ENABLE_SPRING=1` to use spring. This assumes that you use binstubs from `bin/` which is true in most cases.

cc @jacobvosmaer-gitlab 

See merge request !4752
parents 8c2697ea 7b523eb1
......@@ -3,7 +3,7 @@
# This file loads spring without using Bundler, in order to be fast.
# It gets overwritten when you run the `spring binstub` command.
unless defined?(Spring)
unless (defined?(Spring) || ENV['ENABLE_SPRING'] != '1') && File.basename($0) != 'spring'
require 'rubygems'
require 'bundler'
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment