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

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge pull request #10466 from prathamesh-sonpatki/scaffold-assets	Carlos Antonio da Silva	2013-05-05	1	-4/+4
*	Merge pull request #10448 from arunagw/bug-fix-scaffold-generator-master	Rafael Mendonça França	2013-05-04	3	-1/+20
*	adding test for the symbol refs	Aaron Patterson	2013-04-26	1	-0/+7
*	just clear the caches on clear! rather than replacing. fixes #10251	Aaron Patterson	2013-04-17	1	-8/+4
*	adding a test for root path in the app	Aaron Patterson	2013-04-17	1	-0/+24
*	Merge pull request #10246 from prathamesh-sonpatki/3.2.13-https-rubygems	Carlos Antonio da Silva	2013-04-17	1	-1/+1
\|\
\| *	Use secure source in generated Gemfile for creating new plugin. Closes #10245	Prathamesh Sonpatki	2013-04-17	1	-1/+1
* \|	Fix "Scaling Rails Screencasts" link in caching guide	Carlos Antonio da Silva	2013-04-16	1	-1/+1
\|/
*	Merge pull request #9688 from alexeymuranov/doc-nested-attributes-3-2	Carlos Antonio da Silva	2013-04-13	1	-17/+41
\|\
\| *	Document nested attributes as hash of hashes	Alexey Muranov	2013-04-13	1	-17/+41
\|/
*	Merge pull request #10172 from senny/10098_backport	Rafael Mendonça França	2013-04-11	4	-1/+13
\|\
\| *	Correctly parse bigint defaults in PostgreSQL, Backpost #10098.	Erik Peterson	2013-04-11	4	-1/+13
\|/
*	Merge branch '3-2-later' into 3-2-stable	Aaron Patterson	2013-04-09	1	-0/+10
\|\
\| *	adding test for CVE	Aaron Patterson	2013-02-09	1	-0/+10
* \|	Improve the changelog entry [ci skip]	Rafael Mendonça França	2013-04-05	1	-3/+4
* \|	Merge pull request #10105 from rmm5t/fix-explicit-name-on-multiple-fields	Rafael Mendonça França	2013-04-05	3	-8/+24
\|\ \
\| * \|	Fix explicit names on multiple file fields	Ryan McGeary	2013-04-05	3	-8/+24
\|/ /
* \|	Fix typo in view name	Carlos Antonio da Silva	2013-04-03	2	-1/+1
* \|	Use 1.8 hash style in test views	Carlos Antonio da Silva	2013-04-03	2	-2/+2
* \|	Merge pull request #7792 from seejee/chained_scopes_preload_properly	Carlos Antonio da Silva	2013-04-03	4	-2/+22
\|\ \
\| * \|	Chained scopes will be preloaded properly. Fixes #7490	Chris Geihsler	2013-04-03	4	-2/+22
* \| \|	Common behavior with adding formats to lookup_context for TemplateRenderer an...	Dmitry Vorotilin	2013-04-02	12	-4/+33
* \| \|	Fix formatting and minor review in AP changelog	Carlos Antonio da Silva	2013-03-30	1	-9/+8
* \| \|	Add attr_accessible to the Getting Started Guide.	Steve Klabnik	2013-03-29	1	-0/+2
* \| \|	Removing explain support warning from the Railtie	Rafael Mendonça França	2013-03-28	2	-7/+7
* \| \|	Merge pull request #9943 from fredwu/test_fix_for_74e59ea	Carlos Antonio da Silva	2013-03-26	1	-1/+1
\|\ \ \
\| * \| \|	Fixed test failures on 1.8.7 caused by 74e59ea	Fred Wu	2013-03-27	1	-1/+1
\|/ / /
* \| \|	Merge pull request #9576 from fredwu/backport_fix_explicitly_inheraitance_col...	Rafael Mendonça França	2013-03-26	3	-1/+18
\|\ \ \
\| * \| \|	Added changelog for 55e2954	Fred Wu	2013-03-27	1	-0/+5
\| * \| \|	Don't reset inheritance_column when setting explicitly.	Fred Wu	2013-03-27	2	-1/+13
\|/ / /
* \| \|	Merge pull request #9899 from macksmind/backport_5808	Jeremy Kemper	2013-03-24	3	-6/+60
\|\ \ \
\| * \| \|	Backport #5808	Mack Earnhardt	2013-03-24	3	-6/+60
\|/ / /
* \| \|	Merge pull request #9873 from senny/use_old_hash_syntax	Jon Leighton	2013-03-22	1	-1/+1
\|\ \ \
\| * \| \|	use ruby 1.8 Hash syntax [ci skip]	Yves Senn	2013-03-22	1	-1/+1
\|/ / /
* \| \|	Merge pull request #9870 from senny/9806_eager_loading_regression	Jon Leighton	2013-03-22	2	-2/+8
\|\ \ \
\| * \| \|	do not reset associations when preloading twice.	Yves Senn	2013-03-22	2	-2/+8
\|/ / /
* \| \|	Fix test to Ruby 1.8	Rafael Mendonça França	2013-03-21	1	-1/+1
* \| \|	Improve CHANGELOG entry [ci skip]	Rafael Mendonça França	2013-03-21	1	-1/+5
* \| \|	Merge branch '3-2-stable' into fredwu-slow_view_loading_fix	Aaron Patterson	2013-03-20	6	-2/+32
\|\ \ \
\| * \| \|	Merge pull request #9802 from newsline/fix-broken-action-missing	Rafael Mendonça França	2013-03-20	3	-1/+18
\| * \| \|	Remove bad changelog entry from AR [ci skip]	Carlos Antonio da Silva	2013-03-20	1	-3/+0
\| * \| \|	Wrong exception is occured when raising no translatable exception	kennyj	2013-03-20	3	-0/+16
\| * \| \|	Don't crash exception translation w/ nil result attribute.	Steve Jorgensen	2013-03-20	1	-1/+1
* \| \| \|	Added changelog for 687e68d	Fred Wu	2013-03-21	1	-0/+6
* \| \| \|	Fixed assets loading performance in 3.2.13	Fred Wu	2013-03-20	2	-1/+10
\|/ / /
* \| \|	Be consistent with quotes in smtp example guide [ci skip]	Carlos Antonio da Silva	2013-03-19	1	-1/+1
* \| \|	Merge pull request #9796 from dembskoi/clone_structure	Rafael Mendonça França	2013-03-19	2	-0/+8
\|\ \ \
\| * \| \|	Reset postgreSQL search path in db:test:clone_structure.	Alexander	2013-03-19	2	-0/+8
* \| \| \|	Merge pull request #9804 from samsonasu/backport_number_to_human_fixes	Rafael Mendonça França	2013-03-19	3	-1/+20
\|\ \ \ \ \| \|/ / / \|/\| \| \|
\| * \| \|	Backport #9347 to rails 3.2	hoffm	2013-03-19	3	-1/+20
\|/ / /