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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge pull request #25553 from vipulnsward/25543-docs-follow-up	Vipul A M	2016-06-30	1	-16/+7
\|\ \| \| \| \|	25543 docs cleanup
\| *	- Tone down documentation	Vipul A M	2016-06-28	1	-16/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Remove repetative docs - Fix grammar on sentences - Add escaping for literals [ci skip]
* \|	Merge pull request #25431 from ↵	Rafael França	2016-06-30	2	-1/+10
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	prathamesh-sonpatki/add-note-about-upgrade-guide-at-the-end-of-update Display link to Rails upgrade guide at the end of `rails app:update` task.
\| * \|	Display link to Rails upgrade guide at the end of `rails app:update` task.	Prathamesh Sonpatki	2016-06-30	2	-1/+10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- This will nudge people in the direction of going through upgrade guides.
* \| \|	Use sass-rails in our test suite	Rafael Mendonça França	2016-06-30	3	-1/+10
\| \| \|
* \| \|	Merge pull request #25612 from vipulnsward/publish-testing-guide	Rafael França	2016-06-30	1	-2/+1
\|\ \ \ \| \| \| \| \| \| \| \|	Mark Testing Guide as pubished and reword the title
\| * \| \|	Mark Testing Guide as pubished and reword the title[ci skip]	Vipul A M	2016-06-30	1	-2/+1
\|/ / /
* \| \|	Merge pull request #25611 from alexcameron89/upgrading_rails_guide	Vipul A M	2016-06-30	1	-16/+16
\|\ \ \ \| \| \| \| \| \| \| \|	[ci skip] Fix Typos and Punctuation in Guides: Upgrading
\| * \| \|	[ci skip] Fix Typos and Punctuation in Guides - Upgrading	Alex Kitchens	2016-06-30	1	-16/+16
\|/ / /
* \| \|	Do not allow rack pre releases	Rafael Mendonça França	2016-06-30	2	-6/+5
\| \| \|
* \| \|	Merge pull request #25609 from rosenfeld/patch-8	Eileen M. Uchitelle	2016-06-30	1	-0/+11
\|\ \ \ \| \| \| \| \| \| \| \|	Add a Rails 5 release note for ActionController::Live becoming a Concern
\| * \| \|	Add a Rails 5 release note for ActionController::Live becoming a Concern	Rodrigo Rosenfeld Rosas	2016-06-30	1	-0/+11
\|/ / / \| \| \| \| \| \| \| \| \| \| \| \|	Related to issue #25581 https://github.com/rails/rails/issues/25581
* \| \|	Merge pull request #25608 from rosenfeld/patch-7	Eileen M. Uchitelle	2016-06-30	1	-0/+29
\|\ \ \ \| \| \| \| \| \| \| \|	Add an upgrade note related to ActionController::Live becoming a Concern
\| * \| \|	Add an upgrade note related to ActionController::Live becoming a Concern	Rodrigo Rosenfeld Rosas	2016-06-30	1	-0/+29
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	See issue #25581: https://github.com/rails/rails/issues/25581
* \| \| \|	Merge pull request #25607 from sstephenson/turbolinks-5-final	Rafael Mendonça França	2016-06-30	3	-11/+6
\|\ \ \ \ \| \|/ / / \|/\| \| \| \| \| \| \|	Update to Turbolinks 5.0.0 final
\| * \| \|	Update to Turbolinks 5.0.0 final	Sam Stephenson	2016-06-30	3	-11/+6
\| \| \| \|
* \| \| \|	Point to released coffee-rails	Rafael Mendonça França	2016-06-30	3	-11/+6
\|/ / /
* \| \|	Fix styles of headings to follow guide rules	eileencodes	2016-06-30	1	-20/+20
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	From the style guide: When writing headings, capitalize all words except for prepositions, conjunctions, internal articles, and forms of the verb "to be":
* \| \|	Merge pull request #25604 from alexcameron89/upgrading_rails_guide	Rafael França	2016-06-30	1	-12/+11
\|\ \ \ \| \| \| \| \| \| \| \|	Change wording & punctuation in Guides - Upgrading
\| * \| \|	Change wording & punctuation in Guides - Upgrading	Alex Kitchens	2016-06-30	1	-12/+11
\| \| \| \|
* \| \| \|	Merge pull request #25602 from matthewd/restore-key-generator	Matthew Draper	2016-07-01	2	-7/+22
\|\ \ \ \ \| \|/ / / \|/\| \| \|	Partially revert #25192
\| * \| \|	Partially revert #25192	Matthew Draper	2016-07-01	2	-7/+22
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	KeyGenerator is used in other contexts, and we cannot change its output... even if it does accidentally default to generating excess key material for our primary internal usage.
* \| \| \|	fixes config value [ci skip]	Xavier Noria	2016-06-30	1	-1/+1
\| \| \| \|
* \| \| \|	expands a bit a section of the upgrade guide [ci skip]	Xavier Noria	2016-06-30	1	-4/+15
\|/ / /
* \| \|	Merge pull request #25587 from vipulnsward/publish-release-notes	Eileen M. Uchitelle	2016-06-30	1	-1/+0
\|\ \ \ \| \| \| \| \| \| \| \|	Publish Rails 5 release notes
\| * \| \|	Publish Rails 5 release notes[ci skip]	Vipul A M	2016-06-29	1	-1/+0
\| \|/ /
* \| \|	Merge pull request #25596 from prathamesh-sonpatki/testing-guide-50	Eileen M. Uchitelle	2016-06-30	1	-42/+102
\|\ \ \ \| \| \| \| \| \| \| \|	Update testing guide for Rails 5
\| * \| \|	Update testing guide for Rails 5 release [ci skip]	Prathamesh Sonpatki	2016-06-30	1	-42/+102
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Update the testing guide as per output of test runner. - Show how to see all the options provided by test runner. - We no longer generate fixture named :first. - Update the request methods with URL helpers and also fix few wrong occurrences. - Generated test case does not have assert_includes for response body. - This removes code from https://github.com/rails/rails/commit/ca83436d but I think that might be oversight. We don't generate such code in the generated controller test. - Update the helper example to suite the integration style of tests. - We can't modify session directly in new integration style controller tests. - Show an example which matches with integration style request tests. - Active Job default adapter for tests is async, not test. - Fix the example of request headers and CGI variables.
* \| \| \|	Merge pull request #25598 from prathamesh-sonpatki/release-notes--1	Eileen M. Uchitelle	2016-06-30	1	-1/+36
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	Update release notes for 5.0 [ci skip]
\| * \| \| \|	Update release notes for 5.0 [ci skip]	Prathamesh Sonpatki	2016-06-30	1	-1/+36
\| \| \| \| \|
* \| \| \| \|	Merge pull request #25599 from prathamesh-sonpatki/update-upgrade-guide	Eileen M. Uchitelle	2016-06-30	2	-2/+8
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Update upgrade guide
\| * \| \| \| \|	Add a note about autoloading being disabled in production env in upgrade ↵	Prathamesh Sonpatki	2016-06-30	2	-2/+8
\|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	guide [ci skip] - Also to_time_preserves_timezone config should be false for older apps getting upgraded to Rails 5 [ci skip]
* / / / /	Update upgrade guides	eileencodes	2016-06-30	1	-6/+36
\|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Mentions missing config options and fixes headers for section talking about new framework defaults.
* \| \| \|	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]
\| * \| \|	Update getting started guide for Rails 5 [ci skip]	Prathamesh Sonpatki	2016-06-30	2	-10/+12
\|/ / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Rails 5 will return 204 No Content by default for controller actions which do not have a template or do not specify how to render. - The "Getting started" guide needs to be updated for this.
* \| \|	Merge branch 'add-test-runner-to-release-notes'	eileencodes	2016-06-30	1	-3/+16
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	This is an slight refactoring/improved version of #25586.
\| * \| \|	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]
\| * \| \|	add missing things to release notes [ci skip]	yuuji.yaginuma	2016-06-30	1	-7/+13
\| \|/ / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add following. * https://github.com/rails/rails/commit/05934d24aff62d66fc62621aa38dae6456e276be * https://github.com/rails/rails/commit/38d2bf5fd1f3e014f2397898d371c339baa627b1 * https://github.com/rails/rails/pull/25469
* / /	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
\| * \|	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
\| * \| \|	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
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	It's useful to have a link to the release notes in the upgrade guide for a clearer view of what changed in Rails.
* \| \| \|	Update release notes about legacy `mysql` adapter	eileencodes	2016-06-29	1	-2/+4
\|/ / / \| \| \| \| \| \| \| \| \|	Make release notes about legacy `mysql` adapter clearer.
* \| \|	Update Rails 5 upgrade guides	eileencodes	2016-06-29	1	-4/+133
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Adds missing upgrade items to the upgrade guides for Rails 5. Fixes some typos and whitespace as well.
* \| \|	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
\| * \|	Add documentation about Action Cable npm package	Jon Moss	2016-05-26	1	-0/+68
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Sorry, forgot to include in my main PR :( [ci skip] [Jon Moss, Zach Schneider]