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

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge pull request #16267 from robin850/rbx-yaml	Rafael Mendonça França	2014-07-23	3	-0/+28
\|\
\| *	Set Psych as the YAML engine for Rubinius	Robin Dupret	2014-07-23	3	-0/+28
* \|	Do not set enforce_available_locales to i18n 0.7	Rafael Mendonça França	2014-07-23	3	-22/+4
* \|	Split Action Pack tests in a new job on travis	Rafael Mendonça França	2014-07-23	1	-1/+2
* \|	Use PROCESS_COUNT to define the number of parallel executors	Rafael Mendonça França	2014-07-23	1	-1/+1
* \|	specify N=0 to prevent parallel tests (just run tests on the main process)	Aaron Patterson	2014-07-23	1	-2/+6
\|/
*	Merge pull request #16237 from tonytonyjan/patch	Arthur Nogueira Neves	2014-07-23	1	-4/+5
\|\
\| *	`create` return an active record object with erros instead of false when vali...	Tony Jian	2014-07-23	1	-4/+5
* \|	Merge pull request #16234 from tgxworld/fix_template_assertion_for_integratio...	Yves Senn	2014-07-22	3	-5/+66
\|\ \
\| * \|	Fix AC::TemplateAssertions instance variables not resetting.	Guo Xiang Tan	2014-07-21	3	-5/+66
\| \|/
* \|	Merge pull request #16256 from akshay-vishnoi/doc-change	Rafael Mendonça França	2014-07-22	1	-1/+1
\|\ \
\| * \|	Fixes #16255 [ci skip]	Akshay Vishnoi	2014-07-22	1	-1/+1
\|/ /
* \|	Merge pull request #16231 from Envek/type_in_references	Yves Senn	2014-07-22	6	-5/+56
\|\ \
\| * \|	Allow to specify a type for foreign key column in migrations	Andrey Novikov	2014-07-22	6	-3/+46
\|/ /
* \|	Merge pull request #16253 from zuhao/refactor_activerecord_nested_through_ass...	Yves Senn	2014-07-22	1	-1/+1
\|\ \
\| * \|	Make sure assertion passes for postgresql.	Zuhao Wan	2014-07-22	1	-1/+1
* \| \|	Merge pull request #16254 from zuhao/refactor_activerecord_attribute_decorato...	Yves Senn	2014-07-22	1	-1/+0
\|\ \ \ \| \|/ / \|/\| \|
\| * \|	Remove redundant that already happened in teardown.	Zuhao Wan	2014-07-22	1	-1/+0
\|/ /
* \|	build fix, remove not null constraint.	Yves Senn	2014-07-22	1	-1/+1
* \|	Merge pull request #16250 from zuhao/refactor_activerecord_migration_test	Yves Senn	2014-07-22	1	-1/+1
\|\ \
\| * \|	Remove length limit that results failure in other tests.	Zuhao Wan	2014-07-22	1	-1/+1
* \| \|	docs, add example for running a single test against core adapters.	Yves Senn	2014-07-22	1	-0/+6
* \| \|	Merge pull request #16248 from zuhao/refactor_activerecord_presence_validatio...	Yves Senn	2014-07-22	1	-2/+3
\|\ \ \ \| \|/ / \|/\| \|
\| * \|	Remove the side-effects of validates_presence_of.	Zuhao Wan	2014-07-22	1	-2/+3
\|/ /
* \|	Merge pull request #16232 from egilburg/activesupport_coverage	Rafael Mendonça França	2014-07-21	11	-4/+114
\|\ \
\| * \|	missing activesupport test coverage	Eugene Gilburg	2014-07-19	11	-4/+114
\| \|/
* \|	Merge pull request #16239 from akshay-vishnoi/remove-require	Rafael Mendonça França	2014-07-21	1	-1/+0
\|\ \
\| * \|	Remove not-required file class/subclasses	Akshay Vishnoi	2014-07-21	1	-1/+0
* \| \|	Merge pull request #16242 from vadivelan-k/content_verifier	Arthur Nogueira Neves	2014-07-21	1	-1/+1
\|\ \ \
\| * \| \|	Touch option description grammatical error fixed [ci skip]	vadivelan	2014-07-21	1	-1/+1
\|/ / /
* \| \|	Merge pull request #16240 from siddharthbhagwan/master	Eileen M. Uchitelle	2014-07-21	1	-1/+1
\|\ \ \ \| \|/ / \|/\| \|
\| * \|	Generator guide grammatical error fixed [ci skip]	Siddharth Bhagwan	2014-07-21	1	-1/+1
\|/ /
* \|	Merge pull request #16236 from y-yagi/patch-1	Yves Senn	2014-07-21	1	-1/+1
\|\ \ \| \|/ \|/\|
\| *	[ci skip] Fix code in Routing Guide	yuuji.yaginuma	2014-07-21	1	-1/+1
\|/
*	Merge branch 'rm-remove-mocha'	Rafael Mendonça França	2014-07-19	20	-84/+182
\|\
\| *	Stop requiring mocha automatically	Rafael Mendonça França	2014-07-19	14	-5/+19
\| *	Stop using mocha on dbconsole_test	Rafael Mendonça França	2014-07-15	1	-44/+68
\| *	Stop using mocha on console_test	Rafael Mendonça França	2014-07-07	1	-15/+40
\| *	Set the application logger using configuration	Rafael Mendonça França	2014-07-07	1	-3/+5
\| *	Stop using mocha on configuration_test	Rafael Mendonça França	2014-07-07	1	-7/+23
\| *	Stop using mocha on app_rails_loader_test	Rafael Mendonça França	2014-07-07	2	-10/+27
* \|	Merge pull request #16230 from egilburg/before_type_cast_coverage	Rafael Mendonça França	2014-07-19	1	-0/+7
\|\ \
\| * \|	adding missing test for text area value before type cast	Eugene Gilburg	2014-07-19	1	-0/+7
\|/ /
* \|	Merge pull request #16224 from egilburg/renderer_refactors	Rafael Mendonça França	2014-07-19	4	-17/+32
\|\ \
\| * \|	adding missing test coverage	Eugene Gilburg	2014-07-18	1	-0/+12
\| * \|	marking private methods which dont work if called on their own anyways	Eugene Gilburg	2014-07-18	2	-1/+5
\| * \|	small refactors to actionview renderers	Eugene Gilburg	2014-07-18	3	-16/+15
* \| \|	Merge pull request #16227 from Aguynamedsteve/typo_correction	Yves Senn	2014-07-19	1	-1/+1
\|\ \ \
\| * \| \|	Fixed typo in comment	Steve	2014-07-19	1	-1/+1
* \| \| \|	Merge pull request #16219 from skanev/fix-create-join-table-with-common-prefix	Yves Senn	2014-07-19	5	-2/+44
\|\ \ \ \ \| \|_\|/ / \|/\| \| \|