diff options
| author | Douwe Maan <douwe@selenight.nl> | 2016-04-23 12:27:09 +0200 |
|---|---|---|
| committer | Douwe Maan <douwe@selenight.nl> | 2016-04-23 12:27:09 +0200 |
| commit | 952e2dc6d9cfacf223345bd34dacb0d34d3fdeca (patch) | |
| tree | 9e1db5aedd40687d61ad837448794b9d7a611e0a /bin/rails | |
| parent | 7910853368970292eb243ee34072c7f527fa67f2 (diff) | |
| parent | 7acea6bde9dbffafc99401eb0d7bb748c1f06d3f (diff) | |
| download | gitlab-ce-952e2dc6d9cfacf223345bd34dacb0d34d3fdeca.tar.gz | |
Merge branch 'master' into eReGeBe/gitlab-ce-feature/milestone-md
Diffstat (limited to 'bin/rails')
| -rwxr-xr-x | bin/rails | 5 |
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' |