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

	Commit message (Expand)	Author	Age	Files	Lines
*	Revert benchmark helper regression. Use a #capture within a #benchmark	Jeremy Kemper	2013-01-14	3	-39/+3
*	Test to allow Range including DateTime and DateTime::Infinity	gsphanikumar	2013-01-14	1	-0/+6
*	Merge pull request #8916 from josemota/collection-with-block	Rafael Mendonça França	2013-01-13	2	-4/+53
\|\
\| *	Collection radio buttons and collection check boxes through FormBuilder render	José Mota	2013-01-12	2	-4/+53
* \|	Add regression test to #8907	Rafael Mendonça França	2013-01-14	1	-0/+31
* \|	Merge pull request #8917 from adomokos/adding_more_tests_to_activemodel_model	Rafael Mendonça França	2013-01-13	1	-0/+6
\|\ \
\| * \|	Adding tests for ActiveModel::Model	Attila Domokos	2013-01-12	1	-0/+6
\| \|/
* \|	Merge pull request #8925 from colinbm/date_select_value	Steve Klabnik	2013-01-13	3	-1/+26
\|\ \
\| * \|	Allow value to be set on date_select	Colin Burn-Murdoch	2013-01-13	3	-1/+26
\|/ /
* \|	Remove WIP from Working With JavaScript Guide.	Steve Klabnik	2013-01-13	1	-1/+0
* \|	Associaton -> Association	Steve Klabnik	2013-01-13	1	-2/+2
\|/
*	Fix AR tests due to Mysql constant not being defined	Carlos Antonio da Silva	2013-01-12	3	-7/+5
*	Deprecate `Rails::Generators::ActiveModel#update_attributes`	Carlos Antonio da Silva	2013-01-12	2	-0/+23
*	Bring back "database already exists" messages when running rake tasks	Carlos Antonio da Silva	2013-01-12	7	-20/+47
*	Merge pull request #8907 from rubys/master	Rafael Mendonça França	2013-01-11	1	-1/+2
\|\
\| *	Fix regression introduced in pull request 8812	Sam Ruby	2013-01-11	1	-1/+2
\|/
*	Merge pull request #8896 from NARKOZ/patch-5	Rafael Mendonça França	2013-01-11	1	-2/+2
\|\
\| *	remove_possible_method -> remove_method	Nihad Abbasov	2013-01-11	1	-2/+2
\|/
*	Add changelog entry for scaffold generator and jbuilder changes	Carlos Antonio da Silva	2013-01-11	1	-0/+9
*	Merge pull request #8882 from goshakkk/clearer-conditional	Carlos Antonio da Silva	2013-01-11	1	-3/+3
\|\
\| *	clearer conditional in constraint match check	Gosha Arinich	2013-01-10	1	-3/+3
* \|	Merge pull request #8866 from adomokos/adding_more_tests_to_errors_test	Carlos Antonio da Silva	2013-01-11	1	-0/+53
\|\ \
\| * \|	Covering untested methods for ActiveModel::Errors	Attila Domokos	2013-01-10	1	-0/+53
* \| \|	Merge pull request #8623 from virusman/form_helpers_collectionproxy_fix	Jon Leighton	2013-01-11	2	-1/+24
\|\ \ \
\| * \| \|	Test nested fields with AssociationProxy mockup & fix AssociationProxy suppor...	virusman	2012-12-27	2	-1/+24
* \| \| \|	Merge pull request #8568 from inossidabile/fix-in_clause_length	Jon Leighton	2013-01-11	3	-8/+13
\|\ \ \ \
\| * \| \| \|	Eager loading made to use relation's in_clause_length instead of host's one (...	Boris Staal	2012-12-20	3	-8/+13
* \| \| \| \|	Merge pull request #8855 from dylanahsmith/parse-non-object-json-params	Jeremy Kemper	2013-01-10	3	-2/+13
\|\ \ \ \ \
\| * \| \| \| \|	Fix json params parsing regression for non-object JSON content.	Dylan Smith	2013-01-11	3	-2/+13
\|/ / / / /
* \| \| \| \|	All green with Ruby 2.0 :green_heart:	Rafael Mendonça França	2013-01-11	1	-3/+0
* \| \| \| \|	Use thor master to make rails work with Ruby 2.0	Rafael Mendonça França	2013-01-11	1	-0/+2
* \| \| \| \|	thread_safe is a dependency of active_support	Rafael Mendonça França	2013-01-11	1	-1/+0
* \| \| \| \|	Merge pull request #8887 from rwz/controller-scaffold-codestyle	Rafael Mendonça França	2013-01-10	3	-4/+4
\|\ \ \ \ \
\| * \| \| \| \|	More consistent quotes in scaffold generator	Pavel Pravosud	2013-01-11	2	-3/+3
\| * \| \| \| \|	Changed if ! to unless	Pavel Pravosud	2013-01-11	1	-1/+1
* \| \| \| \| \|	Merge pull request #8886 from rwz/specify-jbuilder-version	Guillermo Iguaran	2013-01-10	1	-1/+1
\|\ \ \ \ \ \ \| \|/ / / / / \|/\| \| \| \| \|
\| * \| \| \| \|	Specified jbuilder version	Pavel Pravosud	2013-01-11	1	-1/+1
\|/ / / / /
* \| \| \| \|	Merge pull request #8884 from mattdbridges/array-access-doc-fixes	Guillermo Iguaran	2013-01-10	1	-4/+4
\|\ \ \ \ \ \| \|_\|_\|_\|/ \|/\| \| \| \|
\| * \| \| \|	Updating Array access docs more consistent	Matt Bridges	2013-01-10	1	-4/+4
\|/ / / /
* \| \| \|	Merge pull request #8869 from goshakkk/guides-asset-pipeline-tilt	Guillermo Iguaran	2013-01-10	1	-1/+25
\|\ \ \ \
\| * \| \| \|	add asset pipeline guides section on implementing & registering own engines	Gosha Arinich	2013-01-10	1	-1/+25
* \| \| \| \|	Relax bundler dep until 1.3.0 is actually released.	Jeremy Kemper	2013-01-10	2	-2/+2
* \| \| \| \|	Include jbuilder by default and rely on its scaffold generator to show json A...	David Heinemeier Hansson	2013-01-10	6	-99/+14
* \| \| \| \|	Merge pull request #8878 from senny/add_performance_test_extraction_to_guide	Guillermo Iguaran	2013-01-10	1	-0/+1
\|\ \ \ \ \
\| * \| \| \| \|	mention performance test extraction in 4.0 guide	Yves Senn	2013-01-10	1	-0/+1
\|/ / / / /
* \| \| \| \|	Merge pull request #8876 from senny/extract_performance_tests	Guillermo Iguaran	2013-01-10	33	-1640/+20
\|\ \ \ \ \
\| * \| \| \| \|	remove the rails guide on performance testing	Yves Senn	2013-01-10	3	-692/+0
\| * \| \| \| \|	remove performance tests from the default stack	Yves Senn	2013-01-10	10	-47/+5
\| * \| \| \| \|	extract PerformanceTest into rails-performance_tests gem	Yves Senn	2013-01-10	21	-901/+15
\| \| \|_\|_\|/ \| \|/\| \| \|
* \| \| \| \|	Merge pull request #8821 from jamis/master	Rafael Mendonça França	2013-01-10	2	-7/+3
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \|