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

	Commit message (Expand)	Author	Age	Files	Lines
*	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
*	Merge pull request #11104 from drewda/patch-1	Carlos Antonio da Silva	2013-06-28	1	-0/+2
\|\
\| *	adding additional plugins for debugging [ci skip]	Drew Dara-Abrams	2013-06-27	1	-0/+2
* \|	Fix layouts and rendering guide example using flash.now instead	Carlos Antonio da Silva	2013-06-28	1	-1/+1
* \|	Apply default scope when joining associations.	Jon Leighton	2013-06-28	3	-0/+29
* \|	Fix test	Jon Leighton	2013-06-28	1	-1/+8
* \|	Fix rake test_sqlite3_mem	Jon Leighton	2013-06-28	2	-11/+7
* \|	Merge pull request #11153 from strzalek/remove-ar-deprecated-finders	Jon Leighton	2013-06-28	7	-637/+7
\|\ \
\| * \|	Remove depreacted finders	Łukasz Strzałkowski	2013-06-28	7	-637/+7
* \| \|	Fix indentation	Akira Matsuda	2013-06-28	1	-1/+1
* \| \|	Merge pull request #11150 from jetthoughts/remove_depr_message_for_attribute_...	Carlos Antonio da Silva	2013-06-27	2	-19/+0
\|\ \ \
\| * \| \|	Remove deprecation warning from AttributeMethodsMatcher	Paul Nikitochkin	2013-06-28	2	-19/+0
\|/ / /
* \| \|	Merge pull request #11127 from jetthoughts/ask_user_add_line_to_routes_in_guide	Yves Senn	2013-06-27	1	-2/+2
\|\ \ \
\| * \| \|	Asking user to declare post resource in guide [ci skip]	Paul Nikitochkin	2013-06-27	1	-2/+2
\|/ / /
* \| \|	Merge pull request #11149 from strzalek/remove-protected-attrs	Carlos Antonio da Silva	2013-06-27	4	-39/+0
\|\ \ \
\| * \| \|	Remove deprecated attr_protected/accessible	Łukasz Strzałkowski	2013-06-27	4	-39/+0
\| \|/ /
* \| \|	Review AV changelog [ci skip]	Carlos Antonio da Silva	2013-06-27	1	-2/+2
* \| \|	Merge pull request #11147 from kennyj/remove_prompt_argument_was_deprecated	Carlos Antonio da Silva	2013-06-27	3	-26/+7
\|\ \ \
\| * \| \|	Remove passing the prompt to grouped_options_for_select as an argument, becau...	kennyj	2013-06-28	3	-26/+7
\|/ / /
* \| \|	Merge pull request #11141 from keydunov/master	Yves Senn	2013-06-27	1	-1/+1
\|\ \ \ \| \|/ / \|/\| \|
\| * \|	Fix documentation for grouped_collection_select [ci skip]	Artyom	2013-06-27	1	-1/+1
* \| \|	Merge pull request #11146 from kennyj/re-remove-deprecated-api	Rafael Mendonça França	2013-06-27	2	-19/+0
\|\ \ \
\| * \| \|	Re-remove deprecated API.	kennyj	2013-06-28	2	-19/+0
* \| \| \|	Merge pull request #11145 from JeffreyRodriguez/rails_4_root_directive_update...	Rafael Mendonça França	2013-06-27	1	-5/+5
\|\ \ \ \ \| \|/ / / \|/\| \| \|
\| * \| \|	Removed "to:" from root directive and fixed typo ":to"	Jeff Rodriguez	2013-06-27	1	-5/+5
* \| \| \|	Merge pull request #11144 from kennyj/fix_copyright_year	Guillermo Iguaran	2013-06-27	1	-1/+1
\|\ \ \ \ \| \|/ / / \|/\| \| \|
\| * \| \|	Fix copyright year for actionview [ci skip]	kennyj	2013-06-28	1	-1/+1
\|/ / /
* \| \|	Fix punctuation in config templates	Akira Matsuda	2013-06-28	2	-2/+2
* \| \|	Merge pull request #11142 from tumayun/use_master_branch_activesupport	Rafael Mendonça França	2013-06-27	1	-1/+1
\|\ \ \ \| \|/ / \|/\| \|
\| * \|	activerecord/examples/simple.rb use master branch activesupport gem	tumayun	2013-06-27	1	-1/+1
\|/ /
* \|	Merge pull request #11139 from prathamesh-sonpatki/grammar	Yves Senn	2013-06-27	1	-3/+3
\|\ \
\| * \|	fix grammar, change 'an' to 'a' [ci skip]	Prathamesh Sonpatki	2013-06-27	1	-3/+3
* \| \|	Merge pull request #11054 from senny/11048_make_default_value_explicit	Carlos Antonio da Silva	2013-06-27	1	-4/+2
\|\ \ \
\| * \| \|	make default value for `:message` on `AM::Errors` explicit.	Yves Senn	2013-06-22	1	-4/+2
* \| \| \|	Merge pull request #11133 from wangjohn/remove_deprecation_rake_task	Yves Senn	2013-06-27	1	-18/+0
\|\ \ \ \ \| \|_\|/ / \|/\| \| \|
\| * \| \|	Removing deprecation message and silencing method.	wangjohn	2013-06-26	1	-18/+0
* \| \| \|	Merge pull request #11136 from prathamesh-sonpatki/rails4	Yves Senn	2013-06-27	1	-1/+1
\|\ \ \ \
\| * \| \| \|	Use activerecord 4.0.0 for reporting bugs using the template[ci skip]	Prathamesh Sonpatki	2013-06-27	1	-1/+1
\| \|/ / /
* \| \| \|	Merge pull request #11137 from WvanLelyveld/master	Steve Klabnik	2013-06-27	1	-1/+1
\|\ \ \ \ \| \|/ / / \|/\| \| \|
\| * \| \|	Fixing links to accept_language plugin/middleware	Wouter van Lelyveld	2013-06-27	1	-1/+1
\|/ / /
* \| \|	Review railties changelog [ci skip]	Carlos Antonio da Silva	2013-06-26	1	-5/+4
* \| \|	Move delegation error constant to inside Module	Carlos Antonio da Silva	2013-06-26	2	-3/+5
* \| \|	Merge pull request #11124 from wangjohn/removing_deprecated_rake_tasks	Santiago Pastorino	2013-06-26	3	-101/+6
\|\ \ \
\| * \| \|	Removing deprecated rake tasks.	wangjohn	2013-06-24	3	-101/+6
* \| \| \|	Merge pull request #11128 from edg3r/patch-1	Yves Senn	2013-06-26	1	-1/+1
\|\ \ \ \
\| * \| \| \|	linking small rails 4 features image to a bigger one [ci skip]	R4K3	2013-06-27	1	-1/+1
\| \|/ / /
* \| \| \|	Merge pull request #10828 from southpolesteve/delegation_error_class	Yves Senn	2013-06-26	2	-2/+4
\|\ \ \ \
\| * \| \| \|	Add DelegationError class. Rasied by delegation to a nil object	Steve Faulkner	2013-06-26	2	-2/+4
* \| \| \| \|	mention the removal of `--builder` in 4.0 release notes.	Yves Senn	2013-06-26	1	-0/+4
\| \|/ / / \|/\| \| \|