diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2012-12-09 19:05:00 -0800 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2012-12-09 19:05:00 -0800 |
| commit | 05e6123653b7ceb98960403ec40788b3f34e3efd (patch) | |
| tree | 3501b9071d2fceab292cf30e2fa08411581ef659 /railties/lib | |
| parent | 8110035623b6a2415d9160f98ab1c9816c5c325c (diff) | |
| parent | e073b038b7eb27f3dd18aa1edbd5a0b7e76b6476 (diff) | |
| download | rails-05e6123653b7ceb98960403ec40788b3f34e3efd.tar.gz rails-05e6123653b7ceb98960403ec40788b3f34e3efd.tar.bz2 rails-05e6123653b7ceb98960403ec40788b3f34e3efd.zip | |
Merge pull request #8472 from schneems/schneems/expand_path
Use `File.expand_path` instead of `File.join`
Diffstat (limited to 'railties/lib')
| -rw-r--r-- | railties/lib/rails/info_controller.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/railties/lib/rails/info_controller.rb b/railties/lib/rails/info_controller.rb index e94c6a2030..fe1e25d88c 100644 --- a/railties/lib/rails/info_controller.rb +++ b/railties/lib/rails/info_controller.rb @@ -1,7 +1,7 @@ require 'action_dispatch/routing/inspector' class Rails::InfoController < ActionController::Base - self.view_paths = File.join(File.dirname(__FILE__), 'templates') + self.view_paths = File.expand_path('../templates', __FILE__) layout 'application' before_filter :require_local! |