[DRE-commits] [rails] 08/44: Merge tag 'upstream/4.0.0'
Ondrej Sury
ondrej at moszumanska.debian.org
Wed Jul 16 15:03:58 UTC 2014
This is an automated email from the git hooks/post-receive script.
ondrej pushed a commit to branch master
in repository rails.
commit 988ca53ef7e37ad282a43b8da237a0efe9cbdb27
Merge: 4405d7c 844a188
Author: Ondřej Surý <ondrej at sury.org>
Date: Fri Jul 19 13:58:34 2013 +0200
Merge tag 'upstream/4.0.0'
Upstream version 4.0.0
# gpg: Signature made Fri 19 Jul 2013 01:58:32 PM CEST using RSA key ID F4FCBB07
# gpg: Good signature from "Ondřej Surý <ondrej at sury.org>"
# gpg: aka "Ondřej Surý <ondrej at debian.org>"
# gpg: aka "[jpeg image of size 3934]"
Gemfile | 5 -
RAILS_VERSION | 2 +-
actionmailer/CHANGELOG.md | 5 +-
actionmailer/README.rdoc | 9 +-
actionmailer/lib/action_mailer/base.rb | 10 +-
actionmailer/lib/action_mailer/version.rb | 2 +-
.../implicitly_multipart_example.html.erb~ | 10 +
.../implicitly_multipart_example.rhtml.bak | 1 +
actionmailer/test/mailers/base_mailer.rb | 2 +-
actionpack/CHANGELOG.md | 49 +++-
actionpack/lib/action_controller/metal/url_for.rb | 3 +-
actionpack/lib/action_controller/test_case.rb | 6 -
actionpack/lib/action_dispatch/http/parameters.rb | 2 +-
.../lib/action_dispatch/middleware/cookies.rb | 2 +-
.../middleware/exception_wrapper.rb | 1 +
.../middleware/public_exceptions.rb | 5 +-
.../middleware/templates/rescues/layout.erb | 6 +
.../lib/action_dispatch/routing/inspector.rb | 2 +-
actionpack/lib/action_dispatch/routing/mapper.rb | 14 +-
.../lib/action_dispatch/routing/route_set.rb | 1 +
.../lib/action_dispatch/testing/integration.rb | 8 +-
actionpack/lib/action_pack/version.rb | 2 +-
actionpack/lib/action_view/dependency_tracker.rb | 2 +-
.../lib/action_view/helpers/asset_url_helper.rb | 5 +-
.../lib/action_view/helpers/form_tag_helper.rb | 2 +-
actionpack/lib/action_view/lookup_context.rb | 1 +
actionpack/test/controller/integration_test.rb | 18 +-
actionpack/test/controller/show_exceptions_test.rb | 4 +-
actionpack/test/controller/test_case_test.rb | 5 -
.../dispatch/request/json_params_parsing_test.rb | 2 +-
actionpack/test/dispatch/routing/inspector_test.rb | 9 +
actionpack/test/dispatch/routing/route_set_test.rb | 11 +
actionpack/test/dispatch/routing_test.rb | 13 ++
actionpack/test/dispatch/show_exceptions_test.rb | 6 +
.../test/fixtures/digestor/messages/show.html.erb | 3 +-
actionpack/test/fixtures/public/400.html | 1 +
actionpack/test/fixtures/test/hello_world.erb~ | 1 +
.../fixtures/test/malformed/malformed.en.html.erb~ | 1 +
.../test/fixtures/test/malformed/malformed.erb~ | 1 +
.../fixtures/test/malformed/malformed.html.erb~ | 1 +
actionpack/test/template/asset_tag_helper_test.rb | 18 +-
actionpack/test/template/digestor_test.rb | 6 +
activemodel/CHANGELOG.md | 9 +-
activemodel/lib/active_model/lint.rb | 2 +-
activemodel/lib/active_model/model.rb | 2 +
activemodel/lib/active_model/secure_password.rb | 7 +-
activemodel/lib/active_model/version.rb | 2 +-
activemodel/test/cases/model_test.rb | 49 +++-
activemodel/test/cases/secure_password_test.rb | 9 +
activerecord/CHANGELOG.md | 66 +++++-
.../lib/active_record/associations/association.rb | 12 +-
.../associations/has_one_association.rb | 5 +-
.../attribute_methods/serialization.rb | 14 +-
.../lib/active_record/autosave_association.rb | 5 +-
.../abstract/schema_definitions.rb | 4 +-
.../abstract/schema_statements.rb | 4 +-
.../connection_adapters/abstract_mysql_adapter.rb | 4 +-
.../connection_adapters/postgresql_adapter.rb | 31 ++-
.../lib/active_record/explain_subscriber.rb | 2 +-
activerecord/lib/active_record/migration.rb | 25 +-
.../lib/active_record/nested_attributes.rb | 39 +++-
activerecord/lib/active_record/persistence.rb | 50 +++-
activerecord/lib/active_record/railtie.rb | 21 +-
.../lib/active_record/railties/databases.rake | 12 +-
activerecord/lib/active_record/relation.rb | 52 +++--
.../lib/active_record/relation/delegation.rb | 6 +-
activerecord/lib/active_record/schema.rb | 2 +-
.../tasks/postgresql_database_tasks.rb | 2 +-
.../lib/active_record/validations/associated.rb | 6 +-
activerecord/lib/active_record/version.rb | 2 +-
.../cases/adapters/mysql/active_schema_test.rb | 27 +--
.../cases/adapters/mysql2/active_schema_test.rb | 27 +--
.../test/cases/adapters/postgresql/bytea_test.rb | 17 ++
.../cases/adapters/postgresql/datatype_test.rb | 2 -
.../test/cases/adapters/postgresql/uuid_test.rb | 62 +++++
activerecord/test/cases/ar_schema_test.rb | 20 ++
.../associations/has_one_associations_test.rb | 16 ++
.../cases/attribute_methods/serialization_test.rb | 29 +++
activerecord/test/cases/explain_subscriber_test.rb | 5 +
.../test/cases/migration/change_schema_test.rb | 29 +++
activerecord/test/cases/migration_test.rb | 9 +
activerecord/test/cases/nested_attributes_test.rb | 14 ++
.../test/cases/tasks/postgresql_rake_test.rb | 2 +-
.../validations/association_validation_test.rb | 17 --
activesupport/CHANGELOG.md | 29 +--
activesupport/lib/active_support/callbacks.rb | 23 +-
.../lib/active_support/core_ext/array/wrap.rb | 12 +-
activesupport/lib/active_support/core_ext/date.rb | 1 -
.../active_support/core_ext/date/calculations.rb | 11 +
.../core_ext/date/infinite_comparable.rb | 5 -
.../lib/active_support/core_ext/date_time.rb | 1 -
.../core_ext/date_time/calculations.rb | 7 +
.../core_ext/date_time/infinite_comparable.rb | 5 -
.../active_support/core_ext/infinite_comparable.rb | 35 ---
.../lib/active_support/core_ext/marshal.rb | 2 +
.../lib/active_support/core_ext/numeric.rb | 1 -
.../core_ext/numeric/infinite_comparable.rb | 9 -
.../active_support/core_ext/object/inclusion.rb | 17 +-
.../active_support/core_ext/range/include_range.rb | 2 +
activesupport/lib/active_support/core_ext/time.rb | 1 -
.../active_support/core_ext/time/calculations.rb | 12 +
.../core_ext/time/infinite_comparable.rb | 5 -
.../active_support/deprecation/proxy_wrappers.rb | 6 +-
.../active_support/hash_with_indifferent_access.rb | 22 +-
.../lib/active_support/notifications/fanout.rb | 7 +
.../lib/active_support/testing/isolation.rb | 4 +
activesupport/lib/active_support/version.rb | 2 +-
activesupport/test/callbacks_test.rb | 17 --
activesupport/test/core_ext/date_ext_test.rb | 9 +-
activesupport/test/core_ext/date_time_ext_test.rb | 7 -
activesupport/test/core_ext/hash_ext_test.rb | 16 ++
activesupport/test/core_ext/numeric_ext_test.rb | 54 -----
.../test/core_ext/object/inclusion_test.rb | 18 +-
activesupport/test/core_ext/range_ext_test.rb | 26 ---
activesupport/test/core_ext/time_ext_test.rb | 29 ++-
activesupport/test/core_ext/time_with_zone_test.rb | 10 -
activesupport/test/json/decoding_test.rb | 4 +
activesupport/test/json/encoding_test.rb | 15 +-
activesupport/test/message_encryptor_test.rb | 7 +-
activesupport/test/message_verifier_test.rb | 7 +-
activesupport/test/notifications_test.rb | 22 ++
activesupport/test/test_case_test.rb | 3 +
guides/CHANGELOG.md | 5 +-
.../images/{ => getting_started}/challenge.png | Bin
.../images/getting_started/rails_welcome.png | Bin 0 -> 50433 bytes
guides/assets/images/rails_welcome.png | Bin 71979 -> 0 bytes
guides/bug_report_templates/active_record_gem.rb | 2 +-
guides/code/getting_started/Gemfile.lock | 2 +-
guides/code/getting_started/config/environment.rb | 4 +-
guides/source/2_2_release_notes.md | 2 +-
guides/source/2_3_release_notes.md | 4 +-
guides/source/3_0_release_notes.md | 6 +-
guides/source/3_1_release_notes.md | 2 +-
guides/source/3_2_release_notes.md | 6 +-
guides/source/4_0_release_notes.md | 7 +-
guides/source/action_controller_overview.md | 10 +-
guides/source/action_mailer_basics.md | 2 +-
guides/source/active_record_querying.md | 7 +-
guides/source/active_record_validations.md | 3 +-
guides/source/active_support_core_extensions.md | 15 +-
guides/source/asset_pipeline.md | 26 +--
guides/source/caching_with_rails.md | 4 +-
guides/source/command_line.md | 2 +-
guides/source/configuring.md | 2 +-
guides/source/contributing_to_ruby_on_rails.md | 4 +-
guides/source/debugging_rails_applications.md | 4 +-
guides/source/development_dependencies_install.md | 2 +-
guides/source/getting_started.md | 257 +++++++--------------
guides/source/i18n.md | 2 +-
guides/source/initialization.md | 70 +++---
guides/source/layout.html.erb | 10 +-
guides/source/layouts_and_rendering.md | 142 ++++++------
guides/source/migrations.md | 24 +-
guides/source/ruby_on_rails_guides_guidelines.md | 4 +
guides/source/testing.md | 42 ++--
guides/source/upgrading_ruby_on_rails.md | 2 +-
rails.gemspec | 2 +-
railties/CHANGELOG.md | 9 +-
railties/lib/rails/application.rb | 1 +
railties/lib/rails/application/finisher.rb | 35 ++-
railties/lib/rails/commands.rb | 2 -
railties/lib/rails/generators/app_base.rb | 4 +-
.../rails/generators/rails/app/app_generator.rb | 1 +
.../rails/generators/rails/app/templates/Gemfile | 4 +-
.../rails/app/templates/app/assets/images/.keep | 0
.../app/assets/javascripts/application.js.tt | 4 +-
.../rails/app/templates/config/environment.rb | 4 +-
.../config/initializers/wrap_parameters.rb.tt | 2 +-
.../rails/app/templates/config/routes.rb | 7 +
.../rails/plugin_new/templates/bin/rails.tt | 2 +-
.../plugin_new/templates/rails/javascripts.js | 4 +-
railties/lib/rails/tasks/documentation.rake | 101 ++++----
railties/lib/rails/tasks/framework.rake | 2 +-
railties/lib/rails/test_unit/railtie.rb | 2 +-
railties/lib/rails/version.rb | 2 +-
railties/test/application/configuration_test.rb | 1 +
railties/test/application/loading_test.rb | 35 ++-
railties/test/generators/app_generator_test.rb | 8 +-
railties/test/railties/mounted_engine_test.rb | 45 ++++
version.rb | 2 +-
180 files changed, 1460 insertions(+), 933 deletions(-)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/rails.git
More information about the Pkg-ruby-extras-commits
mailing list