Skip to content

Instantly share code, notes, and snippets.

@kyanny

kyanny/diff-A.txt

Created June 28, 2011 13:13
Show Gist options
  • Star 1 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save kyanny/1051105 to your computer and use it in GitHub Desktop.
Save kyanny/1051105 to your computer and use it in GitHub Desktop.
Download ZIP
git diff --diff-filter option
Raw
diff-A.txt
.../test/fixtures/test/scoped_translation.erb | 1 +
actionpack/test/fixtures/test/translation.erb | 1 +
.../test/connections/jdbc_jdbcderby/connection.rb | 18 ++++++++
.../test/connections/jdbc_jdbch2/connection.rb | 18 ++++++++
.../test/connections/jdbc_jdbchsqldb/connection.rb | 18 ++++++++
.../test/connections/jdbc_jdbcmysql/connection.rb | 26 +++++++++++
.../connections/jdbc_jdbcpostgresql/connection.rb | 26 +++++++++++
.../connections/jdbc_jdbcsqlite3/connection.rb | 25 ++++++++++
.../test/connections/native_db2/connection.rb | 25 ++++++++++
.../test/connections/native_firebird/connection.rb | 26 +++++++++++
.../connections/native_frontbase/connection.rb | 27 +++++++++++
.../test/connections/native_mysql/connection.rb | 25 ++++++++++
.../test/connections/native_mysql2/connection.rb | 25 ++++++++++
.../test/connections/native_openbase/connection.rb | 21 +++++++++
.../test/connections/native_oracle/connection.rb | 47 ++++++++++++++++++++
.../connections/native_postgresql/connection.rb | 21 +++++++++
.../test/connections/native_sqlite3/connection.rb | 25 ++++++++++
.../native_sqlite3/in_memory_connection.rb | 18 ++++++++
.../test/connections/native_sybase/connection.rb | 23 ++++++++++
19 files changed, 416 insertions(+), 0 deletions(-)
Raw
diff.txt
Gemfile | 15 +-
RAILS_VERSION | 2 +-
actionmailer/CHANGELOG | 24 ---
actionmailer/Rakefile | 4 +-
actionmailer/actionmailer.gemspec | 4 +-
actionmailer/lib/action_mailer/base.rb | 29 +---
actionmailer/lib/action_mailer/mail_helper.rb | 28 ++--
actionmailer/lib/action_mailer/railtie.rb | 4 -
actionmailer/lib/action_mailer/version.rb | 2 +-
actionmailer/test/abstract_unit.rb | 1 +
actionmailer/test/base_test.rb | 40 -----
actionmailer/test/i18n_with_controller_test.rb | 18 +--
actionpack/CHANGELOG | 81 ----------
actionpack/Rakefile | 4 +-
actionpack/actionpack.gemspec | 6 +-
actionpack/lib/abstract_controller/callbacks.rb | 2 +-
.../lib/action_controller/caching/actions.rb | 8 +-
.../lib/action_controller/deprecated/base.rb | 2 +-
actionpack/lib/action_controller/log_subscriber.rb | 6 +-
.../metal/request_forgery_protection.rb | 2 +-
.../lib/action_dispatch/http/filter_parameters.rb | 21 +--
actionpack/lib/action_dispatch/http/request.rb | 1 -
.../middleware/templates/rescues/diagnostics.erb | 2 +-
actionpack/lib/action_dispatch/routing/mapper.rb | 28 +---
.../lib/action_dispatch/routing/route_set.rb | 7 +-
.../action_dispatch/testing/assertions/routing.rb | 6 +-
actionpack/lib/action_pack/version.rb | 2 +-
actionpack/lib/action_view/base.rb | 6 +-
.../lib/action_view/helpers/asset_tag_helper.rb | 6 +-
actionpack/lib/action_view/helpers/cache_helper.rb | 8 +-
actionpack/lib/action_view/helpers/form_helper.rb | 15 +-
.../lib/action_view/helpers/form_options_helper.rb | 4 +-
.../lib/action_view/helpers/javascript_helper.rb | 3 +-
.../lib/action_view/helpers/number_helper.rb | 4 +-
.../lib/action_view/helpers/prototype_helper.rb | 1 +
actionpack/lib/action_view/helpers/text_helper.rb | 44 +++---
.../lib/action_view/helpers/translation_helper.rb | 32 +---
actionpack/lib/action_view/helpers/url_helper.rb | 2 +-
actionpack/lib/action_view/template.rb | 3 -
actionpack/lib/action_view/test_case.rb | 1 -
actionpack/test/controller/caching_test.rb | 5 -
actionpack/test/controller/filters_test.rb | 29 ----
actionpack/test/controller/log_subscriber_test.rb | 15 --
actionpack/test/controller/url_for_test.rb | 8 -
actionpack/test/controller/webservice_test.rb | 2 +-
actionpack/test/dispatch/mapper_test.rb | 56 -------
actionpack/test/dispatch/request_test.rb | 38 -----
.../test/dispatch/routing_assertions_test.rb | 103 ------------
actionpack/test/dispatch/routing_test.rb | 51 +------
actionpack/test/dispatch/show_exceptions_test.rb | 16 --
.../filter_test/implicit_actions/edit.html.erb | 1 -
.../filter_test/implicit_actions/show.html.erb | 1 -
.../test/_layout_with_partial_and_yield.html.erb | 4 -
.../test/fixtures/test/scoped_translation.erb | 1 +
actionpack/test/fixtures/test/translation.erb | 1 +
.../test/fixtures/translations/templates/array.erb | 1 -
.../test/fixtures/translations/templates/found.erb | 1 -
.../fixtures/translations/templates/missing.erb | 1 -
actionpack/test/template/asset_tag_helper_test.rb | 50 +------
actionpack/test/template/date_helper_test.rb | 17 +--
actionpack/test/template/erb_util_test.rb | 10 --
actionpack/test/template/form_helper_test.rb | 48 +------
actionpack/test/template/javascript_helper_test.rb | 9 -
actionpack/test/template/number_helper_test.rb | 11 +--
actionpack/test/template/prototype_helper_test.rb | 8 +-
actionpack/test/template/render_test.rb | 15 +--
actionpack/test/template/template_test.rb | 5 -
actionpack/test/template/text_helper_test.rb | 42 ++----
.../test/template/translation_helper_test.rb | 72 ++++------
actionpack/test/template/url_helper_test.rb | 8 -
activemodel/CHANGELOG | 24 ---
activemodel/Rakefile | 4 +-
activemodel/activemodel.gemspec | 4 +-
activemodel/lib/active_model/attribute_methods.rb | 66 +++------
activemodel/lib/active_model/naming.rb | 5 +-
activemodel/lib/active_model/translation.rb | 5 +-
.../lib/active_model/validations/inclusion.rb | 23 +---
activemodel/lib/active_model/validations/length.rb | 3 +-
activemodel/lib/active_model/version.rb | 2 +-
activemodel/test/cases/attribute_methods_test.rb | 74 ---------
.../serializeration/xml_serialization_test.rb | 2 +-
activemodel/test/cases/translation_test.rb | 17 --
.../test/cases/validations/i18n_validation_test.rb | 19 +++
.../cases/validations/inclusion_validation_test.rb | 9 -
.../cases/validations/length_validation_test.rb | 11 --
activemodel/test/models/person.rb | 7 +-
activerecord/CHANGELOG | 87 +----------
activerecord/RUNNING_UNIT_TESTS | 51 +++---
activerecord/Rakefile | 47 +++----
activerecord/activerecord.gemspec | 3 +-
.../lib/active_record/association_preload.rb | 25 +---
activerecord/lib/active_record/associations.rb | 45 ++----
.../associations/association_collection.rb | 13 +-
.../associations/association_proxy.rb | 10 +-
.../belongs_to_polymorphic_association.rb | 2 +-
.../has_and_belongs_to_many_association.rb | 6 +-
.../associations/has_many_association.rb | 4 +-
.../associations/has_many_through_association.rb | 2 +-
.../associations/through_association_scope.rb | 20 +--
.../lib/active_record/attribute_methods.rb | 2 +-
.../active_record/attribute_methods/primary_key.rb | 6 -
.../lib/active_record/attribute_methods/read.rb | 40 +----
.../attribute_methods/time_zone_conversion.rb | 11 +-
.../lib/active_record/attribute_methods/write.rb | 8 +-
activerecord/lib/active_record/base.rb | 38 +----
activerecord/lib/active_record/callbacks.rb | 14 +-
.../abstract/database_statements.rb | 10 +-
.../connection_adapters/mysql_adapter.rb | 18 +--
.../connection_adapters/postgresql_adapter.rb | 23 +---
.../connection_adapters/sqlite3_adapter.rb | 8 -
activerecord/lib/active_record/fixtures.rb | 6 -
.../lib/active_record/locking/pessimistic.rb | 2 +-
activerecord/lib/active_record/migration.rb | 2 -
.../lib/active_record/nested_attributes.rb | 1 -
activerecord/lib/active_record/observer.rb | 9 +-
activerecord/lib/active_record/persistence.rb | 6 +-
activerecord/lib/active_record/relation.rb | 5 +-
activerecord/lib/active_record/relation/batches.rb | 2 +-
.../lib/active_record/relation/calculations.rb | 2 +-
.../lib/active_record/relation/finder_methods.rb | 20 +--
.../lib/active_record/relation/query_methods.rb | 3 +-
.../lib/active_record/relation/spawn_methods.rb | 11 +--
activerecord/lib/active_record/test_case.rb | 7 -
activerecord/lib/active_record/version.rb | 2 +-
activerecord/test/.gitignore | 1 -
activerecord/test/cases/adapter_test.rb | 9 +-
.../test/cases/adapters/mysql/schema_test.rb | 36 -----
.../cases/adapters/sqlite/sqlite_adapter_test.rb | 19 ---
.../associations/belongs_to_associations_test.rb | 2 +-
activerecord/test/cases/associations/eager_test.rb | 57 +-------
.../has_and_belongs_to_many_associations_test.rb | 14 +--
.../associations/has_many_associations_test.rb | 4 +-
.../has_many_through_associations_test.rb | 66 +--------
.../associations/has_one_associations_test.rb | 10 --
.../associations/inner_join_association_test.rb | 17 +--
.../test/cases/associations/join_model_test.rb | 26 +---
activerecord/test/cases/attribute_methods_test.rb | 73 ++-------
activerecord/test/cases/base_test.rb | 32 +---
activerecord/test/cases/batches_test.rb | 10 --
activerecord/test/cases/calculations_test.rb | 6 -
activerecord/test/cases/custom_locking_test.rb | 17 --
activerecord/test/cases/finder_test.rb | 8 +-
.../test/cases/habtm_destroy_order_test.rb | 51 ------
activerecord/test/cases/helper.rb | 29 +---
activerecord/test/cases/i18n_test.rb | 1 +
activerecord/test/cases/lifecycle_test.rb | 20 ---
.../test/cases/mass_assignment_security_test.rb | 2 +-
activerecord/test/cases/method_scoping_test.rb | 2 +-
activerecord/test/cases/named_scope_test.rb | 15 --
activerecord/test/cases/nested_attributes_test.rb | 16 --
activerecord/test/cases/primary_keys_test.rb | 9 -
activerecord/test/cases/query_cache_test.rb | 11 +-
activerecord/test/cases/reflection_test.rb | 4 +-
activerecord/test/cases/relation_scoping_test.rb | 8 +-
activerecord/test/cases/relations_test.rb | 78 ++-------
activerecord/test/cases/schema_dumper_test.rb | 1 +
activerecord/test/cases/timestamp_test.rb | 26 ---
activerecord/test/config.example.yml | 136 ----------------
.../test/connections/jdbc_jdbcderby/connection.rb | 18 ++
.../test/connections/jdbc_jdbch2/connection.rb | 18 ++
.../test/connections/jdbc_jdbchsqldb/connection.rb | 18 ++
.../test/connections/jdbc_jdbcmysql/connection.rb | 26 +++
.../connections/jdbc_jdbcpostgresql/connection.rb | 26 +++
.../connections/jdbc_jdbcsqlite3/connection.rb | 25 +++
.../test/connections/native_db2/connection.rb | 25 +++
.../test/connections/native_firebird/connection.rb | 26 +++
.../connections/native_frontbase/connection.rb | 27 ++++
.../test/connections/native_mysql/connection.rb | 25 +++
.../test/connections/native_mysql2/connection.rb | 25 +++
.../test/connections/native_openbase/connection.rb | 21 +++
.../test/connections/native_oracle/connection.rb | 47 ++++++
.../connections/native_postgresql/connection.rb | 21 +++
.../test/connections/native_sqlite3/connection.rb | 25 +++
.../native_sqlite3/in_memory_connection.rb | 18 ++
.../test/connections/native_sybase/connection.rb | 23 +++
activerecord/test/models/author.rb | 2 +-
activerecord/test/models/categorization.rb | 5 +-
activerecord/test/models/company.rb | 15 +-
activerecord/test/models/lesson.rb | 11 --
activerecord/test/models/post.rb | 20 ---
activerecord/test/models/project.rb | 7 +-
activerecord/test/models/student.rb | 3 -
activerecord/test/models/tagging.rb | 4 +-
activerecord/test/schema/schema.rb | 16 --
activerecord/test/support/config.rb | 42 -----
activerecord/test/support/connection.rb | 20 ---
activeresource/CHANGELOG | 29 ----
activeresource/Rakefile | 4 +-
activeresource/activeresource.gemspec | 1 +
activeresource/lib/active_resource/version.rb | 2 +-
activesupport/CHANGELOG | 24 ---
activesupport/Rakefile | 4 +-
activesupport/activesupport.gemspec | 2 +
.../lib/active_support/buffered_logger.rb | 29 ++--
.../lib/active_support/cache/file_store.rb | 2 +-
.../lib/active_support/cache/mem_cache_store.rb | 2 +-
activesupport/lib/active_support/callbacks.rb | 1 -
.../core_ext/big_decimal/conversions.rb | 13 --
.../active_support/core_ext/date/calculations.rb | 4 +-
.../lib/active_support/core_ext/date/zones.rb | 6 +-
.../core_ext/date_time/calculations.rb | 3 +-
.../active_support/core_ext/hash/conversions.rb | 3 +-
.../active_support/core_ext/module/deprecation.rb | 2 -
.../core_ext/string/output_safety.rb | 20 +---
.../active_support/core_ext/time/calculations.rb | 4 +-
activesupport/lib/active_support/gzip.rb | 4 -
activesupport/lib/active_support/i18n_railtie.rb | 23 +---
activesupport/lib/active_support/inflections.rb | 4 -
.../lib/active_support/json/backends/jsongem.rb | 6 +-
.../lib/active_support/json/backends/yajl.rb | 6 +-
.../lib/active_support/json/backends/yaml.rb | 27 +---
activesupport/lib/active_support/json/encoding.rb | 2 +-
activesupport/lib/active_support/log_subscriber.rb | 2 +-
activesupport/lib/active_support/ordered_hash.rb | 15 +--
.../lib/active_support/testing/performance.rb | 2 +-
activesupport/lib/active_support/time_with_zone.rb | 14 +--
activesupport/lib/active_support/version.rb | 2 +-
activesupport/lib/active_support/whiny_nil.rb | 2 +-
activesupport/lib/active_support/xml_mini/jdom.rb | 25 +--
activesupport/test/buffered_logger_test.rb | 39 -----
activesupport/test/core_ext/bigdecimal_test.rb | 8 +-
activesupport/test/core_ext/date_ext_test.rb | 32 ++--
activesupport/test/core_ext/date_time_ext_test.rb | 8 +-
activesupport/test/core_ext/duration_test.rb | 10 +-
activesupport/test/core_ext/hash_ext_test.rb | 15 --
activesupport/test/core_ext/numeric_ext_test.rb | 10 +-
activesupport/test/core_ext/string_ext_test.rb | 6 -
activesupport/test/core_ext/time_with_zone_test.rb | 19 +--
activesupport/test/dependencies_test.rb | 2 -
activesupport/test/deprecation_test.rb | 2 +-
activesupport/test/gzip_test.rb | 13 +--
activesupport/test/inflector_test.rb | 7 -
activesupport/test/inflector_test_cases.rb | 1 -
activesupport/test/json/decoding_test.rb | 10 +-
activesupport/test/load_paths_test.rb | 3 +-
activesupport/test/safe_buffer_test.rb | 12 --
activesupport/test/whiny_nil_test.rb | 2 -
activesupport/test/xml_mini/jdom_engine_test.rb | 165 ++++++++++----------
load_paths.rb | 2 +-
rails.gemspec | 1 +
railties/CHANGELOG | 24 ---
railties/Rakefile | 4 +-
.../guides/source/active_record_querying.textile | 20 ---
.../source/active_support_core_extensions.textile | 10 +-
.../source/api_documentation_guidelines.textile | 2 +-
.../source/contributing_to_ruby_on_rails.textile | 2 +-
railties/guides/source/getting_started.textile | 2 +-
railties/guides/source/i18n.textile | 8 +-
railties/guides/source/rails_on_rack.textile | 4 +-
railties/guides/source/routing.textile | 16 +--
railties/guides/source/testing.textile | 7 +-
railties/lib/rails/application.rb | 6 +-
railties/lib/rails/commands/console.rb | 2 +-
railties/lib/rails/commands/dbconsole.rb | 6 -
railties/lib/rails/generators/actions.rb | 7 +-
railties/lib/rails/generators/named_base.rb | 4 +-
.../rails/generators/rails/app/app_generator.rb | 7 -
.../rails/generators/rails/app/templates/Gemfile | 4 +-
.../generators/rails/plugin/templates/Rakefile.tt | 6 +-
railties/lib/rails/rack/logger.rb | 2 +-
railties/lib/rails/railtie.rb | 1 -
railties/lib/rails/tasks/documentation.rake | 10 +-
railties/lib/rails/version.rb | 2 +-
railties/railties.gemspec | 2 +-
railties/test/application/configuration_test.rb | 81 ----------
railties/test/application/console_test.rb | 6 +-
railties/test/application/generators_test.rb | 4 -
.../test/application/initializers/boot_test.rb | 6 +-
.../initializers/check_ruby_version_test.rb | 4 -
.../application/initializers/frameworks_test.rb | 4 -
.../test/application/initializers/hooks_test.rb | 4 -
.../test/application/initializers/i18n_test.rb | 36 +----
.../application/initializers/load_path_test.rb | 4 -
.../application/initializers/notifications_test.rb | 4 -
railties/test/application/loading_test.rb | 4 -
railties/test/application/middleware_test.rb | 29 +----
railties/test/application/paths_test.rb | 4 -
railties/test/application/rackup_test.rb | 4 -
railties/test/application/rake_test.rb | 4 -
railties/test/application/routing_test.rb | 4 -
railties/test/application/runner_test.rb | 4 -
railties/test/application/test_test.rb | 4 -
railties/test/generators/actions_test.rb | 25 ---
railties/test/generators/app_generator_test.rb | 4 +-
railties/test/generators/named_base_test.rb | 5 -
railties/test/isolation/abstract_unit.rb | 9 -
railties/test/railties/engine_test.rb | 4 -
railties/test/railties/plugin_ordering_test.rb | 6 +-
railties/test/railties/plugin_test.rb | 4 -
railties/test/railties/railtie_test.rb | 6 +-
railties/test/railties/shared_tests.rb | 2 +-
tasks/release.rb | 28 +----
version.rb | 2 +-
293 files changed, 1129 insertions(+), 3318 deletions(-)
Raw
gistfile1.txt
$ git diff --stat v3.0.9..remotes/origin/3-0-4-security > diff.txt
$ git diff --stat --diff-filter=A v3.0.9..remotes/origin/3-0-4-security > diff-A.txt
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment