1. 31 5月, 2016 5 次提交
    • S
      Merge pull request #25179 from kamipo/reuse_result_of_associated_table · d92a0d04
      Sean Griffin 提交于
      Reuse a result of `table.associated_table(column)` in `AssociationQueryHandler.value_for`
      d92a0d04
    • S
      Exists shouldn't error when used with `includes` · 02da8aea
      Sean Griffin 提交于
      Currently `exists?` does some hackery where it assumes that we can join
      onto anything that we passed to `eager_load` or `includes`, which
      doesn't work if we are joining onto a polymorphic association.
      
      Actually figuring out if we want to include something would require
      knowledge deep within the join dependency module, which is hard to pull
      up. The simplest solution is just to pass a flag down that says we're
      not actually going to try to eager load any of the data. It's not the
      solution I'd like, but that code really needs to be untangled before we
      can do much with it.
      
      This is another attempt at 6d5b1fdf which should address the concerns
      that led to reverting it in 4ecabed2.
      02da8aea
    • K
      Merge pull request #25194 from vipulnsward/use-cipher · 518893f8
      Kasper Timm Hansen 提交于
      use OpenSSL::Cipher instead of deprecated OpenSSL::Cipher::Cipher
      518893f8
    • S
      Ensure that instances of `ActiveModel::Errors` can be marshalled · b3dfd7d1
      Sean Griffin 提交于
      We now use default procs inside of the errors object, which gets
      included by default when marshaling anything that includes
      `ActiveModel::Validations`. This means that Active Record objects cannot
      be marshalled. We strip and apply the default proc ourselves. This will
      ensure the objects are YAML serializable as well, since YAML falls back
      to marshal implementations now. This is less important, however, as the
      errors aren't included when dumping Active Record objects.
      
      This commit does not include a changelog entry, as 5.0 is still in RC
      status at the time of writing, and 5.0.0 will not release with the bug
      this fixes.
      
      Fixes #25165
      b3dfd7d1
    • K
      Merge pull request #25175 from kamipo/fix_migration_class_names_in_tests · 88f763b0
      Kasper Timm Hansen 提交于
      Fix migration class names in tests
      88f763b0
  2. 30 5月, 2016 4 次提交
  3. 29 5月, 2016 10 次提交
  4. 28 5月, 2016 16 次提交
  5. 27 5月, 2016 5 次提交