Merge branch 'master' into gh-217-retry

.travis.yml

@@ -1,19 +1,12 @@
 before_install: gem update bundler
-gemfile:
-- Gemfile
-- gemfiles/activemodel3.rb
-install: bundle install --jobs=1 # rubygems/rubygems#982
+env: RAKE_TASK=spec
 language: ruby
 matrix:
-  exclude:
+  include:
+  - env: RAKE_TASK=rubocop
+    rvm: 2.1
   - gemfile: gemfiles/activemodel3.rb
-    rvm: 2.0
-  - gemfile: gemfiles/activemodel3.rb
-    rvm: 1.9
-  - gemfile: gemfiles/activemodel3.rb
-    rvm: jruby
-  - gemfile: gemfiles/activemodel3.rb
-    rvm: rbx-2
+    rvm: 2.1
 notifications:
   email: false
   hipchat:
@@ -28,3 +21,4 @@ rvm:
 - 1.9
 - jruby
 - rbx-2
+script: bundle exec rake $RAKE_TASK

CHANGELOG.md

@@ -1,7 +1,16 @@
 # [Master][]
 
+# [1.4.0][] (2014-12-10)
+
+## Changed
+
+- [#239][]: Accept `ActiveRecord::Relation` objects as `array` inputs.
+
+# [1.3.1][] (2014-12-10)
+
 ## Fixed
 
+- [#235][]: Fix a bug that prevented custom translations from loading.
 - [#224][]: Fix a bug that incorrectly inferred plural class names for filters
   inside arrays.
 
@@ -351,7 +360,9 @@
 
 - Initial release.
 
-  [master]: https://github.com/orgsync/active_interaction/compare/v1.3.0...master
+  [master]: https://github.com/orgsync/active_interaction/compare/v1.4.0...master
+  [1.4.0]: https://github.com/orgsync/active_interaction/compare/v1.3.1...v1.4.0
+  [1.3.1]: https://github.com/orgsync/active_interaction/compare/v1.3.0...v1.3.1
   [1.3.0]: https://github.com/orgsync/active_interaction/compare/v1.2.5...v1.3.0
   [1.2.5]: https://github.com/orgsync/active_interaction/compare/v1.2.4...v1.2.5
   [1.2.4]: https://github.com/orgsync/active_interaction/compare/v1.2.3...v1.2.4
@@ -461,3 +472,5 @@
   [#206]: https://github.com/orgsync/active_interaction/issues/206
   [#207]: https://github.com/orgsync/active_interaction/issues/207
   [#224]: https://github.com/orgsync/active_interaction/issues/224
+  [#235]: https://github.com/orgsync/active_interaction/issues/235
+  [#239]: https://github.com/orgsync/active_interaction/issues/239