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

	Commit message (Collapse)	Author	Age	Files	Lines
*	fetch value(s) from stringified options	Jon Rowe	2013-06-29	4	-2/+23
\|
*	Merge pull request #11150 from ↵	Carlos Antonio da Silva	2013-06-27	2	-19/+0
\|\ \| \| \| \| \| \| \| \|	jetthoughts/remove_depr_message_for_attribute_method_matcher Remove deprecation warning from AttributeMethodsMatcher
\| *	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 getting start guide
\| *	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
\| *	Remove deprecated attr_protected/accessible	Łukasz Strzałkowski	2013-06-27	4	-39/+0
\| \| \| \| \| \| \| \|	Rails 4.0 has removed attr_protected and attr_accessible feature in favor of Strong Parameters.
* \|	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, because it was deprecated.
\| * \|	Remove passing the prompt to grouped_options_for_select as an argument, ↵	kennyj	2013-06-28	3	-26/+7
\|/ / \| \| \| \| \| \|	because it was deprecated.
* \|	Merge pull request #11141 from keydunov/master	Yves Senn	2013-06-27	1	-1/+1
\|\ \ \| \|/ \|/\|	Fix documentation for grouped_collection_select
\| *	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.
\| * \|	Re-remove deprecated API.	kennyj	2013-06-28	2	-19/+0
\| \| \|
* \| \|	Merge pull request #11145 from ↵	Rafael Mendonça França	2013-06-27	1	-5/+5
\|\ \ \ \| \|/ / \|/\| \| \| \| \| \| \| \|	JeffreyRodriguez/rails_4_root_directive_updates_and_fixes Removed "to:" from root directive and fixed typo ":to"
\| * \|	Removed "to:" from root directive and fixed typo ":to"	Jeff Rodriguez	2013-06-27	1	-5/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	`root :to` is invalid syntax `root to:` is valid, but the generated routes file omits `to:`
* \| \|	Merge pull request #11144 from kennyj/fix_copyright_year	Guillermo Iguaran	2013-06-27	1	-1/+1
\|\ \ \ \| \|/ / \|/\| \|	Fix copyright year for actionview [ci skip]
\| * \|	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
\| *	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]
\| *	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.
\| * \|	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.
\| * \|	Removing deprecation message and silencing method.	wangjohn	2013-06-26	1	-18/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The deprecation rake task is no longer useful because the deprecated methods have already been removed. The method for silencing stderr has been removed since it was only useful for `rake test:uncommitted` which was deprecated and removed.
* \| \|	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
\| * \| \|	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
\|\ \ \ \| \|/ / \|/\| \|	There was a parenthesis in the guides, which resulted in the one link not working, and a second link not even showing. [ci skip]
\| * \|	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 for tests
\| * \|	Removing deprecated rake tasks.	wangjohn	2013-06-24	3	-101/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The `rake test:recent` and `rake test:uncommitted` tasks were deprecated and are now being removed.
* \| \|	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
\| * \| \|	linking small rails 4 features image to a bigger one [ci skip]	R4K3	2013-06-27	1	-1/+1
\| \|/ / \| \| \| \| \| \| \| \| \| \| \| \|	View a bigger version onclick https://github.com/rails/rails/issues/11100
* \| \|	Merge pull request #10828 from southpolesteve/delegation_error_class	Yves Senn	2013-06-26	2	-2/+4
\|\ \ \ \| \| \| \| \| \| \| \|	Create DelegationError class
\| * \| \|	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
\| \|/ / \|/\| \|
* \| \|	Merge pull request #11126 from ↵	Rafael Mendonça França	2013-06-26	1	-1/+1
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	tumayun/fix_activerecord_examples_performance_rb_syntax_error fix activerecord/examples/performance.rb#L101 syntax error
\| * \| \|	fix activerecord/examples/performance.rb#L101 syntax error	tumayun	2013-06-27	1	-1/+1
\| \| \| \|
* \| \| \|	Merge branch 'master' of github.com:lifo/docrails	Vijay Dev	2013-06-26	16	-37/+69
\|\ \ \ \ \| \|/ / / \|/\| \| \| \| \| \| \| \| \| \| \|	Conflicts: guides/source/layout.html.erb
\| * \| \|	Remove a comment related to 920753f	Robin Dupret	2013-06-26	1	-1/+0
\| \| \| \| \| \| \| \| \| \| \| \|	Since 920753f, double assignment isn't used anymore
\| * \| \|	Mention Content-Type for JSON params parsing.	Gustavo Delfino	2013-06-24	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	http://stackoverflow.com/questions/8501021/rails-json-request-is-not-parsed-correctly-into-post-parameters
\| * \| \|	Added markdown tag for highlight	Anton Cherepanov	2013-06-24	1	-1/+1
\| \| \| \|
\| * \| \|	[doc] Info added for tmp:create [ci skip]	Rashmi Yadav	2013-06-23	1	-1/+2
\| \| \| \|
\| * \| \|	Missing mention about a generated file [ci skip]	Robin Dupret	2013-06-22	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add a mention about the helper's test file generated invoking the controller generator in the USAGE file
\| * \| \|	[doc] Update return false if record is invalid	Rashmi Yadav	2013-06-19	1	-2/+2
\| \| \| \|
\| * \| \|	rewrote render tag using more succinct and idiomatic way	Chandresh Pant	2013-06-17	1	-3/+1
\| \| \| \|