This project is archived and is in readonly mode.
Changeset [33048b6e2738ff73b612dbcb35955189221dfbd0] by José Valim
July 21st, 2009 @ 11:51 AM
Solving merge conflicts. http://github.com/rails/rails/co...
Committed by José Valim
- M actionpack/examples/very_simple.rb
- M actionpack/examples/views/layouts/alt.html.erb
- M actionpack/examples/views/layouts/kaigi.html.erb
- M actionpack/examples/views/template.html.erb
- M actionpack/lib/action_controller.rb
- M actionpack/lib/action_controller/abstract/base.rb
- M actionpack/lib/action_controller/abstract/callbacks.rb
- M actionpack/lib/action_controller/abstract/helpers.rb
- M actionpack/lib/action_controller/abstract/layouts.rb
- M actionpack/lib/action_controller/abstract/logger.rb
- M actionpack/lib/action_controller/abstract/renderer.rb
- M actionpack/lib/action_controller/base/compatibility.rb
- M actionpack/lib/action_controller/base/helpers.rb
- M actionpack/lib/action_controller/base/http.rb
- M actionpack/lib/action_controller/routing/generation/polymorphic_routes.rb
- M actionpack/lib/action_controller/testing/process.rb
- M actionpack/lib/action_view.rb
- M actionpack/lib/action_view/base.rb
- M actionpack/lib/action_view/context.rb
- M actionpack/lib/action_view/helpers.rb
- M actionpack/lib/action_view/helpers/active_model_helper.rb
- M actionpack/lib/action_view/helpers/active_record_helper.rb
- M actionpack/lib/action_view/helpers/ajax_helper.rb
- M actionpack/lib/action_view/helpers/form_helper.rb
- M actionpack/lib/action_view/render/partials.rb
- M actionpack/lib/action_view/template/renderable.rb
- M actionpack/lib/action_view/template/template.rb
- M actionpack/lib/action_view/test_case.rb
- M actionpack/test/abstract_unit.rb
- M actionpack/test/activerecord/render_partial_with_record_identification_test.rb
- M actionpack/test/controller/record_identifier_test.rb
- M actionpack/test/controller/redirect_test.rb
- M actionpack/test/javascript/ajax_test.rb
- M actionpack/test/lib/controller/fake_models.rb
- M actionpack/test/template/active_record_helper_i18n_test.rb
- M actionpack/test/template/active_record_helper_test.rb
- M actionpack/test/template/atom_feed_helper_test.rb
- M actionpack/test/template/compiled_templates_test.rb
- M actionpack/test/template/form_helper_test.rb
- M actionpack/test/template/prototype_helper_test.rb
- M actionpack/test/template/record_tag_helper_test.rb
- M actionpack/test/template/url_helper_test.rb
- M activemodel/examples/validations.rb
- M activemodel/lib/active_model.rb
- M activemodel/lib/active_model/attributes.rb
- M activemodel/lib/active_model/base.rb
- M activemodel/lib/active_model/conversion.rb
- M activemodel/lib/active_model/observing.rb
- M activemodel/lib/active_model/serializers/json.rb
- M activemodel/lib/active_model/serializers/xml.rb
- M activemodel/lib/active_model/validations.rb
- M activemodel/lib/activemodel.rb
- M activemodel/test/cases/attributes_test.rb
- M activemodel/test/cases/observing_test.rb
- M activemodel/test/cases/serializeration/json_serialization_test.rb
- M activemodel/test/cases/serializeration/xml_serialization_test.rb
- M activerecord/CHANGELOG
- M activerecord/lib/active_record/associations.rb
- M activerecord/lib/active_record/associations/belongs_to_association.rb
- M activerecord/lib/active_record/associations/belongs_to_polymorphic_association.rb
- M activerecord/lib/active_record/autosave_association.rb
- M activerecord/lib/active_record/base.rb
- M activerecord/lib/active_record/callbacks.rb
- M activerecord/test/cases/associations/belongs_to_associations_test.rb
- M activerecord/test/cases/base_test.rb
- M activerecord/test/cases/reflection_test.rb
- M activerecord/test/models/author.rb
- M activerecord/test/models/company.rb
- M activerecord/test/models/essay.rb
- M activerecord/test/models/reply.rb
- M activerecord/test/models/topic.rb
- M activerecord/test/schema/schema.rb
- M activeresource/lib/active_resource.rb
- M activeresource/lib/active_resource/base.rb
- M activeresource/lib/active_resource/observing.rb
- M activesupport/lib/active_support/core_ext/string/interpolation.rb
- M activesupport/lib/active_support/test_case.rb
- M activesupport/test/core_ext/string_ext_test.rb
- M railties/lib/generators/rails/app/templates/script/about.tt
- M railties/lib/generators/rails/app/templates/script/console.tt
- M railties/lib/generators/rails/app/templates/script/dbconsole.tt
- M railties/lib/generators/rails/app/templates/script/destroy.tt
- M railties/lib/generators/rails/app/templates/script/generate.tt
- M railties/lib/generators/rails/app/templates/script/performance/benchmarker.tt
- M railties/lib/generators/rails/app/templates/script/performance/profiler.tt
- M railties/lib/generators/rails/app/templates/script/plugin.tt
- M railties/lib/generators/rails/app/templates/script/runner.tt
- M railties/lib/generators/rails/app/templates/script/server.tt
- M railties/lib/vendor/bundler/LICENSE
- M railties/lib/vendor/bundler/Rakefile
- M railties/lib/vendor/bundler/bin/gem_bundler
- M railties/lib/vendor/bundler/lib/bundler.rb
- M railties/lib/vendor/bundler/lib/bundler/cli.rb
- M railties/lib/vendor/bundler/lib/bundler/dependency.rb
- M railties/lib/vendor/bundler/lib/bundler/finder.rb
- M railties/lib/vendor/bundler/lib/bundler/gem_bundle.rb
- M railties/lib/vendor/bundler/lib/bundler/gem_specification.rb
- M railties/lib/vendor/bundler/lib/bundler/installer.rb
- M railties/lib/vendor/bundler/lib/bundler/manifest.rb
- M railties/lib/vendor/bundler/lib/bundler/resolver.rb
- M railties/lib/vendor/bundler/lib/bundler/resolver/builders.rb
- M railties/lib/vendor/bundler/lib/bundler/resolver/engine.rb
- M railties/lib/vendor/bundler/lib/bundler/resolver/inspect.rb
- M railties/lib/vendor/bundler/lib/bundler/resolver/search.rb
- M railties/lib/vendor/bundler/lib/bundler/resolver/stack.rb
- M railties/lib/vendor/bundler/lib/bundler/resolver/state.rb
- M railties/lib/vendor/bundler/lib/bundler/runtime.rb
Create your profile
Help contribute to this project by taking a few moments to create your personal profile. Create your profile »
<h2 style="font-size: 14px">Tickets have moved to Github</h2>
The new ticket tracker is available at <a href="https://github.com/rails/rails/issues">https://github.com/rails/rails/issues</a>