Permalink
Switch branches/tags
Commits on Jul 22, 2018
  1. Merge pull request #32984 from chiraggshah/min-thread-env-variable

    schneems committed Jul 22, 2018
    Separate min and max threads count environment variable for puma configuration
Commits on Jul 21, 2018
  1. Merge pull request #33268 from benpickles/remove-pubdate-from-docs

    schneems committed Jul 21, 2018
    Keep time_tag docs up-to-date.
  2. Merge pull request #33411 from bogdanvlviv/follow-up-33401-5491f8115711

    kaspth committed Jul 21, 2018
    Clarify example of the test `ActionController::HttpAuthentication::Token` [ci skip]
  3. Merge pull request #24131 from brchristian/limit_and_primary_key

    schneems committed Jul 21, 2018
    ActiveRecord: limit() and primary_key
  4. Merge pull request #33408 from ycherniavskyi/fix_leaking_special_form…

    kaspth committed Jul 21, 2018
    …_with_attributes_into_html_attributes
    
    Fix leaking special form_with attributes into html attributes
  5. Modified the changes to make it backward compatible

    chiraggshah committed Jul 21, 2018
Commits on Jul 20, 2018
  1. Merge pull request #33405 from georgeclaghorn/activestorage-referenti…

    georgeclaghorn committed Jul 20, 2018
    …al-integrity
    
    Add a foreign-key constraint to the active_storage_attachments table for blobs
  2. Fix leaking special form_with attributes into html attributes

    ycherniavskyi committed Jul 20, 2018
    Special form_with attributes `skip_default_ids` and `allow_method_names_outside_object`
    attributes are leaking into html attributes of option select tag helpers.
  3. Merge pull request #33171 from zvkemp/active-job-asn-wrap-enqueue

    kaspth committed Jul 20, 2018
    Wrap ActiveJob::Enqueue in evented ActiveSupport::Notification
  4. Merge pull request #32410 from yuki24/show-cause-on-debug-view-2

    kaspth committed Jul 20, 2018
    Show nested exceptions on the debug view
  5. Merge pull request #33392 from azbshiri/actionpack/prevent-request-en…

    kaspth committed Jul 20, 2018
    …coder-to-parse-nil-params
    
    Prevent `RequestEncoder#encode_params` to parse falsey params
  6. Prevent `RequestEncoder#encode_params` to parse falsey params

    azbshiri committed Jul 20, 2018
    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
  7. CHANGELOG entry

    brchristian committed Mar 10, 2016
  8. Fix deprecation message for `SOURCE_ANNOTATION_DIRECTORIES`

    y-yagi committed Jul 20, 2018
    Also, added a test that a deprecated message will be output.
  9. Merge pull request #33401 from pinewong/patch-1

    rafaelfranca committed Jul 20, 2018
    Fix problem with document expiration in ActionController::HttpAuthentication::Basic
  10. Fix basic auth problem in ActionController::HttpAuthentication::Basic…

    pinewong committed Jul 20, 2018
    … doc
Commits on Jul 19, 2018
  1. Merge pull request #33394 from kamipo/avoid_extra_scoping

    eileencodes committed Jul 19, 2018
    Avoid extra scoping in delegating to klass methods in the `scope` block
  2. Merge pull request #33391 from utilum/method_call_assertions_instead_…

    kamipo committed Jul 19, 2018
    …of_mocha
    
    Use MethodCallAssertions instead of Mocha#expects
  3. Avoid extra scoping in delegating to klass methods in the `scope` block

    kamipo committed Jul 18, 2018
    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.
  4. Fix `insert_fixtures_set` to be restored original connection flags

    kamipo committed Jul 19, 2018
    #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.
  5. Clarify the ActiveStorage::Attachment#purge and #purge_later docs

    georgeclaghorn committed Jul 19, 2018
    Link to the corresponding ActiveStorage::Blob methods, whose docs more accurately describe their effects. [ci skip]