summaryrefslogtreecommitdiff
path: root/bin/spring
diff options
context:
space:
mode:
authorRobert Speicher <rspeicher@gmail.com>2016-04-22 12:36:47 -0400
committerRobert Speicher <rspeicher@gmail.com>2016-04-22 16:00:56 -0400
commitfdc8b05ab181b809fd7d0fb3b8e8d73fac534fd0 (patch)
treef88b393c3ea7dd828218e9df9d6e1b8c1144643a /bin/spring
parent80893cad672361e62c0c05c2cf9262209bc54fd2 (diff)
downloadgitlab-ce-fdc8b05ab181b809fd7d0fb3b8e8d73fac534fd0.tar.gz
Re-generate Spring binstubs for updated version of Spring
Prevents output like this: Array values in the parameter are deprecated. Please use a String or nil. An Array was passed in from bin/rspec:3:in `load'
Diffstat (limited to 'bin/spring')
-rwxr-xr-xbin/spring12
1 files changed, 6 insertions, 6 deletions
diff --git a/bin/spring b/bin/spring
index 7b45d374fcd..7fe232c3aae 100755
--- a/bin/spring
+++ b/bin/spring
@@ -4,12 +4,12 @@
# It gets overwritten when you run the `spring binstub` command.
unless defined?(Spring)
- require "rubygems"
- require "bundler"
+ require 'rubygems'
+ require 'bundler'
- 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"
+ if (match = Bundler.default_lockfile.read.match(/^GEM$.*?^ (?: )*spring \((.*?)\)$.*?^$/m))
+ Gem.paths = { 'GEM_PATH' => [Bundler.bundle_path.to_s, *Gem.path].uniq.join(Gem.path_separator) }
+ gem 'spring', match[1]
+ require 'spring/binstub'
end
end