kotovalexarian-likes-github/rails--rails
1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00
Code Releases Activity

Fix changelog

Browse source
This commit is contained in:
David Heinemeier Hansson 2012-12-18 16:32:11 +01:00
parent 09aeee7247
commit 15c40b2ef5
1 changed files with 1 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
railties/CHANGELOG.md
View file

@ -1,14 +1,12 @@
## Rails 4.0.0 (unreleased) ## ## Rails 4.0.0 (unreleased) ##
<<<<<<< HEAD
* Add app/models/concerns and app/controllers/concerns to the default directory structure and load path *DHH* * Add app/models/concerns and app/controllers/concerns to the default directory structure and load path *DHH*
See http://37signals.com/svn/posts/3372-put-chubby-models-on-a-diet-with-concerns for usage instructions. See http://37signals.com/svn/posts/3372-put-chubby-models-on-a-diet-with-concerns for usage instructions.
=======
* The `rails/info/routes` now correctly formats routing output as an html table. * The `rails/info/routes` now correctly formats routing output as an html table.
*Richard Schneeman* *Richard Schneeman*
>>>>>>> f6d0eda918756bf56e2c05afcaaabda723487017
* The `public/index.html` is no longer generated for new projects. * The `public/index.html` is no longer generated for new projects.
Page is replaced by internal `welcome_controller` inside of railties. Page is replaced by internal `welcome_controller` inside of railties.