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

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge pull request #10578 from dingle/lu/back_port_to_json_fix	Rafael Mendonça França	2013-05-15	3	-3/+19
\|\
\| *	Support include_root_in_json for ActiveResource properly.	Xinjiang Lu	2013-05-15	3	-3/+19
* \|	Merge pull request #10616 from Empact/backport-distinct-distinct	Rafael Mendonça França	2013-05-14	3	-0/+20
\|\ \
\| * \|	Backport a super-simplified version of #6792, fixing	Ben Woosley	2013-05-14	3	-0/+20
\|/ /
* \|	Update mail to minimum version 2.5.4	Mikel Lindsaar	2013-05-14	1	-1/+1
* \|	Improve CHANGELOG entries	Rafael Mendonça França	2013-05-12	2	-3/+13
* \|	Merge pull request #7695 from benolee/backport_cc7dd66_and_c0ba0f0	Rafael Mendonça França	2013-05-12	10	-1/+87
\|\ \ \| \|/ \|/\|
\| *	backport runner fixes to 3-2-stable	kennyj	2012-12-16	10	-0/+88
* \|	Merge pull request #10303 from ahorner/3-2-stable	Rafael Mendonça França	2013-05-11	5	-4/+47
\|\ \
\| * \|	Preserve context for joins while merging relations	Andrew Horner	2013-05-11	5	-4/+47
\|/ /
* \|	Merge pull request #10571 from dasch/dasch/restore-explain-fix	Rafael Mendonça França	2013-05-11	3	-1/+12
\|\ \
\| * \|	Don't try to EXPLAIN select_db calls	Daniel Schierbeck	2013-05-12	3	-1/+12
* \| \|	Add CHANGELOG entry removed by mistake [ci skip]	Rafael Mendonça França	2013-05-11	1	-0/+7
\|/ /
* \|	Revert "Don't try to EXPLAIN select_db calls"	Xavier Noria	2013-05-11	2	-8/+1
* \|	So not make Fixnum#/ private on Ruby verions less than 1.9.3	Rafael Mendonça França	2013-05-10	1	-4/+3
* \|	Fix test to ruby 2.0	Rafael Mendonça França	2013-05-10	1	-2/+9
* \|	Merge pull request #10557 from arunagw/pluck-refactor-using-map	Andrew White	2013-05-10	1	-1/+1
\|\ \
\| * \|	Using map. No need to run query again	Arun Agrawal	2013-05-10	1	-1/+1
\|/ /
* \|	Merge pull request #10555 from dasch/dasch/3-2-stable	Xavier Noria	2013-05-10	2	-1/+8
\|\ \
\| * \|	Don't try to EXPLAIN select_db calls	Daniel Schierbeck	2013-05-10	2	-1/+8
* \| \|	Merge pull request #10552 from arunagw/pluck-fixed-3-2-stable	Rafael Mendonça França	2013-05-10	2	-6/+7
\|\ \ \
\| * \| \|	Fixed pluck to be working with selects.	Arun Agrawal	2013-05-10	2	-3/+7
\| * \| \|	Remove useless else	Arun Agrawal	2013-05-10	1	-3/+0
\|/ / /
* \| \|	Revert "Merge pull request #8209 from senny/backport_8176"	Rafael Mendonça França	2013-05-08	3	-6/+11
* \| \|	Revert "Remove unicode character encoding from ActiveSupport::JSON.encode"	Rafael Mendonça França	2013-05-08	3	-23/+23
* \| \|	Merge pull request #10496 from arunagw/build-fix-scaffold-generator	Carlos Antonio da Silva	2013-05-07	1	-1/+1
\|\ \ \
\| * \| \|	Build fix for scaffold generator	Arun Agrawal	2013-05-07	1	-1/+1
\|/ / /
* \| \|	Merge pull request #10489 from greenriver/ar_counter_cache_multiple_destroy	Rafael Mendonça França	2013-05-06	3	-1/+28
* \| \|	Merge pull request #10478 from cainlevy/patch-1	Rafael Mendonça França	2013-05-06	1	-1/+1
* \| \|	Merge pull request #10406 from greenriver/distance_of_time_rational	Rafael Mendonça França	2013-05-06	2	-1/+6
\|\ \ \
\| * \| \|	Merging in fix from #8222	Ben Tucker	2013-05-06	2	-1/+6
\| \|/ /
* \| \|	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