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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Remove readonly notice.	Steve Klabnik	2012-09-26	1	-2/+0
\| \| \| \| \| \| \|	You need to have @implicit_readonly set for this to happen, and it's false by defualt. Fixes #3386.
*	update image_tag output in examples to actual	Nihad Abbasov	2012-09-25	1	-4/+4
\| \| \|	[ci-skip]
*	Update guides/source/routing.md	Bryan Larsen	2012-09-25	1	-0/+12
\|
*	add documentation to generated routes	schneems	2012-09-24	2	-2/+4
\| \| \|	Mention that in addition to `rake routes` a developer can also visit `/rails/info/routes` in the browser.
*	remove misleading comment in Rakefile	schneems	2012-09-24	1	-3/+0
\| \| \|	Comment introduced in https://github.com/rails/rails/commit/bbb3e5a8 before rake `isolate:test` was even introduced https://github.com/rails/rails/commit/bbb3e5a8
*	Fix typo in 4_0_release_notes.md	Igor Zubkov	2012-09-25	1	-1/+1
\|
*	remove duplication	Juanjo Bazán	2012-09-24	1	-1/+0
\|
*	add a note about DynamicForm in error_messages_for section [ci skip]	Francesco Rodriguez	2012-09-24	1	-1/+5
\|
*	String.to_time documentation along examples.	Adam Stankiewicz	2012-09-24	1	-1/+11
\|
*	Removed duplicate line describing "default_options".	Cory Logan	2012-09-23	1	-1/+0
\| \| \| \|	[ci skip]
*	update AC::ConditionalGet documentation [ci skip]	Francesco Rodriguez	2012-09-22	1	-27/+31
\|
*	update AC::Caching documentation [ci skip]	Francesco Rodriguez	2012-09-22	5	-87/+103
\|
*	remove added indentation from the last commit [ci skip]	Francesco Rodriguez	2012-09-22	1	-1/+1
\|
*	update AR::Validations documentation [ci skip]	Francesco Rodriguez	2012-09-22	5	-28/+28
\|
*	nodoc AR::Railtie [ci skip]	Francesco Rodriguez	2012-09-21	2	-4/+4
\|
*	remove AC::Parameters reference [ci skip]	Francesco Rodriguez	2012-09-21	1	-1/+1
\|
*	update AR::Scoping documentation [ci skip]	Francesco Rodriguez	2012-09-21	2	-91/+77
\|
*	add :nodoc: directive to AR::Fixtures::File [ci skip]	Francesco Rodriguez	2012-09-21	1	-1/+1
\|
*	fix AR::Coders::YAMLColumn nodoc [ci skip]	Francesco Rodriguez	2012-09-21	1	-4/+2
\|
*	update AR/attribute_methods documentation [ci skip]	Francesco Rodriguez	2012-09-21	4	-26/+36
\|
*	Better docs for overriding inheretance column	Steve Klabnik	2012-09-22	1	-5/+2
\|
*	fix AR::AttributeMethods::Dirty :nodoc: [ci skip]	Francesco Rodriguez	2012-09-21	1	-4/+4
\|
*	fix AR::Associations::CollectionProxy#delete broken documentation [ci skip]	Francesco Rodriguez	2012-09-21	1	-23/+2
\|
*	update AR::Associations::CollectionProxy#loaded? documentation [ci skip]	Francesco Rodriguez	2012-09-21	1	-1/+6
\|
*	fix typos in AC::StrongParameters documentation [ci skip]	Francesco Rodriguez	2012-09-21	1	-2/+2
\|
*	add note about AR#include_root_in_json default in Upgrading Rails guide [ci ↵	Francesco Rodriguez	2012-09-21	1	-1/+15
\| \| \| \|	skip]
*	Merge branch 'master' of github.com:lifo/docrails	Vijay Dev	2012-09-22	3	-67/+67
\|\
\| *	Update action_mailer_basics.md to ruby 1.9 syntax. [ci skip]	José Corcuera	2012-09-21	1	-61/+61
\| \|
\| *	Update examples in action_controller_overview.md to ruby 1.9 syntax. [ci skip]	José Corcuera	2012-09-21	1	-4/+4
\| \|
\| *	Update examples in AS::Concern to use correct scope syntax. [ci skip]	José Corcuera	2012-09-21	1	-2/+2
\| \|
* \|	Use default charset/collation only if neither is specified. Otherwise we ↵	Jeremy Kemper	2012-09-21	1	-4/+7
\| \| \| \| \| \| \| \|	set utf8_unicode_ci collation on latin1 table.
* \|	some edits in 4.0 release notes [ci skip]	Vijay Dev	2012-09-22	1	-9/+10
\| \|
* \|	Fix typos and links in engines guide [ci skip]	Vijay Dev	2012-09-21	1	-3/+2
\| \|
* \|	fix some md syntax errors and general revisions [ci skip]	Vijay Dev	2012-09-21	3	-20/+19
\|/
*	Merge branch 'master' of github.com:lifo/docrails	Vijay Dev	2012-09-21	95	-1174/+1339
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: actionmailer/lib/action_mailer/base.rb activesupport/lib/active_support/configurable.rb activesupport/lib/active_support/core_ext/module/deprecation.rb guides/source/action_controller_overview.md guides/source/active_support_core_extensions.md guides/source/ajax_on_rails.textile guides/source/association_basics.textile guides/source/upgrading_ruby_on_rails.md While resolving conflicts, I have chosen to ignore changes done in docrails at some places - these will be most likely 1.9 hash syntax changes.
\| *	remove nodoc [ci skip]	Vijay Dev	2012-09-21	1	-1/+1
\| \|
\| *	Updated description of what engines are used for	Stephan Hagemann	2012-09-21	1	-2/+2
\| \|
\| *	Revert "Fix MIME type in CHANGELOG"	Jo Liss	2012-09-21	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	CHANGELOG edits do not belongs on docrails, so I'll send a pull request instead. Thanks @rafaelfranca for catching this. This reverts commit 84c9491eab5b9f7c4250ca4c2ca5d763e8c4ff4d.
\| *	Fix MIME type in CHANGELOG	Jo Liss	2012-09-21	1	-1/+1
\| \|
\| *	Add extra note about :dependent => :destroy.	Steve Klabnik	2012-09-21	1	-1/+4
\| \| \| \| \| \| \| \|	Callbacks may interfere with each other.
\| *	correct a typo	Przemek Hocke	2012-09-21	1	-1/+1
\| \|
\| *	Add missing "m" char	Przemek Hocke	2012-09-21	1	-1/+1
\| \|
\| *	fix two typos in the associations guide	Przemek Hocke	2012-09-21	1	-2/+2
\| \|
\| *	fix a small typo	Przemek Hocke	2012-09-21	1	-1/+1
\| \|
\| *	Fix indentation and update documentation for Array#wrap for Ruby 1.9	Jo Liss	2012-09-20	1	-9/+10
\| \|
\| *	fix :nodoc:s in AR::Timestamp [ci skip]	Francesco Rodriguez	2012-09-19	1	-7/+7
\| \|
\| *	fix Hash#slice code example [ci skip]	Francesco Rodriguez	2012-09-18	2	-2/+2
\| \|
\| *	Update 3.0 -> 3.1 session information.	Steve Klabnik	2012-09-18	1	-0/+13
\| \| \| \| \| \| \| \|	Fixes #7685
\| *	Expanded note about poly associations.	Steve Klabnik	2012-09-18	1	-3/+12
\| \| \| \| \| \| \| \|	Now with example!
\| *	update ActionMailer documentation [ci skip]	Francesco Rodriguez	2012-09-17	5	-18/+15
\| \|