[DRE-commits] [ruby-active-model-serializers] 01/03: Merge tag 'upstream/0.9.5'

[Sruthi Chandran]

This is an automated email from the git hooks/post-receive script.

srud-guest pushed a commit to branch master
in repository ruby-active-model-serializers.

commit 569681e080c0996661efaecf546d22a9d57dc59b
Merge: 8841fc6 23d59c6
Author: Sruthi Chandran <srud at disroot.org>
Date:   Fri Aug 26 19:52:21 2016 +0530

    Merge tag 'upstream/0.9.5'
    
    Upstream version 0.9.5

 .gitignore                                         |  1 +
 .travis.yml                                        | 13 ++---
 CHANGELOG.md                                       |  6 ++-
 Gemfile                                            | 56 +++++++++++++++-------
 appveyor.yml                                       | 27 +++++++++++
 lib/active_model/serializer.rb                     |  6 ++-
 lib/active_model/serializer/version.rb             |  2 +-
 test/fixtures/poro.rb                              | 38 ++++++++++++++-
 .../active_model/serializer/associations_test.rb   | 30 ++++++++++++
 9 files changed, 152 insertions(+), 27 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/ruby-active-model-serializers.git