aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Point to released coffee-railsRafael Mendonça França2016-06-303-11/+6
|
* Fix styles of headings to follow guide ruleseileencodes2016-06-301-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_guideRafael França2016-06-301-12/+11
|\ | | | | Change wording & punctuation in Guides - Upgrading
| * Change wording & punctuation in Guides - UpgradingAlex Kitchens2016-06-301-12/+11
| |
* | Merge pull request #25602 from matthewd/restore-key-generatorMatthew Draper2016-07-012-7/+22
|\ \ | |/ |/| Partially revert #25192
| * Partially revert #25192Matthew Draper2016-07-012-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 Noria2016-06-301-1/+1
| |
* | expands a bit a section of the upgrade guide [ci skip]Xavier Noria2016-06-301-4/+15
|/
* Merge pull request #25587 from vipulnsward/publish-release-notesEileen M. Uchitelle2016-06-301-1/+0
|\ | | | | Publish Rails 5 release notes
| * Publish Rails 5 release notes[ci skip]Vipul A M2016-06-291-1/+0
| |
* | Merge pull request #25596 from prathamesh-sonpatki/testing-guide-50Eileen M. Uchitelle2016-06-301-42/+102
|\ \ | | | | | | Update testing guide for Rails 5
| * | Update testing guide for Rails 5 release [ci skip]Prathamesh Sonpatki2016-06-301-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--1Eileen M. Uchitelle2016-06-301-1/+36
|\ \ \ | | | | | | | | Update release notes for 5.0 [ci skip]
| * | | Update release notes for 5.0 [ci skip]Prathamesh Sonpatki2016-06-301-1/+36
| | | |
* | | | Merge pull request #25599 from prathamesh-sonpatki/update-upgrade-guideEileen M. Uchitelle2016-06-302-2/+8
|\ \ \ \ | | | | | | | | | | Update upgrade guide
| * | | | Add a note about autoloading being disabled in production env in upgrade ↵Prathamesh Sonpatki2016-06-302-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 guideseileencodes2016-06-301-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-masterEileen M. Uchitelle2016-06-302-10/+12
|\ \ \ | |/ / |/| | Update getting started guide for Rails 5 [ci skip]
| * | Update getting started guide for Rails 5 [ci skip]Prathamesh Sonpatki2016-06-302-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'eileencodes2016-06-301-3/+16
|\ \ | | | | | | | | | This is an slight refactoring/improved version of #25586.
| * | Add test runner features to release notes [ci skip]Vipul A M2016-06-301-3/+16
| |/
* | Merge pull request #25589 from y-yagi/update_5_0_release_notesEileen M. Uchitelle2016-06-301-7/+13
|\ \ | | | | | | add missing things to release notes [ci skip]
| * | add missing things to release notes [ci skip]yuuji.yaginuma2016-06-301-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 poolJeremy Daer2016-06-292-7/+9
|/
* Merge pull request #25583 from vipulnsward/add-api-apps-to-release-notesEileen M. Uchitelle2016-06-291-3/+28
|\ | | | | Add API Apps to release notes
| * Add API Apps to release notes[ci skip]Vipul A M2016-06-291-3/+28
| |
* | Fix release notes linkeileencodes2016-06-291-1/+1
| |
* | Merge pull request #25584 from vipulnsward/upgrading-guideEileen M. Uchitelle2016-06-291-3/+3
|\ \ | | | | | | Pass over Upgrading guide
| * | Pass over Upgrading guide [ci skip]Vipul A M2016-06-291-3/+3
| | |
* | | Add note about release notes in upgrade guideeileencodes2016-06-291-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` adaptereileencodes2016-06-291-2/+4
|/ / | | | | | | Make release notes about legacy `mysql` adapter clearer.
* | Update Rails 5 upgrade guideseileencodes2016-06-291-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-docsVipul A M2016-06-291-0/+68
|\ \ | |/ |/| Add documentation about Action Cable npm package
| * Add documentation about Action Cable npm packageJon Moss2016-05-261-0/+68
| | | | | | | | | | | | | | | | Sorry, forgot to include in my main PR :( [ci skip] [Jon Moss, Zach Schneider]
* | Merge pull request #25574 from alexcameron89/action_view_baseJon Moss2016-06-291-6/+6
|\ \ | | | | | | [ci skip] Update formatting in ActionView::Base documentation
| * | [ci skip] Update formatting in ActionView::Base documentationAlex Kitchens2016-06-291-6/+6
| | |
* | | Merge pull request #25572 from alexcameron89/polymorphic_routesJon Moss2016-06-291-2/+2
|\| | | | | | | | [ci skip] Fix grammar & add link in PolymorphicRoutes
| * | [ci skip] Fix typo & add link in PolymorphicRoutesAlex Kitchens2016-06-291-2/+2
| | |
* | | Merge pull request #25559 from kmcphillips/masterSean Griffin2016-06-294-10/+36
|\ \ \ | | | | | | | | Do not inspect array of over 10 elements
| * | | Do not specal case inspecting associated arrays of over 10 elements, ↵Kevin McPhillips2016-06-294-10/+36
|/ / / | | | | | | | | | preventing infinite looping in some cases.
* | | Don't attempt to clear active connections unless we'ere connectedSean Griffin2016-06-291-1/+1
| | | | | | | | | | | | | | | | | | Right now with this middleware we are likely always connected, but I'm hoping to change that soon. This is an easy change to pull out on its own.
* | | Remove unused `ActiveRecord::Base.connection_id`Sean Griffin2016-06-295-28/+9
|/ / | | | | | | | | | | | | | | This method appears to have been partially used in connection pool caching, but it was introduced without much reasoning or any tests. One edge case test was added later on, but it was focused on implementation details. This method is no longer used outside of tests, and as such is removed.
* | Merge pull request #25567 from y-yagi/update_description_of_test_orderVipul A M2016-06-291-1/+1
|\ \ | | | | | | update description of `test_order` [ci skip]
| * | update description of `test_order` [ci skip]yuuji.yaginuma2016-06-291-1/+1
| | | | | | | | | | | | Follow up to 5f777e4b5ee2e3e8e6fd0e2a208ec2a4d25a960d
* | | Merge pull request #25562 from vipulnsward/select-html-options-testRafael França2016-06-281-1/+10
|\ \ \ | | | | | | | | Add coverage for #25529
| * | | - Added select tag test for verifying passing html options to f.select helperVipul A M2016-06-281-1/+10
| |/ / | | | | | | | | | - Renamed test to be more descriptive
* | | Merge pull request #25364 from kamipo/fix_serialize_for_date_typeRafael França2016-06-282-1/+17
|\ \ \ | |/ / |/| | Fix `Type::Date#serialize` to return a date object correctly
| * | Fix `Type::Date#serialize` to return a date object correctlyRyuta Kamizono2016-06-162-1/+17
| | | | | | | | | | | | | | | | | | | | | | | | Currently `Type::Date#serialize` does not cast a value to a date object. It should be cast to a date object for finding by date column correctly working. Fixes #25354.
* | | Merge pull request #25544 from piotrj/pj-issue-25488Rafael França2016-06-282-1/+21
|\ \ \ | | | | | | | | Fix setting route's to in a scope
| * | | Fix setting route's to in a scopePiotr Jakubowski2016-06-282-1/+21
| | | | | | | | | | | | | | | | | | | | | | | | Fixes #25488 97d7dc4 introduced a regression that resulted in ArgumentError when to was in options of the scope and not of particular route.