[DRE-commits] [ruby-factory-girl-rails] 02/05: Merge tag 'upstream/4.7.0'

[Praveen Arimbrathodiyil]

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

praveen pushed a commit to branch master
in repository ruby-factory-girl-rails.

commit 890571286b8c16e9b2fb7c2f5f4b66e06e3fe37c
Merge: 6e1de90 ea5cc32
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Thu Sep 15 16:03:50 2016 +0530

    Merge tag 'upstream/4.7.0'
    
    Upstream version 4.7.0
    
    # gpg: Signature made Thursday 15 September 2016 04:03:50 PM IST using RSA key ID CE1F9C674512C22A
    # gpg: Good signature from "Praveen Arimbrathodiyil (piratepin) <praveen at debian.org>" [ultimate]
    # gpg:                 aka "Pirate Praveen (pirates.org.in) <praveen at onenetbeyond.org>" [ultimate]
    # gpg:                 aka "Pirate Praveen (piratesin) <me at j4v4m4n.in>" [ultimate]
    # gpg:                 aka "Pirate Praveen (PP) <praveen at privacyrequired.com>" [ultimate]
    # gpg:                 aka "Praveen Arimbrathodiyil (j4v4m4n) <pravi.a at gmail.com>" [ultimate]

 .gitignore                                         |  12 +-
 .travis.yml                                        |  36 ++--
 Appraisals                                         |  40 ++---
 CONTRIBUTING.md                                    |  53 +++---
 Gemfile                                            |  19 ++-
 Gemfile.lock                                       | 144 ++++++++++++++++
 NEWS                                               |   3 +
 README.md                                          |  84 +++++-----
 bin/setup                                          |  16 ++
 checksums.yaml.gz                                  | Bin 269 -> 0 bytes
 factory_girl_rails.gemspec                         |  12 +-
 features/fixture_replacement_config.feature        |  62 +++++--
 features/generators.feature                        |  54 ++++--
 features/load_definitions.feature                  |  16 +-
 features/step_definitions/appraisal.rb             |   2 +-
 features/step_definitions/rails_steps.rb           |  28 +---
 features/support/env.rb                            |   4 +-
 gemfiles/rails3.1.gemfile                          |  16 --
 gemfiles/rails3.1.gemfile.lock                     | 171 -------------------
 gemfiles/rails3.2.gemfile                          |  22 ++-
 gemfiles/rails3.2.gemfile.lock                     | 169 -------------------
 gemfiles/rails4.1.gemfile                          |  23 +++
 gemfiles/rails4.2.gemfile                          |  21 +++
 gemfiles/rails5.0.gemfile                          |  22 +++
 .../generators/rspec_generator.rb                  |   2 +-
 lib/generators/factory_girl.rb                     |   2 +-
 .../factory_girl/model/model_generator.rb          |  86 +++++++++-
 .../factory_girl/model/templates/fixtures.erb      |   9 -
 metadata.yml                                       | 184 ---------------------
 29 files changed, 571 insertions(+), 741 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/ruby-factory-girl-rails.git