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

	Commit message (Expand)	Author	Age	Files	Lines
*	Fxied some typos	Prathamesh Sonpatki	2013-05-18	3	-3/+3
*	Merge pull request #10676 from tkhr/add-test-to-counter_cache_test.rb	Rafael Mendonça França	2013-05-18	5	-4/+18
\|\
\| *	Fix tests which started to fail due to commit 0123c39f41e2062311b2197e6e230ef...	Takehiro Adachi	2013-05-18	2	-4/+4
\| *	Add test to AR's counter_cache_test.rb	Takehiro Adachi	2013-05-18	3	-0/+14
* \|	Merge pull request #10675 from prathamesh-sonpatki/dont-auto-require-mocha	Rafael Mendonça França	2013-05-18	1	-1/+5
\|\ \
\| * \|	Don't autorequire mocha to avoid deprecation warnings	Prathamesh Sonpatki	2013-05-18	1	-1/+5
\|/ /
* \|	stop swallowing exceptions in assert_queries. Methods that raise an	Aaron Patterson	2013-05-17	1	-2/+2
* \|	Merge pull request #10672 from carllerche/master	Santiago Pastorino	2013-05-17	2	-0/+29
\|\ \
\| * \|	Bug fix: Evented notification subscribers can handle published events	Carl Lerche	2013-05-17	2	-0/+29
\|/ /
* \|	stop doing assingments in an iterator	Aaron Patterson	2013-05-17	1	-2/+6
* \|	include bind values from the default scope	Aaron Patterson	2013-05-17	2	-6/+5
\|/
*	Merge pull request #10657 from AJ-Acevedo/plugin	Rafael Mendonça França	2013-05-16	1	-0/+1
\|\
\| *	plugin new missing license spec	AJ Acevedo	2013-05-16	1	-0/+1
\|/
*	let Ruby do the is_a check for us	Aaron Patterson	2013-05-16	1	-3/+4
*	Merge pull request #10656 from zenspider/fix_mocha_back	Aaron Patterson	2013-05-16	1	-1/+1
\|\
\| *	Mocha 0.14.0 was released with MT5 support. Switch back to gem	Ryan Davis	2013-05-16	1	-1/+1
\|/
*	Fix named routing regression from 3.2.13	schneems	2013-05-16	2	-0/+12
*	Revert "just call the class method since we know the callbacks are stored at ...	Aaron Patterson	2013-05-16	1	-2/+1
*	Merge pull request #10652 from md5/concern-multiple-included	Rafael Mendonça França	2013-05-16	3	-0/+28
\|\
\| *	Raise when multiple included blocks are defined	Mike Dillon	2013-05-16	3	-0/+28
* \|	Merge pull request #10527 from zenspider/squishy_minitest5	Aaron Patterson	2013-05-16	13	-146/+50
\|\ \
\| * \|	oops. I should have only required minitest, not minitets/autorun. muscle memory.	Ryan Davis	2013-05-09	1	-1/+1
\| * \|	tweak dependencies	Ryan Davis	2013-05-08	2	-2/+2
\| * \|	Updates to make rails 4 happy with minitest 5:	Ryan Davis	2013-05-06	11	-144/+48
* \| \|	test refactor	Aaron Patterson	2013-05-16	1	-5/+2
* \| \|	Add more data to AR::UnknownAttributeError	Bogdan Gusiev	2013-05-16	3	-1/+22
* \| \|	Merge pull request #10594 from shime/rack-debugger	Aaron Patterson	2013-05-16	2	-4/+4
\|\ \ \
\| * \| \|	exit with non-zero to signal failure	Hrvoje Šimić	2013-05-13	2	-4/+4
* \| \| \|	Merge pull request #10619 from alno/top_level_array_in_postgres_json	Aaron Patterson	2013-05-16	3	-1/+17
\|\ \ \ \
\| * \| \| \|	Support array as root element in JSON	Alexey Noskov	2013-05-14	3	-1/+17
* \| \| \| \|	Revert "Integration tests support the OPTIONS http method"	Rafael Mendonça França	2013-05-16	2	-24/+2
* \| \| \| \|	Merge pull request #10636 from seanwalbran/fix-asset-host-proc-returning-nil	Rafael Mendonça França	2013-05-16	2	-1/+13
\|\ \ \ \ \ \| \|_\|_\|_\|/ \|/\| \| \| \|
\| * \| \| \|	restore ability to return nil from asset_host proc, add test	Sean Walbran	2013-05-15	2	-1/+13
* \| \| \| \|	restore whitespace in Gemfile between sqlite3 and sprockets	Sam Ruby	2013-05-16	1	-1/+1
* \| \| \| \|	Revert "Add the options method to action_controller testcase."	Rafael Mendonça França	2013-05-16	2	-11/+0
* \| \| \| \|	Check if APP_RAKEFILE is defined	Piotr Sarnacki	2013-05-16	1	-1/+1
* \| \| \| \|	Merge pull request #10639 from cbartlett/master	Carlos Antonio da Silva	2013-05-16	1	-1/+1
\|\ \ \ \ \
\| * \| \| \| \|	Remove trailing line break	Colin Bartlett	2013-05-16	1	-1/+1
* \| \| \| \| \|	Merge pull request #10640 from joelcogen/master	Piotr Sarnacki	2013-05-16	1	-1/+1
\|\ \ \ \ \ \ \| \|/ / / / / \|/\| \| \| \| \|
\| * \| \| \| \|	Fix detection of engine in rake db:load_config	Joel Cogen	2013-05-16	1	-1/+1
\|/ / / / /
* \| \| \| \|	tiny types should only be integers when the length is <= 1. fixes #10620	Aaron Patterson	2013-05-15	1	-3/+9
* \| \| \| \|	add failing test exposing mysql adapter tinyint bug	phinze	2013-05-15	1	-3/+16
* \| \| \| \|	Merge pull request #10591 from acapilleri/cond_callback_test	Aaron Patterson	2013-05-15	1	-0/+13
\|\ \ \ \ \
\| * \| \| \| \|	add test for skip_before_filter with condition	Angelo capilleri	2013-05-13	1	-0/+13
\| \| \|_\|/ / \| \|/\| \| \|
* \| \| \| \|	require things we need	Aaron Patterson	2013-05-15	1	-0/+1
* \| \| \| \|	Merge pull request #10504 from kennyj/support_pg_91	Rafael Mendonça França	2013-05-15	3	-6/+8
\|\ \ \ \ \
\| * \| \| \| \|	Remove unnecessary code, because this extension is created on demand in hstor...	kennyj	2013-05-15	1	-2/+0
\| * \| \| \| \|	Also support extensions in PostgreSQL 9.1, because this has been supported si...	kennyj	2013-05-15	2	-4/+8
* \| \| \| \| \|	Revert "Merge pull request #10600 from aditya-kapoor/code_refactor"	Rafael Mendonça França	2013-05-15	1	-9/+11
* \| \| \| \| \|	just call the class method since we know the callbacks are stored at the	Aaron Patterson	2013-05-15	1	-1/+2