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

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge pull request #7822 from lulalala/reset-counter-cache-for-has-many-through	Rafael Mendonça França	2012-10-02	5	-4/+29
*	Merge pull request #7797 from senny/7459_prefix_tempalte_assertion_variables	Rafael Mendonça França	2012-10-01	3	-23/+29
*	Merge pull request #7789 from senny/7777_resource_functions_modify_options	Rafael Mendonça França	2012-10-01	3	-2/+27
*	Merge pull request #6450 from iHiD/resource_generator_routes_master	Rafael Mendonça França	2012-10-01	3	-7/+116
*	Since File instance doesn't respond to #open use a double to test the	Rafael Mendonça França	2012-09-30	3	-5/+4
*	Asset manifest includes aliases for foo.js -> foo/index.js and vice versa. Bu...	Jeremy Kemper	2012-09-30	4	-22/+43
*	Merge pull request #7802 from steveklabnik/issue_7799	Xavier Noria	2012-09-30	1	-1/+1
\|\
\| *	Fix reference to code sample in Getting Started.	Steve Klabnik	2012-09-30	1	-1/+1
\|/
*	New CHANGELOG entries always in the top [ci skip]	Rafael Mendonça França	2012-09-30	1	-6/+6
*	Merge pull request #7659 from HugoLnx/template_error_no_matches_rebased	Rafael Mendonça França	2012-09-30	4	-6/+55
*	Merge pull request #7786 from yabawock/3-2-stable	Rafael Mendonça França	2012-09-29	3	-1/+14
\|\
\| *	Don't paramify ActionDispatch::Http::UploadedFile in tests	Tim Vandecasteele	2012-09-29	3	-1/+14
* \|	Merge pull request #7785 from okcwest/3-2-stable	Aaron Patterson	2012-09-28	4	-6/+13
\|\ \ \| \|/ \|/\|
\| *	backport 68677ffb8298105eb9d3efa26d928dd88cc5e006	Evan Petrie	2012-09-28	4	-6/+13
* \|	Hashrocket for 1.8 support	Jeremy Kemper	2012-09-28	1	-2/+2
* \|	Shush uninitialized @_layout warning	Jeremy Kemper	2012-09-28	1	-1/+1
\|/
*	Shush syntax warnings	Jeremy Kemper	2012-09-28	1	-3/+3
*	Tune up Rails::Rack::Logger. Only put space between requests in development l...	Jeremy Kemper	2012-09-27	2	-20/+29
*	Add logger.push_tags and .pop_tags to complement logger.tagged	Jeremy Kemper	2012-09-27	3	-18/+69
*	Log newlines separately to ensure the 'Started GET ...' line has a tag on the...	Jeremy Kemper	2012-09-27	1	-1/+2
*	Only apply log tags if the logger supports it	Jeremy Kemper	2012-09-27	1	-1/+1
*	Merge pull request #7684 from jrochkind/connection_pool_timeout_key_backport	Rafael Mendonça França	2012-09-25	4	-5/+39
\|\
\| *	ConnectionPool accepts spec key 'checkout_timeout'	Jonathan Rochkind	2012-09-24	4	-5/+39
* \|	Fix invalid ruby 1.8 syntax	Rafael Mendonça França	2012-09-21	1	-4/+5
\|/
*	Merge pull request #7723 from steveklabnik/backport_3554	Rafael Mendonça França	2012-09-21	4	-5/+23
\|\
\| *	Merge pull request #3544 from amatsuda/_field_changed	Aaron Patterson	2012-09-21	4	-5/+23
\|/
*	Revert "Revert "Respect `config.digest = false` for `asset_path`""	Rafael Mendonça França	2012-09-20	3	-1/+20
*	Explictly set the assets digest option to false	Rafael Mendonça França	2012-09-20	1	-2/+5
*	Revert "Respect `config.digest = false` for `asset_path`"	Rafael Mendonça França	2012-09-20	3	-20/+1
*	Revert "backport fair connection pool 02b2335563 to 3-2-stable"	Rafael Mendonça França	2012-09-20	7	-311/+51
*	Merge pull request #7718 from kennyj/fix_6962-32	Rafael Mendonça França	2012-09-20	3	-1/+16
\|\
\| *	Fix #6962. AS::TimeWithZone#strftime responds incorrectly to %:z and %::z for...	kennyj	2012-09-20	3	-1/+16
\|/
*	Load the environment after creating the database	Jeremy Kemper	2012-09-19	1	-2/+2
*	Merge pull request #7668 from Draiken/fix_issue_6497	Rafael Mendonça França	2012-09-19	3	-1/+18
*	Cache columns metadata to avoid extra while testing	Rafael Mendonça França	2012-09-18	3	-1/+11
*	Merge pull request #7686 from steveklabnik/add_upgrade_note	Rafael Mendonça França	2012-09-18	1	-0/+122
\|\
\| *	Add upgrading note to 3.1 release notes.	Steve Klabnik	2012-09-18	1	-0/+122
\|/
*	Merge pull request #7672 from wagenet/asset_path_digest_fix	Rafael Mendonça França	2012-09-18	3	-1/+20
\|\
\| *	Respect `config.digest = false` for `asset_path`	Peter Wagenet	2012-09-17	3	-1/+20
\|/
*	Merge pull request #7675 from jrochkind/fair_conn_pool_backport	Rafael Mendonça França	2012-09-17	4	-50/+300
\|\
\| *	backport fair connection pool 02b2335563 to 3-2-stable	Jonathan Rochkind	2012-09-17	4	-50/+300
\|/
*	log 404 status when ActiveRecord::RecordNotFound was raised (#7646)	Yves Senn	2012-09-17	4	-3/+27
*	Merge pull request #7661 from ernie/build-join-records-on-unsaved-hmt	Rafael Mendonça França	2012-09-17	3	-0/+25
*	Merge pull request #7666 from kennyj/fix_9fa3f102813eeeec440abd75870dfa7b2383...	Rafael Mendonça França	2012-09-17	1	-1/+1
*	Merge pull request #7651 from steveklabnik/issue_3956	Rafael Mendonça França	2012-09-16	2	-2/+32
*	Backport explain fixes.	Rafael Mendonça França	2012-09-16	5	-13/+27
*	`skip` in Ruby 1.8 doesn't skip the test case without return	Rafael Mendonça França	2012-09-13	1	-1/+1
*	Merge pull request #7633 from frodsan/patch-5	Carlos Antonio da Silva	2012-09-13	1	-1/+1
\|\
\| *	fix markdown markup in AR/CHANGELOG	Francesco Rodríguez	2012-09-13	1	-1/+1
\|/
*	Merge pull request #7632 from stevecj/3-2-stable	Rafael Mendonça França	2012-09-13	4	-0/+82
\|\