aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | Merge pull request #23906 from schneems/schneems/puma-3-0Richard Schneeman2016-02-262-1/+6
|\ \ \ \ \ | |_|/ / / |/| | | | [close #23681] Use puma 3.0.0+
| * | | | [close #23681] Use puma 3.0.0+ schneems2016-02-262-1/+6
|/ / / / | | | | | | | | | | | | | | | | Puma 3.0 and up introduced compatibility to read from `config/puma.rb` when booting from the command `$ rails server`https://github.com/puma/puma/pull/856.
* | | | Merge pull request #23902 from prajakta-tambe/update-debuggings-rails-app-docप्रथमेश Sonpatki2016-02-261-5/+5
|\ \ \ \ | | | | | | | | | | Changed debugging rails app doc.
| * | | | - Changed Debugging Rails Applications doc's logger introduction section. ↵prajakta2016-02-261-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changed location for specifying logger. [Prajakta, thiagoaugusto]
* | | | | Merge pull request #23899 from y-yagi/fix_typo_in_pull_request_templateप्रथमेश Sonpatki2016-02-261-1/+1
|\ \ \ \ \ | | | | | | | | | | | | fix typo in pull_request_template [ci skip]
| * | | | | fix typo in pull_request_template [ci skip]yuuji.yaginuma2016-02-261-1/+1
|/ / / / /
* | | | | :nail_care:Arthur Nogueira Neves2016-02-251-1/+1
| | | | | | | | | | | | | | | [skip ci]
* | | | | The async.callback call should live with the hijackMatthew Draper2016-02-261-4/+5
| | | | | | | | | | | | | | | | | | | | If we're deferring one, we should defer the other too.
* | | | | Merge pull request #23738 from maclover7/issue-templateRafael França2016-02-252-0/+33
|\ \ \ \ \ | | | | | | | | | | | | Add `issue_template.md`
| * | | | | Add `issue_template.md` and `pull_request_template.md`Jon Moss2016-02-182-0/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This appears to be a new feature of GitHub. See these links for more details: - https://github.com/dear-github/dear-github/issues/125 - https://github.com/owncloud/core/issues/new - https://github.com/blog/2111-issue-and-pull-request-templates [ci skip]
* | | | | | :nail_care:Rafael Mendonça França2016-02-251-2/+2
| | | | | |
* | | | | | Merge pull request #23852 from prathamesh-sonpatki/hsts-subdomainsRafael França2016-02-256-8/+69
|\ \ \ \ \ \ | | | | | | | | | | | | | | Enable HSTS with IncludeSubdomains header by default for new apps
| * | | | | | Update documentation and deprecation messagePrathamesh Sonpatki2016-02-251-3/+3
| | | | | | |
| * | | | | | Add CHANGELOG entryPrathamesh Sonpatki2016-02-251-0/+4
| | | | | | |
| * | | | | | Added deprecation for older appsPrathamesh Sonpatki2016-02-252-8/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - For old apps which are not setting any value for hsts[:subdomains], a deprecation warning will be shown saying that hsts[:subdomains] will be turned on by default in Rails 5.1. Currently it will be set to false for backward compatibility. - Adjusted tests to reflect this change.
| * | | | | | Old applications will not get the ssl_options initializerPrathamesh Sonpatki2016-02-252-0/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - We will remove the initializer for old apps which are migrated to Rails 5 so that they are not affected by this breaking change.
| * | | | | | New applications will be generated with ssl_options to enable HSTS with ↵Prathamesh Sonpatki2016-02-251-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | subdomains - We will reuse config.ssl_options for setting the HSTS settings.
| * | | | | | HSTS without IncludeSubdomains is often uselessEgor Homakov2016-02-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1) Because if you forget to add Secure; to the session cookie, it will leak to http:// subdomain in some cases 2) Because http:// subdomain can Cookie Bomb/cookie force main domain or be used for phishing. That's why *by default* it must include subdomains as it's much more common scenario. Very few websites *intend* to leave their blog.app.com working over http:// while having everything else encrypted. Yes, many developers forget to add subdomains=true by default, believe me :)
* | | | | | | Merge pull request #23846 from ↵Rafael França2016-02-253-11/+31
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | y-yagi/correctly_check_ApplicationRecord_in_mountable_engine correctly check `ApplicationRecord` is exist in moutable engine
| * | | | | | | correctly check `ApplicationRecord` is exist in moutable engineyuuji.yaginuma2016-02-253-11/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Follow up to 1813b29fc7632959800252f36e4b2e6ed4ac7266
* | | | | | | | Merge pull request #23887 from ↵Matthew Draper2016-02-262-1/+19
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | jrafanie/fix_uniqueness_validation_on_after_create Fix uniqueness validation with an after_create hook.
| * | | | | | | | Fix uniqueness validation with an after_create hook.Joe Rafaniello2016-02-252-1/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | record.id_was is nil in after_create/after_save, so we should use id in these cases. While this logic feels incomplete, the existing update_record uses the same logic: https://github.com/rails/rails/blob/2fda4e0874a97a76107ab9e88305169f2c625933/activerecord/lib/active_record/relation.rb#L83 This logic was originally added for a similar problem: updates not working with after_create hook. See: 482f8c15b1d699c95bfbc3d836f674a09c0d9031 Followup to #23581 Fixes #23844
* | | | | | | | | Revert "Merge pull request #20851 from tomprats/indifferent-sessions"Matthew Draper2016-02-263-21/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 22db455dbe9c26fe6d723cac0758705d9943ea4b, reversing changes made to 40be61dfda1e04c3f306022a40370862e3a2ce39. This finishes off what I meant to do in 6216a092ccfe6422f113db906a52fe8ffdafdbe6.
* | | | | | | | | Revert "Update Session to utilize indiffernt access"Matthew Draper2016-02-268-127/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 45a75a3fcc96b22954caf69be2df4e302b134d7a. HWIAs are better than silently deeply-stringified hashes... but that's a reaction to a shortcoming of one particular session store: we should not break the basic behaviour of other, more featureful, session stores in the process. Fixes #23884
* | | | | | | | | 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]
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-02 21:56:59 +0000