Permalink
Commits on Aug 30, 2016
  1. Merge pull request #25880 from ryandv/fix_performance_regression_in_t…

    …imewithzone_to_time
    
    Fix performance regression in `TimeWithZone#to_time`
    pixeltrix committed on GitHub Aug 30, 2016
Commits on Aug 29, 2016
  1. Merge pull request #26317 from maclover7/jm-fix-26298

    Allow `send_file` to declare a charset
    tenderlove committed on GitHub Aug 29, 2016
  2. Add regression tests

    maclover7 committed Aug 29, 2016
  3. Allow `send_file` to declare a charset

    Removed my patch in favor of @tenderlove's less invasive approach.
    
    [Aaron Patterson & Jon Moss]
    maclover7 committed Aug 29, 2016
  4. Merge pull request #26318 from alexcameron89/contributing-doc-update

    [ci skip] Update branch version in Contributing Guide
    pixeltrix committed on GitHub Aug 29, 2016
  5. [ci skip] Update branch version in Contributing Guide

    Since only Rails 4 and above are currently supported, this updates a
    3-2-stable example to be consistent with the support standard.
    alexcameron89 committed Aug 29, 2016
  6. Fix nested multiple roots

    The PR #20940 enabled the use of multiple roots with different constraints
    at the top level but unfortunately didn't work when those roots were inside
    a namespace and also broke the use of root inside a namespace after a top
    level root was defined because the check for the existence of the named route
    used the global :root name and not the namespaced name.
    
    This is fixed by using the name_for_action method to expand the :root name to
    the full namespaced name. We can pass nil for the second argument as we're not
    dealing with resource definitions so don't need to handle the cases for edit
    and new routes.
    
    Fixes #26148.
    ryohashimoto committed with pixeltrix Aug 29, 2016
  7. Remove unneeded FIXME note

    This is the intended behavior. You should not do more than one request
    in a controller test.
    rafaelfranca committed Aug 29, 2016
  8. Merge pull request #26311 from y-yagi/use_inspect_for_show_value

    use `inspect` for show `from` value
    kaspth committed on GitHub Aug 29, 2016
  9. Merge pull request #26310 from kjellberg/guides

    Add .gitignore to "files & purpose" list - getting started docs
    maclover7 committed on GitHub Aug 29, 2016
  10. use `inspect` for show `from` value

    If `from` is nil, in order to avoid the blank is showed.
    y-yagi committed Aug 29, 2016
Commits on Aug 28, 2016
  1. Merge pull request #26305 from kamipo/follow-up-to-26301

    Switch back to `Hash.dup`
    kaspth committed on GitHub Aug 28, 2016
  2. Merge pull request #26306 from kamipo/remove_under_ruby-1.9

    Remove "Under Ruby 1.9" [ci skip]
    kaspth committed on GitHub Aug 28, 2016
  3. Remove "Under Ruby 1.9" [ci skip]

    Rails dropped Ruby 1.9 support, but this comment still true.
    kamipo committed Aug 28, 2016
  4. Switch back to `Hash.dup`

    Follow up to #26301.
    kamipo committed Aug 28, 2016
  5. validate_each in NumericalityValidator is never called in this case.

    NumericalityValidator#validate_each is never called when allow_nil is true and
    the value is nil because it is already skipped in EachValidator#validate.
    guilleiguaran committed Aug 28, 2016
  6. Add test for allow_blank in numericality validation

    Signed-off-by: Guillermo Iguaran <guilleiguaran@gmail.com>
    ncreuschling committed with guilleiguaran Aug 25, 2016
  7. Merge pull request #26301 from maclover7/jm-fix-comment

    Switch back to `Hash.dup`
    guilleiguaran committed on GitHub Aug 28, 2016
Commits on Aug 27, 2016
  1. Switch back to `Hash.dup`

    The performance difference between `Hash[]` and `Hash.dup` looks to have
    been narrowed by @tenderlove via this commit --> ruby/ruby@b3803cc#diff-eff9999082c8ce7d8ba1fc1d79f439cf.
    Since this commit first appeared in Ruby 2.0.0, and since Rails now
    requires a minimum Ruby version of 2.2.2, this performance boost should
    be available for all users.
    
    Relevant links:
    
    - This behavior was originally added via rails@02174a3
    - The conversation on the Ruby issue tracker lives here --> https://bugs.ruby-lang.org/issues/7166
    maclover7 committed Aug 27, 2016
  2. Merge pull request #26299 from davydovanton/fix-typo

    Fix typo in Delegation#delegate_missing_to doc [ci skip]
    vipulnsward committed on GitHub Aug 27, 2016
  3. Merge pull request #26297 from ledermann/patch-1

    Errors#add_on_blank: Fix typo in deprecation message
    vijaydev committed on GitHub Aug 27, 2016
  4. Fix typo in deprecation message

    This fixes a copy-and-paste-issue slipped in by #18996
    ledermann committed on GitHub Aug 27, 2016
  5. Merge pull request #26293 from mechanicles/move-custom-assertion

    Move Rails' custom assertion method `assert_nothing_raised` to its proper place.
    guilleiguaran committed on GitHub Aug 27, 2016
  6. Move custom assertion to its proper place

    ActiveSupport::Testing::Assertions.
    
    We have a separate module in which have defined Rails' own custom
    assertions. So it would be good to keep all custom Rails' assertions in
    one place i.e. in this module.
    mechanicles committed Aug 27, 2016
Commits on Aug 26, 2016
  1. Missing key should throw KeyError

    It should not throw a NameError, but should throw a KeyError.
    
    Fixes #26278
    eileencodes committed Aug 26, 2016
  2. Merge pull request #26288 from maclover7/jm-revert-21995

    Update `Rails.configuration` documentation
    guilleiguaran committed on GitHub Aug 26, 2016
  3. Clarify two ways to set Rails configuration options

    [ci skip]
    maclover7 committed Aug 26, 2016
  4. Add back in `config_for` example

    [ci skip]
    maclover7 committed Aug 26, 2016
  5. Revert "Merge pull request #21995 from tak1n/master"

    This reverts commit 4973704, reversing
    changes made to 78edeb3.
    maclover7 committed Aug 26, 2016
  6. Merge pull request #26287 from mechanicles/rails-assertion

    Move `assert_nothing_raised` method to Rails Specific Assertions section [ci skip]
    maclover7 committed on GitHub Aug 26, 2016
  7. Move `assert_nothing_raised` method to Rails Specific Assertions

    section [ci skip]
    
    - Method `assert_nothing_raised` is Rails' own custom assertion method and
    not a part of Minitest. So move it from Minitest assertions section to Rails
    Specific Assertions section.
    mechanicles committed Aug 26, 2016
  8. Merge pull request #26284 from kamipo/fix_warnig

    Fix "warning: assigned but unused variable - task"
    guilleiguaran committed on GitHub Aug 26, 2016