diff options
| author | Ryan Garver <ragarver@gmail.com> | 2012-10-04 08:13:12 -0700 |
|---|---|---|
| committer | Ryan Garver <ragarver@gmail.com> | 2012-10-04 08:13:12 -0700 |
| commit | 1f3a8c873ed9b3fc8eb41ae775a570b95ebdf715 (patch) | |
| tree | 7dad02bf5f727d327fae9ccac1c2007dc4641be1 /railties/lib/rails.rb | |
| parent | 4cb50a3f571234b1202f9a0dffe39b445ecf807d (diff) | |
| parent | d7d228402efd1ddbbdb2b15d2e91ec22693b9298 (diff) | |
| download | rails-1f3a8c873ed9b3fc8eb41ae775a570b95ebdf715.tar.gz rails-1f3a8c873ed9b3fc8eb41ae775a570b95ebdf715.tar.bz2 rails-1f3a8c873ed9b3fc8eb41ae775a570b95ebdf715.zip | |
Merge branch 'master' into feature/public-fragment_name_with_digest
Diffstat (limited to 'railties/lib/rails.rb')
| -rw-r--r-- | railties/lib/rails.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/railties/lib/rails.rb b/railties/lib/rails.rb index a15965a9da..d7e22cc839 100644 --- a/railties/lib/rails.rb +++ b/railties/lib/rails.rb @@ -127,7 +127,7 @@ module Rails end def public_path - application && application.paths["public"].first + application && Pathname.new(application.paths["public"].first) end end end |