aboutsummaryrefslogtreecommitdiffstats
path: root/railties
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@loudthinking.com>2012-08-07 11:17:50 -0500
committerDavid Heinemeier Hansson <david@loudthinking.com>2012-08-07 11:18:00 -0500
commitfb883318c8b82b3570cee022ddf6886f9052245d (patch)
tree403fa97aacda853bd06b309accd88bfb6b49ac96 /railties
parent46b8bceedd3e47169c50a04c93161424909c75fb (diff)
downloadrails-fb883318c8b82b3570cee022ddf6886f9052245d.tar.gz
rails-fb883318c8b82b3570cee022ddf6886f9052245d.tar.bz2
rails-fb883318c8b82b3570cee022ddf6886f9052245d.zip
Revert "The application generator generates `public/humans.txt` with some basic data". I dont consider this something most people is going to want most of the time. If you want to add it in your own app, knock yourself out. But it doesnt belong in Rails imo
Diffstat (limited to 'railties')
-rw-r--r--railties/CHANGELOG.md2
-rw-r--r--railties/lib/rails/generators/rails/app/templates/public/humans.txt.tt7
-rw-r--r--railties/test/generators/app_generator_test.rb5
3 files changed, 0 insertions, 14 deletions
diff --git a/railties/CHANGELOG.md b/railties/CHANGELOG.md
index 5165d9401f..18c130e828 100644
--- a/railties/CHANGELOG.md
+++ b/railties/CHANGELOG.md
@@ -31,8 +31,6 @@
* Load all environments available in `config.paths["config/environments"]`. *Piotr Sarnacki*
-* The application generator generates `public/humans.txt` with some basic data. *Paul Campbell*
-
* Add `config.queue_consumer` to allow the default consumer to be configurable. *Carlos Antonio da Silva*
* Add Rails.queue as an interface with a default implementation that consumes jobs in a separate thread. *Yehuda Katz*
diff --git a/railties/lib/rails/generators/rails/app/templates/public/humans.txt.tt b/railties/lib/rails/generators/rails/app/templates/public/humans.txt.tt
deleted file mode 100644
index f081e08b6c..0000000000
--- a/railties/lib/rails/generators/rails/app/templates/public/humans.txt.tt
+++ /dev/null
@@ -1,7 +0,0 @@
-# See more about this file at: http://humanstxt.org/
-# For format suggestions, see: http://humanstxt.org/Standard.html
-/* TEAM */
-
-/* APP */
- Name: <%= app_const_base %>
- Software: Ruby on Rails
diff --git a/railties/test/generators/app_generator_test.rb b/railties/test/generators/app_generator_test.rb
index 5534476a6d..907065f75c 100644
--- a/railties/test/generators/app_generator_test.rb
+++ b/railties/test/generators/app_generator_test.rb
@@ -377,11 +377,6 @@ class AppGeneratorTest < Rails::Generators::TestCase
assert_no_match(/run bundle install/, output)
end
- def test_humans_txt_file
- run_generator [File.join(destination_root, 'things-43')]
- assert_file "things-43/public/humans.txt", /Name: Things43/, /Software: Ruby on Rails/
- end
-
protected
def action(*args, &block)