summaryrefslogtreecommitdiff
path: root/bin/spring
diff options
context:
space:
mode:
authorRobert Speicher <rspeicher@gmail.com>2015-05-20 18:39:33 -0400
committerRobert Speicher <rspeicher@gmail.com>2015-05-20 18:39:33 -0400
commit3601ebda79b84c3ea4b21f0e2b91003f206c342a (patch)
tree9d427a76ed905080dc11f694c53954effe8af511 /bin/spring
parent71b1a2c7287f0838cdcaeb5a896d582cddfea5d1 (diff)
downloadgitlab-ce-3601ebda79b84c3ea4b21f0e2b91003f206c342a.tar.gz
Update spring, re-run binstubs
Diffstat (limited to 'bin/spring')
-rwxr-xr-xbin/spring11
1 files changed, 4 insertions, 7 deletions
diff --git a/bin/spring b/bin/spring
index 253ec37c345..7b45d374fcd 100755
--- a/bin/spring
+++ b/bin/spring
@@ -1,17 +1,14 @@
#!/usr/bin/env ruby
-# This file loads spring without using Bundler, in order to be fast
-# It gets overwritten when you run the `spring binstub` command
+# 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)
require "rubygems"
require "bundler"
- if match = Bundler.default_lockfile.read.match(/^GEM$.*?^ spring \((.*?)\)$.*?^$/m)
- ENV["GEM_PATH"] = ([Bundler.bundle_path.to_s] + Gem.path).join(File::PATH_SEPARATOR)
- ENV["GEM_HOME"] = ""
- Gem.paths = ENV
-
+ if match = Bundler.default_lockfile.read.match(/^GEM$.*?^ (?: )*spring \((.*?)\)$.*?^$/m)
+ Gem.paths = { "GEM_PATH" => [Bundler.bundle_path.to_s, *Gem.path].uniq }
gem "spring", match[1]
require "spring/binstub"
end