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

	Commit message (Expand)	Author	Age	Files	Lines
*	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
\|/ / / / / /
* \| \| \| \| \|	Merge pull request #14823 from kuldeepaggarwal/fix-inflector-example	Arun Agrawal	2014-04-20	1	-1/+1
\|\ \ \ \ \ \ \| \|/ / / / / \|/\| \| \| \| \|
\| * \| \| \| \|	[ci-skip] correct the classify example's output	Kuldeep Aggarwal	2014-04-21	1	-1/+1
\|/ / / / /
* \| \| \| \|	Merge pull request #14820 from akshay-vishnoi/doc_changes	Richard Schneeman	2014-04-20	6	-8/+8
\|\ \ \ \ \ \| \| \|_\|_\|/ \| \|/\| \| \|
\| * \| \| \|	[ci skip] builtin -> built-in	Akshay Vishnoi	2014-04-20	6	-8/+8
* \| \| \| \|	Merge pull request #14821 from jonatack/patch-5	Arthur Nogueira Neves	2014-04-20	1	-47/+63
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \|
\| * \| \| \|	Fix code indentation and improve formatting	Jon Atack	2014-04-20	1	-47/+63
\|/ / / /
* \| \| \|	Merge pull request #14816 from jonatack/patch-2	Robin Dupret	2014-04-20	1	-1/+1
\|\ \ \ \
\| * \| \| \|	Grammar fix in Getting Started Guide	Jon Atack	2014-04-20	1	-1/+1
\|/ / / /
* \| \| \|	Make URL escaping more consistent	Andrew White	2014-04-20	8	-10/+89
* \| \| \|	Optimize URI escaping	Andrew White	2014-04-20	1	-17/+42
* \| \| \|	Always escape string passed to url helper.	edogawaconan	2014-04-20	2	-3/+3
* \| \| \|	Merge pull request #14811 from qrush/master	Guillermo Iguaran	2014-04-19	1	-1/+1
\|\ \ \ \
\| * \| \| \|	Remove statement assuming coffee shop/public space wifi is inherently insecure	Nick Quaranto	2014-04-19	1	-1/+1
\|/ / / /
* \| \| \|	Merge pull request #14810 from robin850/patch-18	Godfrey Chan	2014-04-19	1	-1/+0
\|\ \ \ \
\| * \| \| \|	Don't rely on Arel master in bug report template [ci skip]	Robin Dupret	2014-04-19	1	-1/+0
\|/ / / /
* \| \| \|	Merge pull request #14805 from akshay-vishnoi/structure-change	Andrew White	2014-04-19	1	-0/+0
\|\ \ \ \
\| * \| \| \|	multibyte_conformance.rb --> multibyte_conformance_test.rb	Akshay Vishnoi	2014-04-19	1	-0/+0
\| \|/ / /
* \| \| \|	Merge pull request #14804 from akshay-vishnoi/doc_changes	Arthur Nogueira Neves	2014-04-19	3	-4/+4
\|\ \ \ \
\| * \| \| \|	"subhash" --> "sub-hash"	Akshay Vishnoi	2014-04-19	3	-4/+4
\| \|/ / /
* \| \| \|	Merge pull request #14808 from akalyaev/few-corrections-in-rails-initializati...	Xavier Noria	2014-04-19	1	-2/+2
\|\ \ \ \ \| \|/ / / \|/\| \| \|
\| * \| \|	wrap methods in backticks [ci skip]	Anton Kalyaev	2014-04-19	1	-2/+2
\|/ / /