CHANGELOG.md in ransack-1.6.6 vs CHANGELOG.md in ransack-1.7.0

@@ -1,10 +1,99 @@
 # Change Log
 
+## Unreleased
+
+
+## Version 1.7.0 - 2015-08-20
+### Fixed
+
+*   Fix
+    [#499](https://github.com/activerecord-hackery/ransack/issues/499) and
+    [#549](https://github.com/activerecord-hackery/ransack/issues/549).
+    Ransack now loads only Active Record if both Active Record and Mongoid are
+    running to avoid the two adapters overriding each other. This clarifies
+    that Ransack currently knows how to work with only one database adapter
+    active at a time. PR
+    [#541](https://github.com/activerecord-hackery/ransack/pull/541).
+
+    *ASnow (Большов Андрей)*
+
+*   Fix [#299](https://github.com/activerecord-hackery/ransack/issues/299)
+    `attribute_method?` parsing for attribute names containing `_and_`
+    and `_or_`. Attributes named like `foo_and_bar` or `foo_or_bar` are
+    recognized now instead of running failing checks for `foo` and `bar`.
+    PR [#562](https://github.com/activerecord-hackery/ransack/pull/562).
+
+    *Ryohei Hoshi*
+
+*   Fix a time-dependent test failure. When the database has
+    `default_timezone = :local` (system time) and the `Time.zone` is set to
+    elsewhere, then `Date.current` does not match what the query produces for
+    the stored timestamps. Resolved by setting everything to UTC. PR
+    [#561](https://github.com/activerecord-hackery/ransack/pull/561).
+
+    *Andrew Vit*
+
+*   Avoid overwriting association conditions with default scope in Rails 3.
+    When a model with default scope was associated with conditions
+    (`has_many :x, conditions: ...`), the default scope would overwrite the
+    association conditions. This patch ensures that both sources of conditions
+    are applied. Avoid selecting records from joins that would normally be
+    filtered out if they were selected from the base table. Only applies to
+    Rails 3, as this issue was fixed since Rails 4. PR
+    [#560](https://github.com/activerecord-hackery/ransack/pull/560).
+
+    *Andrew Vit*
+
+*   Fix RSpec `its` method deprecation warning: 'Use of rspec-core's `its`
+    method is deprecated. Use the rspec-its gem instead
+    ([c09aa17](https://github.com/activerecord-hackery/ransack/commit/c09aa17)).
+
+*   Fix deprecated RSpec syntax in `grouping_spec.rb`
+    ([ba92a0b](https://github.com/activerecord-hackery/ransack/commit/ba92a0b)).
+
+    *Jon Atack*
+
+### Added
+
+*   Add Mongoid support for referenced/embedded relations. PR
+    [#498](https://github.com/activerecord-hackery/ransack/pull/498).
+    TODO: Missing spec coverage! Add documentation!
+
+    *Penn Su*
+
+*   Add German locale file (de.yml). PR
+    [#537](https://github.com/activerecord-hackery/ransack/pull/537).
+
+    *Philipp Weissensteiner*
+
+### Changed
+
+*   Upgrade gemspec dependencies: MySQL2 from '0.3.14' to '0.3.18', and RSpec
+    from '~> 2.14.0' to '~> 2' which loads 2.99
+    ([000cd2](https://github.com/activerecord-hackery/ransack/commit/000cd2)).
+
+*   Upgrade spec suite to RSpec 3 `expect` syntax backward compatible with
+    RSpec 2.9
+    ([87cd36d](https://github.com/activerecord-hackery/ransack/commit/87cd36d)
+    and
+    [d296caa](https://github.com/activerecord-hackery/ransack/commit/d296caa)).
+
+*   Various FormHelper refactorings
+    ([17dd97a](https://github.com/activerecord-hackery/ransack/commit/17dd97a)
+    and
+    [29a73b9](https://github.com/activerecord-hackery/ransack/commit/29a73b9)).
+
+*   Various documentation updates.
+
+    *Jon Atack*
+
+
 ## Version 1.6.6 - 2015-04-05
 ### Changed
 
-*   Upgrade Polyamorous dependency to version 1.2.0, which uses Module#prepend instead of monkey-patching for hooking into Active Record (with Ruby 2.x).
+*   Upgrade Polyamorous dependency to version 1.2.0, which uses `Module#prepend`
+    instead of `alias_method` for hooking into Active Record (with Ruby 2.x).
 
     *Jon Atack*
 
 ### Fixed