rails.git - Mirror of official rails repo with custom fixes.

	Commit message (Expand)	Author	Age	Files	Lines
*	Add test for read_attribute(:id) with non-standard PK.	Jon Leighton	2011-12-01	3	-4/+23
*	Remove the need for type_cast_attribute.	Jon Leighton	2011-12-01	5	-43/+52
*	Fix up test altering global state that was causing me grief	Jon Leighton	2011-12-01	1	-2/+4
*	Get rid of the underscore versions of attribute methods!	Jon Leighton	2011-12-01	6	-6/+40
*	Don't rely on underscore-prefixed attribute methods.	Jon Leighton	2011-12-01	3	-48/+80
*	Remove unnecessary *args	Jon Leighton	2011-12-01	1	-2/+2
*	Merge branch 'exceptions' with the following features:	José Valim	2011-12-01	16	-254/+406
\|\
\| *	Remove unnecessary test setup.	José Valim	2011-12-01	1	-6/+1
\| *	Split and improve show and debug exceptions middlewares.	José Valim	2011-12-01	4	-89/+145
\| *	Split ShowExceptions responsibilities in two middlewares.	José Valim	2011-12-01	10	-95/+130
\| *	Add a deprecation to old show exceptions API (even though it was not public).	José Valim	2011-12-01	1	-0/+14
\| *	Add an ExceptionWrapper that wraps an exception and provide convenience helpers.	José Valim	2011-12-01	5	-77/+104
\| *	Allow rescue responses to be configured through a railtie.	José Valim	2011-12-01	6	-30/+55
* \|	Revert "Added ActiveRecord::Base#last_modified to work with the new fresh_whe...	David Heinemeier Hansson	2011-12-01	4	-12/+4
* \|	Added ActiveRecord::Base#last_modified to work with the new fresh_when/stale?...	David Heinemeier Hansson	2011-12-01	4	-4/+12
* \|	Allow fresh_when/stale? to take a record instead of an options hash [DHH]	David Heinemeier Hansson	2011-12-01	3	-4/+97
\|/
*	Update CHANGELOG.	José Valim	2011-12-01	1	-1/+3
*	Merge pull request #3660 from jdelStrother/asset_protocol	José Valim	2011-12-01	2	-2/+22
\|\
\| *	Leave default_asset_host_protocol unset	Jonathan del Strother	2011-12-01	2	-2/+22
\|/
*	Merge pull request #3823 from avakhov/av-length-validation-exception-msg-fix	José Valim	2011-11-30	1	-1/+1
\|\
\| *	Fix argument error message for length validation	Alexey Vakhov	2011-12-01	1	-1/+1
\|/
*	Add hackery to make Syck use encode_with/init_with. Fixes 1.8 after recent ch...	Jon Leighton	2011-12-01	2	-0/+25
*	don't alter global state in test	Jon Leighton	2011-11-30	1	-2/+3
*	If the table behind has no primary key, do not ask again and just return nil.	Julius de Bruijn	2011-11-30	2	-1/+7
*	consistency	Jon Leighton	2011-11-30	3	-16/+16
*	Don't check column type, you might implement a custom coder that serializes t...	Jon Leighton	2011-11-30	1	-1/+1
*	omg computer science!	Jon Leighton	2011-11-30	4	-29/+47
*	Fix typo	Jon Leighton	2011-11-30	1	-2/+2
*	Don't need second param	Jon Leighton	2011-11-30	2	-4/+4
*	No longer need to undef id as we are defining it ourselves	Jon Leighton	2011-11-30	1	-3/+0
*	Move some serialization stuff out of Base	Jon Leighton	2011-11-30	2	-40/+42
*	Extract attribute serialization code into a separate module	Jon Leighton	2011-11-30	4	-28/+49
*	Use inheritance to avoid special-case code for the 'id' method	Jon Leighton	2011-11-30	4	-9/+21
*	#id is an alias for whatever the primary key is	Jon Leighton	2011-11-30	1	-1/+1
*	fix indent	Jon Leighton	2011-11-30	1	-3/+3
*	expand on pluck docs	Vijay Dev	2011-12-01	1	-3/+18
*	minor typo fix	Vijay Dev	2011-12-01	2	-2/+2
*	s/is is/is	Vijay Dev	2011-12-01	1	-1/+1
*	Merge pull request #3816 from lest/exception-page-utf-8	Yehuda Katz	2011-11-30	2	-12/+35
\|\
\| *	fix exception page when template contains utf-8 and parameters contain utf-8	lest	2011-11-30	2	-12/+35
* \|	Merge pull request #3786 from nashby/add-namespace-to-form	Vijay Dev	2011-11-30	1	-1/+1
\|\ \
\| * \|	update guides	Vasiliy Ermolovich	2011-11-28	1	-1/+1
* \| \|	fix bad nodocs	Vijay Dev	2011-12-01	1	-11/+21
\| \|/ \|/\|
* \|	switch WatchStack to use composition, tighten up API	Aaron Patterson	2011-11-30	1	-6/+13
* \|	Merge branch 'master' of github.com:lifo/docrails	Vijay Dev	2011-11-30	9	-14/+21
\|\ \
\| * \|	Fixing incorrect documentation	Aviv Ben-Yosef	2011-11-30	1	-2/+2
\| * \|	Fix ActionDispatch::Request method explanations	Travis Pew	2011-11-28	1	-5/+5
\| * \|	there is no need to repeat about possibility of using -h option to get full help	Sergey Parizhskiy	2011-11-28	1	-1/+1
\| * \|	Merge branch 'master' of github.com:lifo/docrails	Sergey Parizhskiy	2011-11-28	159	-1812/+2855
\| \|\ \
\| \| * \|	Update information about foreign key plugins support in the guides	Rodrigo Rosenfeld Rosas	2011-11-28	1	-1/+1