[DRE-commits] [ruby-railties-3.2] 01/05: Merge tag 'upstream/3.2.16'

[Ondrej Sury]

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

ondrej pushed a commit to annotated tag debian/3.2.16-1
in repository ruby-railties-3.2.

commit f1add2c7d742d20695b53163ccc827f3d60d9e1e
Merge: f0b31b0 5b7b171
Author: Ondřej Surý <ondrej at sury.org>
Date:   Wed Dec 4 17:41:58 2013 +0100

    Merge tag 'upstream/3.2.16'
    
    Upstream version 3.2.16
    
    # gpg verification failed.

 CHANGELOG.md                                       |  26 ++++++++--
 checksums.yaml.gz                                  | Bin 266 -> 267 bytes
 guides/rails_guides.rb                             |   2 +-
 guides/source/action_mailer_basics.textile         |   2 +-
 guides/source/caching_with_rails.textile           |  10 ++--
 guides/source/getting_started.textile              |   2 +
 guides/source/initialization.textile               |   2 +-
 guides/source/layout.html.erb                      |  10 ++--
 lib/rails/application.rb                           |  13 ++++-
 lib/rails/commands/benchmarker.rb                  |   4 +-
 lib/rails/commands/profiler.rb                     |   1 +
 lib/rails/commands/runner.rb                       |   1 +
 lib/rails/engine.rb                                |   5 ++
 lib/rails/generators/rails/app/app_generator.rb    |   2 +-
 .../app/templates/app/mailers/.empty_directory     |   0
 .../app/templates/app/models/.empty_directory      |   0
 .../templates/public/stylesheets/.empty_directory  |   0
 .../app/templates/test/fixtures/.empty_directory   |   0
 .../app/templates/test/functional/.empty_directory |   0
 .../templates/test/integration/.empty_directory    |   0
 .../rails/app/templates/test/unit/.empty_directory |   0
 .../generator/templates/templates/.empty_directory |   0
 .../generators/rails/plugin_new/templates/Gemfile  |   2 +-
 .../templates/app/mailers/.empty_directory         |   0
 .../templates/app/models/.empty_directory          |   0
 .../rails/scaffold/scaffold_generator.rb           |   2 +
 lib/rails/railtie.rb                               |  10 ++++
 lib/rails/tasks/documentation.rake                 |   4 +-
 lib/rails/test_unit/testing.rake                   |   7 ++-
 lib/rails/version.rb                               |   2 +-
 metadata.yml                                       |  53 +++++++++++++--------
 31 files changed, 113 insertions(+), 47 deletions(-)

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