aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | Fix test name typo prescence -> presenceeileencodes2016-02-271-1/+1
| | | | | |
* | | | | | Merge pull request #23439 from ryohashimoto/160203_rake_railsKasper Timm Hansen2016-02-277-10/+29
|\ \ \ \ \ \ | | | | | | | | | | | | | | Use app namespace for framework tasks
| * | | | | | The tasks in the rails task namespace is deprecated in favor of app namespace.Ryo Hashimoto2016-02-267-10/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | (e.g. `rails:update` and `rails:template` tasks is renamed to `app:update` and `app:template`.)
* | | | | | | Merge pull request #23926 from kuldeepaggarwal/fix-docsप्रथमेश Sonpatki2016-02-271-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | [ci skip]Add info for specifying logger in different envrionments.
| * | | | | | | [ci skip]Add info for specifying logger in different envrionments.Kuldeep Aggarwal2016-02-271-1/+1
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | refer 2dc3e81aea8dbc, 56ca2061df83a3
* | | | | | | :scissors:Rafael Mendonça França2016-02-261-2/+2
| | | | | | |
* | | | | | | Merge pull request #23917 from chashmeetsingh/patch-1Rafael Mendonça França2016-02-261-1/+3
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Create tmp folder if not present
| * | | | | | | Create tmp folder if not presentChashmeet Singh2016-02-271-1/+3
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | All Apps may not have a tmp folder Update dev.rake Update dev.rake Update dev.rake Update dev.rake Update dev.rake Update dev.rake Update dev.rake
* | | | | | | Merge pull request #23920 from ianks/masterRafael França2016-02-261-1/+1
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | Specify plaform: :mri for byebug
| * | | | | | Specify plaform: :mri for byebugIan Ker-Seymer2016-02-261-1/+1
|/ / / / / /
* | | | | | Merge pull request #23915 from sikachu/pr-23710-updateRafael França2016-02-263-3/+30
|\ \ \ \ \ \ | | | | | | | | | | | | | | Revise #23717 (Add "Rendering ..." message) using proper ActiveSupport::LogSubscriber#start
| * | | | | | Add CHANGELOG entry for "Rendering ..." loggingPrem Sichanugrist2016-02-261-0/+6
| | | | | | |
| * | | | | | Update to use Subscriber#start insteadPrem Sichanugrist2016-02-262-7/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We don't need to instrument another event as `ActiveSupport::LogSubscriber` already tracks when the instrumentation starts. Close #23717
| * | | | | | Added log "Rendering ...", when starting to render a template, to log that ↵Vipul A M2016-02-263-3/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | we have started to render something, at the very beginning. This helps to easily identify queries from controller vs views Fixes #23710
* | | | | | | Merge pull request #23916 from ↵Jeremy Daer2016-02-261-2/+6
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | lifo/same-redis-connection-for-subscription-and-broadcast Always use redis_connector to create redis connections
| * | | | | | Use redis_connector to create redis connections for both subscriptions and ↵Pratik Naik2016-02-261-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | broadcasts
* | | | | | | 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