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

	Commit message (Collapse)	Author	Age	Files	Lines
...
\| * \| \| \| \| \| \| \|	Put attr_reader in with all of the other instance methods	Mike Gehard	2014-05-17	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This makes the grouping make a little more sense
* \| \| \| \| \| \| \| \|	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
\| * \| \| \| \| \| \| \|	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
\|\ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / \|/\| \| \| \| \| \| \| \|	Check authentication scheme in Basic auth
\| * \| \| \| \| \| \| \|	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
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	`authenticate_with_http_basic` and its families should check the authentication schema is "Basic". Different schema, such as OAuth2 Bearer should be rejected by basic auth, but it was passing as the test shows. This fixes #10257.
* \| \| \| \| \| \| \| \|	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
\| * \| \| \| \| \| \| \| \|	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
\| * \| \| \| \| \| \| \| \| \|	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
\| * \| \| \| \| \| \| \| \|	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
\| * \| \| \| \| \| \| \| \|	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 [ci skip]
\| * \| \| \| \| \| \| \| \|	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
\| * \| \| \| \| \| \| \| \| \|	Replace `type_cast` case statement with delegation	Sean Griffin	2014-05-20	7	-75/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	All subclasses of column were now delegating `type_cast` to their injected type object. We can remove the overriding methods, and generalize it on the `Column` class itself. This also enabled us to remove several column classes completely, as they no longer had any meaningful behavior of their own.
* \| \| \| \| \| \| \| \| \| \|	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
\| * \| \| \| \| \| \| \| \| \| \|	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
\| * \| \| \| \| \| \| \| \| \| \| \|	Have Postgres OID types inherit from general types	Sean Griffin	2014-05-20	4	-151/+85
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Using general types where possible. Several more can go away once infinity gets figured out.
* \| \| \| \| \| \| \| \| \| \| \| \|	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
\| * \| \| \| \| \| \| \| \| \| \| \|	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
\| * \| \| \| \| \| \| \| \| \| \|	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
\| * \| \| \| \| \| \| \| \| \| \|	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 of a HABTM auxiliar
\| * \| \| \| \| \| \| \| \| \| \|	Fixed the inferred table name for HABTM within a schema	Eric Chahin	2014-05-20	3	-1/+33
\|/ / / / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes #14824.
* \| \| \| \| \| \| \| \| \| \|	Merge pull request #15192 from simi/guides-binstubs	Yves Senn	2014-05-20	16	-108/+108
\|\ \ \ \ \ \ \ \ \ \ \ \| \|_\|/ / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \|	Use generated binstubs in guides examples. [ci skip]
\| * \| \| \| \| \| \| \| \| \|	Use generated binstubs in guides examples.	Josef Šimánek	2014-05-20	16	-108/+108
\|/ / / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
* \| \| \| \| \| \| \| \| \|	fix `rake test_sqlite3_mem`.	Yves Senn	2014-05-20	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	While running Sqlite3 memory tests I encountered the following error: ``` Finished in 69.416366s, 58.0267 runs/s, 162.3681 assertions/s. 1) Error: ActiveRecord::Migration::ChangeSchemaTest#test_add_column_with_timestamp_type: NoMethodError: undefined method `type' for nil:NilClass /Users/senny/Projects/rails/activerecord/test/cases/migration/change_schema_test.rb:244:in `test_add_column_with_timestamp_type' 4028 runs, 11271 assertions, 0 failures, 1 errors, 1 skips ``` This was because the table `testings` was used in multiple test-cases. This resulted in a wrongly cached schema on `ActiveRecord::Base.schema_chae`. /cc @zuhao
* \| \| \| \| \| \| \| \| \|	docs, `instantiate` expects `String` keys. [Rafal Piekarski & Yves Senn]	Yves Senn	2014-05-20	2	-4/+15
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #15122 Closes #15107
* \| \| \| \| \| \| \| \| \|	Merge pull request #15182 from zuhao/refactor_actionpack_respond_with_test_2	Yves Senn	2014-05-20	1	-4/+10
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Un-define :to_json for Customer class after stubbing.
\| * \| \| \| \| \| \| \| \| \|	Add using_resouce_with_json to controller.	Zuhao Wan	2014-05-20	1	-4/+10
\| \| \| \| \| \| \| \| \| \| \|