mirror of
https://github.com/rails/rails.git
synced 2022-11-09 12:12:34 -05:00
Resolved the conflict
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5407 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
This commit is contained in:
parent
88d9b32496
commit
4559840a32
1 changed files with 4 additions and 0 deletions
|
@ -2,6 +2,10 @@
|
|||
|
||||
* Update dependencies to allow constants to be defined alongside their siblings. A common case for this is AR model classes with STI; user.rb might define User, Administrator and Guest for example. [Nicholas Seckar]
|
||||
|
||||
* next_week respects DST changes. #6483 [marclove]
|
||||
|
||||
* Update dependencies to allow constants to be defined alongside their siblings. A common case for this is AR model classes with STI; user.rb might define User, Administrator and Guest for example. [Nicholas Seckar]
|
||||
|
||||
* next_week respects DST changes. #6483, #5617, #2353, #2509, #4551 [marclove, rabiedenharn, rails@roetzel.de, jsolson@damogran.org, drbrain@segment7.net]
|
||||
|
||||
* Expose methods added to Enumerable in the documentation, such as group_by. Closes #6170. [sergeykojin@gmail.com, Marcel Molina Jr.]
|
||||
|
|
Loading…
Reference in a new issue