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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge pull request #4808 from route/mb_chars_as_json	José Valim	2012-01-31	2	-0/+7
\|\ \| \| \| \|	Added as_json method for multibyte strings
\| *	Added as_json method for multibyte strings	Dmitriy Vorotilin	2012-02-01	2	-0/+7
\| \|
* \|	Merge pull request #4799 from arunagw/warning_fixed_for_indentations	Aaron Patterson	2012-01-31	1	-1/+1
\|\ \ \| \|/ \|/\|	warning removed: mismatched indentations
\| *	warning removed: mismatched indentations	Arun Agrawal	2012-01-31	1	-1/+1
\| \|
* \|	Revert "Merge pull request #4746 from jenslukowski/issue4718"	Aaron Patterson	2012-01-31	2	-16/+1
\| \| \| \| \| \| \| \| \| \|	This reverts commit 5cad7a0dba652f3e942e58087bc88ba5c5390edc, reversing changes made to bb842e8d2111e50b21a14b8bd6d89371a4b9cd68.
* \|	Merge pull request #4805 from xuanxu/none_and_null_object_pattern	Jon Leighton	2012-01-31	6	-1/+71
\|\ \ \| \| \| \| \| \|	Added `none` query method to return zero records.
\| * \|	Added `none` query method to return zero records.	Juanjo Bazán	2012-01-31	6	-1/+71
\| \| \| \| \| \| \| \| \|	And added NullRelation class implementing the null object pattern for the `Relation` class.
* \| \|	QueryCache will just dup an AR::Result, AR::Result can deep copy	Aaron Patterson	2012-01-31	2	-9/+21
\| \| \|
* \| \|	always return the result set from select_all	Aaron Patterson	2012-01-31	2	-2/+2
\| \| \|
* \| \|	made the result set object act more like an array	Aaron Patterson	2012-01-31	5	-4/+24
\| \| \|
* \| \|	Merge pull request #4735 from arton/master	Aaron Patterson	2012-01-31	1	-1/+5
\|\ \ \ \| \| \| \| \| \| \| \|	Re-launch assets:precompile task using original $0 if $0 is batch file so it works on Windows
\| * \| \|	run direcly $0 if rake invoked by Windows batch file.	arton	2012-01-29	1	-1/+5
\| \| \| \|
* \| \| \|	Merge pull request #4742 from petervandenabeele/master	Aaron Patterson	2012-01-31	1	-0/+3
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	Set the timezone correctly for a test in activerecord/../base_test.rb
\| * \| \| \|	Set default_timezone explicitly for a test in activerecord/../base_test.rb	Peter Vandenabeele	2012-01-29	1	-0/+3
\| \| \| \| \|
* \| \| \| \|	Merge pull request #4746 from jenslukowski/issue4718	Aaron Patterson	2012-01-31	2	-1/+16
\|\ \ \ \ \ \| \|_\|_\|/ / \|/\| \| \| \|	Test and fix for issue 4718
\| * \| \| \|	fix for Issue 4718	Jens Lukowski	2012-01-29	1	-1/+8
\| \| \| \| \|
\| * \| \| \|	failing test case for Issue 4718	Jens Lukowski	2012-01-28	1	-0/+8
\| \| \|/ / \| \|/\| \|
* \| \| \|	Merge pull request #4803 from lucascaton/master	Aaron Patterson	2012-01-31	3	-3/+5
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	Remove slash from favicon_link_tag method attribute
\| * \| \| \|	Remove slash from favicon_link_tag method attribute	Lucas Caton	2012-01-31	3	-3/+5
\|/ / / /
* \| \| \|	Merge pull request #4802 from carlosantoniodasilva/collection-helpers-refactor	José Valim	2012-01-31	3	-14/+28
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	Refactor select helper and remove eval
\| * \| \| \|	Remove eval calls, use send.. eval is evil	Carlos Antonio da Silva	2012-01-31	1	-3/+3
\| \| \| \| \|
\| * \| \| \|	Refactor select tag form helpers	Carlos Antonio da Silva	2012-01-31	2	-11/+25
\| \| \|_\|/ \| \|/\| \|
* \| \| \|	Merge pull request #4791 from gregolsen/reflection_test_fixed	José Valim	2012-01-31	3	-4/+4
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	reflection test fixed
\| * \| \| \|	test_get_ids_for_ordered_association fixed	gregolsen	2012-01-31	2	-2/+2
\| \| \| \| \|
\| * \| \| \|	reflection test fixed	gregolsen	2012-01-31	1	-2/+2
\| \| \| \| \|
* \| \| \| \|	Merge pull request #4800 from rafaelfranca/remove-warnings	José Valim	2012-01-31	4	-16/+31
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Remove deprecation warnings from tests
\| * \| \| \| \|	Remove deprecation warnings from tests	Rafael Mendonça França	2012-01-31	3	-13/+28
\| \| \| \| \| \|
\| * \| \| \| \|	Put spaces between the words at deprecation warning	Rafael Mendonça França	2012-01-31	1	-3/+3
\| \| \|/ / / \| \|/\| \| \|
* \| \| \| \|	Merge pull request #4797 from kennyj/fix_4774	José Valim	2012-01-31	2	-1/+6
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Fix GH #4744. Don't run bundle install when executing `rails new app` with --pretend option
\| * \| \| \| \|	Don't run bundle install when passed with --pretend option	kennyj	2012-02-01	2	-1/+6
\| \|/ / / /
* \| \| \| \|	Merge pull request #4798 from ihower/fix_routing_typo	José Valim	2012-01-31	1	-1/+1
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \|	Fix typo in routing documentation
\| * \| \| \|	Fix typo in routing documentation	Wen-Tien Chang	2012-02-01	1	-1/+1
\|/ / / /
* \| \| \|	Merge pull request #4792 from rafaelfranca/build-fix	José Valim	2012-01-31	2	-1/+2
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	Only add ActiveRecord configuration if it is present
\| * \| \| \|	Only add ActiveRecord configuration if it is present	Rafael Mendonça França	2012-01-31	2	-1/+2
\| \|/ / /
* \| \| \|	to_proper_path -> to_partial_path	José Valim	2012-01-31	1	-1/+1
\| \| \| \|
* \| \| \|	Update actionpack/lib/action_view/renderer/partial_renderer.rb	José Valim	2012-01-31	1	-2/+1
\|/ / /
* \| \|	Merge pull request #4783 from gregolsen/ids_reader_fix	Jon Leighton	2012-01-31	3	-1/+6
\|\ \ \ \| \| \| \| \| \| \| \|	ids_reader method fixed, test added to has_many association (for PostgreSQL)
\| * \| \|	ids_reader method fixed, test added to has_many association	gregolsen	2012-01-31	3	-1/+6
\| \| \| \|
* \| \| \|	Merge pull request #4727 from railsaholic/dependent_restrict_should_add_error	Jon Leighton	2012-01-31	11	-35/+157
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	has_many/has_one, :dependent => :restrict, deprecation added
\| * \| \| \|	suggested fixes for :dependent => :restrict deprecation.	Manoj	2012-01-31	5	-36/+16
\| \| \| \| \|
\| * \| \| \|	Same method for has_many and has_one associations	Paco Guzman	2012-01-31	3	-30/+17
\| \| \| \| \|
\| * \| \| \|	Easy dependent_restrict error message	Paco Guzman	2012-01-31	2	-4/+2
\| \| \| \| \|
\| * \| \| \|	has_many/has_one, :dependent => :restrict, deprecation added.	Manoj	2012-01-29	11	-21/+178
\| \| \|/ / \| \|/\| \|
* \| \| \|	Merge pull request #4788 from arunagw/warning_remove_shadowing_var	Santiago Pastorino	2012-01-31	1	-2/+2
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	warning removed: shadowing outer local variable - klass
\| * \| \| \|	warning removed: shadowing outer local variable - klass	Arun Agrawal	2012-01-31	1	-2/+2
\|/ / / /
* \| \| \|	Merge pull request #4782 from lest/patch-1	José Valim	2012-01-31	1	-1/+1
\|\ \ \ \ \| \|_\|/ / \|/\| \| \|	fix assets test
\| * \| \|	fix assets test	Sergey Nartimov	2012-01-31	1	-1/+1
\|/ / /
* \| \|	Merge pull request #4763 from kennyj/fix_4754	Jon Leighton	2012-01-31	2	-1/+17
\|\ \ \ \| \| \| \| \| \| \| \|	[MySQL] Fix GH #4754. Remove double-quote characters around PK when using sql_mode=ANSI_QUOTES
\| * \| \|	Fix GH #4754. Remove double-quote when using ANSI_QUOTES	kennyj	2012-01-31	2	-1/+17
\| \| \| \|
* \| \| \|	Merge pull request #4732 from pwim/refactor-dynamic-match	Jon Leighton	2012-01-30	3	-28/+60
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	Refactor dynamic match