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

	Commit message (Expand)	Author	Age	Files	Lines
*	make variable name more clear	Aaron Patterson	2014-05-21	1	-2/+2
*	do not mutate parameters, let the caller do mutations	Aaron Patterson	2014-05-21	2	-4/+6
*	push the formatter up to the Route object	Aaron Patterson	2014-05-21	2	-4/+4
*	Merge pull request #15231 from khusnetdinov/fix_typo_guides_active_support_in...	Guillermo Iguaran	2014-05-21	1	-1/+1
\|\
\| *	Fix typo guides/source/active_support_instrumentation.md	Marat Khusnetdinov	2014-05-22	1	-1/+1
* \|	Merge pull request #15229 from peeyushsingla/master	Rafael Mendonça França	2014-05-21	1	-2/+2
\|\ \
\| * \|	fixes in active record query for reorder	peeyush	2014-05-21	1	-2/+2
* \| \|	Merge pull request #15227 from sgrif/sg-rename-oid-type	Rafael Mendonça França	2014-05-21	2	-15/+5
\|\ \ \ \| \|/ / \|/\| \|
\| * \|	Rename `oid_type` to `cast_type` to make PG columns consistent	Sean Griffin	2014-05-21	2	-15/+5
\|/ /
* \|	Merge pull request #15219 from sgrif/sg-missing-nodoc	Rafael Mendonça França	2014-05-21	1	-3/+3
\|\ \
\| * \|	Add missing nodocs to MySQL adapter	Sean Griffin	2014-05-21	1	-3/+3
* \| \|	Merge pull request #14613 from Sirupsen/fix-serialize-update-column	Rafael Mendonça França	2014-05-21	4	-14/+51
\|\ \ \
\| * \| \|	Fix serialized field returning serialized data after update_column	Simon Eskildsen	2014-04-05	4	-14/+51
* \| \| \|	Revert "Merge pull request #14544 from jefflai2/named_scope_sti"	Rafael Mendonça França	2014-05-21	8	-42/+5
* \| \| \|	Merge pull request #15221 from laurelfan/doc-fix-redirecting	Arthur Nogueira Neves	2014-05-21	1	-4/+8
\|\ \ \ \ \| \|_\|/ / \|/\| \| \|
\| * \| \|	fix formatting and text for ActionController::Redirecting doc	Laurel Fan	2014-05-21	1	-4/+8
* \| \| \|	build fix, use lambda syntax that ruby 1.9.3 understands.	Yves Senn	2014-05-21	1	-1/+1
* \| \| \|	push `extract_scale` to the `Type`.	Yves Senn	2014-05-21	4	-7/+9
* \| \| \|	pg, extract money tests into separate file.	Yves Senn	2014-05-21	2	-35/+55
* \| \| \|	Merge pull request #14855 from laurocaetano/fix_polymorphic_with_string_key	Yves Senn	2014-05-21	5	-4/+50
\|\ \ \ \
\| * \| \| \|	Fix polymorphic eager load with foreign_key as String.	Lauro Caetano	2014-05-20	5	-2/+42
\|/ / / /
* \| \| \|	Merge pull request #15213 from tgxworld/remove_redundant_code	Rafael Mendonça França	2014-05-20	1	-3/+2
\|\ \ \ \
\| * \| \| \|	Remove redundant code.	Guo Xiang Tan	2014-05-20	1	-3/+2
* \| \| \| \|	Merge pull request #10887 from sakuro/deep_transform_keys_in_nested_arrays	Rafael Mendonça França	2014-05-20	3	-16/+67
\|\ \ \ \ \ \| \|_\|/ / / \|/\| \| \| \|
\| * \| \| \|	Hash#deep_*_keys(!) recurse into nested arrays.	OZAWA Sakuro	2013-06-08	3	-16/+67
* \| \| \| \|	Merge pull request #14544 from jefflai2/named_scope_sti	Rafael Mendonça França	2014-05-20	8	-5/+42
\|\ \ \ \ \
\| * \| \| \| \|	Fixes Issue #13466.	Jefferson Lai	2014-04-23	8	-5/+42
* \| \| \| \| \|	Merge pull request #15205 from sgrif/sg-delegate-klass	Rafael Mendonça França	2014-05-20	9	-14/+33
\|\ \ \ \ \ \
\| * \| \| \| \| \|	Delegate `klass` to the injected type object	Sean Griffin	2014-05-20	9	-14/+33
* \| \| \| \| \| \|	Merge pull request #14979 from brocktimus/master	Rafael Mendonça França	2014-05-20	3	-1/+16
\|\ \ \ \ \ \ \
\| * \| \| \| \| \| \|	Prevented belongs_to: touch propagating up if there are no changes being saved	Brock Trappitt	2014-05-21	3	-1/+16
* \| \| \| \| \| \| \|	Revert "Revert "Merge pull request #8313 from alan/only_save_changed_has_one_...	Rafael Mendonça França	2014-05-20	3	-8/+22
\|/ / / / / / /
* \| \| \| \| \| \|	Merge pull request #15154 from msgehard/move_password_field	Rafael Mendonça França	2014-05-20	1	-2/+2
\|\ \ \ \ \ \ \
\| * \| \| \| \| \| \|	Put attr_reader in with all of the other instance methods	Mike Gehard	2014-05-17	1	-2/+2
* \| \| \| \| \| \| \|	we don't use this parameter for anything, so rm	Aaron Patterson	2014-05-20	3	-22/+21
* \| \| \| \| \| \| \|	fewer string allocations per url_for	Aaron Patterson	2014-05-20	1	-7/+5
* \| \| \| \| \| \| \|	mutate the path string to avoid object allocations	Aaron Patterson	2014-05-20	1	-4/+4
* \| \| \| \| \| \| \|	push only_path conditional up	Aaron Patterson	2014-05-20	1	-18/+19
* \| \| \| \| \| \| \|	push arg checking up	Aaron Patterson	2014-05-20	1	-4/+4
* \| \| \| \| \| \| \|	fewer method calls and string garbage when there is no user/password	Aaron Patterson	2014-05-20	1	-9/+5
* \| \| \| \| \| \| \|	fewer hash allocations when calling url_for	Aaron Patterson	2014-05-20	1	-9/+12
* \| \| \| \| \| \| \|	fix variable names, only pass hashes to the positional args method	Aaron Patterson	2014-05-20	1	-8/+10
\| \|/ / / / / / \|/\| \| \| \| \| \|
* \| \| \| \| \| \|	Merge pull request #15208 from sgrif/sg-delegate-type-cast-for-write	Rafael Mendonça França	2014-05-20	4	-30/+14
\|\ \ \ \ \ \ \
\| * \| \| \| \| \| \|	Delegate `type_cast_for_write` to injected type object	Sean Griffin	2014-05-20	4	-30/+14
* \| \| \| \| \| \| \|	Merge pull request #11346 from tomykaira/fix_10257	Rafael Mendonça França	2014-05-20	2	-2/+21
\|\ \ \ \ \ \ \ \ \| \|/ / / / / / / \|/\| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Run login_procedure only when the auth_scheme is valid	tomykaira	2013-07-08	1	-7/+14
\| * \| \| \| \| \| \|	Check authentication scheme in Basic auth	tomykaira	2013-07-07	2	-1/+13
* \| \| \| \| \| \| \|	Merge pull request #15207 from sgrif/sg-inline-column-helpers	Rafael Mendonça França	2014-05-20	10	-120/+77
\|\ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \|	Inline typecasting helpers from Column to the appropriate types	Sean Griffin	2014-05-20	10	-120/+77
* \| \| \| \| \| \| \| \|	Merge pull request #15206 from sgrif/sg-type-map-postgresql	Rafael Mendonça França	2014-05-20	3	-45/+31
\|\ \ \ \ \ \ \ \ \