summaryrefslogtreecommitdiff
path: root/bin/rails
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/rails
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/rails')
-rwxr-xr-xbin/rails5
1 files changed, 5 insertions, 0 deletions
diff --git a/bin/rails b/bin/rails
index 5191e6927af..0138d79b751 100755
--- a/bin/rails
+++ b/bin/rails
@@ -1,4 +1,9 @@
#!/usr/bin/env ruby
+begin
+ load File.expand_path('../spring', __FILE__)
+rescue LoadError => e
+ raise unless e.message.include?('spring')
+end
APP_PATH = File.expand_path('../../config/application', __FILE__)
require_relative '../config/boot'
require 'rails/commands'