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

	Commit message (Expand)	Author	Age	Files	Lines
...
* \| \| \| \| \| \|	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
\|\ \ \ \ \ \ \ \ \| \|_\|/ / / / / / \|/\| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	create_join_table uses same logic as HABTM reflections	Stefan Kanev	2014-07-18	5	-2/+44
* \| \| \| \| \| \| \|	Merge pull request #16098 from tgxworld/fixes_to_request_test	Rafael Mendonça França	2014-07-18	1	-22/+14
\|\ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \|	Remove redundant test.	Guo Xiang Tan	2014-07-18	1	-11/+0
\| * \| \| \| \| \| \| \|	Fix duplicated test.	Guo Xiang Tan	2014-07-18	1	-2/+6
\| * \| \| \| \| \| \| \|	Update test to clearly reflect what it is testing for.	Guo Xiang Tan	2014-07-18	1	-5/+7
\| * \| \| \| \| \| \| \|	Update outdated test.	Guo Xiang Tan	2014-07-18	1	-6/+3
\| \| \|_\|/ / / / / \| \|/\| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge pull request #16212 from aantix/additional_migration_conflict_help_mess...	Rafael Mendonça França	2014-07-18	1	-1/+2
\|\ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \|	Modified migration conflict message to remove the string concatenation.	Jim Jones	2014-07-18	1	-3/+3
\| * \| \| \| \| \| \| \|	Added additional help messaging when there's scaffolding being generated and ...	Jim Jones	2014-07-17	1	-1/+2
* \| \| \| \| \| \| \| \|	Merge pull request #16221 from arthurnn/14886_pr	Godfrey Chan	2014-07-18	4	-2/+14
\|\ \ \ \ \ \ \ \ \ \| \|_\|_\|/ / / / / / \|/\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Add CHANGELOG for #14886	Arthur Neves	2014-07-18	2	-1/+6
\| * \| \| \| \| \| \| \|	LOCALHOST definition should match any 127.0.0.0/8 address	Earl J St Sauver	2014-07-18	3	-2/+9
\|/ / / / / / / /
* \| \| \| \| \| \| \|	Merge pull request #15762 from arthurnn/better_error_on_bad_alias_method	Matthew Draper	2014-07-18	3	-10/+27
\|\ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \|	Dont swallow errors when bad alias_method	Arthur Neves	2014-06-24	3	-10/+27
* \| \| \| \| \| \| \| \|	Follow-up to #16097 [ci skip]	Robin Dupret	2014-07-18	2	-4/+8
* \| \| \| \| \| \| \| \|	Merge pull request #16099 from tgxworld/pass_log_as_block	Yves Senn	2014-07-18	5	-43/+46
\|\ \ \ \ \ \ \ \ \ \| \|_\|/ / / / / / / \|/\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Prefer to pass block when logging.	Guo Xiang Tan	2014-07-18	5	-43/+46
\|/ / / / / / / /
* \| \| \| \| \| \| \|	reporting is only done in one thread, so we can safely remove the lock	Aaron Patterson	2014-07-17	1	-1/+1
* \| \| \| \| \| \| \|	%i doesn't work on 1.9	Aaron Patterson	2014-07-17	1	-1/+1
* \| \| \| \| \| \| \|	fix thread safety issues	Aaron Patterson	2014-07-17	1	-4/+7
* \| \| \| \| \| \| \|	pass the test reporter by reference	Aaron Patterson	2014-07-17	1	-1/+4
* \| \| \| \| \| \| \|	Merge pull request #16210 from sonnym/assert_valid_keys_in_validate	Matthew Draper	2014-07-18	3	-0/+19
\|\ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \|	check for valid options in validate method	sonnym	2014-07-17	3	-0/+18
* \| \| \| \| \| \| \| \|	fix filesystem race condition	Aaron Patterson	2014-07-17	1	-1/+1
* \| \| \| \| \| \| \| \|	do not restart the service, just stop it	Aaron Patterson	2014-07-17	1	-1/+0
* \| \| \| \| \| \| \| \|	only parallelize on forking systems	Aaron Patterson	2014-07-17	1	-1/+1
* \| \| \| \| \| \| \| \|	Disable some tests on SQLite	Rafael Mendonça França	2014-07-17	1	-77/+77
* \| \| \| \| \| \| \| \|	Prefer if/else for this case	Rafael Mendonça França	2014-07-17	1	-3/+2