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

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge pull request #15693 from pdg137/enforce_utf8	Matthew Draper	2014-06-14	3	-7/+7
\|\
\| *	In actionview, eliminate calls to tag that use html_safe parameter values. Th...	Paul Grayson	2014-06-13	3	-8/+7
* \|	Merge pull request #15579 from sgrif/sg-through-associations	Rafael Mendonça França	2014-06-13	5	-7/+47
\|\ \
\| * \|	Through associations should set both parent ids on join models	Sean Griffin	2014-06-13	5	-7/+47
* \| \|	Merge pull request #15692 from sromano/falseClass	Matthew Draper	2014-06-14	3	-2/+29
\|\ \ \ \| \|/ / \|/\| \|
\| * \|	ActionController::Parameters#require now accepts FalseClass values	Sergio Romano	2014-06-13	3	-1/+24
* \| \|	Merge pull request #15674 from sgrif/sg-mutable-attributes	Matthew Draper	2014-06-14	12	-36/+149
\|\ \ \
\| * \| \|	Detect in-place changes on mutable AR attributes	Sean Griffin	2014-06-13	12	-36/+149
* \| \| \|	Merge pull request #15695 from sgrif/sg-rm-column-types-override	Rafael Mendonça França	2014-06-13	2	-11/+2
\|\ \ \ \
\| * \| \| \|	Remove unused column types override	Sean Griffin	2014-06-13	2	-11/+2
* \| \| \| \|	Merge pull request #15696 from sgrif/sg-bad-test	Rafael Mendonça França	2014-06-13	1	-2/+2
\|\ \ \ \ \
\| * \| \| \| \|	Reorder test which does not represent real world usage	Sean Griffin	2014-06-13	1	-2/+2
\| \|/ / / /
* \| \| \| \|	s/variable supplied/value supplied [ci skip]	Zachary Scott	2014-06-13	1	-2/+1
* \| \| \| \|	Reword PreparedStatementInvalid example, and use values instead of	Zachary Scott	2014-06-13	1	-4/+3
* \| \| \| \|	Revert code changes at "Copy edits and code font wrap for Active Record [ci s...	Rafael Mendonça França	2014-06-13	1	-1/+7
* \| \| \| \|	Merge pull request #15306 from rails/4-2-release_notes	Zachary Scott	2014-06-13	2	-0/+249
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \|
\| * \| \| \|	First pass at Rails 4.2 release notes [ci skip]	Godfrey Chan	2014-06-13	1	-2/+2
\| * \| \| \|	Create 4.2 release notes guide scaffold [ci skip]	Zachary Scott	2014-06-13	2	-0/+249
* \| \| \| \|	Merge pull request #15689 from sgrif/sg-attribute-methods	Matthew Draper	2014-06-14	2	-0/+9
\|\ \ \ \ \
\| * \| \| \| \|	Ensure we always define attribute methods	Sean Griffin	2014-06-13	2	-0/+9
* \| \| \| \| \|	Merge pull request #15593 from sgrif/sg-attribute	Rafael Mendonça França	2014-06-13	16	-88/+225
\|\ \ \ \ \ \ \| \|_\|/ / / / \|/\| \| \| \| \|
\| * \| \| \| \|	Introduce an Attribute object to handle the type casting dance	Sean Griffin	2014-06-13	16	-88/+225
* \| \| \| \| \|	Copy edits from e0f3f1a [ci skip]	Zachary Scott	2014-06-13	1	-3/+7
* \| \| \| \| \|	Copy edits and code font wrap for Active Record [ci skip]	Zachary Scott	2014-06-13	2	-30/+30
* \| \| \| \| \|	Document behavior concerns regarding the full Rails stack [ci skip]	Zachary Scott	2014-06-13	1	-0/+24
\| \|_\|_\|_\|/ \|/\| \| \| \|
* \| \| \| \|	Merge pull request #15690 from deeeki/activemodel_model_doc	Arthur Nogueira Neves	2014-06-13	1	-3/+3
\|\ \ \ \ \
\| * \| \| \| \|	[ci skip] Clarify ActiveModel::Model docs	deeeki	2014-06-14	1	-3/+3
* \| \| \| \| \|	Builder source code is still available on github [ci skip]	Zachary Scott	2014-06-13	1	-0/+3
* \| \| \| \| \|	Add links to RDoc back into API documentation guidelines [ci skip]	Zachary Scott	2014-06-13	1	-1/+7
* \| \| \| \| \|	Specifically talking about Rake the library [ci skip]	Zachary Scott	2014-06-13	1	-2/+1
\| \|_\|_\|_\|/ \|/\| \| \| \|
* \| \| \| \|	Merge pull request #15682 from tgxworld/controller_test_process	Rafael Mendonça França	2014-06-13	1	-2/+5
\|\ \ \ \ \
\| * \| \| \| \|	Set flash in test session when necessary.	Guo Xiang Tan	2014-06-12	1	-2/+5
* \| \| \| \| \|	Merge pull request #15683 from larrylv/fix-token-with-empty-value	Matthew Draper	2014-06-13	3	-8/+32
\|\ \ \ \ \ \ \| \|_\|_\|_\|/ / \|/\| \| \| \| \|
\| * \| \| \| \|	Fix parsed token value with header `Authorization token=`.	Larry Lv	2014-06-13	3	-8/+32
* \| \| \| \| \|	Merge pull request #15686 from sgrif/sg-pg-int-arrays	Rafael Mendonça França	2014-06-13	2	-6/+15
\|\ \ \ \ \ \ \| \|/ / / / / \|/\| \| \| \| \|
\| * \| \| \| \|	PG arrays should type cast user input	Sean Griffin	2014-06-13	2	-6/+15
\|/ / / / /
* \| \| \| \|	pg guide, minor copy edits	Yves Senn	2014-06-13	1	-2/+4
* \| \| \| \|	Set the status before of setting the response body	Guillermo Iguaran	2014-06-13	1	-2/+2
* \| \| \| \|	Merge pull request #15680 from akshay-vishnoi/doc_changes	Sean Griffin	2014-06-12	1	-1/+1
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \|
\| * \| \| \|	[ci skip] BigDecimal#duplicable? returns false in 1.9.x	Akshay Vishnoi	2014-06-13	1	-1/+1
* \| \| \| \|	Merge pull request #15678 from sgrif/sg-test-hash	Matthew Draper	2014-06-13	1	-0/+7
\|\ \ \ \ \
\| * \| \| \| \|	Add a test to ensure we don't get a performance regression on #hash	Sean Griffin	2014-06-12	1	-0/+7
* \| \| \| \| \|	Merge pull request #15677 from sgrif/sg-less-imperative-pk	Matthew Draper	2014-06-13	1	-3/+4
\|\ \ \ \ \ \
\| * \| \| \| \| \|	Use a conditional rather than early return in `id`	Sean Griffin	2014-06-12	1	-3/+4
\| \|/ / / / /
* \| \| \| \| \|	Merge pull request #15676 from sgrif/sg-object-hash	Matthew Draper	2014-06-13	1	-1/+5
\|\ \ \ \ \ \ \| \|/ / / / / \|/\| \| \| \| \|
\| * \| \| \| \|	Defer to super, rather than re-implementing Object#hash	Sean Griffin	2014-06-12	1	-1/+5
\|/ / / / /
* \| \| \| \|	Merge pull request #15665 from sgrif/sg-id-perf	Sean Griffin	2014-06-12	2	-1/+2
\|\ \ \ \ \
\| * \| \| \| \|	Fix performance regression on preloading HABTM associations	Sean Griffin	2014-06-12	2	-1/+2
* \| \| \| \| \|	Merge pull request #15654 from pdg137/master	Matthew Draper	2014-06-13	5	-7/+51
\|\ \ \ \ \ \
\| * \| \| \| \| \|	In tag helper, honor html_safe on array parameters; also make safe_join more ...	Paul Grayson	2014-06-12	4	-8/+51