aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #23889 from claudiob/fix-getting-startedClaudio B2016-02-251-16/+20
|\ | | | | Doc: update guides for Rails 5
| * Doc: update AC::Parameters guides for Rails 5claudiob2016-02-251-2/+2
| | | | | | | | [ci skip]
| * Doc: update routes guides for Rails 5claudiob2016-02-251-14/+18
|/ | | | [ci skip]
* Merge pull request #23874 from st0012/update-documentsAndrew White2016-02-251-1/+3
|\ | | | | [ci skip] Update configuration guide
| * Add config.debug_exception_response_format into configuration guideStan Lo2016-02-251-0/+2
| |
| * Update config.force_ssl's documentationStan Lo2016-02-251-1/+1
| |
* | Additional review of 6b31761.Kasper Timm Hansen2016-02-253-3/+2
| | | | | | | | | | * Fixes typos in error message and release notes. * Removes unused template test file.
* | Merge pull request #23827 from rails/new_implicit_renderGodfrey Chan2016-02-2514-57/+235
|\ \ | |/ |/| Lock down new `ImplicitRender` behavior for 5.0 RC
| * Lock down new `ImplicitRender` behavior for 5.0 RCGodfrey Chan2016-02-2514-57/+235
|/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. Conceptually revert #20276 The feature was implemented for the `responders` gem. In the end, they did not need that feature, and have found a better fix (see plataformatec/responders#131). `ImplicitRender` is the place where Rails specifies our default policies for the case where the user did not explicitly tell us what to render, essentially describing a set of heuristics. If the gem (or the user) knows exactly what they want, they could just perform the correct `render` to avoid falling through to here, as `responders` did (the user called `respond_with`). Reverting the patch allows us to avoid exploding the complexity and defining “the fallback for a fallback” policies. 2. `respond_to` and templates are considered exhaustive enumerations If the user specified a list of formats/variants in a `respond_to` block, anything that is not explicitly included should result in an `UnknownFormat` error (which is then caught upstream to mean “406 Not Acceptable” by default). This is already how it works before this commit. Same goes for templates – if the user defined a set of templates (usually in the file system), that set is now considered exhaustive, which means that “missing” templates are considered `UnknownFormat` errors (406). 3. To keep API endpoints simple, the implicit render behavior for actions with no templates defined at all (regardless of formats, locales, variants, etc) are defaulted to “204 No Content”. This is a strictly narrower version of the feature landed in #19036 and #19377. 4. To avoid confusion when interacting in the browser, these actions will raise an `UnknownFormat` error for “interactive” requests instead. (The precise definition of “interactive” requests might change – the spirit here is to give helpful messages and avoid confusions.) Closes #20666, #23062, #23077, #23564 [Godfrey Chan, Jon Moss, Kasper Timm Hansen, Mike Clark, Matthew Draper]
* Merge pull request #23843 from maclover7/fix-23471Matthew Draper2016-02-253-10/+29
|\ | | | | Only hijack Rack socket when first needed
| * Only hijack Rack socket when first neededJon Moss2016-02-243-10/+29
| | | | | | | | Fixes #23471
* | Merge pull request #23863 from delftswa2016/fix-readme-headingJon Moss2016-02-243-4/+4
|\ \ | | | | | | Fix README heading according to Markdown conventions
| * | Fix title of README according to Markdown conventionsAaron Ang2016-02-253-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | The first heading in some README's are indicated using a second level heading (`##`), which in my opinion is of incorrect structure. Therefore, in this patch I changed the first heading to a first level heading (`#`) in README's where this incorrect structure occurs. [ci skip]
* | | Merge pull request #23488 from maclover7/actioncable-defaultsMatthew Draper2016-02-2512-21/+49
|\ \ \ | |_|/ |/| | Enable ActionCable routes by default
| * | Only open Action Cable connection if data is being sentJon Moss2016-02-242-6/+6
| | |
| * | Enable Action Cable routes by defaultJon Moss2016-02-2410-15/+43
| | | | | | | | | | | | This also marks Action Cable routes as internal to Rails.
* | | Merge pull request #23862 from prathamesh-sonpatki/test-for-strong-etagRafael França2016-02-241-0/+8
|\ \ \ | |/ / |/| | Added a test for generating Strong ETag
| * | Added a test for generating Strong ETagPrathamesh Sonpatki2016-02-241-0/+8
| | |
* | | Merge pull request #23870 from ↵Jon Moss2016-02-241-0/+17
|\ \ \ | | | | | | | | | | | | | | | | akshaymohite/api-app-debug-exception-response-format-in-doc [ci skip] Need to mention debug_exception_response_format in the api_app documentation.
| * | | [ci skip] Need to mention debug_exception_response_format in the api_app ↵Akshay2016-02-251-0/+17
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | documentation. - #23771 removed the reference to debug_exception_response_format from the api_app documentation. - We need to let users know, they have ability to configure debug_exception_response_format in their development environment. - Added documentation for the same in api_app.md file - Grammar corrections
* | | Merge pull request #23866 from abhishekjain16/documentJon Moss2016-02-242-2/+2
|\ \ \ | | | | | | | | [ci skip] Replace usage of rake routes with rails routes
| * | | [ci skip] Replace usage of rake routes with rails routesAbhishek Jain2016-02-252-2/+2
| | | |
* | | | Ensure suppressor runs before validationseileencodes2016-02-244-2/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I ran into an issue where validations on a suppressed record were causing validation errors to be thrown on a record that was never going to be saved. There isn't a reason to run the validations on a record that doesn't matter. This change moves the suppressor up the chain to be run on the `save` or `save!` in the validations rather than in persistence. The issue with running it when we hit persistence is that the validations are run first, then we hit persistance, and then we hit the suppressor. The suppressor comes first. The change to the test was required since I added the `validates_presence_of` validations. Adding this alone was enough to demonstrate the issue. I added a new test to demonstrate the new behavior is explict.
* | | | Merge branch 'master' into treewipAaron Patterson2016-02-24198-1246/+2139
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (113 commits) remove useless method Updated file documentation [ci skip] changes caching guide to add note on weak etags Don't put config.action_mailer.perform_caching entry twice in development.rb Fix wording and wrong reference Add Ruby formatting to CHANGELOG entry Fix ActionView's cache section reference Do not define methods in the included block Add caching guide in ActionMailer basics Add ActionMailer configuration options Preparing for 5.0.0.beta3 release Update 5.0 release notes Enable tmp_restart plugin for puma Prep release for Rails 5 beta3 [ci skip] Move collection caching changelog entry. Ensure `drop_table` even if tests failure or interrupted :bomb: run the test @rafaelfranca :angry: Remove changelog entry for reverted commit Add CHANGELOG for https://github.com/rails/rails/pull/23734 [ci skip] No need CHANGELOG entry for #23849. ...
| * | | remove useless methodAaron Patterson2016-02-241-2/+0
| | | |
| * | | Merge pull request #23861 from chashmeetsingh/patch-1प्रथमेश Sonpatki2016-02-241-1/+1
| |\ \ \ | | |/ / | |/| | Updated file documentation [ci skip]
| | * | Updated file documentation [ci skip]Chashmeet Singh2016-02-241-1/+1
| |/ /
| * | Merge pull request #23860 from zerothabhishek/weak-etag-guideRafael França2016-02-241-0/+8
| |\ \ | | | | | | | | Changes caching guide to add note on weak etags
| | * | changes caching guide to add note on weak etagsAbhishek Yadav2016-02-241-0/+8
| | | |
| * | | Merge pull request #23859 from ↵Rafael França2016-02-241-8/+2
| |\ \ \ | | | | | | | | | | | | | | | | | | | | prathamesh-sonpatki/dont-put-perform-caching-config-twice Don't put config.action_mailer.perform_caching entry twice in development.rb
| | * | | Don't put config.action_mailer.perform_caching entry twice in development.rbPrathamesh Sonpatki2016-02-241-8/+2
| | | | |
| * | | | Merge pull request #23857 from st0012/update-documentsRafael França2016-02-244-1/+26
| |\ \ \ \ | | |/ / / | |/| | | [ci skip] Update guide sources for mailer view caching feature
| | * | | Fix wording and wrong referenceStan Lo2016-02-252-2/+2
| | | | |
| | * | | Fix ActionView's cache section referenceStan Lo2016-02-251-1/+1
| | | | |
| | * | | Add caching guide in ActionMailer basicsStan Lo2016-02-251-0/+16
| | | | |
| | * | | Add ActionMailer configuration optionsStan Lo2016-02-251-0/+3
| | | | |
| | * | | Update 5.0 release notesStan Lo2016-02-251-0/+6
| | | | |
| * | | | Merge pull request #23858 from claudiob/fix-aca-readmeClaudio B2016-02-241-4/+5
| |\ \ \ \ | | | | | | | | | | | | Add Ruby formatting to CHANGELOG entry
| | * | | | Add Ruby formatting to CHANGELOG entryclaudiob2016-02-241-4/+5
| |/ / / / | | | | | | | | | | | | | | | [ci skip]
| * | | | Do not define methods in the included blockRafael Mendonça França2016-02-241-293/+289
| | | | | | | | | | | | | | | | | | | | Instance methods can be defined in the module itself
| * | | | Preparing for 5.0.0.beta3 releaseeileencodes2016-02-2410-0/+26
| | | | | | | | | | | | | | | | | | | | Adds changelog headers for beta3 release
| * | | | Enable tmp_restart plugin for pumaRafael Mendonça França2016-02-241-0/+3
| | | | | | | | | | | | | | | | | | | | Fixes #23855
| * | | | Prep release for Rails 5 beta3eileencodes2016-02-2412-45/+45
| |/ / /
| * | | [ci skip] Move collection caching changelog entry.Kasper Timm Hansen2016-02-241-25/+25
| | | | | | | | | | | | | | | | | | | | We changed this in beta2, and only editing the original entry means people can't see that it was significantly changed.
| * | | Merge pull request #23853 from kamipo/ensure_drop_tableRafael França2016-02-241-7/+5
| |\ \ \ | | | | | | | | | | Ensure `drop_table` even if tests failure or interrupted
| | * | | Ensure `drop_table` even if tests failure or interruptedRyuta Kamizono2016-02-241-7/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I was encountered remaining `:binary_testings` table by tests failure. When remaining `:binary_testings` table, never reach `drop_table` due to `create_table` in the test always fails.
| * | | | :bomb: run the test @rafaelfranca :angry:Rafael Mendonça França2016-02-241-1/+1
| |/ / /
| * | | Remove changelog entry for reverted commiteileencodes2016-02-241-12/+0
| | | | | | | | | | | | | | | | | | | | I had to revert changes made for this CHANGELOG entry so this is no longer valid. The change for this entry was removed in 2c02bc0.
| * | | Merge pull request #23850 from prathamesh-sonpatki/changelog-for-23734Rafael França2016-02-241-0/+5
| |\ \ \ | | | | | | | | | | Add CHANGELOG for https://github.com/rails/rails/pull/23734 [ci skip]
| | * | | Add CHANGELOG for https://github.com/rails/rails/pull/23734 [ci skip]Prathamesh Sonpatki2016-02-241-0/+5
| |/ / /