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

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge pull request #25597 from prathamesh-sonpatki/update-getting-started-master	Eileen M. Uchitelle	2016-06-30	2	-10/+12
\|\
\| *	Update getting started guide for Rails 5 [ci skip]	Prathamesh Sonpatki	2016-06-30	2	-10/+12
\|/
*	Merge branch 'add-test-runner-to-release-notes'	eileencodes	2016-06-30	1	-3/+16
\|\
\| *	Add test runner features to release notes [ci skip]	Vipul A M	2016-06-30	1	-3/+16
* \|	Merge pull request #25589 from y-yagi/update_5_0_release_notes	Eileen M. Uchitelle	2016-06-30	1	-7/+13
\|\ \
\| * \|	add missing things to release notes [ci skip]	yuuji.yaginuma	2016-06-30	1	-7/+13
\| \|/
* /	Periodic timers: delegate async instance_exec to the worker pool	Jeremy Daer	2016-06-29	2	-7/+9
\|/
*	Merge pull request #25583 from vipulnsward/add-api-apps-to-release-notes	Eileen M. Uchitelle	2016-06-29	1	-3/+28
\|\
\| *	Add API Apps to release notes[ci skip]	Vipul A M	2016-06-29	1	-3/+28
* \|	Fix release notes link	eileencodes	2016-06-29	1	-1/+1
* \|	Merge pull request #25584 from vipulnsward/upgrading-guide	Eileen M. Uchitelle	2016-06-29	1	-3/+3
\|\ \
\| * \|	Pass over Upgrading guide [ci skip]	Vipul A M	2016-06-29	1	-3/+3
* \| \|	Add note about release notes in upgrade guide	eileencodes	2016-06-29	1	-0/+2
* \| \|	Update release notes about legacy `mysql` adapter	eileencodes	2016-06-29	1	-2/+4
\|/ /
* \|	Update Rails 5 upgrade guides	eileencodes	2016-06-29	1	-4/+133
* \|	Merge pull request #24991 from maclover7/actioncable-npm-docs	Vipul A M	2016-06-29	1	-0/+68
\|\ \ \| \|/ \|/\|
\| *	Add documentation about Action Cable npm package	Jon Moss	2016-05-26	1	-0/+68
* \|	Merge pull request #25574 from alexcameron89/action_view_base	Jon Moss	2016-06-29	1	-6/+6
\|\ \
\| * \|	[ci skip] Update formatting in ActionView::Base documentation	Alex Kitchens	2016-06-29	1	-6/+6
* \| \|	Merge pull request #25572 from alexcameron89/polymorphic_routes	Jon Moss	2016-06-29	1	-2/+2
\|\\| \|
\| * \|	[ci skip] Fix typo & add link in PolymorphicRoutes	Alex Kitchens	2016-06-29	1	-2/+2
* \| \|	Merge pull request #25559 from kmcphillips/master	Sean Griffin	2016-06-29	4	-10/+36
\|\ \ \
\| * \| \|	Do not specal case inspecting associated arrays of over 10 elements, preventi...	Kevin McPhillips	2016-06-29	4	-10/+36
\|/ / /
* \| \|	Don't attempt to clear active connections unless we'ere connected	Sean Griffin	2016-06-29	1	-1/+1
* \| \|	Remove unused `ActiveRecord::Base.connection_id`	Sean Griffin	2016-06-29	5	-28/+9
\|/ /
* \|	Merge pull request #25567 from y-yagi/update_description_of_test_order	Vipul A M	2016-06-29	1	-1/+1
\|\ \
\| * \|	update description of `test_order` [ci skip]	yuuji.yaginuma	2016-06-29	1	-1/+1
* \| \|	Merge pull request #25562 from vipulnsward/select-html-options-test	Rafael França	2016-06-28	1	-1/+10
\|\ \ \
\| * \| \|	- Added select tag test for verifying passing html options to f.select helper	Vipul A M	2016-06-28	1	-1/+10
\| \|/ /
* \| \|	Merge pull request #25364 from kamipo/fix_serialize_for_date_type	Rafael França	2016-06-28	2	-1/+17
\|\ \ \ \| \|/ / \|/\| \|
\| * \|	Fix `Type::Date#serialize` to return a date object correctly	Ryuta Kamizono	2016-06-16	2	-1/+17
* \| \|	Merge pull request #25544 from piotrj/pj-issue-25488	Rafael França	2016-06-28	2	-1/+21
\|\ \ \
\| * \| \|	Fix setting route's to in a scope	Piotr Jakubowski	2016-06-28	2	-1/+21
* \| \| \|	Fix adding implicitly rendered template digests to ETags	Javan Makhmali	2016-06-28	3	-11/+43
\|/ / /
* \| \|	Make client test run individually.	Kasper Timm Hansen	2016-06-28	1	-1/+3
* \| \|	Add dup leftover from 26710ab.	Kasper Timm Hansen	2016-06-28	1	-1/+1
* \| \|	Revert "Merge pull request #25131 from javierhonduco/javierhonduco/clone_dept...	Matthew Draper	2016-06-29	1	-3/+0
* \| \|	Default to frozen string literals in TagHelper.	Kasper Timm Hansen	2016-06-28	1	-5/+7
* \| \|	Merge pull request #25555 from vipulnsward/boolean-attributes-update	Rafael França	2016-06-28	4	-14/+13
\|\ \ \
\| * \| \|	Bring Boolean Attributes list for AV Tags helper upto speed with current spec.	Vipul A M	2016-06-28	4	-14/+13
* \| \| \|	Merge pull request #25551 from vipulnsward/25543-follow-up	Kasper Timm Hansen	2016-06-28	1	-1/+1
\|\ \ \ \
\| * \| \| \|	Expand list of void elements to match spec from https://html.spec.whatwg.org/...	Vipul A M	2016-06-28	1	-1/+1
\| \|/ / /
* \| \| \|	Merge pull request #25554 from vipulnsward/25543-freeze-string	Kasper Timm Hansen	2016-06-28	1	-1/+1
\|\ \ \ \ \| \|/ / / \|/\| \| \|
\| * \| \|	Freeze string for default content for tag_strings, which later goes on to cre...	Vipul A M	2016-06-28	1	-1/+1
\|/ / /
* \| \|	Merge pull request #25123 from bf4/remove_problematic_mime_test	Rafael França	2016-06-27	1	-3/+3
\|\ \ \
\| * \| \|	Modifies mime-registration test not to interfere with real mime types	Benjamin Fleischer	2016-05-23	1	-3/+3
* \| \| \|	Merge pull request #25192 from vipulnsward/25185-default-key-length	Aaron Patterson	2016-06-28	3	-9/+7
\|\ \ \ \
\| * \| \| \|	We default to using aes-256-cbc as our verification/signing cipher. It can ac...	Vipul A M	2016-06-27	3	-9/+7
\|/ / / /
* \| \| \|	Merge pull request #25545 from derekprior/dp-simple-format-docs	Vipul A M	2016-06-27	1	-4/+5
\|\ \ \ \
\| * \| \| \|	Document `simple_format` handling of `\r`	Derek Prior	2016-06-27	1	-4/+5
\|/ / / /