diff options
| author | José Valim <jose.valim@gmail.com> | 2011-11-27 07:12:15 -0800 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2011-11-27 07:12:15 -0800 |
| commit | e7e046fa1ca66a3f6edf0731ca64d6529a749790 (patch) | |
| tree | a985da4e7d6968e876c1ccf548312ec2a0cb5613 | |
| parent | ee8db25e64df7fa5870781957dcdc67fa2a1d8e1 (diff) | |
| parent | 78ad94aaa7b70fee6c8f49de04f26d4ec14fa162 (diff) | |
| download | rails-e7e046fa1ca66a3f6edf0731ca64d6529a749790.tar.gz rails-e7e046fa1ca66a3f6edf0731ca64d6529a749790.tar.bz2 rails-e7e046fa1ca66a3f6edf0731ca64d6529a749790.zip | |
Merge pull request #3769 from kennyj/fix_index_html
avoid url started with "/" for the rails.png in public/index.html
| -rw-r--r-- | railties/lib/rails/generators/rails/app/templates/public/index.html | 2 | ||||
| -rw-r--r-- | railties/test/generators/app_generator_test.rb | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/railties/lib/rails/generators/rails/app/templates/public/index.html b/railties/lib/rails/generators/rails/app/templates/public/index.html index 9d9811a5bf..a1d50995c5 100644 --- a/railties/lib/rails/generators/rails/app/templates/public/index.html +++ b/railties/lib/rails/generators/rails/app/templates/public/index.html @@ -59,7 +59,7 @@ #header { - background-image: url("/assets/rails.png"); + background-image: url("assets/rails.png"); background-repeat: no-repeat; background-position: top left; height: 64px; diff --git a/railties/test/generators/app_generator_test.rb b/railties/test/generators/app_generator_test.rb index a1bd2fbaa5..235c08e38e 100644 --- a/railties/test/generators/app_generator_test.rb +++ b/railties/test/generators/app_generator_test.rb @@ -55,6 +55,7 @@ class AppGeneratorTest < Rails::Generators::TestCase assert_file "app/views/layouts/application.html.erb", /javascript_include_tag\s+"application"/ assert_file "app/assets/stylesheets/application.css" assert_file "config/application.rb", /config\.assets\.enabled = true/ + assert_file "public/index.html", /url\("assets\/rails.png"\);/ end def test_invalid_application_name_raises_an_error |