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

	Commit message (Expand)	Author	Age	Files	Lines
*	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
* \| \| \| \|	this variable is used, so we don't have to use double assignments	Aaron Patterson	2013-05-15	1	-1/+1
* \| \| \| \|	remove dead code	Aaron Patterson	2013-05-15	1	-23/+4
* \| \| \| \|	remove deprecation notices	Aaron Patterson	2013-05-15	2	-26/+0
* \| \| \| \|	stop keeping a reference to the options hash	Aaron Patterson	2013-05-15	1	-12/+7
* \| \| \| \|	conditions are guaranteed to be arrays by initialize	Aaron Patterson	2013-05-15	1	-2/+2
* \| \| \| \|	simplify the condions lambda generation	Aaron Patterson	2013-05-15	1	-12/+2
* \| \| \| \|	use unless instead of if!	Aaron Patterson	2013-05-15	1	-3/+3
* \| \| \| \|	Merge pull request #10631 from kennyj/improve_10266	Rafael Mendonça França	2013-05-15	2	-2/+7
\|\ \ \ \ \
\| * \| \| \| \|	Fix HWIA#to_hash behavior with array of hashes.	kennyj	2013-05-16	2	-2/+7
* \| \| \| \| \|	Merge pull request #10601 from Ichimonji10/fix-docs	Rafael Mendonça França	2013-05-15	1	-15/+27
\|\ \ \ \ \ \ \| \|_\|_\|_\|/ / \|/\| \| \| \| \|
\| * \| \| \| \|	Rewrite `activerecord/RUNNING_UNIT_TESTS`	Jeremy Audet	2013-05-15	1	-15/+27
* \| \| \| \| \|	Merge pull request #10626 from firedev/master	Guillermo Iguaran	2013-05-14	3	-6/+3
\|\ \ \ \ \ \ \| \| \|/ / / / \| \|/\| / / / \| \|_\|/ / / \|/\| \| \| \|
\| * \| \| \|	Removed incorrect warning from application.js templates and replaced it with ...	Nick	2013-05-15	3	-6/+3
\|/ / / /
* \| \| \|	only dup the options once, the Callback object does not mutate them	Aaron Patterson	2013-05-14	1	-2/+2
* \| \| \|	make the compile method thread safe	Aaron Patterson	2013-05-14	1	-5/+7
* \| \| \|	use inject rather than multiple assignments	Aaron Patterson	2013-05-14	1	-4/+2
* \| \| \|	deprecating string based terminators	Aaron Patterson	2013-05-14	6	-9/+23
* \| \| \|	inspect the filter when displaying error messages	Aaron Patterson	2013-05-14	1	-1/+1
* \| \| \|	use public api for testing rather than grabbing instance variables	Aaron Patterson	2013-05-14	1	-1/+1
* \| \| \|	halting lambda must be instance execed	Aaron Patterson	2013-05-14	1	-2/+2
* \| \| \|	fixing arity2 test	Aaron Patterson	2013-05-14	1	-3/+8
* \| \| \|	Merge pull request #10266 from vipulnsward/fix_HIA_to_hash	Rafael Mendonça França	2013-05-14	2	-3/+11
\|\ \ \ \
\| * \| \| \|	fix HashWithIndifferentAccess#to_hash behaviour	Vipul A M	2013-04-19	2	-3/+11
* \| \| \| \|	Merge branch 'polymorphic'	Aaron Patterson	2013-05-14	4	-230/+364
\|\ \ \ \ \
\| * \| \| \| \|	fix shadowed variable warnings	Aaron Patterson	2013-05-14	1	-5/+5