Merge branch 'association-conditions-rails3' into integration

* association-conditions-rails3: (365 commits)
  Avoid overwriting association conditions with default scope
  Only patch default conditions once
  Compare and adjust German locale with localeapp translation
  [skip ci] German locale file (de.yml)
  Fix RSpec `its` method deprecation warning
  Clearer method and method call not in iteration
  Replace deprecated RSpec syntax
  Use fewer conditionals & simplify the required files
  [skip ci] Update changelog/readme and bump to version 1.6.6
  Use latest Polyamorous release
  [skip ci] README: Fix RubyGems YARD rendering, add Code Climate
  [skip ci] Update changelog for 631d104, 12c6b8f
  Fix activerecord-hackery#518: undefined method `model_name`
  Add Ruby version to specs info header
  Updated AR-specific reference to use Polyamorous
  Revert 746f35e, remove patch for Rails 4.2.1/5.0.0
  [skip ci] Update year to 2015
  Fix erroneous reference to AR class
  Bump to version 1.6.5 (Rails 5 release)
  [skip ci] More docs updates
  ...

.travis.yml

@@ -1,28 +1,63 @@
+services: mongodb
+
 language: ruby
 
 sudo: false
 
 rvm:
+  - 2.2.1
   - 2.1
   - 2.0
-  - 1.9.3
+  - 1.9
 
 env:
+  - RAILS=4-2-stable DB=mongodb
+  - RAILS=4-2-stable DB=sqlite3
+  - RAILS=4-2-stable DB=mysql
+  - RAILS=4-2-stable DB=postgres
+
+  - RAILS=4-1-stable DB=mongodb
   - RAILS=4-1-stable DB=sqlite3
   - RAILS=4-1-stable DB=mysql
   - RAILS=4-1-stable DB=postgres
+
   - RAILS=4-0-stable DB=sqlite3
   - RAILS=4-0-stable DB=mysql
   - RAILS=4-0-stable DB=postgres
+
   - RAILS=3-2-stable DB=sqlite
   - RAILS=3-2-stable DB=mysql
   - RAILS=3-2-stable DB=postgres
+
   - RAILS=3-1-stable DB=sqlite
   - RAILS=3-1-stable DB=mysql
   - RAILS=3-1-stable DB=postgres
-  - RAILS=3-0-stable DB=sqlite
-  - RAILS=3-0-stable DB=mysql
-  - RAILS=3-0-stable DB=postgres
+
+matrix:
+  include:
+    - rvm: 2.2
+      env: RAILS=master DB=sqlite3
+    - rvm: 2.2
+      env: RAILS=master DB=mysql
+    - rvm: 2.2
+      env: RAILS=master DB=postgres
+  exclude:
+    - rvm: 2.2
+      env: RAILS=3-1-stable DB=sqlite
+    - rvm: 2.2
+      env: RAILS=3-1-stable DB=mysql
+    - rvm: 2.2
+      env: RAILS=3-1-stable DB=postgres
+  allow_failures:
+    - env: RAILS=master DB=sqlite3
+    - env: RAILS=master DB=mysql
+    - env: RAILS=master DB=postgres
+    - rvm: 2.2
+      env: RAILS=3-2-stable DB=sqlite
+    - rvm: 2.2
+      env: RAILS=3-2-stable DB=mysql
+    - rvm: 2.2
+      env: RAILS=3-2-stable DB=postgres
 
 before_script:
   - mysql -e 'create database ransack collate utf8_general_ci;'