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

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge pull request #16034 from sgrif/sg-hstore-type-object	Rafael Mendonça França	2014-07-03	4	-66/+39
\|\
\| *	Use the type object for type casting HStore columns	Sean Griffin	2014-07-03	4	-66/+39
\|/
*	Merge pull request #15941 from variousred/docrails-changes	Vijay Dev	2014-07-03	1	-8/+10
\|\
\| *	[ci skip] Changes some wording to better foreshadow what is coming up later.	Michael Mitchell	2014-07-02	1	-8/+10
* \|	Merge pull request #16029 from cade/fix_typo_in_comment	Vijay Dev	2014-07-03	1	-1/+1
\|\ \
\| * \|	Fix typo in comment	Cade Truitt	2014-07-02	1	-1/+1
\|/ /
* \|	Merge pull request #16026 from lucasmazza/lm-respond-to-jsonp-fix	Rafael Mendonça França	2014-07-02	3	-1/+24
\|\ \
\| * \|	Change the JSON renderer to enforce the 'JS' Content Type	Lucas Mazza	2014-07-02	3	-1/+24
* \| \|	Add CHANGELOG for c803b90	Godfrey Chan	2014-07-02	1	-0/+4
* \| \|	The hex escape sequence can be of any length	Godfrey Chan	2014-07-02	1	-1/+1
* \| \|	Fix escape_once double-escaping hex-encoded entities	John F. Douthat	2014-07-02	3	-1/+3
* \| \|	Only automatically include validations when enabled	Godfrey Chan	2014-07-02	2	-12/+5
* \| \|	Merge pull request #16001 from johnpaulashenfelter/jp_fix_datetime_to_f	Godfrey Chan	2014-07-02	3	-2/+10
\|\ \ \ \| \|/ / \|/\| \|
\| * \|	`DateTime#to_f` now preserves fractional seconds.	John Paul Ashenfelter	2014-07-02	3	-2/+10
\|/ /
* \|	Merge pull request #16024 from aditya-kapoor/include-validations	Rafael Mendonça França	2014-07-02	4	-2/+6
\|\ \
\| * \|	automatically include ActiveModel::Validations when include ActiveModel::Secu...	Aditya Kapoor	2014-07-03	4	-2/+6
* \| \|	Merge pull request #16015 from sgrif/sg-ensure-initialized	Rafael Mendonça França	2014-07-02	2	-4/+7
\|\ \ \ \| \|/ / \|/\| \|
\| * \|	Move pk initialization logic onto `AttributeSet`	Sean Griffin	2014-07-02	2	-4/+7
* \| \|	Merge pull request #16022 from sgrif/sg-range-quoting	Rafael Mendonça França	2014-07-02	3	-2/+19
\|\ \ \
\| * \| \|	Quote range strings when quoting PG ranges	Sean Griffin	2014-07-02	3	-2/+19
\|/ / /
* \| /	Fix SQL injection when querying against ranges and bitstrings	Rafael Mendonça França	2014-07-02	3	-4/+16
\| \|/ \|/\|
* \|	Fix typo	Rafael Mendonça França	2014-07-02	1	-1/+1
* \|	Merge pull request #16016 from sgrif/sg-dup	Rafael Mendonça França	2014-07-02	3	-2/+19
\|\ \
\| * \|	Don't error when `dup`ing a record with no PK	Sean Griffin	2014-07-02	3	-2/+19
\| \|/
* \|	Merge pull request #16007 from nishantmodak/flash_msg_as_string	Rafael Mendonça França	2014-07-02	1	-3/+6
\|\ \ \| \|/ \|/\|
\| *	flash doesn't pass objects #15522 [ci skip]	Nishant Modak	2014-07-01	1	-3/+6
* \|	Revert "Merge pull request #15394 from morgoth/fix-automatic-maintaining-test...	Rafael Mendonça França	2014-07-02	4	-105/+3
* \|	Tiny follow-up to #15987 and 088b4c3e [ci skip]	Robin Dupret	2014-07-02	1	-4/+4
* \|	do not hold on to a stale connection object. fixes #15998	Aaron Patterson	2014-07-01	2	-6/+14
* \|	Merge pull request #15999 from eileencodes/add-regression-tests-for-keys-on-n...	Rafael Mendonça França	2014-07-01	1	-0/+32
\|\ \ \| \|/ \|/\|
\| *	Add regression tests for keys on nested associations	eileencodes	2014-07-01	1	-0/+32
* \|	Merge pull request #16006 from ShunsukeAida/xml_http_request_comment_change	Rafael Mendonça França	2014-07-01	1	-2/+2
\|\ \
\| * \|	makes it sound less misleading	ShunsukeAida	2014-07-02	1	-2/+2
* \| \|	Rename preview_enabled option to show_previews	Rafael Mendonça França	2014-07-01	6	-20/+20
* \| \|	Merge pull request #15970 from lengarvey/add_configuration_option_for_mail_pr...	Rafael Mendonça França	2014-07-01	7	-3/+80
\|\ \ \ \| \|/ / \|/\| \|
\| * \|	Add configuration to enable mail previews	Leonard Garvey	2014-07-01	7	-3/+80
* \| \|	Merge pull request #16000 from sgrif/sg-silence-warning	Matthew Draper	2014-07-02	1	-0/+1
\|\ \ \
\| * \| \|	Silence warning emitted in tests	Sean Griffin	2014-07-01	1	-0/+1
* \| \| \|	Merge pull request #16004 from JuanitoFatas/doc/patch-1	Rafael Mendonça França	2014-07-01	1	-0/+2
\|\ \ \ \ \| \|/ / / \|/\| \| \|
\| * \| \|	[ci skip] Add missing prologue section of upgrading ruby on rails guide.	Juanito Fatas	2014-07-01	1	-0/+2
\| \| \|/ \| \|/\|
* \| \|	Merge pull request #15997 from cirosantilli/typo	Eileen M. Uchitelle	2014-07-01	1	-1/+1
\|\ \ \ \| \|/ / \|/\| \|
\| * \|	Fix doc unwanted dl Admin:: [ci skip]	Ciro Santilli	2014-07-01	1	-1/+1
\|/ /
* \|	push host / port / protocol extraction up	Aaron Patterson	2014-06-30	1	-6/+6
* \|	Add CHANGELOG entry for #15214	Rafael Mendonça França	2014-06-30	1	-0/+4
* \|	Use if/else	Rafael Mendonça França	2014-06-30	1	-2/+5
* \|	Merge pull request #15214 from todd/date_field_docs	Rafael Mendonça França	2014-06-30	3	-2/+119
\|\ \
\| * \|	Add String support for min/max attributes on DatetimeField	Todd Bealmear	2014-06-30	3	-2/+119
\|/ /
* \|	Rename rollback_changes to undo_changes	Rafael Mendonça França	2014-06-30	3	-6/+6
* \|	Add CHANGELOG entry for #14861 and document private methods on the API	Rafael Mendonça França	2014-06-30	2	-5/+10
* \|	Merge pull request #14861 from igor04/dirty-rollback	Rafael Mendonça França	2014-06-30	2	-0/+35
\|\ \