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

	Commit message (Expand)	Author	Age	Files	Lines
*	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
\|\ \ \ \ \ \ \
\| * \| \| \| \| \| \|	Use the generic type map for PostgreSQL OID registrations	Sean Griffin	2014-05-20	3	-45/+31
\| \|/ / / / / /
* \| \| \| \| \| \|	Merge pull request #15204 from sgrif/sg-delegate-predicates	Rafael Mendonça França	2014-05-20	12	-24/+44
\|\ \ \ \ \ \ \ \| \|/ / / / / / \|/\| \| \| \| \| \|
\| * \| \| \| \| \|	Delegate predicate methods to injected type object on Column	Sean Griffin	2014-05-20	12	-24/+44
\|/ / / / / /
* \| \| \| \| \|	remove dead code	Aaron Patterson	2014-05-20	1	-57/+0
* \| \| \| \| \|	cache the formatter on the path object	Aaron Patterson	2014-05-20	2	-2/+6
* \| \| \| \| \|	translate AST to a formatter before url generation	Aaron Patterson	2014-05-20	2	-1/+72
* \| \| \| \| \|	Merge pull request #15200 from sgrif/sg-type-map-mysql	Rafael Mendonça França	2014-05-20	4	-23/+39
\|\ \ \ \ \ \
\| * \| \| \| \| \|	Use the generic type map object for mysql field lookups	Sean Griffin	2014-05-20	4	-23/+39
\|/ / / / / /
* \| \| \| \| \|	Merge pull request #15191 from camsong/master	Yves Senn	2014-05-20	1	-2/+8
\|\ \ \ \ \ \
\| * \| \| \| \| \|	Distinguish rake assets:clobber from rake assets:clean	cam song	2014-05-20	1	-2/+5
* \| \| \| \| \| \|	Merge pull request #15203 from sgrif/sg-delegate-type-cast	Rafael Mendonça França	2014-05-20	7	-75/+7
\|\ \ \ \ \ \ \
\| * \| \| \| \| \| \|	Replace `type_cast` case statement with delegation	Sean Griffin	2014-05-20	7	-75/+7
* \| \| \| \| \| \| \|	Merge pull request #15187 from v-yarotsky/fix_confusing_delegation_exception	Rafael Mendonça França	2014-05-20	3	-26/+20
\|\ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \|	Fix confusing exception in ActiveSupport delegation	Vladimir Yarotsky	2014-05-20	3	-26/+20
* \| \| \| \| \| \| \| \|	prepopulate the dispatch cache so we don't need the ThreadSafe cache.	Aaron Patterson	2014-05-20	1	-7/+9
* \| \| \| \| \| \| \| \|	make the each visitor top-down left-right	Aaron Patterson	2014-05-20	1	-1/+1
* \| \| \| \| \| \| \| \|	Merge pull request #15201 from sgrif/sg-types-postgresql	Rafael Mendonça França	2014-05-20	4	-151/+85
\|\ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \|	Have Postgres OID types inherit from general types	Sean Griffin	2014-05-20	4	-151/+85
* \| \| \| \| \| \| \| \| \|	fix multiple hash preloads. Fixes #14994	Aaron Patterson	2014-05-20	2	-6/+14