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

	Commit message (Collapse)	Author	Age	Files	Lines
...
* \| \| \| \| \| \| \| \|	Merge pull request #25632 from volmer/fix-integration-test-frozen-literals	Kasper Timm Hansen	2016-07-01	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix request encoding in tests when string literals are frozen
\| * \| \| \| \| \| \| \| \|	Fix request encoding in tests when string literals are frozen	Volmer	2016-07-01	1	-1/+1
\| \| \|_\|_\|_\|/ / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	When running tests with `--enable-frozen-string-literal` or `# frozen_string_literal: true`, it's currently attempted to mutate the path string in order to append the format, causing a `RuntimeError`. ```ruby get '/posts', as: :json ``` ``` RuntimeError: can't modify frozen String ``` This commit fixes the problem by replacing the mutation with a concatenation, returning a new string.
* \| \| \| \| \| \| \| \|	Merge pull request #25600 from pan/constantize-docfix	Vipul A M	2016-07-01	1	-4/+4
\|\ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / \|/\| \| \| \| \| \| \| \|	fix ActiveSupport::Infector.constantize usage API doc [ci skip]
\| * \| \| \| \| \| \| \|	fix ActiveSupport::Infector.constantize usage API doc [ci skip]	Pan GaoYong	2016-06-30	1	-4/+4
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Add regression test for foreign key schema dump caching	eileencodes	2016-07-01	1	-0/+13
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	If you had a foreign key set and then decided to add `on_delete: :cascade` later in another migration that migration would run but wouldn't refresh the schema dump. The reason for this was because `create_table_info` caches the statement and sets it to be the same as the original declaration for the foreign key (without the `on_delete: :cascade`. PR #25307 ended up fixing this bug because it removes the check for `create_table_info` and relies on reading from `information_schema`. The fix however was intended to patch another bug. The reason this fixes the issue is we're no longer parsing the regex from the cached `create_table_info`. This regression test is to ensure that the issue does not return if we for some reason go back to using `create_table_info` to set the foreign keys.
* \| \| \| \| \| \| \| \|	Merge pull request #25307 from ↵	Eileen M. Uchitelle	2016-07-01	5	-36/+46
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	kamipo/extract_foreign_key_action_from_information_schema Extract foreign key action from `information_schema`
\| * \| \| \| \| \| \| \| \|	Extract foreign key action from `information_schema`	Ryuta Kamizono	2016-06-07	4	-34/+44
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes #25300.
\| * \| \| \| \| \| \| \| \|	Make `foreign_keys` queries to `SCHEMA`	Ryuta Kamizono	2016-06-07	2	-2/+2
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Fix release task now that NPM is part of the build	eileencodes	2016-07-01	1	-18/+22
\| \|_\|_\|_\|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Note: this commit looks super weird becuase git. I'm moving the entire NPM section to the part where we actually push the gems/npm package for the reasons below. That's not how the git diff looks though. When we release Rails we run `rake prep_release` which calls `update_versions`. This was updating the NPM version as well. But when we would later run `rake install` to test the installed gem `update_versions` gets called again which causes the install to fail because NPM sees the version is the same as the last run and refuses to continue. If you forget to stash this will then cause the push to RubyGems to fail because `update_versions` is called again and then NPM will not continue because it thinks the version hasn't been changed even though it has. The correct solution would be to not update the NPM verion if it matches the version already in the file but after an hour I could not find a simple way to use NPM to read the current version. Honestly that's not the best way to do it either because say you forget to update something else and then the script thinks it's already been updated. With that in mind I think the best solution is to not update the NPM version until right before we are going to push to NPM because then that won't cause the push to RubyGems to fail.
* \| \| \| \| \| \| \| \|	Merge pull request #25618 from kamipo/fix_release_notes	Rafael França	2016-07-01	1	-4/+0
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Deprecation passing of `start` value was removed [ci skip]
\| * \| \| \| \| \| \| \| \|	Deprecation passing of `start` value was removed [ci skip]	Ryuta Kamizono	2016-07-01	1	-4/+0
\|/ / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	ref #18961, #23099.
* \| \| \| \| \| \| \| \|	Merge pull request #25582 from alexcameron89/action_controller_base	प्रथमेश Sonpatki	2016-07-01	1	-4/+4
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip] Add 'params' formatting in ActionController::Base
\| * \| \| \| \| \| \| \| \|	[ci skip] Add 'params' formatting in ActionController::Base	Alex Kitchens	2016-06-30	1	-4/+4
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	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
\| \|/ / / / / / / / /