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

[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 dfca3c26964d8447a59a2f1e77c2bdca545ae681
Merge: 47ac720 af50824
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Tue Aug 12 17:49:29 2014 +0530

    Merge tag 'upstream/4.4.1'
    
    Upstream version 4.4.1

 .travis.yml                                        |   3 +-
 Appraisals                                         |  10 --
 Gemfile                                            |   2 +-
 NEWS                                               |  12 ++
 README.md                                          |  30 +++--
 checksums.yaml.gz                                  | Bin 0 -> 269 bytes
 factory_girl_rails.gemspec                         |   5 +-
 features/fixture_replacement_config.feature        |  13 ++
 features/support/env.rb                            |   9 +-
 gemfiles/rails3.0.gemfile                          |  13 --
 gemfiles/rails3.0.gemfile.lock                     | 139 ---------------------
 gemfiles/rails3.1.gemfile                          |   2 +-
 gemfiles/rails3.1.gemfile.lock                     |   8 +-
 gemfiles/rails3.2.gemfile                          |   2 +-
 gemfiles/rails3.2.gemfile.lock                     |   8 +-
 lib/factory_girl_rails.rb                          |   2 +
 lib/factory_girl_rails/generator.rb                |  43 +++++++
 .../generators/non_rspec_generator.rb              |  19 +++
 .../generators/null_generator.rb                   |  11 ++
 .../generators/rspec_generator.rb                  |  23 ++++
 lib/factory_girl_rails/railtie.rb                  |  20 +--
 metadata.yml                                       |  85 ++++++-------
 22 files changed, 206 insertions(+), 253 deletions(-)

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