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

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge branch 'concerns'	Rafael Mendonça França	2012-08-13	6	-30/+232
\|\
\| *	Add CHANGELOG entry and documentation for Routing Concerns	Rafael Mendonça França	2012-08-13	3	-0/+98
\| *	Extract common controllers to abstract_unit	Rafael Mendonça França	2012-08-13	3	-45/+33
\| *	Implementing Routing Concerns	Rafael Mendonça França	2012-08-13	2	-1/+117
\|/
*	oops, should be directory	Aaron Patterson	2012-08-13	1	-1/+1
*	push header merge down to a private method so that live responses can have th...	Aaron Patterson	2012-08-13	3	-8/+22
*	live response headers can be merged with a hash	Aaron Patterson	2012-08-13	2	-0/+10
*	speed up cache directory creation	Aaron Patterson	2012-08-13	1	-3/+9
*	Merge pull request #7343 from egtann/master	Rafael Mendonça França	2012-08-13	3	-1/+42
\|\
\| *	Add support for start_hour and end_hour options in select_hour helper	Evan Tann	2012-08-13	3	-1/+42
\|/
*	Merge pull request #7338 from sax/master	Aaron Patterson	2012-08-12	2	-3/+23
\|\
\| *	Evented notifications take priority over Timed notifications	Eric Saxby	2012-08-11	2	-3/+23
* \|	Merge pull request #7341 from edward/patch-1	Rafael Mendonça França	2012-08-12	1	-1/+1
\|\ \
\| * \|	Grammar fix in ActionView docs/comments	Edward Ocampo-Gooding	2012-08-12	1	-1/+1
\|/ /
* \|	Merge pull request #7339 from maletor/patch-1	Xavier Noria	2012-08-12	1	-1/+1
\|\ \
\| * \|	Missing closing tag	Ellis Berner	2012-08-12	1	-1/+1
\|/ /
* \|	Merge pull request #6073 from daveyeu/restore-state-on-record-invalid	Rafael Mendonça França	2012-08-11	3	-1/+23
\|\ \ \| \|/ \|/\|
\| *	Restore state on create when ActiveRecord::RecordInvalid is raised	Dave Yeu	2012-08-11	3	-1/+23
\|/
*	Ensure option_html_attributes does not modify the given option hashes	Carlos Antonio da Silva	2012-08-11	2	-1/+10
*	Simplify html attributes generation for options_for_select	Carlos Antonio da Silva	2012-08-11	2	-8/+11
*	Refactor model name logic and make it a real private class method	Carlos Antonio da Silva	2012-08-11	1	-5/+8
*	Sync CHANGELOGs [ci skip]	Rafael Mendonça França	2012-08-11	5	-33/+231
*	Add CHANGELOG entry for #7314	Rafael Mendonça França	2012-08-11	1	-0/+5
*	Merge pull request #7331 from morgoth/changelog-for-engine-table-name-prefix-...	Vijay Dev	2012-08-11	1	-0/+3
\|\
\| *	Added changelog entry for table name prefix fix [ci skip]	Wojciech Wnętrzak	2012-08-11	1	-0/+3
\|/
*	[guides] Add info about CHANGELOGs to contributing guide	Piotr Sarnacki	2012-08-11	1	-0/+25
*	Merge branch 'number-helpers-defaults'	Carlos Antonio da Silva	2012-08-11	6	-36/+191
\|\
\| *	Ensure I18n format values always have precedence over defaults	Carlos Antonio da Silva	2012-08-11	3	-43/+47
\| *	Fallback to :en locale instead of handling a constant with defaults	Carlos Antonio da Silva	2012-08-11	6	-28/+179
\|/
*	Bring back changelog entries for Active Support	Carlos Antonio da Silva	2012-08-11	2	-2/+20
*	Merge pull request #7314 from schneems/schneems/form_for_error	Rafael Mendonça França	2012-08-10	2	-0/+15
\|\
\| *	check for nil or empty record in form_for	schneems	2012-08-10	2	-0/+15
* \|	Merge pull request #7329 from guilleiguaran/move-default-headers-ad-railtie	Rafael Mendonça França	2012-08-10	3	-5/+11
\|\ \
\| * \|	Add doc for config.action_dispatch.default_headers	Guillermo Iguaran	2012-08-10	1	-0/+6
\| * \|	Move AD default_headers configurations to railtie	Guillermo Iguaran	2012-08-10	2	-5/+5
* \| \|	Further refactor build_conditions in route set	Carlos Antonio da Silva	2012-08-10	1	-5/+3
\|/ /
* \|	fixup guides in light of :dependent changes	Jon Leighton	2012-08-10	3	-15/+19
* \|	Use method compilation for association methods	Jon Leighton	2012-08-10	12	-89/+86
* \|	Fix handling SCRIPT_NAME from within mounted engine's	Piotr Sarnacki	2012-08-11	7	-41/+78
* \|	Merge pull request #7321 from bogdan/refactor_routes_set	Santiago Pastorino	2012-08-10	1	-10/+7
\|\ \
\| * \|	RouteSet: refactor internals	Bogdan Gusiev	2012-08-10	1	-10/+7
* \| \|	remove some artifacts of dependent_restrict_raises that I missed	Jon Leighton	2012-08-10	2	-2/+0
* \| \|	DRY up handling of dependent option	Jon Leighton	2012-08-10	5	-63/+22
* \| \|	Unprivatise all the things	Jon Leighton	2012-08-10	7	-170/+156
* \| \|	move dependency logic out of generated methods	Jon Leighton	2012-08-10	7	-65/+64
* \| \|	Clean up dependent option validation.	Jon Leighton	2012-08-10	4	-14/+7
* \| \|	Remove the dependent_restrict_raises option.	Jon Leighton	2012-08-10	12	-141/+87
* \| \|	Merge pull request #7286 from kennyj/fix_7191	Rafael Mendonça França	2012-08-10	2	-13/+28
\|\ \ \
\| * \| \|	Fix #7191. Remove unnecessary transaction when assigning has_one associations.	kennyj	2012-08-08	2	-13/+28
* \| \| \|	Add 'X-Frame-Options' => 'SAMEORIGIN' and 'X-XSS-Protection' => '1; mode=bloc...	Santiago Pastorino	2012-08-10	1	-0/+6