[DRE-commits] [ruby-railties-3.2] branch master updated (f0b31b0 -> a19f192)

Ondrej Sury ondrej at moszumanska.debian.org
Sun Dec 15 15:37:44 UTC 2013


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

ondrej pushed a change to branch master
in repository ruby-railties-3.2.

      from  f0b31b0   Merge branch 'master-experimental'
       new  ef66e7f   New upstream version 3.2.16
       new  cdbe88f   Update debian/control to rails release 3.2.16
       new  87e8b97   Prepare 3.2.16 release
       new  8ce7256   prepare 3.2.16-1 release
       new  953de40   Update patches for 3.2.16 release
       new  fb246bb   Fix invalid conflict with rails (<< 3:3.2.0) (Closes: #731888)
       new  a19f192   prepare 3.2.16-2 release

The 7 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 CHANGELOG.md                                       |  26 ++++++++--
 checksums.yaml.gz                                  | Bin 266 -> 267 bytes
 debian/changelog                                   |  13 +++++
 debian/control                                     |  12 ++---
 debian/control.in                                  |   2 +-
 debian/patches/be-carefull-with-that-bundler.patch |   4 +-
 debian/patches/fix-rake-tmp-tasks.patch            |   4 +-
 debian/patches/remove-rubygems.patch               |  21 ++++----
 debian/patches/syntaxhighlighter-source.patch      |   6 +--
 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 +++++++++++++--------
 38 files changed, 150 insertions(+), 72 deletions(-)
 copy guides/code/getting_started/public/favicon.ico => lib/rails/generators/rails/app/templates/app/mailers/.empty_directory (100%)
 copy guides/code/getting_started/public/favicon.ico => lib/rails/generators/rails/app/templates/app/models/.empty_directory (100%)
 copy guides/code/getting_started/public/favicon.ico => lib/rails/generators/rails/app/templates/public/stylesheets/.empty_directory (100%)
 copy guides/code/getting_started/public/favicon.ico => lib/rails/generators/rails/app/templates/test/fixtures/.empty_directory (100%)
 copy guides/code/getting_started/public/favicon.ico => lib/rails/generators/rails/app/templates/test/functional/.empty_directory (100%)
 copy guides/code/getting_started/public/favicon.ico => lib/rails/generators/rails/app/templates/test/integration/.empty_directory (100%)
 copy guides/code/getting_started/public/favicon.ico => lib/rails/generators/rails/app/templates/test/unit/.empty_directory (100%)
 copy guides/code/getting_started/public/favicon.ico => lib/rails/generators/rails/generator/templates/templates/.empty_directory (100%)
 copy guides/code/getting_started/public/favicon.ico => lib/rails/generators/rails/plugin_new/templates/app/mailers/.empty_directory (100%)
 copy guides/code/getting_started/public/favicon.ico => lib/rails/generators/rails/plugin_new/templates/app/models/.empty_directory (100%)

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



More information about the Pkg-ruby-extras-commits mailing list