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

	Commit message (Expand)	Author	Age	Files	Lines
*	Add CHANGELOG entry for #10971	Rafael Mendonça França	2013-06-24	1	-0/+14
*	Merge pull request #10971 from dtaniwaki/escape_link_to_unless	Rafael Mendonça França	2013-06-24	2	-1/+6
*	Fix textile markup	Rafael Mendonça França	2013-06-24	1	-1/+1
*	Revert "Merge pull request #10901 from armstrjare/fix_query_null_foreign_key_...	Yves Senn	2013-06-22	3	-34/+1
*	Merge pull request #10901 from armstrjare/fix_query_null_foreign_key_on_new_r...	Yves Senn	2013-06-22	3	-1/+34
\|\
\| *	Fixes CollectionAssociation#ids_reader returning incorrect ids for new records	Jared Armstrong	2013-06-21	3	-1/+34
* \|	Merge pull request #11033 from robin850/patch-1	Xavier Noria	2013-06-20	1	-5/+5
\|\ \
\| * \|	Update the feedback instructions [ci skip]	Robin Dupret	2013-06-20	1	-5/+5
\|/ /
* \|	Merge pull request #10883 from ifeelgoods/3-2-stable	Yves Senn	2013-06-19	1	-2/+2
\|\ \
\| * \|	indicate the default Rails cache store	Matthieu Paret	2013-06-19	1	-2/+2
* \| \|	Compare host scheme using case-insensitive regexp	Rafael Mendonça França	2013-06-16	3	-11/+52
* \| \|	nokogiri >= 1.6 doesn't work with ruby 1.8	Rafael Mendonça França	2013-06-15	1	-1/+1
* \| \|	Merge pull request #10925 from senny/10917_test_to_prevent_regression	Yves Senn	2013-06-15	3	-3/+35
\| \|/ \|/\|
* \|	Override Time.at to work with Time-like values	Andrew White	2013-06-08	3	-0/+38
\|/
*	adding a test for #10830	Aaron Patterson	2013-06-05	1	-0/+46
*	Restore rescue block for when IM is enabled	Andrew White	2013-05-24	1	-19/+22
*	Merge pull request #10745 from arunagw/build_fix_ruby187	Andrew White	2013-05-24	4	-7/+7
\|\
\| *	It's scoped in 3-2-stable!	Arun Agrawal	2013-05-24	1	-1/+1
\| *	Using 1.8.7 syntax for 3-2-stable	Arun Agrawal	2013-05-24	3	-6/+6
\|/
*	Merge pull request #10713 from senny/10693_fix_primary_key_option_on_has_many	Rafael Mendonça França	2013-05-23	4	-2/+15
*	Merge pull request #10681 from jholton/3-2-stable-fix_association_auto_save	Rafael Mendonça França	2013-05-22	3	-31/+48
\|\
\| *	destroys association records before saving/inserting new association records	Johnny Holton	2013-05-18	3	-31/+48
* \|	Merge pull request #10646 from kennyj/fix_am_20130517	Rafael Mendonça França	2013-05-20	1	-1/+1
\|/
*	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
\|/ / /