aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Get rid of the underscore versions of attribute methods!Jon Leighton2011-12-016-6/+40
* Don't rely on underscore-prefixed attribute methods.Jon Leighton2011-12-013-48/+80
* Remove unnecessary *argsJon Leighton2011-12-011-2/+2
* Merge branch 'exceptions' with the following features:José Valim2011-12-0116-254/+406
|\
| * Remove unnecessary test setup.José Valim2011-12-011-6/+1
| * Split and improve show and debug exceptions middlewares.José Valim2011-12-014-89/+145
| * Split ShowExceptions responsibilities in two middlewares.José Valim2011-12-0110-95/+130
| * Add a deprecation to old show exceptions API (even though it was not public).José Valim2011-12-011-0/+14
| * Add an ExceptionWrapper that wraps an exception and provide convenience helpers.José Valim2011-12-015-77/+104
| * Allow rescue responses to be configured through a railtie.José Valim2011-12-016-30/+55
* | Revert "Added ActiveRecord::Base#last_modified to work with the new fresh_whe...David Heinemeier Hansson2011-12-014-12/+4
* | Added ActiveRecord::Base#last_modified to work with the new fresh_when/stale?...David Heinemeier Hansson2011-12-014-4/+12
* | Allow fresh_when/stale? to take a record instead of an options hash [DHH]David Heinemeier Hansson2011-12-013-4/+97
|/
* Update CHANGELOG.José Valim2011-12-011-1/+3
* Merge pull request #3660 from jdelStrother/asset_protocolJosé Valim2011-12-012-2/+22
|\
| * Leave default_asset_host_protocol unsetJonathan del Strother2011-12-012-2/+22
|/
* Merge pull request #3823 from avakhov/av-length-validation-exception-msg-fixJosé Valim2011-11-301-1/+1
|\
| * Fix argument error message for length validationAlexey Vakhov2011-12-011-1/+1
|/
* Add hackery to make Syck use encode_with/init_with. Fixes 1.8 after recent ch...Jon Leighton2011-12-012-0/+25
* don't alter global state in testJon Leighton2011-11-301-2/+3
* If the table behind has no primary key, do not ask again and just return nil.Julius de Bruijn2011-11-302-1/+7
* consistencyJon Leighton2011-11-303-16/+16
* Don't check column type, you might implement a custom coder that serializes t...Jon Leighton2011-11-301-1/+1
* omg computer science!Jon Leighton2011-11-304-29/+47
* Fix typoJon Leighton2011-11-301-2/+2
* Don't need second paramJon Leighton2011-11-302-4/+4
* No longer need to undef id as we are defining it ourselvesJon Leighton2011-11-301-3/+0
* Move some serialization stuff out of BaseJon Leighton2011-11-302-40/+42
* Extract attribute serialization code into a separate moduleJon Leighton2011-11-304-28/+49
* Use inheritance to avoid special-case code for the 'id' methodJon Leighton2011-11-304-9/+21
* #id is an alias for whatever the primary key isJon Leighton2011-11-301-1/+1
* fix indentJon Leighton2011-11-301-3/+3
* expand on pluck docsVijay Dev2011-12-011-3/+18
* minor typo fixVijay Dev2011-12-012-2/+2
* s/is is/isVijay Dev2011-12-011-1/+1
* Merge pull request #3816 from lest/exception-page-utf-8Yehuda Katz2011-11-302-12/+35
|\
| * fix exception page when template contains utf-8 and parameters contain utf-8lest2011-11-302-12/+35
* | Merge pull request #3786 from nashby/add-namespace-to-formVijay Dev2011-11-301-1/+1
|\ \
| * | update guidesVasiliy Ermolovich2011-11-281-1/+1
* | | fix bad nodocsVijay Dev2011-12-011-11/+21
| |/ |/|
* | switch WatchStack to use composition, tighten up APIAaron Patterson2011-11-301-6/+13
* | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2011-11-309-14/+21
|\ \
| * | Fixing incorrect documentation Aviv Ben-Yosef2011-11-301-2/+2
| * | Fix ActionDispatch::Request method explanationsTravis Pew2011-11-281-5/+5
| * | there is no need to repeat about possibility of using -h option to get full helpSergey Parizhskiy2011-11-281-1/+1
| * | Merge branch 'master' of github.com:lifo/docrailsSergey Parizhskiy2011-11-28159-1812/+2855
| |\ \
| | * | Update information about foreign key plugins support in the guidesRodrigo Rosenfeld Rosas2011-11-281-1/+1
| | * | Revert "fixed typo in getting started form_for for comments"Arun Agrawal2011-11-281-1/+1
| | * | fixed typo in getting started form_for for commentsTim Reischmann2011-11-281-1/+1
| | * | Update Object#in? description for https://github.com/rails/rails/pull/3767Tadas Tamošauskas2011-11-271-1/+3