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

	Commit message (Expand)	Author	Age	Files	Lines
*	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
* \| \| \|	Merge pull request #15199 from sgrif/sg-types-mysql	Rafael Mendonça França	2014-05-20	1	-69/+11
\|\ \ \ \ \| \|_\|_\|/ \|/\| \| \|
\| * \| \|	Use general types for mysql fields	Sean Griffin	2014-05-20	1	-69/+11
\|/ / /
* \| \|	Merge pull request #15198 from sgrif/sg-delegate-type-cast-mysql	Yves Senn	2014-05-20	6	-53/+72
\|\ \ \ \| \|/ / \|/\| \|
\| * \|	Delegate type_cast to injected type object in mysql	Sean Griffin	2014-05-20	6	-53/+72
\|/ /
* \|	Merge pull request #15197 from sgrif/sg-delegate-type-cast-sqlite3	Yves Senn	2014-05-20	11	-7/+83
\|\ \
\| * \|	Delegate `#type_cast` to injected type objects on SQLite3	Sean Griffin	2014-05-20	11	-7/+83
* \| \|	Merge pull request #14965 from eric-chahin/issue_14824	Matthew Draper	2014-05-20	3	-1/+33
\|\ \ \ \| \|/ / \|/\| \|
\| * \|	Fixed the inferred table name for HABTM within a schema	Eric Chahin	2014-05-20	3	-1/+33
\|/ /
* \|	Merge pull request #15192 from simi/guides-binstubs	Yves Senn	2014-05-20	16	-108/+108
\|\ \
\| * \|	Use generated binstubs in guides examples.	Josef Šimánek	2014-05-20	16	-108/+108
\|/ /
* \|	fix `rake test_sqlite3_mem`.	Yves Senn	2014-05-20	1	-0/+1
* \|	docs, `instantiate` expects `String` keys. [Rafal Piekarski & Yves Senn]	Yves Senn	2014-05-20	2	-4/+15
* \|	Merge pull request #15182 from zuhao/refactor_actionpack_respond_with_test_2	Yves Senn	2014-05-20	1	-4/+10
\|\ \
\| * \|	Add using_resouce_with_json to controller.	Zuhao Wan	2014-05-20	1	-4/+10
* \| \|	Merge pull request #15178 from zuhao/refactor_actionpack_respond_with_test	Yves Senn	2014-05-20	2	-0/+35
\|\ \ \
\| * \| \|	Add ActionController::Renderers.remove.	Zuhao Wan	2014-05-20	2	-0/+35
* \| \| \|	make the AST go from left to right, rather than right to left	Aaron Patterson	2014-05-19	2	-45/+48
\| \|_\|/ \|/\| \|
* \| \|	fix escaping in generation	Aaron Patterson	2014-05-19	1	-1/+7
* \| \|	Revert "Rewrite journey routes formatter for performance"	Aaron Patterson	2014-05-19	2	-28/+43
* \| \|	Merge pull request #15184 from sgrif/sg-remove-timestamp-type	Rafael Mendonça França	2014-05-19	18	-47/+52
\|\ \ \
\| * \| \|	Remove :timestamp column type	Sean Griffin	2014-05-19	18	-47/+52
\|/ / /
* \| \|	Merge pull request #15155 from dskang/digest	Rafael Mendonça França	2014-05-19	7	-23/+47
\|\ \ \
\| * \| \|	Default config.assets.digests to true in development	Dan Kang	2014-05-17	7	-23/+47
\| \|/ /
* \| \|	Fixing test order issues	Rafael Mendonça França	2014-05-19	1	-2/+8
* \| \|	Merge pull request #10798 from jcxplorer/fix-enable_extension-with-table_name...	Rafael Mendonça França	2014-05-19	3	-1/+65
\|\ \ \
\| * \| \|	Fix migrations with enable_extension	Joao Carlos	2013-05-29	3	-1/+65
* \| \| \|	Merge pull request #15158 from sgrif/sg-delegate-type	Yves Senn	2014-05-19	29	-117/+570
\|\ \ \ \ \| \|_\|_\|/ \|/\| \| \|
\| * \| \|	Delegate `Column#type` to the injected type object	Sean Griffin	2014-05-19	29	-117/+570
\|/ / /
* \| \|	test, inline `DeveloperWithAggregate`, which is used by a single test.	Yves Senn	2014-05-19	2	-7/+7
* \| \|	Merge pull request #15168 from eileencodes/return-early-on-delete-and-destroy...	Rafael Mendonça França	2014-05-19	1	-0/+2
\|\ \ \
\| * \| \|	early return on delete and destroy methods	eileencodes	2014-05-18	1	-0/+2
\| \| \|/ \| \|/\|
* \| \|	Merge pull request #14126 from schuetzm/index_option_for_column	Rafael Mendonça França	2014-05-19	3	-6/+28
\|\ \ \
\| * \| \|	Make `:index` in migrations work with all column types	Marc Schütz	2014-05-18	3	-6/+28
\| \|/ /
* \| \|	Merge pull request #15160 from sgrif/sg-destructured-each	Rafael Mendonça França	2014-05-19	1	-4/+4
\|\ \ \
\| * \| \|	Use destructured arguments when looping through pairs	Sean Griffin	2014-05-17	1	-4/+4
* \| \| \|	pg, re-introduce `PostgreSQL::Utils` to unify schema/table extraction.	Yves Senn	2014-05-19	6	-39/+51
* \| \| \|	pg, add missing nodocs for extracted modules.	Yves Senn	2014-05-19	5	-10/+10
* \| \| \|	Merge pull request #14962 from arunagw/aa-fix-rake-activerecord	Yves Senn	2014-05-19	4	-78/+81
\|\ \ \ \
\| * \| \| \|	Reorganize ActiveRecord tasks [Arun Agrawal & Abd ar-Rahman Hamidi]	Arun Agrawal	2014-05-16	4	-78/+81
* \| \| \| \|	pg guide, move introductory sentences into main content. [ci skip]	Yves Senn	2014-05-19	1	-7/+7
* \| \| \| \|	Merge pull request #15156 from sgrif/sg-postgres-timestamps	Yves Senn	2014-05-18	1	-6/+3
\|\ \ \ \ \