aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #32984 from chiraggshah/min-thread-env-variableRichard Schneeman2018-07-211-2/+3
|\ | | | | Separate min and max threads count environment variable for puma configuration
| * Modified the changes to make it backward compatibleChirag Shah2018-07-211-1/+1
| |
| * Separate min and max threads count for pumaChirag Shah2018-05-251-2/+3
| | | | | | | | | | | | | | | | | | | | Same environment variable RAILS_MAX_THREADS was being used for setting the minimum and maximum thread count for puma. This change makes it obvious and easy to decide which environment variable to change for setting the min or max. Don't feel like this is a breaking change as the same default is maintained.
* | Merge pull request #33268 from benpickles/remove-pubdate-from-docsRichard Schneeman2018-07-211-2/+0
|\ \ | | | | | | Keep time_tag docs up-to-date.
| * | Keep time_tag docs up-to-date.Ben Pickles2018-07-011-2/+0
| | | | | | | | | | | | | | | The pubdate attribute was removed from the spec, see 940eec417f20e53abd3e3114c7fa845dac0d3a62 for context.
* | | Remove unused attributeGeorge Claghorn2018-07-212-5/+5
| | |
* | | Merge pull request #33411 from bogdanvlviv/follow-up-33401-5491f8115711Kasper Timm Hansen2018-07-211-4/+3
|\ \ \ | | | | | | | | Clarify example of the test `ActionController::HttpAuthentication::Token` [ci skip]
| * | | Clarify example of the test `ActionController::HttpAuthentication::Token` ↵bogdanvlviv2018-07-211-4/+3
|/ / / | | | | | | | | | | | | | | | [ci skip] Follow up #33401, 5491f8115711d8b34d52f8ba5e52ba39a49b08fe.
* | | Merge pull request #24131 from brchristian/limit_and_primary_keyRichard Schneeman2018-07-213-1/+22
|\ \ \ | | | | | | | | ActiveRecord: limit() and primary_key
| * | | CHANGELOG entryBrian Christian2018-07-191-0/+6
| | | |
| * | | don't impose primary key order if limit() is definedBrian Christian2018-07-191-1/+1
| | | |
| * | | tests for use of primary_key with limitBrian Christian2018-07-191-0/+15
| | | |
* | | | Merge pull request #33408 from ↵Kasper Timm Hansen2018-07-214-7/+25
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | ycherniavskyi/fix_leaking_special_form_with_attributes_into_html_attributes Fix leaking special form_with attributes into html attributes
| * | | | Fix leaking special form_with attributes into html attributesYurii Cherniavskyi2018-07-204-7/+25
| | | | | | | | | | | | | | | | | | | | | | | | | Special form_with attributes `skip_default_ids` and `allow_method_names_outside_object` attributes are leaking into html attributes of option select tag helpers.
* | | | | Merge pull request #33405 from ↵George Claghorn2018-07-208-6/+25
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | georgeclaghorn/activestorage-referential-integrity Add a foreign-key constraint to the active_storage_attachments table for blobs
| * | | | Discard ActiveStorage::PurgeJobs on ActiveRecord::InvalidForeignKeyGeorge Claghorn2018-07-202-1/+11
| | | | |
| * | | | Test that ActiveStorage::Blob#purge fails when attachments existGeorge Claghorn2018-07-201-0/+8
| | | | |
| * | | | Add a foreign-key constraint to the attachments table for blobsGeorge Claghorn2018-07-193-2/+3
| | | | |
| * | | | Delete attachment before purging blobGeorge Claghorn2018-07-191-2/+2
| | | | |
| * | | | Destroy blob record before deleting stored dataGeorge Claghorn2018-07-191-1/+1
| | | | |
* | | | | [ci skip] Fixup changelog. Trim title. Mention benefit.Kasper Timm Hansen2018-07-202-5/+8
| | | | |
* | | | | Merge pull request #33171 from zvkemp/active-job-asn-wrap-enqueueKasper Timm Hansen2018-07-203-6/+27
|\ \ \ \ \ | | | | | | | | | | | | Wrap ActiveJob::Enqueue in evented ActiveSupport::Notification
| * | | | | Wrap ActiveJob::Enqueue in evented ActiveSupport::Notificationzvkemp2018-07-173-6/+27
| | | | | |
* | | | | | Merge pull request #32410 from yuki24/show-cause-on-debug-view-2Kasper Timm Hansen2018-07-2011-77/+189
|\ \ \ \ \ \ | | | | | | | | | | | | | | Show nested exceptions on the debug view
| * | | | | | Show nested exceptions on the debug viewYuki Nishijima2018-07-1511-77/+189
| | | | | | |
* | | | | | | [ci skip] Fix syntax error + make example easier to follow.Kasper Timm Hansen2018-07-201-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Follow up to 9f152a606
* | | | | | | [ci skip] Strike changelog entry, since it's 5.2 backported.Kasper Timm Hansen2018-07-201-11/+0
| | | | | | |
* | | | | | | [ci skip] Move changelog entry up top. Clarify.Kasper Timm Hansen2018-07-201-7/+11
| | | | | | |
* | | | | | | Merge pull request #33392 from ↵Kasper Timm Hansen2018-07-203-1/+22
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | azbshiri/actionpack/prevent-request-encoder-to-parse-nil-params Prevent `RequestEncoder#encode_params` to parse falsey params
| * | | | | | Prevent `RequestEncoder#encode_params` to parse falsey paramsAlireza Bashiri2018-07-203-1/+22
| | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a `get` method called with `as: :json` and `params: nil` or `params: false` (explicitly or implicitly) `RequestEncoder#encode_params` converts it into a `null` or `false` value which includes a unexpected `null=` or `false` query string into request URL. From now on `RequestEncoder#encode_params` checks whether `params` is nil or not otherwise returns. Move down `nil` conversion guard Update CHANGELOG.md
* | | | | | Fix deprecation message for `SOURCE_ANNOTATION_DIRECTORIES`yuuji.yaginuma2018-07-202-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | Also, added a test that a deprecated message will be output.
* | | | | | Merge pull request #33401 from pinewong/patch-1Rafael França2018-07-201-2/+2
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Fix problem with document expiration in ActionController::HttpAuthentication::Basic
| * | | | | Fix basic auth problem in ActionController::HttpAuthentication::Basic doc黄松2018-07-201-2/+2
|/ / / / /
* | | | | Merge pull request #33394 from kamipo/avoid_extra_scopingEileen M. Uchitelle2018-07-193-2/+8
|\ \ \ \ \ | | | | | | | | | | | | Avoid extra scoping in delegating to klass methods in the `scope` block
| * | | | | Avoid extra scoping in delegating to klass methods in the `scope` blockRyuta Kamizono2018-07-193-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since #29301, delegating to klass methods in the `scope` block would cause extra scoping by the receiver itself. The extra scoping would always override intermediate scoping like `unscoped` and caused the regression #33387. To keep the original scoping behavior, should avoid the extra scoping in the `scope` block. Fixes #33387.
* | | | | | Merge pull request #33391 from utilum/method_call_assertions_instead_of_mochaRyuta Kamizono2018-07-195-98/+154
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Use MethodCallAssertions instead of Mocha#expects
| * | | | | Use MethodCallAssertions instead of Mocha#expectsutilum2018-07-195-98/+154
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Many calls to `Mocha#expects` preceded the introduction of `ActiveSupport::Testing::MethodCallAssertions` in 53f64c0fb, and many are simple to replace with `MethodCallAssertions`. This patch makes all these simple replacements. Step 5 in #33162
* | | | | | Fix `insert_fixtures_set` to be restored original connection flagsRyuta Kamizono2018-07-193-34/+116
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | #33363 has two regressions. First one is that `insert_fixtures_set` is failed if flags is an array. Second one is that connection flags are not restored if `set_server_option` is not supported.
* | | | | | Link between ActiveStorage::Blob#purge, #purge_later, and #delete [ci skip]George Claghorn2018-07-181-5/+5
| | | | | |
* | | | | | Clarify the ActiveStorage::Attachment#purge and #purge_later docsGeorge Claghorn2018-07-181-2/+2
|/ / / / / | | | | | | | | | | | | | | | Link to the corresponding ActiveStorage::Blob methods, whose docs more accurately describe their effects. [ci skip]
* | | | | Revert "Short circuit the scoping delegation for `relation.all`"Ryuta Kamizono2018-07-191-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit eb807384c81a6e086b17a576755e992e6c4c685e. If the current scope is affected by the `unscoped` block, `all` won't be the same with `spawn`.
* | | | | Merge pull request #33384 from ↵Rafael França2018-07-181-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | lanzhiheng/add-situation-for-belongs-to-associations-note [ci skip] Add situation for belongs to association.
| * | | | | Add situation for belongs to association. [ci skip]lanzhiheng2018-07-181-1/+1
| | | | | |
* | | | | | Merge pull request #33363 from ahorek/transaction_bugRafael França2018-07-182-5/+38
|\ \ \ \ \ \ | | | | | | | | | | | | | | use set_server_option if possible
| * | | | | | use set_server_option if possiblepavel2018-07-152-5/+38
| | | | | | |
* | | | | | | Revert "Merge pull request #33385 from ↵Rafael Mendonça França2018-07-181-16/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lanzhiheng/add-example-for-has-and-belongs-to-many-association" This reverts commit 3c8c410012e34709f3fdfe5b6a571353b20d0c56, reversing changes made to daee94da99605d89854660b63d98e4c1dc9a979d. We have this information below in the reference section for has_and_belongs_to_many.
* | | | | | | Merge pull request #31320 from gtqnchev/to_form_params-fixRafael França2018-07-183-3/+21
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Fix issue with `button_to`'s `to_form_params`
| * | | | | | | Fix issue with `button_to`'s `to_form_params`Georgi Georgiev2018-07-163-3/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `button_to` was throwing exception when invoked with `params` hash that contains symbol and string keys. The reason for the exception was that `to_form_params` was comparing the given symbol and string keys. The issue is fixed by turning all keys to strings inside `to_form_params` before comparing them.
* | | | | | | | Merge pull request #33385 from ↵Rafael França2018-07-181-0/+16
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lanzhiheng/add-example-for-has-and-belongs-to-many-association [ci skip] Add example for `has-and-belongs-to-many` association.
| * | | | | | | | Add example for `has-and-belongs-to-many` association. [ci skip]lanzhiheng2018-07-181-0/+16
| | |_|/ / / / / | |/| | | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-04 10:22:51 +0000