diff options
| -rw-r--r-- | railties/CHANGELOG | 2 | ||||
| -rw-r--r-- | railties/Rakefile | 4 | ||||
| -rw-r--r-- | railties/html/favicon.ico | 0 | ||||
| -rw-r--r-- | railties/lib/rails_generator/generators/applications/app/app_generator.rb | 2 |
4 files changed, 6 insertions, 2 deletions
diff --git a/railties/CHANGELOG b/railties/CHANGELOG index 8a5d3c926c..f6ae399f42 100644 --- a/railties/CHANGELOG +++ b/railties/CHANGELOG @@ -1,5 +1,7 @@ *SVN* +* Added an empty favicon.ico file to the public directory of new applications (so the logs are not spammed by its absence) + * Fixed that scaffold generator new template should use local variable instead of instance variable #778 [Dan Peterson] * Allow unit tests to run on a remote server for PostgreSQL #781 [adamm@galacticasoftware.com] diff --git a/railties/Rakefile b/railties/Rakefile index b54673ef3b..5523359191 100644 --- a/railties/Rakefile +++ b/railties/Rakefile @@ -20,7 +20,7 @@ PUBLIC_DIRS = %w( images javascripts stylesheets ) TEST_DIRS = %w( fixtures unit functional mocks mocks/development mocks/test ) LOG_FILES = %w( server.log development.log test.log production.log ) -HTML_FILES = %w( 404.html 500.html index.html ) +HTML_FILES = %w( 404.html 500.html index.html favicon.ico ) BIN_FILES = %w( generate destroy breakpointer console server update ) VENDOR_LIBS = %w( actionpack activerecord actionmailer activesupport actionwebservice railties ) @@ -267,4 +267,4 @@ desc "Publish the API documentation" task :pgem => [:gem] do Rake::SshFilePublisher.new("davidhh@comox.textdrive.com", "public_html/gems/gems", "pkg", "#{PKG_FILE_NAME}.gem").upload `ssh davidhh@comox.textdrive.com './gemupdate.sh'` -end +end
\ No newline at end of file diff --git a/railties/html/favicon.ico b/railties/html/favicon.ico new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/railties/html/favicon.ico diff --git a/railties/lib/rails_generator/generators/applications/app/app_generator.rb b/railties/lib/rails_generator/generators/applications/app/app_generator.rb index dc731c4e3f..b0876c1820 100644 --- a/railties/lib/rails_generator/generators/applications/app/app_generator.rb +++ b/railties/lib/rails_generator/generators/applications/app/app_generator.rb @@ -65,6 +65,8 @@ class AppGenerator < Rails::Generator::Base %w(404 500 index).each do |file| m.template "html/#{file}.html", "public/#{file}.html" end + + m.template "html/favicon.ico", "public/favicon.ico" # Docs m.file "doc/README_FOR_APP", "doc/README_FOR_APP" |