1. 06 7月, 2015 5 次提交
  2. 05 7月, 2015 6 次提交
  3. 03 7月, 2015 7 次提交
  4. 02 7月, 2015 3 次提交
  5. 01 7月, 2015 6 次提交
    • R
      [ci skip] Improve the url_for documentation · 48dc8261
      Roque Pinel 提交于
      Clarify the `url_for` usage in mailers.
      
      Re-add the documentation about `url_for` and Route's path parameters,
      first introduced by 5c4f1859.
      This was reported on #15097 and until it is decided to deprecate it
      or not, I believe the documentation should exist.
      48dc8261
    • R
      Display a more human readable list of reserved names · 42b59065
      Robin Dupret 提交于
      Interpolating an array inside a String will call #inspect on it. Let's
      call #join to display a more human-readable error message.
      42b59065
    • R
      Separate the constraint and other options [ci skip] · bc71e432
      Robin Dupret 提交于
      Only one constraint option can be used at a time (except for the minimum
      and maximum ones that can eventually be combined). However, other
      options can be used with them (e.g. the validation failure message).
      So let's make the distinction between these two different options
      categories.
      
      [Yves Senn, Matthew Draper & Robin Dupret]
      bc71e432
    • K
      Merge pull request #20747 from pwnall/fix_minitest_rails · 1099e54b
      Kasper Timm Hansen 提交于
      Avoid crashing when minitest-rails is loaded.
      1099e54b
    • V
      Avoid crashing when minitest-rails is loaded. · e334ec4f
      Victor Costan 提交于
      The improvments to the test runner's integration with minitest in commit
      b6fc8e25 add methods to the Minitest
      module that refer to the Rails module. Unfortunately, when the
      minitest-rails gem is loaded, the reference is incorrectly resolved to
      the Minitest::Rails module.
      e334ec4f
    • S
      Correct through associations using scopes · bc6ac860
      Sean Griffin 提交于
      The changes introduced to through associations in c80487eb were quite
      interesting. Changing `relation.merge!(scope)` to `relation =
      relation.merge(scope)` should in theory never cause any changes in
      behavior. The subtle breakage led to a surprising conclusion.
      
      The old code wasn't doing anything! Since `merge!` calls
      `instance_exec` when given a proc, and most scopes will look something
      like `has_many :foos, -> { where(foo: :bar) }`, if we're not capturing
      the return value, it's a no-op. However, removing the `merge` causes
      `unscope` to break.
      
      While we're merging in the rest of the chain elsewhere, we were never
      merging in `unscope` values, causing a breakage on associations where a
      default scope was being unscoped in an association scope (yuk!). This is
      subtly related to #20722, since it appears we were previously relying on
      this mutability.
      
      Fixes #20721.
      Fixes #20727.
      bc6ac860
  6. 30 6月, 2015 11 次提交
  7. 29 6月, 2015 2 次提交