[DRE-commits] [rails] branch master updated (d207828 -> 6df2d28)

[Antonio Terceiro]

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

terceiro pushed a change to branch master
in repository rails.

      from  d207828   update ruby-sprockets-rails minimum version
      adds  6c318cc   Imported Upstream version 4.2.6
       new  093daed   Merge branch 'upstream'
       new  9f966ae   New upstream release
       new  149bea5   split authors in changelog
       new  9219ea1   Drop patch applied upstream
       new  6df2d28   release to unstable

The 5 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:
 .travis.yml                                        |   3 +-
 Gemfile                                            |   2 +-
 Gemfile.lock                                       | 147 ++++++++++-----------
 RAILS_VERSION                                      |   2 +-
 actionmailer/CHANGELOG.md                          |   5 +
 actionmailer/lib/action_mailer/gem_version.rb      |   4 +-
 actionpack/CHANGELOG.md                            |   5 +
 .../lib/action_dispatch/middleware/static.rb       |   6 +-
 .../lib/action_dispatch/routing/route_set.rb       |   4 +-
 .../lib/action_dispatch/routing/routes_proxy.rb    |   9 +-
 actionpack/lib/action_pack/gem_version.rb          |   4 +-
 .../parameters/parameters_permit_test.rb           |  21 +++
 actionpack/test/dispatch/static_test.rb            |   4 +
 actionview/CHANGELOG.md                            |  25 ++++
 actionview/lib/action_view/flows.rb                |   2 +-
 actionview/lib/action_view/gem_version.rb          |   4 +-
 .../lib/action_view/helpers/asset_tag_helper.rb    |   2 +-
 .../lib/action_view/helpers/tags/week_field.rb     |   2 +-
 .../lib/action_view/renderer/partial_renderer.rb   |   2 +-
 .../test/activerecord/polymorphic_routes_test.rb   |   2 +-
 actionview/test/fixtures/test/_klass.erb           |   1 +
 actionview/test/template/asset_tag_helper_test.rb  |   1 +
 actionview/test/template/capture_helper_test.rb    |  13 ++
 actionview/test/template/form_helper_test.rb       |  14 +-
 actionview/test/template/render_test.rb            |   2 +
 activejob/CHANGELOG.md                             |   5 +
 activejob/lib/active_job/gem_version.rb            |   4 +-
 activemodel/CHANGELOG.md                           |   5 +
 activemodel/lib/active_model/dirty.rb              |   6 +-
 activemodel/lib/active_model/gem_version.rb        |   4 +-
 activerecord/CHANGELOG.md                          |  31 +++++
 .../associations/has_many_through_association.rb   |   5 +
 .../lib/active_record/attribute_methods/dirty.rb   |   1 +
 .../abstract/database_statements.rb                |   3 +-
 .../abstract/schema_definitions.rb                 |   4 +-
 .../abstract/schema_statements.rb                  |  21 ++-
 .../connection_adapters/abstract_mysql_adapter.rb  |  25 +++-
 .../connection_adapters/mysql_adapter.rb           |   2 +-
 .../postgresql/schema_statements.rb                |  11 ++
 .../connection_adapters/sqlite3_adapter.rb         |   2 +
 activerecord/lib/active_record/gem_version.rb      |   4 +-
 activerecord/lib/active_record/reflection.rb       |   2 +-
 .../lib/active_record/relation/spawn_methods.rb    |  10 +-
 .../tasks/postgresql_database_tasks.rb             |   4 +-
 activerecord/test/cases/adapter_test.rb            |  15 +++
 .../cases/adapters/mysql2/mysql2_adapter_test.rb   |  44 ++++++
 activerecord/test/cases/dirty_test.rb              |  10 ++
 activerecord/test/cases/finder_test.rb             |   9 +-
 activerecord/test/cases/fixtures_test.rb           |   4 +
 .../cases/migration/references_foreign_key_test.rb |  16 +++
 activerecord/test/cases/reflection_test.rb         |   9 ++
 activerecord/test/cases/relation_test.rb           |   7 +
 .../test/cases/tasks/postgresql_rake_test.rb       |  19 ++-
 activerecord/test/cases/view_test.rb               |   6 +
 activerecord/test/fixtures/author_addresses.yml    |   6 +
 activerecord/test/fixtures/authors.yml             |   2 +
 activerecord/test/fixtures/naked/yml/trees.yml     |   3 +
 activerecord/test/models/chef.rb                   |   4 +
 activerecord/test/models/hotel.rb                  |   3 +
 activerecord/test/models/mocktail_designer.rb      |   2 +
 activerecord/test/schema/schema.rb                 |   7 +
 activesupport/CHANGELOG.md                         |   5 +
 activesupport/lib/active_support/gem_version.rb    |   4 +-
 activesupport/lib/active_support/logger.rb         |  14 ++
 activesupport/lib/active_support/logger_silence.rb |  25 +++-
 .../lib/active_support/per_thread_registry.rb      |   2 +
 activesupport/test/logger_test.rb                  |  81 ++++++++++++
 debian/changelog                                   |  10 +-
 ...wnMethods-merge-to-check-an-arg-is-a-Proc.patch |  66 ---------
 debian/patches/series                              |   1 -
 guides/CHANGELOG.md                                |   5 +
 guides/source/configuring.md                       |   6 +-
 guides/source/contributing_to_ruby_on_rails.md     |   4 +-
 guides/source/layout.html.erb                      |  11 +-
 railties/CHANGELOG.md                              |   5 +
 railties/lib/rails/commands/dbconsole.rb           |   2 +-
 railties/lib/rails/gem_version.rb                  |   4 +-
 .../%name%/application_controller.rb.tt            |   1 +
 railties/test/application/assets_test.rb           |  16 +--
 railties/test/generators/plugin_generator_test.rb  |   6 +-
 version.rb                                         |   4 +-
 81 files changed, 631 insertions(+), 242 deletions(-)
 create mode 100644 actionview/test/fixtures/test/_klass.erb
 create mode 100644 activerecord/test/cases/adapters/mysql2/mysql2_adapter_test.rb
 create mode 100644 activerecord/test/fixtures/naked/yml/trees.yml
 create mode 100644 activerecord/test/models/mocktail_designer.rb
 delete mode 100644 debian/patches/0003-Make-AR-SpawnMethods-merge-to-check-an-arg-is-a-Proc.patch

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