[DRE-commits] [rails] 01/09: Merge tag 'upstream/4.1.7'

[Antonio Terceiro]

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

terceiro pushed a commit to branch master
in repository rails.

commit acc151496242ce4884e65afe4452e50e8b32c656
Merge: c2c5606 f026fca
Author: Antonio Terceiro <terceiro at debian.org>
Date:   Fri Nov 14 16:02:39 2014 -0200

    Merge tag 'upstream/4.1.7'
    
    Upstream version 4.1.7
    
    # gpg: Signature made Sex 14 Nov 2014 16:02:36 BRST using RSA key ID CD460BDE
    # gpg: Good signature from "Antonio Terceiro <terceiro at softwarelivre.org>"
    # gpg:                 aka "Antonio Terceiro <terceiro at dcc.ufba.br>"
    # gpg:                 aka "Antonio Terceiro <terceiro at colivre.coop.br>"
    # gpg:                 aka "Antonio Terceiro <terceiro at debian.org>"

 RAILS_VERSION                                      |  2 +-
 actionmailer/lib/action_mailer/gem_version.rb      |  2 +-
 .../lib/action_dispatch/middleware/static.rb       | 22 +++++++++++++++++++++-
 actionpack/lib/action_pack/gem_version.rb          |  2 +-
 actionpack/test/dispatch/static_test.rb            | 22 ++++++++++++++++++++--
 actionview/lib/action_view/gem_version.rb          |  2 +-
 activemodel/lib/active_model/gem_version.rb        |  2 +-
 activerecord/lib/active_record/gem_version.rb      |  2 +-
 activesupport/lib/active_support/gem_version.rb    |  2 +-
 railties/lib/rails/gem_version.rb                  |  2 +-
 version.rb                                         |  2 +-
 11 files changed, 50 insertions(+), 12 deletions(-)

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