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

	Commit message (Expand)	Author	Age	Files	Lines
*	updates a migration example in the Getting Started guide [ci skip]	Xavier Noria	2015-06-28	1	-5/+3
*	Revert the behavior of association names and `where` to be closer to 4.2	Sean Griffin	2015-06-27	1	-1/+1
*	Improve error messages in cookies_test	eileencodes	2015-06-27	1	-3/+3
*	Merge pull request #20276 from davetron5000/revert-head-on-no-template	Kasper Timm Hansen	2015-06-27	2	-2/+38
\|\
\| *	Override default_render's behavior with a block	Dave Copeland	2015-06-20	2	-2/+38
* \|	Merge pull request #20720 from rohandaxini/patch-2	Rafael Mendonça França	2015-06-27	1	-1/+1
\|\ \
\| * \|	Maintaining consistency in wordings [ci skip]	Rohan Daxini	2015-06-27	1	-1/+1
\|/ /
* \|	Merge pull request #20712 from nhodges/dev/nh/20345	Rafael Mendonça França	2015-06-27	1	-2/+1
\|\ \
\| * \|	Remove `config` options from `default_options` in `railties`	Nuri Hodges	2015-06-26	1	-2/+1
* \| \|	Merge pull request #20556 from radanskoric/improve-validation-helpers	Rafael Mendonça França	2015-06-27	5	-7/+41
\|\ \ \
\| * \| \|	Improve Validation Helpers' documentation comments and tests	Radan Skoric	2015-06-27	5	-7/+41
\|/ / /
* \| \|	Merge pull request #20652 from ankit1910/change_doc	Zachary Scott	2015-06-27	1	-2/+12
\|\ \ \
\| * \| \|	Change documentation for collection.build and collection.create [ci-skip]	ankit1910	2015-06-21	1	-2/+12
* \| \| \|	Merge pull request #20607 from cmtonkinson/update-console-colors	Rafael Mendonça França	2015-06-27	1	-8/+11
\|\ \ \ \
\| * \| \| \|	More granular console SQL coloration	Chris Tonkinson	2015-06-23	1	-8/+11
* \| \| \| \|	Merge pull request #20699 from vngrs/foreign_key_with_table_name_suffix_and_p...	Rafael Mendonça França	2015-06-27	3	-2/+37
\|\ \ \ \ \
\| * \| \| \| \|	Add table name prefix and suffix support to add_foreign_key and remove_foreig...	Mehmet Emin İNAÇ	2015-06-25	3	-2/+37
* \| \| \| \| \|	Merge pull request #20018 from sikachu/change-column-default-recorder	Rafael Mendonça França	2015-06-27	10	-13/+72
\|\ \ \ \ \ \
\| * \| \| \| \| \|	Update guide for new change_column_default syntax	Prem Sichanugrist	2015-06-26	1	-6/+8
\| * \| \| \| \| \|	Add reversible syntax for change_column_default	Prem Sichanugrist	2015-06-26	9	-7/+64
* \| \| \| \| \| \|	Merge pull request #20711 from fenec/fix_routes_in_guides	Rafael Mendonça França	2015-06-27	1	-0/+1
\|\ \ \ \ \ \ \
\| * \| \| \| \| \| \|	Change routes.rb look in getting started [ci skip]	Dmitry Pak	2015-06-27	1	-0/+1
\| \| \|_\|_\|_\|/ / \| \|/\| \| \| \| \|
* \| \| \| \| \| \|	Merge pull request #20714 from y-yagi/fix_file_fixture_path	Rafael Mendonça França	2015-06-27	1	-1/+1
\|\ \ \ \ \ \ \ \| \|/ / / / / / \|/\| \| \| \| \| \|
\| * \| \| \| \| \|	correct `file_fixture_path` in plugins `test_helper.rb`	yuuji.yaginuma	2015-06-27	1	-1/+1
* \| \| \| \| \| \|	Merge pull request #20417 from dubek/fix-template-cache-call-pattern	Kasper Timm Hansen	2015-06-26	3	-1/+36
\|\ \ \ \ \ \ \
\| * \| \| \| \| \| \|	Improve detection of partial templates eligible for collection caching.	Dov Murik	2015-06-22	3	-1/+36
* \| \| \| \| \| \| \|	Merge pull request #20708 from sikachu/update-pluck-suggestion	Zachary Scott	2015-06-26	1	-1/+1
\|\ \ \ \ \ \ \ \ \| \|_\|_\|/ / / / / \|/\| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Update .pluck documentation on uniq	Prem Sichanugrist	2015-06-26	1	-1/+1
\|/ / / / / / /
* \| \| \| \| \| \|	Merge pull request #20677 from jmondo/decimal-default-string	Sean Griffin	2015-06-25	4	-4/+9
\|\ \ \ \ \ \ \
\| * \| \| \| \| \| \|	Display decimal defaults as strings to keep precision	John Gesimondo	2015-06-23	4	-4/+9
\| \| \|_\|_\|/ / / \| \|/\| \| \| \| \|
* \| \| \| \| \| \|	remove bad test.	Aaron Patterson	2015-06-25	1	-4/+0
* \| \| \| \| \| \|	Merge pull request #20697 from 5t111111/add-block-to-add_source	Guillermo Iguaran	2015-06-25	4	-2/+36
\|\ \ \ \ \ \ \
\| * \| \| \| \| \| \|	cherry-pick test and source doc from #20050	Hirofumi Wakasugi	2015-06-25	3	-0/+20
\| * \| \| \| \| \| \|	modify add_source in application template to take a block for gem entries	Hirofumi Wakasugi	2015-06-25	1	-2/+16
\| \| \|_\|/ / / / \| \|/\| \| \| \| \|
* \| \| \| \| \| \|	Add pending test for the great-grandparent touching bug from #19324	David Heinemeier Hansson	2015-06-25	6	-0/+72
* \| \| \| \| \| \|	Merge pull request #20696 from y-yagi/remove_active_resource_from_instrumenta...	Yves Senn	2015-06-25	1	-11/+0
\|\ \ \ \ \ \ \ \| \|/ / / / / / \|/\| \| \| \| \| \|
\| * \| \| \| \| \|	remove nonexistent hook from instrumentation guide [ci skip]	yuuji.yaginuma	2015-06-25	1	-11/+0
\|/ / / / / /
* \| \| \| \| \|	Merge pull request #20681 from ivantsepp/update_rails_welcome_png	Rafael Mendonça França	2015-06-24	1	-0/+0
\|\ \ \ \ \ \ \| \|/ / / / / \|/\| \| \| \| \|
\| * \| \| \| \|	Update rails_welcome.png	Ivan Tse	2015-06-24	1	-0/+0
\|/ / / / /
* \| \| \| \|	Merge pull request #20674 from yui-knk/fix/guide2	Rafael Mendonça França	2015-06-23	1	-1/+1
\|\ \ \ \ \
\| * \| \| \| \|	[ci skip] Make clear what `this method` is	yui-knk	2015-06-24	1	-1/+1
* \| \| \| \| \|	A few documentation fixes [ci skip]	Robin Dupret	2015-06-23	3	-8/+8
* \| \| \| \| \|	Remove the paragraph about Rails::Server#middleware	Robin Dupret	2015-06-23	1	-18/+0
\|/ / / / /
* \| \| \| \|	Merge pull request #20673 from aditya-kapoor/correct-preload-doc	Yves Senn	2015-06-23	1	-1/+1
\|\ \ \ \ \
\| * \| \| \| \|	[ci skip] correct for ActiveRecord::Associations::Preloader:	Aditya Kapoor	2015-06-23	1	-1/+2
* \| \| \| \| \|	docs, add missing closing bracket. [ci skip]	Yves Senn	2015-06-23	1	-1/+1
\|/ / / / /
* \| \| \| \|	Merge pull request #20552 from jamesdabbs/belongs-to-polymorphic-force-reload	Yves Senn	2015-06-23	3	-1/+10
\|\ \ \ \ \
\| * \| \| \| \|	Fix `undefined method uncached` for polymorphic belongs_to #20426	James Dabbs	2015-06-13	2	-1/+2
* \| \| \| \| \|	Merge pull request #20545 from dcrec1/20541	Yves Senn	2015-06-23	3	-3/+39
\|\ \ \ \ \ \
\| * \| \| \| \| \|	thrown ActiveRecord::AssociationTypeMismatch when assigning a wrong value for...	Diego Carrion	2015-06-22	3	-3/+31