[DRE-commits] [ruby-activerecord-deprecated-finders] 01/05: Merge tag 'upstream/1.0.4'

[Balasankar C]

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

balasankarc-guest pushed a commit to branch master
in repository ruby-activerecord-deprecated-finders.

commit 17d6d6073887d143350600bc4b9bbf9b7e056f10
Merge: 4be9c16 8ce29e8
Author: Balasankar C <balasankarc at autistici.org>
Date:   Thu Oct 1 22:32:53 2015 +0530

    Merge tag 'upstream/1.0.4'
    
    Upstream version 1.0.4

 .travis.yml                                        | 10 +++-
 README.md                                          | 60 +++++++++++++++++++---
 Rakefile                                           | 17 ------
 activerecord-deprecated_finders.gemspec            | 15 +++---
 activerecord-deprecated_finders.gemspec.erb        | 21 --------
 gemfiles/{Gemfile-edge => Gemfile-4-0}             |  2 +-
 gemfiles/Gemfile-4-0-stable                        |  5 ++
 gemfiles/{Gemfile-edge => Gemfile-4-1}             |  2 +-
 gemfiles/Gemfile-4-1-stable                        |  5 ++
 gemfiles/{Gemfile-edge => Gemfile-4-2}             |  2 +-
 gemfiles/Gemfile-4-2-stable                        |  5 ++
 lib/active_record/deprecated_finders/base.rb       |  7 ++-
 .../deprecated_finders/collection_proxy.rb         |  8 ++-
 lib/active_record/deprecated_finders/relation.rb   |  2 +-
 lib/active_record/deprecated_finders/version.rb    |  2 +-
 test/associations_test.rb                          |  4 +-
 test/calculate_test.rb                             | 24 +++++++++
 test/helper.rb                                     |  6 ++-
 test/scope_test.rb                                 |  6 +++
 19 files changed, 138 insertions(+), 65 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/ruby-activerecord-deprecated-finders.git