aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib/rails.rb
diff options
context:
space:
mode:
authorJosé Valim <jose.valim@gmail.com>2010-01-23 02:03:11 +0100
committerJosé Valim <jose.valim@gmail.com>2010-01-23 02:03:11 +0100
commit4eab3aad8d256b868390b739b075bd38661339b2 (patch)
tree71fdb380573b2550cf70ecca8a685368355ecf47 /railties/lib/rails.rb
parent98240c49b05093d6d14b9384a9bd695b58eefb59 (diff)
downloadrails-4eab3aad8d256b868390b739b075bd38661339b2.tar.gz
rails-4eab3aad8d256b868390b739b075bd38661339b2.tar.bz2
rails-4eab3aad8d256b868390b739b075bd38661339b2.zip
Ensure user set load paths have higher preference and move Bootstrap inside Application.
Diffstat (limited to 'railties/lib/rails.rb')
-rw-r--r--railties/lib/rails.rb1
1 files changed, 0 insertions, 1 deletions
diff --git a/railties/lib/rails.rb b/railties/lib/rails.rb
index e3aa9e4c97..29afb672b6 100644
--- a/railties/lib/rails.rb
+++ b/railties/lib/rails.rb
@@ -8,7 +8,6 @@ require 'rails/initializable'
require 'rails/railtie'
require 'rails/plugin'
require 'rails/engine'
-require 'rails/bootstrap'
require 'rails/application'
require 'rails/railties_path'
require 'rails/version'