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

	Commit message (Expand)	Author	Age	Files	Lines
*	Warning removed for missmatched indentation	Arun Agrawal	2014-04-26	1	-2/+2
*	Merge pull request #14853 from kassio/kb-fix-custom-join-table-habtm	Yves Senn	2014-04-25	4	-2/+15
\|\
\| *	Fix custom join_table name on habtm reflections	Kassio Borges	2014-04-25	4	-2/+15
* \|	Merge pull request #14873 from jonatack/patch-8	Yves Senn	2014-04-25	1	-5/+5
\|\ \
\| * \|	Fix code & grammar in Form Helpers Guide	Jon Atack	2014-04-25	1	-5/+5
\|/ /
* \|	Merge branch 'master' into adequaterecord	Aaron Patterson	2014-04-25	39	-380/+634
\|\\|
\| *	move AR length validation tests into separate test-case.	Yves Senn	2014-04-24	2	-42/+48
\| *	No need for trailing slash on migration path.	Jeremy Kemper	2014-04-24	1	-1/+1
\| *	reset `@arel` when modifying a Relation in place.	Yves Senn	2014-04-24	3	-1/+18
\| *	Merge pull request #14859 from jefflai2/datetime_type	Yves Senn	2014-04-24	2	-6/+15
\| \|\
\| \| *	PostgreSQL Timestamps always map to `:datetime`.	Jefferson Lai	2014-04-24	2	-6/+15
\| * \|	Merge pull request #14856 from Gaurav2728/gaurav-typo_fix	Santiago Pastorino	2014-04-24	1	-2/+2
\| \|\ \ \| \| \|/ \| \|/\|
\| \| *	[ci skip] Improve formatting and yml	Gaurav Sharma	2014-04-24	1	-2/+2
\| \|/
\| *	Merge pull request #14858 from ebouchut/patch-1	Robin Dupret	2014-04-24	1	-1/+1
\| \|\
\| \| *	Fix a typo in the doc of forty_two AR FinderMethod	Eric Bouchut	2014-04-24	1	-1/+1
\| \|/
\| *	Merge pull request #14843 from tgxworld/improve_readability_of_contributing_t...	Santiago Pastorino	2014-04-23	1	-5/+5
\| \|\
\| \| *	Improve readability of contributing to rails guide. [ci skip]	Guo Xiang Tan	2014-04-23	1	-5/+5
\| * \|	Merge pull request #14852 from matthewd/fix_build_for_assets	Rafael Mendonça França	2014-04-23	1	-2/+2
\| \|\ \
\| \| * \|	Precompile the image we're referencing, too.	Matthew Draper	2014-04-24	1	-2/+2
\| \|/ /
\| * \|	Merge pull request #14842 from lucasmazza/lm-no-touching-callbacks	Yves Senn	2014-04-23	3	-2/+27
\| \|\ \
\| \| * \|	`ActiveRecord::Base.no_touching` no longer triggers callbacks or start empty ...	Lucas Mazza	2014-04-23	3	-2/+27
\| \| \|/
\| * \|	Merge pull request #14850 from chancancode/fix_json_cookie_jar	Guillermo Iguaran	2014-04-23	3	-2/+132
\| \|\ \
\| \| * \|	Fixed an issue with migrating legacy json cookies.	Godfrey Chan	2014-04-23	3	-2/+132
\| \|/ /
\| * \|	Merge pull request #14840 from akshay-vishnoi/doc_changes	Arthur Nogueira Neves	2014-04-23	1	-2/+2
\| \|\ \ \| \| \|/ \| \|/\|
\| \| *	Correct comment [ci skip]	Akshay Vishnoi	2014-04-23	1	-2/+2
\| * \|	Perfer to define methods instead of calling test	Rafael Mendonça França	2014-04-22	1	-4/+4
\| * \|	Fix syntax error	Rafael Mendonça França	2014-04-22	1	-0/+1
\| * \|	Add CHANGELOG entry for #14757 [ci skip]	Rafael Mendonça França	2014-04-22	1	-0/+6
\| * \|	Merge pull request #14757 from estsauver/14752	Rafael Mendonça França	2014-04-22	5	-6/+19
\| \|\ \
\| \| * \|	select! renamed to avoid name collision Array#select!	Earl J St Sauver	2014-04-21	5	-6/+19
\| * \| \|	Merge pull request #14573 from habermann24/has_many_through_fix	Rafael Mendonça França	2014-04-22	5	-2/+30
\| \|\ \ \
\| \| * \| \|	Minor improvement: Use the merge method on the relation instead of instance_e...	Jan Habermann	2014-04-03	1	-1/+1
\| \| * \| \|	Simplify the code in target_scope	Jan Habermann	2014-04-03	1	-5/+2
\| \| * \| \|	Add a CHANGELOG entry for the has_many :through scoping fix (See #14537 for d...	Jan Habermann	2014-04-03	1	-0/+9
\| \| * \| \|	Properly handle scoping with has_many :through. Fixes #14537.	Jan Habermann	2014-04-03	4	-2/+25
\| * \| \| \|	Merge pull request #14801 from kuldeepaggarwal/fix-string-inflection	Rafael Mendonça França	2014-04-22	2	-1/+6
\| \|\ \ \ \
\| \| * \| \| \|	Fix inconsistent behavior from String#pluralize	Kuldeep Aggarwal	2014-04-19	2	-1/+6
\| * \| \| \| \|	Merge pull request #14836 from jonatack/patch-5	Yves Senn	2014-04-22	1	-8/+8
\| \|\ \ \ \ \
\| \| * \| \| \| \|	Fix run-on sentences and improve grammar [skip ci]	Jon Atack	2014-04-22	1	-8/+8
\| \|/ / / / /
\| * \| \| \| \|	Merge pull request #13335 from glorieux/favicon_link_tag_mimetype	Rafael Mendonça França	2014-04-22	3	-6/+21
\| \|\ \ \ \ \
\| \| * \| \| \| \|	Change favicon_link_tag helper mimetype from image/vnd.microsoft.icon to imag...	glorieux	2014-04-21	3	-6/+21
\| * \| \| \| \| \|	Merge pull request #10764 from mokevnin/replace_class_eval_by_define_method	Rafael Mendonça França	2014-04-22	1	-35/+29
\| \|\ \ \ \ \ \
\| \| * \| \| \| \| \|	replace class_eval by define_method in abstract_controller/callbacks	kirill	2014-04-20	1	-35/+29
\| * \| \| \| \| \| \|	Merge pull request #14835 from zzak/test_form_helper_label_with_block_and_html	Rafael Mendonça França	2014-04-22	2	-0/+8
\| \|\ \ \ \ \ \ \
\| \| * \| \| \| \| \| \|	Add test for using ActionView::Helpers::FormHelper.label with block and html	Zachary Scott	2014-04-22	2	-0/+8
\| \|/ / / / / / /
\| * \| / / / / /	Rearrange deck chairs on the titanic. Organize connection handling test cases.	Jeremy Kemper	2014-04-21	4	-249/+246
\| \| \|/ / / / / \| \|/\| \| \| \| \|
\| * \| \| \| \| \|	Merge pull request #14826 from stevegraham/action_controller_renderer_doc_fix	Arthur Nogueira Neves	2014-04-20	1	-2/+2
\| \|\ \ \ \ \ \
\| \| * \| \| \| \| \|	ActionController::Renderers documentation fix	Stevie Graham	2014-04-20	1	-2/+2
\| * \| \| \| \| \| \|	Merge pull request #14825 from arunagw/aa-remove-missleading-comment	Arun Agrawal	2014-04-20	1	-1/+1
\| \|\ \ \ \ \ \ \ \| \| \|/ / / / / / \| \|/\| \| \| \| \| \|
\| \| * \| \| \| \| \|	Changed miss-leading comment [ci skip]	Arun Agrawal	2014-04-20	1	-1/+1
\| \|/ / / / / /