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

	Commit message (Expand)	Author	Age	Files	Lines
...
* \| \| \| \| \|	Merge pull request #9837 from kjg/no_scaffold_css_when_no_assets	Guillermo Iguaran	2013-03-20	3	-1/+6
\|\ \ \ \ \ \ \| \|_\|/ / / / \|/\| \| \| \| \|
\| * \| \| \| \|	Don't generate a scaffold.css if no-assets	Kevin Glowacz	2013-03-20	3	-1/+6
\|/ / / / /
* \| \| \| \|	use `connect_poll` on pg so that reaping does not hurt the connection	Aaron Patterson	2013-03-20	2	-3/+4
* \| \| \| \|	Revert "default the reaping frequency to 10 seconds"	Aaron Patterson	2013-03-20	1	-1/+1
\| \|/ / / \|/\| \| \|
* \| \| \|	Merge pull request #9833 from choudhuryanupam/fix_active_schema_test	Carlos Antonio da Silva	2013-03-20	1	-2/+1
\|\ \ \ \
\| * \| \| \|	Removed unnecessary block	Anupam Choudhury	2013-03-20	1	-2/+1
* \| \| \| \|	Properly named variable inside block	Anupam Choudhury	2013-03-20	1	-2/+2
\|/ / / /
* \| \| \|	Merge pull request #9821 from vipulnsward/fix_typos_in_AR	Vijay Dev	2013-03-20	5	-6/+6
\|\ \ \ \
\| * \| \| \|	Fix some typos in AR- CHANGELOG, tests, method doc. fixed	Vipul A M	2013-03-20	5	-6/+6
\| \| \|/ / \| \|/\| \|
* \| \| \|	Merge pull request #9825 from rShetty/patch-1	Vijay Dev	2013-03-20	1	-1/+1
\|\ \ \ \ \| \|/ / / \|/\| \| \|
\| * \| \|	Fix a typo	Rajeev N Bharshetty	2013-03-20	1	-1/+1
\|/ / /
* \| \|	Merge pull request #9818 from wangjohn/sort_last_to_max_in_migration_version	Carlos Antonio da Silva	2013-03-19	1	-1/+1
\|\ \ \
\| * \| \|	Changed the call to .sort.last to .max when computing the migration version. You	wangjohn	2013-03-19	1	-1/+1
* \| \| \|	Merge pull request #9817 from knewter/fix-test-case-name-typo-in-ar	Carlos Antonio da Silva	2013-03-19	1	-2/+2
\|\ \ \ \ \| \|/ / / \|/\| \| \|
\| * \| \|	Commas aren't comas.	Josh Adams	2013-03-19	1	-2/+2
\|/ / /
* \| \|	Merge pull request #9794 from schneems/schneems/email-host	Andrew White	2013-03-19	3	-1/+26
\|\ \ \
\| * \| \|	Fix improperly configured host in generated urls	schneems	2013-03-19	3	-1/+26
* \| \| \|	Remove mentions of "app" from http request docs [ci skip]	Carlos Antonio da Silva	2013-03-19	1	-12/+10
* \| \| \|	Merge pull request #9816 from sebasoga/strong_parameters_guide_fix	Guillermo Iguaran	2013-03-19	1	-1/+1
\|\ \ \ \
\| * \| \| \|	Fix guides error on error class name	Sebastian Sogamoso	2013-03-19	1	-1/+1
\|/ / / /
* \| \| \|	Merge pull request #9529 from wangjohn/find_on_inverse_of_bugfix_9470	Jeremy Kemper	2013-03-19	3	-2/+38
\|\ \ \ \
\| * \| \| \|	Calling find() on an association with an inverse will now check to see	wangjohn	2013-03-19	3	-2/+38
* \| \| \| \|	Merge pull request #9807 from vipulnsward/remove_unused_payloads	Jeremy Kemper	2013-03-19	1	-3/+3
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \|
\| * \| \| \|	remove unused payloads in blocks in caching instrumentation	Vipul A M	2013-03-19	1	-3/+3
* \| \| \| \|	Merge pull request #9811 from neerajdotname/fix-secret-token-sentence	Rafael Mendonça França	2013-03-19	1	-1/+1
\|\ \ \ \ \ \| \|_\|/ / / \|/\| \| \| \|
\| * \| \| \|	fix sentence [ci skip]	Neeraj Singh	2013-03-19	1	-1/+1
\|/ / / /
* \| \| \|	Merge pull request #9363 from wangjohn/fix_repair_validations	Aaron Patterson	2013-03-19	3	-2/+66
\|\ \ \ \ \| \|/ / / \|/\| \| \|
\| * \| \|	The repair_validations helper was not working correctly before because	wangjohn	2013-03-19	3	-2/+66
\|/ / /
* \| \|	Merge pull request #9800 from kennyj/fix_warning_20130319	Santiago Pastorino	2013-03-19	1	-1/+1
\|\ \ \ \| \|/ / \|/\| \|
\| * \|	Fix warning: mismatched indentatmmismatched indentations at 'end' with 'def'	kennyj	2013-03-19	1	-1/+1
\|/ /
* \|	Merge pull request #9792 from vipulnsward/drop_unused_hash	Steve Klabnik	2013-03-18	2	-3/+3
\|\ \
\| * \|	drop an unused hash; change slang to SPECIAL	Vipul A M	2013-03-19	2	-3/+3
\|/ /
* \|	Initialize @app_env_config now that the var name has changed	Carlos Antonio da Silva	2013-03-19	1	-1/+1
* \|	Use @app_env_config instead of @env_config	José Valim	2013-03-18	1	-1/+1
\|/
*	Revert "Merge pull request #9784 from vipulnsward/change_from_blank_to_empty_...	Carlos Antonio da Silva	2013-03-18	1	-4/+4
*	Merge pull request #9784 from vipulnsward/change_from_blank_to_empty_on_string	Carlos Antonio da Silva	2013-03-18	1	-4/+4
\|\
\| *	change from blank? to empty? on obvious string values to save extra method c...	Vipul A M	2013-03-19	1	-4/+4
* \|	Fix failing tests related to where values change to strings	Carlos Antonio da Silva	2013-03-18	1	-7/+7
* \|	Revert "instruct RDoc to only parse Ruby files under lib [Fixes #9779]"	Xavier Noria	2013-03-18	6	-6/+6
* \|	Merge pull request #9782 from vipulnsward/change_from_each_to_each_key_habtm	Rafael Mendonça França	2013-03-18	2	-3/+3
\|\ \
\| * \|	1. Change from each to each_value since we did not use key	Vipul A M	2013-03-19	2	-3/+3
\| \|/
* \|	instruct RDoc to only parse Ruby files under lib [Fixes #9779]	Xavier Noria	2013-03-18	6	-6/+6
* \|	Merge pull request #9022 from braddunbar/digest-basic-auth	Steve Klabnik	2013-03-18	3	-0/+14
\|\ \
\| * \|	Digest auth should not 500 when given a basic header.	Brad Dunbar	2013-03-18	3	-0/+14
\|/ /
* \|	Merge pull request #9778 from vipulnsward/fix_typos_in_ar_v1	Steve Klabnik	2013-03-18	9	-10/+10
\|\ \
\| * \|	fix typos in AR. lots of them.	Vipul A M	2013-03-19	9	-10/+10
\| \|/
* \|	Merge pull request #9202 from gkop/more_helpful_message_when_starting_server	Steve Klabnik	2013-03-18	2	-2/+2
\|\ \
\| * \|	More helpful message when starting server	Gabe Kopley	2013-03-18	2	-2/+2
\|/ /
* \|	Merge branch 'master-sec'	Aaron Patterson	2013-03-18	9	-18/+81
\|\ \
\| * \|	fix protocol checking in sanitization [CVE-2013-1857]	Aaron Patterson	2013-03-15	2	-2/+12