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

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge pull request #11203 from schneems/schneems/plugin_new-plugin	Rafael Mendonça França	2013-07-01	35	-16/+20
\|\
\| *	s/plugin_new/plugin	schneems	2013-06-30	35	-16/+20
* \|	Merge pull request #11207 from vipulnsward/remove_escapes	Carlos Antonio da Silva	2013-07-01	1	-6/+6
\|\ \
\| * \|	Remove redundant escapes from xml serialization test	Vipul A M	2013-07-01	1	-6/+6
* \| \|	Merge pull request #11211 from gsamokovarov/trailing-comma	Guillermo Iguaran	2013-07-01	1	-10/+9
\|\ \ \
\| * \| \|	Further clean-up of ActiveSupport::Callbacks	Genadi Samokovarov	2013-07-01	1	-10/+9
\| \|/ /
* \| \|	Merge pull request #10099 from wangjohn/railties_each_with_config_2nd_attempt	Santiago Pastorino	2013-07-01	2	-7/+226
\|\ \ \ \| \|/ / \|/\| \|
\| * \|	Allowing multiple rails applications in the same ruby instance.	wangjohn	2013-06-30	2	-7/+226
\|/ /
* \|	Merge pull request #11195 from yangchenyun/update_doc_for_define_callbacks	Carlos Antonio da Silva	2013-06-30	1	-13/+14
\|\ \
\| * \|	unified the param names across all callbacks manipulation methods	Steven Yang	2013-07-01	1	-10/+10
\| * \|	updated AS:Callbacks doc for terminator option in define_callbacks method	Steven Yang	2013-06-30	1	-3/+4
* \| \|	Merge pull request #11205 from Gawyn/using-preferred-find_by-syntax-in-guides	Carlos Antonio da Silva	2013-06-30	5	-10/+10
\|\ \ \
\| * \| \|	Using preferred find_by syntax in guides	Cristian Planas	2013-07-01	5	-10/+10
\| \| \|/ \| \|/\|
* \| \|	Merge pull request #11204 from Gawyn/find_by-triggers-after_find	Carlos Antonio da Silva	2013-06-30	1	-0/+1
\|\ \ \
\| * \| \|	Adding find_by in guide to methods that trigger after_find	Cristian Planas	2013-07-01	1	-0/+1
\| \|/ /
* \| \|	Merge pull request #11192 from charliesome/extra-roflscale	Carlos Antonio da Silva	2013-06-30	1	-1/+1
\|\ \ \ \| \|/ / \|/\| \|
\| * \|	store a symbol directly inside DISPATCH_CACHE for extra roflscale	Charlie Somerville	2013-06-30	1	-1/+1
* \| \|	fix typo in ActiveModel::Error docs [ci skip]	Steven Yang	2013-06-30	1	-1/+1
* \| \|	Merge pull request #11196 from yangchenyun/remove_evals_in_am_callbacks	Carlos Antonio da Silva	2013-06-30	1	-1/+3
\|\ \ \
\| * \| \|	remove evals from AM::Validations::Callbacks	Steven Yang	2013-06-30	1	-1/+3
\| \| \|/ \| \|/\|
* \| \|	Merge pull request #11186 from jetthoughts/synchronize_create_method_body	Yves Senn	2013-06-30	1	-9/+34
\|\ \ \
\| * \| \|	Synchronize PostController#create code from 5.6 to others sections. [ci skip]	Paul Nikitochkin	2013-06-30	1	-9/+34
\| \| \|/ \| \|/\|
* \| \|	don't shadow `through_scope` method name with local var.	Yves Senn	2013-06-30	1	-7/+7
* \| \|	Merge pull request #11180 from robin850/patch-5	Yves Senn	2013-06-30	1	-20/+5
\|\ \ \
\| * \| \|	Remove a duplicated section [ci skip]	Robin Dupret	2013-06-29	1	-20/+5
* \| \| \|	Merge pull request #11189 from jetthoughts/destroy_link_description_for_getti...	Yves Senn	2013-06-30	1	-3/+3
\|\ \ \ \
\| * \| \| \|	Added clarification for destroy link_to description in 5.14 [ci skip]	Paul Nikitochkin	2013-06-30	1	-3/+3
\| \| \|/ / \| \|/\| \|
* \| \| \|	Merge pull request #11190 from dkaplan88/typo	Yves Senn	2013-06-30	1	-1/+1
\|\ \ \ \ \| \|_\|_\|/ \|/\| \| \|
\| * \| \|	Typo in Active Record Migrations Guide [ci skip]	dkaplan88	2013-06-29	1	-1/+1
\| \|/ /
* / /	Clean the code a bit	Santiago Pastorino	2013-06-29	2	-2/+2
\|/ /
* \|	Merge pull request #11176 from schneems/schneems/plugin_new_help_fix	Rafael Mendonça França	2013-06-29	2	-9/+11
\|\ \ \| \|/ \|/\|
\| *	Fix `rails plugin --help`	schneems	2013-06-29	2	-9/+11
* \|	Merge pull request #11177 from yangchenyun/mine	José Valim	2013-06-29	1	-8/+8
\|\ \
\| * \|	provide a more sementicthe local variables name for ActiveModel::Validations:...	Steven Yang	2013-06-29	1	-8/+8
* \| \|	Merge pull request #11156 from JonRowe/fix_tags_picking_string_keys_from_non_...	Rafael Mendonça França	2013-06-29	4	-2/+23
\|\ \ \ \| \|/ / \|/\| \|
\| * \|	fetch value(s) from stringified options	Jon Rowe	2013-06-29	4	-2/+23
* \| \|	Merge pull request #11152 from senny/remove_implicit_join_references	Steve Klabnik	2013-06-29	6	-87/+25
\|\ \ \
\| * \| \|	remove deprecated implicit join references.	Yves Senn	2013-06-29	6	-87/+25
\| \| \|/ \| \|/\|
* \| \|	Merge pull request #11175 from robin850/patch-4	Steve Klabnik	2013-06-29	1	-1/+1
\|\ \ \ \| \|/ / \|/\| \|
\| * \|	Update a broken link into the fixtures' template	Robin Dupret	2013-06-29	1	-1/+1
\|/ /
* \|	use bytesize rather than force encoding	Aaron Patterson	2013-06-28	1	-2/+1
* \|	writing the new body can cause the response to be committed and the	Aaron Patterson	2013-06-28	1	-1/+3
* \|	Merge pull request #11160 from wangjohn/documentation_for_railties_initializa...	Vijay Dev	2013-06-28	1	-8/+21
\|\ \
\| * \|	Adding documentation to the Rails initialization guide. [ci skip]	wangjohn	2013-06-26	1	-8/+21
\|/ /
* \|	Merge pull request #11163 from nfedyashev/omit_turbolinks_on_javascript_skip_...	Carlos Antonio da Silva	2013-06-28	3	-3/+17
\|\ \
\| * \|	Omit turbolinks configuration completely on skip_javascript generator option	Nikita Fedyashev	2013-06-28	3	-3/+17
* \| \|	Merge pull request #11161 from dmitry/find_in_batches_works_without_logger	Carlos Antonio da Silva	2013-06-28	2	-2/+12
\|\ \ \
\| * \| \|	find_in_batches should work without logger	Dmitry Polushkin	2013-06-28	2	-2/+12
* \| \| \|	Remove order_values argument now that default_scope is simplified	Carlos Antonio da Silva	2013-06-28	1	-5/+5
* \| \| \|	Simplify/fix implementation of default scopes	Jon Leighton	2013-06-28	12	-74/+31