diff options
| author | Clement Ho <ClemMakesApps@gmail.com> | 2018-12-28 14:52:43 -0600 |
|---|---|---|
| committer | Clement Ho <ClemMakesApps@gmail.com> | 2018-12-28 14:52:43 -0600 |
| commit | c9d7514fd8d46b0de126fb9d6d081ec25bd3c5bb (patch) | |
| tree | 417386f11b8c9f44bfac861659603281d302f614 /bin/rails | |
| parent | 77e1a9b0f8757109ca7f7a4398c46fe8d1d45dbe (diff) | |
| parent | e962baf4417e59cbb2ef8621ef0662f93f180f92 (diff) | |
| download | gitlab-ce-fix-popover-header-size.tar.gz | |
Merge branch 'master' into fix-popover-header-sizefix-popover-header-size
Diffstat (limited to 'bin/rails')
| -rwxr-xr-x | bin/rails | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/bin/rails b/bin/rails index d21b64b3007..07396602377 100755 --- a/bin/rails +++ b/bin/rails @@ -1,14 +1,4 @@ #!/usr/bin/env ruby - -# Remove this block when upgraded to rails 5.0. -if %w[0 false].include?(ENV["RAILS5"]) - begin - load File.expand_path('../spring', __FILE__) - rescue LoadError => e - raise unless e.message.include?('spring') - end -end - APP_PATH = File.expand_path('../config/application', __dir__) require_relative '../config/boot' require 'rails/commands' |