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

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge pull request #7253 from acapilleri/lenght_validator_errors_options	Rafael Mendonça França	2012-08-03	1	-2/+2
\|\
\| *	calculate errors_options one time in validate_each	Angelo Capilleri	2012-08-03	1	-2/+2
* \|	Add test select_tag escapes prompt	Santiago Pastorino	2012-08-03	1	-0/+6
* \|	Use content_tag here instead of manually building HTML	Santiago Pastorino	2012-08-03	1	-2/+6
* \|	Don't eager load all this	Santiago Pastorino	2012-08-03	1	-32/+33
* \|	Remove ActiveRecord::Base.to_a	Jon Leighton	2012-08-03	18	-64/+55
* \|	reinstate changelog that seems to have been accidentally deleted o_O	Jon Leighton	2012-08-03	1	-0/+19
* \|	Allow Relation#merge to take a proc.	Jon Leighton	2012-08-03	3	-2/+37
* \|	make sure the body finishes rendering before checking response closure	Aaron Patterson	2012-08-03	1	-1/+2
* \|	Merge pull request #7231 from armanddp/no_content	Rafael Mendonça França	2012-08-02	3	-8/+38
\|\ \
\| * \|	Collapsed dual checks (one for content headers and one for content) into a si...	Armand du Plessis	2012-08-02	3	-8/+38
* \| \|	Remove `:rails_env` task since it is not needed anymore.	Rafael Mendonça França	2012-08-02	2	-16/+9
\|/ /
* \|	Merge pull request #7240 from steveklabnik/fix_2301	Rafael Mendonça França	2012-08-02	3	-4/+7
\|\ \
\| * \|	Changelog entry for Digest Auth fix (#2301)	Steve Klabnik	2012-08-02	1	-0/+2
\| * \|	Fix for digest authentication bug - issue #2301 in rails/rails	Arthur Smith	2012-08-02	2	-4/+5
* \| \|	load active_support/deprecation in active_support/rails	Xavier Noria	2012-08-02	20	-19/+4
* \| \|	load active_support/core_ext/module/delegation in active_support/rails	Xavier Noria	2012-08-02	17	-16/+3
* \| \|	load active_support/core_ext/class/attribute in active_support/rails	Xavier Noria	2012-08-02	32	-34/+6
* \| \|	load active_support/concern in active_support/rails	Xavier Noria	2012-08-02	17	-16/+3
* \| \|	load active_support/dependencies/autoload in active_support/rails	Xavier Noria	2012-08-02	3	-2/+3
* \| \|	load active_support/core_ext/object/inclusion in active_support/rails	Xavier Noria	2012-08-02	26	-25/+4
* \| \|	load active_support/core_ext/object/blank in active_support/rails	Xavier Noria	2012-08-02	55	-54/+2
* \| \|	defines a private require-hub active_support/rails	Xavier Noria	2012-08-02	8	-0/+16
* \| \|	Check validity of options[:as] just once	José Valim	2012-08-02	1	-12/+18
* \| \|	Merge pull request #7129 from kennyj/fix_7079	José Valim	2012-08-02	2	-7/+19
\|\ \ \ \| \|/ / \|/\| \|
\| * \|	Improve error handling when using partial name with hyphen. Fix #7079	kennyj	2012-08-03	2	-7/+19
* \| \|	Fix tests.	Rafael Mendonça França	2012-08-02	1	-2/+2
* \| \|	Do not consider the numeric attribute as changed if the old value is	Rafael Mendonça França	2012-08-02	2	-2/+15
\|/ /
* \|	s/scoped/scope/	Jon Leighton	2012-08-01	9	-27/+33
* \|	Add CollectionProxy#scope	Jon Leighton	2012-08-01	3	-1/+30
* \|	Use explicit delegations	Jon Leighton	2012-08-01	1	-119/+79
* \|	Refactor a bit	Jon Leighton	2012-08-01	1	-38/+37
* \|	Add `Relation#load`	Jon Leighton	2012-08-01	3	-2/+35
* \|	Deprecate :finder_sql, :counter_sql, :insert_sql, :delete_sql.	Jon Leighton	2012-08-01	9	-45/+118
* \|	Revert "Remove :finder_sql, :counter_sql, :insert_sql, :delete_sql."	Jon Leighton	2012-08-01	15	-84/+339
* \|	Merge pull request #7217 from freerobby/no_password_requirement_if_validation...	Carlos Antonio da Silva	2012-08-01	3	-2/+21
\|\ \
\| * \|	has_secure_password should not raise a 'digest missing' error if the calling ...	Robby Grossman	2012-07-31	3	-2/+21
* \| \|	Merge pull request #7228 from kennyj/move_to_ar2	Carlos Antonio da Silva	2012-08-01	1	-1/+1
\|\ \ \
\| * \| \|	Change AR's CHANGELOG, because it is related to e35c67ae0f920011a2440210041e9...	kennyj	2012-08-02	1	-1/+1
\|/ / /
* \| \|	Merge pull request #7224 from kennyj/move_to_ar	José Valim	2012-08-01	2	-17/+22
\|\ \ \
\| * \| \|	The use_schema_cache_dump configuration moved to ActiveRecord.	kennyj	2012-08-02	2	-17/+22
* \| \| \|	Merge branch 'refactor-dependency-check'	Carlos Antonio da Silva	2012-08-01	4	-21/+23
\|\ \ \ \
\| * \| \| \|	Refactor dependency check validation	Carlos Antonio da Silva	2012-08-01	4	-28/+19
\| * \| \| \|	move method for dependent option check	Hrvoje Šimić	2012-08-01	4	-11/+22
\| \| \|/ / \| \|/\| \|
* \| \| \|	Merge pull request #7219 from jmazzi/master	Rafael Mendonça França	2012-08-01	1	-0/+11
\|\ \ \ \ \| \| \|/ / \| \|/\| \|
\| * \| \|	Restoring documentation for env_config per #7070	Justin Mazzi	2012-08-01	1	-0/+11
\|/ / /
* \| \|	Merge pull request #7147 from pferdefleisch/scaffold_controller_docs	Rafael Mendonça França	2012-07-31	1	-4/+3
\|\ \ \
\| * \| \|	Updated scaffold_controller generator docs #7146	Aaron Cruz	2012-07-31	1	-4/+3
\|/ / /
* \| \|	Merge pull request #7204 from frodsan/update_conventions	Rafael Mendonça França	2012-07-31	1	-8/+8
\|\ \ \
\| * \| \|	update coding conventions in metal/live	Francesco Rodriguez	2012-07-30	1	-8/+8