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

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge pull request #8393 from frodsan/fix_dependend_order_test_example	Carlos Antonio da Silva	2012-12-03	1	-0/+3
\|\
\| *	ensure original encoding doesnt change	Francesco Rodriguez	2012-12-01	1	-0/+3
* \|	Use send in Time marshal extensions since the methods are now private	Carlos Antonio da Silva	2012-12-03	1	-1/+1
* \|	Override <%== to always behave as literal text rather than toggling based on ...	Jeremy Kemper	2012-12-03	3	-4/+21
* \|	Merge pull request #8407 from kennyj/fix_profiler_comments	Rafael Mendonça França	2012-12-03	2	-3/+3
\|\ \
\| * \|	Fix wrong doc and message about rails profiler.	kennyj	2012-12-04	2	-3/+3
\|/ /
* \|	Try to get back the campfire notifications	Rafael Mendonça França	2012-12-03	1	-1/+1
* \|	Fix failing tests related to rake notes	Carlos Antonio da Silva	2012-12-03	1	-2/+2
* \|	Merge pull request #8375 from steveklabnik/migrations_guide	Xavier Noria	2012-12-03	1	-365/+217
\|\ \
\| * \|	Migration Guide: General fix-up	Steve Klabnik	2012-12-01	1	-365/+217
* \| \|	Merge pull request #8402 from senny/8376_descriptive_error_message_for_partia...	Rafael Mendonça França	2012-12-02	3	-1/+16
\|\ \ \
\| * \| \|	More descriptive error when rendering a partial with `:layout => true`	Yves Senn	2012-12-02	3	-1/+16
\|/ / /
* \| \|	Merge pull request #8394 from acangiano/add_db_folder_to_annotations	Rafael Mendonça França	2012-12-01	3	-1/+7
\|\ \ \
\| * \| \|	Add db to the list of default annotation folders	Antonio Cangiano	2012-12-01	3	-1/+7
\| \| \|/ \| \|/\|
* \| \|	Merge pull request #8398 from rmascarenhas/active-model-errors-spec-fixes	Rafael Mendonça França	2012-12-01	1	-3/+2
\|\ \ \
\| * \| \|	Actually test that ActiveModel::Errors#add defaults to :invalid.	Renato Mascarenhas	2012-12-01	1	-1/+1
\| * \| \|	Call `full_messages` instead of `to_a` in its spec.	Renato Mascarenhas	2012-12-01	1	-2/+1
\|/ / /
* \| \|	Merge pull request #8397 from mmb/gitignore_global_home	Rafael Mendonça França	2012-12-01	1	-1/+1
\|\ \ \
\| * \| \|	Quote ~ in git config global excludes command.	Matthew M. Boedicker	2012-12-01	1	-1/+1
\|/ / /
* / /	Only take the date parts from Time.zone.now	Andrew White	2012-12-01	2	-3/+10
\|/ /
* \|	Merge pull request #8382 from asanghi/mailerguide	Vijay Dev	2012-12-01	1	-1/+52
\|\ \
\| * \|	Add Mailer Callback section to Mailer guides	Aditya Sanghi	2012-12-02	1	-1/+52
* \| \|	Remove not used variable warnigns	Carlos Antonio da Silva	2012-12-01	2	-5/+5
\|/ /
* \|	Merge pull request #8391 from rmascarenhas/reset-attribute-doesnt-change-it	Rafael Mendonça França	2012-12-01	3	-3/+9
\|\ \ \| \|/ \|/\|
\| *	Reset attributes should not report changes.	Renato Mascarenhas	2012-12-01	3	-3/+9
* \|	Merge pull request #8379 from steveklabnik/validations_guide	Vijay Dev	2012-12-01	4	-347/+342
\|\ \ \| \|/ \|/\|
\| *	Here's a few updates to the validations guide. A bunch of small changes,	Steve Klabnik	2012-12-01	4	-347/+342
\|/
*	Merge branch 'master' of github.com:lifo/docrails	Vijay Dev	2012-12-01	40	-261/+299
\|\
\| *	copy edits [ci skip]	Vijay Dev	2012-12-01	2	-2/+2
\| *	Fix Calculations#pluck doc to mention several attributes can be selected [ci ...	Florent Guilleux	2012-12-01	1	-3/+3
\| *	Normalize on 'After reading this guide, you will know:'	Steve Klabnik	2012-11-29	37	-28/+80
\| *	nodoc AS::Deprecation::InstanceDelegator class [ci skip]	Francesco Rodriguez	2012-11-29	1	-3/+3
\| *	add documentation to CollectionProxy #length and #size methods [ci skip]	Francesco Rodriguez	2012-11-29	1	-2/+7
\| *	add documentation to CollectionProxy#empty?	Francesco Rodriguez	2012-11-29	1	-1/+6
\| *	Asset Pipeline: add 'the'	Steve Klabnik	2012-11-29	1	-2/+2
\| *	Command Line: remove 'A Guide to'	Steve Klabnik	2012-11-29	1	-2/+2
\| *	Migrations: add 'Active Record' to title	Steve Klabnik	2012-11-29	1	-2/+2
\| *	Fix title of 'form helpers' guide.	Steve Klabnik	2012-11-29	1	-2/+2
\| *	Associations: s/A Guide//	Steve Klabnik	2012-11-29	1	-2/+2
\| *	Remove 'This guide is based on ' warnings.	Steve Klabnik	2012-11-29	4	-9/+0
\| *	Add periods to the bullet points in guides.	Steve Klabnik	2012-11-29	28	-126/+126
\| *	Migrations: Fix opening bullets.	Steve Klabnik	2012-11-29	1	-2/+2
\| *	ActionView -> Action View	Steve Klabnik	2012-11-29	1	-2/+2
\| *	ActionController -> Action Controller	Steve Klabnik	2012-11-29	1	-2/+2
\| *	ActiveSupport -> Active Support	Steve Klabnik	2012-11-29	1	-4/+4
\| *	ActionMailer -> Action Mailer.	Steve Klabnik	2012-11-29	1	-2/+2
\| *	ActionPack -> Action Pack.	Steve Klabnik	2012-11-29	1	-1/+1
\| *	ActiveRecord -> Active Record	Steve Klabnik	2012-11-29	5	-6/+6
\| *	Migrations: move massive paragraph out of intro.	Steve Klabnik	2012-11-29	1	-10/+19
\| *	Getting Started: Improve instructions on opening a terminal	Steve Klabnik	2012-11-29	1	-1/+4