diff options
| author | José Valim <jose.valim@gmail.com> | 2010-01-23 02:03:11 +0100 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2010-01-23 02:03:11 +0100 |
| commit | 4eab3aad8d256b868390b739b075bd38661339b2 (patch) | |
| tree | 71fdb380573b2550cf70ecca8a685368355ecf47 /railties/lib/rails/engine.rb | |
| parent | 98240c49b05093d6d14b9384a9bd695b58eefb59 (diff) | |
| download | rails-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/engine.rb')
| -rw-r--r-- | railties/lib/rails/engine.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/railties/lib/rails/engine.rb b/railties/lib/rails/engine.rb index 93f39f176c..03c78b6d4b 100644 --- a/railties/lib/rails/engine.rb +++ b/railties/lib/rails/engine.rb @@ -77,12 +77,12 @@ module Rails initializer :add_routing_files do |app| config.paths.config.routes.to_a.each do |route| - app.route_configuration_files << route if File.exists?(route) + app.route_configuration_files.unshift(route) if File.exists?(route) end end initializer :add_locales do - config.i18n.load_path.concat(config.paths.config.locales.to_a) + config.i18n.load_path.unshift(*config.paths.config.locales.to_a) end initializer :add_view_paths do |