mirror of
https://github.com/rails/rails.git
synced 2022-11-09 12:12:34 -05:00
cleanup
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4764 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
This commit is contained in:
parent
7678d123a7
commit
5f3486c0b4
1 changed files with 0 additions and 1 deletions
|
@ -8,7 +8,6 @@
|
|||
|
||||
* Tweak RoutingError message to show option diffs, not just missing named route significant keys. [Rick Olson]
|
||||
|
||||
>>>>>>> .r4761
|
||||
* Invoke method_missing directly on hidden actions. Closes #3030. [Nicholas Seckar]
|
||||
|
||||
* Require Tempfile explicitly for TestUploadedFile due to changes in class auto loading. [Rick Olson]
|
||||
|
|
Loading…
Reference in a new issue